it-blaster / typograph-bundle

EMT/EMTBase.php

Doc Comments +10 added lines, -7 removed lines

@@ -54,6 +54,9 @@ 
 		$this->logs[] = array('class' => $tret, 'info' => $str, 'data' => $data);

 	}

 		

+	/**
+	 * @param string $data
+	 */
 	protected function error($info, $data = null)

 	{

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

@@ -154,7 +157,7 @@ 
      * Добавление защищенного блока

      *

      * @param 	string $tag тэг, который должен быть защищён

-     * @return  void

+     * @return  boolean

      */

     public function add_safe_tag($tag)

     {      	

@@ -170,8 +173,9 @@ 
      *

      * @param 	string $open начало блока

      * @param 	string $close конец защищенного блока

-     * @param 	bool $quoted специальные символы в начале и конце блока экранированы

-     * @return  void

+     * @param 	bool $quoted специальные символы в начале и конце блока экранированы
+     * @param string $id

+     * @return  boolean

      */

     public function add_safe_block($id, $open, $close, $quoted = false)

     {

@@ -197,8 +201,8 @@ 
     /**

      * Сохранение содержимого защищенных блоков

      *

-     * @param   string $text

-     * @param   bool $safe если true, то содержимое блоков будет сохранено, иначе - раскодировано. 

+     * @param   string $text
+     * @param boolean $way

      * @return  string

      */

     public function safe_blocks($text, $way, $show = true)

@@ -307,7 +311,7 @@ 
 	 *

 	 * @param mixed $class - имя класса трета, или сам объект

 	 * @param string $altname - альтернативное имя, если хотим например иметь два одинаоковых терта в обработке

- 	 * @return unknown

+ 	 * @return boolean

 	 */

 	public function add_tret($class, $altname = false)

 	{

@@ -592,7 +596,6 @@ 
 	 * Установить настройку

 	 *

 	 * @param mixed $selector

-	 * @param string $setting

 	 * @param mixed $value

 	 */

 	protected function doset($selector, $key, $value)

Indentation +113 added lines, -113 removed lines

@@ -103,130 +103,130 @@ 
 	}

 	

 	/**

-     * Добавление защищенного блока

-     *

-     * <code>

-     *  Jare_Typograph_Tool::addCustomBlocks('<span>', '</span>');

-     *  Jare_Typograph_Tool::addCustomBlocks('\<nobr\>', '\<\/span\>', true);

-     * </code>

-     * 

-     * @param 	string $id идентификатор

-     * @param 	string $open начало блока

-     * @param 	string $close конец защищенного блока

-     * @param 	string $tag тэг

-     * @return  void

-     */

-    private function _add_safe_block($id, $open, $close, $tag)

-    {

-    	$this->_safe_blocks[] = array(

-    			'id' => $id,

-    			'tag' => $tag,

-    			'open' =>  $open,

-    			'close' =>  $close,

-    		);

-    }

+	 * Добавление защищенного блока

+	 *

+	 * <code>

+	 *  Jare_Typograph_Tool::addCustomBlocks('<span>', '</span>');

+	 *  Jare_Typograph_Tool::addCustomBlocks('\<nobr\>', '\<\/span\>', true);

+	 * </code>

+	 * 

+	 * @param 	string $id идентификатор

+	 * @param 	string $open начало блока

+	 * @param 	string $close конец защищенного блока

+	 * @param 	string $tag тэг

+	 * @return  void

+	 */

+	private function _add_safe_block($id, $open, $close, $tag)

+	{

+		$this->_safe_blocks[] = array(

+				'id' => $id,

+				'tag' => $tag,

+				'open' =>  $open,

+				'close' =>  $close,

+			);

+	}

     

-    /**

-     * Список защищенных блоков

-     *

-     * @return 	array

-     */

-    public function get_all_safe_blocks()

-    {

-    	return $this->_safe_blocks;

-    }

+	/**

+	 * Список защищенных блоков

+	 *

+	 * @return 	array

+	 */

+	public function get_all_safe_blocks()

+	{

+		return $this->_safe_blocks;

+	}

     

-    /**

-     * Удаленного блока по его номеру ключа

-     *

-     * @param 	string $id идентифиактор защищённого блока 

-     * @return  void

-     */

-    public function remove_safe_block($id)

-    {

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

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

-    	}

-    }

+	/**

+	 * Удаленного блока по его номеру ключа

+	 *

+	 * @param 	string $id идентифиактор защищённого блока 

+	 * @return  void

+	 */

+	public function remove_safe_block($id)

+	{

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

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

+		}

+	}

     

     

-    /**

-     * Добавление защищенного блока

-     *

-     * @param 	string $tag тэг, который должен быть защищён

-     * @return  void

-     */

-    public function add_safe_tag($tag)

-    {      	

-    	$open = preg_quote("<", '/'). $tag."[^>]*?" .  preg_quote(">", '/');

-    	$close = preg_quote("</$tag>", '/');

-    	$this->_add_safe_block($tag, $open, $close, $tag);

-    	return true;

-    }

+	/**

+	 * Добавление защищенного блока

+	 *

+	 * @param 	string $tag тэг, который должен быть защищён

+	 * @return  void

+	 */

+	public function add_safe_tag($tag)

+	{      	

+		$open = preg_quote("<", '/'). $tag."[^>]*?" .  preg_quote(">", '/');

+		$close = preg_quote("</$tag>", '/');

+		$this->_add_safe_block($tag, $open, $close, $tag);

+		return true;

+	}

     

     

-    /**

-     * Добавление защищенного блока

-     *

-     * @param 	string $open начало блока

-     * @param 	string $close конец защищенного блока

-     * @param 	bool $quoted специальные символы в начале и конце блока экранированы

-     * @return  void

-     */

-    public function add_safe_block($id, $open, $close, $quoted = false)

-    {

-    	$open = trim($open);

-    	$close = trim($close);

+	/**

+	 * Добавление защищенного блока

+	 *

+	 * @param 	string $open начало блока

+	 * @param 	string $close конец защищенного блока

+	 * @param 	bool $quoted специальные символы в начале и конце блока экранированы

+	 * @return  void

+	 */

+	public function add_safe_block($id, $open, $close, $quoted = false)

+	{

+		$open = trim($open);

+		$close = trim($close);

     	

-    	if (empty($open) || empty($close)) 

-    	{

-    		return false;

-    	}

+		if (empty($open) || empty($close)) 

+		{

+			return false;

+		}

     	

-    	if (false === $quoted) 

-    	{

-    		$open = preg_quote($open, '/');

-            $close = preg_quote($close, '/');

-    	}

+		if (false === $quoted) 

+		{

+			$open = preg_quote($open, '/');

+			$close = preg_quote($close, '/');

+		}

     	

-    	$this->_add_safe_block($id, $open, $close, "");

-    	return true;

-    }

+		$this->_add_safe_block($id, $open, $close, "");

+		return true;

+	}

     

     

-    /**

-     * Сохранение содержимого защищенных блоков

-     *

-     * @param   string $text

-     * @param   bool $safe если true, то содержимое блоков будет сохранено, иначе - раскодировано. 

-     * @return  string

-     */

-    public function safe_blocks($text, $way, $show = true)

-    {

-    	if (count($this->_safe_blocks)) 

-    	{

-    		$safeType = true === $way ? "\Fenrizbes\TypographBundle\EMT\EMTLib::encrypt_tag(\$m[2])" : "stripslashes(\Fenrizbes\TypographBundle\EMT\EMTLib::decrypt_tag(\$m[2]))";

-    		$safeblocks = true === $way ? $this->_safe_blocks : array_reverse($this->_safe_blocks);

-       		foreach ($safeblocks as $block) 

-       		{

-        		$text = preg_replace_callback("/({$block['open']})(.+?)({$block['close']})/s",   create_function('$m','return $m[1].'.$safeType . '.$m[3];')   , $text);

-        	}

-    	}

+	/**

+	 * Сохранение содержимого защищенных блоков

+	 *

+	 * @param   string $text

+	 * @param   bool $safe если true, то содержимое блоков будет сохранено, иначе - раскодировано. 

+	 * @return  string

+	 */

+	public function safe_blocks($text, $way, $show = true)

+	{

+		if (count($this->_safe_blocks)) 

+		{

+			$safeType = true === $way ? "\Fenrizbes\TypographBundle\EMT\EMTLib::encrypt_tag(\$m[2])" : "stripslashes(\Fenrizbes\TypographBundle\EMT\EMTLib::decrypt_tag(\$m[2]))";

+			$safeblocks = true === $way ? $this->_safe_blocks : array_reverse($this->_safe_blocks);

+	   		foreach ($safeblocks as $block) 

+	   		{

+				$text = preg_replace_callback("/({$block['open']})(.+?)({$block['close']})/s",   create_function('$m','return $m[1].'.$safeType . '.$m[3];')   , $text);

+			}

+		}

     	

-    	return $text;

-    }

+		return $text;

+	}

     

     

-     /**

-     * Декодирование блоков, которые были скрыты в момент типографирования

-     *

-     * @param   string $text

-     * @return  string

-     */

-    public function decode_internal_blocks($text)

-    {

+	 /**

+	  * Декодирование блоков, которые были скрыты в момент типографирования

+	  *

+	  * @param   string $text

+	  * @return  string

+	  */

+	public function decode_internal_blocks($text)

+	{

 		return EMTLib::decode_internal_blocks($text);

-    }

+	}

 	

 	

 	private function create_object($tret)

@@ -307,7 +307,7 @@ 
 	 *

 	 * @param mixed $class - имя класса трета, или сам объект

 	 * @param string $altname - альтернативное имя, если хотим например иметь два одинаоковых терта в обработке

- 	 * @return unknown

+	 * @return unknown

 	 */

 	public function add_tret($class, $altname = false)

 	{

@@ -449,7 +449,7 @@ 
 		

 		if($this->is_on('dounicode'))

 		{

-            EMTLib::convert_html_entities_to_unicode($this->_text);

+			EMTLib::convert_html_entities_to_unicode($this->_text);

 		}

 		

 		$this->_text = EMTLib::safe_tag_chars($this->_text, false);

@@ -612,8 +612,8 @@ 
 				$rule_pattern = implode(".", $pa);

 			}

 		}

