- Timestamp:
- 04/27/12 17:51:22 (12 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/index.php
r5914 r6065 253 253 // Fix problem with cyrus delimiter changes in preferences. 254 254 // Dots in names: enabled/disabled. 255 $save_in_folder = @ eregi_replace("INBOX/", "INBOX".$_SESSION['phpgw_info']['expressomail']['email_server']['imapDelimiter'], $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['save_in_folder']);256 $save_in_folder = @ eregi_replace("INBOX.", "INBOX".$_SESSION['phpgw_info']['expressomail']['email_server']['imapDelimiter'], $save_in_folder);255 $save_in_folder = @preg_replace('/INBOX\//i', "INBOX".$_SESSION['phpgw_info']['expressomail']['email_server']['imapDelimiter'], $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['save_in_folder']); 256 $save_in_folder = @preg_replace('/INBOX./i', "INBOX".$_SESSION['phpgw_info']['expressomail']['email_server']['imapDelimiter'], $save_in_folder); 257 257 $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['save_in_folder'] = $save_in_folder; 258 258 // End Fix. -
trunk/phpgwapi/inc/adodb/session/old/adodb-cryptsession.php
r34 r6065 24 24 #---------------------------------# 25 25 session_start(); 26 session_register('AVAR');27 26 $_SESSION['AVAR'] += 1; 28 27 print " … … 316 315 317 316 session_start(); 318 session_register('AVAR');319 317 $_SESSION['AVAR'] += 1; 320 318 print " -
trunk/phpgwapi/inc/adodb/session/old/adodb-session-clob.php
r34 r6065 19 19 include('adodb-session.php'); 20 20 session_start(); 21 session_register('AVAR');22 21 $_SESSION['AVAR'] += 1; 23 22 print " … … 30 29 adodb_session_open(false,false,false); 31 30 session_start(); 32 session_register('AVAR');33 31 $_SESSION['AVAR'] += 1; 34 32 print " … … 440 438 441 439 session_start(); 442 session_register('AVAR');443 440 $_SESSION['AVAR'] += 1; 444 441 ADOConnection::outp( " -
trunk/phpgwapi/inc/adodb/session/old/adodb-session.php
r1057 r6065 19 19 include('adodb-session.php'); 20 20 session_start(); 21 session_register('AVAR');22 21 $_SESSION['AVAR'] += 1; 23 22 print " … … 30 29 adodb_sess_open(false,false,false); 31 30 session_start(); 32 session_register('AVAR');33 31 $_SESSION['AVAR'] += 1; 34 32 print " … … 431 429 432 430 session_start(); 433 session_register('AVAR');434 431 $_SESSION['AVAR'] += 1; 435 432 ADOConnection::outp( " -
trunk/phpgwapi/inc/class.contacts_ldap.inc.php
r6057 r6065 330 330 for($i=0;$i<count($filterarray);$i++) 331 331 { 332 list($name,$value) = split("=",$filterarray[$i]);332 list($name,$value) = preg_split('/=/',$filterarray[$i]); 333 333 if($name) 334 334 { -
trunk/prototype/services/ImapServiceAdapter.php
r6029 r6065 568 568 569 569 $folder = mb_convert_encoding($data['folder'], "UTF7-IMAP","ISO-8859-1, UTF-8"); 570 $folder = @ eregi_replace("INBOX[/.]", "INBOX".$this->imap_delimiter, $folder);570 $folder = @preg_replace('/INBOX[\/.]/i', "INBOX".$this->imap_delimiter, $folder); 571 571 572 572 /**
Note: See TracChangeset
for help on using the changeset viewer.