jaws-project-commits — CVS Commits

[Jaws-project-commits] jaws/html/gadgets/Faq/templates EditCategory.html,NONE,1.1 EditQuestion.html,NONE,1.1 ListCategories.html,NONE,1.1 ManageQuestions.html,NONE,1.1 ViewAll.html,NONE,1.1 ViewCategory.html,NONE,1.1 ViewQuestion.html,NONE,1.1 admin.html,1.3,NONE faq.html,1.2,NONE

[Jonathan H. <io...@us...>]

Update of /cvsroot/jaws-project/jaws/html/gadgets/Faq/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16992/templates

Added Files:
	EditCategory.html EditQuestion.html ListCategories.html 
	ManageQuestions.html ViewAll.html ViewCategory.html 
	ViewQuestion.html 
Removed Files:
	admin.html faq.html 
Log Message:
Support categories in FAQ ;-)

--- NEW FILE: ViewQuestion.html ---
<!-- BEGIN view_question -->
<h2>{question}</h2>
{answer}
<!-- END view_question -->

--- NEW FILE: ListCategories.html ---
<!-- BEGIN list -->
<h3>{categories}</h3>
<ul>
<!-- BEGIN item -->
<li><a href="index.php?gadget=Faq&amp;action=ViewCategory&amp;id={id}">{category}</a></li>
<!-- END item -->
</ul>
<!-- END list -->

--- NEW FILE: EditQuestion.html ---
<!-- BEGIN edit_question -->
<div id="control-panel-title" style="background: transparent url({icon}) no-repeat;">{title}</div>
{menubar}
<!-- BEGIN message -->
<br />
<div align="center">
<span class="control-panel-message">{message}</span>
</div><br />
<!-- END message -->  
<!-- BEGIN preview -->
<div align="center">
<div style="width: 100%; margin-bottom: 20px; overflow: auto; max-height: 400px; border: 1px solid #ddd; text-align: left;">
<div style="padding: 10px;">
<h1>{question} <span style="font-size: x-small; color: #999;">[{preview}]</span></h1>
{answer}
</div>
</div>
</div>
<!-- END preview -->
{form}
<!-- END edit_question -->

--- NEW FILE: ViewCategory.html ---
<!-- BEGIN category -->
<h2>{category}</h2>
<!-- BEGIN item -->
<div style="padding: 5px;">
<strong>{pos}. {question}:<a name="{id}">&nbsp;</a></strong>
<div style="padding: 15px;">
{answer}
</div>
</div>
<!-- END item -->
<!-- END category -->

--- NEW FILE: ViewAll.html ---
<!-- BEGIN faq -->
<h1>{title}</h1>
<!-- BEGIN summary -->
<h2>{contents}</h2>
<ol>
<!-- BEGIN category -->
<li><strong>{category}</strong></li>
<ol>
  <!-- BEGIN item -->
  <li><a href="index.php?gadget=Faq#{id}">{question}</a></li>
  <!-- END item -->
</ol>
<!-- END category -->
</ol>
<!-- END summary -->
<!-- BEGIN list -->
<h2>{pos}. {category}</h2>
<!-- BEGIN question -->
<div style="padding: 5px;">
<strong>{pos}. {question}:<a name="{id}">&nbsp;</a></strong>
<div style="padding: 15px;">
{answer}
</div>
</div>
<!-- END question -->
<!-- END list -->
<!-- END faq -->

--- admin.html DELETED ---

--- NEW FILE: ManageQuestions.html ---
<!-- BEGIN list -->
<div id="control-panel-title" style="background: transparent url({icon}) no-repeat;">{title}</div>
{menubar}
<div align="right".
<form name="catForm" action="admin.php" method="POST">
<input type="hidden" name="gadget" value="Faq">
<input type="hidden" name="action" value="ManageQuestions">
{category} {category_combo}
</form>
</div>
<!-- BEGIN message -->
<br />
<div align="center">
<span class="control-panel-message">{message}</span>
</div><br />
<!-- END message -->  
<!-- BEGIN category -->
<div style="border: 1px solid #ddd; background: #fafafa; padding:10px; margin-bottom: 10px; margin-top:15px;">
<h3 style="margin:0; padding:0;">{up} {down} {position}. {name}</h3>
{description}
<div align="right" style="margin-top: 10px;">
{add_question} | {edit} | {delete}
</div>
</div>
<div align="center">
{grid}
<!-- BEGIN noquestions --> 
<div style="margin:20px;">
<span class="control-panel-message">
{message}
</span>
</div>
<!-- END noquestions -->
</div>
<!-- END category -->
<!-- END list -->

--- NEW FILE: EditCategory.html ---
<!-- BEGIN edit_category -->
<div id="control-panel-title" style="background: transparent url({icon}) no-repeat;">{title}</div>
{menubar}
<!-- BEGIN message -->
<br />
<div align="center">
<span class="control-panel-message">{message}</span>
</div><br />
<!-- END message -->  
{form}
<!-- END edit_category -->

--- faq.html DELETED ---

[Jaws-project-commits] jaws/html/gadgets/Faq/languages/en Faq.php,1.2,1.3

[Jonathan H. <io...@us...>]

Update of /cvsroot/jaws-project/jaws/html/gadgets/Faq/languages/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16992/languages/en

Modified Files:
	Faq.php 
Log Message:
Support categories in FAQ ;-)

Index: Faq.php
===================================================================
RCS file: /cvsroot/jaws-project/jaws/html/gadgets/Faq/languages/en/Faq.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Faq.php	11 Mar 2005 18:01:50 -0000	1.2
--- Faq.php	18 Mar 2005 01:59:59 -0000	1.3
***************
*** 1,42 ****
  <?php
! // General Translation file (i18n) for Faq gadget
! // Jaws 2005 <c>
! // Generated by: Generatei18N.pl Perl Script <Jaws Developers>
! // 
! 
  define ("_EN_FAQ_NAME","FAQ");
  define ("_EN_FAQ_INFO_DESCRIPTION","Stores <em>F</em>requently <em>A</em>sked <em>Q</em>uestions and their answers.");
  
! // ACLs
! define ("_EN_FAQ_ACL_DEFAULT","Adminstrate FAQ");
! define ("_EN_FAQ_ACL_DEFAULT_DESCRIPTION","The user can manage the FAQ list.");
! define ("_EN_FAQ_ACL_ADDQUESTION","Add Questions");
! define ("_EN_FAQ_ACL_ADDQUESTION_DESCRIPTION","The user can add new questions to the FAQ list.");
! define ("_EN_FAQ_ACL_EDITQUESTION","Edit Questions");
! define ("_EN_FAQ_ACL_EDITQUESTION_DESCRIPTION","The user can edit questions that are already in the FAQ list.");
! define ("_EN_FAQ_ACL_DELETEQUESTION","Delete Questions");
! define ("_EN_FAQ_ACL_DELETEQUESTION_DESCRIPTION","The user can delete questions from the FAQ list.");
! 
! // Actions
! define ("_EN_FAQ_ACTION_DEFAULT","Display a list of questions.");
! define ("_EN_FAQ_ACTION_VIEW","Display a list of questions.");
! define ("_EN_FAQ_ADMIN_DEFAULT","Administration");
! 
! // Layout blocks
! define ("_EN_FAQ_LAYOUT_FASTLINKS","Fast Links");
! define ("_EN_FAQ_LAYOUT_FASTLINKS_DESCRIPTION","Display a list of links to frequently asked questions.");
  
  // Strings
  define ("_EN_FAQ_LIST","FAQ List");
  define ("_EN_FAQ_QUESTION","Question");
! define ("_EN_FAQ_DELETE_QUESTION","Delete Question");
! define ("_EN_FAQ_EDIT_QUESTION","Edit Question");
! define ("_EN_FAQ_QUESTION_ADDED","The question has been added to the FAQ list.");
! define ("_EN_FAQ_QUESTION_NOT_ADDED","There was a problem adding the question.");
! define ("_EN_FAQ_QUESTION_UPDATED","The question has been updated.");
! define ("_EN_FAQ_QUESTION_NOT_UPDATED","There was a problem adding the question.");
! define ("_EN_FAQ_ADD_QUESTION","Add Question");
! define ("_EN_FAQ_UPDATE_QUESTION","Update Question");
! define ("_EN_FAQ_QUESTION_DELETED","The question has been deleted.");
! define ("_EN_FAQ_QUESTION_NOT_DELETED","There was a problem deleting the question.");
  ?>
--- 1,42 ----
  <?php
! // Info
  define ("_EN_FAQ_NAME","FAQ");
  define ("_EN_FAQ_INFO_DESCRIPTION","Stores <em>F</em>requently <em>A</em>sked <em>Q</em>uestions and their answers.");
  
! // ACL Stuff
! define ("_EN_FAQ_ACL_DEFAULT","Administrate FAQ");
! define ("_EN_FAQ_ACL_DEFAULT_DESCRIPTION","User with this permission can administrate FAQ");
! define ("_EN_FAQ_ACL_ADDQUESTION","Add questions");
! define ("_EN_FAQ_ACL_ADDQUESTION_DESCRIPTION","The user can add new questions to FAQ");
! define ("_EN_FAQ_ACL_EDITQUESTION","Edit questions");
! define ("_EN_FAQ_ACL_EDITQUESTION_DESCRIPTION","The user can edit questions that are already in FAQ");
! define ("_EN_FAQ_ACL_DELETEQUESTION","Delete questions");
! define ("_EN_FAQ_ACL_DELETEQUESTION_DESCRIPTION","The user can delete questions from the FAQ");
! define ("_EN_FAQ_ACL_MANAGECATEGORIES","Manage categories");
! define ("_EN_FAQ_ACL_MANAGECATEGORIES_DESCRIPTION","The user can manage FAQ categories");
  
  // Strings
+ define ("_EN_FAQ_LAYOUT_LISTCATEGORIES","List categories");
+ define ("_EN_FAQ_LAYOUT_LISTCATEGORIES_DESCRIPTION","Show a list with the FAQ categories");
+ define ("_EN_FAQ_CATEGORIES","Categories");
+ define ("_EN_FAQ_TITLE","Frequently Asked Questions");
+ define ("_EN_FAQ_CONTENTS","Contents");
  define ("_EN_FAQ_LIST","FAQ List");
+ define ("_EN_FAQ_ADD_QUESTION","Add question");
+ define ("_EN_FAQ_ADD_CATEGORY","Add category");
+ define ("_EN_FAQ_ALL_CATEGORIES","All categories");
+ define ("_EN_FAQ_CATEGORY","Category");
+ define ("_EN_FAQ_CONFIRM_DELETE_CATEGORY","Do you want to delete this category and all its questions?");
+ define ("_EN_FAQ_EDIT_CATEGORY","Edit category");
+ define ("_EN_FAQ_DELETE_CATEGORY","Delete category");
  define ("_EN_FAQ_QUESTION","Question");
! define ("_EN_FAQ_MOVEUP","Move up");
! define ("_EN_FAQ_MOVEDOWN","Move down");
! define ("_EN_FAQ_CONFIRM_DELETE_QUESTION","Do you want to delete this question?");
! define ("_EN_FAQ_START_ADD","Start adding questions to this category");
! define ("_EN_FAQ_STATUS","Status");
! define ("_EN_FAQ_ACTIVE","Active");
! define ("_EN_FAQ_INACTIVE","Inactive");
! define ("_EN_FAQ_UPDATE_QUESTION","Update question");
! define ("_EN_FAQ_UPDATE_CATEGORY","Update category");
  ?>

[Jaws-project-commits] jaws/html/gadgets/Faq/languages Faq.php,1.2,1.3

[Jonathan H. <io...@us...>]

Update of /cvsroot/jaws-project/jaws/html/gadgets/Faq/languages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16992/languages

Modified Files:
	Faq.php 
Log Message:
Support categories in FAQ ;-)

Index: Faq.php
===================================================================
RCS file: /cvsroot/jaws-project/jaws/html/gadgets/Faq/languages/Faq.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Faq.php	11 Mar 2005 17:54:35 -0000	1.2
--- Faq.php	18 Mar 2005 01:59:59 -0000	1.3
***************
*** 5,30 ****
  // 
  
! define ("_FAQ_NAME","FAQ");
! define ("_FAQ_INFO_DESCRIPTION","Stores <em>F</em>requently <em>A</em>sked <em>Q</em>uestions and their answers.");
! define ("_FAQ_ACL_DEFAULT","Adminstrate FAQ");
! define ("_FAQ_ACL_DEFAULT_DESCRIPTION","The user can manage the FAQ list.");
! define ("_FAQ_ACL_ADDQUESTION","Add Questions");
! define ("_FAQ_ACL_ADDQUESTION_DESCRIPTION","The user can add new questions to the FAQ list.");
! define ("_FAQ_ACL_EDITQUESTION","Edit Questions");
! define ("_FAQ_ACL_EDITQUESTION_DESCRIPTION","The user can edit questions that are already in the FAQ list.");
! define ("_FAQ_ACL_DELETEQUESTION","Delete Questions");
! define ("_FAQ_ACL_DELETEQUESTION_DESCRIPTION","The user can delete questions from the FAQ list.");
  define ("_FAQ_LIST","FAQ List");
! define ("_FAQ_ADMIN_DEFAULT","Administration");
  define ("_FAQ_QUESTION","Question");
! define ("_FAQ_DELETE_QUESTION","Delete Question");
! define ("_FAQ_EDIT_QUESTION","Edit Question");
! define ("_FAQ_QUESTION_ADDED","The question has been added to the FAQ list.");
! define ("_FAQ_QUESTION_NOT_ADDED","There was a problem adding the question.");
! define ("_FAQ_QUESTION_UPDATED","The question has been updated.");
! define ("_FAQ_QUESTION_NOT_UPDATED","There was a problem adding the question.");
! define ("_FAQ_ADD_QUESTION","Add Question");
! define ("_FAQ_UPDATE_QUESTION","Update Question");
! define ("_FAQ_QUESTION_DELETED","The question has been deleted.");
! define ("_FAQ_QUESTION_NOT_DELETED","There was a problem deleting the question.");
  ?>
--- 5,42 ----
  // 
  
! define ("_FAQ_LAYOUT_LISTCATEGORIES","List categories");
! define ("_FAQ_LAYOUT_LISTCATEGORIES_DESCRIPTION","Show a list with the FAQ categories");
! define ("_FAQ_CATEGORIES","Categories");
! define ("_FAQ_TITLE","Frequently Asked Questions");
! define ("_FAQ_CONTENTS","Contents");
  define ("_FAQ_LIST","FAQ List");
! define ("_FAQ_ADD_QUESTION","Add question");
! define ("_FAQ_ADD_CATEGORY","Add category");
! define ("_FAQ_NAME","FAQ");
! define ("_FAQ_ALL_CATEGORIES","All categories");
! define ("_FAQ_CATEGORY","Category");
! define ("_FAQ_CONFIRM_DELETE_CATEGORY","Do you want to delete this category and all its questions?");
! define ("_FAQ_EDIT_CATEGORY","Edit category");
! define ("_FAQ_DELETE_CATEGORY","Delete category");
  define ("_FAQ_QUESTION","Question");
! define ("_FAQ_MOVEUP","Move up");
! define ("_FAQ_MOVEDOWN","Move down");
! define ("_FAQ_CONFIRM_DELETE_QUESTION","Do you want to delete this question?");
! define ("_FAQ_START_ADD","Start adding questions to this category");
! define ("_FAQ_STATUS","Status");
! define ("_FAQ_ACTIVE","Active");
! define ("_FAQ_INACTIVE","Inactive");
! define ("_FAQ_UPDATE_QUESTION","Update question");
! define ("_FAQ_UPDATE_CATEGORY","Update category");
! define ("_FAQ_INFO_DESCRIPTION","Stores <em>F</em>requently <em>A</em>sked <em>Q</em>uestions and their answers.");
! define ("_FAQ_ACL_DEFAULT","Administrate FAQ");
! define ("_FAQ_ACL_DEFAULT_DESCRIPTION","User with this permission can administrate FAQ");
! define ("_FAQ_ACL_ADDQUESTION","Add questions");
! define ("_FAQ_ACL_ADDQUESTION_DESCRIPTION","The user can add new questions to FAQ");
! define ("_FAQ_ACL_EDITQUESTION","Edit questions");
! define ("_FAQ_ACL_EDITQUESTION_DESCRIPTION","The user can edit questions that are already in FAQ");
! define ("_FAQ_ACL_DELETEQUESTION","Delete questions");
! define ("_FAQ_ACL_DELETEQUESTION_DESCRIPTION","The user can delete questions from the FAQ");
! define ("_FAQ_ACL_MANAGECATEGORIES","Manage categories");
! define ("_FAQ_ACL_MANAGECATEGORIES_DESCRIPTION","The user can manage FAQ categories");
  ?>

[Jaws-project-commits] jaws/html/gadgets/Faq/sql MySQL.sql,1.2,1.3

[Jonathan H. <io...@us...>]

Update of /cvsroot/jaws-project/jaws/html/gadgets/Faq/sql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16992/sql

Modified Files:
	MySQL.sql 
Log Message:
Support categories in FAQ ;-)

Index: MySQL.sql
===================================================================
RCS file: /cvsroot/jaws-project/jaws/html/gadgets/Faq/sql/MySQL.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MySQL.sql	14 Mar 2005 19:36:54 -0000	1.2
--- MySQL.sql	18 Mar 2005 01:59:59 -0000	1.3
***************
*** 1,8 ****
  CREATE TABLE [[faq]] (
!   faq_no int(11) NOT NULL auto_increment,
    question varchar(255) NOT NULL default '',
    answer TEXT,
    createtime datetime NOT NULL default '0000-00-00 00:00:00',
    updatetime timestamp(14) NOT NULL,
!   PRIMARY KEY  (faq_no)
  ) TYPE=MyISAM;
