Changeset 757 for branches/Ver3.0/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php

Timestamp:

May 23, 2011, 3:03:57 PM (13 years ago)

Author:

toemon

Message:

ConfigFromXoopsクラスを廃止し、modInfoクラスを使用するように変更
WP2.2以下で使用するテンプレートold_templateの廃止

File:

• branches/Ver3.0/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php (modified) (10 diffs)

branches/Ver3.0/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php

@@ -40 +40 @@
 
 function xpress_is_multiblog() {
-        global $xoops_config;
-        
         if (function_exists('is_multisite') && is_multisite()) return true;
         return false;
@@ -56 +54 @@
 
 function xpress_is_wp_version($operator='==',$comp_version){
-        global $xoops_config;
-        return version_compare($xoops_config->wp_version, $comp_version, $operator);
+        global $modInfo;
+        return version_compare($modInfo->get_wp_version(), $comp_version, $operator);
 }
 
@@ -184 +182 @@
 function xpress_credit($args ='')
 {
-        global $wp_version , $xoops_config;
-        if ($xoops_config->is_wpmu) {
-                global $wpmu_version;
-        }
+        global $wp_version , $modInfo;
         
         $defaults = array(
@@ -197 +192 @@
         extract( $r );
         
-        $xpress_version = $xoops_config->module_version;
-        $xpress_codename = $xoops_config->module_codename;
+        $xpress_version = $modInfo->get_module_version();
+        $xpress_codename = $modInfo->get_module_codename();
         if ($no_link){
-                if ($xoops_config->is_wpmu) {
-                        $output = 'XPressMU Ver.' . sprintf('%.2f %s',$xpress_version,$xpress_codename);
-                        $output .= '(included WordPress MU ' . $wpmu_version. ')';
+                $output = 'XPressME Ver.' . sprintf('%.2f %s',$xpress_version,$xpress_codename);
+                if (strstr($wp_version,'ME')){
+                        $output .= '(included WordPress ' . $wp_version . ')';
                 } else {
-                        $output = 'XPressME Ver.' . sprintf('%.2f %s',$xpress_version,$xpress_codename);
-                        if (strstr($wp_version,'ME')){
-                                $output .= '(included WordPress ' . $wp_version . ')';
-                        } else {
-                                $output .= '(included WordPress ' . $wp_version . ')';
-                        }
-                }
-        } else {
-                if ($xoops_config->is_wpmu) {
-                        $output = '<a href="http://ja.xpressme.info"'. " target='_blank'" . '>XPressMU Ver.' . sprintf('%.2f %s',$xpress_version,$xpress_codename) .'</a>';
-                        $output .= '(included <a href="http://mu.wordpress.org/" title="Powered by WordPress"'." target='_blank'". '>WordPress MU ' . $wpmu_version . '</a>)';
+                        $output .= '(included WordPress ' . $wp_version . ')';
+                }
+        } else {
+                $output = '<a href="http://ja.xpressme.info"'. " target='_blank'" . '>XPressME Ver.' . sprintf('%.2f %s',$xpress_version,$xpress_codename) .'</a>';
+                if (strstr($wp_version,'ME')){
+                        $output .= '(included <a href="http://wpme.sourceforge.jp/" title="Powered by WordPress"'." target='_blank'". '>WordPress ' . $wp_version . '</a>)';
                 } else {
-                        $output = '<a href="http://ja.xpressme.info"'. " target='_blank'" . '>XPressME Ver.' . sprintf('%.2f %s',$xpress_version,$xpress_codename) .'</a>';
-                        if (strstr($wp_version,'ME')){
-                                $output .= '(included <a href="http://wpme.sourceforge.jp/" title="Powered by WordPress"'." target='_blank'". '>WordPress ' . $wp_version . '</a>)';
-                        } else {
-                                $output .= '(included <a href="http://wordpress.org/" title="Powered by WordPress"'." target='_blank'". '>WordPress ' . $wp_version . '</a>)';
-                        }
+                        $output .= '(included <a href="http://wordpress.org/" title="Powered by WordPress"'." target='_blank'". '>WordPress ' . $wp_version . '</a>)';
                 }
         }               
@@ -664 +649 @@
 function xpress_post_new_link($args ='')
 {
-        global $xoops_config;
+        global $modInfo;
         
         $defaults = array(
@@ -846 +831 @@
 
 function xpress_get_calendar($args = '') {
-        global $wpdb, $m, $monthnum, $year, $wp_locale, $posts , $xoops_config;
+        global $wpdb, $m, $monthnum, $year, $wp_locale, $posts , $modInfo;
 
         $defaults = array(
@@ -1035 +1020 @@
 
 function xpress_create_new_blog_link($args ='' ) {
-        global $xoops_config;
+        global $modInfo;
 
         global $current_user;
@@ -1058 +1043 @@
 
 function xpress_create_new_blog() {
-        global $xoops_config;
+        global $modInfo;
         global $current_user;
         $ret = array();
@@ -1070 +1055 @@
                         case 'all':
                         case 'blog':
-                                $ret['url'] = $xoops_config->module_url . '/wp-signup.php';
+                                $ret['url'] = $modInfo->get_module_url() . '/wp-signup.php';
                                 $ret['menu_url'] = 'wp-signup.php';
                                 $ret['title'] = __('Create New Blog','xpressme');
@@ -1083 +1068 @@
 }
 function xpress_primary_blog_link() {
-        global $xoops_config;
+        global $modInfo;
         global $current_user;
         global $blog_id;