diff --git a/admin.php b/admin.php index 3342a1879..739f0df5f 100644 --- a/admin.php +++ b/admin.php @@ -123,6 +123,7 @@ $template->assign( 'U_CONFIG_DISPLAY'=> $conf_link.'default', 'U_CONFIG_EXTENTS'=> $link_start.'extend_for_templates', 'U_CONFIG_MENUBAR'=> $link_start.'menubar', + 'U_CONFIG_THEMES'=> $link_start.'themes_new', 'U_CATEGORIES'=> $link_start.'cat_list', 'U_MOVE'=> $link_start.'cat_move', 'U_CAT_OPTIONS'=> $link_start.'cat_options', diff --git a/admin/include/plugins.class.php b/admin/include/plugins.class.php index fb9db0c88..a7ea5cc7f 100644 --- a/admin/include/plugins.class.php +++ b/admin/include/plugins.class.php @@ -268,14 +268,20 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id=\'' . $plugin_id . '\''; /** * Retrieve PEM server datas to $server_plugins */ - function get_server_plugins($new=false) + function get_server_plugins($new=false, $ext_type='plugin') { global $user; + $pem_category_id = 12; + if ('theme' == $ext_type) + { + $pem_category_id = 10; + } + // Retrieve PEM versions $version = PHPWG_VERSION; $versions_to_check = array(); - $url = PEM_URL . '/api/get_version_list.php?category_id=12&format=php'; + $url = PEM_URL . '/api/get_version_list.php?category_id='.$pem_category_id.'&format=php'; if (fetchRemote($url, $result) and $pem_versions = @unserialize($result)) { if (!preg_match('/^\d+\.\d+\.\d+/', $version)) @@ -307,7 +313,7 @@ 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 = PEM_URL . '/api/get_revision_list.php?category_id='.$pem_category_id.'&format=php&last_revision_only=true'; $url .= '&version=' . implode(',', $versions_to_check); $url .= '&lang=' . substr($user['language'], 0, 2); $url .= '&get_nb_downloads=true'; @@ -364,9 +370,24 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id=\'' . $plugin_id . '\''; * @param string - archive URL * @param string - plugin id or extension id */ - function extract_plugin_files($action, $revision, $dest) + function extract_plugin_files($action, $revision, $dest, $ext_type = 'plugin') { - if ($archive = tempnam( PHPWG_PLUGINS_PATH, 'zip')) + if ('plugin' == $ext_type) + { + $install_basedir = PHPWG_PLUGINS_PATH; + $main_filename = 'main.inc.php'; + } + elseif ('theme' == $ext_type) + { + $install_basedir = PHPWG_ROOT_PATH.'themes/'; + $main_filename = 'themeconf.inc.php'; + } + else + { + fatal_error('unknown extension type "'.$ext_type.'"'); + } + + if ($archive = tempnam( $install_basedir, 'zip')) { $url = PEM_URL . '/download.php?rid=' . $revision; $url .= '&origin=piwigo_' . $action; @@ -381,7 +402,7 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id=\'' . $plugin_id . '\''; foreach ($list as $file) { // we search main.inc.php in archive - if (basename($file['filename']) == 'main.inc.php' + if (basename($file['filename']) == $main_filename and (!isset($main_filepath) or strlen($file['filename']) < strlen($main_filepath))) { @@ -393,11 +414,11 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id=\'' . $plugin_id . '\''; $root = dirname($main_filepath); // main.inc.php path in archive if ($action == 'upgrade') { - $extract_path = PHPWG_PLUGINS_PATH . $dest; + $extract_path = $install_basedir . $dest; } else { - $extract_path = PHPWG_PLUGINS_PATH + $extract_path = $install_basedir . ($root == '.' ? 'extension_' . $dest : basename($root)); } if($result = $zip->extract(PCLZIP_OPT_PATH, $extract_path, diff --git a/admin/themes/default/template/admin.tpl b/admin/themes/default/template/admin.tpl index 8de4f69ea..8cd35122a 100644 --- a/admin/themes/default/template/admin.tpl +++ b/admin/themes/default/template/admin.tpl @@ -22,6 +22,7 @@ jQuery().ready(function(){ldelim}
  • {'Default display'|@translate}
  • {'Menu'|@translate}
  • {'Templates'|@translate}
    • +
  • {'Themes'|@translate}
    • diff --git a/admin/themes/default/template/themes_new.tpl b/admin/themes/default/template/themes_new.tpl new file mode 100644 index 000000000..7317b7df5 --- /dev/null +++ b/admin/themes/default/template/themes_new.tpl @@ -0,0 +1,13 @@ +
    +

    {'Install New Theme'|@translate}

    +
    + +{if isset($themes)} + +{/if} \ No newline at end of file diff --git a/admin/themes_new.php b/admin/themes_new.php new file mode 100644 index 000000000..c606f97b1 --- /dev/null +++ b/admin/themes_new.php @@ -0,0 +1,133 @@ +extract_plugin_files( + 'install', + $_GET['revision'], + $_GET['extension'], + 'theme' + ); + + redirect($base_url.'&installstatus='.$install_status); +} + +// +-----------------------------------------------------------------------+ +// | installation result | +// +-----------------------------------------------------------------------+ + +if (isset($_GET['installstatus'])) +{ + switch ($_GET['installstatus']) + { + case 'ok': + array_push( + $page['infos'], + l10n('Theme has been successfully installed') + ); + 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['installstatus']) + ); + } +} + +// +-----------------------------------------------------------------------+ +// | template output | +// +-----------------------------------------------------------------------+ + +$template->set_filenames(array('themes' => 'themes_new.tpl')); + +if ($themes->get_server_plugins(true, 'theme')) +{ + foreach($themes->server_plugins as $theme) + { + $url_auto_install = htmlentities($base_url) + . '&revision=' . $theme['revision_id'] + . '&extension=' . $theme['extension_id'] + ; + + $template->append( + 'new_themes', + array( + 'name' => $theme['extension_name'], + 'src' => PEM_URL.'/upload/extension-'.$theme['extension_id'].'/thumbnail.jpg', + 'install_url' => $url_auto_install, + ) + ); + } +} +else +{ + array_push($page['errors'], l10n('Can\'t connect to server.')); +} + +$template->assign_var_from_handle('ADMIN_CONTENT', 'themes'); +?> \ No newline at end of file