Changeset 9710 for extensions

Timestamp:

Mar 15, 2011, 7:55:17 PM (13 years ago)

Author:

patdenice

Message:

New languages keys.

Location:

extensions/autoupdate/trunk

Files:

• ajax/check_updates.php (modified) (1 diff)
• ajax/ignore_list.php (modified) (1 diff)
• ajax/update_language.php (modified) (1 diff)
• ajax/update_plugin.php (modified) (1 diff)
• ajax/update_theme.php (modified) (1 diff)
• include/functions_remote.inc.php (deleted)
• language/ar_SA/plugin.lang.php (modified) (2 diffs)
• language/cs_CZ/plugin.lang.php (modified) (2 diffs)
• language/da_DK/plugin.lang.php (modified) (2 diffs)
• language/de_DE/plugin.lang.php (modified) (2 diffs)
• language/en_UK/plugin.lang.php (modified) (2 diffs)
• language/es_ES/plugin.lang.php (modified) (2 diffs)
• language/fr_FR/plugin.lang.php (modified) (2 diffs)
• language/hr_HR/plugin.lang.php (modified) (2 diffs)
• language/hu_HU/plugin.lang.php (modified) (2 diffs)
• language/it_IT/plugin.lang.php (modified) (2 diffs)
• language/ja_JP/plugin.lang.php (modified) (2 diffs)
• language/ka_GE/plugin.lang.php (modified) (2 diffs)
• language/lv_LV/plugin.lang.php (modified) (2 diffs)
• language/nl_NL/plugin.lang.php (modified) (2 diffs)
• language/no_NO/plugin.lang.php (modified) (2 diffs)
• language/pl_PL/plugin.lang.php (modified) (2 diffs)
• language/pt_PT/plugin.lang.php (modified) (2 diffs)
• language/ru_RU/plugin.lang.php (modified) (2 diffs)
• language/sk_SK/plugin.lang.php (modified) (2 diffs)
• language/vi_VN/plugin.lang.php (modified) (2 diffs)
• language/zh_CN/plugin.lang.php (modified) (2 diffs)
• main.inc.php (modified) (2 diffs)
• plugins_update.php (deleted)
• template/extensions.tpl (modified) (7 diffs)
• template/head.tpl (modified) (2 diffs)

extensions/autoupdate/trunk/ajax/check_updates.php

@@ -13 +13 @@
 header('Content-Type: text/html; charset=UTF-8');
 
