live627 / smf-ultimate-menu

ManageUltimateMenu.php

Spacing +1 added lines, -1 removed lines

@@ -333,7 +333,7 @@
 		{
 			// I see you made it to the final stage, my young padawan.
 			if (!empty($id))
-				$smcFunc['db_query']('','
+				$smcFunc['db_query']('', '
 					UPDATE {db_prefix}um_menu
 					SET name = {string:name}, type = {string:type}, target = {string:target}, position = {string:position}, link = {string:link}, status = {string:status}, permissions = {string:permissions}, parent = {string:parent}
 					WHERE id_button = {int:id}',

Braces +39 added lines, -29 removed lines

@@ -8,8 +8,9 @@ 
  * @license http://opensource.org/licenses/MIT MIT
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 function Menu()
 {
@@ -24,8 +25,9 @@ 
 	);
 
 	// Default to sub action 'manmenu'
-	if (!isset($_GET['sa']) || !isset($subActions[$_GET['sa']]))
-		$_GET['sa'] = 'manmenu';
+	if (!isset($_GET['sa']) || !isset($subActions[$_GET['sa']])) {
+			$_GET['sa'] = 'manmenu';
+	}
 
 	// Have you got the proper permissions?
 	isAllowedTo('admin_forum');
@@ -73,8 +75,9 @@ 
 		checkSession();
 
 		// Make sure every entry is a proper integer.
-		foreach ($_POST['remove'] as $index => $page_id)
-			$_POST['remove'][(int) $index] = (int) $page_id;
+		foreach ($_POST['remove'] as $index => $page_id) {
+					$_POST['remove'][(int) $index] = (int) $page_id;
+		}
 
 		// Delete the page!
 		$smcFunc['db_query']('', '
@@ -95,8 +98,8 @@ 
 		foreach (total_getMenu() as $item)
 		{
 			$status = !empty($_POST['status'][$item['id_button']]) ? 'active' : 'inactive';
-			if ($status != $item['status'])
-				$smcFunc['db_query']('', '
+			if ($status != $item['status']) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}um_menu
 					SET status = {string:status}
 					WHERE id_button = {int:item}',
@@ -105,14 +108,16 @@ 
 						'item' => $item['id_button'],
 					)
 				);
+			}
 		}
 		rebuild_um_menu();
 		redirectexit('action=admin;area=umen');
 	}
 
 	// New item?
-	if (isset($_POST['new']))
-		redirectexit('action=admin;area=umen;sa=addbutton');
+	if (isset($_POST['new'])) {
+			redirectexit('action=admin;area=umen;sa=addbutton');
+	}
 
 	loadLanguage('ManageBoards');
 
@@ -302,13 +307,15 @@ 
 		$target = isset($_REQUEST['target']) ? $_REQUEST['target'] : '_self';
 
 		// These fields are required!
-		foreach ($required_fields as $required_field)
-			if ($_POST[$required_field] == '')
+		foreach ($required_fields as $required_field) {
+					if ($_POST[$required_field] == '')
 				$post_errors[$required_field] = 'um_menu_empty_' . $required_field;
+		}
 
 		// Stop making numeric names!
-		if (is_numeric($name))
-			$post_errors['name'] = 'um_menu_numeric';
+		if (is_numeric($name)) {
+					$post_errors['name'] = 'um_menu_numeric';
+		}
 
 		// Let's make sure you're not trying to make a name that's already taken.
 		$request = $smcFunc['db_query']('', '
@@ -326,14 +333,15 @@ 
 
 		$smcFunc['db_free_result']($request);
 
-		if ($check > 0)
-			$post_errors['name'] = 'um_menu_mysql';
+		if ($check > 0) {
+					$post_errors['name'] = 'um_menu_mysql';
+		}
 
 		if (empty($post_errors))
 		{
 			// I see you made it to the final stage, my young padawan.
-			if (!empty($id))
-				$smcFunc['db_query']('','
+			if (!empty($id)) {
+							$smcFunc['db_query']('','
 					UPDATE {db_prefix}um_menu
 					SET name = {string:name}, type = {string:type}, target = {string:target}, position = {string:position}, link = {string:link}, status = {string:status}, permissions = {string:permissions}, parent = {string:parent}
 					WHERE id_button = {int:id}',
@@ -349,8 +357,8 @@ 
 						'parent' => $parent,
 					)
 				);
-			else
-				$smcFunc['db_insert']('insert',
+			} else {
+							$smcFunc['db_insert']('insert',
 					'{db_prefix}um_menu',
 						array(
 							'slug' => 'string', 'name' => 'string', 'type' => 'string', 'target' => 'string', 'position' => 'string', 'link' => 'string', 'status' => 'string', 'permissions' => 'string', 'parent' => 'string',
@@ -360,6 +368,7 @@ 
 						),
 						array('id_button')
 					);
+			}
 
 			rebuild_um_menu();
 
@@ -368,8 +377,7 @@ 
 			clean_cache('menu_buttons');
 
 			redirectexit('action=admin;area=umen');
-		}
-		else
+		} else
 		{
 			$context['post_error'] = $post_errors;
 			$context['error_title'] = empty($id) ? 'um_menu_errors_create' : 'um_menu_errors_modify';
@@ -430,8 +438,7 @@ 
 			'status' => $row['status'],
 			'parent' => $row['parent'],
 		);
-	}
-	else
+	} else
 	{
 		$context['button_data'] = array(
 			'name' => '',
@@ -458,8 +465,9 @@ 
 		FROM {db_prefix}um_menu');
 
 	$um_menu = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$um_menu[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$um_menu[] = $row;
+	}
 
 	return $um_menu;
 }
@@ -481,8 +489,9 @@ 
 	);
 
 	$um_menu = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$um_menu[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$um_menu[] = $row;
+	}
 
 	return $um_menu;
 }
