Sylver35 / smiliescat

controller/admin_controller.php

Indentation +5 added lines, -5 removed lines

@@ -55,14 +55,14 @@
 	protected $u_action;
 
 	/**
-	* The database tables
-	*
-	* @var string */
+	 * The database tables
+	 *
+	 * @var string */
 	protected $smilies_category_table;
 
 	/**
-	* Constructor
-	*/
+	 * Constructor
+	 */
 	public function __construct(category $category, config $config, db $db, pagination $pagination, request $request, template $template, user $user, language $language, log $log, $root_path, $smilies_category_table)
 	{
 		$this->category				= $category;

Spacing +27 added lines, -27 removed lines

@@ -65,27 +65,27 @@ 
 	*/
 	public function __construct(category $category, config $config, db $db, pagination $pagination, request $request, template $template, user $user, language $language, log $log, $root_path, $smilies_category_table)
 	{
-		$this->category				= $category;
-		$this->config				= $config;
-		$this->db					= $db;
-		$this->pagination			= $pagination;
-		$this->request				= $request;
+		$this->category = $category;
+		$this->config = $config;
+		$this->db = $db;
+		$this->pagination = $pagination;
+		$this->request = $request;
 		$this->template				= $template;
-		$this->user					= $user;
+		$this->user = $user;
 		$this->language				= $language;
-		$this->log					= $log;
+		$this->log = $log;
 		$this->root_path			= $root_path;
-		$this->category_table		= $smilies_category_table;
+		$this->category_table = $smilies_category_table;
 	}
 
 	public function acp_categories_config()
 	{
 		$this->language->add_lang('acp/language');
-		$mode		= $this->request->variable('mode', '');
-		$action		= $this->request->variable('action', '');
-		$id			= $this->request->variable('id', 0);
-		$empty_row	= false;
-		$form_key	= 'sylver35/smiliescat';
+		$mode = $this->request->variable('mode', '');
+		$action = $this->request->variable('action', '');
+		$id = $this->request->variable('id', 0);
+		$empty_row = false;
+		$form_key = 'sylver35/smiliescat';
 		add_form_key($form_key);
 
 		if ($action)
@@ -152,7 +152,7 @@ 
 					$result = $this->db->sql_query($sql);
 					while ($row = $this->db->sql_fetchrow($result))
 					{
-						$iso	= $row['lang_iso'];
+						$iso = $row['lang_iso'];
 						$lang	= $this->request->variable("lang_$iso", '', true);
 						$name	= $this->request->variable("name_$iso", '', true);
 						if ($name === '')
@@ -216,9 +216,9 @@ 
 						));
 						$i++;
 						$list_id[$i] = $row['lang_id'];
-						$cat_id		= $row['cat_id'];
-						$cat_order	= $row['cat_order'];
-						$title		= $row['cat_title'];
+						$cat_id = $row['cat_id'];
+						$cat_order = $row['cat_order'];
+						$title = $row['cat_title'];
 					}
 					$this->db->sql_freeresult($result);
 
