diff options
| author | Fabio Bas <ctrlaltca@gmail.com> | 2014-01-06 22:44:30 +0100 | 
|---|---|---|
| committer | David <ottodavid@gmx.net> | 2014-08-21 17:21:19 +0200 | 
| commit | dcaa0390c1d1335f47f0dd4b8784dc550e3d9f93 (patch) | |
| tree | fcbf48afd7e8e2ff4811bcdfdc87d1145f855d51 /demos/time-tracker/protected/App_Code | |
| parent | fc0db15ebce101602fb1cbfa8f6a5cc0f8b58be4 (diff) | |
Removed all @version $Id comments: they were managed by svn and are useless with git
(cherry picked from commit 3e9969766153839abfb7de59e0c778a604bfbf55)
Conflicts:
	framework/Web/UI/ActiveControls/TCallbackClientScript.php
	framework/Web/UI/JuiControls/TJuiAutoComplete.php
	framework/Web/UI/JuiControls/TJuiControlAdapter.php
	framework/Web/UI/JuiControls/TJuiDraggable.php
	framework/Web/UI/JuiControls/TJuiDroppable.php
	framework/Web/UI/JuiControls/TJuiResizable.php
	framework/Web/UI/JuiControls/TJuiSelectable.php
	framework/Web/UI/JuiControls/TJuiSortable.php
