standardize the use of unix eol; use svn properties to enforce native eol

9 files changed, 548 insertions, 548 deletions

diff --git a/demos/time-tracker/protected/App_Code/Dao/BaseDao.php b/demos/time-tracker/protected/App_Code/Dao/BaseDao.php
index 5edb6af7..a75011d7 100644
--- a/demos/time-tracker/protected/App_Code/Dao/BaseDao.php
+++ b/demos/time-tracker/protected/App_Code/Dao/BaseDao.php
@@ -1,45 +1,45 @@
-<?php

-/**

- * Base DAO class file.

- *

- * @author Wei Zhuo <weizhuo[at]gmail[dot]com>

- * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2006 PradoSoft

- * @license http://www.pradosoft.com/license/

- * @version $Id$

- * @package Demos

- */

-

-/**

- * Base DAO class.

- *

- * @author Wei Zhuo <weizhuo[at]gmail[dot]com>

- * @version $Id$

- * @package Demos

- * @since 3.1

- */

-class BaseDao

-{

-	/**

-	 * @var TSqlMapGateway sqlmap client.

-	 */

-	private $_sqlmap;

-

-	/**

-	 * @param TSqlMapGateway sqlmap client.

-	 */

-	public function setSqlMap($sqlmap)

-	{

-		$this->_sqlmap = $sqlmap;

-	}

-

-	/**

-	 * @return TSqlMapGateway sqlmap client.

-	 */

-	protected function getSqlMap()

-	{

-		return $this->_sqlmap;

-	}

-}

-

+<?php
+/**
+ * Base DAO class file.
+ *
+ * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
+ * @link http://www.pradosoft.com/
+ * @copyright Copyright &copy; 2005-2006 PradoSoft
+ * @license http://www.pradosoft.com/license/
+ * @version $Id$
+ * @package Demos
+ */
+
+/**
+ * Base DAO class.
+ *
+ * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
+ * @version $Id$
+ * @package Demos
+ * @since 3.1
+ */
+class BaseDao
+{
+	/**
+	 * @var TSqlMapGateway sqlmap client.
+	 */
+	private $_sqlmap;
+
+	/**
+	 * @param TSqlMapGateway sqlmap client.
+	 */
+	public function setSqlMap($sqlmap)
+	{
+		$this->_sqlmap = $sqlmap;
+	}
+
+	/**
+	 * @return TSqlMapGateway sqlmap client.
+	 */
+	protected function getSqlMap()
+	{
+		return $this->_sqlmap;
+	}
+}
+
 ?>
\ No newline at end of file
diff --git a/demos/time-tracker/protected/App_Code/Dao/CategoryDao.php b/demos/time-tracker/protected/App_Code/Dao/CategoryDao.php
index 7476f036..e43639a0 100644
--- a/demos/time-tracker/protected/App_Code/Dao/CategoryDao.php
+++ b/demos/time-tracker/protected/App_Code/Dao/CategoryDao.php
@@ -1,53 +1,53 @@
-<?php

-

-class CategoryDao extends BaseDao

-{

-	function addNewCategory($category)

-	{

-		$sqlmap = $this->getSqlMap();

-		$exists = $this->getCategoryByNameInProject(

-			$category->Name, $category->ProjectID);

-		if(!$exists)

-			$sqlmap->insert('AddNewCategory', $category);

-	}

-

-	function getCategoryByID($categoryID)

-	{

-		$sqlmap = $this->getSqlMap();

-		return $sqlmap->queryForObject('GetCategoryByID', $categoryID);

-	}

-

-	function getAllCategories()

-	{

-		$sqlmap = $this->getSqlMap();

-		return $sqlmap->queryForList('GetAllCategories');

-	}

-

-	function deleteCategory($categoryID)

-	{

-		$sqlmap = $this->getSqlMap();

-		$sqlmap->delete('DeleteCategory', $categoryID);

-	}

-

-	function getCategoriesByProjectID($projectID)

-	{

-		$sqlmap = $this->getSqlMap();

-		return $sqlmap->queryForList('GetCategoriesByProjectID', $projectID);

-	}

-

-	function getCategoryByNameInProject($name, $projectID)

-	{

-		$sqlmap = $this->getSqlMap();

-		$param['project'] = $projectID;

-		$param['category'] = $name;

-		return $sqlmap->queryForObject('GetCategoryByNameInProject', $param);

-	}

-

-	function updateCategory($category)

-	{

-		$sqlmap = $this->getSqlMap();

-		$sqlmap->update('UpdateCategory', $category);

-	}

-}

