XPressME Integration Kit

Trac


Ignore:
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/wp-content/plugins/xpressme/include
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • branches/Ver3.0/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php

    r688 r757  
    4040 
    4141function xpress_is_multiblog() { 
    42         global $xoops_config; 
    43          
    4442        if (function_exists('is_multisite') && is_multisite()) return true; 
    4543        return false; 
     
    5654 
    5755function xpress_is_wp_version($operator='==',$comp_version){ 
    58         global $xoops_config; 
    59         return version_compare($xoops_config->wp_version, $comp_version, $operator); 
     56        global $modInfo; 
     57        return version_compare($modInfo->get_wp_version(), $comp_version, $operator); 
    6058} 
    6159 
     
    184182function xpress_credit($args ='') 
    185183{ 
    186         global $wp_version , $xoops_config; 
    187         if ($xoops_config->is_wpmu) { 
    188                 global $wpmu_version; 
    189         } 
     184        global $wp_version , $modInfo; 
    190185         
    191186        $defaults = array( 
     
    197192        extract( $r ); 
    198193         
    199         $xpress_version = $xoops_config->module_version; 
    200         $xpress_codename = $xoops_config->module_codename; 
     194        $xpress_version = $modInfo->get_module_version(); 
     195        $xpress_codename = $modInfo->get_module_codename(); 
    201196        if ($no_link){ 
    202                 if ($xoops_config->is_wpmu) { 
    203                         $output = 'XPressMU Ver.' . sprintf('%.2f %s',$xpress_version,$xpress_codename); 
    204                         $output .= '(included WordPress MU ' . $wpmu_version. ')'; 
     197                $output = 'XPressME Ver.' . sprintf('%.2f %s',$xpress_version,$xpress_codename); 
     198                if (strstr($wp_version,'ME')){ 
     199                        $output .= '(included WordPress ' . $wp_version . ')'; 
    205200                } else { 
    206                         $output = 'XPressME Ver.' . sprintf('%.2f %s',$xpress_version,$xpress_codename); 
    207                         if (strstr($wp_version,'ME')){ 
    208                                 $output .= '(included WordPress ' . $wp_version . ')'; 
    209                         } else { 
    210                                 $output .= '(included WordPress ' . $wp_version . ')'; 
    211                         } 
    212                 } 
    213         } else { 
    214                 if ($xoops_config->is_wpmu) { 
    215                         $output = '<a href="http://ja.xpressme.info"'. " target='_blank'" . '>XPressMU Ver.' . sprintf('%.2f %s',$xpress_version,$xpress_codename) .'</a>'; 
    216                         $output .= '(included <a href="http://mu.wordpress.org/" title="Powered by WordPress"'." target='_blank'". '>WordPress MU ' . $wpmu_version . '</a>)'; 
     201                        $output .= '(included WordPress ' . $wp_version . ')'; 
     202                } 
     203        } else { 
     204                $output = '<a href="http://ja.xpressme.info"'. " target='_blank'" . '>XPressME Ver.' . sprintf('%.2f %s',$xpress_version,$xpress_codename) .'</a>'; 
     205                if (strstr($wp_version,'ME')){ 
     206                        $output .= '(included <a href="http://wpme.sourceforge.jp/" title="Powered by WordPress"'." target='_blank'". '>WordPress ' . $wp_version . '</a>)'; 
    217207                } else { 
    218                         $output = '<a href="http://ja.xpressme.info"'. " target='_blank'" . '>XPressME Ver.' . sprintf('%.2f %s',$xpress_version,$xpress_codename) .'</a>'; 
    219                         if (strstr($wp_version,'ME')){ 
    220                                 $output .= '(included <a href="http://wpme.sourceforge.jp/" title="Powered by WordPress"'." target='_blank'". '>WordPress ' . $wp_version . '</a>)'; 
    221                         } else { 
    222                                 $output .= '(included <a href="http://wordpress.org/" title="Powered by WordPress"'." target='_blank'". '>WordPress ' . $wp_version . '</a>)'; 
    223                         } 
     208                        $output .= '(included <a href="http://wordpress.org/" title="Powered by WordPress"'." target='_blank'". '>WordPress ' . $wp_version . '</a>)'; 
    224209                } 
    225210        }                
     
    664649function xpress_post_new_link($args ='') 
    665650{ 
    666         global $xoops_config; 
     651        global $modInfo; 
    667652         
    668653        $defaults = array( 
     
    846831 
    847832function xpress_get_calendar($args = '') { 
    848         global $wpdb, $m, $monthnum, $year, $wp_locale, $posts , $xoops_config; 
     833        global $wpdb, $m, $monthnum, $year, $wp_locale, $posts , $modInfo; 
    849834 
    850835        $defaults = array( 
     
    10351020 
    10361021function xpress_create_new_blog_link($args ='' ) { 
    1037         global $xoops_config; 
     1022        global $modInfo; 
    10381023 
    10391024        global $current_user; 
     
    10581043 
    10591044function xpress_create_new_blog() { 
    1060         global $xoops_config; 
     1045        global $modInfo; 
    10611046        global $current_user; 
    10621047        $ret = array(); 
     
    10701055                        case 'all': 
    10711056                        case 'blog': 
    1072                                 $ret['url'] = $xoops_config->module_url . '/wp-signup.php'; 
     1057                                $ret['url'] = $modInfo->get_module_url() . '/wp-signup.php'; 
    10731058                                $ret['menu_url'] = 'wp-signup.php'; 
    10741059                                $ret['title'] = __('Create New Blog','xpressme'); 
     
    10831068} 
    10841069function xpress_primary_blog_link() { 
    1085         global $xoops_config; 
     1070        global $modInfo; 
    10861071        global $current_user; 
    10871072        global $blog_id; 
  • branches/Ver3.0/xpressme_integration_kit/wp-content/plugins/xpressme/include/d3forum_comment_synchro.php

    r616 r757  
    524524//  The content is reflected in the D3Forum comment when there is a change in the WordPress comment.  
    525525function wp_comment_sync_to_d3forum($comment_ID = 0,$sync_mode){ 
    526         global $xpress_config,$xoops_db,$xoops_config,$wpdb,$blog_id; 
     526        global $xpress_config,$xoops_db,$modInfo,$wpdb,$blog_id; 
    527527         
    528528        if (empty($blog_id)) $blog_id =1; 
    529529         
    530530        if (!is_d3forum_setting()) die('The setting of the D3Forum comment integration is wrong. '); 
    531         $mydirname = $xoops_config->module_name; 
     531        $mydirname = $modInfo->get_module_dirname(); 
    532532 
    533533        $d3f_forum_id = $xpress_config->d3forum_forum_id; 
  • branches/Ver3.0/xpressme_integration_kit/wp-content/plugins/xpressme/include/functions_for_wp_old.php

    r718 r757  
    11<?php 
    22// wp_login override for wp2.3 under 
    3 if ( !function_exists('wp_login') && version_compare($xoops_config->wp_version,'2.3', '<')) : 
     3if ( !function_exists('wp_login') && version_compare($modInfo->get_wp_version(),'2.3', '<')) : 
    44        function wp_login($username, $password, $already_md5 = false) { 
    55                global $wpdb, $error; 
     
    4343 
    4444// Under WP2.1 
    45 if (version_compare($xoops_config->wp_version,'2.1', '<')) : 
     45if (version_compare($modInfo->get_wp_version(),'2.1', '<')) : 
    4646        // ADD WP 2.1.0 
    4747        function the_modified_date($d = '') { 
     
    6060 
    6161// Under WP2.2 
    62 if (version_compare($xoops_config->wp_version,'2.2', '<')): 
     62if (version_compare($modInfo->get_wp_version(),'2.2', '<')): 
    6363        // Added WP2.2 wp_parse_args() 
    6464        function wp_parse_args( $args, $defaults = '' ) { 
     
    9595 
    9696// Under WP2.2.1 
    97 if (version_compare($xoops_config->wp_version,'2.2.1', '<')) : 
     97if (version_compare($modInfo->get_wp_version(),'2.2.1', '<')) : 
    9898        // Added WP2.2.1 wp_parse_str() 
    9999        function wp_parse_str( $string, &$array ) { 
     
    107107 
    108108// Under WP2.3 
    109 if (version_compare($xoops_config->wp_version,'2.3', '<')) : 
     109if (version_compare($modInfo->get_wp_version(),'2.3', '<')) : 
    110110        if ( !function_exists('wp_sanitize_redirect') ) : 
    111111        /** 
     
    167167 
    168168// Under WP2.5 
    169 if (version_compare($xoops_config->wp_version,'2.5', '<')) : 
     169if (version_compare($modInfo->get_wp_version(),'2.5', '<')) : 
    170170        // Added WP2.5 absint() 
    171171        function absint( $maybeint ) { 
     
    192192 
    193193// Under WP2.7 
    194 if (version_compare($xoops_config->wp_version,'2.6', '<')) : 
     194if (version_compare($modInfo->get_wp_version(),'2.6', '<')) : 
    195195        /** 
    196196         * Guess the URL for the site. 
     
    215215 
    216216// Under WP2.7 
    217 if (version_compare($xoops_config->wp_version,'2.7', '<')) : 
     217if (version_compare($modInfo->get_wp_version(),'2.7', '<')) : 
    218218        // Added WP2.7 separate_comments() 
    219219        function &separate_comments(&$comments) { 
     
    346346 
    347347// Under WP2.8 
    348 if (version_compare($xoops_config->wp_version,'2.8', '<')) : 
     348if (version_compare($modInfo->get_wp_version(),'2.8', '<')) : 
    349349        function _wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false ) { 
    350350                $string = (string) $string; 
  • branches/Ver3.0/xpressme_integration_kit/wp-content/plugins/xpressme/include/notify_functions.php

    r662 r757  
    3737function Notification_triggerEvent($force_reserve = false,$category, $item_id, $event, $extra_tags=array(), $user_list=array(), $omit_user_id=null) 
    3838{ 
    39         global $xoops_db,$xoops_config; 
     39        global $xoops_db,$modInfo; 
    4040        global $xoopsModule,$xoopsUser,$xoopsUserIsAdmin; 
    4141 
     
    5252                $_SERVER['REQUEST_METHOD'] = 'POST'; 
    5353        } 
    54 //      set_error_handler("xpress_error_handler"); 
    55 //      if ($xoops_config->is_impress != true){  // impress cms is error 
    56 //              if ( !defined("XOOPS_MAINFILE_INCLUDED")) { 
    57 //                      require_once $xoops_config->xoops_mainfile_path;        // load XOOPS System 
    58 //              } 
    59 //      } 
    6054        if (!$force_reserve && defined("XOOPS_MAINFILE_INCLUDED") ) { 
    6155                if ( defined("XPRESS_EVENT_DEBUG")) xpress_debug_message($message = 'call $notification_handler->triggerEvent'); 
     
    8579function do_CommentNotifications($commentID, $comment_post_ID) 
    8680{ 
    87         global $wpdb, $xoops_config , $xoops_db; 
     81        global $wpdb, $modInfo , $xoops_db; 
    8882 
    8983        $table_term_relationships = $wpdb->term_relationships; 
     
    139133function do_PostNotifications($post_id,$not_event) 
    140134{ 
    141         global $wpdb, $xoops_config, $xoops_db; 
     135        global $wpdb, $modInfo, $xoops_db; 
    142136 
    143137         // $not_event:         newpost,editpost ; $commentID, $comment_post_ID) 
  • branches/Ver3.0/xpressme_integration_kit/wp-content/plugins/xpressme/include/pluggable-override.php

    r348 r757  
    160160function wp_check_password($password, $hash, $user_id = '') { 
    161161        global $wp_hasher; 
    162         global $xoops_config,$xoops_db; 
     162        global $modInfo,$wpConfigInfo,$xoops_db; 
    163163 
    164164        // For attestation when password has been sent as hash value. (When having logged it in from Xoops and ImpressCMS) 
     
    174174         
    175175        // Password authentication for ImpressCMS  
    176         if($xoops_config->is_impress && function_exists('hash')){ 
    177                 $mainSalt = $xoops_config->xoops_db_salt; 
     176        if($modInfo->is_impress_cms() && function_exists('hash')){ 
     177                $mainSalt = $wpConfigInfo->get_db_salt(); 
    178178                // get user salt 
    179                 $xpress_user_db = $xoops_config->module_db_prefix . 'users'; 
    180                 $xoops_user_db = $xoops_config->xoops_db_prefix . '_users'; 
     179                $xpress_user_db = $wpConfigInfo->get_db_prefix() . 'users'; 
     180                $xoops_user_db = $wpConfigInfo->get_xoops_db_prefix() . 'users'; 
    181181                $login_name = $xoops_db->get_var("SELECT user_login FROM $xpress_user_db WHERE ID = $user_id"); 
    182182                $user_salt = $xoops_db->get_var("SELECT salt FROM $xoops_user_db WHERE uname = '$login_name'"); 
     
    236236if ( !function_exists('wp_redirect') ) : 
    237237function wp_redirect($location, $status = 302) { 
    238         global $is_IIS,$xoops_config,$action; 
     238        global $is_IIS,$modInfo,$action; 
    239239         
    240         if ($location == 'wp-login.php?loggedout=true') $location = $xoops_config->xoops_url.'/user.php?op=logout'; //xoops logout at wp logout 
    241         if ($location == 'wp-login.php?action=register') $location = $xoops_config->xoops_url."/register.php";  //wp-register to xoops register 
    242         if ($action == 'logout') $location = $xoops_config->xoops_url.'/user.php?op=logout'; //xoops logout at comment logout 
     240        if ($location == 'wp-login.php?loggedout=true') $location = $modInfo->get_xoops_url().'/user.php?op=logout'; //xoops logout at wp logout 
     241        if ($location == 'wp-login.php?action=register') $location = $modInfo->get_xoops_url()."/register.php";  //wp-register to xoops register 
     242        if ($action == 'logout') $location = $modInfo->get_xoops_url().'/user.php?op=logout'; //xoops logout at comment logout 
    243243 
    244244        $location = apply_filters('wp_redirect', $location, $status); 
  • branches/Ver3.0/xpressme_integration_kit/wp-content/plugins/xpressme/include/xpress_common_functions.php

    r658 r757  
    11<?php 
    2 global $xoops_config; 
    3 if (!is_object($xoops_config)){ // is call other modules 
    4         require_once dirname(dirname(dirname(dirname(dirname( __FILE__ ))))) .'/class/config_from_xoops.class.php' ; 
    5         $xoops_config = new ConfigFromXoops; 
     2global $modInfo; 
     3if (!is_object($modInfo)){ // is call other modules 
     4        require_once dirname(dirname(dirname(dirname(dirname( __FILE__ ))))) .'/class/modInfoClass.php' ; 
     5        $modInfo = new ConfigFromXoops; 
    66} 
    77 
     
    1414        global $xoops_db; 
    1515         
    16         $modules_db = get_xoops_prefix() . 'modules'; 
     16        $module_handler =& xoops_gethandler('module'); 
     17        $module =& $module_handler->getByDirname($mydirname); 
     18        $moduleID = $module->getVar('mid'); 
     19 
    1720        $config_db = get_xoops_prefix() . 'config'; 
    18  
    19         $moduleID = $xoops_db->get_var("SELECT mid FROM $modules_db WHERE dirname = '$module_dir'"); 
    2021        if (empty($moduleID)) return null; 
    2122        $conf_value = $xoops_db->get_var("SELECT conf_value FROM $config_db WHERE (conf_modid = $moduleID) AND (conf_name = '$config_name')"); 
     
    4647function get_xoops_prefix() 
    4748{ 
    48         global $xoops_config; 
    49         $ret =$xoops_config->xoops_db_prefix . '_'; 
     49        global $modInfo; 
     50        $ret = $modInfo->get_xoops_db_prefix(); 
    5051        return $ret; 
    5152} 
     
    5354function get_xoops_trust_path() 
    5455{ 
    55         global $xoops_config; 
    56         $ret =$xoops_config->xoops_trust_path; 
     56        global $modInfo; 
     57        $ret =$modInfo->get_xoops_trust_path(); 
    5758        return $ret; 
    5859} 
     
    6061function get_xoops_root_path() 
    6162{ 
    62         global $xoops_config; 
    63         $ret =$xoops_config->xoops_root_path; 
     63        global $modInfo; 
     64        $ret =$modInfo->get_xoops_root_path(); 
    6465        return $ret; 
    6566} 
     
    7273function get_xoops_url() 
    7374{ 
    74         global $xoops_config; 
    75         $ret =$xoops_config->xoops_url ; 
     75        global $modInfo; 
     76        $ret =$modInfo->get_xoops_url() ; 
    7677        return $ret; 
    7778} 
     
    7980function get_xpress_url() 
    8081{ 
    81         global $xoops_config; 
    82         $ret =$xoops_config->module_url ; 
     82        global $modInfo; 
     83        $ret =$modInfo->get_module_url() ; 
    8384        return $ret; 
    8485} 
     
    8687function get_xpress_modid() 
    8788{ 
    88         global $xoops_db; 
    89          
    90         $modulename = get_xpress_dir_name();     
    91         $sql = "SELECT mid FROM " . get_xoops_prefix() . "modules WHERE dirname = '$modulename'"; 
    92         $mid = $xoops_db->get_var($sql); 
    93         return $mid;     
     89        global $modInfo; 
     90         
     91        $modulename = get_xpress_dir_name(); 
     92        $mid = $modInfo->get_moduleID_ByDirname($modulename); 
     93        return $mid; 
    9494} 
    9595 
     
    369369function get_block_file_path($mydirname,$file_name) 
    370370{ 
    371         global $xoops_config, $xpress_config; 
    372         $mydirpath = $xoops_config->xoops_root_path . '/modules/' . $mydirname; 
     371        global $modInfo, $xpress_config; 
     372        $mydirpath = $modInfo->get_xoops_root_path() . '/modules/' . $mydirname; 
    373373        $select_theme = xpress_ThemeTemplate(get_xpress_theme_name($mydirname)); 
    374374        $xpress_default_theme = 'xpress_default'; 
  • branches/Ver3.0/xpressme_integration_kit/wp-content/plugins/xpressme/include/xpress_upgrade.php

    r748 r757  
    66 
    77function list_xpress_update( $update=null ) { 
    8         global $xoops_config,$xpress_config; 
    9          
    10         $xpress_version = $xoops_config->module_version . $xoops_config->module_codename; 
     8        global $modInfo,$xpress_config; 
     9         
     10        $xpress_version = $modInfo->get_module_full_version(); 
    1111        $lang = WPLANG; 
    1212         
     
    139139 
    140140function do_xpress_upgrade( $develop = false,$reinstall = false ) { 
    141         global $wp_filesystem,$xoops_config; 
     141        global $wp_filesystem,$modInfo; 
    142142 
    143143        if ( $reinstall ) 
     
    191191                show_message( __('Please update the module. ', 'xpressme') ); 
    192192                 
    193                 $update_url = $xoops_config->module_url .'/admin/update.php'; 
     193                $update_url = $modInfo->get_module_url() .'/admin/update.php'; 
    194194                show_message( '<strong>' . __('Actions:', 'xpressme') . '</strong> <a href="' . esc_url( $update_url ) . '">' . __('Go to Module Update', 'xpressme') . '</a>' ); 
    195195        } 
     
    216216 
    217217function xp_remote_get($url, $headers = ""){ 
    218         global $xoops_config; 
    219         $xpress_version = $xoops_config->module_version . $xoops_config->module_codename; 
    220  
    221         require_once( $xoops_config->module_path . '/wp-includes/class-snoopy.php'); 
     218        global $modInfo; 
     219        $xpress_version = $modInfo->get_module_full_version(); 
     220 
     221        require_once( $modInfo->get_module_path() . '/wp-includes/class-snoopy.php'); 
    222222 
    223223        // Snoopy is an HTTP client in PHP 
     
    263263function get_xpress_latest_version($check_url=null){ 
    264264        global $wp_version, $wpdb, $wp_local_package; 
    265         global $xoops_config; 
    266          
    267         $xpress_version = $xoops_config->module_version . $xoops_config->module_codename; 
     265        global $modInfo; 
     266         
     267        $xpress_version = $modInfo->get_module_full_version(); 
    268268        $lang = WPLANG; 
    269269        if(is_null($check_url)) 
     
    362362 
    363363        global $wp_version, $wpdb, $wp_local_package; 
    364         global $xoops_config; 
     364        global $modInfo; 
    365365 
    366366        $php_query_string = $_SERVER['QUERY_STRING']; 
    367         $xpress_version = $xoops_config->module_version . $xoops_config->module_codename; 
     367        $xpress_version = $modInfo->get_module_full_version(); 
    368368 
    369369        $latest = get_option('xpressme_latest_version'); 
     
    387387                $latest_version=$latest['latest_version']; 
    388388                $check_time=$latest['check_time']; 
    389                 $upgrade_page = $xoops_config->module_url . "/wp-admin/admin.php?page=upgrade_page"; 
     389                $upgrade_page = $modInfo->get_module_url() . "/wp-admin/admin.php?page=upgrade_page"; 
    390390 
    391391                if (version_compare($xpress_version, $latest_version, '<')) { 
Note: See TracChangeset for help on using the changeset viewer.