-include(AUTOUPDATE_PATH.'include/functions_remote.inc.php');
-echo autoupdate_check_version();
+if (!isset($_SESSION['need_update']))
+{
+  $_SESSION['need_update'] = null;
+
+  if (preg_match('/(\d+\.\d+)\.(\d+)/', PHPWG_VERSION, $matches)
+    and @fetchRemote(PHPWG_URL.'/download/all_versions.php', $result))
+  {
+    $all_versions = @explode("\n", $result);
+    $new_version = trim($all_versions[0]);
+    $_SESSION['need_update'] = version_compare(PHPWG_VERSION, $new_version, '<');
+  }
+}
+
+if ($_SESSION['need_update'])
+{
+  echo 'piwigo_upgrade'; exit();
+}
+else
+{
+  // Gallery is up to date
+  // Check plugins upgrade
+  include_once(PHPWG_ROOT_PATH.'admin/include/plugins.class.php');
+  include_once(PHPWG_ROOT_PATH.'admin/include/themes.class.php');
+  include_once(PHPWG_ROOT_PATH.'admin/include/languages.class.php');
+  $plugins = new plugins();
+  $themes = new themes();
+  $languages = new languages();
+
+  if (!isset($_SESSION['extensions_need_update']))
+  {
+    $_SESSION['extensions_need_update'] = array();
+    autoupdate_check_plugins_upgrade($plugins);
+    autoupdate_check_themes_upgrade($themes);
+    autoupdate_check_languages_upgrade($languages);
+  }
+  else
+  {
+    if (!empty($_SESSION['extensions_need_update']['plugins']))
+    {
+      // Check if plugins have been upgraded since last check
+      foreach($plugins->fs_plugins as $plugin_id => $fs_plugin)
+      {
+        if (isset($_SESSION['extensions_need_update']['plugins'][$plugin_id])
+          and $plugins->plugin_version_compare($fs_plugin['version'], $_SESSION['extensions_need_update']['plugins'][$plugin_id]))
+        {
+          // Plugin have been updated
+          autoupdate_check_plugins_upgrade($plugins);
+        }
+      }
+    }
+    if (!empty($_SESSION['extensions_need_update']['themes']))
+    {
+      // Check if themes have been upgraded since last check
+      foreach($themes->fs_themes as $theme_id => $fs_theme)
+      {
+        if (isset($_SESSION['extensions_need_update']['themes'][$theme_id])
+          and $themes->theme_version_compare($fs_theme['version'], $_SESSION['extensions_need_update']['themes'][$theme_id]))
+        {
+          // theme have been updated
+          autoupdate_check_themes_upgrade($themes);
+        }
+      }
+    }
+    if (!empty($_SESSION['extensions_need_update']['languages']))
+    {
+      // Check if languages have been upgraded since last check
+      foreach($languages->fs_languages as $language_id => $fs_language)
+      {
+        if (isset($_SESSION['extensions_need_update']['languages'][$language_id])
+          and $languages->language_version_compare($fs_language['version'], $_SESSION['extensions_need_update']['languages'][$language_id]))
+        {
+          // language have been updated
+          autoupdate_check_languages_upgrade($languages);
+        }
+      }
+    }
+  }
+
+  if (!empty($_SESSION['extensions_need_update']))
+  {
+    echo 'ext_upgrade'; exit;
+  }
+}
+
+if ($_SESSION['need_update'] === false and $_SESSION['extensions_need_update'] === array())
+{
+  echo 'up_to_date'; exit;
+}
+else
+{
+  autoupdate_error();
+}
+
+function autoupdate_check_plugins_upgrade($plugins)
+{
+  global $conf;
+
+  if (!$plugins->get_server_plugins())
+  {
+    autoupdate_error();
+  }
+
+  $plugins_ignore_list = array();
+  $need_upgrade = array();
+
+  foreach($plugins->fs_plugins as $plugin_id => $fs_plugin)
+  {
+    if (isset($fs_plugin['extension']) and isset($plugins->server_plugins[$fs_plugin['extension']]))
+    {
+      $plugin_info = $plugins->server_plugins[$fs_plugin['extension']];
+
+      if (!$plugins->plugin_version_compare($fs_plugin['version'], $plugin_info['revision_name']))
+      {
+        if (in_array($plugin_id, $conf['AU_ignore']['plugins']))
+        {
+          array_push($plugins_ignore_list, $plugin_id);
+        }
+        else
+        {
+          $_SESSION['extensions_need_update']['plugins'][$plugin_id] = $plugin_info['revision_name'];
+        }
+      }
+    }
+  }
+
+  $conf['AU_ignore']['plugins'] = $plugins_ignore_list;
+  conf_update_param('autoupdate_ignore_list', pwg_db_real_escape_string(serialize($conf['AU_ignore'])));
+}
+
+function autoupdate_check_themes_upgrade($themes)
+{
+  global $conf;
+
+  if (!$themes->get_server_themes())
+  {
+    autoupdate_error();
+  }
+  
+  $themes_ignore_list = array();
+  $need_upgrade = array();
+
+  foreach($themes->fs_themes as $theme_id => $fs_theme)
+  {
+    if (isset($fs_theme['extension']) and isset($themes->server_themes[$fs_theme['extension']]))
+    {
+      $theme_info = $themes->server_themes[$fs_theme['extension']];
+
+      if (!$themes->theme_version_compare($fs_theme['version'], $theme_info['revision_name']))
+      {
+        if (in_array($theme_id, $conf['AU_ignore']['theme']))
+        {
+          array_push($themes_ignore_list, $theme_id);
+        }
+        else
+        {
+          $_SESSION['extensions_need_update']['themes'][$theme_id] = $theme_info['revision_name'];
+        }
+      }
+    }
+  }
+
+  $conf['AU_ignore']['themes'] = $themes_ignore_list;
+  conf_update_param('autoupdate_ignore_list', pwg_db_real_escape_string(serialize($conf['AU_ignore'])));
+}
+
+function autoupdate_check_languages_upgrade($languages)
+{
+  global $conf;
+
+  if (!$languages->get_server_languages())
+  {
+    autoupdate_error();
+  }
+
+  $languages_ignore_list = array();
+  $need_upgrade = array();
+
+  foreach($languages->fs_languages as $language_id => $fs_language)
+  {
+    if (isset($fs_language['extension']) and isset($languages->server_languages[$fs_language['extension']]))
+    {
+      $language_info = $languages->server_languages[$fs_language['extension']];
+
+      if (!$languages->language_version_compare($fs_language['version'], $language_info['revision_name']))
+      {
+        if (in_array($language_id, $conf['AU_ignore']['languages']))
+        {
+          array_push($languages_ignore_list, $language_id);
+        }
+        else
+        {
+          $_SESSION['extensions_need_update']['languages'][$language_id] = $language_info['revision_name'];
+        }
+      }
+    }
+  }
+
+  $conf['AU_ignore']['languages'] = $languages_ignore_list;
+  conf_update_param('autoupdate_ignore_list', pwg_db_real_escape_string(serialize($conf['AU_ignore'])));
+}
+
+function autoupdate_error()
+{
+  $_SESSION['extensions_need_update'] = null;
+  
+  echo 'error'; exit;
+}
 
 ?>

extensions/autoupdate/trunk/ajax/ignore_list.php

@@ -15 +15 @@
   unset($_SESSION['extensions_need_update']);
   echo 'ok';
+  exit;
 }
 

extensions/autoupdate/trunk/ajax/update_language.php

@@ -35 +35 @@
 $revision = $_REQUEST['revision'];
 
-//$upgrade_status = $languages->extract_language_files('upgrade', $revision, $language_id);
-$upgrade_status = 'ok';
+$upgrade_status = $languages->extract_language_files('upgrade', $revision, $language_id);
 
 switch ($upgrade_status)

extensions/autoupdate/trunk/ajax/update_plugin.php

@@ -92 +92 @@
 }
 
-//$upgrade_status = $plugins->extract_plugin_files('upgrade', $revision, $plugin_id);
-$upgrade_status = 'ok';
+$upgrade_status = $plugins->extract_plugin_files('upgrade', $revision, $plugin_id);
 
 if (isset($_REQUEST['reactivate']))

extensions/autoupdate/trunk/ajax/update_theme.php

@@ -35 +35 @@
 $revision = $_REQUEST['revision'];
 
-//$upgrade_status = $themes->extract_theme_files('upgrade', $revision, $theme_id);
-$upgrade_status = 'ok';
+$upgrade_status = $themes->extract_theme_files('upgrade', $revision, $theme_id);
 
 switch ($upgrade_status)

extensions/autoupdate/trunk/language/ar_SA/plugin.lang.php

@@ -10 +10 @@
 $lang['Piwigo cannot retrieve upgrade file from server'] = 'لا يمكن Piwigo استرداد ملف الترقية من الملقم';
 $lang['Click here to see Piwigo %s release notes'] = 'Piwigo  اضغط هنا  %s لمشاهدة ملاحظات الاصدار';
-$lang['Some upgrades are available for you plugins'] = 'بعض الترقيات متاحة للإضافات';
-$lang['Click here see upgrade plugins page'] = 'أضغط هنا لرؤيات الترقيات الموجودة للإضافات';
-$lang['Gallery and plugins are up to date'] = 'المعرض و الاضافات حتى الآن';
 $lang['Unable to check upgrades...'] = 'لا يمكن فحص التحديثات ...';
 $lang['Click here to check upgrades now'] = 'أضغط هنا لفحص التحديثات الآن .';
