dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// added check for install-new directory

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11739 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mMarinetti
2011-12-23 00:35:43 +00:00
parent 0f5c6f264d
commit 61db68ff59
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/login/content.tpl
+2 -1
View File
@@ -78,6 +78,7 @@
<p><span>{l s='For security reasons, you cannot connect to the Back Office until after you have:'}<br /><br /> <p><span>{l s='For security reasons, you cannot connect to the Back Office until after you have:'}<br /><br />
<ul> <ul>
<li>{l s='delete the /install folder'}</li> <li>{l s='delete the /install folder'}</li>
<li>{l s='delete the /install-new folder'}</li>
<li>{l s='renamed the /admin folder (eg.) /admin'}{$randomNb}</li> <li>{l s='renamed the /admin folder (eg.) /admin'}{$randomNb}</li>
</ul> </ul>
<br />{l s='Please then access this page by the new url (eg.) http://www.domain.tld/admin'}{$randomNb}</span></p> <br />{l s='Please then access this page by the new url (eg.) http://www.domain.tld/admin'}{$randomNb}</span></p>
@@ -100,4 +101,4 @@
</form> </form>
</div> </div>
<h2><a href="http://www.prestashop.com">&copy; Copyright by PrestaShop. all rights reserved.</a></h2> <h2><a href="http://www.prestashop.com">&copy; Copyright by PrestaShop. all rights reserved.</a></h2>
</div> </div>
controllers/admin/AdminLoginController.php
+4 -2
View File
@@ -70,7 +70,9 @@ class AdminLoginControllerCore extends AdminController
if(file_exists(_PS_ADMIN_DIR_.'/../install') OR file_exists(_PS_ADMIN_DIR_.'/../admin')) if(file_exists(_PS_ADMIN_DIR_.'/../install') || file_exists(_PS_ADMIN_DIR_.'/../admin')
|| file_exists(_PS_ADMIN_DIR_.'/../install-new')
)
$this->context->smarty->assign( $this->context->smarty->assign(
array( array(
'randomNb' => rand(100, 999), 'randomNb' => rand(100, 999),
@@ -204,4 +206,4 @@ class AdminLoginControllerCore extends AdminController
else if (Tools::isSubmit('ajax')) else if (Tools::isSubmit('ajax'))
die(Tools::jsonEncode(array('hasErrors' => true, 'errors' => $this->errors))); die(Tools::jsonEncode(array('hasErrors' => true, 'errors' => $this->errors)));
} }
} }