-

+<?php
+
+class CategoryDao extends BaseDao
+{
+	function addNewCategory($category)
+	{
+		$sqlmap = $this->getSqlMap();
+		$exists = $this->getCategoryByNameInProject(
+			$category->Name, $category->ProjectID);
+		if(!$exists)
+			$sqlmap->insert('AddNewCategory', $category);
+	}
+
+	function getCategoryByID($categoryID)
+	{
+		$sqlmap = $this->getSqlMap();
+		return $sqlmap->queryForObject('GetCategoryByID', $categoryID);
+	}
+
+	function getAllCategories()
+	{
+		$sqlmap = $this->getSqlMap();
+		return $sqlmap->queryForList('GetAllCategories');
+	}
+
+	function deleteCategory($categoryID)
+	{
+		$sqlmap = $this->getSqlMap();
+		$sqlmap->delete('DeleteCategory', $categoryID);
+	}
+
+	function getCategoriesByProjectID($projectID)
+	{
+		$sqlmap = $this->getSqlMap();
+		return $sqlmap->queryForList('GetCategoriesByProjectID', $projectID);
+	}
+
+	function getCategoryByNameInProject($name, $projectID)
+	{
+		$sqlmap = $this->getSqlMap();
+		$param['project'] = $projectID;
+		$param['category'] = $name;
+		return $sqlmap->queryForObject('GetCategoryByNameInProject', $param);
+	}
+
+	function updateCategory($category)
+	{
+		$sqlmap = $this->getSqlMap();
+		$sqlmap->update('UpdateCategory', $category);
+	}
+}
+
 ?>
\ No newline at end of file
diff --git a/demos/time-tracker/protected/App_Code/Dao/CategoryRecord.php b/demos/time-tracker/protected/App_Code/Dao/CategoryRecord.php
index 876b582d..0394ce92 100644
--- a/demos/time-tracker/protected/App_Code/Dao/CategoryRecord.php
+++ b/demos/time-tracker/protected/App_Code/Dao/CategoryRecord.php
@@ -1,13 +1,13 @@
-<?php

-

-class CategoryRecord

-{

-	public $ActualDuration = 0.0;

-	public $Abbreviation = '';

-	public $ID=0;

-	public $EstimateDuration = 0.0;

-	public $Name='';

-	public $ProjectID=0; 	

-}

-

+<?php
+
+class CategoryRecord
+{
+	public $ActualDuration = 0.0;
+	public $Abbreviation = '';
+	public $ID=0;
+	public $EstimateDuration = 0.0;
+	public $Name='';
+	public $ProjectID=0; 	
+}
+
 ?>
\ No newline at end of file
diff --git a/demos/time-tracker/protected/App_Code/Dao/ProjectDao.php b/demos/time-tracker/protected/App_Code/Dao/ProjectDao.php
index 9e8867bc..1d085b47 100644
--- a/demos/time-tracker/protected/App_Code/Dao/ProjectDao.php
+++ b/demos/time-tracker/protected/App_Code/Dao/ProjectDao.php
@@ -1,105 +1,105 @@
-<?php

-/**

- * Project DAO class file.

- *

- * @author Wei Zhuo <weizhuo[at]gmail[dot]com>

- * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2006 PradoSoft

- * @license http://www.pradosoft.com/license/

- * @version $Id$

- * @package Demos

- */

-

-/**

- * Project DAO class.

- *

- * @author Wei Zhuo <weizhuo[at]gmail[dot]com>

- * @version $Id$

- * @package Demos

- * @since 3.1

- */

-class ProjectDao extends BaseDao

