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

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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&amp;action=DeleteFriend&amp;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&amp;action=DeleteFriend&amp;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&amp;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&amp;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");
  	}
  }