[xoops-svn] SF.net SVN: xoops-svn:[12436] XoopsModules/wfdownloads/trunk/wfdownloads

[<luc...@us...>]

Revision: 12436
          http://sourceforge.net/p/xoops/svn/12436
Author:   luciorota
Date:     2014-04-08 21:29:30 +0000 (Tue, 08 Apr 2014)
Log Message:
-----------
change "$i++" to "++$i"
use defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");

Modified Paths:
--------------
    XoopsModules/wfdownloads/trunk/wfdownloads/class/dbupdater.php
    XoopsModules/wfdownloads/trunk/wfdownloads/include/comment_functions.php
    XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
    XoopsModules/wfdownloads/trunk/wfdownloads/include/module.php
    XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/dbupdater.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/dbupdater.php	2014-04-07 23:49:36 UTC (rev 12435)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/dbupdater.php	2014-04-08 21:29:30 UTC (rev 12436)
@@ -38,9 +38,7 @@
  * @author  marcan <ma...@sm...>
  * @link    http://www.smartfactory.ca The SmartFactory
  */
-if (!defined("XOOPS_ROOT_PATH")) {
-    die("XOOPS root path not defined");
-}
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
 
 class WfdownloadsTable
 {

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/include/comment_functions.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/comment_functions.php	2014-04-07 23:49:36 UTC (rev 12435)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/comment_functions.php	2014-04-08 21:29:30 UTC (rev 12436)
@@ -19,9 +19,7 @@
  * @version         svn:$id$
  */
 
-if (!defined("XOOPS_ROOT_PATH")) {
-     die("XOOPS root path not defined");
-}
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
 include_once dirname(__FILE__) . '/common.php';
 
 // comment callback functions

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php	2014-04-07 23:49:36 UTC (rev 12435)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php	2014-04-08 21:29:30 UTC (rev 12436)
@@ -18,9 +18,7 @@
  * @author          Xoops Development Team
  * @version         svn:$id$
  */
-if (!defined("XOOPS_ROOT_PATH")) {
-    die("XOOPS root path not defined");
-}
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
 include_once dirname(__FILE__) . '/common.php';
 
 /**

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/include/module.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/module.php	2014-04-07 23:49:36 UTC (rev 12435)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/module.php	2014-04-08 21:29:30 UTC (rev 12436)
@@ -18,9 +18,7 @@
  * @author          Xoops Development Team
  * @version         svn:$id$
  */
-if (!defined("XOOPS_ROOT_PATH")) {
-    die("Xoops root path not defined");
-}
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
 include_once(XOOPS_ROOT_PATH . "/modules/wfdownloads/class/dbupdater.php");
 include_once(XOOPS_ROOT_PATH . "/modules/wfdownloads/include/common.php");
 @include_once(XOOPS_ROOT_PATH . "/modules/wfdownloads/language/" . $xoopsConfig['language'] . "/admin.php");

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php	2014-04-07 23:49:36 UTC (rev 12435)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php	2014-04-08 21:29:30 UTC (rev 12436)
@@ -68,19 +68,19 @@
 $i                                     = 0;
 $modversion['helpsection'][$i]['name'] = "Overview";
 $modversion['helpsection'][$i]['link'] = "page=help";
-$i++;
+++$i;
 $modversion['helpsection'][$i]['name'] = "Fresh Install";
 $modversion['helpsection'][$i]['link'] = "page=help2";
-$i++;
+++$i;
 $modversion['helpsection'][$i]['name'] = "Import";
 $modversion['helpsection'][$i]['link'] = "page=help3";
-$i++;
+++$i;
 $modversion['helpsection'][$i]['name'] = "Updates Notes";
 $modversion['helpsection'][$i]['link'] = "page=help4";
-$i++;
+++$i;
 $modversion['helpsection'][$i]['name'] = "Updates from 2.0 - 3.10";
 $modversion['helpsection'][$i]['link'] = "page=help5";
-$i++;
+++$i;
 $modversion['helpsection'][$i]['name'] = "Updates from 3.10+";
 $modversion['helpsection'][$i]['link'] = "page=help6";
 
@@ -117,25 +117,25 @@
 // Tables created by sql file (without prefix!)
 $i                        = 0;
 $modversion['tables'][$i] = $modversion['dirname'] . '_broken';
-$i++;
+++$i;
 $modversion['tables'][$i] = $modversion['dirname'] . '_cat';
-$i++;
+++$i;
 $modversion['tables'][$i] = $modversion['dirname'] . '_downloads';
-$i++;
+++$i;
 $modversion['tables'][$i] = $modversion['dirname'] . '_mod';
-$i++;
+++$i;
 $modversion['tables'][$i] = $modversion['dirname'] . '_votedata';
-$i++;
+++$i;
 $modversion['tables'][$i] = $modversion['dirname'] . '_indexpage';
-$i++;
+++$i;
 $modversion['tables'][$i] = $modversion['dirname'] . '_reviews';
-$i++;
+++$i;
 $modversion['tables'][$i] = $modversion['dirname'] . '_mimetypes';
-$i++;
+++$i;
 $modversion['tables'][$i] = $modversion['dirname'] . '_meta';
-$i++;
+++$i;
 $modversion['tables'][$i] = $modversion['dirname'] . '_mirrors';
-$i++;
+++$i;
 $modversion['tables'][$i] = $modversion['dirname'] . '_ip_log';
 
 
@@ -171,15 +171,15 @@
 }
 $i = 0;
 if ($isSubmissionAllowed) {
-    $i++;
+    ++$i;
     $modversion['sub'][$i]['name'] = _MI_WFDOWNLOADS_SMNAME1;
     $category_suffix               = (!empty($_GET['cid'])) ? "?cid=" . intval($_GET['cid']) : ""; //Added by Lankford on 2008/2/20
     $modversion['sub'][$i]['url']  = "submit.php{$category_suffix}";
 }
