il y a 12 ans · 26da58c95f
--- a/Sources/ManageSettings.php
+++ b/Sources/ManageSettings.php
@@ -250,6 +250,13 @@ function ModifyCoreFeatures($return_config = false)
 
 				);
 
 			'),
 
 		),
 
+		// ih = Integration Hooks Handling.
 
+		'ih' => array(
 
+			'url' => 'action=admin;area=modsettings;sa=hooks',
 
+			'settings' => array(
 
+				'handlinghooks_enabled' => 1,
 
+			),
 
+		),
 
 		// k = karma.
 
 		'k' => array(
 
 			'url' => 'action=admin;area=featuresettings;sa=karma',
@@ -2193,34 +2200,41 @@ function list_integration_hooks()
 
 	global $sourcedir, $scripturl, $context, $txt, $modSettings, $settings;
 
 
 
 	$context['filter'] = '';
 
-	$presentHooks = get_integration_hooks();
 
-	if (isset($_GET['filter']) && in_array($_GET['filter'], array_keys($presentHooks)))
 
+	$currentHooks = get_integration_hooks();
 
+	if (isset($_GET['filter']) && in_array($_GET['filter'], array_keys($currentHooks)))
 
 		$context['filter'] = ';filter=' . $_GET['filter'];
 
 
 
-	if (!empty($_REQUEST['do']) && isset($_REQUEST['hook']) && isset($_REQUEST['function']))
 
+	if (!empty($modSettings['handlinghooks_enabled']))
 
 	{
 
-		checkSession('request');
 
-		validateToken('admin-hook', 'request');
 
-
 
-		if ($_REQUEST['do'] == 'remove')
 
-			remove_integration_function($_REQUEST['hook'], $_REQUEST['function']);
 
-		elseif ($_REQUEST['do'] == 'disable')
 
+		if (!empty($_REQUEST['do']) && isset($_REQUEST['hook']) && isset($_REQUEST['function']))
 
 		{
 
-			remove_integration_function($_REQUEST['hook'], $_REQUEST['function']);
 
-			// It's a hack I know...but I'm way too lazy!!!
 
-			add_integration_function($_REQUEST['hook'], $_REQUEST['function'] . ']');
 
-		}
 
-		elseif ($_REQUEST['do'] == 'enable')
 
-		{
 
-			remove_integration_function($_REQUEST['hook'], $_REQUEST['function'] . ']');
 
-			// It's a hack I know...but I'm way too lazy!!!
 
-			add_integration_function($_REQUEST['hook'], $_REQUEST['function']);
 
-		}
 
+			checkSession('request');
 
+			validateToken('admin-hook', 'request');
 
 
 
-		redirectexit('action=admin;area=modsettings;sa=hooks' . $context['filter']);
 
-	}
 
+			if ($_REQUEST['do'] == 'remove')
 
+				remove_integration_function($_REQUEST['hook'], urldecode($_REQUEST['function']));
 
+			else
 
+			{
 
+				if ($_REQUEST['do'] == 'disable')
 
+				{
 
+					// It's a hack I know...but I'm way too lazy!!!
 
+					$function_remove = $_REQUEST['function'];
 
+					$function_add = $_REQUEST['function'] . ']';
 
+				}
 
+				else
 
+				{
 
+					$function_remove = $_REQUEST['function'] . ']';
 
+					$function_add = $_REQUEST['function'];
 
+				}
 
+				$file = !empty($_REQUEST['includedfile']) ? urldecode($_REQUEST['includedfile']) : '';
 
 
 
-	createToken('admin-hook', 'request');
 
+				remove_integration_function($_REQUEST['hook'], $function_remove, $file);
 
+				add_integration_function($_REQUEST['hook'], $function_add, $file);
 
+
 
+				redirectexit('action=admin;area=modsettings;sa=hooks' . $context['filter']);
 
+			}
 
+		}
 
