onericcomputing / mmanager-module-builder

src/Utils/UserAgent.php

Braces +2 added lines, -4 removed lines

@@ -83,12 +83,10 @@
 		if(filter_var($client, FILTER_VALIDATE_IP))
 		{
 			$ip = $client;
-		}
-		elseif(filter_var($forward, FILTER_VALIDATE_IP))
+		} elseif(filter_var($forward, FILTER_VALIDATE_IP))
 		{
 			$ip = $forward;
-		}
-		else
+		} else
 		{
 			$ip = $remote;
 		}

src/Utils/CsvParser.php

Braces +10 added lines, -15 removed lines

@@ -52,8 +52,7 @@ 
 		if(! $filepath)
 		{
 			$filepath = $this->_get_filepath();    
-		}
-		else
+		} else
 		{   
 			// If filepath provided, set it
 			$this->_set_filepath($filepath);
@@ -69,8 +68,7 @@ 
 		if(! $detect_line_endings)
 		{
 			$detect_line_endings = $this->_get_detect_line_endings();    
-		}
-		else
+		} else
 		{   
 			// If detect_line_endings provided, set it
 			$this->_set_detect_line_endings($detect_line_endings);
@@ -86,8 +84,7 @@ 
 		if(! $initial_line)
 		{
 			$initial_line = $this->_get_initial_line();    
-		}
-		else
+		} else
 		{
 			$this->_set_initial_line($initial_line);
 		}
@@ -96,8 +93,7 @@ 
 		if(! $delimiter)
 		{
 			$delimiter = $this->_get_delimiter();    
-		}
-		else
+		} else
 		{   
 			// If delimiter provided, set it
 			$this->_set_delimiter($delimiter);
@@ -107,8 +103,7 @@ 
 		if(! $column_headers)
 		{
 			$column_headers = $this->_get_column_headers();    
-		}
-		else
+		} else
 		{
 			// If column headers provided, set them
 			$this->_set_column_headers($column_headers);
@@ -139,22 +134,22 @@ 
 						{
 							$column_headers[$key] = trim($value);
 						}
-					}
-					else // Parse first row for column_headers to use
+					} else // Parse first row for column_headers to use
 					{
 						foreach ($data as $key => $value)
 						{
 							  $column_headers[$key] = trim($value);
 						}                
 					}          
-				}
-				else
+				} else
 				{
 					$new_row = $row - $this->initial_line - 1; // needed so that the returned array starts at 0 instead of 1
-					foreach($column_headers as $key => $value) // assumes there are as many columns as their are title columns
+					foreach($column_headers as $key => $value) {
+						// assumes there are as many columns as their are title columns
 					{
 					$result[$new_row][$value] = utf8_encode(trim($data[$key]));
 					}
+					}
 				}
             
 				unset($data);

src/Extensions/Database/ezSQLcore.php

Braces +12 added lines, -12 removed lines

@@ -233,8 +233,7 @@ 
 			if ($output == OBJECT)
 			{
 				return $this->last_result;
-			}
-			elseif ($output == ARRAY_A || $output == ARRAY_N)
+			} elseif ($output == ARRAY_A || $output == ARRAY_N)
 			{
 				if ($this->last_result)
 				{
@@ -306,8 +305,7 @@ 
 				{
 					$this->register_error("Could not open cache dir: $this->cache_dir");
 					$this->show_errors ? trigger_error("Could not open cache dir: $this->cache_dir", E_USER_WARNING) : null;
-				}
-				else
+				} else
 				{
 					// Cache all result values
 					$result_cache = array(
@@ -317,8 +315,9 @@ 
 						'return_value' => $this->num_rows,
 					);
 					file_put_contents($cache_file, serialize($result_cache));
-					if (file_exists($cache_file.".updating"))
-						unlink($cache_file.".updating");
+					if (file_exists($cache_file.".updating")) {
+											unlink($cache_file.".updating");
+					}
 				}
 			}
 
