Dolibarr / dolibarr

htdocs/theme/eldy/main_menu_fa_icons.inc.php

Braces +4 added lines, -1 removed lines

@@ -1,4 +1,7 @@
-<?php if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
+<?php if (!defined('ISLOADEDBYSTEELSHEET')) {
+	die('Must be call by steelsheet');
+}
+?>
 /* <style type="text/css" > */
 
 .mainmenu::before{

htdocs/admin/events.php

Braces +5 added lines, -2 removed lines

@@ -66,8 +66,11 @@
 	foreach ($eventstolog as $key => $arr)
 	{
 		$param = 'MAIN_LOGEVENTS_'.$arr['id'];
-		if (GETPOST($param, 'alphanohtml')) dolibarr_set_const($db, $param, GETPOST($param, 'alphanohtml'), 'chaine', 0, '', $conf->entity);
-		else dolibarr_del_const($db, $param, $conf->entity);
+		if (GETPOST($param, 'alphanohtml')) {
+			dolibarr_set_const($db, $param, GETPOST($param, 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+		} else {
+			dolibarr_del_const($db, $param, $conf->entity);
+		}
 	}
 
 	$db->commit();

htdocs/mrp/tpl/originproductline.tpl.php

Braces +6 added lines, -2 removed lines

@@ -23,7 +23,9 @@ 
 	exit;
 }
 
-if (!is_object($form)) $form = new Form($db);
+if (!is_object($form)) {
+	$form = new Form($db);
+}
 
 $qtytoconsumeforline = $this->tpl['qty'] / $this->tpl['efficiency'];
 /*if ((empty($this->tpl['qty_frozen']) && $this->tpl['qty_bom'] > 1)) {
@@ -43,7 +45,9 @@ 
 //print '<td class="right">'.$this->tpl['efficiency'].'</td>';
 
 $selected = 1;
-if (!empty($selectedLines) && !in_array($this->tpl['id'], $selectedLines)) $selected = 0;
+if (!empty($selectedLines) && !in_array($this->tpl['id'], $selectedLines)) {
+	$selected = 0;
+}
 print '<td class="center">';
 //print '<input id="cb'.$this->tpl['id'].'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$this->tpl['id'].'"'.($selected?' checked="checked"':'').'>';
 print '</td>';

htdocs/admin/accountant.php

Braces +9 added lines, -3 removed lines

@@ -34,7 +34,9 @@ 
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'companies'));
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 $error = 0;
 
@@ -45,7 +47,9 @@ 
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 || ($action == 'updateedit'))
@@ -130,7 +134,9 @@ 
 print '<tr class="oddeven"><td><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
 print img_picto('', 'globe-americas', 'class="paddingrightonly"');
 print $form->select_country($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY, 'country_id');
-if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+if ($user->admin) {
+	print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+}
 print '</td></tr>'."\n";
 
 print '<tr class="oddeven"><td><label for="state_id">'.$langs->trans("State").'</label></td><td class="maxwidthonsmartphone">';

htdocs/modulebuilder/template/core/tpl/linkedobjectblock_myobject.tpl.php

Braces +3 added lines, -1 removed lines

@@ -41,7 +41,9 @@
 	$ilink++;
 
 	$trclass = 'oddeven';
-	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) {
+		$trclass .= ' liste_sub_total';
+	}
 	?>
 <tr class="<?php echo $trclass; ?>">
 	<td><?php echo $langs->trans("MyObject"); ?></td>

htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php

Braces +4 added lines, -1 removed lines

@@ -97,7 +97,10 @@
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-		if (empty($conf->mymodule->enabled)) return 0; // If module is not enabled, we do nothing
+		if (empty($conf->mymodule->enabled)) {
+			return 0;
+		}
+		// If module is not enabled, we do nothing
 
 		// Put here code you want to execute when a Dolibarr business events occurs.
 		// Data and type of action are stored into $object and $action

htdocs/modulebuilder/template/css/mymodule.css.php

Braces +42 added lines, -14 removed lines

@@ -23,14 +23,27 @@ 
 
 //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled because need to load personalized language
 //if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');	// Not disabled. Language code is found on url.
-if (!defined('NOREQUIRESOC'))    define('NOREQUIRESOC', '1');
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
 //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');	// Not disabled because need to do translations
-if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', 1);
-if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
-if (!defined('NOLOGIN'))         define('NOLOGIN', 1); // File must be accessed by logon page so without login
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', 1);
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1);
+}
+if (!defined('NOLOGIN')) {
+	define('NOLOGIN', 1);
+}
+// File must be accessed by logon page so without login
 //if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU',1);  // We need top menu content
-if (!defined('NOREQUIREHTML'))   define('NOREQUIREHTML', 1);
-if (!defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', 1);
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
 session_cache_limiter('public');
 // false or '' = keep cache instruction added by server
@@ -40,16 +53,28 @@ 
 // Load Dolibarr environment
 $res = 0;
 // Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
+	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+}
 // Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
 $tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
 while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/../main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/../main.inc.php";
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
+	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+}
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/../main.inc.php")) {
+	$res = @include substr($tmp, 0, ($i + 1))."/../main.inc.php";
+}
 // Try main.inc.php using relative path
-if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
-if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
-if (!$res) die("Include of main fails");
+if (!$res && file_exists("../../main.inc.php")) {
+	$res = @include "../../main.inc.php";
+}
+if (!$res && file_exists("../../../main.inc.php")) {
+	$res = @include "../../../main.inc.php";
+}
+if (!$res) {
+	die("Include of main fails");
+}
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
@@ -65,8 +90,11 @@ 
 header('Content-type: text/css');
 // Important: Following code is to cache this file to avoid page request by browser at each Dolibarr page access.
 // You can use CTRL+F5 to refresh your browser cache.
-if (empty($dolibarr_nocache)) header('Cache-Control: max-age=10800, public, must-revalidate');
-else header('Cache-Control: no-cache');
+if (empty($dolibarr_nocache)) {
+	header('Cache-Control: max-age=10800, public, must-revalidate');
+} else {
+	header('Cache-Control: no-cache');
+}
 
 ?>
 

htdocs/accountancy/bookkeeping/balance.php

Braces +18 added lines, -6 removed lines

@@ -98,13 +98,21 @@ 
 		$search_date_end = dol_get_last_day($year_end, $month_end);
 	}
 }
-if ($sortorder == "") $sortorder = "ASC";
-if ($sortfield == "") $sortfield = "t.numero_compte";
+if ($sortorder == "") {
+	$sortorder = "ASC";
+}
+if ($sortfield == "") {
+	$sortfield = "t.numero_compte";
+}
 
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.urlencode($limit);
+}
 
 $filter = array();
 if (!empty($search_date_start)) {
@@ -128,9 +136,11 @@ 
  * Action
  */
 
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	// All tests are required to be compatible with all browsers
 {
 	$show_subgroup = '';
+}
 	$search_date_start = '';
 	$search_date_end = '';
 	$search_accountancy_code_start = '';
@@ -193,7 +203,9 @@ 
 	}
 
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	if ($optioncss != '') {
+		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	}
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" id="action" value="list">';

htdocs/core/class/lessc.class.php

Braces +251 added lines, -92 removed lines

@@ -86,8 +86,11 @@ 
 	}
 
 	public static function compressList($items, $delim) {
-		if (!isset($items[1]) && isset($items[0])) return $items[0];
-		else return array('list', $delim, $items);
+		if (!isset($items[1]) && isset($items[0])) {
+			return $items[0];
+		} else {
+			return array('list', $delim, $items);
+		}
 	}
 
 	public static function preg_quote($what) {
@@ -100,16 +103,22 @@ 
 		}
 
 		$str = $this->coerceString($importPath);
