pradosoft / prado

demos/blog/protected/Common/BlogDataModule.php

Braces +126 added lines, -94 removed lines

@@ -30,15 +30,17 @@ 
 
 	public function getDbFile()
 	{
-		if($this->_dbFile===null)
-			$this->_dbFile=Prado::getPathOfNamespace(self::DEFAULT_DB_FILE,self::DB_FILE_EXT);
+		if($this->_dbFile===null) {
+					$this->_dbFile=Prado::getPathOfNamespace(self::DEFAULT_DB_FILE,self::DB_FILE_EXT);
+		}
 		return $this->_dbFile;
 	}
 
 	public function setDbFile($value)
 	{
-		if(($this->_dbFile=Prado::getPathOfNamespace($value,self::DB_FILE_EXT))===null)
-			throw new BlogException(500,'blogdatamodule_dbfile_invalid',$value);
+		if(($this->_dbFile=Prado::getPathOfNamespace($value,self::DB_FILE_EXT))===null) {
+					throw new BlogException(500,'blogdatamodule_dbfile_invalid',$value);
+		}
 	}
 
 	protected function createDatabase()
@@ -52,8 +54,7 @@ 
 				try {
 					$command=$this->_db->createCommand($statement);
 					$command->execute();
-				}
-				catch(TDbException $e)
+				} catch(TDbException $e)
 				{
 					throw new BlogException(500,'blogdatamodule_createdatabase_failed',$e->getErrorMessage(),$statement);
 				}
@@ -69,25 +70,28 @@ 
 		try {
 			$this->_db=new TDbConnection("sqlite:".$dbFile);
 			$this->_db->Active=true;
-		}
-		catch(TDbException $e)
+		} catch(TDbException $e)
 		{
 			throw new BlogException(500,'blogdatamodule_dbconnect_failed',$e->getErrorMessage());
 		}
 
-		if($newDb)
-			$this->createDatabase();
+		if($newDb) {
+					$this->createDatabase();
+		}
 	}
 
 	protected function generateModifier($filter,$orderBy,$limit)
 	{
 		$modifier='';
-		if($filter!=='')
-			$modifier=' WHERE '.$filter;
-		if($orderBy!=='')
-			$modifier.=' ORDER BY '.$orderBy;
-		if($limit!=='')
-			$modifier.=' LIMIT '.$limit;
+		if($filter!=='') {
+					$modifier=' WHERE '.$filter;
+		}
+		if($orderBy!=='') {
+					$modifier.=' ORDER BY '.$orderBy;
+		}
+		if($limit!=='') {
+					$modifier.=' LIMIT '.$limit;
+		}
 		return $modifier;
 	}
 
@@ -96,8 +100,7 @@ 
 		try {
 			$command=$this->_db->createCommand($sql);
 			return $command->query();
-		}
-		catch(TDbException $e)
+		} catch(TDbException $e)
 		{
 			throw new BlogException(500,'blogdatamodule_query_failed',$e->getErrorMessage(),$sql);
 		}
@@ -121,36 +124,41 @@ 
 
 	public function queryUsers($filter='',$orderBy='',$limit='')
 	{
-		if($filter!=='')
-			$filter='WHERE '.$filter;
+		if($filter!=='') {
+					$filter='WHERE '.$filter;
+		}
 		$sql="SELECT * FROM tblUsers $filter $orderBy $limit";
 		$rows=$this->query($sql);
 		$users=array();
-		foreach($rows as $row)
-			$users[]=$this->populateUserRecord($row);
+		foreach($rows as $row) {
+					$users[]=$this->populateUserRecord($row);
+		}
 		return $users;
 	}
 
 	public function queryUserCount($filter)
 	{
-		if($filter!=='')
-			$filter='WHERE '.$filter;
+		if($filter!=='') {
+					$filter='WHERE '.$filter;
+		}
 		$sql="SELECT COUNT(id) AS user_count FROM tblUsers $filter";
 		$result=$this->query($sql);
-		if(($row=$result->read())!==false)
-			return $row['user_count'];
-		else
-			return 0;
+		if(($row=$result->read())!==false) {
+					return $row['user_count'];
+		} else {
+					return 0;
+		}
 	}
 
 	public function queryUserByID($id)
 	{
 		$sql="SELECT * FROM tblUsers WHERE id=$id";
 		$result=$this->query($sql);
-		if(($row=$result->read())!==false)
-			return $this->populateUserRecord($row);
-		else
-			return null;
+		if(($row=$result->read())!==false) {
+					return $this->populateUserRecord($row);
+		} else {
+					return null;
+		}
 	}
 
 	public function queryUserByName($name)