@@ -342,8 +341,7 @@ 
 					! (file_exists($cache_file.".updating") && (time() - filemtime($cache_file.".updating") < 60)))
 				{
 					touch($cache_file.".updating"); // Show that we in the process of updating the cache
-				}
-				else
+				} else
 				{
 					$result_cache = unserialize(file_get_contents($cache_file));
 
@@ -598,10 +596,12 @@ 
 			$sql = array();
 			foreach ($params as $field => $val)
 			{
-				if ($val === 'true' || $val === true)
-					$val = 1;
-				if ($val === 'false' || $val === false)
-					$val = 0;
+				if ($val === 'true' || $val === true) {
+									$val = 1;
+				}
+				if ($val === 'false' || $val === false) {
+									$val = 0;
+				}
 
 				switch ($val) {
 					case 'NOW()' :

src/Extensions/Database/ezSQL_mysqli.php

Braces +17 added lines, -11 removed lines

@@ -26,8 +26,12 @@ 
 	*  ezSQL Database specific class - mySQLi
 	*/
 
-	if ( ! function_exists('mysqli_connect')) die('<b>Fatal Error:</b> ezSQL_mysql requires mySQLi Lib to be compiled and or linked in to the PHP engine');
-	if ( ! class_exists('ezSQLcore')) die('<b>Fatal Error:</b> ezSQL_mysql requires ezSQLcore (ez_sql_core.php) to be included/loaded before it can be used');
+	if ( ! function_exists('mysqli_connect')) {
+		die('<b>Fatal Error:</b> ezSQL_mysql requires mySQLi Lib to be compiled and or linked in to the PHP engine');
+	}
+	if ( ! class_exists('ezSQLcore')) {
+		die('<b>Fatal Error:</b> ezSQL_mysql requires ezSQLcore (ez_sql_core.php) to be included/loaded before it can be used');
+	}
 
 	class ezSQL_mysqli extends ezSQLcore
 	{
@@ -64,7 +68,9 @@ 
 			$return_val = false;
 			if ( ! $this->connect($dbuser, $dbpassword, $dbhost, $dbport));
 			else if ( ! $this->select($dbname, $encoding));
-			else $return_val = true;
+			else {
+				$return_val = true;
+			}
 			return $return_val;
 		}
 
@@ -99,8 +105,7 @@ 
 				{
 					$this->register_error($ezsql_mysqli_str[2].' in '.__FILE__.' on line '.__LINE__);
 					$this->show_errors ? trigger_error($ezsql_mysqli_str[2], E_USER_WARNING) : null;
-				}
-				else
+				} else
 				{
 					$this->dbuser = $dbuser;
 					$this->dbpassword = $dbpassword;
@@ -141,13 +146,13 @@ 
 			else if ( ! @$this->dbh->select_db($dbname))
 			{
 				// Try to get error supplied by mysql if not use our own
-				if ( ! $str = @$this->dbh->error)
-					  $str = $ezsql_mysqli_str[5];
+				if ( ! $str = @$this->dbh->error) {
+									  $str = $ezsql_mysqli_str[5];
+				}
 
 				$this->register_error($str.' in '.__FILE__.' on line '.__LINE__);
 				$this->show_errors ? trigger_error($str, E_USER_WARNING) : null;
-			}
-			else
+			} else
 			{
 				$this->dbname = $dbname;
 				if ($encoding != '')
@@ -257,8 +262,9 @@ 
 				$this->connect($this->dbuser, $this->dbpassword, $this->dbhost, $this->dbport);
 				$this->select($this->dbname, $this->encoding);
 				// No existing connection at this point means the server is unreachable
-				if ( ! isset($this->dbh) || ! $this->dbh || $this->dbh->connect_errno)
-					return false;
+				if ( ! isset($this->dbh) || ! $this->dbh || $this->dbh->connect_errno) {
+									return false;
+				}
 			}
 
 			// Perform the query via std mysql_query function..

src/BootstrapTable.php

Braces +5 added lines, -10 removed lines

@@ -104,20 +104,16 @@ 
 				if ($order->amount_paid > 0 AND $order->order_status == 'Refunded')
 				{
 					$number_prefix = null == get_option('credit_note_prefix') ? __('credit_note_prefix').sprintf("%04s", $order->order_number) : get_option('credit_note_prefix').sprintf("%04s", $order->order_number);
-				}
-				elseif ($order->order_status == 'Refunded')
+				} elseif ($order->order_status == 'Refunded')
 				{
 					$number_prefix = null == get_option('credit_note_prefix') ? __('credit_note_prefix').sprintf("%04s", $order->order_number) : get_option('credit_note_prefix').sprintf("%04s", $order->order_number);
-				}
-				elseif ($order->amount_paid > 0 AND $order->amount_due > 0 AND $order->order_status !== 'Paid')
+				} elseif ($order->amount_paid > 0 AND $order->amount_due > 0 AND $order->order_status !== 'Paid')
 				{
 					$number_prefix = null == get_option('sale_order_prefix') ? __('sale_order_prefix_short').sprintf("%04s", $order->order_number) : get_option('sale_order_prefix').sprintf("%04s", $order->order_number);
-				}
-				elseif ($order->order_status == 'Expired' || $order->order_status == 'Open' || $order->order_status == 'Pending' || $order->order_status == 'Failed')
+				} elseif ($order->order_status == 'Expired' || $order->order_status == 'Open' || $order->order_status == 'Pending' || $order->order_status == 'Failed')
 				{
 					$number_prefix = null == get_option('sale_order_prefix') ? __('sale_order_prefix_short').sprintf("%04s", $order->order_number) : get_option('sale_order_prefix').sprintf("%04s", $order->order_number);
-				}
-				else
+				} else
 				{
 					$number_prefix = null == get_option('sale_order_prefix') ? __('sale_order_prefix_short').sprintf("%04s", $order->order_number) : get_option('sale_order_prefix').sprintf("%04s", $order->order_number);
 				}
