Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[12796] XoopsCore/branches/2.5.x/2.5.8
|
From: <be...@us...> - 2014-09-22 08:24:09
|
Revision: 12796
http://sourceforge.net/p/xoops/svn/12796
Author: beckmi
Date: 2014-09-22 08:23:59 +0000 (Mon, 22 Sep 2014)
Log Message:
-----------
reverting couple of $i++ conversions
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Config_File.class.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty_Compiler.class.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.write_cache_file.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.bmp.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.class.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/prefix_manager.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Generator.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/FixNesting.php
Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-09-21 05:41:46 UTC (rev 12795)
+++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-09-22 08:23:59 UTC (rev 12796)
@@ -10,6 +10,7 @@
- adding Adding language constants for Protector's Prefix Manager (slider84/mamba)
- allowing for "https" URL in YouTube links in Textsanitizer (mamba)
- converting $i++ to ++$i for improved performance (mamba)
+- reverting couple of $i++ conversions (zyspec/mamba)
===============================
2014-06-20: Version 2.5.7 Final (Patch)
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php 2014-09-21 05:41:46 UTC (rev 12795)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php 2014-09-22 08:23:59 UTC (rev 12796)
@@ -100,7 +100,7 @@
for ($i = 0; $i < $count; ++$i) {
$_items[$i]['title'] = XoopsLocal::convert_encoding($_items[$i]['title'], _CHARSET, 'UTF-8');
$_items[$i]['description'] = XoopsLocal::convert_encoding($_items[$i]['description'], _CHARSET, 'UTF-8');
- $items[strval(strtotime($_items[$i]['pubdate'])) . "-" . strval(++$cnt)] = $_items[$i];
+ $items[strval(strtotime($_items[$i]['pubdate'])) . "-" . strval($cnt++)] = $_items[$i];
}
} else {
echo $rss2parser->getErrors();
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Config_File.class.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Config_File.class.php 2014-09-21 05:41:46 UTC (rev 12795)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Config_File.class.php 2014-09-22 08:23:59 UTC (rev 12796)
@@ -324,7 +324,7 @@
$var_value = '';
while ($i<$count) {
if (($pos = strpos($lines[$i], '"""')) === false) {
- $var_value .= $lines[++$i];
+ $var_value .= $lines[$i++];
} else {
/* end of multiline-value */
$var_value .= substr($lines[$i], 0, $pos);
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty_Compiler.class.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty_Compiler.class.php 2014-09-21 05:41:46 UTC (rev 12795)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty_Compiler.class.php 2014-09-22 08:23:59 UTC (rev 12796)
@@ -162,7 +162,7 @@
. '(?:\s*,\s*' . $this->_obj_single_param_regexp . ')*)?\)';
$this->_obj_start_regexp = '(?:' . $this->_dvar_regexp . '(?:' . $this->_obj_ext_regexp . ')+)';
$this->_obj_call_regexp = '(?:' . $this->_obj_start_regexp . '(?:' . $this->_obj_params_regexp . ')?(?:' . $this->_dvar_math_regexp . '(?:' . $this->_num_const_regexp . '|' . $this->_dvar_math_var_regexp . ')*)?)';
-
+
// matches valid modifier syntax:
// |foo
// |@foo
@@ -304,7 +304,7 @@
}
}
}
-
+
/* Compile the template tags into PHP code. */
$compiled_tags = array();
for ($i = 0, $for_max = count($template_tags); $i < $for_max; ++$i) {
@@ -333,7 +333,7 @@
for ($j = $i + 1; $j < $for_max; ++$j) {
/* remove leading and trailing whitespaces of each line */
$text_blocks[$j] = preg_replace('![\t ]*[\r\n]+[\t ]*!', '', $text_blocks[$j]);
- if ($compiled_tags[$j] == '{/strip}') {
+ if ($compiled_tags[$j] == '{/strip}') {
/* remove trailing whitespaces from the last text_block */
$text_blocks[$j] = rtrim($text_blocks[$j]);
}
@@ -349,9 +349,9 @@
}
}
$compiled_content = '';
-
+
$tag_guard = '%%%SMARTYOTG' . md5(uniqid(rand(), true)) . '%%%';
-
+
/* Interleave the compiled contents and text blocks to get the final result. */
for ($i = 0, $for_max = count($compiled_tags); $i < $for_max; ++$i) {
if ($compiled_tags[$i] == '') {
@@ -361,7 +361,7 @@
// replace legit PHP tags with placeholder
$text_blocks[$i] = str_replace('<?', $tag_guard, $text_blocks[$i]);
$compiled_tags[$i] = str_replace('<?', $tag_guard, $compiled_tags[$i]);
-
+
$compiled_content .= $text_blocks[$i] . $compiled_tags[$i];
}
$compiled_content .= str_replace('<?', $tag_guard, $text_blocks[$i]);
@@ -371,8 +371,8 @@
$compiled_content = preg_replace("~(?<!')language\s*=\s*[\"\']?\s*php\s*[\"\']?~", "<?php echo 'language=php' ?>\n", $compiled_content);
// recover legit tags
- $compiled_content = str_replace($tag_guard, '<?', $compiled_content);
-
+ $compiled_content = str_replace($tag_guard, '<?', $compiled_content);
+
// remove \n from the end of the file, if any
if (strlen($compiled_content) && (substr($compiled_content, -1) == "\n") ) {
$compiled_content = substr($compiled_content, 0, -1);
@@ -437,7 +437,7 @@
/* Matched comment. */
if (substr($template_tag, 0, 1) == '*' && substr($template_tag, -1) == '*')
return '';
-
+
/* Split tag into two three parts: command, command modifiers and the arguments. */
if(! preg_match('~^(?:(' . $this->_num_const_regexp . '|' . $this->_obj_call_regexp . '|' . $this->_var_regexp
. '|\/?' . $this->_reg_obj_regexp . '|\/?' . $this->_func_regexp . ')(' . $this->_mod_regexp . '*))
@@ -445,7 +445,7 @@
~xs', $template_tag, $match)) {
$this->_syntax_error("unrecognized tag: $template_tag", E_USER_ERROR, __FILE__, __LINE__);
}
-
+
$tag_command = $match[1];
$tag_modifier = isset($match[2]) ? $match[2] : null;
$tag_args = isset($match[3]) ? $match[3] : null;
@@ -585,7 +585,7 @@
} else if ($this->_compile_block_tag($tag_command, $tag_args, $tag_modifier, $output)) {
return $output;
} else if ($this->_compile_custom_tag($tag_command, $tag_args, $tag_modifier, $output)) {
- return $output;
+ return $output;
} else {
$this->_syntax_error("unrecognized tag '$tag_command'", E_USER_ERROR, __FILE__, __LINE__);
}
@@ -936,7 +936,7 @@
if (empty($name)) {
return $this->_syntax_error("missing insert name", E_USER_ERROR, __FILE__, __LINE__);
}
-
+
if (!preg_match('~^\w+$~', $name)) {
return $this->_syntax_error("'insert: 'name' must be an insert function name", E_USER_ERROR, __FILE__, __LINE__);
}
@@ -1225,7 +1225,7 @@
$buffer = isset($attrs['name']) ? $attrs['name'] : "'default'";
$assign = isset($attrs['assign']) ? $attrs['assign'] : null;
$append = isset($attrs['append']) ? $attrs['append'] : null;
-
+
$output = "<?php ob_start(); ?>";
$this->_capture_stack[] = array($buffer, $assign, $append);
} else {
@@ -1266,11 +1266,11 @@
if(empty($tokens)) {
$_error_msg = $elseif ? "'elseif'" : "'if'";
- $_error_msg .= ' statement requires arguments';
+ $_error_msg .= ' statement requires arguments';
$this->_syntax_error($_error_msg, E_USER_ERROR, __FILE__, __LINE__);
}
-
-
+
+
// make sure we have balanced parenthesis
$token_count = array_count_values($tokens);
if(isset($token_count['(']) && $token_count['('] != $token_count[')']) {
@@ -1368,8 +1368,8 @@
if ($is_arg_start != 0) {
if (preg_match('~^' . $this->_func_regexp . '$~', $tokens[$is_arg_start-1])) {
$is_arg_start--;
- }
- }
+ }
+ }
} else
$is_arg_start = $i-1;
/* Construct the argument for 'is' expression, so it knows
@@ -1400,7 +1400,7 @@
}
} elseif(preg_match('~^' . $this->_var_regexp . '$~', $token) && (strpos('+-*/^%&|', substr($token, -1)) === false) && isset($tokens[$i+1]) && $tokens[$i+1] == '(') {
// variable function call
- $this->_syntax_error("variable function call '$token' not allowed in if statement", E_USER_ERROR, __FILE__, __LINE__);
+ $this->_syntax_error("variable function call '$token' not allowed in if statement", E_USER_ERROR, __FILE__, __LINE__);
} elseif(preg_match('~^' . $this->_obj_call_regexp . '|' . $this->_var_regexp . '(?:' . $this->_mod_regexp . '*)$~', $token)) {
// object or variable
$token = $this->_parse_var_props($token);
@@ -1475,7 +1475,7 @@
case 'even':
if (isset($tokens[$expr_end]) && $tokens[$expr_end] == 'by') {
++$expr_end;
- $expr_arg = $tokens[++$expr_end];
+ $expr_arg = $tokens[$expr_end++];
$expr = "!(1 & ($is_arg / " . $this->_parse_var_props($expr_arg) . "))";
} else
$expr = "!(1 & $is_arg)";
@@ -1484,7 +1484,7 @@
case 'odd':
if (isset($tokens[$expr_end]) && $tokens[$expr_end] == 'by') {
++$expr_end;
- $expr_arg = $tokens[++$expr_end];
+ $expr_arg = $tokens[$expr_end++];
$expr = "(1 & ($is_arg / " . $this->_parse_var_props($expr_arg) . "))";
} else
$expr = "(1 & $is_arg)";
@@ -1493,7 +1493,7 @@
case 'div':
if (@$tokens[$expr_end] == 'by') {
++$expr_end;
- $expr_arg = $tokens[++$expr_end];
+ $expr_arg = $tokens[$expr_end++];
$expr = "!($is_arg % " . $this->_parse_var_props($expr_arg) . ")";
} else {
$this->_syntax_error("expecting 'by' after 'div'", E_USER_ERROR, __FILE__, __LINE__);
@@ -1753,12 +1753,12 @@
$_var_ref = $var_expr;
else
$_var_ref = substr($var_expr, 1);
-
+
if(!$_has_math) {
-
+
// get [foo] and .foo and ->foo and (...) pieces
preg_match_all('~(?:^\w+)|' . $this->_obj_params_regexp . '|(?:' . $this->_var_bracket_regexp . ')|->\$?\w+|\.\$?\w+|\S+~', $_var_ref, $match);
-
+
$_indexes = $match[0];
$_var_name = array_shift($_indexes);
@@ -2018,7 +2018,7 @@
array_shift($indexes);
$compiled_ref = "(\$this->_foreach[$_var]['iteration']-1)";
break;
-
+
case 'first':
array_shift($indexes);
$compiled_ref = "(\$this->_foreach[$_var]['iteration'] <= 1)";
@@ -2028,12 +2028,12 @@
array_shift($indexes);
$compiled_ref = "(\$this->_foreach[$_var]['iteration'] == \$this->_foreach[$_var]['total'])";
break;
-
+
case 'show':
array_shift($indexes);
$compiled_ref = "(\$this->_foreach[$_var]['total'] > 0)";
break;
-
+
default:
unset($_max_index);
$compiled_ref = "\$this->_foreach[$_var]";
@@ -2159,7 +2159,7 @@
case 'rdelim':
$compiled_ref = "'$this->right_delimiter'";
break;
-
+
default:
$this->_syntax_error('$smarty.' . $_ref . ' is an unknown reference', E_USER_ERROR, __FILE__, __LINE__);
break;
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.write_cache_file.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.write_cache_file.php 2014-09-21 05:41:46 UTC (rev 12795)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.write_cache_file.php 2014-09-22 08:23:59 UTC (rev 12796)
@@ -50,7 +50,7 @@
$level--;
unset($results[$i]);
} else { // opening tag
- if (++$level > 0) unset($results[$i]);
+ if ($level++ > 0) unset($results[$i]);
}
++$j;
} elseif ($level > 0) {
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.bmp.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.bmp.php 2014-09-21 05:41:46 UTC (rev 12795)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.bmp.php 2014-09-22 08:23:59 UTC (rev 12796)
@@ -368,13 +368,13 @@
// BYTE rgbGreen;
// BYTE rgbRed;
// BYTE rgbReserved;
- $blue = $this->LittleEndian2Int(substr($BMPpalette, ++$paletteoffset, 1));
- $green = $this->LittleEndian2Int(substr($BMPpalette, ++$paletteoffset, 1));
- $red = $this->LittleEndian2Int(substr($BMPpalette, ++$paletteoffset, 1));
+ $blue = $this->LittleEndian2Int(substr($BMPpalette, $paletteoffset++, 1));
+ $green = $this->LittleEndian2Int(substr($BMPpalette, $paletteoffset++, 1));
+ $red = $this->LittleEndian2Int(substr($BMPpalette, $paletteoffset++, 1));
if (($thisfile_bmp['type_os'] == 'OS/2') && ($thisfile_bmp['type_version'] == 1)) {
// no padding byte
} else {
- ++$paletteoffset; // padding byte
+ $paletteoffset++; // padding byte
}
$thisfile_bmp['palette'][$i] = (($red << 16) | ($green << 8) | ($blue));
}
@@ -395,7 +395,7 @@
case 1:
for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col = $col) {
- $paletteindexbyte = ord($BMPpixelData{++$pixeldataoffset});
+ $paletteindexbyte = ord($BMPpixelData{$pixeldataoffset++});
for ($i = 7; $i >= 0; $i--) {
$paletteindex = ($paletteindexbyte & (0x01 << $i)) >> $i;
$thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
@@ -404,7 +404,7 @@
}
while (($pixeldataoffset % 4) != 0) {
// lines are padded to nearest DWORD
- ++$pixeldataoffset;
+ $pixeldataoffset++;
}
}
break;
@@ -412,7 +412,7 @@
case 4:
for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col = $col) {
- $paletteindexbyte = ord($BMPpixelData{++$pixeldataoffset});
+ $paletteindexbyte = ord($BMPpixelData{$pixeldataoffset++});
for ($i = 1; $i >= 0; $i--) {
$paletteindex = ($paletteindexbyte & (0x0F << (4 * $i))) >> (4 * $i);
$thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
@@ -421,7 +421,7 @@
}
while (($pixeldataoffset % 4) != 0) {
// lines are padded to nearest DWORD
- ++$pixeldataoffset;
+ $pixeldataoffset++;
}
}
break;
@@ -429,12 +429,12 @@
case 8:
for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
for ($col = 0; $col < $thisfile_bmp_header_raw['width']; ++$col) {
- $paletteindex = ord($BMPpixelData{++$pixeldataoffset});
+ $paletteindex = ord($BMPpixelData{$pixeldataoffset++});
$thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
}
while (($pixeldataoffset % 4) != 0) {
// lines are padded to nearest DWORD
- ++$pixeldataoffset;
+ $pixeldataoffset++;
}
}
break;
@@ -447,7 +447,7 @@
}
while (($pixeldataoffset % 4) != 0) {
// lines are padded to nearest DWORD
- ++$pixeldataoffset;
+ $pixeldataoffset++;
}
}
break;
@@ -460,7 +460,7 @@
}
while (($pixeldataoffset % 4) != 0) {
// lines are padded to nearest DWORD
- ++$pixeldataoffset;
+ $pixeldataoffset++;
}
}
break;
@@ -481,8 +481,8 @@
case 8:
$pixelcounter = 0;
while ($pixeldataoffset < strlen($BMPpixelData)) {
- $firstbyte = $this->LittleEndian2Int(substr($BMPpixelData, ++$pixeldataoffset, 1));
- $secondbyte = $this->LittleEndian2Int(substr($BMPpixelData, ++$pixeldataoffset, 1));
+ $firstbyte = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
+ $secondbyte = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
if ($firstbyte == 0) {
// escaped/absolute mode - the first byte of the pair can be set to zero to
@@ -503,8 +503,8 @@
// delta - The 2 bytes following the escape contain unsigned values
// indicating the horizontal and vertical offsets of the next pixel
// from the current position.
- $colincrement = $this->LittleEndian2Int(substr($BMPpixelData, ++$pixeldataoffset, 1));
- $rowincrement = $this->LittleEndian2Int(substr($BMPpixelData, ++$pixeldataoffset, 1));
+ $colincrement = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
+ $rowincrement = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
$col = ($pixelcounter % $thisfile_bmp_header_raw['width']) + $colincrement;
$row = ($thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width'])) - $rowincrement;
$pixelcounter = ($row * $thisfile_bmp_header_raw['width']) + $col;
@@ -516,7 +516,7 @@
// number of bytes that follow, each of which contains the color index
// of a single pixel. Each run must be aligned on a word boundary.
for ($i = 0; $i < $secondbyte; ++$i) {
- $paletteindex = $this->LittleEndian2Int(substr($BMPpixelData, ++$pixeldataoffset, 1));
+ $paletteindex = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
$col = $pixelcounter % $thisfile_bmp_header_raw['width'];
$row = $thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width']);
$thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
@@ -524,7 +524,7 @@
}
while (($pixeldataoffset % 2) != 0) {
// Each run must be aligned on a word boundary.
- ++$pixeldataoffset;
+ $pixeldataoffset++;
}
break;
}
@@ -557,8 +557,8 @@
case 4:
$pixelcounter = 0;
while ($pixeldataoffset < strlen($BMPpixelData)) {
- $firstbyte = $this->LittleEndian2Int(substr($BMPpixelData, ++$pixeldataoffset, 1));
- $secondbyte = $this->LittleEndian2Int(substr($BMPpixelData, ++$pixeldataoffset, 1));
+ $firstbyte = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
+ $secondbyte = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
if ($firstbyte == 0) {
// escaped/absolute mode - the first byte of the pair can be set to zero to
@@ -579,8 +579,8 @@
// delta - The 2 bytes following the escape contain unsigned values
// indicating the horizontal and vertical offsets of the next pixel
// from the current position.
- $colincrement = $this->LittleEndian2Int(substr($BMPpixelData, ++$pixeldataoffset, 1));
- $rowincrement = $this->LittleEndian2Int(substr($BMPpixelData, ++$pixeldataoffset, 1));
+ $colincrement = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
+ $rowincrement = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
$col = ($pixelcounter % $thisfile_bmp_header_raw['width']) + $colincrement;
$row = ($thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width'])) - $rowincrement;
$pixelcounter = ($row * $thisfile_bmp_header_raw['width']) + $col;
@@ -593,13 +593,13 @@
// each run must be aligned on a word boundary.
unset($paletteindexes);
for ($i = 0; $i < ceil($secondbyte / 2); ++$i) {
- $paletteindexbyte = $this->LittleEndian2Int(substr($BMPpixelData, ++$pixeldataoffset, 1));
+ $paletteindexbyte = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
$paletteindexes[] = ($paletteindexbyte & 0xF0) >> 4;
$paletteindexes[] = ($paletteindexbyte & 0x0F);
}
while (($pixeldataoffset % 2) != 0) {
// Each run must be aligned on a word boundary.
- ++$pixeldataoffset;
+ $pixeldataoffset++;
}
foreach ($paletteindexes as $dummy => $paletteindex) {
@@ -652,13 +652,13 @@
return false;
}
while ((($thisfile_bmp_header_raw['red_mask'] >> $redshift) & 0x01) == 0) {
- ++$redshift;
+ $redshift++;
}
while ((($thisfile_bmp_header_raw['green_mask'] >> $greenshift) & 0x01) == 0) {
- ++$greenshift;
+ $greenshift++;
}
while ((($thisfile_bmp_header_raw['blue_mask'] >> $blueshift) & 0x01) == 0) {
- ++$blueshift;
+ $blueshift++;
}
for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
for ($col = 0; $col < $thisfile_bmp_header_raw['width']; ++$col) {
@@ -672,7 +672,7 @@
}
while (($pixeldataoffset % 4) != 0) {
// lines are padded to nearest DWORD
- ++$pixeldataoffset;
+ $pixeldataoffset++;
}
}
break;
@@ -875,4 +875,4 @@
}
-?>
\ No newline at end of file
+?>
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.class.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.class.php 2014-09-21 05:41:46 UTC (rev 12795)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.class.php 2014-09-22 08:23:59 UTC (rev 12796)
@@ -2439,7 +2439,7 @@
$this->DebugMessage('AntiOffsiteLinking() writing '.count($nohotlink_text_array).' lines of text "'.$message.'" (in #'.$this->config_error_textcolor.') on top of image', __FILE__, __LINE__);
foreach ($nohotlink_text_array as $textline) {
$leftoffset = max(0, round(($this->thumbnail_width - (strlen($textline) * ImageFontWidth($this->config_error_fontsize))) / 2));
- ImageString($this->gdimg_output, $this->config_error_fontsize, $leftoffset, $topoffset + (++$rowcounter * ImageFontHeight($this->config_error_fontsize)), $textline, $nohotlink_text_color);
+ ImageString($this->gdimg_output, $this->config_error_fontsize, $leftoffset, $topoffset + ($rowcounter++ * ImageFontHeight($this->config_error_fontsize)), $textline, $nohotlink_text_color);
}
}
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/prefix_manager.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/prefix_manager.php 2014-09-21 05:41:46 UTC (rev 12795)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/prefix_manager.php 2014-09-22 08:23:59 UTC (rev 12796)
@@ -215,7 +215,7 @@
$has_xoopscomments = false ;
foreach ($tables as $table) {
if( $table == $prefix['name'] . '_xoopscomments' ) $has_xoopscomments = true ;
- if( substr( $table , 0 , strlen( $prefix['name'] ) + 1 ) === $prefix['name'] . '_' ) ++$table_count ;
+ if( substr( $table , 0 , strlen( $prefix['name'] ) + 1 ) === $prefix['name'] . '_' ) ++$table_count;
}
// check if prefix_xoopscomments exists
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Generator.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Generator.php 2014-09-21 05:41:46 UTC (rev 12795)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Generator.php 2014-09-22 08:23:59 UTC (rev 12796)
@@ -94,8 +94,8 @@
// script special case
// the contents of the script block must be ONE token
// for this to work.
- $html .= $this->generateFromToken($tokens[++$i]);
- $html .= $this->generateScriptFromToken($tokens[++$i]);
+ $html .= $this->generateFromToken($tokens[$i++]);
+ $html .= $this->generateScriptFromToken($tokens[$i++]);
}
$html .= $this->generateFromToken($tokens[$i]);
}
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/FixNesting.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/FixNesting.php 2014-09-21 05:41:46 UTC (rev 12795)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/FixNesting.php 2014-09-22 08:23:59 UTC (rev 12796)
@@ -114,7 +114,7 @@
$go = false;
$def = empty($stack) ? $definition->info_parent_def : $definition->info[$node->name];
while (isset($node->children[$ix])) {
- $child = $node->children[++$ix];
+ $child = $node->children[$ix++];
if ($child instanceof HTMLPurifier_Node_Element) {
$go = true;
$stack[] = array($node, $is_inline, $excludes, $ix);
|