-        EMTLib::_process_selector_pattern($tret_pattern);

-        EMTLib::_process_selector_pattern($rule_pattern);

+		EMTLib::_process_selector_pattern($tret_pattern);

+		EMTLib::_process_selector_pattern($rule_pattern);

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

 		

 		foreach ($this->trets as $tret) 		

Spacing +96 added lines, -97 removed lines

@@ -24,9 +24,9 @@ 
 	 *

 	 * @var array

 	 */

-	protected $trets = array() ; 

-	protected $trets_index = array() ; 

-	protected $tret_objects = array() ; 

+	protected $trets = array(); 

+	protected $trets_index = array(); 

+	protected $tret_objects = array(); 

 

 	public $ok             = false;

 	public $debug_enabled  = false;

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

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

 	{

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

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

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

 	}

 	

@@ -57,7 +57,7 @@ 
 	protected function error($info, $data = null)

 	{

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

-		$this->log("ERROR $info", $data );		

+		$this->log("ERROR $info", $data);		

 	}

 	

 	protected function tret_error($tret, $info, $data = null)

@@ -67,10 +67,10 @@ 
 	

 	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,

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

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

 				'place' => $place,

 				'text'  => $after_text,

 				'text_raw'  => $after_text_raw,

@@ -144,8 +144,8 @@ 
      */

     public function remove_safe_block($id)

     {

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

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

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

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

     	}

     }

     

@@ -158,7 +158,7 @@ 
      */

     public function add_safe_tag($tag)

     {      	

-    	$open = preg_quote("<", '/'). $tag."[^>]*?" .  preg_quote(">", '/');

+    	$open = preg_quote("<", '/').$tag."[^>]*?".preg_quote(">", '/');

     	$close = preg_quote("</$tag>", '/');

     	$this->_add_safe_block($tag, $open, $close, $tag);

     	return true;

@@ -209,7 +209,7 @@ 
     		$safeblocks = true === $way ? $this->_safe_blocks : array_reverse($this->_safe_blocks);

        		foreach ($safeblocks as $block) 

        		{

-        		$text = preg_replace_callback("/({$block['open']})(.+?)({$block['close']})/s",   create_function('$m','return $m[1].'.$safeType . '.$m[3];')   , $text);

+        		$text = preg_replace_callback("/({$block['open']})(.+?)({$block['close']})/s", create_function('$m', 'return $m[1].'.$safeType.'.$m[3];'), $text);

         	}

     	}

     	