@@ -156,8 +152,7 @@ 
 				if (isset($client->client_address1) && $client->client_postcode && $client->client_city && $client->client_country)
 				{
 					$address = $client->client_address1.' '.$client->client_postcode.' '.$client->client_city.' '.get_countries($client->client_country);
-				}
-				else
+				} else
 				{
 					$address = false;
 				}

src/Adapter/Qrcode/PhpQrCode.php

Braces +194 added lines, -109 removed lines

@@ -176,8 +176,9 @@ 
 		{
 			$barcode_array = array();
             
-			if (!is_array($mode))
-				$mode = explode(',', $mode);
+			if (!is_array($mode)) {
+							$mode = explode(',', $mode);
+			}
                 
 			$eccLevel = 'L';
                 
@@ -194,8 +195,9 @@ 
                 
 			foreach ($qrTab as $line) {
 				$arrAdd = array();
-				foreach(str_split($line) as $char)
-					$arrAdd[] = ($char=='1')?1:0;
+				foreach(str_split($line) as $char) {
+									$arrAdd[] = ($char=='1')?1:0;
+				}
 				$barcode_array['bcode'][] = $arrAdd;
 			}
                     
@@ -223,8 +225,9 @@ 
 				
 				$width = count($frame);
 				$bitMask = array_fill(0, $width, array_fill(0, $width, 0));
-				for ($maskNo = 0; $maskNo < 8; $maskNo++)
-					$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);
+				for ($maskNo = 0; $maskNo < 8; $maskNo++) {
+									$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);
+				}
 			}
 			
 			QRtools::markTime('after_build_cache');
@@ -261,8 +264,9 @@ 
 			list($usec, $sec) = explode(" ", microtime());
 			$time = ((float)$usec + (float)$sec);
             
-			if (!isset($GLOBALS['qr_time_bench']))
-				$GLOBALS['qr_time_bench'] = array();
+			if (!isset($GLOBALS['qr_time_bench'])) {
+							$GLOBALS['qr_time_bench'] = array();
+			}
             
 			$GLOBALS['qr_time_bench'][$markerId] = $time;
 		}
@@ -427,8 +431,9 @@ 
 
 			for($i=1; $i<= QRSPEC_VERSION_MAX; $i++) {
 				$words  = self::$capacity[$i][QRCAP_WORDS] - self::$capacity[$i][QRCAP_EC][$level];
-				if($words >= $size) 
-					return $i;
+				if($words >= $size) {
+									return $i;
+				}
 			}
 
 			return -1;
