Completed
Branch 1.1.0 (fd7b36)
by Sylver
02:51
created
core/category.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -218,8 +218,7 @@
 block discarded – undo
218 218
 				$row = $this->db->sql_fetchrow($result);
219 219
 				$cat_name = $row['cat_name'];
220 220
 				$this->db->sql_freeresult($result);
221
-			}
222
-			else
221
+			} else
223 222
 			{
224 223
 				$cat_name = $this->language->lang('SC_CATEGORY_DEFAUT');
225 224
 			}
Please login to merge, or discard this patch.
controller/main.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -86,14 +86,14 @@
 block discarded – undo
86 86
 	public function popup_smilies_category()
87 87
 	{
88 88
 		$title	= '';
89
-		$cat_id	= $cat_order = $i = 0;
89
+		$cat_id = $cat_order = $i = 0;
90 90
 		$start	= $this->request->variable('start', 0);
91 91
 		$cat	= $this->request->variable('select', -1);
92 92
 		$cat	= ($cat == -1) ? $this->config['smilies_category_nb'] : $cat;
93
-		$max_id	= $this->category->get_max_id();
94
-		$count	= $this->category->smilies_count($cat);
93
+		$max_id = $this->category->get_max_id();
94
+		$count = $this->category->smilies_count($cat);
95 95
 		$url	= $this->helper->route('sylver35_smiliescat_smilies_pop');
96
-		$lang	= $this->user->lang_name;
96
+		$lang = $this->user->lang_name;
97 97
 		$root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $this->path_helper->get_web_root_path();
98 98
 
99 99
 		$sql = $this->db->sql_build_query('SELECT', array(
Please login to merge, or discard this patch.
controller/admin_controller.php 1 patch
Braces   +9 added lines, -18 removed lines patch added patch discarded remove patch
@@ -158,8 +158,7 @@  discard block
 block discarded – undo
158 158
 						if ($name === '')
159 159
 						{
160 160
 							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);
161
-						}
162
-						else
161
+						} else
163 162
 						{
164 163
 							$sql_in = array_merge($sql_in, array(
165 164
 								'cat_lang'		=> $lang,
@@ -276,16 +275,14 @@  discard block
 block discarded – undo
276 275
 						if ($name === '')
277 276
 						{
278 277
 							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);
279
-						}
280
-						else
278
+						} else
281 279
 						{
282 280
 							if ($sort == 'edit')
283 281
 							{
284 282
 								$sql = 'UPDATE ' . $this->category_table . " SET cat_name = '" . $this->category->capitalize($name) . "', cat_title = '" . $this->category->capitalize($title) . "'
285 283
 									WHERE cat_lang = '" . $this->db->sql_escape($lang) . "' AND cat_id = $id";
286 284
 								$this->db->sql_query($sql);
287
-							}
288
-							else if ($sort == 'create')
285
+							} else if ($sort == 'create')
289 286
 							{
290 287
 								$sql_in = array(
291 288
 									'cat_id'		=> $id,
@@ -371,8 +368,7 @@  discard block
 block discarded – undo
371 368
 							'MESSAGE_TEXT'	=> $this->language->lang('SC_MOVE_SUCCESS'),
372 369
 							'REFRESH_DATA'	=> array('time'		=> 2),
373 370
 						));
374
-					}
375
-					else
371
+					} else
376 372
 					{
377 373
 						trigger_error($this->language->lang('SC_MOVE_SUCCESS') . adm_back_link($this->u_action));
378 374
 					}
@@ -409,13 +405,11 @@  discard block
 block discarded – undo
409 405
 								'MESSAGE_TEXT'	=> $this->language->lang('SC_DELETE_SUCCESS'),
410 406
 								'REFRESH_DATA'	=> array('time'		=> 2),
411 407
 							));
412
-						}
413
-						else
408
+						} else
414 409
 						{
415 410
 							trigger_error($this->language->lang('SC_DELETE_SUCCESS') . adm_back_link($this->u_action));
416 411
 						}
417
-					}
418
-					else
412
+					} else
419 413
 					{
420 414
 						confirm_box(false, $this->language->lang('CONFIRM_OPERATION'), build_hidden_fields(array(
421 415
 							'mode'		=> $mode,
@@ -431,8 +425,7 @@  discard block
 block discarded – undo
431 425
 			$this->template->assign_vars(array(
432 426
 				'IN_ACTION'		=> true,
433 427
 			));
434
-		}
435
-		else
428
+		} else
436 429
 		{
437 430
 			$i = 1;
438 431
 			$cat = 0;
@@ -570,8 +563,7 @@  discard block
 block discarded – undo
570 563
 			$this->template->assign_vars(array(
571 564
 				'IN_ACTION'			=> true,
572 565
 			));
573
-		}
574
-		else
566
+		} else
575 567
 		{
576 568
 			$category = $i = 0;
577 569
 			$smiley_url = '';
@@ -594,8 +586,7 @@  discard block
 block discarded – undo
594 586
 					'WHERE'		=> "$where AND code <> ''",
595 587
 					'ORDER_BY'	=> 'cat_order ASC, smiley_order ASC',
596 588
 				));
597
-			}
598
-			else
589
+			} else
599 590
 			{
600 591
 				$sql = $this->db->sql_build_query('SELECT', array(
601 592
 					'SELECT'	=> '*',
Please login to merge, or discard this patch.