Changeset 1999
- Timestamp:
- 02/10/10 15:37:22 (14 years ago)
- Location:
- trunk
- Files:
-
- 10 added
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/calendar/inc/class.uicalendar.inc.php
r1949 r1999 5210 5210 '<script type="text/javascript" src="phpgwapi/js/dJSWin/dJSWin.js"></script>'. 5211 5211 "<script src='calendar/js/edit_exmail.js' type='text/javascript'></script>" . 5212 $load_lang_vars. 5213 "<script src='".$module_name."/js/connector.js' type='text/javascript'></script>". 5212 $load_lang_vars. 5214 5213 "<script type='text/javascript'>var DEFAULT_URL = '".$module_name."/controller.php?action=';</script> ". 5215 5214 "<script type='text/javascript'>" . -
trunk/calendar/templates/default/delegate.tpl
r1646 r1999 3 3 <script src='{url_template}/../../js/edit_exmail.js' type='text/javascript'></script> 4 4 <script src='{module_name}/inc/load_lang.php' type='text/javascript'></script> 5 <script src='{module_name}/js/connector.js' type='text/javascript'></script>6 5 <script type='text/javascript'>var DEFAULT_URL = '{module_name}/controller.php?action=';</script> 7 6 <font color="#FF0000">{error_msg}</font> -
trunk/expressoMail1_2/index.php
r1735 r1999 196 196 </body> 197 197 </html> 198 <script src="js/connector.js?<?=$update_version?>" type="text/javascript"></script>199 198 <script src="../phpgwapi/js/dftree/dftree.js?<?=$update_version?>" type="text/javascript"></script> 200 <script language="Javascript"> connector.updateVersion = "<?=$update_version?>";init();</script>199 <script language="Javascript">expresso.connector.updateVersion = "<?=$update_version?>";init();</script> 201 200 <!-----Expresso Mail - Version Updated:<?=$update_version?>--------> -
trunk/expressoMail1_2/js/TreeShow.js
r1558 r1999 7 7 this.name_folder = ""; 8 8 this.name_func = ""; 9 connector.loadScript("TreeS");9 expresso.connector.loadScript("TreeS"); 10 10 } 11 11 Tree_Box.prototype.update_folder = function(){ … … 175 175 ttreeBox.name_folder = "root"; //or use var newpast 176 176 this.name_func = "newpast"; 177 connector.purgeCache();177 expresso.connector.purgeCache(); 178 178 ttreeBox.update_folder(); 179 179 } … … 224 224 var handler_return = function(data) 225 225 { 226 connector.purgeCache();226 expresso.connector.purgeCache(); 227 227 ttreeBox.name_folder = "root"; 228 228 ttreeBox.update_folder(); … … 290 290 alert(data); 291 291 }else{ 292 connector.purgeCache();292 expresso.connector.purgeCache(); 293 293 ttreeBox.name_folder = "root"; 294 294 ttreeBox.update_folder(); -
trunk/expressoMail1_2/js/abas.js
r1994 r1999 41 41 if (Element('viewsource_rt_checkbox').checked) 42 42 { 43 connector.loadScript("rich_text_editor");43 expresso.connector.loadScript("rich_text_editor"); 44 44 RichTextEditor.viewsource(false); 45 45 } … … 66 66 try{ 67 67 if(ID){ 68 connector.loadScript("rich_text_editor");68 expresso.connector.loadScript("rich_text_editor"); 69 69 RichTextEditor.loadEditor(ID); 70 70 } -
trunk/expressoMail1_2/js/draw_api.js
r1969 r1999 331 331 //Timeout to release HTTPRequest , loadScript and update tree folders. 332 332 if(data) 333 setTimeout(" connector.loadScript('TreeShow');ttreeBox.update_folder();",500);333 setTimeout("expresso.connector.loadScript('TreeShow');ttreeBox.update_folder();",500); 334 334 } 335 335 cExecute("$this.imap_functions.create_extra_mailbox",handler_correct_folders,"nw_folders="+folder_create); … … 819 819 "TreeShow"); 820 820 821 connector.loadAllScripts(scripts);821 expresso.connector.loadAllScripts(scripts); 822 822 } 823 823 } … … 2881 2881 function draw_plugin_cc(ID, addrs) 2882 2882 { 2883 connector.loadScript("ccQuickAdd");2883 expresso.connector.loadScript("ccQuickAdd"); 2884 2884 2885 2885 var array_addrs = ''; … … 2919 2919 } 2920 2920 function deny_email(email){ 2921 connector.loadScript("filter");2922 connector.loadScript("filters");2921 expresso.connector.loadScript("filter"); 2922 expresso.connector.loadScript("filters"); 2923 2923 var dn_em = document.createElement("SPAN"); 2924 2924 dn_em.id = "tt_d"; -
trunk/expressoMail1_2/js/main.js
r1989 r1999 83 83 Element('tableDivAppbox').width = '100%'; 84 84 else 85 connector.createXMLHTTP();85 expresso.connector.createXMLHTTP(); 86 86 Element('divStatusBar').innerHTML = '<table height="16px" border=0 width=100% cellspacing=0 cellpadding=2>' + 87 87 '<tr>' + … … 281 281 // operação na applet 282 282 283 connector.showProgressBar();283 expresso.connector.showProgressBar(); 284 284 285 285 // if ((msg_info.DispositionNotificationTo) && ((msg_info.Unseen == 'U') || (msg_info.Recent == 'N'))){ … … 437 437 updateBoxBgColor(box.childNodes); 438 438 } 439 connector.purgeCache();439 expresso.connector.purgeCache(); 440 440 update_menu(); 441 441 } … … 583 583 updateBoxBgColor(box); 584 584 } 585 connector.purgeCache();585 expresso.connector.purgeCache(); 586 586 } 587 587 … … 641 641 if(typeof(data) == 'string') 642 642 if (data.match(/^(.*)TRYCREATE(.*)$/)){ 643 connector.loadScript('TreeS');643 expresso.connector.loadScript('TreeS'); 644 644 var move_to_folder = data.match(/^(.*)Spam(.*)$/) ? "Spam" : trashfolder; 645 645 alert(get_lang('There is not %1 folder, Expresso is creating it for you... Please, repeat your request later.', move_to_folder)); 646 connector.loadScript('TreeShow');646 expresso.connector.loadScript('TreeShow'); 647 647 ttree.FOLDER = 'root'; 648 648 ttreeBox.new_past(move_to_folder); … … 797 797 var update_tree; 798 798 for (var i = 0; i < data.length; i++) { 799 msg_info = connector.unserialize(data[i]);799 msg_info = expresso.connector.unserialize(data[i]); 800 800 if ( folder == 'INBOX/Lixeira/tmpMoveToLocal' ){ 801 801 msg_info.msg_folder += (Date.parse(new Date)); … … 1199 1199 tmp = link_attachment.innerHTML.substring(0,link_attachment.innerHTML.lastIndexOf("(")); 1200 1200 a_tmp[2] = "'"+tmp.substring(0,tmp.length-1)+"'"; 1201 s_tmp = escape( connector.serialize(a_tmp));1201 s_tmp = escape(expresso.connector.serialize(a_tmp)); 1202 1202 1203 1203 divFiles.innerHTML += "<input style='border:0' type='CHECKBOX' name='forwarding_attachments[]' checked value=\""+s_tmp+"\"/>"; … … 1305 1305 tmp = link_attachment.innerHTML.substring(0,link_attachment.innerHTML.lastIndexOf("(")); 1306 1306 a_tmp[2] = "'"+tmp.substring(0,tmp.length-1)+"'"; 1307 s_tmp = escape( connector.serialize(a_tmp));1307 s_tmp = escape(expresso.connector.serialize(a_tmp)); 1308 1308 divFiles.innerHTML += "<input style='border:0' type='CHECKBOX' name='forwarding_attachments[]' checked value=\""+s_tmp+"\"/>"; 1309 1309 divFiles.appendChild(link_attachment); … … 1421 1421 tmp = link_attachment.innerHTML.substring(0,link_attachment.innerHTML.lastIndexOf("(")); 1422 1422 a_tmp[2] = "'"+tmp.substring(0,tmp.length-1)+"'"; 1423 s_tmp = escape( connector.serialize(a_tmp));1423 s_tmp = escape(expresso.connector.serialize(a_tmp)); 1424 1424 divOriginalAttachments.innerHTML += "<input style='border:0' type='CHECKBOX' name='forwarding_attachments[]' checked value=\""+s_tmp+"\"/>"; 1425 1425 divOriginalAttachments.appendChild(link_attachment); … … 1515 1515 } 1516 1516 if(!expresso_offline) 1517 connector.hideProgressBar();1517 expresso.connector.hideProgressBar(); 1518 1518 } 1519 1519 … … 1530 1530 if (!smime){ // Erro aconteceu ao assinar ou decifrar e-mail 1531 1531 connector = new cConnector(); 1532 connector.hideProgressBar();1532 expresso.connector.hideProgressBar(); 1533 1533 return; 1534 1534 } … … 1713 1713 if (data.append.match(/^(.*)TRYCREATE(.*)$/)) 1714 1714 { 1715 connector.loadScript('TreeS');1715 expresso.connector.loadScript('TreeS'); 1716 1716 alert(get_lang('There is not %1 folder, Expresso is creating it for you... Please, repeat your request later.',draftsfolder)); 1717 connector.loadScript('TreeShow');1717 expresso.connector.loadScript('TreeShow'); 1718 1718 ttree.FOLDER = 'root'; 1719 1719 ttreeBox.new_past(draftsfolder); … … 1793 1793 }; 1794 1794 1795 var attach_files = connector.unserialize(data.files);1795 var attach_files = expresso.connector.unserialize(data.files); 1796 1796 if (attach_files != null) { 1797 1797 openTab.countFile[border_id] = attach_files.length; … … 1810 1810 var a_tmp = href.split(','); 1811 1811 a_tmp[2] = fileName; 1812 s_tmp = escape( connector.serialize(a_tmp));1812 s_tmp = escape(expresso.connector.serialize(a_tmp)); 1813 1813 1814 1814 var check_attachment = document.createElement("INPUT"); -
trunk/expressoMail1_2/js/manifest
r1932 r1999 19 19 { "url": "ccQuickAdd.js?1.222" }, 20 20 { "url": "color_palette.js?1.222" }, 21 { "url": "connector.js?1.222" },22 21 { "url": "common_functions.js?1.222" }, 23 22 { "url": "doiMenuData.js?1.222" }, 24 23 { "url": "drag_area.js?1.222" }, 25 24 { "url": "draw_api.js?1.222" }, 26 { "url": "md5.js?1.222" },27 25 { "url": "DropDownContacts.js?1.222" }, 28 26 { "url": "filter.js?1.222" }, -
trunk/expressoMail1_2/js/md5.js
r1335 r1999 1 /**2 * @author MD5 (Message-Digest Algorithm)3 * * http://www.webtoolkit.info/4 *5 */6 var MD5 = function (string) {7 8 function RotateLeft(lValue, iShiftBits) {9 return (lValue<<iShiftBits) | (lValue>>>(32-iShiftBits));10 }11 12 function AddUnsigned(lX,lY) {13 var lX4,lY4,lX8,lY8,lResult;14 lX8 = (lX & 0x80000000);15 lY8 = (lY & 0x80000000);16 lX4 = (lX & 0x40000000);17 lY4 = (lY & 0x40000000);18 lResult = (lX & 0x3FFFFFFF)+(lY & 0x3FFFFFFF);19 if (lX4 & lY4) {20 return (lResult ^ 0x80000000 ^ lX8 ^ lY8);21 }22 if (lX4 | lY4) {23 if (lResult & 0x40000000) {24 return (lResult ^ 0xC0000000 ^ lX8 ^ lY8);25 } else {26 return (lResult ^ 0x40000000 ^ lX8 ^ lY8);27 }28 } else {29 return (lResult ^ lX8 ^ lY8);30 }31 }32 33 function F(x,y,z) { return (x & y) | ((~x) & z); }34 function G(x,y,z) { return (x & z) | (y & (~z)); }35 function H(x,y,z) { return (x ^ y ^ z); }36 function I(x,y,z) { return (y ^ (x | (~z))); }37 38 function FF(a,b,c,d,x,s,ac) {39 a = AddUnsigned(a, AddUnsigned(AddUnsigned(F(b, c, d), x), ac));40 return AddUnsigned(RotateLeft(a, s), b);41 };42 43 function GG(a,b,c,d,x,s,ac) {44 a = AddUnsigned(a, AddUnsigned(AddUnsigned(G(b, c, d), x), ac));45 return AddUnsigned(RotateLeft(a, s), b);46 };47 48 function HH(a,b,c,d,x,s,ac) {49 a = AddUnsigned(a, AddUnsigned(AddUnsigned(H(b, c, d), x), ac));50 return AddUnsigned(RotateLeft(a, s), b);51 };52 53 function II(a,b,c,d,x,s,ac) {54 a = AddUnsigned(a, AddUnsigned(AddUnsigned(I(b, c, d), x), ac));55 return AddUnsigned(RotateLeft(a, s), b);56 };57 58 function ConvertToWordArray(string) {59 var lWordCount;60 var lMessageLength = string.length;61 var lNumberOfWords_temp1=lMessageLength + 8;62 var lNumberOfWords_temp2=(lNumberOfWords_temp1-(lNumberOfWords_temp1 % 64))/64;63 var lNumberOfWords = (lNumberOfWords_temp2+1)*16;64 var lWordArray=Array(lNumberOfWords-1);65 var lBytePosition = 0;66 var lByteCount = 0;67 while ( lByteCount < lMessageLength ) {68 lWordCount = (lByteCount-(lByteCount % 4))/4;69 lBytePosition = (lByteCount % 4)*8;70 lWordArray[lWordCount] = (lWordArray[lWordCount] | (string.charCodeAt(lByteCount)<<lBytePosition));71 lByteCount++;72 }73 lWordCount = (lByteCount-(lByteCount % 4))/4;74 lBytePosition = (lByteCount % 4)*8;75 lWordArray[lWordCount] = lWordArray[lWordCount] | (0x80<<lBytePosition);76 lWordArray[lNumberOfWords-2] = lMessageLength<<3;77 lWordArray[lNumberOfWords-1] = lMessageLength>>>29;78 return lWordArray;79 };80 81 function WordToHex(lValue) {82 var WordToHexValue="",WordToHexValue_temp="",lByte,lCount;83 for (lCount = 0;lCount<=3;lCount++) {84 lByte = (lValue>>>(lCount*8)) & 255;85 WordToHexValue_temp = "0" + lByte.toString(16);86 WordToHexValue = WordToHexValue + WordToHexValue_temp.substr(WordToHexValue_temp.length-2,2);87 }88 return WordToHexValue;89 };90 91 function Utf8Encode(string) {92 string = string.replace(/\r\n/g,"\n");93 var utftext = "";94 95 for (var n = 0; n < string.length; n++) {96 97 var c = string.charCodeAt(n);98 99 if (c < 128) {100 utftext += String.fromCharCode(c);101 }102 else if((c > 127) && (c < 2048)) {103 utftext += String.fromCharCode((c >> 6) | 192);104 utftext += String.fromCharCode((c & 63) | 128);105 }106 else {107 utftext += String.fromCharCode((c >> 12) | 224);108 utftext += String.fromCharCode(((c >> 6) & 63) | 128);109 utftext += String.fromCharCode((c & 63) | 128);110 }111 112 }113 114 return utftext;115 };116 117 var x=Array();118 var k,AA,BB,CC,DD,a,b,c,d;119 var S11=7, S12=12, S13=17, S14=22;120 var S21=5, S22=9 , S23=14, S24=20;121 var S31=4, S32=11, S33=16, S34=23;122 var S41=6, S42=10, S43=15, S44=21;123 124 string = Utf8Encode(string);125 126 x = ConvertToWordArray(string);127 128 a = 0x67452301; b = 0xEFCDAB89; c = 0x98BADCFE; d = 0x10325476;129 130 for (k=0;k<x.length;k+=16) {131 AA=a; BB=b; CC=c; DD=d;132 a=FF(a,b,c,d,x[k+0], S11,0xD76AA478);133 d=FF(d,a,b,c,x[k+1], S12,0xE8C7B756);134 c=FF(c,d,a,b,x[k+2], S13,0x242070DB);135 b=FF(b,c,d,a,x[k+3], S14,0xC1BDCEEE);136 a=FF(a,b,c,d,x[k+4], S11,0xF57C0FAF);137 d=FF(d,a,b,c,x[k+5], S12,0x4787C62A);138 c=FF(c,d,a,b,x[k+6], S13,0xA8304613);139 b=FF(b,c,d,a,x[k+7], S14,0xFD469501);140 a=FF(a,b,c,d,x[k+8], S11,0x698098D8);141 d=FF(d,a,b,c,x[k+9], S12,0x8B44F7AF);142 c=FF(c,d,a,b,x[k+10],S13,0xFFFF5BB1);143 b=FF(b,c,d,a,x[k+11],S14,0x895CD7BE);144 a=FF(a,b,c,d,x[k+12],S11,0x6B901122);145 d=FF(d,a,b,c,x[k+13],S12,0xFD987193);146 c=FF(c,d,a,b,x[k+14],S13,0xA679438E);147 b=FF(b,c,d,a,x[k+15],S14,0x49B40821);148 a=GG(a,b,c,d,x[k+1], S21,0xF61E2562);149 d=GG(d,a,b,c,x[k+6], S22,0xC040B340);150 c=GG(c,d,a,b,x[k+11],S23,0x265E5A51);151 b=GG(b,c,d,a,x[k+0], S24,0xE9B6C7AA);152 a=GG(a,b,c,d,x[k+5], S21,0xD62F105D);153 d=GG(d,a,b,c,x[k+10],S22,0x2441453);154 c=GG(c,d,a,b,x[k+15],S23,0xD8A1E681);155 b=GG(b,c,d,a,x[k+4], S24,0xE7D3FBC8);156 a=GG(a,b,c,d,x[k+9], S21,0x21E1CDE6);157 d=GG(d,a,b,c,x[k+14],S22,0xC33707D6);158 c=GG(c,d,a,b,x[k+3], S23,0xF4D50D87);159 b=GG(b,c,d,a,x[k+8], S24,0x455A14ED);160 a=GG(a,b,c,d,x[k+13],S21,0xA9E3E905);161 d=GG(d,a,b,c,x[k+2], S22,0xFCEFA3F8);162 c=GG(c,d,a,b,x[k+7], S23,0x676F02D9);163 b=GG(b,c,d,a,x[k+12],S24,0x8D2A4C8A);164 a=HH(a,b,c,d,x[k+5], S31,0xFFFA3942);165 d=HH(d,a,b,c,x[k+8], S32,0x8771F681);166 c=HH(c,d,a,b,x[k+11],S33,0x6D9D6122);167 b=HH(b,c,d,a,x[k+14],S34,0xFDE5380C);168 a=HH(a,b,c,d,x[k+1], S31,0xA4BEEA44);169 d=HH(d,a,b,c,x[k+4], S32,0x4BDECFA9);170 c=HH(c,d,a,b,x[k+7], S33,0xF6BB4B60);171 b=HH(b,c,d,a,x[k+10],S34,0xBEBFBC70);172 a=HH(a,b,c,d,x[k+13],S31,0x289B7EC6);173 d=HH(d,a,b,c,x[k+0], S32,0xEAA127FA);174 c=HH(c,d,a,b,x[k+3], S33,0xD4EF3085);175 b=HH(b,c,d,a,x[k+6], S34,0x4881D05);176 a=HH(a,b,c,d,x[k+9], S31,0xD9D4D039);177 d=HH(d,a,b,c,x[k+12],S32,0xE6DB99E5);178 c=HH(c,d,a,b,x[k+15],S33,0x1FA27CF8);179 b=HH(b,c,d,a,x[k+2], S34,0xC4AC5665);180 a=II(a,b,c,d,x[k+0], S41,0xF4292244);181 d=II(d,a,b,c,x[k+7], S42,0x432AFF97);182 c=II(c,d,a,b,x[k+14],S43,0xAB9423A7);183 b=II(b,c,d,a,x[k+5], S44,0xFC93A039);184 a=II(a,b,c,d,x[k+12],S41,0x655B59C3);185 d=II(d,a,b,c,x[k+3], S42,0x8F0CCC92);186 c=II(c,d,a,b,x[k+10],S43,0xFFEFF47D);187 b=II(b,c,d,a,x[k+1], S44,0x85845DD1);188 a=II(a,b,c,d,x[k+8], S41,0x6FA87E4F);189 d=II(d,a,b,c,x[k+15],S42,0xFE2CE6E0);190 c=II(c,d,a,b,x[k+6], S43,0xA3014314);191 b=II(b,c,d,a,x[k+13],S44,0x4E0811A1);192 a=II(a,b,c,d,x[k+4], S41,0xF7537E82);193 d=II(d,a,b,c,x[k+11],S42,0xBD3AF235);194 c=II(c,d,a,b,x[k+2], S43,0x2AD7D2BB);195 b=II(b,c,d,a,x[k+9], S44,0xEB86D391);196 a=AddUnsigned(a,AA);197 b=AddUnsigned(b,BB);198 c=AddUnsigned(c,CC);199 d=AddUnsigned(d,DD);200 }201 202 var temp = WordToHex(a)+WordToHex(b)+WordToHex(c)+WordToHex(d);203 204 return temp.toLowerCase();205 } -
trunk/expressoMail1_2/templates/default/main.css
r1965 r1999 10 10 font-family: Verdana, Arial, Helvetica, sans-serif; 11 11 font-size: 13px; 12 }13 .whiteSpace{14 width: 2px;15 12 } 16 13 … … 110 107 } 111 108 112 .menu-sel113 {114 text-decoration: none;115 text-align: center;116 font: bold 13px Lucidatypewriter,monospace;117 color:#0000FF;118 height: 20px;119 width:220px;120 background-color:#F7F7F7;121 margin-bottom: 0px;122 border: 1px solid #4a79b1;123 border-bottom: 0px;124 padding:0px 5px 0px 0px;125 -moz-border-radius: 9px 9px 0px 0px;126 -moz-user-select: none;127 cursor: pointer;128 }129 .menu130 {131 text-decoration: none;132 text-align: center;133 /* font: bold 13px Lucidatypewriter,monospace;*/134 height: 20px;135 width:220px;136 background-color:#c8d7ea;137 138 /* background-color: #F7F7F7;*/139 margin-bottom: 0px;140 border: 1px solid #f4f7fc;141 border-bottom: 1px solid #4a79b1;142 padding:0px 5px 0px 0px;143 -moz-border-radius: 9px 9px 0px 0px;144 -moz-user-select: none;145 cursor: pointer;146 }147 148 .last_menu149 {150 border-bottom: 1px solid #4a79b1;151 -moz-border-radius: 0px 0px 0px 0px;152 }153 154 .conteudo {155 font-family: Verdana, Arial, Helvetica, sans-serif;156 font-size: 10px;157 font-weight: normal;158 color: #000033;159 padding: 1px;160 border-left:1px solid #4A79B1;161 width:99.5%;162 overflow: none;163 -moz-border-radius: 0px 0px 6px 6px;164 }165 109 166 110 .table_message{ -
trunk/phpgwapi/inc/class.common.inc.php
r1576 r1999 1219 1219 { 1220 1220 echo parse_navbar(); 1221 } 1221 } 1222 echo "<script type='text/javascript' src='../phpgwapi/expressoAjax/expressoAjax.js'></script>"; 1223 1222 1224 } 1223 1225 -
trunk/phpgwapi/inc/class.preferences.inc.php
r1295 r1999 222 222 $this->session = array(); 223 223 } 224 $groups = $GLOBALS['phpgw']->accounts->membership(); 225 foreach($groups as $group) 226 $gids .= ",".$group['account_id']; 227 $account_id = (int)$this->account_id; 228 224 229 $this->db->query("SELECT * FROM phpgw_preferences" 225 . " WHERE preference_owner IN (-1,-2," . (int)$this->account_id. ')',__LINE__,__FILE__);230 . " WHERE preference_owner IN (-1,-2," . $account_id . $gids . ')',__LINE__,__FILE__); 226 231 227 232 $this->forced = $this->default = $this->user = array(); … … 244 249 $this->default[$app] = $value; 245 250 break; 246 default: //user251 case $account_id: //user 247 252 $this->user[$app] = $value; 253 break; 254 default: // group 255 $this->group[$app] = $value; 248 256 break; 249 257 } … … 273 281 } 274 282 } 283 // now set/force forced values for groups 284 // 285 foreach($this->group as $app => $values) 286 { 287 foreach($values as $var => $value) 288 { 289 $this->data[$app][$var] = $value; 290 } 291 } 292 275 293 // now set/force forced values 276 294 // … … 532 550 @note the user prefs for saveing are in $this->user not in $this->data, which are the effectiv prefs only 533 551 */ 534 function save_repository($update_session_info = False,$type='user' )552 function save_repository($update_session_info = False,$type='user',$account_id = null) 535 553 { 536 554 switch($type) 537 555 { 538 556 case 'forced': 539 $account_id = -1; 557 if ($account_id == null) 558 $account_id = -1; 540 559 $prefs = &$this->forced; 541 560 break; … … 554 573 { 555 574 $this->db->transaction_begin(); 556 //$this->db->query("DELETE FROM phpgw_preferences WHERE preference_owner='$account_id'",557 $this->db->query("DELETE FROM phpgw_preferences WHERE preference_owner='$account_id' and preference_app <> 'jabberit_messenger'",558 __LINE__,__FILE__559 );560 561 575 foreach($prefs as $app => $value) 562 576 { … … 566 580 } 567 581 $this->quote($value); 568 $value = $this->db->db_addslashes(serialize($value)); 582 $value = $this->db->db_addslashes(serialize($value)); // this addslashes is for the database 569 583 $app = $this->db->db_addslashes($app); 570 584 571 $this->db->query($sql = "INSERT INTO phpgw_preferences" 572 . " (preference_owner,preference_app,preference_value)" 573 . " VALUES ($account_id,'$app','$value')",__LINE__,__FILE__); 585 $query = "SELECT (preference_owner, preference_app) FROM phpgw_preferences WHERE preference_owner = '".$account_id."' AND preference_app = '".$app."'"; 586 587 $this->db->query($query, __LINE__, __FILE__); 588 589 if(!$this->db->next_record()) 590 { 591 // Insert Db 592 $query = "INSERT INTO phpgw_preferences(preference_owner,preference_app, preference_value) ". 593 "VALUES('".$account_id."','".$app."','".$value."')"; 594 } 595 else 596 { 597 // Update Db 598 $query = "UPDATE phpgw_preferences SET preference_value = '".$value."' WHERE ". 599 "preference_owner = '".$account_id."' AND preference_app = '".$app."'"; 600 } 601 $this->db->query($query, __LINE__, __FILE__); 574 602 } 575 603 $this->db->transaction_commit(); -
trunk/phpgwapi/templates/default/css/azul.css
r1719 r1999 12 12 border-bottom: 1px solid #D3DCE3; 13 13 14 } 15 16 .conteudo { 17 font-family: Verdana, Arial, Helvetica, sans-serif; 18 font-size: 10px; 19 font-weight: normal; 20 color: #000033; 21 padding: 1px; 22 border-left:1px solid #4A79B1; 23 width:99.5%; 24 overflow: none; 25 -moz-border-radius: 0px 0px 6px 6px; 26 } 27 28 .whiteSpace{ 29 width: 2px; 30 } 31 .menu 32 { 33 text-decoration: none; 34 text-align: center; 35 /* font: bold 13px Lucidatypewriter,monospace;*/ 36 height: 20px; 37 width:220px; 38 background-color:#c8d7ea; 39 40 /* background-color: #F7F7F7;*/ 41 margin-bottom: 0px; 42 border: 1px solid #f4f7fc; 43 border-bottom: 1px solid #4a79b1; 44 padding:0px 5px 0px 0px; 45 -moz-border-radius: 9px 9px 0px 0px; 46 -moz-user-select: none; 47 cursor: pointer; 48 } 49 50 .last_menu 51 { 52 border-bottom: 1px solid #4a79b1; 53 -moz-border-radius: 0px 0px 0px 0px; 54 } 55 56 .menu-sel 57 { 58 text-decoration: none; 59 text-align: center; 60 font: bold 13px Lucidatypewriter,monospace; 61 color:#0000FF; 62 height: 20px; 63 width:220px; 64 background-color:#F7F7F7; 65 margin-bottom: 0px; 66 border: 1px solid #4a79b1; 67 border-bottom: 0px; 68 padding:0px 5px 0px 0px; 69 -moz-border-radius: 9px 9px 0px 0px; 70 -moz-user-select: none; 71 cursor: pointer; 14 72 } 15 73 -
trunk/preferences/preferences.php
r1933 r1999 345 345 function process_array(&$repository,$array,$notifys,$prefix='') 346 346 { 347 $group_id = ($_POST['group']*1); 347 348 $_appname = check_app(); 348 349 … … 397 398 { 398 399 return $error; 399 } 400 401 $GLOBALS['phpgw']->preferences->save_repository(True,$GLOBALS['type']); 400 } 401 $GLOBALS['phpgw']->preferences->save_repository(True,$GLOBALS['type'],$group_id); 402 402 403 403 return False; … … 590 590 $t->set_var('tabs',$GLOBALS['phpgw']->common->create_tabs($tabs,$selected)); 591 591 } 592 if ($GLOBALS['type'] == 'forced') 593 { 594 $select_groups = '<script src="js/config.js"></script> 595 <script src="js/connector.js"></script> 596 <td>'.lang('groups').':<input type="text" value="" size="30" onkeyup="search_user(this)"> 597 <span id="span_searching1"></span></td> 598 <td><select name="group" id="searchu" style="width: 200px;" size="5" id="search"></td>'; 599 $t->set_var('select_groups',$select_groups); 600 } 592 601 $t->set_var('lang_submit', lang('save')); 593 602 $t->set_var('lang_cancel', lang('cancel')); -
trunk/preferences/templates/default/preferences.tpl
r1405 r1999 9 9 {rows} 10 10 <!-- END list --> 11 <tr> 12 {select_groups} 13 </tr> 11 14 <tr height="30" valign="bottom"> 12 15 <td align="left">
Note: See TracChangeset
for help on using the changeset viewer.