Diffstat (limited to 'demos/time-tracker/protected/App_Code')
9 files changed, 12 insertions, 29 deletions
diff --git a/demos/time-tracker/protected/App_Code/Dao/BaseDao.php b/demos/time-tracker/protected/App_Code/Dao/BaseDao.php index b37fb5df..571a9d1a 100755 --- a/demos/time-tracker/protected/App_Code/Dao/BaseDao.php +++ b/demos/time-tracker/protected/App_Code/Dao/BaseDao.php @@ -6,7 +6,6 @@   * @link http://www.pradosoft.com/   * @copyright Copyright © 2005-2006 PradoSoft   * @license http://www.pradosoft.com/license/ - * @version $Id: BaseDao.php 3189 2012-07-12 12:16:21Z ctrlaltca $   * @package Demos   */ @@ -14,7 +13,6 @@   * Base DAO class.   *   * @author Wei Zhuo <weizhuo[at]gmail[dot]com> - * @version $Id: BaseDao.php 3189 2012-07-12 12:16:21Z ctrlaltca $   * @package Demos   * @since 3.1   */ diff --git a/demos/time-tracker/protected/App_Code/Dao/ProjectDao.php b/demos/time-tracker/protected/App_Code/Dao/ProjectDao.php index dbaf0e80..0110ae5e 100755 --- a/demos/time-tracker/protected/App_Code/Dao/ProjectDao.php +++ b/demos/time-tracker/protected/App_Code/Dao/ProjectDao.php @@ -6,7 +6,6 @@   * @link http://www.pradosoft.com/   * @copyright Copyright © 2005-2006 PradoSoft   * @license http://www.pradosoft.com/license/ - * @version $Id: ProjectDao.php 3189 2012-07-12 12:16:21Z ctrlaltca $   * @package Demos   */ @@ -14,7 +13,6 @@   * Project DAO class.   *   * @author Wei Zhuo <weizhuo[at]gmail[dot]com> - * @version $Id: ProjectDao.php 3189 2012-07-12 12:16:21Z ctrlaltca $   * @package Demos   * @since 3.1   */ diff --git a/demos/time-tracker/protected/App_Code/Dao/ProjectRecord.php b/demos/time-tracker/protected/App_Code/Dao/ProjectRecord.php index 631b1f8c..c02a78a5 100755 --- a/demos/time-tracker/protected/App_Code/Dao/ProjectRecord.php +++ b/demos/time-tracker/protected/App_Code/Dao/ProjectRecord.php @@ -6,7 +6,6 @@   * @link http://www.pradosoft.com/   * @copyright Copyright © 2005-2006 PradoSoft   * @license http://www.pradosoft.com/license/ - * @version $Id: ProjectRecord.php 3189 2012-07-12 12:16:21Z ctrlaltca $   * @package Demos   */ @@ -14,7 +13,6 @@   * Time Tracker Project class.   *   * @author Wei Zhuo <weizhuo[at]gmail[dot]com> - * @version $Id: ProjectRecord.php 3189 2012-07-12 12:16:21Z ctrlaltca $   * @package Demos   * @since 3.1   */ diff --git a/demos/time-tracker/protected/App_Code/Dao/UserDao.php b/demos/time-tracker/protected/App_Code/Dao/UserDao.php index 495da072..51d04c58 100755 --- a/demos/time-tracker/protected/App_Code/Dao/UserDao.php +++ b/demos/time-tracker/protected/App_Code/Dao/UserDao.php @@ -6,7 +6,6 @@   * @link http://www.pradosoft.com/   * @copyright Copyright © 2005-2006 PradoSoft   * @license http://www.pradosoft.com/license/ - * @version $Id: UserDao.php 3189 2012-07-12 12:16:21Z ctrlaltca $   * @package Demos   */ @@ -17,7 +16,6 @@   * this token can be used to perform persistent cookie login.   *   * @author Wei Zhuo <weizhuo[at]gmail[dot]com> - * @version $Id: UserDao.php 3189 2012-07-12 12:16:21Z ctrlaltca $   * @package Demos   * @since 3.1   */ diff --git a/demos/time-tracker/protected/App_Code/DaoManager.php b/demos/time-tracker/protected/App_Code/DaoManager.php index 9602ced0..90655ac8 100755 --- a/demos/time-tracker/protected/App_Code/DaoManager.php +++ b/demos/time-tracker/protected/App_Code/DaoManager.php @@ -6,7 +6,6 @@   * @link http://www.pradosoft.com/   * @copyright Copyright © 2005-2006 PradoSoft   * @license http://www.pradosoft.com/license/ - * @version $Id: DaoManager.php 3189 2012-07-12 12:16:21Z ctrlaltca $   * @package Demos   */ @@ -18,7 +17,6 @@ Prado::using('System.Data.SqlMap.TSqlMapConfig');   * A Registry for Dao and an implementation of that type.   *   * @author Wei Zhuo <weizhuo[at]gmail[dot]com> - * @version $Id: DaoManager.php 3189 2012-07-12 12:16:21Z ctrlaltca $   * @package Demos   * @since 3.1   */ diff --git a/demos/time-tracker/protected/App_Code/TimeTrackerException.php b/demos/time-tracker/protected/App_Code/TimeTrackerException.php index 424c7d30..87398952 100755 --- a/demos/time-tracker/protected/App_Code/TimeTrackerException.php +++ b/demos/time-tracker/protected/App_Code/TimeTrackerException.php @@ -6,7 +6,6 @@   * @link http://www.pradosoft.com/   * @copyright Copyright © 2005-2006 PradoSoft   * @license http://www.pradosoft.com/license/ - * @version $Id: TimeTrackerException.php 3189 2012-07-12 12:16:21Z ctrlaltca $   * @package Demos   */ @@ -15,7 +14,6 @@   * "exceptions.txt"   *   * @author Wei Zhuo <weizhuo[at]gmail[dot]com> - * @version $Id: TimeTrackerException.php 3189 2012-07-12 12:16:21Z ctrlaltca $   * @package Demos   * @since 3.1   */ @@ -27,6 +25,6 @@ class TimeTrackerException extends TException  	protected function getErrorMessageFile()  	{  		return dirname(__FILE__).'/exceptions.txt'; -	}	 +	}  } diff --git a/demos/time-tracker/protected/App_Code/TimeTrackerUser.php b/demos/time-tracker/protected/App_Code/TimeTrackerUser.php index da98e786..5215b31c 100755 --- a/demos/time-tracker/protected/App_Code/TimeTrackerUser.php +++ b/demos/time-tracker/protected/App_Code/TimeTrackerUser.php @@ -6,7 +6,6 @@   * @link http://www.pradosoft.com/   * @copyright Copyright © 2005-2006 PradoSoft   * @license http://www.pradosoft.com/license/ - * @version $Id: TimeTrackerUser.php 3189 2012-07-12 12:16:21Z ctrlaltca $   * @package Demos   */ @@ -20,14 +19,13 @@ Prado::using('System.Security.TUserManager');   * User class for Time Tracker application.   *   * @author Wei Zhuo <weizhuo[at]gmail[dot]com> - * @version $Id: TimeTrackerUser.php 3189 2012-07-12 12:16:21Z ctrlaltca $   * @package Demos   * @since 3.1   */  class TimeTrackerUser extends TUser  {  	private $_emailAddress; -	 +  	/**  	 * @param string user email address  	 */ @@ -35,7 +33,7 @@ class TimeTrackerUser extends TUser  	{  		$this->_emailAddress = $value;  	} -	 +  	/**  	 * @return string user email address  	 */ diff --git a/demos/time-tracker/protected/App_Code/TrackerAuthManager.php b/demos/time-tracker/protected/App_Code/TrackerAuthManager.php index 48962167..08daae3f 100755 --- a/demos/time-tracker/protected/App_Code/TrackerAuthManager.php +++ b/demos/time-tracker/protected/App_Code/TrackerAuthManager.php @@ -4,7 +4,6 @@   * a string token saved in the cookie.   *   * @author Wei Zhuo <weizhuo[at]gmail[dot]com> - * @version $Id: TrackerAuthManager.php 3189 2012-07-12 12:16:21Z ctrlaltca $   * @package Demos   * @since 3.1   */ @@ -14,24 +13,24 @@ class TrackerAuthManager extends TAuthManager  	 * @const string signon token cookie name.  	 */  	const SignonCookieName = 'time-tracker-signon'; -	 +  	/**  	 * Performs the real authentication work. Overrides and calls parent -	 * implementation. Trys to authenticate using token saved in cookie.  +	 * implementation. Trys to authenticate using token saved in cookie.  	 * @param mixed parameter to be passed to OnAuthenticate event  	 */  	public function onAuthenticate($param)  	{  		parent::onAuthenticate($param); -		$currentUser = $this->Application->User;  +		$currentUser = $this->Application->User;  		if(!$currentUser || $currentUser->IsGuest)  			$this->authenticateFromCookie($param);  	} -	 +  	/**  	 * If the user is not set or is still a guest, try to authenticate the user  	 * using a string token saved in the cookie if any. -	 * @param mixed parameter to be passed to OnAuthenticate event  +	 * @param mixed parameter to be passed to OnAuthenticate event  	 */  	protected function authenticateFromCookie($param)  	{ @@ -45,7 +44,7 @@ class TrackerAuthManager extends TAuthManager  				$this->updateCredential($user);  		}  	} -	 +  	/**  	 * Changes the user credentials.  	 * @param TUser new user details. @@ -54,9 +53,9 @@ class TrackerAuthManager extends TAuthManager  	{  		$user->IsGuest = false;  		$this->updateSessionUser($user); -		$this->Application->User = $user;		 +		$this->Application->User = $user;  	} -	 +  	/**  	 * Generate a token to be saved in the cookie for later authentication.  	 * @param TimeTrackerUser user details. @@ -70,7 +69,7 @@ class TrackerAuthManager extends TAuthManager  		$cookie->Expire = strtotime('+1 month');  		$this->Response->Cookies[] = $cookie;  	} -	 +  	/**  	 * Logs out the user and delete the token from cookie.  	 */ diff --git a/demos/time-tracker/protected/App_Code/UserManager.php b/demos/time-tracker/protected/App_Code/UserManager.php index 20b34d47..eabbe315 100755 --- a/demos/time-tracker/protected/App_Code/UserManager.php +++ b/demos/time-tracker/protected/App_Code/UserManager.php @@ -6,7 +6,6 @@   * @link http://www.pradosoft.com/   * @copyright Copyright © 2005-2006 PradoSoft   * @license http://www.pradosoft.com/license/ - * @version $Id: UserManager.php 3189 2012-07-12 12:16:21Z ctrlaltca $   * @package Demos   */ @@ -14,7 +13,6 @@   * User manager module class for time tracker application.   *   * @author Wei Zhuo <weizhuo[at]gmail[dot]com> - * @version $Id: UserManager.php 3189 2012-07-12 12:16:21Z ctrlaltca $   * @package Demos   * @since 3.1   */  | 
