From 790f6b3bb6e4bf888a7fdb36f87a763cdb8ca450 Mon Sep 17 00:00:00 2001 From: patdenice Date: Sat, 23 Apr 2011 12:48:05 +0000 Subject: Change tabsheet place for plugins, themes and languages. Plugins, themes and languages use same update page. git-svn-id: http://piwigo.org/svn/trunk@10594 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin.php | 6 +- admin/include/functions.php | 10 +- admin/include/languages.class.php | 18 -- admin/include/plugins.class.php | 18 -- admin/include/themes.class.php | 18 -- admin/include/updates.class.php | 7 +- admin/languages.php | 50 ++++++ admin/languages_installed.php | 1 - admin/languages_new.php | 1 - admin/languages_update.php | 133 --------------- admin/plugins.php | 50 ++++++ admin/plugins_installed.php | 180 ++++++++++++++++++++ admin/plugins_list.php | 183 --------------------- admin/plugins_new.php | 5 +- admin/plugins_update.php | 153 ----------------- admin/themes.php | 50 ++++++ admin/themes/default/template/languages_update.tpl | 58 ------- admin/themes/default/template/plugins_list.tpl | 2 +- admin/themes/default/template/plugins_update.tpl | 58 ------- admin/themes/default/template/themes_update.tpl | 58 ------- admin/themes_installed.php | 1 - admin/themes_new.php | 1 - admin/themes_update.php | 133 --------------- 23 files changed, 344 insertions(+), 850 deletions(-) create mode 100644 admin/languages.php delete mode 100644 admin/languages_update.php create mode 100644 admin/plugins.php create mode 100644 admin/plugins_installed.php delete mode 100644 admin/plugins_list.php delete mode 100644 admin/plugins_update.php create mode 100644 admin/themes.php delete mode 100644 admin/themes/default/template/languages_update.tpl delete mode 100644 admin/themes/default/template/plugins_update.tpl delete mode 100644 admin/themes/default/template/themes_update.tpl delete mode 100644 admin/themes_update.php diff --git a/admin.php b/admin.php index 08156d151..42d059167 100644 --- a/admin.php +++ b/admin.php @@ -147,8 +147,8 @@ $template->assign( 'U_CONFIG_DISPLAY'=> $conf_link.'default', 'U_CONFIG_EXTENTS'=> $link_start.'extend_for_templates', 'U_CONFIG_MENUBAR'=> $link_start.'menubar', - 'U_CONFIG_LANGUAGES' => $link_start.'languages_installed', - 'U_CONFIG_THEMES'=> $link_start.'themes_installed', + 'U_CONFIG_LANGUAGES' => $link_start.'languages', + 'U_CONFIG_THEMES'=> $link_start.'themes', 'U_CATEGORIES'=> $link_start.'cat_list', 'U_MOVE'=> $link_start.'cat_move', 'U_CAT_OPTIONS'=> $link_start.'cat_options', @@ -164,7 +164,7 @@ $template->assign( 'U_RETURN'=> make_index_url(), 'U_ADMIN'=> PHPWG_ROOT_PATH.'admin.php', 'U_LOGOUT'=> PHPWG_ROOT_PATH.'index.php?act=logout', - 'U_PLUGINS'=> $link_start.'plugins_list', + 'U_PLUGINS'=> $link_start.'plugins', 'U_ADD_PHOTOS' => $link_start.'photos_add', 'U_CHANGE_THEME' => PHPWG_ROOT_PATH.'admin.php?change_theme=1', 'U_PENDING_COMMENTS' => $link_start.'comments', diff --git a/admin/include/functions.php b/admin/include/functions.php index 3d32e7b0e..edc09048e 100644 --- a/admin/include/functions.php +++ b/admin/include/functions.php @@ -2072,9 +2072,7 @@ function get_active_menu($menu_page) case 'notification_by_mail': return 2; - case 'plugins_list': - case 'plugins_update': - case 'plugins_new': + case 'plugins': case 'plugin': return 3; @@ -2091,11 +2089,9 @@ function get_active_menu($menu_page) case 'configuration': case 'extend_for_templates': case 'menubar': - case 'themes_new': - case 'themes_installed': + case 'themes': case 'theme': - case 'languages_installed': - case 'languages_new': + case 'languages': return 5; } return 0; diff --git a/admin/include/languages.class.php b/admin/include/languages.class.php index c19385412..cfcacc934 100644 --- a/admin/include/languages.class.php +++ b/admin/include/languages.class.php @@ -35,24 +35,6 @@ class languages $this->get_fs_languages($target_charset); } - /** - * Set tabsheet for languages pages. - * @param string selected page. - */ - function set_tabsheet($selected) - { - include_once(PHPWG_ROOT_PATH.'admin/include/tabsheet.class.php'); - - $link = get_root_url().'admin.php?page='; - - $tabsheet = new tabsheet(); - $tabsheet->add('languages_installed', l10n('Installed Languages'), $link.'languages_installed'); - $tabsheet->add('languages_update', l10n('Check for updates'), $link.'languages_update'); - $tabsheet->add('languages_new', l10n('Add New Language'), $link.'languages_new'); - $tabsheet->select($selected); - $tabsheet->assign(); - } - /** * Perform requested actions * @param string - action diff --git a/admin/include/plugins.class.php b/admin/include/plugins.class.php index 3f7cf4567..d1b8f5c5b 100644 --- a/admin/include/plugins.class.php +++ b/admin/include/plugins.class.php @@ -41,24 +41,6 @@ class plugins } } - /** - * Set tabsheet for plugins pages. - * @param string selected page. - */ - function set_tabsheet($selected) - { - include_once(PHPWG_ROOT_PATH.'admin/include/tabsheet.class.php'); - - $link = get_root_url().'admin.php?page='; - - $tabsheet = new tabsheet(); - $tabsheet->add('plugins_list', l10n('Plugin list'), $link.'plugins_list'); - $tabsheet->add('plugins_update', l10n('Check for updates'), $link.'plugins_update'); - $tabsheet->add('plugins_new', l10n('Other plugins'), $link.'plugins_new'); - $tabsheet->select($selected); - $tabsheet->assign(); - } - /** * Perform requested actions * @param string - action diff --git a/admin/include/themes.class.php b/admin/include/themes.class.php index 78716214e..294046976 100644 --- a/admin/include/themes.class.php +++ b/admin/include/themes.class.php @@ -40,24 +40,6 @@ class themes } } - /** - * Set tabsheet for themes pages. - * @param string selected page. - */ - function set_tabsheet($selected) - { - include_once(PHPWG_ROOT_PATH.'admin/include/tabsheet.class.php'); - - $link = get_root_url().'admin.php?page='; - - $tabsheet = new tabsheet(); - $tabsheet->add('themes_installed', l10n('Installed Themes'), $link.'themes_installed'); - $tabsheet->add('themes_update', l10n('Check for updates'), $link.'themes_update'); - $tabsheet->add('themes_new', l10n('Add New Theme'), $link.'themes_new'); - $tabsheet->select($selected); - $tabsheet->assign(); - } - /** * Perform requested actions * @param string - action diff --git a/admin/include/updates.class.php b/admin/include/updates.class.php index b53001488..def4a1a2d 100644 --- a/admin/include/updates.class.php +++ b/admin/include/updates.class.php @@ -15,9 +15,14 @@ class updates var $merged_extensions = array(); var $merged_extension_url = 'http://piwigo.org/download/merged_extensions.txt'; - function __construct() + function __construct($page='updates') { $this->types = array('plugins', 'themes', 'languages'); + + if (in_array($page, $this->types)) + { + $this->types = array($page); + } $this->default_themes = array('clear', 'dark', 'Sylvia'); $this->default_plugins = array('admin_multi_view', 'c13y_upgrade', 'language_switch', 'LocalFilesEditor'); diff --git a/admin/languages.php b/admin/languages.php new file mode 100644 index 000000000..095fd7670 --- /dev/null +++ b/admin/languages.php @@ -0,0 +1,50 @@ +add('installed', l10n('Installed Languages'), $my_base_url.'&tab=installed'); +$tabsheet->add('update', l10n('Check for updates'), $my_base_url.'&tab=update'); +$tabsheet->add('new', l10n('Add New Language'), $my_base_url.'&tab=new'); +$tabsheet->select($page['tab']); +$tabsheet->assign(); + +if ($page['tab'] == 'update') + include(PHPWG_ROOT_PATH.'admin/updates_ext.php'); +else + include(PHPWG_ROOT_PATH.'admin/languages_'.$page['tab'].'.php'); + +?> \ No newline at end of file diff --git a/admin/languages_installed.php b/admin/languages_installed.php index 2f4c23f30..93e719491 100644 --- a/admin/languages_installed.php +++ b/admin/languages_installed.php @@ -34,7 +34,6 @@ $base_url = get_root_url().'admin.php?page='.$page['page']; $languages = new languages(); $languages->get_db_languages(); -$languages->set_tabsheet($page['page']); //--------------------------------------------------perform requested actions if (isset($_GET['action']) and isset($_GET['language'])) diff --git a/admin/languages_new.php b/admin/languages_new.php index 6f3d0abfa..9d10c5b8e 100644 --- a/admin/languages_new.php +++ b/admin/languages_new.php @@ -34,7 +34,6 @@ $base_url = get_root_url().'admin.php?page='.$page['page']; $languages = new languages(); $languages->get_db_languages(); -$languages->set_tabsheet($page['page']); // +-----------------------------------------------------------------------+ // | setup check | diff --git a/admin/languages_update.php b/admin/languages_update.php deleted file mode 100644 index 238113049..000000000 --- a/admin/languages_update.php +++ /dev/null @@ -1,133 +0,0 @@ -set_tabsheet($page['page']); - -//-----------------------------------------------------------automatic upgrade -if (isset($_GET['language']) and isset($_GET['revision'])) -{ - if (!is_webmaster()) - { - array_push($page['errors'], l10n('Webmaster status is required.')); - } - else - { - check_pwg_token(); - - $language_id = $_GET['language']; - $revision = $_GET['revision']; - - $upgrade_status = $languages->extract_language_files('upgrade', $revision, $language_id); - - switch ($upgrade_status) - { - case 'ok': - array_push($page['infos'], - sprintf( - l10n('%s has been successfully upgraded.'), - $languages->fs_languages[$_GET['language']]['name'])); - break; - - case 'temp_path_error': - array_push($page['errors'], l10n('Can\'t create temporary file.')); - break; - - case 'dl_archive_error': - array_push($page['errors'], l10n('Can\'t download archive.')); - break; - - case 'archive_error': - array_push($page['errors'], l10n('Can\'t read or extract archive.')); - break; - - default: - array_push($page['errors'], - sprintf(l10n('An error occured during extraction (%s).'), $upgrade_status) - ); - } - - $languages->languages(); - $template->delete_compiled_templates(); - } -} - -// +-----------------------------------------------------------------------+ -// | start template output | -// +-----------------------------------------------------------------------+ -$template->set_filenames(array('languages' => 'languages_update.tpl')); - -if ($languages->get_server_languages()) -{ - 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'])) - { - $url_auto_update = $base_url - . '&revision=' . $language_info['revision_id'] - . '&language=' . $language_id - . '&pwg_token='.get_pwg_token() - ; - - $template->append('update_languages', array( - 'ID' => $language_info['extension_id'], - 'EXT_NAME' => $fs_language['name'], - 'EXT_URL' => PEM_URL.'/extension_view.php?eid='.$language_info['extension_id'], - 'EXT_DESC' => trim($language_info['extension_description'], " \n\r"), - 'REV_DESC' => trim($language_info['revision_description'], " \n\r"), - 'CURRENT_VERSION' => $fs_language['version'], - 'NEW_VERSION' => $language_info['revision_name'], - 'AUTHOR' => $language_info['author_name'], - 'DOWNLOADS' => $language_info['extension_nb_downloads'], - 'URL_UPDATE' => $url_auto_update, - 'URL_DOWNLOAD' => $language_info['download_url'] . '&origin=piwigo_download' - ) - ); - } - } - } -} -else -{ - $template->assign('SERVER_ERROR', true); - array_push($page['errors'], l10n('Can\'t connect to server.')); -} - -$template->assign_var_from_handle('ADMIN_CONTENT', 'languages'); -?> \ No newline at end of file diff --git a/admin/plugins.php b/admin/plugins.php new file mode 100644 index 000000000..7b2a7152d --- /dev/null +++ b/admin/plugins.php @@ -0,0 +1,50 @@ +add('installed', l10n('Plugin list'), $my_base_url.'&tab=installed'); +$tabsheet->add('update', l10n('Check for updates'), $my_base_url.'&tab=update'); +$tabsheet->add('new', l10n('Other plugins'), $my_base_url.'&tab=new'); +$tabsheet->select($page['tab']); +$tabsheet->assign(); + +if ($page['tab'] == 'update') + include(PHPWG_ROOT_PATH.'admin/updates_ext.php'); +else + include(PHPWG_ROOT_PATH.'admin/plugins_'.$page['tab'].'.php'); + +?> \ No newline at end of file diff --git a/admin/plugins_installed.php b/admin/plugins_installed.php new file mode 100644 index 000000000..70fd734f5 --- /dev/null +++ b/admin/plugins_installed.php @@ -0,0 +1,180 @@ +set_filenames(array('plugins' => 'plugins_list.tpl')); + +// TODO : use a session parameter +$plugin_order = isset($_GET['plugin_order']) ? $_GET['plugin_order'] : 'state'; +$plugin_display = isset($_GET['plugin_display']) ? $_GET['plugin_display'] : 'compact'; + +$base_url = get_root_url().'admin.php?page='.$page['page'].'&plugin_order='.$plugin_order.'&plugin_display='.$plugin_display; +$pwg_token = get_pwg_token(); +$action_url = $base_url.'&plugin='.'%s'.'&pwg_token='.$pwg_token; + +$plugins = new plugins(); + +//--------------------------------------------------perform requested actions +if (isset($_GET['action']) and isset($_GET['plugin'])) +{ + if (in_array($_GET['action'], array('install', 'uninstall')) AND !is_webmaster()) + { + array_push($page['errors'], l10n('Webmaster status is required.')); + } + else + { + check_pwg_token(); + + $page['errors'] = $plugins->perform_action($_GET['action'], $_GET['plugin']); + + if (empty($page['errors'])) + { + if ($_GET['action'] == 'activate' or $_GET['action'] == 'deactivate') + { + $template->delete_compiled_templates(); + } + redirect($base_url); + } + } +} + +// +-----------------------------------------------------------------------+ +// | start template output | +// +-----------------------------------------------------------------------+ + +$plugins->sort_fs_plugins('name'); +$plugins->get_merged_extensions(); +$plugins->get_incompatible_plugins(); +$merged_plugins = false; +$tpl_plugins = array(); + +foreach($plugins->fs_plugins as $plugin_id => $fs_plugin) +{ + if (isset($_SESSION['incompatible_plugins'][$plugin_id]) + and $fs_plugin['version'] != $_SESSION['incompatible_plugins'][$plugin_id]) + { + // Incompatible plugins must be reinitilized + $plugins->get_incompatible_plugins(true); + } + + $tpl_plugin = array( + 'ID' => $plugin_id, + 'NAME' => $fs_plugin['name'], + 'VISIT_URL' => $fs_plugin['uri'], + 'VERSION' => $fs_plugin['version'], + 'DESC' => $fs_plugin['description'], + 'AUTHOR' => $fs_plugin['author'], + 'AUTHOR_URL' => @$fs_plugin['author uri'], + 'U_ACTION' => sprintf($action_url, $plugin_id), + 'INCOMPATIBLE' => isset($_SESSION['incompatible_plugins'][$plugin_id]), + ); + + if (isset($plugins->db_plugins_by_id[$plugin_id])) + { + $tpl_plugin['STATE'] = $plugins->db_plugins_by_id[$plugin_id]['state']; + } + else + { + $tpl_plugin['STATE'] = 'inactive'; + } + + if (isset($fs_plugin['extension']) and in_array($fs_plugin['extension'], $_SESSION['merged_extensions'])) + { + $plugins->perform_action('uninstall', $plugin_id); + $tpl_plugin['STATE'] = 'merged'; + $tpl_plugin['DESC'] = l10n('THIS PLUGIN IS NOW PART OF PIWIGO CORE! DELETE IT NOW.'); + $merged_plugins = true; + } + + array_push($tpl_plugins, $tpl_plugin); +} + +$template->append('plugin_states', 'active'); +$template->append('plugin_states', 'inactive'); + +if ($merged_plugins) +{ + $template->append('plugin_states', 'merged'); +} + +$missing_plugin_ids = array_diff( + array_keys($plugins->db_plugins_by_id), + array_keys($plugins->fs_plugins) + ); + +if (count($missing_plugin_ids) > 0) +{ + foreach($missing_plugin_ids as $plugin_id) + { + array_push( + $tpl_plugins, + array( + 'NAME' => $plugin_id, + 'VERSION' => $plugins->db_plugins_by_id[$plugin_id]['version'], + 'DESC' => l10n('ERROR: THIS PLUGIN IS MISSING BUT IT IS INSTALLED! UNINSTALL IT NOW.'), + 'U_ACTION' => sprintf($action_url, $plugin_id), + 'STATE' => 'missing', + ) + ); + } + $template->append('plugin_states', 'missing'); +} + +// sort plugins : state or name +if ($plugin_order == 'name') +{ + function cmp($a, $b) + { + return strcasecmp($a['NAME'], $b['NAME']); + } +} +else +{ + function cmp($a, $b) + { + $s = array('merged' => 0, 'missing' => 1, 'active' => 2, 'inactive' => 3); + + if($a['STATE'] == $b['STATE']) + return strcasecmp($a['NAME'], $b['NAME']); + else + return $s[$a['STATE']] >= $s[$b['STATE']]; + } + $plugin_order = 'state'; +} + +usort($tpl_plugins, 'cmp'); +$template->assign(array( + 'plugin_order' => $plugin_order, + 'plugin_display' => $plugin_display, + 'plugins' => $tpl_plugins, + 'PWG_TOKEN' => $pwg_token, +)); + +$template->assign_var_from_handle('ADMIN_CONTENT', 'plugins'); +?> \ No newline at end of file diff --git a/admin/plugins_list.php b/admin/plugins_list.php deleted file mode 100644 index 3f38356b5..000000000 --- a/admin/plugins_list.php +++ /dev/null @@ -1,183 +0,0 @@ -set_filenames(array('plugins' => 'plugins_list.tpl')); - -// TODO : use a session parameter -$plugin_order = isset($_GET['plugin_order']) ? $_GET['plugin_order'] : 'state'; -$plugin_display = isset($_GET['plugin_display']) ? $_GET['plugin_display'] : 'compact'; - -$base_url = get_root_url().'admin.php?page='.$page['page'].'&plugin_order='.$plugin_order.'&plugin_display='.$plugin_display; -$pwg_token = get_pwg_token(); -$action_url = $base_url.'&plugin='.'%s'.'&pwg_token='.$pwg_token; - -$plugins = new plugins(); - -//--------------------------------------------------perform requested actions -if (isset($_GET['action']) and isset($_GET['plugin'])) -{ - if (in_array($_GET['action'], array('install', 'uninstall')) AND !is_webmaster()) - { - array_push($page['errors'], l10n('Webmaster status is required.')); - } - else - { - check_pwg_token(); - - $page['errors'] = $plugins->perform_action($_GET['action'], $_GET['plugin']); - - if (empty($page['errors'])) - { - if ($_GET['action'] == 'activate' or $_GET['action'] == 'deactivate') - { - $template->delete_compiled_templates(); - } - redirect($base_url); - } - } -} - -//--------------------------------------------------------------------Tabsheet -$plugins->set_tabsheet($page['page']); - -// +-----------------------------------------------------------------------+ -// | start template output | -// +-----------------------------------------------------------------------+ - -$plugins->sort_fs_plugins('name'); -$plugins->get_merged_extensions(); -$plugins->get_incompatible_plugins(); -$merged_plugins = false; -$tpl_plugins = array(); - -foreach($plugins->fs_plugins as $plugin_id => $fs_plugin) -{ - if (isset($_SESSION['incompatible_plugins'][$plugin_id]) - and $fs_plugin['version'] != $_SESSION['incompatible_plugins'][$plugin_id]) - { - // Incompatible plugins must be reinitilized - $plugins->get_incompatible_plugins(true); - } - - $tpl_plugin = array( - 'ID' => $plugin_id, - 'NAME' => $fs_plugin['name'], - 'VISIT_URL' => $fs_plugin['uri'], - 'VERSION' => $fs_plugin['version'], - 'DESC' => $fs_plugin['description'], - 'AUTHOR' => $fs_plugin['author'], - 'AUTHOR_URL' => @$fs_plugin['author uri'], - 'U_ACTION' => sprintf($action_url, $plugin_id), - 'INCOMPATIBLE' => isset($_SESSION['incompatible_plugins'][$plugin_id]), - ); - - if (isset($plugins->db_plugins_by_id[$plugin_id])) - { - $tpl_plugin['STATE'] = $plugins->db_plugins_by_id[$plugin_id]['state']; - } - else - { - $tpl_plugin['STATE'] = 'inactive'; - } - - if (isset($fs_plugin['extension']) and in_array($fs_plugin['extension'], $_SESSION['merged_extensions'])) - { - $plugins->perform_action('uninstall', $plugin_id); - $tpl_plugin['STATE'] = 'merged'; - $tpl_plugin['DESC'] = l10n('THIS PLUGIN IS NOW PART OF PIWIGO CORE! DELETE IT NOW.'); - $merged_plugins = true; - } - - array_push($tpl_plugins, $tpl_plugin); -} - -$template->append('plugin_states', 'active'); -$template->append('plugin_states', 'inactive'); - -if ($merged_plugins) -{ - $template->append('plugin_states', 'merged'); -} - -$missing_plugin_ids = array_diff( - array_keys($plugins->db_plugins_by_id), - array_keys($plugins->fs_plugins) - ); - -if (count($missing_plugin_ids) > 0) -{ - foreach($missing_plugin_ids as $plugin_id) - { - array_push( - $tpl_plugins, - array( - 'NAME' => $plugin_id, - 'VERSION' => $plugins->db_plugins_by_id[$plugin_id]['version'], - 'DESC' => l10n('ERROR: THIS PLUGIN IS MISSING BUT IT IS INSTALLED! UNINSTALL IT NOW.'), - 'U_ACTION' => sprintf($action_url, $plugin_id), - 'STATE' => 'missing', - ) - ); - } - $template->append('plugin_states', 'missing'); -} - -// sort plugins : state or name -if ($plugin_order == 'name') -{ - function cmp($a, $b) - { - return strcasecmp($a['NAME'], $b['NAME']); - } -} -else -{ - function cmp($a, $b) - { - $s = array('merged' => 0, 'missing' => 1, 'active' => 2, 'inactive' => 3); - - if($a['STATE'] == $b['STATE']) - return strcasecmp($a['NAME'], $b['NAME']); - else - return $s[$a['STATE']] >= $s[$b['STATE']]; - } - $plugin_order = 'state'; -} - -usort($tpl_plugins, 'cmp'); -$template->assign(array( - 'plugin_order' => $plugin_order, - 'plugin_display' => $plugin_display, - 'plugins' => $tpl_plugins, - 'PWG_TOKEN' => $pwg_token, -)); - -$template->assign_var_from_handle('ADMIN_CONTENT', 'plugins'); -?> \ No newline at end of file diff --git a/admin/plugins_new.php b/admin/plugins_new.php index 710ce8eec..1b1e9befb 100644 --- a/admin/plugins_new.php +++ b/admin/plugins_new.php @@ -30,7 +30,7 @@ include_once(PHPWG_ROOT_PATH.'admin/include/plugins.class.php'); $template->set_filenames(array('plugins' => 'plugins_new.tpl')); -$base_url = get_root_url().'admin.php?page='.$page['page']; +$base_url = get_root_url().'admin.php?page='.$page['page'].'&'.$page['tab']; $plugins = new plugins(); @@ -81,9 +81,6 @@ if (isset($_GET['installstatus'])) } } -//--------------------------------------------------------------------Tabsheet -$plugins->set_tabsheet($page['page']); - //---------------------------------------------------------------Order options $template->assign('order_options', array( diff --git a/admin/plugins_update.php b/admin/plugins_update.php deleted file mode 100644 index 1ed176daa..000000000 --- a/admin/plugins_update.php +++ /dev/null @@ -1,153 +0,0 @@ -set_filenames(array('plugins' => 'plugins_update.tpl')); - -$base_url = get_root_url().'admin.php?page='.$page['page']; - -$plugins = new plugins(); - -//-----------------------------------------------------------automatic upgrade -if (isset($_GET['plugin']) and isset($_GET['revision'])) -{ - if (!is_webmaster()) - { - array_push($page['errors'], l10n('Webmaster status is required.')); - } - else - { - check_pwg_token(); - - $plugin_id = $_GET['plugin']; - $revision = $_GET['revision']; - - if (isset($plugins->db_plugins_by_id[$plugin_id]) - and $plugins->db_plugins_by_id[$plugin_id]['state'] == 'active') - { - $plugins->perform_action('deactivate', $plugin_id); - - redirect($base_url - . '&revision=' . $revision - . '&plugin=' . $plugin_id - . '&pwg_token='.get_pwg_token() - . '&reactivate=true'); - } - - $upgrade_status = $plugins->extract_plugin_files('upgrade', $revision, $plugin_id); - - if (isset($_GET['reactivate'])) - { - $plugins->perform_action('activate', $plugin_id); - } - - $template->delete_compiled_templates(); - - redirect($base_url.'&plugin='.$plugin_id.'&upgradestatus='.$upgrade_status); - } -} - -//--------------------------------------------------------------upgrade result -if (isset($_GET['upgradestatus']) and isset($_GET['plugin'])) -{ - switch ($_GET['upgradestatus']) - { - case 'ok': - array_push($page['infos'], - sprintf( - l10n('%s has been successfully upgraded.'), - $plugins->fs_plugins[$_GET['plugin']]['name'])); - break; - - case 'temp_path_error': - array_push($page['errors'], l10n('Can\'t create temporary file.')); - break; - - case 'dl_archive_error': - array_push($page['errors'], l10n('Can\'t download archive.')); - break; - - case 'archive_error': - array_push($page['errors'], l10n('Can\'t read or extract archive.')); - break; - - default: - array_push($page['errors'], - sprintf(l10n('An error occured during extraction (%s).'), $_GET['upgradestatus']), - l10n('Please check "plugins" folder and sub-folders permissions (CHMOD).')); - } -} - -//--------------------------------------------------------------------Tabsheet -$plugins->set_tabsheet($page['page']); - -// +-----------------------------------------------------------------------+ -// | start template output | -// +-----------------------------------------------------------------------+ -if ($plugins->get_server_plugins()) -{ - 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'])) - { - $url_auto_update = $base_url - . '&revision=' . $plugin_info['revision_id'] - . '&plugin=' . $plugin_id - . '&pwg_token='.get_pwg_token() - ; - - $template->append('plugins', array( - 'ID' => $plugin_info['extension_id'], - 'EXT_NAME' => $fs_plugin['name'], - 'EXT_URL' => PEM_URL.'/extension_view.php?eid='.$plugin_info['extension_id'], - 'EXT_DESC' => trim($plugin_info['extension_description'], " \n\r"), - 'REV_DESC' => trim($plugin_info['revision_description'], " \n\r"), - 'CURRENT_VERSION' => $fs_plugin['version'], - 'NEW_VERSION' => $plugin_info['revision_name'], - 'AUTHOR' => $plugin_info['author_name'], - 'DOWNLOADS' => $plugin_info['extension_nb_downloads'], - 'URL_UPDATE' => $url_auto_update, - 'URL_DOWNLOAD' => $plugin_info['download_url'] . '&origin=piwigo_download')); - } - } - } -} -else -{ - $template->assign('SERVER_ERROR', true); - array_push($page['errors'], l10n('Can\'t connect to server.')); -} - -$template->assign_var_from_handle('ADMIN_CONTENT', 'plugins'); -?> \ No newline at end of file diff --git a/admin/themes.php b/admin/themes.php new file mode 100644 index 000000000..297cec1a9 --- /dev/null +++ b/admin/themes.php @@ -0,0 +1,50 @@ +add('installed', l10n('Installed Themes'), $my_base_url.'&tab=installed'); +$tabsheet->add('update', l10n('Check for updates'), $my_base_url.'&tab=update'); +$tabsheet->add('new', l10n('Add New Theme'), $my_base_url.'&tab=new'); +$tabsheet->select($page['tab']); +$tabsheet->assign(); + +if ($page['tab'] == 'update') + include(PHPWG_ROOT_PATH.'admin/updates_ext.php'); +else + include(PHPWG_ROOT_PATH.'admin/themes_'.$page['tab'].'.php'); + +?> \ No newline at end of file diff --git a/admin/themes/default/template/languages_update.tpl b/admin/themes/default/template/languages_update.tpl deleted file mode 100644 index 2b1a2b27d..000000000 --- a/admin/themes/default/template/languages_update.tpl +++ /dev/null @@ -1,58 +0,0 @@ -{footer_script require='jquery.effects.blind'}{literal} -jQuery(document).ready(function(){ - jQuery("td[id^='desc_'], p[id^='revdesc_']").click(function() { - id = this.id.split('_'); - jQuery("#revdesc_"+id[1]).toggle('blind'); - jQuery(".button_"+id[1]).toggle(); - return false; - }); -}); -{/literal}{/footer_script} - -
-

{'Languages'|@translate}

-
- -{if not empty($update_languages)} -
-
-{'Languages which need upgrade'|@translate} -{foreach from=$update_languages item=language name=languages_loop} -
- - - - - - - - - - - - - -
- {$language.EXT_NAME} - - {'Install'|@translate} - | {'Download'|@translate} - | {'Visit language site'|@translate} -
- {'Version'|@translate} {$language.CURRENT_VERSION} - - {'Downloads'|@translate}: {$language.DOWNLOADS} - - - {'New Version'|@translate} : {$language.NEW_VERSION} - | {'By %s'|@translate|@sprintf:$language.AUTHOR} -
- -
-
-{/foreach} -
-
-{elseif not isset($SERVER_ERROR)} -

{'All languages are up to date.'|@translate}

-{/if} diff --git a/admin/themes/default/template/plugins_list.tpl b/admin/themes/default/template/plugins_list.tpl index ccf6f02f7..54f051eac 100644 --- a/admin/themes/default/template/plugins_list.tpl +++ b/admin/themes/default/template/plugins_list.tpl @@ -81,7 +81,7 @@ jQuery(document).ready(function() {
- + {'Sort order'|@translate} :