From abf790ce2e88b2035501151ea33730b97cd2d2a1 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sat, 20 Jun 2009 16:36:58 +0000
Subject: [PATCH] in SESSION, userconf renamed to tmp_user_values to avoid
 confusion with the future db-based user preferences

---
 clearview3/css/theme_left.css.php    | 2 +-
 clearview3/css/theme_right.css.php   | 2 +-
 crimson_gray/css/theme_left.css.php  | 6 +++---
 crimson_gray/css/theme_right.css.php | 2 +-
 hillside/css/theme_left.css.php      | 2 +-
 hillside/css/theme_right.css.php     | 2 +-
 paradice/css/theme_left.css.php      | 4 ++--
 paradice/css/theme_right.css.php     | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/clearview3/css/theme_left.css.php b/clearview3/css/theme_left.css.php
index dc2919141..4351edf24 100644
--- a/clearview3/css/theme_left.css.php
+++ b/clearview3/css/theme_left.css.php
@@ -14,7 +14,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
 }
 ?>
 
-body#body_leftFrame{padding:10px;margin:0;background:<?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?> url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>frame_fone.png) repeat-y right;color:<?php echo $GLOBALS['cfg']['NaviColor'] ?>;font-family:<?php echo $GLOBALS['cfg']['FontFamily'] ?>;font-size: <?php echo (null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']);?>;}
+body#body_leftFrame{padding:10px;margin:0;background:<?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?> url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>frame_fone.png) repeat-y right;color:<?php echo $GLOBALS['cfg']['NaviColor'] ?>;font-family:<?php echo $GLOBALS['cfg']['FontFamily'] ?>;font-size: <?php echo (null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']);?>;}
 input,
 select,
 textarea{font-size:1em;}
diff --git a/clearview3/css/theme_right.css.php b/clearview3/css/theme_right.css.php
index 1bb69fdfa..84b09cfe5 100644
--- a/clearview3/css/theme_right.css.php
+++ b/clearview3/css/theme_right.css.php
@@ -18,7 +18,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
 ********************************************************************** */
 html{font-size: <?php echo (null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']);?>}
 body,
-body#bodyquerywindow{padding:10px;margin:0;background:<?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?>;color:<?php echo $GLOBALS['cfg']['MainColor'] ?>;font-family:<?php echo $GLOBALS['cfg']['FontFamily'] ?>;font-size:95%;line-height:130%}
+body#bodyquerywindow{padding:10px;margin:0;background:<?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?>;color:<?php echo $GLOBALS['cfg']['MainColor'] ?>;font-family:<?php echo $GLOBALS['cfg']['FontFamily'] ?>;font-size:95%;line-height:130%}
 a img{border:none}
 a:link,
 a:visited{text-decoration:none;color:#483D8B}
diff --git a/crimson_gray/css/theme_left.css.php b/crimson_gray/css/theme_left.css.php
index 712248764..227065bce 100644
--- a/crimson_gray/css/theme_left.css.php
+++ b/crimson_gray/css/theme_left.css.php
@@ -26,7 +26,7 @@ body {
 <?php if (! empty($GLOBALS['cfg']['FontFamily'])) { ?>
     font-family:        <?php echo $GLOBALS['cfg']['FontFamily']; ?>;
 <?php } ?>
-    background:         <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>;
+    background:         <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>;
     color:              <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
     margin:             0;
     padding:            0.2em 0.2em 0.2em 0.2em;
@@ -87,7 +87,7 @@ button {
 
 div#pmalogo {
     <?php //better echo $GLOBALS['cfg']['logoBGC']; ?>
-    background-color: <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>;
+    background-color: <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>;
     padding:.3em;
 }
 div#pmalogo,
@@ -161,7 +161,7 @@ div#left_tableList ul {
     margin:             0;
     padding:            0;
     font-size:          80%;
-    background:         <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>;
+    background:         <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>;
 }
 
 div#left_tableList ul ul {
diff --git a/crimson_gray/css/theme_right.css.php b/crimson_gray/css/theme_right.css.php
index 64d9a2269..a3eb70f82 100644
--- a/crimson_gray/css/theme_right.css.php
+++ b/crimson_gray/css/theme_right.css.php
@@ -31,7 +31,7 @@ body {
     padding:            0;
     margin:             0.5em;
     color:              <?php echo $GLOBALS['cfg']['MainColor']; ?>;
-    background:         <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?>;
+    background:         <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?>;
 }
 
 <?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { ?>
diff --git a/hillside/css/theme_left.css.php b/hillside/css/theme_left.css.php
index 15efdd530..781437be3 100644
--- a/hillside/css/theme_left.css.php
+++ b/hillside/css/theme_left.css.php
@@ -27,7 +27,7 @@ body {
 <?php if (! empty($GLOBALS['cfg']['FontFamily'])) { ?>
     font-family:        <?php echo $GLOBALS['cfg']['FontFamily']; ?>;
 <?php } ?>
-    background:         <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>;
+    background:         <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>;
     color:              <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
     margin:             0;
     padding:            0.2em 0.2em 0.2em 0.2em;
diff --git a/hillside/css/theme_right.css.php b/hillside/css/theme_right.css.php
index b29679d9f..705d7181b 100644
--- a/hillside/css/theme_right.css.php
+++ b/hillside/css/theme_right.css.php
@@ -30,7 +30,7 @@ body {
     padding:            0;
     margin:             0.5em;
     color:              <?php echo $GLOBALS['cfg']['MainColor']; ?>;
-    background:         <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?>;
+    background:         <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?>;
 }
 
 <?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { ?>
diff --git a/paradice/css/theme_left.css.php b/paradice/css/theme_left.css.php
index 0ec2e6dbc..f47e71983 100644
--- a/paradice/css/theme_left.css.php
+++ b/paradice/css/theme_left.css.php
@@ -28,7 +28,7 @@ body {
     font-family:        <?php echo $GLOBALS['cfg']['FontFamily']; ?>;
 <?php } ?>
 	font-size:			0.8em;
-    background:         <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>;
+    background:         <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>;
     color:              <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
     margin:             0;
     padding:            0.2em 0.2em 0.2em 0.2em;
@@ -108,7 +108,7 @@ button {
 
 div#pmalogo {
     <?php //better echo $GLOBALS['cfg']['logoBGC']; ?>
-    background-color: <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>;
+    background-color: <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>;
     padding:.3em;
 }
 div#pmalogo,
diff --git a/paradice/css/theme_right.css.php b/paradice/css/theme_right.css.php
index decb6723f..9b661ebdd 100644
--- a/paradice/css/theme_right.css.php
+++ b/paradice/css/theme_right.css.php
@@ -30,7 +30,7 @@ body {
     padding:            0;
     margin:             0.5em;
     color:              <?php echo $GLOBALS['cfg']['MainColor']; ?>;
-    background:         <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?>;
+    background:         <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?>;
     font-size:          1em;
 }
 
-- 
2.11.4.GIT