-		if ($str === null) return false;
+		if ($str === null) {
+			return false;
+		}
 
 		$url = $this->compileValue($this->lib_e($str));
 
 		// don't import if it ends in css
-		if (substr_compare($url, '.css', -4, 4) === 0) return false;
+		if (substr_compare($url, '.css', -4, 4) === 0) {
+			return false;
+		}
 
 		$realPath = $this->findImport($url);
 
-		if ($realPath === null) return false;
+		if ($realPath === null) {
+			return false;
+		}
 
 		if ($this->importDisabled) {
 			return array(false, "/* import disabled */");
@@ -513,7 +522,9 @@ 
 					}
 
 					$passed = $this->reduce($guard) == self::$TRUE;
-					if ($negate) $passed = !$passed;
+					if ($negate) {
+						$passed = !$passed;
+					}
 
 					$this->popEnv();
 
@@ -525,7 +536,9 @@ 
 					}
 				}
 
-				if ($groupPassed) break;
+				if ($groupPassed) {
+					break;
+				}
 			}
 
 			if (!$groupPassed) {
@@ -597,8 +610,12 @@ 
 
 	// attempt to find blocks matched by path and args
 	protected function findBlocks($searchIn, $path, $orderedArgs, $keywordArgs, $seen = array()) {
-		if ($searchIn == null) return null;
-		if (isset($seen[$searchIn->id])) return null;
+		if ($searchIn == null) {
+			return null;
+		}
+		if (isset($seen[$searchIn->id])) {
+			return null;
+		}
 		$seen[$searchIn->id] = true;
 
 		$name = $path[0];
@@ -628,7 +645,9 @@ 
 				return count($matches) > 0 ? $matches : null;
 			}
 		}
