remijean/ZwiiCMS
2
1
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Pull Requests Activity

10.2.dev30 formulaire ouvert mauvais message

Browse Source
This commit is contained in:
Fred Tempez 2020-06-06 11:55:56 +02:00
parent 6b2c44c3fc
commit 0ac70c9f51
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/core.js.php
View File

@ -260,10 +260,10 @@ core.start = function() {
var fileName = inputFileHiddenDOM.val();
if(fileName === "") {
fileName = "Choisissez un fichier";
$(".inputFileDelete").addClass("disabled");
$(inputFileHiddenDOM).addClass("disabled");
}
else {
$(".inputFileDelete").removeClass("disabled");
$(inputFileHiddenDOM).removeClass("disabled");
}
inputFileHiddenDOM.parent().find(".inputFileLabel").text(fileName);
}).trigger("change");

5
core/core.php
View File

@ -39,7 +39,7 @@ class common {
const ACCESS_TIMER = 1800;
// Numéro de version
const ZWII_VERSION = '10.2.00.dev28';
const ZWII_VERSION = '10.2.00.dev30';
const ZWII_UPDATE_CHANNEL = "v10";
public static $actions = [];
@ -1668,7 +1668,8 @@ class core extends common {
*/
foreach($this->getData(['user']) as $userId => $userIds){
$t = explode('/',$this->getData(['user', $userId, 'accessUrl']));
if ( $userId !== $this->getuser('id') &&
if ( $this->getuser('id') &&
$userId !== $this->getuser('id') &&
$this->getData(['user', $userId,'accessUrl']) === $this->getUrl() &&
array_intersect($t,self::$accessList) &&
array_intersect($t,self::$accessExclude) !== false &&