merge with rel310C

This commit is contained in:
sparkyx 2008-02-11 18:53:44 +00:00
parent 2bddf09d9c
commit aefc4b1eb8
77 changed files with 1189 additions and 1205 deletions

View file

@ -324,7 +324,7 @@ function load_global_pref()
$line[$type]=$row['parameter_value'];;
}
// save array into g_ variable
$array_pref=array ('g_theme'=>'THEME','g_pagesize'=>'PAGESIZE');
$array_pref=array ('g_theme'=>'THEME','g_pagesize'=>'PAGESIZE','g_topmenu'=>'TOPMENU');
foreach ($array_pref as $name=>$parameter ) {
if ( ! isset ($line[$parameter]) ) {
echo_debug("Missing pref : ".$parameter);
@ -349,7 +349,7 @@ function insert_default_global_pref($p_type="",$p_value="") {
echo_debug('class_user.php',__LINE__,"parameter p_type $p_type p_value $p_value");
$default_parameter= array("THEME"=>"Light",
"PAGESIZE"=>"50");
"PAGESIZE"=>"50",'TOPMENU'=>'SELECT');
$cn=Dbconnect();
$Sql="insert into user_global_pref(user_id,parameter_type,parameter_value)
values ('%s','%s','%s')";
@ -378,7 +378,7 @@ function insert_default_global_pref($p_type="",$p_value="") {
*/
function update_global_pref($p_type,$p_value="") {
$default_parameter= array("THEME"=>"Light",
"PAGESIZE"=>"50");
"PAGESIZE"=>"50",'TOPMENU'=>'SELECT');
$cn=Dbconnect();
$Sql="update user_global_pref set parameter_value='%s'
where parameter_type='%s' and