@@ -268,11 +268,11 @@ 
 					$result = $this->db->sql_query($sql);
 					while ($row = $this->db->sql_fetchrow($result))
 					{
-						$iso	= $row['lang_iso'];
+						$iso = $row['lang_iso'];
 						$lang	= $this->request->variable("lang_$iso", '', true);
 						$name	= $this->request->variable("name_$iso", '', true);
 						$sort	= $this->request->variable("sort_$iso", '');
-						$order	= $this->request->variable('order', 0);
+						$order = $this->request->variable('order', 0);
 						if ($name === '')
 						{
 							trigger_error($this->language->lang('SC_CATEGORY_ERROR', $this->language->lang('SC_CATEGORY_NAME')) . adm_back_link($this->u_action . '&action=edit&id=' . $id), E_USER_WARNING);
@@ -494,11 +494,11 @@ 
 	{
 		$this->language->add_lang('acp/posting');
 		$action		= $this->request->variable('action', '');
-		$start		= $this->request->variable('start', 0);
+		$start = $this->request->variable('start', 0);
 		$select		= $this->request->variable('select', -1);
-		$id			= $this->request->variable('id', -1);
-		$lang		= $this->user->lang_name;
-		$form_key	= 'sylver35/smiliescat';
+		$id = $this->request->variable('id', -1);
+		$lang = $this->user->lang_name;
+		$form_key = 'sylver35/smiliescat';
 		add_form_key($form_key);
 
 		if ($action)
@@ -573,12 +573,12 @@ 
 		}
 		else
 		{
-			$category		= $i = 0;
+			$category = $i = 0;
 			$smiley_url		= '';
 			$spacer_cat		= false;
-			$smilies_count	= $this->category->smilies_count($select);
-			$cat_title		= $this->language->lang('SC_CATEGORY_DEFAUT');
-			$where			= ($select !== -1) ? "cat_id = $select" : 'smiley_id > 0';
+			$smilies_count = $this->category->smilies_count($select);
+			$cat_title = $this->language->lang('SC_CATEGORY_DEFAUT');
+			$where = ($select !== -1) ? "cat_id = $select" : 'smiley_id > 0';
 
 			if ($select !== 0)
 			{

Braces +9 added lines, -18 removed lines

@@ -158,8 +158,7 @@ 
 						if ($name === '')
 						{
 							trigger_error($this->language->lang('SC_CATEGORY_ERROR', $this->language->lang('SC_CATEGORY_NAME')) . adm_back_link($this->u_action . '&action=add'), E_USER_WARNING);
-						}
-						else
+						} else
 						{
 							$sql_in = array_merge($sql_in, array(
 								'cat_lang'		=> $lang,
@@ -276,16 +275,14 @@ 
 						if ($name === '')
 						{
 							trigger_error($this->language->lang('SC_CATEGORY_ERROR', $this->language->lang('SC_CATEGORY_NAME')) . adm_back_link($this->u_action . '&action=edit&id=' . $id), E_USER_WARNING);
-						}
-						else
+						} else
 						{
 							if ($sort == 'edit')
 							{
 								$sql = 'UPDATE ' . $this->category_table . " SET cat_name = '" . $this->category->capitalize($name) . "', cat_title = '" . $this->category->capitalize($title) . "'
 									WHERE cat_lang = '" . $this->db->sql_escape($lang) . "' AND cat_id = $id";
 								$this->db->sql_query($sql);
-							}
-							else if ($sort == 'create')
+							} else if ($sort == 'create')
 							{
 								$sql_in = array(
 									'cat_id'		=> $id,
@@ -371,8 +368,7 @@ 
 							'MESSAGE_TEXT'	=> $this->language->lang('SC_MOVE_SUCCESS'),
 							'REFRESH_DATA'	=> array('time'		=> 2),
 						));
-					}
-					else
+					} else
 					{
 						trigger_error($this->language->lang('SC_MOVE_SUCCESS') . adm_back_link($this->u_action));
 					}
@@ -409,13 +405,11 @@ 
 								'MESSAGE_TEXT'	=> $this->language->lang('SC_DELETE_SUCCESS'),
 								'REFRESH_DATA'	=> array('time'		=> 2),
 							));
-						}
-						else
+						} else
 						{
 							trigger_error($this->language->lang('SC_DELETE_SUCCESS') . adm_back_link($this->u_action));
 						}
-					}
-					else
+					} else
 					{
 						confirm_box(false, $this->language->lang('CONFIRM_OPERATION'), build_hidden_fields(array(
 							'mode'		=> $mode,
@@ -431,8 +425,7 @@ 
 			$this->template->assign_vars(array(
 				'IN_ACTION'		=> true,
 			));
-		}
-		else
+		} else
 		{
 			$i = 1;
 			$cat = 0;
@@ -570,8 +563,7 @@ 
 			$this->template->assign_vars(array(
 				'IN_ACTION'			=> true,
 			));
-		}
-		else
+		} else
 		{
 			$category		= $i = 0;
 			$smiley_url		= '';
@@ -594,8 +586,7 @@ 
 					'WHERE'		=> "$where AND code <> ''",
 					'ORDER_BY'	=> 'cat_order ASC, smiley_order ASC',
 				));