@@ -446,8 +451,9 @@ 
 		//----------------------------------------------------------------------
 		public static function lengthIndicator($mode, $version)
 		{
-			if ($mode == QR_MODE_STRUCTURE)
-				return 0;
+			if ($mode == QR_MODE_STRUCTURE) {
+							return 0;
+			}
                 
 			if ($version <= 9) {
 				$l = 0;
@@ -463,8 +469,9 @@ 
 		//----------------------------------------------------------------------
 		public static function maximumWords($mode, $version)
 		{
-			if($mode == QR_MODE_STRUCTURE) 
-				return 3;
+			if($mode == QR_MODE_STRUCTURE) {
+							return 3;
+			}
                 
 			if($version <= 9) {
 				$l = 0;
@@ -610,8 +617,9 @@ 
 		//----------------------------------------------------------------------
 		public static function putAlignmentPattern($version, &$frame, $width)
 		{
-			if($version < 2)
-				return;
+			if($version < 2) {
+							return;
+			}
 
 			$d = self::$alignmentPattern[$version][1] - self::$alignmentPattern[$version][0];
 			if($d < 0) {
@@ -663,8 +671,9 @@ 
 		//----------------------------------------------------------------------
 		public static function getVersionPattern($version)
 		{
-			if($version < 7 || $version > QRSPEC_VERSION_MAX)
-				return 0;
+			if($version < 7 || $version > QRSPEC_VERSION_MAX) {
+							return 0;
+			}
 
 			return self::$versionPattern[$version -7];
 		}
@@ -681,11 +690,13 @@ 
 
 		public static function getFormatInfo($mask, $level)
 		{
-			if($mask < 0 || $mask > 7)
-				return 0;
+			if($mask < 0 || $mask > 7) {
+							return 0;
+			}
                 
-			if($level < 0 || $level > 3)
-				return 0;                
+			if($level < 0 || $level > 3) {
+							return 0;
+			}
 
 			return self::$formatInfo[$level][$mask];
 		}
@@ -865,8 +876,9 @@ 
 		//----------------------------------------------------------------------
 		public static function newFrame($version)
 		{
-			if($version < 1 || $version > QRSPEC_VERSION_MAX) 
-				return null;
+			if($version < 1 || $version > QRSPEC_VERSION_MAX) {
+							return null;
+			}
 
 			if(!isset(self::$frames[$version])) {
                 
@@ -884,8 +896,9 @@ 
 				}
 			}
             
-			if(is_null(self::$frames[$version]))
-				return null;
+			if(is_null(self::$frames[$version])) {
+							return null;
+			}
 
 			return self::$frames[$version];
 		}
@@ -950,7 +963,7 @@ 
 					ImagePng($image, $filename);
 					header("Content-type: image/png");
 					ImagePng($image);
-				}else{
+				} else{
 					ImagePng($image, $filename);
 				}
 			}
@@ -1210,8 +1223,9 @@ 
 		{
 			$bits = 0;
 
-			if($version == 0) 
-				$version = 1;
+			if($version == 0) {
+							$version = 1;
+			}
 
 			switch($this->mode) {
 				case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size);    break;
@@ -1270,8 +1284,9 @@ 
 							break;
 					}
                     
-					if($ret < 0)
-						return -1;
+					if($ret < 0) {
+											return -1;
+					}
 				}
 
 				return $this->bstream->size();
@@ -1488,8 +1503,9 @@ 
 		//----------------------------------------------------------------------
 		public static function checkModeKanji($size, $data)
 		{
-			if($size & 1)
-				return false;
+			if($size & 1) {
+							return false;
+			}
 
 			for($i=0; $i<$size; $i+=2) {
 				$val = (ord($data[$i]) << 8) | ord($data[$i+1]);
@@ -1509,8 +1525,9 @@ 
 
 		public static function check($mode, $size, $data)
 		{
-			if($size <= 0) 
-				return false;
+			if($size <= 0) {
+							return false;
+			}
 
 			switch($mode) {
 				case QR_MODE_NUM:       return self::checkModeNum($size, $data);   break;
@@ -1575,8 +1592,9 @@ 
 					$chunks = (int)($payload / 11);
 					$remain = $payload - $chunks * 11;
 					$size = $chunks * 2;
-					if($remain >= 6) 
-						$size++;
+					if($remain >= 6) {
+											$size++;
+					}
 					break;
 				case QR_MODE_8:
 					$size = (int)($payload / 8);
@@ -1593,8 +1611,12 @@ 
 			}
             
 			$maxsize = QRspec::maximumWords($mode, $version);
-			if($size < 0) $size = 0;
-			if($size > $maxsize) $size = $maxsize;
+			if($size < 0) {
+				$size = 0;
+			}
+			if($size > $maxsize) {
+				$size = $maxsize;
+			}
 
 			return $size;
 		}
@@ -1607,8 +1629,9 @@ 
 			foreach($this->items as $item) {
 				$bits = $item->encodeBitStream($this->version);
                 
-				if($bits < 0) 
-					return -1;
+				if($bits < 0) {
+									return -1;
+				}
                     
 				$total += $bits;
 			}
@@ -1627,8 +1650,9 @@ 
 			for(;;) {
 				$bits = $this->createBitStream();
                 
-				if($bits < 0) 
-					return -1;
+				if($bits < 0) {
+									return -1;
+				}
                     
 				$ver = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level);
 				if($ver < 0) {
@@ -1665,8 +1689,9 @@ 
 			$padding = new QRbitstream();
 			$ret = $padding->appendNum($words * 8 - $bits + 4, 0);
             
-			if($ret < 0) 
-				return $ret;
+			if($ret < 0) {
+							return $ret;
+			}
 
 			$padlen = $maxwords - $words;
             
@@ -1679,8 +1704,9 @@ 
                 
 				$ret = $padding->appendBytes($padlen, $padbuf);
                 
-				if($ret < 0)
-					return $ret;
+				if($ret < 0) {
+									return $ret;
+				}
                 
 			}
 
@@ -1857,13 +1883,15 @@ 
 		//----------------------------------------------------------------------
 		public function appendNum($bits, $num)
 		{
-			if ($bits == 0) 
-				return 0;
+			if ($bits == 0) {
+							return 0;
+			}
 
 			$b = QRbitstream::newFromNum($bits, $num);
             
-			if(is_null($b))
-				return -1;
+			if(is_null($b)) {
+							return -1;
+			}
 
 			$ret = $this->append($b);
 			unset($b);
@@ -1874,13 +1902,15 @@ 
 		//----------------------------------------------------------------------
 		public function appendBytes($size, $data)
 		{
-			if ($size == 0) 
-				return 0;
+			if ($size == 0) {
+							return 0;
+			}
 
 			$b = QRbitstream::newFromBytes($size, $data);
             
-			if(is_null($b))
-				return -1;
+			if(is_null($b)) {
+							return -1;
+			}
 
 			$ret = $this->append($b);
 			unset($b);
@@ -1984,8 +2014,9 @@ 
 		//----------------------------------------------------------------------
 		public static function isdigitat($str, $pos)
 		{    
-			if ($pos >= strlen($str))
-				return false;
+			if ($pos >= strlen($str)) {
+							return false;
+			}
             
 			return ((ord($str[$pos]) >= ord('0'))&&(ord($str[$pos]) <= ord('9')));
 		}
@@ -1993,8 +2024,9 @@ 
 		//----------------------------------------------------------------------
 		public static function isalnumat($str, $pos)
 		{
-			if ($pos >= strlen($str))
-				return false;
+			if ($pos >= strlen($str)) {
+							return false;
+			}
                 
 			return (QRinput::lookAnTable(ord($str[$pos])) >= 0);
 		}
@@ -2002,8 +2034,9 @@ 
 		//----------------------------------------------------------------------
 		public function identifyMode($pos)
 		{
-			if ($pos >= strlen($this->dataStr)) 
-				return QR_MODE_NUL;
+			if ($pos >= strlen($this->dataStr)) {
+							return QR_MODE_NUL;
+			}
                 
 			$c = $this->dataStr[$pos];
             
@@ -2057,8 +2090,9 @@ 
 			}
             
 			$ret = $this->input->append(QR_MODE_NUM, $run, str_split($this->dataStr));
-			if($ret < 0)
-				return -1;
+			if($ret < 0) {
+							return -1;
+			}
 
 			return $run;
 		}
@@ -2104,8 +2138,9 @@ 
 			}
 
 			$ret = $this->input->append(QR_MODE_AN, $run, str_split($this->dataStr));
-			if($ret < 0)
-				return -1;
+			if($ret < 0) {
+							return -1;
+			}
 
 			return $run;
 		}
@@ -2120,8 +2155,9 @@ 
 			}
             
 			$ret = $this->input->append(QR_MODE_KANJI, $p, str_split($this->dataStr));
-			if($ret < 0)
-				return -1;
+			if($ret < 0) {
+							return -1;
+			}
 
 			return $run;
 		}
@@ -2175,8 +2211,9 @@ 
 			$run = $p;
 			$ret = $this->input->append(QR_MODE_8, $run, str_split($this->dataStr));
             
-			if($ret < 0)
-				return -1;
+			if($ret < 0) {
+							return -1;
+			}
 
 			return $run;
 		}
