Merge branch '11600-mac' into 11600
This commit is contained in:
commit
59a2406aaa
|
|
@ -1112,7 +1112,7 @@ class common {
|
|||
while( $success
|
||||
AND $file = readdir($dir) ) {
|
||||
|
||||
if (( $file != '.' ) && ( $file != '..' )) {
|
||||
if (( $file != '.' ) && ( $file != '..' )) {
|
||||
if ( is_dir($src . '/' . $file) ){
|
||||
// Appel récursif des sous-dossiers
|
||||
$s = $this->copyDir($src . '/' . $file, $dst . '/' . $file);
|
||||
|
|
|
|||
|
|
@ -1720,30 +1720,6 @@ th.col12 {
|
|||
}
|
||||
|
||||
|
||||
/* Traduction auto */
|
||||
/*
|
||||
* Supprimer Le tooltip Google
|
||||
*
|
||||
.goog-tooltip {
|
||||
display: none !important;
|
||||
}
|
||||
.goog-tooltip:hover {
|
||||
display: none !important;
|
||||
}
|
||||
.goog-text-highlight {
|
||||
background-color: transparent !important;
|
||||
border: none !important;
|
||||
box-shadow: none !important;
|
||||
} */
|
||||
|
||||
/* Emplacement des conditions d'utilisation */
|
||||
#googTransLogo {
|
||||
float: right;
|
||||
}
|
||||
#googTransLogo img {
|
||||
width: 60%;
|
||||
}
|
||||
|
||||
/* Bannière masquable en petit écran*/
|
||||
@media screen and (max-width: 768px) {
|
||||
.bannerDisplay{
|
||||
|
|
|
|||
|
|
@ -22,6 +22,12 @@ class install extends common {
|
|||
'update' => self::GROUP_ADMIN
|
||||
];
|
||||
|
||||
// Type de proxy
|
||||
public static $proxyType = [
|
||||
'tcp://' => 'TCP',
|
||||
'http://' => 'HTTP'
|
||||
];
|
||||
|
||||
// Thèmes proposés à l'installation
|
||||
public static $themes = [];
|
||||
|
||||
|
|
@ -97,6 +103,12 @@ class install extends common {
|
|||
$this->setData(['module', 'blog', 'posts', 'mon-deuxieme-article', 'userId', $userId]);
|
||||
$this->setData(['module', 'blog', 'posts', 'mon-troisieme-article', 'userId', $userId]);
|
||||
}
|
||||
|
||||
// Sauvegarder la configuration du Proxy
|
||||
$this->setData(['config', 'proxyType', $this->getInput('installProxyType') ]);
|
||||
$this->setData(['config', 'proxyUrl', $this->getInput('installProxyUrl') ]);
|
||||
$this->setData(['config', 'proxyPort', $this->getInput('installProxyPort', helper::FILTER_INT)]);
|
||||
|
||||
// Images exemples livrées dans tous les cas
|
||||
try {
|
||||
// Décompression dans le dossier de fichier temporaires
|
||||
|
|
|
|||
|
|
@ -1,56 +1,92 @@
|
|||
<p>Renseignez les champs ci-dessous pour finaliser l'installation.</p>
|
||||
<?php echo template::formOpen('installForm'); ?>
|
||||
<?php echo template::text('installId', [
|
||||
'autocomplete' => 'off',
|
||||
'label' => 'Identifiant'
|
||||
]); ?>
|
||||
<div class="row">
|
||||
<div class="col6">
|
||||
<?php echo template::password('installPassword', [
|
||||
'autocomplete' => 'off',
|
||||
'label' => 'Mot de passe'
|
||||
]); ?>
|
||||
</div>
|
||||
<div class="col6">
|
||||
<?php echo template::password('installConfirmPassword', [
|
||||
'autocomplete' => 'off',
|
||||
'label' => 'Confirmation'
|
||||
]); ?>
|
||||
</div>
|
||||
</div>
|
||||
<?php echo template::mail('installMail', [
|
||||
'autocomplete' => 'off',
|
||||
'label' => 'Adresse mail'
|
||||
]); ?>
|
||||
<div class="row">
|
||||
<div class="col6">
|
||||
<?php echo template::text('installFirstname', [
|
||||
'autocomplete' => 'off',
|
||||
'label' => 'Prénom'
|
||||
]); ?>
|
||||
</div>
|
||||
<div class="col6">
|
||||
<?php echo template::text('installLastname', [
|
||||
'autocomplete' => 'off',
|
||||
'label' => 'Nom'
|
||||
]); ?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col12">
|
||||
<?php echo template::select('installTheme', $module::$themes, [
|
||||
'label' => 'Thème'
|
||||
]); ?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col12">
|
||||
<?php echo template::checkbox('installDefaultData',true , 'Ne pas charger l\'exemple de site (utilisateurs avancés)', [
|
||||
'checked' => false
|
||||
]);
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<ul class="accordion" data-speed="150">
|
||||
<li class="accordion-item active">
|
||||
<h3 class="accordion-title">Compte administrateur</h3>
|
||||
<div class="accordion-content">
|
||||
<div class="row">
|
||||
<div class="col12">
|
||||
<?php echo template::text('installId', [
|
||||
'autocomplete' => 'off',
|
||||
'label' => 'Identifiant'
|
||||
]); ?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col6">
|
||||
<?php echo template::password('installPassword', [
|
||||
'autocomplete' => 'off',
|
||||
'label' => 'Mot de passe'
|
||||
]); ?>
|
||||
</div>
|
||||
<div class="col6">
|
||||
<?php echo template::password('installConfirmPassword', [
|
||||
'autocomplete' => 'off',
|
||||
'label' => 'Confirmation'
|
||||
]); ?>
|
||||
</div>
|
||||
</div>
|
||||
<?php echo template::mail('installMail', [
|
||||
'autocomplete' => 'off',
|
||||
'label' => 'Adresse mail'
|
||||
]); ?>
|
||||
<div class="row">
|
||||
<div class="col6">
|
||||
<?php echo template::text('installFirstname', [
|
||||
'autocomplete' => 'off',
|
||||
'label' => 'Prénom'
|
||||
]); ?>
|
||||
</div>
|
||||
<div class="col6">
|
||||
<?php echo template::text('installLastname', [
|
||||
'autocomplete' => 'off',
|
||||
'label' => 'Nom'
|
||||
]); ?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
<li class="accordion-item">
|
||||
<h3 class="accordion-title">Options avancées</h3>
|
||||
<div class="accordion-content">
|
||||
<div class="row">
|
||||
<div class="col12">
|
||||
<?php echo template::checkbox('installDefaultData',true , 'Ne pas charger l\'exemple de site (utilisateurs avancés)', [
|
||||
'checked' => false
|
||||
]);
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col3">
|
||||
<?php echo template::select('installProxyType', $module::$proxyType, [
|
||||
'label' => 'Type de proxy',
|
||||
'selected' => $this->getData(['config', 'proxyType'])
|
||||
]); ?>
|
||||
</div>
|
||||
<div class="col6">
|
||||
<?php echo template::text('installProxyUrl', [
|
||||
'label' => 'Adresse du proxy',
|
||||
'placeholder' => 'cache.proxy.fr'
|
||||
]); ?>
|
||||
</div>
|
||||
<div class="col3">
|
||||
<?php echo template::text('installProxyPort', [
|
||||
'label' => 'Port du proxy',
|
||||
'placeholder' => '6060'
|
||||
]); ?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col12">
|
||||
<?php echo template::select('installTheme', $module::$themes, [
|
||||
'label' => 'Thème'
|
||||
]); ?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
<div class="row">
|
||||
<div class="col3 offset9">
|
||||
<?php echo template::submit('installSubmit', [
|
||||
|
|
|
|||
|
|
@ -501,12 +501,12 @@ class plugin extends common {
|
|||
|
||||
// Mise en forme du tableau des modules employés dans les pages
|
||||
// Avec les commandes de sauvegarde et de restauration
|
||||
//foreach ($pagesInfos as $keyi18n=>$valueI18n) {
|
||||
|
||||
$keyi18n = self::$i18n;
|
||||
$valueI18n = $pagesInfos[self::$i18n];
|
||||
foreach ($valueI18n as $keyPage=>$value) {
|
||||
// Construire le tableau de sortie
|
||||
$keyi18n = self::$i18n;
|
||||
$valueI18n = $pagesInfos[self::$i18n];
|
||||
foreach ($valueI18n as $keyPage=>$value) {
|
||||
if (isset($infoModules[$pagesInfos[$keyi18n][$keyPage]['moduleId']])) {
|
||||
// Co[nstruire le tableau de sortie
|
||||
self::$modulesData[] = [
|
||||
$infoModules[$pagesInfos[$keyi18n][$keyPage]['moduleId']] ['realName'],
|
||||
$pagesInfos[$keyi18n][$keyPage]['moduleId'],
|
||||
|
|
@ -524,11 +524,10 @@ class plugin extends common {
|
|||
'class' => 'buttonRed dataDelete',
|
||||
'help' => 'Détacher le module de la page',
|
||||
])
|
||||
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
//}
|
||||
|
||||
// Valeurs en sortie
|
||||
$this->addOutput([
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
display: inline-block;
|
||||
transition: 0.3s;
|
||||
border-radius: 10px 10px 0px 0px;
|
||||
width: 160px;
|
||||
width: 200px;
|
||||
margin: 0 1px;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -170,43 +170,6 @@ class search extends common {
|
|||
// Variable de travail, on conserve la variable globale pour l'affichage du résultat
|
||||
$motclef = self::$motclef;
|
||||
|
||||
// Traduction du mot clé si le script Google Trad est actif
|
||||
// Le multi langue est sélectionné
|
||||
if ( $this->getData(['config','i18n','scriptGoogle']) === true
|
||||
AND
|
||||
// et la traduction de la langue courante est automatique
|
||||
( isset($_COOKIE['googtrans'])
|
||||
AND ( $this->getData(['config','i18n', substr($_COOKIE['googtrans'],4,2)]) === 'script'
|
||||
// Ou traduction automatique
|
||||
OR $this->getData(['config','i18n','autoDetect']) === true )
|
||||
)
|
||||
// Cas des pages d'administration
|
||||
// Pas connecté
|
||||
AND ( $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')
|
||||
// Ou connecté avec option active
|
||||
OR ($this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD')
|
||||
AND $this->getData(['config','i18n','admin']) === true
|
||||
)
|
||||
)
|
||||
AND !isset($_COOKIE['ZWII_I18N_SITE'])
|
||||
)
|
||||
{
|
||||
// Découper la chaîne
|
||||
$f = str_getcsv($motclef, ' ');
|
||||
// Supprimer les espaces et les guillemets
|
||||
$f = str_replace(' ','',$f);
|
||||
$f = str_replace('"','',$f);
|
||||
// Lire le cookie GoogTrans et déterminer les langues cibles
|
||||
$language['origin'] = substr($_COOKIE['googtrans'],4,2);
|
||||
$language['target'] = substr($_COOKIE['googtrans'],1,2);
|
||||
if ($language['target'] !== $language['origin']) {
|
||||
foreach ($f as $key => $value) {
|
||||
$e = $this->translate($language['origin'],$language['target'],$value);
|
||||
$motclef = str_replace($value,$e,$motclef);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Suppression des mots < 3 caractères et des articles > 2 caractères de la chaîne $motclef
|
||||
$arraymotclef = explode(' ', $motclef);
|
||||
$motclef = '';
|
||||
|
|
|
|||
Loading…
Reference in New Issue