-			}
-			else
+			} else
 			{
 				$sql = $this->db->sql_build_query('SELECT', array(
 					'SELECT'	=> '*',

controller/main.php

Indentation +7 added lines, -7 removed lines

@@ -56,14 +56,14 @@ 
 	protected $root_path;
 
 	/**
-	* The database tables
-	*
-	* @var string */
+	 * The database tables
+	 *
+	 * @var string */
 	protected $smilies_category_table;
 
 	/**
-	* Constructor
-	*/
+	 * Constructor
+	 */
 	public function __construct(category $category, request $request, config $config, helper $helper, path_helper $path_helper, db $db, template $template, user $user, language $language, pagination $pagination, $root_path, $smilies_category_table)
 	{
 		$this->category			= $category;
@@ -81,8 +81,8 @@ 
 	}
 
 	/**
-	* @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
-	*/
+	 * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
+	 */
 	public function popup_smilies_category()
 	{
 		$title	= '';

Spacing +11 added lines, -11 removed lines

@@ -66,18 +66,18 @@ 
 	*/
 	public function __construct(category $category, request $request, config $config, helper $helper, path_helper $path_helper, db $db, template $template, user $user, language $language, pagination $pagination, $root_path, $smilies_category_table)
 	{
-		$this->category			= $category;
-		$this->request			= $request;
+		$this->category = $category;
+		$this->request = $request;
 		$this->config			= $config;
 		$this->helper			= $helper;
-		$this->path_helper		= $path_helper;
-		$this->db 				= $db;
+		$this->path_helper = $path_helper;
+		$this->db = $db;
 		$this->template			= $template;
-		$this->user				= $user;
+		$this->user = $user;
 		$this->language			= $language;
-		$this->pagination		= $pagination;
+		$this->pagination = $pagination;
 		$this->root_path		= $root_path;
-		$this->category_table	= $smilies_category_table;
+		$this->category_table = $smilies_category_table;
 	}
 
 	/**
@@ -86,14 +86,14 @@ 
 	public function popup_smilies_category()
 	{
 		$title	= '';
-		$cat_id	= $cat_order = $i = 0;
+		$cat_id = $cat_order = $i = 0;
 		$start	= $this->request->variable('start', 0);
 		$cat	= $this->request->variable('select', -1);
 		$cat	= ($cat == -1) ? $this->config['smilies_category_nb'] : $cat;
-		$max_id	= $this->category->get_max_id();
-		$count	= $this->category->smilies_count($cat);
+		$max_id = $this->category->get_max_id();
+		$count = $this->category->smilies_count($cat);
 		$url	= $this->helper->route('sylver35_smiliescat_smilies_pop');
-		$lang	= $this->user->lang_name;
+		$lang = $this->user->lang_name;
 		$root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $this->path_helper->get_web_root_path();
 
 		$sql = $this->db->sql_build_query('SELECT', array(

event/listener.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 	public function __construct(category $category, helper $helper, template $template)
 	{
 		$this->category		= $category;
-		$this->helper		= $helper;
+		$this->helper = $helper;
 		$this->template		= $template;
 	}
 

core/category.php

Indentation +3 added lines, -3 removed lines

@@ -33,9 +33,9 @@
 	protected $ext_manager;
 
 	/**
-	* The database tables
-	*
-	* @var string */
+	 * The database tables
+	 *
+	 * @var string */
 	protected $smilies_category_table;
 
 	/**

Spacing +4 added lines, -4 removed lines

@@ -44,11 +44,11 @@
 	public function __construct(cache $cache, db $db, user $user, language $language, manager $ext_manager, $smilies_category_table)
 	{
 		$this->cache			= $cache;
-		$this->db				= $db;
+		$this->db = $db;
 		$this->user				= $user;
-		$this->language			= $language;
-		$this->ext_manager		= $ext_manager;
-		$this->category_table	= $smilies_category_table;
+		$this->language = $language;
+		$this->ext_manager = $ext_manager;
+		$this->category_table = $smilies_category_table;
 	}
 
 	public function get_version()

Braces +1 added lines, -2 removed lines

@@ -218,8 +218,7 @@
 				$row = $this->db->sql_fetchrow($result);
 				$cat_name = $row['cat_name'];
 				$this->db->sql_freeresult($result);
-			}
-			else
+			} else
 			{
 				$cat_name = $this->language->lang('SC_CATEGORY_DEFAUT');
 			}