-$i++;
+++$i;
 $modversion['sub'][$i]['name'] = _MI_WFDOWNLOADS_SMNAME2;
 $modversion['sub'][$i]['url']  = "topten.php?list=hit";
-$i++;
+++$i;
 $modversion['sub'][$i]['name'] = _MI_WFDOWNLOADS_SMNAME3;
 $modversion['sub'][$i]['url']  = "topten.php?list=rate";
 unset($i);
@@ -194,7 +194,7 @@
 $modversion['blocks'][$i]['edit_func']   = $modversion['dirname'] . "_top_edit";
 $modversion['blocks'][$i]['options']     = "published|10|19";
 $modversion['blocks'][$i]['template']    = $modversion['dirname'] . "_block_new.html";
-$i++;
+++$i;
 $modversion['blocks'][$i]['file']        = "top.php";
 $modversion['blocks'][$i]['name']        = _MI_WFDOWNLOADS_BNAME2;
 $modversion['blocks'][$i]['description'] = "Shows most downloaded files";
@@ -202,7 +202,7 @@
 $modversion['blocks'][$i]['edit_func']   = $modversion['dirname'] . "_top_edit";
 $modversion['blocks'][$i]['options']     = "hits|10|19";
 $modversion['blocks'][$i]['template']    = $modversion['dirname'] . "_block_top.html";
-$i++;
+++$i;
 $modversion['blocks'][$i]['file']        = "top_by_cat.php";
 $modversion['blocks'][$i]['name']        = _MI_WFDOWNLOADS_BNAME3;
 $modversion['blocks'][$i]['description'] = "Shows most downloaded files by top categories";
@@ -227,89 +227,89 @@
 $i                                          = 1;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_header.html';
 $modversion['templates'][$i]['description'] = 'Header info';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_footer.html';
 $modversion['templates'][$i]['description'] = 'Footer info';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_brokenfile.html';
 $modversion['templates'][$i]['description'] = '';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_download.html';
 $modversion['templates'][$i]['description'] = '';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_index.html';
 $modversion['templates'][$i]['description'] = '';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_ratefile.html';
 $modversion['templates'][$i]['description'] = '';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_singlefile.html';
 $modversion['templates'][$i]['description'] = '';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_topten.html';
 $modversion['templates'][$i]['description'] = '';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_viewcat.html';
 $modversion['templates'][$i]['description'] = '';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_newlistindex.html';
 $modversion['templates'][$i]['description'] = '';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_reviews.html';
 $modversion['templates'][$i]['description'] = '';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_mirrors.html';
 $modversion['templates'][$i]['description'] = '';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_disclaimer.html';
 $modversion['templates'][$i]['description'] = '';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_submit.html';
 $modversion['templates'][$i]['description'] = '';
 
 // Admin templates
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_admin_categorieslist.html';
 $modversion['templates'][$i]['type']        = 'admin';
 $modversion['templates'][$i]['description'] = '';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_admin_downloadslist.html';
 $modversion['templates'][$i]['type']        = 'admin';
 $modversion['templates'][$i]['description'] = '';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_admin_ip_logslist.html';
 $modversion['templates'][$i]['type']        = 'admin';
 $modversion['templates'][$i]['description'] = '';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_admin_reportsmodificationslist.html';
 $modversion['templates'][$i]['type']        = 'admin';
 $modversion['templates'][$i]['description'] = '';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_admin_ratingslist.html';
 $modversion['templates'][$i]['type']        = 'admin';
 $modversion['templates'][$i]['description'] = '';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_admin_reviewslist.html';
 $modversion['templates'][$i]['type']        = 'admin';
 $modversion['templates'][$i]['description'] = '';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_admin_mirrorslist.html';
 $modversion['templates'][$i]['type']        = 'admin';
 $modversion['templates'][$i]['description'] = '';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_admin_mimetypeslist.html';
 $modversion['templates'][$i]['type']        = 'admin';
 $modversion['templates'][$i]['description'] = '';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_admin_permissions.html';
 $modversion['templates'][$i]['type']        = 'admin';
 $modversion['templates'][$i]['description'] = '';
 
 // Common templates
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_common_breadcrumb.html';
 $modversion['templates'][$i]['description'] = '';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_common_letterschoice.html';
 $modversion['templates'][$i]['description'] = '';
 
