Changeset 6167

Timestamp:

05/13/10 12:06:29 (3 years ago)

Author:

patdenice

Message:

Upgrade work for 2.1.
Language keys have not been inserted yet.

Location:

extensions/autoupdate

Files:

• autoupdate.php (modified) (1 diff)
• include (added)
• include/functions.inc.php (added)
• include/functions_remote.inc.php (added)
• include/index.php (added)
• include/mysqldump.php (added)
• index.php (modified) (1 diff)
• main.inc.php (modified) (1 diff)
• maintain.inc.php (modified) (1 diff)
• plugins_update.php (modified) (3 diffs)
• remote.php (modified) (3 diffs)
• template (added)
• template/ajax-loader.gif (copied) (copied from extensions/autoupdate/ajax-loader.gif)
• template/autoupdate.tpl (added)
• template/head.tpl (copied) (copied from extensions/autoupdate/head.tpl) (1 diff)
• template/index.php (added)

extensions/autoupdate/autoupdate.php

@@ -2 +2 @@
 
 load_language('plugin.lang', dirname(__FILE__).'/');
-
-if (isset($_GET['action']) and 
-  ($_GET['action'] == 'check_autoupdate' or $_GET['action'] == 'check_upgrade' ))
-{
-  unset($_SESSION['need_update']);
-  unset($_SESSION['plugins_need_update']);
-}
-
-if (isset($_GET['autoupdate']))
-{
-  if ($_GET['autoupdate'] == 'success')
-  {
-    array_push($page['infos'], sprintf(l10n('autoupdate_success'), PHPWG_VERSION));
-  }
-  elseif ($file = $conf['local_data_dir'].'/autoupdate/'.$_GET['autoupdate'].'.zip' and file_exists($file))
-  {
-    include(dirname(__FILE__).'/class.inc.php');
-    include_once(PHPWG_ROOT_PATH.'admin/include/pclzip.lib.php');
-    $autoupdate = new autoupdate();
-    $zip = new PclZip($file);
-    if ($result = $zip->extract(PCLZIP_OPT_PATH, PHPWG_ROOT_PATH,
-                                PCLZIP_OPT_REMOVE_PATH, $_GET['autoupdate'],
-                                PCLZIP_OPT_SET_CHMOD, 0755,
-                                PCLZIP_OPT_REPLACE_NEWER))
-    {
-      //Check if all files were extracted
-      $error = '';
-      foreach($result as $extract)
-      {
-        if (!in_array($extract['status'], array('ok', 'filtered', 'already_a_directory')))
+include(AUTOUPDATE_PATH.'include/functions.inc.php');
+include(PHPWG_ROOT_PATH.'admin/include/pclzip.lib.php');
+
+/*
+STEP:
+0 = check is needed. If version is latest or check fail, we stay on step 0
+1 = new version on same branch AND new branch are available => user may choose upgrade.
+2 = upgrade on same branch
+3 = upgrade on different branch
+*/
+$step = isset($_GET['step']) ? $_GET['step'] : 0;
+
+// +-----------------------------------------------------------------------+
+// |                                Step 0                                 |
+// +-----------------------------------------------------------------------+
+if ($step == 0)
+{
+  if (preg_match('/(\d+\.\d+)\.(\d+)/', PHPWG_VERSION, $matches)
+    and @fetchRemote(PHPWG_URL.'/download/all_versions.php', $result)
+    and $all_versions = @explode("\n", $result)
+    and is_array($all_versions))
+  {
+    $template->assign('CHECK_VERSION', true);
+
+    $last_version = trim($all_versions[0]);
+
+    if (version_compare(PHPWG_VERSION, $last_version, '<'))
+    {
+      $new_branch = preg_replace('/(\d+\.\d+)\.\d+/', '$1', $last_version);
+      $actual_branch = $matches[1];
+
+      if ($new_branch == $actual_branch)
+      {
+        $step = 2;
+      }
+      else
+      {
+        $step = 3;
+
+        // Check if new version exists in same branch
+        foreach ($all_versions as $version)
         {
-          // Try to change chmod and extract
-          if (@chmod(PHPWG_ROOT_PATH.$extract['filename'], 0777)
-            and ($res = $zip->extract(PCLZIP_OPT_BY_NAME, $_GET['autoupdate'].'/'.$extract['filename'],
-                                      PCLZIP_OPT_PATH, PHPWG_ROOT_PATH,
-                                      PCLZIP_OPT_REMOVE_PATH, $_GET['autoupdate'],
-                                      PCLZIP_OPT_SET_CHMOD, 0755,
-                                      PCLZIP_OPT_REPLACE_NEWER))
-            and isset($res[0]['status'])
-            and $res[0]['status'] == 'ok')
+          $new_branch = preg_replace('/(\d+\.\d+)\.\d+/', '$1', $version);
+
+          if ($new_branch == $actual_branch)
           {
-            continue;
-          }
-          else
-          {
-            $error .= $extract['filename'].': '.$extract['status']."\n";
+            if (version_compare(PHPWG_VERSION, $version, '<'))
+            {
+              $step = 1;
+            }
+            break;
           }
         }
       }
-
-      if (empty($error))
-      {
-        if (file_exists(PHPWG_ROOT_PATH.'obsolete.list')
-          and $old_files = file(PHPWG_ROOT_PATH.'obsolete.list', FILE_IGNORE_NEW_LINES)
-          and !empty($old_files))
-        {
-          array_push($old_files, 'obsolete.list');
-          foreach($old_files as $old_file)
-          {
-            $path = PHPWG_ROOT_PATH.$old_file;
-            if (is_file($path))
-            {
-              @unlink($path);
-            }
-            elseif (is_dir($path))
-            {
-              $autoupdate->deltree($path);
-            }
-          }
-        }
-        if (preg_match('/\d+\.\d+\.\d+_to_(\d+\.\d+\.\d+)/', $_GET['autoupdate'], $matches))
-        {
-          unset($_SESSION['need_update']);
-          $autoupdate->check_version($matches[1]);
-        }
-        $autoupdate->deltree($conf['local_data_dir'].'/autoupdate');
-        invalidate_user_cache(true);
-        $template->delete_compiled_templates();
-        redirect('admin.php?autoupdate=success');
-      }
-      else
-      {
-        file_put_contents($conf['local_data_dir'].'/autoupdate/log_error.txt', $error);
-        $relative_path = trim(str_replace(dirname(dirname(dirname(__FILE__))), '', $conf['local_data_dir']), '/\\');
-        array_push($page['errors'], sprintf(l10n('autoupdate_extract_fail'), PHPWG_ROOT_PATH.$relative_path.'/autoupdate/log_error.txt'));
-      }
-    }
-    else
-    {
-      $autoupdate->deltree($conf['local_data_dir'].'/autoupdate');
-      array_push($page['errors'], l10n('autoupdate_fail'));
     }
   }
   else
   {
-    @unlink($file);
-    array_push($page['errors'], l10n('autoupdate_fail'));
-  }
-}
-
-if (!isset($_SESSION['need_update']) or !isset($_SESSION['plugins_need_update'])
-  or $_SESSION['need_update'] !== false or $_SESSION['plugins_need_update'] !== array())
-{
-  $template->set_filename('autoupdate_head', realpath(dirname(__FILE__).'/head.tpl'));
-  array_push($header_notes, $template->parse('autoupdate_head', true));
-}
+    $template->assign('CHECK_VERSION', false);
+  }
+}
+
+// +-----------------------------------------------------------------------+
+// |                                Step 1                                 |
+// +-----------------------------------------------------------------------+
+if ($step == 1)
+{
+  $new_versions = array($last_version, $version);
+  $template->assign('new_versions', $new_versions);
+}
+
+// +-----------------------------------------------------------------------+
+// |                                Step 2                                 |
+// +-----------------------------------------------------------------------+
+if ($step == 2)
+{
+  if (isset($_POST['submit']) and isset($_POST['upgrade_to']))
+  {
+    upgrade_to($_POST['upgrade_to'], $step);
+  }
+
+  $template->assign('UPGRADE_TO', isset($_GET['to']) ? $_GET['to'] : $last_version);
+}
+
+// +-----------------------------------------------------------------------+
+// |                                Step 3                                 |
+// +-----------------------------------------------------------------------+
+if ($step == 3)
+{
+  if (isset($_POST['saveTemplate']))
+  {
+    $path = $conf['local_data_dir'].'/autoupdate';
+
+    if (@mkgetdir($path)
+      and ($zip = tempnam($path, 'zip'))
+      and ($archive = new pclZip($zip))
+      and ($v_list = $archive->add(PHPWG_ROOT_PATH.'template', PCLZIP_OPT_REMOVE_PATH, PHPWG_ROOT_PATH))
+      and is_array($v_list)
+      and !empty($v_list))
+    {
+      $http_headers = array(
+        'Content-Length: '.@filesize($zip),
+        'Content-Type: application/zip',
+        'Content-Disposition: attachment; filename="template.zip";',
+        'Content-Transfer-Encoding: binary',
+        );
+
+      foreach ($http_headers as $header) {
+        header($header);
+      }
+
+      @readfile($zip);
+      autoupdate_deltree($conf['local_data_dir'].'/autoupdate');
+      exit();
+    }
+
+    array_push($page['errors'], l10n('Unable to send template directory.'));
+  }
+
+  if (isset($_POST['dumpDatabase']))
+  {
+    if (version_compare(PHPWG_VERSION, '2.1', '<'))
+    {
+      global $cfgBase;
+      $conf['db_base'] = $cfgBase;
+    }
+
+    include(AUTOUPDATE_PATH.'include/mysqldump.php');
+
+    $path = $conf['local_data_dir'].'/autoupdate';
+
+    if (@mkgetdir($path)
+      and ($backupFile = tempnam($path, 'sql'))
+      and ($dumper = new MySQLDump($conf['db_base'],$backupFile,false,false)))
+    {
+      $tablesStructure = array(
+        CATEGORIES_TABLE,
+        COMMENTS_TABLE,
+        CONFIG_TABLE,
+        FAVORITES_TABLE,
+        GROUP_ACCESS_TABLE,
+        GROUPS_TABLE,
+        HISTORY_TABLE,
+        HISTORY_SUMMARY_TABLE,
+        IMAGE_CATEGORY_TABLE,
+        IMAGES_TABLE,
+        SESSIONS_TABLE,
+        SITES_TABLE,
+        USER_ACCESS_TABLE,
+        USER_GROUP_TABLE,
+        USERS_TABLE,
+        USER_INFOS_TABLE,
+        USER_FEED_TABLE,
+        WAITING_TABLE,
+        RATE_TABLE,
+        USER_CACHE_TABLE,
+        USER_CACHE_CATEGORIES_TABLE,
+        CADDIE_TABLE,
+        UPGRADE_TABLE,
+        SEARCH_TABLE,
+        USER_MAIL_NOTIFICATION_TABLE,
+        TAGS_TABLE,
+        IMAGE_TAG_TABLE,
+        PLUGINS_TABLE,
+        OLD_PERMALINKS_TABLE,
+        );
+
+      $tablesData = $tablesStructure;
+
+      if (!isset($_POST['includeHistory']))
+      {
+        unset($tablesData[6]);
+      }
+
+      foreach ($tablesStructure as $table)
+      {
+        $dumper->getTableStructure($table); 
+      }
+      foreach ($tablesData as $table)
+      {
+        $dumper->getTableData($table); 
+      }
+    }
+
+    if (@filesize($backupFile))
+    {
+      $http_headers = array(
+        'Content-Length: '.@filesize($backupFile),
+        'Content-Type: text/x-sql',
+        'Content-Disposition: attachment; filename="database.sql";',
+        'Content-Transfer-Encoding: binary',
+        );
+
+      foreach ($http_headers as $header) {
+        header($header);
+      }
+
+      @readfile($backupFile);
+      autoupdate_deltree($conf['local_data_dir'].'/autoupdate');
+      exit();
+    }
+
+    array_push($page['errors'], l10n('Unable to dump database.'));
+  }
+
+  if (isset($_POST['submit']) and isset($_POST['upgrade_to']))
+  {
+    upgrade_to($_POST['upgrade_to'], $step);
+  }
+
+  $template->assign('UPGRADE_TO', isset($_GET['to']) ? $_GET['to'] : $last_version);
+}
+
+// +-----------------------------------------------------------------------+
+// |                        Process template                               |
+// +-----------------------------------------------------------------------+
+
+$template->assign(array(
+  'STEP' => $step,
+  'AU_URL' => get_admin_plugin_menu_link(AUTOUPDATE_PATH . '/autoupdate.php'),
+  )
+);
+
+$template->set_filename('plugin_admin_content', realpath(AUTOUPDATE_PATH.'template/autoupdate.tpl'));
+$template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');
 
 ?>

extensions/autoupdate/index.php

@@ -1 +1 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | file          : $Id: index.php 1912 2007-03-16 06:30:07Z rub $
-// | last update   : $Date: 2007-03-16 07:30:07 +0100 (ven, 16 mar 2007) $
-// | last modifier : $Author: rub $
-// | revision      : $Revision: 1912 $
+// | Copyright(C) 2008-2010 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |

extensions/autoupdate/main.inc.php

@@ -11 +11 @@
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
-if (script_basename() == 'admin') add_event_handler('get_admin_plugin_menu_links', 'check_for_auto_upgrade');
+define('AUTOUPDATE_PATH' , PHPWG_PLUGINS_PATH . basename(dirname(__FILE__)) . '/');
+
+if (script_basename() == 'admin')
+ add_event_handler('get_admin_plugin_menu_links', 'check_for_auto_upgrade');
 
 function check_for_auto_upgrade($plugin_menu_links)
 {
-  global $template, $page, $conf, $header_notes;
+  global $template, $page, $conf, $header_notes, $prefixeTable;
 
   if ($page['page'] == 'intro')
   {
-    include(dirname(__FILE__).'/autoupdate.php');
+    if (isset($_GET['action']) and 
+      ($_GET['action'] == 'check_autoupdate' or $_GET['action'] == 'check_upgrade' ))
+    {
+      unset($_SESSION['need_update']);
+      unset($_SESSION['plugins_need_update']);
+    }
+
+    if (!isset($_SESSION['need_update']) or !isset($_SESSION['plugins_need_update'])
+      or $_SESSION['need_update'] !== false or $_SESSION['plugins_need_update'] !== array())
+    {
+      $template->set_filename('autoupdate_head', realpath(AUTOUPDATE_PATH.'template/head.tpl'));
+      array_push($header_notes, $template->parse('autoupdate_head', true));
+    }
   }
 
-  if ($page['page'] == 'plugins_update')
+  if ($page['page'] == 'plugins_update' and method_exists('template', 'set_prefilter'))
   {
     include(dirname(__FILE__).'/plugins_update.php');
   }
 
+  array_push($plugin_menu_links, array(
+      'NAME' => 'Piwigo AutoUpgrade',
+      'URL' => get_admin_plugin_menu_link(AUTOUPDATE_PATH . '/autoupdate.php')));
+
   return $plugin_menu_links;
 }

extensions/autoupdate/maintain.inc.php

@@ -3 +3 @@
 function plugin_activate()
 {
-  global $prefixeTable;
+  global $prefixeTable, $conf;
 
-  $query = '
+  if (!isset($conf['autoupdate_ignore_list']))
+  {
+    $query = '
 INSERT INTO ' . CONFIG_TABLE . ' (param,value,comment)
 VALUES ("autoupdate_ignore_list" , "'.addslashes(serialize(array())).'" , "Ignored plugin list for Piwigo Auto Update plugin");';
 
-  pwg_query($query);
+    pwg_query($query);
+  }
 }
 

extensions/autoupdate/plugins_update.php

@@ -5 +5 @@
 function autoupdate_plugins_update_filter($content, &$smarty)
 {
-  $search = '<a href="{$plugin.URL_DOWNLOAD}">{\'plugins_download\'|@translate}</a>';
-  $replacement = '  <a href="{$plugin.URL_DOWNLOAD}">{\'plugins_download\'|@translate}</a><br>
+  $l_key = version_compare(PHPWG_VERSION, '2.1', '<') ? 'plugins_download' : 'Download file';
+
+  $search = '<a href="{$plugin.URL_DOWNLOAD}">{\''.$l_key.'\'|@translate}</a>';
+
+  $replacement = '  <a href="{$plugin.URL_DOWNLOAD}">{\''.$l_key.'\'|@translate}</a><br>
     <a href="#" onClick="autoupdate_ignore(\'{$plugin.EXT_NAME}\', true, {$smarty.foreach.plugins_loop.index}); return false;" id="au_ignore_{$smarty.foreach.plugins_loop.index}_true" {if $plugin.EXT_NAME|@in_array:$AU_IGNORE_LIST}style="display: none;"{/if}>{\'Don\\\'t notify on admin homepage\'|@translate}</a>
     <a href="#" onClick="autoupdate_ignore(\'{$plugin.EXT_NAME}\', false, {$smarty.foreach.plugins_loop.index}); return false;" id="au_ignore_{$smarty.foreach.plugins_loop.index}_false" {if !$plugin.EXT_NAME|@in_array:$AU_IGNORE_LIST}style="display: none;"{/if}>{\'Notify on admin homepage\'|@translate}</a>';
@@ -18 +21 @@
   jQuery.post(
     "'.PHPWG_ROOT_PATH.'plugins/autoupdate/remote.php",
-    { "autoupdate_ignore[]": [name, bool] },
+    { "autoupdate_ignore'.(version_compare(PHPWG_VERSION, '2.1', '<') ? '[]' : '').'": [name, bool] },
     function(data) {
       if (data == "ok") {
@@ -30 +33 @@
 ';
 
-//$template->delete_compiled_templates();
 $template->block_html_head('', $script_head, $smarty, $repeat);
 $template->set_prefilter('plugins', 'autoupdate_plugins_update_filter');

extensions/autoupdate/remote.php

@@ -5 +5 @@
 include_once( PHPWG_ROOT_PATH.'include/common.inc.php' );
 include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
+include_once(PHPWG_ROOT_PATH.'admin/include/functions_plugins.inc.php');
 
 check_status(ACCESS_ADMINISTRATOR);
@@ -12 +13 @@
   and count($_POST['autoupdate_ignore']) == 2)
 {
+  // Add or remove plugin from ignore list
   $ignore = unserialize($conf['autoupdate_ignore_list']);
   $ignore = array_flip($ignore);
@@ -43 +45 @@
 else
 {
+  // Check if gallery or plugins are up to date
   load_language('plugin.lang', dirname(__FILE__).'/');
   header('Content-Type: text/html; charset=UTF-8');
 
-  include(dirname(__FILE__).'/class.inc.php');
-  $autoupdate = new autoupdate();
-
-  echo $autoupdate->check_version();
+  include(AUTOUPDATE_PATH.'include/functions_remote.inc.php');
+  echo autoupdate_check_version();
 }
 

extensions/autoupdate/template/head.tpl

@@ -21 +21 @@
   });
 }
-
-function confirm_autoupdate() {ldelim}
-  conf = confirm('{'autoupdate_alert'|@translate}');
-  if (conf) jQuery('#autoupdate').html('Upgrade in progress... Please wait.');
-  return conf;
-}
 </script>
 {/html_head}
-<p id="autoupdate"><img src="plugins/autoupdate/ajax-loader.gif"> &nbsp; {'Checking upgrades for gallery and plugins...'|@translate}</p>
+<p id="autoupdate"><img src="plugins/autoupdate/template/ajax-loader.gif"> &nbsp; {'Checking upgrades for gallery and plugins...'|@translate}</p>