@@ -160,10 +168,11 @@ 
 
 		$result=$command->query();
 
-		if(($row=$result->read())!==false)
-			return $this->populateUserRecord($row);
-		else
-			return null;
+		if(($row=$result->read())!==false) {
+					return $this->populateUserRecord($row);
+		} else {
+					return null;
+		}
 	}
 
 	public function insertUser($user)
@@ -220,10 +229,11 @@ 
 		$postRecord=new PostRecord;
 		$postRecord->ID=(integer)$row['id'];
 		$postRecord->AuthorID=(integer)$row['author_id'];
-		if($row['author_full_name']!=='')
-			$postRecord->AuthorName=$row['author_full_name'];
-		else
-			$postRecord->AuthorName=$row['author_name'];
+		if($row['author_full_name']!=='') {
+					$postRecord->AuthorName=$row['author_full_name'];
+		} else {
+					$postRecord->AuthorName=$row['author_name'];
+		}
 		$postRecord->CreateTime=(integer)$row['create_time'];
 		$postRecord->ModifyTime=(integer)$row['modify_time'];
 		$postRecord->Title=$row['title'];
@@ -237,10 +247,12 @@ 
 	{
 		//FIXME this is insecure by design since it misses proper escaping
 		$filter='';
-		if($postFilter!=='')
-			$filter.=" AND $postFilter";
-		if($categoryFilter!=='')
-			$filter.=" AND a.id IN (SELECT post_id AS id FROM tblPost2Category WHERE $categoryFilter)";
+		if($postFilter!=='') {
+					$filter.=" AND $postFilter";
+		}
+		if($categoryFilter!=='') {
+					$filter.=" AND a.id IN (SELECT post_id AS id FROM tblPost2Category WHERE $categoryFilter)";
+		}
 		$sql="SELECT a.id AS id,
 					a.author_id AS author_id,
 					b.name AS author_name,
@@ -255,8 +267,9 @@ 
 				WHERE a.author_id=b.id $filter $orderBy $limit";
 		$rows=$this->query($sql);
 		$posts=array();
-		foreach($rows as $row)
-			$posts[]=$this->populatePostRecord($row);
+		foreach($rows as $row) {
+					$posts[]=$this->populatePostRecord($row);
+		}
 		return $posts;
 	}
 
@@ -275,8 +288,9 @@ 
 				FROM tblPosts a, tblUsers b
 				WHERE a.author_id=b.id AND a.status=0";
 
-		foreach($keywords as $keyword)
-			$sql.=" AND (content LIKE ? OR title LIKE ?)";
+		foreach($keywords as $keyword) {
+					$sql.=" AND (content LIKE ? OR title LIKE ?)";
+		}
 
 		$sql.=" $orderBy $limit";
 
@@ -292,8 +306,9 @@ 
 		$rows=$command->query();
 
 		$posts=array();
-		foreach($rows as $row)
-			$posts[]=$this->populatePostRecord($row);
+		foreach($rows as $row) {
+					$posts[]=$this->populatePostRecord($row);
+		}
 		return $posts;
 
 	}
@@ -302,18 +317,21 @@ 
 	{
 		//FIXME this is insecure by design since it misses proper escaping
 		$filter='';
-		if($postFilter!=='')
-			$filter.=" AND $postFilter";
-		if($categoryFilter!=='')
-			$filter.=" AND a.id IN (SELECT post_id AS id FROM tblPost2Category WHERE $categoryFilter)";
+		if($postFilter!=='') {
+					$filter.=" AND $postFilter";
+		}
+		if($categoryFilter!=='') {
+					$filter.=" AND a.id IN (SELECT post_id AS id FROM tblPost2Category WHERE $categoryFilter)";
+		}
 		$sql="SELECT COUNT(a.id) AS post_count
 				FROM tblPosts a, tblUsers b
 				WHERE a.author_id=b.id $filter";
 		$result=$this->query($sql);
-		if(($row=$result->read())!==false)
-			return $row['post_count'];
-		else
-			return 0;
+		if(($row=$result->read())!==false) {
+					return $row['post_count'];
+		} else {
+					return 0;
+		}
 	}
 
 	public function queryPostByID($id)
@@ -336,10 +354,11 @@ 
 
 		$result=$command->query();
 