-{

-	public function projectNameExists($projectName)

-	{

-		$sqlmap = $this->getSqlMap();

-		return $sqlmap->queryForObject('ProjectNameExists', $projectName);

-	}

-

-	public function addNewProject($project)

-	{

-		$sqlmap = $this->getSqlMap();

-		$sqlmap->insert('CreateNewProject', $project);

-	}

-

-	public function getProjectByID($projectID)

-	{

-		$sqlmap = $this->getSqlMap();

-		return $sqlmap->queryForObject('GetProjectByID', $projectID);

-	}

-

-	public function deleteProject($projectID)

-	{

-		$sqlmap = $this->getSqlMap();

-		$sqlmap->update('DeleteProject',$projectID);

-	}

-

-	public function addUserToProject($projectID, $username)

-	{

-		$sqlmap = $this->getSqlMap();

-		$members = $this->getProjectMembers($projectID);

-		if(!in_array($username, $members))

-		{

-			$param['username'] = $username;

-			$param['project'] = $projectID;

-			$sqlmap->insert('AddUserToProject',$param);

-		}

-	}

-

-	public function getProjectMembers($projectID)

-	{

-		$sqlmap = $this->getSqlMap();

-		return $sqlmap->queryForList('GetProjectMembers', $projectID);

-	}

-

-	public function getAllProjects($sort='', $order='ASC')

-	{

-		$sqlmap = $this->getSqlMap();

-		if($sort === '')

-			return $sqlmap->queryForList('GetAllProjects');

-		else

-		{

-			$param['sort'] = $sort;

-			$param['order'] = $order;

-			return $sqlmap->queryForList('GetAllProjectsOrdered', $param);

-		}

-	}

-

-	public function getProjectsByManagerName($manager)

-	{

-		$sqlmap = $this->getSqlMap();

-		return $sqlmap->queryForList('GetProjectsByManagerName', $manager);

-	}

-

-	public function getProjectsByUserName($username)

-	{

-		$sqlmap = $this->getSqlMap();

-		return $sqlmap->queryForList('GetProjectsByUserName', $username);

-	}

-

-	public function removeUserFromProject($projectID, $username)

-	{

-		$sqlmap = $this->getSqlMap();

-		$param['username'] = $username;

-		$param['project'] = $projectID;

-		$sqlmap->delete('RemoveUserFromProject', $param);

-	}

-

-	public function updateProject($project)

-	{

-		$sqlmap = $this->getSqlMap();

-		$sqlmap->update('UpdateProject', $project);

-	}

-}

-

+<?php
+/**
+ * Project DAO class file.
+ *
+ * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
+ * @link http://www.pradosoft.com/
+ * @copyright Copyright &copy; 2005-2006 PradoSoft
+ * @license http://www.pradosoft.com/license/
+ * @version $Id$
+ * @package Demos
+ */
+
+/**
+ * Project DAO class.
+ *
+ * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
+ * @version $Id$
+ * @package Demos
+ * @since 3.1
+ */
+class ProjectDao extends BaseDao
+{
+	public function projectNameExists($projectName)
+	{
+		$sqlmap = $this->getSqlMap();
+		return $sqlmap->queryForObject('ProjectNameExists', $projectName);
+	}
+
+	public function addNewProject($project)
+	{
+		$sqlmap = $this->getSqlMap();
+		$sqlmap->insert('CreateNewProject', $project);
+	}
+
+	public function getProjectByID($projectID)
+	{
+		$sqlmap = $this->getSqlMap();
+		return $sqlmap->queryForObject('GetProjectByID', $projectID);
+	}
+
+	public function deleteProject($projectID)
+	{
+		$sqlmap = $this->getSqlMap();
+		$sqlmap->update('DeleteProject',$projectID);
+	}
+
+	public function addUserToProject($projectID, $username)
+	{
+		$sqlmap = $this->getSqlMap();
+		$members = $this->getProjectMembers($projectID);
+		if(!in_array($username, $members))
+		{
+			$param['username'] = $username;
+			$param['project'] = $projectID;
+			$sqlmap->insert('AddUserToProject',$param);
+		}
+	}
+
+	public function getProjectMembers($projectID)
+	{
+		$sqlmap = $this->getSqlMap();
+		return $sqlmap->queryForList('GetProjectMembers', $projectID);
+	}
+
+	public function getAllProjects($sort='', $order='ASC')
+	{
+		$sqlmap = $this->getSqlMap();
+		if($sort === '')
+			return $sqlmap->queryForList('GetAllProjects');
+		else
+		{
+			$param['sort'] = $sort;
+			$param['order'] = $order;
+			return $sqlmap->queryForList('GetAllProjectsOrdered', $param);
+		}
+	}
+
+	public function getProjectsByManagerName($manager)
+	{
+		$sqlmap = $this->getSqlMap();
+		return $sqlmap->queryForList('GetProjectsByManagerName', $manager);
+	}
+
+	public function getProjectsByUserName($username)
+	{
+		$sqlmap = $this->getSqlMap();
+		return $sqlmap->queryForList('GetProjectsByUserName', $username);
+	}
+
+	public function removeUserFromProject($projectID, $username)
+	{
+		$sqlmap = $this->getSqlMap();
+		$param['username'] = $username;
+		$param['project'] = $projectID;
+		$sqlmap->delete('RemoveUserFromProject', $param);
+	}
+
+	public function updateProject($project)
+	{
+		$sqlmap = $this->getSqlMap();
+		$sqlmap->update('UpdateProject', $project);
+	}
+}
+
 ?>