@@ -510,8 +519,9 @@ 
 		FROM {db_prefix}um_menu');
 
 	$db_buttons = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$db_buttons[$row['id_button']] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$db_buttons[$row['id_button']] = $row;
+	}
 
 	$smcFunc['db_free_result']($request);
 	updateSettings(

ManageUltimateMenu.template.php

Braces +12 added lines, -8 removed lines

@@ -30,9 +30,10 @@ 
 						<strong>', $txt[$context['error_title']], '</strong>
 						<ul>';
 
-		foreach ($context['post_error'] as $error)
-			echo '
+		foreach ($context['post_error'] as $error) {
+					echo '
 							<li>', $txt[$error], '</li>';
+		}
 
 		echo '
 						</ul>
@@ -65,14 +66,16 @@ 
 
 		if (!empty($buttonData['sub_buttons']))
 		{
-			foreach ($buttonData['sub_buttons'] as $childButton => $childButtonData)
-				echo '
+			foreach ($buttonData['sub_buttons'] as $childButton => $childButtonData) {
+							echo '
 									<option value="', $childButton, '"', $context['button_data']['parent'] == $childButton ? ' selected="selected"' : '', '>-- ', $childButtonData['title'], '</option>';
+			}
 
-			if (!empty($childButtonData['sub_buttons']))
-				foreach ($childButtonData['sub_buttons'] as $grandChildButton => $grandChildButtonData)
+			if (!empty($childButtonData['sub_buttons'])) {
+							foreach ($childButtonData['sub_buttons'] as $grandChildButton => $grandChildButtonData)
 					echo '
 									<option value="', $grandChildButton, '"', $context['button_data']['parent'] == $grandChildButton ? ' selected="selected"' : '', '>---- ', $grandChildButtonData['title'], '</option>';
+			}
 		}
 	}
 
@@ -120,8 +123,9 @@ 
 									</label>
 								</div>';
 
-		if (!$permission['checked'])
-			$all_checked = false;
+		if (!$permission['checked']) {
+					$all_checked = false;
+		}
 	}
 
 	echo '

install.php

Braces +8 added lines, -5 removed lines

@@ -9,12 +9,14 @@ 
  */
 
 // If SSI.php is in the same place as this file, and SMF isn't defined...
-if (file_exists(dirname(__FILE__) . '/SSI.php') && !defined('SMF'))
+if (file_exists(dirname(__FILE__) . '/SSI.php') && !defined('SMF')) {
 	require_once(dirname(__FILE__) . '/SSI.php');
+}
 
 // Hmm... no SSI.php and no SMF?
