From 8165e9678078600ea8fa9e48062e1b4e039f4d3b Mon Sep 17 00:00:00 2001 From: sparkyx Date: Tue, 25 Oct 2005 12:10:28 +0000 Subject: [PATCH] Code cleaning : preference are now in a separate table --- html/admin/sql/patch/ac-upgrade6.sql | 5 ++- html/central.php | 2 +- html/dossier_prefs.php | 2 +- html/facturation.php | 2 +- html/fiche.php | 2 +- html/form.php | 2 +- html/jrn_add.php | 2 +- html/jrn_detail.php | 2 +- html/jrn_op_detail.php | 2 +- html/jrn_update.php | 2 +- html/pcmn_update.php | 2 +- html/poste_search.php | 2 +- html/priv_user.php | 2 +- html/recherche.php | 2 +- html/stock.php | 2 +- html/user_advanced.php | 2 +- html/user_impress.php | 2 +- html/user_login.php | 2 +- html/user_pref.php | 22 ++++--------- html/user_sec.php | 2 +- include/class_user.php | 46 ++++++++++++++++++++++++---- include/postgres.php | 6 ++-- 22 files changed, 71 insertions(+), 44 deletions(-) diff --git a/html/admin/sql/patch/ac-upgrade6.sql b/html/admin/sql/patch/ac-upgrade6.sql index a6bcec592..1b42fd72c 100644 --- a/html/admin/sql/patch/ac-upgrade6.sql +++ b/html/admin/sql/patch/ac-upgrade6.sql @@ -1,4 +1,4 @@ - +begin; create table user_global_pref ( user_id text, parameter_type text, @@ -12,6 +12,9 @@ comment on column user_global_pref.parameter_value is 'the value of parameter '; alter table user_global_pref add constraint pk_user_global_pref primary key (user_id,parameter_type); insert into user_global_pref select use_login,'PAGESIZE','50' from ac_users; +insert into user_global_pref select use_login,'THEME',use_theme from ac_users; alter table ac_users drop use_usertype; +alter table ac_users drop use_theme; update version set val=7; +commit; diff --git a/html/central.php b/html/central.php index 767ae0300..ac0abe026 100644 --- a/html/central.php +++ b/html/central.php @@ -21,7 +21,7 @@ /* $Revision$ */ include_once ("ac_common.php"); -html_page_start($_SESSION['use_theme']); +html_page_start($_SESSION['g_theme']); if ( ! isset ( $_SESSION['g_dossier'] ) ) { echo "You must choose a Dossier "; diff --git a/html/dossier_prefs.php b/html/dossier_prefs.php index 151d2b808..1540af0c2 100644 --- a/html/dossier_prefs.php +++ b/html/dossier_prefs.php @@ -20,7 +20,7 @@ // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr /* $Revision$ */ include_once ("ac_common.php"); -html_page_start($_SESSION['use_theme']); +html_page_start($_SESSION['g_theme']); if ( ! isset ( $_SESSION['g_dossier'] ) ) { echo "You must choose a Dossier "; exit -2; diff --git a/html/facturation.php b/html/facturation.php index e7557199a..4584f76a3 100644 --- a/html/facturation.php +++ b/html/facturation.php @@ -20,7 +20,7 @@ include ("ac_common.php"); include ("check_priv.php"); /* $Revision$ */ -html_page_start($g_UserProperty['use_theme']); +html_page_start($g_UserProperty['g_theme']); if ( ! isset ( $g_dossier ) ) { echo "You must choose a Dossier "; exit -2; diff --git a/html/fiche.php b/html/fiche.php index 873e85144..3aeb6df0b 100644 --- a/html/fiche.php +++ b/html/fiche.php @@ -21,7 +21,7 @@ include_once ("ac_common.php"); //phpinfo(); -html_page_start($_SESSION['use_theme']); +html_page_start($_SESSION['g_theme']); if ( ! isset ( $_SESSION['g_dossier'] ) ) { echo "You must choose a Dossier "; diff --git a/html/form.php b/html/form.php index c03b27f70..1697cabef 100644 --- a/html/form.php +++ b/html/form.php @@ -22,7 +22,7 @@ include_once ("ac_common.php"); include_once ("user_menu.php"); -html_page_start($_SESSION['use_theme']); +html_page_start($_SESSION['g_theme']); if ( ! isset ( $_SESSION['g_dossier'] ) ) { echo "You must choose a Dossier "; diff --git a/html/jrn_add.php b/html/jrn_add.php index 459448e2a..edc2a2fb3 100644 --- a/html/jrn_add.php +++ b/html/jrn_add.php @@ -21,7 +21,7 @@ /* $Revision$ */ include_once ("ac_common.php"); include_once("jrn.php"); -html_page_start($_SESSION['use_theme']); +html_page_start($_SESSION['g_theme']); if ( ! isset ( $_SESSION['g_dossier'] ) ) { echo "You must choose a Dossier "; exit -2; diff --git a/html/jrn_detail.php b/html/jrn_detail.php index ac24a1186..1455efbdd 100644 --- a/html/jrn_detail.php +++ b/html/jrn_detail.php @@ -19,7 +19,7 @@ // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr /* $Revision$ */ include_once ("ac_common.php"); -html_page_start($_SESSION['use_theme']); +html_page_start($_SESSION['g_theme']); if ( ! isset ( $_SESSION['g_dossier'] ) ) { echo "You must choose a Dossier "; exit -2; diff --git a/html/jrn_op_detail.php b/html/jrn_op_detail.php index d17235566..27db99be9 100644 --- a/html/jrn_op_detail.php +++ b/html/jrn_op_detail.php @@ -21,7 +21,7 @@ include_once ("ac_common.php"); include_once ("poste.php"); include_once ("user_common.php"); -html_page_start($_SESSION['use_theme']); +html_page_start($_SESSION['g_theme']); if ( ! isset ( $_SESSION['g_dossier'] ) ) { echo "You must choose a Dossier "; // phpinfo(); diff --git a/html/jrn_update.php b/html/jrn_update.php index 38481cb35..9e6410da2 100644 --- a/html/jrn_update.php +++ b/html/jrn_update.php @@ -19,7 +19,7 @@ // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr /* $Revision$ */ include_once ("ac_common.php"); -html_page_start($_SESSION['use_theme']); +html_page_start($_SESSION['g_theme']); if ( ! isset ( $_SESSION['g_dossier'] ) ) { echo "You must choose a Dossier "; exit -2; diff --git a/html/pcmn_update.php b/html/pcmn_update.php index 63b125932..37d407369 100644 --- a/html/pcmn_update.php +++ b/html/pcmn_update.php @@ -19,7 +19,7 @@ // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr /* $Revision$ */ include_once ("ac_common.php"); -html_page_start($_SESSION['use_theme']); +html_page_start($_SESSION['g_theme']); require_once("constant.php"); if ( ! isset ( $_SESSION['g_dossier'] ) ) { diff --git a/html/poste_search.php b/html/poste_search.php index 0d4dfaecd..76a451b2b 100644 --- a/html/poste_search.php +++ b/html/poste_search.php @@ -20,7 +20,7 @@ /* $Revision$ */ include_once ("ac_common.php"); -html_page_start($_SESSION['use_theme'],"onLoad='window.focus();'"); +html_page_start($_SESSION['g_theme'],"onLoad='window.focus();'"); include_once ("postgres.php"); include_once("jrn.php"); /* Admin. Dossier */ diff --git a/html/priv_user.php b/html/priv_user.php index d75b35e1c..d2c9770c2 100644 --- a/html/priv_user.php +++ b/html/priv_user.php @@ -21,7 +21,7 @@ include_once("ac_common.php"); include_once("postgres.php"); include_once("debug.php"); include_once("user_menu.php"); -html_page_start($_SESSION['use_theme']); +html_page_start($_SESSION['g_theme']); echo_debug(__FILE__,__LINE__,"entering priv_users"); diff --git a/html/recherche.php b/html/recherche.php index 9d9164703..444b226ca 100644 --- a/html/recherche.php +++ b/html/recherche.php @@ -26,7 +26,7 @@ include_once("user_common.php"); include_once("class_widget.php"); -html_page_start($_SESSION['use_theme']); +html_page_start($_SESSION['g_theme']); if ( ! isset ( $_SESSION['g_dossier'] ) ) { echo "You must choose a Dossier "; exit -2; diff --git a/html/stock.php b/html/stock.php index 46415b6e5..b50205bd6 100644 --- a/html/stock.php +++ b/html/stock.php @@ -25,7 +25,7 @@ include_once("postgres.php"); include_once("stock_inc.php"); include_once("check_priv.php"); -html_page_start($_SESSION['use_theme']); +html_page_start($_SESSION['g_theme']); if ( ! isset ( $_SESSION['g_dossier'] ) ) { echo "You must choose a Dossier "; diff --git a/html/user_advanced.php b/html/user_advanced.php index 7acbac229..a1790fdd1 100644 --- a/html/user_advanced.php +++ b/html/user_advanced.php @@ -20,7 +20,7 @@ include_once ("ac_common.php"); /* $Revision$ */ -html_page_start($_SESSION['use_theme']); +html_page_start($_SESSION['g_theme']); if ( ! isset ( $_SESSION['g_dossier'] ) ) { echo "You must choose a Dossier "; phpinfo(); diff --git a/html/user_impress.php b/html/user_impress.php index 572edd4cc..dd6ea34e4 100644 --- a/html/user_impress.php +++ b/html/user_impress.php @@ -19,7 +19,7 @@ // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr /* $Revision$ */ include_once ("ac_common.php"); -html_page_start($_SESSION['use_theme']); +html_page_start($_SESSION['g_theme']); if ( ! isset ( $_SESSION['g_dossier'] ) ) { echo "You must choose a Dossier "; exit -2; diff --git a/html/user_login.php b/html/user_login.php index 11a0fb214..ae5afea69 100644 --- a/html/user_login.php +++ b/html/user_login.php @@ -27,7 +27,7 @@ include_once ("class_user.php"); $User=new cl_user($rep); $User->Check(); -html_page_start($_SESSION['use_theme']); +html_page_start($_SESSION['g_theme']); include_once("user_menu.php"); $priv=($User->admin==1)?"Administrator":"User"; diff --git a/html/user_pref.php b/html/user_pref.php index 1aa68548e..579f58d4d 100644 --- a/html/user_pref.php +++ b/html/user_pref.php @@ -27,18 +27,17 @@ include_once ("class_user.php"); $cn=DbConnect($_SESSION['g_dossier']); $User=new cl_user($cn); $User->Check(); - // Met a jour le theme utilisateur (style) if ( isset ( $_POST['style_user']) ) { - $Res=ExecSql($Rep, - "update ac_users set use_theme='".$_POST['style_user']. - "' where use_login='".$_SESSION['g_user']."'"); + $Res=ExecSql($Rep, + "update user_global_pref set parameter_value='".$_POST['style_user']. + "' where user_id='".$_SESSION['g_user']."' and parameter_type='THEME'"); // echo '

Theme utilisateur changé

'; - $_SESSION['use_theme']=$_POST['style_user']; + $_SESSION['g_theme']=$_POST['style_user']; } -html_page_start($_SESSION['use_theme']); +html_page_start($_SESSION['g_theme']); // show the top menu depending of the use_style // comta style @@ -67,15 +66,6 @@ if ( isset ($_POST['spass']) ) { $g_pass=$pass_1; } } -// Met a jour le theme utilisateur (style) -if ( isset ( $_POST['style_user']) ) { - $Res=ExecSql($Rep, - "update ac_users set use_theme='".$_POST['style_user']. - "' where use_login='".$_SESSION['g_user']."'"); - // echo '

Theme utilisateur changé

'; - $_SESSION['use_theme']=$_POST['style_user']; - -} ?>

Password

@@ -97,7 +87,7 @@ for ($i=0;$i < pg_NumRows($res);$i++){ // Formatte le display $disp_style="