@@ -45 +42 @@
 /*TODO*/$lang['Piwigo Upgrade'] = 'Piwigo Upgrade';
 /*TODO*/$lang['Extensions Upgrade'] = 'Extensions Upgrade';
+
+/*TODO*/$lang['Some upgrades are available for extensions'] = 'Some upgrades are available for extensions';
+/*TODO*/$lang['Click here to see upgrades'] = 'Click here to see upgrades';
+/*TODO*/$lang['Gallery and extensions are up to date'] = 'Gallery and extensions are up to date';
 ?>

extensions/autoupdate/trunk/language/cs_CZ/plugin.lang.php

@@ -10 +10 @@
 $lang['Piwigo cannot retrieve upgrade file from server'] = 'Piwigo nemùže získat novou verzi ze serveru';
 $lang['Click here to see Piwigo %s release notes'] = 'Pro informace o nové verzi Piwigo %s kliknìte zde';
-$lang['Some upgrades are available for you plugins'] = 'Pro nìkteré vaše doplòky jsou dostupné aktualizace';
-$lang['Click here see upgrade plugins page'] = 'Pro stránku s aktualizacemi pro doplòky kliknìte zde';
-$lang['Gallery and plugins are up to date'] = 'Galerie Piwigo a doplòky jsou aktuální';
 $lang['Unable to check upgrades...'] = 'Nebylo možné zkontrolovat aktualizace...';
 $lang['Click here to check upgrades now'] = 'Pro kontrolu aktualizací kliknìte zde';
@@ -45 +42 @@
 /*TODO*/$lang['Piwigo Upgrade'] = 'Piwigo Upgrade';
 /*TODO*/$lang['Extensions Upgrade'] = 'Extensions Upgrade';
+
+/*TODO*/$lang['Some upgrades are available for extensions'] = 'Some upgrades are available for extensions';
+/*TODO*/$lang['Click here to see upgrades'] = 'Click here to see upgrades';
+/*TODO*/$lang['Gallery and extensions are up to date'] = 'Gallery and extensions are up to date';
 ?>

extensions/autoupdate/trunk/language/da_DK/plugin.lang.php

@@ -10 +10 @@
 $lang['Piwigo cannot retrieve upgrade file from server'] = 'Piwigo kan ikke modtage opgraderings filer fra serveren';
 $lang['Click here to see Piwigo %s release notes'] = 'Klik her for at se Piwigo %s release notes';
-$lang['Some upgrades are available for you plugins'] = 'Der er opgraderinger til rådighed til dine plugins';
-$lang['Click here see upgrade plugins page'] = 'Klik her for at gå til opgraderingssiden for plugins';
-$lang['Gallery and plugins are up to date'] = 'Galleri og plugins er up to date';
 $lang['Unable to check upgrades...'] = 'Det er ikke muligt at tjekke for opgraderinger...';
 $lang['Click here to check upgrades now'] = 'Klik her for at tjekke for opgraderinger nu';
@@ -45 +42 @@
 /*TODO*/$lang['Piwigo Upgrade'] = 'Piwigo Upgrade';
 /*TODO*/$lang['Extensions Upgrade'] = 'Extensions Upgrade';
+
+/*TODO*/$lang['Some upgrades are available for extensions'] = 'Some upgrades are available for extensions';
+/*TODO*/$lang['Click here to see upgrades'] = 'Click here to see upgrades';
+/*TODO*/$lang['Gallery and extensions are up to date'] = 'Gallery and extensions are up to date';
 ?>

extensions/autoupdate/trunk/language/de_DE/plugin.lang.php

@@ -10 +10 @@
 $lang['Piwigo cannot retrieve upgrade file from server'] = 'Piwigo kann die Aktualisierungsdatei nicht vom Server laden';
 $lang['Click here to see Piwigo %s release notes'] = 'Klicken Sie hier für die Piwigo %s Versionshinweise';
-$lang['Some upgrades are available for you plugins'] = 'Einige Aktualisierungen für Plugins sind verfügbar';
-$lang['Click here see upgrade plugins page'] = 'Klicken Sie hier für die Seite der Plugin Aktualisierungen';
-$lang['Gallery and plugins are up to date'] = 'Galerie und Plugins sind aktuell';
 $lang['Unable to check upgrades...'] = 'Die überprüfung auf Aktualisierungen ist nicht möglich...';
 $lang['Click here to check upgrades now'] = 'Klicken Sie hier um auf Aktualisierungen zu prüfen';
@@ -45 +42 @@
 /*TODO*/$lang['Piwigo Upgrade'] = 'Piwigo Upgrade';
 /*TODO*/$lang['Extensions Upgrade'] = 'Extensions Upgrade';
+
+/*TODO*/$lang['Some upgrades are available for extensions'] = 'Some upgrades are available for extensions';
+/*TODO*/$lang['Click here to see upgrades'] = 'Click here to see upgrades';
+/*TODO*/$lang['Gallery and extensions are up to date'] = 'Gallery and extensions are up to date';
 ?>

extensions/autoupdate/trunk/language/en_UK/plugin.lang.php

@@ -10 +10 @@
 $lang['Piwigo cannot retrieve upgrade file from server'] = 'Piwigo cannot retrieve upgrade file from server';
 $lang['Click here to see Piwigo %s release notes'] = 'Click here to see Piwigo %s release notes';
-$lang['Some upgrades are available for you plugins'] = 'Some upgrades are available for you plugins';
-$lang['Click here see upgrade plugins page'] = 'Click here see upgrade plugins page';
-$lang['Gallery and plugins are up to date'] = 'Gallery and plugins are up to date';
 $lang['Unable to check upgrades...'] = 'Unable to check upgrades...';
 $lang['Click here to check upgrades now'] = 'Click here to check upgrades now';
