From: <be...@us...> - 2014-10-02 22:59:08
|
Revision: 12803 http://sourceforge.net/p/xoops/svn/12803 Author: beckmi Date: 2014-10-02 22:58:58 +0000 (Thu, 02 Oct 2014) Log Message: ----------- replaced $i++ with ++$i for consistency/performance Modified Paths: -------------- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams0.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/news.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/smartsection.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/preferences.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_columns.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/category.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/ajax_rating.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/functions.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/rate.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/thumb.php Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php 2014-09-28 19:34:11 UTC (rev 12802) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php 2014-10-02 22:58:58 UTC (rev 12803) @@ -263,7 +263,7 @@ $delete = "<a href='category.php?op=del&categoryid=" . $categoryObj->categoryid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/delete.png' title='" . _AM_PUBLISHER_DELETECOL . "' alt='" . _AM_PUBLISHER_DELETECOL . "' /></a>"; $spaces = ''; - for ($j = 0; $j < $level; $j++) { + for ($j = 0; $j < $level; ++$j) { $spaces .= ' '; } @@ -275,7 +275,7 @@ echo "</tr>"; $subCategoriesObj = $publisher->getHandler('category')->getCategories(0, 0, $categoryObj->categoryid()); if (count($subCategoriesObj) > 0) { - $level++; + ++$level; foreach ($subCategoriesObj as $key => $thiscat) { publisher_displayCategory($thiscat, $level); } Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php 2014-09-28 19:34:11 UTC (rev 12802) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php 2014-10-02 22:58:58 UTC (rev 12803) @@ -296,7 +296,7 @@ $resultPictures = $xoopsDB->query($sql); $newCat['newid'] = $categoryObj->categoryid(); - $cnt_imported_cat++; + ++$cnt_imported_cat; echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . "<br/>"; @@ -389,7 +389,7 @@ $newArticleArray[$arrArticle['storyid']] = $itemObj->itemid(); echo " " . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />"; - $cnt_imported_articles++; + ++$cnt_imported_articles; } } Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams0.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams0.php 2014-09-28 19:34:11 UTC (rev 12802) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams0.php 2014-10-02 22:58:58 UTC (rev 12803) @@ -146,7 +146,7 @@ } $newCat['newid'] = $categoryObj->categoryid(); - $cnt_imported_cat++; + ++$cnt_imported_cat; echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . "<br\>"; @@ -221,7 +221,7 @@ */ $newArticleArray[$arrArticle['storyid']] = $itemObj->itemid(); echo " " . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />"; - $cnt_imported_articles++; + ++$cnt_imported_articles; } } Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php 2014-09-28 19:34:11 UTC (rev 12802) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php 2014-10-02 22:58:58 UTC (rev 12803) @@ -167,7 +167,7 @@ $newArticleArray[$arrArticle['id']] = $itemObj->itemid(); echo " " . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />"; - $cnt_imported_articles++; + ++$cnt_imported_articles; } } Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/news.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/news.php 2014-09-28 19:34:11 UTC (rev 12802) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/news.php 2014-10-02 22:58:58 UTC (rev 12803) @@ -146,7 +146,7 @@ } $newCat['newid'] = $categoryObj->categoryid(); - $cnt_imported_cat++; + ++$cnt_imported_cat; echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . "<br\>"; @@ -221,7 +221,7 @@ */ $newArticleArray[$arrArticle['storyid']] = $itemObj->itemid(); echo " " . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />"; - $cnt_imported_articles++; + ++$cnt_imported_articles; } } Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/smartsection.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/smartsection.php 2014-09-28 19:34:11 UTC (rev 12802) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/smartsection.php 2014-10-02 22:58:58 UTC (rev 12803) @@ -142,7 +142,7 @@ } $newCat['newid'] = $categoryObj->categoryid(); - $cnt_imported_cat++; + ++$cnt_imported_cat; echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . "<br\>"; @@ -200,7 +200,7 @@ $newArticleArray[$arrArticle['itemid']] = $itemObj->itemid(); echo " " . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />"; - $cnt_imported_articles++; + ++$cnt_imported_articles; } } Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php 2014-09-28 19:34:11 UTC (rev 12802) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php 2014-10-02 22:58:58 UTC (rev 12803) @@ -150,7 +150,7 @@ publisher_saveCategoryPermissions($categoryObj->getGroups_read(), $categoryObj->categoryid(), 'category_read'); publisher_saveCategoryPermissions($categoryObj->getGroups_submit(), $categoryObj->categoryid(), 'item_submit'); - $cnt_imported_cat++; + ++$cnt_imported_cat; echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . "<br\>"; @@ -219,7 +219,7 @@ $newArticleArray[$arrArticle['articleid']] = $itemObj->itemid(); echo " " . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />"; - $cnt_imported_articles++; + ++$cnt_imported_articles; } } $newCatArray[$newCat['oldid']] = $newCat; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php 2014-09-28 19:34:11 UTC (rev 12802) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php 2014-10-02 22:58:58 UTC (rev 12803) @@ -142,7 +142,7 @@ publisher_saveCategoryPermissions($categoryObj->getGroups_read(), $categoryObj->categoryid(), 'category_read'); publisher_saveCategoryPermissions($categoryObj->getGroups_submit(), $categoryObj->categoryid(), 'item_submit'); - $cnt_imported_cat++; + ++$cnt_imported_cat; echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . "<br\>"; @@ -217,7 +217,7 @@ $newArticleArray[$arrArticle['articleid']] = $itemObj->itemid(); echo " " . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />"; - $cnt_imported_articles++; + ++$cnt_imported_articles; } } $newCatArray[$newCat['oldid']] = $newCat; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php 2014-09-28 19:34:11 UTC (rev 12802) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php 2014-10-02 22:58:58 UTC (rev 12803) @@ -320,7 +320,7 @@ $resultPictures = $xoopsDB->query($sql); $newCat['newid'] = $categoryObj->categoryid(); - $cnt_imported_cat++; + ++$cnt_imported_cat; echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . "<br/>"; @@ -413,7 +413,7 @@ $newArticleArray[$arrArticle['storyid']] = $itemObj->itemid(); echo " " . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />"; - $cnt_imported_articles++; + ++$cnt_imported_articles; } } Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/preferences.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/preferences.php 2014-09-28 19:34:11 UTC (rev 12802) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/preferences.php 2014-10-02 22:58:58 UTC (rev 12803) @@ -103,7 +103,7 @@ $ele = new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput()); $options = $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id'))); $opcount = count($options); - for ($j = 0; $j < $opcount; $j++) { + for ($j = 0; $j < $opcount; ++$j) { $optval = defined($options[$j]->getVar('confop_value')) ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value'); $optkey = defined($options[$j]->getVar('confop_name')) ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name'); $ele->addOption($optval, $optkey); @@ -113,7 +113,7 @@ $ele = new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput(), 5, true); $options = $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id'))); $opcount = count($options); - for ($j = 0; $j < $opcount; $j++) { + for ($j = 0; $j < $opcount; ++$j) { $optval = defined($options[$j]->getVar('confop_value')) ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value'); $optkey = defined($options[$j]->getVar('confop_name')) ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name'); $ele->addOption($optval, $optkey); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_columns.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_columns.php 2014-09-28 19:34:11 UTC (rev 12802) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_columns.php 2014-10-02 22:58:58 UTC (rev 12803) @@ -115,7 +115,7 @@ $columns[$k][] = $mainitem; unset($thisitem); unset($mainitem); - $k++; + ++$k; if ($k == $opt_num_columns) { $k = 0; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php 2014-09-28 19:34:11 UTC (rev 12802) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php 2014-10-02 22:58:58 UTC (rev 12803) @@ -233,7 +233,7 @@ $block['letters'] = $letters; $columns[$k][] = $item; - $k++; + ++$k; if ($k == $column_count) { $k = 0; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/category.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/category.php 2014-09-28 19:34:11 UTC (rev 12802) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/category.php 2014-10-02 22:58:58 UTC (rev 12803) @@ -322,7 +322,7 @@ public function getForm($subCatsCount = 4) { include_once XOOPS_ROOT_PATH . '/modules/' . PUBLISHER_DIRNAME . '/class/form/category.php'; - $form = new PublisherCategoryForm($this, $subCatsCount); + $form = new PublisherCategoryForm($this, $subCatsCount); return $form; } @@ -498,7 +498,7 @@ { global $theresult; $spaces = ''; - for ($j = 0; $j < $level; $j++) { + for ($j = 0; $j < $level; ++$j) { $spaces .= '--'; } $theresult[$category['categoryid']] = $spaces . $category['name']; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/ajax_rating.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/ajax_rating.php 2014-09-28 19:34:11 UTC (rev 12802) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/ajax_rating.php 2014-10-02 22:58:58 UTC (rev 12803) @@ -82,7 +82,7 @@ $publisher->getHandler('rating')->insert($newRatingObj); $current_rating += $rating; -$count++; +++$count; $publisher->getHandler('item')->updateAll('rating', number_format($current_rating / $count, 4), $criteria, true); $publisher->getHandler('item')->updateAll('votes', $count, $criteria, true); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/functions.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/functions.php 2014-09-28 19:34:11 UTC (rev 12802) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/functions.php 2014-10-02 22:58:58 UTC (rev 12803) @@ -548,7 +548,7 @@ $publisher = PublisherPublisher::getInstance(); $spaces = ''; - for ($j = 0; $j < $level; $j++) { + for ($j = 0; $j < $level; ++$j) { $spaces .= '--'; } @@ -562,7 +562,7 @@ $subCategoriesObj = $publisher->getHandler('category')->getCategories(0, 0, $categoryObj->categoryid()); if (count($subCategoriesObj) > 0) { - $level++; + ++$level; foreach ($subCategoriesObj as $catID => $subCategoryObj) { $ret .= publisher_addCategoryOption($subCategoryObj, $selectedid, $level); } @@ -915,7 +915,7 @@ $rater .= '<div id="unit_ul' . $itemid . '" class="publisher_unit-rating" style="width:' . $rating_unitwidth * $units . 'px;">'; $rater .= '<div class="publisher_current-rating" style="width:' . $rating_width . 'px;">' . _MD_PUBLISHER_VOTE_RATING . ' ' . $rating2 . '/' . $units . '</div>'; - for ($ncount = 1; $ncount <= $units; $ncount++) { // loop from 1 to the number of units + for ($ncount = 1; $ncount <= $units; ++$ncount) { // loop from 1 to the number of units if (!$voted) { // if the user hasn't yet voted, draw the voting stars $rater .= '<div><a href="' . PUBLISHER_URL . '/rate.php?itemid=' . $itemid . '&rating=' . $ncount . '" title="' . $ncount . ' ' . _MD_PUBLISHER_VOTE_OUTOF . ' ' . $units . '" class="publisher_r' . $ncount . '-unit rater" rel="nofollow">' . $ncount . '</a></div>'; } Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/rate.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/rate.php 2014-09-28 19:34:11 UTC (rev 12802) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/rate.php 2014-10-02 22:58:58 UTC (rev 12803) @@ -71,7 +71,7 @@ $publisher->getHandler('rating')->insert($newRatingObj); $current_rating += $rating; -$count++; +++$count; $publisher->getHandler('item')->updateAll('rating', number_format($current_rating / $count, 4), $criteria, true); $publisher->getHandler('item')->updateAll('votes', $count, $criteria, true); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/thumb.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/thumb.php 2014-09-28 19:34:11 UTC (rev 12802) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/thumb.php 2014-10-02 22:58:58 UTC (rev 12803) @@ -753,7 +753,7 @@ $filterSettings = explode(',', $fl); if (isset ($imageFilters[$filterSettings[0]])) { - for ($i = 0; $i < 4; $i++) { + for ($i = 0; $i < 4; ++$i) { if (!isset ($filterSettings[$i])) { $filterSettings[$i] = null; } else { |