diff --git a/CHANGES.MD b/CHANGES.MD index 531b84fe..924d65f4 100644 --- a/CHANGES.MD +++ b/CHANGES.MD @@ -4,6 +4,8 @@ ## Préversion version 8.3.14 * Modifications : - Footer dans 3 blocs contenant dans l'ordre : Texte, Réseaux sociaux, Copyright + - Balise ALT dans les images du menu + - Config RFM ## version 8.3.13 : * Modifications : diff --git a/core/core.php b/core/core.php index b0a63594..cfcd25b6 100644 --- a/core/core.php +++ b/core/core.php @@ -429,7 +429,6 @@ class common { self::GROUP_ADMIN => 'Administrateur' ]; public static $timezone; - private $url = ''; private $user = []; @@ -1842,30 +1841,30 @@ class layout extends common { break; case 'text' : $items .= $this->getData(['page', $parentPageId, 'title']); - break; + break; case 'icon' : if ($this->getData(['page', $parentPageId, 'iconUrl']) != "") { - $items .= ''.$this->getData(['page', $parentPageId, 'title']).''; + $items .= ''.$this->getData(['page', $parentPageId, 'title']).''; } else { $items .= $this->getData(['page', $parentPageId, 'title']); } break; case 'icontitle' : if ($this->getData(['page', $parentPageId, 'iconUrl']) != "") { - $items .= ''.$this->getData(['page', $parentPageId, 'title']).'getData(['page', $parentPageId, 'title']).'" src="'. helper::baseUrl(false) .'site/file/source/'.$this->getData(['page', $parentPageId, 'iconUrl']).'" title="'; $items .= $this->getData(['page', $parentPageId, 'title']).'"/>'; } else { $items .= $this->getData(['page', $parentPageId, 'title']); - } + } break; case 'icontext' : if ($this->getData(['page', $parentPageId, 'iconUrl']) != "") { - $items .= ''.$this->getData(['page', $parentPageId, 'title']).''; + $items .= ''.$this->getData(['page', $parentPageId, 'title']).''; $items .= $this->getData(['page', $parentPageId, 'title']); } else { $items .= $this->getData(['page', $parentPageId, 'title']); } - break; + break; } // Menu Image @@ -1900,30 +1899,30 @@ class layout extends common { break; case 'text' : $items .= $this->getData(['page', $childKey, 'title']); - break; + break; case 'icon' : if ($this->getData(['page', $childKey, 'iconUrl']) != "") { - $items .= ''; + $items .= ''.$this->getData(['page', $parentPageId, 'title']).''; } else { $items .= $this->getData(['page', $parentPageId, 'title']); } break; case 'icontitle' : if ($this->getData(['page', $childKey, 'iconUrl']) != "") { - $items .= 'getData(['page', $parentPageId, 'title']).'" src="'. helper::baseUrl(false) .'site/file/source/'.$this->getData(['page', $childKey, 'iconUrl']).'" title="'; $items .= $this->getData(['page', $childKey, 'title']).'"/>'; } else { $items .= $this->getData(['page', $childKey, 'title']); - } + } break; case 'icontext' : if ($this->getData(['page', $childKey, 'iconUrl']) != "") { - $items .= ''; + $items .= ''.$this->getData(['page', $parentPageId, 'title']).''; $items .= $this->getData(['page', $childKey, 'title']); } else { $items .= $this->getData(['page', $childKey, 'title']); } - break; + break; } $items .= ''; // Menu Image diff --git a/core/vendor/filemanager/config/config.php b/core/vendor/filemanager/config/config.php index 5cdd38b0..a80a3021 100755 --- a/core/vendor/filemanager/config/config.php +++ b/core/vendor/filemanager/config/config.php @@ -104,7 +104,7 @@ $config = array( |-------------------------------------------------------------------------- | | If you want enable ftp use write these parametres otherwise leave empty - | Remember to set base_url properly to point in the ftp server domain and + | Remember to set base_url properly to point in the ftp server domain and | upload dir will be ftp_base_folder + upload_dir so without final / | */ @@ -221,7 +221,7 @@ $config = array( //convert all spaces on files name and folders name this value 'replace_with' => "_", //convert to lowercase the files and folders name - 'lower_case' => false, + 'lower_case' => true, //Add ?484899493349 (time value) to returned images to prevent cache 'add_time_to_img' => false, @@ -261,7 +261,7 @@ $config = array( //****************** // // WATERMARK IMAGE - // + // //Watermark url or false 'image_watermark' => false, # Could be a pre-determined position such as: @@ -338,11 +338,11 @@ $config = array( //********************** //Allowed extensions (lowercase insert) //********************** - 'ext_img' => array( 'jpg', 'jpeg', 'png', 'gif', 'bmp', 'tiff', 'svg','ico' ), //Images - 'ext_file' => array( 'doc', 'docx', 'rtf', 'pdf', 'xls', 'xlsx', 'txt', 'csv', 'html', 'xhtml', 'psd', 'sql', 'log', 'fla', 'xml', 'ade', 'adp', 'mdb', 'accdb', 'ppt', 'pptx', 'odt', 'ots', 'ott', 'odb', 'odg', 'otp', 'otg', 'odf', 'ods', 'odp', 'css', 'ai', 'kmz','dwg', 'dxf', 'hpgl', 'plt', 'spl', 'step', 'stp', 'iges', 'igs', 'sat', 'cgm'), //Files - 'ext_video' => array( 'mov', 'mpeg', 'm4v', 'mp4', 'avi', 'mpg', 'wma', 'flv', 'webm' ), //Video - 'ext_music' => array( 'mp3', 'mpga', 'm4a', 'ac3', 'aiff', 'mid', 'ogg', 'wav' ), //Audio - 'ext_misc' => array( 'zip', 'rar', 'gz', 'tar', 'iso', 'dmg','7z' ), //Archives + 'ext_img' => array('jpg', 'jpeg', 'png', 'gif', 'bmp', 'tiff', 'svg','ico'), //Images + 'ext_file' => array('doc', 'docx', 'rtf', 'pdf', 'xls', 'xlsx', 'txt', 'csv', 'html', 'xhtml', 'psd', 'sql', 'log', 'fla', 'xml', 'ade', 'adp', 'mdb', 'accdb', 'ppt', 'pptx', 'odt', 'ots', 'ott', 'odb', 'odg', 'otp', 'otg', 'odf', 'ods', 'odp', 'css', 'ai', 'kmz','dwg', 'dxf', 'hpgl', 'plt', 'spl', 'step', 'stp', 'iges', 'igs', 'sat', 'cgm'), //Files + 'ext_video' => array('mov', 'mpeg', 'm4v', 'mp4', 'avi', 'mpg', 'wma', 'flv', 'webm'), //Video + 'ext_music' => array('mp3', 'mpga', 'm4a', 'ac3', 'aiff', 'mid', 'ogg', 'wav'), //Audio + 'ext_misc' => array('7z', 'zip', 'rar', 'gz', 'tar', 'iso', 'dmg'), //Archives /****************** * AVIARY config