[xoops-svn] SF.net SVN: xoops-svn:[12463] XoopsModules/wfdownloads/branches/mamba/ wfdownloads

[<be...@us...>]

Revision: 12463
          http://sourceforge.net/p/xoops/svn/12463
Author:   beckmi
Date:     2014-04-19 23:21:34 +0000 (Sat, 19 Apr 2014)
Log Message:
-----------
Replacing Logical operators

Modified Paths:
--------------
    XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php
    XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/menu.php
    XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top.php
    XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top_by_cat.php
    XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/breadcrumb.php
    XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php
    XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/dbupdater.php
    XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/download.php
    XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/ip_log.php
    XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/mimetype.php
    XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/mirror.php
    XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/modification.php
    XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/multicolumnsthemeform.php
    XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/rating.php
    XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/report.php
    XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/review.php
    XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/session.php
    XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/tree.php
    XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads.php
    XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/xoopstree.php
    XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt
    XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/comment_functions.php
    XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/common.php
    XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/directorychecker.php
    XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/filechecker.php
    XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php
    XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/module.php
    XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/search.inc.php
    XoopsModules/wfdownloads/branches/mamba/wfdownloads/index.php
    XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php
    XoopsModules/wfdownloads/branches/mamba/wfdownloads/xoops_version.php

Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php	2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php	2014-04-19 23:21:34 UTC (rev 12463)
@@ -300,7 +300,7 @@
         //    a) Are they actually changing the value of version, or is it the same?
         //    b) Are they actually modifying the record, or is this a new one?
         //  If both conditions are true, then trigger all three notifications related to modified records.