-		if(($row=$result->read())!==false)
-			return $this->populatePostRecord($row);
-		else
-			return null;
+		if(($row=$result->read())!==false) {
+					return $this->populatePostRecord($row);
+		} else {
+					return null;
+		}
 	}
 
 	public function insertPost($post,$catIDs)
@@ -356,8 +375,9 @@ 
 
 		$command->execute();
 		$post->ID=$this->_db->getLastInsertID();
-		foreach($catIDs as $catID)
-			$this->insertPostCategory($post->ID,$catID);
+		foreach($catIDs as $catID) {
+					$this->insertPostCategory($post->ID,$catID);
+		}
 	}
 
 	public function updatePost($post,$newCatIDs=null)
@@ -366,14 +386,17 @@ 
 		{
 			$cats=$this->queryCategoriesByPostID($post->ID);
 			$catIDs=array();
-			foreach($cats as $cat)
-				$catIDs[]=$cat->ID;
+			foreach($cats as $cat) {
+							$catIDs[]=$cat->ID;
+			}
 			$deleteIDs=array_diff($catIDs,$newCatIDs);
-			foreach($deleteIDs as $id)
-				$this->deletePostCategory($post->ID,$id);
+			foreach($deleteIDs as $id) {
+							$this->deletePostCategory($post->ID,$id);
+			}
 			$insertIDs=array_diff($newCatIDs,$catIDs);
-			foreach($insertIDs as $id)
-				$this->insertPostCategory($post->ID,$id);
+			foreach($insertIDs as $id) {
+							$this->insertPostCategory($post->ID,$id);
+			}
 		}
 
 		$command=$this->_db->createCommand("UPDATE tblPosts SET
@@ -394,8 +417,9 @@ 
 	public function deletePost($id)
 	{
 		$cats=$this->queryCategoriesByPostID($id);
-		foreach($cats as $cat)
-			$this->deletePostCategory($id,$cat->ID);
+		foreach($cats as $cat) {
+					$this->deletePostCategory($id,$cat->ID);
+		}
 
 		$command=$this->_db->createCommand("DELETE FROM tblComments WHERE post_id=?");
 		$command->bindValue(1, $id);
@@ -424,13 +448,15 @@ 
 	public function queryComments($filter,$orderBy,$limit)
 	{
 		//FIXME this is insecure by design since it misses proper escaping
-		if($filter!=='')
-			$filter='WHERE '.$filter;
+		if($filter!=='') {
+					$filter='WHERE '.$filter;
+		}
 		$sql="SELECT * FROM tblComments $filter $orderBy $limit";
 		$rows=$this->query($sql);
 		$comments=array();
-		foreach($rows as $row)
-			$comments[]=$this->populateCommentRecord($row);
+		foreach($rows as $row) {
+					$comments[]=$this->populateCommentRecord($row);
+		}
 		return $comments;
 	}
 
@@ -443,8 +469,9 @@ 
 		$rows=$command->query();
 
 		$comments=array();
-		foreach($rows as $row)
-			$comments[]=$this->populateCommentRecord($row);
+		foreach($rows as $row) {
+					$comments[]=$this->populateCommentRecord($row);
+		}
 		return $comments;
 	}
 
@@ -512,8 +539,9 @@ 
 		$sql="SELECT * FROM tblCategories ORDER BY name ASC";
 		$rows=$this->query($sql);
 		$cats=array();
-		foreach($rows as $row)
-			$cats[]=$this->populateCategoryRecord($row);
+		foreach($rows as $row) {
+					$cats[]=$this->populateCategoryRecord($row);
+		}
 		return $cats;
 	}
 
@@ -531,8 +559,9 @@ 
 		$rows=$command->query();
 
 		$cats=array();
-		foreach($rows as $row)
-			$cats[]=$this->populateCategoryRecord($row);
+		foreach($rows as $row) {
+					$cats[]=$this->populateCategoryRecord($row);
+		}
 		return $cats;
 	}
 
@@ -544,10 +573,11 @@ 
 		$command->bindValue(1, $id);
 		$result=$command->query();
 
-		if(($row=$result->read())!==false)
-			return $this->populateCategoryRecord($row);
-		else
-			return null;
+		if(($row=$result->read())!==false) {
+					return $this->populateCategoryRecord($row);
+		} else {
+					return null;
+		}
 	}
 
 	public function queryCategoryByName($name)
@@ -558,10 +588,11 @@ 
 		$command->bindValue(1, $name);
 		$result=$command->query();
 
-		if(($row=$result->read())!==false)
-			return $this->populateCategoryRecord($row);
-		else
-			return null;
+		if(($row=$result->read())!==false) {
+					return $this->populateCategoryRecord($row);
+		} else {
+					return null;
+		}
 	}
 
 	public function insertCategory($category)
