Changeset 860 for trunk/xpressme_integration_kit

Timestamp:

Jun 15, 2016, 9:52:13 AM (9 years ago)

Author:

toemon

Message:

PHP7 対応　Fix #431
thx nao-pon

Location:

trunk/xpressme_integration_kit

Files:

• admin/index.php (modified) (3 diffs)
• class/xpressD3commentContent.class.php (modified) (5 diffs)
• include/memory_limit.php (modified) (4 diffs)
• include/oninstall.php (modified) (1 diff)
• wp-content/plugins/xpressme/include/d3forum_comment_disp.php (modified) (1 diff)
• wp-content/plugins/xpressme/include/d3forum_comment_synchro.php (modified) (4 diffs)
• wp-content/plugins/xpressme/include/user_sync_xoops.php (modified) (1 diff)
• wp-content/plugins/xpressme/xpressme_class.php (modified) (1 diff)

trunk/xpressme_integration_kit/admin/index.php

@@ -165 +165 @@
         include(dirname(__FILE__) . '/../wp-includes/version.php');
         require_once dirname(dirname( __FILE__ )).'/include/memory_limit.php' ;
+        $db =& XoopsDatabaseFactory::getDatabaseConnection();
 
         if ($is_report) {
@@ -173 +174 @@
                 if (defined('LIBXML_DOTTED_VERSION')) echo LIBXML_DOTTED_VERSION ; else echo "Can't detect.";
                 echo "<br />\n";;
-                echo "MySQL Version:   " . mysql_get_server_info() . "</text><br />";
+                echo "MySQL Version:   " . mysqli_get_server_info($db->conn) . "</text><br />";
                 echo "XOOPS Version:   " . XOOPS_VERSION . "</text><br />";
                 echo "XPressME Version:   " . $xoopsModule->getInfo('version') . ' ' . $xoopsModule->getInfo('codename') . "<br />\n";
@@ -247 +248 @@
                 if (defined('LIBXML_DOTTED_VERSION')) echo LIBXML_DOTTED_VERSION ; else echo "Can't detect.";
                 echo "</text><br />";
-                echo "<label>" . "<strong>MySQL Version:</strong>" . ":</label><text>" . mysql_get_server_info() . "</text><br />";
+                echo "<label>" . "<strong>MySQL Version:</strong>" . ":</label><text>" . mysqli_get_server_info($db->conn) . "</text><br />";
                 echo "<label>" . "<strong>XOOPS Version:</strong>" . ":</label><text>" . XOOPS_VERSION . "</text><br />";
                 echo "<label>" . "<strong>XPressME Version:</strong>" . ":</label><text>" . $xoopsModule->getInfo('version') . ' ' . $xoopsModule->getInfo('codename') . "</text><br />";

trunk/xpressme_integration_kit/class/xpressD3commentContent.class.php

@@ -9 +9 @@
                 {
                 //      include_once dirname(dirname(__FILE__)).'/include/common_functions.php' ;
-                        global $forum_id;
-                        
+                        if ( empty( $this->forum_id ) ) {
+                                global $forum_id;
+                                if ( !empty( $forum_id ) ) {
+                                        $this->forum_id = $forum_id;
+                                } else {
+                                        return parent::fetchSummary( $external_link_id );
+                                }
+                        }
+
                         $db =& XoopsDatabaseFactory::getDatabaseConnection() ;
-                        $myts =& MyTextsanitizer::getInstance() ;
+                        (method_exists('MyTextsanitizer', 'sGetInstance') && ($myts =& MyTextsanitizer::sGetInstance())) || ($myts =& MyTextsanitizer::getInstance()) ;
 
                         $module_handler =& xoops_gethandler( 'module' ) ;
@@ -24 +31 @@
                         
                         $xpress_prefix = preg_replace('/wordpress/','wp',$mydirname);
-                        $blog_info = $this->get_comment_blog_info($forum_id);
+                        $blog_info = $this->get_comment_blog_info($this->forum_id);
                         // query
                         $post_row = $db->fetchArray( $db->query( "SELECT * FROM ".$blog_info['mb_table_prefix']."posts WHERE ID=$post_id" ) ) ;
@@ -68 +75 @@
                 function canAddComment($external_link_id)
                 {
-                        global $forum_id;
                         global $post;
+
+                        if ( empty( $this->forum_id ) ) {
+                                global $forum_id;
+                                if ( !empty( $forum_id ) ) {
+                                        $this->forum_id = $forum_id;
+                                } else {
+                                        return false;
+                                }
+                        }
                         
                         if (is_object($post)){  // in wordpress 
@@ -92 +107 @@
                                         if( preg_match( '/[^0-9a-zA-Z_-]/' , $mydirname ) ) die( 'Invalid mydirname' ) ;
                                         
-                                        $blog_info = $this->get_comment_blog_info($forum_id);
+                                        $blog_info = $this->get_comment_blog_info($this->forum_id);
                                         $xpress_prefix = preg_replace('/wordpress/','wp',$mydirname);
 
@@ -176 +191 @@
                 function validate_id( $link_id )
                 {
-                        global $forum_id;
+                        if ( empty( $this->forum_id ) ) {
+                                global $forum_id;
+                                if ( !empty( $forum_id ) ) {
+                                        $this->forum_id = $forum_id;
+                                } else {
+                                        return false;
+                                }
+                        }
                         $post_id = intval( $link_id ) ;
                         $mydirname = $this->mydirname ;
                         $xpress_prefix = preg_replace('/wordpress/','wp',$mydirname);
-                        $blog_info = $this->get_comment_blog_info($forum_id);           
+                        $blog_info = $this->get_comment_blog_info($this->forum_id);
                         $db =& XoopsDatabaseFactory::getDatabaseConnection() ;
                         

trunk/xpressme_integration_kit/include/memory_limit.php

@@ -15 +15 @@
                 $has_xoops_db = (!empty($xoopsDB));
                 if (!$has_xoops_db) {
-                        $cn = mysql_connect($xoops_config->xoops_db_host, $xoops_config->xoops_db_user, $xoops_config->xoops_db_pass);
+                        $cn = mysqli_connect($xoops_config->xoops_db_host, $xoops_config->xoops_db_user, $xoops_config->xoops_db_pass);
                         if ($cn){
-                                $db_selected = mysql_select_db($xoops_config->xoops_db_name, $cn);
+                                $db_selected = mysqli_select_db($cn, $xoops_config->xoops_db_name);
                         }
                 }
@@ -31 +31 @@
                 } else {
                         if ($db_selected){
-                                if($result = mysql_query($module_sql)){
-                                        $row = mysql_fetch_assoc($result);
+                                if($result = mysqli_query($cn, $module_sql)){
+                                        $row = mysqli_fetch_assoc($result);
                                         $module_id = $row['mid'];
                                 }
@@ -48 +48 @@
                         } else {
                                 if ($db_selected){
-                                        if($result = mysql_query($config_sql)){
-                                                $row = mysql_fetch_assoc($result);
+                                        if($result = mysqli_query($cn, $config_sql)){
+                                                $row = mysqli_fetch_assoc($result);
                                                 $memory = $row['conf_value'];
                                         }
@@ -56 +56 @@
                 }
                 if (!$has_xoops_db) {
-                        mysql_close($cn);
+                        mysqli_close($cn);
                 }
                 

trunk/xpressme_integration_kit/include/oninstall.php

@@ -90 +90 @@
 
         $charset_collate = '';
-        if ( version_compare(mysql_get_server_info(), '4.1.0', '>=') ) {
+        if ( version_compare($wpdb->get_var('SELECT VERSION()'), '4.1.0', '>=') ) {
                 if ( ! empty($wpdb->charset) )
                         $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";

trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/d3forum_comment_disp.php

@@ -34 +34 @@
                 $xoops_db->query( "UPDATE ".get_xoops_prefix() . $dir_name."_forums SET forum_external_link_format='".$external_link_format."' WHERE forum_id= $forum_id" ) ;
                 
-                $d3comment =& new xpressD3commentContent( $dir_name , $xpress_dirname ) ;
+                $d3comment = new xpressD3commentContent( $dir_name , $xpress_dirname ) ;
 
                 $post_title = get_the_title();

trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/d3forum_comment_synchro.php

@@ -486 +486 @@
                                 $wp_res =       $xoops_db->query($wp_sql);
                                 if ($wp_res === false) die( '...Err. INSERT' . $wp_comments . '(' . $wp_sql . ')');
-                                $comment_ID = mysql_insert_id();
+                                $comment_ID = $xoops_db->insert_id;
                                 $wp_sql  = "UPDATE $wp_posts SET  comment_count = comment_count +1 WHERE ID = $comment_post_ID";
                                 $xoops_db->query($wp_sql);
@@ -696 +696 @@
                         $sql = "INSERT INTO ".$d3f_posts." SET $set4sql,pid=$reply_pid,topic_id=$topic_id,post_time=$post_time,poster_ip=$poster_ip";
                         $xoops_db->query($sql) ;
-                        $post_id = mysql_insert_id();
+                        $post_id = $xoops_db->insert_id;
                         wp_d3forum_sync_topic( $d3forum_dirname , $topic_id ) ;
                         
@@ -729 +729 @@
                         $sql = "INSERT INTO ".$d3f_topic." SET forum_id=$forum_id,topic_invisible=$topic_invisible,topic_external_link_id='".addslashes($topic_external_link_id)."'";
                         $xoops_db->query($sql) ;
-                        $topic_id = mysql_insert_id();
+                        $topic_id = $xoops_db->insert_id;
                         // create post in the topic
                         $sql = "INSERT INTO ".$d3f_posts." SET $set4sql,topic_id=$topic_id,post_time=$post_time,poster_ip=$poster_ip";
                         $xoops_db->query($sql) ;
-                        $post_id = mysql_insert_id();
+                        $post_id = $xoops_db->insert_id;
                         wp_d3forum_sync_topic( $d3forum_dirname , $topic_id , true , true ) ;
                         
@@ -1054 +1054 @@
         }
 
-        $xoops_db->query( "INSERT INTO ".$d3forum_prefix."post_histories SET post_id=$post_id, history_time=UNIX_TIMESTAMP(), data='".mysql_real_escape_string( serialize( $data ) )."'" ) ;
+        $xoops_db->query( $xoops_db->prepare( "INSERT INTO ".$d3forum_prefix."post_histories SET post_id=$post_id, history_time=UNIX_TIMESTAMP(), data=%s", serialize( $data ) ) ) ;
 }
 

trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/user_sync_xoops.php

@@ -267 +267 @@
                                 $wu_sql .=              " , '$user_regist_time', $user_status, '$user_display_name')";
                                 $xoops_db->query($wu_sql);
-                                $wp_user_id = mysql_insert_id();
+                                $wp_user_id = $xoops_db->insert_id;
                         } else {         // WP User ID has not been used yet. 
                                 $wu_sql  =      "INSERT INTO $db_xpress_users ";

trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme_class.php

@@ -367 +367 @@
                 $sql .=    "('$cat_id', '', '$title','a:0:{}')";
                 $xoops_db->query($sql);
-                $insert_forum_id = mysql_insert_id();
+                $insert_forum_id = $xoops_db->insert_id;
                 $sql  = "INSERT INTO $d3forum_forum_access_tbl ";
                 $sql .=    "(forum_id, groupid, can_post, can_edit, can_delete, post_auto_approved, is_moderator) ";