Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12133] XoopsModules/wfdownloads/trunk/wfdownloads
|
From: <be...@us...> - 2013-10-05 12:19:57
|
Revision: 12133
http://sourceforge.net/p/xoops/svn/12133
Author: beckmi
Date: 2013-10-05 12:19:51 +0000 (Sat, 05 Oct 2013)
Log Message:
-----------
Code reformatting toward PSR-2
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/clone.php
XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/category.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/dbupdater.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/ip_log.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/mimetype.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/mirror.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/modification.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/object.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/rating.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/report.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/request.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/review.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/session.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/xoopstree.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/include/search.inc.php
XoopsModules/wfdownloads/trunk/wfdownloads/index.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/common.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help.html
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help2.html
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help3.html
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help4.html
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help5.html
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help6.html
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/main.php
XoopsModules/wfdownloads/trunk/wfdownloads/module.css
XoopsModules/wfdownloads/trunk/wfdownloads/ratefile.php
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_common_letterschoice.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_disclaimer.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_viewcat.html
XoopsModules/wfdownloads/trunk/wfdownloads/thickbox.css
XoopsModules/wfdownloads/trunk/wfdownloads/visit.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/clone.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/clone.php 2013-10-04 21:19:57 UTC (rev 12132)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/clone.php 2013-10-05 12:19:51 UTC (rev 12133)
@@ -1,177 +1,165 @@
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-/**
- * Wfdownloads module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @package wfdownload
- * @since 3.23
- * @author Xoops Development Team
- * @version svn:$id$
- */
-$currentFile = basename(__FILE__);
-include_once dirname(__FILE__) . '/admin_header.php';
-
-if (@$_POST['op'] == 'submit') {
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header($currentFile, 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
- exit();
- }
-
- $cloneDirname = $_POST['clonedirname'];
-
- // Check if name is valid
- if (empty($cloneDirname) || preg_match('/[^a-zA-Z0-9\_\-]/', $cloneDirname)) {
- redirect_header($currentFile, 3, sprintf(_AM_WFDOWNLOADS_CLONE_INVALIDNAME, $cloneDirname));
- exit();
- }
- // Check wether the cloned module exists or not
- if ($cloneDirname && is_dir(XOOPS_ROOT_PATH . '/modules/' . $cloneDirname)) {
- redirect_header($currentFile, 3, sprintf(_AM_WFDOWNLOADS_CLONE_EXISTS, $cloneDirname));
- }
-
- $patterns = array(
- strtolower(WFDOWNLOADS_DIRNAME) => strtolower($cloneDirname),
- strtoupper(WFDOWNLOADS_DIRNAME) => strtoupper($cloneDirname),
- ucfirst(strtolower(WFDOWNLOADS_DIRNAME)) => ucfirst(strtolower($cloneDirname))
- );
-
- $patKeys = array_keys($patterns);
- $patValues = array_values($patterns);
- wfdownloads_cloneFileDir(WFDOWNLOADS_ROOT_PATH);
- $logocreated = wfdownloads_createLogo(strtolower($cloneDirname));
-
- $message = "";
- if (is_dir(XOOPS_ROOT_PATH . '/modules/' . strtolower($cloneDirname))) {
- $message .= sprintf(_AM_WFDOWNLOADS_CLONE_CONGRAT, "<a href='" . XOOPS_URL . "/modules/system/admin.php?fct=modulesadmin&op=installlist'>" . ucfirst(strtolower($cloneDirname)) . "</a>") . "<br />\n";
- if (!$logocreated) {
- $message .= _AM_WFDOWNLOADS_CLONE_IMAGEFAIL;
- }
- } else {
- $message .= _AM_WFDOWNLOADS_CLONE_FAIL;
- }
-
- wfdownloads_xoops_cp_header();
- $indexAdmin = new ModuleAdmin();
- echo $indexAdmin->addNavigation($currentFile);
- echo $message;
- include 'admin_footer.php';
- exit();
-
-} else {
- wfdownloads_xoops_cp_header();
- $indexAdmin = new ModuleAdmin();
- echo $indexAdmin->addNavigation($currentFile);
- include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
- $form = new XoopsThemeForm(sprintf(_AM_WFDOWNLOADS_CLONE_TITLE, $wfdownloads->getModule()->getVar('name', 'E')), 'clone', $currentFile, 'post', true);
- $cloneDirname_text = new XoopsFormText(_AM_WFDOWNLOADS_CLONE_NAME, 'clonedirname', 20, 20, '');
- $cloneDirname_text->setDescription(_AM_WFDOWNLOADS_CLONE_NAME_DSC);
- $form->addElement($cloneDirname_text, true);
- $form->addElement(new XoopsFormHidden('op', 'submit'));
- $form->addElement(new XoopsFormButton('', '', _SUBMIT, 'submit'));
- $form->display();
- include 'admin_footer.php';
- exit();
-}
-
-
-
-// work around for PHP < 5.0.x
-if (!function_exists('file_put_contents')) {
- function file_put_contents($filename, $data, $file_append = false)
- {
- if ($fp = fopen($filename, (!$file_append ? 'w+' : 'a+'))) {
- fputs($fp, $data);
- fclose($fp);
- }
- }
-}
-
-// recursive clonning script
-function wfdownloads_cloneFileDir($path)
-{
- global $patKeys;
- global $patValues;
-
- $newPath = str_replace($patKeys[0], $patValues[0], $path);
-
- if (is_dir($path)) {
- // create new dir
- mkdir($newPath);
- // check all files in dir, and process it
- if ($handle = opendir($path)) {
- while ($file = readdir($handle)) {
- if ($file != '.' && $file != '..' && $file != '.svn') {
- wfdownloads_cloneFileDir("{$path}/{$file}");
- }
- }
- closedir($handle);
- }
- } else {
- if (preg_match('/(.jpg|.gif|.png|.zip|.ttf)$/i', $path)) {
- // image
- copy($path, $newPath);
- } else {
- // file, read it
- $content = file_get_contents($path);
- $content = str_replace($patKeys, $patValues, $content);
- file_put_contents($newPath, $content);
- }
- }
-}
-
-function wfdownloads_createLogo($dirname)
-{
- $wfdownloads = WfdownloadsWfdownloads::getInstance();
- // Check extension/functions
- if (!extension_loaded("gd")) {
- return false;
- } else {
- $required_functions = array(
- "imagecreatetruecolor",
- "imagecolorallocate",
- "imagefilledrectangle",
- "imagejpeg",
- "imagedestroy",
- "imageftbbox"
- );
- foreach ($required_functions as $func) {
- if (!function_exists($func)) {
- return false;
- }
- }
- }
- // Check original image/font
- if (!file_exists($imageBase = XOOPS_ROOT_PATH . "/modules/" . $dirname . "/images/module_logo.png")) {
- return false;
- }
- if (!file_exists($font = XOOPS_ROOT_PATH . "/modules/" . $wfdownloads->getModule()->dirname() . "/images/VeraBd.ttf")) {
- return false;
- }
- // Create image
- $imageModule = imagecreatefrompng($imageBase);
- // Erase old text
- $greyColor = imagecolorallocate($imageModule, 237, 237, 237);
- imagefilledrectangle($imageModule, 5, 35, 85, 46, $greyColor);
- // Write text
- $textColor = imagecolorallocate($imageModule, 0, 0, 0);
- $space_to_border = (80 - strlen($dirname) * 6.5) / 2;
- imagefttext($imageModule, 8.5, 0, $space_to_border, 45, $textColor, $font, ucfirst($dirname), array());
- // Set transparency color
- $whiteColor = imagecolorallocatealpha($imageModule, 255, 255, 255, 127);
- imagefill($imageModule, 0, 0, $whiteColor);
- imagecolortransparent($imageModule, $whiteColor);
- // Save new image
- imagepng($imageModule, XOOPS_ROOT_PATH . "/modules/" . $dirname . "/images/module_logo.png");
- imagedestroy($imageModule);
- return true;
-}
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * Wfdownloads module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package wfdownload
+ * @since 3.23
+ * @author Xoops Development Team
+ * @version svn:$id$
+ */
+$currentFile = basename(__FILE__);
+include_once dirname(__FILE__) . '/admin_header.php';
+
+if (@$_POST['op'] == 'submit') {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($currentFile, 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ exit();
+ }
+
+ $cloneDirname = $_POST['clonedirname'];
+
+ // Check if name is valid
+ if (empty($cloneDirname) || preg_match('/[^a-zA-Z0-9\_\-]/', $cloneDirname)) {
+ redirect_header($currentFile, 3, sprintf(_AM_WFDOWNLOADS_CLONE_INVALIDNAME, $cloneDirname));
+ exit();
+ }
+ // Check wether the cloned module exists or not
+ if ($cloneDirname && is_dir(XOOPS_ROOT_PATH . '/modules/' . $cloneDirname)) {
+ redirect_header($currentFile, 3, sprintf(_AM_WFDOWNLOADS_CLONE_EXISTS, $cloneDirname));
+ }
+
+ $patterns = array(
+ strtolower(WFDOWNLOADS_DIRNAME) => strtolower($cloneDirname),
+ strtoupper(WFDOWNLOADS_DIRNAME) => strtoupper($cloneDirname),
+ ucfirst(strtolower(WFDOWNLOADS_DIRNAME)) => ucfirst(strtolower($cloneDirname))
+ );
+
+ $patKeys = array_keys($patterns);
+ $patValues = array_values($patterns);
+ wfdownloads_cloneFileDir(WFDOWNLOADS_ROOT_PATH);
+ $logocreated = wfdownloads_createLogo(strtolower($cloneDirname));
+
+ $message = "";
+ if (is_dir(XOOPS_ROOT_PATH . '/modules/' . strtolower($cloneDirname))) {
+ $message .= sprintf(_AM_WFDOWNLOADS_CLONE_CONGRAT, "<a href='" . XOOPS_URL . "/modules/system/admin.php?fct=modulesadmin&op=installlist'>" . ucfirst(strtolower($cloneDirname)) . "</a>") . "<br />\n";
+ if (!$logocreated) {
+ $message .= _AM_WFDOWNLOADS_CLONE_IMAGEFAIL;
+ }
+ } else {
+ $message .= _AM_WFDOWNLOADS_CLONE_FAIL;
+ }
+
+ wfdownloads_xoops_cp_header();
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation($currentFile);
+ echo $message;
+ include 'admin_footer.php';
+ exit();
+
+} else {
+ wfdownloads_xoops_cp_header();
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation($currentFile);
+ include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+ $form = new XoopsThemeForm(sprintf(_AM_WFDOWNLOADS_CLONE_TITLE, $wfdownloads->getModule()->getVar('name', 'E')), 'clone', $currentFile, 'post', true);
+ $cloneDirname_text = new XoopsFormText(_AM_WFDOWNLOADS_CLONE_NAME, 'clonedirname', 20, 20, '');
+ $cloneDirname_text->setDescription(_AM_WFDOWNLOADS_CLONE_NAME_DSC);
+ $form->addElement($cloneDirname_text, true);
+ $form->addElement(new XoopsFormHidden('op', 'submit'));
+ $form->addElement(new XoopsFormButton('', '', _SUBMIT, 'submit'));
+ $form->display();
+ include 'admin_footer.php';
+ exit();
+}
+
+// recursive clonning script
+function wfdownloads_cloneFileDir($path)
+{
+ global $patKeys;
+ global $patValues;
+
+ $newPath = str_replace($patKeys[0], $patValues[0], $path);
+
+ if (is_dir($path)) {
+ // create new dir
+ mkdir($newPath);
+ // check all files in dir, and process it
+ if ($handle = opendir($path)) {
+ while ($file = readdir($handle)) {
+ if ($file != '.' && $file != '..' && $file != '.svn') {
+ wfdownloads_cloneFileDir("{$path}/{$file}");
+ }
+ }
+ closedir($handle);
+ }
+ } else {
+ if (preg_match('/(.jpg|.gif|.png|.zip|.ttf)$/i', $path)) {
+ // image
+ copy($path, $newPath);
+ } else {
+ // file, read it
+ $content = file_get_contents($path);
+ $content = str_replace($patKeys, $patValues, $content);
+ file_put_contents($newPath, $content);
+ }
+ }
+}
+
+function wfdownloads_createLogo($dirname)
+{
+ $wfdownloads = WfdownloadsWfdownloads::getInstance();
+ // Check extension/functions
+ if (!extension_loaded("gd")) {
+ return false;
+ } else {
+ $required_functions = array(
+ "imagecreatetruecolor",
+ "imagecolorallocate",
+ "imagefilledrectangle",
+ "imagejpeg",
+ "imagedestroy",
+ "imageftbbox"
+ );
+ foreach ($required_functions as $func) {
+ if (!function_exists($func)) {
+ return false;
+ }
+ }
+ }
+ // Check original image/font
+ if (!file_exists($imageBase = XOOPS_ROOT_PATH . "/modules/" . $dirname . "/images/module_logo.png")) {
+ return false;
+ }
+ if (!file_exists($font = XOOPS_ROOT_PATH . "/modules/" . $wfdownloads->getModule()->dirname() . "/images/VeraBd.ttf")) {
+ return false;
+ }
+ // Create image
+ $imageModule = imagecreatefrompng($imageBase);
+ // Erase old text
+ $greyColor = imagecolorallocate($imageModule, 237, 237, 237);
+ imagefilledrectangle($imageModule, 5, 35, 85, 46, $greyColor);
+ // Write text
+ $textColor = imagecolorallocate($imageModule, 0, 0, 0);
+ $space_to_border = (80 - strlen($dirname) * 6.5) / 2;
+ imagefttext($imageModule, 8.5, 0, $space_to_border, 45, $textColor, $font, ucfirst($dirname), array());
+ // Set transparency color
+ $whiteColor = imagecolorallocatealpha($imageModule, 255, 255, 255, 127);
+ imagefill($imageModule, 0, 0, $whiteColor);
+ imagecolortransparent($imageModule, $whiteColor);
+ // Save new image
+ imagepng($imageModule, XOOPS_ROOT_PATH . "/modules/" . $dirname . "/images/module_logo.png");
+ imagedestroy($imageModule);
+
+ return true;
+}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php 2013-10-04 21:19:57 UTC (rev 12132)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php 2013-10-05 12:19:51 UTC (rev 12133)
@@ -60,7 +60,7 @@
case "report.add" :
default :
// Get report sender 'uid'
- $senderUid = is_object($xoopsUser) ? (int)$xoopsUser->getVar('uid') : 0;
+ $senderUid = is_object($xoopsUser) ? (int) $xoopsUser->getVar('uid') : 0;
$senderIp = getenv('REMOTE_ADDR');
if (!empty($_POST['submit'])) {
@@ -155,7 +155,7 @@
$broken['title'] = trim($download->getVar('title'));
$broken['id'] = $report->getVar('reportid');
- $broken['reporter'] = XoopsUserUtility::getUnameFromId((int)$report->getVar('sender'));
+ $broken['reporter'] = XoopsUserUtility::getUnameFromId((int) $report->getVar('sender'));
$broken['date'] = formatTimestamp($report->getVar('published'), $wfdownloads->getConfig('dateformat'));
$broken['acknowledged'] = ($report->getVar('acknowledged') == 1) ? _YES : _NO ;
$broken['confirmed'] = ($report->getVar('confirmed') == 1) ? _YES : _NO ;
@@ -170,7 +170,7 @@
$time = ($download->getVar('updated') != false) ? $download->getVar('updated') : $download->getVar('published');
$down['updated'] = formatTimestamp($time, $wfdownloads->getConfig('dateformat'));
$is_updated = ($download->getVar('updated') != false) ? _MD_WFDOWNLOADS_UPDATEDON : _MD_WFDOWNLOADS_SUBMITDATE;
- $down['publisher'] = XoopsUserUtility::getUnameFromId((int)$download->getVar('submitter'));
+ $down['publisher'] = XoopsUserUtility::getUnameFromId((int) $download->getVar('submitter'));
$xoopsTpl->assign('brokenreportexists', false);
$xoopsTpl->assign('file_id', $lid);
@@ -182,4 +182,4 @@
include 'footer.php';
}
break;
-}
\ No newline at end of file
+}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/category.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/category.php 2013-10-04 21:19:57 UTC (rev 12132)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/category.php 2013-10-05 12:19:51 UTC (rev 12133)
@@ -20,7 +20,8 @@
*/
defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
include_once dirname(dirname(__FILE__)) . '/include/common.php';
-class WfdownloadsCategory extends XoopsObject {
+class WfdownloadsCategory extends XoopsObject
+{
/**
* @var WfdownloadsWfdownloads
* @access public
@@ -63,6 +64,7 @@
public function __call($method, $args)
{
$arg = isset($args[0]) ? $args[0] : null;
+
return $this->getVar($method, $arg);
}
@@ -116,7 +118,7 @@
$description_textarea = new XoopsFormDhtmlTextArea(_AM_WFDOWNLOADS_FCATEGORY_DESCRIPTION, 'description', $this->getVar('description', 'e'), 15, 60);
$form->addElement($description_textarea, true);
-
+
$summary_textarea = new XoopsFormTextArea(_AM_WFDOWNLOADS_FCATEGORY_SUMMARY, 'summary', $this->getVar('summary'), 10, 60);
$form->addElement($summary_textarea);
@@ -140,7 +142,7 @@
// Added Formulize module support (2006/05/04) jpc - start
if (wfdownloads_checkModule('formulize')) {
- if(file_exists(XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php")) {
+ if (file_exists(XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php")) {
include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
$fids = allowedForms();
$fids_select = array();
@@ -176,20 +178,22 @@
$button_cancel->setExtra('onclick="history.go(-1)"');
$button_tray->addElement($button_cancel);
$form->addElement($button_tray);
+
return $form;
}
}
-class WfdownloadsCategoryHandler extends XoopsPersistableObjectHandler {
+class WfdownloadsCategoryHandler extends XoopsPersistableObjectHandler
+{
/**
* @var WfdownloadsWfdownloads
* @access public
*/
public $wfdownloads = null;
-
+
var $allCategories = false;
var $topCategories = false;
-
+
/**
* @param null|object $db
*/
@@ -199,7 +203,8 @@
$this->wfdownloads = WfdownloadsWfdownloads::getInstance();
}
- function getNicePath($cid, $root_filename = "index.php", $item_filename = "viewcat.php?op=") {
+ function getNicePath($cid, $root_filename = "index.php", $item_filename = "viewcat.php?op=")
+ {
include_once WFDOWNLOADS_ROOT_PATH . '/class/xoopstree.php';
$mytree = new WfdownloadsXoopsTree($this->table, $this->keyName, 'pid');
$pathstring = $mytree->getNicePathFromId($cid, $this->identifierName, $item_filename);
@@ -210,74 +215,82 @@
$pathstring = trim($pathstring);
$pathstring = str_replace(':', '>', $pathstring);
// $pathstring = substr($pathstring, 0, strlen($pathstring) - 13); // not needed now with fixed icms core! but required for XOOPS
-
return $pathstring;
}
/**
* Get categories that the current user has permissions for
*
- * @param bool $id_as_key
- * @param bool $as_object
+ * @param bool $id_as_key
+ * @param bool $as_object
* @return array
*/
- function getUserCategories($id_as_key = false, $as_object = true) {
+ function getUserCategories($id_as_key = false, $as_object = true)
+ {
global $xoopsUser;
$gperm_handler = xoops_gethandler('groupperm');
$groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
$allowedDownCategoriesIds = $gperm_handler->getItemIds('WFDownCatPerm', $groups, $this->wfdownloads->getModule()->mid());
+
return $this->getObjects(new Criteria('cid', '(' . implode(',', $allowedDownCategoriesIds) . ')', 'IN'), $id_as_key, $as_object);
}
/**
* Get categories that the current user has permissions for
*
- * @param bool $id_as_key
- * @param bool $as_object
+ * @param bool $id_as_key
+ * @param bool $as_object
* @return array
*/
- function getUserDownCategories($id_as_key = false, $as_object = true) {
+ function getUserDownCategories($id_as_key = false, $as_object = true)
+ {
global $xoopsUser;
$gperm_handler = xoops_gethandler('groupperm');
$groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
$allowedDownCategoriesIds = $gperm_handler->getItemIds('WFDownCatPerm', $groups, $this->wfdownloads->getModule()->mid());
+
return $this->getObjects(new Criteria('cid', '(' . implode(',', $allowedDownCategoriesIds) . ')', 'IN'), $id_as_key, $as_object);
}
- function getUserUpCategories($id_as_key = false, $as_object = true) {
+ function getUserUpCategories($id_as_key = false, $as_object = true)
+ {
global $xoopsUser;
$gperm_handler = xoops_gethandler('groupperm');
$groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : XOOPS_GROUP_ANONYMOUS;
$allowedUpCategoriesIds = $gperm_handler->getItemIds('WFUpCatPerm', $groups, $this->wfdownloads->getModule()->mid());
+
return $this->getObjects(new Criteria('cid', '(' . implode(',', $allowedUpCategoriesIds) . ')', 'IN'), $id_as_key, $as_object);
}
- function getChildCats($category) {
+ function getChildCats($category)
+ {
$allcats = $this->getObjects();
include_once XOOPS_ROOT_PATH . '/class/tree.php';
$tree = new XoopsObjectTree($allcats, $this->keyName, 'pid');
+
return $tree->getAllChild($category->getVar($this->keyName));
}
- function getAllSubcatsTopParentCid() {
+ function getAllSubcatsTopParentCid()
+ {
if (!$this->allCategories) {
$this->allCategories = $this->getObjects(null, true);
}
-
+
include_once XOOPS_ROOT_PATH . '/class/tree.php';
$tree = new XoopsObjectTree($this->allCategories, $this->keyName, 'pid');
$treeobj = $tree->getTree();
-
+
/**
* Let's create an array where key will be cid of the top categories and
* value will be an array containing all the cid of its subcategories
* If value = 0, then this topcat does not have any subcats
*/
$topcatsarray = array();
- foreach($treeobj[0]['child'] as $topcid) {
+ foreach ($treeobj[0]['child'] as $topcid) {
if (!isset($this->topCategories[$topcid])) {
$this->topCategories[$topcid] = $topcid;
}
@@ -288,13 +301,13 @@
$topcatsarray[$topcid] = $childrenids;
unset($childrenids);
}
-
+
/**
* Now we need to create another array where key will be all subcategories cid and
* value will be the cid of its top most category
*/
$allsubcats_linked_totop = array();
-
+
foreach ($topcatsarray as $topcatcid=>$subcatsarray) {
if ($subcatsarray == 0) {
$allsubcats_linked_totop[$topcatcid] = $topcatcid;
@@ -304,15 +317,15 @@
}
}
}
-
+
/**
- * Finally, let's finish by adding to this array, all the top categories which values
+ * Finally, let's finish by adding to this array, all the top categories which values
* will be their cid
*/
- foreach($this->topCategories as $topcid) {
+ foreach ($this->topCategories as $topcid) {
$allsubcats_linked_totop[$topcid] = $topcid;
}
-
+
return $allsubcats_linked_totop;
}
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/dbupdater.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/dbupdater.php 2013-10-04 21:19:57 UTC (rev 12132)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/dbupdater.php 2013-10-05 12:19:51 UTC (rev 12133)
@@ -42,8 +42,8 @@
die("XOOPS root path not defined");
}
-class WfdownloadsTable {
-
+class WfdownloadsTable
+{
/**
* @var string $_name name of the table
*/
@@ -110,6 +110,7 @@
function name()
{
global $xoopsDB;
+
return $xoopsDB->prefix($this->_name);
}
@@ -350,9 +351,11 @@
$ret = $xoopsDB->query($query);
if (! $ret) {
echo "<li class='err'>" . sprintf(_AM_WFDOWNLOADS_DB_MSG_DROP_TABLE_ERR, $this->name()) . "</li>";
+
return false;
} else {
echo "<li class='ok'>" . sprintf(_AM_WFDOWNLOADS_DB_MSG_DROP_TABLE, $this->name()) . "</li>";
+
return true;
}
}
@@ -479,6 +482,7 @@
echo "<li class='ok'>" . sprintf(_AM_WFDOWNLOADS_DB_MSG_DROPFIELD, $dropedField, $this->name()) . "</li>";
}
}
+
return $ret;
}
}
@@ -493,8 +497,8 @@
* @link http://www.smartfactory.ca The SmartFactory
*/
-class WfdownloadsDbupdater {
-
+class WfdownloadsDbupdater
+{
function WfdownloadsDbupdater()
{
@@ -516,9 +520,11 @@
$ret = $xoopsDB->query($query);
if (! $ret) {
echo "<li class='err'>$badmsg</li>";
+
return false;
} else {
echo "<li class='ok'>$goodmsg</li>";
+
return true;
}
}
@@ -542,9 +548,11 @@
$ret = $xoopsDB->query($query);
if (! $ret) {
echo "<li class='err'>" . sprintf(_AM_WFDOWNLOADS_DB_MSG_RENAME_TABLE_ERR, $from) . "</li>";
+
return false;
} else {
echo "<li class='ok'>" . sprintf(_AM_WFDOWNLOADS_DB_MSG_RENAME_TABLE, $from, $to) . "</li>";
+
return true;
}
}
@@ -595,7 +603,6 @@
$ret = $table->updateFieldsValues($table) && $ret;
}
-
// If table has droped field, alter the table
if ($table->getDropedFields()) {
$ret = $table->dropFields($table) && $ret;
@@ -608,7 +615,6 @@
echo "</ul>";
-
return $ret;
}
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-10-04 21:19:57 UTC (rev 12132)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-10-05 12:19:51 UTC (rev 12133)
@@ -20,7 +20,8 @@
*/
defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
include_once dirname(dirname(__FILE__)) . '/include/common.php';
-class WfdownloadsDownload extends XoopsObject {
+class WfdownloadsDownload extends XoopsObject
+{
/**
* @var WfdownloadsWfdownloads
* @access public
@@ -109,6 +110,7 @@
public function __call($method, $args)
{
$arg = isset($args[0]) ? $args[0] : null;
+
return $this->getVar($method, $arg);
}
@@ -120,11 +122,12 @@
if (!isset($this->_category)) {
$this->_category = $this->wfdownloads->getHandler('category')->get($this->getVar('cid'));
}
+
return $this->_category;
}
-
- function getDownloadInfo() {
+ function getDownloadInfo()
+ {
global $xoopsConfig, $xoopsUser, $myts, $xoopsDB;
xoops_load('XoopsUserUtility');
@@ -238,10 +241,10 @@
$summary = $this->getVar('summary');
if (
- ($this->wfdownloads->getConfig('autosummary') == _WFDOWNLOADS_AUTOSUMMARY_YES) ||
+ ($this->wfdownloads->getConfig('autosummary') == _WFDOWNLOADS_AUTOSUMMARY_YES) ||
($this->wfdownloads->getConfig('autosummary') == _WFDOWNLOADS_AUTOSUMMARY_IFBLANK && empty($summary))) {
// generate autosummary
- $maxSummaryLength = (int)$this->wfdownloads->getConfig('autosumlength');
+ $maxSummaryLength = (int) $this->wfdownloads->getConfig('autosumlength');
if (wfdownloads_checkModule('xlanguage')) {
global $xlanguage;
@@ -308,7 +311,7 @@
$download['is_updated'] = ($this->getVar('updated') > 0) ? _MD_WFDOWNLOADS_UPDATEDON : _MD_WFDOWNLOADS_SUBMITDATE;
if (is_object($xoopsUser) && $download['isadmin'] != true) {
- $download['useradminlink'] = ((int)($xoopsUser->getvar('uid')) == $this->getVar('submitter')) ? true : false;
+ $download['useradminlink'] = ((int) ($xoopsUser->getvar('uid')) == $this->getVar('submitter')) ? true : false;
}
$sql2 = "SELECT rated FROM " . $xoopsDB->prefix('wfdownloads_reviews') . " WHERE lid = '" . intval($download['id']) . "' AND submit = '1'";
@@ -332,13 +335,13 @@
$numrows2 = $xoopsDB->getRowsNum($results3);
$download['mirrors_num'] = ($numrows2) ? $numrows2 : 0;
+
return $download;
}
-
-
- function getForm($customArray = array()) { // $custom array added April 22, 2006 by jwe) {
+ function getForm($customArray = array()) { // $custom array added April 22, 2006 by jwe)
+ {
global $xoopsUser;
include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
@@ -375,7 +378,7 @@
}
// changed - start - March 4 2006 - jpc
- if(wfdownloads_checkModule('formulize')) {
+ if (wfdownloads_checkModule('formulize')) {
$sform->addElement(new XoopsFormHidden('cid', $this->getVar('cid', 'e')));
} else {
$categories = $this->wfdownloads->getHandler('category')->getUserUpCategories();
@@ -385,7 +388,7 @@
// changed - end - March 4 2006 - jpc
// Changed - start - April 22, 2006 - jwe
- if(count($customArray) == 0) {
+ if (count($customArray) == 0) {
$sform->addElement(new XoopsFormText(_MD_WFDOWNLOADS_HOMEPAGETITLEC, 'homepagetitle', 50, 255, $this->getVar('homepagetitle', 'e')), false);
$sform->addElement(new XoopsFormText(_MD_WFDOWNLOADS_HOMEPAGEC, 'homepage', 50, 255, $this->getVar('homepage', 'e')), false);
$sform->addElement(new XoopsFormText(_MD_WFDOWNLOADS_VERSIONC, 'version', 10, 20, $this->getVar('version', 'e')), false);
@@ -493,7 +496,7 @@
$button_submit->setExtra('onclick="this.form.elements.op.value=\'download.save\'"');
$button_tray->addElement($button_submit);
} else {
- $button_tray->addElement(new XoopsFormHidden('lid', (int)$this->getVar('lid')));
+ $button_tray->addElement(new XoopsFormHidden('lid', (int) $this->getVar('lid')));
$button_tray->addElement(new XoopsFormHidden('op', 'download.save'));
$button_submit = new XoopsFormButton('', '', _SUBMIT, 'submit');
$button_submit->setExtra('onclick="this.form.elements.op.value=\'download.save\'"');
@@ -506,7 +509,6 @@
$button_tray->addElement($button_cancel);
$sform->addElement($button_tray);
-
return $sform;
}
@@ -523,9 +525,9 @@
$sform = new XoopsThemeForm($title, "storyform", $_SERVER['REQUEST_URI']);
$sform->setExtra('enctype="multipart/form-data"');
if (!$this->isNew()) {
- $sform -> addElement(new XoopsFormLabel(_AM_WFDOWNLOADS_FILE_ID, (int)$this->getVar('lid')));
+ $sform -> addElement(new XoopsFormLabel(_AM_WFDOWNLOADS_FILE_ID, (int) $this->getVar('lid')));
}
- if ($this->getVar('ipaddress') != "") {
+ if ($this->getVar('ipaddress') != "") {
$sform->addElement(new XoopsFormLabel(_AM_WFDOWNLOADS_FILE_IP, $this->getVar('ipaddress')));
}
@@ -568,7 +570,7 @@
$sform->addElement($userfile_file, false);
// changed - start - March 4 2006 - jpc
-// if(file_exists(XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php")) {
+// if (file_exists(XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php")) {
// $sform->addElement(new XoopsFormHidden('cid', $this->getVar('cid', 'e')));
// } else {
$categories = $this->wfdownloads->getHandler('category')->getObjects();
@@ -796,7 +798,7 @@
$button_tray->addElement(new XoopsFormButton('', '', _SUBMIT, 'submit'));
} else {
$button_tray->addElement(new XoopsFormHidden('status', 2));
- $button_tray->addElement(new XoopsFormHidden('lid', (int)$this->getVar('lid')));
+ $button_tray->addElement(new XoopsFormHidden('lid', (int) $this->getVar('lid')));
$button_submit = new XoopsFormButton('', '', _SUBMIT, 'submit');
$button_submit->setExtra('onclick="this.form.elements.op.value=\'download.save\'"');
$button_tray->addElement($button_submit);
@@ -811,13 +813,13 @@
$button_tray->addElement($button_cancel);
$sform->addElement($button_tray);
+
return $sform;
}
-
-
// Added Formulize module support (2006/05/04) jpc - start
- function getCategoryForm() {
+ function getCategoryForm()
+ {
include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
include_once(XOOPS_ROOT_PATH . '/class/tree.php');
$sform = new XoopsThemeForm(_MD_WFDOWNLOADS_FFS_SUBMITCATEGORYHEAD, 'storyform', $_SERVER['REQUEST_URI']);
@@ -833,30 +835,31 @@
$button_tray->addElement(new XoopsFormHidden('lid', $this->getVar('lid', 'e')));
}
$sform->addElement($button_tray);
+
return $sform;
}
// Added Formulize module support (2006/05/04) jpc - end
-
-
/**
* Returns an array representation of the object
*
* @return array
*/
- function toArray() {
+ function toArray()
+ {
$ret = array();
$vars = $this->getVars();
foreach (array_keys($vars) as $i) {
$ret[$i] = $this->getVar($i);
}
+
return $ret;
}
}
+}
-
-
-class WfdownloadsDownloadHandler extends XoopsPersistableObjectHandler {
+class WfdownloadsDownloadHandler extends XoopsPersistableObjectHandler
+{
/**
* @var WfdownloadsWfdownloads
* @access public
@@ -875,10 +878,11 @@
/**
* Get maximum published date from a criteria
*
- * @param CriteriaElement $criteria
+ * @param CriteriaElement $criteria
* @return mixed
*/
- function getMaxPublishdate($criteria = null) {
+ function getMaxPublishdate($criteria = null)
+ {
if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
if ($criteria->groupby != "") {
$groupby = true;
@@ -898,13 +902,14 @@
}
if ($groupby == false) {
list($count) = $this->db->fetchRow($result);
+
return $count;
- }
- else {
+ } else {
$ret = array();
while (list($id, $count) = $this->db->fetchRow($result)) {
$ret[$id] = $count;
}
+
return $ret;
}
}
@@ -914,7 +919,8 @@
*
* @return CriteriaElement
*/
- function getActiveCriteria() {
+ function getActiveCriteria()
+ {
global $xoopsUser;
$gperm_handler = xoops_gethandler('groupperm');
@@ -928,16 +934,18 @@
$groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
$allowedDownCategoriesIds = $gperm_handler->getItemIds('WFDownCatPerm', $groups, $this->wfdownloads->getModule()->mid());
$criteria->add(new Criteria('cid', '(' . implode(',', $allowedDownCategoriesIds) . ')', 'IN'));
+
return $criteria;
}
/**
* Get array of active downloads with optional additional criteria
*
- * @param CriteriaCompo $crit Additional criteria
+ * @param CriteriaCompo $crit Additional criteria
* @return array
*/
- function getActiveDownloads($crit = null) {
+ function getActiveDownloads($crit = null)
+ {
if (is_object($crit)) {
$criteria = $crit;
} else {
@@ -945,47 +953,53 @@
}
$active_crit = $this->getActiveCriteria();
$criteria->add($active_crit);
+
return $this->getObjects($criteria);
}
/**
* Get count of active downloads
*
- * @param CriteriaElement $crit Additional criteria
+ * @param CriteriaElement $crit Additional criteria
* @return array/int
*/
- function getActiveCount($crit = null) {
+ function getActiveCount($crit = null)
+ {
$criteria = $this->getActiveCriteria();
if (is_object($crit)) {
$criteria->add($crit);
}
+
return $this->getCount($criteria);
}
/**
* Increment hit counter for a download
*
- * @param int $lid
+ * @param int $lid
* @return bool
*/
- function incrementHits($lid) {
- $sql = "UPDATE " . $this->table . " SET hits=hits+1 WHERE lid='" . (int)$lid . "'";
+ function incrementHits($lid)
+ {
+ $sql = "UPDATE " . $this->table . " SET hits=hits+1 WHERE lid='" . (int) $lid . "'";
+
return $this->db->queryF($sql);
}
- function delete($download, $force = false) {
+ function delete($download, $force = false)
+ {
if (parent::delete($download, $force)) {
- $criteria = new Criteria('lid', (int)$download->getVar('lid'));
+ $criteria = new Criteria('lid', (int) $download->getVar('lid'));
$this->wfdownloads->getHandler('rating')->deleteAll($criteria);
$this->wfdownloads->getHandler('mirror')->deleteAll($criteria);
$this->wfdownloads->getHandler('review')->deleteAll($criteria);
$this->wfdownloads->getHandler('report')->deleteAll($criteria);
// delete comments
- xoops_comment_delete((int)$this->wfdownloads->getModule()->mid(), (int)$download->getVar('lid'));
+ 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 (file_exists(XOOPS_ROOT_PATH . '/modules/formulize/include/functions.php') AND $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'));
@@ -995,6 +1009,7 @@
// Added Formulize module support (2006/05/04) jpc - end
return true;
}
+
return false;
}
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/ip_log.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/ip_log.php 2013-10-04 21:19:57 UTC (rev 12132)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/ip_log.php 2013-10-05 12:19:51 UTC (rev 12133)
@@ -20,7 +20,8 @@
*/
defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
include_once dirname(dirname(__FILE__)) . '/include/common.php';
-class WfdownloadsIP_Log extends XoopsObject {
+class WfdownloadsIP_Log extends XoopsObject
+{
/**
* @var WfdownloadsWfdownloads
* @access public
@@ -49,7 +50,8 @@
}
}
-class WfdownloadsIP_LogHandler extends XoopsPersistableObjectHandler {
+class WfdownloadsIP_LogHandler extends XoopsPersistableObjectHandler
+{
/**
* @var WfdownloadsWfdownloads
* @access public
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/mimetype.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/mimetype.php 2013-10-04 21:19:57 UTC (rev 12132)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/mimetype.php 2013-10-05 12:19:51 UTC (rev 12133)
@@ -31,7 +31,8 @@
*/
defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
include_once dirname(dirname(__FILE__)) . '/include/common.php';
-class WfdownloadsMimetype extends XoopsObject {
+class WfdownloadsMimetype extends XoopsObject
+{
/**
* @var WfdownloadsWfdownloads
* @access public
@@ -59,7 +60,7 @@
}
}
}
-
+
function getForm($action = false)
{
include_once(XOOPS_ROOT_PATH . '/class/xoopsformloader.php');
@@ -89,9 +90,9 @@
$muser_radio = new XoopsFormRadioYN(_AM_WFDOWNLOADS_MIME_USERF, 'mime_user', $this->getVar('mime_user', 'e'));
$form->addElement($muser_radio);
-
+
$form->addElement(new XoopsFormHidden('op', 'save'));
-
+
$button_tray = new XoopsFormElementTray('', '');
if ($this->isNew()) {
$butt_create = new XoopsFormButton('', '', _AM_WFDOWNLOADS_MIME_CREATE, 'submit');
@@ -112,17 +113,19 @@
$button_tray->addElement($butt_cancel);
}
$form->addElement($button_tray);
+
return $form;
}
}
-class WfdownloadsMimetypeHandler extends XoopsPersistableObjectHandler {
+class WfdownloadsMimetypeHandler extends XoopsPersistableObjectHandler
+{
/**
* @var WfdownloadsWfdownloads
* @access public
*/
public $wfdownloads = null;
-
+
/**
* @param null|object $db
*/
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/mirror.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/mirror.php 2013-10-04 21:19:57 UTC (rev 12132)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/mirror.php 2013-10-05 12:19:51 UTC (rev 12133)
@@ -20,7 +20,8 @@
*/
defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
include_once dirname(dirname(__FILE__)) . '/include/common.php';
-class WfdownloadsMirror extends XoopsObject {
+class WfdownloadsMirror extends XoopsObject
+{
/**
* @var WfdownloadsWfdownloads
* @access public
@@ -44,7 +45,7 @@
$this->initVar('submit', XOBJ_DTYPE_INT); // boolean
$this->initVar('date', XOBJ_DTYPE_INT);
$this->initVar('uid', XOBJ_DTYPE_INT);
-
+
if (isset($id)) {
$item = $this->wfdownloads->getHandler('item')->get($id);
foreach ($item->vars as $k => $v) {
@@ -53,9 +54,10 @@
}
}
- function getForm() {
+ function getForm()
+ {
include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
- $uid = !empty($xoopsUser) ? (int)($xoopsUser->getVar('uid')) : 0;
+ $uid = !empty($xoopsUser) ? (int) ($xoopsUser->getVar('uid')) : 0;
$sform = new XoopsThemeForm(_AM_WFDOWNLOADS_MIRROR_SNEWMNAMEDESC, 'mirrorform', $_SERVER['REQUEST_URI']);
$sform -> addElement(new XoopsFormText(_AM_WFDOWNLOADS_MIRROR_FHOMEURLTITLE, 'title', 50, 255, $this->getVar('title', 'e')), true);
@@ -79,8 +81,8 @@
$approve_checkbox -> addOption(1, " ");
$sform -> addElement($approve_checkbox);
- $sform -> addElement(new XoopsFormHidden('lid', (int)($this->getVar('lid'))));
- $sform -> addElement(new XoopsFormHidden('mirror_id', (int)($this->getVar('mirror_id'))));
+ $sform -> addElement(new XoopsFormHidden('lid', (int) ($this->getVar('lid'))));
+ $sform -> addElement(new XoopsFormHidden('mirror_id', (int) ($this->getVar('mirror_id'))));
$sform -> addElement(new XoopsFormHidden('uid', $uid));
$sform -> addElement(new XoopsFormHidden('confirm', 1));
$button_tray = new XoopsFormElementTray('', '');
@@ -108,6 +110,7 @@
$button_tray -> addElement($cancel_button);
}
$sform -> addElement($button_tray);
+
return $sform;
}
/**
@@ -115,17 +118,20 @@
*
* @return array
*/
- function toArray() {
+ function toArray()
+ {
$ret = array();
$vars = $this->getVars();
foreach (array_keys($vars) as $i) {
$ret[$i] = $this->getVar($i);
}
+
return $ret;
}
}
-class WfdownloadsMirrorHandler extends XoopsPersistableObjectHandler {
+class WfdownloadsMirrorHandler extends XoopsPersistableObjectHandler
+{
/**
* @var WfdownloadsWfdownloads
* @access public
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/modification.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/modification.php 2013-10-04 21:19:57 UTC (rev 12132)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/modification.php 2013-10-05 12:19:51 UTC (rev 12133)
@@ -22,8 +22,8 @@
include_once dirname(dirname(__FILE__)) . '/include/common.php';
require_once XOOPS_ROOT_PATH . '/modules/wfdownloads/class/download.php';
-class WfdownloadsModification extends WfdownloadsDownload {
-
+class WfdownloadsModification extends WfdownloadsDownload
+{
/**
* @param int|null $id
*/
@@ -37,7 +37,7 @@
//Obsolete
unset($this->vars['ipaddress']);
unset($this->vars['notifypub']);
-
+
if (isset($id)) {
$item = $this->wfdownloads->getHandler('item')->get($id);
foreach ($item->vars as $k => $v) {
@@ -47,7 +47,8 @@
}
}
-class WfdownloadsModificationHandler extends XoopsPersistableObjectHandler {
+class WfdownloadsModificationHandler extends XoopsPersistableObjectHandler
+{
/**
* @var WfdownloadsWfdownloads
* @access public
@@ -63,17 +64,19 @@
$this->wfdownloads = WfdownloadsWfdownloads::getInstance();
}
- function approveModification($requestid) {
+ function approveModification($requestid)
+ {
$sql = "UPDATE " . $this->table . " m, ". $wfdownloads->getHandler('download')->table . " d";
$sql.= " SET d.cid = 'm.cid', d.title = 'm.title',
d.url = 'm.url', d.filename = 'm.filename', d.filetype = 'm.filetype', d.mirror = 'm.mirror', d.license = 'm.license', d.features = 'm.features', d.homepage = 'm.homepage', d.version = 'm.version', d.size = 'm.size', d.platform = 'm.platform',
d.screenshot = 'm.screenshot', d.screenshot2 = 'm.screenshot2', d.screenshot3 = 'm.screenshot3', d.screenshot4 = 'm.screenshot4', d.publisher = 'm.publisher', d.status = '2', d.price = 'm.price', d.requirements = 'm.requirements',
d.homepagetitle = 'm.homepagetitle', d.limitations = 'm.limitations', d.versiontypes = 'm.versiontypes', d.dhistory = 'm.dhistory', d.updated = 'm.updated',
d.summary = 'm.summary', d.description = 'm.description'";
- $sql = " WHERE d.lid = 'm.lid' AND m.requestid='" . (int)$requestid . "'";
+ $sql = " WHERE d.lid = 'm.lid' AND m.requestid='" . (int) $requestid . "'";
if ($this->db->query($sql)) {
- return $this->deleteAll(new Criteria('requestid', (int)$requestid));
+ return $this->deleteAll(new Criteria('requestid', (int) $requestid));
}
+
return false;
}
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/object.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/object.php 2013-10-04 21:19:57 UTC (rev 12132)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/object.php 2013-10-05 12:19:51 UTC (rev 12133)
@@ -28,8 +28,8 @@
* @package Kernel
*/
-class XoopsPersistableObjectHandler extends XoopsObjectHandler {
-
+class XoopsPersistableObjectHandler extends XoopsObjectHandler
+{
/**#@+
* Information about the class, the handler is managing
*
@@ -50,7 +50,8 @@
*
* @return void
*/
- function XoopsPersistableObjectHandler(&$db, $tablename, $classname, $keyname, $idenfierName = false) {
+ function XoopsPersistableObjectHandler(&$db, $tablename, $classname, $keyname, $idenfierName = false)
+ {
$this->XoopsObjectHandler($db);
$this->table = $db->prefix($tablename);
$this->keyName = $keyname;
@@ -72,14 +73,15 @@
if ($isNew === true) {
$obj->setNew();
}
+
return $obj;
}
/**
* retrieve an object
*
- * @param mixed $id ID of the object - or array of ids for joint keys. Joint keys MUST be given in the same order as in the constructor
- * @param bool $as_object whether to return an object or an array
+ * @param mixed $id ID of the object - or array of ids for joint keys. Joint keys MUST be given in the same order as in the constructor
+ * @param bool $as_object whether to return an object or an array
* @return mixed reference to the object, false if failed
*/
function &get($id, $as_object = true) {
@@ -95,17 +97,19 @@
$obj_array = $this->getObjects($criteria, false, $as_object);
if (count($obj_array) != 1) {
$obj = $this->create();
+
return $obj;
}
+
return $obj_array[0];
}
/**
* retrieve objects from the database
*
- * @param object $criteria {@link CriteriaElement} conditions to be met
- * @param bool $id_as_key use the ID as key for the array?
- * @param bool $as_object return an array of objects?
+ * @param object $criteria {@link CriteriaElement} conditions to be met
+ * @param bool $id_as_key use the ID as key for the array?
+ * @param bool $as_object return an array of objects?
*
* @return array
*/
@@ -133,13 +137,14 @@
/**
* Convert a database resultset to a returnable array
*
- * @param object $result database resultset
- * @param bool $id_as_key - should NOT be used with joint keys
- * @param bool $as_object
+ * @param object $result database resultset
+ * @param bool $id_as_key - should NOT be used with joint keys
+ * @param bool $as_object
*
* @return array
*/
- function convertResultSet($result, $id_as_key = false, $as_object = true) {
+ function convertResultSet($result, $id_as_key = false, $as_object = true)
+ {
$ret = array();
while ($myrow = $this->db->fetchArray($result)) {
$obj =& $this->create(false);
@@ -182,7 +187,8 @@
*
* @return array
*/
- function getList($criteria = null, $limit = 0, $start = 0) {
+ function getList($criteria = null, $limit = 0, $start = 0)
+ {
$ret = array();
if ($criteria == null) {
$criteria = new CriteriaCompo();
@@ -193,8 +199,8 @@
}
$sql = 'SELECT '.$this->keyName;
- if(!empty($this->identifierName)){
- $sql .= ', '.$this->identifierName;
+ if (!empty($this->identifierName)) {
+ $sql .= ', '.$this->identifierName;
}
$sql .= ' FROM '.$this->table;
if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
@@ -215,6 +221,7 @@
//identifiers should be textboxes, so sanitize them like that
$ret[$myrow[$this->keyName]] = empty($this->identifierName)?1:$myts->htmlSpecialChars($myrow[$this->identifierName]);
}
+
return $ret;
}
@@ -222,8 +229,8 @@
* count objects matching a condition
*
- * @param object $criteria {@link CriteriaElement} to match
- * @return int count of objects
+ * @param object $criteria {@link CriteriaElement} to match
+ * @return int count of objects
*/
function getCount($criteria = null)
{
@@ -248,12 +255,14 @@
}
if ($groupby == false) {
list($count) = $this->db->fetchRow($result);
+
return $count;
} else {
$ret = array();
while (list($id, $count) = $this->db->fetchRow($result)) {
$ret[$id] = $count;
}
+
return $ret;
}
}
@@ -261,9 +270,9 @@
/**
* delete an object from the database
*
- * @param object $obj reference to the object to delete
- * @param bool $force
- * @return bool false if failed.
+ * @param object $obj reference to the object to delete
+ * @param bool $force
+ * @return bool false if failed.
*/
function delete(&$obj, $force = false)
{
@@ -285,16 +294,17 @@
if (!$result) {
return false;
}
+
return true;
}
/**
* insert a new object in the database
*
- * @param object $obj reference to the object
- * @param bool $force whether to force the query execution despite security settings
- * @param bool $checkObject check if the object is dirty and clean the attributes
- * @return bool false if failed, true if already present and unchanged or successful
+ * @param object $obj reference to the object
+ * @param bool $force whether to force the query execution despite security settings
+ * @param bool $checkObject check if the object is dirty and clean the attributes
+ * @return bool false if failed, true if already present and unchanged or successful
*/
function insert(&$obj, $force = false, $checkObject = true)
@@ -302,6 +312,7 @@
if ($checkObject != false) {
if (!is_object($obj)) {
var_dump($obj);
+
return false;
}
/**
@@ -309,10 +320,12 @@
*/
if (!is_a($obj, $this->className)) {
$obj->setErrors(get_class($obj)." Differs from ".$this->className);
+
return false;
}
if (!$obj->isDirty()) {
$obj->setErrors("Not dirty"); //will usually not be outputted as errors are not displayed when the method returns true, but it can be helpful when troubleshooting code - Mith
+
return true;
}
}
@@ -372,17 +385,18 @@
if ($obj->isNew() && !is_array($this->keyName)) {
$obj->assignVar($this->keyName, $this->db->getInsertId());
}
+
return true;
}
/**
* Change a value for objects with a certain criteria
*
- * @param string $fieldname Name of the field
- * @param string $fieldvalue Value to write
- * @param object $criteria {@link CriteriaElement}
+ * @param string $fieldname Name of the field
+ * @param string $fieldvalue Value to write
+ * @param object $criteria {@link CriteriaElement}
*
- * @return bool
+ * @return bool
**/
function updateAll($fieldname, $fieldvalue, $criteria = null, $force = false)
{
@@ -406,13 +420,14 @@
if (!$result) {
return false;
}
+
return true;
}
/**
* delete all objects meeting the conditions
*
- * @param object $criteria {@link CriteriaElement} with conditions to meet
+ * @param object $criteria {@link CriteriaElement} with conditions to meet
* @return bool
*/
@@ -425,8 +440,10 @@
return false;
}
$rows = $this->db->getAffectedRows();
+
return $rows > 0 ? $rows : true;
}
+
return false;
}
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/rating.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/rating.php 2013-10-04 21:19:57 UTC (rev 12132)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/rating.php 2013-10-05 12:19:51 UTC (rev 12133)
@@ -20,7 +20,8 @@
*/
defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
include_once dirname(dirname(__FILE__)) . '/include/common.php';
-class WfdownloadsRating extends XoopsObject {
+class WfdownloadsRating extends XoopsObject
+{
/**
* @var WfdownloadsWfdownloads
* @access public
@@ -40,7 +41,7 @@
$this->initVar('rating', XOBJ_DTYPE_INT);
$this->initVar('ratinghostname', XOBJ_DTYPE_TXTBOX);
$this->initVar('ratingtimestamp', XOBJ_DTYPE_INT);
-
+
if (isset($id)) {
$item = $this->wfdownloads->getHandler('item')->get($id);
foreach ($item->vars as $k => $v) {
@@ -50,7 +51,8 @@
}
}
-class WfdownloadsRatingHandler extends XoopsPersistableObjectHandler {
+class WfdownloadsRatingHandler extends XoopsPersistableObjectHandler
+{
/**
* @var WfdownloadsWfdownloads
* @access public
@@ -69,10 +71,11 @@
/**
* Get average ratings of users matching a condition
*
- * @param object $criteria {@link CriteriaElement} to match
+ * @param object $criteria {@link CriteriaElement} to match
* @return array/int
*/
- function getUserAverage($criteria = null) {
+ function getUserAverage($criteria = null)
+ {
$groupby = false;
$field = '';
if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
@@ -94,6 +97,7 @@
}
if ($groupby == false) {
list($average, $count) = $this->db->fetchRow($result);
+
return array(
'avg' => $average,
'count' => $count
@@ -106,6 +110,7 @@
'count' => $count
);
}
+
return $ret;
}
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/report.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/report.php 2013-10-04 21:19:57 UTC (rev 12132)
+++ XoopsModules/wfdownloads/trunk/wfdow...
[truncated message content] |
