Changeset 7551


Ignore:
Timestamp:
11/22/12 17:45:28 (11 years ago)
Author:
angelo
Message:

Ticket #3197 - Reduzir tempo de carregamento do modulo Expresso MailexpressoMail1_2/js/draw_api.min.js

Location:
trunk
Files:
1 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/calendar/inc/class.socalendar_sql.inc.php

    r7432 r7551  
    963963                                }else 
    964964                                        $type = 'E'; 
    965                          
    966  
    967965                        $sql = 'UPDATE phpgw_cal SET ' 
    968966                                        . 'owner='.(int)$event['owner'].', ' 
  • trunk/expressoAdmin1_2/inc/class.imap_functions.inc.php

    r5850 r7551  
    147147                        $result['msg'] .= $this->functions->lang('Server returns') . ': ' . imap_last_error(); 
    148148                } 
    149                  
     149                ob_start(); 
     150                print_r($result); 
     151                $output = ob_get_clean(); 
     152                file_put_contents( "/tmp/angelo.log",  $output , FILE_APPEND);           
    150153                return $result; 
    151154        } 
  • trunk/expressoMail1_2/inc/class.imap_functions.inc.php

    r7460 r7551  
    194194        function get_range_msgs2($params) 
    195195        {        
     196                $tmp = mktime(); 
    196197                include_once dirname(__FILE__).'/../../prototype/api/controller.php'; 
    197198            // Free others requests 
     
    217218                    $return['tot_unseen'] = ($search_box_type == 'SEEN') ? 0 : $msgs_info->unseen; 
    218219 
    219                     $sort_array_msg = $this->get_msgs($folder, $sort_box_type, $search_box_type, $sort_box_reverse,$msg_range_begin,$msg_range_end); 
     220                    $sort_array_msg = $this->get_msgs($folder, $sort_box_type, $search_box_type, $sort_box_reverse,$msg_range_begin,$msg_range_end,$tmp); 
    220221 
    221222                    $num_msgs = ($search_box_type=="UNSEEN") ? $msgs_info->unseen : (($search_box_type=="SEEN") ? ($msgs_info->messages - $msgs_info->unseen) : $msgs_info->messages); 
     
    232233                                    $return[$i] = $this->get_info_head_msg( $msg_number , $sample );                                     
    233234                                    $i++; 
    234                             }  
     235                            } 
    235236                                                         
    236237                                                        $filter = array('AND', array('=', 'folderName', $folder), array('IN','messageNumber', $sort_array_msg)); 
     
    267268                                                        } 
    268269                    } 
    269                     $return['num_msgs'] =  $num_msgs;                            
     270                    $return['num_msgs'] =  $num_msgs;                            
    270271                } else { 
    271272                        $num_msgs = imap_num_msg($this->mbox); 
    272                         $sort_array_msg = $this-> get_msgs($folder, $sort_box_type, $search_box_type, $sort_box_reverse,$msg_range_begin,$num_msgs); 
    273  
    274  
     273                        $sort_array_msg = $this-> get_msgs($folder, $sort_box_type, $search_box_type, $sort_box_reverse,$msg_range_begin,$num_msgs,$tmp); 
    275274                        $return['tot_unseen'] = 0; 
    276275                        $i = 0; 
    277  
    278276                        if(is_array($sort_array_msg)){ 
    279277 
     
    295293                        $return['num_msgs'] = count($sort_array_msg)+($msg_range_begin-1); 
    296294                } 
    297                                  
    298                 return $return; 
     295                                ob_start(); 
     296                                print_r("\n"); 
     297                                print_r("saindo da get_range_msgs2: "."\n"); 
     298                                print_r("tempo estimado: ".(mktime() - $tmp)); 
     299                                print_r("\n"."------------------------"); 
     300                                $output = ob_get_clean(); 
     301                                file_put_contents( "/tmp/angelo.log",  $output , FILE_APPEND);                   
     302                return $return;                 
    299303    } 
    300304         
     
    401405        */ 
    402406        function get_info_head_msg( $msg_number , $appendSample = false ) 
    403         {              
     407        {          
    404408            $return = false; 
    405409            $cached = false; 
     
    415419                   $cached = true;    
    416420            } 
    417              
    418             $header = imap_headerinfo($this->mbox, imap_msgno( $this->mbox , $msg_number )); //Resgata o objeto Header da mensagem , nescessario mesmo com o cache pois as flags podem ser atualizadas por outro cliente de email 
     421            $header = imap_headerinfo($this->mbox,imap_msgno($this->mbox,$msg_number)); //Resgata o objeto Header da mensagem , nescessario mesmo com o cache pois as flags podem ser atualizadas por outro cliente de email 
    419422            $return['Recent'] = $header->Recent; 
    420423            $return['Unseen'] = $header->Unseen; 
     
    489492            if( $this->useCache === true ) 
    490493                $this->cache->set( 'infoHead://'.$this->username.'://'.$this->mboxFolder.'://'.$msg_number , $return , $this->expirationCache); 
    491                      
    492                                          
    493                                          
    494                                          
    495494            return $return; 
    496495        } 
     
    32863285        function messages_sort($sort_box_type,$sort_box_reverse, $search_box_type,$offsetBegin,$offsetEnd,$folder) 
    32873286        { 
     3287                $tmp = mktime(); 
    32883288                $sort = array(); 
    32893289                if ($sort_box_type != "SORTFROM" && $search_box_type!= "FLAGGED"){ 
     
    32953295                                $slice_array = false; 
    32963296                        else 
    3297                                 $slice_array = true; 
     3297                                $slice_array = true;             
    32983298                } 
    32993299                else 
     
    33583358                if ($slice_array) 
    33593359                        $sort = array_slice($sort,$offsetBegin-1,$offsetEnd-($offsetBegin-1),true); 
     3360                ob_start(); 
     3361                print_r("------------------------"."\n"); 
     3362                print_r("saindo da messages_sort: "."\n"); 
     3363                print_r("tempo estimado: ".(mktime() - $tmp)); 
     3364                $output = ob_get_clean(); 
     3365                file_put_contents( "/tmp/angelo.log",  $output , FILE_APPEND);           
    33603366                return $sort; 
    33613367 
     
    38363842        } 
    38373843 
    3838         function get_msgs($folder, $sort_box_type, $search_box_type, $sort_box_reverse,$offsetBegin = 0,$offsetEnd = 0) 
     3844        function get_msgs($folder, $sort_box_type, $search_box_type, $sort_box_reverse,$offsetBegin = 0,$offsetEnd = 0,$tmp) 
    38393845        { 
    38403846                if(!$this->mbox || !is_resource($this->mbox)) 
     
    38453851                        $offsetBegin = 1; 
    38463852                } 
    3847                 return $this->messages_sort($sort_box_type,$sort_box_reverse, $search_box_type,$offsetBegin,$offsetEnd,$folder); 
     3853                return $this->messages_sort($sort_box_type,$sort_box_reverse, $search_box_type,$offsetBegin,$offsetEnd,$folder,$tmp); 
    38483854        } 
    38493855 
  • trunk/expressoMail1_2/js/draw_api.min.js

    r7547 r7551  
    1  
    21focusIn="";canMakeBox=true;fastSearch=false;selectedPagingMsgs={};allMsgsSelected=false;totalFolderMsgs=0;var jqXHR=new Array();var idattachbycontent=0;onceOpenedHeadersMessages={};var cache=new Array();var openTab={'type':[],'content_id':[],'imapUid':[],'countFile':[0,0,0,0,0,0,0,0,0,0],'imapBox':[],'toPreserve':[],'condition':[]};var autoSaveControl={'timer':[],'status':[]};var tabTypes={'new':4,'forward':6,'reply_with_history':7,'reply_to_all_with_history':8,'reply_without_history':9,'reply_to_all_without_history':10,'edit':5};var currentTab,numBox=0;function draw_tree_folders(folders){if(Element('dftree_tree_folders')){if(!expresso_offline){var update_tree_folders=function(data){draw_quota(data);var unseen_in_mailbox=0;var unseen_in_shared_folders=0;for(var i=0;i<data.length;i++){if(data[i].folder_unseen>0) 
    32{unseen_in_mailbox=parseInt(unseen_in_mailbox+data[i].folder_unseen);if(data[i].folder_id.indexOf('INBOX')!==0) 
     
    278277add_className(tr_element,'flagged_msg');td_element1=createTDElement(0,0,"td_msg");chk_box_element=document.createElement("INPUT");chk_box_element.setAttribute("type","checkbox");chk_box_element.className="checkbox";chk_box_element.setAttribute("id","check_box_message_"+headers_msgs.msg_number);$(chk_box_element).click(function(e){updateSelectedMsgs($(this).is(':checked'),headers_msgs.msg_number);$(".selected_shortcut_msg").removeClass("current_selected_shortcut_msg selected_shortcut_msg");$(".current_selected_shortcut_msg").removeClass("current_selected_shortcut_msg selected_shortcut_msg");if(preferences.use_shortcuts=='1') 
    279278$(this).parents("tr:first").addClass("current_selected_shortcut_msg selected_shortcut_msg");changeBgColor(e,headers_msgs.msg_number);$(this).blur();});td_element1.appendChild(chk_box_element);td_element2=createTDElement(0,1,"td_msg");if(headers_msgs.attachment&&(headers_msgs.attachment==1||headers_msgs.attachment.number_attachments>0)) 
    280 td_element2.innerHTML="<img src ='templates/"+template+"/images/clip.gif' >";td_element21=createTDElement(0,2,"td_msg",null,"td_message_answered_"+headers_msgs.msg_number);if((headers_msgs.Forwarded=='F')||(headers_msgs.Draft=='X'&&headers_msgs.Answered=='A')){td_element21.onclick=function(){search_emails(headers_msgs.subject.replace(/^(re: ?|fw: ?|enc: ?|res: ?|fwd: ?)*/gi,''),true);};td_element21.innerHTML="<img src ='templates/"+template+"/images/forwarded.png' title='"+get_lang('Forwarded')+"'>";headers_msgs.Draft='' 
     279$(td_element2).css({'background-image':'url(templates/'+template+'/images/mail-gifs.gif)','background-position':'0 -242px'});td_element21=createTDElement(0,2,"td_msg",null,"td_message_answered_"+headers_msgs.msg_number);if((headers_msgs.Forwarded=='F')||(headers_msgs.Draft=='X'&&headers_msgs.Answered=='A')){td_element21.onclick=function(){search_emails(headers_msgs.subject.replace(/^(re: ?|fw: ?|enc: ?|res: ?|fwd: ?)*/gi,''),true);};td_element21.innerHTML="<img src ='templates/"+template+"/images/forwarded.png' title='"+get_lang('Forwarded')+"'>";headers_msgs.Draft='' 
    281280headers_msgs.Answered='';headers_msgs.Forwarded='F';} 
    282281else if(headers_msgs.Draft=='X') 
     
    382381else 
    383382_name=info_msg.from.email.length>_maxChar?info_msg.from.email.substring(0,_maxChar)+"...":info_msg.from.email;} 
    384 td.innerHTML=_name.bold()+', '+info_msg.smalldate;if(info_msg.attachments&&info_msg.attachments.length>0) 
    385 td.innerHTML+="&nbsp<img style='cursor:pointer' onclick='javascript:Element(\"option_hide_more_"+ID+"\").onclick()' src ='templates/"+template+"/images/clip.gif' title='"+info_msg.attachments[0].name+"'>";if(typeof(info_msg.signature)=='string') 
     383td.innerHTML=_name.bold()+', '+info_msg.smalldate;if(info_msg.attachments&&info_msg.attachments.length>0){td.innerHTML+="&nbsp";$(td).css({'background-image':'url(templates/'+template+'/images/mail-gifs.gif)','background-position':'0 -242px'});$(td).find('img').css({'cursor':'pointer','title':info_msg.attachments[0].name}).click(function(){$("option_hide_more_"+ID).click();});} 
     384if(typeof(info_msg.signature)=='string') 
    386385{if(info_msg.signature!="void") 
    387386td.innerHTML+='&nbsp;<img style="cursor:pointer" onclick="alert(\''+get_lang("This message is signed, and you can trust.")+info_msg.signature+'\');" src="templates/'+template+'/images/signed.gif">';else 
     
    656655table.parentNode.removeChild(table);table=document.createElement("TABLE");tbody=document.createElement("TBODY");table.appendChild(tbody);table.id="table_quota";table.width="102";table.border="0";table.cellSpacing=0;table.cellPadding=0;td11=document.createElement("TD");td11.align="center";td11.setAttribute("noWrap","true");td11.innerHTML+='<div id="quota_progressbar" class="boxHeaderText" style="display: block; float: left; height: 13px; width: 121px;"></div>&nbsp;<span class="boxHeaderText" style="line-height : 0px;">'+value+"% ("+borkb(q_used*1024)+"/"+borkb(q_limit*1024)+")</span>";tr2=document.createElement("TR");td22=document.createElement("TD");tr2.appendChild(td11);tbody.appendChild(tr2);div.appendChild(table);$("#quota_progressbar").progressbar({value:value});if(value>90){if(value>=100) 
    657656write_msg(get_lang("Your Mailbox is 100% full! You must free more space or will not receive messages."));else 
    658 write_msg(get_lang("Warning: Your Mailbox is almost full!"));$("#quota_progressbar").find(".ui-progressbar-value").css({"background-image":"url(templates/default/images/dsalert.gif)","border-color":"red"});} 
     657write_msg(get_lang("Warning: Your Mailbox is almost full!"));$("#quota_progressbar").find(".ui-progressbar-value").css({"background-image":"url(templates/default/images/mail-gifs.gif)","border-color":"red",'background-position':'0 -305px'});} 
    659658else if(value>80) 
    660659$("#quota_progressbar").find(".ui-progressbar-value").css({"background-image":"url(templates/default/images/dswarn.gif)","border-color":"yellow"});}} 
  • trunk/prototype/config/PostgreSQL.srv

    r6081 r7551  
    77;host = 127.0.0.1 
    88port = 5432 
    9 dbname = expresso 
     9dbname = expresso24angelo 
    1010user = postgres 
    1111; Caso o usuario tenha senha... 
  • trunk/prototype/modules/mail/interceptors/Helpers.php

    r6641 r7551  
    9696                                         
    9797                                        /** 
    98                                          * Devido há inconsistencias na chamada do interceptor addDefaultElementsFilter (followupflag:before.find) 
     98                                         * Devido a inconsistencias na chamada do interceptor addDefaultElementsFilter (followupflag:before.find) 
    9999                                         * os followupflag defaults são inseridos no retorno, por isso é necessário procurar o objeto correto 
    100100                                         * através do id 
  • trunk/prototype/request.php

    r6443 r7551  
    4242} 
    4343//////////////////////////////////////////////////////////////////////////////////////// 
    44  
    45  
    4644echo json_encode( toUtf8(Controller::call( $id ? 'read' : 'find', 
    4745                                    Controller::URI( $concept, $id, $service ), 
    4846                                    $properties, 
    4947                                    $criteria )) ); 
    50  
     48/* 
     49ob_start(); 
     50print_r("\n"."-----------"."\n"); 
     51print_r("conceito: ".$concept."\n"); 
     52print_r("tempo: ".(mktime() - $time)); 
     53print_r("\n"."-----------"."\n"); 
     54$output = ob_get_clean(); 
     55file_put_contents( "/tmp/angelo.log",  $output , FILE_APPEND); 
     56*/ 
    5157Controller::closeAll(); 
Note: See TracChangeset for help on using the changeset viewer.