-        if (!$thisIsANewRecord and ($download->getVar('version') != $version)) {
+        if (!$thisIsANewRecord && ($download->getVar('version') != $version)) {
             // Trigger the three events related to modified files (one for the file, category, and global event categories respectively)
             $tags                  = array();
             $tags['FILE_NAME']     = $title;

Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/menu.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/menu.php	2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/menu.php	2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
  * @author          Xoops Development Team
  * @version         svn:$id$
  */
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
 $module_handler = xoops_gethandler('module');
 $module = $module_handler->getByDirname(basename(dirname(dirname(__FILE__))));

Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top.php	2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top.php	2014-04-19 23:21:34 UTC (rev 12463)
@@ -27,7 +27,7 @@
  *            $options[1]   = How many downloads are displayes
  * Output  : Returns the most recent or most popular downloads
  */
-defined("XOOPS_ROOT_PATH") or die('XOOPS root path not defined');
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 include_once dirname(dirname(__FILE__)) . '/include/common.php';
 /**
  * @param $options

Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top_by_cat.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top_by_cat.php	2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top_by_cat.php	2014-04-19 23:21:34 UTC (rev 12463)
@@ -27,7 +27,7 @@
  *            $options[1]   = How many downloads are displayes
  * Output  : Returns the most recent or most popular downloads
  */
-defined("XOOPS_ROOT_PATH") or die('XOOPS root path not defined');
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 include_once dirname(dirname(__FILE__)) . '/include/common.php';
 /**
  * @param $options

Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/breadcrumb.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/breadcrumb.php	2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/breadcrumb.php	2014-04-19 23:21:34 UTC (rev 12463)
@@ -25,7 +25,7 @@
  * $breadcrumb->addLink( 'bread 3', 'index3.php' );
  * echo $breadcrumb->render();
  */
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
 /**
  * Class WfdownloadsBreadcrumb

Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php	2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php	2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
  * @author          Xoops Development Team
  * @version         svn:$id$
  */
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 include_once dirname(dirname(__FILE__)) . '/include/common.php';
 
 /**

Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/dbupdater.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/dbupdater.php	2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/dbupdater.php	2014-04-19 23:21:34 UTC (rev 12463)
@@ -38,7 +38,7 @@
  * @author  marcan <ma...@sm...>
  * @link    http://www.smartfactory.ca The SmartFactory
  */
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
 /**
  * Class WfdownloadsTable

Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/download.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/download.php	2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/download.php	2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
  * @author          Xoops Development Team
  * @version         svn:$id$
  */
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 include_once dirname(dirname(__FILE__)) . '/include/common.php';
 
 /**
@@ -1311,8 +1311,8 @@
             xoops_comment_delete((int) $this->wfdownloads->getModule()->mid(), (int) $download->getVar('lid'));
 
             // Added Formulize module support (2006/05/04) jpc - start
-            if (wfdownloads_checkModule('formulize')) {
-                if (file_exists(XOOPS_ROOT_PATH . '/modules/formulize/include/functions.php') AND $download->getVar('formulize_idreq') > 0) {
+            if (wfdownloads_checkModule('formulize')) { if (file_exists(XOOPS_ROOT_PATH . '/modules/formulize/include/functions.php') && $download->getVar('formulize_idreq') > 0) {
+
                     include_once XOOPS_ROOT_PATH . '/modules/formulize/include/functions.php';
                     //deleteFormEntries(array($download->getVar('formulize_idreq')));
                     $category = $this->wfdownloads->getHandler('category')->get($download->getVar('cid'));

Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/ip_log.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/ip_log.php	2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/ip_log.php	2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
  * @author          Xoops Development Team
  * @version         svn:$id$
  */
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 include_once dirname(dirname(__FILE__)) . '/include/common.php';
 
 /**

Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/mimetype.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/mimetype.php	2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/mimetype.php	2014-04-19 23:21:34 UTC (rev 12463)
@@ -29,7 +29,7 @@
   KEY mime_id (mime_id)
 ) ENGINE=MyISAM;
 */
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 include_once dirname(dirname(__FILE__)) . '/include/common.php';
 
 /**

Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/mirror.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/mirror.php	2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/mirror.php	2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
  * @author          Xoops Development Team
  * @version         svn:$id$
  */
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 include_once dirname(dirname(__FILE__)) . '/include/common.php';
 
 /**

Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/modification.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/modification.php	2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/modification.php	2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
  * @author          Xoops Development Team
  * @version         svn:$id$
  */
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 include_once dirname(dirname(__FILE__)) . '/include/common.php';
 
 require_once XOOPS_ROOT_PATH . '/modules/wfdownloads/class/download.php';

Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/multicolumnsthemeform.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/multicolumnsthemeform.php	2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/multicolumnsthemeform.php	2014-04-19 23:21:34 UTC (rev 12463)
@@ -19,7 +19,7 @@
  * @version     $Id:$
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
 xoops_load('XoopsForm');
 

Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/rating.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/rating.php	2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/rating.php	2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
  * @author          Xoops Development Team
  * @version         svn:$id$
  */
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 include_once dirname(dirname(__FILE__)) . '/include/common.php';
 
 /**

Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/report.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/report.php	2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/report.php	2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
  * @author          Xoops Development Team
  * @version         svn:$id$
  */
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 include_once dirname(dirname(__FILE__)) . '/include/common.php';
 
 /**

Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/review.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/review.php	2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/review.php	2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
  * @author          Xoops Development Team
  * @version         svn:$id$
  */
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 include_once dirname(dirname(__FILE__)) . '/include/common.php';
 
 /**

Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/session.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/session.php	2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/session.php	2014-04-19 23:21:34 UTC (rev 12463)
@@ -19,7 +19,7 @@
  * @author          Harry Fuecks (PHP Anthology Volume II)
  * @version         $Id: session.php 10283 2012-11-28 13:39:36Z trabis $
  */
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
 include_once dirname(dirname(__FILE__)) . '/include/common.php';
 

Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/tree.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/tree.php	2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/tree.php	2014-04-19 23:21:34 UTC (rev 12463)
@@ -19,7 +19,7 @@
  * @version     $Id:$
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
 include_once XOOPS_ROOT_PATH . '/class/tree.php';
 

Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads.php	2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads.php	2014-04-19 23:21:34 UTC (rev 12463)
@@ -19,7 +19,7 @@
  * @author          trabis <lus...@gm...>
  * @version         $Id:$
  */
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
 /**
  * Class WfdownloadsWfdownloads

Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/xoopstree.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/xoopstree.php	2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/xoopstree.php	2014-04-19 23:21:34 UTC (rev 12463)
@@ -17,7 +17,7 @@
  * @version         $Id$
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
 /**
  * Abstract base class for forms

Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt	2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt	2014-04-19 23:21:34 UTC (rev 12463)
@@ -1,4 +1,5 @@
 <b><u>=> Version 3.23 Beta (2014-04-19)</u></b>
+- replacing "or" with "||" (mamba)
 - replaced template extensions from .html to .tpl (mamba)
 - replaced Thickbox with MagnificPopup (mamba)
 - fixed: source code for HTML5/CSS3 (mamba)

Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/comment_functions.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/comment_functions.php	2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/comment_functions.php	2014-04-19 23:21:34 UTC (rev 12463)
@@ -19,7 +19,7 @@
  * @version         svn:$id$
  */
 
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 include_once dirname(__FILE__) . '/common.php';
 
 // comment callback functions

Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/common.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/common.php	2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/common.php	2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
  * @author          Xoops Development Team
  * @version         svn:$id$
  */
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
 // This must contain the name of the folder in which reside Wfdownloads
 define("WFDOWNLOADS_DIRNAME", basename(dirname(dirname(__FILE__))));

Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/directorychecker.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/directorychecker.php	2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/directorychecker.php	2014-04-19 23:21:34 UTC (rev 12463)
@@ -19,7 +19,7 @@
  * @version         svn:$id$
  */
 
-//defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+//defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
 require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
 $mydirname = basename(dirname(dirname(__FILE__)));
@@ -98,7 +98,7 @@
     {
         $target = str_replace("..", "", $target);
         // http://www.php.net/manual/en/function.mkdir.php
-        return is_dir($target) or (self::createDirectory(dirname($target), $mode) and mkdir($target, $mode));
+        return is_dir($target) || (self::createDirectory(dirname($target), $mode) && mkdir($target, $mode));
     }
 
     /**

Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/filechecker.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/filechecker.php	2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/filechecker.php	2014-04-19 23:21:34 UTC (rev 12463)
@@ -19,7 +19,7 @@
  * @version         svn:$id$
  */
 
-//defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+//defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
 require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
 $mydirname = basename(dirname(dirname(__FILE__)));

Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php	2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php	2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
  * @author          Xoops Development Team
  * @version         svn:$id$
  */
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 include_once dirname(__FILE__) . '/common.php';
 
 /**
@@ -1698,7 +1698,7 @@
 
     // Create swish-e.conf
     $file = "{$swisheDocPath}/swish-e.conf";
-    $fp = fopen($file, 'w') or die("<BR><BR>Unable to open {$file}");
+    $fp = fopen($file, 'w') || die("<BR><BR>Unable to open {$file}");
     $line = "IndexDir {$swisheDocPath}/\n";
     fputs($fp, $line);
     $line = "IndexFile {$swisheDocPath}/index.swish-e\n";
@@ -1784,7 +1784,7 @@
 
         // Opens a pipe to swish-e
         $pipe_handler = popen("{$swish} -w {$search_query} -f {$search_index} {$search_params}", "r")
-        or die("The search request generated an error...Please try again.");
+        || die("The search request generated an error...Please try again.");
 
         //print "$swish -w $search_query -f $search_index $search_params<BR>";
 

Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/module.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/module.php	2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/module.php	2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
  * @author          Xoops Development Team
  * @version         svn:$id$
  */
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || 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/branches/mamba/wfdownloads/include/search.inc.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/search.inc.php	2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/search.inc.php	2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
  * @author          Xoops Development Team
  * @version         svn:$id$
  */
-defined("XOOPS_ROOT_PATH") or die('XOOPS root path not defined');
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 include_once dirname(dirname(__FILE__)) . '/include/common.php';
 /**
  * @param        $queryArray
@@ -56,7 +56,7 @@
     // because count() returns 1 even if a supplied variable
     // is not an array, we must check if $querryarray is really an array
     $queryArray_count = 0;
-    if ((is_array($queryArray) && $queryArray_count = count($queryArray)) OR $userId != 0) {
+    if ((is_array($queryArray) && $queryArray_count = count($queryArray)) || $userId != 0) {
         // $userId != 0 added August 13 2007 -- ACCOUNTS FOR CASES WHERE THERE ARE NO QUERY TERMS BUT A USER ID IS PASSED -- FREEFORM SOLUTIONS
         if ($queryArray_count == 0) {
             $queryArray_count
@@ -98,7 +98,7 @@
             }
 
             // Set criteria for the captions that the user can see if necessary
-            if (is_array($fids) AND count($fids) > 0) {
+            if (is_array($fids) && count($fids) > 0) {
                 $formulizeElementCriteria = new CriteriaCompo();
                 $formulizeElementCriteria->add(new Criteria('ele_display', 1), 'OR');
                 foreach ($userGroups as $group) {
@@ -165,7 +165,7 @@
             }
 
             // Make a criteria object that includes the custom form ids that were found, if any
-            if (count($saved_ids) > 0 AND is_array($saved_ids)) {
+            if (count($saved_ids) > 0 && is_array($saved_ids)) {
                 $subs_plus_custom = new CriteriaCompo(new Criteria('formulize_idreq', '(' . implode(',', $saved_ids) . ')', 'IN'));
                 $subs_plus_custom->add($allSubCriterias, 'OR');
                 $queryCriteria->add($subs_plus_custom);
@@ -220,10 +220,10 @@
     $storedLids = array();
 
     // foreach (array_keys($downloads) as $i)
-    for ($x = $offset; ($i < $limit AND $x < count($limitOffsetIndex)); ++$x) {
+    for ($x = $offset; ($i < $limit && $x < count($limitOffsetIndex)); ++$x) {
         $lid = $limitOffsetIndex[$x];
         $obj = $downloads[$lid];
-        if (is_object($obj) AND !isset($storedLids[$lid])) {
+        if (is_object($obj) && !isset($storedLids[$lid])) {
             $storedLids[$lid] = true;
             $ret[$i]['image'] = "assets/images/size2.gif";
             $ret[$i]['link']  = "singlefile.php?cid=" . $obj->getVar('cid') . "&amp;lid={$lid}";

Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/index.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/index.php	2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/index.php	2014-04-19 23:21:34 UTC (rev 12463)
@@ -172,7 +172,7 @@
             // Foreach subcategory
             foreach (array_keys($allSubcategories) as $k) {
                 if (in_array($allSubcategories[$k]->getVar('cid'), $allowedDownCategoriesIds)) {
-                    $publishdate = (isset($listings['published'][$allSubcategories[$k]->getVar('cid')]) AND
+                    $publishdate = (isset($listings['published'][$allSubcategories[$k]->getVar('cid')]) &&
                         $listings['published'][$allSubcategories[$k]->getVar('cid')] > $publishdate)
                         ? $listings['published'][$allSubcategories[$k]->getVar('cid')] : $publishdate;
                 }
@@ -214,7 +214,7 @@
                 if (in_array($allSubcategories[$k]->getVar('cid'), $allowedDownCategoriesIds)) {
                     $download_count += isset($listings['count'][$allSubcategories[$k]->getVar('cid')])
                         ? $listings['count'][$allSubcategories[$k]->getVar('cid')] : 0;
-                    if ($wfdownloads->getConfig('subcats') == 1 AND $allSubcategories[$k]->getVar('pid') == $mainCategories[$i]->getVar('cid')) {
+                    if ($wfdownloads->getConfig('subcats') == 1 && $allSubcategories[$k]->getVar('pid') == $mainCategories[$i]->getVar('cid')) {
                         // if we are collecting subcat info for displaying, and this subcat is a first level child...
                         $subcategories[] = array(
                             'id'               => $allSubcategories[$k]->getVar('cid'), // this definition is not removed for backward compatibility issues

Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php	2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php	2014-04-19 23:21:34 UTC (rev 12463)
@@ -369,7 +369,7 @@
         //  If both conditions are true, then trigger all three notifications related to modified records.
         $version = !empty($_POST["version"]) ? trim($_POST["version"]) : 0;
 
-        if (!$isANewRecord and ($download->getVar('version') != $version)) {
+        if (!$isANewRecord && ($download->getVar('version') != $version)) {
             // Trigger the three events related to modified files (one for the file, category, and global event categories respectively)
             $tags                  = array();
             $tags['FILE_NAME']     = $title;

Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/xoops_version.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/xoops_version.php	2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/xoops_version.php	2014-04-19 23:21:34 UTC (rev 12463)
@@ -19,7 +19,7 @@
  * @version         svn:$id$
  */
 
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
 $modversion['name']        = _MI_WFDOWNLOADS_NAME;
 $modversion['version']     = 3.23;