--- 1,24 ----
+ CREATE TABLE [[faq_category]] (
+   id int(11) NOT NULL auto_increment,
+   category varchar(255) NOT NULL default '',
+   description TEXT,
+   position int(11) NOT NULL default 0,
+   updatetime timestamp(14) NOT NULL,
+   PRIMARY KEY  (id)
+ ) TYPE=MyISAM;
+ 
+ INSERT INTO [[faq_category]] values (1,'General', 'Here you can find General questions', 1, now());
+ 
  CREATE TABLE [[faq]] (
!   id int(11) NOT NULL auto_increment,
    question varchar(255) NOT NULL default '',
    answer TEXT,
+   category int(11) NOT NULL,
+   active int(1) default '1',
+   position int(11) NOT NULL default 0,
    createtime datetime NOT NULL default '0000-00-00 00:00:00',
    updatetime timestamp(14) NOT NULL,
!   PRIMARY KEY  (id)
  ) TYPE=MyISAM;
+ 
+ INSERT INTO [[faq]] VALUES (1,'What is JAWS?','Jaws is a Framework and Content Management System for building dynamic web sites. It aims to be User Friendly giving ease of use and lots of ways to customize web sites, but at the same time is Developer Frendly, it offers a simple and powerful framework to hack your own modules.',1,1,1,now(),now());

[Jaws-project-commits] jaws/html/include JawsSession.php,1.12,1.13

[Jonathan H. <io...@us...>]

Update of /cvsroot/jaws-project/jaws/html/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16781

Modified Files:
	JawsSession.php 
Log Message:
Fix load ACL

Index: JawsSession.php
===================================================================
RCS file: /cvsroot/jaws-project/jaws/html/include/JawsSession.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** JawsSession.php	17 Mar 2005 07:30:23 -0000	1.12
--- JawsSession.php	18 Mar 2005 01:58:50 -0000	1.13
***************
*** 222,226 ****
  			$this->SetAttribute ("mtime", time());
  			$this->SetAttribute ("username", $username);
! 			$this->SetAttribute ("acl", "");
  			$this->SetAttribute ("logged", true);
  			if ($this->Synchronize())
--- 222,226 ----
  			$this->SetAttribute ("mtime", time());
  			$this->SetAttribute ("username", $username);
! 			$this->SetAttribute ("acl", array("last_update" => ""));
  			$this->SetAttribute ("logged", true);
  			if ($this->Synchronize())

[Jaws-project-commits] jaws/html/gadgets/Menu/templates Admin.html,1.2,1.3

[Jonathan H. <io...@us...>]

Update of /cvsroot/jaws-project/jaws/html/gadgets/Menu/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32500/templates

Modified Files:
	Admin.html 
Log Message:
foo says: Pablo doesn't like this menu


Index: Admin.html
===================================================================
RCS file: /cvsroot/jaws-project/jaws/html/gadgets/Menu/templates/Admin.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Admin.html	8 Mar 2005 23:20:54 -0000	1.2
--- Admin.html	17 Mar 2005 21:09:42 -0000	1.3
***************
*** 6,10 ****
      <td valign="top">
        <!-- BEGIN group -->
!       <table style="border: 1px solid #ddd; padding: 2px;" cellspacing="0" cellpadding="3" width="100%">
  	<!-- BEGIN item -->
  	<tr>
--- 6,10 ----
      <td valign="top">
        <!-- BEGIN group -->
!       <table style="border: 1px solid #ddd; padding: 2px; width: 100%; min-width:240px; border-collapse: collapse;">
  	<!-- BEGIN item -->
  	<tr>

[Jaws-project-commits] jaws/html/gadgets/Menu Menu.php,1.8,1.9

[Jonathan H. <io...@us...>]

Update of /cvsroot/jaws-project/jaws/html/gadgets/Menu
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32500

Modified Files:
	Menu.php 
Log Message:
foo says: Pablo doesn't like this menu


Index: Menu.php
===================================================================
RCS file: /cvsroot/jaws-project/jaws/html/gadgets/Menu/Menu.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Menu.php	8 Mar 2005 23:20:52 -0000	1.8
--- Menu.php	17 Mar 2005 21:09:41 -0000	1.9
***************
*** 101,105 ****
  			$tpl->SetBlock ("menu/group/item");
  			$tpl->SetVariable ("class", "dark-background");
! 			$tpl->SetVariable ("style", "");
  
  			$tpl->SetVariable ("title", $item["title"]);
--- 101,105 ----
  			$tpl->SetBlock ("menu/group/item");
  			$tpl->SetVariable ("class", "dark-background");
! 			$tpl->SetVariable ("style", "padding: 2px;");
  
  			$tpl->SetVariable ("title", $item["title"]);
***************
*** 145,155 ****
  				$tpl->SetBlock ("menu/group/item");
  				if ($counter % 2 == 0)
! 					$tpl->SetVariable ("style", "background-color: #fff;");
  				else
! 					$tpl->SetVariable ("style", "background-color: #ddd;");
  				$tpl->SetVariable ("class", "");
  
  				$tpl->SetVariable ("title", $menu_item["title"]);
! 				$tpl->SetVariable ("url", $menu_item["url"]);
  				$tpl->SetVariable ("id", $menu_item["id"]);
  
--- 145,159 ----
  				$tpl->SetBlock ("menu/group/item");
  				if ($counter % 2 == 0)
! 					$tpl->SetVariable ("style", "padding: 2px; background-color: #fff;");
  				else
! 					$tpl->SetVariable ("style", "padding: 2px; background-color: #ddd;");
  				$tpl->SetVariable ("class", "");
  
  				$tpl->SetVariable ("title", $menu_item["title"]);
! 				if (strlen($menu_item["url"]) > 30) {
! 					$tpl->SetVariable ("url", substr($menu_item["url"],0,30)."...");
! 				} else {
! 					$tpl->SetVariable ("url", $menu_item["url"]);
! 				}
  				$tpl->SetVariable ("id", $menu_item["id"]);
  

[Jaws-project-commits] jaws/html/languages/en Global.php,1.6,1.7

[Pablo F. <pab...@us...>]

Update of /cvsroot/jaws-project/jaws/html/languages/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17492/languages/en

Modified Files:
	Global.php 
Log Message:
Add more words :D


Index: Global.php
===================================================================
RCS file: /cvsroot/jaws-project/jaws/html/languages/en/Global.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Global.php	11 Mar 2005 07:31:31 -0000	1.6
--- Global.php	17 Mar 2005 07:30:53 -0000	1.7
***************
*** 31,34 ****
--- 31,38 ----
  define ("_EN_GLOBAL_ALWAYS","Always");
  
+ /* Date/Time phrases */
+ define ("_EN_GLOBAL_CREATETIME", "Create Time");
+ define ("_EN_GLOBAL_UPDATETIME", "Create Time");
+ 
  /* Common phrases */
  define ("_EN_GLOBAL_CONFIRM_DELETE","Do you want to delete this {0}?");
***************
*** 38,40 ****
--- 42,51 ----
  define ("_EN_GLOBAL_ACTION_DEFAULT","Default action");
  
+ /* Common errors */
+ define ("_EN_GLOBAL_ERROR_QUERY_FAILED", "There was a problem while trying to run {0} query.");
+ define ("_EN_GLOBAL_ERROR_FAILED_CREATING_DIR", "There was a problem creating {0} directory.");
+ define ("_EN_GLOBAL_ERROR_FAILED_ADDING_REGISTRY_KEY", "There was a problem adding the key {0} to the registry.");
+ define ("_EN_GLOBAL_ERROR_FAILED_DIRECTORY_UNWRITABLE", "Directory {0} is not writable.");
+ define ("_EN_GLOBAL_ERROR_SQLFILE_NOT_EXISTS", "The query file {0}.");
+ define ("_EN_GLOBAL_ERROR_FAILED_QUERY_FILE", "There was a problem running a query located in: {0}.");
  ?>

[Jaws-project-commits] jaws/html/include JawsError.php,1.3,1.4 JawsSession.php,1.11,1.12

[Pablo F. <pab...@us...>]

Update of /cvsroot/jaws-project/jaws/html/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17245

Modified Files:
	JawsError.php JawsSession.php 
Log Message:
Some fixes and features, for example:
 * Header Location MUST NOT call exit;, if its called, session variables 
are killed and LastResponse is lost
 * All errors are logged


Index: JawsSession.php
===================================================================
RCS file: /cvsroot/jaws-project/jaws/html/include/JawsSession.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** JawsSession.php	15 Mar 2005 19:56:54 -0000	1.11
--- JawsSession.php	17 Mar 2005 07:30:23 -0000	1.12
***************
*** 364,371 ****
  	function GetAttribute ($name)
  	{
! 		if (isset($this->_Attributes[$name]))
  			return $this->_Attributes[$name];
! 		else
  			return null;
  	}	
  
--- 364,372 ----
  	function GetAttribute ($name)
  	{
! 		if (isset($this->_Attributes[$name])) {
  			return $this->_Attributes[$name];
! 		} else {
  			return null;
+ 		}
  	}	
  
***************
*** 382,387 ****
  			$this->_HasChanged = true;
  			return true;
! 		} else
  			return false;
  	}
  
--- 383,389 ----
  			$this->_HasChanged = true;
  			return true;
! 		} else {
  			return false;
+ 		}
  	}
  
***************
*** 434,438 ****
  	function PushLastResponse ($msg, $level = RESPONSE_WARNING)
  	{
- 		
  		if (!defined ($level)) {
  			$level = RESPONSE_WARNING;
--- 436,439 ----

Index: JawsError.php
===================================================================
RCS file: /cvsroot/jaws-project/jaws/html/include/JawsError.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JawsError.php	15 Mar 2005 19:56:54 -0000	1.3
--- JawsError.php	17 Mar 2005 07:30:22 -0000	1.4
***************
*** 40,43 ****
--- 40,44 ----
  		$this->_Message = $message;
  		$this->_Code = $code;		
+ 		$GLOBALS["log"]->Log (JAWS_LOG_ERR, "[{$code}]: {$message}", "");
  	}
  

[Jaws-project-commits] jaws/html/include/JawsTypes JawsHeader.php,1.2,1.3

[Pablo F. <pab...@us...>]

Update of /cvsroot/jaws-project/jaws/html/include/JawsTypes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17245/JawsTypes

Modified Files:
	JawsHeader.php 
Log Message:
Some fixes and features, for example:
 * Header Location MUST NOT call exit;, if its called, session variables 
are killed and LastResponse is lost
 * All errors are logged


Index: JawsHeader.php
===================================================================
RCS file: /cvsroot/jaws-project/jaws/html/include/JawsTypes/JawsHeader.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JawsHeader.php	15 Mar 2005 19:58:20 -0000	1.2
--- JawsHeader.php	17 Mar 2005 07:30:24 -0000	1.3
***************
*** 22,26 ****
  	{
  		header ("Location: {$url}");
! 		exit;
  	}
  
--- 22,26 ----
  	{
  		header ("Location: {$url}");
! 		//exit;
  	}
  

[Jaws-project-commits] jaws/html/plugins/SyntaxHighlight SyntaxHighlight.php,1.4,1.5

[Pablo F. <pab...@us...>]

Update of /cvsroot/jaws-project/jaws/html/plugins/SyntaxHighlight
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16868/SyntaxHighlight

Modified Files:
	SyntaxHighlight.php 
Log Message:
s/_EN//


Index: SyntaxHighlight.php
===================================================================
RCS file: /cvsroot/jaws-project/jaws/html/plugins/SyntaxHighlight/SyntaxHighlight.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SyntaxHighlight.php	12 Mar 2005 22:14:57 -0000	1.4
--- SyntaxHighlight.php	17 Mar 2005 07:27:23 -0000	1.5
***************
*** 73,77 ****
  
  		$button_terminal =& new Button ("addcode", "", "images/stock/stock-terminal.png");
! 		$button_terminal->SetTitle (_t("_EN_PLUGINS_SYNTAXHIGHLIGHT_ADD_TERMINAL")." ALT+T");				
  		$button_terminal->AddEvent (new JSEvent (ON_CLICK, 
  												 "javascript: insertTags($textarea,'[terminal]\\n','\\n[/terminal]\\n','"._t("Your Terminal Text")."');"));
--- 73,77 ----
  
  		$button_terminal =& new Button ("addcode", "", "images/stock/stock-terminal.png");
! 		$button_terminal->SetTitle (_t("_PLUGINS_SYNTAXHIGHLIGHT_ADD_TERMINAL")." ALT+T");				
  		$button_terminal->AddEvent (new JSEvent (ON_CLICK, 
  												 "javascript: insertTags($textarea,'[terminal]\\n','\\n[/terminal]\\n','"._t("Your Terminal Text")."');"));

[Jaws-project-commits] jaws/html/gadgets/Search SearchModel.php,1.3,1.4

[Pablo F. <pab...@us...>]

Update of /cvsroot/jaws-project/jaws/html/gadgets/Search
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16837/Search

Modified Files:
	SearchModel.php 
Log Message:
Eh?


Index: SearchModel.php
===================================================================
RCS file: /cvsroot/jaws-project/jaws/html/gadgets/Search/SearchModel.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SearchModel.php	12 Mar 2005 02:46:56 -0000	1.3
--- SearchModel.php	17 Mar 2005 07:27:07 -0000	1.4
***************
*** 32,36 ****
  			require_once "{$GLOBALS["path"]}gadgets/{$gadget}/{$modelName}.php";
  			$gModel =& new $modelName();
! 			if ($gResult = $gModel->Search ($search)) 
  				$result = array_merge($result, $gResult);
  		}
--- 32,37 ----
  			require_once "{$GLOBALS["path"]}gadgets/{$gadget}/{$modelName}.php";
  			$gModel =& new $modelName();
! 			$gResult = $gModel->Search ($search);
! 			if (!JawsError::IsError ($gResult) || !$result) //FIXME: should test only IsError...
  				$result = array_merge($result, $gResult);
  		}

[Jaws-project-commits] jaws/html/gadgets/Chatbox/languages/en Chatbox.php,1.5,1.6

[Pablo F. <pab...@us...>]

Update of /cvsroot/jaws-project/jaws/html/gadgets/Chatbox/languages/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16705/languages/en

Modified Files:
	Chatbox.php 
Log Message:
Done!, compatible with Jaws 0.5
 * Debug done
 * Translation done
 * Errors are handled by JawsError


Index: Chatbox.php
===================================================================
RCS file: /cvsroot/jaws-project/jaws/html/gadgets/Chatbox/languages/en/Chatbox.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Chatbox.php	17 Mar 2005 01:02:01 -0000	1.5
--- Chatbox.php	17 Mar 2005 07:26:45 -0000	1.6
***************
*** 34,58 ****
  define ("_EN_CHATBOX_ERROR_ENTRY_NOT_DELETED","There was a problem deleting the entry.");
  define ("_EN_CHATBOX_ERROR_SETTINGS_NOT_UPDATED","There was a problem saving your settings.");
- 
- function GetCustomers ()
- {
- 	$sql = "SELECT id, name, lastname FROM [[customer]]";
- 	$rs = $GLOBALS["app"]->DB->Execute ($sql);
- 	if ($rs)
- 		return true;
- 	else
- 		return new JawsError (_t("_GLOBALS_ERROR_QUERY_FAILED", "GetCustomers"));
- }
- 
- function UpdateCustomer ($id, $name, $lastname)
- {
-    $sql = "UPDATE [[customer]] SET name = {name}, lastname = {lastname} 
-            WHERE id = {id}";
-    $rs = $GLOBALS["app"]->DB->Execute ($sql, array ("name" => $name,
- 													"lastname" => $lastname));
-    if ($rs)
- 	   return $rs->GetRows ();
-    else
- 	   return new JawsError (_t("_CUSTOMER_ERROR_COULD_NOT_UPDATE_CUSTOMER"));
- }
  ?>
--- 34,36 ----

[Jaws-project-commits] jaws/html/gadgets/Chatbox Chatbox.php,1.18,1.19 ChatboxModel.php,1.10,1.11

[Pablo F. <pab...@us...>]

Update of /cvsroot/jaws-project/jaws/html/gadgets/Chatbox
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16705

Modified Files:
	Chatbox.php ChatboxModel.php 
Log Message:
Done!, compatible with Jaws 0.5
 * Debug done
 * Translation done
 * Errors are handled by JawsError


