Changeset 2642
- Timestamp:
- 04/27/10 16:58:10 (14 years ago)
- Location:
- trunk
- Files:
-
- 12 edited
-
expressoMail1_2/index.php (modified) (6 diffs)
-
expressoMail1_2/js/jscode/abas.js (modified) (1 diff)
-
expressoMail1_2/js/jscode/common_functions.js (modified) (3 diffs)
-
expressoMail1_2/js/jscode/draw_api_folders.js (modified) (2 diffs)
-
expressoMail1_2/js/jscode/globals.js (modified) (2 diffs)
-
expressoMail1_2/js/jscode/local_messages.js (modified) (1 diff)
-
expressoMail1_2/js/jscode/main.js (modified) (1 diff)
-
expressoMail1_2/js/jscode/messages_controller.js (modified) (1 diff)
-
expressoMail1_2/js/jscode/wfolders.js (modified) (1 diff)
-
phpgwapi/js/tools/xconnector.js (modified) (3 diffs)
-
phpgwapi/js/tools/xlink.js (modified) (1 diff)
-
phpgwapi/js/tools/xscript.js (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/index.php
r2603 r2642 11 11 \**************************************************************************/ 12 12 13 $GLOBALS['phpgw_info']['flags'] = array( 14 //'noheader' => False, 15 //'nonavbar' => False, 13 $GLOBALS['phpgw_info']['flags'] = array 14 ( 16 15 'currentapp' => 'expressoMail1_2', 17 16 'update_version' => '1.235', … … 20 19 21 20 require_once('../header.inc.php'); 22 23 //include_once("inc/load_lang.php");24 21 25 22 $_SESSION['phpgw_info']['expressomail']['user'] = $GLOBALS['phpgw_info']['user']; … … 120 117 $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_command_for_spam'] = $current_config['expressoMail_command_for_spam']; 121 118 $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_use_spam_filter'] = $current_config['expressoMail_use_spam_filter']; 122 echo '<script> var use_spam_filter = "' . $current_config['expressoMail_use_spam_filter'] . '"</script>';123 119 // End Set Anti-Spam options. 124 120 … … 148 144 149 145 //$GLOBALS['phpgw']->js->validate_file( 'modal', 'modal', 'expressoMail1_2' ); 150 $GLOBALS[ 'phpgw']->js->validate_file( 'jscalendar', 'calendar', 'expressoMail1_2' );151 $GLOBALS[ 'phpgw']->js->validate_file( 'jscalendar', 'calendar-setup', 'expressoMail1_2' );152 $GLOBALS[ 'phpgw']->js->validate_file( 'jscalendar', 'lang/calendar-br', 'expressoMail1_2' );153 $GLOBALS[ 'phpgw']->js->validate_file( 'jscode', 'globals', 'expressoMail1_2' );154 $GLOBALS[ 'phpgw']->js->validate_file( 'jscode', 'sniff_browser', 'expressoMail1_2' );155 $GLOBALS[ 'phpgw']->js->validate_file( 'jscode', 'common_functions', 'expressoMail1_2' );156 $GLOBALS[ 'phpgw']->js->validate_file( 'jscode', 'abas', 'expressoMail1_2' );157 $GLOBALS[ 'phpgw']->js->validate_file( 'jscode', 'doiMenuData', 'expressoMail1_2' );158 $GLOBALS[ 'phpgw']->js->validate_file( 'jscode', 'drag_area', 'expressoMail1_2' );159 $GLOBALS[ 'phpgw']->js->validate_file( 'jscode', 'draw_api_messages', 'expressoMail1_2' );160 $GLOBALS[ 'phpgw']->js->validate_file( 'jscode', 'draw_api_folders', 'expressoMail1_2' );161 $GLOBALS[ 'phpgw']->js->validate_file( 'jscode', 'DropDownContacts', 'expressoMail1_2' );162 $GLOBALS[ 'phpgw']->js->validate_file( 'jscode', 'InfoContact', 'expressoMail1_2' );163 $GLOBALS[ 'phpgw']->js->validate_file( 'jscode', 'local_messages', 'expressoMail1_2' );164 $GLOBALS[ 'phpgw']->js->validate_file( 'jscode', 'messages_controller', 'expressoMail1_2' );165 $GLOBALS[ 'phpgw']->js->validate_file( 'jscode', 'rich_text_editor', 'expressoMail1_2' );166 $GLOBALS[ 'phpgw']->js->validate_file( 'jscode', 'wfolders', 'expressoMail1_2' );167 $GLOBALS[ 'phpgw']->js->validate_file( 'jscode', 'main', 'expressoMail1_2' );146 $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscalendar', 'calendar', 'expressoMail1_2' ); 147 $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscalendar', 'calendar-setup', 'expressoMail1_2' ); 148 $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscalendar', 'lang/calendar-br', 'expressoMail1_2' ); 149 $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode', 'globals', 'expressoMail1_2' ); 150 $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode', 'sniff_browser', 'expressoMail1_2' ); 151 $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode', 'common_functions', 'expressoMail1_2' ); 152 $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode', 'abas', 'expressoMail1_2' ); 153 $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode', 'doiMenuData', 'expressoMail1_2' ); 154 $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode', 'drag_area', 'expressoMail1_2' ); 155 $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode', 'draw_api_messages', 'expressoMail1_2' ); 156 $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode', 'draw_api_folders', 'expressoMail1_2' ); 157 $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode', 'DropDownContacts', 'expressoMail1_2' ); 158 $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode', 'InfoContact', 'expressoMail1_2' ); 159 $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode', 'local_messages', 'expressoMail1_2' ); 160 $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode', 'messages_controller', 'expressoMail1_2' ); 161 $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode', 'rich_text_editor', 'expressoMail1_2' ); 162 $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode', 'wfolders', 'expressoMail1_2' ); 163 $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode', 'main', 'expressoMail1_2' ); 168 164 169 165 if ( $GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'expressoMail' ][ 'use_shortcuts' ] ) … … 181 177 $script .= '<style type="text/css">@import url(' . $phpgwapi_url . '/js/jscalendar/calendar-win2k-1.css);</style>'; 182 178 $script .= '<script type="text/javascript">'; 179 $script .= ' use_spam_filter = "' . $current_config['expressoMail_use_spam_filter'] . '";'; 183 180 $script .= ' special_folders["'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'].'"] = \'Trash\';'; 184 181 $script .= ' special_folders["'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'].'"] = \'Drafts\';'; … … 192 189 $script .= ' var locale = "'.$GLOBALS['phpgw']->common->getPreferredLanguage().'";'; 193 190 $script .= ' var account_id = ' . $GLOBALS['phpgw_info']['user']['account_id'] . ';'; 194 $script .= ' expresso.connector.updateVersion = "'. $GLOBALS['phpgw_info']['flags']['update_version'] . '";';195 191 $script .= ' var cyrus_delimiter = "' . $_SESSION['phpgw_info']['expressomail']['email_server']['imapDelimiter'] . '";'; 196 192 $script .= ( ( array_key_exists( 'HTTP_BACKGROUNDREQUEST', $_SERVER ) || array_key_exists( 'BackgroundRequest', $_GET ) ) ? 'init( );' : 'XEvents.add( window, "onload", init)' ); -
trunk/expressoMail1_2/js/jscode/abas.js
r2630 r2642 1 var BordersArray = new Array();2 BordersArray[0] = new setBorderAttributes(0);3 4 1 function setBorderAttributes(ID) 5 2 { -
trunk/expressoMail1_2/js/jscode/common_functions.js
r2618 r2642 1 1 // BEGIN: FUNCTION RESIZE WINDOW 2 /*3 2 if (!expresso_offline) { 4 3 var _showBar = showBar; 5 4 var _hideBar = hideBar; 6 5 } 7 */8 6 9 7 function __showBar(){ … … 19 17 hideBar = __hideBar; 20 18 21 window.onresize = resizeWindow;19 XEvents.add( window, 'onresize', resizeWindow ); 22 20 23 21 function resizeWindow(){ … … 36 34 var div = Element("content_id_"+BordersArray[i].sequence); 37 35 38 // This comented code cause/avoid (!?) Firefox to stuck some request39 36 if(div) 40 // div.setAttribute("style","height: "+parseInt(defaultHeight - 90)+"px;"); 41 div.style.height = defaultHeight - 90; 37 div.style.height = ( defaultHeight - 90 ) + 'px'; 42 38 if(div_scroll) 43 // div_scroll.setAttribute("style","height: "+parseInt(defaultHeight - 130)+"px;"); 44 div_scroll.style.height = defaultHeight - 130; 39 div_scroll.style.height = ( defaultHeight - 130 ) + 'px'; 45 40 } 46 41 } -
trunk/expressoMail1_2/js/jscode/draw_api_folders.js
r2630 r2642 224 224 else{ 225 225 if(div) 226 { 226 227 div.innerHTML = ''; 227 value = data['quota_percent']; 228 q_used = data['quota_used']; 229 table = document.getElementById("table_quota"); 230 if(table) 231 table.parentNode.removeChild(table); 232 table = document.createElement("TABLE"); 233 tbody = document.createElement("TBODY"); 234 table.appendChild(tbody); 235 table.id = "table_quota"; 236 table.width="102"; 237 table.border="0"; 238 table.cellSpacing = 0; 239 table.cellPadding = 0; 240 241 //tr1 = document.createElement("TR"); 242 td11 = document.createElement("TD"); 243 td11.align="center"; 244 td11.setAttribute("noWrap","true"); 245 td11.innerHTML += ' <span class="boxHeaderText">' + value+"% ("+q_used+"M/"+q_limit+"M)</span>"; 246 //tr1.appendChild(td11); 247 248 tr2 = document.createElement("TR"); 249 td21 = document.createElement("TD"); 250 td21.setAttribute("noWrap","true"); 251 td21.height="15"; 252 td22 = document.createElement("TD"); 253 td21.setAttribute("background", URL_SERVER + 'phpgwapi/templates/' + template + '/images/dsunused.gif'); 254 table221 = document.createElement("TABLE"); 255 tbody221 = document.createElement("TBODY"); 256 table221.appendChild(tbody221); 257 table221.style.width=value+"%"; 258 td21.width="102"; 259 table221.border="0"; 260 table221.cellSpacing = 0; 261 table221.cellPadding = 0; 262 tr221 = document.createElement("TR"); 263 td221 = document.createElement("TD"); 264 td221.height="15"; 265 if(value > 90) { 266 if(value >= 100) 267 write_msg(get_lang("Your Mailbox is 100% full! You must free more space or will not receive messages.")); 228 value = data['quota_percent']; 229 q_used = data['quota_used']; 230 table = document.getElementById("table_quota"); 231 if(table) 232 table.parentNode.removeChild(table); 233 table = document.createElement("TABLE"); 234 tbody = document.createElement("TBODY"); 235 table.appendChild(tbody); 236 table.id = "table_quota"; 237 table.width="102"; 238 table.border="0"; 239 table.cellSpacing = 0; 240 table.cellPadding = 0; 241 242 //tr1 = document.createElement("TR"); 243 td11 = document.createElement("TD"); 244 td11.align="center"; 245 td11.setAttribute("noWrap","true"); 246 td11.innerHTML += ' <span class="boxHeaderText">' + value+"% ("+q_used+"M/"+q_limit+"M)</span>"; 247 //tr1.appendChild(td11); 248 249 tr2 = document.createElement("TR"); 250 td21 = document.createElement("TD"); 251 td21.setAttribute("noWrap","true"); 252 td21.height="15"; 253 td22 = document.createElement("TD"); 254 td21.setAttribute("background", URL_SERVER + 'phpgwapi/templates/' + template + '/images/dsunused.gif'); 255 table221 = document.createElement("TABLE"); 256 tbody221 = document.createElement("TBODY"); 257 table221.appendChild(tbody221); 258 table221.style.width=value+"%"; 259 td21.width="102"; 260 table221.border="0"; 261 table221.cellSpacing = 0; 262 table221.cellPadding = 0; 263 tr221 = document.createElement("TR"); 264 td221 = document.createElement("TD"); 265 td221.height="15"; 266 if(value > 90) { 267 if(value >= 100) 268 write_msg(get_lang("Your Mailbox is 100% full! You must free more space or will not receive messages.")); 269 else 270 write_msg(get_lang("Warning: Your Mailbox is almost full!")); 271 td221.setAttribute("background","templates/"+template+"/images/dsalert.gif"); 272 } 273 else if(value > 80) 274 td221.setAttribute("background", URL_SERVER + 'expressoMail1_2/templates/' + template + '/images/dswarn.gif'); 268 275 else 269 write_msg(get_lang("Warning: Your Mailbox is almost full!")); 270 td221.setAttribute("background","templates/"+template+"/images/dsalert.gif"); 271 } 272 else if(value > 80) 273 td221.setAttribute("background", URL_SERVER + 'expressoMail1_2/templates/' + template + '/images/dswarn.gif'); 274 else 275 td221.className = 'dsused'; 276 277 tr221.appendChild(td221); 278 tbody221.appendChild(tr221); 279 td21.appendChild(table221); 280 tr2.appendChild(td21); 281 tr2.appendChild(td11); 282 283 //tr2.appendChild(td1); 284 285 tbody.appendChild(tr2); //Desenho 286 //tbody.appendChild(tr1); //Letras 287 div.appendChild(table); 276 td221.className = 'dsused'; 277 278 tr221.appendChild(td221); 279 tbody221.appendChild(tr221); 280 td21.appendChild(table221); 281 tr2.appendChild(td21); 282 tr2.appendChild(td11); 283 284 //tr2.appendChild(td1); 285 286 tbody.appendChild(tr2); //Desenho 287 //tbody.appendChild(tr1); //Letras 288 div.appendChild(table); 289 } 288 290 } 289 291 } … … 318 320 span_paging.className = "boxHeaderText"; 319 321 span_paging.align="right"; 320 document.getElementById("div_menu_c3").appendChild(span_paging); 322 var div_menu_c3 = document.getElementById("div_menu_c3"); 323 if ( div_menu_c3 ) 324 div_menu_c3.appendChild(span_paging); 321 325 } 322 326 span_paging.style.width="100%"; -
trunk/expressoMail1_2/js/jscode/globals.js
r2630 r2642 46 46 47 47 var special_folders = new Array(4); 48 special_folders[ 'Trash' ] = 'Trash'; 49 special_folders[ 'Drafts' ] = 'Drafts'; 50 special_folders[ 'Spam' ] = 'Spam'; 51 special_folders[ 'Sent' ] = 'Sent'; 48 52 var trashfolder = 'Trash'; 49 53 var draftsfolder = 'Drafts'; … … 61 65 "controller" : "/controller.php?action=" 62 66 } ); 67 68 var BordersArray = new Array(); 69 var expresso_local_messages; 70 var proxy_mensagens; 71 var wfolders; 72 var use_spam_filter; -
trunk/expressoMail1_2/js/jscode/local_messages.js
r2566 r2642 1588 1588 }; 1589 1589 1590 var expresso_local_messages;1591 expresso_local_messages = new local_messages();1592 expresso_local_messages.create_objects(); -
trunk/expressoMail1_2/js/jscode/main.js
r2630 r2642 6 6 7 7 function init(){ 8 BordersArray[0] = new setBorderAttributes(0); 9 expresso_local_messages = new local_messages(); 10 expresso_local_messages.create_objects(); 11 proxy_mensagens = new messages_proxy(); 12 wfolders = new cWFolders(); 13 8 14 current_folder = "INBOX"; 9 15 if (!is_ie) -
trunk/expressoMail1_2/js/jscode/messages_controller.js
r2572 r2642 324 324 }; 325 325 326 var proxy_mensagens;327 proxy_mensagens = new messages_proxy(); -
trunk/expressoMail1_2/js/jscode/wfolders.js
r2572 r2642 160 160 161 161 /* Build the Object */ 162 var wfolders;163 wfolders = new cWFolders(); -
trunk/phpgwapi/js/tools/xconnector.js
r2628 r2642 108 108 try 109 109 { 110 110 _request( _data ); 111 111 } 112 catch (e )112 catch ( _e ) 113 113 { 114 //alert("#request\n\n" + _ID + "\n\n" + _e + "\n\n" + _e.description);114 alert("#request\n\n" + _ID + "\n\n" + _e + "\n\n" + _e.description); 115 115 } 116 116 … … 126 126 catch( e ) 127 127 { 128 //alert( "e\n\n" + e ); 128 129 } 129 130 break; … … 141 142 142 143 var _SEND = null; 143 144 //if ( _THREADS[_ID]._METHOD == 'GET' )145 // _TARGET += '?' + _ACTION;146 147 //_TARGET += _ID;148 144 149 145 _THREADS[ _ID ]._XHR.open( ( ( _THREADS[ _ID ]._POST ) ? 'POST' : 'GET' ), _TARGET, true); -
trunk/phpgwapi/js/tools/xlink.js
r2630 r2642 62 62 _container.appendChild( el.firstChild ); 63 63 64 var _inline = [ ]; 65 for ( var i = 0; i < _new_scripts.length; i++ ) 66 if ( _new_scripts[ i ][ 2 ] == undefined || _new_scripts[ i ][ 2 ].length == 0 ) 67 _inline[ _inline.length ] = _new_scripts[ i ][ 3 ]; 64 var _count = 0; 65 function _scripts( ) 66 { 67 if ( _new_scripts[ _count ][ 2 ] == undefined || _new_scripts[ _count ][ 2 ].length == 0 ) 68 _script.load( function( ) 69 { 70 if ( ++_count < _new_scripts.length ) 71 _scripts( ); 72 }, _new_scripts[ _count ][ 3 ] ); 68 73 else 69 _script.add( _new_scripts[ i ][ 2 ].substr( 70 URL_SERVER.length - 1, 71 _new_scripts[ i ][ 2 ].indexOf( '?' ) - URL_SERVER.length + 1 72 ) ); 74 { 75 _script.add( 76 _new_scripts[ _count ][ 2 ].substr( 77 URL_SERVER.length - 1, 78 _new_scripts[ _count ][ 2 ].indexOf( '?' ) - URL_SERVER.length + 1 79 ) 80 ); 81 if ( ++_count < _new_scripts.length ) 82 _scripts( ); 83 } 84 } 73 85 74 var _it_has_loaded = _script.load( function()86 if ( _new_scripts.length ) 75 87 { 76 if ( _inline.length ) 77 window.eval( _inline.join( '' ) ); 78 } ); 79 80 if ( ! _it_has_loaded && _inline.length ) 81 window.eval( _inline.join( '' ) ); 88 _scripts( ); 89 _script.load( ); 90 } 82 91 } 83 92 } ); -
trunk/phpgwapi/js/tools/xscript.js
r2630 r2642 18 18 function _load( ) 19 19 { 20 if ( ! _new.length )21 return false;22 23 20 var _handler = null; 24 21 if ( arguments.length && typeof arguments[ 0 ] == 'function' ) 25 22 _handler = arguments[ 0 ]; 26 23 27 _connector.go( { 28 "access" : URL_SERVER + 'controller.php?action=phpgwapi.javascript.get_source&source=' + _new.join( ';' ), 29 "handler" : function( data ) 30 { 31 for ( var i = 0; i < _new.length; i++ ) 32 _loaded[ _loaded.length ] = _new[ i ]; 24 var _inline = ''; 25 if ( arguments.length && typeof arguments[ 1 ] == 'string' ) 26 _inline = arguments[ 1 ]; 33 27 34 _new = [ ]; 28 if ( ! _new.length ) 29 { 30 window.eval( _inline); 31 if ( _handler ) 32 _handler( ); 33 } 34 else 35 { 36 var _scripts = _new.join( ';' ); 35 37 36 window.eval( data ); 38 for ( var i = 0; i < _new.length; i++ ) 39 _loaded[ _loaded.length ] = _new[ i ]; 37 40 38 if ( _handler ) 39 _handler( data ); 40 } 41 } ); 41 _new = [ ]; 42 43 _connector.go( { 44 "access" : URL_SERVER + 'controller.php?action=phpgwapi.javascript.get_source&source=' + _scripts, 45 "handler" : function( data ) 46 { 47 window.eval( data + _inline); 48 49 if ( _handler ) 50 _handler( ); 51 } 52 } ); 53 } 42 54 } 43 55
Note: See TracChangeset
for help on using the changeset viewer.