@@ -640,10 +671,11 @@ 
 	{
 		$sql="SELECT MIN(create_time) AS create_time FROM tblPosts";
 		$result=$this->query($sql);
-		if(($row=$result->read())!==false)
-			return $row['create_time'];
-		else
-			return time();
+		if(($row=$result->read())!==false) {
+					return $row['create_time'];
+		} else {
+					return time();
+		}
 	}
 }
 

demos/blog/protected/Common/BlogUserManager.php

Braces +10 added lines, -9 removed lines

@@ -33,9 +33,9 @@ 
 	 */
 	public function getUser($username=null)
 	{
-		if($username===null)
-			return new BlogUser($this);
-		else
+		if($username===null) {
+					return new BlogUser($this);
+		} else
 		{
 			$username=strtolower($username);
 			$db=$this->Application->getModule('data');
@@ -47,9 +47,9 @@ 
 				$user->setIsGuest(false);
 				$user->setRoles($userRecord->Role===UserRecord::ROLE_USER?'user':'admin');
 				return $user;
+			} else {
+							return null;
 			}
-			else
-				return null;
 		}
 	}
 
@@ -62,10 +62,11 @@ 
 	public function validateUser($username,$password)
 	{
 		$db=$this->Application->getModule('data');
-		if(($userRecord=$db->queryUserByName($username))!==null)
-			return $userRecord->Password===md5($password) && $userRecord->Status===UserRecord::STATUS_NORMAL;
-		else
-			return false;
+		if(($userRecord=$db->queryUserByName($username))!==null) {
+					return $userRecord->Password===md5($password) && $userRecord->Status===UserRecord::STATUS_NORMAL;
+		} else {
+					return false;
+		}
 	}
 
 	/**

demos/blog/protected/Common/XListMenu.php

Braces +23 added lines, -18 removed lines

@@ -42,8 +42,9 @@ 
 {
 	public function addParsedObject($object)
 	{
-		if($object instanceof XListMenuItem)
-			parent::addParsedObject($object);
+		if($object instanceof XListMenuItem) {
+					parent::addParsedObject($object);
+		}
 	}
 
 	public function getActiveCssClass()
@@ -68,10 +69,12 @@ 
 
 	public function render($writer)
 	{
-		if(($activeClass=$this->getActiveCssClass())!=='')
-			$activeClass=' class="'.$activeClass.'"';
-		if(($inactiveClass=$this->getInactiveCssClass())!=='')
-			$inactiveClass=' class="'.$inactiveClass.'"';
+		if(($activeClass=$this->getActiveCssClass())!=='') {
+					$activeClass=' class="'.$activeClass.'"';
+		}
+		if(($inactiveClass=$this->getInactiveCssClass())!=='') {
+					$inactiveClass=' class="'.$inactiveClass.'"';
+		}
 		$currentPagePath=$this->getPage()->getPagePath();
 		$writer->write("<ul>\n");
 		foreach($this->getItems() as $item)
@@ -80,20 +83,22 @@ 
 			//if(strpos($currentPagePath.'.',$pagePath.'.')===0)
 			if($pagePath[strlen($pagePath)-1]==='*')
 			{
-				if(strpos($currentPagePath.'.',rtrim($pagePath,'*'))===0)
-					$cssClass=$activeClass;
-				else
-					$cssClass=$inactiveClass;
-			}
-			else
+				if(strpos($currentPagePath.'.',rtrim($pagePath,'*'))===0) {
+									$cssClass=$activeClass;
+				} else {
+									$cssClass=$inactiveClass;
+				}
+			} else
 			{
-				if($pagePath===$currentPagePath)
-					$cssClass=$activeClass;
-				else
-					$cssClass=$inactiveClass;
+				if($pagePath===$currentPagePath) {
+									$cssClass=$activeClass;
+				} else {
+									$cssClass=$inactiveClass;
+				}
+			}
+			if(($url=$item->getNavigateUrl())==='') {
+							$url=$this->getService()->constructUrl($pagePath);
 			}
-			if(($url=$item->getNavigateUrl())==='')
-				$url=$this->getService()->constructUrl($pagePath);
 			$writer->write("<li><a href=\"$url\"$cssClass>".$item->getText()."</a></li>\n");
 		}
 		$writer->write("</ul>");

demos/blog/index_php.php

Braces +6 added lines, -3 removed lines

@@ -6,12 +6,15 @@
 $runtimePath=$basePath.'/protected/runtime';
 $dataPath=$basePath.'/protected/Data';
 
-if(!is_writable($assetsPath))
+if(!is_writable($assetsPath)) {
 	die("Please make sure that the directory $assetsPath is writable by Web server process.");
-if(!is_writable($runtimePath))
+}
+if(!is_writable($runtimePath)) {
 	die("Please make sure that the directory $runtimePath is writable by Web server process.");
-if(!is_writable($dataPath))
+}
+if(!is_writable($dataPath)) {
 	die("Please make sure that the directory $dataPath is writable by Web server process.");
+}
 
 require_once($frameworkPath);
 $application=new TApplication('protected',false,TApplication::CONFIG_TYPE_PHP);

demos/quickstart/protected/controls/SampleLayout.php

Braces +3 added lines, -2 removed lines

@@ -4,8 +4,9 @@
 {
 	public function __construct()
 	{
-		if(isset($this->Request['notheme']))
-			$this->Service->RequestedPage->EnableTheming=false;
+		if(isset($this->Request['notheme'])) {
+					$this->Service->RequestedPage->EnableTheming=false;
+		}
 		parent::__construct();
 	}
 }

demos/quickstart/protected/controls/DocLink.php

Braces +3 added lines, -2 removed lines

@@ -22,8 +22,9 @@
 		{
 			$classFile='class-'.array_pop($paths).'.html';
 			$this->setNavigateUrl(self::BASE_URL . '/' . $classFile);
-			if($this->getText() === '')
-				$this->setText('API Manual');
+			if($this->getText() === '') {
+							$this->setText('API Manual');
+			}
 		}
 	}
 }

demos/quickstart/protected/controls/SearchBox.php

Braces +3 added lines, -2 removed lines

@@ -23,8 +23,9 @@
 	public function onInit($param)
 	{
 		parent::onInit($param);
-		if(strlen($q = $this->Page->Request['q']) > 0)
-			$this->search->setText($q);
+		if(strlen($q = $this->Page->Request['q']) > 0) {
+					$this->search->setText($q);
+		}
 	}
 
 	public function doSearch($sender, $param)

demos/quickstart/protected/controls/Layout.php

Braces +11 added lines, -8 removed lines

@@ -4,8 +4,9 @@ 
 {
 	public function __construct()
 	{
-		if(isset($this->Request['notheme']))
-			$this->Service->RequestedPage->EnableTheming=false;
+		if(isset($this->Request['notheme'])) {
+					$this->Service->RequestedPage->EnableTheming=false;
+		}
 		parent::__construct();
 	}
 
@@ -13,10 +14,11 @@ 
 	{
 		parent::onLoad($param);
 		$url=$this->Request->RequestUri;
-		if(strpos($url,'?')===false)
-			$url.='?notheme=true';
-		else
-			$url.='&notheme=true';
+		if(strpos($url,'?')===false) {
+					$url.='?notheme=true';
+		} else {
+					$url.='&notheme=true';
+		}
 		$this->PrinterLink->NavigateUrl=$url;
 
 		if(isset($this->Request['notheme']))
@@ -40,8 +42,9 @@ 
 			unset($params[$this->Request->ServiceID]);
 			$url = $this->Service->ConstructUrl($this->Service->RequestedPagePath, $params);
 			$item->link->NavigateUrl = $url;
-			if($this->Application->Globalization->Culture == $params['lang'])
-				$item->link->CssClass="active";
+			if($this->Application->Globalization->Culture == $params['lang']) {
+							$item->link->CssClass="active";
+			}
 		}
 	}
 }

demos/quickstart/protected/controls/Comments/CommentBlock.php

Braces +6 added lines, -4 removed lines

@@ -37,8 +37,9 @@ 
 			$data = $this->getCommentData();
 			foreach($data as $r)
 			{
-				if(!isset($count[$r->block_id]))
-					$count[$r->block_id]=0;
+				if(!isset($count[$r->block_id])) {
+									$count[$r->block_id]=0;
+				}
 				$count[$r->block_id]++;
 			}
 			$js = "var comment_count = ".TJavascript::encode($count).";\n";
@@ -55,8 +56,9 @@ 
 
 	function add_comment($sender, $param)
 	{
-		if(!$this->Page->IsValid)
-			return;
+		if(!$this->Page->IsValid) {
+					return;
+		}
 		$record = new CommentRecord;
 		$record->username = $this->username->Text;
 		$record->date_added = date('Y-m-d h:i:s');