@@ -1044,14 +1044,14 @@
 $modversion['notification']['category'][$i]['description']    = _MI_WFDOWNLOADS_GLOBAL_NOTIFYDSC;
 $modversion['notification']['category'][$i]['item_name']      = '';
 $modversion['notification']['category'][$i]['subscribe_from'] = array('index.php', 'viewcat.php', 'singlefile.php');
-$i++;
+++$i;
 $modversion['notification']['category'][$i]['name']           = 'category';
 $modversion['notification']['category'][$i]['title']          = _MI_WFDOWNLOADS_CATEGORY_NOTIFY;
 $modversion['notification']['category'][$i]['description']    = _MI_WFDOWNLOADS_CATEGORY_NOTIFYDSC;
 $modversion['notification']['category'][$i]['subscribe_from'] = array('viewcat.php', 'singlefile.php');
 $modversion['notification']['category'][$i]['item_name']      = 'cid';
 $modversion['notification']['category'][$i]['allow_bookmark'] = true;
-$i++;
+++$i;
 $modversion['notification']['category'][$i]['name']           = 'file';
 $modversion['notification']['category'][$i]['title']          = _MI_WFDOWNLOADS_FILE_NOTIFY;
 $modversion['notification']['category'][$i]['description']    = _MI_WFDOWNLOADS_FILE_NOTIFYDSC;
@@ -1067,7 +1067,7 @@
 $modversion['notification']['event'][$i]['description']   = _MI_WFDOWNLOADS_GLOBAL_NEWCATEGORY_NOTIFYDSC;
 $modversion['notification']['event'][$i]['mail_template'] = 'global_newcategory_notify';
 $modversion['notification']['event'][$i]['mail_subject']  = _MI_WFDOWNLOADS_GLOBAL_NEWCATEGORY_NOTIFYSBJ;
-$i++;
+++$i;
 $modversion['notification']['event'][$i]['name']          = 'file_modify';
 $modversion['notification']['event'][$i]['category']      = 'global';
 $modversion['notification']['event'][$i]['admin_only']    = true;
@@ -1076,7 +1076,7 @@
 $modversion['notification']['event'][$i]['description']   = _MI_WFDOWNLOADS_GLOBAL_FILEMODIFY_NOTIFYDSC;
 $modversion['notification']['event'][$i]['mail_template'] = 'global_filemodify_notify';
 $modversion['notification']['event'][$i]['mail_subject']  = _MI_WFDOWNLOADS_GLOBAL_FILEMODIFY_NOTIFYSBJ;
-$i++;
+++$i;
 $modversion['notification']['event'][$i]['name']          = 'file_broken';
 $modversion['notification']['event'][$i]['category']      = 'global';
 $modversion['notification']['event'][$i]['admin_only']    = true;
@@ -1085,7 +1085,7 @@
 $modversion['notification']['event'][$i]['description']   = _MI_WFDOWNLOADS_GLOBAL_FILEBROKEN_NOTIFYDSC;
 $modversion['notification']['event'][$i]['mail_template'] = 'global_filebroken_notify';
 $modversion['notification']['event'][$i]['mail_subject']  = _MI_WFDOWNLOADS_GLOBAL_FILEBROKEN_NOTIFYSBJ;
-$i++;
+++$i;
 $modversion['notification']['event'][$i]['name']          = 'file_submit';
 $modversion['notification']['event'][$i]['category']      = 'global';
 $modversion['notification']['event'][$i]['admin_only']    = true;
@@ -1094,7 +1094,7 @@
 $modversion['notification']['event'][$i]['description']   = _MI_WFDOWNLOADS_GLOBAL_FILESUBMIT_NOTIFYDSC;
 $modversion['notification']['event'][$i]['mail_template'] = 'global_filesubmit_notify';
 $modversion['notification']['event'][$i]['mail_subject']  = _MI_WFDOWNLOADS_GLOBAL_FILESUBMIT_NOTIFYSBJ;