@@ -2186,8 +2223,9 @@ 
 		{
 			while (strlen($this->dataStr) > 0)
 			{
-				if($this->dataStr == '')
-					return 0;
+				if($this->dataStr == '') {
+									return 0;
+				}
 
 				$mode = $this->identifyMode(0);
                 
@@ -2195,16 +2233,22 @@ 
 					case QR_MODE_NUM: $length = $this->eatNum(); break;
 					case QR_MODE_AN:  $length = $this->eatAn(); break;
 					case QR_MODE_KANJI:
-						if ($hint == QR_MODE_KANJI)
-								$length = $this->eatKanji();
-						else    $length = $this->eat8();
+						if ($hint == QR_MODE_KANJI) {
+														$length = $this->eatKanji();
+						} else {
+							$length = $this->eat8();
+						}
 						break;
 					default: $length = $this->eat8(); break;
                 
 				}
 
-				if($length == 0) return 0;
-				if($length < 0)  return -1;
+				if($length == 0) {
+					return 0;
+				}
+				if($length < 0) {
+					return -1;
+				}
                 
 				$this->dataStr = substr($this->dataStr, $length);
 			}
@@ -2240,8 +2284,9 @@ 
 
 			$split = new QRsplit($string, $input, $modeHint);
             
-			if(!$casesensitive)
-				$split->toUpper();
+			if(!$casesensitive) {
+							$split->toUpper();
+			}
                 
 			return $split->splitString();
 		}
