it-blaster / typograph-bundle

EMT/EMTypograph.php

Braces +35 added lines, -11 removed lines

@@ -149,13 +149,19 @@ 
 			if($ginfo === true)

 			{

 				$tret = $this->get_tret($group);

-				if($tret) $info['title'] = $tret->title; else $info['title'] = "Не определено";

+				if($tret) {

+					$info['title'] = $tret->title;

+				} else {

+					$info['title'] = "Не определено";

+				}

 			} else {

 				$info = $ginfo;

 			}

 			$info['name'] = $group;

 			$info['options'] = array();

-			if(is_array($bygroup[$group])) foreach($bygroup[$group] as $opt) $info['options'][] = $opt;

+			if(is_array($bygroup[$group])) {

+				foreach($bygroup[$group] as $opt) $info['options'][] = $opt;

+			}

 			$arr['group'][] = $info;

 		}

 		return $arr;

@@ -170,16 +176,24 @@ 
 	 */

 	protected function get_option_info($key)

 	{

-		if(!isset($this->all_options[$key])) return false;

-		if(is_array($this->all_options[$key])) return $this->all_options[$key];

+		if(!isset($this->all_options[$key])) {

+			return false;

+		}

+		if(is_array($this->all_options[$key])) {

+			return $this->all_options[$key];

+		}

 		

 		if(($this->all_options[$key] == "direct") || ($this->all_options[$key] == "reverse"))

 		{

 			$pa = explode(".", $key);

 			$tret_pattern = $pa[0];

 			$tret = $this->get_tret($tret_pattern);

-			if(!$tret) return false;		

-			if(!isset($tret->rules[$pa[1]])) return false;

+			if(!$tret) {

+				return false;

+			}

+			if(!isset($tret->rules[$pa[1]])) {

+				return false;

+			}

 			$array = $tret->rules[$pa[1]];

 			$array['way'] = $this->all_options[$key];

 			return $array;

@@ -196,7 +210,9 @@ 
 	 */

 	public function do_setup($name, $value)

 	{

-		if(!isset($this->all_options[$name])) return;

+		if(!isset($this->all_options[$name])) {

+			return;

+		}

 		

 		// эта настрока связана с правилом ядра

 		if(is_string($this->all_options[$name]))

@@ -209,15 +225,21 @@ 
 			if(isset($this->all_options[$name]['selector']))

 			{

 				$settingname = "active";

-				if(isset($this->all_options[$name]['setting'])) $settingname = $this->all_options[$name]['setting'];

+				if(isset($this->all_options[$name]['setting'])) {

+					$settingname = $this->all_options[$name]['setting'];

+				}

 				$this->set($this->all_options[$name]['selector'], $settingname, $value);

 			}

 		}

 		

 		if($name == "OptAlign.layout")

 		{

-			if($value == "style") $this->set_tag_layout(EMTLib::LAYOUT_STYLE);

-			if($value == "class") $this->set_tag_layout(EMTLib::LAYOUT_CLASS);

+			if($value == "style") {

+				$this->set_tag_layout(EMTLib::LAYOUT_STYLE);

+			}

+			if($value == "class") {

+				$this->set_tag_layout(EMTLib::LAYOUT_CLASS);

+			}

 		}

 		

 	}

@@ -232,7 +254,9 @@ 
 	public static function fast_apply($text, $options = null)

 	{

 		$obj = new self();

-		if(is_array($options)) $obj->setup($options);

+		if(is_array($options)) {

+			$obj->setup($options);

+		}

 		$obj->set_text($text);

 		return $obj->apply();

 	}

EMT/EMTTretQuote.php

Braces +15 added lines, -5 removed lines

@@ -85,7 +85,9 @@ 
 

     protected function inject_in($pos, $text, &$thetext)

     {

-        for($i=0;$i<strlen($text);$i++) $thetext[$pos+$i] = $text[$i];

+        for($i=0;$i<strlen($text);$i++) {

+        	$thetext[$pos+$i] = $text[$i];

+        }

     }

 

     protected function build_sub_quotations()

@@ -106,28 +108,36 @@ 
             while(true)

             {

                 $p = EMTLib::strpos_ex($textx, array("&laquo;", "&raquo;"), $off);

-                if($p===false) break;

+                if($p===false) {

+                	break;

+                }

                 if($p['str'] == "&laquo;")

                 {

-                    if($level>0) if(!$this->is_on('no_bdquotes')) $this->inject_in($p['pos'], self::QUOTE_CRAWSE_OPEN, $textx);

+                    if($level>0) {

+                    	if(!$this->is_on('no_bdquotes')) $this->inject_in($p['pos'], self::QUOTE_CRAWSE_OPEN, $textx);

+                    }

                     $level++;

                 }

                 if($p['str'] == "&raquo;")

                 {

                     $level--;

-                    if($level>0) if(!$this->is_on('no_bdquotes')) $this->inject_in($p['pos'], self::QUOTE_CRAWSE_CLOSE, $textx);

+                    if($level>0) {

+                    	if(!$this->is_on('no_bdquotes')) $this->inject_in($p['pos'], self::QUOTE_CRAWSE_CLOSE, $textx);

+                    }

                 }

                 $off = $p['pos']+strlen($p['str']);

                 if($level == 0)

                 {

                     $okpos = $off;

                     array_push($okposstack, $okpos);

-                } elseif($level<0) // уровень стал меньше нуля

+                } elseif($level<0) {

+                	// уровень стал меньше нуля

                 {

                     if(!$this->is_on('no_inches'))

                     {

                         do{

                             $lokpos = array_pop($okposstack);

+                }

                             $k = substr($textx, $lokpos, $off-$lokpos);

                             $k = str_replace(self::QUOTE_CRAWSE_OPEN, self::QUOTE_FIRS_OPEN, $k);

                             $k = str_replace(self::QUOTE_CRAWSE_CLOSE, self::QUOTE_FIRS_CLOSE, $k);

EMT/EMTBase.php

Braces +99 added lines, -40 removed lines

@@ -45,7 +45,9 @@ 
 	

 	protected function log($str, $data = null)

 	{

-		if(!$this->logging) return;

+		if(!$this->logging) {

+			return;

+		}

 		$this->logs[] = array('class' => '', 'info' => $str, 'data' => $data);

 	}

 	

@@ -67,7 +69,9 @@ 
 	

 	protected function debug($class, $place, &$after_text, $after_text_raw = "")

 	{

-		if(!$this->debug_enabled) return;

+		if(!$this->debug_enabled) {

+			return;

+		}

 		$this->debug_info[] = array(

 				'tret'  => $class == $this ? false: true,

 				'class' => is_object($class)? get_class($class) : $class,

@@ -145,7 +149,9 @@ 
     public function remove_safe_block($id)

     {

     	foreach($this->_safe_blocks as $k => $block) {

-    		if($block['id']==$id) unset($this->_safe_blocks[$k]);

+    		if($block['id']==$id) {

+    			unset($this->_safe_blocks[$k]);

+    		}

     	}

     }

     

@@ -270,9 +276,13 @@ 
 	{

 		foreach($this->trets as $tret)

 		{

-			if(isset($this->tret_objects[$tret])) continue;

+			if(isset($this->tret_objects[$tret])) {

+				continue;

+			}

 			$obj = $this->create_object($tret);

-			if($obj == null) continue;

+			if($obj == null) {

+				continue;

+			}

 			$this->tret_objects[$tret] = $obj;

 		}

 		

@@ -328,8 +338,9 @@ 
 		if(is_string($class))

 		{

 			$obj = $this->create_object($class);

-			if($obj === null)

-				return false;

+			if($obj === null) {

+							return false;

+			}

 			$this->tret_objects[($altname ? $altname : $class)] = $obj;

 			$this->trets[] = ($altname ? $altname : $class);

 			return true;

@@ -345,7 +356,9 @@ 
 	 */

 	public function get_tret($name)

 	{

-		if(isset($this->tret_objects[$name])) return $this->tret_objects[$name];

+		if(isset($this->tret_objects[$name])) {

+			return $this->tret_objects[$name];

+		}

 		foreach($this->trets as $tret)

 		{

 			if($tret == $name)

@@ -387,8 +400,11 @@ 
 		$this->_init();		

 		

 		$atrets = $this->trets;

-		if(is_string($trets)) $atrets = array($trets);

-		elseif(is_array($trets)) $atrets = $trets;

+		if(is_string($trets)) {

+			$atrets = array($trets);

+		} elseif(is_array($trets)) {

+			$atrets = $trets;

+		}

 		

 		$this->debug($this, 'init', $this->_text);

 		

@@ -404,15 +420,21 @@ 
 		foreach ($atrets as $tret) 		

 		{

 			// если установлен режим разметки тэгов то выставим его

-			if($this->use_layout_set)

-				$this->tret_objects[$tret]->set_tag_layout_ifnotset($this->use_layout);

+			if($this->use_layout_set) {

+							$this->tret_objects[$tret]->set_tag_layout_ifnotset($this->use_layout);

+			}

 				

-			if($this->class_layout_prefix)

-				$this->tret_objects[$tret]->set_class_layout_prefix($this->class_layout_prefix);

+			if($this->class_layout_prefix) {

+							$this->tret_objects[$tret]->set_class_layout_prefix($this->class_layout_prefix);

+			}

 			

 			// влючаем, если нужно

-			if($this->debug_enabled) $this->tret_objects[$tret]->debug_on();

-			if($this->logging) $this->tret_objects[$tret]->logging = true;

+			if($this->debug_enabled) {

+				$this->tret_objects[$tret]->debug_on();

+			}

+			if($this->logging) {

+				$this->tret_objects[$tret]->logging = true;

+			}

 						

 			// применяем трэт

 			//$this->tret_objects[$tret]->set_text(&$this->_text);

@@ -420,21 +442,24 @@ 
 			$this->tret_objects[$tret]->apply();

 			

 			// соберём ошибки если таковые есть

-			if(count($this->tret_objects[$tret]->errors)>0)

-				foreach($this->tret_objects[$tret]->errors as $err ) 

+			if(count($this->tret_objects[$tret]->errors)>0) {

+							foreach($this->tret_objects[$tret]->errors as $err ) 

 					$this->tret_error($tret, $err['info'], $err['data']);

+			}

 			

 			// логгирование 

-			if($this->logging)

-				if(count($this->tret_objects[$tret]->logs)>0)

+			if($this->logging) {

+							if(count($this->tret_objects[$tret]->logs)>0)

 					foreach($this->tret_objects[$tret]->logs as $log ) 

-						$this->tret_log($tret, $log['info'], $log['data']);				

+						$this->tret_log($tret, $log['info'], $log['data']);

+			}

 			

 			// отладка

-			if($this->debug_enabled)

-				foreach($this->tret_objects[$tret]->debug_info as $di)

+			if($this->debug_enabled) {

+							foreach($this->tret_objects[$tret]->debug_info as $di)

 				{

 					$unsafetext = $di['text'];

+			}

 					$unsafetext = EMTLib::safe_tag_chars($unsafetext, false);

 					$unsafetext = $this->safe_blocks($unsafetext, false);		

 					$this->debug($tret, $di['place'], $unsafetext, $di['text']);

@@ -461,7 +486,9 @@ 
 		if(!$this->disable_notg_replace)

 		{

 			$repl = array('<span class="_notg_start"></span>', '<span class="_notg_end"></span>');

-			if($this->remove_notg) $repl = "";

+			if($this->remove_notg) {

+				$repl = "";

+			}

 			$this->_text = str_replace( array('<notg>','</notg>'), $repl , $this->_text);

 		}

 		$this->_text = trim($this->_text);

@@ -484,15 +511,21 @@ 
 		foreach ($this->trets as $tret) 		

 		{

 			$arr =$this->tret_objects[$tret]->classes;

-			if(!is_array($arr)) continue;

+			if(!is_array($arr)) {

+				continue;

+			}

 			foreach($arr as $classname => $str)

 			{

-				if(($compact) && (!$str)) continue;

+				if(($compact) && (!$str)) {

+					continue;

+				}

 				$clsname = ($this->class_layout_prefix ? $this->class_layout_prefix : "" ).(isset($this->tret_objects[$tret]->class_names[$classname]) ? $this->tret_objects[$tret]->class_names[$classname] :$classname);

 				$res[$clsname] = $str;

 			}

 		}

-		if($list) return $res;

+		if($list) {

+			return $res;

+		}

 		$str = "";

 		foreach($res as $k => $v)

 		{

@@ -542,7 +575,9 @@ 
 	 */

 	public function set_enable_map($map, $disable = false, $strict = true)

 	{

-		if(!is_array($map)) return;

+		if(!is_array($map)) {

+			return;

+		}

 		$trets = array();

 		foreach($map as $tret => $list)

 		{

@@ -554,9 +589,11 @@ 
 			}

 			$trets[] = $tretx;

 			

-			if($list === true) // все

+			if($list === true) {

+				// все

 			{

 				$tretx->activate(array(), !$disable ,  true);

+			}

 			} elseif(is_string($list)) {

 				$tretx->activate(array($list), $disable ,  $strict);

 			} elseif(is_array($list)) {

@@ -567,7 +604,9 @@ 
 		{

 			foreach($this->trets as $tret)

 			{

-				if(in_array($this->tret_objects[$tret], $trets)) continue;

+				if(in_array($this->tret_objects[$tret], $trets)) {

+					continue;

+				}

 				$this->tret_objects[$tret]->activate(array(), $disable ,  true);

 			}

 		}

@@ -582,7 +621,9 @@ 
 	 */

 	public function is_on($key)

 	{

-		if(!isset($this->settings[$key])) return false;

+		if(!isset($this->settings[$key])) {

+			return false;

+		}

 		$kk = $this->settings[$key];

 		return ((strtolower($kk)=="on") || ($kk === "1") || ($kk === true) || ($kk === 1));

 	}

@@ -614,20 +655,30 @@ 
 		}

         EMTLib::_process_selector_pattern($tret_pattern);

         EMTLib::_process_selector_pattern($rule_pattern);

-		if($selector == "*") $this->settings[$key] = $value;

+		if($selector == "*") {

+			$this->settings[$key] = $value;

+		}

 		

 		foreach ($this->trets as $tret) 		

 		{

 			$t1 = $this->get_short_tret($tret);

-			if(!EMTLib::_test_pattern($tret_pattern, $t1))	if(!EMTLib::_test_pattern($tret_pattern, $tret)) continue;

+			if(!EMTLib::_test_pattern($tret_pattern, $t1)) {

+				if(!EMTLib::_test_pattern($tret_pattern, $tret)) continue;

+			}

 			$tret_obj = $this->get_tret($tret);

 			if($key == "active")

 			{

 				foreach($tret_obj->rules as $rulename => $v)

 				{

-					if(!EMTLib::_test_pattern($rule_pattern, $rulename)) continue;

-					if((strtolower($value) === "on") || ($value===1) || ($value === true) || ($value=="1")) $tret_obj->enable_rule($rulename);

-					if((strtolower($value) === "off") || ($value===0) || ($value === false) || ($value=="0")) $tret_obj->disable_rule($rulename);

+					if(!EMTLib::_test_pattern($rule_pattern, $rulename)) {

+						continue;

+					}

+					if((strtolower($value) === "on") || ($value===1) || ($value === true) || ($value=="1")) {

+						$tret_obj->enable_rule($rulename);

+					}

+					if((strtolower($value) === "off") || ($value===0) || ($value === false) || ($value=="0")) {

+						$tret_obj->disable_rule($rulename);

+					}

 				}

 			} else {

 				if($rule_pattern===false)

@@ -636,7 +687,9 @@ 
 				} else {

 					foreach($tret_obj->rules as $rulename => $v)

 					{

-						if(!EMTLib::_test_pattern($rule_pattern, $rulename)) continue;

+						if(!EMTLib::_test_pattern($rule_pattern, $rulename)) {

+							continue;

+						}

 						$tret_obj->set_rule($rulename, $key, $value);

 					}

 				}

@@ -662,7 +715,9 @@ 
 	{

 		if(is_array($selector)) 

 		{

-			foreach($selector as $val) $this->set($val, $key, $value);

+			foreach($selector as $val) {

+				$this->set($val, $key, $value);

+			}

 			return;

 		}

 		if(is_array($key))

@@ -712,7 +767,9 @@ 
 	 */

 	public function setup($setupmap)

 	{

-		if(!is_array($setupmap)) return;

+		if(!is_array($setupmap)) {

+			return;

+		}

 		

 		if(isset($setupmap['map']) || isset($setupmap['maps']))

 		{

@@ -741,7 +798,9 @@ 
 		}

 		

 		

-		foreach($setupmap as $k => $v) $this->do_setup($k , $v);

+		foreach($setupmap as $k => $v) {

+			$this->do_setup($k , $v);

+		}

 	}

 	

 	

EMT/EMTLib.php

Braces +49 added lines, -22 removed lines

@@ -122,12 +122,22 @@ 
 	 */

 	public static function clear_special_chars($text, $mode = null)

 	{

-		if(is_string($mode)) $mode = array($mode);

-		if(is_null($mode)) $mode = array('utf8', 'html');

-		if(!is_array($mode)) return false;

+		if(is_string($mode)) {

+			$mode = array($mode);

+		}

+		if(is_null($mode)) {

+			$mode = array('utf8', 'html');

+		}

+		if(!is_array($mode)) {

+			return false;

+		}

 		$moder = array();

-		foreach($mode as $mod) if(in_array($mod, array('utf8','html'))) $moder[] = $mod;

-		if(count($moder)==0) return false;

+		foreach($mode as $mod) {

+			if(in_array($mod, array('utf8','html'))) $moder[] = $mod;

+		}

+		if(count($moder)==0) {

+			return false;

+		}

 		

 		foreach (self::$_charsTable as $char => $vals) 

 		{

@@ -181,8 +191,12 @@ 
 				$tags = array();	

 				foreach ($allowableTag as $tag) 

 				{

-					if ('<' !== substr($tag, 0, 1) || '>' !== substr($tag, -1, 1)) continue;

-					if ('/' === substr($tag, 1, 1)) continue;

+					if ('<' !== substr($tag, 0, 1) || '>' !== substr($tag, -1, 1)) {

+						continue;

+					}

+					if ('/' === substr($tag, 1, 1)) {

+						continue;

+					}

 					$tags [] = $tag;

 				}

 				$ignore = implode('', $tags);

@@ -205,10 +219,11 @@ 
      */

     public static function safe_tag_chars($text, $way)

     {

-    	if ($way) 

-        	$text = preg_replace_callback('/(\<\/?)(.+?)(\>)/s', create_function('$m','return $m[1].( substr(trim($m[2]), 0, 1) === "a" ? "%%___"  : ""  ) . \Fenrizbes\TypographBundle\EMT\EMTLib::encrypt_tag(trim($m[2]))  . $m[3];'), $text);

-        else

-        	$text = preg_replace_callback('/(\<\/?)(.+?)(\>)/s', create_function('$m','return $m[1].( substr(trim($m[2]), 0, 3) === "%%___" ? \Fenrizbes\TypographBundle\EMT\EMTLib::decrypt_tag(substr(trim($m[2]), 4)) : \Fenrizbes\TypographBundle\EMT\EMTLib::decrypt_tag(trim($m[2])) ) . $m[3];'), $text);

+    	if ($way) {

+    	        	$text = preg_replace_callback('/(\<\/?)(.+?)(\>)/s', create_function('$m','return $m[1].( substr(trim($m[2]), 0, 1) === "a" ? "%%___"  : ""  ) . \Fenrizbes\TypographBundle\EMT\EMTLib::encrypt_tag(trim($m[2]))  . $m[3];'), $text);

+    	} else {

+                	$text = preg_replace_callback('/(\<\/?)(.+?)(\>)/s', create_function('$m','return $m[1].( substr(trim($m[2]), 0, 3) === "%%___" ? \Fenrizbes\TypographBundle\EMT\EMTLib::decrypt_tag(substr(trim($m[2]), 4)) : \Fenrizbes\TypographBundle\EMT\EMTLib::decrypt_tag(trim($m[2])) ) . $m[3];'), $text);

+        }

         return $text;

     }

     

@@ -268,7 +283,9 @@ 
 					if(isset($attribute['style']) && $attribute['style'])

 					{

 						$st = trim($attribute['style']);

-						if(mb_substr($st, -1) != ";") $st .= ";";

+						if(mb_substr($st, -1) != ";") {

+							$st .= ";";

+						}

 						$st .= $attribute['__style'];

 						$attribute['style'] = $st;

 					} else {

@@ -280,7 +297,9 @@ 
 			}			

 			foreach ($attribute as $attr => $value) 

 			{

-				if($attr == "__style") continue;

+				if($attr == "__style") {

+					continue;

+				}

 				if($attr == "class") {

 					$classname = "$value";

 					continue;

@@ -331,7 +350,9 @@ 
     		foreach($needle as $n)

     		{

     			$p = strpos($haystack, $n , $offset);

-    			if($p===false) continue;

+    			if($p===false) {

+    				continue;

+    			}

     			if($m === false)

     			{

     				$m = $p;

@@ -344,7 +365,9 @@ 
     				$w = $n;

     			}

     		}

-    		if($m === false) return false;

+    		if($m === false) {

+    			return false;

+    		}

     		return array('pos' => $m, 'str' => $w);

     	}

     	return strpos($haystack, $needle, $offset);    	

@@ -352,14 +375,18 @@ 
     

     public static function _process_selector_pattern(&$pattern)

 	{

-		if($pattern===false) return;

+		if($pattern===false) {

+			return;

+		}

 		$pattern = preg_quote($pattern , '/');

 		$pattern = str_replace("\\*", "[a-z0-9_\-]*", $pattern);

 		$pattern = "/".$pattern."/i";

 	}

 	public static function _test_pattern($pattern, $text)

 	{

-		if($pattern === false) return true;

+		if($pattern === false) {

+			return true;

+		}

 		return preg_match($pattern, $text);

 	}

 	

@@ -646,7 +673,9 @@ 
 	 */

 	public static function html_char_entity_to_unicode($entity)

 	{

-		if(isset(self::$html4_char_ents[$entity])) return self::_getUnicodeChar(self::$html4_char_ents[$entity]);

+		if(isset(self::$html4_char_ents[$entity])) {

+			return self::_getUnicodeChar(self::$html4_char_ents[$entity]);

+		}

 		return false;

 	}

 	

@@ -682,13 +711,11 @@ 
 	        if($found)

 	        {

 	            return $last_pos - 1;

-	        }

-	        else

+	        } else

 	        {

 	            return false;

 	        }

-	    }

-	    else

+	    } else

 	    {

 	        return false;

 	    } 

EMT/EMTTret.php

Braces +83 added lines, -27 removed lines

@@ -66,7 +66,9 @@ 
 	

 	private function log($str, $data = null)

 	{

-		if(!$this->logging) return;

+		if(!$this->logging) {

+			return;

+		}

 		$this->logs[] = array('info' => $str, 'data' => $data);

 	}

 

@@ -78,7 +80,9 @@ 
 	

 	public function debug($place, &$after_text)

 	{

-		if(!$this->debug_enabled) return;

+		if(!$this->debug_enabled) {

+			return;

+		}

 		$this->debug_info[] = array(

 				'place' => $place,

 				'text'  => $after_text,

@@ -95,7 +99,9 @@ 
 	 */

 	public function set_tag_layout_ifnotset($layout)

 	{

-		if($this->use_layout_set) return;

+		if($this->use_layout_set) {

+			return;

+		}

 		$this->use_layout = $layout;

 	}

 	

@@ -132,8 +138,12 @@ 
 	

 	private function getmethod($name)

 	{

-		if(!$name) return false;

-		if(!method_exists($this, $name)) return false;

+		if(!$name) {

+			return false;

+		}

+		if(!method_exists($this, $name)) {

+			return false;

+		}

 		return array($this, $name);

 	}

 	

@@ -142,9 +152,13 @@ 
 		$this->pre_parse();

 		foreach($this->rules as $rule)

 		{

-			if(!isset($rule['init'])) continue;

+			if(!isset($rule['init'])) {

+				continue;

+			}

 			$m = $this->getmethod($rule['init']);

-			if(!$m) continue;

+			if(!$m) {

+				continue;

+			}

 			call_user_func($m);

 		}

 	}

@@ -152,9 +166,13 @@ 
 	{

 		foreach($this->rules as $rule)

 		{

-			if(!isset($rule['deinit'])) continue;

+			if(!isset($rule['deinit'])) {

+				continue;

+			}

 			$m = $this->getmethod($rule['deinit']);

-			if(!$m) continue;

+			if(!$m) {

+				continue;

+			}

 			call_user_func($m);

 		}

 		$this->post_parse();

@@ -162,8 +180,12 @@ 
 	

 	private function rule_order_sort($a, $b)

 	{

-		if($a['order'] == $b['order']) return 0;

-		if($a['order'] < $b['order']) return -1;

+		if($a['order'] == $b['order']) {

+			return 0;

+		}

+		if($a['order'] < $b['order']) {

+			return -1;

+		}

 		return 1;

 	}

 	

@@ -239,7 +261,9 @@ 
 		}

 		

 		$pattern = $rule['pattern'];

-		if(is_string($pattern)) $pattern = array($pattern);

+		if(is_string($pattern)) {

+			$pattern = array($pattern);

+		}

 		$eval = false;

 		foreach($pattern as $patt)

 		{

@@ -257,7 +281,9 @@ 
 			

 			do {

 				$this->_text = preg_replace($rule['pattern'], $rule['replacement'], $this->_text);

-				if(!(isset($rule['cycled']) && $rule['cycled'])) break;

+				if(!(isset($rule['cycled']) && $rule['cycled'])) {

+					break;

+				}

 			} while(preg_match($rule['pattern'], $this->_text));

 			

 			return;

@@ -271,20 +297,26 @@ 
 			

 			$chr = substr($patt,0,1);

 			$preg_arr = explode($chr, $patt);		

-			if(strpos($preg_arr[count($preg_arr)-1], "e")!==false) // eval система

+			if(strpos($preg_arr[count($preg_arr)-1], "e")!==false) {

+				// eval система

 			{

 				$preg_arr[count($preg_arr)-1] = str_replace("e","",$preg_arr[count($preg_arr)-1]);

+			}

 				$patt = implode($chr, $preg_arr);

 				$this->thereplacement = $repl;

 				do {

 					$this->_text = preg_replace_callback($patt, array($this, "thereplcallback"), $this->_text);

-					if(!(isset($rule['cycled']) && $rule['cycled'])) break;

+					if(!(isset($rule['cycled']) && $rule['cycled'])) {

+						break;

+					}

 				} while(preg_match($patt, $this->_text));

 				

 			} else {

 				do {

 					$this->_text = preg_replace($patt, $repl, $this->_text);

-					if(!(isset($rule['cycled']) && $rule['cycled'])) break;

+					if(!(isset($rule['cycled']) && $rule['cycled'])) {

+						break;

+					}

 				} while(preg_match($patt, $this->_text));

 			}

 			$k++;

@@ -296,7 +328,9 @@ 
 	{

 		$chr = substr($pattern,0,1);

 		$preg_arr = explode($chr, $pattern);				

-		if(strpos($preg_arr[count($preg_arr)-1], "e")===false) return preg_replace($pattern, $replacement, $text);

+		if(strpos($preg_arr[count($preg_arr)-1], "e")===false) {

+			return preg_replace($pattern, $replacement, $text);

+		}

 		$preg_arr[count($preg_arr)-1] = str_replace("e","",$preg_arr[count($preg_arr)-1]);

 		$patt = implode($chr, $preg_arr);

 		$this->thereplacement = $replacement;

@@ -364,7 +398,9 @@ 
 			if(isset($this->classes[$classname]))

 			{

 				$style_inline = $this->classes[$classname];

-				if($style_inline) $attribute['__style'] = $style_inline;

+				if($style_inline) {

+					$attribute['__style'] = $style_inline;

+				}

 			}

 			$classname = (isset($this->class_names[$classname]) ? $this->class_names[$classname] :$classname);

 			$classname = ($this->class_layout_prefix ? $this->class_layout_prefix : "" ).$classname;

@@ -428,7 +464,9 @@ 
 	 */

 	public function is_on($key)

 	{

-		if(!isset($this->settings[$key])) return false;

+		if(!isset($this->settings[$key])) {

+			return false;

+		}

 		$kk = $this->settings[$key];

 		return ((strtolower($kk)=="on") || ($kk === "1") || ($kk === true) || ($kk === 1));

 	}

@@ -441,7 +479,9 @@ 
 	 */

 	public function ss($key)

 	{

-		if(!isset($this->settings[$key])) return "";

+		if(!isset($this->settings[$key])) {

+			return "";

+		}

 		return strval($this->settings[$key]);

 	}

 	

@@ -466,19 +506,31 @@ 
 	 */

 	public function activate($list,$disable =false, $strict = true)

 	{

-		if(!is_array($list)) return ;

+		if(!is_array($list)) {

+			return ;

+		}

 		

 		foreach($list as $rulename)

 		{

-			if($disable) $this->disable_rule($rulename); else $this->enable_rule($rulename);

+			if($disable) {

+				$this->disable_rule($rulename);

+			} else {

+				$this->enable_rule($rulename);

+			}

 		}

 		

 		if($strict)

 		{

 			foreach($this->rules as $rulename => $v)

 			{

-				if(in_array($rulename, $list)) continue;

-				if(!$disable) $this->disable_rule($rulename); else $this->enable_rule($rulename);

+				if(in_array($rulename, $list)) {

+					continue;

+				}

+				if(!$disable) {

+					$this->disable_rule($rulename);

+				} else {

+					$this->enable_rule($rulename);

+				}

 			}

 		}

 	}

@@ -500,9 +552,13 @@ 
 	 */

 	public function apply($list = null)

 	{

-		if(is_string($list)) $rlist = array($list);

-		elseif(is_array($list)) $rlist = $list;

-		else $rlist = array_keys($this->rules);

+		if(is_string($list)) {

+			$rlist = array($list);

+		} elseif(is_array($list)) {

+			$rlist = $list;

+		} else {

+			$rlist = array_keys($this->rules);

+		}

 		$this->_apply($rlist);

 		return $this->_text;

 	}