Changeset 6065 for trunk


Ignore:
Timestamp:
04/27/12 17:51:22 (12 years ago)
Author:
marcosw
Message:

Ticket #2398 - Compatibilizacao com PHP-5.3 em alguns módulos do expresso

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/expressoMail1_2/index.php

    r5914 r6065  
    253253        // Fix problem with cyrus delimiter changes in preferences. 
    254254        // 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); 
    257257        $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['save_in_folder'] = $save_in_folder; 
    258258        // End Fix. 
  • trunk/phpgwapi/inc/adodb/session/old/adodb-cryptsession.php

    r34 r6065  
    2424        #---------------------------------# 
    2525        session_start(); 
    26         session_register('AVAR'); 
    2726        $_SESSION['AVAR'] += 1; 
    2827        print " 
     
    316315 
    317316        session_start(); 
    318         session_register('AVAR'); 
    319317        $_SESSION['AVAR'] += 1; 
    320318        print " 
  • trunk/phpgwapi/inc/adodb/session/old/adodb-session-clob.php

    r34 r6065  
    1919        include('adodb-session.php'); 
    2020        session_start(); 
    21         session_register('AVAR'); 
    2221        $_SESSION['AVAR'] += 1; 
    2322        print " 
     
    3029        adodb_session_open(false,false,false); 
    3130        session_start(); 
    32         session_register('AVAR'); 
    3331        $_SESSION['AVAR'] += 1; 
    3432        print " 
     
    440438 
    441439        session_start(); 
    442         session_register('AVAR'); 
    443440        $_SESSION['AVAR'] += 1; 
    444441        ADOConnection::outp( " 
  • trunk/phpgwapi/inc/adodb/session/old/adodb-session.php

    r1057 r6065  
    1919        include('adodb-session.php'); 
    2020        session_start(); 
    21         session_register('AVAR'); 
    2221        $_SESSION['AVAR'] += 1; 
    2322        print " 
     
    3029        adodb_sess_open(false,false,false); 
    3130        session_start(); 
    32         session_register('AVAR'); 
    3331        $_SESSION['AVAR'] += 1; 
    3432        print " 
     
    431429 
    432430        session_start(); 
    433         session_register('AVAR'); 
    434431        $_SESSION['AVAR'] += 1; 
    435432        ADOConnection::outp( " 
  • trunk/phpgwapi/inc/class.contacts_ldap.inc.php

    r6057 r6065  
    330330                                        for($i=0;$i<count($filterarray);$i++) 
    331331                                        { 
    332                                                 list($name,$value) = split("=",$filterarray[$i]); 
     332                                                list($name,$value) = preg_split('/=/',$filterarray[$i]); 
    333333                                                if($name) 
    334334                                                { 
  • trunk/prototype/services/ImapServiceAdapter.php

    r6029 r6065  
    568568 
    569569                                $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); 
    571571 
    572572                                /** 
Note: See TracChangeset for help on using the changeset viewer.