Changeset 698

Timestamp:

Apr 20, 2011, 1:21:20 PM (13 years ago)

Author:

toemon

Message:

XPressME Integration Kit 自動アップグレード対応　fixes#375

Location:

trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include

Files:

• class-xpress-upgrader.php (added)
• update_xpress.php (added)
• xpress_upgrade.php (modified) (7 diffs)

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

@@ -1 +1 @@
 <?php
-function upgrade_page()
-{
+function  find_xpress_update( $version, $locale ){
+                $latest_version = get_option('xpressme_latest_version');
+                return (object)$latest_version;
+}
+        
+        
+function list_xpress_update( $update=null ) {
         global $xoops_config,$xpress_config;
         
         $xpress_version = $xoops_config->module_version . $xoops_config->module_codename;
+        $xpress_version = '2.38';
         $lang = WPLANG;
 
@@ -12 +18 @@
         echo            '<div id="icon-options-general" class="icon32"><br /></div>'."\n";
         echo            '<h2>' . __('XPressME Upgrade', 'xpressme') . "</h2><br>\n";
-        
-        if(get_xpress_latest_version()){
+        if( get_xpress_latest_version($check_url)){
                 $latest = get_option('xpressme_latest_version');
                 if ($latest) {
@@ -23 +28 @@
 
 
-                if (version_compare($xpress_version, $latest_version, '>')){
+                if (version_compare($xpress_version, $latest_version, '>')){ 
                                 echo '<h3 class="response">';
                                 printf(__('You are using a XPressME Integration Kit development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.', 'xpressme') , $xpress_version , $latest['develop_url']);
@@ -29 +34 @@
 
                 } else if (version_compare($xpress_version, $latest_version, '<')) {
-                        echo    '<h3 class="response">'. __('There is a new version of XPressME Integration Kit available for upgrade', 'xpressme') . '</h3>';
-                        echo '<p>';
-                        printf(__('You can upgrade to version %s download the package and install it manually:', 'xpressme'),$latest_version);
-                        echo '</p>';
-                        echo '<a class="button" href="' . $package . '">';
-                        printf(__('Download %s', 'xpressme') , $latest_version);
-                        echo '</a>';
-                        
+                        echo '<h3 class="response">';
+                        _e( 'An updated version of XPressME Integration Kit is available.' );
+                        echo '</h3>';
+
                         if ($latest['diff_response'] == 'diff_exists'){
-                                echo '<p>';
-                                printf(__('You can download the differential file from version %s to %s and upgrade it manually:', 'xpressme'),$xpress_version,$latest['diff_latest_version']);
-                                echo '</p>';
-                                echo '<a class="button" href="' . $latest['diff_package'] . '">';
-                                        printf(__('Download differential file for %s', 'xpressme') , $latest['diff_latest_version']);
-                                echo '</a>';
+//                              echo '<p>';
+//                              printf(__('You can download the differential file from version %s to %s and upgrade it manually:', 'xpressme'),$xpress_version,$latest['diff_latest_version']);
+//                              echo '</p>';
+                                $download_diff  ='<a class="button" href="' . $latest['diff_package'] . '">';
+//                              $download_diff .=       sprintf(__('Download differential file for %s', 'xpressme') , $latest['diff_latest_version']);
+                                $download_diff .=       sprintf(__('Download differential file for %s', 'xpressme') , $xpress_version);
+                                $download_diff .='</a>';
                         }
+                        $message =      sprintf(__('You can update to <a href="http://codex.wordpress.org/Version_%1$s">XPressME Integration Kit Ver %2$s</a> automatically or download the package and install it manually:'), $update->current, $latest_version);
+                        $submit = __('Update Automatically');
+                        $form_action = 'admin.php?page=upgrade_page&action=do-xpress-upgrade';
+                        $download = sprintf(__('Download %s', 'xpressme') , $latest_version);
+                        $show_buttons = true;
+
                 } else {
-                        echo    '<h3 class="response">'. __('You have the latest version of XPressME Integration Kit. You do not need to upgrade', 'xpressme') . '</h3>';
+                        echo '<h3>';
+                        printf(__('You have the latest version of XPressME Integration Kit Ver.%s.'),$xpress_version);
+                        echo '</h3>';
+
+                        $message = __('You have the latest version of XPressME Integration Kit. You do not need to upgrade', 'xpressme');
+                        $submit = __('Re-install Automatically');
+                        $form_action = 'update-core.php?action=do-core-reinstall';
+
                 }
                 
@@ -74 +89 @@
                 }
 
+                echo '<p>';
+                echo $message;
+                echo '</p>';
+                echo '<form method="post" action="' . $form_action . '" name="upgrade" class="upgrade">';
+        //      wp_nonce_field('upgrade-core');
+                echo '<p>';
+                echo '<input name="version" value="'. esc_attr($update->current) .'" type="hidden"/>';
+                echo '<input name="locale" value="'. esc_attr($update->locale) .'" type="hidden"/>';
+                if ( $show_buttons ) {
+                        echo '<input id="upgrade" class="button" type="submit" value="' . esc_attr($submit) . '" name="upgrade" />&nbsp;';
+                        echo '<a href="' . esc_url($package) . '" class="button">' . $download . '</a>&nbsp;';
+                        echo $download_diff;
+                }
+                echo '</form>';
         } else {
                 echo '<h3 class="response">';
                 printf(__('There is no response from <a href="%s">version check API</a> now. sorry, please confirm it after.', 'xpressme'),$check_url);
                 echo    "</div>\n";
+        }
+}
+
+
+function xpress_update_core($current) {
+        include_once ABSPATH . 'wp-content/plugins/xpressme/include/class-xpress-upgrader.php';
+        $upgrader = new Xpress_Upgrader();
+        return $upgrader->upgrade($current);
+}
+
+function do_xpress_upgrade( $reinstall = false ) {
+        global $wp_filesystem;
+
+        if ( $reinstall )
+                $url = 'update-xpress.php?action=do-xpress-reinstall';
+        else
+                $url = 'update-xpress.php?action=do-xpress-upgrade';
+        $url = wp_nonce_url($url, 'upgrade-xpress');
+        if ( false === ($credentials = request_filesystem_credentials($url, '', false, ABSPATH)) )
+                return;
+
+        $version = isset( $_POST['version'] )? $_POST['version'] : false;
+        $locale = isset( $_POST['locale'] )? $_POST['locale'] : 'en_US';
+        $update = find_xpress_update( $version, $locale );
+//      $update = true;
+        if ( !$update )
+                return;
+
+
+        if ( ! WP_Filesystem($credentials, ABSPATH) ) {
+                request_filesystem_credentials($url, '', true, ABSPATH); //Failed to connect, Error and request again
+                return;
+        }
+?>
+        <div class="wrap">
+        <?php screen_icon(); ?>
+        <h2><?php _e('Update XPressME Integration Kit'); ?></h2>
+<?php
+        if ( $wp_filesystem->errors->get_error_code() ) {
+                foreach ( $wp_filesystem->errors->get_error_messages() as $message )
+                        show_message($message);
+                echo '</div>';
+                return;
+        }
+
+        if ( $reinstall )
+                $update->response = 'reinstall';
+
+        $result = xpress_update_core($update, 'show_message');
+
+        if ( is_wp_error($result) ) {
+                show_message($result);
+                if ('up_to_date' != $result->get_error_code() )
+                        show_message( __('Installation Failed') );
+        } else {
+                show_message( __('XPressME Integration Kit updated successfully') );
+                $update_url = 'http://localhost/cube/modules/xp_test/admin/update.php';
+                show_message( '<strong>' . __('Actions:') . '</strong> <a href="' . esc_url( $update_url ) . '">' . __('Go to Module Update') . '</a>' );
+        }
+        echo '</div>';
+}
+
+
+
+
+function upgrade_page()
+{
+        if ( ! current_user_can('update_plugins') )
+        wp_die(__('You do not have sufficient permissions to update XPressME Integration Kit for this site.'));
+        $action = isset($_GET['action']) ? $_GET['action'] : 'upgrade-xpress';
+        $upgrade_error = false;
+        if ( 'upgrade-xpress' == $action ) {
+                list_xpress_update();
+        } elseif ( 'do-xpress-upgrade' == $action) {
+                do_xpress_upgrade();
         }
 }
@@ -103 +207 @@
 }
 
-function get_xpress_latest_version(){
+function get_xpress_latest_version($check_url){
         global $wp_version, $wpdb, $wp_local_package;
         global $xoops_config;
@@ -110 +214 @@
         $lang = WPLANG;
 
-        $check_url = "http://ja.xpressme.info/version_check/index.php?version=$xpress_version&lang=$lang";
+//      $check_url = "http://ja.xpressme.info/version_check/index.php?version=$xpress_version&lang=$lang";
         $request_options = array(
         'timeout' => 3,