Index: ChatboxModel.php
===================================================================
RCS file: /cvsroot/jaws-project/jaws/html/gadgets/Chatbox/ChatboxModel.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ChatboxModel.php	17 Mar 2005 01:02:00 -0000	1.10
--- ChatboxModel.php	17 Mar 2005 07:26:45 -0000	1.11
***************
*** 31,46 ****
  	{
  		if (!file_exists ($GLOBALS["path"]."gadgets/Chatbox/sql/".$GLOBALS["app"]->DB->GetDriverName().".sql"))
! 			return new JawsError (_t("_GLOBAL_ERROR_SQLFILE_NOT_EXISTS"));
  
  		// Execute the sql file
! 		$queries = explode(';',implode('',file($GLOBALS["path"]."gadgets/Chatbox/sql/".$GLOBALS["app"]->DB->GetDriverName().".sql")));
  		foreach ($queries as $q) 
  			if (!trim($q) == '') 
  				if (!$GLOBALS["app"]->DB->Execute ($q))
! 					return new JawsError (_t("_GLOBAL_ERROR_FAILED_QUERY_FILE", $GLOBALS["app"]->DB->GetDriverName().".sql"));
  
  		//registry keys.
  		if (!$GLOBALS["app"]->Registry->NewKey ("/gadgets/Chatbox/limit", "7"))
! 			return new JawsError (_t("_GLOBAL_ERROR_FAILED_ADDING_REGISTRY_KEY", "/gadgets/Chatbox/limit"));
  		
  		// ACL keys
--- 31,48 ----
  	{
  		if (!file_exists ($GLOBALS["path"]."gadgets/Chatbox/sql/".$GLOBALS["app"]->DB->GetDriverName().".sql"))
! 			return new JawsError (_t("_GLOBAL_ERROR_SQLFILE_NOT_EXISTS"), _t("_CHATBOX_NAME"));
  
  		// Execute the sql file
! 		$queries = explode(';',implode('',file($GLOBALS["path"]."gadgets/Chatbox/sql/".
! 											   $GLOBALS["app"]->DB->GetDriverName().".sql")));
  		foreach ($queries as $q) 
  			if (!trim($q) == '') 
  				if (!$GLOBALS["app"]->DB->Execute ($q))
! 					return new JawsError (_t("_GLOBAL_ERROR_FAILED_QUERY_FILE", 
! 											 $GLOBALS["app"]->DB->GetDriverName().".sql"), _t("_CHATBOX_NAME"));
  
  		//registry keys.
  		if (!$GLOBALS["app"]->Registry->NewKey ("/gadgets/Chatbox/limit", "7"))
! 			return new JawsError (_t("_GLOBAL_ERROR_FAILED_ADDING_REGISTRY_KEY", "/gadgets/Chatbox/limit"), _t("_CHATBOX_NAME"));
  		
  		// ACL keys
***************
*** 62,67 ****
  	function GetEntries ($limit = 0) 
  	{
! 		if ($limit <= 0)
! 			$limit = (int)$GLOBALS["app"]->Registry->Get ("/gadgets/Chatbox/limit");
  
  		$sql = "SELECT
--- 64,73 ----
  	function GetEntries ($limit = 0) 
  	{
! 		if ($limit <= 0) {
! 			$limit = $GLOBALS["app"]->Registry->Get ("/gadgets/Chatbox/limit");
! 			if (JawsError::IsError ($limit))
! 				$limit = 10;
! 		}
! 		
  
  		$sql = "SELECT
***************
*** 73,77 ****
  			return $rs->GetRows ();
  		else
! 			return new JawsError (_t("_GLOBAL_ERROR_QUERY_FAILED", "GetEntries"));
  	}
  
--- 79,83 ----
  			return $rs->GetRows ();
  		else
! 			return new JawsError (_t("_GLOBAL_ERROR_QUERY_FAILED", "GetEntries"), _t("_CHATBOX_NAME"));
  	}
  
***************
*** 107,115 ****
  			return true;
  		else
! 			return new JawsError (_t("_CHATBOX_ERROR_COULD_NOT_ADD_ENTRY"));
  		
  	}
  
- 
  	/**
  	 * Set the properties of the gadget
--- 113,120 ----
  			return true;
  		else
! 			return new JawsError (_t("_CHATBOX_ERROR_COULD_NOT_ADD_ENTRY"), _t("_CHATBOX_NAME"));
  		
  	}
  
  	/**
  	 * Set the properties of the gadget
***************
*** 122,129 ****
  	{
  		$res = $GLOBALS["app"]->Registry->Set ("/gadgets/chatbox/limit", $limit);		 
! 		if (!$res)
! 			return new JawsError (_t("_CHATBOX_ERROR_SETTINGS_NOT_UPDATED"));
! 		else
  			return true;
  	}
  
--- 127,137 ----
  	{
  		$res = $GLOBALS["app"]->Registry->Set ("/gadgets/chatbox/limit", $limit);		 
! 		if (!JawsError::IsError ($res) || $res) {
! 			$GLOBALS["session"]->PushLastResponse (_t("_CHATBOX_SETTINGS_UPDATED"), RESPONSE_NOTICE);
  			return true;
+ 		} else {
+ 			$GLOBALS["session"]->PushLastResponse (_t("_CHATBOX_ERROR_SETTINGS_NOT_UPDATED"), RESPONSE_ERROR);
+ 			return new JawsError (_t("_CHATBOX_ERROR_SETTINGS_NOT_UPDATED"), _t("_CHATBOX_NAME"));		
+ 		}
  	}
  
***************
*** 155,162 ****
  		}
  
! 		if ($rs)
  			return true;
! 		else
! 			return new JawsError (_t("_CHATBOX_ERROR_ENTRY_NOT_DELETED"));
  	}
  
--- 163,173 ----
  		}
  
! 		if ($rs) {
! 			$GLOBALS["session"]->PushLastResponse (_t("_CHATBOX_ENTRY_DELETED"), RESPONSE_NOTICE);
  			return true;
! 		} else {
! 			$GLOBALS["session"]->PushLastResponse (_t("_CHATBOX_ERROR_ENTRY_NOT_DELETE"), RESPONSE_ERROR);
! 			return new JawsError (_t("_CHATBOX_ERROR_ENTRY_NOT_DELETED"), _t("_CHATBOX_NAME"));
! 		}
  	}
  

Index: Chatbox.php
===================================================================
RCS file: /cvsroot/jaws-project/jaws/html/gadgets/Chatbox/Chatbox.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Chatbox.php	17 Mar 2005 01:02:00 -0000	1.18
--- Chatbox.php	17 Mar 2005 07:26:45 -0000	1.19
***************
*** 97,103 ****
  			}
  			$tpl->ParseBlock ("display/entries");
! 		} else {
! 			$GLOBALS["log"]->Log (JAWS_LOG_ERR, _t("_CHATBOX_NAME").": ".$entries->GetMessage(), "");
! 		}
  		$tpl->ParseBlock ("display");
          return $tpl->Get ();
--- 97,101 ----
  			}
  			$tpl->ParseBlock ("display/entries");
! 		} 
  		$tpl->ParseBlock ("display");
          return $tpl->Get ();
***************
*** 123,129 ****
  			JawsSession::SetCookie ("visitor_email", $email, time()+(60*24*150));
  			JawsSession::SetCookie ("visitor_url",   $url,   time()+(60*24*150));
! 		} else {
! 			$GLOBALS["log"]->Log (JAWS_LOG_ERR, _t("_CHATBOX_NAME").": ".$res->GetMessage(), "");
! 		}
  		header ("Location: index.php");	    
  	  }
--- 121,125 ----
  			JawsSession::SetCookie ("visitor_email", $email, time()+(60*24*150));
  			JawsSession::SetCookie ("visitor_url",   $url,   time()+(60*24*150));
! 		} 
  		header ("Location: index.php");	    
  	  }
***************
*** 180,186 ****
  														STOCK_DELETE));
  			$tpl->SetVariable ("grid", $datagrid->Get ());		
- 		} else {
- 			$GLOBALS["session"]->PushLastResponse ($entries->GetMessage());
- 			$GLOBALS["log"]->Log (JAWS_LOG_ERR, _t("_CHATBOX_NAME").": ".$entries->GetMessage(), "");
  		}
  	
--- 176,179 ----
***************
*** 200,204 ****
  			}
  			
! 			$limitcombo->SetDefault ($GLOBALS["app"]->Registry->Get("/gadgets/Chatbox/limit"));
  			
  			$fieldset_config->Add ($limitcombo);
--- 193,200 ----
  			}
  			
! 			$limit = $GLOBALS["app"]->Registry->Get("/gadgets/Chatbox/limit");
! 			if (JawsError::IsError ($limit))
! 				$limit = 10;
! 			$limitcombo->SetDefault ($limit);
  			
  			$fieldset_config->Add ($limitcombo);
***************
*** 233,243 ****
  	{
  		$GLOBALS["session"]->CheckPermission ("Chatbox", "UpdateProperties");
! 		$res = $this->_Model->UpdatePropeties ($_POST["limit_entries"]);
! 		if (!JawsError::IsError ($res)) {
! 			$GLOBALS["session"]->PushLastResponse (_t("_CHATBOX_SETTINGS_UPDATED"), RESPONSE_NOTICE);
! 		} else {
! 			$GLOBALS["session"]->PushLastResponse ($res->GetMessage(), RESPONSE_ERROR);
! 			$GLOBALS["log"]->Log (JAWS_LOG_ERR, _t("_CHATBOX_NAME").": ".$res->GetMessage(), "");
! 		}
  		JawsHeader::Location ("admin.php?gadget=Chatbox");
  	}
--- 229,233 ----
  	{
  		$GLOBALS["session"]->CheckPermission ("Chatbox", "UpdateProperties");
! 		$this->_Model->UpdateProperties ($_POST["limit_entries"]);
  		JawsHeader::Location ("admin.php?gadget=Chatbox");
  	}
***************
*** 251,261 ****
  	{
  		$GLOBALS["session"]->CheckPermission ("Chatbox", "DeleteEntry");
! 		$res = $this->_Model->DeleteEntry($_REQUEST['id']);
! 		if (!JawsError::IsError ($res)) {
! 			$GLOBALS["session"]->PushLastResponse (_t("_CHATBOX_ENTRY_DELETED"), RESPONSE_NOTICE);
! 		} else {
! 			$GLOBALS["session"]->PushLastResponse ($res->GetMessage(), RESPONSE_ERROR);
! 			$GLOBALS["log"]->Log (JAWS_LOG_ERR, _t("_CHATBOX_NAME").": ".$res->GetMessage(), "");
! 		}
  		JawsHeader::Location ("admin.php?gadget=Chatbox");
  	}
--- 241,245 ----
  	{
  		$GLOBALS["session"]->CheckPermission ("Chatbox", "DeleteEntry");
! 		$this->_Model->DeleteEntry($_REQUEST['id']);
  		JawsHeader::Location ("admin.php?gadget=Chatbox");
  	}

[Jaws-project-commits] jaws/html/gadgets/Banner/templates Admin.html,1.4,1.5

[Pablo F. <pab...@us...>]

Update of /cvsroot/jaws-project/jaws/html/gadgets/Banner/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16590/templates

Modified Files:
	Admin.html 
Log Message:
Done! Compatible with jaws 0.5:
 * Debug done
 * Translation done
 * Errors are handled by JawsError


Index: Admin.html
===================================================================
RCS file: /cvsroot/jaws-project/jaws/html/gadgets/Banner/templates/Admin.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Admin.html	6 Mar 2005 03:56:49 -0000	1.4
--- Admin.html	17 Mar 2005 07:26:02 -0000	1.5
***************
*** 7,11 ****
        <!-- BEGIN message -->
        <div align="center">
!       <span class="control-panel-message">{message}</span>
        </div><br />
        <!-- END message -->
--- 7,11 ----
        <!-- BEGIN message -->
        <div align="center">
!       <span class="{class}">{message}</span>
        </div><br />
        <!-- END message -->

[Jaws-project-commits] jaws/html/gadgets/Banner Banner.php,1.22,1.23 BannerModel.php,1.9,1.10

[Pablo F. <pab...@us...>]

Update of /cvsroot/jaws-project/jaws/html/gadgets/Banner
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16590

Modified Files:
	Banner.php BannerModel.php 
Log Message:
Done! Compatible with jaws 0.5:
 * Debug done
 * Translation done
 * Errors are handled by JawsError


Index: BannerModel.php
===================================================================
RCS file: /cvsroot/jaws-project/jaws/html/gadgets/Banner/BannerModel.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** BannerModel.php	17 Mar 2005 01:04:13 -0000	1.9
--- BannerModel.php	17 Mar 2005 07:26:01 -0000	1.10
***************
*** 36,40 ****
  			} else
  				if (!is_writable ($GLOBALS["path"]."/data/banners"))
! 					return new JawsError (_t("_GLOBAL_ERROR_FAILED_CREATING_DIR", $GLOBALS["path"]."/data/banners"));
  		} else {
  			return new JawsError (_t("_GLOBAL_ERROR_FAILED_DIRECTORY_UNWRITABLE", $GLOBALS["path"]));
--- 36,40 ----
  			} else
  				if (!is_writable ($GLOBALS["path"]."/data/banners"))
! 					return new JawsError (_t("_GLOBAL_ERROR_FAILED_CREATING_DIR", $GLOBALS["path"]."/data/banners"), _t("_BANNER_NAME"));
  		} else {
  			return new JawsError (_t("_GLOBAL_ERROR_FAILED_DIRECTORY_UNWRITABLE", $GLOBALS["path"]));
***************
*** 42,46 ****
  		
  		if (!file_exists ($GLOBALS["path"]."gadgets/Banner/sql/".$GLOBALS["app"]->DB->GetDriverName().".sql"))
! 			return new JawsError (_t("_GLOBAL_ERROR_SQLFILE_NOT_EXISTS", $GLOBALS["app"]->DB->GetDriverName().".sql"));
  		
  		// Execute the sql file
--- 42,46 ----
  		
  		if (!file_exists ($GLOBALS["path"]."gadgets/Banner/sql/".$GLOBALS["app"]->DB->GetDriverName().".sql"))
! 			return new JawsError (_t("_GLOBAL_ERROR_SQLFILE_NOT_EXISTS", $GLOBALS["app"]->DB->GetDriverName().".sql"), _t("_BANNER_NAME"));
  		
  		// Execute the sql file
***************
*** 49,57 ****
  			if (!trim($q) == '') 
  				if(!$GLOBALS["app"]->DB->Execute ($q))
! 					return new JawsError (_t("_GLOBAL_ERROR_FAILED_QUERY_FILE", $GLOBALS["app"]->DB->GetDriverName().".sql"));
  
  		//registry keys.
  		if (!$GLOBALS["app"]->Registry->NewKey ("/gadgets/Banner/limit_random", "5"))
! 			return new JawsError (_t("_GLOBAL_ERROR_FAILED_ADDING_REGISTRY_KEY", "/gadgets/Banner/limit_random"));
  
  
--- 49,57 ----
  			if (!trim($q) == '') 
  				if(!$GLOBALS["app"]->DB->Execute ($q))
! 					return new JawsError (_t("_GLOBAL_ERROR_FAILED_QUERY_FILE", $GLOBALS["app"]->DB->GetDriverName().".sql"), _t("_BANNER_NAME"));
  
  		//registry keys.
  		if (!$GLOBALS["app"]->Registry->NewKey ("/gadgets/Banner/limit_random", "5"))
! 			return new JawsError (_t("_GLOBAL_ERROR_FAILED_ADDING_REGISTRY_KEY", "/gadgets/Banner/limit_random"), _t("_BANNER_NAME"));
  
  
***************
*** 84,94 ****
  											array ("id" => $id));
  
! 		if ($rs)
! 			if (isset ($rs["id"]))
! 				return $rs->FetchRow ();
  			else
! 				return new JawsError (_t("_BANNER_ERROR_BANNER_DOES_NOT_EXISTS"));
! 		else
! 			return new JawsError (_t("_GLOBAL_ERROR_QUERY_FAILED", "GetBanner"));				
  	}
  	
--- 84,96 ----
  											array ("id" => $id));
  
! 		if ($rs) {
! 			$row = $rs->FetchRow ();
! 			if (isset ($row["id"]))
! 				return $row;
  			else
! 				return new JawsError (_t("_BANNER_ERROR_BANNER_DOES_NOT_EXISTS"), _t("_BANNER_NAME"));
! 		} else {
! 			return new JawsError (_t("_GLOBAL_ERROR_QUERY_FAILED", "GetBanner"), _t("_BANNER_NAME"));				
! 		}
  	}
  	
***************
*** 110,114 ****
  			return $rs->GetRows ();
  		else
! 			return new JawsError (_t("_GLOBAL_ERROR_QUERY_FAILED", "GetBanners"));				
  	}
  
--- 112,116 ----
  			return $rs->GetRows ();
  		else
! 			return new JawsError (_t("_GLOBAL_ERROR_QUERY_FAILED", "GetBanners"), _t("_BANNER_NAME"));				
  	}
  
***************
*** 131,135 ****
  			return $rs->GetRows ();
  		else
! 			return new JawsError (_t("_GLOBAL_ERROR_QUERY_FAILED", "GetVisibleBanners"));	
  	}
  
--- 133,137 ----
  			return $rs->GetRows ();
  		else
! 			return new JawsError (_t("_GLOBAL_ERROR_QUERY_FAILED", "GetVisibleBanners"), _t("_BANNER_NAME"));	
  	}
  
***************
*** 154,177 ****
  			return $rs->GetRows ();
  		else
! 			return new JawsError (_t("_GLOBAL_ERROR_QUERY_FAILED", "GetRandomBanners"));	
  	}	
  
  	/**
- 	 * Set the properties of the banner
- 	 *
- 	 * @access  public
- 	 * @param	int     $limit     Limit of the banner
- 	 * @return	boolean True if change was successful, otherwise returns a JawsError
- 	 */
- 	function SetLimit ($limit)
- 	{
- 		$ret = $GLOBALS["app"]->Registry->Set("/gadgets/Banner/limit_random", $limit);
- 		if ($ret)
- 			true;
- 		else
- 			return new JawsError (_t("_BANNER_PROPERTIES_NOT_UPDATED"));
- 	}
- 	
- 	/**
  	 * Create a new banner 
  	 *
--- 156,163 ----
  			return $rs->GetRows ();
  		else
! 			return new JawsError (_t("_GLOBAL_ERROR_QUERY_FAILED", "GetRandomBanners"), _t("_BANNER_NAME"));	
  	}	
  
  	/**
  	 * Create a new banner 
  	 *
***************
*** 191,195 ****
  		//		echo $e;
  		if (!eregi (".*(\.jpg|\.gif|\.swf|\.png|\.jpeg)", strtolower ($filename)))
! 			return new JawsError (_t("_BANNER_ERROR_IMAGE_BAD_FORMAT"));
  		if (move_uploaded_file ($filename_tmp, $uploadfile)) {
  			$sql = "INSERT INTO [[banner]]
--- 177,181 ----
  		//		echo $e;
  		if (!eregi (".*(\.jpg|\.gif|\.swf|\.png|\.jpeg)", strtolower ($filename)))
! 			return new JawsError (_t("_BANNER_ERROR_IMAGE_BAD_FORMAT"), _t("_BANNER_NAME"));
  		if (move_uploaded_file ($filename_tmp, $uploadfile)) {
  			$sql = "INSERT INTO [[banner]]
***************
*** 203,213 ****
  													   "display"  => $display));
  		} else {
  			return new JawsError (_t("_BANNER_ERROR_IMAGE_CANT_UPLOAD", $filename));
  		}
  		
! 		if ($rs) 
  			return true;
! 		else 
! 			return new JawsError (_t("_BANNER_ERROR_NOT_ADDED"));
  	}
  
--- 189,203 ----
  													   "display"  => $display));
  		} else {
+ 			$GLOBALS["session"]->PushLastResponse (_t("_BANNER_ERROR_IMAGE_CANT_UPLOAD", $filename), RESPONSE_ERROR);
  			return new JawsError (_t("_BANNER_ERROR_IMAGE_CANT_UPLOAD", $filename));
  		}
  		
! 		if ($rs) {
! 			$GLOBALS["session"]->PushLastResponse (_t("_BANNER_ADDED"), RESPONSE_NOTICE);
  			return true;
! 		} else {
! 			$GLOBALS["session"]->PushLastResponse (_t("_BANNER_ERROR_NOT_ADDED"), RESPONSE_ERROR);
! 			return new JawsError (_t("_BANNER_ERROR_NOT_ADDED"), _t("_BANNER_NAME"));
! 		}
  	}
  
***************
*** 229,233 ****
  											array ("id" => $id));
  		if ($row = $rs->FetchRow ()) {
! 			if (isset($row["id"])) {
  				$sql2 = "DELETE FROM [[banner]]
                           WHERE 
--- 219,223 ----
  											array ("id" => $id));
  		if ($row = $rs->FetchRow ()) {
! 			if (isset($row["image"])) {
  				$sql2 = "DELETE FROM [[banner]]
                           WHERE 
***************
*** 237,252 ****
  				if ($rs2) {
  					$unlink = @unlink ($GLOBALS["path"]."data/banners/".$row["image"]);
! 					if ($unlink)
  						return true;
! 					else
  						return new JawsError (_t("_BANNER_ERROR_CANT_DELETE", $row["image"]));
  				} else {
! 					return new JawsError (_t("_GLOBAL_ERROR_QUERY_FAILED", "DeleteBanner"));	
  				}
  			} else {
! 				return new JawsError (_t("_BANNER_ERROR_BANNER_DOES_NOT_EXISTS"));
  			}
  		} else {
! 			return new JawsError (_t("_GLOBAL_ERROR_QUERY_FAILED", "DeleteBanner"));	
  		}
  	}
--- 227,248 ----
  				if ($rs2) {
  					$unlink = @unlink ($GLOBALS["path"]."data/banners/".$row["image"]);
! 					if ($unlink) {
! 						$GLOBALS["session"]->PushLastResponse (_t("_BANNER_DELETED"), RESPONSE_NOTICE);
  						return true;
! 					} else {
! 						$GLOBALS["session"]->PushLastResponse (_t("_BANNER_ERROR_CANT_DELETE", $row["image"]), RESPONSE_ERROR);
  						return new JawsError (_t("_BANNER_ERROR_CANT_DELETE", $row["image"]));
+ 					}
  				} else {
! 					$GLOBALS["session"]->PushLastResponse (_t("_GLOBAL_ERROR_QUERY_FAILED", "DeleteBanner"), RESPONSE_ERROR);
! 					return new JawsError (_t("_GLOBAL_ERROR_QUERY_FAILED", "DeleteBanner"), _t("_BANNER_NAME"));	
  				}
  			} else {
! 				$GLOBALS["session"]->PushLastResponse (_t("_BANNER_ERROR_BANNER_DOES_NOT_EXISTS"), RESPONSE_ERROR);
! 				return new JawsError (_t("_BANNER_ERROR_BANNER_DOES_NOT_EXISTS"), _t("_BANNER_NAME"));
  			}
  		} else {
! 			$GLOBALS["session"]->PushLastResponse (_t("_GLOBAL_ERROR_QUERY_FAILED", "DeleteBanner"), RESPONSE_ERROR);
! 			return new JawsError (_t("_GLOBAL_ERROR_QUERY_FAILED", "DeleteBanner"), _t("_BANNER_NAME"));	
  		}
  	}
***************
*** 274,287 ****
                      FROM [[banner]]
                      WHERE 
!                      id= {id}";                    
  			$rs  = $GLOBALS["app"]->DB->Execute ($sql,
  												 array ("id" => $id));
  			if ($row = $rs->FetchRow ()) {
! 				if (isset ($row["image"]))
  					$old_image = $row["image"];
! 				else
! 					return new JawsError (_t("_BANNER_ERROR_BANNER_DOES_NOT_EXISTS"));
  			} else {
! 				return new JawsError (_t("_GLOBAL_ERROR_QUERY_FAILED", "UpdateBanner"));	
  			}
  		}
--- 270,286 ----
                      FROM [[banner]]
                      WHERE 
!                      id={id}";                    
  			$rs  = $GLOBALS["app"]->DB->Execute ($sql,
  												 array ("id" => $id));
  			if ($row = $rs->FetchRow ()) {
! 				if (isset ($row["image"])) {
  					$old_image = $row["image"];
! 				} else {
! 					$GLOBALS["session"]->PushLastResponse (_t("_BANNER_ERROR_BANNER_DOES_NOT_EXISTS"), RESPONSE_ERROR);
! 					return new JawsError (_t("_BANNER_ERROR_BANNER_DOES_NOT_EXISTS"), _t("_BANNER_NAME"));
! 				}
  			} else {
! 				$GLOBALS["session"]->PushLastResponse (_t("_GLOBAL_ERROR_QUERY_FAILED", "UpdateBanner"), RESPONSE_ERROR);
! 				return new JawsError (_t("_GLOBAL_ERROR_QUERY_FAILED", "UpdateBanner"), _t("_BANNER_NAME"));	
  			}
  		}
***************
*** 290,303 ****
  			$uploadfile = $uploaddir.$filename;
  			if (!eregi (".*(\.jpg|\.gif|\.swf|\.png|\.jpeg)", strtolower ($filename)))
! 				return new JawsError (_t("_BANNER_ERROR_IMAGE_BAD_FORMAT"));
  			if (move_uploaded_file ($filename_tmp, $uploadfile)) {
  				// Don't abort if the old image couldn't be unlinked, just log a warning.
  				if (($old_image != $uploadfile)) {
! 					$unlink = @unlink ($GLOBALS['path'].$old_image);
! 					if (!$unlink)
! 						return new JawsError (_t("_BANNER_ERROR_CANT_UPLOAD", $old_image));
  				}
  			} else {
! 				return new JawsError (_t("_BANNER_ERROR_IMAGE_CANT_UPLOAD", $filename));
  			}
  		} else {
--- 289,305 ----
  			$uploadfile = $uploaddir.$filename;
  			if (!eregi (".*(\.jpg|\.gif|\.swf|\.png|\.jpeg)", strtolower ($filename)))
! 				return new JawsError (_t("_BANNER_ERROR_IMAGE_BAD_FORMAT"), _t("_BANNER_NAME"));
  			if (move_uploaded_file ($filename_tmp, $uploadfile)) {
  				// Don't abort if the old image couldn't be unlinked, just log a warning.
  				if (($old_image != $uploadfile)) {
! 					$unlink = @unlink ($GLOBALS['path']."data/banners/".$old_image);
! 					if (!$unlink) {
! 						$GLOBALS["session"]->PushLastResponse (_t("_BANNER_ERROR_CANT_DELETE_OLD", $old_image), RESPONSE_ERROR);
! 						return new JawsError (_t("_BANNER_ERROR_CANT_DELETE_OLD", $old_image));
! 					}
  				}
  			} else {
! 				$GLOBALS["session"]->PushLastResponse (_t("_BANNER_ERROR_CANT_UPLOAD", $filename), RESPONSE_ERROR);
! 				return new JawsError (_t("_BANNER_ERROR_CANT_UPLOAD", $filename));
  			}
  		} else {
***************
*** 321,328 ****
  												   "visible"  => $display,
  												   "id"       => $id));
! 		if ($rs)
! 			return new JawsError (_t("_GLOBAL_ERROR_QUERY_FAILED", "UpdateBanner"));
! 		else
  			return true;		
  	}
  
--- 323,333 ----
  												   "visible"  => $display,
  												   "id"       => $id));
! 		if (!$rs) {
! 			$GLOBALS["session"]->PushLastResponse (_t("_GLOBAL_ERROR_QUERY_FAILED", "UpdateBanner"), RESPONSE_ERROR);
! 			return new JawsError (_t("_GLOBAL_ERROR_QUERY_FAILED", "UpdateBanner"), _t("_BANNER_NAME"));
! 		} else {
! 			$GLOBALS["session"]->PushLastResponse (_t("_BANNER_UPDATED"), RESPONSE_NOTICE);
  			return true;		
+ 		}
  	}
  
***************
*** 343,347 ****
  			return true;
  		else
! 			return new JawsError (_t("_GLOBAL_ERROR_QUERY_FAILED", "Click"));
  	}
  
--- 348,352 ----
  			return true;
  		else
! 			return new JawsError (_t("_GLOBAL_ERROR_QUERY_FAILED", "Click"), _t("_BANNER_NAME"));
  	}
  
***************
*** 355,362 ****
  	function UpdateProperties ($limit)
  	{
! 		if ($GLOBALS["app"]->Registry->Set ("/gadgets/Banner/limit_random", $limit))
  			return true;
! 		else
! 			return new JawsError (_t("_BANNER_ERROR_PROPERTIES_NOT_UPDATED"));
  	}
  
--- 360,371 ----
  	function UpdateProperties ($limit)
  	{
! 		$res = $GLOBALS["app"]->Registry->Set ("/gadgets/Banner/limit_random", $limit);
! 		if (!JawsError::IsError ($res) || $res) {
! 			$GLOBALS["session"]->PushLastResponse (_t("_BANNER_PROPERTIES_UPDATED"), RESPONSE_NOTICE);
  			return true;
! 		} else {
! 			$GLOBALS["session"]->PushLastResponse (_t("_BANNER_ERROR_PROPERTIES_NOT_UPDATED"), RESPONSE_ERROR);
! 			return new JawsError (_t("_BANNER_ERROR_PROPERTIES_NOT_UPDATED"), _t("_BANNER_NAME"));
! 		}
  	}
  
***************
*** 371,375 ****
  	{
  		if (strlen(trim($match)) < 3) 
! 			return new JawsError (_t("_BANNER_ERROR_CANT_SEARCH_LENGTH"));
  		$sql = "SELECT id, url, title, image, updatetime
  			FROM [[banner]] WHERE";
--- 380,384 ----
  	{
  		if (strlen(trim($match)) < 3) 
! 			return new JawsError (_t("_BANNER_ERROR_CANT_SEARCH_LENGTH"), _t("_BANNER_NAME"));
  		$sql = "SELECT id, url, title, image, updatetime
  			FROM [[banner]] WHERE";

Index: Banner.php
===================================================================
RCS file: /cvsroot/jaws-project/jaws/html/gadgets/Banner/Banner.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Banner.php	17 Mar 2005 01:04:13 -0000	1.22
--- Banner.php	17 Mar 2005 07:26:01 -0000	1.23
***************
*** 90,96 ****
  				}		
  			}
! 		} else {
! 			$GLOBALS["log"]->Log (JAWS_LOG_ERR, _t("_BANNER_NAME").": ".$banners->GetMessage(), "");
! 		}
  
  		$banners = $this->_Model->GetRandomBanners();
--- 90,94 ----
  				}		
  			}
! 		} 
  
  		$banners = $this->_Model->GetRandomBanners();
***************
*** 112,117 ****
  				}
  			}
- 		} else {
- 			$GLOBALS["log"]->Log (JAWS_LOG_ERR, _t("_BANNER_NAME").": ".$banners->GetMessage(), "");
  		}
  		return $tpl->Get();
--- 110,113 ----
***************
*** 128,138 ****
  		if (!JawsError::IsError ($banner)) {
  			$click = $this->_Model->Click ($banner["id"]);
! 			if (JawsError::IsError ($click))
! 				$GLOBALS["log"]->Log (JAWS_LOG_ERR, _t("_BANNER_NAME").": ".$click->GetMessage(), "");
! 			else
  				JawsHeader::Location ($banner["url"]);
! 		} else {
! 			$GLOBALS["log"]->Log (JAWS_LOG_ERR, _t("_BANNER_NAME").": ".$banner->GetMessage(), "");
! 		}
  		//by default, redirect to mainpage
  		JawsHeader::Location ("index.php");
--- 124,130 ----
  		if (!JawsError::IsError ($banner)) {
  			$click = $this->_Model->Click ($banner["id"]);
! 			if (!JawsError::IsError ($click))
  				JawsHeader::Location ($banner["url"]);
! 		} 
  		//by default, redirect to mainpage
  		JawsHeader::Location ("index.php");
***************
*** 210,216 ****
  														STOCK_DELETE));
  			$tpl->SetVariable ("grid", $datagrid->Get ());		
! 		} else {
! 			$GLOBALS["log"]->Log (JAWS_LOG_ERR, _t("_BANNER_NAME").": ".$banners->GetMessage(), "");
! 		}
  
  		///Config properties
--- 202,206 ----
  														STOCK_DELETE));
  			$tpl->SetVariable ("grid", $datagrid->Get ());		
! 		} 
  
  		///Config properties
***************
*** 230,234 ****
  			}
  			
! 			$limitcombo->SetDefault ($GLOBALS["app"]->Registry->Get("/gadgets/Banner/limit_random"));
  			
  			$fieldset_config->Add ($limitcombo);
--- 220,228 ----
  			}
  			
! 			$limit = $GLOBALS["app"]->Registry->Get("/gadgets/Banner/limit_random");
! 			
! 			if (JawsError::IsError ($limit) || !$limit)
! 				$limit = 10;
! 			$limitcombo->SetDefault ($limit);
  			
  			$fieldset_config->Add ($limitcombo);
***************
*** 257,260 ****
--- 251,256 ----
  					$banner_form->Add (new HiddenEntry ("id", $_GET["id"]));
  					$banner = $this->_Model->GetBanner ($_GET["id"]);
+ 					if (JawsError::IsError ($banner))
+ 						$banner = array ();
  				}
  				
***************
*** 262,274 ****
  				$fieldset_banner->SetDirection ("vertical");
  			   
! 				$titleentry = new Entry ("title", $banner["title"]);
  				$titleentry->SetTitle (_t("_GLOBAL_NAME"));
  				$fieldset_banner->Add ($titleentry);
  				
! 				$urlentry = new Entry ("url", $banner["url"]);
  				$urlentry->SetTitle (_t("_GLOBAL_URL"));
  				$fieldset_banner->Add ($urlentry);
  				
! 				$imageentry = new FileEntry ("image", $banner["image"]);
  				$imageentry->SetTitle (_t("_GLOBAL_FILE"));
  				$fieldset_banner->Add ($imageentry);
--- 258,270 ----
  				$fieldset_banner->SetDirection ("vertical");
  			   
! 				$titleentry = new Entry ("title", (isset ($banner["title"]) ? $banner["title"] : ""));
  				$titleentry->SetTitle (_t("_GLOBAL_NAME"));
  				$fieldset_banner->Add ($titleentry);
  				
! 				$urlentry = new Entry ("url",  (isset ($banner["url"]) ? $banner["url"] : ""));
  				$urlentry->SetTitle (_t("_GLOBAL_URL"));
  				$fieldset_banner->Add ($urlentry);
  				
! 				$imageentry = new FileEntry ("image", (isset ($banner["image"]) ? $banner["image"] : ""));
  				$imageentry->SetTitle (_t("_GLOBAL_FILE"));
  				$fieldset_banner->Add ($imageentry);
***************
*** 279,284 ****
  				$checkvisible->AddOption (_t("_GLOBAL_NO"), "0");
  
! 				if ($banner["always_visible"] == 0)
! 					$checkvisible->SetDefault ("0");
  				else
  					$checkvisible->SetDefault ("1");
--- 275,283 ----
  				$checkvisible->AddOption (_t("_GLOBAL_NO"), "0");
  
! 				if (isset ($banner["always_visible"]))
! 					if ($banner["always_visible"] == 0)
! 						$checkvisible->SetDefault ("0");
! 					else
! 						$checkvisible->SetDefault ("1");
  				else
  					$checkvisible->SetDefault ("1");
***************
*** 313,317 ****
  				$warning->ParseBlock ("warning");
  				$tpl->SetVariable ("banner_form", $warning->Get ());
- 				$GLOBALS["log"]->Log (JAWS_LOG_WARNING, _t("_BANNER_NAME").": "._t("_BANNER_NOTWRITABLE"), "");
  			}
  		} 
--- 312,315 ----
***************
*** 348,372 ****
  	{
  		$GLOBALS["session"]->CheckPermission ("Banner", "EditBanner");
! 		if ($_FILES["image"]["name"] == '') {
! 			$update = $this->_Model->UpdateBanner ($_REQUEST["id"], $_REQUEST["url"], $_REQUEST["title"], 
! 												   $_REQUEST["allways_visible"]);
! 			if (!JawsError::IsError ($update)) {
! 				$GLOBALS["session"]->PushLastResponse (_t("_BANNER_UPDATED"), RESPONSE_NOTICE);
! 			} else {
! 				$GLOBALS["session"]->PushLastResponse ($update->GetMessage(), RESPONSE_ERROR);
! 				$GLOBALS["log"]->Log (JAWS_LOG_ERR, _t("_BANNER_NAME").": ".$update->GetMessage(), "");
! 			}
! 		} else {
! 			$update = $this->_Model->UpdateBanner ($_REQUEST["id"], $_REQUEST["url"], $_REQUEST["title"], 
! 												   $_REQUEST["allways_visible"],
! 												   $_FILES["image"]["name"], $_FILES["image"]["tmp_name"]);
! 			if (!JawsError::IsError ($update)) {
! 				$GLOBALS["session"]->PushLastResponse (_t("_BANNER_UPDATED"), RESPONSE_NOTICE);
! 			} else {
! 				$GLOBALS["session"]->PushLastResponse ($update->GetMessage(), RESPONSE_ERROR);
! 				$GLOBALS["log"]->Log (JAWS_LOG_ERR, _t("_BANNER_NAME").": ".$update->GetMessage(), "");
! 			}
! 		}
! 		JawsHeader::Location ("admin.php?gadget=Banner");
  	}
  
--- 346,358 ----
  	{
  		$GLOBALS["session"]->CheckPermission ("Banner", "EditBanner");
! 		if ($_FILES["image"]["name"] == '') 
! 			$this->_Model->UpdateBanner ($_REQUEST["id"], $_REQUEST["url"], $_REQUEST["title"], 
! 										 $_REQUEST["allways_visible"]);
! 		
! 		else 
! 			$this->_Model->UpdateBanner ($_REQUEST["id"], $_REQUEST["url"], $_REQUEST["title"], 
! 										 $_REQUEST["allways_visible"],
! 										 $_FILES["image"]["name"], $_FILES["image"]["tmp_name"]);
! 		JawsHeader::Location ("admin.php?gadget=Banner&action=Admin");
  	}
  
***************
*** 379,392 ****
  	{
  		$GLOBALS["session"]->CheckPermission ("Banner", "AddBanner");
! 		$res = $this->_Model->NewBanner ($_REQUEST["url"], $_REQUEST["title"], 
! 										 $_REQUEST["allways_visible"], 
! 										 $_FILES["image"]["name"], $_FILES["image"]["tmp_name"]);
! 		if (!JawsError::IsError ($res)) {
! 			$GLOBALS["session"]->PushLastResponse (_t("_BANNER_ADDED"), RESPONSE_NOTICE);
! 		} else {
! 			$GLOBALS["session"]->PushLastResponse ($res->GetMessage(), RESPONSE_ERROR);
! 			$GLOBALS["log"]->Log (JAWS_LOG_ERR, _t("_BANNER_NAME").": ".$res->GetMessage(), "");
! 		}
! 		JawsHeader::Location ("admin.php?gadget=Banner");
  	}
  
--- 365,372 ----
  	{
  		$GLOBALS["session"]->CheckPermission ("Banner", "AddBanner");
! 		$this->_Model->NewBanner ($_REQUEST["url"], $_REQUEST["title"], 
! 								  $_REQUEST["allways_visible"], 
! 								  $_FILES["image"]["name"], $_FILES["image"]["tmp_name"]);	
! 		JawsHeader::Location ("admin.php?gadget=Banner&action=Admin");
  	}
  
***************
*** 399,410 ****
  	{
  		$GLOBALS["session"]->CheckPermission ("Banner", "DeleteBanner");
! 		$res = $this->_Model->DeleteBanner ($_REQUEST['id']);
! 		if (!JawsError::IsError ($res)) {
! 			$GLOBALS["session"]->PushLastResponse (_t("_BANNER_DELETED"), RESPONSE_NOTICE);
! 		} else {
! 			$GLOBALS["session"]->PushLastResponse ($res->GetMessage(), RESPONSE_ERROR);
! 			$GLOBALS["log"]->Log (JAWS_LOG_ERR, _t("_BANNER_NAME").": ".$res->GetMessage(), "");
! 		}
! 		JawsHeader::Location ("admin.php?gadget=Banner");
  	}
  
--- 379,384 ----
  	{
  		$GLOBALS["session"]->CheckPermission ("Banner", "DeleteBanner");
! 		$this->_Model->DeleteBanner ($_REQUEST['id']);	
! 		JawsHeader::Location ("admin.php?gadget=Banner&action=Admin");
  	}
  
***************
*** 417,428 ****
  	{
  		$GLOBALS["session"]->CheckPermission ("Banner", "UpdateProperties");
! 		$res = $this->_Model->UpdateProperties ($_POST["limit_random"]);
! 		if (!JawsError::IsError ($res)) {
! 			$GLOBALS["session"]->PushLastResponse (_t("_BANNER_PROPERTIES_UPDATED"), RESPONSE_NOTICE);
! 		} else {
! 			$GLOBALS["session"]->PushLastResponse ($res->GetMessage(), RESPONSE_ERROR);
! 			$GLOBALS["log"]->Log (JAWS_LOG_ERR, _t("_BANNER_NAME").": ".$res->GetMessage(), "");
! 		}
! 		JawsHeader::Location ("admin.php?gadget=Banner");
  	}
  }
--- 391,396 ----
  	{
  		$GLOBALS["session"]->CheckPermission ("Banner", "UpdateProperties");
! 		$this->_Model->UpdateProperties ($_POST["limit_random"]);
! 		JawsHeader::Location ("admin.php?gadget=Banner&action=Admin");
  	}
  }

[Jaws-project-commits] jaws/html/gadgets/Banner/languages/en Banner.php,1.5,1.6

[Pablo F. <pab...@us...>]

Update of /cvsroot/jaws-project/jaws/html/gadgets/Banner/languages/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16590/languages/en

Modified Files:
	Banner.php 
Log Message:
Done! Compatible with jaws 0.5:
 * Debug done
 * Translation done
 * Errors are handled by JawsError


Index: Banner.php
===================================================================
RCS file: /cvsroot/jaws-project/jaws/html/gadgets/Banner/languages/en/Banner.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Banner.php	17 Mar 2005 01:04:14 -0000	1.5
--- Banner.php	17 Mar 2005 07:26:01 -0000	1.6
***************
*** 40,43 ****
--- 40,44 ----
  
  /* Errors */
+ define ("_EN_BANNER_ERROR_BANNER_DOES_NOT_EXISTS", "Banner does not exists");
  define ("_EN_BANNER_ERROR_IMAGE_BAD_FORMAT", "Banner gadget only support jpg, jpeg, gif, png and swf files");
  define ("_EN_BANNER_ERROR_CANT_UPLOAD", "Banner image {0} couldn't be uploaded");

[Jaws-project-commits] jaws/html/gadgets/Friends Friends.php,1.20,1.21 FriendsModel.php,1.5,1.6

[Pablo F. <pab...@us...>]

Update of /cvsroot/jaws-project/jaws/html/gadgets/Friends
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16429

Modified Files:
	Friends.php FriendsModel.php 
Log Message:
Done!
 * Debug done
 * Translation
 * Errors handled by JawsError


Index: FriendsModel.php
===================================================================
RCS file: /cvsroot/jaws-project/jaws/html/gadgets/Friends/FriendsModel.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FriendsModel.php	17 Mar 2005 01:04:58 -0000	1.5
--- FriendsModel.php	17 Mar 2005 07:25:26 -0000	1.6
***************
*** 31,35 ****
  	{
  		if (!file_exists ($GLOBALS["path"]."gadgets/Friends/sql/".$GLOBALS["app"]->DB->GetDriverName().".sql"))
! 			return new JawsError (_t("_GLOBAL_ERROR_SQLFILE_NOT_EXISTS", $GLOBALS["app"]->DB->GetDriverName().".sql"));
  		
  		// Execute the sql file
--- 31,35 ----
  	{
  		if (!file_exists ($GLOBALS["path"]."gadgets/Friends/sql/".$GLOBALS["app"]->DB->GetDriverName().".sql"))
! 			return new JawsError (_t("_GLOBAL_ERROR_SQLFILE_NOT_EXISTS", $GLOBALS["app"]->DB->GetDriverName().".sql"), _t("_FRIENDS_NAME"));
  		
  		// Execute the sql file
***************
*** 38,46 ****
  			if (!trim($q) == '') 
  				if (!$GLOBALS["app"]->DB->Execute ($q))
! 					return new JawsError (_t("_GLOBAL_ERROR_FAILED_QUERY_FILE", $GLOBALS["app"]->DB->GetDriverName().".sql"));
  
  		//registry keys.
! 		if (!$GLOBALS["app"]->Registry->NewKey ("/gadgets/Friends/limit", "5"))
! 			return new JawsError (_t("_GLOBAL_ERROR_FAILED_ADDING_REGISTRY_KEY", "/gadgets/Friends/limit"));
  
  		// ACL keys
--- 38,48 ----
  			if (!trim($q) == '') 
  				if (!$GLOBALS["app"]->DB->Execute ($q))
! 					return new JawsError (_t("_GLOBAL_ERROR_FAILED_QUERY_FILE", $GLOBALS["app"]->DB->GetDriverName().".sql"), _t("_FRIENDS_NAME"));
  
  		//registry keys.
! 		$res = $GLOBALS["app"]->Registry->NewKey ("/gadgets/Friends/limit", "5");
! 		if (JawsError::IsError ($res) || !$res)
! 			return new JawsError (_t("_GLOBAL_ERROR_FAILED_ADDING_REGISTRY_KEY", "/gadgets/Friends/limit"), _t("_FRIENDS_NAME"));
! 		
  
  		// ACL keys
***************
*** 73,82 ****
  		if ($rs) {
  			$row = $rs->FetchRow ();
! 			if (isset ($row["friend"]))
! 				return $rs->FetchRow ();
! 			else
  				return new JawsError (_t("_FRIENDS_ERROR_FRIEND_DOES_NOT_EXISTS", $friend));
  		} else {
! 			return new JawsError (_t("_GLOBAL_ERROR_QUERY_FAILED", "GetFriend"));				
  		}
  	}
--- 75,85 ----
  		if ($rs) {
  			$row = $rs->FetchRow ();
! 			if (isset ($row["friend"])) {
! 				return $row;
! 			} else {				
  				return new JawsError (_t("_FRIENDS_ERROR_FRIEND_DOES_NOT_EXISTS", $friend));
+ 			}
  		} else {
! 			return new JawsError (_t("_GLOBAL_ERROR_QUERY_FAILED", "GetFriend"), _t("_FRIENDS_NAME"));				
  		}
  	}
***************
*** 99,103 ****
  			return $rs->GetRows ();
  		else
! 			return new JawsError (_t("_GLOBAL_ERROR_QUERY_FAILED", "GetFriendsList"));
  	}
  