@@ -232,20 +232,20 @@ 
 	private function create_object($tret)

 	{

 		// если класса нету, попытаемся его прогрузить, например, если стандартный

-		if(!class_exists($tret))

+		if (!class_exists($tret))

 		{

-			if(preg_match("/^EMTTret([a-zA-Z0-9_]+)$/",$tret, $m))

+			if (preg_match("/^EMTTret([a-zA-Z0-9_]+)$/", $tret, $m))

 			{

 				$tname = $m[1];

-				$fname = str_replace("_"," ",$tname);

+				$fname = str_replace("_", " ", $tname);

 				$fname = ucwords($fname);

-				$fname = str_replace(" ",".",$fname);

+				$fname = str_replace(" ", ".", $fname);

 				//if(file_exists("EMT.Tret.".$fname.".php"))

 				{					

 				}				

 			}

 		}

-		if(!class_exists($tret))

+		if (!class_exists($tret))

 		{

 			$this->error("Класс $tret не найден. Пожалуйста, подргузите нужный файл.");

 			return null;

@@ -259,7 +259,7 @@ 
 	

 	private function get_short_tret($tretname)

 	{

-		if(preg_match("/^EMTTret([a-zA-Z0-9_]+)$/",$tretname, $m))

+		if (preg_match("/^EMTTret([a-zA-Z0-9_]+)$/", $tretname, $m))

 		{

 			return $m[1];

 		}

@@ -268,15 +268,15 @@ 
 	

 	private function _init()

 	{

-		foreach($this->trets as $tret)

+		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;

 		}

 		

-		if(!$this->inited)

+		if (!$this->inited)

 		{

 			$this->add_safe_tag('pre');

 			$this->add_safe_tag('script');

@@ -311,9 +311,9 @@ 
 	 */

 	public function add_tret($class, $altname = false)

 	{

-		if(is_object($class))

+		if (is_object($class))

 		{

-			if(!is_a($class, "EMTTret"))

+			if (!is_a($class, "EMTTret"))

 			{

 				$this->error("You are adding Tret that doesn't inherit base class EMTTret", get_class($class));

 				return false;	

@@ -325,10 +325,10 @@ 
 			$this->trets[] = ($altname ? $altname : get_class($class));

 			return true;

 		}

-		if(is_string($class))

+		if (is_string($class))

 		{

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

-			if($obj === null)

+			if ($obj === null)

 				return false;

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

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

@@ -345,15 +345,15 @@ 
 	 */

 	public function get_tret($name)

 	{

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

-		foreach($this->trets as $tret)

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

+		foreach ($this->trets as $tret)

 		{

-			if($tret == $name)

+			if ($tret == $name)

 			{

 				$this->_init();

 				return $this->tret_objects[$name];

 			}

-			if($this->get_short_tret($tret) == $name)

+			if ($this->get_short_tret($tret) == $name)

 			{

 				$this->_init();

 				return $this->tret_objects[$tret];

@@ -387,8 +387,8 @@ 
 		$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 +404,15 @@ 
 		foreach ($atrets as $tret) 		

 		{

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

-			if($this->use_layout_set)

+			if ($this->use_layout_set)

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

 				

-			if($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,19 +420,19 @@ 
 			$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)

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

+			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']);				

 			

 			// отладка

-			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);

@@ -447,7 +447,7 @@ 
 		$this->_text = $this->decode_internal_blocks($this->_text);

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

 		

-		if($this->is_on('dounicode'))

+		if ($this->is_on('dounicode'))

 		{

             EMTLib::convert_html_entities_to_unicode($this->_text);

 		}

@@ -458,14 +458,14 @@ 
 		$this->_text = $this->safe_blocks($this->_text, false);		

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

 		

-		if(!$this->disable_notg_replace)

+		if (!$this->disable_notg_replace)

 		{

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

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

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

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

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

 		}

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

-		$this->ok = (count($this->errors)==0);

+		$this->ok = (count($this->errors) == 0);

 		return $this->_text;

 	}

 	

@@ -483,18 +483,18 @@ 
 		$res = array();

 		foreach ($this->trets as $tret) 		

 		{

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

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

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

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

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

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

 			{

-				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);

+				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)

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

 		{

 			$str .= ".$k { $v }\n";

 		}

@@ -524,7 +524,7 @@ 
 	 *

 	 * @param string|bool $prefix если true то префикс 'emt_', иначе то, что передали

 	 */

-	public function set_class_layout_prefix($prefix )

+	public function set_class_layout_prefix($prefix)

 	{

 		$this->class_layout_prefix = $prefix === true ? "emt_" : $prefix;

 	}

@@ -542,33 +542,33 @@ 
 	 */

 	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)

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

 		{

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

-			if(!$tretx)

+			if (!$tretx)

 			{

 				$this->log("Трэт $tret не найден при применении карты включаемых правил");

 				continue;

 			}

 			$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)) {

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

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

+			} elseif (is_string($list)) {

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

+			} elseif (is_array($list)) {

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

 			}

 		}

-		if($strict)

+		if ($strict)

 		{

-			foreach($this->trets as $tret)

+			foreach ($this->trets as $tret)

 			{

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

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

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

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

 			}

 		}

 		

@@ -582,9 +582,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));

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

 	}

 	

 	

@@ -600,9 +600,9 @@ 
 		$tret_pattern = false;

 		$rule_pattern = false;

 		//if(($selector === false) || ($selector === null) || ($selector === false) || ($selector === "*")) $type = 0;

-		if(is_string($selector))

+		if (is_string($selector))

 		{

-			if(strpos($selector,".")===false)

+			if (strpos($selector, ".") === false)

 			{

 				$tret_pattern = $selector;

 			} else {

@@ -614,29 +614,29 @@ 
 		}

         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")

+			if ($key == "active")

 			{

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

+				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)

+				if ($rule_pattern === false)

 				{

 					$tret_obj->set($key, $value);

 				} else {

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

+					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);

 					}

 				}

@@ -658,18 +658,18 @@ 
 	 * @param mixed $key

 	 * @param mixed $value

 	 */

-	public function set($selector, $key , $value = false)

+	public function set($selector, $key, $value = false)

 	{

-		if(is_array($selector)) 

+		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))

+		if (is_array($key))

 		{

-			foreach($key as $x => $y)

+			foreach ($key as $x => $y)

 			{

-				if(is_array($value))

+				if (is_array($value))

 				{

 					$kk = $y;

 					$vv = $value[$x];

@@ -712,11 +712,11 @@ 
 	 */

 	public function setup($setupmap)

 	{

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

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

 		

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

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

 		{

-			if(isset($setupmap['map']))

+			if (isset($setupmap['map']))

 			{

 				$ret['map'] = $test['params']['map'];

 				$ret['disable'] = $test['params']['map_disable'];

@@ -726,12 +726,11 @@ 
 				unset($setupmap['map_disable']);

 				unset($setupmap['map_strict']);

 			}

-			if(is_array($setupmap['maps']))

+			if (is_array($setupmap['maps']))

 			{

-				foreach($setupmap['maps'] as $map)

+				foreach ($setupmap['maps'] as $map)

 				{ 

-					$this->set_enable_map

-								($map['map'], 

+					$this->set_enable_map($map['map'], 

 								isset($map['disable']) ? $map['disable'] : false,

 								isset($map['strict']) ? $map['strict'] : false 

 							);

@@ -741,7 +740,7 @@ 
 		}

 		

 		

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

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

 	}

 	

 	

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

Doc Comments +11 added lines, -4 removed lines

@@ -80,7 +80,7 @@ 
      * 

      * @author	somebody?

      * @param	int $c код символа в кодировке UTF-8 (например, 0x00AB)

-     * @return	bool|string

+     * @return	string|false

      */

     public static function _getUnicodeChar($c)

     {

@@ -118,7 +118,7 @@ 
 	 *

 	 * @param 	string $text

 	 * @param   mixed $mode

-	 * @return 	string|bool

+	 * @return 	false|string

 	 */

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

 	{

@@ -199,8 +199,8 @@ 
      * Тег 'a' кодируется со специальным префиксом для дальнейшей

      * возможности выносить за него кавычки.

      * 

-     * @param 	string $text

-     * @param 	bool $safe

+     * @param 	string $text
+     * @param boolean $way

      * @return  string

      */

     public static function safe_tag_chars($text, $way)

@@ -322,6 +322,9 @@ 
     

     

     

+    /**
+     * @param string[] $needle
+     */
     public static function strpos_ex(&$haystack, $needle, $offset = null)

     {

     	if(is_array($needle))

@@ -668,6 +671,10 @@ 
 				, $text);

 	}

 	

+	/**
+	 * @param string $haystack
+	 * @param string $needle
+	 */
 	public static function rstrpos ($haystack, $needle, $offset = 0){

 	    

 	    if(trim($haystack) != "" && trim($needle) != "" && $offset <= mb_strlen($haystack))

Indentation +163 added lines, -163 removed lines

@@ -43,7 +43,7 @@ 
 		'1/2' 	=> array('html' => array('½', '½'),

 						 'utf8' => array(0x00BD)),

 		'1/4' 	=> array('html' => array('¼', '¼'),

-					     'utf8' => array(0x00BC)),

+						 'utf8' => array(0x00BC)),

 		'3/4' 	=> array('html' => array('¾', '¾'),

 						 'utf8' => array(0x00BE)),

 		'+-' 	=> array('html' => array('±', '±'),

@@ -55,13 +55,13 @@ 
 		'(r)' 	=> array('html' => array('®', '®'), 

 						 'utf8' => array(0x00AE)),

 		'(c)' 	=> array('html' => array('©', '©'), 

-					     'utf8' => array(0x00A9)),

+						 'utf8' => array(0x00A9)),

 		'§' 	=> array('html' => array('§', '§'), 

-					     'utf8' => array(0x00A7)),

+						 'utf8' => array(0x00A7)),

 		'`' 	=> array('html' => array('́')),

 		'\'' 	=> array('html' => array('’', '’')),

 		'x' 	=> array('html' => array('×', '×'), 

-					     'utf8' => array('×') /* какой же у него может быть код? */),

+						 'utf8' => array('×') /* какой же у него может быть код? */),

 		

 	);

 

@@ -76,32 +76,32 @@ 
 	

 	

 	/**

-     * Костыли для работы с символами UTF-8

-     * 

-     * @author	somebody?

-     * @param	int $c код символа в кодировке UTF-8 (например, 0x00AB)

-     * @return	bool|string

-     */

-    public static function _getUnicodeChar($c)

-    {

-    	if ($c <= 0x7F) {

-        	return chr($c);

-    	} else if ($c <= 0x7FF) {

-        	return chr(0xC0 | $c >> 6)

-        	     . chr(0x80 | $c & 0x3F);

-    	} else if ($c <= 0xFFFF) {

-        	return chr(0xE0 | $c >> 12)

-        	     . chr(0x80 | $c >> 6 & 0x3F)

-                 . chr(0x80 | $c & 0x3F);

-    	} else if ($c <= 0x10FFFF) {

-        	return chr(0xF0 | $c >> 18) 

-        		 . chr(0x80 | $c >> 12 & 0x3F)                 	

-        		 . chr(0x80 | $c >> 6 & 0x3F)

-                 . chr(0x80 | $c & 0x3F);

-    	} else {

-        	return false;

-    	}

-    }

+	 * Костыли для работы с символами UTF-8

+	 * 

+	 * @author	somebody?

+	 * @param	int $c код символа в кодировке UTF-8 (например, 0x00AB)

+	 * @return	bool|string

+	 */

+	public static function _getUnicodeChar($c)

+	{

+		if ($c <= 0x7F) {

+			return chr($c);

+		} else if ($c <= 0x7FF) {

+			return chr(0xC0 | $c >> 6)

+				 . chr(0x80 | $c & 0x3F);

+		} else if ($c <= 0xFFFF) {

+			return chr(0xE0 | $c >> 12)

+				 . chr(0x80 | $c >> 6 & 0x3F)

+				 . chr(0x80 | $c & 0x3F);

+		} else if ($c <= 0x10FFFF) {

+			return chr(0xF0 | $c >> 18) 

+				 . chr(0x80 | $c >> 12 & 0x3F)                 	

+				 . chr(0x80 | $c >> 6 & 0x3F)

+				 . chr(0x80 | $c & 0x3F);

+		} else {

+			return false;

+		}

+	}

 	

 

 	/**

@@ -194,71 +194,71 @@ 
 	}

 	

 	/**

-     * Сохраняем содержимое тегов HTML

-     *

-     * Тег 'a' кодируется со специальным префиксом для дальнейшей

-     * возможности выносить за него кавычки.

-     * 

-     * @param 	string $text

-     * @param 	bool $safe

-     * @return  string

-     */

-    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);

-        return $text;

-    }

+	 * Сохраняем содержимое тегов HTML

+	 *

+	 * Тег 'a' кодируется со специальным префиксом для дальнейшей

+	 * возможности выносить за него кавычки.

+	 * 

+	 * @param 	string $text

+	 * @param 	bool $safe

+	 * @return  string

+	 */

+	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);

+		return $text;

+	}

     

     

-    /**

-     * Декодриует спец блоки

-     *

-     * @param 	string $text

-     * @return  string

-     */

-    public static function decode_internal_blocks($text)

-    {

-    	$text = preg_replace_callback('/'.EMTLib::INTERNAL_BLOCK_OPEN.'([a-zA-Z0-9\/=]+?)'.EMTLib::INTERNAL_BLOCK_CLOSE.'/s', create_function('$m','return \Fenrizbes\TypographBundle\EMT\EMTLib::decrypt_tag($m[1]);'), $text);

-        return $text;

-    }

+	/**

+	 * Декодриует спец блоки

+	 *

+	 * @param 	string $text

+	 * @return  string

+	 */

+	public static function decode_internal_blocks($text)

+	{

+		$text = preg_replace_callback('/'.EMTLib::INTERNAL_BLOCK_OPEN.'([a-zA-Z0-9\/=]+?)'.EMTLib::INTERNAL_BLOCK_CLOSE.'/s', create_function('$m','return \Fenrizbes\TypographBundle\EMT\EMTLib::decrypt_tag($m[1]);'), $text);

+		return $text;

+	}

     

-    /**

-     * Кодирует спец блок

-     *

-     * @param 	string $text

-     * @return  string

-     */

-    public static function iblock($text)

-    {

-        return EMTLib::INTERNAL_BLOCK_OPEN. EMTLib::encrypt_tag($text).EMTLib::INTERNAL_BLOCK_CLOSE;

-    }

+	/**

+	 * Кодирует спец блок

+	 *

+	 * @param 	string $text

+	 * @return  string

+	 */

+	public static function iblock($text)

+	{

+		return EMTLib::INTERNAL_BLOCK_OPEN. EMTLib::encrypt_tag($text).EMTLib::INTERNAL_BLOCK_CLOSE;

+	}

     

     

-    /**

-     * Создание тега с защищенным содержимым 

-     *

-     * @param 	string $content текст, который будет обрамлен тегом

-     * @param 	string $tag тэг 

-     * @param 	array $attribute список атрибутов, где ключ - имя атрибута, а значение - само значение данного атрибута

-     * @return 	string

-     */

-    public static function build_safe_tag($content, $tag = 'span', $attribute = array(), $layout = EMTLib::LAYOUT_STYLE )

-    {

-    	$htmlTag = $tag;

+	/**

+	 * Создание тега с защищенным содержимым 

+	 *

+	 * @param 	string $content текст, который будет обрамлен тегом

+	 * @param 	string $tag тэг 

+	 * @param 	array $attribute список атрибутов, где ключ - имя атрибута, а значение - само значение данного атрибута

+	 * @return 	string

+	 */

+	public static function build_safe_tag($content, $tag = 'span', $attribute = array(), $layout = EMTLib::LAYOUT_STYLE )

+	{

+		$htmlTag = $tag;

 		

-    	if (self::$_typographSpecificTagId) 

-    	{

-    		if(!isset($attribute['id'])) 

-    		{

-    			$attribute['id'] = 'emt-2' . mt_rand(1000,9999);

-    		}

-    	}

+		if (self::$_typographSpecificTagId) 

+		{

+			if(!isset($attribute['id'])) 

+			{

+				$attribute['id'] = 'emt-2' . mt_rand(1000,9999);

+			}

+		}

     	

 		$classname = "";

-    	if (count($attribute)) 

+		if (count($attribute)) 

 		{

 			

 			if($layout & EMTLib::LAYOUT_STYLE)

@@ -291,66 +291,66 @@ 
 		}

     	

 		if( ($layout & EMTLib::LAYOUT_CLASS ) && $classname) {

-    		$htmlTag .= " class=\"$classname\"";

-    	}

+			$htmlTag .= " class=\"$classname\"";

+		}

     	

 		return "<" . self::encrypt_tag($htmlTag) . ">$content</" . self::encrypt_tag($tag) . ">";

-    }

+	}

     

