- If there is not new plugins to check, we don't get any more error message.

- small corrections in configuration.html and cat_modify.tpl.

git-svn-id: http://piwigo.org/svn/trunk@2701 68402e56-0260-453c-a942-63ccdbb3a9ee

7 files changed, 24 insertions, 14 deletions

diff --git a/admin/include/plugins.class.php b/admin/include/plugins.class.php
index 2d2bd3afe..ff478be83 100644
--- a/admin/include/plugins.class.php
+++ b/admin/include/plugins.class.php
@@ -25,7 +25,7 @@ class plugins
 {
   var $fs_plugins = array();
   var $db_plugins_by_id = array();
-  var $server_plugins;
+  var $server_plugins = array();
 
   /**
    * Initialize $fs_plugins and $db_plugins_by_id
@@ -302,14 +302,19 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id="' . $plugin_id . '"';
     // Retrieve PEM plugins infos
     $url = PEM_URL . '/api/get_revision_list.php?category_id=12&format=php&last_revision_only=true';
     $url .= '&version=' . implode(',', $versions_to_check);
+
     if (!empty($plugins_to_check))
     {
       $url .= $new ? '&extension_exclude=' : '&extension_include=';
       $url .= implode(',', $plugins_to_check);
     }
-    if ($source = @file_get_contents($url)
-      and $pem_plugins = @unserialize($source))
+    if ($source = @file_get_contents($url))
     {
+      $pem_plugins = @unserialize($source);
+      if (!is_array($pem_plugins))
+      {
+        return false;
+      }
       foreach ($pem_plugins as $plugin)
       {
         $this->server_plugins[$plugin['extension_id']] = $plugin;
diff --git a/admin/template/goto/cat_modify.tpl b/admin/template/goto/cat_modify.tpl
index d27311c7b..4648b92d8 100644
--- a/admin/template/goto/cat_modify.tpl
+++ b/admin/template/goto/cat_modify.tpl
@@ -108,7 +108,7 @@
       {html_options options=$image_order_field_options selected=$order.FIELD }
     </select>
     <select name="order_direction_{$order.ID}">
-      {html_options options=$image_order_direction_options selected=$order.DIRECTION }}
+      {html_options options=$image_order_direction_options selected=$order.DIRECTION }
     </select><br/>
   {/foreach}
   
diff --git a/language/en_UK/help/configuration.html b/language/en_UK/help/configuration.html
index de685058a..da4c59a75 100644
--- a/language/en_UK/help/configuration.html
+++ b/language/en_UK/help/configuration.html
@@ -4,7 +4,7 @@
 screen only shows simple configuration parameters that should be enough for
 the vast majority of administrators. If you want to see other numerous (and
 advanced) configuration parameters, read file <span
-cass="filename">include/config_default.inc.php</span>.</p>
+class="filename">include/config_default.inc.php</span>.</p>
 
 <p>This screen is divided in several sections, regrouping configuration
 parameters by theme.</p>
@@ -37,7 +37,7 @@ page.</li>
 </ul>
 
 <h3>History</h3>
-<ul>
+
   <p>Visits on pages <span
   class="pwgScreen">category.php</span> and <span
   class="pwgScreen">picture.php</span> will be saved in the
@@ -46,6 +46,7 @@ page.</li>
   <p>Visits will be shown in <span
   class="pwgScreen">Administration, Specials, History</span>.</p>
 
+<ul>
   <li><strong>Save page visits by guests</strong>: page visits by guests will be saved.</li>
 
   <li><strong>Save page visits by users</strong>: visits by registrered users will be saved.</li>
diff --git a/language/es_ES/help/configuration.html b/language/es_ES/help/configuration.html
index 9aa5e6b2f..b09e492e7 100644
--- a/language/es_ES/help/configuration.html
+++ b/language/es_ES/help/configuration.html
@@ -1,7 +1,7 @@
 <h2>Configuración</h2>
 
 <p>Esta pantalla permite administrar la configuración básica. En efecto, sólo son mostrados los parámetros de configuración que deben bastar para la mayoría de los administradores. Si usted desea ver la lista de los numerosos (y acercados) parámetros, leer el fichero <span
-cass="filename">include/config_default.inc.php</span></p>
+class="filename">include/config_default.inc.php</span></p>
 
 <p>Esta pantalla es divisié en varias secciones, reagrupando los parámetros por tema.</p>
 
@@ -27,13 +27,14 @@ cass="filename">include/config_default.inc.php</span></p>
 </ul>
 
 <h3>Reseña histórica</h3>
-<ul>
+
   <p>Las visitas de las páginas <span
 class="pwgScreen">index.php</span> et <span
 class="pwgScreen">picture.php</span> Son registrados en la mesa <code>history</code>.</p>
 
   <p>Las visitas son fijadas en la pantalla <span class="pwgScreen">Administración, Classes de matemáticas superiores, Reseña histórica</span>.</p>
 
+<ul>
   <li><strong>Registrar las páginas visitadas por los invitados</strong>: las visitas de las páginas por los invitados son registradas.</li>
 
   <li><strong>Registrar las páginas visitadas por los utilizadores</strong>: las visitas del pagespar los utilizadores registrados son registrados.</li>
diff --git a/language/fr_FR/help/configuration.html b/language/fr_FR/help/configuration.html
index 5f4b274ee..8539767fd 100644
--- a/language/fr_FR/help/configuration.html
+++ b/language/fr_FR/help/configuration.html
@@ -4,7 +4,7 @@
 montrés les paramètres de configuration qui doivent suffire à la majorité
 des administrateurs. Si vous souhaitez voir la liste des nombreux (et
 avancés) paramètres, lire le fichier <span
-cass="filename">include/config_default.inc.php</span></p>
+class="filename">include/config_default.inc.php</span></p>
 
 <p>Cet écran est divisié en plusieurs sections, regroupant les paramètres
 par thème.</p>
@@ -37,7 +37,7 @@ galerie.</li>
 </ul>
 
 <h3>Historique</h3>
-<ul>
+
   <p>les visites des pages <span
 class="pwgScreen">index.php</span> et <span
 class="pwgScreen">picture.php</span> sont
@@ -45,6 +45,7 @@ enregistrées dans la table <code>history</code>.</p>
 
   <p>Les visites sont affichées dans l'écran <span class="pwgScreen">Administration, Spéciales, Historique</span>.</p>
 
+<ul>
   <li><strong>Enregistrer les pages visitées par les invités</strong>: les visites des pages par les invités sont enregistrées.</li>
 
   <li><strong>Enregistrer les pages visitées par les utilisateurs</strong>: les visites des pagespar les utilisateurs enregistrés sont enregistrées.</li>
diff --git a/language/it_IT/help/configuration.html b/language/it_IT/help/configuration.html
index 8b5b18eab..3161b7281 100644
--- a/language/it_IT/help/configuration.html
+++ b/language/it_IT/help/configuration.html
@@ -4,7 +4,7 @@
 Infatti, questo schermo mostra soltanto i parametri che dovrebbero 

 bastare per la maggiore parte degli amministratori. Se volete 

 vedere gli altri numerosi parametri di configurazione, leggete il file <span

-cass="filename">include/config_default.inc.php</span>.</p>

+class="filename">include/config_default.inc.php</span>.</p>

 

 <p>Questo schermo è diviso in diverse sezioni, raggruppando i parametri 

 di configurazione per tema.</p>

@@ -37,7 +37,7 @@ possono dare un voto alle immagini.</li>
 </ul>

 

 <h3>Cronologia</h3>

-<ul>

+

   <p>le visite delle pagine <span

 class="pwgScreen">category.php</span> e <span

 class="pwgScreen">picture.php</span> sono

@@ -45,6 +45,7 @@ registrate nella tabella <code>history</code> table.</p>
   

   <p>Le visite sono visualizzate nello schermo <span class="pwgScreen">Amministrazione, Speciale, Cronologia</span>.</p>

 

+<ul>

   <li><strong>Registrare le pagine visitate dagli ospiti</strong>: le pagini visitate dagli ospiti sono registrate.</li>

 

   <li><strong>Registrare le pagine visitate dagli utenti</strong>: le pagini visitate dagli utenti sono registrate.</li>

diff --git a/language/nl_NL/help/configuration.html b/language/nl_NL/help/configuration.html
index b613d03a2..25d6405c9 100644
--- a/language/nl_NL/help/configuration.html
+++ b/language/nl_NL/help/configuration.html
@@ -2,7 +2,7 @@
 
 <p>Dit scherm geeft de administrator de mogenlijkheid tot basisconfiguratie. Dit scherm toont namelijk slechts eenvoudige 
 configuratieparameters die zouden moeten zijn genoeg voor de overgrote meerderheid van beheerders. Als je de andere mogelijkheden wilt zien
-(geavanceerde) over de configuratie parameters, lees dan <span cass="filename">include/config_default.inc.php</span>.</p>
+(geavanceerde) over de configuratie parameters, lees dan <span class="filename">include/config_default.inc.php</span>.</p>
 
 <p>Dit scherm wordt verdeeld in verscheidene secties, hergroeperend configuratieparameters per thema.</p>
 
@@ -30,11 +30,12 @@ configuratieparameters die zouden moeten zijn genoeg voor de overgrote meerderhe
 </ul>
 
 <h3>Geschiedenis</h3>
-<ul>
+
   <p>Bezoek op de pagina's <span class="pwgScreen">category.php</span> en <span class="pwgScreen">picture.php</span> worden opgeslagen in de <code>history</code> tabel.</p>
   
   <p>Bezoek word getoond in <span class="pwgScreen">Administratie, Speciaal, Geschiedenis</span>.</p>
 
+<ul>
   <li><strong>Bewaar pagina bezoek door gasten</strong>: pagina bezoek van gasten wordt opgeslagen.</li>
 
   <li><strong>Bewaar pagina bezoek door gebruikers</strong>: pagina bezoek van geregistreerde gebruikers wordt opgeslagen.</li>