Changeset 7655 for trunk/library
- Timestamp:
- 12/14/12 14:30:35 (11 years ago)
- Location:
- trunk/library
- Files:
-
- 23 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/library/CssToInlineStyles/css_to_inline_styles.php
r5745 r7655 409 409 410 410 // increment 411 $i++;411 ++$i; 412 412 } 413 413 -
trunk/library/Mail/Mail/RFC822.php
r6118 r7655 332 332 $string = $parts[0]; 333 333 334 for ($i = 0; $i < count($parts); $i++) {334 for ($i = 0; $i < count($parts); ++$i) { 335 335 if ($this->_hasUnclosedQuotes($string) 336 336 || $this->_hasUnclosedBrackets($string, '<>') … … 426 426 { 427 427 $parts = explode($char, $string); 428 for ($i = 0; $i < count($parts); $i++){428 for ($i = 0; $i < count($parts); ++$i){ 429 429 if (substr($parts[$i], -1) == '\\' || $this->_hasUnclosedQuotes($parts[$i])) 430 430 $num--; … … 500 500 // geezer 501 501 // ... or any other format valid by RFC 822. 502 for ($i = 0; $i < count($addresses); $i++) {502 for ($i = 0; $i < count($addresses); ++$i) { 503 503 if (!$this->validateMailbox($addresses[$i])) { 504 504 if (empty($this->error)) { … … 544 544 while (count($parts) > 0){ 545 545 $phrase_parts[] = $this->_splitCheck($parts, ' '); 546 for ($i = 0; $i < $this->index + 1; $i++)546 for ($i = 0; $i < $this->index + 1; ++$i) 547 547 array_shift($parts); 548 548 } … … 797 797 while (count($subdomains) > 0) { 798 798 $sub_domains[] = $this->_splitCheck($subdomains, '.'); 799 for ($i = 0; $i < $this->index + 1; $i++)799 for ($i = 0; $i < $this->index + 1; ++$i) 800 800 array_shift($subdomains); 801 801 } … … 891 891 while (count($parts) > 0){ 892 892 $words[] = $this->_splitCheck($parts, '.'); 893 for ($i = 0; $i < $this->index + 1; $i++) {893 for ($i = 0; $i < $this->index + 1; ++$i) { 894 894 array_shift($parts); 895 895 } -
trunk/library/Net/SMTP.php
r5316 r7655 332 332 } 333 333 334 for ($i = 0; $i <= $this->_pipelined_commands; $i++) {334 for ($i = 0; $i <= $this->_pipelined_commands; ++$i) { 335 335 while ($line = $this->_socket->readLine()) { 336 336 $this->_debug("Recv: $line"); … … 1112 1112 $end = $size; 1113 1113 } else { 1114 for (; $end < $size; $end++) {1114 for (; $end < $size; ++$end) { 1115 1115 if ($data[$end] != "\n") { 1116 1116 break; -
trunk/library/Net/Sieve.php
r6118 r7655 929 929 $data = preg_split('/\r?\n/', $this->_toUpper($data), -1, PREG_SPLIT_NO_EMPTY); 930 930 931 for ($i = 0; $i < count($data); $i++) {931 for ($i = 0; $i < count($data); ++$i) { 932 932 if (!preg_match('/^"([A-Z]+)"( "(.*)")?$/', $data[$i], $matches)) { 933 933 continue; … … 1120 1120 1121 1121 $response .= $line . "\r\n"; 1122 $referralCount++;1122 ++$referralCount; 1123 1123 } 1124 1124 } -
trunk/library/PEAR/PEAR/Command/Remote.php
r5146 r7655 793 793 $output .= "deleted $path\n"; 794 794 } 795 $num++;795 ++$num; 796 796 } elseif ($verbose >= 1) { 797 797 $output .= "failed to delete $path $php_errormsg\n"; -
trunk/library/PEAR/PEAR/Command/Test.php
r5146 r7655 289 289 } 290 290 291 $j++;291 ++$j; 292 292 } 293 293 -
trunk/library/PEAR/PEAR/Downloader.php
r5146 r7655 1330 1330 $installOrder = Structures_Graph_Manipulator_TopologicalSorter::sort($depgraph); 1331 1331 $ret = array(); 1332 for ($i = 0, $count = count($installOrder); $i < $count; $i++) {1332 for ($i = 0, $count = count($installOrder); $i < $count; ++$i) { 1333 1333 foreach ($installOrder[$i] as $index => $sortedpackage) { 1334 1334 $data = &$installOrder[$i][$index]->getData(); -
trunk/library/PEAR/PEAR/ErrorStack.php
r5146 r7655 845 845 $backtrace[$functionframe]['function'] == 'eval' && 846 846 isset($backtrace[$functionframe + 1])) { 847 $functionframe++;847 ++$functionframe; 848 848 } 849 849 } 850 850 if (isset($backtrace[$frame])) { 851 851 if (!isset($backtrace[$frame]['file'])) { 852 $frame++;852 ++$frame; 853 853 } 854 854 $funcbacktrace = $backtrace[$functionframe]; -
trunk/library/PEAR/PEAR/Frontend/CLI.php
r5146 r7655 271 271 echo $this->bold("* Enter an answer for #" . $i . ": ({$prompts[$var]})\n"); 272 272 } 273 $i++;273 ++$i; 274 274 } 275 275 } … … 579 579 { 580 580 $highest = 1; 581 for ($i = 0; $i < count($columns); $i++) {581 for ($i = 0; $i < count($columns); ++$i) { 582 582 $col = &$columns[$i]; 583 583 if (isset($colparams[$i]) && !empty($colparams[$i]['wrap'])) { … … 642 642 $width = $widest; 643 643 } else { 644 for ($i = 0; $i < $ncols; $i++) {644 for ($i = 0; $i < $ncols; ++$i) { 645 645 if (!isset($width[$i])) { 646 646 $width[$i] = $widest[$i]; … … 672 672 } 673 673 674 for ($i = 0; $i < count($table_data); $i++) {674 for ($i = 0; $i < count($table_data); ++$i) { 675 675 extract($table_data[$i]); 676 676 if (!is_array($rowparams)) { … … 691 691 } 692 692 } else { 693 for ($c = 0; $c < count($data); $c++) {693 for ($c = 0; $c < count($data); ++$c) { 694 694 $rowlines[$c] = array($data[$c]); 695 695 } 696 696 } 697 697 698 for ($r = 0; $r < $height; $r++) {698 for ($r = 0; $r < $height; ++$r) { 699 699 $rowtext = ''; 700 for ($c = 0; $c < count($data); $c++) {700 for ($c = 0; $c < count($data); ++$c) { 701 701 if (isset($colparams[$c])) { 702 702 $attribs = array_merge($rowparams, $colparams); -
trunk/library/PEAR/PEAR/PackageFile/v1.php
r5146 r7655 1118 1118 array('index' => $i)); 1119 1119 } 1120 $i++;1120 ++$i; 1121 1121 } 1122 1122 if (!$haslead) { … … 1165 1165 array('index' => $i)); 1166 1166 } 1167 $i++;1167 ++$i; 1168 1168 } 1169 1169 } … … 1179 1179 array('index' => $i)); 1180 1180 } 1181 $i++;1181 ++$i; 1182 1182 } 1183 1183 } … … 1375 1375 $tokens = token_get_all($contents); 1376 1376 /* 1377 for ($i = 0; $i < sizeof($tokens); $i++) {1377 for ($i = 0; $i < sizeof($tokens); ++$i) { 1378 1378 @list($token, $data) = $tokens[$i]; 1379 1379 if (is_string($token)) { … … 1406 1406 $inquote = false; 1407 1407 $interface = false; 1408 for ($i = 0; $i < sizeof($tokens); $i++) {1408 for ($i = 0; $i < sizeof($tokens); ++$i) { 1409 1409 if (is_array($tokens[$i])) { 1410 1410 list($token, $data) = $tokens[$i]; -
trunk/library/PEAR/PEAR/PackageFile/v2.php
r5146 r7655 329 329 $mymaintainers = $this->getMaintainers(); 330 330 $yourmaintainers = $pf1->getMaintainers(); 331 for ($i1 = 0; $i1 < count($yourmaintainers); $i1++) {331 for ($i1 = 0; $i1 < count($yourmaintainers); ++$i1) { 332 332 $reset = false; 333 for ($i2 = 0; $i2 < count($mymaintainers); $i2++) {333 for ($i2 = 0; $i2 < count($mymaintainers); ++$i2) { 334 334 if ($mymaintainers[$i2]['handle'] == $yourmaintainers[$i1]['handle']) { 335 335 if ($mymaintainers[$i2]['role'] != $yourmaintainers[$i1]['role']) { … … 1213 1213 } 1214 1214 1215 for ($i = 0; $i < count($releases['configureoption']); $i++) {1215 for ($i = 0; $i < count($releases['configureoption']); ++$i) { 1216 1216 $releases['configureoption'][$i] = $releases['configureoption'][$i]['attribs']; 1217 1217 } -
trunk/library/PEAR/PEAR/PackageFile/v2/Validator.php
r5146 r7655 1881 1881 } 1882 1882 /* 1883 for ($i = 0; $i < sizeof($tokens); $i++) {1883 for ($i = 0; $i < sizeof($tokens); ++$i) { 1884 1884 @list($token, $data) = $tokens[$i]; 1885 1885 if (is_string($token)) { … … 1912 1912 $inquote = false; 1913 1913 $interface = false; 1914 for ($i = 0; $i < sizeof($tokens); $i++) {1914 for ($i = 0; $i < sizeof($tokens); ++$i) { 1915 1915 if (is_array($tokens[$i])) { 1916 1916 list($token, $data) = $tokens[$i]; -
trunk/library/PEAR/PEAR/RunTest.php
r6057 r7655 397 397 398 398 399 for ($i = 0; $i < $numLines; $i++) {399 for ($i = 0; $i < $numLines; ++$i) { 400 400 if (isset($lines[$i]) && substr($lines[$i], 0, 9) == 'namespace') { 401 401 $namespace = substr($lines[$i], 10, -1); -
trunk/library/PEAR/System.php
r5146 r7655 323 323 324 324 $count_args = count($args); 325 for ($i = 0; $i < $count_args; $i++) {325 for ($i = 0; $i < $count_args; ++$i) { 326 326 if ($args[$i] == '>') { 327 327 $mode = 'wb'; … … 578 578 $do_files = $do_dirs = true; 579 579 $args_count = count($args); 580 for ($i = 0; $i < $args_count; $i++) {580 for ($i = 0; $i < $args_count; ++$i) { 581 581 switch ($args[$i]) { 582 582 case '-type': … … 588 588 } 589 589 } 590 $i++;590 ++$i; 591 591 break; 592 592 case '-name': … … 596 596 $name = strtr($name, array('\?' => '.', '\*' => '.*')); 597 597 $patterns[] = '('.$name.')'; 598 $i++;598 ++$i; 599 599 break; 600 600 case '-maxdepth': … … 616 616 $ret = array(); 617 617 $files_count = count($files); 618 for ($i = 0; $i < $files_count; $i++) {618 for ($i = 0; $i < $files_count; ++$i) { 619 619 // only search in the part of the file below the current directory 620 620 $filepart = basename($files[$i]); -
trunk/library/ckeditor/plugins/aspell/spellerpages/server-scripts/spellchecker.php
r5081 r7655 82 82 # open temp file, add the submitted text. 83 83 if( $fh = fopen( $tempfile, 'w' )) { 84 for( $i = 0; $i < count( $textinputs ); $i++) {84 for( $i = 0; $i < count( $textinputs ); ++$i ) { 85 85 $text = urldecode( $textinputs[$i] ); 86 86 $text = html_entity_decode ($text , ENT_QUOTES , 'UTF-8' ); … … 122 122 } 123 123 print_suggs_elem( $suggs, $index, $text_input_index ); 124 $index++;124 ++$index; 125 125 } elseif( $chardesc == '*' ) { 126 $text_input_index++;126 ++$text_input_index; 127 127 print_textindex_decl( $text_input_index ); 128 128 $index = 0; -
trunk/library/csstidy/class.csstidy.php
r5135 r7655 367 367 break; 368 368 } 369 $i++;369 ++$i; 370 370 } 371 371 … … 419 419 $template = explode('|',$content); 420 420 421 for ($i = 0; $i < count($template); $i++)421 for ($i = 0; $i < count($template); ++$i ) 422 422 { 423 423 $this->template[$i] = $template[$i]; … … 470 470 $cur_comment = ''; 471 471 472 for ($i = 0, $size = strlen($string); $i < $size; $i++)472 for ($i = 0, $size = strlen($string); $i < $size; ++$i ) 473 473 { 474 474 if($string{$i} == "\n" || $string{$i} == "\r") … … 812 812 { 813 813 $this->status = $this->from; 814 $i++;814 ++$i; 815 815 $this->_add_token(COMMENT, $cur_comment); 816 816 $cur_comment = ''; -
trunk/library/csstidy/class.csstidy_optimise.php
r4414 r7655 302 302 $color_tmp = substr($color,4,strlen($color)-5); 303 303 $color_tmp = explode(',',$color_tmp); 304 for ( $i = 0; $i < count($color_tmp); $i++)304 for ( $i = 0; $i < count($color_tmp); ++$i ) 305 305 { 306 306 $color_tmp[$i] = trim ($color_tmp[$i]); … … 312 312 } 313 313 $color = '#'; 314 for ($i = 0; $i < 3; $i++)314 for ($i = 0; $i < 3; ++$i ) 315 315 { 316 316 if($color_tmp[$i]<16) { … … 383 383 $temp = array($subvalue); 384 384 } 385 for ($l = 0; $l < count($temp); $l++)385 for ($l = 0; $l < count($temp); ++$l) 386 386 { 387 387 // continue if no numeric value … … 404 404 { 405 405 $unit_found = FALSE; 406 for ($m = 0, $size_4 = count($units); $m < $size_4; $m++)406 for ($m = 0, $size_4 = count($units); $m < $size_4; ++$m) 407 407 { 408 408 if (strpos(strtolower($temp[$l]),$units[$m]) !== FALSE) … … 514 514 if(count($values) == 4) 515 515 { 516 for($i=0;$i<4; $i++)516 for($i=0;$i<4;++$i) 517 517 { 518 518 $return[$shorthands[$property][$i]] = $values[$i].$important; … … 528 528 elseif(count($values) == 2) 529 529 { 530 for($i=0;$i<4; $i++)530 for($i=0;$i<4;++$i) 531 531 { 532 532 $return[$shorthands[$property][$i]] = (($i % 2 != 0)) ? $values[1].$important : $values[0].$important; … … 535 535 else 536 536 { 537 for($i=0;$i<4; $i++)537 for($i=0;$i<4;++$i) 538 538 { 539 539 $return[$shorthands[$property][$i]] = $values[0].$important; … … 558 558 $output = array(); 559 559 $num = 0; 560 for($i = 0, $len = strlen($string);$i < $len; $i++)560 for($i = 0, $len = strlen($string);$i < $len; ++$i) 561 561 { 562 562 switch($status) … … 619 619 620 620 $important = ''; 621 for($i = 0; $i < 4; $i++)621 for($i = 0; $i < 4; ++$i) 622 622 { 623 623 $val = $array[$value[$i]]; … … 665 665 666 666 $str_value = csstidy_optimise::explode_ws(',',$str_value); 667 for($i = 0; $i < count($str_value); $i++)667 for($i = 0; $i < count($str_value); ++$i) 668 668 { 669 669 $have['clip'] = FALSE; $have['pos'] = FALSE; … … 672 672 $str_value[$i] = csstidy_optimise::explode_ws(' ',trim($str_value[$i])); 673 673 674 for($j = 0; $j < count($str_value[$i]); $j++)674 for($j = 0; $j < count($str_value[$i]); ++$j) 675 675 { 676 676 if($have['bg'] === FALSE && (substr($str_value[$i][$j],0,4) == 'url(' || $str_value[$i][$j] === 'none')) … … 743 743 $important = ''; 744 744 745 for($i = 0; $i < $number_of_values; $i++)745 for($i = 0; $i < $number_of_values; ++$i) 746 746 { 747 747 foreach($background_prop_default as $bg_property => $default_value) -
trunk/library/csstidy/css_optimiser.php
r4414 r7655 322 322 { 323 323 echo '<dt>'.$line.'</dt>'; 324 for($i = 0; $i < count($array); $i++)324 for($i = 0; $i < count($array); ++$i) 325 325 { 326 326 echo '<dd class="'.$array[$i]['t'].'">'.$array[$i]['m'].'</dd>'; -
trunk/library/iCalcreator/iCalUtilityFunctions.class.php
r5146 r7655 352 352 $output = array(); 353 353 $val = null; 354 for( $ix=0; $ix < strlen( $duration ); $ix++) {354 for( $ix=0; $ix < strlen( $duration ); ++$ix ) { 355 355 switch( strtoupper( substr( $duration, $ix, 1 ))) { 356 356 case 'W': … … 697 697 $yeardays = $weekno = 0; 698 698 $yeardaycnt = array(); 699 for( $m = 1; $m <= 12; $m++) { // count up and update up-counters699 for( $m = 1; $m <= 12; ++$m ) { // count up and update up-counters 700 700 $daycnts[$m] = array(); 701 701 $weekdaycnt = array(); … … 703 703 $yeardaycnt[$dn] = $weekdaycnt[$dn] = 0; 704 704 $mcnt = date( 't', mktime( 0, 0, 0, $m, 1, $wdate['year'] )); 705 for( $d = 1; $d <= $mcnt; $d++) {705 for( $d = 1; $d <= $mcnt; ++$d ) { 706 706 $daycnts[$m][$d] = array(); 707 707 if( isset( $recur['BYYEARDAY'] )) { 708 $yeardays++;708 ++$yeardays; 709 709 $daycnts[$m][$d]['yearcnt_up'] = $yeardays; 710 710 } … … 880 880 else { 881 881 /* update result array if BYSETPOS is set */ 882 $countcnt++;882 ++$countcnt; 883 883 if( $startdatets <= $wdatets ) { // only output within period 884 884 $result[$wdatets] = TRUE; … … 939 939 //echo "recur ".implode('-',iCalUtilityFunctions::_date_time_string(date('Y-m-d H:i:s',$bysetposarr1[$ix]),6))."<br />\n";//test 940 940 } 941 $countcnt++;941 ++$countcnt; 942 942 } 943 943 if( isset( $recur['COUNT'] ) && ( $countcnt >= $recur['COUNT'] )) -
trunk/library/iCalcreator/iCalcreator.class.php
r5316 r7655 394 394 if( $propix != $xpropno ) 395 395 $reduced[$xpropkey] = $xpropvalue; 396 $xpropno++;396 ++$xpropno; 397 397 } 398 398 } … … 450 450 : array( $xpropkey, $this->xprop[$xpropkey]['value'] ); 451 451 else 452 $xpropno++;452 ++$xpropno; 453 453 } 454 454 return FALSE; // not found ?? … … 766 766 return TRUE; 767 767 } 768 $cix1dC++;768 ++$cix1dC; 769 769 } 770 770 elseif( !$argType && ($arg1 == $component->getProperty( 'uid' ))) { … … 817 817 if( $index == $cix1gC ) 818 818 return $component->copy(); 819 $cix1gC++;819 ++$cix1gC; 820 820 } 821 821 elseif( !$argType && ($arg1 == $component->getProperty( 'uid' ))) { … … 1219 1219 return TRUE; 1220 1220 } 1221 $cix1sC++;1221 ++$cix1sC; 1222 1222 } 1223 1223 elseif( !$argType && ( $arg1 == $component2->getProperty( 'uid' ))) { // UID insert/replace … … 1289 1289 elseif( 'vtimezone' == $b->objName ) return 1; 1290 1290 $sortkeys = array( 'year', 'month', 'day', 'hour', 'min', 'sec' ); 1291 for( $k = 0; $k < 4 ; $k++) {1291 for( $k = 0; $k < 4 ; ++$k ) { 1292 1292 if( empty( $a->srtk[$k] )) return -1; 1293 1293 elseif( empty( $b->srtk[$k] )) return 1; … … 1376 1376 $line = substr( $line, 0, ( strlen( $line ) - strlen( "\n\r" ))).'\n'; 1377 1377 if( 'BEGIN:VCALENDAR' == strtoupper( substr( $line, 0, 15 ))) { 1378 $calsync++;1378 ++$calsync; 1379 1379 continue; 1380 1380 } … … 1420 1420 if( $newProp ) { 1421 1421 $newProp = FALSE; 1422 $lastix++;1422 ++$lastix; 1423 1423 $proprows[$lastix] = $line; 1424 1424 } … … 1446 1446 /* get propname */ 1447 1447 $cix = $propname = null; 1448 for( $cix=0, $clen = strlen( $line ); $cix < $clen; $cix++) {1448 for( $cix=0, $clen = strlen( $line ); $cix < $clen; ++$cix ) { 1449 1449 if( in_array( $line[$cix], array( ':', ';' ))) 1450 1450 break; … … 1460 1460 $attrix = -1; 1461 1461 $strlen = strlen( $line ); 1462 for( $cix=0; $cix < $strlen; $cix++) {1462 for( $cix=0; $cix < $strlen; ++$cix ) { 1463 1463 if(( ':' == $line[$cix] ) && 1464 1464 ( '://' != substr( $line, $cix, 3 )) && … … 1500 1500 $content = explode( ',', $line ); 1501 1501 $clen = count( $content ); 1502 for( $cix = 0; $cix < $clen; $cix++) {1502 for( $cix = 0; $cix < $clen; ++$cix ) { 1503 1503 if( "\\" == substr( $content[$cix], -1 )) { 1504 1504 $content[$cix] .= ','.$content[$cix + 1]; 1505 1505 unset( $content[$cix + 1] ); 1506 $cix++;1506 ++$cix; 1507 1507 } 1508 1508 } … … 2740 2740 if( $fno < $cnt ) 2741 2741 $content .= ','; 2742 $fno++;2742 ++$fno; 2743 2743 } 2744 2744 $output .= $this->_createElement( 'FREEBUSY', $attributes, $content ); … … 3122 3122 if( $rno < $cnt ) 3123 3123 $content .= ','; 3124 $rno++;3124 ++$rno; 3125 3125 } 3126 3126 $output .= $this->_createElement( 'RDATE', $attributes, $content ); … … 3930 3930 $length = 6; 3931 3931 $str = null; 3932 for( $p = 0; $p < $length; $p++)3932 for( $p = 0; $p < $length; ++$p ) 3933 3933 $unique .= $base{mt_rand( $start, $end )}; 3934 3934 $this->uid = array( 'params' => null ); … … 4335 4335 } 4336 4336 $content2 .= $content21.$content22; 4337 $bydaycnt++;4337 ++$bydaycnt; 4338 4338 } 4339 4339 else { … … 4343 4343 else { 4344 4344 $content22 .= $valuePart; 4345 $bydaycnt++;4345 ++$bydaycnt; 4346 4346 } 4347 4347 $content2 .= $content21.$content22; … … 4812 4812 if( $propix != $xpropno ) 4813 4813 $reduced[$xpropkey] = $xpropvalue; 4814 $xpropno++;4814 ++$xpropno; 4815 4815 } 4816 4816 } … … 5029 5029 : array( $xpropkey, $this->xprop[$xpropkey]['value'] ); 5030 5030 else 5031 $xpropno++;5031 ++$xpropno; 5032 5032 } 5033 5033 return FALSE; // not found ?? … … 5054 5054 return FALSE; 5055 5055 $arglist[0] = strtoupper( $arglist[0] ); 5056 for( $argix=$numargs; $argix < 12; $argix++) {5056 for( $argix=$numargs; $argix < 12; ++$argix ) { 5057 5057 if( !isset( $arglist[$argix] )) 5058 5058 $arglist[$argix] = null; … … 5212 5212 if( $newProp ) { 5213 5213 $newProp = FALSE; 5214 $lastix++;5214 ++$lastix; 5215 5215 $proprows[$lastix] = $line; 5216 5216 } … … 5240 5240 /* get propname, (problem with x-properties, otherwise in previous loop) */ 5241 5241 $cix = $propname = null; 5242 for( $cix=0, $clen = strlen( $line ); $cix < $clen; $cix++) {5242 for( $cix=0, $clen = strlen( $line ); $cix < $clen; ++$cix ) { 5243 5243 if( in_array( $line[$cix], array( ':', ';' ))) 5244 5244 break; … … 5259 5259 $controlCN = false; 5260 5260 5261 for( $cix=0; $cix < $clen; $cix++) {5261 for( $cix=0; $cix < $clen; ++$cix ) { 5262 5262 5263 5263 if('"' == $line[$cix] && $controlCN) $controlCN = false; … … 5315 5315 $content = explode( ',', $line ); 5316 5316 $clen = count( $content ); 5317 for( $cix = 0; $cix < $clen; $cix++) {5317 for( $cix = 0; $cix < $clen; ++$cix ) { 5318 5318 if( "\\" == substr($content[$cix], -1)) { 5319 5319 $content[$cix] .= ','.$content[$cix + 1]; 5320 5320 unset($content[$cix + 1]); 5321 $cix++;5321 ++$cix; 5322 5322 } 5323 5323 } … … 5522 5522 return TRUE; 5523 5523 } 5524 $cix2dC++;5524 ++$cix2dC; 5525 5525 } 5526 5526 elseif( !$argType && ($arg1 == $component->getProperty( 'uid' ))) { … … 5574 5574 if( $index == $cix2gC ) 5575 5575 return $component->copy(); 5576 $cix2gC++;5576 ++$cix2gC; 5577 5577 } 5578 5578 elseif( !$argType && ( $arg1 == $component->getProperty( 'uid' ))) { … … 5671 5671 return TRUE; 5672 5672 } 5673 $cix2sC++;5673 ++$cix2sC; 5674 5674 } 5675 5675 elseif( !$argType && ( $arg1 == $component2->getProperty( 'uid' ))) { // UID insert/replace … … 5751 5751 $bytecnt = strlen( $tmp ); 5752 5752 $charCnt = $ix = 0; 5753 for( $ix = 0; $ix < $bytecnt; $ix++) {5753 for( $ix = 0; $ix < $bytecnt; ++$ix ) { 5754 5754 if(( 73 < $charCnt ) && ( '\n' == substr( $tmp, $ix, $eolcharlen ))) { 5755 5755 $ix += $eolcharlen; -
trunk/library/mime/mime.php
r6266 r7655 895 895 case !$text && !$html && $attachments: 896 896 $message =& $this->_addMixedPart(); 897 for ($i = 0; $i < count($this->_parts); $i++) {897 for ($i = 0; $i < count($this->_parts); ++$i) { 898 898 $this->_addAttachmentPart($message, $this->_parts[$i]); 899 899 } … … 903 903 $message =& $this->_addMixedPart(); 904 904 $this->_addTextPart($message, $this->_txtbody); 905 for ($i = 0; $i < count($this->_parts); $i++) {905 for ($i = 0; $i < count($this->_parts); ++$i) { 906 906 $this->_addAttachmentPart($message, $this->_parts[$i]); 907 907 } … … 930 930 $ht =& $this->_addRelatedPart($message); 931 931 $this->_addHtmlPart($ht); 932 for ($i = 0; $i < count($this->_html_images); $i++) {932 for ($i = 0; $i < count($this->_html_images); ++$i) { 933 933 $this->_addHtmlImagePart($ht, $this->_html_images[$i]); 934 934 } … … 939 939 $message =& $this->_addRelatedPart($null); 940 940 $this->_addHtmlPart($message); 941 for ($i = 0; $i < count($this->_html_images); $i++) {941 for ($i = 0; $i < count($this->_html_images); ++$i) { 942 942 $this->_addHtmlImagePart($message, $this->_html_images[$i]); 943 943 } … … 958 958 $this->_addHtmlPart($message); 959 959 } 960 for ($i = 0; $i < count($this->_html_images); $i++) {960 for ($i = 0; $i < count($this->_html_images); ++$i) { 961 961 $this->_addHtmlImagePart($message, $this->_html_images[$i]); 962 962 } … … 973 973 $this->_addHtmlPart($message); 974 974 } 975 for ($i = 0; $i < count($this->_parts); $i++) {975 for ($i = 0; $i < count($this->_parts); ++$i) { 976 976 $this->_addAttachmentPart($message, $this->_parts[$i]); 977 977 } … … 989 989 } 990 990 $this->_addHtmlPart($rel); 991 for ($i = 0; $i < count($this->_html_images); $i++) {991 for ($i = 0; $i < count($this->_html_images); ++$i) { 992 992 $this->_addHtmlImagePart($rel, $this->_html_images[$i]); 993 993 } 994 for ($i = 0; $i < count($this->_parts); $i++) {994 for ($i = 0; $i < count($this->_parts); ++$i) { 995 995 $this->_addAttachmentPart($message, $this->_parts[$i]); 996 996 } … … 1009 1009 } 1010 1010 1011 for ($i = 0; $i < count($this->_html_images); $i++) {1011 for ($i = 0; $i < count($this->_html_images); ++$i) { 1012 1012 $this->_addHtmlImagePart($message, $this->_html_images[$i]); 1013 1013 } 1014 for ($i = 0; $i < count($this->_parts); $i++) {1014 for ($i = 0; $i < count($this->_parts); ++$i) { 1015 1015 $this->_addAttachmentPart($message, $this->_parts[$i]); 1016 1016 } -
trunk/library/mime/mimeDecode.php
r6063 r7655 326 326 327 327 $parts = $this->_boundarySplit($body, $content_type['other']['boundary']); 328 for ($i = 0; $i < count($parts); $i++) {328 for ($i = 0; $i < count($parts); ++$i) { 329 329 list($part_header, $part_body) = $this->_splitBodyHeader($parts[$i]); 330 330 $part = $this->_decode($part_header, $part_body, $default_ctype); … … 386 386 $return[$prepend . $mime_number] = &$structure; 387 387 } 388 for ($i = 0; $i < count($structure->parts); $i++) {388 for ($i = 0; $i < count($structure->parts); ++$i) { 389 389 390 390 … … 521 521 $escaped = false; 522 522 if ($c == '\\') { 523 $i++;523 ++$i; 524 524 if ($i == $l-1) { // end of string. 525 525 break; … … 535 535 $val = ''; 536 536 $key = trim($key); 537 $i++;537 ++$i; 538 538 continue; 539 539 } … … 547 547 } 548 548 $key .= $c; 549 $i++;549 ++$i; 550 550 continue; 551 551 } … … 556 556 // not in quote yet. 557 557 if ((!strlen($val) || $lq !== false) && $c == ' ' || $c == "\t") { 558 $i++;558 ++$i; 559 559 continue; // skip leading spaces after '=' or after '"' 560 560 } … … 565 565 // but we will handle it as a merged part of the string.. 566 566 $val = !strlen(trim($val)) ? '' : trim($val); 567 $i++;567 ++$i; 568 568 continue; 569 569 } … … 593 593 $key = ''; 594 594 $lq = false; 595 $i++;595 ++$i; 596 596 continue; 597 597 } 598 598 599 599 $val .= $c; 600 $i++;600 ++$i; 601 601 continue; 602 602 } … … 608 608 $lq = $q; 609 609 $q = false; 610 $i++;610 ++$i; 611 611 continue; 612 612 } … … 614 614 // normal char inside of quoted string.. 615 615 $val.= $c; 616 $i++;616 ++$i; 617 617 } 618 618 … … 668 668 669 669 $len = count($tmp) -1; 670 for ($i = 1; $i < $len; $i++) {670 for ($i = 1; $i < $len; ++$i) { 671 671 if (strlen(trim($tmp[$i]))) { 672 672 $parts[] = $tmp[$i]; … … 792 792 preg_match_all("/begin ([0-7]{3}) (.+)\r?\n(.+)\r?\nend/Us", $input, $matches); 793 793 794 for ($j = 0; $j < count($matches[3]); $j++) {794 for ($j = 0; $j < count($matches[3]); ++$j) { 795 795 796 796 $str = $matches[3][$j]; … … 802 802 $strlen = count($str); 803 803 804 for ($i = 0; $i < $strlen; $i++) {804 for ($i = 0; $i < $strlen; ++$i) { 805 805 $pos = 1; 806 806 $d = 0; … … 943 943 // Multiple headers with this name 944 944 if (is_array($headers[$hdr_name])) { 945 for ($i = 0; $i < count($hdr_value); $i++) {945 for ($i = 0; $i < count($hdr_value); ++$i) { 946 946 $output .= Mail_mimeDecode::_getXML_helper($hdr_name, $hdr_value[$i], $indent); 947 947 } … … 954 954 955 955 if (!empty($input->parts)) { 956 for ($i = 0; $i < count($input->parts); $i++) {956 for ($i = 0; $i < count($input->parts); ++$i) { 957 957 $output .= $crlf . str_repeat($htab, $indent) . '<mimepart>' . $crlf . 958 958 Mail_mimeDecode::_getXML($input->parts[$i], $indent+1) . -
trunk/library/mime/mimePart.php
r6057 r7655 283 283 $encoded['body'] = ''; 284 284 285 for ($i = 0; $i < count($this->_subparts); $i++) {285 for ($i = 0; $i < count($this->_subparts); ++$i) { 286 286 $encoded['body'] .= '--' . $boundary . $eol; 287 287 $tmp = $this->_subparts[$i]->encode(); … … 393 393 394 394 if (count($this->_subparts)) { 395 for ($i = 0; $i < count($this->_subparts); $i++) {395 for ($i = 0; $i < count($this->_subparts); ++$i) { 396 396 fwrite($fh, $f_eol . '--' . $boundary . $eol); 397 397 $res = $this->_subparts[$i]->_encodePartToFile($fh); … … 581 581 $char = $line[$i]; 582 582 $dec = ord($char); 583 $i++;583 ++$i; 584 584 585 585 if (($dec == 32) && (!isset($line[$i]))) { … … 688 688 $value = ''; 689 689 } 690 $headCount++;690 ++$headCount; 691 691 } 692 692 … … 921 921 $strlen = strlen($string); 922 922 923 for ($q=$p=$i=0; $i < $strlen; $i++) {923 for ($q=$p=$i=0; $i < $strlen; ++$i) { 924 924 if ($string[$i] == "\"" 925 925 && (empty($string[$i-1]) || $string[$i-1] != "\\") … … 1103 1103 $prev = ''; 1104 1104 1105 for ($i=1; $i<=$length; $i++) {1105 for ($i=1; $i<=$length; ++$i) { 1106 1106 // See #17311 1107 1107 $chunk = mb_substr($str, $start, $i-$start, $charset); … … 1134 1134 $regexp = '/([\x22-\x29\x2C\x2E\x3A-\x40\x5B-\x60\x7B-\x7E\x80-\xFF])/'; 1135 1135 1136 for ($i=0; $i<=$length; $i++) {1136 for ($i=0; $i<=$length; ++$i) { 1137 1137 $char = mb_substr($str, $i, 1, $charset); 1138 1138 // RFC recommends underline (instead of =20) in place of the space
Note: See TracChangeset
for help on using the changeset viewer.