|
|
|
@ -185,37 +185,41 @@ class common {
|
|
|
|
|
|
|
|
|
|
// Fontes |
|
|
|
|
public static $fonts = [ |
|
|
|
|
'abril-fatface' => 'Abril Fatface', |
|
|
|
|
'arimo' => 'Arimo', |
|
|
|
|
'arvo' => 'Arvo', |
|
|
|
|
'berkshire-swash' => 'Berkshire Swash', |
|
|
|
|
'dancing-script' => 'Dancing Script', |
|
|
|
|
'droid-sans-2' => 'Droid Sans', |
|
|
|
|
'droid-serif-2' => 'Droid Serif', |
|
|
|
|
'fira-sans' => 'Fira Sans', |
|
|
|
|
'genera' => 'Genera', |
|
|
|
|
'inconsolata-2' => 'Inconsolata', |
|
|
|
|
'indie-flower' => 'Indie Flower', |
|
|
|
|
'josefin-sans-std' => 'Josefin Sans', |
|
|
|
|
'liberation-sans' => 'Liberation Sans', |
|
|
|
|
'liberation-serif' => 'Liberation Serif', |
|
|
|
|
'lobster-2' => 'Lobster', |
|
|
|
|
'lora' => 'Lora', |
|
|
|
|
'lato' => 'Lato', |
|
|
|
|
'montserrat-ace' => 'Montserrat Ace', |
|
|
|
|
'old-standard-tt-3' => 'Old Standard TT', |
|
|
|
|
'open-sans' => 'Open Sans', |
|
|
|
|
'oswald-4' => 'Oswald', |
|
|
|
|
'pt-mono' => 'PT Mono', |
|
|
|
|
'pt-serif' => 'PT Serif', |
|
|
|
|
'raleway-5' => 'Raleway', |
|
|
|
|
'rancho' => 'Rancho', |
|
|
|
|
'roboto' => 'Roboto', |
|
|
|
|
'signika' => 'Signika', |
|
|
|
|
'ubuntu' => 'Ubuntu', |
|
|
|
|
'vollkorn' => 'Vollkorn' |
|
|
|
|
]; |
|
|
|
|
|
|
|
|
|
public static $fontsWebSafe = [ |
|
|
|
|
'georgia' => 'Georgia, DejaVu Serif, Norasi, serif;', |
|
|
|
|
'times' => 'Times, Times New Roman, Liberation Serif, FreeSerif, serif;', |
|
|
|
|
'arial' => 'Arial, Helvetica, Liberation Sans, FreeSans, sans-serif;', |
|
|
|
|
'trebuchet' => 'Trebuchet MS, Arial, Helvetica, sans-serif;', |
|
|
|
|
'lucida' => 'Lucida Sans, Lucida Grande, Lucida Sans Unicode, Luxi Sans, sans-serif;', |
|
|
|
|
'tahoma' => 'Tahoma, Geneva, Kalimati, sans-serif;', |
|
|
|
|
'verdana' => 'Verdana, DejaVu Sans, Bitstream Vera Sans, Geneva, sans-serif;', |
|
|
|
|
'impact' => 'Impact, Arial Black, sans-serif;', |
|
|
|
|
'courrier' => 'Courier, Courier New, FreeMono, Liberation Mono, monospace;', |
|
|
|
|
'monaco' => 'Monaco, DejaVu Sans Mono, Lucida Console, Andale Mono, monospace;' |
|
|
|
|
]; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* Constructeur commun |
|
|
|
|
*/ |
|
|
|
@ -2277,16 +2281,26 @@ class core extends common {
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* Traitement des polices de caractères |
|
|
|
|
*/ |
|
|
|
|
|
|
|
|
|
// Fusionne la liste des fontes avec les webSafe |
|
|
|
|
foreach (self::$fontsWebSafe as $fontId => $fontValue) { |
|
|
|
|
$fontName = explode (',', $fontValue); |
|
|
|
|
self::$fonts [$fontId] = $fontName[0]; |
|
|
|
|
} |
|
|
|
|
// Importe les polices personnalisées |
|
|
|
|
$fontsImported = $this->getData(['fonts', 'imported']); |
|
|
|
|
if (is_array($fontsImported) && |
|
|
|
|
!empty ($fontsImported) |
|
|
|
|
) { |
|
|
|
|
// Fusionner les fonts avec les fontes installées |
|
|
|
|
// Fusionner avec les fontes installées |
|
|
|
|
self::$fonts = array_merge(self::$fonts, $fontsImported); |
|
|
|
|
// Tri Alphabétique |
|
|
|
|
asort(self::$fonts); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
// Tri Alphabétique |
|
|
|
|
asort(self::$fonts); |
|
|
|
|
|
|
|
|
|
// Crée le fichier de personnalisation avancée |
|
|
|
|
if(file_exists(self::DATA_DIR.'custom.css') === false) { |
|
|
|
@ -2311,7 +2325,9 @@ class core extends common {
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* Import des polices de caractères |
|
|
|
|
* A partir du CDN ou dans le dossier site/file/source/fonts |
|
|
|
|
* A partir du CDN |
|
|
|
|
* ou dans le dossier site/file/source/fonts |
|
|
|
|
* ou pas du tout si fonte webSafe |
|
|
|
|
*/ |
|
|
|
|
$fonts = [ $this->getData(['theme', 'text', 'font']), |
|
|
|
|
$this->getData(['theme', 'title', 'font']), |
|
|
|
@ -2321,12 +2337,21 @@ class core extends common {
|
|
|
|
|
]; |
|
|
|
|
// Suppression des polices identiques |
|
|
|
|
$fonts = array_unique($fonts); |
|
|
|
|
// Lire le fichier des fontes locales |
|
|
|
|
$localFonts = $this->getData(['fonts', 'files']); |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* Fontes Web Safe, ne sont pas chargées. |
|
|
|
|
*/ |
|
|
|
|
foreach ($fonts as $fontId) { |
|
|
|
|
if (array_key_exists($fontId, self::$fontsWebSafe) ) { |
|
|
|
|
unset($fonts[$fontId]); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* Chargement des polices en ligne dans un fichier séparé |
|
|
|
|
*/ |
|
|
|
|
// Lire le fichier des fontes locales |
|
|
|
|
$localFonts = $this->getData(['fonts', 'files']); |
|
|
|
|
$fontFile = ''; |
|
|
|
|
foreach ($fonts as $fontId) { |
|
|
|
|
if (!array_key_exists($fontId, $localFonts) ) { |
|
|
|
@ -2549,6 +2574,16 @@ class core extends common {
|
|
|
|
|
]; |
|
|
|
|
// Suppression des polices identiques |
|
|
|
|
$fonts = array_unique($fonts); |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* Fontes Web Safe, ne sont pas chargées. |
|
|
|
|
*/ |
|
|
|
|
foreach ($fonts as $fontId) { |
|
|
|
|
if (array_key_exists($fontId, self::$fontsWebSafe) ) { |
|
|
|
|
unset($fonts[$fontId]); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// Lire le fichier des fontes locales |
|
|
|
|
$localFonts = $this->getData(['fonts', 'files']); |
|
|
|
|
|
|
|
|
|