@@ -45 +42 @@
 $lang['Piwigo Upgrade'] = 'Piwigo Upgrade';
 $lang['Extensions Upgrade'] = 'Extensions Upgrade';
+
+$lang['Some upgrades are available for extensions'] = 'Some upgrades are available for extensions';
+$lang['Click here to see upgrades'] = 'Click here to see upgrades';
+$lang['Gallery and extensions are up to date'] = 'Gallery and extensions are up to date';
 ?>

extensions/autoupdate/trunk/language/es_ES/plugin.lang.php

@@ -10 +10 @@
 $lang['Piwigo cannot retrieve upgrade file from server'] = 'Piwigo no puede recuperar el fichero de actualización desde el servidor';
 $lang['Click here to see Piwigo %s release notes'] = 'Haga clic aquí para ver las informaciones relativas a Piwigo %s';
-$lang['Some upgrades are available for you plugins'] = 'Hay actualizaciónes disponibles para su plugins';
-$lang['Click here see upgrade plugins page'] = 'Haga clic aquí para visualizar la página de actualización des plugins';
-$lang['Gallery and plugins are up to date'] = 'Su galería y sus plugins están actualizados';
 $lang['Unable to check upgrades...'] = 'Imposible verificar las actualizaciónes...';
 $lang['Click here to check upgrades now'] = 'Haga clic aquí para verificar las actualizaciónes';
@@ -45 +42 @@
 /*TODO*/$lang['Piwigo Upgrade'] = 'Piwigo Upgrade';
 /*TODO*/$lang['Extensions Upgrade'] = 'Extensions Upgrade';
+
+/*TODO*/$lang['Some upgrades are available for extensions'] = 'Some upgrades are available for extensions';
+/*TODO*/$lang['Click here to see upgrades'] = 'Click here to see upgrades';
+/*TODO*/$lang['Gallery and extensions are up to date'] = 'Gallery and extensions are up to date';
 ?>

extensions/autoupdate/trunk/language/fr_FR/plugin.lang.php

@@ -10 +10 @@
 $lang['Piwigo cannot retrieve upgrade file from server'] = 'Piwigo ne peut pas récupérer le fichier de mise à jour depuis le serveur';
 $lang['Click here to see Piwigo %s release notes'] = 'Cliquez ici pour afficher les informations relatives à Piwigo %s';
-$lang['Some upgrades are available for you plugins'] = 'Des mises à jour sont disponibles pour vos plugins';
-$lang['Click here see upgrade plugins page'] = 'Cliquez ici pour afficher la page de mise à jour des plugins';
-$lang['Gallery and plugins are up to date'] = 'Votre galerie et vos plugins sont à jour';
 $lang['Unable to check upgrades...'] = 'Impossible de vérifier les mises à jour...';
 $lang['Click here to check upgrades now'] = 'Cliquez ici pour vérifier les mises à jour maintenant';
@@ -45 +42 @@
 $lang['Piwigo Upgrade'] = 'Mise à jour de Piwigo';
 $lang['Extensions Upgrade'] = 'Mise à jour des extensions';
+
+$lang['Some upgrades are available for extensions'] = 'Des mises à jour sont disponibles pour les extensions';
+$lang['Click here to see upgrades'] = 'Cliquez ici pour voir les mises à jour';
+$lang['Gallery and extensions are up to date'] = 'Votre galerie et les extensions sont à jour';
 ?>

extensions/autoupdate/trunk/language/hr_HR/plugin.lang.php

@@ -10 +10 @@
 $lang['Piwigo cannot retrieve upgrade file from server'] = 'Piwigo ne može dohvatiti zapis nadogradnje sa poslužitelja';
 $lang['Click here to see Piwigo %s release notes'] = 'Kliknite ovdje za prikaz zabilješki Piwigo %s izdanja';
-$lang['Some upgrades are available for you plugins'] = 'Dostupne su nadogradnje za neke dodatke (plugin-ove)';
-$lang['Click here see upgrade plugins page'] = 'Kliknite za pregled stranice nadogradnji dodataka';
-$lang['Gallery and plugins are up to date'] = 'Galerija i dodaci su ažurni';
 $lang['Unable to check upgrades...'] = 'Nemoguće je provjeriti nadogradnje...';
 $lang['Click here to check upgrades now'] = 'Kliknite za provjeru nadogradnji sada';
@@ -45 +42 @@
 /*TODO*/$lang['Piwigo Upgrade'] = 'Piwigo Upgrade';
 /*TODO*/$lang['Extensions Upgrade'] = 'Extensions Upgrade';
+
+/*TODO*/$lang['Some upgrades are available for extensions'] = 'Some upgrades are available for extensions';
+/*TODO*/$lang['Click here to see upgrades'] = 'Click here to see upgrades';
+/*TODO*/$lang['Gallery and extensions are up to date'] = 'Gallery and extensions are up to date';
 ?>

extensions/autoupdate/trunk/language/hu_HU/plugin.lang.php

@@ -10 +10 @@
 $lang['Piwigo cannot retrieve upgrade file from server'] = 'Nem tudom letölteni a frissítést a Piwigo fájl szerverről';
 $lang['Click here to see Piwigo %s release notes'] = 'Kattintson ide a Piwigo %s kiadási megjegyzések megtekintéséhez';
-$lang['Some upgrades are available for you plugins'] = 'Frissítések találhatók egyes bővítményekhez';
-$lang['Click here see upgrade plugins page'] = 'Kattintson ide a "frissíthető bővítmények" oldal megtekintéséhez ';
-$lang['Gallery and plugins are up to date'] = 'A galéria és a bővítmények a legfrissebbek';
 $lang['Unable to check upgrades...'] = 'A frissítés ellenőrzése nem lehetséges....';
 $lang['Click here to check upgrades now'] = 'Kattintson ide a frissítések ellenőrzéséhez';
@@ -46 +43 @@
 $lang['Piwigo Upgrade'] = 'Piwigo frissítése';
 $lang['Extensions Upgrade'] = 'Bővítmények frissítése';