--- 102,106 ----
  			return $rs->GetRows ();
  		else
! 			return new JawsError (_t("_GLOBAL_ERROR_QUERY_FAILED", "GetFriendsList"), _t("_FRIENDS_NAME"));
  	}
  
***************
*** 111,123 ****
  	function GetRandomFriends ()
  	{
  		$sql = "SELECT user_id, friend, url 
                  	FROM [[friend]]
!                 	ORDER BY rand() LIMIT ".$GLOBALS["app"]->Registry->Get ("/gadgets/Friends/limit");
! 		$rs = $GLOBALS["app"]->DB->Execute ($sql);
  
  		if ($rs)
  			return $rs->GetRows ();
  		else
! 			return new JawsError (_t("_GLOBAL_ERROR_QUERY_FAILED", "GetRandomFriends"));				
  	}
  	
--- 114,130 ----
  	function GetRandomFriends ()
  	{
+ 		$limit = $GLOBALS["app"]->Registry->Get ("/gadgets/Friends/limit");
+ 		if (JawsError::IsError ($limit) || !$limit)
+ 			$limit = 10;
+ 
  		$sql = "SELECT user_id, friend, url 
                  	FROM [[friend]]
!                 	ORDER BY rand() LIMIT {limit}";
! 		$rs = $GLOBALS["app"]->DB->Execute ($sql, array ("limit" => $limit));
  
  		if ($rs)
  			return $rs->GetRows ();
  		else
! 			return new JawsError (_t("_GLOBAL_ERROR_QUERY_FAILED", "GetRandomFriends"), _t("_FRIENDS_NAME"));				
  	}
  	
