Changeset 7655 for trunk/calendar/inc/class.bocalendar.inc.php

Timestamp:

12/14/12 14:30:35 (11 years ago)

Author:

douglasz

Message:

Ticket #3236 - Melhorias de performance no codigo do Expresso.

File:

• trunk/calendar/inc/class.bocalendar.inc.php (modified) (20 diffs)

trunk/calendar/inc/class.bocalendar.inc.php

@@ -912 +912 @@
                                 $endtime += $offset*$multi;
                                 $starttime <= $enddate;
-                                $i++,
+                                ++$i,
                                 $i = ($i < count($dowOffsets))?$i:0,
                                 $multi = $dowOffsets[$i],
@@ -1252 +1252 @@
                                         $minparts = min($l_participants);
                                         $part = Array();
-                                        for($i=0;$i<count($parts);$i++)
+                                        for($i=0;$i<count($parts);++$i)
                                         {
                                                 if (($accept_type = substr($parts[$i],-1,1)) == '0' || (int)$accept_type > 0)
@@ -2137 +2137 @@
                         {
                                 $exceptions = explode(',',$exception_str);
-                                for($exception_count=0;$exception_count<count($exceptions);$exception_count++)
+                                for($exception_count=0;$exception_count<count($exceptions);++$exception_count)
                                 {
                                         $exception[] = (int)$exceptions[$exception_count];
@@ -2196 +2196 @@
                                 }
 
-                                for($i=0;$i<count($this->cached_events[$date]);$i++)
+                                for($i=0;$i<count($this->cached_events[$date]);++$i)
                                 {
                                         if($this->cached_events[$date][$i]['id'] == $event['id'] || $this->cached_events[$date][$i]['reference'] == $event['id'])
@@ -2256 +2256 @@
                         $repeated = $this->repeating_events;
                         $r_events = count($repeated);
-                        for ($i=0;$i<$r_events;$i++)
+                        for ($i=0;$i<$r_events;++$i)
                         {
                                 $rep_events = $this->repeating_events[$i];
@@ -2460 +2460 @@
                                         {
                                                 $emonth = 1;
-                                                $eyear++;
+                                                ++$eyear;
                                         }
                                 }
@@ -2510 +2510 @@
                         if($c_cached_ids)
                         {
-                                for($i=0;$i<$c_cached_ids;$i++)
+                                for($i=0;$i<$c_cached_ids;++$i)
                                 {
                                         $event = $this->so->read_entry($cached_event_ids[$i]);
@@ -2525 +2525 @@
                                                 $start['month'] = (int)(substr($startdate,4,2));
                                                 $start['mday'] = (int)(substr($startdate,6,2));
-                                                for($j=$startdate,$k=0;$j<=$enddate;$k++,$j=(int)(date('Ymd',mktime(0,0,0,$start['month'],$start['mday'] + $k,$start['year']))))
+                                                for($j=$startdate,$k=0;$j<=$enddate;++$k,$j=(int)(date('Ymd',mktime(0,0,0,$start['month'],$start['mday'] + $k,$start['year']))))
                                                 {
                                                         $c_evt_day = count($this->cached_events[$j]) - 1;
@@ -2556 +2556 @@
                         if($c_cached_ids_repeating)
                         {
-                                for($i=0;$i<$c_cached_ids_repeating;$i++)
+                                for($i=0;$i<$c_cached_ids_repeating;++$i)
                                 {
                                         $this->repeating_events[$i] = $this->so->read_entry($cached_event_ids_repeating[$i]);
@@ -2575 +2575 @@
                                         {
                                                 echo '<!-- Total events found matching '.$search_date.' = '.count($this->cached_events[$search_date]).' -->'."\n";
-                                                for($i=0;$i<count($this->cached_events[$search_date]);$i++)
+                                                for($i=0;$i<count($this->cached_events[$search_date]);++$i)
                                                 {
                                                         echo '<!-- Date: '.$search_date.' ['.$i.'] = '.$this->cached_events[$search_date][$i]['id'].' -->'."\n";
@@ -2583 +2583 @@
                         }
                         $retval = Array();
-                        for($j=date('Ymd',mktime(0,0,0,$smonth,$sday,$syear)),$k=0;$j<=date('Ymd',mktime(0,0,0,$emonth,$eday,$eyear));$k++,$j=date('Ymd',mktime(0,0,0,$smonth,$sday + $k,$syear)))
+                        for($j=date('Ymd',mktime(0,0,0,$smonth,$sday,$syear)),$k=0;$j<=date('Ymd',mktime(0,0,0,$emonth,$eday,$eyear));++$k,$j=date('Ymd',mktime(0,0,0,$smonth,$sday + $k,$syear)))
                         {
                                 if(is_array($this->cached_events[$j]))
@@ -2765 +2765 @@
                 function prepare_matrix($interval,$increment,$part,$fulldate)
                 {
-                        for($h=0;$h<24;$h++)
-                        {
-                                for($m=0;$m<$interval;$m++)
+                        for($h=0;$h<24;++$h)
+                        {
+                                for($m=0;$m<$interval;++$m)
                                 {
                                         $index = (($h * 10000) + (($m * $increment) * 100));
@@ -2785 +2785 @@
                                 $starttemp = $this->splittime("$start",False);
                                 $subminute = 0;
-                                for($m=0;$m<$interval;$m++)
+                                for($m=0;$m<$interval;++$m)
                                 {
                                         $minutes = $increment * $m;
@@ -2797 +2797 @@
                                 $endtemp = $this->splittime("$end",False);
                                 $addminute = 0;
-                                for($m=0;$m<$interval;$m++)
+                                for($m=0;$m<$interval;++$m)
                                 {
                                         $minutes = ($increment * $m);
@@ -2809 +2809 @@
                                 $endtemp = $this->splittime("$end",False);
 
-                                for($h=$starttemp['hour'];$h<=$endtemp['hour'];$h++)
+                                for($h=$starttemp['hour'];$h<=$endtemp['hour'];++$h)
                                 {
                                         $startminute = 0;
@@ -2825 +2825 @@
                                         $time_display = $GLOBALS['phpgw']->common->show_date($eventstart['raw'],$this->users_timeformat).'-'.$GLOBALS['phpgw']->common->show_date($eventend['raw'],$this->users_timeformat);
                                         $time_description = '('.$time_display.') '.$this->get_short_field($event,$private,'title').$this->display_status($event['participants'][$part]);
-                                        for($m=$startminute;$m<$endminute;$m++)
+                                        for($m=$startminute;$m<$endminute;++$m)
                                         {
                                                 $index = ($hour + (($m * $increment) * 100));
@@ -2866 +2866 @@
 
                         //verifica se todos os participantes rejeitaram o evento
-                        for($i = 0; $i < count($sts); $i++ ){ 
+                        for($i = 0; $i < count($sts); ++$i ){
                                 if( $sts[i] === "R")
                                         unset( $sts[i] );
@@ -3065 +3065 @@
                     $last_space = false;
 
-                    for($i=0, $count=0; $i < $str_width; $i++, $count++)
+                    for($i=0, $count=0; $i < $str_width; ++$i, ++$count)
                     {
                         // If we're at a break
@@ -4199 +4199 @@
                 {
                         $already_moved = Array();
-                        for($v=$firstday;$v<=$lastday;$v++)
+                        for($v=$firstday;$v<=$lastday;++$v)
                         {
                                 if (!$this->cached_events[$v])
@@ -4436 +4436 @@
                         {
                                 $cal_grps = '';
-                                for($i=0;$i<count($event['groups']);$i++)
+                                for($i=0;$i<count($event['groups']);++$i)
                                 {
                                         if($GLOBALS['phpgw']->accounts->exists($event['groups'][$i]))