\ No newline at end of file
diff --git a/demos/time-tracker/protected/App_Code/Dao/ProjectRecord.php b/demos/time-tracker/protected/App_Code/Dao/ProjectRecord.php
index 7812751b..1f6ededd 100644
--- a/demos/time-tracker/protected/App_Code/Dao/ProjectRecord.php
+++ b/demos/time-tracker/protected/App_Code/Dao/ProjectRecord.php
@@ -1,35 +1,35 @@
-<?php

-/**

- * Project class file.

- *

- * @author Wei Zhuo <weizhuo[at]gmail[dot]com>

- * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2006 PradoSoft

- * @license http://www.pradosoft.com/license/

- * @version $Id$

- * @package Demos

- */

-

-/**

- * Time Tracker Project class.

- *

- * @author Wei Zhuo <weizhuo[at]gmail[dot]com>

- * @version $Id$

- * @package Demos

- * @since 3.1

- */

-class ProjectRecord

-{

-	public $ActualDuration = 0;

-	public $CreatorUserName = '';

-	public $CompletionDate = 0;

-	public $DateCreated = 0;

-	public $Description = '';

-	public $EstimateDuration = 0.0;

-	public $ID = 0;

-	public $ManagerUserName = '';

-	public $Name = '';

-}

-

-

+<?php
+/**
+ * Project class file.
+ *
+ * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
+ * @link http://www.pradosoft.com/
+ * @copyright Copyright &copy; 2005-2006 PradoSoft
+ * @license http://www.pradosoft.com/license/
+ * @version $Id$
+ * @package Demos
+ */
+
+/**
+ * Time Tracker Project class.
+ *
+ * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
+ * @version $Id$
+ * @package Demos
+ * @since 3.1
+ */
+class ProjectRecord
+{
+	public $ActualDuration = 0;
+	public $CreatorUserName = '';
+	public $CompletionDate = 0;
+	public $DateCreated = 0;
+	public $Description = '';
+	public $EstimateDuration = 0.0;
+	public $ID = 0;
+	public $ManagerUserName = '';
+	public $Name = '';
+}
+
+
 ?>
\ No newline at end of file
diff --git a/demos/time-tracker/protected/App_Code/Dao/ReportsDao.php b/demos/time-tracker/protected/App_Code/Dao/ReportsDao.php
index 15d0c2a3..c03dd81d 100644
--- a/demos/time-tracker/protected/App_Code/Dao/ReportsDao.php
+++ b/demos/time-tracker/protected/App_Code/Dao/ReportsDao.php
@@ -1,87 +1,87 @@
-<?php

-

-class ProjectReport extends TComponent

-{

-	public $ProjectName = '';

-	public $EstimateHours = 0;

-	public $EstimateCompletion = 0;

-	public $Categories;

-

-	public function __construct()

-	{

-		$this->Categories = new TList;

-	}

-

-	public function getActualHours()

-	{

-		$total = 0;

-		foreach($this->Categories as $cat)

-			$total += $cat->getActualHours();

-		return $total;

-	}

-}

-

-class CategoryReport extends TComponent

-{

-	public $CategoryName = '';

-	public $EstimateHours = 0;

-	public $members = array();

-

-	public function getActualHours()

-	{

-		$total = 0;

-		foreach($this->members as $member)

-			$total += $member['hours'];

-		return $total;

-	}

-}

-

-class UserReport extends TComponent

-{

-	public $Username;

-	public $Projects = array();

-

-	public function getTotalHours()

-	{

-		$hours = 0;

-		foreach($this->Projects as $project)

-			$hours += $project->Duration;

-		return $hours;

-	}

-}

-

-class UserProjectReport

-{

-	public $ProjectName = '';

-	public $CategoryName = '';

-	public $Duration = 0;

-	public $Description='';

-	public $ReportDate=0;

-}