+
+/*TODO*/$lang['Some upgrades are available for extensions'] = 'Some upgrades are available for extensions';
+/*TODO*/$lang['Click here to see upgrades'] = 'Click here to see upgrades';
+/*TODO*/$lang['Gallery and extensions are up to date'] = 'Gallery and extensions are up to date';
 ?>

extensions/autoupdate/trunk/language/it_IT/plugin.lang.php

@@ -10 +10 @@
 $lang['Piwigo cannot retrieve upgrade file from server'] = 'Piwigo non può recuperare i file d\'aggiornamento dal server';
 $lang['Click here to see Piwigo %s release notes'] = 'Cliccare qui per visualizzare le informazioni relative a Piwigo %s';
-$lang['Some upgrades are available for you plugins'] = 'Degli aggiornamenti sono disponibili per i vostri plugins';
-$lang['Click here see upgrade plugins page'] = 'Cliccare qui per visualizzare la pagina di aggiornamento dei plugins';
-$lang['Gallery and plugins are up to date'] = 'La vostra galleria e i vostri plugins sono aggiorno';
 $lang['Unable to check upgrades...'] = 'Non è stato possibile verificare gli aggiornamenti...';
 $lang['Click here to check upgrades now'] = 'Cliccare qui per verificare gli aggiornameti ora';
@@ -45 +42 @@
 /*TODO*/$lang['Piwigo Upgrade'] = 'Piwigo Upgrade';
 /*TODO*/$lang['Extensions Upgrade'] = 'Extensions Upgrade';
+
+/*TODO*/$lang['Some upgrades are available for extensions'] = 'Some upgrades are available for extensions';
+/*TODO*/$lang['Click here to see upgrades'] = 'Click here to see upgrades';
+/*TODO*/$lang['Gallery and extensions are up to date'] = 'Gallery and extensions are up to date';
 ?>

extensions/autoupdate/trunk/language/ja_JP/plugin.lang.php

@@ -10 +10 @@
 $lang['Piwigo cannot retrieve upgrade file from server'] = 'Piwigoは、アップグレードファイルをサーバから検索できません。';
 $lang['Click here to see Piwigo %s release notes'] = 'Piwigo %s リリースノートを閲覧するには、ここをクリックしてください。';
-$lang['Some upgrades are available for you plugins'] = 'あなたのプラグインに関して、いくつかのアップグレードが利用できます。';
-$lang['Click here see upgrade plugins page'] = 'プラグインのアップグレードページを閲覧するには、ここをクリックしてください。';
-$lang['Gallery and plugins are up to date'] = 'ギャラリーおよびプラグインは最新版です。';
 $lang['Unable to check upgrades...'] = 'アップグレードを確認できません ...';
 $lang['Click here to check upgrades now'] = 'アップグレードするには、ここをクリックしてください。';
@@ -45 +42 @@
 /*TODO*/$lang['Piwigo Upgrade'] = 'Piwigo Upgrade';
 /*TODO*/$lang['Extensions Upgrade'] = 'Extensions Upgrade';
+
+/*TODO*/$lang['Some upgrades are available for extensions'] = 'Some upgrades are available for extensions';
+/*TODO*/$lang['Click here to see upgrades'] = 'Click here to see upgrades';
+/*TODO*/$lang['Gallery and extensions are up to date'] = 'Gallery and extensions are up to date';
 ?>

extensions/autoupdate/trunk/language/ka_GE/plugin.lang.php

@@ -10 +10 @@
 $lang['Piwigo cannot retrieve upgrade file from server'] = 'Piwigo ვერ იღებს განახლების ფაილებს სერვერიდან';
 $lang['Click here to see Piwigo %s release notes'] = 'დაწკაპეთ აქ რათა იხილოთ Piwigo %s  რელიზის შესახებ';
-$lang['Some upgrades are available for you plugins'] = 'ხელმისაწვდომია მოდულების ზოგიერთი განახლება';
-$lang['Click here see upgrade plugins page'] = 'დაწკაპეთ აქ, რათა ეწვიოთ მოდულების განახლების გვერდს';
-$lang['Gallery and plugins are up to date'] = 'გალერეა და მოდულები განახლებულია';
 $lang['Unable to check upgrades...'] = 'განახლების შემოწმება შეუძლებელია...';
 $lang['Click here to check upgrades now'] = 'დაწკპეთ აქ, რათა ეხლავე შეამოწმოთ განახლება';
@@ -46 +43 @@
 /*TODO*/$lang['Piwigo Upgrade'] = 'Piwigo Upgrade';
 /*TODO*/$lang['Extensions Upgrade'] = 'Extensions Upgrade';
+
+/*TODO*/$lang['Some upgrades are available for extensions'] = 'Some upgrades are available for extensions';
+/*TODO*/$lang['Click here to see upgrades'] = 'Click here to see upgrades';
+/*TODO*/$lang['Gallery and extensions are up to date'] = 'Gallery and extensions are up to date';
 ?>

extensions/autoupdate/trunk/language/lv_LV/plugin.lang.php

@@ -10 +10 @@
 $lang['Piwigo cannot retrieve upgrade file from server'] = 'Piwigo nevar ielādēt jauninājuma failu no servera';
 $lang['Click here to see Piwigo %s release notes'] = 'Spiest te, lai lai aplūkotu Piwigo %s laidiena piezīmes';
-$lang['Some upgrades are available for you plugins'] = 'Ir pieejami jauninājumi dažiem Jūsu spraudņiem';
-$lang['Click here see upgrade plugins page'] = 'Spiest te, lai skatītu spraudņu jauninājumu lapu';
-$lang['Gallery and plugins are up to date'] = 'Galerija un spraudņi ir aktuāli (up to date)';
 $lang['Unable to check upgrades...'] = 'Neiespējami pārbaudīt jauninājumus...';
 $lang['Click here to check upgrades now'] = 'Spiest te, lai pārbaudītu jauninājumus tūlīt';
