Home Explore Help
Register Sign In
Omnimaga
/
SMF2.1
mirror of [email protected]:Omnimaga/SMF2.1.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Moving the .js files to loadJavascriptFile89 in Login.template.php
#1392

Signed-off-by: Suki <[email protected]>

Suki 10 years ago
parent
b03abfcb6c
commit
73a7239d78
8 changed files with 19 additions and 14 deletions
Split View Show Diff Stats
  1. 3 3
      Sources/Load.php
  2. 5 4
      Sources/LogInOut.php
  3. 2 0
      Sources/Register.php
  4. 2 0
      Sources/Reminder.php
  5. 1 0
      Sources/Security.php
  6. 5 0
      Sources/Subs-Auth.php
  7. 1 1
      Sources/Subs.php
  8. 0 6
      Themes/default/Login.template.php

+ 3 - 3
Sources/Load.php
View File 

@@ -2049,9 +2049,9 @@ function loadSubTemplate($sub_template_name, $fatal = false)
 
  */
 
 function loadCSSFile($filename, $params = array(), $id = '')
 
 {
 
-	global $settings, $context;
 
+	global $settings, $context, $modSettings;
 
 
-	$params['seed'] = (!isset($params['seed']) || $params['seed'] === true) ? '?alph21' : (is_string($params['seed']) ? ($params['seed'] = $params['seed'][0] === '?' ? $params['seed'] : '?' . $params['seed']) : '');
 
+	$params['seed'] = (!isset($params['seed']) || $params['seed'] === true) ? $modSettings['browser_cache'] : (is_string($params['seed']) ? ($params['seed'] = $params['seed'][0] === '?' ? $params['seed'] : '?' . $params['seed']) : '');
 
 	$params['force_current'] = !empty($params['force_current']) ? $params['force_current'] : false;
 
 	$theme = !empty($params['default_theme']) ? 'default_theme' : 'theme';
 
 
@@ -2099,7 +2099,7 @@ function loadCSSFile($filename, $params = array(), $id = '')
 
  */
 
 function loadJavascriptFile($filename, $params = array(), $id = '')
 
 {
 
-	global $settings, $context, reset_browser_cache;
 
+	global $settings, $context, $modSettings;
 
 
 	$params['seed'] = (!isset($params['seed']) || $params['seed'] === true) ? $modSettings['browser_cache'] : (is_string($params['seed']) ? ($params['seed'] = $params['seed'][0] === '?' ? $params['seed'] : '?' . $params['seed']) : '');
 
 	$params['force_current'] = !empty($params['force_current']) ? $params['force_current'] : false;

+ 5 - 4
Sources/LogInOut.php
View File 

@@ -41,7 +41,7 @@ function Login()
 
 	else
 
 	{
 
 		loadLanguage('Login');
 
-		loadTemplate('Login');
 
+
 
 		$context['sub_template'] = 'login';
 
 
 		if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest')
 
@@ -69,6 +69,9 @@ function Login()
 
 	else
 
 		unset($_SESSION['login_url']);
 
 
+	// Need some js goodies.
 
+	loadJavascriptFile('sha1.js', array('default_theme' => true), 'smf_scripts');
 
+
 
 	// Create a one time token.
 
 	createToken('login');
 
 }
 
@@ -168,10 +171,8 @@ function Login2()
 
 	if (WIRELESS)
 
 		$context['sub_template'] = WIRELESS_PROTOCOL . '_login';
 
 	else
 
-	{
 
-		loadTemplate('Login');
 
 		$context['sub_template'] = 'login';
 
-	}
 
+
 
 
 	// Set up the default/fallback stuff.
 
 	$context['default_username'] = isset($_POST['user']) ? preg_replace('~&amp;#(\\d{1,7}|x[0-9a-fA-F]{1,6});~', '&#\\1;', $smcFunc['htmlspecialchars']($_POST['user'])) : '';

+ 2 - 0
Sources/Register.php
View File 

@@ -707,6 +707,8 @@ function Activate()
 
 		'never_expire' => false,
 
 		'description' => $txt['activate_success']
 
 	);
 
+
 
+	loadJavascriptFile('sha1.js', array('default_theme' => true), 'smf_scripts');
 
 }
 
 
 /**

+ 2 - 0
Sources/Reminder.php
View File 

@@ -270,6 +270,8 @@ function setPassword2()
 
 		'never_expire' => false,
 
 		'description' => $txt['reminder_password_set']
 
 	);
 
+
 
+	loadJavascriptFile('sha1.js', array('default_theme' => true), 'smf_scripts');
 
 	createToken('login');
 
 }

+ 1 - 0
Sources/Security.php
View File 

@@ -155,6 +155,7 @@ function is_not_guest($message = '')
 
 	else
 
 	{
 
 		loadTemplate('Login');
 
+		loadJavascriptFile('sha1.js', array('default_theme' => true), 'smf_scripts');
 
 		$context['sub_template'] = 'kick_guest';
 
 		$context['robot_no_index'] = true;
 
 	}

+ 5 - 0
Sources/Subs-Auth.php
View File 

@@ -158,6 +158,9 @@ function KickGuest()
 
 	loadTemplate('Login');
 
 	createToken('login');
 
 
+	// Need some js goodies.
 
+	loadJavascriptFile('sha1.js', array('default_theme' => true), 'smf_scripts');
 
+
 
 	// Never redirect to an attachment
 
 	if (strpos($_SERVER['REQUEST_URL'], 'dlattach') === false)
 
 		$_SESSION['login_url'] = $_SERVER['REQUEST_URL'];
 
@@ -178,6 +181,7 @@ function InMaintenance()
 
 	loadLanguage('Login');
 
 	loadTemplate('Login');
 
 	createToken('login');
 
+	loadJavascriptFile('sha1.js', array('default_theme' => true), 'smf_scripts');
 
 
 	// Send a 503 header, so search engines don't bother indexing while we're in maintenance mode.
 
 	header('HTTP/1.1 503 Service Temporarily Unavailable');
 
@@ -203,6 +207,7 @@ function adminLogin($type = 'admin')
 
 
 	loadLanguage('Admin');
 
 	loadTemplate('Login');
 
+	loadJavascriptFile('sha1.js', array('default_theme' => true), 'smf_scripts');
 
 
 	// Validate what type of session check this is.
 
 	$types = array();

+ 1 - 1
Sources/Subs.php
View File 

@@ -3975,7 +3975,7 @@ function reset_browser_cache($set = '')
 
 	global $modSettings;
 
 
 	if(empty($modSettings['browser_cache']) || empty($set) || preg_match('~^[a-z0-9]{1,4}$~i', $set) === false)
 
-		$modSettings['browser_cache'] = substr(sha1(microtime()), 0, 4);
 
+		$modSettings['browser_cache'] = '?alph21';
 
 
 	else
 
 		$modSettings['browser_cache'] = $set;

+ 0 - 6
Themes/default/Login.template.php
View File 

@@ -16,8 +16,6 @@ function template_login()
 
 	global $context, $settings, $scripturl, $modSettings, $txt;
 
 
 	echo '
 
-		<script src="', $settings['default_theme_url'], '/scripts/sha1.js"></script>
 
-
 
 		<div class="tborder login">
 
 			<div class="cat_bar">
 
 				<h3 class="catbg">
 
@@ -97,7 +95,6 @@ function template_kick_guest()
 
 
 	// This isn't that much... just like normal login but with a message at the top.
 
 	echo '
 
-	<script src="', $settings['default_theme_url'], '/scripts/sha1.js"></script>
 
 	<form action="', $scripturl, '?action=login2" method="post" accept-charset="', $context['character_set'], '" name="frmLogin" id="frmLogin"', empty($context['disable_login_hashing']) ? ' onsubmit="hashLoginPassword(this, \'' . $context['session_id'] . '\', \'' . (!empty($context['login_token']) ? $context['login_token'] : '') . '\');"' : '', '>
 
 		<div class="tborder login">
 
 			<div class="cat_bar">
 
@@ -169,7 +166,6 @@ function template_maintenance()
 
 
 	// Display the administrator's message at the top.
 
 	echo '
 
-<script src="', $settings['default_theme_url'], '/scripts/sha1.js"></script>
 
 <form action="', $scripturl, '?action=login2" method="post" accept-charset="', $context['character_set'], '"', empty($context['disable_login_hashing']) ? ' onsubmit="hashLoginPassword(this, \'' . $context['session_id'] . '\', \'' . (!empty($context['login_token']) ? $context['login_token'] : '') . '\');"' : '', '>
 
 	<div class="tborder login" id="maintenance_mode">
 
 		<div class="cat_bar">
 
@@ -210,8 +206,6 @@ function template_admin_login()
 
 
 	// Since this should redirect to whatever they were doing, send all the get data.
 
 	echo '
 
-<script src="', $settings['default_theme_url'], '/scripts/sha1.js"></script>
 
-
 
 <form action="', $scripturl, $context['get_data'], '" method="post" accept-charset="', $context['character_set'], '" name="frmLogin" id="frmLogin" onsubmit="hash', ucfirst($context['sessionCheckType']), 'Password(this, \'', $context['user']['username'], '\', \'', $context['session_id'], '\', \'' . (!empty($context['login_token']) ? $context['login_token'] : '') . '\');">
 
 	<div class="tborder login" id="admin_login">
 
 		<div class="cat_bar">