-

-class ReportsDao extends BaseDao

-{

-	public function getTimeReportsByProjectIDs($projects)

-	{

-		$ids = implode(',', array_map('intval', $projects));

-		$sqlmap = $this->getSqlMap();

-		return $sqlmap->queryForList('GetTimeReportByProjectIDs', $ids);

-	}

-

-	public function getUserProjectTimeReports($users, $projects, $startDate, $endDate)

-	{

-		$sqlmap = $this->getSqlMap();

-		$ids = implode(',', array_map('intval', $projects));

-		$sqlmap->getDbConnection()->setActive(true); //db connection needs to be open for quoteString

-		$usernames = implode(',', array_map(array($sqlmap->getDbConnection(), 'quoteString'), $users));

-

-		$param['projects'] = $ids;

-		$param['members'] = $usernames;

-		$param['startDate'] = intval($startDate);

-		$param['endDate'] = intval($endDate);

-

-		return $sqlmap->queryForList('GetTimeReportByUsername', $param);

-	}

-}

-

+<?php
+
+class ProjectReport extends TComponent
+{
+	public $ProjectName = '';
+	public $EstimateHours = 0;
+	public $EstimateCompletion = 0;
+	public $Categories;
+
+	public function __construct()
+	{
+		$this->Categories = new TList;
+	}
+
+	public function getActualHours()
+	{
+		$total = 0;
+		foreach($this->Categories as $cat)
+			$total += $cat->getActualHours();
+		return $total;
+	}
+}
+
+class CategoryReport extends TComponent
+{
+	public $CategoryName = '';
+	public $EstimateHours = 0;
+	public $members = array();
+
+	public function getActualHours()
+	{
+		$total = 0;
+		foreach($this->members as $member)
+			$total += $member['hours'];
+		return $total;
+	}
+}
+
+class UserReport extends TComponent
+{
+	public $Username;
+	public $Projects = array();
+
+	public function getTotalHours()
+	{
+		$hours = 0;
+		foreach($this->Projects as $project)
+			$hours += $project->Duration;
+		return $hours;
+	}
+}
+
+class UserProjectReport
+{
+	public $ProjectName = '';
+	public $CategoryName = '';
+	public $Duration = 0;
+	public $Description='';
+	public $ReportDate=0;
+}
+
+class ReportsDao extends BaseDao
+{
+	public function getTimeReportsByProjectIDs($projects)
+	{
+		$ids = implode(',', array_map('intval', $projects));
+		$sqlmap = $this->getSqlMap();
+		return $sqlmap->queryForList('GetTimeReportByProjectIDs', $ids);
+	}
+
+	public function getUserProjectTimeReports($users, $projects, $startDate, $endDate)
+	{
+		$sqlmap = $this->getSqlMap();
+		$ids = implode(',', array_map('intval', $projects));
+		$sqlmap->getDbConnection()->setActive(true); //db connection needs to be open for quoteString
+		$usernames = implode(',', array_map(array($sqlmap->getDbConnection(), 'quoteString'), $users));
+
+		$param['projects'] = $ids;
+		$param['members'] = $usernames;
+		$param['startDate'] = intval($startDate);
+		$param['endDate'] = intval($endDate);
+
+		return $sqlmap->queryForList('GetTimeReportByUsername', $param);
+	}
+}
+
 ?>
\ No newline at end of file
diff --git a/demos/time-tracker/protected/App_Code/Dao/TimeEntryDao.php b/demos/time-tracker/protected/App_Code/Dao/TimeEntryDao.php
index 4bd74eb5..f761fd25 100644
--- a/demos/time-tracker/protected/App_Code/Dao/TimeEntryDao.php
+++ b/demos/time-tracker/protected/App_Code/Dao/TimeEntryDao.php
@@ -1,38 +1,38 @@
-<?php

-

-class TimeEntryDao extends BaseDao