+	}
 
 
 
 	$list_options = array(
 
 		'id' => 'list_integration_hooks',
@@ -2253,7 +2267,14 @@ function list_integration_hooks()
 
 					'value' => $txt['hooks_field_function_name'],
 
 				),
 
 				'data' => array(
 
-					'db' => 'function_name',
 
+					'function' => create_function('$data', '
 
+						global $txt;
 
+
 
+						if (!empty($data[\'included_file\']))
 
+							return $txt[\'hooks_field_function\'] . \': \' . $data[\'real_function\'] . \'<br />\' . $txt[\'hooks_field_included_file\'] . \': \' . $data[\'included_file\'];
 
+						else
 
+							return $data[\'real_function\'];
 
+					'),
 
 				),
 
 				'sort' =>  array(
 
 					'default' => 'function_name',
@@ -2284,7 +2305,7 @@ function list_integration_hooks()
 
 						$change_status = array(\'before\' => \'\', \'after\' => \'\');
 
 						if ($data[\'can_be_disabled\'] && $data[\'status\'] != \'deny\')
 
 						{
 
-							$change_status[\'before\'] = \'<a href="\' . $scripturl . \'?action=admin;area=modsettings;sa=hooks;do=\' . ($data[\'enabled\'] ? \'disable\' : \'enable\') . \';hook=\' . $data[\'hook_name\'] . \';function=\' . $data[\'function_name\'] . $context[\'filter\'] . \';\' . $context[\'admin-hook_token_var\'] . \'=\' . $context[\'admin-hook_token\'] . \';\' . $context[\'session_var\'] . \'=\' . $context[\'session_id\'] . \'" onclick="return confirm(\' . javaScriptEscape($txt[\'quickmod_confirm\']) . \');">\';
 
+							$change_status[\'before\'] = \'<a href="\' . $scripturl . \'?action=admin;area=modsettings;sa=hooks;do=\' . ($data[\'enabled\'] ? \'disable\' : \'enable\') . \';hook=\' . $data[\'hook_name\'] . \';function=\' . $data[\'real_function\'] . (!empty($data[\'included_file\']) ? \';includedfile=\' . urlencode($data[\'included_file\']) : \'\') . $context[\'filter\'] . \';\' . $context[\'admin-hook_token_var\'] . \'=\' . $context[\'admin-hook_token\'] . \';\' . $context[\'session_var\'] . \'=\' . $context[\'session_id\'] . \'" onclick="return confirm(\' . javaScriptEscape($txt[\'quickmod_confirm\']) . \');">\';
 
 							$change_status[\'after\'] = \'</a>\';
 
 						}
 
 						return $change_status[\'before\'] . \'<img src="\' . $settings[\'images_url\'] . \'/admin/post_moderation_\' . $data[\'status\'] . \'.png" alt="\' . $data[\'img_text\'] . \'" title="\' . $data[\'img_text\'] . \'" />\' . $change_status[\'after\'];
@@ -2296,28 +2317,6 @@ function list_integration_hooks()
 
 					'reverse' => 'status DESC',
 
 				),
 
 			),
 
-			'check' => array(
 
-				'header' => array(
 
-					'value' => $txt['hooks_button_remove'],
 
-					'style' => 'width:3%',
 
-				),
 
-				'data' => array(
 
-					'function' => create_function('$data', '
 
-						global $txt, $settings, $scripturl, $context;
 
-
 
-						if (!$data[\'hook_exists\'])
 
-							return \'
 
-							<a href="\' . $scripturl . \'?action=admin;area=modsettings;sa=hooks;do=remove;hook=\' . $data[\'hook_name\'] . \';function=\' . $data[\'function_name\'] . $context[\'filter\'] . \';\' . $context[\'admin-hook_token_var\'] . \'=\' . $context[\'admin-hook_token\'] . \';\' . $context[\'session_var\'] . \'=\' . $context[\'session_id\'] . \'" onclick="return confirm(\' . javaScriptEscape($txt[\'quickmod_confirm\']) . \');">
 
-								<img src="\' . $settings[\'images_url\'] . \'/icons/quick_remove.png" alt="\' . $txt[\'hooks_button_remove\'] . \'" title="\' . $txt[\'hooks_button_remove\'] . \'" />
 
-							</a>\';
 
-					'),
 
-					'class' => 'centertext',
 
-				),
 
-			),
 
-		),
 
-		'form' => array(
 
-			'href' => $scripturl . '?action=admin;area=modsettings;sa=hooks' . $context['filter'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 
-			'name' => 'list_integration_hooks',
 
 		),
 
 		'additional_rows' => array(
 
 			array(
@@ -2333,6 +2332,35 @@ function list_integration_hooks()
 
 		),
 
 	);
 
 
 
+	if (!empty($modSettings['handlinghooks_enabled']))
 
+	{
 
+		createToken('admin-hook', 'request');
 
+
 
+		$list_options['columns']['remove'] = array(
 
+			'header' => array(
 
+				'value' => $txt['hooks_button_remove'],
 
+				'style' => 'width:3%',
 
+			),
 
+			'data' => array(
 
+				'function' => create_function('$data', '
 
+					global $txt, $settings, $scripturl, $context;
 
+
 
+					if (!$data[\'hook_exists\'])
 
+						return \'
 
+						<a href="\' . $scripturl . \'?action=admin;area=modsettings;sa=hooks;do=remove;hook=\' . $data[\'hook_name\'] . \';function=\' . urlencode($data[\'function_name\']) . $context[\'filter\'] . \';\' . $context[\'admin-hook_token_var\'] . \'=\' . $context[\'admin-hook_token\'] . \';\' . $context[\'session_var\'] . \'=\' . $context[\'session_id\'] . \'" onclick="return confirm(\' . javaScriptEscape($txt[\'quickmod_confirm\']) . \');">
 
+							<img src="\' . $settings[\'images_url\'] . \'/icons/quick_remove.png" alt="\' . $txt[\'hooks_button_remove\'] . \'" title="\' . $txt[\'hooks_button_remove\'] . \'" />
 
+						</a>\';
 
+				'),
 
+				'class' => 'centertext',
 
+			),
 
+		);
 
+		$list_options['form'] = array(
 
+			'href' => $scripturl . '?action=admin;area=modsettings;sa=hooks' . $context['filter'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 
+			'name' => 'list_integration_hooks',
 
+		);
 
+	}
 
+
 
+
 
 	require_once($sourcedir . '/Subs-List.php');
 
 	createList($list_options);
 
 
@@ -2365,7 +2393,7 @@ function get_files_recursive($dir_path)
 
 
 
 function get_integration_hooks_data($start, $per_page, $sort)
 
 {
 
-	global $boarddir, $sourcedir, $settings, $txt, $context, $scripturl;
 
+	global $boarddir, $sourcedir, $settings, $txt, $context, $scripturl, $modSettings;
 
 
 
 	$hooks = $temp_hooks = get_integration_hooks();
 
 	$hooks_data = $temp_data = $hook_status = array();
@@ -2385,7 +2413,15 @@ function get_integration_hooks_data($start, $per_page, $sort)
 
 				{
 
 					foreach ($functions as $function_o)
 
 					{
 
-						$function = str_replace(']', '', $function_o);
 
+						$hook_name = str_replace(']', '', $function_o);
 
+						if (strpos($hook_name, '::') !== false)
 
+						{
 
+							$function = explode('::', $hook_name);
 
+							$function = $function[1];
 
+						}
 
+						$function = explode(':', $function);
 
+						$function = $function[0];
 
+
 
 						if (substr($hook, -8) === '_include')
 
 						{
 
 							$hook_status[$hook][$function]['exists'] = file_exists(strtr(trim($function), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir'])));
@@ -2393,11 +2429,10 @@ function get_integration_hooks_data($start, $per_page, $sort)
 
 							$temp_data['include'][basename($function)] = array('hook' => $hook, 'function' => $function);
 
 							unset($temp_hooks[$hook][$function_o]);
 
 						}
 
-						// @TODO replace with a preg_match? (the difference is the space before the open parentheses
 
-						elseif (strpos($fc, 'function ' . trim($function) . '(') !== false || strpos($fc, 'function ' . trim($function) . ' (') !== false)
 
+						elseif (strpos(str_replace(' (', '(', $fc), 'function ' . trim($function) . '(') !== false)
 
 						{
 
-							$hook_status[$hook][$function]['exists'] = true;
 
-							$hook_status[$hook][$function]['in_file'] = $file['name'];
 
+							$hook_status[$hook][$hook_name]['exists'] = true;
 
+							$hook_status[$hook][$hook_name]['in_file'] = $file['name'];
 
 							// I want to remember all the functions called within this file (to check later if they are enabled or disabled and decide if the integrare_*_include of that file can be disabled too)
 
 							$temp_data['function'][$file['name']][] = $function_o;
 
 							unset($temp_hooks[$hook][$function_o]);
@@ -2465,18 +2500,27 @@ function get_integration_hooks_data($start, $per_page, $sort)
 
 				$function = str_replace(']', '', $function);
 
 				$hook_exists = !empty($hook_status[$hook][$function]['exists']);
 
 				$file_name = isset($hook_status[$hook][$function]['in_file']) ? $hook_status[$hook][$function]['in_file'] : ((substr($hook, -8) === '_include') ? 'zzzzzzzzz' : 'zzzzzzzza');
 
-				$status = $hook_exists ? ($enabled ? 'a' : 'b') : 'c';
 
 				$sort[] = $$sort_options[0];
 
+
 
+				if (strpos($function, '::') !== false)
 
+				{
 
+					$function = explode('::', $function);
 
+					$function = $function[1];
 
+				}
 
+				$exploded = explode(':', $function);
 
+
 
 				$temp_data[] = array(
 
 					'id' => 'hookid_' . $id++,
 
 					'hook_name' => $hook,
 
 					'function_name' => $function,
 
+					'real_function' => $exploded[0],
 
+					'included_file' => isset($exploded[1]) ? strtr(trim($exploded[1]), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir'])) : '',
 
 					'file_name' => (isset($hook_status[$hook][$function]['in_file']) ? $hook_status[$hook][$function]['in_file'] : ''),
 
 					'hook_exists' => $hook_exists,
 
 					'status' => $hook_exists ? ($enabled ? 'allow' : 'moderate') : 'deny',
 
 					'img_text' => $txt['hooks_' . ($hook_exists ? ($enabled ? 'active' : 'disabled') : 'missing')],
 
 					'enabled' => $enabled,
 
-					'can_be_disabled' => !isset($hook_status[$hook][$function]['enabled']),
 
+					'can_be_disabled' => !empty($modSettings['handlinghooks_enabled']) && !isset($hook_status[$hook][$function]['enabled']),
 
 				);
 
 			}
 
 		}
--- a/Sources/ModerationCenter.php
+++ b/Sources/ModerationCenter.php
@@ -154,18 +154,6 @@ function ModerationMain($dont_call = false)
 
 		),
 
 	);
 
 
 
-	// Any files to include for moderation?
 
-	if (!empty($modSettings['integrate_moderate_include']))
 
-	{
 
-		$moderate_includes = explode(',', $modSettings['integrate_moderate_include']);
 
-		foreach ($moderate_includes as $include)
 
-		{
 
-			$include = strtr(trim($include), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir']));
 
-			if (file_exists($include))
 
-				require_once($include);
 
-		}
 
-	}
 
-
 
 	// Let them modify admin areas easily.
 
 	call_integration_hook('integrate_moderate_areas', array(&$moderation_areas));
 
 
--- a/Sources/Packages.php
+++ b/Sources/Packages.php
@@ -1011,9 +1011,9 @@ function PackageInstall()
 
 			elseif ($action['type'] == 'hook' && isset($action['hook'], $action['function']))
 
 			{
 
 				if ($action['reverse'])
 
-					remove_integration_function($action['hook'], $action['function']);
 
+					remove_integration_function($action['hook'], $action['function'], $action['include_file']);
 
 				else
 
-					add_integration_function($action['hook'], $action['function']);
 
+					add_integration_function($action['hook'], $action['function'], $action['include_file']);
 
 			}
 
 			// Only do the database changes on uninstall if requested.
 
 			elseif ($action['type'] == 'database' && !empty($action['filename']) && (!$context['uninstalling'] || !empty($_POST['do_db_changes'])))
--- a/Sources/Post.php
+++ b/Sources/Post.php
@@ -49,18 +49,6 @@ function Post($post_errors = array())
 
 
 
 	require_once($sourcedir . '/Subs-Post.php');
 
 
 
-	// Any files to include for post?
 
-	if (!isset($post_includes) && !empty($modSettings['integrate_post_include']))
 
-	{
 
-		$post_includes = explode(',', $modSettings['integrate_post_include']);
 
-		foreach ($post_includes as $include)
 
-		{
 
-			$include = strtr(trim($include), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir']));
 
-			if (file_exists($include))
 
-				require_once($include);
 
-		}
 
-	}
 
-
 
 	if (isset($_REQUEST['xml']))
 
 	{
 
 		$context['sub_template'] = 'post';
@@ -1196,22 +1184,6 @@ function Post2()
 
 	// No need!
 
 	$context['robot_no_index'] = true;
 
 
 
-	// Any files to include for post?
 
-	if (!empty($modSettings['integrate_post_include']))
 
-	{
 
-		$post_includes = explode(',', $modSettings['integrate_post_include']);
 
-		foreach ($post_includes as $include)
 
-		{
 
-			$include = strtr(trim($include), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir']));
 
-			if (file_exists($include))
 
-				require_once($include);
 
-		}
 
-	}
 
-
 
-	// Previewing? Go back to start.
 
-	if (isset($_REQUEST['preview']))
 
-		return Post();
 
-
 
 	// Previewing? Go back to start.
 
 	if (isset($_REQUEST['preview']))
 
 		return Post();
--- a/Sources/Subs-Package.php
+++ b/Sources/Subs-Package.php
@@ -1138,6 +1138,7 @@ function parsePackageInfo(&$packageXML, $testing_only = true, $method = 'install
 
 				'type' => $actionType,
 
 				'function' => $action->exists('@function') ? $action->fetch('@function') : '',
 
 				'hook' => $action->exists('@hook') ? $action->fetch('@hook') : $action->fetch('.'),
 
+				'include_file' => $action->exists('@file') ? $action->fetch('@file') : '',
 
 				'reverse' => $action->exists('@reverse') && $action->fetch('@reverse') == 'true' ? true : false,
 
 				'description' => '',
 
 			);
--- a/Sources/Subs.php
+++ b/Sources/Subs.php
@@ -4046,19 +4046,47 @@ function smf_seed_generator()
 
  */
 
 function call_integration_hook($hook, $parameters = array())
 
 {
 
-	global $modSettings;
 
+	global $modSettings, $settings, $boarddir, $sourcedir;
 
 
 
 	$results = array();
 
 	if (empty($modSettings[$hook]))
 
 		return $results;
 
 
 
 	$functions = explode(',', $modSettings[$hook]);
 
-
 
 	// Loop through each function.
 
 	foreach ($functions as $function)
 
 	{
 
 		$function = trim($function);
 
-		$call = strpos($function, '::') !== false ? explode('::', $function) : $function;
 
+		if (strpos($function, '::') !== false)
 
+		{
 
+			$call = explode('::', $function);
 
+			if (strpos($call[1], ':') !== false)
 
+			{
 
+				list($func, $file) = explode(':', $call[1]);
 
+				if (empty($settings['theme_dir']))
 
+					$absPath = strtr(trim($file), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir));
 
+				else
 
+					$absPath = strtr(trim($file), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir']));
 
+				if (file_exists($absPath))
 
+					require_once($absPath);
 
+				$call = array($call[0], $func);
 
+			}
 
+		}
 
+		else
 
+		{
 
+			$call = $function;
 
+			if (strpos($function, ':') !== false)
 
+			{
 
+				list($func, $file) = explode(':', $function);
 
+				if (empty($settings['theme_dir']))
 
+					$absPath = strtr(trim($file), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir));
 
+				else
 
+					$absPath = strtr(trim($file), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir']));
 
+				if (file_exists($absPath))
 
+					require_once($absPath);
 
+				$call = $function;
 
+			}
 
+		}
 
 
 
 		// Is it valid?
 
 		if (is_callable($call))
@@ -4074,12 +4102,15 @@ function call_integration_hook($hook, $parameters = array())
 
  *
 
  * @param string $hook
 
  * @param string $function
 
+ * @param string $file
 
  * @param bool $permanent = true if true, updates the value in settings table
 
  */
 
-function add_integration_function($hook, $function, $permanent = true)
 
+function add_integration_function($hook, $function, $file = '', $permanent = true)
 
 {
 
 	global $smcFunc, $modSettings;
 
 
 
+	$integration_call = (!empty($file) && $file !== true) ? $function . ':' . $file : $function;
 
+
 
 	// Is it going to be permanent?
 
 	if ($permanent)
 
 	{
@@ -4097,13 +4128,13 @@ function add_integration_function($hook, $function, $permanent = true)
 
 		if (!empty($current_functions))
 
 		{
 
 			$current_functions = explode(',', $current_functions);
 
-			if (in_array($function, $current_functions))
 
+			if (in_array($integration_call, $current_functions))
 
 				return;
 
 
 
-			$permanent_functions = array_merge($current_functions, array($function));
 
+			$permanent_functions = array_merge($current_functions, array($integration_call));
 
 		}
 
 		else
 
-			$permanent_functions = array($function);
 
+			$permanent_functions = array($integration_call);
 
 
 
 		updateSettings(array($hook => implode(',', $permanent_functions)));
 
 	}
@@ -4112,10 +4143,10 @@ function add_integration_function($hook, $function, $permanent = true)
 
 	$functions = empty($modSettings[$hook]) ? array() : explode(',', $modSettings[$hook]);
 
 
 
 	// Do nothing, if it's already there.
 
-	if (in_array($function, $functions))
 
+	if (in_array($integration_call, $functions))
 
 		return;
 
 
 
-	$functions[] = $function;
 
+	$functions[] = $integration_call;
 
 	$modSettings[$hook] = implode(',', $functions);
 
 }
 
 
@@ -4126,11 +4157,14 @@ function add_integration_function($hook, $function, $permanent = true)
 
  *
 
  * @param string $hook
 
  * @param string $function
 
+ * @param string $file
 
  */
 
-function remove_integration_function($hook, $function)
 
+function remove_integration_function($hook, $function, $file = '')
 
 {
 
 	global $smcFunc, $modSettings;
 
 
 
+	$integration_call = (!empty($file)) ? $function . ':' . $file : $function;
 
+
 
 	// Get the permanent functions.
 
 	$request = $smcFunc['db_query']('', '
 
 		SELECT value
@@ -4147,18 +4181,18 @@ function remove_integration_function($hook, $function)
 
 	{
 
 		$current_functions = explode(',', $current_functions);
 
 
 
-		if (in_array($function, $current_functions))
 
-			updateSettings(array($hook => implode(',', array_diff($current_functions, array($function)))));
 
+		if (in_array($integration_call, $current_functions))
 
+			updateSettings(array($hook => implode(',', array_diff($current_functions, array($integration_call)))));
 
 	}
 
 
 
 	// Turn the function list into something usable.
 
 	$functions = empty($modSettings[$hook]) ? array() : explode(',', $modSettings[$hook]);
 
 
 
 	// You can only remove it if it's available.
 
-	if (!in_array($function, $functions))
 
+	if (!in_array($integration_call, $functions))
 
 		return;
 
 
 
-	$functions = array_diff($functions, array($function));
 
+	$functions = array_diff($functions, array($integration_call));
 
 	$modSettings[$hook] = implode(',', $functions);
 
 }
 
 
--- a/Sources/Who.php
+++ b/Sources/Who.php
@@ -723,9 +723,9 @@ function Credits($in_admin = false)
 
 			$credit_info = unserialize($row['credits']);
 
 
 
 			$copyright = empty($credit_info['copyright']) ? '' : $txt['credits_copyright'] . ' &copy; ' . $smcFunc['htmlspecialchars']($credit_info['copyright']);
 
-			$license = empty($credit_info['license']) ? '' : $txt['credits_license'] . ' ' . $smcFunc['htmlspecialchars']($credit_info['license']);
 
-			$version = $txt['credits_version'] . $row['version'];
 
-			$title = (empty($credit_info['title']) ? $row['name'] : $smcFunc['htmlspecialchars']($credit_info['title'])) . ' : ' . $version;
 
+			$license = empty($credit_info['license']) ? '' : $txt['credits_license'] . ': ' . $smcFunc['htmlspecialchars']($credit_info['license']);
 
+			$version = $txt['credits_version'] . ' ' . $row['version'];
 
+			$title = (empty($credit_info['title']) ? $row['name'] : $smcFunc['htmlspecialchars']($credit_info['title'])) . ': ' . $version;
 
 
 
 			// build this one out and stash it away
 
 			$mod_name = empty($credit_info['url']) ? $title : '<a href="' . $credit_info['url'] . '">' . $title . '</a>';
--- a/Themes/default/Profile.template.php
+++ b/Themes/default/Profile.template.php
@@ -1776,7 +1776,8 @@ function template_notification()
 
 					<hr class="hrcolor" />
 
 					<div>
 
 						<input id="notify_submit" type="submit" value="', $txt['notify_save'], '" class="button_submit" />
 
-						<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
+						<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />', !empty($context['token_check']) ? '
 
+						<input type="hidden" name="' . $context[$context['token_check'] . '_token_var'] . '" value="' . $context[$context['token_check'] . '_token'] . '" />' : '', '
 
 						<input type="hidden" name="u" value="', $context['id_member'], '" />
 
 						<input type="hidden" name="sa" value="', $context['menu_item_selected'], '" />
 
 					</div>
--- a/Themes/default/images/admin/feature_ih.png
+++ b/Themes/default/images/admin/feature_ih.png
--- a/Themes/default/languages/Admin.english.php
+++ b/Themes/default/languages/Admin.english.php
@@ -654,6 +654,8 @@ $txt['paid_subs_view'] = 'View Subscriptions';
 
 $txt['hooks_title_list'] = 'Integration Hooks';
 
 $txt['hooks_field_hook_name'] = 'Hook Name';
 
 $txt['hooks_field_function_name'] = 'Function Name';
 
+$txt['hooks_field_function'] = 'Function';
 
+$txt['hooks_field_included_file'] = 'Included file';
 
 $txt['hooks_field_file_name'] = 'File Name';
 
 $txt['hooks_field_hook_exists'] = 'Status';
 
 $txt['hooks_active'] = 'Exists';
--- a/Themes/default/languages/ManageSettings.english.php
+++ b/Themes/default/languages/ManageSettings.english.php
@@ -305,6 +305,8 @@ $txt['core_settings_item_dr'] = 'Drafts';
 
 $txt['core_settings_item_dr_desc'] = 'Enabling this feature will allow users to save drafts of their posts so they can return to them later to post them.';
 
 $txt['core_settings_item_cp'] = 'Advanced Profile Fields';
 
 $txt['core_settings_item_cp_desc'] = 'This enables you to hide standard profile fields, add profile fields to registration, and create new profile fields for your forum.';
 
+$txt['core_settings_item_ih'] = 'Integration Hooks Handling';
 
+$txt['core_settings_item_ih_desc'] = 'This feature allows you to enable or disable hooks. Since this could stop your forum to work properly use this function only if you know what you are doing';
 
 $txt['core_settings_item_k'] = 'Karma';
 
 $txt['core_settings_item_k_desc'] = 'Karma is a feature that shows the popularity of a member. Members, if allowed, can \'applaud\' or \'smite\' other members, which is how their popularity is calculated.';
 
 $txt['core_settings_item_ml'] = 'Moderation, Administration and User Logs';