pradosoft / prado

buildscripts/classtree/build.php

Doc Comments +12 added lines

@@ -67,6 +67,9 @@ 
 		$this->displayTreeInternal(array_keys($this->_baseClasses),0);
 	}
 
+	/**
+	 * @param integer $level
+	 */
 	public function displayTreeInternal($classNames,$level)
 	{
 		foreach($classNames as $className)
@@ -153,6 +156,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $path
+	 */
 	protected function isValidPath($path)
 	{
 		if(is_dir($path))
@@ -161,6 +167,9 @@ 
 			return basename($path)!==basename($path,'.php') && !isset($this->_exclusions[basename($path)]);
 	}
 
+	/**
+	 * @param string $path
+	 */
 	public function getSourceFiles($path)
 	{
 		$files=array();
@@ -227,6 +236,9 @@ 
 
 	}
 
+	/**
+	 * @param PradoVTMDocument $doc
+	 */
 	private	function processObjectType($objectType,$objectInfo,$prefix,$doc)
 	{
 		foreach($objectInfo['Properties'] as $name=>$property)

Spacing +111 added lines, -111 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 
-$basePath=dirname(__FILE__);
-$frameworkPath=realpath($basePath.'/../../framework');
-require_once($frameworkPath.'/prado.php');
-require_once($basePath.'/DWExtension.php');
+$basePath = dirname(__FILE__);
+$frameworkPath = realpath($basePath . '/../../framework');
+require_once($frameworkPath . '/prado.php');
+require_once($basePath . '/DWExtension.php');
 
 //the manager class sets up some dependency paths
 Prado::using('System.Data.SqlMap.TSqlMapManager');
 
-$exclusions=array(
+$exclusions = array(
 	'pradolite.php',
 	'prado-cli.php',
 	'JSMin.php',
@@ -17,93 +17,93 @@ 
 	'/Testing',
 	'/Web/UI/WebControls/assets',
 	);
-$a=new ClassTreeBuilder($frameworkPath,$exclusions);
+$a = new ClassTreeBuilder($frameworkPath, $exclusions);
 $a->buildTree();
-$a->saveToFile($basePath.'/classes.data');
+$a->saveToFile($basePath . '/classes.data');
 $a->saveAsDWExtension($basePath);
 
 class ClassTreeBuilder
 {
-	const REGEX_RULES='/^\s*(abstract\s+)?class\s+(\w+)(\s+extends\s+(\w+)\s*|\s*)/msS';
+	const REGEX_RULES = '/^\s*(abstract\s+)?class\s+(\w+)(\s+extends\s+(\w+)\s*|\s*)/msS';
 	private $_frameworkPath;
 	private $_exclusions;
-	private $_classes=array();
+	private $_classes = array();
 
-	public function __construct($frameworkPath,$exclusions)
+	public function __construct($frameworkPath, $exclusions)
 	{
-		$this->_frameworkPath=realpath($frameworkPath);
-		$this->_exclusions=array();
-		foreach($exclusions as $exclusion)
+		$this->_frameworkPath = realpath($frameworkPath);
+		$this->_exclusions = array();
+		foreach ($exclusions as $exclusion)
 		{
-			if($exclusion[0]==='/')
-				$this->_exclusions[realpath($frameworkPath.'/'.$exclusion)]=true;
+			if ($exclusion[0] === '/')
+				$this->_exclusions[realpath($frameworkPath . '/' . $exclusion)] = true;
 			else
-				$this->_exclusions[$exclusion]=true;
+				$this->_exclusions[$exclusion] = true;
 		}
 	}
 
 	public function buildTree()
 	{
-		$sourceFiles=$this->getSourceFiles($this->_frameworkPath);
-		foreach($sourceFiles as $sourceFile)
+		$sourceFiles = $this->getSourceFiles($this->_frameworkPath);
+		foreach ($sourceFiles as $sourceFile)
 			$this->parseFile($sourceFile);
 		ksort($this->_classes);
-		foreach(array_keys($this->_classes) as $className)
+		foreach (array_keys($this->_classes) as $className)
 		{
-			$parentClass=$this->_classes[$className]['ParentClass'];
-			if(isset($this->_classes[$parentClass]))
-				$this->_classes[$parentClass]['ChildClasses'][]=$className;
+			$parentClass = $this->_classes[$className]['ParentClass'];
+			if (isset($this->_classes[$parentClass]))
+				$this->_classes[$parentClass]['ChildClasses'][] = $className;
 		}
-		echo "\nClass tree built successfully. Total ".count($this->_classes)." classes found.\n";
+		echo "\nClass tree built successfully. Total " . count($this->_classes) . " classes found.\n";
 	}
 
 	public function saveToFile($fileName)
 	{
-		file_put_contents($fileName,serialize($this->_classes));
+		file_put_contents($fileName, serialize($this->_classes));
 	}
 
 	public function displayTree()
 	{
-		$this->displayTreeInternal(array_keys($this->_baseClasses),0);
+		$this->displayTreeInternal(array_keys($this->_baseClasses), 0);
 	}
 
-	public function displayTreeInternal($classNames,$level)
+	public function displayTreeInternal($classNames, $level)
 	{
-		foreach($classNames as $className)
+		foreach ($classNames as $className)
 		{
-			echo str_repeat(' ',$level*4);
-			echo $className.':'.$this->_classes[$className]->Package."\n";
-			$this->displayTreeInternal(array_keys($this->_classes[$className]->ChildClasses),$level+1);
+			echo str_repeat(' ', $level * 4);
+			echo $className . ':' . $this->_classes[$className]->Package . "\n";
+			$this->displayTreeInternal(array_keys($this->_classes[$className]->ChildClasses), $level + 1);
 		}
 	}
 
 	protected function parseFile($sourceFile)
 	{
 		include_once($sourceFile);
-		$classFile=strtr(substr($sourceFile,strlen($this->_frameworkPath)),'\\','/');
+		$classFile = strtr(substr($sourceFile, strlen($this->_frameworkPath)), '\\', '/');
 		echo "Parsing $classFile...\n";
-		$content=file_get_contents($sourceFile);
-		if(preg_match('/@package\s+([\w\.]+)\s*/msS',$content,$matches)>0)
-			$package=$matches[1];
+		$content = file_get_contents($sourceFile);
+		if (preg_match('/@package\s+([\w\.]+)\s*/msS', $content, $matches) > 0)
+			$package = $matches[1];
 		else
-			$package='';
-		$n=preg_match_all(self::REGEX_RULES,$content,$matches,PREG_SET_ORDER);
-		for($i=0;$i<$n;++$i)
+			$package = '';
+		$n = preg_match_all(self::REGEX_RULES, $content, $matches, PREG_SET_ORDER);
+		for ($i = 0; $i < $n; ++$i)
 		{
-			$className=$matches[$i][2];
-			if(isset($this->_classes[$className]))
-				throw new Exception("Class $className is defined in both $sourceFile and ".$this->_classes[$className]->ClassFile);
-			$c=new TComponentReflection($className);
-			$properties=$c->getProperties();
+			$className = $matches[$i][2];
+			if (isset($this->_classes[$className]))
+				throw new Exception("Class $className is defined in both $sourceFile and " . $this->_classes[$className]->ClassFile);
+			$c = new TComponentReflection($className);
+			$properties = $c->getProperties();
 			$this->parseMethodComments($properties);
-			$events=$c->getEvents();
+			$events = $c->getEvents();
 			$this->parseMethodComments($events);
-			$methods=$c->getMethods();
+			$methods = $c->getMethods();
 			$this->parseMethodComments($methods);
-			$this->_classes[$className]=array(
+			$this->_classes[$className] = array(
 				'ClassFile'=>$classFile,
 				'Package'=>$package,
-				'ParentClass'=>isset($matches[$i][4])?$matches[$i][4]:'',
+				'ParentClass'=>isset($matches[$i][4]) ? $matches[$i][4] : '',
 				'ChildClasses'=>array(),
 				'Properties'=>$properties,
 				'Events'=>$events,
@@ -113,69 +113,69 @@ 
 
 	protected function parseMethodComments(&$methods)
 	{
-		foreach(array_keys($methods) as $key)
+		foreach (array_keys($methods) as $key)
 		{
-			$method=&$methods[$key];
-			$comments=$method['comments'];
-			$s='';
-			foreach(explode("\n",$comments) as $line)
+			$method = &$methods[$key];
+			$comments = $method['comments'];
+			$s = '';
+			foreach (explode("\n", $comments) as $line)
 			{
-				$line=trim($line);
-				$line=trim($line,'/*');
-				$s.=' '.$line;
+				$line = trim($line);
+				$line = trim($line, '/*');
+				$s .= ' ' . $line;
 			}
-			$s=trim($s);
-			$s=preg_replace('/\{@link.*?([\w\(\)]+)\}/i','$1',$s);
-			$pos1=strpos($s,'@');
-			$pos2=strpos($s,'.');
-			if($pos1===false)
+			$s = trim($s);
+			$s = preg_replace('/\{@link.*?([\w\(\)]+)\}/i', '$1', $s);
+			$pos1 = strpos($s, '@');
+			$pos2 = strpos($s, '.');
+			if ($pos1 === false)
 			{
-				if($pos2!==false)
-					$method['comments']=substr($s,0,$pos2);
+				if ($pos2 !== false)
+					$method['comments'] = substr($s, 0, $pos2);
 				else
-					$method['comments']=$s;
+					$method['comments'] = $s;
 			}
-			else if($pos1>0)
+			else if ($pos1 > 0)
 			{
-				if($pos2 && $pos2<$pos1)	// use the first line as comment
-					$method['comments']=substr($s,0,$pos2);
+				if ($pos2 && $pos2 < $pos1)	// use the first line as comment
+					$method['comments'] = substr($s, 0, $pos2);
 				else
-					$method['comments']=substr($s,0,$pos1);
+					$method['comments'] = substr($s, 0, $pos1);
 			}
 			else
 			{
-				$matches=array();
-				if(preg_match('/@return\s+[\w\|]+\s+([^\.]*)/',$s,$matches)>0)
-					$method['comments']=$matches[1];
+				$matches = array();
+				if (preg_match('/@return\s+[\w\|]+\s+([^\.]*)/', $s, $matches) > 0)
+					$method['comments'] = $matches[1];
 				else
-					$method['comments']='';
+					$method['comments'] = '';
 			}
 		}
 	}
 
 	protected function isValidPath($path)
 	{
-		if(is_dir($path))
+		if (is_dir($path))
 			return !isset($this->_exclusions[basename($path)]) && !isset($this->_exclusions[$path]);
 		else
-			return basename($path)!==basename($path,'.php') && !isset($this->_exclusions[basename($path)]);
+			return basename($path) !== basename($path, '.php') && !isset($this->_exclusions[basename($path)]);
 	}
 
 	public function getSourceFiles($path)
 	{
-		$files=array();
-		$folder=opendir($path);
-		while($file=readdir($folder))
+		$files = array();
+		$folder = opendir($path);
+		while ($file = readdir($folder))
 		{
-			if($file==='.' || $file==='..')
+			if ($file === '.' || $file === '..')
 				continue;
-			$fullPath=realpath($path.'/'.$file);
-			if($this->isValidPath($fullPath))
+			$fullPath = realpath($path . '/' . $file);
+			if ($this->isValidPath($fullPath))
 			{
-				if(is_file($fullPath))
-					$files[]=$fullPath;
+				if (is_file($fullPath))
+					$files[] = $fullPath;
 				else
-					$files=array_merge($files,$this->getSourceFiles($fullPath));
+					$files = array_merge($files, $this->getSourceFiles($fullPath));
 			}
 		}
 		closedir($folder);
@@ -184,71 +184,71 @@ 
 
 	public function saveAsDWExtension($basePath)
 	{
-		$tagPath=$basePath.'/Configuration/TagLibraries/PRADO';
+		$tagPath = $basePath . '/Configuration/TagLibraries/PRADO';
 
 		// prepare the directory to save tag lib
-		@mkdir($basePath.'/Configuration');
-		@mkdir($basePath.'/Configuration/TagLibraries');
-		@mkdir($basePath.'/Configuration/TagLibraries/PRADO');
+		@mkdir($basePath . '/Configuration');
+		@mkdir($basePath . '/Configuration/TagLibraries');
+		@mkdir($basePath . '/Configuration/TagLibraries/PRADO');
 
 		$docMXI = new PradoMXIDocument(Prado::getVersion());
 		$tagChooser = new PradoTagChooser;
 
 		$controlClass = new ReflectionClass('TControl');
 
-		foreach($this->_classes as $className=>$classInfo)
+		foreach ($this->_classes as $className=>$classInfo)
 		{
 			$class = new ReflectionClass($className);
-			if($class->isInstantiable() && ($className==='TControl' || $class->isSubclassOf($controlClass)))
+			if ($class->isInstantiable() && ($className === 'TControl' || $class->isSubclassOf($controlClass)))
 			{
 				$docMXI->addTag($className);
 				$tagChooser->addElement($className);
 				$docVTM = new PradoVTMDocument($className);
-				foreach($classInfo['Properties'] as $name=>$property)
+				foreach ($classInfo['Properties'] as $name=>$property)
 				{
-					$type=$property['type'];
-					if(isset($this->_classes[$type]) && ($type==='TFont' || strrpos($type,'Style')===strlen($type)-5 && $type!=='TStyle'))
-						$this->processObjectType($type,$this->_classes[$type],$name,$docVTM);
-					if($property['readonly'] || $property['protected'])
+					$type = $property['type'];
+					if (isset($this->_classes[$type]) && ($type === 'TFont' || strrpos($type, 'Style') === strlen($type) - 5 && $type !== 'TStyle'))
+						$this->processObjectType($type, $this->_classes[$type], $name, $docVTM);
+					if ($property['readonly'] || $property['protected'])
 						continue;
-					if(($type=$this->checkType($className,$name,$property['type']))!=='')
-						$docVTM->addAttribute($name,$type);
+					if (($type = $this->checkType($className, $name, $property['type'])) !== '')
+						$docVTM->addAttribute($name, $type);
 				}
-				foreach($classInfo['Events'] as $name=>$event)
+				foreach ($classInfo['Events'] as $name=>$event)
 				{
 					$docVTM->addEvent($name);
 				}
-				file_put_contents($tagPath.'/'.$className.'.vtm',$docVTM->getXML());
+				file_put_contents($tagPath . '/' . $className . '.vtm', $docVTM->getXML());
 			}
 		}
 
-		file_put_contents($basePath.'/PRADO.mxi',$docMXI->getXML());
-		file_put_contents($tagPath.'/TagChooser.xml',$tagChooser->getXML());
+		file_put_contents($basePath . '/PRADO.mxi', $docMXI->getXML());
+		file_put_contents($tagPath . '/TagChooser.xml', $tagChooser->getXML());
 
 	}
 
-	private	function processObjectType($objectType,$objectInfo,$prefix,$doc)
+	private	function processObjectType($objectType, $objectInfo, $prefix, $doc)
 	{
-		foreach($objectInfo['Properties'] as $name=>$property)
+		foreach ($objectInfo['Properties'] as $name=>$property)
 		{
-			if($property['type']==='TFont')
-				$this->processObjectType('TFont',$this->_classes['TFont'],$prefix.'.'.$name,$doc);
-			if($property['readonly'] || $property['protected'])
+			if ($property['type'] === 'TFont')
+				$this->processObjectType('TFont', $this->_classes['TFont'], $prefix . '.' . $name, $doc);
+			if ($property['readonly'] || $property['protected'])
 				continue;
-			if(($type=$this->checkType($objectType,$name,$property['type']))!=='')
-				$doc->addAttribute($prefix.'.'.$name,$type);
+			if (($type = $this->checkType($objectType, $name, $property['type'])) !== '')
+				$doc->addAttribute($prefix . '.' . $name, $type);
 		}
 	}
 
-	private	function checkType($className,$propertyName,$type)
+	private	function checkType($className, $propertyName, $type)
 	{
-		if(strrpos($propertyName,'Color')===strlen($propertyName)-5)
+		if (strrpos($propertyName, 'Color') === strlen($propertyName) - 5)
 			return 'color';
-		if($propertyName==='Style')
+		if ($propertyName === 'Style')
 			return 'style';
-		if($type==='boolean')
-			return array('true','false');
-		if($type==='string' || $type==='integer' || $type==='ITemplate')
+		if ($type === 'boolean')
+			return array('true', 'false');
+		if ($type === 'string' || $type === 'integer' || $type === 'ITemplate')
 			return 'text';
 		return '';
 	}

Braces +5 added lines, -6 removed lines

@@ -45,8 +45,9 @@ 
 	public function buildTree()
 	{
 		$sourceFiles=$this->getSourceFiles($this->_frameworkPath);
-		foreach($sourceFiles as $sourceFile)
-			$this->parseFile($sourceFile);
+		foreach($sourceFiles as $sourceFile) {
+					$this->parseFile($sourceFile);
+		}
 		ksort($this->_classes);
 		foreach(array_keys($this->_classes) as $className)
 		{
@@ -134,15 +135,13 @@ 
 					$method['comments']=substr($s,0,$pos2);
 				else
 					$method['comments']=$s;
-			}
-			else if($pos1>0)
+			} else if($pos1>0)
 			{
 				if($pos2 && $pos2<$pos1)	// use the first line as comment
 					$method['comments']=substr($s,0,$pos2);
 				else
 					$method['comments']=substr($s,0,$pos1);
-			}
-			else
+			} else
 			{
 				$matches=array();
 				if(preg_match('/@return\s+[\w\|]+\s+([^\.]*)/',$s,$matches)>0)

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -81,7 +81,7 @@ 
 	{
 		include_once($sourceFile);
 		$classFile=strtr(substr($sourceFile,strlen($this->_frameworkPath)),'\\','/');
-		echo "Parsing $classFile...\n";
+		echo "parsing $classFile...\n";
 		$content=file_get_contents($sourceFile);
 		if(preg_match('/@package\s+([\w\.]+)\s*/msS',$content,$matches)>0)
 			$package=$matches[1];
@@ -92,7 +92,7 @@ 
 		{
 			$className=$matches[$i][2];
 			if(isset($this->_classes[$className]))
-				throw new Exception("Class $className is defined in both $sourceFile and ".$this->_classes[$className]->ClassFile);
+				throw new Exception("class $className is defined in both $sourceFile and ".$this->_classes[$className]->ClassFile);
 			$c=new TComponentReflection($className);
 			$properties=$c->getProperties();
 			$this->parseMethodComments($properties);

buildscripts/index/api_index.php

Doc Comments +3 added lines

@@ -10,6 +10,9 @@
 	private $_index;	
 	private $_api;
 	
+	/**
+	 * @param string $api
+	 */
 	public function __construct($index_file, $api)
 	{
 		$this->_api = $api;

Spacing +13 added lines, -13 removed lines

@@ -23,7 +23,7 @@ 
 		echo "Building search index...\n";
 		$files = $this->get_files($this->_api);
 		$count = 0;
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
 			$content = $this->get_details($file, $this->_api);
 			
@@ -31,7 +31,7 @@ 
 			
 			$title = $content['class'];
 			
-			echo "  Adding ".$title."\n";
+			echo "  Adding " . $title . "\n";
 			
 			//unsearchable text
 			$doc->addField(Zend_Search_Lucene_Field::UnIndexed('link', $content['link']));
@@ -39,9 +39,9 @@ 
 			//$doc->addField(Zend_Search_Lucene_Field::UnIndexed('text', $content['content']));
 			
 			//searchable
-			$body = strtolower($this->sanitize($content['content'])).' '.strtolower($title);			
-			$doc->addField(Zend_Search_Lucene_Field::Keyword('page', strtolower(str_replace('.',' ',$title))));
-			$doc->addField(Zend_Search_Lucene_Field::Unstored('contents',$body));
+			$body = strtolower($this->sanitize($content['content'])) . ' ' . strtolower($title);			
+			$doc->addField(Zend_Search_Lucene_Field::Keyword('page', strtolower(str_replace('.', ' ', $title))));
+			$doc->addField(Zend_Search_Lucene_Field::Unstored('contents', $body));
 			$this->_index->addDocument($doc);
 			$count++;
 		}
@@ -51,7 +51,7 @@ 
 
 	function sanitize($input) 
 	{
-		return htmlentities(strip_tags( $input ));
+		return htmlentities(strip_tags($input));
 	}	
 
 	function get_files($path)
@@ -61,8 +61,8 @@ 
 		$files = array();
 		while (false !== ($entry = $d->read()))
 		{
-			$filepath = $path.'/'.$entry;
-			if(is_file($filepath) && strpos($entry, 'class-')===0)
+			$filepath = $path . '/' . $entry;
+			if (is_file($filepath) && strpos($entry, 'class-') === 0)
 				$files[] = realpath($filepath);
 		}
 		$d->close();
@@ -72,13 +72,13 @@ 
 	function get_doc_content($file)
 	{
 		$content = file_get_contents($file);
-		$html = preg_replace('/<h1>/','~~~', $content);
+		$html = preg_replace('/<h1>/', '~~~', $content);
 		$html = preg_replace('/<![^~]+/m', '', $html);
 		$html = preg_replace('/<div class="credit">[\s\w\W\S]+/m', '', $html);
-		$html = preg_replace('/&nbsp;|~+|\s{2,}/',' ',$html);
-		$html = preg_replace('/\s{2,}/',' ',$html);
+		$html = preg_replace('/&nbsp;|~+|\s{2,}/', ' ', $html);
+		$html = preg_replace('/\s{2,}/', ' ', $html);
 		$text = strip_tags($html);
-		$text = str_replace(' , ',', ',$text);
+		$text = str_replace(' , ', ', ', $text);
 		return $text;
 	}
 	
@@ -89,7 +89,7 @@ 
 		$replace = array('', '', '');
 		$path = str_replace($find, $replace, $file);
 		$result['class'] = $path;
-		$result['link'] = self::API_URL.$file;
+		$result['link'] = self::API_URL . $file;
 		return $result;
 	}
 }

buildscripts/index/quickstart_index.php

Doc Comments +8 added lines

@@ -8,6 +8,10 @@ 
 	private $_base;
 	private $_source;
 
+	/**
+	 * @param string $base
+	 * @param string $source
+	 */
 	public function __construct($index_file, $base, $source)
 	{
 		$this->_index = new Zend_Search_Lucene($index_file, true);
@@ -37,6 +41,10 @@ 
 		echo "\n {$count} files indexed.\n";
 	}
 
+	/**
+	 * @param string $content
+	 * @param integer $mtime
+	 */
 	public function add($content, $section, $mtime)
 	{
 		foreach($this->split_headings($content) as $headers)

Spacing +14 added lines, -14 removed lines

@@ -21,14 +21,14 @@ 
 		echo "Building search index...\n";
 		$pages = include($this->_source);
 		$count = 0;
-		foreach($pages as $chapter => $sections)
+		foreach ($pages as $chapter => $sections)
 		{
-			foreach($sections as $section)
+			foreach ($sections as $section)
 			{
 				echo "    Adding $section\n";
-				$page = $this->_base.'/'.$section;
+				$page = $this->_base . '/' . $section;
 				$file_content = file_get_contents($page);
-				$this->add($file_content,$section, filemtime($page));
+				$this->add($file_content, $section, filemtime($page));
 				$count++;
 			}
 		}
@@ -39,11 +39,11 @@ 
 
 	public function add($content, $section, $mtime)
 	{
-		foreach($this->split_headings($content) as $headers)
+		foreach ($this->split_headings($content) as $headers)
 		{
 			$doc = new Zend_Search_Lucene_Document();
-			$link = "index.php?page=".preg_replace('/\/|\\\/', '.', $section);
-			$link = str_replace('.page', '', $link).'#'.$headers['section'];
+			$link = "index.php?page=" . preg_replace('/\/|\\\/', '.', $section);
+			$link = str_replace('.page', '', $link) . '#' . $headers['section'];
 
 			//unsearchable text
 			$doc->addField(Zend_Search_Lucene_Field::UnIndexed('link', $link));
@@ -53,15 +53,15 @@ 
 
 			//searchable text
 			$doc->addField(Zend_Search_Lucene_Field::Keyword('page', strtolower($headers['title'])));
-			$body = strtolower($this->sanitize($headers['content'])).' '.strtolower($headers['title']);
-			$doc->addField(Zend_Search_Lucene_Field::Unstored('contents',$body));
+			$body = strtolower($this->sanitize($headers['content'])) . ' ' . strtolower($headers['title']);
+			$doc->addField(Zend_Search_Lucene_Field::Unstored('contents', $body));
 			$this->_index->addDocument($doc);
 		}
 	}
 
 	function sanitize($input)
 	{
-		return htmlentities(strip_tags( $input ));
+		return htmlentities(strip_tags($input));
 	}
 
 	public function index()
@@ -82,14 +82,14 @@ 
 		$html = preg_replace('/<h3([^>]*)>([^<]*)<\/h3>/', '<hh$1>$2</hh>', $html);
 
 
-		$sections = preg_split('/<hh[^>]*>([^<]+)<\/hh>/', $html,-1);
+		$sections = preg_split('/<hh[^>]*>([^<]+)<\/hh>/', $html, -1);
 		$headers = array();
 		preg_match_all('/<hh([^>]*)>([^<]+)<\/hh>/', $html, $headers);
 		$contents = array();
-		for($i = 1, $t = count($sections); $i < $t; $i++)
+		for ($i = 1, $t = count($sections); $i < $t; $i++)
 		{
-			$content['title'] = trim($this->sanitize($headers[2][$i-1]));
-			$content['section'] = str_replace('"', '',trim($headers[1][$i-1],'"'));
+			$content['title'] = trim($this->sanitize($headers[2][$i - 1]));
+			$content['section'] = str_replace('"', '', trim($headers[1][$i - 1], '"'));
 			$content['content'] = trim($this->sanitize($sections[$i]));
 			$contents[] = $content;
 		}

buildscripts/texbuilder/Page2Tex.php

Doc Comments +3 added lines

@@ -71,6 +71,9 @@
 		}
 	}
 
+	/**
+	 * @param string $filename
+	 */
 	function include_figure($info, $filename)
 	{
 		$width = sprintf('%0.2f', $info[0]/(135/2.54));

Indentation +2 added lines, -2 removed lines

@@ -167,10 +167,10 @@
 
 		//DocLink
 		$html = preg_replace('/<com:DocLink\s+ClassPath="([^"]*)[.]([^."]*)"\s+Text="([^"]+)"\s*\/>/',
-	                        '\href{http://pradosoft.github.io/docs/manual/$1/$2.html}{$3}', $html);
+							'\href{http://pradosoft.github.io/docs/manual/$1/$2.html}{$3}', $html);
 
 		$html = preg_replace('/<com:DocLink\s+ClassPath="([^"]*)[.]([^.]*)"\s+\/>/',
-	                        '\href{http://pradosoft.github.io/docs/manual/$1/$2.html}{$1.$2 API Reference}', $html);
+							'\href{http://pradosoft.github.io/docs/manual/$1/$2.html}{$1.$2 API Reference}', $html);
 
 		//text modifiers
 		$html = preg_replace('/<(b|strong)[^>]*>([^<]*)<\/(b|strong)>/', '\textbf{$2}', $html);

Spacing +72 added lines, -72 removed lines

@@ -4,16 +4,16 @@ 
 {
 	private $_current_page;
 	private static $header_count = 0;
-	private static $p_count=0;
-	private static $hil_count=0;
-	private $page_count=0;
+	private static $p_count = 0;
+	private static $hil_count = 0;
+	private $page_count = 0;
 	private $_base;
 	private $_dir;
 
-	private $_verb_find = array('\$','\%', '\{', '\}', "\t",'``','`');
-	private $_verb_replace = array('$', '%', '{','}', "     ",'"','\'');
+	private $_verb_find = array('\$', '\%', '\{', '\}', "\t", '``', '`');
+	private $_verb_replace = array('$', '%', '{', '}', "     ", '"', '\'');
 
-	function __construct($base, $dir, $current='')
+	function __construct($base, $dir, $current = '')
 	{
 		$this->_base = $base;
 		$this->_current_page = $current;
@@ -22,21 +22,21 @@ 
 
 	function setCurrentPage($current)
 	{
-		self::$header_count = self::$header_count+1000;
+		self::$header_count = self::$header_count + 1000;
 		$this->_current_page = $current;
 	}
 
 	function escape_verbatim($matches)
 	{
-		return "\begin{small}\begin{verbatim}".
-				str_replace($this->_verb_find, $this->_verb_replace, $matches[1]).
-				'\end{verbatim}\end{small}'."\n";
+		return "\begin{small}\begin{verbatim}" .
+				str_replace($this->_verb_find, $this->_verb_replace, $matches[1]) .
+				'\end{verbatim}\end{small}' . "\n";
 	}
 
 	function escape_verb($matches)
 	{
 		$text = str_replace($this->_verb_find, $this->_verb_replace, $matches[1]);
-		return '\begin{small}\verb<'.$text.'< \end{small}';
+		return '\begin{small}\verb<' . $text . '< \end{small}';
 	}
 
 	function include_image($matches)
@@ -44,11 +44,11 @@ 
 
 		$current_path = $this->_current_page;
 
-		$image = dirname($current_path).'/'.trim($matches[1]);
+		$image = dirname($current_path) . '/' . trim($matches[1]);
 
 		$file = realpath($image);
 		$info = getimagesize($file);
-		switch($info[2])
+		switch ($info[2])
 		{
 			case 1:
 				$im = imagecreatefromgif($file);
@@ -58,13 +58,13 @@ 
 		}
 		$base = $this->_base;
 
-		if(isset($im))
+		if (isset($im))
 		{
 			$prefix = strtolower(str_replace(realpath($base), '', $file));
-			$filename = preg_replace('/\\\|\//', '_', substr($prefix,1));
-			$filename = substr($filename, 0, strrpos($filename,'.')).'.png';
-			$newfile = $this->_dir.'/'.$filename;
-			imagepng($im,$newfile);
+			$filename = preg_replace('/\\\|\//', '_', substr($prefix, 1));
+			$filename = substr($filename, 0, strrpos($filename, '.')) . '.png';
+			$newfile = $this->_dir . '/' . $filename;
+			imagepng($im, $newfile);
 			imagedestroy($im);
 
 			return $this->include_figure($info, $filename);
@@ -73,12 +73,12 @@ 
 
 	function include_figure($info, $filename)
 	{
-		$width = sprintf('%0.2f', $info[0]/(135/2.54));
+		$width = sprintf('%0.2f', $info[0] / (135 / 2.54));
 		return '
 	\begin{figure}[!ht]
 		\centering
-			\includegraphics[width='.$width.'cm]{'.$filename.'}
-		\label{fig:'.$filename.'}
+			\includegraphics[width='.$width . 'cm]{' . $filename . '}
+		\label{fig:'.$filename . '}
 	\end{figure}
 	';
 	}
@@ -86,12 +86,12 @@ 
 	function anchor($matches)
 	{
 		$page = $this->get_current_path();
-		return '\hypertarget{'.$page.'/'.strtolower($matches[1]).'}{}';
+		return '\hypertarget{' . $page . '/' . strtolower($matches[1]) . '}{}';
 	}
 
 	function texttt($matches)
 	{
-		$text ='\texttt{'.str_replace(array('#','_','&amp;'),array('\#','\_','\&'), $matches[1]).'}';
+		$text = '\texttt{' . str_replace(array('#', '_', '&amp;'), array('\#', '\_', '\&'), $matches[1]) . '}';
 		//$text = preg_replace('/([^\\\\])&([^;]+)/', '$1\&$2', $text);
 		return $text;
 	}
@@ -100,39 +100,39 @@ 
 	{
 		$current_path = $this->_current_page;
 		$base = $this->_base;
-		$page = strtolower(substr(str_replace($base, '', $current_path),1));
+		$page = strtolower(substr(str_replace($base, '', $current_path), 1));
 		return $page;
 	}
 
 	function make_link($matches)
 	{
-		if(is_int(strpos($matches[1], '#')))
+		if (is_int(strpos($matches[1], '#')))
 		{
-			if(strpos($matches[1],'?') ===false)
+			if (strpos($matches[1], '?') === false)
 			{
-				if(strpos($matches[1],'http://')===false)
+				if (strpos($matches[1], 'http://') === false)
 				{
-					$target = $this->get_current_path().'/'.substr($matches[1],1);
-					return '\hyperlink{'.$target.'}{'.$matches[2].'}';
+					$target = $this->get_current_path() . '/' . substr($matches[1], 1);
+					return '\hyperlink{' . $target . '}{' . $matches[2] . '}';
 				}
 			}
 			else
 			{
 				$page = strtolower(str_replace('?page=', '', $matches[1]));
-				$page = str_replace('.','/',$page);
-				$page = str_replace('#','.page/',$page);
-				return '\hyperlink{'.$page.'}{'.$matches[2].'}';
+				$page = str_replace('.', '/', $page);
+				$page = str_replace('#', '.page/', $page);
+				return '\hyperlink{' . $page . '}{' . $matches[2] . '}';
 			}
 		}
-		else if(is_int(strpos($matches[1],'?')))
+		else if (is_int(strpos($matches[1], '?')))
 		{
-			$page = str_replace('?page=','',$matches[1]);
-			return '\hyperlink{'.$page.'}{'.$matches[2].'}';
+			$page = str_replace('?page=', '', $matches[1]);
+			return '\hyperlink{' . $page . '}{' . $matches[2] . '}';
 		}
-		return '\href{'.str_replace('#','\\#',$matches[1]).'}{'.$matches[2].'}';
+		return '\href{' . str_replace('#', '\\#', $matches[1]) . '}{' . $matches[2] . '}';
 	}
 
-	function parse_html($page,$html)
+	function parse_html($page, $html)
 	{
 		$html = preg_replace('/<\/?com:TContent[^>]*>/', '', $html);
 		$html = preg_replace('/<\/?p [^>]*>/', '', $html);
@@ -152,14 +152,14 @@ 
 		//codes
 		$html = str_replace('$', '\$', $html);
 
-		$html = preg_replace_callback('/<com:TTextHighlighter[^>]*>((.|\n)*?)<\/com:TTextHighlighter\s*>/', array($this,'escape_verbatim'), $html);
+		$html = preg_replace_callback('/<com:TTextHighlighter[^>]*>((.|\n)*?)<\/com:TTextHighlighter\s*>/', array($this, 'escape_verbatim'), $html);
 //		$html = preg_replace('/<\/com:TTextHighlighter>/', '`2`', $html);
 //		$html = preg_replace_callback('/(`1`)([^`]*)(`2`)/m', array($this,'escape_verbatim'), $html);
-		$html = preg_replace_callback('/(<div class="source">)((.|\n)*?)(<\/div>)/', array($this,'escape_verbatim'), $html);
-		$html = preg_replace_callback('/(<pre>)([^<]*)(<\/pre>)/', array($this,'escape_verbatim'), $html);
+		$html = preg_replace_callback('/(<div class="source">)((.|\n)*?)(<\/div>)/', array($this, 'escape_verbatim'), $html);
+		$html = preg_replace_callback('/(<pre>)([^<]*)(<\/pre>)/', array($this, 'escape_verbatim'), $html);
 
 		//<code>
-		$html = preg_replace_callback('/<code>([^<]*)<\/code>/', array($this,'escape_verb'), $html);
+		$html = preg_replace_callback('/<code>([^<]*)<\/code>/', array($this, 'escape_verb'), $html);
 
 		//runbar
 		$html = preg_replace('/<com:RunBar\s+PagePath="([^"]*)"\s+\/>/',
@@ -175,13 +175,13 @@ 
 		//text modifiers
 		$html = preg_replace('/<(b|strong)[^>]*>([^<]*)<\/(b|strong)>/', '\textbf{$2}', $html);
 		$html = preg_replace('/<i [^>]*>([^<]*)+?<\/i>/', '\emph{$1}', $html);
-		$html = preg_replace_callback('/<tt>([^<]*)<\/tt>/', array($this,'texttt'), $html);
+		$html = preg_replace_callback('/<tt>([^<]*)<\/tt>/', array($this, 'texttt'), $html);
 
 		//links
 		$html = preg_replace_callback('/<a[^>]+href="([^"]*)"[^>]*>([^<]*)<\/a>/',
-								array($this,'make_link'), $html);
+								array($this, 'make_link'), $html);
 		//anchor
-		$html = preg_replace_callback('/<a[^>]+name="([^"]*)"[^>]*><\/a>/', array($this,'anchor'), $html);
+		$html = preg_replace_callback('/<a[^>]+name="([^"]*)"[^>]*><\/a>/', array($this, 'anchor'), $html);
 
 		//description <dl>
 		$html = preg_replace('/<dt>([^<]*)<\/dt>/', '\item[$1]', $html);
@@ -230,20 +230,20 @@ 
 	function tabular($matches)
 	{
 		$options = array();
-		foreach(explode(',', $matches[1]) as $string)
+		foreach (explode(',', $matches[1]) as $string)
 		{
 			$sub = explode('=', trim($string));
 			$options[trim($sub[0])] = trim($sub[1]);
 		}
 
-		$widths = explode(' ',preg_replace('/\(|\)/', '', $options['width']));
+		$widths = explode(' ', preg_replace('/\(|\)/', '', $options['width']));
 		$this->_tabular_widths = $widths;
 
 		$this->_tabular_total = count($widths);
 		$this->_tabular_col = 0;
 
-		$begin = '\begin{table}[!hpt]\centering '."\n".' \begin{tabular}{'.$options['align'].'}\hline';
-		$end = '\end{tabular} '."\n".'\end{table}'."\n";
+		$begin = '\begin{table}[!hpt]\centering ' . "\n" . ' \begin{tabular}{' . $options['align'] . '}\hline';
+		$end = '\end{tabular} ' . "\n" . '\end{table}' . "\n";
 		$table = preg_replace('/<\/tr>/', '\\\\\\\\ \hline', $matches[2]);
 		$table = preg_replace('/<tr>/', '', $table);
 		$table = preg_replace('/<th>([^<]+)<\/th>/', '\textbf{$1} &', $table);
@@ -251,95 +251,95 @@ 
 		$table = preg_replace('/<br \/>/', ' \\\\\\\\', $table);
 
 		$table = preg_replace('/&\s*\\\\\\\\/', '\\\\\\\\', $table);
-		return $begin.$table.$end;
+		return $begin . $table . $end;
 	}
 
 	function table_column($matches)
 	{
 		$width = $this->_tabular_widths[$this->_tabular_col];
-		if($this->_tabular_col >= $this->_tabular_total-1)
+		if ($this->_tabular_col >= $this->_tabular_total - 1)
 			$this->_tabular_col = 0;
 		else
 			$this->_tabular_col++;
-		return '\begin{minipage}{'.$width.'\textwidth}\vspace{3mm}'.
-			$matches[1].'\vspace{3mm}\end{minipage} & ';
+		return '\begin{minipage}{' . $width . '\textwidth}\vspace{3mm}' .
+			$matches[1] . '\vspace{3mm}\end{minipage} & ';
 	}
 
 	function mbox($matches)
 	{
-		return "\n\begin{mybox}\n".$matches[1]."\n".'\end{mybox}'."\n";
+		return "\n\begin{mybox}\n" . $matches[1] . "\n" . '\end{mybox}' . "\n";
 	}
 
 	function get_chapter_label($chapter)
 	{
-		return '\hypertarget{'.str_replace(' ', '', $chapter).'}{}';
+		return '\hypertarget{' . str_replace(' ', '', $chapter) . '}{}';
 	}
 
 	function get_section_label($section)
 	{
 		$section = str_replace('.page', '', $section);
-		return '\hypertarget{'.str_replace('/', '.', $section).'}{}';
+		return '\hypertarget{' . str_replace('/', '.', $section) . '}{}';
 	}
 
 
 	function set_header_id($content, $j)
 	{
-		$this->page_count=$j;
-		$content = preg_replace_callback('/<h1>/', array($this,"h1"), $content);
-		$content = preg_replace_callback('/<h2>/', array($this,"h2"), $content);
-		$content = preg_replace_callback('/<h3>/', array($this,"h3"), $content);
+		$this->page_count = $j;
+		$content = preg_replace_callback('/<h1>/', array($this, "h1"), $content);
+		$content = preg_replace_callback('/<h2>/', array($this, "h2"), $content);
+		$content = preg_replace_callback('/<h3>/', array($this, "h3"), $content);
 		$content = $this->set_block_content_id($content);
 		return $content;
 	}
 
 	function h1($matches)
 	{
-		$page = $this->page_count*1000;
-		return "<h1 id=\"".($page + (++self::$header_count))."\">";
+		$page = $this->page_count * 1000;
+		return "<h1 id=\"" . ($page + (++self::$header_count)) . "\">";
 	}
 
 	function h2($matches)
 	{
-		$page = $this->page_count*1000;
-		return "<h2 id=\"".($page + (++self::$header_count))."\">";
+		$page = $this->page_count * 1000;
+		return "<h2 id=\"" . ($page + (++self::$header_count)) . "\">";
 	}
 
 	function h3($matches)
 	{
-		$page = $this->page_count*1000;
-		return "<h3 id=\"".($page + (++self::$header_count))."\">";
+		$page = $this->page_count * 1000;
+		return "<h3 id=\"" . ($page + (++self::$header_count)) . "\">";
 	}
 
 	function set_block_content_id($content)
 	{
-		$content = preg_replace_callback('/<p>/',  array($this, 'add_p'), $content);
+		$content = preg_replace_callback('/<p>/', array($this, 'add_p'), $content);
 		$content = preg_replace_callback('/<com:TTextHighlighter([^>]+)>/', array($this, 'hil'), $content);
 		return $content;
 	}
 
 	function hil($matches)
 	{
-		$id = ($this->page_count*10000) + (++self::$hil_count);
-		if(preg_match('/id="code-\d+"/i', $matches[1]))
+		$id = ($this->page_count * 10000) + (++self::$hil_count);
+		if (preg_match('/id="code-\d+"/i', $matches[1]))
 		{
 			$code = preg_replace('/id="code-(\d+)"/', 'id="code_$1"', $matches[0]);
 			//var_dump($code);
 			return $code;
 		}
-		else if(preg_match('/id="[^"]+"/i', $matches[1]))
+		else if (preg_match('/id="[^"]+"/i', $matches[1]))
 		{
 			return $matches[0];
 		}
 		else
 		{
-			$changes = str_replace('"source"', '"source block-content" id="code-'.$id.'"', $matches[0]);
+			$changes = str_replace('"source"', '"source block-content" id="code-' . $id . '"', $matches[0]);
 			return $changes;
 		}
 	}
 
 	function add_p($matches)
 	{
-		 $page = $this->page_count*10000;
-		 return "<p id=\"".($page + (++self::$p_count))."\" class=\"block-content\">";
+		 $page = $this->page_count * 10000;
+		 return "<p id=\"" . ($page + (++self::$p_count)) . "\" class=\"block-content\">";
 	}
 }

Braces +4 added lines, -8 removed lines

@@ -115,16 +115,14 @@ 
 					$target = $this->get_current_path().'/'.substr($matches[1],1);
 					return '\hyperlink{'.$target.'}{'.$matches[2].'}';
 				}
-			}
-			else
+			} else
 			{
 				$page = strtolower(str_replace('?page=', '', $matches[1]));
 				$page = str_replace('.','/',$page);
 				$page = str_replace('#','.page/',$page);
 				return '\hyperlink{'.$page.'}{'.$matches[2].'}';
 			}
-		}
-		else if(is_int(strpos($matches[1],'?')))
+		} else if(is_int(strpos($matches[1],'?')))
 		{
 			$page = str_replace('?page=','',$matches[1]);
 			return '\hyperlink{'.$page.'}{'.$matches[2].'}';
@@ -325,12 +323,10 @@ 
 			$code = preg_replace('/id="code-(\d+)"/', 'id="code_$1"', $matches[0]);
 			//var_dump($code);
 			return $code;
-		}
-		else if(preg_match('/id="[^"]+"/i', $matches[1]))
+		} else if(preg_match('/id="[^"]+"/i', $matches[1]))
 		{
 			return $matches[0];
-		}
-		else
+		} else
 		{
 			$changes = str_replace('"source"', '"source block-content" id="code-'.$id.'"', $matches[0]);
 			return $changes;

demos/blog-tutorial/samples/day4/blog/protected/pages/posts/ListPost.php

Doc Comments +1 added lines

@@ -48,6 +48,7 @@
 
 	/**
 	 * Fetches posts from database with offset and limit.
+	 * @param double $offset
 	 */
 	protected function getPosts($offset, $limit)
 	{

Spacing +13 added lines, -13 removed lines

@@ -10,10 +10,10 @@ 
 	public function onInit($param)
 	{
 		parent::onInit($param);
-		if(!$this->IsPostBack)  // if the page is requested the first time
+		if (!$this->IsPostBack)  // if the page is requested the first time
 		{
 			// get the total number of posts available
-			$this->Repeater->VirtualItemCount=PostRecord::finder()->count();
+			$this->Repeater->VirtualItemCount = PostRecord::finder()->count();
 			// populates post data into the repeater
 			$this->populateData();
 		}
@@ -24,10 +24,10 @@ 
 	 * This method is invoked when the user clicks on a page button
 	 * and thus changes the page of posts to display.
 	 */
-	public function pageChanged($sender,$param)
+	public function pageChanged($sender, $param)
 	{
 		// change the current page index to the new one
-		$this->Repeater->CurrentPageIndex=$param->NewPageIndex;
+		$this->Repeater->CurrentPageIndex = $param->NewPageIndex;
 		// re-populate data into the repeater
 		$this->populateData();
 	}
@@ -38,11 +38,11 @@ 
 	 */
 	protected function populateData()
 	{
-		$offset=$this->Repeater->CurrentPageIndex*$this->Repeater->PageSize;
-		$limit=$this->Repeater->PageSize;
-		if($offset+$limit>$this->Repeater->VirtualItemCount)
-			$limit=$this->Repeater->VirtualItemCount-$offset;
-		$this->Repeater->DataSource=$this->getPosts($offset,$limit);
+		$offset = $this->Repeater->CurrentPageIndex * $this->Repeater->PageSize;
+		$limit = $this->Repeater->PageSize;
+		if ($offset + $limit > $this->Repeater->VirtualItemCount)
+			$limit = $this->Repeater->VirtualItemCount - $offset;
+		$this->Repeater->DataSource = $this->getPosts($offset, $limit);
 		$this->Repeater->dataBind();
 	}
 
@@ -52,10 +52,10 @@ 
 	protected function getPosts($offset, $limit)
 	{
 		// Construts a query criteria
-		$criteria=new TActiveRecordCriteria;
-		$criteria->OrdersBy['create_time']='desc';
-		$criteria->Limit=$limit;
-		$criteria->Offset=$offset;
+		$criteria = new TActiveRecordCriteria;
+		$criteria->OrdersBy['create_time'] = 'desc';
+		$criteria->Limit = $limit;
+		$criteria->Offset = $offset;
 		// query for the posts with the above criteria and with author information
 		return PostRecord::finder()->withAuthor()->findAll($criteria);
 	}

demos/blog/protected/Common/BlogDataModule.php

Doc Comments +3 added lines

@@ -28,6 +28,9 @@
 		$this->connectDatabase();
 	}
 
+	/**
+	 * @return string
+	 */
 	public function getDbFile()
 	{
 		if($this->_dbFile===null)

Spacing +232 added lines, -232 removed lines

@@ -18,10 +18,10 @@ 
  */
 class BlogDataModule extends TModule
 {
-	const DB_FILE_EXT='.db';
-	const DEFAULT_DB_FILE='Application.Data.Blog';
-	private $_db=null;
-	private $_dbFile=null;
+	const DB_FILE_EXT = '.db';
+	const DEFAULT_DB_FILE = 'Application.Data.Blog';
+	private $_db = null;
+	private $_dbFile = null;
 
 	public function init($config)
 	{
@@ -30,32 +30,32 @@ 
 
 	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()
 	{
-		$schemaFile=dirname(__FILE__).'/schema.sql';
-		$statements=explode(';',file_get_contents($schemaFile));
-		foreach($statements as $statement)
+		$schemaFile = dirname(__FILE__) . '/schema.sql';
+		$statements = explode(';', file_get_contents($schemaFile));
+		foreach ($statements as $statement)
 		{
-			if(trim($statement)!=='')
+			if (trim($statement) !== '')
 			{
 				try {
-					$command=$this->_db->createCommand($statement);
+					$command = $this->_db->createCommand($statement);
 					$command->execute();
 				}
-				catch(TDbException $e)
+				catch (TDbException $e)
 				{
-					throw new BlogException(500,'blogdatamodule_createdatabase_failed',$e->getErrorMessage(),$statement);
+					throw new BlogException(500, 'blogdatamodule_createdatabase_failed', $e->getErrorMessage(), $statement);
 				}
 			}
 		}
@@ -63,81 +63,81 @@ 
 
 	protected function connectDatabase()
 	{
-		$dbFile=$this->getDbFile();
-		$newDb=!is_file($dbFile);
+		$dbFile = $this->getDbFile();
+		$newDb = !is_file($dbFile);
 
 		try {
-			$this->_db=new TDbConnection("sqlite:".$dbFile);
-			$this->_db->Active=true;
+			$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());
+			throw new BlogException(500, 'blogdatamodule_dbconnect_failed', $e->getErrorMessage());
 		}
 
-		if($newDb)
+		if ($newDb)
 			$this->createDatabase();
 	}
 
-	protected function generateModifier($filter,$orderBy,$limit)
+	protected function generateModifier($filter, $orderBy, $limit)
 	{
-		$modifier='';
-		if($filter!=='')
-			$modifier=' WHERE '.$filter;
-		if($orderBy!=='')
-			$modifier.=' ORDER BY '.$orderBy;
-		if($limit!=='')
-			$modifier.=' LIMIT '.$limit;
+		$modifier = '';
+		if ($filter !== '')
+			$modifier = ' WHERE ' . $filter;
+		if ($orderBy !== '')
+			$modifier .= ' ORDER BY ' . $orderBy;
+		if ($limit !== '')
+			$modifier .= ' LIMIT ' . $limit;
 		return $modifier;
 	}
 
 	public function query($sql)
 	{
 		try {
-			$command=$this->_db->createCommand($sql);
+			$command = $this->_db->createCommand($sql);
 			return $command->query();
 		}
-		catch(TDbException $e)
+		catch (TDbException $e)
 		{
-			throw new BlogException(500,'blogdatamodule_query_failed',$e->getErrorMessage(),$sql);
+			throw new BlogException(500, 'blogdatamodule_query_failed', $e->getErrorMessage(), $sql);
 		}
 	}
 
 	protected function populateUserRecord($row)
 	{
-		$userRecord=new UserRecord;
-		$userRecord->ID=(integer)$row['id'];
-		$userRecord->Name=$row['name'];
-		$userRecord->FullName=$row['full_name'];
-		$userRecord->Role=(integer)$row['role'];
-		$userRecord->Password=$row['passwd'];
-		$userRecord->VerifyCode=$row['vcode'];
-		$userRecord->Email=$row['email'];
-		$userRecord->CreateTime=(integer)$row['reg_time'];
-		$userRecord->Status=(integer)$row['status'];
-		$userRecord->Website=$row['website'];
+		$userRecord = new UserRecord;
+		$userRecord->ID = (integer) $row['id'];
+		$userRecord->Name = $row['name'];
+		$userRecord->FullName = $row['full_name'];
+		$userRecord->Role = (integer) $row['role'];
+		$userRecord->Password = $row['passwd'];
+		$userRecord->VerifyCode = $row['vcode'];
+		$userRecord->Email = $row['email'];
+		$userRecord->CreateTime = (integer) $row['reg_time'];
+		$userRecord->Status = (integer) $row['status'];
+		$userRecord->Website = $row['website'];
 		return $userRecord;
 	}
 
-	public function queryUsers($filter='',$orderBy='',$limit='')
+	public function queryUsers($filter = '', $orderBy = '', $limit = '')
 	{
-		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);
+		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);
 		return $users;
 	}
 
 	public function queryUserCount($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)
+		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;
@@ -145,9 +145,9 @@ 
 
 	public function queryUserByID($id)
 	{
-		$sql="SELECT * FROM tblUsers WHERE id=$id";
-		$result=$this->query($sql);
-		if(($row=$result->read())!==false)
+		$sql = "SELECT * FROM tblUsers WHERE id=$id";
+		$result = $this->query($sql);
+		if (($row = $result->read()) !== false)
 			return $this->populateUserRecord($row);
 		else
 			return null;
@@ -155,12 +155,12 @@ 
 
 	public function queryUserByName($name)
 	{
-		$command=$this->_db->createCommand("SELECT * FROM tblUsers WHERE name=?");
+		$command = $this->_db->createCommand("SELECT * FROM tblUsers WHERE name=?");
 		$command->bindValue(1, $name);
 
-		$result=$command->query();
+		$result = $command->query();
 
-		if(($row=$result->read())!==false)
+		if (($row = $result->read()) !== false)
 			return $this->populateUserRecord($row);
 		else
 			return null;
@@ -168,8 +168,8 @@ 
 
 	public function insertUser($user)
 	{
-		$command=$this->_db->createCommand("INSERT INTO tblUsers ".
-				"(name,full_name,role,passwd,email,reg_time,status,website) ".
+		$command = $this->_db->createCommand("INSERT INTO tblUsers " .
+				"(name,full_name,role,passwd,email,reg_time,status,website) " .
 				"VALUES (?,?,?,?,?,?,?,?)");
 		$command->bindValue(1, $user->Name);
 		$command->bindValue(2, $user->FullName);
@@ -181,12 +181,12 @@ 
 		$command->bindValue(8, $user->Website);
 		$command->execute();
 
-		$user->ID=$this->_db->getLastInsertID();
+		$user->ID = $this->_db->getLastInsertID();
 	}
 
 	public function updateUser($user)
 	{
-		$command=$this->_db->createCommand("UPDATE tblUsers SET
+		$command = $this->_db->createCommand("UPDATE tblUsers SET
 				name=?,
 				full_name=?,
 				role=?,
@@ -210,38 +210,38 @@ 
 
 	public function deleteUser($id)
 	{
-		$command=$this->_db->createCommand("DELETE FROM tblUsers WHERE id=?");
+		$command = $this->_db->createCommand("DELETE FROM tblUsers WHERE id=?");
 		$command->bindValue(1, $id);
 		$command->execute();
 	}
 
 	protected function populatePostRecord($row)
 	{
-		$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'];
+		$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'];
-		$postRecord->CreateTime=(integer)$row['create_time'];
-		$postRecord->ModifyTime=(integer)$row['modify_time'];
-		$postRecord->Title=$row['title'];
-		$postRecord->Content=$row['content'];
-		$postRecord->Status=(integer)$row['status'];
-		$postRecord->CommentCount=(integer)$row['comment_count'];
+			$postRecord->AuthorName = $row['author_name'];
+		$postRecord->CreateTime = (integer) $row['create_time'];
+		$postRecord->ModifyTime = (integer) $row['modify_time'];
+		$postRecord->Title = $row['title'];
+		$postRecord->Content = $row['content'];
+		$postRecord->Status = (integer) $row['status'];
+		$postRecord->CommentCount = (integer) $row['comment_count'];
 		return $postRecord;
 	}
 
-	public function queryPosts($postFilter,$categoryFilter,$orderBy,$limit)
+	public function queryPosts($postFilter, $categoryFilter, $orderBy, $limit)
 	{
 		//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)";
-		$sql="SELECT a.id AS id,
+		$filter = '';
+		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,
 					b.full_name AS author_full_name,
@@ -253,16 +253,16 @@ 
 					a.comment_count AS comment_count
 				FROM tblPosts a, tblUsers b
 				WHERE a.author_id=b.id $filter $orderBy $limit";
-		$rows=$this->query($sql);
-		$posts=array();
-		foreach($rows as $row)
-			$posts[]=$this->populatePostRecord($row);
+		$rows = $this->query($sql);
+		$posts = array();
+		foreach ($rows as $row)
+			$posts[] = $this->populatePostRecord($row);
 		return $posts;
 	}
 
-	public function queryPostsSearch($keywords,$orderBy,$limit)
+	public function queryPostsSearch($keywords, $orderBy, $limit)
 	{
-		$sql="SELECT a.id AS id,
+		$sql = "SELECT a.id AS id,
 					a.author_id AS author_id,
 					b.name AS author_name,
 					b.full_name AS author_full_name,
@@ -275,42 +275,42 @@ 
 				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";
+		$sql .= " $orderBy $limit";
 
-		$command=$this->_db->createCommand($sql);
+		$command = $this->_db->createCommand($sql);
 
-		$i=1;
-		foreach($keywords as $keyword)
+		$i = 1;
+		foreach ($keywords as $keyword)
 		{
-			$command->bindValue($i, "%".$keyword."%");
+			$command->bindValue($i, "%" . $keyword . "%");
 			$i++;
 		}
 
-		$rows=$command->query();
+		$rows = $command->query();
 
-		$posts=array();
-		foreach($rows as $row)
-			$posts[]=$this->populatePostRecord($row);
+		$posts = array();
+		foreach ($rows as $row)
+			$posts[] = $this->populatePostRecord($row);
 		return $posts;
 
 	}
 
-	public function queryPostCount($postFilter,$categoryFilter)
+	public function queryPostCount($postFilter, $categoryFilter)
 	{
 		//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)";
-		$sql="SELECT COUNT(a.id) AS post_count
+		$filter = '';
+		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)
+		$result = $this->query($sql);
+		if (($row = $result->read()) !== false)
 			return $row['post_count'];
 		else
 			return 0;
@@ -318,7 +318,7 @@ 
 
 	public function queryPostByID($id)
 	{
-		$sql="SELECT a.id AS id,
+		$sql = "SELECT a.id AS id,
 		             a.author_id AS author_id,
 		             b.name AS author_name,
 		             b.full_name AS author_full_name,
@@ -331,20 +331,20 @@ 
 		      FROM tblPosts a, tblUsers b
 		      WHERE a.id=? AND a.author_id=b.id";
 
-		$command=$this->_db->createCommand($sql);
+		$command = $this->_db->createCommand($sql);
 		$command->bindValue(1, $id);
 
-		$result=$command->query();
+		$result = $command->query();
 
-		if(($row=$result->read())!==false)
+		if (($row = $result->read()) !== false)
 			return $this->populatePostRecord($row);
 		else
 			return null;
 	}
 
-	public function insertPost($post,$catIDs)
+	public function insertPost($post, $catIDs)
 	{
-		$command=$this->_db->createCommand("INSERT INTO tblPosts
+		$command = $this->_db->createCommand("INSERT INTO tblPosts
 				(author_id,create_time,modify_time,title,content,status)
 				VALUES (?,?,?,?,?,?)");
 		$command->bindValue(1, $post->AuthorID);
@@ -355,28 +355,28 @@ 
 		$command->bindValue(6, $post->Status);
 
 		$command->execute();
-		$post->ID=$this->_db->getLastInsertID();
-		foreach($catIDs as $catID)
-			$this->insertPostCategory($post->ID,$catID);
+		$post->ID = $this->_db->getLastInsertID();
+		foreach ($catIDs as $catID)
+			$this->insertPostCategory($post->ID, $catID);
 	}
 
-	public function updatePost($post,$newCatIDs=null)
+	public function updatePost($post, $newCatIDs = null)
 	{
-		if($newCatIDs!==null)
+		if ($newCatIDs !== null)
 		{
-			$cats=$this->queryCategoriesByPostID($post->ID);
-			$catIDs=array();
-			foreach($cats as $cat)
-				$catIDs[]=$cat->ID;
-			$deleteIDs=array_diff($catIDs,$newCatIDs);
-			foreach($deleteIDs as $id)
-				$this->deletePostCategory($post->ID,$id);
-			$insertIDs=array_diff($newCatIDs,$catIDs);
-			foreach($insertIDs as $id)
-				$this->insertPostCategory($post->ID,$id);
+			$cats = $this->queryCategoriesByPostID($post->ID);
+			$catIDs = array();
+			foreach ($cats as $cat)
+				$catIDs[] = $cat->ID;
+			$deleteIDs = array_diff($catIDs, $newCatIDs);
+			foreach ($deleteIDs as $id)
+				$this->deletePostCategory($post->ID, $id);
+			$insertIDs = array_diff($newCatIDs, $catIDs);
+			foreach ($insertIDs as $id)
+				$this->insertPostCategory($post->ID, $id);
 		}
 
-		$command=$this->_db->createCommand("UPDATE tblPosts SET
+		$command = $this->_db->createCommand("UPDATE tblPosts SET
 				modify_time=?,
 				title=?,
 				content=?,
@@ -393,67 +393,67 @@ 
 
 	public function deletePost($id)
 	{
-		$cats=$this->queryCategoriesByPostID($id);
-		foreach($cats as $cat)
-			$this->deletePostCategory($id,$cat->ID);
+		$cats = $this->queryCategoriesByPostID($id);
+		foreach ($cats as $cat)
+			$this->deletePostCategory($id, $cat->ID);
 
-		$command=$this->_db->createCommand("DELETE FROM tblComments WHERE post_id=?");
+		$command = $this->_db->createCommand("DELETE FROM tblComments WHERE post_id=?");
 		$command->bindValue(1, $id);
 		$command->execute();
 
-		$command=$this->_db->createCommand("DELETE FROM tblPosts WHERE id=?");
+		$command = $this->_db->createCommand("DELETE FROM tblPosts WHERE id=?");
 		$command->bindValue(1, $id);
 		$command->execute();
 	}
 
 	protected function populateCommentRecord($row)
 	{
-		$commentRecord=new CommentRecord;
-		$commentRecord->ID=(integer)$row['id'];
-		$commentRecord->PostID=(integer)$row['post_id'];
-		$commentRecord->AuthorName=$row['author_name'];
-		$commentRecord->AuthorEmail=$row['author_email'];
-		$commentRecord->AuthorWebsite=$row['author_website'];
-		$commentRecord->AuthorIP=$row['author_ip'];
-		$commentRecord->CreateTime=(integer)$row['create_time'];
-		$commentRecord->Content=$row['content'];
-		$commentRecord->Status=(integer)$row['status'];
+		$commentRecord = new CommentRecord;
+		$commentRecord->ID = (integer) $row['id'];
+		$commentRecord->PostID = (integer) $row['post_id'];
+		$commentRecord->AuthorName = $row['author_name'];
+		$commentRecord->AuthorEmail = $row['author_email'];
+		$commentRecord->AuthorWebsite = $row['author_website'];
+		$commentRecord->AuthorIP = $row['author_ip'];
+		$commentRecord->CreateTime = (integer) $row['create_time'];
+		$commentRecord->Content = $row['content'];
+		$commentRecord->Status = (integer) $row['status'];
 		return $commentRecord;
 	}
 
-	public function queryComments($filter,$orderBy,$limit)
+	public function queryComments($filter, $orderBy, $limit)
 	{
 		//FIXME this is insecure by design since it misses proper escaping
-		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);
+		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);
 		return $comments;
 	}
 
 	public function queryCommentsByPostID($id)
 	{
-		$sql="SELECT * FROM tblComments WHERE post_id=? ORDER BY create_time DESC";
-		$command=$this->_db->createCommand($sql);
+		$sql = "SELECT * FROM tblComments WHERE post_id=? ORDER BY create_time DESC";
+		$command = $this->_db->createCommand($sql);
 		$command->bindValue(1, $id);
 
-		$rows=$command->query();
+		$rows = $command->query();
 
-		$comments=array();
-		foreach($rows as $row)
-			$comments[]=$this->populateCommentRecord($row);
+		$comments = array();
+		foreach ($rows as $row)
+			$comments[] = $this->populateCommentRecord($row);
 		return $comments;
 	}
 
 	public function insertComment($comment)
 	{
-		$sql="INSERT INTO tblComments
+		$sql = "INSERT INTO tblComments
 				(post_id,author_name,author_email,author_website,author_ip,create_time,status,content)
 				VALUES (?,?,?,?,?,?,?,?)";
-		$command=$this->_db->createCommand($sql);
+		$command = $this->_db->createCommand($sql);
 		$command->bindValue(1, $comment->PostID);
 		$command->bindValue(2, $comment->AuthorName);
 		$command->bindValue(3, $comment->AuthorEmail);
@@ -464,14 +464,14 @@ 
 		$command->bindValue(8, $comment->Content);
 
 		$command->execute();
-		$comment->ID=$this->_db->getLastInsertID();
+		$comment->ID = $this->_db->getLastInsertID();
 		$this->query("UPDATE tblPosts SET comment_count=comment_count+1 WHERE id={$comment->PostID}");
 	}
 
 	public function updateComment($comment)
 	{
-		$sql="UPDATE tblComments SET status=? WHERE id=?";
-		$command=$this->_db->createCommand($sql);
+		$sql = "UPDATE tblComments SET status=? WHERE id=?";
+		$command = $this->_db->createCommand($sql);
 		$command->bindValue(1, $comment->Status);
 		$command->bindValue(2, $comment->ID);
 
@@ -480,18 +480,18 @@ 
 
 	public function deleteComment($id)
 	{
-		$sql="SELECT post_id FROM tblComments WHERE id=?";
-		$command=$this->_db->createCommand($sql);
+		$sql = "SELECT post_id FROM tblComments WHERE id=?";
+		$command = $this->_db->createCommand($sql);
 		$command->bindValue(1, $id);
-		$result=$command->query();
+		$result = $command->query();
 
-		if(($row=$result->read())!==false)
+		if (($row = $result->read()) !== false)
 		{
-			$command=$this->_db->createCommand("DELETE FROM tblComments WHERE id=?");
+			$command = $this->_db->createCommand("DELETE FROM tblComments WHERE id=?");
 			$command->bindValue(1, $id);
 			$command->execute();
 
-			$command=$this->_db->createCommand("UPDATE tblPosts SET comment_count=comment_count-1 WHERE id=?");
+			$command = $this->_db->createCommand("UPDATE tblPosts SET comment_count=comment_count-1 WHERE id=?");
 			$command->bindValue(1, $row['post_id']);
 			$command->execute();
 		}
@@ -499,52 +499,52 @@ 
 
 	protected function populateCategoryRecord($row)
 	{
-		$catRecord=new CategoryRecord;
-		$catRecord->ID=(integer)$row['id'];
-		$catRecord->Name=$row['name'];
-		$catRecord->Description=$row['description'];
-		$catRecord->PostCount=$row['post_count'];
+		$catRecord = new CategoryRecord;
+		$catRecord->ID = (integer) $row['id'];
+		$catRecord->Name = $row['name'];
+		$catRecord->Description = $row['description'];
+		$catRecord->PostCount = $row['post_count'];
 		return $catRecord;
 	}
 
 	public function queryCategories()
 	{
-		$sql="SELECT * FROM tblCategories ORDER BY name ASC";
-		$rows=$this->query($sql);
-		$cats=array();
-		foreach($rows as $row)
-			$cats[]=$this->populateCategoryRecord($row);
+		$sql = "SELECT * FROM tblCategories ORDER BY name ASC";
+		$rows = $this->query($sql);
+		$cats = array();
+		foreach ($rows as $row)
+			$cats[] = $this->populateCategoryRecord($row);
 		return $cats;
 	}
 
 	public function queryCategoriesByPostID($postID)
 	{
-		$sql="SELECT a.id AS id,
+		$sql = "SELECT a.id AS id,
 				a.name AS name,
 				a.description AS description,
 				a.post_count AS post_count
 				FROM tblCategories a, tblPost2Category b
 				WHERE a.id=b.category_id AND b.post_id=? ORDER BY a.name";
 
-		$command=$this->_db->createCommand($sql);
+		$command = $this->_db->createCommand($sql);
 		$command->bindValue(1, $postID);
-		$rows=$command->query();
+		$rows = $command->query();
 
-		$cats=array();
-		foreach($rows as $row)
-			$cats[]=$this->populateCategoryRecord($row);
+		$cats = array();
+		foreach ($rows as $row)
+			$cats[] = $this->populateCategoryRecord($row);
 		return $cats;
 	}
 
 	public function queryCategoryByID($id)
 	{
-		$sql="SELECT * FROM tblCategories WHERE id=?";
+		$sql = "SELECT * FROM tblCategories WHERE id=?";
 
-		$command=$this->_db->createCommand($sql);
+		$command = $this->_db->createCommand($sql);
 		$command->bindValue(1, $id);
-		$result=$command->query();
+		$result = $command->query();
 
-		if(($row=$result->read())!==false)
+		if (($row = $result->read()) !== false)
 			return $this->populateCategoryRecord($row);
 		else
 			return null;
@@ -552,13 +552,13 @@ 
 
 	public function queryCategoryByName($name)
 	{
-		$sql="SELECT * FROM tblCategories WHERE name=?";
+		$sql = "SELECT * FROM tblCategories WHERE name=?";
 
-		$command=$this->_db->createCommand($sql);
+		$command = $this->_db->createCommand($sql);
 		$command->bindValue(1, $name);
-		$result=$command->query();
+		$result = $command->query();
 
-		if(($row=$result->read())!==false)
+		if (($row = $result->read()) !== false)
 			return $this->populateCategoryRecord($row);
 		else
 			return null;
@@ -566,23 +566,23 @@ 
 
 	public function insertCategory($category)
 	{
-		$sql="INSERT INTO tblCategories
+		$sql = "INSERT INTO tblCategories
 				(name,description)
 				VALUES (?,?)";
 
-		$command=$this->_db->createCommand($sql);
+		$command = $this->_db->createCommand($sql);
 		$command->bindValue(1, $category->Name);
 		$command->bindValue(2, $category->Description);
 		$command->execute();
 
-		$category->ID=$this->_db->getLastInsertID();
+		$category->ID = $this->_db->getLastInsertID();
 	}
 
 	public function updateCategory($category)
 	{
-		$sql="UPDATE tblCategories SET name=?, description=?, post_count=? WHERE id=?";
+		$sql = "UPDATE tblCategories SET name=?, description=?, post_count=? WHERE id=?";
 
-		$command=$this->_db->createCommand($sql);
+		$command = $this->_db->createCommand($sql);
 		$command->bindValue(1, $category->Name);
 		$command->bindValue(2, $category->Description);
 		$command->bindValue(3, $category->PostCount);
@@ -593,44 +593,44 @@ 
 
 	public function deleteCategory($id)
 	{
-		$sql="DELETE FROM tblPost2Category WHERE category_id=?";
-		$command=$this->_db->createCommand($sql);
+		$sql = "DELETE FROM tblPost2Category WHERE category_id=?";
+		$command = $this->_db->createCommand($sql);
 		$command->bindValue(1, $id);
 		$command->execute();
 
-		$sql="DELETE FROM tblCategories WHERE id=?";
-		$command=$this->_db->createCommand($sql);
+		$sql = "DELETE FROM tblCategories WHERE id=?";
+		$command = $this->_db->createCommand($sql);
 		$command->bindValue(1, $id);
 		$command->execute();
 	}
 
-	public function insertPostCategory($postID,$categoryID)
+	public function insertPostCategory($postID, $categoryID)
 	{
-		$sql="INSERT INTO tblPost2Category (post_id, category_id) VALUES (?, ?)";
-		$command=$this->_db->createCommand($sql);
+		$sql = "INSERT INTO tblPost2Category (post_id, category_id) VALUES (?, ?)";
+		$command = $this->_db->createCommand($sql);
 		$command->bindValue(1, $postID);
 		$command->bindValue(2, $categoryID);
 		$command->execute();
 
-		$sql="UPDATE tblCategories SET post_count=post_count+1 WHERE id=?";
-		$command=$this->_db->createCommand($sql);
+		$sql = "UPDATE tblCategories SET post_count=post_count+1 WHERE id=?";
+		$command = $this->_db->createCommand($sql);
 		$command->bindValue(1, $categoryID);
 		$command->execute();
 
 	}
 
-	public function deletePostCategory($postID,$categoryID)
+	public function deletePostCategory($postID, $categoryID)
 	{
-		$sql="DELETE FROM tblPost2Category WHERE post_id=? AND category_id=?";
-		$command=$this->_db->createCommand($sql);
+		$sql = "DELETE FROM tblPost2Category WHERE post_id=? AND category_id=?";
+		$command = $this->_db->createCommand($sql);
 		$command->bindValue(1, $postID);
 		$command->bindValue(2, $categoryID);
-		$result=$command->query();
+		$result = $command->query();
 
-		if($result->getRowCount()>0)
+		if ($result->getRowCount() > 0)
 		{
-			$sql="UPDATE tblCategories SET post_count=post_count-1 WHERE id=?";
-			$command=$this->_db->createCommand($sql);
+			$sql = "UPDATE tblCategories SET post_count=post_count-1 WHERE id=?";
+			$command = $this->_db->createCommand($sql);
 			$command->bindValue(1, $categoryID);
 			$command->execute();
 		}
@@ -638,9 +638,9 @@ 
 
 	public function queryEarliestPostTime()
 	{
-		$sql="SELECT MIN(create_time) AS create_time FROM tblPosts";
-		$result=$this->query($sql);
-		if(($row=$result->read())!==false)
+		$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();
@@ -649,11 +649,11 @@ 
 
 class UserRecord
 {
-	const ROLE_USER=0;
-	const ROLE_ADMIN=1;
-	const STATUS_NORMAL=0;
-	const STATUS_DISABLED=1;
-	const STATUS_PENDING=2;
+	const ROLE_USER = 0;
+	const ROLE_ADMIN = 1;
+	const STATUS_NORMAL = 0;
+	const STATUS_DISABLED = 1;
+	const STATUS_PENDING = 2;
 	public $ID;
 	public $Name;
 	public $FullName;
@@ -668,10 +668,10 @@ 
 
 class PostRecord
 {
-	const STATUS_PUBLISHED=0;
-	const STATUS_DRAFT=1;
-	const STATUS_PENDING=2;
-	const STATUS_STICKY=3;
+	const STATUS_PUBLISHED = 0;
+	const STATUS_DRAFT = 1;
+	const STATUS_PENDING = 2;
+	const STATUS_STICKY = 3;
 	public $ID;
 	public $AuthorID;
 	public $AuthorName;

Braces +42 added lines, -32 removed lines

@@ -52,8 +52,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,8 +68,7 @@ 
 		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());
 		}
@@ -96,8 +94,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);
 		}
@@ -126,8 +123,9 @@ 
 		$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;
 	}
 
@@ -255,8 +253,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 +274,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 +292,9 @@ 
 		$rows=$command->query();
 
 		$posts=array();
-		foreach($rows as $row)
-			$posts[]=$this->populatePostRecord($row);
+		foreach($rows as $row) {
+					$posts[]=$this->populatePostRecord($row);
+		}
 		return $posts;
 
 	}
@@ -356,8 +357,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 +368,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 +399,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);
@@ -429,8 +435,9 @@ 
 		$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 +450,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 +520,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 +540,9 @@ 
 		$rows=$command->query();
 
 		$cats=array();
-		foreach($rows as $row)
-			$cats[]=$this->populateCategoryRecord($row);
+		foreach($rows as $row) {
+					$cats[]=$this->populateCategoryRecord($row);
+		}
 		return $cats;
 	}
 

demos/blog/protected/Common/BlogUserManager.php

Doc Comments +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 	/**
 	 * Returns a user instance given the user name.
 	 * @param string user name, null if it is a guest.
-	 * @return TUser the user instance, null if the specified username is not in the user database.
+	 * @return BlogUser|null the user instance, null if the specified username is not in the user database.
 	 */
 	public function getUser($username=null)
 	{

Spacing +11 added lines, -11 removed lines

@@ -31,21 +31,21 @@ 
 	 * @param string user name, null if it is a guest.
 	 * @return TUser the user instance, null if the specified username is not in the user database.
 	 */
-	public function getUser($username=null)
+	public function getUser($username = null)
 	{
-		if($username===null)
+		if ($username === null)
 			return new BlogUser($this);
 		else
 		{
-			$username=strtolower($username);
-			$db=$this->Application->getModule('data');
-			if(($userRecord=$db->queryUserByName($username))!==null)
+			$username = strtolower($username);
+			$db = $this->Application->getModule('data');
+			if (($userRecord = $db->queryUserByName($username)) !== null)
 			{
-				$user=new BlogUser($this);
+				$user = new BlogUser($this);
 				$user->setID($userRecord->ID);
 				$user->setName($username);
 				$user->setIsGuest(false);
-				$user->setRoles($userRecord->Role===UserRecord::ROLE_USER?'user':'admin');
+				$user->setRoles($userRecord->Role === UserRecord::ROLE_USER ? 'user' : 'admin');
 				return $user;
 			}
 			else
@@ -59,11 +59,11 @@ 
 	 * @param string password
 	 * @return boolean true if validation is successful, false otherwise.
 	 */
-	public function validateUser($username,$password)
+	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;
+		$db = $this->Application->getModule('data');
+		if (($userRecord = $db->queryUserByName($username)) !== null)
+			return $userRecord->Password === md5($password) && $userRecord->Status === UserRecord::STATUS_NORMAL;
 		else
 			return false;
 	}

Braces +1 added lines, -2 removed lines

@@ -47,8 +47,7 @@
 				$user->setIsGuest(false);
 				$user->setRoles($userRecord->Role===UserRecord::ROLE_USER?'user':'admin');
 				return $user;
-			}
-			else
+			} else
 				return null;
 		}
 	}

demos/blog/protected/Pages/Admin/ConfigMan.php

Doc Comments +3 added lines

@@ -64,6 +64,9 @@
 			$this->Response->reload();
 	}
 
+	/**
+	 * @param string $id
+	 */
 	private function createParameter($id,$value)
 	{
 		$element=new TXmlElement('parameter');

Spacing +37 added lines, -37 removed lines

@@ -18,57 +18,57 @@
  */
 class ConfigMan extends BlogPage
 {
-	const CONFIG_FILE='Application.Data.Settings';
+	const CONFIG_FILE = 'Application.Data.Settings';
 
 	public function onLoad($param)
 	{
 		parent::onLoad($param);
-		if(!$this->IsPostBack)
+		if (!$this->IsPostBack)
 		{
-			$parameters=$this->Application->Parameters;
-			$this->SiteTitle->Text=$parameters['SiteTitle'];
-			$this->SiteSubtitle->Text=$parameters['SiteSubtitle'];
-			$this->SiteOwner->Text=$parameters['SiteOwner'];
-			$this->AdminEmail->Text=$parameters['AdminEmail'];
-			$this->MultipleUser->Checked=TPropertyValue::ensureBoolean($parameters['MultipleUser']);
-			$this->AccountApproval->Checked=TPropertyValue::ensureBoolean($parameters['AccountApproval']);
-			$this->PostPerPage->Text=$parameters['PostPerPage'];
-			$this->RecentComments->Text=$parameters['RecentComments'];
-			$this->PostApproval->Checked=TPropertyValue::ensureBoolean($parameters['PostApproval']);
-			$themes=$this->Service->ThemeManager->AvailableThemes;
-			$this->ThemeName->DataSource=$themes;
+			$parameters = $this->Application->Parameters;
+			$this->SiteTitle->Text = $parameters['SiteTitle'];
+			$this->SiteSubtitle->Text = $parameters['SiteSubtitle'];
+			$this->SiteOwner->Text = $parameters['SiteOwner'];
+			$this->AdminEmail->Text = $parameters['AdminEmail'];
+			$this->MultipleUser->Checked = TPropertyValue::ensureBoolean($parameters['MultipleUser']);
+			$this->AccountApproval->Checked = TPropertyValue::ensureBoolean($parameters['AccountApproval']);
+			$this->PostPerPage->Text = $parameters['PostPerPage'];
+			$this->RecentComments->Text = $parameters['RecentComments'];
+			$this->PostApproval->Checked = TPropertyValue::ensureBoolean($parameters['PostApproval']);
+			$themes = $this->Service->ThemeManager->AvailableThemes;
+			$this->ThemeName->DataSource = $themes;
 			$this->ThemeName->dataBind();
-			$this->ThemeName->SelectedValue=array_search($parameters['ThemeName'],$themes);
+			$this->ThemeName->SelectedValue = array_search($parameters['ThemeName'], $themes);
 		}
 	}
 
-	public function saveButtonClicked($sender,$param)
+	public function saveButtonClicked($sender, $param)
 	{
-		$dom=new TXmlDocument;
-		$dom->Encoding='utf-8';
-		$dom->TagName='parameters';
-		$elements=$dom->Elements;
-		$elements[]=$this->createParameter('SiteTitle',$this->SiteTitle->Text);
-		$elements[]=$this->createParameter('SiteSubtitle',$this->SiteSubtitle->Text);
-		$elements[]=$this->createParameter('SiteOwner',$this->SiteOwner->Text);
-		$elements[]=$this->createParameter('AdminEmail',$this->AdminEmail->Text);
-		$elements[]=$this->createParameter('MultipleUser',$this->MultipleUser->Checked);
-		$elements[]=$this->createParameter('AccountApproval',$this->AccountApproval->Checked);
-		$elements[]=$this->createParameter('PostPerPage',$this->PostPerPage->Text);
-		$elements[]=$this->createParameter('RecentComments',$this->RecentComments->Text);
-		$elements[]=$this->createParameter('PostApproval',$this->PostApproval->Checked);
-		$themeName=$this->ThemeName->SelectedItem->Text;
-		$elements[]=$this->createParameter('ThemeName',$themeName);
-		$dom->saveToFile(Prado::getPathOfNamespace(self::CONFIG_FILE,'.xml'));
-		if($themeName!==$this->Theme->Name)
+		$dom = new TXmlDocument;
+		$dom->Encoding = 'utf-8';
+		$dom->TagName = 'parameters';
+		$elements = $dom->Elements;
+		$elements[] = $this->createParameter('SiteTitle', $this->SiteTitle->Text);
+		$elements[] = $this->createParameter('SiteSubtitle', $this->SiteSubtitle->Text);
+		$elements[] = $this->createParameter('SiteOwner', $this->SiteOwner->Text);
+		$elements[] = $this->createParameter('AdminEmail', $this->AdminEmail->Text);
+		$elements[] = $this->createParameter('MultipleUser', $this->MultipleUser->Checked);
+		$elements[] = $this->createParameter('AccountApproval', $this->AccountApproval->Checked);
+		$elements[] = $this->createParameter('PostPerPage', $this->PostPerPage->Text);
+		$elements[] = $this->createParameter('RecentComments', $this->RecentComments->Text);
+		$elements[] = $this->createParameter('PostApproval', $this->PostApproval->Checked);
+		$themeName = $this->ThemeName->SelectedItem->Text;
+		$elements[] = $this->createParameter('ThemeName', $themeName);
+		$dom->saveToFile(Prado::getPathOfNamespace(self::CONFIG_FILE, '.xml'));
+		if ($themeName !== $this->Theme->Name)
 			$this->Response->reload();
 	}
 
-	private function createParameter($id,$value)
+	private function createParameter($id, $value)
 	{
-		$element=new TXmlElement('parameter');
-		$element->Attributes['id']=$id;
-		$element->Attributes['value']=TPropertyValue::ensureString($value);
+		$element = new TXmlElement('parameter');
+		$element->Attributes['id'] = $id;
+		$element->Attributes['value'] = TPropertyValue::ensureString($value);
 		return $element;
 	}
 }

demos/blog/protected/Pages/SearchPost.php

Doc Comments +3 added lines

@@ -32,6 +32,9 @@
 		return $limit;
 	}
 
+	/**
+	 * @param integer $newOffset
+	 */
 	private function formUrl($newOffset)
 	{
 		$gets=array();

Spacing +25 added lines, -25 removed lines

@@ -7,60 +7,60 @@
 	public function onInit($param)
 	{
 		parent::onInit($param);
-		$this->_posts=$this->DataAccess->queryPostsSearch(
+		$this->_posts = $this->DataAccess->queryPostsSearch(
 				$this->getPostKeywords(),
 				'ORDER BY create_time DESC',
-				'LIMIT '.$this->getPageOffset().','.$this->getPageSize());
+				'LIMIT ' . $this->getPageOffset() . ',' . $this->getPageSize());
 	}
 
 	private function getPostKeywords()
 	{
-		return explode(' ',$this->Request['keyword']);
+		return explode(' ', $this->Request['keyword']);
 	}
 
 	private function getPageOffset()
 	{
-		if(($offset=TPropertyValue::ensureInteger($this->Request['offset']))<=0)
-			$offset=0;
+		if (($offset = TPropertyValue::ensureInteger($this->Request['offset'])) <= 0)
+			$offset = 0;
 		return $offset;
 	}
 
 	private function getPageSize()
 	{
-		if(($limit=TPropertyValue::ensureInteger($this->Request['limit']))<=0)
-			$limit=TPropertyValue::ensureInteger($this->Application->Parameters['PostPerPage']);
+		if (($limit = TPropertyValue::ensureInteger($this->Request['limit'])) <= 0)
+			$limit = TPropertyValue::ensureInteger($this->Application->Parameters['PostPerPage']);
 		return $limit;
 	}
 
 	private function formUrl($newOffset)
 	{
-		$gets=array();
-		$gets['offset']=$newOffset;
-		if($this->Request['limit']!==null)
-			$gets['limit']=$this->Request['limit'];
-		if($this->Request['time']!==null)
-			$gets['time']=$this->Request['time'];
-		if($this->Request['cat']!==null)
-			$gets['cat']=$this->Request['cat'];
-		return $this->Service->constructUrl('Posts.ListPost',$gets);
+		$gets = array();
+		$gets['offset'] = $newOffset;
+		if ($this->Request['limit'] !== null)
+			$gets['limit'] = $this->Request['limit'];
+		if ($this->Request['time'] !== null)
+			$gets['time'] = $this->Request['time'];
+		if ($this->Request['cat'] !== null)
+			$gets['cat'] = $this->Request['cat'];
+		return $this->Service->constructUrl('Posts.ListPost', $gets);
 	}
 
 	public function onLoad($param)
 	{
 		parent::onLoad($param);
-		$this->PostList->DataSource=$this->_posts;
+		$this->PostList->DataSource = $this->_posts;
 		$this->PostList->dataBind();
-		if($this->getPageOffset()>0)
+		if ($this->getPageOffset() > 0)
 		{
-			if(($offset=$this->getPageOffset()-$this->getPageSize())<0)
-				$offset=0;
-			$this->PrevPage->NavigateUrl=$this->formUrl($offset);
-			$this->PrevPage->Visible=true;
+			if (($offset = $this->getPageOffset() - $this->getPageSize()) < 0)
+				$offset = 0;
+			$this->PrevPage->NavigateUrl = $this->formUrl($offset);
+			$this->PrevPage->Visible = true;
 		}
-		if(count($this->_posts)===$this->getPageSize())
+		if (count($this->_posts) === $this->getPageSize())
 		{
-			$this->NextPage->NavigateUrl=$this->formUrl($this->getPageOffset()+$this->getPageSize());
-			$this->NextPage->Visible=true;
+			$this->NextPage->NavigateUrl = $this->formUrl($this->getPageOffset() + $this->getPageSize());
+			$this->NextPage->Visible = true;
 		}
 	}
 }