From 290f2c1d39d1c47d48ba4e6a6d347459975e8b0f Mon Sep 17 00:00:00 2001 From: patdenice Date: Fri, 13 Feb 2009 20:49:03 +0000 Subject: - Show number of downloads in plugins list. - Allow to sort plugins by number of downloads. - Fix plugin revision URL (no more revision_view in PEM). git-svn-id: http://piwigo.org/svn/trunk@3143 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/include/plugins.class.php | 10 ++++++++++ admin/plugins_new.php | 21 +++++++++++++-------- admin/plugins_update.php | 29 +++++++++++++++++------------ admin/template/goto/default-layout.css | 1 + admin/template/goto/plugins_new.tpl | 4 ++-- admin/template/goto/plugins_update.tpl | 4 ++-- language/de_DE/admin.lang.php | 4 +++- language/en_UK/admin.lang.php | 4 +++- language/es_ES/admin.lang.php | 4 +++- language/fr_FR/admin.lang.php | 4 +++- language/it_IT/admin.lang.php | 4 +++- language/nl_NL/admin.lang.php | 4 +++- language/pl_PL/admin.lang.php | 5 ++++- 13 files changed, 67 insertions(+), 31 deletions(-) diff --git a/admin/include/plugins.class.php b/admin/include/plugins.class.php index d746298df..caff5ef26 100644 --- a/admin/include/plugins.class.php +++ b/admin/include/plugins.class.php @@ -304,6 +304,7 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id="' . $plugin_id . '"'; $url = PEM_URL . '/api/get_revision_list.php?category_id=12&format=php&last_revision_only=true'; $url .= '&version=' . implode(',', $versions_to_check); $url .= '&lang=' . substr($user['language'], 0, 2); + $url .= '&get_nb_downloads=true'; if (!empty($plugins_to_check)) { @@ -345,6 +346,9 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id="' . $plugin_id . '"'; case 'author': uasort($this->server_plugins, array($this, 'extension_author_compare')); break; + case 'downloads': + usort($this->server_plugins, array($this, 'extension_downloads_compare')); + break; } } @@ -508,6 +512,12 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id="' . $plugin_id . '"'; else return $r; } + function extension_downloads_compare($a, $b) + { + if ($a['extension_nb_downloads'] < $b['extension_nb_downloads']) return 1; + else return -1; + } + function sort_plugins_by_state() { uasort($this->fs_plugins, 'name_compare'); diff --git a/admin/plugins_new.php b/admin/plugins_new.php index 5a0d70190..56b09d097 100644 --- a/admin/plugins_new.php +++ b/admin/plugins_new.php @@ -83,7 +83,8 @@ $template->assign('order_options', $link.'date' => l10n('Post date'), $link.'revision' => l10n('plugins_revisions'), $link.'name' => l10n('Name'), - $link.'author' => l10n('Author'))); + $link.'author' => l10n('Author'), + $link.'downloads' => l10n('Number of downloads'))); $template->assign('order_selected', $link.$order); // +-----------------------------------------------------------------------+ @@ -97,10 +98,15 @@ if ($plugins->get_server_plugins(true)) { list($date, ) = explode(' ', $plugin['revision_date']); - $ver_desc = sprintf(l10n('plugins_description'), - $plugin['revision_name'], - $date, - $plugin['revision_description']); + $ext_desc = ''.l10n('Downloads').': '.$plugin['extension_nb_downloads']."\r\n" + ."\r\n" + .$plugin['extension_description']; + + $rev_desc = ''.l10n('Version').': '.$plugin['revision_name']."\r\n" + .''.l10n('Released on').': '.$date."\r\n" + .''.l10n('Downloads').': '.$plugin['revision_nb_downloads']."\r\n" + ."\r\n" + .$plugin['revision_description']; $url_auto_install = htmlentities($base_url) . '&revision=' . $plugin['revision_id'] @@ -109,11 +115,10 @@ if ($plugins->get_server_plugins(true)) $template->append('plugins', array( 'EXT_NAME' => $plugin['extension_name'], 'EXT_URL' => PEM_URL.'/extension_view.php?eid='.$plugin['extension_id'], - 'EXT_DESC' => $plugin['extension_description'], + 'EXT_DESC' => $ext_desc, 'VERSION' => $plugin['revision_name'], - 'VERSION_URL' => PEM_URL.'/revision_view.php?rid='.$plugin['revision_id'], 'DATE' => $date, - 'VER_DESC' => $ver_desc, + 'VER_DESC' => $rev_desc, 'AUTHOR' => $plugin['author_name'], 'URL_INSTALL' => $url_auto_install, 'URL_DOWNLOAD' => $plugin['download_url'] . '&origin=piwigo_download')); diff --git a/admin/plugins_update.php b/admin/plugins_update.php index b92ed836d..e6d6705fe 100644 --- a/admin/plugins_update.php +++ b/admin/plugins_update.php @@ -86,7 +86,7 @@ if (isset($_GET['upgradestatus']) and isset($_GET['plugin'])) default: array_push($page['errors'], - sprintf(l10n('plugins_extract_error'), $_GET['installstatus']), + sprintf(l10n('plugins_extract_error'), $_GET['upgradestatus']), l10n('plugins_check_chmod')); } } @@ -108,19 +108,25 @@ if ($plugins->get_server_plugins()) list($date, ) = explode(' ', $plugin_info['revision_date']); - $ver_desc = sprintf(l10n('plugins_description'), - $plugin_info['revision_name'], - $date, - $plugin_info['revision_description']); + $ext_desc = ''.l10n('Downloads').': '.$plugin_info['extension_nb_downloads']."\r\n" + ."\r\n" + .$plugin_info['extension_description']; + + $rev_desc = ''.l10n('Version').': '.$plugin_info['revision_name']."\r\n" + .''.l10n('Released on').': '.$date."\r\n" + .''.l10n('Downloads').': '.$plugin_info['revision_nb_downloads']."\r\n" + ."\r\n" + .$plugin_info['revision_description']; if ($plugins->plugin_version_compare($fs_plugin['version'], $plugin_info['revision_name'])) { // Plugin is up to date $template->append('plugins_uptodate', array( - 'URL' => $fs_plugin['uri'], + 'URL' => PEM_URL.'/extension_view.php?eid='.$plugin_info['extension_id'], 'NAME' => $fs_plugin['name'], - 'EXT_DESC' => $plugin_info['extension_description'], - 'VERSION' => $fs_plugin['version'])); + 'EXT_DESC' => $ext_desc, + 'VERSION' => $fs_plugin['version'], + 'VER_DESC' => $rev_desc)); } else { @@ -131,12 +137,11 @@ if ($plugins->get_server_plugins()) $template->append('plugins_not_uptodate', array( 'EXT_NAME' => $fs_plugin['name'], - 'EXT_URL' => $fs_plugin['uri'], - 'EXT_DESC' => $plugin_info['extension_description'], + 'EXT_URL' => PEM_URL.'/extension_view.php?eid='.$plugin_info['extension_id'], + 'EXT_DESC' => $ext_desc, 'VERSION' => $fs_plugin['version'], - 'VERSION_URL' => PEM_URL.'/revision_view.php?rid='.$plugin_info['revision_id'], 'NEW_VERSION' => $plugin_info['revision_name'], - 'NEW_VER_DESC' => $ver_desc, + 'NEW_VER_DESC' => $rev_desc, 'URL_UPDATE' => $url_auto_update, 'URL_DOWNLOAD' => $plugin_info['download_url'] . '&origin=piwigo_download')); } diff --git a/admin/template/goto/default-layout.css b/admin/template/goto/default-layout.css index 87f411dd3..08f3bab3f 100644 --- a/admin/template/goto/default-layout.css +++ b/admin/template/goto/default-layout.css @@ -38,6 +38,7 @@ TABLE#detailedStats { } /* Plugins tables */ +TABLE.plugins { min-width: 400px; } TABLE.plugins A { border: 0; } TABLE.plugins TR TD { padding: 4px 10px; } TABLE.plugins TR TD.pluginState { padding: 4px 16px; } diff --git a/admin/template/goto/plugins_new.tpl b/admin/template/goto/plugins_new.tpl index bd6339566..9fe0a0c33 100644 --- a/admin/template/goto/plugins_new.tpl +++ b/admin/template/goto/plugins_new.tpl @@ -15,7 +15,7 @@ jQuery().ready(function(){ldelim}
{'Sort order'|@translate} : - {html_options options=$order_options selected=$order_selected} @@ -37,7 +37,7 @@ jQuery().ready(function(){ldelim} {foreach from=$plugins item=plugin name=plugins_loop} {$plugin.EXT_NAME} - {$plugin.VERSION} + {$plugin.VERSION} {$plugin.DATE} {$plugin.AUTHOR} {'plugins_auto_install'|@translate} diff --git a/admin/template/goto/plugins_update.tpl b/admin/template/goto/plugins_update.tpl index c7bdc2865..cae800f85 100644 --- a/admin/template/goto/plugins_update.tpl +++ b/admin/template/goto/plugins_update.tpl @@ -32,7 +32,7 @@ jQuery().ready(function(){ldelim} {$plugin.EXT_NAME} {$plugin.VERSION} - {$plugin.NEW_VERSION} + {$plugin.NEW_VERSION} {'plugins_auto_update'|@translate} / {'plugins_download'|@translate} @@ -54,7 +54,7 @@ jQuery().ready(function(){ldelim} {foreach from=$plugins_uptodate item=plugin name=plugins_loop} {$plugin.NAME} - {$plugin.VERSION} + {$plugin.VERSION} {/foreach} diff --git a/language/de_DE/admin.lang.php b/language/de_DE/admin.lang.php index 4a619f0d8..1bc52425c 100644 --- a/language/de_DE/admin.lang.php +++ b/language/de_DE/admin.lang.php @@ -570,7 +570,6 @@ $lang['plugins_new_version'] = 'Version
verfügbar'; $lang['plugins_auto_update'] = 'Automatisches Update'; $lang['plugins_auto_install'] = 'Automatische Installation'; $lang['plugins_download'] = 'Laden Sie die Datei'; -$lang['plugins_description'] = 'Version: %s

Datum: %s

%s'; $lang['plugins_tab_list'] = 'Liste der Plugins'; $lang['plugins_tab_update'] = 'Plugins auf Updates überprüfen'; $lang['plugins_tab_new'] = 'Zur verfügung stehende Plugins'; @@ -644,5 +643,8 @@ $lang['Delete selected photos'] = 'Fotos löschen'; $lang['%d photo was deleted'] = '%d Foto wurde gelöscht'; $lang['%d photos were deleted'] = '%d Fotos wurden gelöscht'; /* TODO */ $lang['Bound template'] = 'Bound template'; +/* TODO */ $lang['Downloads'] = 'Downloads'; +/* TODO */ $lang['Released on'] = 'Released on'; +/* TODO */ $lang['Number of downloads'] = 'Number of downloads'; // --------- Starting below: New or revised $lang ---- from Colibri (2.1) ?> \ No newline at end of file diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php index a0fc10709..835a2ac1d 100644 --- a/language/en_UK/admin.lang.php +++ b/language/en_UK/admin.lang.php @@ -570,7 +570,6 @@ $lang['plugins_new_version'] = 'Available
version'; $lang['plugins_auto_update'] = 'Automatic upgrade'; $lang['plugins_auto_install'] = 'Automatic installation'; $lang['plugins_download'] = 'Download file'; -$lang['plugins_description'] = 'Version: %s

Date: %s

%s'; $lang['plugins_tab_list'] = 'Plugin list'; $lang['plugins_tab_update'] = 'Check for updates'; $lang['plugins_tab_new'] = 'Other plugins'; @@ -645,5 +644,8 @@ $lang['Delete selected photos'] = 'Delete selected photos'; $lang['%d photo was deleted'] = '%d photo was deleted'; $lang['%d photos were deleted'] = '%d photos were deleted'; $lang['Bound template'] = 'Bound template'; +$lang['Downloads'] = 'Downloads'; +$lang['Released on'] = 'Released on'; +$lang['Number of downloads'] = 'Number of downloads'; // --------- Starting below: New or revised $lang ---- from Colibri (2.1) ?> diff --git a/language/es_ES/admin.lang.php b/language/es_ES/admin.lang.php index 0fee777a7..7212b849f 100644 --- a/language/es_ES/admin.lang.php +++ b/language/es_ES/admin.lang.php @@ -568,7 +568,6 @@ $lang['plugins_new_version'] = 'Versión
disponible'; $lang['plugins_auto_update'] = 'Puesta al día automático'; $lang['plugins_auto_install'] = 'Instalación automática'; $lang['plugins_download'] = 'Descargar el fichero'; -$lang['plugins_description'] = 'Versión : %s

Fecha : %s

%s'; $lang['plugins_tab_list'] = 'Lista plugins'; $lang['plugins_tab_update'] = 'Verificar las puestas al día'; $lang['plugins_tab_new'] = 'Otro plugins disponible'; @@ -642,5 +641,8 @@ $lang['Delete selected photos'] = 'Suprimir las fotos'; $lang['%d photo was deleted'] = '%d foto ha sido suprimida'; $lang['%d photos were deleted'] = '%d fotos han sido suprimidas'; $lang['Bound template'] = 'Template relacionado '; +/* TODO */ $lang['Downloads'] = 'Downloads'; +/* TODO */ $lang['Released on'] = 'Released on'; +/* TODO */ $lang['Number of downloads'] = 'Number of downloads'; // --------- Starting below: New or revised $lang ---- from Colibri (2.1) ?> diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php index a9b7b3dad..f5ad9dea9 100644 --- a/language/fr_FR/admin.lang.php +++ b/language/fr_FR/admin.lang.php @@ -570,7 +570,6 @@ $lang['plugins_new_version'] = 'Version
disponible'; $lang['plugins_auto_update'] = 'Mise à jour automatique'; $lang['plugins_auto_install'] = 'Installation automatique'; $lang['plugins_download'] = 'Télécharger le fichier'; -$lang['plugins_description'] = 'Version: %s

Date: %s

%s'; $lang['plugins_tab_list'] = 'Liste des plugins'; $lang['plugins_tab_update'] = 'Vérifier les mises à jour'; $lang['plugins_tab_new'] = 'Autres plugins disponibles'; @@ -644,5 +643,8 @@ $lang['Delete selected photos'] = 'Supprimer les photos'; $lang['%d photo was deleted'] = '%d photo a été supprimée'; $lang['%d photos were deleted'] = '%d photos ont été supprimées'; $lang['Bound template'] = 'Template rattaché'; +$lang['Downloads'] = 'Téléchargements'; +$lang['Released on'] = 'Ajouté le'; +$lang['Number of downloads'] = 'Nombre de téléchargements'; // --------- Starting below: New or revised $lang ---- from Colibri (2.1) ?> diff --git a/language/it_IT/admin.lang.php b/language/it_IT/admin.lang.php index e592284f3..783536578 100644 --- a/language/it_IT/admin.lang.php +++ b/language/it_IT/admin.lang.php @@ -570,7 +570,6 @@ $lang['plugins_new_version'] = 'Versione
disponibile'; $lang['plugins_auto_update'] = 'Aggiornamento automatico'; $lang['plugins_auto_install'] = 'Installazione automatica'; $lang['plugins_download'] = 'Scaricare il file'; -$lang['plugins_description'] = 'Versione: %s

Data: %s

%s'; $lang['plugins_tab_list'] = 'Lista dei plugins'; $lang['plugins_tab_update'] = 'Verificare gli aggiornamenti'; $lang['plugins_tab_new'] = 'Altri plugins disponibili'; @@ -644,5 +643,8 @@ $lang['Delete selected photos'] = 'Cancellare le foto'; $lang['%d photo was deleted'] = '%d foto cancellata'; $lang['%d photos were deleted'] = '%d foto cancellate'; $lang['Bound template'] = 'Template legato'; +/* TODO */ $lang['Downloads'] = 'Downloads'; +/* TODO */ $lang['Released on'] = 'Released on'; +/* TODO */ $lang['Number of downloads'] = 'Number of downloads'; // --------- Starting below: New or revised $lang ---- from Colibri (2.1) ?> diff --git a/language/nl_NL/admin.lang.php b/language/nl_NL/admin.lang.php index 52e227a60..1ba990df0 100644 --- a/language/nl_NL/admin.lang.php +++ b/language/nl_NL/admin.lang.php @@ -571,7 +571,6 @@ $lang['c13y_submit_correction'] = 'Pas geselecteerde correcties toe'; /* TODO */ $lang['plugins_auto_update'] = 'Automatic upgrade'; /* TODO */ $lang['plugins_auto_install'] = 'Automatic installation'; /* TODO */ $lang['plugins_download'] = 'Download file'; -/* TODO */ $lang['plugins_description'] = 'Version: %s

Date: %s

%s'; /* TODO */ $lang['plugins_tab_list'] = 'Plugin list'; /* TODO */ $lang['plugins_tab_update'] = 'Check for updates'; /* TODO */ $lang['plugins_tab_new'] = 'Other plugins'; @@ -640,5 +639,8 @@ $lang['edit category informations'] = 'bewerk categorie informatie'; /* TODO */ $lang['%d photo was deleted'] = '%d photo was deleted'; /* TODO */ $lang['%d photos were deleted'] = '%d photos were deleted'; /* TODO */ $lang['Bound template'] = 'Bound template'; +/* TODO */ $lang['Downloads'] = 'Downloads'; +/* TODO */ $lang['Released on'] = 'Released on'; +/* TODO */ $lang['Number of downloads'] = 'Number of downloads'; // --------- Starting below: New or revised $lang ---- from Colibri (2.1) ?> diff --git a/language/pl_PL/admin.lang.php b/language/pl_PL/admin.lang.php index b0ceb34d5..858249442 100644 --- a/language/pl_PL/admin.lang.php +++ b/language/pl_PL/admin.lang.php @@ -570,7 +570,6 @@ $lang['plugins_new_version'] = 'Dostępna
wersja'; $lang['plugins_auto_update'] = 'Automatyczna aktualizacja'; $lang['plugins_auto_install'] = 'Instalacja automatyczna'; $lang['plugins_download'] = 'Pobierz plik'; -$lang['plugins_description'] = 'Wersja: %s

Data: %s

%s'; $lang['plugins_tab_list'] = 'Lista wtyczek'; $lang['plugins_tab_update'] = 'Sprawdź dostepność aktualizaji'; $lang['plugins_tab_new'] = 'Inne wtyczki'; @@ -645,4 +644,8 @@ $lang['Delete selected photos'] = 'Usuń zaznaczone zdjęcie'; $lang['%d photo was deleted'] = '%d zdjęcie zostało usunięte'; $lang['%d photos were deleted'] = '%d zdjęć zostało usuniętych'; $lang['Bound template'] = 'Przypisz Szablon'; +/* TODO */ $lang['Downloads'] = 'Downloads'; +/* TODO */ $lang['Released on'] = 'Released on'; +/* TODO */ $lang['Number of downloads'] = 'Number of downloads'; +// --------- Starting below: New or revised $lang ---- from Colibri (2.1) ?> -- cgit v1.2.3