Changeset 84554 in spip-zone for _plugins_/acces_restreint

Timestamp:

Sep 10, 2014, 1:07:55 PM (7 years ago)

Author:

marcimat@…

Message:

Report de r84553 : Notices PHP en moins sur le formulaire de configuration des .htaccess . On passe par lire_config bien plus lisible du coup.

File:

• _plugins_/acces_restreint/branches/v3.8/formulaires/configurer_accesrestreint.php (modified) (3 diffs)

_plugins_/acces_restreint/branches/v3.8/formulaires/configurer_accesrestreint.php

@@ -1 +1 @@
 <?php
 /**
- * Plugin Acces Restreint 3.0 pour Spip 2.0
- * Licence GPL (c) 2006-2008 Cedric Morin
+ * Plugin Acces Restreint 3.0 pour Spip 3.0
+ * Licence GPL (c) 2006-2014 Cedric Morin
  *
  */
@@ -9 +9 @@
 
 function formulaires_configurer_accesrestreint_charger_dist(){
+        include_spip('inc/config');
         $valeurs = array(
-                'accesrestreint_proteger_documents' => isset($GLOBALS['meta']["accesrestreint_proteger_documents"])?$GLOBALS['meta']["accesrestreint_proteger_documents"]:'non',
-                'creer_htpasswd' => $GLOBALS['meta']["creer_htpasswd"]?$GLOBALS['meta']["creer_htpasswd"]:'non',
+                'accesrestreint_proteger_documents' => lire_config('accesrestreint_proteger_documents', 'non'),
+                'creer_htpasswd' => lire_config('creer_htpasswd', 'non'),
         );
-
         return $valeurs;
 }
@@ -20 +20 @@
 
         $champs = array('accesrestreint_proteger_documents','creer_htpasswd');
-        $current = $GLOBALS['meta']["accesrestreint_proteger_documents"];
 
-        foreach($champs as $c)
-                ecrire_meta($c,_request($c)=='oui'?'oui':'non');
+        include_spip('inc/config');
+        $old_config = lire_config('accesrestreint_proteger_documents');
+
+        foreach ($champs as $c) {
+                ecrire_config($c,_request($c)=='oui'?'oui':'non');
+        }
 
         // generer/supprimer les fichiers htaccess qui vont bien
         include_spip("inc/accesrestreint_documents");
-        accesrestreint_gerer_htaccess($GLOBALS['meta']["accesrestreint_proteger_documents"]=="oui");
+        $new_config = lire_config('accesrestreint_proteger_documents');
+        accesrestreint_gerer_htaccess($new_config == "oui");
 
         // si le reglage du htaccess a change, purger le cache
-        if ($GLOBALS['meta']["accesrestreint_proteger_documents"]!==$current) {
-                $purger = charger_fonction("purger","action");
+        if ($new_config !== $old_config) {
+                $purger = charger_fonction("purger", "action");
                 $purger("cache");
         }
 
-        return array('message_ok'=>_T('config_info_enregistree'),'editable'=>true);
+        return array('message_ok'=>_T('config_info_enregistree'), 'editable'=>true);
 }