***************
*** 133,140 ****
  	{
  		$res = $GLOBALS["app"]->Registry->Set("/gadgets/Friends/limit",$limit);
! 		if (!$res)
! 			return new JawsError (_t("_FRIENDS_ERROR_PROPERTIES_NOT_UPDATED"));
! 		else
! 			return true;
  	}
  
--- 140,150 ----
  	{
  		$res = $GLOBALS["app"]->Registry->Set("/gadgets/Friends/limit",$limit);
! 		if ($res || !JawsError::IsError ($res)) {
! 			$GLOBALS["session"]->PushLastResponse (_t("_FRIENDS_PROPERTIES_UPDATED"), RESPONSE_NOTICE);
! 			return true;			
! 		} else {
! 			$GLOBALS["session"]->PushLastResponse (_t("_FRIENDS_ERROR_PROPERTIES_NOT_UPDATED"), RESPONSE_ERROR);
! 			return new JawsError (_t("_FRIENDS_ERROR_PROPERTIES_NOT_UPDATED"), _t("_FRIENDS_NAME"));
! 		}
  	}
  
***************
*** 152,159 ****
  		$sql = "INSERT INTO [[friend]] (friend,url) VALUES ({friend}, {url})";
  		$rs = $GLOBALS["app"]->DB->Execute ($sql,array ("friend" => $friend, "url" => $url));
! 		if ($rs)
  			return true;
! 		else
! 			return new JawsError (_t("_FRIENDS_ERROR_NOT_ADDED"));
  
  	}
--- 162,172 ----
  		$sql = "INSERT INTO [[friend]] (friend,url) VALUES ({friend}, {url})";
  		$rs = $GLOBALS["app"]->DB->Execute ($sql,array ("friend" => $friend, "url" => $url));
! 		if ($rs) {
! 			$GLOBALS["session"]->PushLastResponse (_t("_FRIENDS_ADDED"), RESPONSE_NOTICE);
  			return true;
! 		} else {
! 			$GLOBALS["session"]->PushLastResponse (_t("_FRIENDS_ERROR_NOT_ADDED"), RESPONSE_ERROR);
! 			return new JawsError (_t("_FRIENDS_ERROR_NOT_ADDED"), _t("_FRIENDS_NAME"));
! 		}
  
  	}
***************
*** 179,186 ****
  												   "old"    => $old_friend));
  
! 		if ($rs)
  			return true;
! 		else
! 			return new JawsError (_t("_FRIENDS_ERROR_NOT_UPDATED"));
  	}
  
--- 192,202 ----
  												   "old"    => $old_friend));
  
! 		if ($rs) {
! 			$GLOBALS["session"]->PushLastResponse (_t("_FRIENDS_UPDATED"), RESPONSE_NOTICE);						
  			return true;
! 		} else {
! 			$GLOBALS["session"]->PushLastResponse (_t("_FRIENDS_ERROR_NOT_UPDATED"), RESPONSE_ERROR);
! 			return new JawsError (_t("_FRIENDS_ERROR_NOT_UPDATED"), _t("_FRIENDS_NAME"));
! 		}
  	}
  
***************
*** 201,208 ****
  											array("friend" => $friend));
  
! 		if ($rs)
  			return true;
! 		else
! 			return new JawsError (_t("_FRIENDS_ERROR_NOT_UPDATED"));                 
  
  	}
--- 217,227 ----
  											array("friend" => $friend));
  
! 		if ($rs) {
! 			$GLOBALS["session"]->PushLastResponse (_t("_FRIENDS_DELETED"), RESPONSE_NOTICE);
  			return true;
! 		} else {
! 			$GLOBALS["session"]->PushLastResponse (_t("_FRIENDS_ERROR_NOT_DELETED"), RESPONSE_ERROR);
! 			return new JawsError (_t("_FRIENDS_ERROR_NOT_UPDATED"), _t("_FRIENDS_NAME"));                 
! 		}
  
  	}

Index: Friends.php
===================================================================
RCS file: /cvsroot/jaws-project/jaws/html/gadgets/Friends/Friends.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Friends.php	17 Mar 2005 01:30:26 -0000	1.20
--- Friends.php	17 Mar 2005 07:25:26 -0000	1.21
***************
*** 78,83 ****
  				$tpl->ParseBlock("friends/friend");
  			}
- 		} else {
- 			$GLOBALS["log"]->Log (JAWS_LOG_ERR, _t("_FRIENDS_NAME").": ".$friends->GetMessage(), "");
  		}
  		$tpl->ParseBlock("friends");
--- 78,81 ----
***************
*** 132,143 ****
  			if ($GLOBALS["session"]->GetPermission ("Friends", "DeleteFriend"))
  				$datagrid->AddColumn (new ActionColumn (_t("_GLOBAL_DELETE", _t("_FRIEND_FRIEND")), 
! 														"javascript: if (confirm ('"._t("_GLOBAL_CONFIRM_DELETE", _t("_FRIENDS_FRIEND"))."').) ".
  														"window.location = 'admin.php?gadget=Friends&action=DeleteFriend&friend={friend}';",
  														STOCK_DELETE));
  
  			$tpl->SetVariable ("grid", $datagrid->Get ());		
! 		} else {
! 			$GLOBALS["log"]->Log (JAWS_LOG_ERR, _t("_FRIENDS_NAME").": ".$friends->GetMessage(), "");
! 		}
  		
  		///Config properties
--- 130,139 ----
  			if ($GLOBALS["session"]->GetPermission ("Friends", "DeleteFriend"))
  				$datagrid->AddColumn (new ActionColumn (_t("_GLOBAL_DELETE", _t("_FRIEND_FRIEND")), 
! 														"javascript: if (confirm ('"._t("_GLOBAL_CONFIRM_DELETE", _t("_FRIENDS_FRIEND"))."')) ".
  														"window.location = 'admin.php?gadget=Friends&action=DeleteFriend&friend={friend}';",
  														STOCK_DELETE));
  
  			$tpl->SetVariable ("grid", $datagrid->Get ());		
