Changeset 604


Ignore:
Timestamp:
01/14/09 16:25:35 (11 years ago)
Author:
niltonneto
Message:

Resolve #397

Location:
trunk/expressoMail1_2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/expressoMail1_2/inc/load_lang.php

    r566 r604  
    44        { 
    55                $array_keys = array(); 
    6                 $fn = '../setup/phpgw_'.$_SESSION['phpgw_info']['expressomail']['user']['preferences']['common']['lang'].'.lang';                        
     6                $fn = 'setup/phpgw_'.$_SESSION['phpgw_info']['expressomail']['user']['preferences']['common']['lang'].'.lang';                   
    77                if (file_exists($fn)){ 
    88                        $fp = fopen($fn,'r'); 
     
    1414                } 
    1515        } 
    16         $script  = "array_lang = new Array();"; 
     16         
    1717        foreach($_SESSION['phpgw_info']['expressomail']['lang'] as $key => $value) 
    1818                $script .= "array_lang['".str_replace("'","\'",strtolower($key))."'] = '".str_replace("'","\'",$value)."';\n"; 
    19         echo $script; 
     19        echo "<script type='text/javascript'>$script</script>"; 
    2020?> 
  • trunk/expressoMail1_2/index.php

    r569 r604  
    9696                        'use_dynamic_contacts'                          => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_dynamic_contacts'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_dynamic_contacts'] : "0", 
    9797                        'number_of_contacts'                            => $current_config['expressoMail_Number_of_dynamic_contacts'] ? $current_config['expressoMail_Number_of_dynamic_contacts'] : "0", 
    98                 'use_cache'                                             => $current_config['expressoMail_enable_cache'] 
     98                        'use_cache'                                             => $current_config['expressoMail_enable_cache'], 
     99                        'notification_domains'                  => $current_config['expressoMail_notification_domains'] 
    99100 
    100101 
    101102                 
    102103        ); 
     104 
    103105 
    104106        $template = CreateObject('phpgwapi.Template',PHPGW_APP_TPL); 
     
    145147    $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']    = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']      ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']              : lang("Spam"); 
    146148    $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']    = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']      ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']              : lang("Sent"); 
    147  
     149     
    148150    echo '<script> var special_folders = new Array(4); 
    149151        special_folders["'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'].'"] = \'Trash\'; 
     
    160162 
    161163        $obj = createobject("expressoMail1_2.functions"); 
    162         echo "<script src='inc/load_lang.php?".$update_version."' type='text/javascript'></script>";     
     164        include("inc/load_lang.php");            
    163165        // INCLUDE these JS Files:  
    164166        echo $obj -> getFilesJs("js/abas.js," . 
Note: See TracChangeset for help on using the changeset viewer.