Changeset 90350 in spip-zone

Timestamp:

Jun 19, 2015, 4:40:20 AM (6 years ago)

Author:

jack@…

Message:

La configuration commence à fonctionner dans le privé, mais elle n'est toujours pas prise en compte dans le public... Why ?
Nettoyage:
On commente "define('PLUGIN_Name', "pgn4spip");", c'est défini par défaut, non, le nom du plugin ?
On commente "ReadCurrentConfiguration?($optValue);" qui ne semble pas utilisé en SPIP 3, sauf dans le fichier pgn4spip_conf.php

Location:

_plugins_/pgn4spip/trunk

Files:

• formulaires/configurer_pgn4spip.php (modified) (1 diff)
• modeles/pgn.html (modified) (1 diff)
• paquet.xml (modified) (1 diff)
• pgn4spip_conf.php (modified) (3 diffs)
• pgn4spip_fonctions.php (modified) (1 diff)
• pgn4spip_options.php (modified) (1 diff)

_plugins_/pgn4spip/trunk/formulaires/configurer_pgn4spip.php

@@ -13 +13 @@
  **********************************************************************************/
 if (!defined("_ECRIRE_INC_VERSION")) return; // No direct access allowed to this file
-define('PLUGIN_Name', "pgn4spip");
+//define('PLUGIN_Name', "pgn4spip");
 define('PLUGIN_Form', "configurer_" . PLUGIN_Name);
-define('PATH_Conf', PLUGIN_Name . '/' . PLUGIN_Name . '_conf.php');
+define('PATH_Conf', find_in_path(pgn4spip_fonctions.php));
 if (!function_exists('InitOptionValueByDefault')) require _DIR_PLUGINS . PATH_Conf;
 

_plugins_/pgn4spip/trunk/modeles/pgn.html

@@ -27 +27 @@
 <BOUCLE_pgn(DOCUMENTS){id_document=#ENV{id}}{extension==pgn}{tout}>
 <?php
-define('PLUGIN_Name', "pgn4spip");
+//define('PLUGIN_Name', "pgn4spip");
 define('PATH_Fonctions', find_in_path(pgn4spip_fonctions.php));
-if (!function_exists('pgn4spip_prepropre')) require _DIR_PLUGINS . PATH_Fonctions;
+if (!function_exists('pgn4spip_prepropre')) require find_in_path(pgn4spip_fonctions);
+
 
 define('QUOTE_HTML', '&quot;'); // '"' in HTML

_plugins_/pgn4spip/trunk/paquet.xml

@@ -2 +2 @@
         prefix="pgn4spip"
         categorie="divers"
-        version="2.61.6"
+        version="2.61.7"
         etat="test"
         compatibilite="[3.0.0;3.1.*]"

_plugins_/pgn4spip/trunk/pgn4spip_conf.php

@@ -45 +45 @@
                 foreach ($optValue as $optShort => $valueByDefault)
                 {
-                        $valueFromConf = lire_config(PLUGIN_Name . '/cfg_' . $optShort, $valueByDefault);
+                        $valueFromConf = lire_config('pgn4spip/cfg_' . $optShort, $valueByDefault);
                         if (IsOptionValueOk($optShort, $valueFromConf, $valueByDefault))
                         {
@@ -51 +51 @@
                         }
                 }                       
-                $isManual = lire_config(PLUGIN_Name . '/cfg_isManual');
+                $isManual = lire_config('pgn4spip/cfg_isManual');
                 if ($isManual != '')
                 {
-                        $optValue['fh'] = lire_config(PLUGIN_Name . '/cfg_height_site', ""); // height of the module
+                        $optValue['fh'] = lire_config('pgn4spip/cfg_height_site', ""); // height of the module
                 }
         }
@@ -135 +135 @@
         return false;
 }
-?>

_plugins_/pgn4spip/trunk/pgn4spip_fonctions.php

@@ -36 +36 @@
 if (!defined("_ECRIRE_INC_VERSION")) return; // No direct access allowed to this file
 
-define('PLUGIN_Name', "pgn4spip");
-define('PATH_Conf', 'find_in_path(pgn4spip_conf.php)');
-if (!function_exists('ReadCurrentConfiguration')) require _DIR_PLUGIN_PGN4SPIP . PATH_Conf;
+//define('PLUGIN_Name', "pgn4spip");
+//define('PATH_Conf', 'find_in_path(pgn4spip_conf.php)');
+//if (!function_exists('ReadCurrentConfiguration')) require _DIR_PLUGIN_PGN4SPIP . PATH_Conf;
 
 define('TAG_pgn', "[pP][gG][nN]"); // pgn or PGN

_plugins_/pgn4spip/trunk/pgn4spip_options.php

@@ -18 +18 @@
 
 // Init $optValue with default values of options overriden with the current configuration
-ReadCurrentConfiguration($optValue); // read from the config form
+//ReadCurrentConfiguration($optValue); // read from the config form