From 4708e6c75e7a681b44a5cd3631209dc64a5fbc1b Mon Sep 17 00:00:00 2001
From: mistic100 <mistic@piwigo.org>
Date: Tue, 29 Jan 2013 17:35:23 +0000
Subject: feature:2826

git-svn-id: http://piwigo.org/svn/trunk@20449 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/include/languages.class.php | 4 ++--
 admin/include/plugins.class.php   | 8 +++++---
 admin/include/themes.class.php    | 4 ++--
 include/config_default.inc.php    | 7 ++++++-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/admin/include/languages.class.php b/admin/include/languages.class.php
index 36f946fd1..6a7262bb0 100644
--- a/admin/include/languages.class.php
+++ b/admin/include/languages.class.php
@@ -217,10 +217,10 @@ UPDATE '.USER_INFOS_TABLE.'
    */
   function get_server_languages($new=false)
   {
-    global $user;
+    global $user, $conf;
 
     $get_data = array(
-      'category_id' => 8,
+      'category_id' => $conf['pem_languages_category'],
       'format' => 'php',
     );
 
diff --git a/admin/include/plugins.class.php b/admin/include/plugins.class.php
index a75160b02..3c0cb6ffa 100644
--- a/admin/include/plugins.class.php
+++ b/admin/include/plugins.class.php
@@ -292,7 +292,7 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id=\'' . $plugin_id . '\'';
    */
   function get_server_plugins($new=false)
   {
-    global $user;
+    global $user, $conf;
 
     $versions_to_check = $this->get_versions_to_check();
     if (empty($versions_to_check))
@@ -313,7 +313,7 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id=\'' . $plugin_id . '\'';
     // Retrieve PEM plugins infos
     $url = PEM_URL . '/api/get_revision_list.php';
     $get_data = array(
-      'category_id' => 12,
+      'category_id' => $conf['pem_plugins_category'],
       'format' => 'php',
       'last_revision_only' => 'true',
       'version' => implode(',', $versions_to_check),
@@ -363,6 +363,8 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id=\'' . $plugin_id . '\'';
     {
       return false;
     }
+    
+    global $conf;
 
     // Plugins to check
     $plugins_to_check = array();
@@ -377,7 +379,7 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id=\'' . $plugin_id . '\'';
     // Retrieve PEM plugins infos
     $url = PEM_URL . '/api/get_revision_list.php';
     $get_data = array(
-      'category_id' => 12,
+      'category_id' => $conf['pem_plugins_category'],
       'format' => 'php',
       'version' => implode(',', $versions_to_check),
       'extension_include' => implode(',', $plugins_to_check),
diff --git a/admin/include/themes.class.php b/admin/include/themes.class.php
index 4b42af3be..654d220ef 100644
--- a/admin/include/themes.class.php
+++ b/admin/include/themes.class.php
@@ -454,10 +454,10 @@ SELECT
    */
   function get_server_themes($new=false)
   {
-    global $user;
+    global $user, $conf;
 
     $get_data = array(
-      'category_id' => 10,
+      'category_id' => $conf['pem_themes_category'],
       'format' => 'php',
     );
 
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index 91fcd225f..aa63f2407 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -755,9 +755,14 @@ $conf['enable_synchronization'] = true;
 // permitted characters for files/directoris during synchronization
 $conf['sync_chars_regex'] = '/^[a-zA-Z0-9-_.]+$/';
 
-// PEM url
+// PEM url (default is http://piwigo.org/ext)
 $conf['alternative_pem_url'] = '';
 
+// categories ID on PEM
+$conf['pem_plugins_category'] = 12;
+$conf['pem_themes_category'] = 10;
+$conf['pem_languages_category'] = 8;
+
 // based on the EXIF "orientation" tag, should we rotate photos added in the
 // upload form or through pwg.images.addSimple web API method?
 $conf['upload_form_automatic_rotation'] = true;
-- 
cgit v1.2.3