-		if ($searchIn->parent === $searchIn) return null;
+		if ($searchIn->parent === $searchIn) {
+			return null;
+		}
 		return $this->findBlocks($searchIn->parent, $path, $orderedArgs, $keywordArgs, $seen);
 	}
 
@@ -744,7 +763,9 @@ 
 					}
 
 					$oldParent = $mixin->parent;
-					if ($mixin != $block) $mixin->parent = $block;
+					if ($mixin != $block) {
+						$mixin->parent = $block;
+					}
 
 					foreach ($this->sortProps($mixin->props) as $subProp) {
 						if ($suffix !== null &&
@@ -763,8 +784,12 @@ 
 
 					$mixin->parent = $oldParent;
 
-					if ($haveArgs) $this->popEnv();
-					if ($haveScope) $this->popEnv();
+					if ($haveArgs) {
+						$this->popEnv();
+					}
+					if ($haveScope) {
+						$this->popEnv();
+					}
 				}
 
 				break;
@@ -1015,8 +1040,10 @@ 
 					}
 				}
 
-				if (!is_null($mime)) // fallback if the mime type is still unknown
+				if (!is_null($mime)) {
+					// fallback if the mime type is still unknown
 					$url = sprintf('data:%s;base64,%s', $mime, base64_encode(file_get_contents($fullpath)));
+				}
 			}
 		}
 
@@ -1044,7 +1071,9 @@ 
 	}
 
 	protected function lib__sprintf($args) {
-		if ($args[0] != "list") return $args;
+		if ($args[0] != "list") {
+			return $args;
+		}
 		$values = $args[2];
 		$string = array_shift($values);
 		$template = $this->compileValue($this->lib_e($string));
@@ -1258,8 +1287,9 @@ 
 	// mix(@color1, @color2, [@weight: 50%]);
 	// http://sass-lang.com/docs/yardoc/Sass/Script/Functions.html#mix-instance_method
 	protected function lib_mix($args) {
-		if ($args[0] != "list" || count($args[2]) < 2)
-			$this->throwError("mix expects (color1, color2, weight)");
+		if ($args[0] != "list" || count($args[2]) < 2) {
+					$this->throwError("mix expects (color1, color2, weight)");
+		}
 
 			list($first, $second) = $args[2];
 			$first = $this->assertColor($first);
@@ -1303,8 +1333,7 @@ 
 			$darkColor  = (isset($args[2][1])) ? $this->assertColor($args[2][1]) : $darkColor;
 			$lightColor = (isset($args[2][2])) ? $this->assertColor($args[2][2]) : $lightColor;
 			$threshold  = (isset($args[2][3])) ? $this->assertNumber($args[2][3]) : $threshold;
-		}
-		else {
+		} else {
 			$inputColor = $this->assertColor($args);
 		}
 
@@ -1347,12 +1376,16 @@ 
 
 	public function assertColor($value, $error = "expected color value") {
 		$color = $this->coerceColor($value);
-		if (is_null($color)) $this->throwError($error);
+		if (is_null($color)) {
+			$this->throwError($error);
+		}
 		return $color;
 	}
 
 	public function assertNumber($value, $error = "expecting number") {
-		if ($value[0] == "number") return $value[1];
+		if ($value[0] == "number") {
+			return $value[1];
+		}
 		$this->throwError($error);
 	}
 
@@ -1360,7 +1393,9 @@ 
 		if ($expectedArgs == 1) {
 			return $value;
 		} else {
-			if ($value[0] !== "list" || $value[1] != ",") $this->throwError("expecting list");
+			if ($value[0] !== "list" || $value[1] != ",") {
+				$this->throwError("expecting list");
+			}
 			$values = $value[2];
 			$numValues = count($values);
 			if ($expectedArgs != $numValues) {
@@ -1531,7 +1566,9 @@ 
 					} else {
 						$components[] = floatval($c[1]);
 					}
-				} else break;
+				} else {
+					break;
+				}
 
 				$i++;
 			}