! 		} 
  		
  		///Config properties
***************
*** 156,160 ****
  			}
  			
! 			$limitcombo->SetDefault ($GLOBALS["app"]->Registry->Get("/gadgets/Friends/limit"));
  			
  			$fieldset_config->Add ($limitcombo);
--- 152,160 ----
  			}
  			
! 			$limit = $GLOBALS["app"]->Registry->Get("/gadgets/Friends/limit");
! 			if (JawsError::IsError ($limit) || !$limit)
! 				$limit = 10;
! 
! 			$limitcombo->SetDefault ($limit);
  			
  			$fieldset_config->Add ($limitcombo);
***************
*** 175,184 ****
  			$city_form->ShouldValidate (true);
  			$city_form->Add (new HiddenEntry ("gadget", "Friends"));
! 			if ($_GET["action"] != "EditFriend") {
  				$city_form->Add (new HiddenEntry ("action", "AddFriend"));
  			} else {
  				$city_form->Add (new HiddenEntry ("action", "UpdateFriend"));
! 				$city_form->Add (new HiddenEntry ("oldfriend", $_GET["friend"]));
! 				$friend = $this->_Model->GetFriend ($_GET["friend"]);
  			}
  			
--- 175,187 ----
  			$city_form->ShouldValidate (true);
  			$city_form->Add (new HiddenEntry ("gadget", "Friends"));
! 			$action = isset ($_GET["action"]) ? $_GET["action"] : "";
! 			if ($action != "EditFriend") {
  				$city_form->Add (new HiddenEntry ("action", "AddFriend"));
  			} else {
  				$city_form->Add (new HiddenEntry ("action", "UpdateFriend"));
! 				$city_form->Add (new HiddenEntry ("oldfriend", isset ($_GET["friend"]) ? $_GET["friend"] : ""));
! 				$friend = $this->_Model->GetFriend (isset ($_GET["friend"]) ? $_GET["friend"] : "");
! 				if (JawsError::IsError ($friend))
! 					$friend = array ();			
  			}
  			
***************
*** 186,195 ****
  			$fieldset_banner->SetDirection ("vertical");
  			
! 			$friendentry =& new Entry ("friend", $friend["friend"]);
  			$friendentry->AddValidator (new JSRequiredValidator ("friend", _t("_FRIENDS_VALIDATE_NAME")));
  			$friendentry->SetTitle (_t("_FRIENDS_FRIEND"));
  			$fieldset_banner->Add ($friendentry);
  			
! 			$urlentry =& new Entry ("url", $friend["url"]);
  			//$urlentry->AddValidator (new JSRequiredValidator ("url", _t("_FRIENDS_VALIDATE_URL"))); //FIXME: Test it
  			$urlentry->SetTitle (_t("_GLOBAL_URL"));
--- 189,198 ----
  			$fieldset_banner->SetDirection ("vertical");
  			
! 			$friendentry =& new Entry ("friend", (isset ($friend["friend"]) ? $friend["friend"] : ""));
  			$friendentry->AddValidator (new JSRequiredValidator ("friend", _t("_FRIENDS_VALIDATE_NAME")));
  			$friendentry->SetTitle (_t("_FRIENDS_FRIEND"));
  			$fieldset_banner->Add ($friendentry);
  			
! 			$urlentry =& new Entry ("url", (isset ($friend["url"]) ? $friend["url"] : ""));
  			//$urlentry->AddValidator (new JSRequiredValidator ("url", _t("_FRIENDS_VALIDATE_URL"))); //FIXME: Test it
  			$urlentry->SetTitle (_t("_GLOBAL_URL"));
***************
*** 198,211 ****
  			$buttonbox =& new HBox ();
  			$buttonbox->SetStyle ("float: right;"); //hig style
! 			if ($_REQUEST["action"] == "EditFriend")
  				$submit =& new Button ("updatefriend", _t("_GLOBAL_UPDATE", _t("_FRIENDS_FRIEND")), STOCK_SAVE);
  			else
  				$submit =& new Button ("addnewfriend", _t("_GLOBAL_SAVE", _t("_FRIENDS_FRIEND")), STOCK_SAVE);
  			$submit->SetSubmit ();
  
  			$cancel =& new Button ("cancelform", _t("_GLOBAL_CANCEL"), STOCK_CANCEL);
  			$cancel->AddEvent (new JSEvent (ON_CLICK, "window.location = 'admin.php?gadget=Friends&action=Admin';"));
! 				
! 			if ($_REQUEST["action"] == "EditFriend")
  				$buttonbox->Add ($cancel);
  			$buttonbox->Add ($submit);
--- 201,215 ----
  			$buttonbox =& new HBox ();
  			$buttonbox->SetStyle ("float: right;"); //hig style
! 			if ($action == "EditFriend")
  				$submit =& new Button ("updatefriend", _t("_GLOBAL_UPDATE", _t("_FRIENDS_FRIEND")), STOCK_SAVE);
  			else
  				$submit =& new Button ("addnewfriend", _t("_GLOBAL_SAVE", _t("_FRIENDS_FRIEND")), STOCK_SAVE);
+ 
  			$submit->SetSubmit ();
  
  			$cancel =& new Button ("cancelform", _t("_GLOBAL_CANCEL"), STOCK_CANCEL);
  			$cancel->AddEvent (new JSEvent (ON_CLICK, "window.location = 'admin.php?gadget=Friends&action=Admin';"));
! 
! 			if ($action == "EditFriend")
  				$buttonbox->Add ($cancel);
  			$buttonbox->Add ($submit);
***************
*** 249,260 ****
  	{
  		$GLOBALS["session"]->CheckPermission ("Friends", "EditFriend");
! 		$res = $this->_Model->UpdateFriend ($_POST["oldfriend"], $_POST["friend"], $_POST["url"]);
! 		if (!JawsError::IsError ($res)) {
! 			$GLOBALS["session"]->PushLastResponse (_t("_FRIENDS_UPDATED"), RESPONSE_NOTICE);
! 		} else {			
! 			$GLOBALS["session"]->PushLastResponse ($res->GetMessage(), RESPONSE_ERROR);
! 			$GLOBALS["log"]->Log (JAWS_LOG_ERR, _t("_FRIENDS_NAME").": ".$res->GetMessage(), "");
! 		}
! 		JawsHeader::Location ("admin.php?gadget=Friends");
  	}
  
--- 253,258 ----
  	{
  		$GLOBALS["session"]->CheckPermission ("Friends", "EditFriend");
! 		$this->_Model->UpdateFriend ($_POST["oldfriend"], $_POST["friend"], $_POST["url"]);
! 		JawsHeader::Location ("admin.php?gadget=Friends&action=Admin");
  	}
  
***************
*** 267,278 ****
  	{
  		$GLOBALS["session"]->CheckPermission ("Friends", "AddFriend");
! 		$res = $this->_Model->NewFriend ($_POST["friend"], $_POST["url"]);
! 		if (!JawsError::IsError ($res)) {
! 			$GLOBALS["session"]->PushLastResponse (_t("_FRIENDS_ADDED"), RESPONSE_NOTICE);
! 		} else {
! 			$GLOBALS["session"]->PushLastResponse ($res->GetMessage(), RESPONSE_ERROR);
! 			$GLOBALS["log"]->Log (JAWS_LOG_ERR, _t("_FRIENDS_NAME").": ".$res->GetMessage(), "");
! 		}
! 		JawsHeader::Location ("admin.php?gadget=Friends");
  	}
  	
--- 265,270 ----
  	{
  		$GLOBALS["session"]->CheckPermission ("Friends", "AddFriend");
! 		$this->_Model->NewFriend ($_POST["friend"], $_POST["url"]);
! 		JawsHeader::Location ("admin.php?gadget=Friends&action=Admin");
  	}
  	
***************
*** 285,296 ****
  	{
  		$GLOBALS["session"]->CheckPermission ("Friends", "DeleteFriend");
! 		$res = $this->_Model->DeleteFriend ($_REQUEST["friend"]);
! 		if (!JawsError::IsError ($res)) {
! 			$GLOBALS["session"]->PushLastResponse (_t("_FRIENDS_DELETED"), RESPONSE_NOTICE);
! 		} else {
! 			$GLOBALS["session"]->PushLastResponse ($res->GetMessage(), RESPONSE_ERROR);
! 			$GLOBALS["log"]->Log (JAWS_LOG_ERR, _t("_FRIENDS_NAME").": ".$res->GetMessage(), "");
! 		}
! 		JawsHeader::Location ("admin.php?gadget=Friends");
  	}
  
--- 277,282 ----
  	{
  		$GLOBALS["session"]->CheckPermission ("Friends", "DeleteFriend");
! 		$this->_Model->DeleteFriend ($_REQUEST["friend"]);
! 		JawsHeader::Location ("admin.php?gadget=Friends&action=Admin");
  	}
  
***************
*** 303,314 ****
  	{
  		$GLOBALS["session"]->CheckPermission ("Friends", "UpdateProperties");
! 		$res = $this->_Model->UpdateProperties ($_POST["limit_random"]);
! 		if (!JawsError::IsError ($res)) {
! 			$GLOBALS["session"]->PushLastResponse (_t("_FRIENDS_PROPERTIES_UPDATED"), RESPONSE_NOTICE);
! 		} else {
! 			$GLOBALS["session"]->PushLastResponse ($res->GetMessage(), RESPONSE_ERROR);
! 			$GLOBALS["log"]->Log (JAWS_LOG_ERR, _t("_FRIENDS_NAME").": ".$res->GetMessage(), "");
! 		}
! 		JawsHeader::Location ("admin.php?gadget=Friends");
  	}
  }
--- 289,294 ----
  	{
  		$GLOBALS["session"]->CheckPermission ("Friends", "UpdateProperties");
! 		$this->_Model->UpdateProperties ($_POST["limit_random"]);
! 		JawsHeader::Location ("admin.php?gadget=Friends&action=Admin");
  	}
  }

[Jaws-project-commits] jaws/html/gadgets/Friends/templates Admin.html,1.1,1.2

[Pablo F. <pab...@us...>]

Update of /cvsroot/jaws-project/jaws/html/gadgets/Friends/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16429/templates

Modified Files:
	Admin.html 
Log Message:
Done!
 * Debug done
 * Translation
 * Errors handled by JawsError


Index: Admin.html
===================================================================
RCS file: /cvsroot/jaws-project/jaws/html/gadgets/Friends/templates/Admin.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Admin.html	10 Mar 2005 17:58:30 -0000	1.1
--- Admin.html	17 Mar 2005 07:25:26 -0000	1.2
***************
*** 7,11 ****
        <!-- BEGIN message -->
        <div align="center">
!       <span class="control-panel-message">{message}</span>
        </div><br />
        <!-- END message -->      
--- 7,11 ----
        <!-- BEGIN message -->
        <div align="center">
!       <span class="{class}">{message}</span>
        </div><br />
        <!-- END message -->      

[Jaws-project-commits] jaws/html/gadgets/Glossary Glossary.php,1.12,1.13 GlossaryModel.php,1.7,1.8

[Pablo F. <pab...@us...>]

Update of /cvsroot/jaws-project/jaws/html/gadgets/Glossary
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16319

Modified Files:
	Glossary.php GlossaryModel.php 
Log Message:
Works! Compatible with Jaws 0.5:
 * Debug done
 * Errors are handled by JawsError
 * Translation 100%


Index: GlossaryModel.php
===================================================================
RCS file: /cvsroot/jaws-project/jaws/html/gadgets/Glossary/GlossaryModel.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** GlossaryModel.php	15 Mar 2005 08:15:25 -0000	1.7
--- GlossaryModel.php	17 Mar 2005 07:24:40 -0000	1.8
***************
*** 6,10 ****
   * @author Pablo Fischer <pa...@pa...>
   * @copyright Jaws 2004
!  * @package JawsModel
   */
  class GlossaryModel extends JawsModel
--- 6,11 ----
   * @author Pablo Fischer <pa...@pa...>
   * @copyright Jaws 2004
!  * @package Gadgets
!  * @subpackage Glossary
   */
  class GlossaryModel extends JawsModel
***************
*** 18,23 ****
  	{
  		$this->_Name = "Glossary";
- 		$this->_Description = "This gadget will let you to have a dictionary";
- 		$this->_Version = "0.4";
  	}
  
--- 19,22 ----
***************
*** 26,32 ****
--- 25,34 ----
  	 *
  	 * @access  public
+ 	 * @return  boolean True on success and JawsError on failure
  	 */
  	function InstallGadget ()
  	{
+ 		if (!file_exists ($GLOBALS["path"]."gadgets/Glossary/sql/".$GLOBALS["app"]->DB->GetDriverName().".sql"))
+ 			return new JawsError (_t("_GLOBAL_ERROR_SQLFILE_NOT_EXISTS", $GLOBALS["app"]->DB->GetDriverName().".sql"), _t("_GLOSSARY_NAME"));
  		// Execute the sql file
  		$queries = explode(';',implode('',file($GLOBALS["path"]."gadgets/Glossary/sql/".
***************
*** 34,38 ****
  		foreach ($queries as $q) 
  			if (!trim($q) == '') 
! 				$GLOBALS["app"]->DB->Execute ($q);
  
  		// ACL keys
--- 36,42 ----
  		foreach ($queries as $q) 
  			if (!trim($q) == '') 
! 				if (!$GLOBALS["app"]->DB->Execute ($q))
! 					return new JawsError (_t("_GLOBAL_ERROR_FAILED_QUERY_FILE", $GLOBALS["app"]->DB->GetDriverName().".sql"), _t("_GLOSSARY_NAME"));
! 
  
  		// ACL keys
***************
*** 56,60 ****
  	 * @access  public
  	 * @param   string  $letter Letter to find
! 	 * @return  array   Returns an array of the terms that begin with a letter and false on error
  	 */
  	function GetTermsOf ($letter)
--- 60,64 ----
  	 * @access  public
  	 * @param   string  $letter Letter to find
! 	 * @return  array   Returns an array of the terms that begin with a letter and JawsError on failure
  	 */
  	function GetTermsOf ($letter)
***************
*** 66,73 ****
  		$rs = $GLOBALS["app"]->DB->Execute ($sql);
  		
! 		if ($rs)
  			return $rs->GetRows ();
! 		else
! 			return false;
  	}
  
--- 70,78 ----
  		$rs = $GLOBALS["app"]->DB->Execute ($sql);
  		
! 		if ($rs) {
  			return $rs->GetRows ();
! 		} else {
! 			return new JawsError (_t("_GLOBAL_ERROR_QUERY_FAILED", "GetTermsOf"), _t("_GLOSSARY_NAME"));				
! 		}
  	}
  
***************
*** 108,115 ****
  		$rs = $GLOBALS["app"]->DB->Execute ($sql, array ("id" => $id));
  		
! 		if ($rs)
  			return $rs->FetchRow ();
! 		else
! 			return false;
  	}
  
--- 113,122 ----
  		$rs = $GLOBALS["app"]->DB->Execute ($sql, array ("id" => $id));
  		
! 		if ($rs) {
  			return $rs->FetchRow ();
! 		} else {
! 			return new JawsError (_t("_GLOBAL_ERROR_QUERY_FAILED", "GetTerm"), _t("_GLOSSARY_NAME"));				
! 		}
! 
  	}
  
***************
*** 125,132 ****
  		$rs = $GLOBALS["app"]->DB->Execute ($sql);
  		
! 		if ($rs)
  			return $rs->FetchRow ();
! 		else
! 			return false;
  	}
  
--- 132,140 ----
  		$rs = $GLOBALS["app"]->DB->Execute ($sql);
  		
! 		if ($rs) {
  			return $rs->FetchRow ();
! 		} else {
! 			return new JawsError (_t("_GLOBAL_ERROR_QUERY_FAILED", "GetRandomTerm"), _t("_GLOSSARY_NAME"));				
! 		}
  	}
  
***************
*** 142,149 ****
  		$rs = $GLOBALS["app"]->DB->Execute ($sql);
  		
! 		if ($rs)
  			return $rs->GetRows ();
! 		else
! 			return false;
  	}
  
--- 150,158 ----
  		$rs = $GLOBALS["app"]->DB->Execute ($sql);
  		
! 		if ($rs) {
  			return $rs->GetRows ();
! 		} else {
! 			return new JawsError (_t("_GLOBAL_ERROR_QUERY_FAILED", "GetTerms"), _t("_GLOSSARY_NAME"));				
! 		}
  	}
  
***************
*** 161,168 ****
  		$rs = $GLOBALS["app"]->DB->Execute ($sql, array ("id" => $id));
  		
! 		if ($rs)
  			return true;
! 		else
! 			return false;
  	}
  
--- 170,180 ----
  		$rs = $GLOBALS["app"]->DB->Execute ($sql, array ("id" => $id));
  		
! 		if ($rs) {
! 			$GLOBALS["session"]->PushLastResponse (_t("_GLOSSARY_TERM_DELETED"), RESPONSE_NOTICE);
  			return true;
! 		} else {
! 			$GLOBALS["session"]->PushLastResponse (_t("_GLOSSARY_ERROR_TERM_NOT_DELETED"), RESPONSE_ERROR);
! 			return new JawsError (_t("_GLOSSARY_ERROR_TERM_NOT_DELETED"), _t("_GLOSSARY_NAME"));				
! 		}
  	}
  
***************
*** 185,192 ****
  														 "desc" => $desc));
  		
! 		if ($rs)
  			return true;
! 		else
! 			return false;
  	}
  