@@ -45 +42 @@
 /*TODO*/$lang['Piwigo Upgrade'] = 'Piwigo Upgrade';
 /*TODO*/$lang['Extensions Upgrade'] = 'Extensions Upgrade';
+
+/*TODO*/$lang['Some upgrades are available for extensions'] = 'Some upgrades are available for extensions';
+/*TODO*/$lang['Click here to see upgrades'] = 'Click here to see upgrades';
+/*TODO*/$lang['Gallery and extensions are up to date'] = 'Gallery and extensions are up to date';
 ?>

extensions/autoupdate/trunk/language/nl_NL/plugin.lang.php

@@ -10 +10 @@
 $lang['Piwigo cannot retrieve upgrade file from server'] = 'Piwigo kan het upgrade-bestand niet van de server verkrijgen';
 $lang['Click here to see Piwigo %s release notes'] = 'Klik hier om de Piwigo %s release-aantekeningen te bekijken';
-$lang['Some upgrades are available for you plugins'] = 'Er zijn upgrades beschikbaar voor sommige van uw plugins';
-$lang['Click here see upgrade plugins page'] = 'Klik hier om naar de upgrade-plugins-pagina te gaan';
-$lang['Gallery and plugins are up to date'] = 'Galerie en plugins zijn up to date';
 $lang['Unable to check upgrades...'] = 'Niet mogelijk om upgrades te controleren...';
 $lang['Click here to check upgrades now'] = 'Klik hier om nu naar upgrades te zoeken';
@@ -45 +42 @@
 /*TODO*/$lang['Piwigo Upgrade'] = 'Piwigo Upgrade';
 /*TODO*/$lang['Extensions Upgrade'] = 'Extensions Upgrade';
+
+/*TODO*/$lang['Some upgrades are available for extensions'] = 'Some upgrades are available for extensions';
+/*TODO*/$lang['Click here to see upgrades'] = 'Click here to see upgrades';
+/*TODO*/$lang['Gallery and extensions are up to date'] = 'Gallery and extensions are up to date';
 ?>

extensions/autoupdate/trunk/language/no_NO/plugin.lang.php

@@ -10 +10 @@
 $lang['Piwigo cannot retrieve upgrade file from server'] = 'Piwigo kan ikke motta oppgraderingsfilen fra serveren';
 $lang['Click here to see Piwigo %s release notes'] = 'Klikk her for å se Piwigos %s utgivelses informasjon';
-$lang['Some upgrades are available for you plugins'] = 'Noen oppgraderinger er tilgjengelig for dine tilleggsprogrammer';
-$lang['Click here see upgrade plugins page'] = 'Klikk her for å se oppgraderingssiden for dine tilleggsverktøy';
-$lang['Gallery and plugins are up to date'] = 'Galleri og tilleggsverktøy er alle oppdaterte';
 $lang['Unable to check upgrades...'] = 'Ike i stand til å sjekke for oppgraderinger...';
 $lang['Click here to check upgrades now'] = 'Klikk her for å sjekke oppgraderinger nå';
@@ -44 +41 @@
 /*TODO*/$lang['Piwigo Upgrade'] = 'Piwigo Upgrade';
 /*TODO*/$lang['Extensions Upgrade'] = 'Extensions Upgrade';
+
+/*TODO*/$lang['Some upgrades are available for extensions'] = 'Some upgrades are available for extensions';
+/*TODO*/$lang['Click here to see upgrades'] = 'Click here to see upgrades';
+/*TODO*/$lang['Gallery and extensions are up to date'] = 'Gallery and extensions are up to date';
 ?>

extensions/autoupdate/trunk/language/pl_PL/plugin.lang.php

@@ -10 +10 @@
 $lang['Piwigo cannot retrieve upgrade file from server'] = 'Piwigo nie może ściągnąć pliku aktualizacji z serwera';
 $lang['Click here to see Piwigo %s release notes'] = 'Kliknij tutaj, aby przejść do informacji o wydaniu Piwigo %s ';
-$lang['Some upgrades are available for you plugins'] = 'Są dostępne aktualizacje do niektórych Twoich wtyczek';
-$lang['Click here see upgrade plugins page'] = 'Kliknij tutaj, aby przejść na stronę aktualizacji wtyczek';
-$lang['Gallery and plugins are up to date'] = 'Galeria i wtyczki są aktualne';
 $lang['Unable to check upgrades...'] = 'Nie można sprawdzić aktualizacji...';
 $lang['Click here to check upgrades now'] = 'Kliknij tutaj, aby teraz sprawdzić aktualizacje';
@@ -45 +42 @@
 /*TODO*/$lang['Piwigo Upgrade'] = 'Piwigo Upgrade';
 /*TODO*/$lang['Extensions Upgrade'] = 'Extensions Upgrade';
+
+/*TODO*/$lang['Some upgrades are available for extensions'] = 'Some upgrades are available for extensions';
+/*TODO*/$lang['Click here to see upgrades'] = 'Click here to see upgrades';
+/*TODO*/$lang['Gallery and extensions are up to date'] = 'Gallery and extensions are up to date';
 ?>

extensions/autoupdate/trunk/language/pt_PT/plugin.lang.php

@@ -10 +10 @@
 $lang['Piwigo cannot retrieve upgrade file from server'] = 'Piwigo não consegue recuperar o ficheiro de actualização do servidor remoto.';
 $lang['Click here to see Piwigo %s release notes'] = 'Clique aqui para ver as notas de lançamento de Piwigo %s';
-$lang['Some upgrades are available for you plugins'] = 'Estão disponíveis algumas actualizações para os seus plugins';
-$lang['Click here see upgrade plugins page'] = 'Clique aqui para ver a página de actualização de plugins';
-$lang['Gallery and plugins are up to date'] = 'Galeria e plugins estão actualizados';
 $lang['Unable to check upgrades...'] = 'Impossível verificar a existência de novas actualizações...';
 $lang['Click here to check upgrades now'] = 'Clique aqui para verificar agora por novas actualizações';
