[-] BO : Remove warning at login template

PrestaShop · Mar 26, 2013 · 135bd2c · 135bd2c
1 parent b8ecaa8
commit 135bd2c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/admin-dev/themes/default/template/controllers/login/content.tpl b/admin-dev/themes/default/template/controllers/login/content.tpl
@@ -102,9 +102,9 @@
 			<p>{l s='For security reasons, you cannot connect to the Back Office until after you have:'}</p>
 			<ul>
 				<li>{l s='deleted the /install folder'}</li>
-				<li>{l s='renamed the /admin folder (e.g. /admin123%d)' sprintf=$randomNb}</li>
+				<li>{l s='renamed the /admin folder (e.g. /admin%d)' sprintf=$randomNb}</li>
 			</ul>
-			<p>{l s='Please then access this page by the new URL (e.g. http://www.yoursite.com/admin123%d)' sprintf=$randomNb}</p>
+			<p>{l s='Please then access this page by the new URL (e.g. http://www.yoursite.com/admin%d)' sprintf=$randomNb}</p>
 		</div>
 	{/if}
 	</div>

diff --git a/controllers/admin/AdminLoginController.php b/controllers/admin/AdminLoginController.php
@@ -71,16 +71,18 @@ public function initContent()
 		if (file_exists(_PS_ADMIN_DIR_.'/../install'))
 			$this->context->smarty->assign('wrong_folder_name', true);
 		if (file_exists(_PS_ADMIN_DIR_.'/../admin'))
-		{
+		{	
 			$rand = sprintf('%04d', rand(0, 9999));
 			if (@rename(_PS_ADMIN_DIR_.'/../admin', _PS_ADMIN_DIR_.'/../admin'.$rand))
 				Tools::redirectAdmin('../admin'.$rand);
 			else
 				$this->context->smarty->assign(array(
-					'randomNb' => rand(100, 999),
 					'wrong_folder_name' => true
 				));
 		}
+		$this->context->smarty->assign(array(
+			'randomNb' => rand(0, 9999)
+		));
 
 		// Redirect to admin panel
 		if (Tools::isSubmit('redirect') && Validate::isControllerName(Tools::getValue('redirect')))