Ticket #713: dataprev.v3.t713.patch
File dataprev.v3.t713.patch, 8.6 KB (added by lucas.dacosta, 14 years ago) |
---|
-
phpgwapi/templates/classic/login_celepar.php
141 141 142 142 if(!isset($GLOBALS['sessionid']) || ! $GLOBALS['sessionid']) 143 143 { 144 $GLOBALS['phpgw']->redirect($GLOBALS['phpgw_info']['server']['webserver_url'] . '/login.php?cd=' . $GLOBALS['phpgw']->session->cd_reason );144 $GLOBALS['phpgw']->redirect($GLOBALS['phpgw_info']['server']['webserver_url'] . '/login.php?cd=' . $GLOBALS['phpgw']->session->cd_reason.'&phpgw_forward='.urlencode($_GET['phpgw_forward'])); 145 145 } 146 146 else 147 147 { … … 167 167 } 168 168 if ($GLOBALS['phpgw_info']['server']['use_https'] != 2) 169 169 { 170 $forward = 'http://'.$_SERVER['HTTP_HOST'].($GLOBALS['phpgw']->link($ forward.'?cd=yes'));170 $forward = 'http://'.$_SERVER['HTTP_HOST'].($GLOBALS['phpgw']->link($_GET['phpgw_forward'])); 171 171 echo "<script language='Javascript1.3'>location.href='".$forward."'</script>"; 172 172 } 173 173 else 174 174 { 175 $GLOBALS['phpgw']->redirect_link($ forward,$extra_vars);175 $GLOBALS['phpgw']->redirect_link($_GET['phpgw_forward'],''); 176 176 } 177 177 } 178 178 } -
phpgwapi/templates/default/login_default.php
160 160 161 161 if(!isset($GLOBALS['sessionid']) || ! $GLOBALS['sessionid']) 162 162 { 163 $GLOBALS['phpgw']->redirect($GLOBALS['phpgw_info']['server']['webserver_url'] . '/login.php?cd=' . $GLOBALS['phpgw']->session->cd_reason );163 $GLOBALS['phpgw']->redirect($GLOBALS['phpgw_info']['server']['webserver_url'] . '/login.php?cd=' . $GLOBALS['phpgw']->session->cd_reason.'&phpgw_forward='.urlencode($_GET['phpgw_forward'])); 164 164 } 165 165 else 166 166 { … … 186 186 } 187 187 if ($GLOBALS['phpgw_info']['server']['use_https'] != 2) 188 188 { 189 $forward = 'http://'.$_SERVER['HTTP_HOST'].($GLOBALS['phpgw']->link($ forward.'?cd=yes'));189 $forward = 'http://'.$_SERVER['HTTP_HOST'].($GLOBALS['phpgw']->link($_GET['phpgw_forward'])); 190 190 echo "<script language='Javascript1.3'>location.href='".$forward."'</script>"; 191 191 } 192 192 else 193 193 { 194 $GLOBALS['phpgw']->redirect_link($ forward,$extra_vars);194 $GLOBALS['phpgw']->redirect_link($_GET['phpgw_forward'],''); 195 195 } 196 196 } 197 197 } -
expressoMail1_2/index.php
92 92 $template->set_var("lang_search_user", lang("Search user") . '...'); 93 93 $template->set_var("upload_max_filesize",ini_get('upload_max_filesize')); 94 94 $template->set_var("msg_folder",$_GET['msgball']['folder']); 95 $template->set_var("msg_number",$_GET['msgball']['msgnum'] ? $_GET['msgball']['msgnum'] : $_GET['to']); 95 96 $geto = $_GET['to']; 97 98 function prepareurl($urlde) { 99 $urlde = str_replace('%0D%0A','<br>',$urlde); // replace '\r\n', '<br>' 100 if( preg_match('[%]',$urlde) ) { 101 $extra_vars_tmp = explode('&',$urlde); 102 $extra_new = ""; 103 foreach($extra_vars_tmp as $param) { // v=%20%25%20nosn%020&a=1 => // v=n%10%2o => v=> não => 104 $val = explode('=', $param); 105 $de = urldecode($val[1]); 106 $u2i = utf8_decode($de); 107 $pu2i = prepareurl($u2i); 108 $param2 = urlencode($pu2i); 109 $extra_new .= $val[0].'='.$param2.'&'; 110 } 111 return str_replace('+','%20',$extra_new); 112 } 113 return $urlde; 114 } 115 116 117 if($geto) { 118 $geto = @eregi_replace("^\"|\"$","",$geto); 119 $geto = prepareurl($geto); 120 } 121 //$template->set_var("msg_number",$_GET['msgball']['msgnum'] ? $_GET['msgball']['msgnum'] : $_GET['to']); 122 $template->set_var("msg_number",$_GET['msgball']['msgnum'] ? $_GET['msgball']['msgnum'] : $geto); 96 123 $template->set_var("user_email",$_SESSION['phpgw_info']['expressomail']['user']['email']); 97 124 $acc = CreateObject('phpgwapi.accounts'); 98 125 $template->set_var("user_organization", $acc->get_organization($GLOBALS['phpgw_info']['user']['account_dn'])); -
expressoMail1_2/js/main.js
897 897 898 898 function new_message_to(email) { 899 899 var new_border_ID = new_message('new','null'); 900 document.getElementById("to_" + new_border_ID).value=email; 900 title = get_lang("New Message"); 901 902 var variaveis=email.split(/\?|&/); 903 variaveis[0] = "to="+variaveis[0]; 904 var qs=[]; 905 for(var i=0;i<variaveis.length;i++){ 906 nvar=variaveis[i].split("="); 907 qs[nvar[0]]=unescape(nvar[1]); 908 } 909 910 Element("to_" + new_border_ID).value = qs['to']; 911 912 if (qs['cc']){ 913 Element("cc_" + new_border_ID).value = qs['cc']; 914 Element("space_link_" + new_border_ID).style.display = 'none'; 915 Element("a_cc_link_" + new_border_ID).style.display = 'none'; 916 Element("tr_cc_"+ new_border_ID).style.display = ''; 917 } 918 919 if (qs['bcc']){ 920 Element("cco_" + new_border_ID).value = qs['bcc']; 921 Element("space_link_" + new_border_ID).style.display = 'none'; 922 Element("a_cco_link_" + new_border_ID).style.display = 'none'; 923 Element("tr_cco_"+ new_border_ID).style.display = ''; 924 } 925 926 if(qs['subject']) { 927 Element("subject_" + new_border_ID).value = qs['subject']; 928 } 929 930 var body = document.getElementById("body_" + new_border_ID); 931 body.contentWindow.document.open(); 932 933 if(typeof(preferences.signature) == 'undefined') 934 preferences.signature = ""; 935 var signature = preferences.type_signature == 'html' ? preferences.signature : preferences.signature.replace(/\n/g, "<br>"); 936 937 var bbb = "<html><body bgcolor='#FFFFFF'>"; 938 if(qs['body']) { 939 bbb = bbb + "<font face='Arial' size='2'>"+qs['body']+"</font>"; 940 } 941 if (preferences.use_signature == "1") { 942 bbb = bbb + "<br>" + signature; 943 } 944 bbb = bbb + "</body></html>"; 945 body.contentWindow.document.write(bbb); 901 946 } 902 947 903 948 function new_message(type, border_ID){ … … 1222 1267 break; 1223 1268 case "new": 1224 1269 title = get_lang("New Message"); 1270 var booleanmailtocontinue=false; 1271 1225 1272 if(Element('msg_number').value) { 1226 1273 var _to = Element('msg_number').value; 1227 var reEmail = /^[A-Za-z\d_-]+(\.[A-Za-z\d_-]+)*@(([A-Za-z\d][A-Za-z\d-]{0,61}[A-Za-z\d]\.)+[A-Za-z]{2,6}|\[\d{1,3}(\.\d{1,3}){3}\])$/; 1228 if(!reEmail.test(_to)){ 1229 var array_contacts = contacts.split(','); 1230 for(i = 0; i < array_contacts.length;i++) { 1231 if(array_contacts[i].lastIndexOf(_to) != "-1"){ 1232 var _group = array_contacts[i].split(";"); 1233 _to = '"'+_group[0]+'" <'+_group[1]+'>'; 1234 break; 1274 if(/^mailto:/.test(_to)) { 1275 var unemm = unescape(_to.replace(/^mailto:/,'')); 1276 var mm = unemm.replace("?","&"); 1277 mm = mm.replace("\r\n","<br>"); 1278 booleanmailtocontinue=true; 1279 Element('msg_number').value=mm; 1280 delete_border(new_border_ID,'true'); 1281 new_message_to(mm); 1282 break; 1283 } 1284 else { 1285 var reEmail = /^[A-Za-z\d_-]+(\.[A-Za-z\d_-]+)*@(([A-Za-z\d][A-Za-z\d-]{0,61}[A-Za-z\d]\.)+[A-Za-z]{2,6}|\[\d{1,3}(\.\d{1,3}){3}\])$/; 1286 if(!reEmail.test(_to)){ 1287 var array_contacts = contacts.split(','); 1288 for(i = 0; i < array_contacts.length;i++) { 1289 if(array_contacts[i].lastIndexOf(_to) != "-1"){ 1290 var _group = array_contacts[i].split(";"); 1291 _to = '"'+_group[0]+'" <'+_group[1]+'>'; 1292 break; 1293 } 1235 1294 } 1236 1295 } 1296 Element("to_" + new_border_ID).value = _to +','; 1237 1297 } 1238 Element("to_" + new_border_ID).value = _to +',';1239 1298 Element('msg_number').value = ''; 1240 1299 } 1241 1300 var body = document.getElementById("body_" + new_border_ID); 1242 body.contentWindow.document.open(); 1243 // Insert the signature automaticaly at message body if use_signature preference is set 1244 if (preferences.use_signature == "1") { 1245 body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'>" + "<br>" + signature + "</body></html>"); 1301 if(booleanmailtocontinue==false) { 1302 body.contentWindow.document.open(); 1303 // Insert the signature automaticaly at message body if use_signature preference is set 1304 if (preferences.use_signature == "1") { 1305 body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'>" + "<br>" + signature + "</body></html>"); 1306 } 1307 else { 1308 body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'></body></html>"); 1309 } 1246 1310 } 1247 else {1248 body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'></body></html>");1249 }1250 1311 body.contentWindow.document.close(); 1251 1312 body.contentWindow.document.designMode = "on"; 1252 1313 config_events( body.contentWindow.document, 'onkeyup', function( e )