-    /**

-     * Метод, осуществляющий кодирование (сохранение) информации

-     * с целью невозможности типографировать ее

-     *

-     * @param 	string $text

-     * @return 	string

-     */

-    public static function encrypt_tag($text)

-    {

-    	return base64_encode($text)."=";

-    }

+	/**

+	 * Метод, осуществляющий кодирование (сохранение) информации

+	 * с целью невозможности типографировать ее

+	 *

+	 * @param 	string $text

+	 * @return 	string

+	 */

+	public static function encrypt_tag($text)

+	{

+		return base64_encode($text)."=";

+	}

     

-    /**

-     * Метод, осуществляющий декодирование информации

-     *

-     * @param 	string $text

-     * @return 	string

-     */

-    public static function decrypt_tag($text)

-    {

-    	return base64_decode(substr($text,0,-1));

-    }

+	/**

+	 * Метод, осуществляющий декодирование информации

+	 *

+	 * @param 	string $text

+	 * @return 	string

+	 */

+	public static function decrypt_tag($text)

+	{

+		return base64_decode(substr($text,0,-1));

+	}

     

     

     

-    public static function strpos_ex(&$haystack, $needle, $offset = null)

-    {

-    	if(is_array($needle))

-    	{

-    		$m = false;

-    		$w = false;

-    		foreach($needle as $n)

-    		{

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

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

-    			if($m === false)

-    			{

-    				$m = $p;

-    				$w = $n;

-    				continue;

-    			}

-    			if($p < $m)

-    			{

-    				$m = $p;

-    				$w = $n;

-    			}

-    		}

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

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

-    	}

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

-    }

