Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[11981] XoopsModules/wfdownloads/trunk/wfdownloads
|
From: <luc...@us...> - 2013-08-25 23:21:58
|
Revision: 11981
http://sourceforge.net/p/xoops/svn/11981
Author: luciorota
Date: 2013-08-25 23:21:52 +0000 (Sun, 25 Aug 2013)
Log Message:
-----------
code optimization
breadcrumb class (could be a standard class)
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/ratings.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php
XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top.php
XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top_by_cat.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/common.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/mirror.php
XoopsModules/wfdownloads/trunk/wfdownloads/newlist.php
XoopsModules/wfdownloads/trunk/wfdownloads/review.php
XoopsModules/wfdownloads/trunk/wfdownloads/rss.php
XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php
XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Added Paths:
-----------
XoopsModules/wfdownloads/trunk/wfdownloads/class/breadcrumb.php
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_common_breadcrumb.html
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2013-08-25 22:26:28 UTC (rev 11980)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2013-08-25 23:21:52 UTC (rev 11981)
@@ -161,8 +161,8 @@
if ($totalDownloadsCount > 0) {
// Published Downloads
$criteria = new CriteriaCompo();
- $criteria->setSort("published");
- $criteria->setOrder("DESC");
+ $criteria->setSort('published');
+ $criteria->setOrder('DESC');
$criteria->setStart($start_published);
$criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
$publishedDownloads = $wfdownloads->getHandler('download')->getActiveDownloads($criteria);
@@ -184,7 +184,7 @@
// New Downloads
$criteria = new CriteriaCompo();
- $criteria->add(new Criteria("published", 0));
+ $criteria->add(new Criteria('published', 0));
$criteria->setStart($start_new);
$criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
$newDownloads = $wfdownloads->getHandler('download')->getObjects($criteria);
@@ -212,8 +212,8 @@
// Autopublished Downloads
$criteria = new CriteriaCompo();
- $criteria->add(new Criteria("published", time(), ">"));
- $criteria->setSort("published");
+ $criteria->add(new Criteria('published', time(), ">"));
+ $criteria->setSort('published');
$criteria->setOrder("ASC");
$criteria->setStart($start_autopublished);
$criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
@@ -259,7 +259,7 @@
// Offline downloads
$criteria = new Criteria("offline", 1);
- $criteria->setSort("published");
+ $criteria->setSort('published');
$criteria->setOrder("ASC");
$criteria->setStart($start_offline);
$criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
@@ -372,14 +372,14 @@
$reg_criteria->add(new Criteria("ratinguser", 0, ">"));
$votesreg = $wfdownloads->getHandler('rating')->getCount($reg_criteria);
$reg_criteria->setSort("ratingtimestamp");
- $reg_criteria->setOrder("DESC");
+ $reg_criteria->setOrder('DESC');
$regvotes = $wfdownloads->getHandler('rating')->getObjects($reg_criteria);
$anon_criteria = new CriteriaCompo(new Criteria('lid', $lid));
$anon_criteria->add(new Criteria("ratinguser", 0, "="));
$votesanon = $wfdownloads->getHandler('rating')->getCount($anon_criteria);
$anon_criteria->setSort("ratingtimestamp");
- $anon_criteria->setOrder("DESC");
+ $anon_criteria->setOrder('DESC');
echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFD_VOTE_RATINGINFOMATION . "</legend>\n";
echo "<div style='padding: 8px;'><b>" . _AM_WFD_VOTE_TOTALVOTES . "</b>{$totalvotes}<br /><br />\n";
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php 2013-08-25 22:26:28 UTC (rev 11980)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php 2013-08-25 23:21:52 UTC (rev 11981)
@@ -33,8 +33,8 @@
$totalmodrequests = $wfdownloads->getHandler('modification')->getCount();
$newreviews = $wfdownloads->getHandler('review')->getCount();
$newmirrors = $wfdownloads->getHandler('mirror')->getCount();
-$totalnewdownloads = $wfdownloads->getHandler('download')->getCount(new Criteria("published", 0));
-$totaldownloads = $wfdownloads->getHandler('download')->getCount(new Criteria("published", 0, ">"));
+$totalnewdownloads = $wfdownloads->getHandler('download')->getCount(new Criteria('published', 0));
+$totaldownloads = $wfdownloads->getHandler('download')->getCount(new Criteria('published', 0, ">"));
$indexAdmin->addInfoBox(_AM_WFD_MINDEX_DOWNSUMMARY);
// Categories
@@ -120,6 +120,13 @@
$indexAdmin->addConfigBoxLine('');
$redirectFile = $_SERVER['PHP_SELF'];
+if (!wfdownload_checkModule('formulize'))
+ $indexAdmin->addConfigBoxLine(_AM_WFD_FORMULIZE_NOT_AVAILABLE);
+else
+ $indexAdmin->addConfigBoxLine(_AM_WFD_FORMULIZE_AVAILABLE);
+
+$indexAdmin->addConfigBoxLine('');
+
$path = $wfdownloads->getConfig('uploaddir') . '/';
$indexAdmin->addConfigBoxLine(DirectoryChecker::getDirectoryStatus($path, 0777, $redirectFile));
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php 2013-08-25 22:26:28 UTC (rev 11980)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php 2013-08-25 23:21:52 UTC (rev 11981)
@@ -108,7 +108,7 @@
$criteria_waiting = new Criteria("submit", 0); // false
$waiting_count = $wfdownloads->getHandler('mirror')->getCount($criteria_waiting);
$criteria_waiting->setSort("date");
- $criteria_waiting->setOrder("DESC");
+ $criteria_waiting->setOrder('DESC');
$criteria_waiting->setLimit($wfdownloads->getConfig('admin_perpage'));
$criteria_waiting->setStart($start_waiting);
$mirrors_waiting = $wfdownloads->getHandler('mirror')->getObjects($criteria_waiting);
@@ -116,7 +116,7 @@
$criteria_published = new Criteria("submit", 1); // true
$published_count = $wfdownloads->getHandler('mirror')->getCount($criteria_published);
$criteria_published->setSort("date");
- $criteria_published->setOrder("DESC");
+ $criteria_published->setOrder('DESC');
$criteria_published->setLimit($wfdownloads->getConfig('admin_perpage'));
$criteria_published->setStart($start_published);
$mirrors_published = $wfdownloads->getHandler('mirror')->getObjects($criteria_published);
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/ratings.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/ratings.php 2013-08-25 22:26:28 UTC (rev 11980)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/ratings.php 2013-08-25 23:21:52 UTC (rev 11981)
@@ -41,7 +41,7 @@
$votes = $wfdownloads->getHandler('rating')->getCount($criteria);
$ratings_count = $wfdownloads->getHandler('rating')->getCount($criteria);
$criteria->setSort('ratingtimestamp');
- $criteria->setOrder("DESC");
+ $criteria->setOrder('DESC');
$criteria->setStart($start);;
$criteria->setLimit(20);
$ratings = $wfdownloads->getHandler('rating')->getObjects($criteria);
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php 2013-08-25 22:26:28 UTC (rev 11980)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php 2013-08-25 23:21:52 UTC (rev 11981)
@@ -279,7 +279,7 @@
$criteria = new CriteriaCompo();
$reports_count = $wfdownloads->getHandler('report')->getCount();
$criteria->setSort("date");
- $criteria->setOrder("DESC");
+ $criteria->setOrder('DESC');
$criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
$criteria->setStart($start_report);
$reports = $wfdownloads->getHandler('report')->getObjects($criteria);
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php 2013-08-25 22:26:28 UTC (rev 11980)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php 2013-08-25 23:21:52 UTC (rev 11981)
@@ -104,7 +104,7 @@
$criteria_waiting = new Criteria("submit", 0); // false
$waiting_count = $wfdownloads->getHandler('review')->getCount();
$criteria_waiting->setSort("date");
- $criteria_waiting->setOrder("DESC");
+ $criteria_waiting->setOrder('DESC');
$criteria_waiting->setLimit($wfdownloads->getConfig('admin_perpage'));
$criteria_waiting->setStart($start_waiting);
$reviews_waiting = $wfdownloads->getHandler('review')->getObjects($criteria_waiting);
@@ -112,7 +112,7 @@
$criteria_published = new Criteria("submit", 1); // true
$published_count = $wfdownloads->getHandler('review')->getCount();
$criteria_published->setSort("date");
- $criteria_published->setOrder("DESC");
+ $criteria_published->setOrder('DESC');
$criteria_published->setLimit($wfdownloads->getConfig('admin_perpage'));
$criteria_published->setStart($start_published);
$reviews_published = $wfdownloads->getHandler('review')->getObjects($criteria_published);
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top.php 2013-08-25 22:26:28 UTC (rev 11980)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top.php 2013-08-25 23:21:52 UTC (rev 11981)
@@ -46,13 +46,13 @@
$wfModule_config = $config_handler->getConfigsByCat(0, $wfModule_mid);
$groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
- $allowed_cats = $gperm_handler->getItemIds("WFDownCatPerm", $groups, $wfModule_mid);
+ $allowed_cats = $gperm_handler->getItemIds('WFDownCatPerm', $groups, $wfModule_mid);
// get downloads
$criteria = new Criteria("cid", implode(',', $allowed_cats), "IN");
$criteria = new CriteriaCompo(new Criteria('offline', 0)); // false
$criteria->setSort($options[0]);
- $criteria->setOrder("DESC");
+ $criteria->setOrder('DESC');
$criteria->setLimit($options[1]);
$downloads = $download_handler->getObjects($criteria);
@@ -64,7 +64,7 @@
$download['title'] = xoops_substr($download['title'], 0, ($options[2] -1));
$download['id'] = (int)$download['lid'];
- if ($options[0] == "published") {
+ if ($options[0] == 'published') {
$download['date'] = formatTimestamp($download['published'], $wfModule_config['dateformat']);
} else {
$download['date'] = formatTimestamp($download['date'], $wfModule_config['dateformat']);
@@ -79,7 +79,7 @@
{
$form = "" . _MB_WFD_DISP . " ";
$form .= "<input type='hidden' name='options[]' value='";
- if ($options[0] == "published") {
+ if ($options[0] == 'published') {
$form .= "published'";
} else {
$form .= "hits'";
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top_by_cat.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top_by_cat.php 2013-08-25 22:26:28 UTC (rev 11980)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top_by_cat.php 2013-08-25 23:21:52 UTC (rev 11981)
@@ -46,14 +46,14 @@
$wfModule_config = $config_handler->getConfigsByCat(0, $wfModule_mid);
$groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
- $allowed_cats = $gperm_handler->getItemIds("WFDownCatPerm", $groups, $wfModule_mid);
+ $allowed_cats = $gperm_handler->getItemIds('WFDownCatPerm', $groups, $wfModule_mid);
// get downloads
$criteria = new CriteriaCompo();
$criteria->add(new Criteria("cid", '(' . implode(',', $allowed_cats) . ')', "IN"));
$criteria->add(new Criteria('offline', 0)); // false
$criteria->setSort('date');
- $criteria->setOrder("DESC");
+ $criteria->setOrder('DESC');
$criteria->setLimit($options[1]);
$downloads = $download_handler->getObjects($criteria);
@@ -65,7 +65,7 @@
$download['title'] = xoops_substr($download['title'], 0, ($options[2] -1));
$download['id'] = (int)($download['lid']);
- if ($options[0] == "published") {
+ if ($options[0] == 'published') {
$download['date'] = formatTimestamp($download['published'], $wfModule_config['dateformat']);
}
$download['dirname'] = $wfModule->dirname();
@@ -90,7 +90,7 @@
{
$form = "" . _MB_WFD_DISP . " ";
$form .= "<input type='hidden' name='options[]' value='";
- if ($options[0] == "published") {
+ if ($options[0] == 'published') {
$form .= "published'";
} else {
$form .= "hits'";
Added: XoopsModules/wfdownloads/trunk/wfdownloads/class/breadcrumb.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/breadcrumb.php (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/breadcrumb.php 2013-08-25 23:21:52 UTC (rev 11981)
@@ -0,0 +1,70 @@
+<?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.
+ */
+/**
+ * WfdownloadsBreadcrumb Class
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author lucio <luc...@gm...>
+ * @package Wfdownloads
+ * @since 3.23
+ * @version $Id:$
+ *
+ * Example:
+ * $breadcrumb = new WfdownloadsBreadcrumb();
+ * $breadcrumb->addLink( 'bread 1', 'index1.php' );
+ * $breadcrumb->addLink( 'bread 2', '' );
+ * $breadcrumb->addLink( 'bread 3', 'index3.php' );
+ * echo $breadcrumb->render();
+ */
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+
+class WfdownloadsBreadcrumb
+{
+ var $dirname;
+ var $_bread = array();
+
+ function __construct()
+ {
+ $this->dirname = basename(dirname(dirname(__FILE__)));
+ }
+
+ /**
+ * Add link to breadcrumb
+ *
+ */
+ function addLink( $title='', $link='' )
+ {
+ $this->_bread[] = array(
+ 'link' => $link,
+ 'title' => $title
+ );
+ }
+
+ /**
+ * Render Wfdownloads BreadCrumb
+ *
+ */
+ function render()
+ {
+ if ( !isset($GLOBALS['xoTheme']) || !is_object($GLOBALS['xoTheme']) ) {
+ include_once $GLOBALS['xoops']->path( "/class/theme.php" );
+ $GLOBALS['xoTheme'] = new xos_opal_Theme();
+ }
+
+ require_once $GLOBALS['xoops']->path('class/template.php');
+ $breadcrumbTpl = new XoopsTpl();
+ $breadcrumbTpl->assign('breadcrumb', $this->_bread);
+ $html = $breadcrumbTpl->fetch("db:" . $this->dirname . "_common_breadcrumb.html");
+ unset($breadcrumbTpl);
+ return $html;
+ }
+}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-08-25 22:26:28 UTC (rev 11980)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-08-25 23:21:52 UTC (rev 11981)
@@ -58,9 +58,9 @@
$this->initVar('limitations', XOBJ_DTYPE_TXTBOX, '');
$this->initVar('versiontypes', XOBJ_DTYPE_TXTBOX, '');
$this->initVar('dhistory', XOBJ_DTYPE_TXTAREA, '');
- $this->initVar('published', XOBJ_DTYPE_INT, 0);
+ $this->initVar('published', XOBJ_DTYPE_INT, 0); // published time or 0
$this->initVar('expired', XOBJ_DTYPE_INT, 0);
- $this->initVar('updated', XOBJ_DTYPE_INT, 0);
+ $this->initVar('updated', XOBJ_DTYPE_INT, 0); // uploaded time or 0
$this->initVar('offline', XOBJ_DTYPE_INT, 0);
$this->initVar('summary', XOBJ_DTYPE_TXTAREA, '');
$this->initVar('description', XOBJ_DTYPE_TXTAREA, '');
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/include/common.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/common.php 2013-08-25 22:26:28 UTC (rev 11980)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/common.php 2013-08-25 23:21:52 UTC (rev 11981)
@@ -37,6 +37,7 @@
include_once WFDOWNLOADS_ROOT_PATH . '/class/session.php';
include_once WFDOWNLOADS_ROOT_PATH . '/class/wfdownloads.php';
include_once WFDOWNLOADS_ROOT_PATH . '/class/request.php';
+include_once WFDOWNLOADS_ROOT_PATH . '/class/breadcrumb.php';
$debug = false;
$wfdownloads = WfdownloadsWfdownloads::getInstance($debug);
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php 2013-08-25 22:26:28 UTC (rev 11980)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php 2013-08-25 23:21:52 UTC (rev 11981)
@@ -881,7 +881,7 @@
$groups = (is_object($xoopsUser)) ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
$gperm_handler = & xoops_gethandler('groupperm');
- $allowed_cats = $gperm_handler->getItemIds("WFDownCatPerm", $groups, $wfdownloads->getModule()->mid());
+ $allowed_cats = $gperm_handler->getItemIds('WFDownCatPerm', $groups, $wfdownloads->getModule()->mid());
return count($allowed_cats);
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/include/module.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/module.php 2013-08-25 22:26:28 UTC (rev 11980)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/module.php 2013-08-25 23:21:52 UTC (rev 11981)
@@ -232,7 +232,7 @@
"limitations" => array("Type" => "varchar(255) NOT NULL default '30 day trial'", "Default" => true),
"versiontypes" => array("Type" => "varchar(255) NOT NULL default 'None'", "Default" => true),
"dhistory" => array("Type" => "text NOT NULL", "Default" => false),
- "published" => array("Type" => "int(11) NOT NULL default '1089662528'", "Default" => true),
+ 'published' => array("Type" => "int(11) NOT NULL default '1089662528'", "Default" => true),
"expired" => array("Type" => "int(10) NOT NULL default '0'", "Default" => true),
"updated" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
"offline" => array("Type" => "tinyint(1) NOT NULL default '0'", "Default" => true),
@@ -292,7 +292,7 @@
"limitations" => array("Type" => "varchar(255) NOT NULL default '30 day trial'", "Default" => true),
"versiontypes" => array("Type" => "varchar(255) NOT NULL default 'None'", "Default" => true),
"dhistory" => array("Type" => "text NOT NULL", "Default" => false),
- "published" => array("Type" => "int(10) NOT NULL default '0'", "Default" => true),
+ 'published' => array("Type" => "int(10) NOT NULL default '0'", "Default" => true),
"expired" => array("Type" => "int(10) NOT NULL default '0'", "Default" => true),
"updated" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
"offline" => array("Type" => "tinyint(1) NOT NULL default '0'", "Default" => true),
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/include/search.inc.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/search.inc.php 2013-08-25 22:26:28 UTC (rev 11980)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/search.inc.php 2013-08-25 23:21:52 UTC (rev 11981)
@@ -31,7 +31,7 @@
$groups = $xoopsUser ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
$gperm_handler = xoops_gethandler('groupperm');
- $allowed_cats = $gperm_handler->getItemIds("WFDownCatPerm", $groups, $wfModule->mid());
+ $allowed_cats = $gperm_handler->getItemIds('WFDownCatPerm', $groups, $wfModule->mid());
$criteria = new CriteriaCompo(new Criteria("cid", "(" . implode(',', $allowed_cats) . ")", "IN"));
if ($userid != 0) {
@@ -40,8 +40,8 @@
// changed and added - start - April 23, 2006 - jwe
// moved these up here since we need to complete the $criteria object a little sooner now
- $criteria->setSort("published");
- $criteria->setOrder("DESC");
+ $criteria->setSort('published');
+ $criteria->setOrder('DESC');
// because count() returns 1 even if a supplied variable
// is not an array, we must check if $querryarray is really an array
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/index.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/index.php 2013-08-25 22:26:28 UTC (rev 11980)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/index.php 2013-08-25 23:21:52 UTC (rev 11981)
@@ -33,6 +33,8 @@
$categories = $wfdownloads->getHandler('category')->getObjects($cat_criteria);
unset($cat_criteria);
+
+
$mytree = new XoopsObjectTree($categories, "cid", "pid");
// Begin Main page Heading etc
@@ -61,7 +63,7 @@
$groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
-$allowedCategoriesIds = $gperm_handler->getItemIds("WFDownCatPerm", $groups, $wfdownloads->getModule()->mid());
+$allowedCategoriesIds = $gperm_handler->getItemIds('WFDownCatPerm', $groups, $wfdownloads->getModule()->mid());
$listings = wfd_getTotalItems(0, $allowedCategoriesIds);
// Get total amount of categories
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-08-25 22:26:28 UTC (rev 11980)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-08-25 23:21:52 UTC (rev 11981)
@@ -588,6 +588,9 @@
define("_AM_WFD_BROKEN_REPORTS","Brokens reports");
define("_AM_WFD_MODIFICATIONS","Modifications");
+define("_AM_WFD_FORMULIZE_AVAILABLE","Formulize Module active. Custom forms are supported.");
+define("_AM_WFD_FORMULIZE_NOT_AVILABLE","Formulize Module not present or not installed or not active. Custom Forms are not supported.");
+
define("_AM_WFD_PERM_NOTE","Note");
// admin/import.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php 2013-08-25 22:26:28 UTC (rev 11980)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php 2013-08-25 23:21:52 UTC (rev 11981)
@@ -25,7 +25,7 @@
// Check permissions
$groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
-if (!$gperm_handler->checkRight("WFDownCatPerm", $cid, $groups, $wfdownloads->getModule()->mid())) {
+if (!$gperm_handler->checkRight('WFDownCatPerm', $cid, $groups, $wfdownloads->getModule()->mid())) {
redirect_header('index.php', 3, _NOPERM);
}
if ($wfdownloads->getConfig('enable_mirrors') == false && ((is_object($xoopsUser) && !$xoopsUser->isAdmin()) || !is_object($xoopsUser))) {
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/newlist.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/newlist.php 2013-08-25 22:26:28 UTC (rev 11980)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/newlist.php 2013-08-25 23:21:52 UTC (rev 11981)
@@ -36,14 +36,14 @@
$xoopsTpl->assign('catarray', $catArray);
// Get number of downloads...
-$allowedCategories = $gperm_handler->getItemIds("WFDownCatPerm", $groups, $wfdownloads->getModule()->mid());
+$allowedCategories = $gperm_handler->getItemIds('WFDownCatPerm', $groups, $wfdownloads->getModule()->mid());
// ... in the last week
$oneWeekAgo = strtotime("-1 week"); //$oneWeekAgo = time() - 3600*24*7; //@TODO: Change to strtotime (TODAY-1week);
-$criteria = new Criteria("published", $oneWeekAgo, ">=");
+$criteria = new Criteria('published', $oneWeekAgo, ">=");
$allWeekDownloads = $wfdownloads->getHandler('download')->getActiveCount($criteria);
// ... in the last month
$oneMonthAgo = strtotime("-1 month"); //$one_month_ago = time() - 3600*24*7; //@TODO: Change to strtotime (TODAY-1month);
-$criteria = new Criteria("published", $oneMonthAgo, ">=");
+$criteria = new Criteria('published', $oneMonthAgo, ">=");
$allMonthDownloads = $wfdownloads->getHandler('download')->getActiveCount($criteria);
$xoopsTpl->assign('allweekdownloads', $allWeekDownloads);
$xoopsTpl->assign('allmonthdownloads', $allMonthDownloads);
@@ -56,11 +56,11 @@
if(in_array($days, $days_limit)) {
$xoopsTpl->assign('newdownloadshowdays', $days);
$downloadshowdays = time() - (3600 * 24 * $days);
- $criteria->add(new Criteria("published", $downloadshowdays, '>='), 'AND');
+ $criteria->add(new Criteria('published', $downloadshowdays, '>='), 'AND');
}
}
-$criteria->setSort("published");
-$criteria->setOrder("DESC");
+$criteria->setSort('published');
+$criteria->setOrder('DESC');
$criteria->setLimit($wfdownloads->getConfig('perpage'));
$criteria->setStart(0);
$downloads = $wfdownloads->getHandler('download')->getActiveDownloads($criteria);
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/review.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/review.php 2013-08-25 22:26:28 UTC (rev 11980)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/review.php 2013-08-25 23:21:52 UTC (rev 11981)
@@ -25,7 +25,7 @@
// Check permissions
$groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
-if (!$gperm_handler->checkRight("WFDownCatPerm", $cid, $groups, $wfdownloads->getModule()->mid())) {
+if (!$gperm_handler->checkRight('WFDownCatPerm', $cid, $groups, $wfdownloads->getModule()->mid())) {
redirect_header('index.php',3, _NOPERM);
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/rss.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/rss.php 2013-08-25 22:26:28 UTC (rev 11980)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/rss.php 2013-08-25 23:21:52 UTC (rev 11981)
@@ -38,9 +38,9 @@
$case = "all";
$category = $wfdownloads->getHandler('category')->get(intval($_REQUEST['cid']));
-$groups = (is_object($xoopsUser)) ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
+$groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
$gperm_handler = &xoops_gethandler('groupperm');
-$allowed_cats = $gperm_handler->getItemIds("WFDownCatPerm", $groups, $wfdownloads->getModule()->mid());
+$allowed_cats = $gperm_handler->getItemIds('WFDownCatPerm', $groups, $wfdownloads->getModule()->mid());
if (!$category->isNew()) {
if (!in_array($category->getVar('cid'), $allowed_cats)) {
@@ -57,20 +57,20 @@
break;
case "category":
- $cache_prefix = 'wfd|catfeed|' . $feed_type. '|'.intval($category->getVar('cid'));
+ $cache_prefix = 'wfd|catfeed|' . $feed_type. '|' . (int)$category->getVar('cid');
break;
}
$xoopsTpl->caching = true;
-$xoopsTpl->cache_lifetime = $xoopsConfig['module_cache'][intval($wfdownloads->getModule()->mid())];
-if( ! $xoopsTpl->is_cached('db:'.$xoopsOption['template_main'], $cache_prefix) ) {
+$xoopsTpl->cache_lifetime = $xoopsConfig['module_cache'][(int)$wfdownloads->getModule()->mid()];
+if( ! $xoopsTpl->is_cached('db:' . $xoopsOption['template_main'], $cache_prefix) ) {
// Get content
$limit = 30;
$criteria = new CriteriaCompo(new Criteria('offline', 0));
- $criteria->setSort("published");
- $criteria->setOrder("DESC");
+ $criteria->setSort('published');
+ $criteria->setOrder('DESC');
$criteria->setLimit($limit);
switch ($case) {
@@ -81,7 +81,7 @@
$desc = $xoopsConfig['slogan'] ;
$channel_url = XOOPS_URL . '/modules/wfdownloads/rss.php';
- $criteria->add(new Criteria("cid", "(" . implode(',', $allowed_cats) . ")", "IN"));
+ $criteria->add(new Criteria("cid", '(' . implode(',', $allowed_cats) . ')', "IN"));
$items = $wfdownloads->getHandler('download')->getObjects($criteria);
$id = 0;
break;
@@ -90,7 +90,7 @@
$shorthand = "cat";
$title = $xoopsConfig['sitename'] . ' - ' . htmlspecialchars($category->getVar('title'), ENT_QUOTES);
$desc = $xoopsConfig['slogan'] . ' - ' . htmlspecialchars($category->getVar('title'), ENT_QUOTES);
- $channel_url = XOOPS_URL . '/modules/wfdownloads/rss.php?cid=' . intval($category->getVar('cid'));
+ $channel_url = XOOPS_URL . '/modules/wfdownloads/rss.php?cid=' . (int)$category->getVar('cid');
$criteria->add(new Criteria("cid", intval($category->getVar('cid'))));
$items = $wfdownloads->getHandler('download')->getObjects($criteria);
@@ -98,10 +98,7 @@
break;
}
- /*
- * Assign feed-specific vars
- */
-
+ // Assign feed-specific vars
$xoopsTpl->assign('channel_title', xoops_utf8_encode($title, 'n'));
$xoopsTpl->assign('channel_desc', xoops_utf8_encode($desc, 'n'));
$xoopsTpl->assign('channel_link', $channel_url);
@@ -113,10 +110,7 @@
$xoopsTpl->assign('channel_generator', 'PHP');
$xoopsTpl->assign('channel_language', _LANGCODE);
- /**
- * Assign items to template style array
- */
-
+ // Assign items to template style array
$url = XOOPS_URL . '/modules/wfdownloads/';
if(count($items) > 0){
// Get users for items
@@ -126,13 +120,13 @@
}
if (count($uids) > 0) {
$member_handler =& xoops_gethandler('member');
- $users = $member_handler->getUserList(new Criteria('uid', "(" . implode(',', array_unique($uids)) . ")", "IN"));
+ $users = $member_handler->getUserList(new Criteria('uid', '(' . implode(',', array_unique($uids)) . ')', "IN"));
}
//Assign items to template
foreach(array_keys($items) AS $i){
$item = $items[$i];
- $link = $url.'singlefile.php?lid='.intval($item->getVar('lid'));
+ $link = $url . 'singlefile.php?lid=' . (int)$item->getVar('lid');
$title = htmlspecialchars($item->getVar('title', 'n'));
$teaser = htmlspecialchars($item->getVar('summary', 'n'));
$author = isset($users[$item->getVar('submitter')]) ? isset($users[$item->getVar('submitter')]) : $xoopsConfig['anonymous'];
@@ -159,7 +153,8 @@
'guid' => $url,
'pubdate' => formatTimestamp(time(), $feed_type),
'dc_date' => formatTimestamp(time(), 'd/m H:i'),
- 'description' => xoops_utf8_encode($art_teaser)));
+ 'description' => xoops_utf8_encode($art_teaser)
+ ));
}
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php 2013-08-25 22:26:28 UTC (rev 11980)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php 2013-08-25 23:21:52 UTC (rev 11981)
@@ -27,11 +27,11 @@
// Check permissions
$groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
if (in_array(XOOPS_GROUP_ANONYMOUS, $groups)) {
- if (!$gperm_handler->checkRight("WFDownCatPerm", $cid, $groups, $wfdownloads->getModule()->mid())) {
+ if (!$gperm_handler->checkRight('WFDownCatPerm', $cid, $groups, $wfdownloads->getModule()->mid())) {
redirect_header(XOOPS_URL . '/user.php', 3, _MD_WFD_NEEDLOGINVIEW);
}
} else {
- if (!$gperm_handler->checkRight("WFDownCatPerm", $cid, $groups, $wfdownloads->getModule()->mid())) {
+ if (!$gperm_handler->checkRight('WFDownCatPerm', $cid, $groups, $wfdownloads->getModule()->mid())) {
redirect_header('index.php', 3, _NOPERM);
}
}
@@ -85,22 +85,22 @@
$xoopsTpl->assign('topcategory_image', $topCategory->getVar('imgurl'));
$xoopsTpl->assign('topcategory_cid', $topCategory->getVar('cid'));
-// added - start - March 6 2006, March 8, 2006 - jpc
+// Added Formulize module support (2006/03/06, 2006/03/08) jpc - start
$formulize_idreq = $download->getVar('formulize_idreq');
if($formulize_idreq) {
$xoopsTpl->assign('custom_form', 1);
include_once XOOPS_ROOT_PATH . "/modules/formulize/include/extract.php";
// get the form id and id_req of the user's entry
global $xoopsDB;
- $module_handler =& xoops_gethandler('module');
- $formulizeModule =& $module_handler->getByDirname("formulize");
- $formulizeConfig =& $config_handler->getConfigsByCat(0, $formulizeModule->mid());
+ $module_handler = xoops_gethandler('module');
+ $formulizeModule = $module_handler->getByDirname('formulize');
+ $formulizeConfig = $config_handler->getConfigsByCat(0, $formulizeModule->mid());
$formulize_fid = $category->getVar('formulize_fid');
if($formulize_fid) {
$formulize_formq = "SELECT desc_form";
- $formulize_formq.= " FROM " . $xoopsDB->prefix("formulize_id");
+ $formulize_formq.= " FROM " . $xoopsDB->prefix('formulize_id');
$formulize_formq.= " WHERE id_form = '$formulize_fid'";
$formulize_formres = $xoopsDB->query($formulize_formq);
if($formulize_formarray = $xoopsDB->fetchArray($formulize_formres)) {
@@ -152,7 +152,7 @@
} else {
$xoopsTpl->assign('custom_form', 0);
}
-// added - end - March 8 2006 - jpc
+// Added Formulize module support (2006/03/06, 2006/03/08) jpc - end
$use_mirrors = $wfdownloads->getConfig('enable_mirrors');
$add_mirror = 0;
@@ -182,8 +182,8 @@
$criteria = new CriteriaCompo(new Criteria("submitter", $download->getVar('submitter')));
$criteria->add(new Criteria('lid', $lid, '!='));
$criteria->setLimit(20);
-$criteria->setSort("published");
-$criteria->setOrder("DESC");
+$criteria->setSort('published');
+$criteria->setOrder('DESC');
$downloads = $wfdownloads->getHandler('download')->getActiveDownloads($criteria);
foreach (array_keys($downloads) as $i) {
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/submit.php 2013-08-25 22:26:28 UTC (rev 11980)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/submit.php 2013-08-25 23:21:52 UTC (rev 11981)
@@ -97,38 +97,38 @@
$allowedMimetypes = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png');
$uploadDirectory = XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('screenshots') . '/';
// Load screenshot #1
- if ((isset($_FILES['screenshot']['name']) && !empty($_FILES['screenshot']['name']))) {
+ if (isset($_FILES['screenshot']['name']) && !empty($_FILES['screenshot']['name'])) {
$screenshot = strtolower($_FILES['screenshot']['name']);
$uploader = new XoopsMediaImgUploader($uploadDirectory, $allowedMimetypes, $wfdownloads->getConfig('maxfilesize'), $wfdownloads->getConfig('maximgwidth'), $wfdownloads->getConfig('maximgheight'));
if ($uploader->fetchMedia($_POST['xoops_upload_file'][1])) {
if (!$uploader->upload()) {
$errors = $uploader->getErrors();
@unlink($uploadDirectory . $screenshot);
- redirect_header('index.php?op=downloadsConfigMenu', 1, $errors);
+ redirect_header($currentFile, 1, $errors);
}
} else {
$errors = $uploader->getErrors();
@unlink($uploadDirectory . $screenshot);
- redirect_header('index.php?op=downloadsConfigMenu', 1, $errors);
+ redirect_header($currentFile, 1, $errors);
}
} else {
$screenshot = '';
}
// Load screenshot #2
if ($wfdownloads->getConfig('max_screenshot') >= 2) {
- if ((isset($_FILES['screenshot2']['name']) && !empty($_FILES['screenshot2']['name']))) {
+ if (isset($_FILES['screenshot2']['name']) && !empty($_FILES['screenshot2']['name'])) {
$screenshot2 = strtolower($_FILES['screenshot2']['name']);
$uploader = new XoopsMediaImgUploader($uploadDirectory, $allowedMimetypes, $wfdownloads->getConfig('maxfilesize'), $wfdownloads->getConfig('maximgwidth'), $wfdownloads->getConfig('maximgheight'));
if ($uploader->fetchMedia($_POST['xoops_upload_file'][2])) {
if (!$uploader->upload()) {
$errors = $uploader->getErrors();
@unlink($uploadDirectory . $screenshot2);
- redirect_header('index.php?op=downloadsConfigMenu', 1, $errors);
+ redirect_header($currentFile, 1, $errors);
}
} else {
$errors = $uploader->getErrors();
@unlink($uploadDirectory . $screenshot2);
- redirect_header('index.php?op=downloadsConfigMenu', 1, $errors);
+ redirect_header($currentFile, 1, $errors);
}
} else {
$screenshot2 = '';
@@ -138,19 +138,19 @@
}
// Load screenshot #3
if ($wfdownloads->getConfig('max_screenshot') >= 3) {
- if ((isset($_FILES['screenshot3']['name']) && !empty($_FILES['screenshot3']['name']))) {
+ if (isset($_FILES['screenshot3']['name']) && !empty($_FILES['screenshot3']['name'])) {
$screenshot3 = strtolower($_FILES['screenshot3']['name']);
$uploader = new XoopsMediaImgUploader($uploadDirectory, $allowedMimetypes, $wfdownloads->getConfig('maxfilesize'), $wfdownloads->getConfig('maximgwidth'), $wfdownloads->getConfig('maximgheight'));
if ($uploader->fetchMedia($_POST['xoops_upload_file'][3])) {
if (!$uploader->upload()) {
$errors = $uploader->getErrors();
@unlink($uploadDirectory . $screenshot3);
- redirect_header('index.php?op=downloadsConfigMenu', 1, $errors);
+ redirect_header($currentFile, 1, $errors);
}
} else {
$errors = $uploader->getErrors();
@unlink($uploadDirectory . $screenshot3);
- redirect_header('index.php?op=downloadsConfigMenu', 1, $errors);
+ redirect_header($currentFile, 1, $errors);
}
} else {
$screenshot3 = '';
@@ -160,19 +160,19 @@
}
// Load screenshot #4
if ($wfdownloads->getConfig('max_screenshot') >= 4) {
- if ((isset($_FILES['screenshot4']['name']) && !empty($_FILES['screenshot4']['name']))) {
+ if (isset($_FILES['screenshot4']['name']) && !empty($_FILES['screenshot4']['name'])) {
$screenshot4 = strtolower($_FILES['screenshot4']['name']);
$uploader = new XoopsMediaImgUploader($uploadDirectory, $allowedMimetypes, $wfdownloads->getConfig('maxfilesize'), $wfdownloads->getConfig('maximgwidth'), $wfdownloads->getConfig('maximgheight'));
if ($uploader->fetchMedia($_POST['xoops_upload_file'][4])) {
if (!$uploader->upload()) {
$errors = $uploader->getErrors();
@unlink($uploadDirectory . $screenshot4);
- redirect_header('index.php?op=downloadsConfigMenu', 1, $errors);
+ redirect_header($currentFile, 1, $errors);
}
} else {
$errors = $uploader->getErrors();
@unlink($uploadDirectory . $screenshot4);
- redirect_header('index.php?op=downloadsConfigMenu', 1, $errors);
+ redirect_header($currentFile, 1, $errors);
}
} else {
$screenshot4 = '';
@@ -185,7 +185,6 @@
if ($lid > 0) {
$thisIsANewRecord = false;
-
if ($wfdownloads->getConfig('autoapprove') == 2 || $wfdownloads->getConfig('autoapprove') == 4) {
$download = $wfdownloads->getHandler('download')->get($lid);
} else {
@@ -196,8 +195,8 @@
$thisIsANewRecord = true;
$download = $wfdownloads->getHandler('download')->create();
if ($wfdownloads->getConfig('autoapprove') == 2 || $wfdownloads->getConfig('autoapprove') == 4) {
- $download->setVar("published", time());
- $download->setVar("status", 1);
+ $download->setVar('published', time());
+ $download->setVar('status', 1);
} else {
$download->setVar('published', false);
$download->setVar('status', 0);
@@ -241,7 +240,7 @@
}
// Added Formulize module support (2006/05/04) jpc - end
- if (!empty($_POST["homepage"]) || $_POST["homepage"] != "http://") {
+ if (!empty($_POST['homepage']) || $_POST['homepage'] != "http://") {
$download->setVar('homepage', formatURL(trim($_POST["homepage"])));
$download->setVar('homepagetitle', trim($_POST["homepagetitle"]));
}
@@ -256,18 +255,18 @@
// 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.
- $version = (!empty($_POST["version"])) ? trim($_POST["version"]) : 0;
+ $version = !empty($_POST["version"]) ? trim($_POST["version"]) : 0;
if (!$thisIsANewRecord and ($download->getVar('version') != $version)) {
// Trigger the three events related to modified files (one for the file, category, and global event categories respectively)
- $notification_handler = & xoops_gethandler('notification');
- $tags = array();
- $tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
- $category = $wfdownloads->getHandler('category')->get($cid);
- $tags['FILE_VERSION'] = $version;
+ $notification_handler = & xoops_gethandler('notification');
+ $tags = array();
+ $tags['FILE_NAME'] = $title;
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
+ $category = $wfdownloads->getHandler('category')->get($cid);
+ $tags['FILE_VERSION'] = $version;
$tags['CATEGORY_NAME'] = $category->getVar('title');
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid={$cid}";
+ $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid={$cid}";
if ($wfdownloads->getConfig('autoapprove') == 2 || $wfdownloads->getConfig('autoapprove') == 4) {
// Then this change will be automatically approved, so the notification needs to go out.
@@ -278,40 +277,39 @@
}
/* End add block */
- $download->setVar('version', $_POST["version"]);
+ $download->setVar('version', $_POST['version']);
$download->setVar('size', $size);
- $download->setVar('platform', $_POST["platform"]);
+ $download->setVar('platform', $_POST['platform']);
$download->setVar('screenshot', $screenshot);
$download->setVar('screenshot2', $screenshot2);
$download->setVar('screenshot3', $screenshot3);
$download->setVar('screenshot4', $screenshot4);
- $download->setVar('summary', $_POST["summary"]);
- $download->setVar('description', $_POST["description"]);
- $submitter = is_object($xoopsUser) ? (int)$xoopsUser->getVar('uid') : 0;
+ $download->setVar('summary', $_POST['summary']);
+ $download->setVar('description', $_POST['description']);
+ $submitter = is_object($xoopsUser) ? (int)$xoopsUser->getVar('uid') : 0;
$download->setVar('submitter', $submitter);
- $download->setVar('publisher', trim($_POST["publisher"]));
- $download->setVar('price', trim($_POST["price"]));
- $download->setVar('mirror', isset($_POST["mirror"]) ? trim($_POST["mirror"]) : '');
- $download->setVar('license', trim($_POST["license"]));
- $paypalemail = '';
- $download->setVar('features', trim($_POST["features"]));
- $download->setVar('requirements', trim($_POST["requirements"]));
- $forumid = (isset($_POST["forumid"]) && $_POST["forumid"] > 0) ? (int)$_POST["forumid"] : 0;
+ $download->setVar('publisher', trim($_POST['publisher']));
+ $download->setVar('price', trim($_POST['price']));
+ $download->setVar('mirror', isset($_POST['mirror']) ? trim($_POST['mirror']) : '');
+ $download->setVar('license', trim($_POST['license']));
+ $paypalemail = '';
+ $download->setVar('features', trim($_POST['features']));
+ $download->setVar('requirements', trim($_POST['requirements']));
+ $forumid = (isset($_POST['forumid']) && $_POST["forumid"] > 0) ? (int)$_POST["forumid"] : 0;
$download->setVar('forumid', $forumid);
- $limitations = (isset($_POST["limitations"])) ? $myts->addslashes($_POST["limitations"]) : '';
+ $limitations = isset($_POST['limitations']) ? $myts->addslashes($_POST['limitations']) : '';
$download->setVar('limitations', $limitations);
- $versiontypes = (isset($_POST["versiontypes"])) ? $myts->addslashes($_POST["versiontypes"]) : '';
+ $versiontypes = isset($_POST['versiontypes']) ? $myts->addslashes($_POST['versiontypes']) : '';
$download->setVar('versiontypes', $versiontypes);
- $dhistory = (isset($_POST["dhistory"])) ? $myts->addslashes($_POST["dhistory"]) : '';
- $dhistoryhistory = (isset($_POST["dhistoryaddedd"])) ? $myts->addslashes($_POST["dhistoryaddedd"]) : '';
+ $dhistory = isset($_POST['dhistory']) ? $myts->addslashes($_POST['dhistory']) : '';
+ $dhistoryhistory = isset($_POST['dhistoryaddedd']) ? $myts->addslashes($_POST['dhistoryaddedd']) : '';
if ($lid > 0 && !empty($dhistoryhistory)) {
$dhistory = $dhistory . "\n\n";
- $time = time();
- $dhistory .= "<b>" . formatTimestamp($time, $wfdownloads->getConfig('dateformat')) . "</b>\n\n";
+ $dhistory .= "<b>" . formatTimestamp(time(), $wfdownloads->getConfig('dateformat')) . "</b>\n\n";
$dhistory .= $dhistoryhistory;
}
$download->setVar('dhistory', $dhistory);
- $offline = (isset($_POST['offline']) && $_POST['offline'] == 1) ? 1 : 0;
+ $offline = (isset($_POST['offline']) && $_POST['offline'] == 1) ? 1 : 0;
$download->setVar('offline', $offline);
$download->setVar('date', time());
@@ -359,16 +357,14 @@
$notifypub = (isset($_POST['notifypub']) && $_POST['notifypub'] == 1) ? 1 : 0;
$download->setVar('notifypub', $notifypub);
$download->setVar('ipaddress', $_SERVER['REMOTE_ADDR']);
-
- $updated = time();
- $download->setVar('updated', $updated);
+ $download->setVar('updated', time());
$wfdownloads->getHandler('download')->insert($download);
- $tags = array();
- $tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
+ $tags = array();
+ $tags['FILE_NAME'] = $title;
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
- $category = $wfdownloads->getHandler('category')->get($cid);
+ $category = $wfdownloads->getHandler('category')->get($cid);
$tags['CATEGORY_NAME'] = $category->getVar('title');
$tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid={$cid}";
} else {
@@ -380,8 +376,8 @@
$error = _MD_WFD_INFONOSAVEDB;
trigger_error($error, E_USER_ERROR);
}
- $tags = array();
- $tags['MODIFYREPORTS_URL'] = WFDOWNLOADS_URL . '/admin/downloads.php?op=listModReq';
+ $tags = array();
+ $tags['MODIFYREPORTS_URL'] = WFDOWNLOADS_URL . '/admin/reportsmodifications.php';
$notification_handler->triggerEvent('global', 0, 'file_modify', $tags);
}
redirect_header('index.php', 2, _MD_WFD_THANKSFORINFO);
@@ -392,38 +388,33 @@
$xoopsOption['template_main'] = 'wfdownloads_disclaimer.html';
include XOOPS_ROOT_PATH . '/header.php';
-
$xoTheme->addStylesheet(WFDOWNLOADS_URL . '/module.css');
$xoTheme->addStylesheet(WFDOWNLOADS_URL . '/thickbox.css');
$xoopsTpl->assign('wfdownloads_url', WFDOWNLOADS_URL . '/');
-
$catarray['imageheader'] = wfd_imageheader();
$xoopsTpl -> assign('catarray', $catarray);
-
$xoopsTpl->assign('categoryPath', _MD_WFD_DISCLAIMERAGREEMENT);
$xoopsTpl->assign('module_home', wfdownloads_module_home(true));
-
$xoopsTpl->assign('image_header', wfd_imageheader());
$xoopsTpl->assign('disclaimer', $myts->displayTarea($wfdownloads->getConfig('disclaimer'), 1, 1, 1, 1, 1));
$xoopsTpl->assign('down_disclaimer', false);
$xoopsTpl->assign('cancel_location', WFDOWNLOADS_URL . '/index.php');
if (!isset($_REQUEST['lid'])) {
- $xoopsTpl->assign('agree_location', WFDOWNLOADS_URL . '/submit.php?agree=1');
+ $xoopsTpl->assign('agree_location', WFDOWNLOADS_URL . "/{$currentFile}?agree=1");
} elseif (isset($_REQUEST['lid'])) {
- $lid = intval($_REQUEST['lid']);
- $xoopsTpl->assign('agree_location', WFDOWNLOADS_URL . '/submit.php?agree=1&lid=' . $lid);
+ $lid = WfdownloadsRequest::getInt('lid');
+ $xoopsTpl->assign('agree_location', WFDOWNLOADS_URL . "/{$currentFile}?agree=1&lid={$lid}");
}
include XOOPS_ROOT_PATH . '/footer.php';
exit();
}
// Show submit form
-
if (isset($_REQUEST['lid']) && is_object($xoopsUser)) {
$user_id = $xoopsUser->uid();
- $lid = $_REQUEST['lid'];
+ $lid = WfdownloadsRequest::getInt('lid');
$download = $wfdownloads->getHandler('download')->get($lid);
if ($user_id !== $download->getVar('submitter')) {
- redirect_header("index.php", 5, _MD_WFD_NOTALLOWEDTOMOD);
+ redirect_header('index.php', 5, _MD_WFD_NOTALLOWEDTOMOD);
}
$cid = $download->getVar('cid');
} else {
@@ -473,13 +464,10 @@
$xoTheme->addStylesheet(WFDOWNLOADS_URL . '/module.css');
$xoTheme->addStylesheet(WFDOWNLOADS_URL . '/thickbox.css');
$xoopsTpl->assign('wfdownloads_url', WFDOWNLOADS_URL . '/');
-
$catarray['imageheader'] = wfd_imageheader();
$xoopsTpl -> assign('catarray', $catarray);
-
$xoopsTpl->assign('categoryPath', _MD_WFD_SUBMITDOWNLOAD);
$xoopsTpl->assign('module_home', wfdownloads_module_home(true));
-
$xoopsTpl -> assign('submit_form' , $sform->render());
include XOOPS_ROOT_PATH . '/footer.php';
Added: XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_common_breadcrumb.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_common_breadcrumb.html (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_common_breadcrumb.html 2013-08-25 23:21:52 UTC (rev 11981)
@@ -0,0 +1,14 @@
+<{foreach item=bread from=$breadcrumb name=bcloop}>
+<span>
+<{if ($bread.link)}>
+ <a href="<{$bread.link}>" title="<{$bread.title}>"><{$bread.title}></a>
+<{else}>
+ <{$bread.title}>
+<{/if}>
+</span>
+
+<{if !$smarty.foreach.bcloop.last}>
+ <span class="delimiter"> > </span>
+<{/if}>
+<{/foreach}>
+<hr />
\ No newline at end of file
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-08-25 22:26:28 UTC (rev 11980)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-08-25 23:21:52 UTC (rev 11981)
@@ -286,6 +286,10 @@
$modversion['templates'][$i]['type'] = 'admin';
$modversion['templates'][$i]['description'] = '';
+// Common templates
+$i++;
+$modversion['templates'][$i]['file'] = $modversion['dirname'] . '_common_breadcrumb.html';
+$modversion['templates'][$i]['description'] = '';
//Module config setting
|
