Changeset 1342 for branches/1.2/phpgwapi


Ignore:
Timestamp:
08/19/09 11:10:14 (15 years ago)
Author:
niltonneto
Message:

Ticket #561 - Correção das diferenças entre versão publicada e branch 1.2

Location:
branches/1.2/phpgwapi
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/1.2/phpgwapi/inc/class.jscalendar.inc.php

    r2 r1342  
    3131                        $this->jscalendar_url = $GLOBALS['phpgw_info']['server']['webserver_url'].'/phpgwapi/js/'.$path; 
    3232                        $this->dateformat = $GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']; 
    33  
    34                         if ($do_header && !strstr($GLOBALS['phpgw_info']['flags']['java_script'],'jscalendar')) 
     33                         
     34                        if ($do_header && !strpos($GLOBALS['phpgw_info']['flags']['java_script'],'jscalendar')) 
    3535                        { 
    3636                                $GLOBALS['phpgw_info']['flags']['java_script'] .= 
  • branches/1.2/phpgwapi/inc/class.preferences.inc.php

    r54 r1342  
    11161116                        // is it possible to use Trash and Sent folders - i.e. using IMAP server 
    11171117                        // if not - force settings to false 
    1118                         if (stristr($prefs['email']['mail_server_type'], 'imap') == False) 
     1118                        if (strpos($prefs['email']['mail_server_type'], 'imap') == False) 
    11191119                        { 
    11201120                                if (isset($prefs['email']['use_trash_folder'])) 
  • branches/1.2/phpgwapi/js/dftree/dftree.js

    r709 r1342  
    224224{ 
    225225        var captionSpan; 
    226         if ((this.id != 'root') && (this.id != 'user') && (this.id !='local_root')){ 
     226        if ((this.id != 'root') && (this.id != 'user')){ 
    227227                captionSpan = getObjectById("l"+this.id+this._myTree.name); 
    228228                captionSpan.style.backgroundColor = 'white'; 
     
    234234{ 
    235235        var captionSpan; 
    236         if ((this.id != 'root') && (this.id != 'user') && (this.id !='local_root')){ 
     236        if ((this.id != 'root') && (this.id != 'user')){ 
    237237                captionSpan = getObjectById("l"+this.id+this._myTree.name); 
    238238                captionSpan.style.backgroundColor = ''; 
     
    300300        else //Nao tem onClick 
    301301        { 
    302                 if ((this.id != 'root') && (this.id != 'user') && (this.id !='local_root')) //e nao seja raiz(root) ou pastas compartilhadas(user). 
     302                if ((this.id != 'root') && (this.id != 'user')) //e nao seja raiz(root) ou pastas compartilhadas(user). 
    303303                        captionEventHandler = function () { _this._select();}; 
    304304        } 
Note: See TracChangeset for help on using the changeset viewer.