Index: trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/class-xpress-upgrader.php
===================================================================
--- trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/class-xpress-upgrader.php (revision 700)
+++ trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/class-xpress-upgrader.php (revision 701)
@@ -1,13 +1,5 @@
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);
}
}
Index: trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/xpress_upgrade.php
===================================================================
--- trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/xpress_upgrade.php (revision 700)
+++ trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/xpress_upgrade.php (revision 701)
@@ -4,6 +4,5 @@
return (object)$latest_version;
}
-
-
+
function list_xpress_update( $update=null ) {
global $xoops_config,$xpress_config;
@@ -26,10 +25,9 @@
}
-
+ $show_buttons = false;
if (version_compare($xpress_version, $latest_version, '>')){
echo '';
- printf(__('You are using a XPressME Integration Kit development version (%1$s). Cool! Please stay updated.', '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 '
';
-
} else if (version_compare($xpress_version, $latest_version, '<')) {
echo '';
@@ -38,13 +36,9 @@
if ($latest['diff_response'] == 'diff_exists'){
-// echo '
';
-// printf(__('You can download the differential file from version %s to %s and upgrade it manually:', 'xpressme'),$xpress_version,$latest['diff_latest_version']);
-// echo '
';
$download_diff ='';
-// $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 .='';
}
- $message = sprintf(__('You can update to XPressME Integration Kit Ver %2$s automatically or download the package and install it manually:'), $update->current, $latest_version);
+ $message = sprintf(__('You can update to XPressME Integration Kit Ver %s 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,14 +58,19 @@
// develop
+ $develop_show = false;
if ($latest['develop_response'] == 'development_exists'
&& !empty($latest['develop_package'])
)
{
- echo '';
- printf(__('You can use the development version %s download the package and install it manually:', 'xpressme'),$latest['develop_latest_version']);
- echo '
';
- echo '';
- printf(__('Download %s', 'xpressme') , $latest['develop_latest_version']);
- echo '';
+ $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,10 +78,7 @@
)
{
- echo '';
- 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 '
';
- echo '';
- printf(__('Download differential file for %s', 'xpressme') , $latest['diff_develop_latest_version']);
- echo '';
+ $develop_download_diff = '';
+ $develop_download_difff .= sprintf(__('Download differential file for %s', 'xpressme') , $latest['diff_develop_latest_version']);
+ $develop_download_diff .= '';
}
}
@@ -102,4 +98,18 @@
}
echo '';
+
+ if ($develop_show){
+ echo '';
+ echo $develop_message;
+ echo '
';
+ echo '';
+ }
} else {
echo '';
@@ -116,5 +126,5 @@
}
-function do_xpress_upgrade( $reinstall = false ) {
+function do_xpress_upgrade( $develop = false,$reinstall = false ) {
global $wp_filesystem;
@@ -133,5 +143,6 @@
if ( !$update )
return;
-
+ if ( $develop )
+ $update->package = $update->develop_package;
if ( ! WP_Filesystem($credentials, ABSPATH) ) {
@@ -180,5 +191,9 @@
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);
}
}