@@ -45 +42 @@
 /*TODO*/$lang['Piwigo Upgrade'] = 'Piwigo Upgrade';
 /*TODO*/$lang['Extensions Upgrade'] = 'Extensions Upgrade';
+
+/*TODO*/$lang['Some upgrades are available for extensions'] = 'Some upgrades are available for extensions';
+/*TODO*/$lang['Click here to see upgrades'] = 'Click here to see upgrades';
+/*TODO*/$lang['Gallery and extensions are up to date'] = 'Gallery and extensions are up to date';
 ?>

extensions/autoupdate/trunk/language/ru_RU/plugin.lang.php

@@ -10 +10 @@
 $lang['Piwigo cannot retrieve upgrade file from server'] = 'Piwigo не может получить файлы обновления с сервера';
 $lang['Click here to see Piwigo %s release notes'] = 'Нажмите, чтобы посмотреть заметки к релизу Piwigo %s';
-$lang['Some upgrades are available for you plugins'] = 'Доступны некоторые обновления для плагинов';
-$lang['Click here see upgrade plugins page'] = 'Нажмите сюда, чтобы посмотреть страницу обновления плагинов';
-$lang['Gallery and plugins are up to date'] = 'Галерея и плагины обновлены';
 $lang['Unable to check upgrades...'] = 'Невозможно проверить обновления...';
 $lang['Click here to check upgrades now'] = 'Нажмите сюда, чтобы проверить обновления сейчас';
@@ -45 +42 @@
 /*TODO*/$lang['Piwigo Upgrade'] = 'Piwigo Upgrade';
 /*TODO*/$lang['Extensions Upgrade'] = 'Extensions Upgrade';
+
+/*TODO*/$lang['Some upgrades are available for extensions'] = 'Some upgrades are available for extensions';
+/*TODO*/$lang['Click here to see upgrades'] = 'Click here to see upgrades';
+/*TODO*/$lang['Gallery and extensions are up to date'] = 'Gallery and extensions are up to date';
 ?>

extensions/autoupdate/trunk/language/sk_SK/plugin.lang.php

@@ -10 +10 @@
 $lang['Piwigo cannot retrieve upgrade file from server'] = 'Piwigo nemôže získať upgradovací súbor zo servra';
 $lang['Click here to see Piwigo %s release notes'] = 'Kliknite sem na zobrazenie poznámok k vydaniu Piwigo %s';
-$lang['Some upgrades are available for you plugins'] = 'Nejaké upgrady sú dostupné pre Vaše pluginy';
-$lang['Click here see upgrade plugins page'] = 'Kliknite sem na zobrazenie upgradov pluginov';
-$lang['Gallery and plugins are up to date'] = 'Galéria a pluginy sú aktuálne';
 $lang['Unable to check upgrades...'] = 'Nemožno skontrolovať upgrady...';
 $lang['Click here to check upgrades now'] = 'Kliknite sem na skontrolovanie upgradov';
@@ -45 +42 @@
 /*TODO*/$lang['Piwigo Upgrade'] = 'Piwigo Upgrade';
 /*TODO*/$lang['Extensions Upgrade'] = 'Extensions Upgrade';
+
+/*TODO*/$lang['Some upgrades are available for extensions'] = 'Some upgrades are available for extensions';
+/*TODO*/$lang['Click here to see upgrades'] = 'Click here to see upgrades';
+/*TODO*/$lang['Gallery and extensions are up to date'] = 'Gallery and extensions are up to date';
 ?>

extensions/autoupdate/trunk/language/vi_VN/plugin.lang.php

@@ -10 +10 @@
 $lang['Piwigo cannot retrieve upgrade file from server'] = 'Piwigo không thể nhận được tệp tin nâng cấp từ  máy chủ';
 $lang['Click here to see Piwigo %s release notes'] = 'Click vào đây để xem xem những ghi chú phát hành của phiên bản Piwigo %s';
-$lang['Some upgrades are available for you plugins'] = 'Có một số bản nâng cấp có thể sử dụng được cho những plugins của bạn';
-$lang['Click here see upgrade plugins page'] = 'Click vào đây để xem trang của plugins';
-$lang['Gallery and plugins are up to date'] = 'Thư viện hình và plugin đã được cập nhật';
 $lang['Unable to check upgrades...'] = 'Không thể kiểm tra bản nâng cấp...';
 $lang['Click here to check upgrades now'] = 'Click vào đây đểm kiểm tra bản nâng cấp ngay';
@@ -45 +42 @@
 /*TODO*/$lang['Piwigo Upgrade'] = 'Piwigo Upgrade';
 /*TODO*/$lang['Extensions Upgrade'] = 'Extensions Upgrade';
+
+/*TODO*/$lang['Some upgrades are available for extensions'] = 'Some upgrades are available for extensions';
+/*TODO*/$lang['Click here to see upgrades'] = 'Click here to see upgrades';
+/*TODO*/$lang['Gallery and extensions are up to date'] = 'Gallery and extensions are up to date';
 ?>

extensions/autoupdate/trunk/language/zh_CN/plugin.lang.php

@@ -10 +10 @@
 $lang['Piwigo cannot retrieve upgrade file from server'] = 'Piwigo 不能从服务器中获取升级文件';
 $lang['Click here to see Piwigo %s release notes'] = '点击此查看 Piwigo %s 的版通知';
-$lang['Some upgrades are available for you plugins'] = '您的插件已有更新了';
-$lang['Click here see upgrade plugins page'] = '点击此查看插件升级页面';
-$lang['Gallery and plugins are up to date'] = '图库和插件已是最新版';
 $lang['Unable to check upgrades...'] = '不能检查更新...';
 $lang['Click here to check upgrades now'] = '点击此检查更新';
@@ -45 +42 @@
 /*TODO*/$lang['Piwigo Upgrade'] = 'Piwigo Upgrade';
 /*TODO*/$lang['Extensions Upgrade'] = 'Extensions Upgrade';
