evolution-cms / evolution

manager/actions/files.dynamic.php

Doc Comments +9 added lines

@@ -565,6 +565,9 @@ 
 
 }
 
+/**
+ * @param string $file
+ */
 function determineIcon($file, $selFile, $mode)
 {
     $icons = array(
@@ -709,6 +712,9 @@ 
     return $path;
 }
 
+/**
+ * @param string $string
+ */
 function getExtension($string)
 {
     $pos = strrpos($string, '.');
@@ -744,6 +750,9 @@ 
     return @mkdir($strPath);
 }
 
+/**
+ * @param string $type
+ */
 function logFileChange($type, $filename)
 {
     //global $_lang;

Braces +5 added lines, -2 removed lines

@@ -733,7 +733,8 @@ 
 }
 
 function mkdirs($strPath, $mode)
-{ // recursive mkdir function
+{
+// recursive mkdir function
     if (is_dir($strPath)) {
         return true;
     }
@@ -838,7 +839,9 @@ 
     global $modx, $_lang, $startpath, $filemanager_path, $uploadablefiles, $new_file_permissions;
     $msg = '';
     foreach ($_FILES['userfile']['name'] as $i => $name) {
-        if (empty($_FILES['userfile']['tmp_name'][$i])) continue;
+        if (empty($_FILES['userfile']['tmp_name'][$i])) {
+            continue;
+        }
         $userfile= array();
 
         $userfile['tmp_name'] = $_FILES['userfile']['tmp_name'][$i];

manager/actions/import_site.static.php

Doc Comments +14 added lines

@@ -160,6 +160,11 @@ 
 	return $output;
 }
 
+/**
+ * @param integer $parent
+ * @param string $filedir
+ * @param string $mode
+ */
 function importFiles($parent, $filedir, $files, $mode) {
 	global $modx;
 	global $_lang, $allowedfiles;
@@ -302,6 +307,9 @@ 
 	}
 }
 
+/**
+ * @param string $directory
+ */
 function getFiles($directory, $listing = array(), $count = 0) {
 	global $_lang;
 	global $filesfound;
@@ -326,6 +334,9 @@ 
 	return ($listing);
 }
 
+/**
+ * @param string $filepath
+ */
 function getFileContent($filepath) {
 	global $_lang;
 	// get the file
@@ -353,6 +364,9 @@ 
 	return $new_array;
 }
 
+/**
+ * @param null|string $src
+ */
 function treatContent($src, $filename, $alias) {
 	global $modx;
 

Braces +14 added lines, -7 removed lines

@@ -101,7 +101,8 @@ 
 	</div>
 
 <?php
-function run() {
+function run()
+{
 	global $modx, $_lang;
 
 	$tbl_site_content = $modx->getFullTableName('site_content');
@@ -162,7 +163,8 @@ 
 	return $output;
 }
 
-function importFiles($parent, $filedir, $files, $mode) {
+function importFiles($parent, $filedir, $files, $mode)
+{
 	global $modx;
 	global $_lang, $allowedfiles;
 	global $search_default, $cache_default, $publish_default;
@@ -303,7 +305,8 @@ 
 	}
 }
 
-function getFiles($directory, $listing = array(), $count = 0) {
+function getFiles($directory, $listing = array(), $count = 0)
+{
 	global $_lang;
 	global $filesfound;
 	$dummy = $count;
@@ -327,7 +330,8 @@ 
 	return ($listing);
 }
 
-function getFileContent($filepath) {
+function getFileContent($filepath)
+{
 	global $_lang;
 	// get the file
 	if(!$buffer = file_get_contents($filepath)) {
@@ -337,7 +341,8 @@ 
 	}
 }
 
-function pop_index($array) {
+function pop_index($array)
+{
 	$new_array = array();
 	foreach($array as $k => $v) {
 		if($v !== 'index.html' && $v !== 'index.htm') {
@@ -354,7 +359,8 @@ 
 	return $new_array;
 }
 
-function treatContent($src, $filename, $alias) {
+function treatContent($src, $filename, $alias)
+{
 	global $modx;
 
 	$src = mb_convert_encoding($src, $modx->config['modx_charset'], 'UTF-8,SJIS-win,eucJP-win,SJIS,EUC-JP,ASCII');
@@ -395,7 +401,8 @@ 
 	);
 }
 
-function convertLink() {
+function convertLink()
+{
 	global $modx;
 	$tbl_site_content = $modx->getFullTableName('site_content');
 

manager/frames/nodes.functions.inc.php

Doc Comments +3 added lines

@@ -504,6 +504,9 @@
 	return $iconsPrivate;
 }
 
+/**
+ * @return string
+ */
 function getNodeTitle($nodeNameSource, $row) {
 	global $modx;
 

Braces +22 added lines, -11 removed lines

@@ -10,7 +10,8 @@ 
  * @param $theme
  * @param string $hereid
  */
-function makeHTML($indent, $parent, $expandAll, $theme, $hereid = '') {
+function makeHTML($indent, $parent, $expandAll, $theme, $hereid = '')
+{
 	global $modx;
 	global $icons, $iconsPrivate, $_style;
 	global $_lang, $opened, $opened2, $closed2; //added global vars
@@ -450,7 +451,8 @@ 
 	return $output;
 }
 
-function getIconInfo($_style) {
+function getIconInfo($_style)
+{
 	if(!isset($_style['tree_page_gif'])) {
 		$_style['tree_page_gif'] = $_style['tree_page'];
 	}
@@ -477,7 +479,8 @@ 
 	return $icons;
 }
 
-function getPrivateIconInfo($_style) {
+function getPrivateIconInfo($_style)
+{
 	if(!isset($_style['tree_page_gif_secure'])) {
 		$_style['tree_page_gif_secure'] = $_style['tree_page_secure'];
 	}
@@ -504,7 +507,8 @@ 
 	return $iconsPrivate;
 }
 
-function getNodeTitle($nodeNameSource, $row) {
+function getNodeTitle($nodeNameSource, $row)
+{
 	global $modx;
 
 	switch($nodeNameSource) {
@@ -550,7 +554,8 @@ 
 	return $nodetitle;
 }
 
-function isDateNode($nodeNameSource) {
+function isDateNode($nodeNameSource)
+{
 	switch($nodeNameSource) {
 		case 'createdon':
 		case 'editedon':
@@ -563,13 +568,15 @@ 
 	}
 }
 
-function checkIsFolder($parent = 0, $isfolder = 1) {
+function checkIsFolder($parent = 0, $isfolder = 1)
+{
 	global $modx;
 
 	return (int) $modx->db->getValue($modx->db->query('SELECT count(*) FROM ' . $modx->getFullTableName('site_content') . ' WHERE parent=' . $parent . ' AND isfolder=' . $isfolder . ' '));
 }
 
-function _htmlentities($array) {
+function _htmlentities($array)
+{
 	global $modx;
 
 	$array = json_encode($array, JSON_UNESCAPED_UNICODE);
@@ -578,7 +585,8 @@ 
 	return $array;
 }
 
-function getTplSingleNode() {
+function getTplSingleNode()
+{
 	return '<div id="node[+id+]"><a class="[+treeNodeClass+]"
         onclick="modx.tree.treeAction(event,[+id+]);"
         oncontextmenu="modx.tree.showPopup(event,[+id+],\'[+nodetitle_esc+]\');"
@@ -602,7 +610,8 @@ 
         title="[+title+]">[+nodetitleDisplay+][+weblinkDisplay+]</span>[+pageIdDisplay+]</a></div>';
 }
 
-function getTplFolderNode() {
+function getTplFolderNode()
+{
 	return '<div id="node[+id+]"><a class="[+treeNodeClass+]"
         onclick="modx.tree.treeAction(event,[+id+]);"
         oncontextmenu="modx.tree.showPopup(event,[+id+],\'[+nodetitle_esc+]\');"
@@ -638,7 +647,8 @@ 
         title="[+title+]">[+nodetitleDisplay+][+weblinkDisplay+]</span>[+pageIdDisplay+]</a><div>';
 }
 
-function getTplFolderNodeNotChildren() {
+function getTplFolderNodeNotChildren()
+{
 	return '<div id="node[+id+]"><a class="[+treeNodeClass+]"
         onclick="modx.tree.treeAction(event,[+id+]);"
         oncontextmenu="modx.tree.showPopup(event,[+id+],\'[+nodetitle_esc+]\');"
@@ -670,7 +680,8 @@ 
         title="[+title+]">[+nodetitleDisplay+][+weblinkDisplay+]</span>[+pageIdDisplay+]</a><div>';
 }
 
-function dbug($str, $flag = false) {
+function dbug($str, $flag = false)
+{
 	print('<pre>');
 	print_r($str);
 	print('</pre>');

manager/includes/categories.inc.php

Doc Comments +3 added lines

@@ -3,6 +3,9 @@
 //Kyle Jaebker - 08/07/06
 
 //Create a new category
+/**
+ * @param string $newCat
+ */
 function newCategory($newCat) {
     global $modx;
     $useTable = $modx->getFullTableName('categories');

Braces +16 added lines, -7 removed lines

@@ -3,18 +3,22 @@ 
 //Kyle Jaebker - 08/07/06
 
 //Create a new category
-function newCategory($newCat) {
+function newCategory($newCat)
+{
     global $modx;
     $useTable = $modx->getFullTableName('categories');
     $categoryId = $modx->db->insert(
         array(
             'category' => $modx->db->escape($newCat),
         ), $useTable);
-    if (!$categoryId) $categoryId = 0;
+    if (!$categoryId) {
+        $categoryId = 0;
+    }
     return $categoryId;
 }
 //check if new category already exists
-function checkCategory($newCat = '') {
+function checkCategory($newCat = '')
+{
     global $modx;
     $useTable = $modx->getFullTableName('categories');
     $newCat = $modx->db->escape($newCat);
@@ -25,13 +29,17 @@ 
     return 0;
 }
 //Check for category, create new if not exists
-function getCategory($category='') {
+function getCategory($category='')
+{
     $categoryId = checkCategory($category);
-    if(!$categoryId) $categoryId = newCategory($category);
+    if(!$categoryId) {
+        $categoryId = newCategory($category);
+    }
     return $categoryId;
 }
 //Get all categories
-function getCategories() {
+function getCategories()
+{
     global $modx;
     $useTable = $modx->getFullTableName('categories');
     $cats = $modx->db->select('id, category', $modx->getFullTableName('categories'), '', 'category');
@@ -43,7 +51,8 @@ 
     return $resourceArray;
 }
 //Delete category & associations
-function deleteCategory($catId=0) {
+function deleteCategory($catId=0)
+{
     global $modx;
     if ($catId) {
         $resetTables = array('site_plugins', 'site_snippets', 'site_htmlsnippets', 'site_templates', 'site_tmplvars', 'site_modules');

manager/includes/controls/phpmailer/PHPMailer.php

Doc Comments +1 added lines, -1 removed lines

@@ -3968,7 +3968,7 @@
      * @param int|string $options Either a PATHINFO_* constant,
      *                            or a string name to return only the specified piece
      *
-     * @return string|array
+     * @return string
      */
     public static function mb_pathinfo($path, $options = null)
     {

Braces +3 added lines, -2 removed lines

@@ -2059,7 +2059,8 @@ 
      */
     public function addrFormat($addr)
     {
-        if (empty($addr[1])) { // No name provided
+        if (empty($addr[1])) {
+// No name provided
             return $this->secureHeader($addr[0]);
         }
 
@@ -3425,7 +3426,7 @@ 
     {
         $this->RecipientsQueue = array_filter(
             $this->RecipientsQueue,
-            function ($params) use ($kind) {
+            function ($params) use ($kind){
                 return $params[0] != $kind;
             }
         );

manager/includes/controls/phpmailer/POP3.php

Doc Comments +1 added lines, -1 removed lines

@@ -209,7 +209,7 @@
      * Connect to a POP3 server.
      *
      * @param string   $host
-     * @param int|bool $port
+     * @param integer $port
      * @param int      $tval
      *
      * @return bool

Braces +2 added lines, -1 removed lines

@@ -344,7 +344,8 @@
     protected function sendString($string)
     {
         if ($this->pop_conn) {
-            if ($this->do_debug >= 2) { //Show client messages when debug >= 2
+            if ($this->do_debug >= 2) {
+//Show client messages when debug >= 2
                 echo 'Client -> Server: ', $string;
             }
 

manager/includes/controls/phpmailer/SMTP.php

Doc Comments +1 added lines, -1 removed lines

@@ -1314,7 +1314,7 @@
      * If no reply has been received yet, it will return null.
      * If no pattern was matched, it will return false.
      *
-     * @return bool|null|string
+     * @return string
      *
      * @see recordLastTransactionID()
      */

manager/includes/extenders/manager.api.class.inc.php

Doc Comments +3 added lines

@@ -192,6 +192,9 @@
 		return $_;
 	}
 
+	/**
+	 * @param string $checksum
+	 */
 	function setSystemChecksum($checksum) {
 		global $modx;
 		$tbl_system_settings = $modx->getFullTableName('system_settings');

Braces +106 added lines, -59 removed lines

@@ -8,16 +8,19 @@ 
 global $_PAGE; // page view state object. Usage $_PAGE['vs']['propertyname'] = $value;
 
 // Content manager wrapper class
-class ManagerAPI {
+class ManagerAPI
+{
 	
 	var $action; // action directive
 
-	function __construct(){
+	function __construct()
+	{
 		global $action;
 		$this->action = $action; // set action directive
 	}
 	
-	function initPageViewState($id=0){
+	function initPageViewState($id=0)
+	{
 		global $_PAGE;
 		$vsid = isset($_SESSION["mgrPageViewSID"]) ? $_SESSION["mgrPageViewSID"] : '';
 		if($vsid!=$this->action) {
@@ -28,33 +31,38 @@ 
 	}
 
 	// save page view state - not really necessary,
-	function savePageViewState($id=0){
+	function savePageViewState($id=0)
+	{
 		global $_PAGE;
 		$_SESSION["mgrPageViewSDATA"] = $_PAGE['vs'];
 		$_SESSION["mgrPageViewSID"] = $id>0 ? $id:$this->action;
 	}
 	
 	// check for saved form
-	function hasFormValues() {
-		if(isset($_SESSION["mgrFormValueId"])) {		
+	function hasFormValues()
+	{
+		if(isset($_SESSION["mgrFormValueId"])) {
 			if($this->action==$_SESSION["mgrFormValueId"]) {
 				return true;
-			}
-			else {
+			} else {
 				$this->clearSavedFormValues();
 			}
 		}
 		return false;
 	}	
 	// saved form post from $_POST
-	function saveFormValues($id=0){
+	function saveFormValues($id=0)
+	{
 		$_SESSION["mgrFormValues"] = $_POST;
 		$_SESSION["mgrFormValueId"] = $id>0 ? $id:$this->action;
 	}		
 	// load saved form values into $_POST
-	function loadFormValues(){
+	function loadFormValues()
+	{
 		
-		if(!$this->hasFormValues()) return false;
+		if(!$this->hasFormValues()) {
+		    return false;
+		}
 		
 		$p = $_SESSION["mgrFormValues"];
 		$this->clearSavedFormValues();
@@ -64,31 +72,41 @@ 
 		return true;
 	}
 	// clear form post
-	function clearSavedFormValues(){
+	function clearSavedFormValues()
+	{
 		unset($_SESSION["mgrFormValues"]);
 		unset($_SESSION["mgrFormValueId"]);	
 	}
 	
-	function getHashType($db_value='') { // md5 | v1 | phpass
+	function getHashType($db_value='')
+	{
+// md5 | v1 | phpass
 		$c = substr($db_value,0,1);
-		if($c==='$')                                      return 'phpass';
-		elseif(strlen($db_value)===32)                    return 'md5';
-		elseif($c!=='$' && strpos($db_value,'>')!==false) return 'v1';
-		else                                              return 'unknown';
+		if($c==='$') {
+		    return 'phpass';
+		} elseif(strlen($db_value)===32) {
+		    return 'md5';
+		} elseif($c!=='$' && strpos($db_value,'>')!==false) {
+		    return 'v1';
+		} else {
+		    return 'unknown';
+		}
 	}
 	
 	function genV1Hash($password, $seed='1')
-	{ // $seed is user_id basically
+	{
+// $seed is user_id basically
 		global $modx;
 		
-		if(isset($modx->config['pwd_hash_algo']) && !empty($modx->config['pwd_hash_algo']))
-			$algorithm = $modx->config['pwd_hash_algo'];
-		else $algorithm = 'UNCRYPT';
+		if(isset($modx->config['pwd_hash_algo']) && !empty($modx->config['pwd_hash_algo'])) {
+					$algorithm = $modx->config['pwd_hash_algo'];
+		} else {
+		    $algorithm = 'UNCRYPT';
+		}
 		
 		$salt = md5($password . $seed);
 		
-		switch($algorithm)
-		{
+		switch($algorithm) {
 			case 'BLOWFISH_Y':
 				$salt = '$2y$07$' . substr($salt,0,22);
 				break;
@@ -106,11 +124,11 @@ 
 				break;
 		}
 		
-		if($algorithm!=='UNCRYPT')
-		{
+		if($algorithm!=='UNCRYPT') {
 			$password = sha1($password) . crypt($password,$salt);
+		} else {
+		    $password = sha1($salt.$password);
 		}
-		else $password = sha1($salt.$password);
 		
 		$result = strtolower($algorithm) . '>' . md5($salt.$password) . substr(md5($salt),0,8);
 		
@@ -124,9 +142,9 @@ 
 		$rs = $modx->db->select('password',$tbl_manager_users,"id='{$uid}'");
 		$password = $modx->db->getValue($rs);
 		
-		if(strpos($password,'>')===false) $algo = 'NOSALT';
-		else
-		{
+		if(strpos($password,'>')===false) {
+		    $algo = 'NOSALT';
+		} else {
 			$algo = substr($password,0,strpos($password,'>'));
 		}
 		return strtoupper($algo);
@@ -135,27 +153,34 @@ 
 	function checkHashAlgorithm($algorithm='')
 	{
 		$result = false;
-		if (!empty($algorithm))
-		{
-			switch ($algorithm)
-			{
+		if (!empty($algorithm)) {
+			switch ($algorithm) {
 				case 'BLOWFISH_Y':
-					if (defined('CRYPT_BLOWFISH') && CRYPT_BLOWFISH == 1)
-					{
-						if (version_compare('5.3.7', PHP_VERSION) <= 0) $result = true;
+					if (defined('CRYPT_BLOWFISH') && CRYPT_BLOWFISH == 1) {
+						if (version_compare('5.3.7', PHP_VERSION) <= 0) {
+						    $result = true;
+						}
 					}
 					break;
 				case 'BLOWFISH_A':
-					if (defined('CRYPT_BLOWFISH') && CRYPT_BLOWFISH == 1) $result = true;
+					if (defined('CRYPT_BLOWFISH') && CRYPT_BLOWFISH == 1) {
+					    $result = true;
+					}
 					break;
 				case 'SHA512':
-					if (defined('CRYPT_SHA512') && CRYPT_SHA512 == 1) $result = true;
+					if (defined('CRYPT_SHA512') && CRYPT_SHA512 == 1) {
+					    $result = true;
+					}
 					break;
 				case 'SHA256':
-					if (defined('CRYPT_SHA256') && CRYPT_SHA256 == 1) $result = true;
+					if (defined('CRYPT_SHA256') && CRYPT_SHA256 == 1) {
+					    $result = true;
+					}
 					break;
 				case 'MD5':
-					if (defined('CRYPT_MD5') && CRYPT_MD5 == 1 && PHP_VERSION != '5.3.7') $result = true;
+					if (defined('CRYPT_MD5') && CRYPT_MD5 == 1 && PHP_VERSION != '5.3.7') {
+					    $result = true;
+					}
 					break;
 				case 'UNCRYPT':
 					$result = true;
@@ -165,20 +190,24 @@ 
 		return $result;
 	}
 
-	function getSystemChecksum($check_files) {
+	function getSystemChecksum($check_files)
+	{
 		$_ = array();
 		$check_files = trim($check_files);
 		$check_files = explode("\n", $check_files);
 		foreach($check_files as $file) {
 			$file = trim($file);
 			$file = MODX_BASE_PATH . $file;
-			if(!is_file($file)) continue;
+			if(!is_file($file)) {
+			    continue;
+			}
 			$_[$file]= md5_file($file);
 		}
 		return serialize($_);
 	}
 
-	function getModifiedSystemFilesList($check_files, $checksum) {
+	function getModifiedSystemFilesList($check_files, $checksum)
+	{
 		$_ = array();
 		$check_files = trim($check_files);
 		$check_files = explode("\n", $check_files);
@@ -186,41 +215,52 @@ 
 		foreach($check_files as $file) {
 			$file = trim($file);
 			$filePath = MODX_BASE_PATH . $file;
-			if(!is_file($filePath)) continue;
-			if(md5_file($filePath) != $checksum[$filePath]) $_[] = $file;
+			if(!is_file($filePath)) {
+			    continue;
+			}
+			if(md5_file($filePath) != $checksum[$filePath]) {
+			    $_[] = $file;
+			}
 		}
 		return $_;
 	}
 
-	function setSystemChecksum($checksum) {
+	function setSystemChecksum($checksum)
+	{
 		global $modx;
 		$tbl_system_settings = $modx->getFullTableName('system_settings');
 		$sql = "REPLACE INTO {$tbl_system_settings} (setting_name, setting_value) VALUES ('sys_files_checksum','" . $modx->db->escape($checksum) . "')";
         $modx->db->query($sql);
 	}
 	
-	function checkSystemChecksum() {
+	function checkSystemChecksum()
+	{
 		global $modx;
 
-		if(!isset($modx->config['check_files_onlogin']) || empty($modx->config['check_files_onlogin'])) return '0';
+		if(!isset($modx->config['check_files_onlogin']) || empty($modx->config['check_files_onlogin'])) {
+		    return '0';
+		}
 		
 		$current = $this->getSystemChecksum($modx->config['check_files_onlogin']);
-		if(empty($current)) return '0';
+		if(empty($current)) {
+		    return '0';
+		}
 		
-		if(!isset($modx->config['sys_files_checksum']) || empty($modx->config['sys_files_checksum']))
-		{
+		if(!isset($modx->config['sys_files_checksum']) || empty($modx->config['sys_files_checksum'])) {
 			$this->setSystemChecksum($current);
 			return '0';
 		}
-		if($current===$modx->config['sys_files_checksum']) $result = '0';
-		else {
+		if($current===$modx->config['sys_files_checksum']) {
+		    $result = '0';
+		} else {
 			$result = $this->getModifiedSystemFilesList($modx->config['check_files_onlogin'], $modx->config['sys_files_checksum']);
 		} 
 
 		return $result;
 	}
 
-    function getLastUserSetting($key=false) {
+    function getLastUserSetting($key=false)
+    {
         global $modx;
         
         $rs = $modx->db->select('*', $modx->getFullTableName('user_settings'), "user = '{$_SESSION['mgrInternalKey']}'");
@@ -233,15 +273,21 @@ 
             }
         }
         
-        if(!$key) return $usersettings;
-        else return isset($usersettings[$key]) ? $usersettings[$key] : NULL;
+        if(!$key) {
+            return $usersettings;
+        } else {
+            return isset($usersettings[$key]) ? $usersettings[$key] : NULL;
+        }
     }
     
-    function saveLastUserSetting($settings, $val='') {
+    function saveLastUserSetting($settings, $val='')
+    {
         global $modx;
         
         if(!empty($settings)) {
-            if(!is_array($settings)) $settings = array($settings=>$val);
+            if(!is_array($settings)) {
+                $settings = array($settings=>$val);
+            }
             
             foreach ($settings as $key => $val) {
                 $f = array();
@@ -256,7 +302,8 @@ 
         }
     }
     
-    function loadDatePicker($path) {
+    function loadDatePicker($path)
+    {
         global $modx;
         include_once($path);
         $dp = new DATEPICKER();

manager/includes/extenders/phpass.class.inc.php

Doc Comments +15 added lines

@@ -43,6 +43,9 @@ 
         $this->random_state = microtime() . uniqid(mt_rand(), TRUE);
     }
 
+    /**
+     * @param integer $count
+     */
     function get_random_bytes($count)
     {
         $output = '';
@@ -66,6 +69,9 @@ 
         return $output;
     }
 
+    /**
+     * @param integer $count
+     */
     function encode64($input, $count)
     {
         $output = '';
@@ -89,6 +95,9 @@ 
         return $output;
     }
 
+    /**
+     * @param string $input
+     */
     function gensalt_private($input)
     {
         $output = '$P$';
@@ -137,6 +146,9 @@ 
         return $output;
     }
 
+    /**
+     * @param string $input
+     */
     function gensalt_extended($input)
     {
         $count_log2 = min($this->iteration_count_log2 + 8, 24);
@@ -155,6 +167,9 @@ 
         return $output;
     }
 
+    /**
+     * @param string $input
+     */
     function gensalt_blowfish($input)
     {
         // This one needs to use a different order of characters and a

Braces +47 added lines, -31 removed lines

@@ -24,7 +24,8 @@ 
 // Obviously, since this code is in the public domain, the above are not
 // requirements (there can be none), but merely suggestions.
 //
-class PasswordHash {
+class PasswordHash
+{
     var $itoa64;
     var $iteration_count_log2;
     var $portable_hashes;
@@ -34,8 +35,9 @@ 
     {
         $this->itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
 
-        if ($iteration_count_log2 < 4 || $iteration_count_log2 > 31)
-            $iteration_count_log2 = 8;
+        if ($iteration_count_log2 < 4 || $iteration_count_log2 > 31) {
+                    $iteration_count_log2 = 8;
+        }
         $this->iteration_count_log2 = $iteration_count_log2;
 
         $this->portable_hashes = $portable_hashes;
@@ -73,16 +75,20 @@ 
         do {
             $value = ord($input[$i++]);
             $output .= $this->itoa64[$value & 0x3f];
-            if ($i < $count)
-                $value |= ord($input[$i]) << 8;
+            if ($i < $count) {
+                            $value |= ord($input[$i]) << 8;
+            }
             $output .= $this->itoa64[($value >> 6) & 0x3f];
-            if ($i++ >= $count)
-                break;
-            if ($i < $count)
-                $value |= ord($input[$i]) << 16;
+            if ($i++ >= $count) {
+                            break;
+            }
+            if ($i < $count) {
+                            $value |= ord($input[$i]) << 16;
+            }
             $output .= $this->itoa64[($value >> 12) & 0x3f];
-            if ($i++ >= $count)
-                break;
+            if ($i++ >= $count) {
+                            break;
+            }
             $output .= $this->itoa64[($value >> 18) & 0x3f];
         } while ($i < $count);
 
@@ -101,23 +107,27 @@ 
     function crypt_private($password, $setting)
     {
         $output = '*0';
-        if (substr($setting, 0, 2) == $output)
-            $output = '*1';
+        if (substr($setting, 0, 2) == $output) {
+                    $output = '*1';
+        }
 
         $id = substr($setting, 0, 3);
         // We use "$P$", phpBB3 uses "$H$" for the same thing
-        if ($id != '$P$' && $id != '$H$')
-            return $output;
+        if ($id != '$P$' && $id != '$H$') {
+                    return $output;
+        }
 
         $count_log2 = strpos($this->itoa64, $setting[3]);
-        if ($count_log2 < 7 || $count_log2 > 30)
-            return $output;
+        if ($count_log2 < 7 || $count_log2 > 30) {
+                    return $output;
+        }
 
         $count = 1 << $count_log2;
 
         $salt = substr($setting, 4, 8);
-        if (strlen($salt) != 8)
-            return $output;
+        if (strlen($salt) != 8) {
+                    return $output;
+        }
 
         // We're kind of forced to use MD5 here since it's the only
         // cryptographic primitive available in all versions of PHP
@@ -208,26 +218,31 @@ 
             $random = $this->get_random_bytes(16);
             $hash =
                 crypt($password, $this->gensalt_blowfish($random));
-            if (strlen($hash) == 60)
-                return $hash;
+            if (strlen($hash) == 60) {
+                            return $hash;
+            }
         }
 
         if (CRYPT_EXT_DES == 1 && !$this->portable_hashes) {
-            if (strlen($random) < 3)
-                $random = $this->get_random_bytes(3);
+            if (strlen($random) < 3) {
+                            $random = $this->get_random_bytes(3);
+            }
             $hash =
                 crypt($password, $this->gensalt_extended($random));
-            if (strlen($hash) == 20)
-                return $hash;
+            if (strlen($hash) == 20) {
+                            return $hash;
+            }
         }
 
-        if (strlen($random) < 6)
-            $random = $this->get_random_bytes(6);
+        if (strlen($random) < 6) {
+                    $random = $this->get_random_bytes(6);
+        }
         $hash =
             $this->crypt_private($password,
             $this->gensalt_private($random));
-        if (strlen($hash) == 34)
-            return $hash;
+        if (strlen($hash) == 34) {
+                    return $hash;
+        }
 
         // Returning '*' on error is safe here, but would _not_ be safe
         // in a crypt(3)-like function used _both_ for generating new
@@ -242,8 +257,9 @@ 
         }
 
         $hash = $this->crypt_private($password, $stored_hash);
-        if (substr($hash,0,1) === '*')
-            $hash = crypt($password, $stored_hash);
+        if (substr($hash,0,1) === '*') {
+                    $hash = crypt($password, $stored_hash);
+        }
 
         return ($hash===$stored_hash) ? true : false;
     }