aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
Diffstat (limited to 'admin')
-rw-r--r--admin/include/plugins.class.php37
-rw-r--r--admin/themes/default/template/admin.tpl1
-rw-r--r--admin/themes/default/template/themes_new.tpl13
-rw-r--r--admin/themes_new.php133
4 files changed, 176 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,
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}
<li><a href="{$U_CONFIG_DISPLAY}">{'Default display'|@translate}</a></li>
<li><a href="{$U_CONFIG_MENUBAR}">{'Menu'|@translate}</a></li>
<li><a href="{$U_CONFIG_EXTENTS}">{'Templates'|@translate}</a></li>
+ <li><a href="{$U_CONFIG_THEMES}">{'Themes'|@translate}</a></li>
</ul>
</dd>
</dl>
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 @@
+<div class="titrePage">
+ <h2>{'Install New Theme'|@translate}</h2>
+</div>
+
+{if isset($themes)}
+<ul>
+{foreach from=$new_themes item=theme name=themes_loop}
+ <li>
+ <img src="{$theme.src}"> {$theme.name} <a href="{$theme.install_url}">Install</a>
+ </li>
+{/foreach}
+</ul>
+{/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 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based picture gallery |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2009 Piwigo Team http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU General Public License as published by |
+// | the Free Software Foundation |
+// | |
+// | This program is distributed in the hope that it will be useful, but |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
+// | General Public License for more details. |
+// | |
+// | You should have received a copy of the GNU General Public License |
+// | along with this program; if not, write to the Free Software |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA. |
+// +-----------------------------------------------------------------------+
+
+if( !defined("PHPWG_ROOT_PATH") )
+{
+ die ("Hacking attempt!");
+}
+
+include_once(PHPWG_ROOT_PATH.'admin/include/plugins.class.php');
+
+$base_url = get_root_url().'admin.php?page='.$page['page'];
+
+$themes = new plugins();
+
+// +-----------------------------------------------------------------------+
+// | setup check |
+// +-----------------------------------------------------------------------+
+
+$themes_dir = PHPWG_ROOT_PATH.'themes';
+if (!is_writable($themes_dir))
+{
+ array_push(
+ $page['errors'],
+ sprintf(
+ l10n('Add write access to the "%s" directory'),
+ 'themes'
+ )
+ );
+}
+
+// +-----------------------------------------------------------------------+
+// | perform installation |
+// +-----------------------------------------------------------------------+
+
+if (isset($_GET['revision']) and isset($_GET['extension']) and !is_adviser())
+{
+ $install_status = $themes->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)
+ . '&amp;revision=' . $theme['revision_id']
+ . '&amp;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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 11:50:01 +0000