+
+/*TODO*/$lang['Some upgrades are available for extensions'] = 'Some upgrades are available for extensions';
+/*TODO*/$lang['Click here to see upgrades'] = 'Click here to see upgrades';
+/*TODO*/$lang['Gallery and extensions are up to date'] = 'Gallery and extensions are up to date';
 ?>

extensions/autoupdate/trunk/main.inc.php

@@ -17 +17 @@
 
 // Upgrade?
-if (!isset($conf['AU_ignore']['plugins']) or !isset($conf['AU_ignore']['themes']) or !isset($conf['AU_ignore']['languages']))
+if (!isset($conf['AU_ignore']['plugins']))
 {
   $conf['AU_ignore'] = array('plugins'=>array(),'themes'=>array(),'languages'=>array());
@@ -38 +38 @@
     {
       unset($_SESSION['need_update']);
-      unset($_SESSION['plugins_need_update']);
+      unset($_SESSION['extensions_need_update']);
     }
 
-    if (!isset($_SESSION['need_update']) or !isset($_SESSION['plugins_need_update'])
-      or $_SESSION['need_update'] !== false or $_SESSION['plugins_need_update'] !== array())
+    if (!isset($_SESSION['need_update']) or !isset($_SESSION['extensions_need_update'])
+      or $_SESSION['need_update'] !== false or $_SESSION['extensions_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' and method_exists('template', 'set_prefilter'))
-  {
-    include(dirname(__FILE__).'/plugins_update.php');
   }
 

extensions/autoupdate/trunk/template/extensions.tpl

@@ -8 +8 @@
 var successHead = '{'Upgrade Complete'|@translate|@escape:'javascript'}';
 var errorMsg    = '{'an error happened'|@translate|@escape:'javascript'}';
+var restoreMsg  = '{'autoupdate_reset_ignore'|@translate|@escape:'javascript'}';
 
 {literal}
@@ -36 +37 @@
       "plugins/autoupdate/ajax/ignore_list.php",
       { reset: true },
-      function(data) { if (data == "ok") { jQuery(".pluginBox, fieldset").show(); jQuery("#reset_ignore").hide(); } }
+      function(data) {
+        if (data == "ok") {
+          jQuery(".pluginBox, fieldset").show();
+          jQuery("#up_to_date").hide();
+          jQuery("#reset_ignore").hide();
+          jQuery("#ignored").hide();
+        }
+      }
     );
     return false;
@@ -46 +54 @@
   var types = new Array('plugin', 'theme', 'language');
   var total = 0;
+  var ignored = 0;
   for (i=0;i<3;i++) {
     nbExtensions = 0;
@@ -51 +60 @@
         if (jQuery(this).css('display') == 'block')
           nbExtensions++;
+        else
+          ignored++;
       });
     total = total + nbExtensions;
@@ -60 +71 @@
     jQuery("#update_all").hide();
     jQuery("#up_to_date").show();
+  }
+  if (ignored > 0) {
+    jQuery("#reset_ignore").val(restoreMsg + ' (' + ignored + ')');
   }
 }
@@ -132 +146 @@
   <h2>Piwigo AutoUpgrade</h2>
 </div>
+
 <div>
 <input type="button" id="update_all" value="{'autoupdate_update_all'|@translate}">
 <input type="button" id="reset_ignore" value="{'autoupdate_reset_ignore'|@translate}" {if !$SHOW_RESET}style="display:none;"{/if}>
 </div>
+
+<p id="up_to_date" style="display:none; text-align:left; margin-left:20px;">{'All extensions are up to date.'|@translate}</p>
 
 {if not empty($update_plugins)}
@@ -262 +279 @@
 </div>
 {/if}
-
-<p>{'All extensions are up to date'|@translate}</p>

extensions/autoupdate/trunk/template/head.tpl

@@ -1 @@
-{html_head}
-<script type="text/javascript">
-var mess_error = '{'Unable to check upgrades...'|@translate}<br><a href="admin.php?action=check_autoupdate">{'Click here to check upgrades now'|@translate}</a>';
+{footer_script}
+var error = '{"Unable to check upgrades..."|@translate|@escape:"javascript"}<br><a href="admin.php?action=check_autoupdate">{"Click here to check upgrades now"|@translate|@escape:"javascript"}</a>';
+var piwigo_upgrade = '{"A new version of Piwigo is available."|@translate|@escape:"javascript"}<br><a href="admin.php?page=plugin-autoupdate">{"Click here to upgrade automatically"|@translate|@escape:"javascript"}</a>';
+var ext_upgrade = '{"Some upgrades are available for extensions"|@translate|@escape:"javascript"}<br><a href="admin.php?page=plugin-autoupdate-ext">{"Click here to see upgrades"|@translate|@escape:"javascript"}</a>';
+var up_to_date = '{"Gallery and extensions are up to date"|@translate|@escape:"javascript"}';
 
 window.onload = function () {ldelim}
@@ -10 +12 @@
     timeout: 10000,  // 10 sec timeout
     success: function (data) {ldelim}
-      var reg = new RegExp("(warning|notice)","i");
-      if (data.match(reg)) {ldelim}
-        data = mess_error;
-      }
-      jQuery('#autoupdate').html(data);
+      var reg = new RegExp("^(error|piwigo_upgrade|ext_upgrade|up_to_date)$","i");
+      if (!data.match(reg))
+        jQuery('#autoupdate').html(error);
+      else
+        jQuery('#autoupdate').html(eval(data));
     },
     error: function() {ldelim}
-     jQuery('#autoupdate').html(mess_error);
+     jQuery('#autoupdate').html(error);
     }
   });
 }
-</script>
-{/html_head}
+{/footer_script}
 <p id="autoupdate"><img src="plugins/autoupdate/template/ajax-loader.gif"> &nbsp; {'Checking upgrades for gallery and plugins...'|@translate}</p>