Changeset 9970 in spip-zone

Timestamp:

Feb 28, 2007, 5:35:32 PM (14 years ago)

Author:

cedric@…

Message:

"compatibilite 1.9.2 et repertoires"

Location:

_plugins_/_stable_/phpmyvisites

Files:

• core/include/global.php (modified) (1 diff)
• exec/phpmv.php (modified) (4 diffs)
• phpmv_boutons.php (modified) (2 diffs)
• phpmv_fonctions.php (modified) (1 diff)
• themes/default/css/styles.php (modified) (1 diff)

_plugins_/_stable_/phpmyvisites/core/include/global.php

@@ -83 +83 @@
 
 // directories
-define('DIR_IMG_THEMES', _DIR_PLUGIN_PHPMV . '/themes/default/images/');
-define('DIR_IMG_BROWSERS', _DIR_PLUGIN_PHPMV . '/images/browsers');
-define('DIR_IMG_OS',       _DIR_PLUGIN_PHPMV . '/images/os');
-define('DIR_IMG_PLUGINS',  _DIR_PLUGIN_PHPMV . '/images/plugins');
-define('DIR_IMG_LOGOS',  _DIR_PLUGIN_PHPMV . '/images/logos');
-define('DIR_IMG_COUNTRIES_FLAGS', _DIR_PLUGIN_PHPMV . '/images/countries_flags');
-define('DIR_IMG_SCREENS', _DIR_PLUGIN_PHPMV . '/images/screens');
+define('DIR_IMG_THEMES', _DIR_PLUGIN_PHPMV . 'themes/default/images/');
+define('DIR_IMG_BROWSERS', _DIR_PLUGIN_PHPMV . 'images/browsers');
+define('DIR_IMG_OS',       _DIR_PLUGIN_PHPMV . 'images/os');
+define('DIR_IMG_PLUGINS',  _DIR_PLUGIN_PHPMV . 'images/plugins');
+define('DIR_IMG_LOGOS',  _DIR_PLUGIN_PHPMV . 'images/logos');
+define('DIR_IMG_COUNTRIES_FLAGS', _DIR_PLUGIN_PHPMV . 'images/countries_flags');
+define('DIR_IMG_SCREENS', _DIR_PLUGIN_PHPMV . 'images/screens');
 define('LANGS_PATH', INCLUDE_PATH . '/langs');
 define('DIR_IMG_MAPS', INCLUDE_PATH . '/images/maps');

_plugins_/_stable_/phpmyvisites/exec/phpmv.php

@@ -21 +21 @@
  */
 