--- 197,207 ----
  														 "desc" => $desc));
  		
! 		if ($rs) {
! 			$GLOBALS["session"]->PushLastResponse (_t("_GLOSSARY_TERM_UPDATED"), RESPONSE_NOTICE);
  			return true;
! 		} else {
! 			$GLOBALS["session"]->PushLastResponse (_t("_GLOSSARY_ERROR_TERM_NOT_UPDATED"), RESPONSE_ERROR);
! 			return new JawsError (_t("_GLOSSARY_ERROR_TERM_NOT_UPDATED"), _t("_GLOSSARY_NAME"));	
! 		}
  	}
  
***************
*** 205,213 ****
  		$rs = $GLOBALS["app"]->DB->Execute ($sql, array ("term" => $term,
  														 "desc" => $desc));
! 		
! 		if ($rs)
  			return true;
! 		else
! 			return false;
  	}
  
--- 220,231 ----
  		$rs = $GLOBALS["app"]->DB->Execute ($sql, array ("term" => $term,
  														 "desc" => $desc));
! 
! 		if ($rs) {
! 			$GLOBALS["session"]->PushLastResponse (_t("_GLOSSARY_TERM_ADDED"), RESPONSE_NOTICE);
  			return true;
! 		} else {
! 			$GLOBALS["session"]->PushLastResponse (_t("_GLOSSARY_ERROR_TERM_NOT_CREATED"), RESPONSE_ERROR);
! 			return new JawsError (_t("_GLOSSARY_ERROR_TERM_NOT_CREATED"), _t("_GLOSSARY_NAME"));	
! 		}	
  	}
  
