7 files changed, 101 insertions, 114 deletions

diff --git a/admin/include/functions_check_integrity.inc.php b/admin/include/functions_check_integrity.inc.php
index 65b7aa2b0..fb97681c4 100644
--- a/admin/include/functions_check_integrity.inc.php
+++ b/admin/include/functions_check_integrity.inc.php
@@ -305,7 +305,7 @@ where
 }
 
 /**
- * Check exif
+ * Do correction user
  *
  * @param user_id, action
  * @return boolean true if ok else false
diff --git a/admin/include/functions_upgrade.php b/admin/include/functions_upgrade.php
index fd9863339..5aa8928a0 100644
--- a/admin/include/functions_upgrade.php
+++ b/admin/include/functions_upgrade.php
@@ -43,39 +43,40 @@ if you want to upgrade';
 // concerning upgrade, we use the default tables
 function prepare_conf_upgrade()
 {
-  global $conf, $prefixeTable;
+  global $prefixeTable;
 
-  $conf['tables']['categories_table'] = $prefixeTable.'categories';
-  $conf['tables']['comments_table'] = $prefixeTable.'comments';
-  $conf['tables']['config_table'] = $prefixeTable.'config';
-  $conf['tables']['favorites_table'] = $prefixeTable.'favorites';
-  $conf['tables']['group_access_table'] = $prefixeTable.'group_access';
-  $conf['tables']['groups_table'] = $prefixeTable.'groups';
-  $conf['tables']['history_table'] = $prefixeTable.'history';
-  $conf['tables']['history_summary_table'] = $prefixeTable.'history_summary';
-  $conf['tables']['image_category_table'] = $prefixeTable.'image_category';
-  $conf['tables']['images_table'] = $prefixeTable.'images';
-  $conf['tables']['sessions_table'] = $prefixeTable.'sessions';
-  $conf['tables']['sites_table'] = $prefixeTable.'sites';
-  $conf['tables']['user_access_table'] = $prefixeTable.'user_access';
-  $conf['tables']['user_group_table'] = $prefixeTable.'user_group';
-  $conf['tables']['users_table'] = $prefixeTable.'users';
-  $conf['tables']['user_infos_table'] = $prefixeTable.'user_infos';
-  $conf['tables']['user_feed_table'] = $prefixeTable.'user_feed';
-  $conf['tables']['waiting_table'] = $prefixeTable.'waiting';
-  $conf['tables']['image_metadata_table'] = $prefixeTable.'image_metadata';
-  $conf['tables']['rate_table'] = $prefixeTable.'rate';
-  $conf['tables']['user_cache_table'] = $prefixeTable.'user_cache';
-  $conf['tables']['user_cache_categories_table'] = $prefixeTable.'user_cache_categories';
-  $conf['tables']['caddie_table'] = $prefixeTable.'caddie';
-  $conf['tables']['upgrade_table'] = $prefixeTable.'upgrade';
-  $conf['tables']['search_table'] = $prefixeTable.'search';
-  $conf['tables']['user_mail_notification_table'] = $prefixeTable.'user_mail_notification';
-  $conf['tables']['tags_table'] = $prefixeTable.'tags';
-  $conf['tables']['image_tag_table'] = $prefixeTable.'image_tag';
-  $conf['tables']['plugins_table'] = $prefixeTable.'plugins';
-  $conf['tables']['web_services_access_table'] = $prefixeTable.'ws_access';
-  $conf['tables']['old_permalinks_table'] = $prefixeTable.'old_permalinks';
+  // $conf is not used for users tables
+  // define cannot be re-defined
+  define('CATEGORIES_TABLE', $prefixeTable.'categories');
+  define('COMMENTS_TABLE', $prefixeTable.'comments');
+  define('CONFIG_TABLE', $prefixeTable.'config');
+  define('FAVORITES_TABLE', $prefixeTable.'favorites');
+  define('GROUP_ACCESS_TABLE', $prefixeTable.'group_access');
+  define('GROUPS_TABLE', $prefixeTable.'groups');
+  define('HISTORY_TABLE', $prefixeTable.'history');
+  define('HISTORY_SUMMARY_TABLE', $prefixeTable.'history_summary');
+  define('IMAGE_CATEGORY_TABLE', $prefixeTable.'image_category');
+  define('IMAGES_TABLE', $prefixeTable.'images');
+  define('SESSIONS_TABLE', $prefixeTable.'sessions');
+  define('SITES_TABLE', $prefixeTable.'sites');
+  define('USER_ACCESS_TABLE', $prefixeTable.'user_access');
+  define('USER_GROUP_TABLE', $prefixeTable.'user_group');
+  define('USERS_TABLE', $prefixeTable.'users');
+  define('USER_INFOS_TABLE', $prefixeTable.'user_infos');
+  define('USER_FEED_TABLE', $prefixeTable.'user_feed');
+  define('WAITING_TABLE', $prefixeTable.'waiting');
+  define('RATE_TABLE', $prefixeTable.'rate');
+  define('USER_CACHE_TABLE', $prefixeTable.'user_cache');
+  define('USER_CACHE_CATEGORIES_TABLE', $prefixeTable.'user_cache_categories');
+  define('CADDIE_TABLE', $prefixeTable.'caddie');
+  define('UPGRADE_TABLE', $prefixeTable.'upgrade');
+  define('SEARCH_TABLE', $prefixeTable.'search');
+  define('USER_MAIL_NOTIFICATION_TABLE', $prefixeTable.'user_mail_notification');
+  define('TAGS_TABLE', $prefixeTable.'tags');
+  define('IMAGE_TAG_TABLE', $prefixeTable.'image_tag');
+  define('PLUGINS_TABLE', $prefixeTable.'plugins');
+  define('WEB_SERVICES_ACCESS_TABLE', $prefixeTable.'ws_access');
+  define('OLD_PERMALINKS_TABLE', $prefixeTable.'old_permalinks');
 }
 
 // Create empty local files to avoid log errors
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index f14a9a0d2..6b6e09072 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -430,10 +430,8 @@ $conf['die_on_sql_error'] = true;
 // users table ?
 $conf['apache_authentication'] = false;
 
-// With $conf['tables'] you can use external tables
-// For example with $conf['tables']['users_table']:
-//   which table is the reference for users? Can be a different
-//   table than PhpWebGallery table
+// users_table: which table is the reference for users? Can be a different
+// table than PhpWebGallery table
 //
 // If you decide to use another table than the default one, you need to
 // prepare your database by deleting some datas :
@@ -451,38 +449,12 @@ $conf['apache_authentication'] = false;
 //
 // All informations contained in these tables and column are related to
 // phpwebgallery_users table.
+$conf['users_table'] = $prefixeTable.'users';
+
+// Other tables can be changed, if you define associated constants
+// Example:
+//   define('USER_INFOS_TABLE', 'pwg_main'.'user_infos');
 
-$conf['tables']['categories_table'] = $prefixeTable.'categories';
-$conf['tables']['comments_table'] = $prefixeTable.'comments';
-$conf['tables']['config_table'] = $prefixeTable.'config';
-$conf['tables']['favorites_table'] = $prefixeTable.'favorites';
-$conf['tables']['group_access_table'] = $prefixeTable.'group_access';
-$conf['tables']['groups_table'] = $prefixeTable.'groups';
-$conf['tables']['history_table'] = $prefixeTable.'history';
-$conf['tables']['history_summary_table'] = $prefixeTable.'history_summary';
-$conf['tables']['image_category_table'] = $prefixeTable.'image_category';
-$conf['tables']['images_table'] = $prefixeTable.'images';
-$conf['tables']['sessions_table'] = $prefixeTable.'sessions';
-$conf['tables']['sites_table'] = $prefixeTable.'sites';
-$conf['tables']['user_access_table'] = $prefixeTable.'user_access';
-$conf['tables']['user_group_table'] = $prefixeTable.'user_group';
-$conf['tables']['users_table'] = $prefixeTable.'users';
-$conf['tables']['user_infos_table'] = $prefixeTable.'user_infos';
-$conf['tables']['user_feed_table'] = $prefixeTable.'user_feed';
-$conf['tables']['waiting_table'] = $prefixeTable.'waiting';
-$conf['tables']['image_metadata_table'] = $prefixeTable.'image_metadata';
-$conf['tables']['rate_table'] = $prefixeTable.'rate';
-$conf['tables']['user_cache_table'] = $prefixeTable.'user_cache';
-$conf['tables']['user_cache_categories_table'] = $prefixeTable.'user_cache_categories';
-$conf['tables']['caddie_table'] = $prefixeTable.'caddie';
-$conf['tables']['upgrade_table'] = $prefixeTable.'upgrade';
-$conf['tables']['search_table'] = $prefixeTable.'search';
-$conf['tables']['user_mail_notification_table'] = $prefixeTable.'user_mail_notification';
-$conf['tables']['tags_table'] = $prefixeTable.'tags';
-$conf['tables']['image_tag_table'] = $prefixeTable.'image_tag';
-$conf['tables']['plugins_table'] = $prefixeTable.'plugins';
-$conf['tables']['web_services_access_table'] = $prefixeTable.'ws_access';
-$conf['tables']['old_permalinks_table'] = $prefixeTable.'old_permalinks';
 
 // user_fields : mapping between generic field names and table specific
 // field names. For example, in PWG, the mail address is names
diff --git a/include/constants.php b/include/constants.php
index 308be5940..7d955c8f3 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -45,36 +45,65 @@ define('ACCESS_ADMINISTRATOR', 3);
 define('ACCESS_WEBMASTER', 4);
 
 // Table names
-define('CATEGORIES_TABLE', $conf['tables']['categories_table']);
-define('COMMENTS_TABLE', $conf['tables']['comments_table']);
-define('CONFIG_TABLE', $conf['tables']['config_table']);
-define('FAVORITES_TABLE', $conf['tables']['favorites_table']);
-define('GROUP_ACCESS_TABLE', $conf['tables']['group_access_table']);
-define('GROUPS_TABLE', $conf['tables']['groups_table']);
-define('HISTORY_TABLE', $conf['tables']['history_table']);
-define('HISTORY_SUMMARY_TABLE', $conf['tables']['history_summary_table']);
-define('IMAGE_CATEGORY_TABLE', $conf['tables']['image_category_table']);
-define('IMAGES_TABLE', $conf['tables']['images_table']);
-define('SESSIONS_TABLE', $conf['tables']['sessions_table']);
-define('SITES_TABLE', $conf['tables']['sites_table']);
-define('USER_ACCESS_TABLE', $conf['tables']['user_access_table']);
-define('USER_GROUP_TABLE', $conf['tables']['user_group_table']);
-define('USERS_TABLE', $conf['tables']['users_table']);
-define('USER_INFOS_TABLE', $conf['tables']['user_infos_table']);
-define('USER_FEED_TABLE', $conf['tables']['user_feed_table']);
-define('WAITING_TABLE', $conf['tables']['waiting_table']);
-define('IMAGE_METADATA_TABLE', $conf['tables']['image_metadata_table']);
-define('RATE_TABLE', $conf['tables']['rate_table']);
-define('USER_CACHE_TABLE', $conf['tables']['user_cache_table']);
-define('USER_CACHE_CATEGORIES_TABLE', $conf['tables']['user_cache_categories_table']);
-define('CADDIE_TABLE', $conf['tables']['caddie_table']);
-define('UPGRADE_TABLE', $conf['tables']['upgrade_table']);
-define('SEARCH_TABLE', $conf['tables']['search_table']);
-define('USER_MAIL_NOTIFICATION_TABLE', $conf['tables']['user_mail_notification_table']);
-define('TAGS_TABLE', $conf['tables']['tags_table']);
-define('IMAGE_TAG_TABLE', $conf['tables']['image_tag_table']);
-define('PLUGINS_TABLE', $conf['tables']['plugins_table']);
-define('WEB_SERVICES_ACCESS_TABLE', $conf['tables']['web_services_access_table']);
-define('OLD_PERMALINKS_TABLE', $conf['tables']['old_permalinks_table']);
+if (!defined('CATEGORIES_TABLE'))
+  define('CATEGORIES_TABLE', $prefixeTable.'categories');
+if (!defined('COMMENTS_TABLE'))
+  define('COMMENTS_TABLE', $prefixeTable.'comments');
+if (!defined('CONFIG_TABLE'))
+  define('CONFIG_TABLE', $prefixeTable.'config');
+if (!defined('FAVORITES_TABLE'))
+  define('FAVORITES_TABLE', $prefixeTable.'favorites');
+if (!defined('GROUP_ACCESS_TABLE'))
+  define('GROUP_ACCESS_TABLE', $prefixeTable.'group_access');
+if (!defined('GROUPS_TABLE'))
+  define('GROUPS_TABLE', $prefixeTable.'groups');
+if (!defined('HISTORY_TABLE'))
+  define('HISTORY_TABLE', $prefixeTable.'history');
+if (!defined('HISTORY_SUMMARY_TABLE'))
+  define('HISTORY_SUMMARY_TABLE', $prefixeTable.'history_summary');
+if (!defined('IMAGE_CATEGORY_TABLE'))
+  define('IMAGE_CATEGORY_TABLE', $prefixeTable.'image_category');
+if (!defined('IMAGES_TABLE'))
+  define('IMAGES_TABLE', $prefixeTable.'images');
+if (!defined('SESSIONS_TABLE'))
+  define('SESSIONS_TABLE', $prefixeTable.'sessions');
+if (!defined('SITES_TABLE'))
+  define('SITES_TABLE', $prefixeTable.'sites');
+if (!defined('USER_ACCESS_TABLE'))
+  define('USER_ACCESS_TABLE', $prefixeTable.'user_access');
+if (!defined('USER_GROUP_TABLE'))
+  define('USER_GROUP_TABLE', $prefixeTable.'user_group');
+if (!defined('USERS_TABLE'))
+  define('USERS_TABLE', $conf['users_table']);
+if (!defined('USER_INFOS_TABLE'))
+  define('USER_INFOS_TABLE', $prefixeTable.'user_infos');
+if (!defined('USER_FEED_TABLE'))
+  define('USER_FEED_TABLE', $prefixeTable.'user_feed');
+if (!defined('WAITING_TABLE'))
+  define('WAITING_TABLE', $prefixeTable.'waiting');
+if (!defined('RATE_TABLE'))
+  define('RATE_TABLE', $prefixeTable.'rate');
+if (!defined('USER_CACHE_TABLE'))
+  define('USER_CACHE_TABLE', $prefixeTable.'user_cache');
+if (!defined('USER_CACHE_CATEGORIES_TABLE'))
+  define('USER_CACHE_CATEGORIES_TABLE', $prefixeTable.'user_cache_categories');
+if (!defined('CADDIE_TABLE'))
+  define('CADDIE_TABLE', $prefixeTable.'caddie');
+if (!defined('UPGRADE_TABLE'))
+  define('UPGRADE_TABLE', $prefixeTable.'upgrade');
+if (!defined('SEARCH_TABLE'))
+  define('SEARCH_TABLE', $prefixeTable.'search');
+if (!defined('USER_MAIL_NOTIFICATION_TABLE'))
+  define('USER_MAIL_NOTIFICATION_TABLE', $prefixeTable.'user_mail_notification');
+if (!defined('TAGS_TABLE'))
+  define('TAGS_TABLE', $prefixeTable.'tags');
+if (!defined('IMAGE_TAG_TABLE'))
+  define('IMAGE_TAG_TABLE', $prefixeTable.'image_tag');
+if (!defined('PLUGINS_TABLE'))
+  define('PLUGINS_TABLE', $prefixeTable.'plugins');
+if (!defined('WEB_SERVICES_ACCESS_TABLE'))
+  define('WEB_SERVICES_ACCESS_TABLE', $prefixeTable.'ws_access');
+if (!defined('OLD_PERMALINKS_TABLE'))
+  define('OLD_PERMALINKS_TABLE', $prefixeTable.'old_permalinks');
 
 ?>
diff --git a/plugins/c13y_upgrade/initialize.inc.php b/plugins/c13y_upgrade/initialize.inc.php
index f62e04974..996b80f4a 100644
--- a/plugins/c13y_upgrade/initialize.inc.php
+++ b/plugins/c13y_upgrade/initialize.inc.php
@@ -39,17 +39,6 @@ function c13y_upgrade($c13y_array)
   

   $result = array();

 

-  if (isset($conf['users_table']))

-  {

-    $result[] = get_c13y(

-      l10n('c13y_upgrade_conf_users_table_msg'),

-      null,

-      null,

-      l10n('c13y_upgrade_conf_users_table_correction').

-      '<BR />'.

-      get_htlm_links_more_info());

-  }

-

   if (count($result) === 0)

   {

     $deactivate_msg_link = 

diff --git a/plugins/c13y_upgrade/language/en_UK.iso-8859-1/plugin.lang.php b/plugins/c13y_upgrade/language/en_UK.iso-8859-1/plugin.lang.php
index 8500dbe0e..a77b6d259 100644
--- a/plugins/c13y_upgrade/language/en_UK.iso-8859-1/plugin.lang.php
+++ b/plugins/c13y_upgrade/language/en_UK.iso-8859-1/plugin.lang.php
@@ -26,8 +26,6 @@
 
 // --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
 $lang['c13y_upgrade_no_anomaly'] = 'No anomaly detected after application upgrade';
-$lang['c13y_upgrade_conf_users_table_msg'] = '"$conf[\'users_table\']" should not be any more used';
-$lang['c13y_upgrade_conf_users_table_correction'] = '"$conf[\'users_table\']" has been replaced by "$conf[\'tables\'][\'users_table\']"';
 $lang['c13y_upgrade_deactivate'] = 'You can deactivate "Check upgrades" plugin';
 
 ?>
diff --git a/plugins/c13y_upgrade/language/fr_FR.iso-8859-1/plugin.lang.php b/plugins/c13y_upgrade/language/fr_FR.iso-8859-1/plugin.lang.php
index 5552049e0..aea3e9351 100644
--- a/plugins/c13y_upgrade/language/fr_FR.iso-8859-1/plugin.lang.php
+++ b/plugins/c13y_upgrade/language/fr_FR.iso-8859-1/plugin.lang.php
@@ -26,8 +26,6 @@
 
 // --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
 $lang['c13y_upgrade_no_anomaly'] = 'Pas d\'anomalie détectée après la mise à jour de l\'application';
-$lang['c13y_upgrade_conf_users_table_msg'] = '"$conf[\'users_table\']" ne doit plus être utilisé';
-$lang['c13y_upgrade_conf_users_table_correction'] = '"$conf[\'users_table\']" a été remplacé par "$conf[\'tables\'][\'users_table\']"';
 $lang['c13y_upgrade_deactivate'] = 'Vous pouvez désactiver le plugin "Check upgrades"';
 
 ?>