Changeset 25
- Timestamp:
- 05/10/07 17:16:06 (17 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
-
expressoMail1_2/docs/change_log.txt (modified) (1 diff)
-
expressoMail1_2/inc/class.imap_functions.inc.php (modified) (1 diff)
-
login.php (modified) (10 diffs)
-
phpgwapi/templates/celepar/login.tpl (modified) (2 diffs)
-
phpgwapi/templates/celepar/navbar.inc.php (modified) (1 diff)
-
phpgwapi/templates/celepar/navbar.tpl (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/docs/change_log.txt
r24 r25 70 70 - Alterado nome do link "Mais opções" para "Opções", no menu de mensagem aberta; 71 71 - Colocado link "Imprimir" entre os links "Opções" e "Encaminhar", no menu de mensagem aberta; 72 73 10/05/2007 - [1.2031] 74 - Mensagens plain com subtype = "mixed", com anexo, estavam sendo abertas no corpo da mensagem. -
trunk/expressoMail1_2/inc/class.imap_functions.inc.php
r13 r25 450 450 if(strtolower($msg->structure[$msg_number]->subtype) == "mixed" && $msg_part == 1) 451 451 $content .= nl2br(imap_base64(imap_fetchbody($mbox_stream, $msg_number, $msg_part, FT_UID))); 452 else 453 $content .= nl2br(imap_fetchbody($mbox_stream, $msg_number, $msg_part, FT_UID)); 452 else if(!strtolower($msg->structure[$msg_number]->subtype) == "mixed") 453 $content .= nl2br(imap_fetchbody($mbox_stream, $msg_number, $msg_part, FT_UID)); 454 454 } 455 455 } -
trunk/login.php
r16 r25 5 5 * Originaly written by Dan Kuykendall <seek3r@phpgroupware.org> * 6 6 * Joseph Engo <jengo@phpgroupware.org> * 7 * --------------------------------------------*7 * Updated by Nilton Emilio Buhrer Neto <niltonneto@celepar.pr.gov.br> * 8 8 * This program is free software; you can redistribute it and/or modify it * 9 9 * under the terms of the GNU General Public License as published by the * … … 80 80 // whoooo scaring 81 81 82 if($GLOBALS['phpgw_info']['server']['usecookies'] == True) 83 { 84 $GLOBALS['phpgw']->session->phpgw_setcookie('serverID', '1024'); 85 //GLOBALS['phpgw']->session->phpgw_setcookie('eGroupWareLoginTime', time()); 86 } 87 88 /* 89 if($_GET['cd'] != 10 && $GLOBALS['phpgw_info']['server']['usecookies'] == False) 90 { 91 $GLOBALS['phpgw']->session->setcookie('sessionid'); 92 $GLOBALS['phpgw']->session->setcookie('kp3'); 93 $GLOBALS['phpgw']->session->setcookie('domain'); 94 } 95 */ 96 97 /* This is not working yet because I need to figure out a way to clear the $cd =1 98 if(isset($_SERVER['PHP_AUTH_USER']) && $_GET['cd'] == '1') 99 { 100 Header('HTTP/1.0 401 Unauthorized'); 101 Header('WWW-Authenticate: Basic realm="phpGroupWare"'); 102 echo 'You have to re-authentificate yourself'; 103 exit; 104 } 105 */ 82 // ServerID => Identify the Apache Frontend. 83 if($GLOBALS['phpgw_info']['server']['usecookies'] == True && $GLOBALS['phpgw_info']['server']['use_frontend_id']) 84 { 85 $GLOBALS['phpgw']->session->phpgw_setcookie('serverID', $GLOBALS['phpgw_info']['server']['use_frontend_id']); 86 } 87 106 88 107 89 function check_logoutcode($code) … … 111 93 case 1: 112 94 return lang('You have been successfully logged out'); 113 break;95 114 96 case 2: 115 97 return lang('Sorry, your login has expired'); 116 break;98 117 99 case 4: 118 100 return lang('Cookies are required to login to this site.'); 119 break;101 120 102 case 5: 121 103 return '<font color="FF0000">' . lang('Bad login or password') . '</font>'; 122 break;104 123 105 case 98: 124 106 return '<font color="FF0000">' . lang('Account is expired') . '</font>'; 125 break;107 126 108 case 99: 127 109 return '<font color="FF0000">' . lang('Blocked, too many attempts') . '</font>'; 128 break;110 129 111 case 10: 130 112 $GLOBALS['phpgw']->session->phpgw_setcookie('sessionid'); … … 139 121 140 122 return '<font color="#FF0000">' . lang('Your session could not be verified.') . '</font>'; 141 break;123 142 124 default: 143 125 return ' '; … … 195 177 if(isset($passwd_type) || $_POST['submitit_x'] || $_POST['submitit_y'] || $submit) 196 178 { 197 // TEMPORÁRIO, Login com ou sem organização ////////////////////////////////////////////////////198 /*$common = CreateObject('phpgwapi.common');179 ///// Início - Código temporário: Para renomeação de login com organização para sem. ////// 180 /* $common = CreateObject('phpgwapi.common'); 199 181 $ldap_conn = $common->ldapConnect(); 200 182 $justthese = array("uid"); … … 202 184 $ldap_search = ldap_search($ldap_conn, $GLOBALS['phpgw_info']['server']['ldap_context'], $filter, $justthese); 203 185 $ldap_info = ldap_get_entries($ldap_conn, $ldap_search); 204 if ($ldap_info['count'] != 0) // Usuário SEM ORG EXISTE.186 if ($ldap_info['count'] != 0) // Verifica se o login existe sem organização. 205 187 { 206 188 $_POST['login'] = $_POST['user']; 207 189 } 208 ldap_close($ldap_conn); 209 */ 210 // TEMPORÁRIO, Login com ou sem organização //////////////////////////////////////////////////// 211 190 ldap_close($ldap_conn);*/ 191 /// Fim - Código temporário: Para renomeação de login com organização para sem. ////// 212 192 if(getenv('REQUEST_METHOD') != 'POST' && $_SERVER['REQUEST_METHOD'] != 'POST' && 213 193 !isset($_SERVER['PHP_AUTH_USER']) && !isset($_SERVER['SSL_CLIENT_S_DN'])) … … 215 195 $GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/login.php','cd=5')); 216 196 } 217 #if(!isset($_COOKIE['eGroupWareLoginTime']))218 #{219 # $GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/login.php','cd=4'));220 #}221 197 222 198 // don't get login data again when $submit is true … … 320 296 if($GLOBALS['phpgw_info']['server']['use_prefix_organization']) 321 297 { 298 // Início - Temporário: Para período de adaptação dos usuários, usando sem organização. 299 // $organization_select = "<tr><td width='96' class='loginLabel' align='right'>".lang("organization").": </td>". 300 // $organization_select .= "<td align='left' style='font-weight:bold' class='loginLabel' colspan=2><a style='font-weight:normal;font-decoration:none;text-decoration:none' href='javascript:void(0)' onclick='alert(\"Não é preciso mais selecionar a Organização.\\r\\n Digite apenas o usuário e a senha!\")' onmouseover='this.style.cursor=\"help\"'> automático</a></td></tr>"; 301 // Fim - Temporário: Para período de adaptação dos usuários, usando sem organização. 322 302 $organization_select = "<tr><td width=\"66\" class=\"loginLabel\">"; 323 303 $organization_select .= lang("organization").":</td>"; … … 351 331 $tmpl->set_var('select_organization',$organization_select); 352 332 } 353 333 354 334 $domain_select = ' '; 355 335 $last_loginid = $_COOKIE['last_loginid']; … … 427 407 $tmpl->set_var('bg_color_title',($GLOBALS['phpgw_info']['server']['login_bg_color_title']?$GLOBALS['phpgw_info']['server']['login_bg_color_title']:'486591')); 428 408 409 if($GLOBALS['phpgw_info']['server']['use_frontend_name']) 410 $tmpl->set_var('frontend_name', " - ".$GLOBALS['phpgw_info']['server']['use_frontend_name']); 411 429 412 if (substr($GLOBALS['phpgw_info']['server']['login_logo_file'],0,4) == 'http') 430 413 { -
trunk/phpgwapi/templates/celepar/login.tpl
r17 r25 12 12 <script language="Javascript"> 13 13 <!-- 14 function submitIt(event){15 /*if(event.keyCode == 13)16 document.login.submit();*/17 }18 14 19 15 function setLogin(){ 20 if( document. login.organization != null)21 document. login.login.value = document.login.organization.value+'-'+document.login.user.value;16 if( document.form_login.organization != null) 17 document.form_login.login.value = document.form_login.organization.value+'-'+document.form_login.user.value; 22 18 else 23 document. login.login.value = document.login.user.value;19 document.form_login.login.value = document.form_login.user.value; 24 20 } 25 21 26 22 function getLogin(){ 27 23 var cookie = '{cookie}'; 28 if( document. login.organization != null)29 document. login.user.value= cookie.substring(cookie.indexOf('-')+1,cookie.length);24 if( document.form_login.organization != null) 25 document.form_login.user.value= cookie.substring(cookie.indexOf('-')+1,cookie.length); 30 26 else 31 document. login.user.value= cookie;27 document.form_login.user.value= cookie; 32 28 33 if(document. login.user.value == '') {34 if(document. login.organization != null)35 document. login.organization.focus();29 if(document.form_login.user.value == '') { 30 if(document.form_login.organization != null) 31 document.form_login.organization.focus(); 36 32 else 37 document. login.user.focus();33 document.form_login.user.focus(); 38 34 } 39 35 else 40 document. login.passwd.focus();36 document.form_login.passwd.focus(); 41 37 } 42 38 … … 59 55 <td bgcolor="#e8eef7" height="100%"> 60 56 <table cellpadding="0" height="100%" cellspacing="0" width="100%" border="0"><tr><td width="60%"> </td><td> 61 <div align="center" class="msgInicial">{cd}<br>{lang_message}<br>{website_title} - 01<br><br></div>57 <div align="center" class="msgInicial">{cd}<br>{lang_message}<br>{website_title}{frontend_name}<br><br></div> 62 58 <table border="0" bordercolor="#cfcfcf" cellpadding="0" cellspacing="0" width="300"> 63 59 <tbody><tr> 64 <FORM name=" login" method="post" action="{login_url}" {autocomplete}>60 <FORM name="form_login" method="post" action="{login_url}" {autocomplete}> 65 61 <input type="hidden" name="passwd_type" value="text"> 66 <input type="hidden" name="login"><tr><td width="60%"> </td><td> 67 <input type="hidden" name="account type" value="u"> 62 <input type="hidden" name="account type" value="u"> 63 <input type="hidden" name="login"> 64 <tr><td width="60%"> </td><td> 68 65 <td bgcolor="#f7f7f7" style="border:1px solid black"> 69 <table 70 <tr><td height="2px"> </td></tr>66 <table border="0" cellpadding="0" cellspacing="0" class="tableLogin"> 67 <tr><td width="96" colspan="3"> </td></tr> 71 68 {select_organization} 72 <tr> 73 <td width="96" class="loginLabel">{lang_username}: </td> 74 <td width="105"><input name="user" size="15"></td> 75 <td>{select_domain}</td> 76 <td width="43" rowspan="3"><img src="phpgwapi/templates/celepar/images/icon_login.gif" width="43" height="64"></td> 69 <tr><td width="96" class="loginLabel" align="right">{lang_username}: </td> 70 <td width="96"><input name="user" size="15"></td> 71 <td width="43" rowspan="3" colspan=2><img src="phpgwapi/templates/celepar/images/icon_login.gif" width="43" height="64"></td> 77 72 </tr> 78 73 <tr> 79 <td width=" 66" class="loginLabel">{lang_password}: </td>80 <td width="135"><input name="passwd" type="password" size="15" onKeyDown="javascript:submitIt(event)"></td>81 <td> </td> 74 <td width="96" class="loginLabel" align="right">{lang_password}: </td> 75 <td width="135"><input name="passwd" type="password" size="15"></td> 76 82 77 </tr> 83 78 <tr> -
trunk/phpgwapi/templates/celepar/navbar.inc.php
r2 r25 225 225 . lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' ' 226 226 . $GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']); 227 228 if($GLOBALS['phpgw_info']['server']['use_frontend_name']) 229 $var['frontend_name'] = " - ".$GLOBALS['phpgw_info']['server']['use_frontend_name']; 227 230 228 231 if($GLOBALS['phpgw_info']['user']['lastpasswd_change'] == 0) -
trunk/phpgwapi/templates/celepar/navbar.tpl
r2 r25 70 70 <table width="100%" border="0" cellspacing="0" cellpadding="0"> 71 71 <tr> 72 <td width="30%" align="left" id="user_info" nowrap>{user_info} - 01</td>72 <td width="30%" align="left" id="user_info" nowrap>{user_info}{frontend_name}</td> 73 73 <td width="30%" id="admin_info" nowrap>{current_users}</td> 74 74 <td style="padding-right:10px" width="*" align="right" valign="center" nowrap="true">
Note: See TracChangeset
for help on using the changeset viewer.
