ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team/ZwiiCMS
10
9
Fork 3
Code Releases 153 Activity

Pas de trad auto du login

Browse Source
This commit is contained in:
fredtempez 2021-01-15 15:14:39 +01:00
parent 7e43f3adf4
commit 36e4cd8253
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/core.php
View File

@ -1572,19 +1572,6 @@ class common {
$this->setData(['locale','metaDescription',$this->getData(['config','metaDescription'])]); $this->setData(['locale','metaDescription',$this->getData(['config','metaDescription'])]);
$this->setData(['locale','title',$this->getData(['config','title'])]); $this->setData(['locale','title',$this->getData(['config','title'])]);
// Options des langues
$this->setData(['config','translate','scriptGoogle',false]);
$this->setData(['config','translate','showCredits',false]);
$this->setData(['config','translate','admin',false]);
$this->setData(['config','translate','autoDetect',false]);
$this->setData(['config','translate','fr',false]);
$this->setData(['config','translate','de',false]);
$this->setData(['config','translate','en',false]);
$this->setData(['config','translate','es',false]);
$this->setData(['config','translate','it',false]);
$this->setData(['config','translate','nl',false]);
$this->setData(['config','translate','pt',false]);
// Renommer les fichier de backup // Renommer les fichier de backup
if ($this->getInput('configAdvancedFileBackup', helper::FILTER_BOOLEAN) === false) { if ($this->getInput('configAdvancedFileBackup', helper::FILTER_BOOLEAN) === false) {
$path = realpath('site/data'); $path = realpath('site/data');
@ -2238,10 +2225,12 @@ class core extends common {
// Cas des pages d'administration // Cas des pages d'administration
// Pas connecté // Pas connecté
AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')
AND $this->getUrl(1) !== 'login'
// Ou connecté avec option active // Ou connecté avec option active
OR ($this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD') OR ($this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD')
AND $this->getData(['config','translate','admin']) === true AND $this->getData(['config','translate','admin']) === true
) )
) { ) {
$this->addOutput([ $this->addOutput([
'vendor' => array_merge($this->output['vendor'], ['i18n']) 'vendor' => array_merge($this->output['vendor'], ['i18n'])