-{

-	public function addNewTimeEntry($entry)

-	{

-		$sqlmap = $this->getSqlMap();

-		$sqlmap->insert('AddNewTimeEntry', $entry);

-	}

-

-	public function getTimeEntryByID($entryID)

-	{

-		$sqlmap = $this->getSqlMap();

-		return $sqlmap->queryForObject('GetTimeEntryByID', $entryID);

-	}

-

-	public function deleteTimeEntry($entryID)

-	{

-		$sqlmap = $this->getSqlMap();

-		$sqlmap->delete('DeleteTimeEntry', $entryID);

-	}

-

-	public function getTimeEntriesInProject($username, $projectID)

-	{

-		$sqlmap = $this->getSqlMap();

-		$param['username'] = $username;

-		$param['project'] = $projectID;

-		return $sqlmap->queryForList('GetAllTimeEntriesByProjectIdAndUser', $param);

-	}

-

-	public function updateTimeEntry($entry)

-	{

-		$sqlmap = $this->getSqlMap();

-		$sqlmap->update('UpdateTimeEntry', $entry);

-	}

-}

-

+<?php
+
+class TimeEntryDao extends BaseDao
+{
+	public function addNewTimeEntry($entry)
+	{
+		$sqlmap = $this->getSqlMap();
+		$sqlmap->insert('AddNewTimeEntry', $entry);
+	}
+
+	public function getTimeEntryByID($entryID)
+	{
+		$sqlmap = $this->getSqlMap();
+		return $sqlmap->queryForObject('GetTimeEntryByID', $entryID);
+	}
+
+	public function deleteTimeEntry($entryID)
+	{
+		$sqlmap = $this->getSqlMap();
+		$sqlmap->delete('DeleteTimeEntry', $entryID);
+	}
+
+	public function getTimeEntriesInProject($username, $projectID)
+	{
+		$sqlmap = $this->getSqlMap();
+		$param['username'] = $username;
+		$param['project'] = $projectID;
+		return $sqlmap->queryForList('GetAllTimeEntriesByProjectIdAndUser', $param);
+	}
+
+	public function updateTimeEntry($entry)
+	{
+		$sqlmap = $this->getSqlMap();
+		$sqlmap->update('UpdateTimeEntry', $entry);
+	}
+}
+
 ?>
\ No newline at end of file
diff --git a/demos/time-tracker/protected/App_Code/Dao/TimeEntryRecord.php b/demos/time-tracker/protected/App_Code/Dao/TimeEntryRecord.php
index fa4f5b8f..8b533070 100644
--- a/demos/time-tracker/protected/App_Code/Dao/TimeEntryRecord.php
+++ b/demos/time-tracker/protected/App_Code/Dao/TimeEntryRecord.php
@@ -1,16 +1,16 @@
-<?php

-

-class TimeEntryRecord

-{

-	public $CreatorUserName='';

-	public $Category;

-	public $DateCreated=0;

-	public $Description='';

-	public $Duration=0.0;

-	public $ID=0;

-	public $Project;

-	public $ReportDate=0;

-	public $Username;

-}

-

+<?php
+
+class TimeEntryRecord
+{
+	public $CreatorUserName='';
+	public $Category;
+	public $DateCreated=0;
+	public $Description='';
+	public $Duration=0.0;
+	public $ID=0;
+	public $Project;
+	public $ReportDate=0;
+	public $Username;
+}
+
 ?>
\ No newline at end of file
diff --git a/demos/time-tracker/protected/App_Code/Dao/UserDao.php b/demos/time-tracker/protected/App_Code/Dao/UserDao.php
index 4bb23b3a..dcb72ee7 100644
--- a/demos/time-tracker/protected/App_Code/Dao/UserDao.php
+++ b/demos/time-tracker/protected/App_Code/Dao/UserDao.php
@@ -1,165 +1,165 @@
-<?php

-/**

- * User Dao class file.

- *

- * @author Wei Zhuo <weizhuo[at]gmail[dot]com>

- * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2006 PradoSoft

- * @license http://www.pradosoft.com/license/

- * @version $Id$

- * @package Demos

- */

-

-/**

- * UserDao class list, create, find and delete users.

- * In addition, it can validate username and password, and update

- * the user roles. Furthermore, a unique new token can be generated,

- * this token can be used to perform persistent cookie login.

- *

- * @author Wei Zhuo <weizhuo[at]gmail[dot]com>

- * @version $Id$

- * @package Demos

- * @since 3.1

- */

-class UserDao extends BaseDao