-$p=explode(basename(_DIR_PLUGINS)."/",str_replace('\\','/',realpath(dirname(dirname(__FILE__)))));
-define('_DIR_PLUGIN_PHPMV',(_DIR_PLUGINS.end($p)));
+if (!defined('_DIR_PLUGIN_PHPMV')){
+        $p=explode(basename(_DIR_PLUGINS)."/",str_replace('\\','/',realpath(dirname(dirname(__FILE__)))));
+        define('_DIR_PLUGIN_PHPMV',(_DIR_PLUGINS.end($p)).'/');
+}
 
 function verif_install(){
-        // gestion de l'install
-        if (!is_dir(_DIR_SESSIONS."phpmvconfig")){
-                sous_repertoire(_DIR_SESSIONS, "phpmvconfig");
-        }
-        if (!is_dir(_DIR_SESSIONS."phpmvdatas")){
-                sous_repertoire(_DIR_SESSIONS, "phpmvdatas");
-        }
-
-        if (@file_exists(_DIR_SESSIONS."phpmvconfig/config.php"))
+        // gestion de l'install et repertoires, selon les versions
+        if (defined('_DIR_TMP')){
+                define('_PHPMV_DIR_DATA',realpath(_DIR_TMP . "phpmvdatas"));
+                if (!is_dir(_DIR_TMP."phpmvdatas")){
+                        sous_repertoire(_DIR_TMP, "phpmvdatas");
+        }
+        else {
+                define('_PHPMV_DIR_DATA',realpath(_DIR_SESSIONS . "phpmvdatas"));
+                if (!is_dir(_DIR_SESSIONS."phpmvdatas")){
+                        sous_repertoire(_DIR_SESSIONS, "phpmvdatas");
+        }
+        if (defined('_DIR_ETC')){
+                if (!is_dir(_DIR_ETC."phpmvconfig"))
+                        sous_repertoire(_DIR_ETC, "phpmvconfig");
+                if (is_dir(_DIR_ETC."phpmvconfig"))
+                        define('_PHPMV_DIR_CONFIG',realpath(_DIR_ETC . "phpmvconfig"));
+        }
+        if (!defined('_PHPMV_DIR_CONFIG')){
+                define('_PHPMV_DIR_CONFIG',realpath(_DIR_SESSIONS . "phpmvconfig"));
+                if (!is_dir(_DIR_SESSIONS."phpmvconfig")){
+                        sous_repertoire(_DIR_SESSIONS, "phpmvconfig");
+        }
+
+        if (@file_exists(_PHPMV_DIR_CONFIG."config.php"))
                 return;
 
-        if (lire_fichier('inc_connect.php',$connect) && preg_match(',spip_connect_db\(([^\)]*)\),i',$connect,$r)){
+        if (!defined('_FILE_CONNECT')){
+                define('_FILE_CONNECT',
+                  (@is_readable($f = _DIR_RESTREINT . 'inc_connect.php') ? $f
+                :       (@is_readable($f = _DIR_RESTREINT . 'inc_connect.php3') ? $f
+                :       false)));
+        }
+        if (lire_fichier(_FILE_CONNECT,$connect) && preg_match(',spip_connect_db\(([^\)]*)\),i',$connect,$r)){
                 $pars = explode(',',$r[1]);
                 $host = substr($pars[0],1,strlen($pars[0])-2);
@@ -62 +85 @@
 );
 ?".'>';
-                ecrire_fichier(_DIR_SESSIONS."phpmvconfig/site_info.php",$conf);
+                ecrire_fichier(_PHPMV_DIR_CONFIG."/site_info.php",$conf);
                 $conf = '<'.'?php 
 $siteUrls = array ('."
@@ -71 +94 @@
 );
 ?".'>';
-                ecrire_fichier(_DIR_SESSIONS."phpmvconfig/site_urls.php",$conf);
+                ecrire_fichier(_PHPMV_DIR_CONFIG."/site_urls.php",$conf);
                 
                 return;
@@ -149 +172 @@
         
         verif_install();
-        define('_PHPMV_DIR_CONFIG',realpath(_DIR_SESSIONS . "phpmvconfig"));
-        define('_PHPMV_DIR_DATA',realpath(_DIR_SESSIONS . "phpmvdatas"));
         
         if (!isset($GLOBALS['meta']['PHPMyVisites_no_admin_stat'])){

_plugins_/_stable_/phpmyvisites/phpmv_boutons.php

@@ -2 +2 @@
 
 
-$p=explode(basename(_DIR_PLUGINS)."/",str_replace('\\','/',realpath(dirname(__FILE__))));
-define('_DIR_PLUGIN_PHPMV',(_DIR_PLUGINS.end($p)));
+if (!defined('_DIR_PLUGIN_PHPMV')){
+        $p=explode(basename(_DIR_PLUGINS)."/",str_replace('\\','/',realpath(dirname(__FILE__))));
+        define('_DIR_PLUGIN_PHPMV',(_DIR_PLUGINS.end($p)).'/');
+}
 
         function phpmv_ajouterBoutons($boutons_admin) {
@@ -19 +21 @@
                         else{
                                 $boutons_admin['statistiques_visites']->sousmenu["phpmv"]= new Bouton(
-                                "../"._DIR_PLUGIN_PHPMV."/img_pack/phpmv-logo.png",  // icone
+                                "../"._DIR_PLUGIN_PHPMV."img_pack/phpmv-logo.png",  // icone
                                 _L("PHPMyVisites") //titre
                                 );

_plugins_/_stable_/phpmyvisites/phpmv_fonctions.php

@@ -7 +7 @@
         ecrire_metas();
 }
-if (!defined(_DIR_PLUGIN_PHPMV)){
+if (!defined('_DIR_PLUGIN_PHPMV')){
         $p=explode(basename(_DIR_PLUGINS)."/",str_replace('\\','/',realpath(dirname(__FILE__))));
-        define('_DIR_PLUGIN_PHPMV',_DIR_PLUGINS.end($p));
+        define('_DIR_PLUGIN_PHPMV',(_DIR_PLUGINS.end($p)).'/');
 }
 if (!isset($GLOBALS['meta']['_DIR_PLUGIN_PHPMV']) OR $GLOBALS['meta']['_DIR_PLUGIN_PHPMV']!=_DIR_PLUGIN_PHPMV){

_plugins_/_stable_/phpmyvisites/themes/default/css/styles.php

@@ -596 +596 @@
 direction: $direction;
 text-align: $rightouleft;
-list-style-image: url(\""._DIR_PLUGIN_PHPMV."/themes/default/images/f3$direction.png\");
+list-style-image: url(\""._DIR_PLUGIN_PHPMV."themes/default/images/f3$direction.png\");
 }
 #menuadmin LI {