-elseif (!defined('SMF'))
+elseif (!defined('SMF')) {
 	die('<b>Error:</b> Cannot install - please verify you put this in the same place as SMF\'s index.php.');
+}
 
 $tables = array(
 	array(
@@ -88,9 +90,10 @@ 
 {
 	$smcFunc['db_create_table']('{db_prefix}' . $table['name'], $table['columns'], $table['indexes'], array(), 'update');
 
-	if (isset($table['default']))
-		$smcFunc['db_insert']('ignore', '{db_prefix}' . $table['name'], $table['default']['columns'], $table['default']['values'], $table['default']['keys']);
-}
+	if (isset($table['default'])) {
+			$smcFunc['db_insert']('ignore', '{db_prefix}' . $table['name'], $table['default']['columns'], $table['default']['values'], $table['default']['keys']);
+	}
+	}
 
 // Now presenting... *drumroll*
 add_integration_function('integrate_pre_include', '$sourcedir/Subs-UltimateMenu.php');

Subs-UltimateMenu.php

Braces +32 added lines, -22 removed lines

@@ -8,8 +8,9 @@ 
  * @license http://opensource.org/licenses/MIT MIT
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 function um_load_menu(&$menu_buttons)
 {
@@ -26,8 +27,9 @@ 
 
 	$db_buttons = @unserialize($modSettings['um_menu']);
 
-	if (empty($db_buttons))
-		return $menu_buttons;
+	if (empty($db_buttons)) {
+			return $menu_buttons;
+	}
 
 	foreach ($db_buttons as $key => $row)
 	{
@@ -89,8 +91,9 @@ 
 	global $context, $modSettings, $smcFunc, $sourcedir, $txt;
 
 	// We'll need this for loading up the names of each group.
-	if (!loadLanguage('ManageBoards'))
-		loadLanguage('ManageBoards');
+	if (!loadLanguage('ManageBoards')) {
+			loadLanguage('ManageBoards');
+	}
 
 	$checked = explode(',', $checked);
 	$disallowed = explode(',', $disallowed);
@@ -105,23 +108,25 @@ 
 
 	$groups = array();
 
-	if (!in_array(-1, $disallowed))
-		// Guests
+	if (!in_array(-1, $disallowed)) {
+			// Guests
 		$groups[-1] = array(
 			'id' => -1,
 			'name' => $txt['parent_guests_only'],
 			'checked' => in_array(-1, $checked) || in_array(-3, $checked),
 			'is_post_group' => false,
 		);
+	}
 
-	if (!in_array(0, $disallowed))
-		// Regular Members
+	if (!in_array(0, $disallowed)) {
+			// Regular Members
 		$groups[0] = array(
 			'id' => 0,
 			'name' => $txt['parent_members_only'],
 			'checked' => in_array(0, $checked) || in_array(-3, $checked),
 			'is_post_group' => false,
 		);
+	}
 
 	// Load membergroups.
 	$request = $smcFunc['db_query']('', '
@@ -136,14 +141,15 @@ 
 			'min_posts' => -1,
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		if (!in_array($row['id_group'], $disallowed))
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			if (!in_array($row['id_group'], $disallowed))
 			$groups[(int) $row['id_group']] = array(
 				'id' => $row['id_group'],
 				'name' => trim($row['group_name']),
 				'checked' => in_array($row['id_group'], $checked) || in_array(-3, $checked),
 				'is_post_group' => $row['min_posts'] != -1,
 			);
+	}
 	$smcFunc['db_free_result']($request);
 
 	asort($groups);
@@ -157,27 +163,31 @@ 
 	{
 		$offset = 0;
 
-		foreach ($haystack as $area => $dummy)
-			if (++$offset && $area == $insertion_point)
+		foreach ($haystack as $area => $dummy) {
+					if (++$offset && $area == $insertion_point)
 				break;
+		}
 
-		if ($where == 'before')
-			$offset--;
+		if ($where == 'before') {
+					$offset--;
+		}
 
 		$haystack = array_slice($haystack, 0, $offset, true) + $needle + array_slice($haystack, $offset, null, true);
-	}
-	else
-		foreach ($haystack as $stack)
+	} else {
+			foreach ($haystack as $stack)
 			if (array_key_exists($insertion_point, $haystack[$stack]))
 			{
 				$offset = 0;
+	}
 
-				foreach ($haystack[$stack] as $area => $dummy)
-					if (++$offset && $area == $insertion_point)
+				foreach ($haystack[$stack] as $area => $dummy) {
+									if (++$offset && $area == $insertion_point)
 						break;
+				}
 
-				if ($where == 'before')
-					$offset--;
+				if ($where == 'before') {
+									$offset--;
+				}
 
 				$haystack[$stack] = array_slice($haystack[$stack], 0, $offset, true) + $needle + array_slice($haystack[$stack], $offset, null, true);
 				break;

uninstall-optional.php

Braces +6 added lines, -3 removed lines

@@ -9,15 +9,18 @@
  */
 
 // If SSI.php is in the same place as this file, and SMF isn't defined...
-if (file_exists(dirname(__FILE__) . '/SSI.php') && !defined('SMF'))
+if (file_exists(dirname(__FILE__) . '/SSI.php') && !defined('SMF')) {
 	require_once(dirname(__FILE__) . '/SSI.php');
+}
 
 // Hmm... no SSI.php and no SMF?
-elseif (!defined('SMF'))
+elseif (!defined('SMF')) {
 	die('<b>Error:</b> Cannot uninstall - please verify you put this in the same place as SMF\'s index.php.');
+}
 
-if (isset($modSettings['um_menu']))
+if (isset($modSettings['um_menu'])) {
 	unset($modSettings['um_menu']);
+}
 
 $smcFunc['db_query']('', '
 	DELETE FROM {db_prefix}settings

uninstall-required.php

Braces +4 added lines, -2 removed lines

@@ -9,12 +9,14 @@
  */
 
 // If SSI.php is in the same place as this file, and SMF isn't defined...
-if (file_exists(dirname(__FILE__) . '/SSI.php') && !defined('SMF'))
+if (file_exists(dirname(__FILE__) . '/SSI.php') && !defined('SMF')) {
 	require_once(dirname(__FILE__) . '/SSI.php');
+}
 
 // Hmm... no SSI.php and no SMF?
-elseif (!defined('SMF'))
+elseif (!defined('SMF')) {
 	die('<b>Error:</b> Cannot uninstall - please verify you put this in the same place as SMF\'s index.php.');
+}
 
 remove_integration_function('integrate_pre_include', '$sourcedir/Subs-UltimateMenu.php');
 remove_integration_function('integrate_menu_buttons', 'um_load_menu');