Changeset 583 for trunk/xpressme_integration_kit/include

Timestamp:

Apr 23, 2010, 10:49:33 AM (14 years ago)

Author:

toemon

Message:

xoops_mod_wordpress060_alphaの複製モジュールからのアップデート対応 fixes#335

Location:

trunk/xpressme_integration_kit/include

Files:

• data.inc.php (modified) (3 diffs)
• general_functions.php (modified) (2 diffs)
• oninstall.php (modified) (1 diff)
• onuninstall.php (modified) (1 diff)
• onupdate.php (modified) (6 diffs)
• search.php (modified) (1 diff)
• sitemap.plugin.php (modified) (1 diff)
• xpress_block_render.php (modified) (1 diff)

trunk/xpressme_integration_kit/include/data.inc.php

@@ -31 +31 @@
         global $xoopsDB;
 
-        if ($mydirname == 'wordpress'){
-                $wp_prefix = 'wp';
-        } else {
-                $wp_prefix = $mydirname;
-        }
+        $wp_prefix = preg_replace('/wordpress/','wp',$mydirname);
         require_once (XOOPS_ROOT_PATH . '/modules/'.$mydirname . '/include/general_functions.php');
         include(XOOPS_ROOT_PATH . '/modules/'.$mydirname . '/wp-includes/version.php');
@@ -163 +159 @@
 
         global $xoopsDB;
-
-        if ($mydirname == 'wordpress'){
-                $wp_prefix = 'wp';
-        } else {
-                $wp_prefix = $mydirname;
-        }
+        $wp_prefix = preg_replace('/wordpress/','wp',$mydirname);
         require_once (XOOPS_ROOT_PATH . '/modules/'.$mydirname . '/include/general_functions.php');
         $prefix = $xoopsDB->prefix($wp_prefix);
@@ -208 +199 @@
 
         global $xoopsDB;
-
-        if ($mydirname == 'wordpress'){
-                $wp_prefix = 'wp';
-        } else {
-                $wp_prefix = $mydirname;
-        }
+        $wp_prefix = preg_replace('/wordpress/','wp',$mydirname);
         
         require_once (XOOPS_ROOT_PATH . '/modules/'.$mydirname . '/include/general_functions.php');

trunk/xpressme_integration_kit/include/general_functions.php

@@ -13 +13 @@
                 if (empty($mydirname))
                         $mydirname = basename( dirname( dirname( __FILE__ ) ) ) ;