-$i++;
+++$i;
 $modversion['notification']['event'][$i]['name']          = 'new_file';
 $modversion['notification']['event'][$i]['category']      = 'global';
 $modversion['notification']['event'][$i]['title']         = _MI_WFDOWNLOADS_GLOBAL_NEWFILE_NOTIFY;
@@ -1102,7 +1102,7 @@
 $modversion['notification']['event'][$i]['description']   = _MI_WFDOWNLOADS_GLOBAL_NEWFILE_NOTIFYDSC;
 $modversion['notification']['event'][$i]['mail_template'] = 'global_newfile_notify';
 $modversion['notification']['event'][$i]['mail_subject']  = _MI_WFDOWNLOADS_GLOBAL_NEWFILE_NOTIFYSBJ;
-$i++;
+++$i;
 $modversion['notification']['event'][$i]['name']          = 'file_submit';
 $modversion['notification']['event'][$i]['category']      = 'category';
 $modversion['notification']['event'][$i]['admin_only']    = true;
@@ -1111,7 +1111,7 @@
 $modversion['notification']['event'][$i]['description']   = _MI_WFDOWNLOADS_CATEGORY_FILESUBMIT_NOTIFYDSC;
 $modversion['notification']['event'][$i]['mail_template'] = 'category_filesubmit_notify';
 $modversion['notification']['event'][$i]['mail_subject']  = _MI_WFDOWNLOADS_CATEGORY_FILESUBMIT_NOTIFYSBJ;
-$i++;
+++$i;
 $modversion['notification']['event'][$i]['name']          = 'new_file';
 $modversion['notification']['event'][$i]['category']      = 'category';
 $modversion['notification']['event'][$i]['title']         = _MI_WFDOWNLOADS_CATEGORY_NEWFILE_NOTIFY;
@@ -1119,7 +1119,7 @@
 $modversion['notification']['event'][$i]['description']   = _MI_WFDOWNLOADS_CATEGORY_NEWFILE_NOTIFYDSC;
 $modversion['notification']['event'][$i]['mail_template'] = 'category_newfile_notify';
 $modversion['notification']['event'][$i]['mail_subject']  = _MI_WFDOWNLOADS_CATEGORY_NEWFILE_NOTIFYSBJ;
-$i++;
+++$i;
 $modversion['notification']['event'][$i]['name']          = 'approve';
 $modversion['notification']['event'][$i]['category']      = 'file';
 $modversion['notification']['event'][$i]['invisible']     = true;
@@ -1128,7 +1128,7 @@
 $modversion['notification']['event'][$i]['description']   = _MI_WFDOWNLOADS_FILE_APPROVE_NOTIFYDSC;
 $modversion['notification']['event'][$i]['mail_template'] = 'file_approve_notify';
 $modversion['notification']['event'][$i]['mail_subject']  = _MI_WFDOWNLOADS_FILE_APPROVE_NOTIFYSBJ;
-$i++;
+++$i;
 $modversion['notification']['event'][$i]['name']          = 'filemodified';
 $modversion['notification']['event'][$i]['category']      = 'file';
 $modversion['notification']['event'][$i]['title']         = _MI_WFDOWNLOADS_FILE_FILEMODIFIED_NOTIFY;
@@ -1136,7 +1136,7 @@
 $modversion['notification']['event'][$i]['description']   = _MI_WFDOWNLOADS_FILE_FILEMODIFIED_NOTIFYDSC;
 $modversion['notification']['event'][$i]['mail_template'] = 'file_filemodified_notify';
 $modversion['notification']['event'][$i]['mail_subject']  = _MI_WFDOWNLOADS_FILE_FILEMODIFIED_NOTIFYSBJ;
-$i++;
+++$i;
 $modversion['notification']['event'][$i]['name']          = 'filemodified';
 $modversion['notification']['event'][$i]['category']      = 'category';
 $modversion['notification']['event'][$i]['title']         = _MI_WFDOWNLOADS_CATEGORY_FILEMODIFIED_NOTIFY;
@@ -1144,7 +1144,7 @@
 $modversion['notification']['event'][$i]['description']   = _MI_WFDOWNLOADS_CATEGORY_FILEMODIFIED_NOTIFYDSC;
 $modversion['notification']['event'][$i]['mail_template'] = 'category_filemodified_notify';
 $modversion['notification']['event'][$i]['mail_subject']  = _MI_WFDOWNLOADS_CATEGORY_FILEMODIFIED_NOTIFYSBJ;
-$i++;
+++$i;
 $modversion['notification']['event'][$i]['name']          = 'filemodified';
 $modversion['notification']['event'][$i]['category']      = 'global';
 $modversion['notification']['event'][$i]['title']         = _MI_WFDOWNLOADS_GLOBAL_FILEMODIFIED_NOTIFY;