***************
*** 221,225 ****
  	function Search ($match) 
  	{
! 		if (strlen(trim($match)) < 3) return false; 
  		$sql = "SELECT id, term, description, createtime FROM [[term]] WHERE";
  		$data = explode (" ", $match);
--- 239,244 ----
  	function Search ($match) 
  	{
! 		if (strlen(trim($match)) < 3) 
! 			return new JawsError (_t("_GLOSSARY_ERROR_CANT_SEARCH_LENGTH"), _t("_GLOSSARY_NAME"));
  		$sql = "SELECT id, term, description, createtime FROM [[term]] WHERE";
  		$data = explode (" ", $match);

Index: Glossary.php
===================================================================
RCS file: /cvsroot/jaws-project/jaws/html/gadgets/Glossary/Glossary.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Glossary.php	9 Mar 2005 05:45:17 -0000	1.12
--- Glossary.php	17 Mar 2005 07:24:39 -0000	1.13
***************
*** 5,8 ****
--- 5,10 ----
   * @author Jonathan Hernandez <io...@gl...>
   * @copyright 2004 Jaws
+  * @package Gadgets
+  * @subpackage Glossary
   */
  require_once "GlossaryModel.php";
***************
*** 11,26 ****
  {
  
  	function Glossary ()
  	{
  		$this->Init ('GlossaryModel');
  		//Actions..
! 		$this->NormalAction ("DefaultAction", _("Default Action"));
! 		$this->NormalAction ("ViewTerm", _("View a specific term"));
! 
! 		$this->LayoutAction ("RandomTerms", _("Random Term"),
! 							 _("Will show a term selected randomly"));
! 		$this->LayoutAction ("ListOfTerms", _("List of Terms"),
! 							 _("Will show a list of all the terms with their links to their meanings"));
  
  		$this->AdminAction ("Admin");
  		$this->AdminAction ("EditTerm");
--- 13,33 ----
  {
  
+ 	/**
+ 	 * Constructor
+ 	 *
+ 	 * @access  public
+ 	 */
  	function Glossary ()
  	{
  		$this->Init ('GlossaryModel');
  		//Actions..
! 		$this->NormalAction ("DefaultAction");
! 		$this->NormalAction ("ViewTerm");
  
+ 		$this->LayoutAction ("RandomTerm", _t("_GLOSSARY_LAYOUT_RANDOM"),
+ 							 _t("_GLOSSARY_LAYOUT_RANDOM_DESC"));
+ 		$this->LayoutAction ("ListOfTerm", _t("_GLOSSARY_LAYOUT_LISTOF"),
+ 							 _t("_GLOSSARY_LAYOUT_LISTOF_DESC"));
+ 		
  		$this->AdminAction ("Admin");
  		$this->AdminAction ("EditTerm");
***************
*** 35,38 ****
--- 42,48 ----
  	/**
  	 * Installs Glossary gadget
+ 	 *
+ 	 * @access  public
+ 	 * @return  boolean  Returns true on success and JawsError on failure
  	 */
  	function InstallGadget () 
***************
*** 41,44 ****
--- 51,60 ----
  	}
  
+ 	/**
+ 	 * Runs the default action
+ 	 *
+ 	 * @access  public
+ 	 * @return  string  HTML content of Default action
+ 	 */
  	function DefaultAction ()
  	{
***************
*** 46,49 ****
--- 62,71 ----
  	}
  
+ 	/**
+ 	 * Look for a term and prints it
+ 	 *
+ 	 * @access  public
+ 	 * @return  string HTML content
+ 	 */
  	function ViewTerm ()
  	{
***************
*** 51,62 ****
  		$tpl->Load ("ViewTerm.html");
  		$tpl->SetBlock ("definition");
! 		$tpl->SetVariable ("gadget_name", _("Glossary"));
  		$term = $this->_Model->GetTerm ($_GET["term"]);
! 		if (count ($term) > 0) {
  			$tpl->SetBlock ("definition/item");
  			$tpl->SetVariable ("term", $term["term"]);
  			$tpl->SetVariable ("description", $this->ParseText ($term["description"]));
! 			$tpl->SetVariable ("created_in", _t("Create time"));
! 			$tpl->SetVariable ("updated_in", _t("Update time"));
  			$tpl->SetVariable ("createtime", JawsDateFormat::Format ($term["createtime"]));
  			$tpl->SetVariable ("updatetime", JawsDateFormat::Format ($term["updatetime"]));
--- 73,84 ----
  		$tpl->Load ("ViewTerm.html");
  		$tpl->SetBlock ("definition");
! 		$tpl->SetVariable ("gadget_name", _t("_GLOSSARY_NAME"));
  		$term = $this->_Model->GetTerm ($_GET["term"]);
! 		if (!JawsError::IsError ($term) && isset ($term["term"])) {
  			$tpl->SetBlock ("definition/item");
  			$tpl->SetVariable ("term", $term["term"]);
  			$tpl->SetVariable ("description", $this->ParseText ($term["description"]));
! 			$tpl->SetVariable ("created_in", _t("_GLOBAL_CREATETIME"));
! 			$tpl->SetVariable ("updated_in", _t("_GLOBAL_UPDATETIME"));
  			$tpl->SetVariable ("createtime", JawsDateFormat::Format ($term["createtime"]));
  			$tpl->SetVariable ("updatetime", JawsDateFormat::Format ($term["updatetime"]));
***************
*** 64,69 ****
  		} else {
  			$tpl->SetBlock ("definition/notfound");
! 			$tpl->SetVariable ("term", $_GET["term"]);
! 			$tpl->SetVariable ("notfound", _t("The term doesn't exists"));
  			$tpl->ParseBlock ("definition/notfound");			
  		}
--- 86,91 ----
  		} else {
  			$tpl->SetBlock ("definition/notfound");
! 			$tpl->SetVariable ("term", isset ($_GET["term"]) ? $_GET["term"] : _t("_GLOSSARY_ERROR_TERM_NO_TERM"));
! 			$tpl->SetVariable ("notfound", _t("_GLOSSARY_ERROR_TERM_DOES_NOT_EXISTS"));
  			$tpl->ParseBlock ("definition/notfound");			
  		}
***************
*** 72,75 ****
--- 94,103 ----
  	}
  
+ 	/**
+ 	 * Look for a random term and prints it
+ 	 *
+ 	 * @access  public
+ 	 * @return  string HTML content
+ 	 */
  	function RandomTerms ()
  	{
***************
*** 78,88 ****
  		$tpl->SetBlock ("random");
  		$term = $this->_Model->GetRandomTerm ();
! 		$tpl->SetVariable ("gadget_name", _("Random Term"));
! 		$tpl->SetVariable ("term", $term["term"]);
! 		$tpl->SetVariable ("description", $this->ParseText ($term["description"]));
  		$tpl->ParseBlock ("random");
  		return $tpl->Get ();
  	}
  
  	function ListOfTerms ()
  	{
--- 106,124 ----
  		$tpl->SetBlock ("random");
  		$term = $this->_Model->GetRandomTerm ();
! 		if (!JawsError::IsError ($term)) {
! 			$tpl->SetVariable ("gadget_name", _t("_GLOSSARY_RANDOM_TERM"));
! 			$tpl->SetVariable ("term", $term["term"]);
! 			$tpl->SetVariable ("description", $this->ParseText ($term["description"]));
! 		}
  		$tpl->ParseBlock ("random");
  		return $tpl->Get ();
  	}
  
+ 	/**
+ 	 * Looks for a list of terms (general) and prints them
+ 	 *
+ 	 * @access   public
+ 	 * @return   string HTML Content
+ 	 */
  	function ListOfTerms ()
  	{
***************
*** 90,99 ****
  		$tpl->Load ("SimpleList.html");
  		$tpl->SetBlock ("list_of_terms");
! 		$tpl->SetVariable ("gadget_name", _("Glossary"));
! 		$term = $this->_Model->GetTerms ();
! 		foreach ($term as $t) {
! 			$tpl->SetBlock ("list_of_terms/term");
! 			$tpl->SetVariable ("term", $t["term"]);
! 			$tpl->ParseBlock ("list_of_terms/term");
  		}
  		$tpl->ParseBlock ("list_of_terms");
--- 126,137 ----
  		$tpl->Load ("SimpleList.html");
  		$tpl->SetBlock ("list_of_terms");
! 		$tpl->SetVariable ("gadget_name", _t("_GLOSSARY_NAME"));
! 		$terms = $this->_Model->GetTerms ();
! 		if (!JawsError::IsError ($terms)) {
! 			foreach ($terms as $t) {
! 				$tpl->SetBlock ("list_of_terms/term");
! 				$tpl->SetVariable ("term", $t["term"]);
! 				$tpl->ParseBlock ("list_of_terms/term");
! 			}
  		}
  		$tpl->ParseBlock ("list_of_terms");
***************
*** 101,104 ****
--- 139,148 ----
  	}
  
+ 	/**
+ 	 * Look for all the terms, order them and prints them all together
+ 	 *
+ 	 * @access   public
+ 	 * @return   string HTML Content
+ 	 */
  	function Display ()
  	{
***************
*** 106,121 ****
  		$tpl->Load ("AlphabeticList.html");
  		$tpl->SetBlock ("list");
! 		$tpl->SetVariable ("gadget_name", _("Glossary"));
! 		foreach ($this->_Model->GetSizeOfTerms() as $term_letter) {
! 			if ($term_letter["size"] > 0) {
! 				$tpl->SetBlock ("list/letter");
! 				$tpl->SetVariable ("letter", $term_letter["letter"]);
! 				foreach ($this->_Model->GetTermsOf ($term_letter["letter"]) as $term) {
! 					$tpl->SetBlock ("list/letter/term");
! 					$tpl->SetVariable ("term", $term["term"]);
! 					$tpl->SetVariable ("description", $this->ParseText ($term["description"]));
! 					$tpl->ParseBlock ("list/letter/term");
  				}
- 				$tpl->ParseBlock ("list/letter");
  			}
  		}
--- 150,172 ----
  		$tpl->Load ("AlphabeticList.html");
  		$tpl->SetBlock ("list");
! 		$tpl->SetVariable ("gadget_name", _t("_GLOSSARY_NAME"));
! 		$termssize = $this->_Model->GetSizeOfTerms();
! 		if (!JawsError::IsError ($termssize)) {
! 			foreach ($this->_Model->GetSizeOfTerms() as $term_letter) {
! 				if ($term_letter["size"] > 0) {
! 					$tpl->SetBlock ("list/letter");
! 					$tpl->SetVariable ("letter", $term_letter["letter"]);
! 					
! 					$termsof = $this->_Model->GetTermsOf ($term_letter["letter"]);
! 					if (!JawsError::IsError ($termsof)) {
! 						foreach ($termsof as $term) {
! 							$tpl->SetBlock ("list/letter/term");
! 							$tpl->SetVariable ("term", $term["term"]);
! 							$tpl->SetVariable ("description", $this->ParseText ($term["description"]));
! 							$tpl->ParseBlock ("list/letter/term");
! 						}
! 					}
! 					$tpl->ParseBlock ("list/letter");
  				}
  			}
  		}
***************
*** 125,150 ****
  	}
  
  	function NewTerm ()
  	{
  		$GLOBALS["session"]->CheckPermission ("Glossary", "AddTerm");
! 		if ($this->_Model->NewTerm ($_POST["term"], $_POST["description"]))
! 			$GLOBALS["session"]->PushLastResponse (_t("A new term has been added"));
! 		else
! 			$GLOBALS["session"]->PushLastResponse (_t("There was a problem adding the term"));
! 		header ("Location: admin.php?gadget=Glossary&action=Admin");
  	}
  
! 
  	function DeleteTerm ()
  	{
  		$GLOBALS["session"]->CheckPermission ("Glossary", "DeleteTerm");
! 		if ($this->_Model->DeleteTerm ($_GET["id"]))
! 			$GLOBALS["session"]->PushLastResponse (_t("The term has been deleted"));
! 		else
! 			$GLOBALS["session"]->PushLastResponse (_t("There was a problem deleting the term"));
! 		header ("Location: admin.php?gadget=Glossary&action=Admin");
  	}
  
! 
  	function EditTerm ()
  	{
--- 176,209 ----
  	}
  
+ 	/**
+ 	 * Adds a new term
+ 	 *
+ 	 * @access  public
+ 	 */
  	function NewTerm ()
  	{
  		$GLOBALS["session"]->CheckPermission ("Glossary", "AddTerm");
! 		$this->_Model->NewTerm ($_POST["term"], $_POST["description"]);
! 		JawsHeader::Location ("admin.php?gadget=Glossary&action=Admin");
  	}
  
! 	/**
! 	 * Deletes a new term
! 	 *
! 	 * @access  public
! 	 */
  	function DeleteTerm ()
  	{
  		$GLOBALS["session"]->CheckPermission ("Glossary", "DeleteTerm");
! 		$this->_Model->DeleteTerm ($_GET["id"]);
! 		JawsHeader::Location ("admin.php?gadget=Glossary&action=Admin");
  	}
  
! 	/**
! 	 * Prepares the term Form to edit/update a term
! 	 *
! 	 * @access  public
! 	 * @return  string  HTML content of EditForm
! 	 */
  	function EditTerm ()
  	{
***************
*** 153,156 ****
--- 212,221 ----
  	}
  
+ 	/**
+ 	 * Prepares the term Form to write a new term
+ 	 *
+ 	 * @access  public
+ 	 * @return  string  HTML content of EditForm
+ 	 */
  	function AddTerm ()
  	{
***************
*** 159,172 ****
  	}
  
  	function UpdateTerm ()
  	{
  		$GLOBALS["session"]->CheckPermission ("Glossary", "EditTerm");
! 		if ($this->_Model->UpdateTerm ($_POST["id"], $_POST["term"], $_POST["description"]))
! 			$GLOBALS["session"]->PushLastResponse (_t("The term has been updated"));
! 		else
! 			$GLOBALS["session"]->PushLastResponse (_t("There was a problem updating the term"));
! 		header ("Location: admin.php?gadget=Glossary&action=Admin");
  	}
  
  	function MenuBar ($action_selected)
  	{
--- 224,245 ----
  	}
  
+ 	/**
+ 	 * Updates a new term
+ 	 *
+ 	 * @access  public
+ 	 */
  	function UpdateTerm ()
  	{
  		$GLOBALS["session"]->CheckPermission ("Glossary", "EditTerm");
! 		$this->_Model->UpdateTerm ($_POST["id"], $_POST["term"], $_POST["description"]);
! 		JawsHeader::Location ("admin.php?gadget=Glossary&action=Admin");
  	}
  
+ 	/**
+ 	 * Builds the menubar of Glossary admin
+ 	 *
+ 	 * @access  private
+ 	 * @return  string  HTML of menubar
+ 	 */
  	function MenuBar ($action_selected)
  	{
***************
*** 177,187 ****
  		$menubar =& new JawsMenubar ();
  		if ($GLOBALS["session"]->GetPermission ("Glossary", "default"))
! 			$menubar->AddOption ("Admin", _t("View Terms"), "admin.php?gadget=Glossary&amp;action=Admin", STOCK_DOCUMENTS);
  		if ($GLOBALS["session"]->GetPermission ("Glossary", "Addterm"))
! 			$menubar->AddOption ("AddTerm", _t("Add a new Term"), "admin.php?gadget=Glossary&amp;action=AddTerm", STOCK_NEW);
  		$menubar->Activate ($action_selected);
  		return $menubar->Get ();		
  	}
  
  	function PreviewNew ()
  	{
--- 250,266 ----
  		$menubar =& new JawsMenubar ();
  		if ($GLOBALS["session"]->GetPermission ("Glossary", "default"))
! 			$menubar->AddOption ("Admin", _t("_GLOSSARY_MENUBAR_VIEWTERMS"), "admin.php?gadget=Glossary&amp;action=Admin", STOCK_DOCUMENTS);
  		if ($GLOBALS["session"]->GetPermission ("Glossary", "Addterm"))
! 			$menubar->AddOption ("AddTerm", _t("_GLOSSARY_MENUBAR_ADDTERM"), "admin.php?gadget=Glossary&amp;action=AddTerm", STOCK_NEW);
  		$menubar->Activate ($action_selected);
  		return $menubar->Get ();		
  	}
  
+ 	/**
+ 	 * Loads again the the EditForm to continue writing the new term but also displays a preview of it
+ 	 *
+ 	 * @access  public
+ 	 * @return  string  HTML content of EditForm
+ 	 */
  	function PreviewNew ()
  	{
***************
*** 190,194 ****
  	}
  
! 	
  	function PreviewEdit ()
  	{
--- 269,278 ----
  	}
  
! 	/**
! 	 * Loads again the the EditForm to continue editing the term but also displays a preview of it
! 	 *
! 	 * @access  public
! 	 * @return  string  HTML content of EditForm
! 	 */
  	function PreviewEdit ()
  	{
***************
*** 197,200 ****
--- 281,290 ----
  	}
  
+ 	/**
+ 	 * Builds the EditForm
+ 	 *
+ 	 * @access  public
+ 	 * @return  stirng  HTML of EditForm
+ 	 */
  	function EditForm ()
  	{
***************
*** 204,218 ****
  		$tpl->SetBlock ("edit_form");
  		$tpl->SetVariable("icon",JawsUtils::CheckImage("gadgets/Glossary/images/Glossary.png"));
! 		$tpl->SetVariable ("title","<a href=\"admin.php\">"._t("Control Panel").
! 						   "</a> &rarr; "._t("Glossary"));	
! 		$tpl->SetVariable ("menubar", $this->MenuBar ($_GET["action"]));		
  
  		$term = array ();
! 		if ($_POST["action"] == "PreviewEdit" || $_POST["action"] == "PreviewNew") {
  			$term["term"] = $_POST["term"];
  			$term["description"] = $_POST["description"];
  			$term["id"] = $_POST["id"] = $_POST["id"];
  		} else {
! 			$term = $this->_Model->GetTerm ($_GET["id"]);
  		}
  		
--- 294,314 ----
  		$tpl->SetBlock ("edit_form");
  		$tpl->SetVariable("icon",JawsUtils::CheckImage("gadgets/Glossary/images/Glossary.png"));
! 		$tpl->SetVariable ("title","<a href=\"admin.php\">"._t("_CONTROLPANEL_NAME").
! 						   "</a> &rarr; "._t("_GLOSSARY_NAME"));	
! 		$tpl->SetVariable ("menubar", $this->MenuBar (isset ($_GET["action"]) ? $_GET["action"] : ""));		
  
  		$term = array ();
! 		$action = isset ($_REQUEST["action"]) ? $_REQUEST["action"] : "";
! 
! 		if ($action == "PreviewEdit" || $action == "PreviewNew") {
  			$term["term"] = $_POST["term"];
  			$term["description"] = $_POST["description"];
  			$term["id"] = $_POST["id"] = $_POST["id"];
  		} else {
! 			if (isset ($_GET["id"])) {
! 				$term = $this->_Model->GetTerm ($_GET["id"]);
! 				if (JawsError::IsError ($term))
! 					$term = array ();
! 			}
  		}
  		
***************
*** 227,236 ****
  		}
  
! 		$termentry =& new Entry ("term", $term["term"]);
  		
! 		$termentry->SetTitle (_t("Term"));
  		$termentry->SetStyle ("width: 100%;");
  		
! 		$editor =& new JawsEditor ("Glossary", "description", $term["description"]);
  		
  		$termform->Add ($termentry);
--- 323,332 ----
  		}
  
! 		$termentry =& new Entry ("term", isset ($term["term"]) ? $term["term"] : "");
  		
! 		$termentry->SetTitle (_t("_GLOSSARY_TERM"));
  		$termentry->SetStyle ("width: 100%;");
  		
! 		$editor =& new JawsEditor ("Glossary", "description", isset ($term["description"]) ? $term["description"] : "");
  		
  		$termform->Add ($termentry);
***************
*** 238,247 ****
  			
  		if ($_GET["action"] == "AddTerm")
! 			$submit =& new Button ("saveterm", _t("Add Term"), STOCK_SAVE);
  		else
! 			$submit =& new Button ("saveterm", _t("Update Term"), STOCK_SAVE);
  		$submit->SetSubmit ();
  		
! 		$preview =& new Button ("preview", _t("Preview"), STOCK_PRINT_PREVIEW);
  		if ($_GET["action"] == "PreviewNew" || $_GET["action"] == "AddTerm")
  			$preview->AddEvent (new JSEvent (ON_CLICK, "javascript: this.form.action.value = 'PreviewNew'; this.form.submit ();"));
--- 334,343 ----
  			
  		if ($_GET["action"] == "AddTerm")
! 			$submit =& new Button ("saveterm", _t("_GLOBAL_SAVE", _t("_GLOSSARY_TERM")), STOCK_SAVE);
  		else
! 			$submit =& new Button ("updateterm", _t("_GLOBAL_UPDATE", _t("GLOSSARY_TERM")), STOCK_SAVE);
  		$submit->SetSubmit ();
  		
! 		$preview =& new Button ("preview", _t("_GLOBAL_PREVIEW"), STOCK_PRINT_PREVIEW);
  		if ($_GET["action"] == "PreviewNew" || $_GET["action"] == "AddTerm")
  			$preview->AddEvent (new JSEvent (ON_CLICK, "javascript: this.form.action.value = 'PreviewNew'; this.form.submit ();"));
***************
*** 258,262 ****
  		$tpl->SetVariable ("form", $termform->Get ());
  
! 		if ($_POST["action"] == "PreviewNew" || $_POST["action"] == "PreviewEdit") {
  			$tpl->SetBlock ("edit_form/preview");
  			$tpl->SetVariable ("term", $term["term"]);
--- 354,358 ----
  		$tpl->SetVariable ("form", $termform->Get ());
  
! 		if ($action == "PreviewNew" || $action == "PreviewEdit") {
  			$tpl->SetBlock ("edit_form/preview");
  			$tpl->SetVariable ("term", $term["term"]);
***************
*** 270,273 ****
--- 366,375 ----
  	}
  
+ 	/**
+ 	 * Manages the main functions of Glossary administration
+ 	 *
+ 	 * @access  public
+ 	 * @return  stirng  HTML Content
+ 	 */
  	function Admin ()
  	{
***************
*** 277,299 ****
  		$tpl->SetBlock ("glossary");
  		$tpl->SetVariable("icon",JawsUtils::CheckImage("gadgets/Glossary/images/Glossary.png"));
! 		$tpl->SetVariable ("title","<a href=\"admin.php\">"._t("Control Panel").
! 						   "</a> &rarr; "._t("Glossary"));	
  		$tpl->SetVariable ("menubar", $this->MenuBar ($_GET["action"]));		
  				
  
  		$terms = $this->_Model->GetTerms ();		
! 		$datagrid =& new DataGrid ($terms, _t("Glossary"));
! 		$datagrid->SetActionLabel (_("Actions"));
  		$datagrid->SetStyle ("width: 100%;");
! 		$datagrid->AddColumn (new Column (_t("Term"), "term"));
! 		$datagrid->AddColumn (new Column (_t("Description"), "description", false, "String", true, "", 'nl2br'));
  		
  		if ($GLOBALS["session"]->GetPermission ("Glossary", "DeleteTerm"))
! 			$datagrid->AddColumn (new ActionColumn (_t("Delete"), 
! 													"javascript: if (confirm ('"._t("Do you want to delete this term?")."')) ".
  													"window.location = 'admin.php?gadget=Glossary&amp;action=DeleteTerm&amp;id={id}'; ",
  													STOCK_DELETE));
  		if ($GLOBALS["session"]->GetPermission ("Glossary", "EditTerm"))
! 			$datagrid->AddColumn (new ActionColumn (_t("Edit"),
  													"admin.php?gadget=Glossary&amp;action=EditTerm&amp;id={id}",
  													STOCK_EDIT));
--- 379,402 ----
  		$tpl->SetBlock ("glossary");
  		$tpl->SetVariable("icon",JawsUtils::CheckImage("gadgets/Glossary/images/Glossary.png"));
! 		$tpl->SetVariable ("title","<a href=\"admin.php\">"._t("_CONTROLPANEL_NAME").
! 						   "</a> &rarr; "._t("_GLOSSARY_NAME"));	
  		$tpl->SetVariable ("menubar", $this->MenuBar ($_GET["action"]));		
  				
  
  		$terms = $this->_Model->GetTerms ();		
! 		$datagrid =& new DataGrid ($terms, _t("_GLOSSARY_NAME"));
! 		$datagrid->SetActionLabel (_t("_GLOBAL_ACTIONS"));
  		$datagrid->SetStyle ("width: 100%;");
! 		$datagrid->AddColumn (new Column (_t("_GLOSSARY_TERM"), "term"));
! 		$datagrid->AddColumn (new Column (_t("_GLOSSARY_DESCRIPTION"), "description", false, "String", true, "", 'nl2br'));
  		
  		if ($GLOBALS["session"]->GetPermission ("Glossary", "DeleteTerm"))
! 			$datagrid->AddColumn (new ActionColumn (_t("_GLOBAL_DELETE"), 
! 													"javascript: if (confirm ('"._t("_GLOBAL_CONFIRM_DELETE", _t("_GLOSSARY_TERM"))."')) ".
  													"window.location = 'admin.php?gadget=Glossary&amp;action=DeleteTerm&amp;id={id}'; ",
+ 													
  													STOCK_DELETE));
  		if ($GLOBALS["session"]->GetPermission ("Glossary", "EditTerm"))
! 			$datagrid->AddColumn (new ActionColumn (_t("_GLOBAL_EDIT"),
  													"admin.php?gadget=Glossary&amp;action=EditTerm&amp;id={id}",
  													STOCK_EDIT));
***************
*** 301,307 ****
  
  		//show response
! 		if ($response = $GLOBALS["session"]->PopLastResponse("Glossary")) {
  			$tpl->SetBlock ("glossary/message");
! 			$tpl->SetVariable ("message", $response);
  			$tpl->ParseBlock ("glossary/message");
  		}
--- 404,411 ----
  
  		//show response
! 		if ($response = $GLOBALS["session"]->PopLastResponse()) {
  			$tpl->SetBlock ("glossary/message");
! 			$tpl->SetVariable ("message", $response["message"]);
! 			$tpl->SetVariable ("class", $response["css"]);
  			$tpl->ParseBlock ("glossary/message");
  		}

[Jaws-project-commits] jaws/html/gadgets/Glossary/templates Admin.html,1.1,1.2

[Pablo F. <pab...@us...>]

Update of /cvsroot/jaws-project/jaws/html/gadgets/Glossary/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16319/templates

Modified Files:
	Admin.html 
Log Message:
Works! Compatible with Jaws 0.5:
 * Debug done
 * Errors are handled by JawsError
 * Translation 100%


Index: Admin.html
===================================================================
RCS file: /cvsroot/jaws-project/jaws/html/gadgets/Glossary/templates/Admin.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Admin.html	9 Mar 2005 05:45:17 -0000	1.1
--- Admin.html	17 Mar 2005 07:24:40 -0000	1.2
***************
*** 6,10 ****
        <br />
        <div align="center">
!       <span class="control-panel-message">{message}</span>
        </div><br />
        <!-- END message -->      
--- 6,10 ----
        <br />
        <div align="center">
!       <span class="{class}">{message}</span>
        </div><br />
        <!-- END message -->      

[Jaws-project-commits] jaws/html/gadgets/Glossary/languages/en Glossary.php,NONE,1.1

[Pablo F. <pab...@us...>]

Update of /cvsroot/jaws-project/jaws/html/gadgets/Glossary/languages/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16319/languages/en

Added Files:
	Glossary.php 
Log Message:
Works! Compatible with Jaws 0.5:
 * Debug done
 * Errors are handled by JawsError
 * Translation 100%


--- NEW FILE: Glossary.php ---
<?php
/* Actions */
define ("_EN_GLOSSARY_LAYOUT_RANDOM", "Show a random term");
define ("_EN_GLOSSARY_LAYOUT_RANDOM_DESC", "Shows a term that is selected randomly");
define ("_EN_GLOSSARY_LAYOUT_LISTOF", "Show the list of terms");
define ("_EN_GLOSSARY_LAYOUT_LISTOF_DESC", "Shows a list of all the terms");

/* Menubar actions */
define ("_EN_GLOSSARY_MENUBAR_VIEWTERMS", "View terms");
define ("_EN_GLOSSARY_MENUBAR_ADDTERM", "Add a new term");

/* Phrases and words */
define ("_EN_GLOSSARY_NAME", "Glossary");
define ("_EN_GLOSSARY_TERM", "Term");
define ("_EN_GLOSSARY_DESCRIPTION", "Description");
define ("_EN_GLOSSARY_RANDOM_TERM", "Random Term");

/* Responses and actions */
define ("_EN_GLOSSARY_TERM_UPDATED","The term has been updated");
define ("_EN_GLOSSARY_TERM_ADDED","The term has been added");
define ("_EN_GLOSSARY_TERM_DELETED","The term has been deleted");

/* Errors */
define ("_EN_GLOSSARY_ERROR_NO_TERM", "No term");
define ("_EN_GLOSSARY_ERROR_TERM_DOES_NOT_EXISTS", "Term does not exists");
define ("_EN_GLOSSARY_ERROR_TERM_NOT_DELETED", "There was a problem while deleting the term");
define ("_EN_GLOSSARY_ERROR_TERM_NOT_UPDATED", "There was a problem while updating the term");
define ("_EN_GLOSSARY_ERROR_TERM_NOT_CREATED", "There was a problem while while creating the term");
define ("_EN_GLOSSARY_ERROR_CANT_SEARCH_LENGTH","Gadget requires the match to be of 4 characters at least");
?>

[Jaws-project-commits] jaws/html/gadgets/Glossary/languages/en - New directory

[Pablo F. <pab...@us...>]

Update of /cvsroot/jaws-project/jaws/html/gadgets/Glossary/languages/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16220/Glossary/languages/en

Log Message:
Directory /cvsroot/jaws-project/jaws/html/gadgets/Glossary/languages/en added to the repository

[Jaws-project-commits] jaws/html/gadgets/Friends/languages/en Friends.php,1.4,1.5

[Pablo F. <pab...@us...>]

Update of /cvsroot/jaws-project/jaws/html/gadgets/Friends/languages/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16212/languages/en

Modified Files:
	Friends.php 
Log Message:
Now its done :-)


Index: Friends.php
===================================================================
RCS file: /cvsroot/jaws-project/jaws/html/gadgets/Friends/languages/en/Friends.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Friends.php	17 Mar 2005 01:04:59 -0000	1.4
--- Friends.php	17 Mar 2005 01:30:26 -0000	1.5
***************
*** 22,25 ****
  define ("_EN_FRIENDS_ERROR_NOT_DELETED","There was a problem deleting your friend");
  define ("_EN_FRIENDS_ERROR_PROPERTIES_NOT_UPDATED","There was a problem updating the properties");
! define ("_EN_FRIENDS_ERROR_DOEST_NOT_EXISTS", "Friend {0} does not exists");
  ?>
--- 22,25 ----
  define ("_EN_FRIENDS_ERROR_NOT_DELETED","There was a problem deleting your friend");
  define ("_EN_FRIENDS_ERROR_PROPERTIES_NOT_UPDATED","There was a problem updating the properties");
! define ("_EN_FRIENDS_ERROR_FRIEND_DOEST_NOT_EXISTS", "Friend {0} does not exists");
  ?>

[Jaws-project-commits] jaws/html/gadgets/Friends Friends.php,1.19,1.20

[Pablo F. <pab...@us...>]

Update of /cvsroot/jaws-project/jaws/html/gadgets/Friends
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16212

Modified Files:
	Friends.php 
Log Message:
Now its done :-)


Index: Friends.php
===================================================================
RCS file: /cvsroot/jaws-project/jaws/html/gadgets/Friends/Friends.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Friends.php	17 Mar 2005 01:04:58 -0000	1.19
--- Friends.php	17 Mar 2005 01:30:26 -0000	1.20
***************
*** 128,137 ****
  			if ($GLOBALS["session"]->GetPermission ("Friends", "EditFriend"))
  				$datagrid->AddColumn (new ActionColumn (_t("_GLOBAL_EDIT", _t("_FRIEND_FRIEND")),
! 														"admin.php?gadget=Friends&action=EditFriend&friend={friend}",
  														STOCK_EDIT));
  			if ($GLOBALS["session"]->GetPermission ("Friends", "DeleteFriend"))
  				$datagrid->AddColumn (new ActionColumn (_t("_GLOBAL_DELETE", _t("_FRIEND_FRIEND")), 
  														"javascript: if (confirm ('"._t("_GLOBAL_CONFIRM_DELETE", _t("_FRIENDS_FRIEND"))."').) ".
! 														"window.location = 'admin.php?gadget=Friends&action=DeleteFriend&friend={friend}';",
  														STOCK_DELETE));
  
--- 128,137 ----
  			if ($GLOBALS["session"]->GetPermission ("Friends", "EditFriend"))
  				$datagrid->AddColumn (new ActionColumn (_t("_GLOBAL_EDIT", _t("_FRIEND_FRIEND")),
! 														"admin.php?gadget=Friends&action=EditFriend&friend={friend}",
  														STOCK_EDIT));
  			if ($GLOBALS["session"]->GetPermission ("Friends", "DeleteFriend"))
  				$datagrid->AddColumn (new ActionColumn (_t("_GLOBAL_DELETE", _t("_FRIEND_FRIEND")), 
  														"javascript: if (confirm ('"._t("_GLOBAL_CONFIRM_DELETE", _t("_FRIENDS_FRIEND"))."').) ".
! 														"window.location = 'admin.php?gadget=Friends&action=DeleteFriend&friend={friend}';",
  														STOCK_DELETE));