-
-                if ($mydirname == 'wordpress'){
-                        $wp_prefix = 'wp';
-                } else {
-                        $wp_prefix = $mydirname;
-                }
+                
+                $wp_prefix = preg_replace('/wordpress/','wp',$mydirname);
 
                 if (empty($xoops_db)) { // not load XPressME
@@ -56 +52 @@
                         $mydirname = basename( dirname( dirname( __FILE__ ) ) ) ;
 
-                if ($mydirname == 'wordpress'){
-                        $wp_prefix = 'wp';
-                } else {
-                        $wp_prefix = $mydirname;
-                }
+                $wp_prefix = preg_replace('/wordpress/','wp',$mydirname);
 
                 if (empty($xoops_db)) { // not load XPressME

trunk/xpressme_integration_kit/include/oninstall.php

@@ -86 +86 @@
         
 // create XPressME table
-        $xp_prefix = $mydirname;
-        if ($xp_prefix == 'wordpress'){
-                $xp_prefix = 'wp';
-        }
+        $xp_prefix = preg_replace('/wordpress/','wp',$mydirname);
         $views_table = XOOPS_DB_PREFIX . '_' . $xp_prefix .'_views' ;
 

trunk/xpressme_integration_kit/include/onuninstall.php

@@ -25 +25 @@
         $mid = $module->getVar('mid') ;
         
-        $xp_prefix = $mydirname;
-        if ($xp_prefix == 'wordpress'){
-                $xp_prefix = 'wp';
-        }
+        $xp_prefix = preg_replace('/wordpress/','wp',$mydirname);
         
         $xoops_prefix = $db->prefix();

trunk/xpressme_integration_kit/include/onupdate.php

@@ -81 +81 @@
 function xpress_put_siteurl($mydirname,$url){
                 global $xoopsModule;
-                $wp_prefix = $mydirname;
-                if ($wp_prefix == 'wordpress'){
-                        $wp_prefix = 'wp';
-                }
+                $wp_prefix = preg_replace('/wordpress/','wp',$mydirname);
                 $xoopsDB =& Database::getInstance();
                 $db_xpress_option = $xoopsDB->prefix($wp_prefix . '_options');
@@ -96 +93 @@
 function xpress_put_home($mydirname,$url){
                 global $xoopsModule;
-                $wp_prefix = $mydirname;
-                if ($wp_prefix == 'wordpress'){
-                        $wp_prefix = 'wp';
-                }
+                $wp_prefix = preg_replace('/wordpress/','wp',$mydirname);
                 $xoopsDB =& Database::getInstance();
                 $db_xpress_option = $xoopsDB->prefix($wp_prefix . '_options');
@@ -111 +105 @@
         function get_xpress_option($mydirname,$option_name){
                 global $xoopsModule;
-                $wp_prefix = $mydirname;
-                if ($wp_prefix == 'wordpress'){
-                        $wp_prefix = 'wp';
-                }
+                $wp_prefix = preg_replace('/wordpress/','wp',$mydirname);
                 $xoopsDB =& Database::getInstance();
                 $option_table = $xoopsDB->prefix($wp_prefix . '_options');
@@ -145 +136 @@
 function get_db_version($mydirname){
                 global $xoopsModule;
-                $wp_prefix = $mydirname;
-                if ($wp_prefix == 'wordpress'){
-                        $wp_prefix = 'wp';
-                }
+                $wp_prefix = preg_replace('/wordpress/','wp',$mydirname);
                 $xoopsDB =& Database::getInstance();
                 $db_xpress_option = $xoopsDB->prefix($wp_prefix . '_options');
@@ -192 +180 @@
 function xpress_table_make($module, $mydirname)
 {
-        $xp_prefix = $mydirname;
-        if ($xp_prefix == 'wordpress'){
-                $xp_prefix = 'wp';
-        }
         $db =& Database::getInstance() ;
         $mid = $module->getVar('mid') ;
 
 // XPressME orignal table update
-        $xp_prefix = $mydirname;
-        if ($xp_prefix == 'wordpress'){
-                $xp_prefix = 'wp';
-        }
+        $xp_prefix = preg_replace('/wordpress/','wp',$mydirname);
         $msgs = array();
 
@@ -307 +288 @@
                 
                 $xoopsDB =& Database::getInstance();
-                if ($mydirname == 'wordpress'){
-                        $xpress_prefix=  $xoopsDB->prefix('wp_');
-                } else {
-                        $xpress_prefix=  $xoopsDB->prefix($mydirname . '_');
-                }
+                $xpress_prefix = $xoopsDB->prefix(preg_replace('/wordpress/','wp',$mydirname) . '_');
                 $db_enhanced = $xpress_prefix . $table_name;
 

trunk/xpressme_integration_kit/include/search.php

@@ -20 +20 @@
                 $myts =& MyTextSanitizer::getInstance();
                 
-                $xp_prefix = $mydirname;
-                if ($xp_prefix == 'wordpress'){
-                        $xp_prefix = 'wp';
-                }
+                $xp_prefix = preg_replace('/wordpress/','wp',$mydirname);
                 if ($userid) {
                         $wp_uid = xoops_uid_to_wp_uid(intval($userid),$mydirname);

trunk/xpressme_integration_kit/include/sitemap.plugin.php

@@ -30 +30 @@
                 $disp_sub =@$sitemap_configs["show_subcategoris"];
                 
-                $prefix = $mydirname;
-                if ($prefix == 'wordpress') $prefix ='wp';
+                $prefix = preg_replace('/wordpress/','wp',$mydirname);
                 $prefix = $xoopsDB->prefix($prefix);
                 require_once (XOOPS_ROOT_PATH . '/modules/'.$mydirname . '/include/general_functions.php');

trunk/xpressme_integration_kit/include/xpress_block_render.php

@@ -84 +84 @@
                 if (is_null($wpdb)){
                         $xoopsDB =& Database::getInstance();
-                        $wp_prefix = $mydirname;
-                        if ($wp_prefix == 'wordpress') $wp_prefix = 'wp';
+                        $wp_prefix = preg_replace('/wordpress/','wp',$mydirname);
 
                         $module_tbl = $xoopsDB->prefix($wp_prefix).'_options';