Changeset 701

Timestamp:

Apr 20, 2011, 3:41:10 PM (13 years ago)

Author:

toemon

Message:

開発版の自動更新対応　bump Ver2.4.0 alpha3

Location:

trunk/xpressme_integration_kit

Files:

• wp-content/plugins/xpressme/include/class-xpress-upgrader.php (modified) (2 diffs)
• wp-content/plugins/xpressme/include/xpress_upgrade.php (modified) (9 diffs)
• xoops_version.php (modified) (1 diff)

trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/class-xpress-upgrader.php

@@ -1 +1 @@
 <?php
 include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-/**
- * Core Upgrader class for WordPress. It allows for WordPress to upgrade itself in combiantion with the wp-admin/includes/update-core.php file
- *
- * @TODO More Detailed docs, for methods as well.
- *
- * @package WordPress
- * @subpackage Upgrader
- * @since 2.8.0
- */
+
 class Xpress_Upgrader extends WP_Upgrader {
 
@@ -57 +49 @@
                 // Copy update-core.php from the new version into place.
                 $update_xpress_file = 'wp-content/plugins/xpressme/include/update_xpress.php';
-//              if ( !$wp_filesystem->copy($kit_dir . $update_xpress_file, $wp_dir . $update_xpress_file, true) ) {
-//                      $wp_filesystem->delete($working_dir, true);
-//                      return new WP_Error('copy_failed', $this->strings['copy_failed']);
-//              }
+                if ( !$wp_filesystem->copy($kit_dir . $update_xpress_file, $wp_dir . $update_xpress_file, true) ) {
+                        $wp_filesystem->delete($working_dir, true);
+                        return new WP_Error('copy_failed', $this->strings['copy_failed']);
+                }
                 $wp_filesystem->chmod($wp_dir . $update_xpress_file, FS_CHMOD_FILE);
 
                 require(ABSPATH . $update_xpress_file);
-
                 return update_xpress($kit_dir, $wp_dir);
-                
-        // Remove working directory
-                $wp_filesystem->delete($working_dir, true);
-                if ( !$wp_filesystem->delete($working_dir, true)){
-                        return new WP_Error('delete_failed', $this->strings['delete_failed']);
-                }
-                show_message( __('Delete Working directory') );
-                $wp_filesystem->chmod($wp_dir . 'templates/', 0777);
         }
 }

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

@@ -4 +4 @@
                 return (object)$latest_version;
 }
-        
-        
+
 function list_xpress_update( $update=null ) {
         global $xoops_config,$xpress_config;
@@ -26 +25 @@
                 }
 
-
+                $show_buttons = false;
                 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']);
+                                printf(__('You are using a XPressME Integration Kit development version (%s). Cool! Please stay updated.', 'xpressme') , $xpress_version);
                                 echo '</h3>';
-
                 } else if (version_compare($xpress_version, $latest_version, '<')) {
                         echo '<h3 class="response">';
@@ -38 +36 @@
 
                         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>';
                                 $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);
+                        $message =      sprintf(__('You can update to XPressME Integration Kit Ver %s</a> automatically or download the package and install it manually:'), $latest_version);
                         $submit = __('Update Automatically');
                         $form_action = 'admin.php?page=upgrade_page&action=do-xpress-upgrade';
@@ -64 +58 @@
                 
                 // develop
+                $develop_show = false;
                 if ($latest['develop_response'] == 'development_exists'
                         && !empty($latest['develop_package'])
                         )
                 {
-                        echo '<h3 class="response">';
-                        printf(__('You can use the development version %s download the package and install it manually:', 'xpressme'),$latest['develop_latest_version']);
-                        echo '</h3>';
-                        echo '<a class="button" href="' . $latest['develop_package'] . '">';
-                        printf(__('Download %s', 'xpressme') , $latest['develop_latest_version']);
-                        echo '</a>';
+                        $develop_latest_version=$latest['develop_latest_version'];
+                        $develop_form_action = 'admin.php?page=upgrade_page&action=do-xpress-develop_upgrade';
+//                      $develop_message =sprintf(__('You can use the development version %s download the package and install it manually:', 'xpressme'),$latest['develop_latest_version']);
+                        $develop_message =      sprintf(__('You can update to  XPressME Integration Kit development version %s automatically or download the package and install it manually:'), $develop_latest_version);
+
+                        $develop_show = true;
+                        $develop_package=$latest['develop_package'];
+                        $develop_submit = __('Update Automatically');
+                        $develop_download = sprintf(__('Download %s', 'xpressme') , $develop_latest_version);
+                        $develop_download_diff = '';
                         // develop diff
                         if ($latest['diff_develop_response'] == 'diff_develop_exists'
@@ -79 +78 @@
                                 )
                         {
-                                        echo '<p>';
-                                        printf(__('You can download the differential file from version %s to %s and upgrade it manually:', 'xpressme'),$xpress_version,$latest['diff_develop_latest_version']);
-                                        echo '</p>';
-                                        echo '<a class="button" href="' . $latest['diff_develop_package'] . '">';
-                                                printf(__('Download differential file for %s', 'xpressme') , $latest['diff_develop_latest_version']);
-                                        echo '</a>';
+                                        $develop_download_diff  = '<a class="button" href="' . $latest['diff_develop_package'] . '">';
+                                        $develop_download_difff .= sprintf(__('Download differential file for %s', 'xpressme') , $latest['diff_develop_latest_version']);
+                                        $develop_download_diff .= '</a>';
                         }
                 }
@@ -102 +98 @@
                 }
                 echo '</form>';
+                
+                if ($develop_show){
+                        echo '<p>';
+                        echo $develop_message;
+                        echo '</p>';
+                        echo '<form method="post" action="' . $develop_form_action . '" name="develop_upgrade" class="develop_upgrade">';
+                        echo '<p>';
+                        echo '<input name="version" value="'. esc_attr($update->current) .'" type="hidden"/>';
+                        echo '<input name="locale" value="'. esc_attr($update->locale) .'" type="hidden"/>';
+                                echo '<input id="upgrade" class="button" type="submit" value="' . esc_attr($develop_submit) . '" name="develop_upgrade" />&nbsp;';
+                                echo '<a href="' . esc_url($develop_package) . '" class="button">' . $develop_download . '</a>&nbsp;';
+                                echo $develop_download_diff;
+                        echo '</form>';
+                }
         } else {
                 echo '<h3 class="response">';
@@ -116 +126 @@
 }
 
-function do_xpress_upgrade( $reinstall = false ) {
+function do_xpress_upgrade( $develop = false,$reinstall = false ) {
         global $wp_filesystem;
 
@@ -133 +143 @@
         if ( !$update )
                 return;
-
+        if ( $develop )
+                $update->package = $update->develop_package;
 
         if ( ! WP_Filesystem($credentials, ABSPATH) ) {
@@ -180 +191 @@
                 list_xpress_update();
         } elseif ( 'do-xpress-upgrade' == $action) {
-                do_xpress_upgrade();
+                $update_develop = false;
+                do_xpress_upgrade($update_develop);
+        } else if  ( 'do-xpress-develop_upgrade' == $action) {
+                $update_develop = true;
+                do_xpress_upgrade($update_develop);
         }
 }

trunk/xpressme_integration_kit/xoops_version.php

@@ -92 +92 @@
 
 // status
-$modversion['codename'] = "alpha2";
+$modversion['codename'] = "alpha3";
 
 // onInstall, onUpdate, onUninstall