diff options
author | plegall <plg@piwigo.org> | 2010-03-15 13:35:35 +0000 |
---|---|---|
committer | plegall <plg@piwigo.org> | 2010-03-15 13:35:35 +0000 |
commit | 395b09de3d1dfc40411df71c8752dcc368ab4ea9 (patch) | |
tree | 1d79d8dafd27fcae30c180a6b8c23dc22f3a3c93 /admin/include/plugins.class.php | |
parent | 279196b283674335f1f46a3f508d0d8fb17ff2fc (diff) |
feature 1507: ability to install themes directly from piwigo.org/ext.
The theme manager backend for installation is the plugin manager backend,
because they are very close.
thanks to feature:1502, installing a theme and installing a plugin are very
similare operations. The only differences are the installation directory and
the main file to find in the archive.
This is only the very first step, the "add new theme" screen needs many
improvements, to begin with display style.
git-svn-id: http://piwigo.org/svn/trunk@5143 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/include/plugins.class.php')
-rw-r--r-- | admin/include/plugins.class.php | 37 |
1 files changed, 29 insertions, 8 deletions
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, |