Changeset 95 for trunk/include

Timestamp:

Mar 3, 2009, 8:33:23 PM (16 years ago)

Author:

toemon

Message:

XOOPS mainfile.phpのdefine文を事前に読み取りwp-config.phpのDB接続関係を生成することにより、XOOPSシステムを必要なときだけ呼び出す仕組みを作る。
およびイベント通知関係の修正（まだゲストのアクセス権限がないと駄目)

Location:

trunk/include

Files:

• config_from_xoops.class.php (modified) (2 diffs)
• include_xoops_define.php (deleted)
• notification.inc.php (modified) (1 diff)
• notification.inc.sub.php (deleted)
• notification.inc.sub.php.delete (added)
• request_url.php (added)
• set_cash_cookie_path.php (modified) (2 diffs)
• specfic_on_call_page.php (deleted)
• xpress_block_render.php (modified) (2 diffs)
• xpress_cache.php (modified) (3 diffs)
• xpress_debug_log.php (added)

trunk/include/config_from_xoops.class.php

@@ -26 +26 @@
         var $module_path;
         var $module_url;
+        var $module_db_prefix;
+        var $xoops_upload_path;
+        var $xoops_upload_url;
+        
         
         function __constructor()        //for PHP5
     {
         $this->ConfigFromXoops();
+       
     }
 
@@ -89 +94 @@
                         }
                 }
+                
+                //  define from /settings/definition.inc.php (XCL)  or /include/common.php(2016a-JP)
+                $this->xoops_upload_path = $this->xoops_root_path .'/uploads';
+                $this->xoops_upload_url = $this->xoops_url . '/uploads';
+                
+                if ($this->module_name == 'wordpress')
+                        $this->module_db_prefix =  $this->xoops_db_prefix  . '_wp_';
+                else
+                        $this->module_db_prefix =  $this->xoops_db_prefix  . '_' . $this->module_name . '_';
+                
     }
     

trunk/include/notification.inc.php

@@ -1 +1 @@
 <?php
-
-function xpress_notify_info( $category , $item_id )
+function xpress_notify( $category , $item_id )
 {
-        $db =& Database::getInstance() ;
         $mydirname = basename( dirname( dirname( __FILE__ ) ) ) ;
-
-
-//      $module_handler =& xoops_gethandler( 'module' ) ;
-//      $module =& $module_handler->getByDirname( $mydirname ) ;
 
         if( $category == 'global' ) {

trunk/include/set_cash_cookie_path.php

@@ -50 +50 @@
  */
 if ( !defined('COOKIEPATH') )
-        define('COOKIEPATH', preg_replace('|https?://[^/]+|i', '', XOOPS_URL . '/' ) );
+        define('COOKIEPATH', preg_replace('|https?://[^/]+|i', '', $xoops_config->xoops_url . '/' ) );
 
 /**
@@ -57 +57 @@
  */
 if ( !defined('SITECOOKIEPATH') )
-        define('SITECOOKIEPATH', preg_replace('|https?://[^/]+|i', '', XOOPS_URL . '/' ) );
+        define('SITECOOKIEPATH', preg_replace('|https?://[^/]+|i', '', $xoops_config->xoops_url  . '/' ) );
 
 /**

trunk/include/xpress_block_render.php

@@ -62 +62 @@
         function get_block_stylesheet_url($mydirname)
         {
-                $mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
+                global $xoops_config;
+                $mydirpath = $xoops_config->xoops_root_path . '/modules/' . $mydirname;
                 $select_theme = get_xpress_theme_name($mydirname);
                 $style_file = $mydirpath . '/wp-content/themes/' . $select_theme . '/blocks/style.css';
                 if (file_exists($style_file))
-                        return XOOPS_URL . '/modules/' .$mydirname . '/wp-content/themes/' . $select_theme . '/blocks/style.css';
+                        return $xoops_config->xoops_url . '/modules/' .$mydirname . '/wp-content/themes/' . $select_theme . '/blocks/style.css';
                 else    
-                        return XOOPS_URL . '/modules/' .$mydirname . '/wp-content/themes/xpress_default/blocks/style.css';
+                        return $xoops_config->xoops_url . '/modules/' .$mydirname . '/wp-content/themes/xpress_default/blocks/style.css';
         }
 
@@ -88 +89 @@
         function get_block_file_path($mydirname,$file_name)
         {
-                $mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
+                global $xoops_config;
+                $mydirpath = $xoops_config->xoops_root_path . '/modules/' . $mydirname;
                 $select_theme = get_xpress_theme_name($mydirname);
                 $block_file = $mydirpath . '/wp-content/themes/' . $select_theme . '/blocks/' . $file_name;
 
                 if (!file_exists($block_file))
-                        $block_file =  XOOPS_ROOT_PATH . '/modules/' .$mydirname . '/wp-content/themes/xpress_default/blocks/' . $file_name;
+                        $block_file =  $xoops_config->xoops_root_path . '/modules/' .$mydirname . '/wp-content/themes/xpress_default/blocks/' . $file_name;
                 return $block_file;
         }

trunk/include/xpress_cache.php

@@ -4 +4 @@
     function xpress_cache_read($mydirname,$collation_key)
     {
-                $cache_dir = XOOPS_ROOT_PATH . '/cache/';
+        global $xoops_config;
+                $cache_dir = $xoops_config->xoops_root_path . '/cache/';
                 $cache_time = 0;
         $filename = $cache_dir .$mydirname . '_' . $collation_key;
@@ -19 +20 @@
     function xpress_cache_write($mydirname,$collation_key,$content)
     {
-                $cache_dir = XOOPS_ROOT_PATH . '/cache/';
+                global $xoops_config;
+                $cache_dir = $xoops_config->xoops_root_path . '/cache/';
                 $cache_time = 0;
 
@@ -35 +37 @@
     function xpress_cache_clear($mydirname)
     {
-                $cache_dir = XOOPS_ROOT_PATH . '/cache/';
+                global $xoops_config;
+                $cache_dir = $xoops_config->xoops_root_path . '/cache/';
                 $cache_time = 0;
         if ($dh = opendir($cache_dir)) {