Changeset 2549 for trunk/expressoMail1_2/index.php

Timestamp:

04/15/10 15:26:02 (14 years ago)

Author:

rodsouza

Message:

Ticket #1009 - Corrigindo problemas com a inclusão de javascript.

File:

• trunk/expressoMail1_2/index.php (modified) (3 diffs)

trunk/expressoMail1_2/index.php

@@ -139 +139 @@
 if(!$var_tokens)
 {
-        $var_tokens = 'ePass2000Lx;/usr/lib/libepsng_p11.so,ePass2000Win;c:/windows/system32/ngp11v211.dll';
+        $var_tokens = 'ePass2000Lx;/usr/lib/libepsng_p11.so,ePass2000Win;c:/windows/system32/ngp11v211.dll;';
 }
-
-
-if ( ! @is_object($GLOBALS['phpgw']->js ) )
-        $GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
 
 $GLOBALS['phpgw']->js->validate_file( 'dJSWin', 'dJSWin' );
@@ -168 +164 @@
 $GLOBALS['phpgw']->js->validate_file( 'jscode', 'wfolders', 'expressoMail1_2' );
 
-if ($GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_shortcuts'])
-        $GLOBALS['phpgw']->js->validate_file( 'jscode', 'shortcut', 'expressoMail1_2' );
+if ( $GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'expressoMail' ][ 'use_shortcuts' ] )
+        $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode', 'shortcut', 'expressoMail1_2' );
 
-if ($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_local_messages'])
-        $GLOBALS['phpgw']->js->validate_file( 'jscode', 'gears_init', 'expressoMail1_2' );
+if ( $_SESSION[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'expressoMail' ][ 'use_local_messages' ] )
+        $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode', 'gears_init', 'expressoMail1_2' );
 
 
@@ -181 +177 @@
 $script .= '<link rel="stylesheet" type="text/css" href="' . $phpgwapi_url . '/js/dftree/dftree.css">';
 $script .= '<style type="text/css">@import url(' . $phpgwapi_url . '/js/jscalendar/calendar-win2k-1.css);</style>';
-$script .= '<script type="text/javascript">var template = "' . $GLOBALS['phpgw_info']['server']['template_set'] . '";';
-$script .= 'var special_folders = new Array(4);';
-$script .= 'special_folders["'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'].'"] = \'Trash\';';
-$script .= 'special_folders["'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'].'"] = \'Drafts\';';
-$script .= 'special_folders["'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'].'"] = \'Spam\';';
-$script .= 'special_folders["'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'].'"] = \'Sent\';';
-$script .= 'var trashfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'].'";';
-$script .= 'var draftsfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'].'";';
-$script .= 'var sentfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'].'";';
-$script .= 'var spamfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'].'";';
-$script .= 'var token_param = "'.$var_tokens.'";';
-$script .= 'var locale = "'.$GLOBALS['phpgw']->common->getPreferredLanguage().'";';
-$script .= 'var account_id = ' . $GLOBALS['phpgw_info']['user']['account_id'] . ';var expresso_offline = false;</script>';
+$script .= '<script type="text/javascript">';
+$script .= '    special_folders["'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'].'"] = \'Trash\';';
+$script .= '    special_folders["'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'].'"] = \'Drafts\';';
+$script .= '    special_folders["'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'].'"] = \'Spam\';';
+$script .= '    special_folders["'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'].'"] = \'Sent\';';
+$script .= '    trashfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'].'";';
+$script .= '    draftsfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'].'";';
+$script .= '    sentfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'].'";';
+$script .= '    spamfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'].'";';
+$script .= '    token_param = "'.$var_tokens.'";';
+$script .= '    var locale = "'.$GLOBALS['phpgw']->common->getPreferredLanguage().'";';
+$script .= '    var account_id = ' . $GLOBALS['phpgw_info']['user']['account_id'] . ';';
+$script .= '    expresso.connector.updateVersion = "'. $GLOBALS['phpgw_info']['flags']['update_version'] . '";';
+$script .= '    init( );';
 $script .= '</script>';
 
-$update_version = $GLOBALS['phpgw_info']['flags']['update_version'];
+$GLOBALS['phpgw_info']['flags']['java_script'] = $script;
 
-echo $script
-        . $GLOBALS[ 'phpgw' ] -> common -> get_java_script( )
-        . '<script language="Javascript">expresso.connector.updateVersion = "'. $update_version . '";init();</script>';
+echo '<!-----Expresso Mail - Version Updated:' . $GLOBALS['phpgw_info']['flags']['update_version'] . '-------->';
 ?>
-<!-----Expresso Mail - Version Updated:<?=$update_version?>-------->