@@ -2318,11 +2363,23 @@ 
 			$rs = null;
             
 			// Check parameter ranges
-			if($symsize < 0 || $symsize > 8)                     return $rs;
-			if($fcr < 0 || $fcr >= (1<<$symsize))                return $rs;
-			if($prim <= 0 || $prim >= (1<<$symsize))             return $rs;
-			if($nroots < 0 || $nroots >= (1<<$symsize))          return $rs; // Can't have more roots than symbol values!
-			if($pad < 0 || $pad >= ((1<<$symsize) -1 - $nroots)) return $rs; // Too much padding
+			if($symsize < 0 || $symsize > 8) {
+				return $rs;
+			}
+			if($fcr < 0 || $fcr >= (1<<$symsize)) {
+				return $rs;
+			}
+			if($prim <= 0 || $prim >= (1<<$symsize)) {
+				return $rs;
+			}
+			if($nroots < 0 || $nroots >= (1<<$symsize)) {
+				return $rs;
+			}
+			// Can't have more roots than symbol values!
+			if($pad < 0 || $pad >= ((1<<$symsize) -1 - $nroots)) {
+				return $rs;
+			}
+			// Too much padding
 
 			$rs = new QRrsItem();
 			$rs->mm = $symsize;
@@ -2388,8 +2445,9 @@ 
 			}
             
 			// convert rs->genpoly[] to index form for quicker encoding
-			for ($i = 0; $i <= $nroots; $i++)
-				$rs->genpoly[$i] = $rs->index_of[$rs->genpoly[$i]];
+			for ($i = 0; $i <= $nroots; $i++) {
+							$rs->genpoly[$i] = $rs->index_of[$rs->genpoly[$i]];
+			}
 
 			return $rs;
 		}