+	public static function strpos_ex(&$haystack, $needle, $offset = null)

+	{

+		if(is_array($needle))

+		{

+			$m = false;

+			$w = false;

+			foreach($needle as $n)

+			{

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

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

+				if($m === false)

+				{

+					$m = $p;

+					$w = $n;

+					continue;

+				}

+				if($p < $m)

+				{

+					$m = $p;

+					$w = $n;

+				}

+			}

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

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

+		}

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

+	}

     

-    public static function _process_selector_pattern(&$pattern)

+	public static function _process_selector_pattern(&$pattern)

 	{

 		if($pattern===false) return;

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

@@ -363,8 +363,8 @@ 
 		return preg_match($pattern, $text);

 	}

 	

-    public static function strtolower($string)

-    { 

+	public static function strtolower($string)

+	{ 

 		$convert_to = array( 

 			"a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", 

 			"v", "w", "x", "y", "z", "à", "á", "â", "ã", "ä", "å", "æ", "ç", "è", "é", "ê", "ë", "ì", "í", "î", "ï", 

@@ -670,28 +670,28 @@ 
 	

 	public static function rstrpos ($haystack, $needle, $offset = 0){

 	    

-	    if(trim($haystack) != "" && trim($needle) != "" && $offset <= mb_strlen($haystack))

-	    {

-	        $last_pos = $offset;

-	        $found = false;

-	        while(($curr_pos = mb_strpos($haystack, $needle, $last_pos)) !== false)

-	        {

-	            $found = true;

-	            $last_pos = $curr_pos + 1;

-	        }

-	        if($found)

-	        {

-	            return $last_pos - 1;

-	        }

-	        else

-	        {

-	            return false;

-	        }

-	    }

-	    else

-	    {

-	        return false;

-	    } 

+		if(trim($haystack) != "" && trim($needle) != "" && $offset <= mb_strlen($haystack))

+		{

+			$last_pos = $offset;

+			$found = false;

+			while(($curr_pos = mb_strpos($haystack, $needle, $last_pos)) !== false)

+			{

+				$found = true;

+				$last_pos = $curr_pos + 1;

+			}

+			if($found)

+			{

+				return $last_pos - 1;

+			}

+			else

+			{

+				return false;

+			}

+		}

+		else

+		{

+			return false;

+		} 

 	}

 	

 	public static function ifop($cond, $true, $false) {

Spacing +44 added lines, -44 removed lines

@@ -84,16 +84,16 @@ 
      */

     public static function _getUnicodeChar($c)

     {

-    	if ($c <= 0x7F) {

+    	if ($c<=0x7F) {

         	return chr($c);

-    	} else if ($c <= 0x7FF) {

+    	} else if ($c<=0x7FF) {

         	return chr(0xC0 | $c >> 6)

         	     . chr(0x80 | $c & 0x3F);

-    	} else if ($c <= 0xFFFF) {

+    	} else if ($c<=0xFFFF) {

         	return chr(0xE0 | $c >> 12)

         	     . chr(0x80 | $c >> 6 & 0x3F)

                  . chr(0x80 | $c & 0x3F);

-    	} else if ($c <= 0x10FFFF) {

+    	} else if ($c<=0x10FFFF) {

         	return chr(0xF0 | $c >> 18) 

         		 . chr(0x80 | $c >> 12 & 0x3F)                 	

         		 . chr(0x80 | $c >> 6 & 0x3F)

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

 	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) 

 		{

@@ -143,7 +143,7 @@ 
 						}

 						if ('html' === $type) 

 						{

-							if(preg_match("/<[a-z]+>/i",$v))

+							if (preg_match("/<[a-z]+>/i", $v))

 							{

 								$v = self::safe_tag_chars($v, true);

 							}

@@ -188,7 +188,7 @@ 
 				$ignore = implode('', $tags);

 			}

 		}

-		$text = preg_replace(array('/\<br\s*\/?>/i', '/\<\/p\>\s*\<p\>/'), array("\n","\n\n"), $text);

+		$text = preg_replace(array('/\<br\s*\/?>/i', '/\<\/p\>\s*\<p\>/'), array("\n", "\n\n"), $text);

 		$text = strip_tags($text, $ignore);

 		return $text;

 	}

@@ -206,9 +206,9 @@ 
     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);

+        	$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);

+        	$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;

     }

     

@@ -221,7 +221,7 @@ 
      */

     public static function decode_internal_blocks($text)

     {

-    	$text = preg_replace_callback('/'.EMTLib::INTERNAL_BLOCK_OPEN.'([a-zA-Z0-9\/=]+?)'.EMTLib::INTERNAL_BLOCK_CLOSE.'/s', create_function('$m','return \Fenrizbes\TypographBundle\EMT\EMTLib::decrypt_tag($m[1]);'), $text);

+    	$text = preg_replace_callback('/'.EMTLib::INTERNAL_BLOCK_OPEN.'([a-zA-Z0-9\/=]+?)'.EMTLib::INTERNAL_BLOCK_CLOSE.'/s', create_function('$m', 'return \Fenrizbes\TypographBundle\EMT\EMTLib::decrypt_tag($m[1]);'), $text);

         return $text;

     }

     

@@ -233,7 +233,7 @@ 
      */

     public static function iblock($text)

     {

-        return EMTLib::INTERNAL_BLOCK_OPEN. EMTLib::encrypt_tag($text).EMTLib::INTERNAL_BLOCK_CLOSE;

+        return EMTLib::INTERNAL_BLOCK_OPEN.EMTLib::encrypt_tag($text).EMTLib::INTERNAL_BLOCK_CLOSE;

     }

     

     

@@ -245,15 +245,15 @@ 
      * @param 	array $attribute список атрибутов, где ключ - имя атрибута, а значение - само значение данного атрибута

      * @return 	string

      */

-    public static function build_safe_tag($content, $tag = 'span', $attribute = array(), $layout = EMTLib::LAYOUT_STYLE )

+    public static function build_safe_tag($content, $tag = 'span', $attribute = array(), $layout = EMTLib::LAYOUT_STYLE)

     {

     	$htmlTag = $tag;

 		

     	if (self::$_typographSpecificTagId) 

     	{

-    		if(!isset($attribute['id'])) 

+    		if (!isset($attribute['id'])) 

     		{

-    			$attribute['id'] = 'emt-2' . mt_rand(1000,9999);

+    			$attribute['id'] = 'emt-2'.mt_rand(1000, 9999);

     		}

     	}

     	

@@ -261,14 +261,14 @@ 
     	if (count($attribute)) 

 		{

 			

-			if($layout & EMTLib::LAYOUT_STYLE)

+			if ($layout & EMTLib::LAYOUT_STYLE)

 			{

-				if(isset($attribute['__style']) && $attribute['__style'])

+				if (isset($attribute['__style']) && $attribute['__style'])

 				{

-					if(isset($attribute['style']) && $attribute['style'])

+					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,8 +280,8 @@ 
 			}			

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

 			{

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

-				if($attr == "class") {

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

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

 					$classname = "$value";

 					continue;

 				}

@@ -290,11 +290,11 @@ 
 			

 		}

     	

-		if( ($layout & EMTLib::LAYOUT_CLASS ) && $classname) {

+		if (($layout & EMTLib::LAYOUT_CLASS) && $classname) {

     		$htmlTag .= " class=\"$classname\"";

     	}

     	

-		return "<" . self::encrypt_tag($htmlTag) . ">$content</" . self::encrypt_tag($tag) . ">";

+		return "<".self::encrypt_tag($htmlTag).">$content</".self::encrypt_tag($tag).">";

     }

     

     /**

@@ -317,34 +317,34 @@ 
      */

     public static function decrypt_tag($text)

     {

-    	return base64_decode(substr($text,0,-1));

+    	return base64_decode(substr($text, 0, -1));

     }

     

     

     

     public static function strpos_ex(&$haystack, $needle, $offset = null)

     {

-    	if(is_array($needle))

+    	if (is_array($needle))

     	{

     		$m = false;

     		$w = false;

-    		foreach($needle as $n)

+    		foreach ($needle as $n)

     		{

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

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

-    			if($m === false)

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

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

+    			if ($m === false)

     			{

     				$m = $p;

     				$w = $n;

     				continue;

     			}

-    			if($p < $m)

+    			if ($p<$m)

     			{

     				$m = $p;

     				$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 +352,14 @@ 
     

     public static function _process_selector_pattern(&$pattern)

 	{

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

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

+		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 +646,7 @@ 
 	 */

 	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;

 	}

 	

@@ -668,20 +668,20 @@ 
 				, $text);

 	}

 	

-	public static function rstrpos ($haystack, $needle, $offset = 0){

+	public static function rstrpos($haystack, $needle, $offset = 0) {

 	    

-	    if(trim($haystack) != "" && trim($needle) != "" && $offset <= mb_strlen($haystack))

+	    if (trim($haystack) != "" && trim($needle) != "" && $offset<=mb_strlen($haystack))

 	    {

 	        $last_pos = $offset;

 	        $found = false;

-	        while(($curr_pos = mb_strpos($haystack, $needle, $last_pos)) !== false)

+	        while (($curr_pos = mb_strpos($haystack, $needle, $last_pos)) !== false)

 	        {

 	            $found = true;

-	            $last_pos = $curr_pos + 1;

+	            $last_pos = $curr_pos+1;

 	        }

-	        if($found)

+	        if ($found)

 	        {

-	            return $last_pos - 1;

+	            return $last_pos-1;

 	        }

 	        else

 	        {

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

Doc Comments +8 added lines, -4 removed lines

@@ -70,6 +70,9 @@ 
 		$this->logs[] = array('info' => $str, 'data' => $data);

 	}

 

+	/**
+	 * @param string $info
+	 */
 	private function error($info, $data = null)

 	{

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

@@ -91,7 +94,6 @@ 
 	 *   EMTLib::LAYOUT_STYLE - с помощью стилей

 	 *   EMTLib::LAYOUT_CLASS - с помощью классов

 	 *

-	 * @param int $kind

 	 */

 	public function set_tag_layout_ifnotset($layout)

 	{

@@ -105,7 +107,6 @@ 
 	 *   EMTLib::LAYOUT_CLASS - с помощью классов

 	 *   EMTLib::LAYOUT_STYLE|EMTLib::LAYOUT_CLASS - оба метода

 	 *

-	 * @param int $kind

 	 */

 	public function set_tag_layout($layout = EMTLib::LAYOUT_STYLE)

 	{

@@ -292,6 +293,10 @@ 
 	}

 	

 	

+	/**
+	 * @param string $pattern
+	 * @param string $replacement
+	 */
 	protected function preg_replace_e($pattern, $replacement, $text)

 	{

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

@@ -437,7 +442,7 @@ 
 	 * Получить строковое значение настройки

 	 *

 	 * @param unknown_type $key

-	 * @return unknown

+	 * @return string

 	 */

 	public function ss($key)

 	{

@@ -494,7 +499,6 @@ 
 	/**

 	 * Применить к тексту

 	 *

-	 * @param string $text - текст к которому применить

 	 * @param mixed $list - список правил, null - все правила

 	 * @return string

 	 */

Indentation +3 added lines, -3 removed lines

@@ -59,9 +59,9 @@
 	 * Типы кавычек

 	 */

 	const QUOTE_FIRS_OPEN = '«';

-    const QUOTE_FIRS_CLOSE = '»';

-    const QUOTE_CRAWSE_OPEN = '„';

-    const QUOTE_CRAWSE_CLOSE = '“';

+	const QUOTE_FIRS_CLOSE = '»';

+	const QUOTE_CRAWSE_OPEN = '„';

+	const QUOTE_CRAWSE_CLOSE = '“';

 	

 	

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

Spacing +75 added lines, -75 removed lines

@@ -29,7 +29,7 @@ 
 	

 	private   $disabled = array();

 	private   $enabled  = array();

-	protected $_text= '';

+	protected $_text = '';

 	public $logging = false;

 	public $logs    = false;

 	public $errors  = false;	

@@ -66,19 +66,19 @@ 
 	

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

 	{

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

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

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

 	}

 

 	private function error($info, $data = null)

 	{

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

-		$this->log('ERROR: '. $info , $data);

+		$this->log('ERROR: '.$info, $data);

 	}

 	

 	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 +95,7 @@ 
 	 */

 	public function set_tag_layout_ifnotset($layout)

 	{

-		if($this->use_layout_set) return;

+		if ($this->use_layout_set) return;

 		$this->use_layout = $layout;

 	}

 	

@@ -132,29 +132,29 @@ 
 	

 	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);

 	}

 	

 	private function _pre_parse()

 	{

 		$this->pre_parse();

-		foreach($this->rules as $rule)

+		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);

 		}

 	}

 	private function _post_parse()

 	{

-		foreach($this->rules as $rule)

+		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 +162,8 @@ 
 	

 	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;

 	}

 	

@@ -172,23 +172,23 @@ 
 		$name = $rule['id'];

 		//$this->log("Правило $name", "Применяем правило");

 		$disabled = (isset($this->disabled[$rule['id']]) && $this->disabled[$rule['id']]) || ((isset($rule['disabled']) && $rule['disabled']) && !(isset($this->enabled[$rule['id']]) && $this->enabled[$rule['id']]));

-		if($disabled)

+		if ($disabled)

 		{

-			$this->log("Правило $name", "Правило отключено" . ((isset($rule['disabled']) && $rule['disabled'])? " (по умолчанию)" : ""));

+			$this->log("Правило $name", "Правило отключено".((isset($rule['disabled']) && $rule['disabled']) ? " (по умолчанию)" : ""));

 			return;

 		}

-		if(isset($rule['function']) && $rule['function'])

+		if (isset($rule['function']) && $rule['function'])

 		{

-			if(!(isset($rule['pattern']) &&  $rule['pattern']))

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

 			{

-				if(method_exists($this, $rule['function']))

+				if (method_exists($this, $rule['function']))

 				{

 					$this->log("Правило $name", "Используется метод ".$rule['function']." в правиле");

 					

 					call_user_func(array($this, $rule['function']));

 					return;

 				} 

-				if(function_exists($rule['function']))

+				if (function_exists($rule['function']))

 				{

 					$this->log("Правило $name", "Используется функция ".$rule['function']." в правиле");

 					

@@ -196,38 +196,38 @@ 
 					return;

 				}

 				

-				$this->error('Функция '.$rule['function'].' из правила '.$rule['id']. " не найдена");

-				return ;

+				$this->error('Функция '.$rule['function'].' из правила '.$rule['id']." не найдена");

+				return;

 			} else {

-				if(preg_match("/^[a-z_0-9]+$/i", $rule['function']))

+				if (preg_match("/^[a-z_0-9]+$/i", $rule['function']))

 				{

-					if(method_exists($this, $rule['function']))

+					if (method_exists($this, $rule['function']))

 					{

 						$this->log("Правило $name", "Замена с использованием preg_replace_callback с методом ".$rule['function']."");

 						

 						$this->_text = preg_replace_callback($rule['pattern'], array($this, $rule['function']), $this->_text);

 						return;

 					} 

-					if(function_exists($rule['function']))

+					if (function_exists($rule['function']))

 					{

 						$this->log("Правило $name", "Замена с использованием preg_replace_callback с функцией ".$rule['function']."");

 						

 						$this->_text = preg_replace_callback($rule['pattern'], $rule['function'], $this->_text);

 						return;

 					}

-					$this->error('Функция '.$rule['function'].' из правила '.$rule['id']. " не найдена");

+					$this->error('Функция '.$rule['function'].' из правила '.$rule['id']." не найдена");

 				} else {

-					$this->_text = preg_replace_callback($rule['pattern'],  create_function('$m', $rule['function']), $this->_text);

+					$this->_text = preg_replace_callback($rule['pattern'], create_function('$m', $rule['function']), $this->_text);

 					$this->log('Замена с использованием preg_replace_callback с инлайн функцией из правила '.$rule['id']);

 					return;

 				}

-				return ;

+				return;

 			}

 		}

 		

-		if(isset($rule['simple_replace']) && $rule['simple_replace'])

+		if (isset($rule['simple_replace']) && $rule['simple_replace'])

 		{

-			if(isset($rule['case_sensitive']) && $rule['case_sensitive'])

+			if (isset($rule['case_sensitive']) && $rule['case_sensitive'])

 			{

 				$this->log("Правило $name", "Простая замена с использованием str_replace");

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

@@ -239,53 +239,53 @@ 
 		}

 		

 		$pattern = $rule['pattern'];

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

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

 		$eval = false;

-		foreach($pattern as $patt)

+		foreach ($pattern as $patt)

 		{

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

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

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

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

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

 			{

 				$eval = true;

 				break;

 			}

 		}

-		if(!$eval)

+		if (!$eval)

 		{

 			$this->log("Правило $name", "Замена с использованием preg_replace");		

 			

 			do {

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

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

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

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

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

 			

 			return;

 		}

 		

 		$this->log("Правило $name", "Замена с использованием preg_replace_callback вместо eval");		

 		$k = 0;

-		foreach($pattern as $patt)

+		foreach ($pattern as $patt)

 		{

 			$repl = is_string($rule['replacement']) ? $rule['replacement'] : $rule['replacement'][$k];

 			

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

+			$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]);

+				$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;

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

+					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;

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

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

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

 			}

 			$k++;

 		}

@@ -294,10 +294,10 @@ 
 	

 	protected function preg_replace_e($pattern, $replacement, $text)

 	{

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

+		$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);

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

+		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;

 		return preg_replace_callback($patt, array($this, "thereplcallback"), $text);

@@ -307,7 +307,7 @@ 
 	private function thereplcallback($m)

 	{

 		$x = "";

-		eval('$x = '.($this->thereplacement?$this->thereplacement:'""').';');

+		eval('$x = '.($this->thereplacement ? $this->thereplacement : '""').';');

 		return $x;

 	}

 	

@@ -316,19 +316,19 @@ 
 		$this->errors = array();

 		$this->_pre_parse();

 		

-		$this->log("Применяется набор правил", implode(",",$list));

+		$this->log("Применяется набор правил", implode(",", $list));

 		

 		$rulelist = array();

-		foreach($list as $k)

+		foreach ($list as $k)

 		{			

 			$rule = $this->rules[$k];

 			$rule['id']    = $k;

-			$rule['order'] = isset($rule['order'])? $rule['order'] : 5 ;

+			$rule['order'] = isset($rule['order']) ? $rule['order'] : 5;

 			$rulelist[] = $rule;

 		}

 		//usort($rulelist, array($this, "rule_order_sort"));

 		

-		foreach($rulelist as $rule)

+		foreach ($rulelist as $rule)

 		{

 			$this->apply_rule($rule);			

 			$this->debug($rule['id'], $this->_text);

@@ -349,30 +349,30 @@ 
 	 */

 	protected function tag($content, $tag = 'span', $attribute = array())

 	{

-		if(isset($attribute['class']))

+		if (isset($attribute['class']))

 		{

 			$classname = $attribute['class'];

-			if($classname == "nowrap")

+			if ($classname == "nowrap")

 			{

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

+				if (!$this->is_on('nowrap'))

 				{

 					$tag = "nobr";

 					$attribute = array();

 					$classname = "";

 				}

 			}

-			if(isset($this->classes[$classname]))

+			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;

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

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

 			$attribute['class'] = $classname;

 		}

 		

 		return EMTLib::build_safe_tag($content, $tag, $attribute,

-				$this->use_layout === false? EMTLib::LAYOUT_STYLE  : $this->use_layout );

+				$this->use_layout === false ? EMTLib::LAYOUT_STYLE : $this->use_layout);

 	}

 	

 	

@@ -428,9 +428,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));

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

 	}

 	

 	/**

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

 	public function ss($key)

 	{

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

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

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

 	}

 	

@@ -464,21 +464,21 @@ 
 	 * @param boolean $disable выкллючить их или включить

 	 * @param boolean $strict строго, т.е. те которые не в списку будут тоже обработаны

 	 */

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

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

 	{

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

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

 		

-		foreach($list as $rulename)

+		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)

+		if ($strict)

 		{

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

+			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,8 +500,8 @@ 
 	 */

 	public function apply($list = null)

 	{

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

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

+		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;

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;

 	}

EMT/EMTTretText.php

Doc Comments +1 added lines

@@ -62,6 +62,7 @@
     /**

 	 * Расстановка защищенных тегов параграфа (<p>...</p>) и переноса строки

 	 *

+	 * @param string $text
 	 * @return  void

 	 */	

 	protected function do_paragraphs($text) {

Indentation +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 		

 		);

 

-    /**

+	/**

 	 * Расстановка защищенных тегов параграфа (<p>...</p>) и переноса строки

 	 *

 	 * @return  void

Spacing +16 added lines, -16 removed lines

@@ -65,15 +65,15 @@ 
 	 * @return  void

 	 */	

 	protected function do_paragraphs($text) {

-		$text = str_replace("\r\n","\n",$text);

-		$text = str_replace("\r","\n",$text);

-		$text = '<' . self::BASE64_PARAGRAPH_TAG . '>' . trim($text) . '</' . self::BASE64_PARAGRAPH_TAG . '>';

+		$text = str_replace("\r\n", "\n", $text);

+		$text = str_replace("\r", "\n", $text);

+		$text = '<'.self::BASE64_PARAGRAPH_TAG.'>'.trim($text).'</'.self::BASE64_PARAGRAPH_TAG.'>';

 		//$text = $this->preg_replace_e('/([\040\t]+)?(\n|\r){2,}/e', '"</" . self::BASE64_PARAGRAPH_TAG . "><" .self::BASE64_PARAGRAPH_TAG . ">"', $text);

 		//$text = $this->preg_replace_e('/([\040\t]+)?(\n){2,}/e', '"</" . self::BASE64_PARAGRAPH_TAG . "><" .self::BASE64_PARAGRAPH_TAG . ">"', $text);

 		$text = $this->preg_replace_e('/([\040\t]+)?(\n)+([\040\t]*)(\n)+/e', '$m[1]."</" . self::BASE64_PARAGRAPH_TAG . ">".\Fenrizbes\TypographBundle\EMT\EMTLib::iblock($m[2].$m[3])."<" .self::BASE64_PARAGRAPH_TAG . ">"', $text);

 		//$text = $this->preg_replace_e('/([\040\t]+)?(\n)+([\040\t]*)(\n)+/e', '"</" . self::BASE64_PARAGRAPH_TAG . ">"."<" .self::BASE64_PARAGRAPH_TAG . ">"', $text);

 		//может от открвающего до закрывающего ?!

-		$text = preg_replace('/\<' . self::BASE64_PARAGRAPH_TAG . '\>('.EMTLib::INTERNAL_BLOCK_OPEN.'[a-zA-Z0-9\/=]+?'.EMTLib::INTERNAL_BLOCK_CLOSE.')?\<\/' . self::BASE64_PARAGRAPH_TAG . '\>/s', "", $text);

+		$text = preg_replace('/\<'.self::BASE64_PARAGRAPH_TAG.'\>('.EMTLib::INTERNAL_BLOCK_OPEN.'[a-zA-Z0-9\/=]+?'.EMTLib::INTERNAL_BLOCK_CLOSE.')?\<\/'.self::BASE64_PARAGRAPH_TAG.'\>/s', "", $text);

 		return $text;

 	}

 		

@@ -84,16 +84,16 @@ 
 	 */	

 	protected function build_paragraphs()

 	{

-		$r = mb_strpos($this->_text, '<' . self::BASE64_PARAGRAPH_TAG . '>' );

-		$p = EMTLib::rstrpos($this->_text, '</' . self::BASE64_PARAGRAPH_TAG . '>' )	;

-		if(($r!== false) && ($p !== false)) {			

+		$r = mb_strpos($this->_text, '<'.self::BASE64_PARAGRAPH_TAG.'>');

+		$p = EMTLib::rstrpos($this->_text, '</'.self::BASE64_PARAGRAPH_TAG.'>');

+		if (($r !== false) && ($p !== false)) {			

 			

-			$beg = mb_substr($this->_text,0,$r);

-			$end = mb_substr($this->_text,$p+mb_strlen('</' . self::BASE64_PARAGRAPH_TAG . '>'));			

+			$beg = mb_substr($this->_text, 0, $r);

+			$end = mb_substr($this->_text, $p+mb_strlen('</'.self::BASE64_PARAGRAPH_TAG.'>'));			

 			$this->_text = 

-							(trim($beg) ? $this->do_paragraphs($beg). "\n":"") .'<' . self::BASE64_PARAGRAPH_TAG . '>'.

-							mb_substr($this->_text,$r + mb_strlen('<' . self::BASE64_PARAGRAPH_TAG . '>'),$p -($r + mb_strlen('<' . self::BASE64_PARAGRAPH_TAG . '>')) ).'</' . self::BASE64_PARAGRAPH_TAG . '>'.

-							(trim($end) ? "\n".$this->do_paragraphs($end) :"") ;

+							(trim($beg) ? $this->do_paragraphs($beg)."\n" : "").'<'.self::BASE64_PARAGRAPH_TAG.'>'.

+							mb_substr($this->_text, $r+mb_strlen('<'.self::BASE64_PARAGRAPH_TAG.'>'), $p-($r+mb_strlen('<'.self::BASE64_PARAGRAPH_TAG.'>'))).'</'.self::BASE64_PARAGRAPH_TAG.'>'.

+							(trim($end) ? "\n".$this->do_paragraphs($end) : "");

 		} else {

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

 		}

@@ -106,11 +106,11 @@ 
 	 */

 	protected function build_brs()

 	{

-		$this->_text = $this->preg_replace_e('/(\<\/' . self::BASE64_PARAGRAPH_TAG . '\>)([\r\n \t]+)(\<' . self::BASE64_PARAGRAPH_TAG . '\>)/mse', '$m[1].\Fenrizbes\TypographBundle\EMT\EMTLib::iblock($m[2]).$m[3]', $this->_text);

+		$this->_text = $this->preg_replace_e('/(\<\/'.self::BASE64_PARAGRAPH_TAG.'\>)([\r\n \t]+)(\<'.self::BASE64_PARAGRAPH_TAG.'\>)/mse', '$m[1].\Fenrizbes\TypographBundle\EMT\EMTLib::iblock($m[2]).$m[3]', $this->_text);

 		

-		if (!preg_match('/\<' . self::BASE64_BREAKLINE_TAG . '\>/', $this->_text)) {

-			$this->_text = str_replace("\r\n","\n",$this->_text);

-			$this->_text = str_replace("\r","\n",$this->_text);

+		if (!preg_match('/\<'.self::BASE64_BREAKLINE_TAG.'\>/', $this->_text)) {

+			$this->_text = str_replace("\r\n", "\n", $this->_text);

+			$this->_text = str_replace("\r", "\n", $this->_text);

 			//$this->_text = $this->preg_replace_e('/(\n|\r)/e', '"<" . self::BASE64_BREAKLINE_TAG . ">"', $this->_text);

 			$this->_text = $this->preg_replace_e('/(\n)/e', '"<" . self::BASE64_BREAKLINE_TAG . ">\n"', $this->_text);

 		}

Service/TypographService.php

Indentation +15 added lines, -15 removed lines

@@ -7,23 +7,23 @@
 
 class TypographService
 {
-    protected $configs;
+	protected $configs;
 
-    public function __construct($configs)
-    {
-        $this->configs = $configs;
-    }
+	public function __construct($configs)
+	{
+		$this->configs = $configs;
+	}
 
-    public function apply($string, $config = null)
-    {
-        if (is_null($config)) {
-            $config = 'default';
-        }
+	public function apply($string, $config = null)
+	{
+		if (is_null($config)) {
+			$config = 'default';
+		}
 
-        if (!isset($this->configs[$config])) {
-            throw new InvalidConfigurationException('Typograph\'s config "'. $config .'" doesn\'t exist');
-        }
+		if (!isset($this->configs[$config])) {
+			throw new InvalidConfigurationException('Typograph\'s config "'. $config .'" doesn\'t exist');
+		}
 
-        return EMTypograph::fast_apply($string, $this->configs[$config]);
-    }
+		return EMTypograph::fast_apply($string, $this->configs[$config]);
+	}
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
         }
 
         if (!isset($this->configs[$config])) {
-            throw new InvalidConfigurationException('Typograph\'s config "'. $config .'" doesn\'t exist');
+            throw new InvalidConfigurationException('Typograph\'s config "'.$config.'" doesn\'t exist');
         }
 
         return EMTypograph::fast_apply($string, $this->configs[$config]);

EMT/EMTTretNobr.php

Spacing +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
 		

 		foreach ($triad as $value) {

 			$value = (int) $value;

-			if ($value > 255) {

+			if ($value>255) {

 				$addTag = false;

 				break;

 			}

EMT/EMTTretNumber.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 		'math_chars' => array(

 				'description'	=> 'Математические знаки больше/меньше/плюс минус/неравно',

 				'pattern' 		=> array('/!=/', '/\<=/', '/([^=]|^)\>=/', '/~=/', '/\+-/'),

-				'replacement' 	=> array('&ne;', '&le;', '\1&ge;', '&cong;', '&plusmn;' )

+				'replacement' 	=> array('&ne;', '&le;', '\1&ge;', '&cong;', '&plusmn;')

 			),

 			/*

 		'split_number_to_triads' => array(

EMT/EMTTretSymbol.php

Spacing +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
 		'arrows_symbols' => array(

 				'description'	=> 'Замена стрелок вправо-влево на html коды',

 				'pattern' 		=> array('/(\s|\>|\&nbsp\;|^)\-\>($|\s|\&nbsp\;|\<)/', '/(\s|\>|\&nbsp\;|^|;)\<\-(\s|\&nbsp\;|$)/', '/→/u', '/←/u'),

-				'replacement' 	=> array('\1&rarr;\2', '\1&larr;\2', '&rarr;', '&larr;' )

+				'replacement' 	=> array('\1&rarr;\2', '\1&larr;\2', '&rarr;', '&larr;')

 			),			

 		);

 }
\ No newline at end of file

EMT/EMTTretOptAlign.php

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
 	protected function oaquote_extra()

 	{

 		$this->_text = $this->preg_replace_e(

-				'/(<' .self::BASE64_PARAGRAPH_TAG . '>)([\040\t]+)?(\&laquo\;)/e', 

+				'/(<'.self::BASE64_PARAGRAPH_TAG.'>)([\040\t]+)?(\&laquo\;)/e', 

 				'$m[1] . $this->tag($m[3], "span", array("class"=>"oa_oquote_nl"))',

 				$this->_text);

 	}