Changeset 757 for branches/Ver3.0/xpressme_integration_kit/include

Timestamp:

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

Author:

toemon

Message:

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

Location:

branches/Ver3.0/xpressme_integration_kit/include

Files:

• add_xpress_config.php (modified) (1 diff)
• add_xpress_process.php (modified) (10 diffs)
• data.inc.php (modified) (1 diff)
• memory_limit.php (modified) (1 diff)
• old_template-loader.php (deleted)
• request_url.php (modified) (1 diff)
• set_cash_cookie_path.php (modified) (3 diffs)
• wp_installer.php (modified) (2 diffs)
• xpress_block_header.php (modified) (2 diffs)
• xpress_block_render.php (modified) (9 diffs)
• xpress_cache.php (modified) (4 diffs)
• xpress_render.php (modified) (4 diffs)

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

@@ -20 +20 @@
 
 require_once dirname(dirname(dirname(dirname( __FILE__ )))).'/mainfile.php' ;
-require_once dirname( __FILE__ ).'/xoops3_define.php' ;
-get_xoops3_define();
 
 $_SERVER['REQUEST_METHOD'] = $request_method; //It returns it to former data. 
 
 require_once dirname( __FILE__ ).'/xpress_debug_log.php' ;
-require_once dirname(dirname( __FILE__ )).'/class/config_from_xoops.class.php' ;
-$xoops_config = new ConfigFromXoops;
-// TEST modInfo_class
+require_once dirname(dirname( __FILE__ )).'/class/wpConfigInfo_class.php' ;
+$wpConfigInfo = new wpConfigInfoClass;
 require_once dirname(dirname( __FILE__ )).'/class/modInfo_class.php' ;
-$mod_info = new modInfo;
+$modInfo = new modInfoClass;
 require_once dirname( __FILE__ ).'/set_cash_cookie_path.php' ;
 ?>

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');

branches/Ver3.0/xpressme_integration_kit/include/data.inc.php

@@ -31 +31 @@
         global $xoopsDB;
 
+        $module_handler =& xoops_gethandler('module');
+        $module =& $module_handler->getByDirname($mydirname);
+        $module_id = $module->getVar('mid');
+        
         $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');
-
-        $modules_table = $xoopsDB->prefix('modules');
-        $modSQL ="SELECT mid FROM " . $modules_table . " WHERE dirname LIKE '" . $mydirname . "'";
-        $modRes = $xoopsDB->query($modSQL, 0, 0);
-        $modRow = $xoopsDB->fetchArray($modRes);
-        $module_id = $modRow['mid'];
 
         $table_config = $xoopsDB->prefix('config');

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