@@ -1556,7 +1593,9 @@ 
 					$res = $this->coerceColor($res);
 				}
 
-				if (empty($value[2])) $res = $this->lib_e($res);
+				if (empty($value[2])) {
+					$res = $this->lib_e($res);
+				}
 
 				return $res;
 			case "variable":
@@ -1588,7 +1627,9 @@ 
 					if (is_array($part)) {
 						$strip = $part[0] == "variable";
 						$part = $this->reduce($part);
-						if ($strip) $part = $this->lib_e($part);
+						if ($strip) {
+							$part = $this->lib_e($part);
+						}
 					}
 				}
 				return $value;
@@ -1597,17 +1638,22 @@ 
 				return $this->lib_e($this->reduce($inner));
 			case "function":
 				$color = $this->funcToColor($value);
-				if ($color) return $color;
+				if ($color) {
+					return $color;
+				}
 
 				list(, $name, $args) = $value;
-				if ($name == "%") $name = "_sprintf";
+				if ($name == "%") {
+					$name = "_sprintf";
+				}
 
 				$f = isset($this->libFunctions[$name]) ?
 				$this->libFunctions[$name] : array($this, 'lib_'.str_replace('-', '_', $name));
 
 				if (is_callable($f)) {
-					if ($args[0] == 'list')
-						$args = self::compressList($args[2], $args[1]);
+					if ($args[0] == 'list') {
+											$args = self::compressList($args[2], $args[1]);
+					}
 
 						$ret = call_user_func($f, $this->reduce($args, true), $this);
 
@@ -1752,7 +1798,9 @@ 
 		$fname = "op_${ltype}_${rtype}";
 		if (is_callable(array($this, $fname))) {
 			$out = $this->$fname($op, $left, $right);
-			if (!is_null($out)) return $out;
+			if (!is_null($out)) {
+				return $out;
+			}
 		}
 
 		// make the expression look it did before being parsed
@@ -1786,8 +1834,12 @@ 
 	// make sure a color's components don't go out of bounds
 	protected function fixColor($c) {
 		foreach (range(1, 3) as $i) {
-			if ($c[$i] < 0) $c[$i] = 0;
-			if ($c[$i] > 255) $c[$i] = 255;
+			if ($c[$i] < 0) {
+				$c[$i] = 0;
+			}
+			if ($c[$i] > 255) {
+				$c[$i] = 255;
+			}
 		}
 
 		return $c;
@@ -1800,7 +1852,9 @@ 
 	}
 
 	protected function op_color_number($op, $lft, $rgt) {
-		if ($rgt[0] == '%') $rgt[1] /= 100;
+		if ($rgt[0] == '%') {
+			$rgt[1] /= 100;
+		}
 
 		return $this->op_color_color($op, $lft,
 			array_fill(1, count($lft) - 1, $rgt[1]));
@@ -1885,7 +1939,9 @@ 
 				$value = $left[1] % $right[1];
 				break;
 			case '/':
-				if ($right[1] == 0) $this->throwError('parse error: divide by zero');
+				if ($right[1] == 0) {
+					$this->throwError('parse error: divide by zero');
+				}
 				$value = $left[1] / $right[1];
 				break;
 			case '<':
@@ -2155,8 +2211,9 @@ 
 	protected function newFormatter() {
 		$className = "lessc_formatter_lessjs";
 		if (!empty($this->formatterName)) {
-			if (!is_string($this->formatterName))
-				return $this->formatterName;
+			if (!is_string($this->formatterName)) {
+							return $this->formatterName;
+			}
 				$className = "lessc_formatter_$this->formatterName";
 		}
 
@@ -2529,7 +2586,9 @@ 
 		 * go back where we started.
 		 */
 		protected function parseChunk() {
-			if (empty($this->buffer)) return false;
+			if (empty($this->buffer)) {
+				return false;
+			}
 			$s = $this->seek();
 
 			if ($this->whitespace()) {
@@ -2572,7 +2631,9 @@ 
 								) {
 									$dir = $this->pushSpecialBlock("directive");
 									$dir->name = $dirName;
-									if (isset($dirValue)) $dir->value = $dirValue;
+									if (isset($dirValue)) {
+										$dir->value = $dirValue;
+									}
 									return true;
 								}
 						} elseif ($this->isDirective($dirName, $this->lineDirectives)) {
@@ -2609,7 +2670,9 @@ 
 							$block = $this->pushBlock($this->fixTags(array($tag)));
 							$block->args = $args;
 							$block->isVararg = $isVararg;
-							if (!empty($guards)) $block->guards = $guards;
+							if (!empty($guards)) {
+								$block->guards = $guards;
+							}
 							return true;
 						} else {
 							$this->seek($s);
@@ -2675,7 +2738,9 @@ 
 							}
 
 							// spare ;
-							if ($this->literal(';')) return true;
+							if ($this->literal(';')) {
+								return true;
+							}
 
 							return false; // got nothing, throw error
 		}
@@ -2692,8 +2757,9 @@ 
 		protected function fixTags($tags) {
 			// move @ tags out of variable namespace
 			foreach ($tags as &$tag) {
-				if ($tag[0] == $this->lessc->vPrefix)
-					$tag[0] = $this->lessc->mPrefix;
+				if ($tag[0] == $this->lessc->vPrefix) {
+									$tag[0] = $this->lessc->mPrefix;
+				}
 			}
 			return $tags;
 		}
@@ -2706,7 +2772,9 @@ 
 				$values[] = $exp;
 			}
 
-			if (count($values) == 0) return false;
+			if (count($values) == 0) {
+				return false;
+			}
 
 			$exps = lessc::compressList($values, ' ');
 			return true;
@@ -2766,7 +2834,9 @@ 
 					$whiteAfter = isset($this->buffer[$this->count - 1]) &&
 					ctype_space($this->buffer[$this->count - 1]);
 
-					if (!$this->value($rhs)) break;
+					if (!$this->value($rhs)) {
+						break;
+					}
 
 					// peek for next operator to see what to do with rhs
 					if ($this->peek(self::$operatorString, $next) && self::$precedence[$next[1]] > self::$precedence[$m[1]]) {
@@ -2791,20 +2861,30 @@ 
 		public function propertyValue(&$value, $keyName = null) {
 			$values = array();
 
-			if ($keyName !== null) $this->env->currentProperty = $keyName;
+			if ($keyName !== null) {
+				$this->env->currentProperty = $keyName;
+			}
 
 			$s = null;
 			while ($this->expressionList($v)) {
 				$values[] = $v;
 				$s = $this->seek();
-				if (!$this->literal(',')) break;
+				if (!$this->literal(',')) {
+					break;
+				}
 			}
 
-			if ($s) $this->seek($s);
+			if ($s) {
+				$this->seek($s);
+			}
 
-			if ($keyName !== null) unset($this->env->currentProperty);
+			if ($keyName !== null) {
+				unset($this->env->currentProperty);
+			}
 
-			if (count($values) == 0) return false;
+			if (count($values) == 0) {
+				return false;
+			}
 
 			$value = lessc::compressList($values, ', ');
 			return true;
@@ -2853,11 +2933,21 @@ 
 					}
 			}
 
-			if ($this->parenValue($value)) return true;
-			if ($this->unit($value)) return true;
-			if ($this->color($value)) return true;
-			if ($this->func($value)) return true;
-			if ($this->string($value)) return true;
+			if ($this->parenValue($value)) {
+				return true;
+			}
+			if ($this->unit($value)) {
+				return true;
+			}
+			if ($this->color($value)) {
+				return true;
+			}
+			if ($this->func($value)) {
+				return true;
+			}
+			if ($this->string($value)) {
+				return true;
+			}
 
 			if ($this->keyword($word)) {
 				$value = array('keyword', $word);
@@ -2891,7 +2981,9 @@ 
 
 		// an import statement
 		protected function import(&$out) {
-			if (!$this->literal('@import')) return false;
+			if (!$this->literal('@import')) {
+				return false;
+			}
 
 			// @import "something.css" media;
 			// @import url("something.css") media;
@@ -2919,8 +3011,12 @@ 
 
 			if (($this->literal("only") && ($only = true) || $this->literal("not") && ($not = true) || true) && $this->keyword($mediaType)) {
 				$prop = array("mediaType");
-				if (isset($only)) $prop[] = "only";
-				if (isset($not)) $prop[] = "not";
+				if (isset($only)) {
+					$prop[] = "only";
+				}
+				if (isset($not)) {
+					$prop[] = "not";
+				}
 				$prop[] = $mediaType;
 				$parts[] = $prop;
 			} else {
@@ -2932,7 +3028,9 @@ 
 				// ~
 			} else {
 				$this->genericList($expressions, "mediaExpression", "and", false);
-				if (is_array($expressions)) $parts = array_merge($parts, $expressions[2]);
+				if (is_array($expressions)) {
+					$parts = array_merge($parts, $expressions[2]);
+				}
 			}
 
 			if (count($parts) == 0) {
@@ -2953,7 +3051,9 @@ 
 				$this->literal(")")
 				) {
 					$out = array("mediaExp", $feature);
-					if ($value) $out[] = $value;
+					if ($value) {
+						$out[] = $value;
+					}
 					return true;
 				} elseif ($this->variable($variable)) {
 					$out = array('variable', $variable);
@@ -3021,7 +3121,9 @@ 
 
 			$this->eatWhiteDefault = $oldWhite;
 
-			if (count($content) == 0) return false;
+			if (count($content) == 0) {
+				return false;
+			}
 
 			// trim the end
 			if (is_string(end($content))) {
@@ -3094,7 +3196,9 @@ 
 				) {
 					$out = array("interpolate", $interp);
 					$this->eatWhiteDefault = $oldWhite;
-					if ($this->eatWhiteDefault) $this->whitespace();
+					if ($this->eatWhiteDefault) {
+						$this->whitespace();
+					}
 					return true;
 				}
 
@@ -3107,7 +3211,9 @@ 
 			// speed shortcut
 			if (isset($this->buffer[$this->count])) {
 				$char = $this->buffer[$this->count];
-				if (!ctype_digit($char) && $char != ".") return false;
+				if (!ctype_digit($char) && $char != ".") {
+					return false;
+				}
 			}
 
 			if ($this->match('([0-9]+(?:\.[0-9]*)?|\.[0-9]+)([%a-zA-Z]+)?', $m)) {
@@ -3244,9 +3350,13 @@ 
 			$tags = array();
 			while ($this->tag($tt, $simple)) {
 				$tags[] = $tt;
-				if (!$this->literal($delim)) break;
+				if (!$this->literal($delim)) {
+					break;
+				}
+			}
+			if (count($tags) == 0) {
+				return false;
 			}
-			if (count($tags) == 0) return false;
 
 			return true;
 		}
@@ -3356,7 +3466,9 @@ 
 			while (true) {
 				if ($this->match('(['.$chars.'0-9]['.$chars.']*)', $m)) {
 					$parts[] = $m[1];
-					if ($simple) break;
+					if ($simple) {
+						break;
+					}
 
 					while ($this->tagBracket($parts, $hasExpression));
 					continue;
@@ -3423,7 +3535,9 @@ 
 						}
 					}
 
-					if (!$this->literal(',')) break;
+					if (!$this->literal(',')) {
+						break;
+					}
 				}
 				$args = array('list', ',', $args);
 
@@ -3468,7 +3582,9 @@ 
 		 * Can optionally take a name that will be set to the current property name
 		 */
 		protected function assign($name = null) {
-			if ($name) $this->currentProperty = $name;
+			if ($name) {
+				$this->currentProperty = $name;
+			}
 			return $this->literal(':') || $this->literal('=');
 		}
 
@@ -3504,7 +3620,9 @@ 
 
 			while ($this->guardGroup($g)) {
 				$guards[] = $g;
-				if (!$this->literal(",")) break;
+				if (!$this->literal(",")) {
+					break;
+				}
 			}
 
 			if (count($guards) == 0) {
@@ -3523,7 +3641,9 @@ 
 			$guardGroup = array();
 			while ($this->guard($guard)) {
 				$guardGroup[] = $guard;
-				if (!$this->literal("and")) break;
+				if (!$this->literal("and")) {
+					break;
+				}
 			}
 
 			if (count($guardGroup) == 0) {
@@ -3541,7 +3661,9 @@ 
 
 			if ($this->literal("(") && $this->expression($exp) && $this->literal(")")) {
 				$guard = $exp;
-				if ($negate) $guard = array("negate", $guard);
+				if ($negate) {
+					$guard = array("negate", $guard);
+				}
 				return true;
 			}
 
@@ -3552,7 +3674,9 @@ 
 		/* raw parsing functions */
 
 		protected function literal($what, $eatWhitespace = null) {
-			if ($eatWhitespace === null) $eatWhitespace = $this->eatWhiteDefault;
+			if ($eatWhitespace === null) {
+				$eatWhitespace = $this->eatWhiteDefault;
+			}
 
 			// shortcut on single letter
 			if (!isset($what[1]) && isset($this->buffer[$this->count])) {
@@ -3580,7 +3704,9 @@ 
 			while ($this->$parseItem($value)) {
 				$items[] = $value;
 				if ($delim) {
-					if (!$this->literal($delim)) break;
+					if (!$this->literal($delim)) {
+						break;
+					}
 				}
 			}
 
@@ -3608,20 +3734,29 @@ 
 			} else {
 				$validChars = $allowNewline ? "." : "[^\n]";
 			}
-			if (!$this->match('('.$validChars.'*?)'.lessc::preg_quote($what), $m, !$until)) return false;
-			if ($until) $this->count -= strlen($what); // give back $what
+			if (!$this->match('('.$validChars.'*?)'.lessc::preg_quote($what), $m, !$until)) {
+				return false;
+			}
+			if ($until) {
+				$this->count -= strlen($what);
+			}
+			// give back $what
 			$out = $m[1];
 			return true;
 		}
 
 		// try to match something on head of buffer
 		protected function match($regex, &$out, $eatWhitespace = null) {
-			if ($eatWhitespace === null) $eatWhitespace = $this->eatWhiteDefault;
+			if ($eatWhitespace === null) {
+				$eatWhitespace = $this->eatWhiteDefault;
+			}
 
 			$r = '/'.$regex.($eatWhitespace && !$this->writeComments ? '\s*' : '').'/Ais';
 			if (preg_match($r, $this->buffer, $out, null, $this->count)) {
 				$this->count += strlen($out[0]);
-				if ($eatWhitespace && $this->writeComments) $this->whitespace();
+				if ($eatWhitespace && $this->writeComments) {
+					$this->whitespace();
+				}
 				return true;
 			}
 			return false;
@@ -3648,7 +3783,9 @@ 
 
 		// match something without consuming it
 		protected function peek($regex, &$out = null, $from = null) {
-			if (is_null($from)) $from = $this->count;
+			if (is_null($from)) {
+				$from = $this->count;
+			}
 			$r = '/'.$regex.'/Ais';
 			$result = preg_match($r, $this->buffer, $out, null, $from);
 
@@ -3657,8 +3794,11 @@ 
 
 		// seek to a spot in the buffer or return where we are on no argument
 		protected function seek($where = null) {
-			if ($where === null) return $this->count;
-			else $this->count = $where;
+			if ($where === null) {
+				return $this->count;
+			} else {
+				$this->count = $where;
+			}
 			return true;
 		}
 
@@ -3708,7 +3848,9 @@ 
 
 		// append a property to the current block
 		protected function append($prop, $pos = null) {
-			if ($pos !== null) $prop[-1] = $pos;
+			if ($pos !== null) {
+				$prop[-1] = $pos;
+			}
 			$this->env->props[] = $prop;
 		}
 
@@ -3733,29 +3875,38 @@ 
 				foreach ($look as $token) {
 					$pos = strpos($text, $token);
 					if ($pos !== false) {
-						if (!isset($min) || $pos < $min[1]) $min = array($token, $pos);
+						if (!isset($min) || $pos < $min[1]) {
+							$min = array($token, $pos);
+						}
 					}
 				}
 
-				if (is_null($min)) break;
+				if (is_null($min)) {
+					break;
+				}
 
 				$count = $min[1];
 				$skip = 0;
 				$newlines = 0;
 				switch ($min[0]) {
 					case 'url(':
-						if (preg_match('/url\(.*?\)/', $text, $m, 0, $count))
-							$count += strlen($m[0]) - strlen($min[0]);
+						if (preg_match('/url\(.*?\)/', $text, $m, 0, $count)) {
+													$count += strlen($m[0]) - strlen($min[0]);
+						}
 							break;
 					case '"':
 					case "'":
-						if (preg_match('/'.$min[0].'.*?(?<!\\\\)'.$min[0].'/', $text, $m, 0, $count))
-							$count += strlen($m[0]) - 1;
+						if (preg_match('/'.$min[0].'.*?(?<!\\\\)'.$min[0].'/', $text, $m, 0, $count)) {
+													$count += strlen($m[0]) - 1;
+						}
 							break;
 					case '//':
 						$skip = strpos($text, "\n", $count);
-						if ($skip === false) $skip = strlen($text) - $count;
-						else $skip -= $count;
+						if ($skip === false) {
+							$skip = strlen($text) - $count;
+						} else {
+							$skip -= $count;
+						}
 						break;
 					case '/*':
 						if (preg_match('/\/\*.*?\*\//s', $text, $m, 0, $count)) {
@@ -3765,7 +3916,9 @@ 
 						break;
 				}
 
-				if ($skip == 0) $count += strlen($min[0]);
+				if ($skip == 0) {
+					$count += strlen($min[0]);
+				}
 
 				$out .= substr($text, 0, $count).str_repeat("\n", $newlines);
 				$text = substr($text, $count + $skip);
@@ -3810,7 +3963,9 @@ 
 	protected function isEmpty($block) {
 		if (empty($block->lines)) {
 			foreach ($block->children as $child) {
-				if (!$this->isEmpty($child)) return false;
+				if (!$this->isEmpty($child)) {
+					return false;
+				}
 			}
 
 			return true;
@@ -3819,7 +3974,9 @@ 
 	}
 
 	public function block($block) {
-		if ($this->isEmpty($block)) return;
+		if ($this->isEmpty($block)) {
+			return;
+		}
 
 		$inner = $pre = $this->indentStr();
 
@@ -3860,7 +4017,9 @@ 
 		}
 
 		if (!empty($block->selectors)) {
-			if (!$isSingle && empty($block->children)) echo $this->break;
+			if (!$isSingle && empty($block->children)) {
+				echo $this->break;
+			}
 
 			if ($isSingle) {
 				echo $this->closeSingle.$this->break;