-{

-	/**

-	 * @param string username

-	 * @return TimeTrackerUser find by user name, null if not found or disabled.

-	 */

-	public function getUserByName($username)

-	{

-		$sqlmap = $this->getSqlMap();

-		return $sqlmap->queryForObject('GetUserByName', $username);

-	}

-

-	/**

-	 * @param string username

-	 * @return boolean true if username already exists, false otherwise.

-	 */

-	public function usernameExists($username)

-	{

-		$sqlmap = $this->getSqlMap();

-		return $sqlmap->queryForObject('UsernameExists', $username);

-	}

-

-	/**

-	 * @return array list of all enabled users.

-	 */

-	public function getAllUsers()

-	{

-		$sqlmap = $this->getSqlMap();

-		return $sqlmap->queryForList('GetAllUsers');

-	}

-

-	/**

-	 * @param TimeTrackerUser new user details.

-	 * @param string new user password.

-	 */

-	public function addNewUser($user, $password)

-	{

-		$sqlmap = $this->getSqlMap();

-		$param['user'] = $user;

-		$param['password'] = md5($password);

-		$sqlmap->insert('AddNewUser', $param);

-		if(count($user->getRoles()) > 0)

-			$this->updateUserRoles($user);

-	}

-

-	/**

-	 * @param string username to delete

-	 */

-	public function deleteUserByName($username)

-	{

-		$sqlmap = $this->getSqlMap();

-		$sqlmap->delete('DeleteUserByName', $username);

-	}

-

-	/**

-	 * Updates the user profile details, including user roles.

-	 * @param TimeTrackerUser updated user details.

-	 * @param string new user password, null to avoid updating password.

-	 */

-	public function updateUser($user,$password=null)

-	{

-		$sqlmap = $this->getSqlMap();

-		if($password !== null)

-		{

-			$param['user'] = $user;

-			$param['password'] = md5($password);

-			$sqlmap->update('UpdateUserDetailsAndPassword', $param);

-		}

-		else

-		{

-			$sqlmap->update('UpdateUserDetails', $user);

-		}

-		$this->updateUserRoles($user);

-	}

-

-	/**

-	 * @param string username to be validated

-	 * @param string matching password

-	 * @return boolean true if the username and password matches.

-	 */

-	public function validateUser($username, $password)

-	{

-		$sqlmap = $this->getSqlMap();

-		$param['username'] = $username;

-		$param['password'] = md5($password);

-		return $sqlmap->queryForObject('ValidateUser', $param);

-	}

-

-	/**

-	 * @param string unique persistent session token

-	 * @return TimeTrackerUser user details if valid token, null otherwise.

-	 */

-	public function validateSignon($token)

-	{

-		$sqlmap = $this->getSqlMap();

-		$sqlmap->update('UpdateSignon', $token);

-		return $sqlmap->queryForObject('ValidateAutoSignon', $token);

-	}

-

-	/**

-	 * @param TimeTrackerUser user details to generate the token

-	 * @return string unique persistent login token.

-	 */

-	public function createSignonToken($user)

-	{

-		$sqlmap = $this->getSqlMap();

-		$param['username'] = $user->getName();

-		$param['token'] = md5(microtime().$param['username']);

-		$sqlmap->insert('RegisterAutoSignon', $param);

-		return $param['token'];

-	}

-

-	/**

-	 * @param TimeTrackerUser deletes all signon token for given user, null to delete all

-	 * tokens.

-	 */

-	public function clearSignonTokens($user=null)

-	{

-		$sqlmap = $this->getSqlMap();

-		if($user !== null)

-			$sqlmap->delete('DeleteAutoSignon', $user->getName());

-		else

-			$sqlmap->delete('DeleteAllSignon');

-	}

-

-	/**

-	 * @param TimeTrackerUser user details for updating the assigned roles.

-	 */

-	public function updateUserRoles($user)

-	{

-		$sqlmap = $this->getSqlMap();

-		$sqlmap->delete('DeleteUserRoles', $user);

-		foreach($user->getRoles() as $role)

-		{

-			$param['username'] = $user->getName();

-			$param['role'] = $role;

-			$sqlmap->update('AddUserRole', $param);

-		}

-	}

-}

-