@@ -2 +2 @@
         // Set XPressME memory limit
         function xpress_set_memory_limmit(){
-                global $xoops_config;
                 global $xoopsDB,$xoopsModule,$xoopsModuleConfig;
                 

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

@@ -13 +13 @@
  */
 function check_page_call($check_file =''){
-        global $xoops_config;   // not object at install
+        global $modInfo;        // not object at install
         if (empty($check_file)) return false;
         $xpress_page =  basename(dirname(dirname(__FILE__))) . '/' . $check_file;

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

@@ -1 +1 @@
 <?php
-$modname= $xoops_config->module_name;
-$modurl = $xoops_config->module_url;
+$modname= $modInfo->get_module_dirname();
+$modurl = $modInfo->get_module_url();
 $hash = md5($modurl);
 /**
@@ -50 +50 @@
  */
 if ( !defined('COOKIEPATH') )
-        define('COOKIEPATH', preg_replace('|https?://[^/]+|i', '', $xoops_config->xoops_url . '/' ) );
+        define('COOKIEPATH', preg_replace('|https?://[^/]+|i', '', $modInfo->get_xoops_url() . '/' ) );
 
 /**
@@ -57 +57 @@
  */
 if ( !defined('SITECOOKIEPATH') )
-        define('SITECOOKIEPATH', preg_replace('|https?://[^/]+|i', '', $xoops_config->xoops_url  . '/' ) );
+        define('SITECOOKIEPATH', preg_replace('|https?://[^/]+|i', '', $modInfo->get_xoops_url()  . '/' ) );
 
 /**

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

@@ -46 +46 @@
         //xpress
         global $wpdb,$wp_rewrite, $wp_queries, $table_prefix, $wp_db_version, $wp_roles, $wp_query,$wp_embed;
-        global $xoops_config;
         $msgs = array();
                 
@@ -107 +106 @@
         
         // Rewrite Option for Xpress
-        $xoops_config_tbl = XOOPS_DB_PREFIX . '_config' ;
-        $sql = "SELECT conf_value FROM  $xoops_config_tbl WHERE `conf_name` = 'default_TZ'";
+        $xoops_conf_tbl = XOOPS_DB_PREFIX . '_config' ;
+        $sql = "SELECT conf_value FROM  $xoops_conf_tbl WHERE `conf_name` = 'default_TZ'";
         $xoops_default_TZ = $wpdb->get_var($sql);
         update_option('gmt_offset', $xoops_default_TZ); 

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

@@ -4 +4 @@
         require_once dirname( __FILE__ ) .'/xml.php' ;
         require_once dirname( __FILE__ ) .'/xpress_cache.php' ;
-        global $xoops_config;
+        global $mod_info;
         
-        if (!is_object($xoops_config)){ // is call other modules
-                require_once dirname(dirname( __FILE__ )) .'/class/config_from_xoops.class.php' ;
-                $xoops_config = new ConfigFromXoops;
+        if (!is_object($mod_info)){ // is call other modules
+                require_once dirname(dirname( __FILE__ )) .'/class/modInfo_class.php' ;
+                $mod_info = new modInfoClass;
         }
         
@@ -46 +46 @@
         function get_block_stylesheet_url($mydirname)
         {
-                global $xoops_config;
-                $mydirpath = $xoops_config->xoops_root_path . '/modules/' . $mydirname;
+                global $mod_info;
+                $mydirpath = $mod_info->get_xoops_root_path() . '/modules/' . $mydirname;
                 $select_theme = get_xpress_theme_name($mydirname);
                 $style_file = $mydirpath . '/wp-content/themes/' . $select_theme . '/blocks/block_style.css';
                 if (file_exists($style_file))
-                        return $xoops_config->xoops_url . '/modules/' .$mydirname . '/wp-content/themes/' . $select_theme . '/blocks/block_style.css';
+                        return $mod_info->get_xoops_url() . '/modules/' .$mydirname . '/wp-content/themes/' . $select_theme . '/blocks/block_style.css';
                 else    
-                        return $xoops_config->xoops_url . '/modules/' .$mydirname . '/wp-content/themes/xpress_default/blocks/block_style.css';
+                        return $mod_info->get_xoops_url() . '/modules/' .$mydirname . '/wp-content/themes/xpress_default/blocks/block_style.css';
         }
 

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

@@ -4 +4 @@
         require_once dirname( __FILE__ ) .'/xml.php' ;
         require_once dirname( __FILE__ ) .'/xpress_cache.php' ;
-        global $xoops_config;
-        
-        if (!is_object($xoops_config)){ // is call other modules
-                require_once dirname(dirname( __FILE__ )) .'/class/config_from_xoops.class.php' ;
-                $xoops_config = new ConfigFromXoops;
+        global $modInfo;
+        
+        if (!is_object($modInfo)){ // is call other modules
+                require_once dirname(dirname( __FILE__ )) .'/class/modInfo_class.php' ;
+                $modInfo = new modInfoClass;
         }
         
@@ -68 +68 @@
         {
                 global $xoopsDB;
-                        $modules_tbl = $xoopsDB->prefix('modules');
-
-                        $sql = "SELECT mid FROM $modules_tbl WHERE dirname = '$mydirname'";
-                        $result =  $xoopsDB->query($sql, 0, 0);
-                        if ($xoopsDB->getRowsNum($result)  > 0){
-                                $row = $xoopsDB->fetchArray($result);
-                                $mid = $row['mid'];
-                        }
-                        return $mid;
+                $module_handler =& xoops_gethandler('module');
+                $module =& $module_handler->getByDirname($mydirname);
+                $module_id = $module->getVar('mid');
+                return $module_id;
         }
 
@@ -121 +116 @@
     function xpress_block_cache_found($mydirname,$block_name)
     {
-        global $xoops_config;
+        global $modInfo;
         
-                $cache_dir = $xoops_config->xoops_cache_path . '/';
+                $cache_dir = $modInfo->get_xoops_cache_path() . '/';
         $xml_name = $block_name . '.xml';
 
@@ -138 +133 @@
         function xpress_block_render($mydirname,$block_function_name,$options)
         {
-                global $wpdb,$xoops_config,$xoopsUserIsAdmin;
+                global $wpdb,$modInfo,$xoopsUserIsAdmin;
                 $func_file = $block_function_name;
                 $call_theme_function_name = str_replace(".php", "", $block_function_name);
@@ -183 +178 @@
                 
                 $tpl =& new XoopsTpl() ;
-                $tpl->template_dir = $xoops_config->module_path . '/templates';
+                $tpl->template_dir = $modInfo->get_module_templates_path();
                 if (!$tpl->template_exists($templates_file)){
-                        $src_file_path = $xoops_config->module_path . '/templates/' .$mydirname. '_' . str_replace(".php", ".html", $block_function_name);
+                        $src_file_path = $modInfo->get_module_templates_path() . '/' .$mydirname. '_' . str_replace(".php", ".html", $block_function_name);
                         $templates_file = add_xpress_tpl($mydirname,$templates_file,$src_file_path);
                 }
@@ -198 +193 @@
         
         function add_xpress_tpl($mydirname,$templates='',$src_file_path){
-                global $wpdb,$xoops_config , $xoops_db;
+                global $wpdb,$modInfo , $xoops_db;
                 
                 $mid = get_block_mid($mydirname);
@@ -210 +205 @@
                         $type = $temp_parm[0];
                 }
-                $temp_file_path = $xoops_config->module_path . '/templates/'. $filename;
+                $temp_file_path = $modInfo->get_module_templates_path() . '/'. $filename;
                 $pattern = '^' . $mydirname . '_';
                 if (preg_match('/' . $pattern . '/' , $filename, $match)){ // file prefix check
@@ -274 +269 @@
         function xpress_unnecessary_block_cache_delete($mydirname)
         {
-                global $xoops_db,$xoops_config;
+                global $xoops_db,$modInfo;
                 
                 $mid = get_xpress_modid();
@@ -289 +284 @@
                 $pattern = '(' . $pattern . ')';
                 
-                $cache_dir = $xoops_config->xoops_cache_path . '/';
+                $cache_dir = $modInfo->get_xoops_cache_path() . '/';
                 $cache_time = 0;
         if ($dh = opendir($cache_dir)) {

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

@@ -4 +4 @@
 if(!function_exists("cache_is_writable")):
         function cache_is_writable(){
-                global $xoops_config;
-                $cache_dir = $xoops_config->xoops_cache_path . '/';
+                global $modInfo;
+                $cache_dir = $modInfo->get_xoops_cache_path() . '/';
                 $filename = $cache_dir .'xpress_cache_test.txt';
                 $fp = @fopen($filename, "w");
@@ -30 +30 @@
     function xpress_cache_read($mydirname,$collation_key)
     {
-        global $xoops_config;
+        global $modInfo;
         
-        $cache_dir = $xoops_config->xoops_cache_path . '/';
+        $cache_dir = $modInfo->get_xoops_cache_path() . '/';
         $filename = $cache_dir .$mydirname . '_' . $collation_key;
         if (xpress_cache_found($filename)) {
@@ -45 +45 @@
     function xpress_cache_write($mydirname,$collation_key,$content)
     {
-                global $xoops_config;
-                $cache_dir = $xoops_config->xoops_cache_path . '/';
+                global $modInfo;
+                $cache_dir = $modInfo->get_xoops_cache_path() . '/';
                 $cache_time = 0;
 
@@ -62 +62 @@
     function xpress_cache_clear($mydirname)
     {
-                global $xoops_config;
-                $cache_dir = $xoops_config->xoops_cache_path . '/';
+                global $modInfo;
+                $cache_dir = $modInfo->get_xoops_cache_path() . '/';
                 $cache_time = 0;
         if ($dh = opendir($cache_dir)) {

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

@@ -182 +182 @@
 //rendering for the module header and the body
 function xpress_render($contents){
-        global $xoops_config;
+        global $modInfo;
         global $xoopsUser , $xoopsTpl,$xpress_config , $xoopsModule , $xoopsLogger, $xoopsConfig ; //for XOOPS
         
@@ -190 +190 @@
         xpress_remake_global_for_permlink();
         $mydirname = basename(dirname(dirname(__FILE__)));
-        include $xoops_config->xoops_root_path ."/header.php";
+        include $modInfo->get_xoops_header_path();
         $xoopsTpl->assign('xoops_breadcrumbs', $xoops_breadcrumbs);
         $xoopsTpl->assign('xoops_module_header', get_xpress_module_header($contents));
@@ -265 +265 @@
         //If notification_select.php is not executed in CMS other than XCL, the selector of in-line is not displayed. 
         if (is_object($xoopsModule) && $xoopsModule->getVar('hasnotification') == 1 && is_object($xoopsUser)) {
-                require_once $xoops_config->xoops_root_path . '/include/notification_select.php';
+                require_once $modInfo->get_xoops_root_path() . '/include/notification_select.php';
         }
         
@@ -272 +272 @@
         $xoopsTpl->clear_cache($templates_file);
         echo $xoopsTpl->fetch( $templates_file ) ;
-        include $xoops_config->xoops_root_path . '/footer.php';
+        include $modInfo->get_xoops_footer_path();
 }