@@ -2447,12 +2505,24 @@ 
 		public static function init_rs($symsize, $gfpoly, $fcr, $prim, $nroots, $pad)
 		{
 			foreach(self::$items as $rs) {
-				if($rs->pad != $pad)       continue;
-				if($rs->nroots != $nroots) continue;
-				if($rs->mm != $symsize)    continue;
-				if($rs->gfpoly != $gfpoly) continue;
-				if($rs->fcr != $fcr)       continue;
-				if($rs->prim != $prim)     continue;
+				if($rs->pad != $pad) {
+					continue;
+				}
+				if($rs->nroots != $nroots) {
+					continue;
+				}
+				if($rs->mm != $symsize) {
+					continue;
+				}
+				if($rs->gfpoly != $gfpoly) {
+					continue;
+				}
+				if($rs->fcr != $fcr) {
+					continue;
+				}
+				if($rs->prim != $prim) {
+					continue;
+				}
 
 				return $rs;
 			}
@@ -2591,8 +2661,9 @@ 
 		{
 			$codeArr = array();
             
-			foreach ($bitFrame as $line)
-				$codeArr[] = join('', $line);
+			foreach ($bitFrame as $line) {
+							$codeArr[] = join('', $line);
+			}
                 
 			return gzcompress(join("\n", $codeArr), 9);
 		}
@@ -2603,8 +2674,9 @@ 
 			$codeArr = array();
             
 			$codeLines = explode("\n", gzuncompress($code));
-			foreach ($codeLines as $line)
-				$codeArr[] = str_split($line);
+			foreach ($codeLines as $line) {
+							$codeArr[] = str_split($line);
+			}
             
 			return $codeArr;
 		}
@@ -2622,16 +2694,18 @@ 
 					$bitMask = self::unserial(file_get_contents($fileName));
 				} else {
 					$bitMask = $this->generateMaskNo($maskNo, $width, $s, $d);
-					if (!file_exists(QR_CACHE_DIR.'mask_'.$maskNo))
-						mkdir(QR_CACHE_DIR.'mask_'.$maskNo);
+					if (!file_exists(QR_CACHE_DIR.'mask_'.$maskNo)) {
+											mkdir(QR_CACHE_DIR.'mask_'.$maskNo);
+					}
 					file_put_contents($fileName, self::serial($bitMask));
 				}
 			} else {
 				$bitMask = $this->generateMaskNo($maskNo, $width, $s, $d);
 			}
 
-			if ($maskGenOnly)
-				return;
+			if ($maskGenOnly) {
+							return;
+			}
                 
 			$d = $s;
 
@@ -2698,8 +2772,9 @@ 
                 
 				$frameY = $frame[$y];
                 
-				if ($y>0)
-					$frameYM = $frame[$y-1];
+				if ($y>0) {
+									$frameYM = $frame[$y-1];
+				}
                 
 				for($x=0; $x<$width; $x++) {
 					if(($x > 0) && ($y > 0)) {
@@ -2912,14 +2987,17 @@ 
 				$blockNo++;
 			}
 
-			if(QRspec::rsBlockNum2($spec) == 0)
-				return 0;
+			if(QRspec::rsBlockNum2($spec) == 0) {
+							return 0;
+			}
 
 			$dl = QRspec::rsDataCodes2($spec);
 			$el = QRspec::rsEccCodes2($spec);
 			$rs = QRrs::init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el);
             
-			if($rs == NULL) return -1;
+			if($rs == NULL) {
+				return -1;
+			}
             
 			for($i=0; $i<QRspec::rsBlockNum2($spec); $i++) {
 				$ecc = array_slice($this->ecccode,$eccPos);
@@ -3057,7 +3135,9 @@ 
 			}
 
 			$input = new QRinput($version, $level);
-			if($input == NULL) return NULL;
+			if($input == NULL) {
+				return NULL;
+			}
 
 			$ret = $input->append($input, QR_MODE_8, strlen($string), str_split($string));
 			if($ret < 0) {
@@ -3077,7 +3157,9 @@ 
 			}
 
 			$input = new QRinput($version, $level);
-			if($input == NULL) return NULL;
+			if($input == NULL) {
+				return NULL;
+			}
 
 			$ret = QRsplit::splitStringToQRinput($string, $input, $hint, $casesensitive);
 			if($ret < 0) {
@@ -3187,7 +3269,9 @@ 
 						}
 					}
 				}
-				if($x < 0 || $y < 0) return null;
+				if($x < 0 || $y < 0) {
+					return null;
+				}
 
 				$this->x = $x;
 				$this->y = $y;
@@ -3294,8 +3378,9 @@ 
 				$err = ob_get_contents();
 				ob_end_clean();
                 
-				if ($err != '')
-					QRtools::log($outfile, $err);
+				if ($err != '') {
+									QRtools::log($outfile, $err);
+				}
                 
 				$maxSize = (int)(QR_PNG_MAXIMUM_SIZE / (count($tab)+2*$this->margin));