Changeset 757 for branches/Ver3.0/xpressme_integration_kit/include/add_xpress_process.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/include/add_xpress_process.php (modified) (10 diffs)

branches/Ver3.0/xpressme_integration_kit/include/add_xpress_process.php

@@ -14 +14 @@
 }
 function safe_site_url(){
-        global $xoops_config,$blog_id,$blogname;
+        global $modInfo,$blog_id,$blogname;
         
         if (is_xpress_index_page_call()){
@@ -35 +35 @@
                 $siteurl = get_option('siteurl');
                 $home = get_option('home');
-                $module_url = $xoops_config->module_url;
-                $module_name = $xoops_config->module_name;
+                $module_url = $modInfo->get_module_url();
+                $module_name = $modInfo->get_module_name();
                 $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
                 $guess_url = preg_replace('|/' . $module_name . '/.*|i', '/' . $module_name, $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
@@ -59 +59 @@
                 }
                 if ($site_url_error || $home_url_error){
-                        include $xoops_config->xoops_root_path ."/header.php";
+                        include $modInfo->get_xoops_header_path();
                         $form = '<form method="post" action="' . $_SERVER["REQUEST_URI"] . '">'."\n";
                         $form .= '<table cellspacing="1" cellpadding="1" border="0">';
@@ -94 +94 @@
                         $form .= '</form>' ."\n";
                         echo $form;
-                        include $xoops_config->xoops_root_path . '/footer.php';
+                        include $modInfo->get_xoops_footer_path();
                         exit();
                 }
@@ -103 +103 @@
                         $form .= '<input type="submit" value= "'.__('Permalink Settings').'" name="submit_redirect" />' ."\n";
                         $form .= '</form>' ."\n";
-                        include $xoops_config->xoops_root_path ."/header.php";
+                        include $modInfo->get_xoops_header_path();
                         echo $form;
-                        include $xoops_config->xoops_root_path . '/footer.php';
+                        include $modInfo->get_xoops_footer_path();
                         exit();
                 }
@@ -118 +118 @@
         require_once( dirname( __FILE__ ).'/wp_check.php');
         if (!is_wpdb_installed()){
-                include $xoops_config->xoops_root_path ."/header.php";
+                include $modInfo->get_xoops_header_path();
                 echo "<h2>Wordpress has not been installed yet. </h2>";
-                include $xoops_config->xoops_root_path . '/footer.php';
+                include $modInfo->get_xoops_footer_path();
                 exit();
         }
 
-        //$_SERVER['REQUEST_METHOD'] = 'POST' is
-        //When notifying by a private message, Notification_reserve_send();
-        //it is evaded that the data base becomes read-only as a result of the check on the referrer and the method. 
-/*
-        $request_method =  (isset($_SERVER['REQUEST_METHOD'])) ? $_SERVER['REQUEST_METHOD'] : '';
-        $_SERVER['REQUEST_METHOD'] = 'POST';
-        require_once $xoops_config->xoops_mainfile_path; //It is necessary to execute it for the user attestation before wp-settings.php. 
-        $_SERVER['REQUEST_METHOD'] = $request_method;
-*/
         xpress_set_memory_limmit(); // Set memory limmit.(Limmit Value from XPressMe modele config.)
         unset($offset);         //This Trap is provides the case where $offset is defined on the XOOPS side.
@@ -161 +152 @@
                 xpress_pulugin_activation('xpressme/xpressme.php');
                 // reloaded 
-                header('Location: ' . $xoops_config->module_url . '/');
+                header('Location: ' . $modInfo->get_module_url() . '/');
                 
                 $err_str = "The activation of the XPressME plugin was executed.<br />\n";
@@ -172 +163 @@
         ob_start();
                 $now_ob_level = ob_get_level();
-                if (version_compare($xoops_config->wp_version,'2.2', '<'))
-                        require_once dirname( __FILE__ ).'/old_template-loader.php' ;
-                else
-                        require_once( ABSPATH . WPINC . '/template-loader.php' );
+                require_once( ABSPATH . WPINC . '/template-loader.php' );
                 ob_end_flush_child($now_ob_level);
                 $wp_output = ob_get_contents();
@@ -202 +190 @@
         // This Function in xpressme plugin
         require_once( dirname( __FILE__ ).'/xpress_block_render.php' ); 
-        xpress_unnecessary_block_cache_delete($xoops_config->module_name);
+        xpress_unnecessary_block_cache_delete($modInfo->get_module_dirname());
         if (is_home()) {
-                xpress_block_cache_refresh($xoops_config->module_name);
+                xpress_block_cache_refresh($modInfo->get_module_dirname());
                 require_once( dirname( __FILE__ ).'/xpress_block_header.php' ); 
-                set_xpress_block_header($xoops_config->module_name);
+                set_xpress_block_header($modInfo->get_module_dirname());
         }
         if ( ini_get( 'register_globals' ) )
@@ -213 +201 @@
         exit();         // The return to wp-blog-header.php is stolen here
 }
-//if (is_admin_post_call()) require_once $xoops_config->xoops_mainfile_path;            // for Notification_triggerEvent
-//if (is_xpress_comments_post_call()) require_once $xoops_config->xoops_mainfile_path;  // for Notification_triggerEvent
 xpress_set_memory_limmit(); // Set memory limmit.(Limmit Value from XPressMe modele config.)
 require_once(ABSPATH.'wp-settings.php');