merge r3136 from trunk

- moved check upgrade feed code to admin/include/functions_upgrade.php
- refactored some code (shorter and somehow faster - but nothing revolutionary)
- decrease lost space in permalinks.tpl and hard coded column width (was illisible)

git-svn-id: http://piwigo.org/svn/branches/2.0@3137 68402e56-0260-453c-a942-63ccdbb3a9ee

2 files changed, 77 insertions, 29 deletions

diff --git a/admin/include/functions_upgrade.php b/admin/include/functions_upgrade.php
index d7c1a4e96..3181946eb 100644
--- a/admin/include/functions_upgrade.php
+++ b/admin/include/functions_upgrade.php
@@ -185,4 +185,52 @@ WHERE '.$conf['user_fields']['username'].'="'.$username.'"
     define('PHPWG_IN_UPGRADE', true);
   }
 }
-?>
+
+/**
+ * which upgrades are available ?
+ *
+ * @return array
+ */
+function get_available_upgrade_ids()
+{
+  $upgrades_path = PHPWG_ROOT_PATH.'install/db';
+
+  $available_upgrade_ids = array();
+
+  if ($contents = opendir($upgrades_path))
+  {
+    while (($node = readdir($contents)) !== false)
+    {
+      if (is_file($upgrades_path.'/'.$node)
+          and preg_match('/^(.*?)-database\.php$/', $node, $match))
+      {
+        array_push($available_upgrade_ids, $match[1]);
+      }
+    }
+  }
+  natcasesort($available_upgrade_ids);
+
+  return $available_upgrade_ids;
+}
+
+
+/**
+ * returns true if there are available upgrade files
+ */
+function check_upgrade_feed()
+{
+  // retrieve already applied upgrades
+  $query = '
+SELECT id
+  FROM '.UPGRADE_TABLE.'
+;';
+  $applied = array_from_query($query, 'id');
+
+  // retrieve existing upgrades
+  $existing = get_available_upgrade_ids();
+
+  // which upgrades need to be applied?
+  return (count(array_diff($existing, $applied)) > 0);
+}
+
+?>
\ No newline at end of file
diff --git a/admin/template/goto/permalinks.tpl b/admin/template/goto/permalinks.tpl
index 375853a40..3e04cc3d0 100644
--- a/admin/template/goto/permalinks.tpl
+++ b/admin/template/goto/permalinks.tpl
@@ -28,40 +28,40 @@
 
 <h3>{'Permalinks'|@translate}</h3>
 <table class="table2">
-  <tr class="throw">
-    <td style="width:20%;">Id {$SORT_ID}</td>
-    <td style="width:20%;">{'Category'|@translate} {$SORT_NAME}</td>
-    <td style="width:20%;">{'Permalink'|@translate} {$SORT_PERMALINK}</td>
-  </tr>
+	<tr class="throw">
+		<td>Id {$SORT_ID}</td>
+		<td>{'Category'|@translate} {$SORT_NAME}</td>
+		<td>{'Permalink'|@translate} {$SORT_PERMALINK}</td>
+	</tr>
 {foreach from=$permalinks item=permalink name="permalink_loop"}
-  <tr class="{if $smarty.foreach.permalink_loop.index is odd}row1{else}row2{/if}"  style="line-height: 2.2em;">
-    <td style="text-align:center;">{$permalink.id}</td>
-    <td>{$permalink.name}</td>
-    <td>{$permalink.permalink}</td>
-  </tr>
+	<tr class="{if $smarty.foreach.permalink_loop.index is odd}row1{else}row2{/if}" style="line-height:1.5em;">
+		<td style="text-align:center;">{$permalink.id}</td>
+		<td>{$permalink.name}</td>
+		<td>{$permalink.permalink}</td>
+	</tr>
 {/foreach}
 </table>
 
 <h3>{'Permalink history'|@translate} <a name="old_permalinks"></a></h3>
 <table class="table2">
-  <tr class="throw">
-    <td style="width:40px;">Id {$SORT_OLD_CAT_ID}</td>
-    <td style="width:25%;">{'Category'|@translate}</td>
-    <td style="width:25%;">{'Permalink'|@translate} {$SORT_OLD_PERMALINK}</td>
-    <td style="width:15%;">Deleted on {$SORT_OLD_DATE_DELETED}</td>
-    <td style="width:15%;">Last hit {$SORT_OLD_LAST_HIT}</td>
-    <td style="width:20px;">Hit {$SORT_OLD_HIT}</td>
-    <td style="width:5px;"></td>
-  </tr>
+	<tr class="throw">
+		<td>Id {$SORT_OLD_CAT_ID}</td>
+		<td>{'Category'|@translate}</td>
+		<td>{'Permalink'|@translate} {$SORT_OLD_PERMALINK}</td>
+		<td>Deleted on {$SORT_OLD_DATE_DELETED}</td>
+		<td>Last hit {$SORT_OLD_LAST_HIT}</td>
+		<td style="width:20px;">Hit {$SORT_OLD_HIT}</td>
+		<td style="width:5px;"></td>
+	</tr>
 {foreach from=$deleted_permalinks item=permalink}
-  <tr style="line-height: 2.2em;">
-    <td style="text-align:center;">{$permalink.cat_id}</td>
-    <td>{$permalink.name}</td>
-    <td>{$permalink.permalink}</td>
-    <td>{$permalink.date_deleted}</td>
-    <td>{$permalink.last_hit}</td>
-    <td>{$permalink.hit}</td>
-    <td><a href="{$permalink.U_DELETE}" {$TAG_INPUT_ENABLED}><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/delete.png" alt="[{'delete'|@translate}]" class="button"></a></td>
-  </tr>
+	<tr style="line-height:1.5em;">
+		<td style="text-align:center;">{$permalink.cat_id}</td>
+		<td>{$permalink.name}</td>
+		<td>{$permalink.permalink}</td>
+		<td>{$permalink.date_deleted}</td>
+		<td>{$permalink.last_hit}</td>
+		<td>{$permalink.hit}</td>
+		<td><a href="{$permalink.U_DELETE}" {$TAG_INPUT_ENABLED}><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/delete.png" alt="[{'delete'|@translate}]" class="button"></a></td>
+	</tr>
 {/foreach}
 </table>