+<?php
+/**
+ * User Dao class file.
+ *
+ * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
+ * @link http://www.pradosoft.com/
+ * @copyright Copyright &copy; 2005-2006 PradoSoft
+ * @license http://www.pradosoft.com/license/
+ * @version $Id$
+ * @package Demos
+ */
+
+/**
+ * UserDao class list, create, find and delete users.
+ * In addition, it can validate username and password, and update
+ * the user roles. Furthermore, a unique new token can be generated,
+ * this token can be used to perform persistent cookie login.
+ *
+ * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
+ * @version $Id$
+ * @package Demos
+ * @since 3.1
+ */
+class UserDao extends BaseDao
+{
+	/**
+	 * @param string username
+	 * @return TimeTrackerUser find by user name, null if not found or disabled.
+	 */
+	public function getUserByName($username)
+	{
+		$sqlmap = $this->getSqlMap();
+		return $sqlmap->queryForObject('GetUserByName', $username);
+	}
+
+	/**
+	 * @param string username
+	 * @return boolean true if username already exists, false otherwise.
+	 */
+	public function usernameExists($username)
+	{
+		$sqlmap = $this->getSqlMap();
+		return $sqlmap->queryForObject('UsernameExists', $username);
+	}
+
+	/**
+	 * @return array list of all enabled users.
+	 */
+	public function getAllUsers()
+	{
+		$sqlmap = $this->getSqlMap();
+		return $sqlmap->queryForList('GetAllUsers');
+	}
+
+	/**
+	 * @param TimeTrackerUser new user details.
+	 * @param string new user password.
+	 */
+	public function addNewUser($user, $password)
+	{
+		$sqlmap = $this->getSqlMap();
+		$param['user'] = $user;
+		$param['password'] = md5($password);
+		$sqlmap->insert('AddNewUser', $param);
+		if(count($user->getRoles()) > 0)
+			$this->updateUserRoles($user);
+	}
+
+	/**
+	 * @param string username to delete
+	 */
+	public function deleteUserByName($username)
+	{
+		$sqlmap = $this->getSqlMap();
+		$sqlmap->delete('DeleteUserByName', $username);
+	}
+
+	/**
+	 * Updates the user profile details, including user roles.
+	 * @param TimeTrackerUser updated user details.
+	 * @param string new user password, null to avoid updating password.
+	 */
+	public function updateUser($user,$password=null)
+	{
+		$sqlmap = $this->getSqlMap();
+		if($password !== null)
+		{
+			$param['user'] = $user;
+			$param['password'] = md5($password);
+			$sqlmap->update('UpdateUserDetailsAndPassword', $param);
+		}
+		else
+		{
+			$sqlmap->update('UpdateUserDetails', $user);
+		}
+		$this->updateUserRoles($user);
+	}
+
+	/**
+	 * @param string username to be validated
+	 * @param string matching password
+	 * @return boolean true if the username and password matches.
+	 */
+	public function validateUser($username, $password)
+	{
+		$sqlmap = $this->getSqlMap();
+		$param['username'] = $username;
+		$param['password'] = md5($password);
+		return $sqlmap->queryForObject('ValidateUser', $param);
+	}
+
+	/**
+	 * @param string unique persistent session token
+	 * @return TimeTrackerUser user details if valid token, null otherwise.
+	 */
+	public function validateSignon($token)
+	{
+		$sqlmap = $this->getSqlMap();
+		$sqlmap->update('UpdateSignon', $token);
+		return $sqlmap->queryForObject('ValidateAutoSignon', $token);
+	}
+
+	/**
+	 * @param TimeTrackerUser user details to generate the token
+	 * @return string unique persistent login token.
+	 */
+	public function createSignonToken($user)
+	{
+		$sqlmap = $this->getSqlMap();
+		$param['username'] = $user->getName();
+		$param['token'] = md5(microtime().$param['username']);
+		$sqlmap->insert('RegisterAutoSignon', $param);
+		return $param['token'];
+	}
+
+	/**
+	 * @param TimeTrackerUser deletes all signon token for given user, null to delete all
+	 * tokens.
+	 */
+	public function clearSignonTokens($user=null)
+	{
+		$sqlmap = $this->getSqlMap();
+		if($user !== null)
+			$sqlmap->delete('DeleteAutoSignon', $user->getName());
+		else
+			$sqlmap->delete('DeleteAllSignon');
+	}
+
+	/**
+	 * @param TimeTrackerUser user details for updating the assigned roles.
+	 */
+	public function updateUserRoles($user)
+	{
+		$sqlmap = $this->getSqlMap();
+		$sqlmap->delete('DeleteUserRoles', $user);
+		foreach($user->getRoles() as $role)
+		{
+			$param['username'] = $user->getName();
+			$param['role'] = $role;
+			$sqlmap->update('AddUserRole', $param);
+		}
+	}
+}
+
 ?>
\ No newline at end of file