Project: ejabberd-modules
Revision: 707
Author: kolargol
Date: 12 Aug 2008 08:37:39
Changes:Bugfix: user preferences was not transmited after initial activation
- implemented new methods for user preferences
- removed save_pref() from functions
- small bugfix in searchbox
Files:modified: /jorge/trunk/lang.php (
try)
modified: /jorge/trunk/index.php (
try)
modified: /jorge/trunk/not_enabled.php (
try)
modified: /jorge/trunk/func.php (
try)
modified: /jorge/trunk/upper.php (
try)
Diff:
| ... | ...@@ -767,4 +767,7 @@ |
| 767 | 767 | $oper_fail[pol] = pl_znaczki("<center><b>Operacja nie zosta |
| ... | ...@@ -111,21 +111,22 @@ |
| 111 | 111 | $db->set_user_id("$ui"); |
| 112 | 112 | $db->set_logger("1","1",$rem_adre); |
| 113 | 113 | // get preferences, if not set, fallback to standard view. |
| 114 | | $get_pref_menu="select pref_id, pref_value from jorge_pref where owner_id='$ui'"; |
| 115 | | $q_pref=mysql_query($get_pref_menu); |
| 116 | | |
| 117 | | while ($res_pref=mysql_fetch_array($q_pref)) { |
| 114 | $db->get_jorge_pref(); |
| 115 | $pref_res = $db->result; |
| 116 | foreach ($pref_res as $res_pref) { |
| 118 | 117 | |
| 119 | 118 | if ($res_pref[pref_id]=="1") { |
| 120 | 119 | |
| 121 | 120 | if ($res_pref[pref_value] == "2") { |
| 122 | 121 | |
| 123 | | $view_type="2"; $tmp_v="calendar_view.php"; |
| 122 | $view_type = "2"; |
| 123 | $tmp_v = "calendar_view.php"; |
| 124 | 124 | |
| 125 | 125 | } |
| 126 | 126 | elseif($res_pref[pref_value] == "1") { |
| 127 | 127 | |
| 128 | | $view_type="1"; $tmp_v="main.php"; |
| 128 | $view_type = "1"; |
| 129 | $tmp_v = "main.php"; |
| 129 | 130 | |
| 130 | 131 | } |
| 131 | 132 | |
| ... | ...@@ -144,11 +145,12 @@ |
| 144 | 145 | $s_lang="eng"; |
| 145 | 146 | |
| 146 | 147 | } |
| 148 | |
| 147 | 149 | $sess->set('language',$s_lang); |
| 148 | 150 | } |
| 149 | 151 | } |
| 150 | 152 | |
| 151 | | // if pref not set fall to defaults |
| 153 | // fall back to defaults |
| 152 | 154 | if ($s_lang=="") { |
| 153 | 155 | |
| 154 | 156 | $sess->set('language',$lang); |
| ... | ...@@ -37,14 +37,22 @@ |
| 37 | 37 | if ($db->insert_new_settings($user_name) === true) { |
| 38 | 38 | |
| 39 | 39 | $html->set_body('<center><b>'.$act_su[$lang].'</b><br><small>'.$act_su2[$lang].'</small><hr> |
| 40 | | <form action="calendar_view.php" method="get"><input class="red" type="submit" name="logout" value="'.$log_out_b[$lang].'"></form></center> |
| 40 | <form action="calendar_view.php" method="get"><input class="red" type="submit" name="logout" value="'.$go_to_jorge[$lang].'"></form></center> |
| 41 | 41 | '); |
| 42 | 42 | |
| 43 | 43 | if ($db->get_user_id($user_name) === true) { |
| 44 | 44 | |
| 45 | 45 | $user_id = $db->result->user_id; |
| 46 | 46 | $db->set_user_id($user_id); |
| 47 | // non critical error |
| 48 | if ($db->set_jorge_pref("1","2") === false OR $db->set_jorge_pref("2","1") === false) { |
| 49 | |
| 50 | $html->alert_message('Ooops something goes wrong...its still beta...please contact system admin with this message'); |
| 51 | |
| 52 | } |
| 47 | 53 | $sess->set('enabled','t'); |
| 54 | $sess->set('view_type','2'); |
| 55 | $sess->set('language',$lang_def); |
| 48 | 56 | $db->set_logger("7","1",$rem_adre); |
| 49 | 57 | |
| 50 | 58 | } |
| ... | ...@@ -793,23 +793,6 @@ |
| 793 | 793 | return($calendar); |
| 794 | 794 | } |
| 795 | 795 | |
| 796 | | function save_pref($user_id, $pref_id,$pref_value) { |
| 797 | | if (mysql_num_rows(mysql_query("select pref_id from jorge_pref where owner_id='$user_id' and pref_id='$pref_id'"))!="0" ) { |
| 798 | | mysql_query("update jorge_pref set pref_value='$pref_value' where owner_id='$user_id' and pref_id='$pref_id'") or die; |
| 799 | | return "t"; |
| 800 | | |
| 801 | | } |
| 802 | | |
| 803 | | else { |
| 804 | | mysql_query("insert into jorge_pref(owner_id,pref_id,pref_value) values ('$user_id','$pref_id','$pref_value')") or die; |
| 805 | | return "t"; |
| 806 | | |
| 807 | | } |
| 808 | | |
| 809 | | return "f"; |
| 810 | | |
| 811 | | } |
| 812 | | |
| 813 | 796 | function delete_chat($talker,$server,$xmpp_host,$user_id,$tslice,$token,$enc,$lnk) { |
| 814 | 797 | |
| 815 | 798 | if (!ctype_digit($talker) OR !ctype_digit($server)) { return "f"; } |
| ... | ...@@ -68,14 +68,30 @@ |
| 68 | 68 | { |
| 69 | 69 | if($pref_value==="1" OR $pref_value==="2") |
| 70 | 70 | { |
| 71 | | save_pref($user_id,$pref_id,$pref_value); |
| 71 | if ($db->set_jorge_pref($pref_id,$pref_value) === false) { |
| 72 | |
| 73 | $html->alert_message($oper_fail[$lang],"message"); |
| 74 | |
| 75 | } |
| 72 | 76 | if ($pref_id==="1") { |
| 73 | | $sess->set('view_type',$pref_value); |
| 74 | | } |
| 77 | |
| 78 | $sess->set('view_type',$pref_value); |
| 79 | |
| 80 | } |
| 75 | 81 | if ($pref_id==="2") { |
| 76 | | if ($pref_value=="1") { $s_lang="pol"; } else { $s_lang="eng"; } |
| 77 | | $sess->set('language',$s_lang); |
| 82 | |
| 83 | if ($pref_value=="1") { |
| 84 | |
| 85 | $s_lang="pol"; |
| 86 | } |
| 87 | else { |
| 88 | |
| 89 | $s_lang="eng"; |
| 78 | 90 | } |
| 91 | |
| 92 | $sess->set('language',$s_lang); |
| 93 | |
| 94 | } |
| 79 | 95 | } |
| 80 | 96 | } |
| 81 | 97 | |
| ... | ...@@ -281,7 +297,7 @@ |
| 281 | 297 | </tr> |
| 282 | 298 | <tr><td height="57"><a href="'.$view_type.'"><img src="img/'.$brand_logo.'" alt="logo" border="0" /></a></td></tr> |
| 283 | 299 | <tr><td valign="top" height="35"><form action="search_v2.php" method="post"> |
| 284 | | <input id="t_search" type="text" name="query" class="cc" value="'.$search_phase.'"> |
| 300 | <input id="t_search" type="text" name="query" class="cc" value="'.htmlspecialchars(stripslashes($search_phase)).'"> |
| 285 | 301 | '); |
| 286 | 302 | |
| 287 | 303 | if ($search_loc==1) { |
To list