Menu
▾
▴
xoops-svn
|
From: <be...@us...> - 2014-04-15 08:32:10
|
Revision: 12447
http://sourceforge.net/p/xoops/svn/12447
Author: beckmi
Date: 2014-04-15 08:31:59 +0000 (Tue, 15 Apr 2014)
Log Message:
-----------
See changelog for changes
Modified Paths:
--------------
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/clone.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/import.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/index.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/menu.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/mimetypes.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/mirrors.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/reportsmodifications.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/reviews.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top_by_cat.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/brokenfile.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/breadcrumb.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/dbupdater.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/download.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/img_uploader.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/ip_log.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/mimetype.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/mirror.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/modification.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/multicolumnsthemeform.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/object.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/rating.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/report.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/request.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/review.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/session.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/tree.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads_lists.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/xoopstree.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/comment_functions.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/common.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/constants.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/directorychecker.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/filechecker.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/module.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/notification.inc.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/search.inc.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/index.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/admin.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/blocks.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/directorychecker.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/filechecker.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/help/help3.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/help/help4.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/help/help5.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/help/help6.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/help/install.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/help/tips_tricks.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/main.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/mirror.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/newlist.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/ratefile.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/review.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/rss.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/singlefile.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_brokenfile.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_disclaimer.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_download.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_index.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_mirrors.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_newlistindex.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_reviews.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_singlefile.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_topten.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_viewcat.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/topten.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/viewcat.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/visit.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/xoops_version.php
Added Paths:
-----------
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/css/
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/css/index.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/css/module.css
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/VeraBd.ttf
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/blank.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/brokenimg.png
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/category/
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/category/blank.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/category/index.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/category/thumbs/
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/category/thumbs/blank.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/category/thumbs/index.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/down.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/approve.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/arrow.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/close12.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/delete.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/disabled.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/down.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/download.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/download1.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/download2.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/download3.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/download4.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/downloads.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/downloads02.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/downloads03.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/edit.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/forum.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/ignore.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/ignore.png
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/index.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/link.png
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/newred.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/off.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/on.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/open12.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/pop.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/rate0.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/rate1.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/rate2.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/rate3.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/rate4.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/rate5.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/reviews.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/rss.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/statistics.png
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/update.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/world_link.png
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon32/
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon32/database_go.png
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon32/editcopy.png
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon32/index.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/index.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/loadingAnimation.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/logo-en.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/logo.png
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/module_logo.png
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/screenshots/
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/screenshots/blank.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/screenshots/index.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/screenshots/thumbs/
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/screenshots/thumbs/blank.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/screenshots/thumbs/index.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/size2.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/up.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/index.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/index.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/magnific/
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/magnific/jquery.magnific-popup.min.js
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/magnific/magnific-popup.css
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/README.md
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/DO NOT CHANGE THESE FILES. USE -src- FOLDER.txt
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/background.png
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/bigplay.png
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/bigplay.svg
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/controls-ted.png
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/controls-wmp-bg.png
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/controls-wmp.png
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/controls.png
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/controls.svg
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/flashmediaelement-cdn.swf
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/flashmediaelement.swf
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/loading.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/mediaelement-and-player.min.js
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/mediaelement.min.js
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/mediaelementplayer.min.css
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/mediaelementplayer.min.js
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/mejs-skins.css
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/silverlightmediaelement.xap
XoopsModules/wfdownloads/branches/mamba/wfdownloads/index.html
Removed Paths:
-------------
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/uploader.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/images/
XoopsModules/wfdownloads/branches/mamba/wfdownloads/js/
XoopsModules/wfdownloads/branches/mamba/wfdownloads/module.css
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php 2014-04-14 22:42:04 UTC (rev 12446)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php 2014-04-15 08:31:59 UTC (rev 12447)
@@ -73,10 +73,10 @@
case "addCat" :
$cid = WfdownloadsRequest::getInt('cid', 0, 'POST');
$pid = WfdownloadsRequest::getInt('pid', 0, 'POST');
- $weight = (isset($_POST["weight"]) && $_POST["weight"] > 0) ? (int)$_POST["weight"] : 0;
+ $weight = (isset($_POST["weight"]) && $_POST["weight"] > 0) ? (int) $_POST["weight"] : 0;
$down_groups = isset($_POST['groups']) ? $_POST['groups'] : array();
$up_groups = isset($_POST['up_groups']) ? $_POST['up_groups'] : array();
- $spotlighthis = (isset($_POST["lid"])) ? (int)$_POST["lid"] : 0;
+ $spotlighthis = (isset($_POST["lid"])) ? (int) $_POST["lid"] : 0;
$spotlighttop = (isset($_POST["spotlighttop"]) && ($_POST["spotlighttop"] == 1)) ? 1 : 0;
include_once XOOPS_ROOT_PATH.'/class/uploader.php';
@@ -100,7 +100,7 @@
}
// Formulize module support (2006/05/04) jpc
if (wfdownloads_checkModule('formulize') < 300) {
- $formulize_fid = (isset($_POST["formulize_fid"])) ? (int)$_POST["formulize_fid"] : 0;
+ $formulize_fid = (isset($_POST["formulize_fid"])) ? (int) $_POST["formulize_fid"] : 0;
}
if (!$cid) {
@@ -136,7 +136,7 @@
}
if (!$cid) {
if ($cid == 0) {
- $newid = (int)$category->getVar('cid');
+ $newid = (int) $category->getVar('cid');
}
wfdownloads_savePermissions($down_groups, $newid, 'WFDownCatPerm');
wfdownloads_savePermissions($up_groups, $newid, 'WFUpCatPerm');
@@ -164,7 +164,7 @@
if ($ok == true) {
// get all subcategories under the specified category
$arr = $mytree -> getAllChild($cid);
- foreach($arr as $child) {
+ foreach ($arr as $child) {
// get all category ids
$cids[] = $child->getVar('cid');
}
@@ -182,7 +182,7 @@
$wfdownloads->getHandler('report')->deleteAll($download_criteria);
$wfdownloads->getHandler('download')->deleteAll($download_criteria);
foreach (array_keys($downloads) as $lid) {
- xoops_comment_delete($wfdownloads->getModule()->mid(), (int)$lid);
+ xoops_comment_delete($wfdownloads->getModule()->mid(), (int) $lid);
}
// all downloads for each category is deleted, now delete the category data
@@ -256,7 +256,7 @@
if (isset($_POST['new_weights']) && count($_POST['new_weights']) > 0) {
$new_weights = $_POST['new_weights'];
$ids = array();
- foreach ($new_weights as $cid => $new_weight ) {
+ foreach ($new_weights as $cid => $new_weight) {
$category = $wfdownloads->getHandler('category')->get($cid);
$category->setVar('weight', $new_weight);
if (!$wfdownloads->getHandler('category')->insert($category)) {
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/clone.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/clone.php 2014-04-14 22:42:04 UTC (rev 12446)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/clone.php 2014-04-15 08:31:59 UTC (rev 12447)
@@ -90,6 +90,9 @@
}
// recursive clonning script
+/**
+ * @param $path
+ */
function wfdownloads_cloneFileDir($path)
{
global $patKeys;
@@ -122,6 +125,11 @@
}
}
+/**
+ * @param $dirname
+ *
+ * @return bool
+ */
function wfdownloads_createLogo($dirname)
{
$wfdownloads = WfdownloadsWfdownloads::getInstance();
@@ -144,10 +152,10 @@
}
}
// Check original image/font
- if (!file_exists($imageBase = XOOPS_ROOT_PATH . "/modules/" . $dirname . "/images/module_logo.png")) {
+ if (!file_exists($imageBase = XOOPS_ROOT_PATH . "/modules/" . $dirname . "/assets/images/module_logo.png")) {
return false;
}
- if (!file_exists($font = XOOPS_ROOT_PATH . "/modules/" . $wfdownloads->getModule()->dirname() . "/images/VeraBd.ttf")) {
+ if (!file_exists($font = XOOPS_ROOT_PATH . "/modules/" . $wfdownloads->getModule()->dirname() . "/assets/images/VeraBd.ttf")) {
return false;
}
// Create image
@@ -164,7 +172,7 @@
imagefill($imageModule, 0, 0, $whiteColor);
imagecolortransparent($imageModule, $whiteColor);
// Save new image
- imagepng($imageModule, XOOPS_ROOT_PATH . "/modules/" . $dirname . "/images/module_logo.png");
+ imagepng($imageModule, XOOPS_ROOT_PATH . "/modules/" . $dirname . "/assets/images/module_logo.png");
imagedestroy($imageModule);
return true;
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php 2014-04-14 22:42:04 UTC (rev 12446)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php 2014-04-15 08:31:59 UTC (rev 12447)
@@ -255,7 +255,7 @@
$filename = '';
$filetype = '';
// Get size from form
- $size = (empty($_POST['size']) || !is_numeric($_POST['size'])) ? 0 : (int)$_POST["size"];
+ $size = (empty($_POST['size']) || !is_numeric($_POST['size'])) ? 0 : (int) $_POST["size"];
} else {
$url = ($_POST["url"] != "http://") ? $_POST['url'] : '';
$filename = $_POST['filename'];
@@ -455,7 +455,7 @@
}
// Added Formulize module support (2006/05/04) jpc - end
$wfdownloads->getHandler('download')->insert($download);
- $newid = (int)$download->getVar('lid');
+ $newid = (int) $download->getVar('lid');
// Send notifications
if (!$lid) {
$tags = array();
@@ -691,7 +691,6 @@
$GLOBALS['xoopsTpl']->assign('filter_date_select', $date_select->render());
$GLOBALS['xoopsTpl']->assign('filter_date_condition', $filter_date_condition);
-
// New Downloads
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('published', 0));
@@ -834,7 +833,6 @@
$GLOBALS['xoopsTpl']->assign('download', $download_array);
}
-
// Get all logged users
$uidArray = array();
foreach ($ip_logs as $ip_log) {
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/import.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/import.php 2014-04-14 22:42:04 UTC (rev 12446)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/import.php 2014-04-15 08:31:59 UTC (rev 12447)
@@ -206,6 +206,9 @@
// =========================================================================================
// This function imports data from WF-Downloads
// =========================================================================================
+/**
+ * @return null
+ */
function import_wfd_to_wfdownloads()
{
global $xoopsDB;
@@ -223,7 +226,7 @@
// Get destination module/handlers/configs
$wfdownloads = WfdownloadsWfdownloads::getInstance();
- echo "<br /><b>Copying Files</b><br />";
+ echo "<br /><span style='font-weight: bold;'>Copying Files</span><br />";
// Copy categories images/thumbnails
if (!wfdownloads_copyDir(XOOPS_ROOT_PATH . '/' . $wfdModuleConfig['catimage'], XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('catimage'))) {
return false;
@@ -244,7 +247,7 @@
}
echo "Copied files<br />";
- echo "<br /><b>Importing Data</b><br />";
+ echo "<br /><span style='font-weight: bold;'>Importing Data</span><br />";
$destination = array(
"cat" => $xoopsDB->prefix("wfdownloads_cat"),
"downloads" => $xoopsDB->prefix("wfdownloads_downloads"),
@@ -346,7 +349,6 @@
$xoopsDB->query($sql);
echo "Imported {$xoopsDB->getAffectedRows()} modification requests into {$destination['mod']}<br />";
-
// Update category ID to new value
$xoopsDB->query("UPDATE {$destination['downloads']} d, {$destination['cat']} c SET d.cid=c.cid WHERE d.old_cid=c.old_cid AND d.old_cid != 0");
$xoopsDB->query("UPDATE {$destination['cat']} c1, {$destination['cat']} c2 SET c1.pid=c2.cid WHERE c1.old_pid=c2.old_cid AND c1.old_pid != 0");
@@ -390,9 +392,9 @@
$xoopsDB->query("ALTER TABLE ." . $destination['downloads'] . " DROP `old_cid`");
$xoopsDB->query("ALTER TABLE ." . $destination['downloads'] . " DROP `old_lid`");
+ return null;
}
-
// =========================================================================================
// This function imports data from mydownloads
// =========================================================================================
@@ -400,7 +402,7 @@
{
global $xoopsDB;
- echo "<br /><b>Importing Data</b><br />";
+ echo "<br /><span style='font-weight: bold;'>Importing Data</span><br />";
$destination = array(
"cat" => $xoopsDB->prefix("wfdownloads_cat"),
"downloads" => $xoopsDB->prefix("wfdownloads_downloads"),
@@ -471,7 +473,6 @@
);
echo "Imported " . $xoopsDB->getAffectedRows() . " modification requests into " . $destination['mod'] . "<br />";
-
//Update category ID to new value
$xoopsDB->query(
"UPDATE " . $destination['downloads'] . " d, " . $destination['cat'] . " c SET d.cid=c.cid WHERE d.old_cid=c.old_cid AND d.old_cid != 0"
@@ -515,7 +516,6 @@
}
-
// =========================================================================================
// This function imports data from pd-downloads
// =========================================================================================
@@ -523,7 +523,7 @@
{
global $xoopsDB;
- echo "<br /><b>Importing Data</b><br />";
+ echo "<br /><span style='font-weight: bold;'>Importing Data</span><br />";
$destination = array(
"cat" => $xoopsDB->prefix("wfdownloads_cat"),
"downloads" => $xoopsDB->prefix("wfdownloads_downloads"),
@@ -563,36 +563,36 @@
//Import data into category table
$xoopsDB->query(
"INSERT INTO " . $destination['cat'] . " (`old_cid`, `old_pid`, `title`, `imgurl`, `description`, `total`, `weight`)
- SELECT `cid`, `pid`, `title`, `imgurl`, `description`, `total`, `weight`
- FROM " . $source['cat']
+ SELECT `cid`, `pid`, `title`, `imgurl`, `description`, `total`, `weight`
+ FROM " . $source['cat']
);
echo "Imported " . $xoopsDB->getAffectedRows() . " categories into " . $destination['cat'] . "<br />";
//Import data into downloads table
$xoopsDB->query(
"INSERT INTO " . $destination['downloads'] . " (`cid`, `old_lid`, `old_cid`, `title`, `url`, `homepage`, `homepagetitle`, `version`, `size`, `platform`, `screenshot`, `submitter`, `publisher`, `status`, `date`, `hits`, `rating`, `votes`, `comments`, `features`, `forumid`, `dhistory`, `published`, `expired`, `updated`, `offline`, `description`, `ipaddress`, `notifypub`)
SELECT 0,`lid`, `cid`, `title`, `url`, `homepage`, `homepagetitle`, `version`, `size`, `platform`, `screenshot`, `submitter`, `publisher`, `status`, `date`, `hits`, `rating`, `votes`, `comments`, `features`, `forumid`, `dhistory`, `published`, `expired`, `updated`, `offline`, `description`, `ipaddress`, `notifypub`
- FROM " . $source['downloads']
+ FROM " . $source['downloads']
);
echo "Imported " . $xoopsDB->getAffectedRows() . " downloads into " . $destination['downloads'] . "<br />";
//Import data into brokens table
$xoopsDB->query(
"INSERT INTO " . $destination['broken'] . " (`reportid`, `lid`, `sender`, `ip`, `date`, `confirmed`, `acknowledged`)
SELECT `reportid`, `lid`, `sender`, `ip`, `date`, `confirmed`, `acknowledged`
- FROM " . $source['broken']
+ FROM " . $source['broken']
);
echo "Imported " . $xoopsDB->getAffectedRows() . " broken reports into " . $destination['broken'] . "<br />";
//Import data into votedata table
$xoopsDB->query(
"INSERT INTO " . $destination['votes'] . " (`ratingid`, `lid`, `ratinguser`, `rating`, `ratinghostname`, `ratingtimestamp`)
SELECT `ratingid`, `lid`, `ratinguser`, `rating`, `ratinghostname`, `ratingtimestamp`
- FROM " . $source['votes']
+ FROM " . $source['votes']
);
echo "Imported " . $xoopsDB->getAffectedRows() . " votes into " . $destination['votes'] . "<br />";
//Import data into mod request table
$xoopsDB->query(
"INSERT INTO " . $destination['mod'] . " (`lid`, `cid`, `title`, `url`, `homepage`, `homepagetitle`, `version`, `size`, `platform`, `screenshot`, `submitter`, `publisher`, `status`, `date`, `hits`, `rating`, `votes`, `comments`, `features`, `forumid`, `dhistory`, `published`, `expired`, `updated`, `offline`, `description`, `modifysubmitter`, `requestdate`)
SELECT `lid`, `cid`, `title`, `url`, `homepage`, `homepagetitle`, `version`, `size`, `platform`, `screenshot`, `submitter`, `publisher`, `status`, `date`, `hits`, `rating`, `votes`, `comments`, `features`, `forumid`, `dhistory`, `published`, `expired`, `updated`, `offline`, `description`, `modifysubmitter`, `requestdate`
- FROM " . $source['mod']
+ FROM " . $source['mod']
);
echo "Imported " . $xoopsDB->getAffectedRows() . " modification requests into " . $destination['mod'] . "<br />";
@@ -637,7 +637,6 @@
}
-
// =========================================================================================
// This function imports data from mydownloads
// =========================================================================================
@@ -645,7 +644,7 @@
{
global $xoopsDB;
- echo "<br /><b>Importing Data</b><br />";
+ echo "<br /><span style='font-weight: bold;'>Importing Data</span><br />";
$destination = array(
"cat" => $xoopsDB->prefix("wfdownloads_cat"),
"downloads" => $xoopsDB->prefix("wfdownloads_downloads"),
@@ -716,7 +715,6 @@
);
echo "Imported " . $xoopsDB->getAffectedRows() . " modification requests into " . $destination['mod'] . "<br />";
-
//Update category ID to new value
$xoopsDB->query(
"UPDATE " . $destination['downloads'] . " d, " . $destination['cat'] . " c SET d.cid=c.cid WHERE d.old_cid=c.old_cid AND d.old_cid != 0"
@@ -759,4 +757,3 @@
$xoopsDB->query("ALTER TABLE ." . $destination['downloads'] . " DROP `ol...
[truncated message content] |
|
From: <be...@us...> - 2014-04-16 12:13:46
|
Revision: 12450
http://sourceforge.net/p/xoops/svn/12450
Author: beckmi
Date: 2014-04-16 12:13:42 +0000 (Wed, 16 Apr 2014)
Log Message:
-----------
fixing typo, adding comment
Modified Paths:
--------------
XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt 2014-04-15 17:29:33 UTC (rev 12449)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt 2014-04-16 12:13:42 UTC (rev 12450)
@@ -1,5 +1,5 @@
<b><u>=> Version 3.23 Beta (2014-04-14)</u></b>
-- replaced Thickbox with MignificPopup (mamba)
+- replaced Thickbox with MagnificPopup (mamba)
- fixed: source code for HTML5/CSS3 (mamba)
- moved module.css, and /js and /images to /assets folder (mamba)
- fixed review for Admin: Admin doesn't need approval (mamba)
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php 2014-04-15 17:29:33 UTC (rev 12449)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php 2014-04-16 12:13:42 UTC (rev 12450)
@@ -1330,7 +1330,7 @@
$uploadDirectory = $uploadDirectory . '/';
$file_name = $_FILES['userfile']['name'];
-
+//Admin can upload files of any size
if (wfdownloads_userIsAdmin()) {
$maxFileSize = return_bytes(ini_get('upload_max_filesize'));
} else {
|
|
From: <luc...@us...> - 2014-04-18 16:11:15
|
Revision: 12460
http://sourceforge.net/p/xoops/svn/12460
Author: luciorota
Date: 2014-04-18 16:11:12 +0000 (Fri, 18 Apr 2014)
Log Message:
-----------
fixed bug when using formulize
Modified Paths:
--------------
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/download.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_common_breadcrumb.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/xoops_version.php
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php 2014-04-18 16:03:16 UTC (rev 12459)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php 2014-04-18 16:11:12 UTC (rev 12460)
@@ -99,7 +99,7 @@
$imgurl = (isset($_POST["imgurl"]) && $_POST["imgurl"] != "blank.png") ? $myts -> addslashes($_POST["imgurl"]) : "";
}
// Formulize module support (2006/05/04) jpc
- if (wfdownloads_checkModule('formulize') < 300) {
+ if (wfdownloads_checkModule('formulize')) {
$formulize_fid = (isset($_POST["formulize_fid"])) ? (int) $_POST["formulize_fid"] : 0;
}
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php 2014-04-18 16:03:16 UTC (rev 12459)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php 2014-04-18 16:11:12 UTC (rev 12460)
@@ -84,7 +84,7 @@
$customArray['fid'] = $fid;
$customArray['formulize_mgr'] =& xoops_getmodulehandler('elements', 'formulize');
$customArray['groups'] = $xoopsUser ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
- $customArray['prevEntry'] = getEntryValues(
+ $customArray['prevEntry'] = getEntryValues( // is a 'formulize' function
$download->getVar('formulize_idreq'),
$customArray['formulize_mgr'],
$customArray['groups'],
@@ -94,9 +94,9 @@
$customArray['go_back'] = "";
$customArray['parentLinks'] = "";
if (wfdownloads_checkModule('formulize') < 300) {
- $owner = getEntryOwner($entry);
+ $owner = getEntryOwner($entry); // is a 'formulize' function
} else {
- $owner = getEntryOwner($entry, $fid);
+ $owner = getEntryOwner($entry, $fid); // is a 'formulize' function
}
$ownerGroups = $member_handler->getGroupsByUser($owner, false);
$customArray['owner_groups'] = $ownerGroups;
@@ -420,9 +420,9 @@
$entries[$fid][0] = $download->getVar('formulize_idreq');
if ($entries[$fid][0]) {
if (wfdownloads_checkModule('formulize') < 300) {
- $owner = getEntryOwner($entries[$fid][0]);
+ $owner = getEntryOwner($entries[$fid][0]); // is a 'formulize' function
} else {
- $owner = getEntryOwner($entries[$fid][0], $fid);
+ $owner = getEntryOwner($entries[$fid][0], $fid); // is a 'formulize' function
}
} else {
print "no idreq";
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php 2014-04-18 16:03:16 UTC (rev 12459)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php 2014-04-18 16:11:12 UTC (rev 12460)
@@ -169,11 +169,11 @@
if (wfdownloads_checkModule('formulize')) {
if (file_exists(XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php")) {
include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
- $fids = allowedForms();
+ $fids = allowedForms(); // is a 'formulize' function
$fids_select = array();
$fids_select[0] = _AM_WFDOWNLOADS_FFS_STANDARD_FORM;
foreach ($fids as $fid) {
- $fids_select[$fid] = getFormTitle($fid);
+ $fids_select[$fid] = getFormTitle($fid); // is a 'formulize' function
}
$formulize_forms = new XoopsFormSelect(_AM_WFDOWNLOADS_FFS_CUSTOM_FORM, "formulize_fid", $this->getVar('formulize_fid'));
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/download.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/download.php 2014-04-18 16:03:16 UTC (rev 12459)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/download.php 2014-04-18 16:11:12 UTC (rev 12460)
@@ -625,17 +625,23 @@
true
);
$sform->addElement(new XoopsFormHidden('size', $this->getVar('size', 'e')));
- $sform = compileElements(
- $customArray['fid'],
- $sform,
- $customArray['formulize_mgr'],
- $customArray['prevEntry'],
- $customArray['entry'],
- $customArray['go_back'],
- $customArray['parentLinks'],
- $customArray['owner_groups'],
- $customArray['groups']
- );
+ if (wfdownloads_checkModule('formulize')) {
+ include_once XOOPS_ROOT_PATH . "/modules/formulize/include/formdisplay.php";
+ include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
+ $sform = compileElements( // is a 'formulize' function
+ $customArray['fid'],
+ $sform,
+ $customArray['formulize_mgr'],
+ $customArray['prevEntry'],
+ $customArray['entry'],
+ $customArray['go_back'],
+ $customArray['parentLinks'],
+ $customArray['owner_groups'],
+ $customArray['groups']
+ );
+ } else {
+ // IN PROGRESS... formulize module not installed!!!
+ }
}
// download: dhistory
$sform->addElement(new XoopsFormTextArea(_MD_WFDOWNLOADS_HISTORYC, 'dhistory', $this->getVar('dhistory', 'e'), 7, 60), false);
@@ -884,7 +890,6 @@
);
} else {
// if we are using a custom form, then add in the form's elements here
-
// download: description
$description_tray = new XoopsFormElementTray(_MD_WFDOWNLOADS_DESCRIPTION, '<br />');
$options['name'] = 'description';
@@ -900,17 +905,23 @@
$sform->addElement($description_tray);
// download: size
$sform->addElement(new XoopsFormHidden('size', $this->getVar('size', 'e')));
- $sform = compileElements(
- $customArray['fid'],
- $sform,
- $customArray['formulize_mgr'],
- $customArray['prevEntry'],
- $customArray['entry'],
- $customArray['go_back'],
- $customArray['parentLinks'],
- $customArray['owner_groups'],
- $customArray['groups']
- );
+ if (wfdownloads_checkModule('formulize')) {
+ include_once XOOPS_ROOT_PATH . "/modules/formulize/include/formdisplay.php";
+ include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
+ $sform = compileElements( // is a 'formulize' function
+ $customArray['fid'],
+ $sform,
+ $customArray['formulize_mgr'],
+ $customArray['prevEntry'],
+ $customArray['entry'],
+ $customArray['go_back'],
+ $customArray['parentLinks'],
+ $customArray['owner_groups'],
+ $customArray['groups']
+ );
+ } else {
+ // IN PROGRESS... formulize module not installed!!!
+ }
}
// download: dhistory
$sform->addElement(new XoopsFormTextArea(_AM_WFDOWNLOADS_FILE_HISTORY, 'dhistory', $this->getVar('dhistory', 'e'), 7, 60), false);
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php 2014-04-18 16:03:16 UTC (rev 12459)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php 2014-04-18 16:11:12 UTC (rev 12460)
@@ -144,7 +144,7 @@
$customArray['fid'] = $fid;
$customArray['formulize_mgr'] = xoops_getmodulehandler('elements', 'formulize');
$customArray['groups'] = $xoopsUser ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
- $customArray['prevEntry'] = getEntryValues(
+ $customArray['prevEntry'] = getEntryValues( // is a 'formulize' function
$download->getVar('formulize_idreq'),
$customArray['formulize_mgr'],
$customArray['groups'],
@@ -154,9 +154,9 @@
$customArray['go_back'] = '';
$customArray['parentLinks'] = '';
if (wfdownloads_checkModule('formulize') < 300) {
- $owner = getEntryOwner($entry);
+ $owner = getEntryOwner($entry); // is a 'formulize' function
} else {
- $owner = getEntryOwner($entry, $fid);
+ $owner = getEntryOwner($entry, $fid); // is a 'formulize' function
}
$owner_groups = $member_handler->getGroupsByUser($owner, false);
$customArray['owner_groups'] = $owner_groups;
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_common_breadcrumb.html
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_common_breadcrumb.html 2014-04-18 16:03:16 UTC (rev 12459)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_common_breadcrumb.html 2014-04-18 16:11:12 UTC (rev 12460)
@@ -12,6 +12,5 @@
<span class="delimiter">></span>
<{/if}>
<{/foreach}>
- <hr/>
</div>
</div>
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/xoops_version.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/xoops_version.php 2014-04-18 16:03:16 UTC (rev 12459)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/xoops_version.php 2014-04-18 16:11:12 UTC (rev 12460)
@@ -42,9 +42,9 @@
$modversion['onUpdate'] = 'include/module.php';
$modversion['onUninstall'] = 'include/module.php';
-$modversion['date'] = '2014-04-14';
-$modversion['release_date'] = '2014/04/14';
-$modversion['releasedate'] = '2014-04-14';
+$modversion['date'] = '2014-04-18';
+$modversion['release_date'] = '2014/04/18';
+$modversion['releasedate'] = '2014-04-18';
$modversion['status'] = 'RC1';
$modversion['teammembers'] = "Bender, David, FrankBlack, Xpider, M0nty, Mithrandir, Marcan, felix[fx2024], Sudhaker, Jegelstaff";
|
|
From: <be...@us...> - 2014-04-19 19:30:58
|
Revision: 12462
http://sourceforge.net/p/xoops/svn/12462
Author: beckmi
Date: 2014-04-19 19:30:53 +0000 (Sat, 19 Apr 2014)
Log Message:
-----------
replacing template extensions from .html to .tpl
Modified Paths:
--------------
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/index.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/mimetypes.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/mirrors.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/permissions.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/ratings.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/reportsmodifications.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/reviews.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/brokenfile.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/breadcrumb.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads_lists.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/directorychecker.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/filechecker.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/index.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/mirror.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/newlist.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/ratefile.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/review.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/rss.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/singlefile.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/topten.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/viewcat.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/visit.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/xoops_version.php
Added Paths:
-----------
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/index.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_categorieslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_ip_logslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_mimetypeslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_mirrorslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_permissions.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_ratingslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_reviewslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/blocks/wfdownloads_block_new.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/blocks/wfdownloads_block_top.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/blocks/wfdownloads_block_top_by_cat.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_brokenfile.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_common_breadcrumb.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_common_letterschoice.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_disclaimer.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_download.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_footer.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_header.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_index.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_mirrors.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_newlistindex.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_ratefile.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_reviews.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_singlefile.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_submit.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_topten.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_viewcat.tpl
Removed Paths:
-------------
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_categorieslist.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_ip_logslist.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_mimetypeslist.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_mirrorslist.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_permissions.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_ratingslist.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_reviewslist.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/blocks/wfdownloads_block_new.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/blocks/wfdownloads_block_top.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/blocks/wfdownloads_block_top_by_cat.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_brokenfile.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_common_breadcrumb.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_common_letterschoice.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_disclaimer.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_download.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_footer.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_header.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_index.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_mirrors.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_newlistindex.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_ratefile.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_reviews.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_singlefile.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_submit.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_topten.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_viewcat.html
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -241,7 +241,7 @@
$sorted_categories = wfdownloads_sortCategories();
$GLOBALS['xoopsTpl']->assign('sorted_categories', $sorted_categories);
$GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML() );
- $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_categorieslist.html");
+ $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_categorieslist.tpl");
} else {
redirect_header("{$currentFile}?op=category.add", 1, _AM_WFDOWNLOADS_CCATEGORY_NOEXISTS);
}
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -794,7 +794,7 @@
} else {
// NOP
}
- $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_downloadslist.html");
+ $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_downloadslist.tpl");
include 'admin_footer.php';
break;
@@ -859,7 +859,7 @@
}
}
- $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_ip_logslist.html");
+ $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_ip_logslist.tpl");
include 'admin_footer.php';
break;
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/index.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/index.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/index.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -216,9 +216,7 @@
$indexAdmin->addConfigBoxLine(DirectoryChecker::getDirectoryStatus($path, 0777, $redirectFile));
$indexAdmin->addConfigBoxLine(FileChecker::getFileStatus($path . 'blank.gif', dirname(dirname(__FILE__)) . '/assets/images/blank.gif', $redirectFile));
$indexAdmin->addConfigBoxLine(DirectoryChecker::getDirectoryStatus($path . 'thumbs' . '/', 0777, $redirectFile));
-$indexAdmin->addConfigBoxLine(
- FileChecker::getFileStatus($path . 'thumbs' . '/' . 'blank.gif', dirname(dirname(__FILE__)) . '/assets/images/blank.gif', $redirectFile)
-);
+$indexAdmin->addConfigBoxLine(FileChecker::getFileStatus($path . 'thumbs' . '/' . 'blank.gif', dirname(dirname(__FILE__)) . '/assets/images/blank.gif', $redirectFile));
$indexAdmin->addConfigBoxLine('');
@@ -226,9 +224,7 @@
$indexAdmin->addConfigBoxLine(DirectoryChecker::getDirectoryStatus($path, 0777, $redirectFile));
$indexAdmin->addConfigBoxLine(FileChecker::getFileStatus($path . 'blank.gif', dirname(dirname(__FILE__)) . '/assets/images/blank.gif', $redirectFile));
$indexAdmin->addConfigBoxLine(DirectoryChecker::getDirectoryStatus($path . 'thumbs' . '/', 0777, $redirectFile));
-$indexAdmin->addConfigBoxLine(
- FileChecker::getFileStatus($path . 'thumbs' . '/' . 'blank.gif', dirname(dirname(__FILE__)) . '/assets/images/blank.gif', $redirectFile)
-);
+$indexAdmin->addConfigBoxLine(FileChecker::getFileStatus($path . 'thumbs' . '/' . 'blank.gif', dirname(dirname(__FILE__)) . '/assets/images/blank.gif', $redirectFile));
//---------------------------
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/mimetypes.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/mimetypes.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/mimetypes.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -218,7 +218,7 @@
$GLOBALS['xoopsTpl']->assign('allowAdminMimetypes', $allowAdminMimetypes);
$GLOBALS['xoopsTpl']->assign('allowUserMimetypes', $allowUserMimetypes);
- $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_mimetypeslist.html");
+ $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_mimetypeslist.tpl");
include 'admin_footer.php';
break;
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/mirrors.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/mirrors.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/mirrors.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -190,7 +190,7 @@
$xoopsTpl->assign('use_reviews', $wfdownloads->getConfig('enable_reviews'));
$xoopsTpl->assign('use_brokenreports', $wfdownloads->getConfig('enable_brokenreports'));
- $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_mirrorslist.html");
+ $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_mirrorslist.tpl");
include 'admin_footer.php';
break;
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/permissions.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/permissions.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/permissions.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -45,6 +45,6 @@
$GLOBALS['xoopsTpl']->assign('down_cat_form', $down_cat_form->render());
$GLOBALS['xoopsTpl']->assign('up_cat_form', $up_cat_form->render());
-$GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_permissions.html");
+$GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_permissions.tpl");
include 'admin_footer.php';
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/ratings.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/ratings.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/ratings.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -83,7 +83,7 @@
$xoopsTpl->assign('use_reviews', $wfdownloads->getConfig('enable_reviews'));
$xoopsTpl->assign('use_brokenreports', $wfdownloads->getConfig('enable_brokenreports'));
- $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_ratingslist.html");
+ $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_ratingslist.tpl");
include 'admin_footer.php';
break;
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/reportsmodifications.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/reportsmodifications.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/reportsmodifications.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -404,7 +404,7 @@
$xoopsTpl->assign('use_reviews', $wfdownloads->getConfig('enable_reviews'));
$xoopsTpl->assign('use_brokenreports', $wfdownloads->getConfig('enable_brokenreports'));
- $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_reportsmodificationslist.html");
+ $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_reportsmodificationslist.tpl");
include 'admin_footer.php';
break;
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/reviews.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/reviews.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/reviews.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -202,7 +202,7 @@
$xoopsTpl->assign('use_reviews', $wfdownloads->getConfig('enable_reviews'));
$xoopsTpl->assign('use_brokenreports', $wfdownloads->getConfig('enable_brokenreports'));
- $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_reviewslist.html");
+ $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_reviewslist.tpl");
include 'admin_footer.php';
break;
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/brokenfile.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/brokenfile.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/brokenfile.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -120,7 +120,7 @@
}
}
} else {
- $xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_brokenfile.html";
+ $xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_brokenfile.tpl";
include XOOPS_ROOT_PATH . '/header.php';
// Begin Main page Heading etc
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/breadcrumb.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/breadcrumb.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/breadcrumb.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -69,7 +69,7 @@
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");
+ $html = $breadcrumbTpl->fetch("db:" . $this->dirname . "_common_breadcrumb.tpl");
unset($breadcrumbTpl);
return $html;
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads_lists.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads_lists.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads_lists.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -117,7 +117,7 @@
}
break;
case "html":
- $types = "[.htm|.html|.xhtml|.php|.php3|.phtml|.txt]";
+ $types = "[.htm|.html|.xhtml|.php|.php3|.phtml|.txt|.tpl]";
if ($noselection) {
$filelist[""] = "No Selection";
}
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt 2014-04-19 19:30:53 UTC (rev 12462)
@@ -1,4 +1,5 @@
-<b><u>=> Version 3.23 Beta (2014-04-14)</u></b>
+<b><u>=> Version 3.23 Beta (2014-04-19)</u></b>
+- replaced template extensions from .html to .tpl (mamba)
- replaced Thickbox with MagnificPopup (mamba)
- fixed: source code for HTML5/CSS3 (mamba)
- moved module.css, and /js and /images to /assets folder (mamba)
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/directorychecker.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/directorychecker.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/directorychecker.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -22,7 +22,8 @@
//defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
-xoops_loadLanguage('directorychecker', 'wfdownloads');
+$mydirname = basename(dirname(dirname(__FILE__)));
+xoops_loadLanguage('directorychecker', $mydirname);
/**
* Class DirectoryChecker
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/filechecker.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/filechecker.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/filechecker.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -22,7 +22,8 @@
//defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
-xoops_loadLanguage('filechecker', 'wfdownloads');
+$mydirname = basename(dirname(dirname(__FILE__)));
+xoops_loadLanguage('filechecker', $mydirname);
/**
* Class FileChecker
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -364,7 +364,7 @@
$letterschoiceTpl = new XoopsTpl();
$letterschoiceTpl->caching = false; // Disable cache
$letterschoiceTpl->assign('alphabet', $alphabet_array);
- $html = $letterschoiceTpl->fetch("db:" . $wfdownloads->getModule()->dirname() . "_common_letterschoice.html");
+ $html = $letterschoiceTpl->fetch("db:" . $wfdownloads->getModule()->dirname() . "_common_letterschoice.tpl");
unset($letterschoiceTpl);
return $html;
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/index.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/index.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/index.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -45,7 +45,7 @@
$allowedDownCategoriesIds = $gperm_handler->getItemIds('WFDownCatPerm', $groups, $wfdownloads->getModule()->mid());
$allowedUpCategoriesIds = $gperm_handler->getItemIds('WFUpCatPerm', $groups, $wfdownloads->getModule()->mid());
-$xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_index.html";
+$xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_index.tpl";
include XOOPS_ROOT_PATH . '/header.php';
$xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery.js');
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/mirror.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/mirror.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/mirror.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -68,7 +68,7 @@
case "list" : // this case is not removed for backward compatibility issues
$start = WfdownloadsRequest::getInt('start', 0);
- $xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_mirrors.html";
+ $xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_mirrors.tpl";
include XOOPS_ROOT_PATH . '/header.php';
$xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery.js');
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/newlist.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/newlist.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/newlist.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -21,7 +21,7 @@
$currentFile = basename(__FILE__);
include 'header.php';
-$xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_newlistindex.html";
+$xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_newlistindex.tpl";
include XOOPS_ROOT_PATH . '/header.php';
$xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery.js');
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/ratefile.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/ratefile.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/ratefile.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -116,7 +116,7 @@
echo $rating->getHtmlErrors();
}
} else {
- $xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_ratefile.html";
+ $xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_ratefile.tpl";
include XOOPS_ROOT_PATH . '/header.php';
$xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery.js');
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/review.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/review.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/review.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -68,7 +68,7 @@
case "list" : // this care is not removed for backward compatibility issues
$start = WfdownloadsRequest::getInt('start', 0);
- $xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_reviews.html";
+ $xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_reviews.tpl";
include XOOPS_ROOT_PATH . '/header.php';
$xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery.js');
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/rss.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/rss.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/rss.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -28,7 +28,7 @@
$feed_type = 'rss';
$contents = ob_get_clean();
header('Content-Type:text/xml; charset=utf-8');
-$xoopsOption['template_main'] = 'system_' . $feed_type . '.html';
+$xoopsOption['template_main'] = 'system_' . $feed_type . '.tpl';
error_reporting(0);
include_once(XOOPS_ROOT_PATH . "/class/template.php");
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/singlefile.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/singlefile.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/singlefile.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -58,7 +58,7 @@
}
// Load Template
-$xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_singlefile.html";
+$xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_singlefile.tpl";
include XOOPS_ROOT_PATH . '/header.php';
$xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery.js');
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -71,7 +71,7 @@
switch ($op) {
case "download.disclaimer" :
// Show disclaimers
- $xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_disclaimer.html";
+ $xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_disclaimer.tpl";
include XOOPS_ROOT_PATH . '/header.php';
$xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery.js');
@@ -168,7 +168,7 @@
$sform = $download->getForm();
}
- $xoopsOption['template_main'] = 'wfdownloads_submit.html';
+ $xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_submit.tpl";
include XOOPS_ROOT_PATH . '/header.php';
$xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery.js');
Added: XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/index.html
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/index.html (rev 0)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/index.html 2014-04-19 19:30:53 UTC (rev 12462)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Deleted: XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_categorieslist.html
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_categorieslist.html 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_categorieslist.html 2014-04-19 19:30:53 UTC (rev 12462)
@@ -1,46 +0,0 @@
-<form action="categories.php" method="post" id="categoriesform">
- <fieldset>
- <legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFDOWNLOADS_FCATEGORY_CATEGORIES_LIST}></legend>
- <table class="outer">
- <tr>
- <th><{$smarty.const._AM_WFDOWNLOADS_FCATEGORY_ID}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_FCATEGORY_TITLE}></th>
- <th><{$smarty.const._AM_W...
[truncated message content] |
|
From: <be...@us...> - 2014-04-19 23:21:39
|
Revision: 12463
http://sourceforge.net/p/xoops/svn/12463
Author: beckmi
Date: 2014-04-19 23:21:34 +0000 (Sat, 19 Apr 2014)
Log Message:
-----------
Replacing Logical operators
Modified Paths:
--------------
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/menu.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top_by_cat.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/breadcrumb.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/dbupdater.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/download.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/ip_log.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/mimetype.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/mirror.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/modification.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/multicolumnsthemeform.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/rating.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/report.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/review.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/session.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/tree.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/xoopstree.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/comment_functions.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/common.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/directorychecker.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/filechecker.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/module.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/search.inc.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/index.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/xoops_version.php
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -300,7 +300,7 @@
// a) Are they actually changing the value of version, or is it the same?
// b) Are they actually modifying the record, or is this a new one?
// If both conditions are true, then trigger all three notifications related to modified records.
- if (!$thisIsANewRecord and ($download->getVar('version') != $version)) {
+ if (!$thisIsANewRecord && ($download->getVar('version') != $version)) {
// Trigger the three events related to modified files (one for the file, category, and global event categories respectively)
$tags = array();
$tags['FILE_NAME'] = $title;
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/menu.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/menu.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/menu.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
* @author Xoops Development Team
* @version svn:$id$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
$module_handler = xoops_gethandler('module');
$module = $module_handler->getByDirname(basename(dirname(dirname(__FILE__))));
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -27,7 +27,7 @@
* $options[1] = How many downloads are displayes
* Output : Returns the most recent or most popular downloads
*/
-defined("XOOPS_ROOT_PATH") or die('XOOPS root path not defined');
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(dirname(__FILE__)) . '/include/common.php';
/**
* @param $options
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top_by_cat.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top_by_cat.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top_by_cat.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -27,7 +27,7 @@
* $options[1] = How many downloads are displayes
* Output : Returns the most recent or most popular downloads
*/
-defined("XOOPS_ROOT_PATH") or die('XOOPS root path not defined');
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(dirname(__FILE__)) . '/include/common.php';
/**
* @param $options
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/breadcrumb.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/breadcrumb.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/breadcrumb.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -25,7 +25,7 @@
* $breadcrumb->addLink( 'bread 3', 'index3.php' );
* echo $breadcrumb->render();
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
/**
* Class WfdownloadsBreadcrumb
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
* @author Xoops Development Team
* @version svn:$id$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(dirname(__FILE__)) . '/include/common.php';
/**
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/dbupdater.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/dbupdater.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/dbupdater.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -38,7 +38,7 @@
* @author marcan <ma...@sm...>
* @link http://www.smartfactory.ca The SmartFactory
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
/**
* Class WfdownloadsTable
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/download.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/download.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/download.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
* @author Xoops Development Team
* @version svn:$id$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(dirname(__FILE__)) . '/include/common.php';
/**
@@ -1311,8 +1311,8 @@
xoops_comment_delete((int) $this->wfdownloads->getModule()->mid(), (int) $download->getVar('lid'));
// Added Formulize module support (2006/05/04) jpc - start
- if (wfdownloads_checkModule('formulize')) {
- if (file_exists(XOOPS_ROOT_PATH . '/modules/formulize/include/functions.php') AND $download->getVar('formulize_idreq') > 0) {
+ if (wfdownloads_checkModule('formulize')) { if (file_exists(XOOPS_ROOT_PATH . '/modules/formulize/include/functions.php') && $download->getVar('formulize_idreq') > 0) {
+
include_once XOOPS_ROOT_PATH . '/modules/formulize/include/functions.php';
//deleteFormEntries(array($download->getVar('formulize_idreq')));
$category = $this->wfdownloads->getHandler('category')->get($download->getVar('cid'));
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/ip_log.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/ip_log.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/ip_log.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
* @author Xoops Development Team
* @version svn:$id$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(dirname(__FILE__)) . '/include/common.php';
/**
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/mimetype.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/mimetype.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/mimetype.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -29,7 +29,7 @@
KEY mime_id (mime_id)
) ENGINE=MyISAM;
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(dirname(__FILE__)) . '/include/common.php';
/**
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/mirror.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/mirror.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/mirror.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
* @author Xoops Development Team
* @version svn:$id$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(dirname(__FILE__)) . '/include/common.php';
/**
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/modification.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/modification.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/modification.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
* @author Xoops Development Team
* @version svn:$id$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(dirname(__FILE__)) . '/include/common.php';
require_once XOOPS_ROOT_PATH . '/modules/wfdownloads/class/download.php';
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/multicolumnsthemeform.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/multicolumnsthemeform.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/multicolumnsthemeform.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -19,7 +19,7 @@
* @version $Id:$
*/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
xoops_load('XoopsForm');
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/rating.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/rating.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/rating.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
* @author Xoops Development Team
* @version svn:$id$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(dirname(__FILE__)) . '/include/common.php';
/**
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/report.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/report.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/report.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
* @author Xoops Development Team
* @version svn:$id$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(dirname(__FILE__)) . '/include/common.php';
/**
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/review.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/review.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/review.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
* @author Xoops Development Team
* @version svn:$id$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(dirname(__FILE__)) . '/include/common.php';
/**
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/session.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/session.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/session.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -19,7 +19,7 @@
* @author Harry Fuecks (PHP Anthology Volume II)
* @version $Id: session.php 10283 2012-11-28 13:39:36Z trabis $
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(dirname(__FILE__)) . '/include/common.php';
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/tree.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/tree.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/tree.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -19,7 +19,7 @@
* @version $Id:$
*/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once XOOPS_ROOT_PATH . '/class/tree.php';
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -19,7 +19,7 @@
* @author trabis <lus...@gm...>
* @version $Id:$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
/**
* Class WfdownloadsWfdownloads
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/xoopstree.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/xoopstree.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/xoopstree.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -17,7 +17,7 @@
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
/**
* Abstract base class for forms
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt 2014-04-19 23:21:34 UTC (rev 12463)
@@ -1,4 +1,5 @@
<b><u>=> Version 3.23 Beta (2014-04-19)</u></b>
+- replacing "or" with "||" (mamba)
- replaced template extensions from .html to .tpl (mamba)
- replaced Thickbox with MagnificPopup (mamba)
- fixed: source code for HTML5/CSS3 (mamba)
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/comment_functions.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/comment_functions.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/comment_functions.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -19,7 +19,7 @@
* @version svn:$id$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(__FILE__) . '/common.php';
// comment callback functions
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/common.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/common.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/common.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
* @author Xoops Development Team
* @version svn:$id$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
// This must contain the name of the folder in which reside Wfdownloads
define("WFDOWNLOADS_DIRNAME", basename(dirname(dirname(__FILE__))));
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/directorychecker.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/directorychecker.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/directorychecker.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -19,7 +19,7 @@
* @version svn:$id$
*/
-//defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+//defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
$mydirname = basename(dirname(dirname(__FILE__)));
@@ -98,7 +98,7 @@
{
$target = str_replace("..", "", $target);
// http://www.php.net/manual/en/function.mkdir.php
- return is_dir($target) or (self::createDirectory(dirname($target), $mode) and mkdir($target, $mode));
+ return is_dir($target) || (self::createDirectory(dirname($target), $mode) && mkdir($target, $mode));
}
/**
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/filechecker.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/filechecker.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/filechecker.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -19,7 +19,7 @@
* @version svn:$id$
*/
-//defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+//defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
$mydirname = basename(dirname(dirname(__FILE__)));
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
* @author Xoops Development Team
* @version svn:$id$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(__FILE__) . '/common.php';
/**
@@ -1698,7 +1698,7 @@
// Create swish-e.conf
$file = "{$swisheDocPath}/swish-e.conf";
- $fp = fopen($file, 'w') or die("<BR><BR>Unable to open {$file}");
+ $fp = fopen($file, 'w') || die("<BR><BR>Unable to open {$file}");
$line = "IndexDir {$swisheDocPath}/\n";
fputs($fp, $line);
$line = "IndexFile {$swisheDocPath}/index.swish-e\n";
@@ -1784,7 +1784,7 @@
// Opens a pipe to swish-e
$pipe_handler = popen("{$swish} -w {$search_query} -f {$search_index} {$search_params}", "r")
- or die("The search request generated an error...Please try again.");
+ || die("The search request generated an error...Please try again.");
//print "$swish -w $search_query -f $search_index $search_params<BR>";
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/module.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/module.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/module.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
* @author Xoops Development Team
* @version svn:$id$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once(XOOPS_ROOT_PATH . "/modules/wfdownloads/class/dbupdater.php");
include_once(XOOPS_ROOT_PATH . "/modules/wfdownloads/include/common.php");
@include_once(XOOPS_ROOT_PATH . "/modules/wfdownloads/language/" . $xoopsConfig['language'] . "/admin.php");
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/search.inc.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/search.inc.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/search.inc.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
* @author Xoops Development Team
* @version svn:$id$
*/
-defined("XOOPS_ROOT_PATH") or die('XOOPS root path not defined');
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(dirname(__FILE__)) . '/include/common.php';
/**
* @param $queryArray
@@ -56,7 +56,7 @@
// because count() returns 1 even if a supplied variable
// is not an array, we must check if $querryarray is really an array
$queryArray_count = 0;
- if ((is_array($queryArray) && $queryArray_count = count($queryArray)) OR $userId != 0) {
+ if ((is_array($queryArray) && $queryArray_count = count($queryArray)) || $userId != 0) {
// $userId != 0 added August 13 2007 -- ACCOUNTS FOR CASES WHERE THERE ARE NO QUERY TERMS BUT A USER ID IS PASSED -- FREEFORM SOLUTIONS
if ($queryArray_count == 0) {
$queryArray_count
@@ -98,7 +98,7 @@
}
// Set criteria for the captions that the user can see if necessary
- if (is_array($fids) AND count($fids) > 0) {
+ if (is_array($fids) && count($fids) > 0) {
$formulizeElementCriteria = new CriteriaCompo();
$formulizeElementCriteria->add(new Criteria('ele_display', 1), 'OR');
foreach ($userGroups as $group) {
@@ -165,7 +165,7 @@
}
// Make a criteria object that includes the custom form ids that were found, if any
- if (count($saved_ids) > 0 AND is_array($saved_ids)) {
+ if (count($saved_ids) > 0 && is_array($saved_ids)) {
$subs_plus_custom = new CriteriaCompo(new Criteria('formulize_idreq', '(' . implode(',', $saved_ids) . ')', 'IN'));
$subs_plus_custom->add($allSubCriterias, 'OR');
$queryCriteria->add($subs_plus_custom);
@@ -220,10 +220,10 @@
$storedLids = array();
// foreach (array_keys($downloads) as $i)
- for ($x = $offset; ($i < $limit AND $x < count($limitOffsetIndex)); ++$x) {
+ for ($x = $offset; ($i < $limit && $x < count($limitOffsetIndex)); ++$x) {
$lid = $limitOffsetIndex[$x];
$obj = $downloads[$lid];
- if (is_object($obj) AND !isset($storedLids[$lid])) {
+ if (is_object($obj) && !isset($storedLids[$lid])) {
$storedLids[$lid] = true;
$ret[$i]['image'] = "assets/images/size2.gif";
$ret[$i]['link'] = "singlefile.php?cid=" . $obj->getVar('cid') . "&lid={$lid}";
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/index.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/index.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/index.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -172,7 +172,7 @@
// Foreach subcategory
foreach (array_keys($allSubcategories) as $k) {
if (in_array($allSubcategories[$k]->getVar('cid'), $allowedDownCategoriesIds)) {
- $publishdate = (isset($listings['published'][$allSubcategories[$k]->getVar('cid')]) AND
+ $publishdate = (isset($listings['published'][$allSubcategories[$k]->getVar('cid')]) &&
$listings['published'][$allSubcategories[$k]->getVar('cid')] > $publishdate)
? $listings['published'][$allSubcategories[$k]->getVar('cid')] : $publishdate;
}
@@ -214,7 +214,7 @@
if (in_array($allSubcategories[$k]->getVar('cid'), $allowedDownCategoriesIds)) {
$download_count += isset($listings['count'][$allSubcategories[$k]->getVar('cid')])
? $listings['count'][$allSubcategories[$k]->getVar('cid')] : 0;
- if ($wfdownloads->getConfig('subcats') == 1 AND $allSubcategories[$k]->getVar('pid') == $mainCategories[$i]->getVar('cid')) {
+ if ($wfdownloads->getConfig('subcats') == 1 && $allSubcategories[$k]->getVar('pid') == $mainCategories[$i]->getVar('cid')) {
// if we are collecting subcat info for displaying, and this subcat is a first level child...
$subcategories[] = array(
'id' => $allSubcategories[$k]->getVar('cid'), // this definition is not removed for backward compatibility issues
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -369,7 +369,7 @@
// If both conditions are true, then trigger all three notifications related to modified records.
$version = !empty($_POST["version"]) ? trim($_POST["version"]) : 0;
- if (!$isANewRecord and ($download->getVar('version') != $version)) {
+ if (!$isANewRecord && ($download->getVar('version') != $version)) {
// Trigger the three events related to modified files (one for the file, category, and global event categories respectively)
$tags = array();
$tags['FILE_NAME'] = $title;
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/xoops_version.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/xoops_version.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/xoops_version.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -19,7 +19,7 @@
* @version svn:$id$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
$modversion['name'] = _MI_WFDOWNLOADS_NAME;
$modversion['version'] = 3.23;
|
|
From: <be...@us...> - 2014-04-20 09:47:12
|
Revision: 12464
http://sourceforge.net/p/xoops/svn/12464
Author: beckmi
Date: 2014-04-20 09:47:08 +0000 (Sun, 20 Apr 2014)
Log Message:
-----------
Small changes
Modified Paths:
--------------
XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top_by_cat.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/dbupdater.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/img_uploader.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads_lists.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/help/help.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/help/tips_tricks.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_categorieslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_download.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_singlefile.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_viewcat.tpl
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top_by_cat.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top_by_cat.php 2014-04-19 23:21:34 UTC (rev 12463)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top_by_cat.php 2014-04-20 09:47:08 UTC (rev 12464)
@@ -78,7 +78,8 @@
$block['topcats'][$cid]['imgurl'] = $wfdownloads->getHandler('category')->allCategories[$cid]->getVar('imgurl');
}
- foreach ($block['downloads'] as $key => $value) {
+//mb foreach ($block['downloads'] as $key => $value) {
+ foreach ($block['downloads'] as $value) {
$block['topcats'][$allsubcats_linked_totop[$value['cid']]]['downloads'][] = $value;
}
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php 2014-04-19 23:21:34 UTC (rev 12463)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php 2014-04-20 09:47:08 UTC (rev 12464)
@@ -345,7 +345,7 @@
if (!isset($this->topCategories[$topcid])) {
$this->topCategories[$topcid] = $topcid;
}
- foreach ($tree->getAllChild($topcid) as $key => $category) {
+ foreach ($tree->getAllChild($topcid) as /*$key =>*/ $category) {
$childrenids[] = $category->getVar('cid');
}
$childrenids = isset($childrenids) ? $childrenids : 0;
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/dbupdater.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/dbupdater.php 2014-04-19 23:21:34 UTC (rev 12463)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/dbupdater.php 2014-04-20 09:47:08 UTC (rev 12464)
@@ -96,7 +96,7 @@
* @param string $name name of the table
*
*/
- function WfdownloadsTable($name)
+ function __construct($name)
{
$this->_name = $name;
$this->_data = array();
@@ -511,7 +511,10 @@
class WfdownloadsDbupdater
{
- function WfdownloadsDbupdater()
+ /**
+ *
+ */
+ function __construct()
{
}
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/img_uploader.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/img_uploader.php 2014-04-19 23:21:34 UTC (rev 12463)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/img_uploader.php 2014-04-20 09:47:08 UTC (rev 12464)
@@ -90,9 +90,9 @@
*
* @internal param int $cmodvalue
*/
- function XoopsMediaImgUploader($uploadDir, $allowedMimeTypes = 0, $maxFileSize, $maxWidth = 0, $maxHeight = 0)
+ function __construct($uploadDir, $allowedMimeTypes = 0, $maxFileSize, $maxWidth = 0, $maxHeight = 0)
{
- $this->XoopsMediaUploader($uploadDir, $allowedMimeTypes, $maxFileSize, $maxWidth, $maxHeight);
+ parent::__construct($uploadDir, $allowedMimeTypes, $maxFileSize, $maxWidth, $maxHeight);
$this->randomfilename = false;
}
}
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads_lists.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads_lists.php 2014-04-19 23:21:34 UTC (rev 12463)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads_lists.php 2014-04-20 09:47:08 UTC (rev 12464)
@@ -42,7 +42,7 @@
* dir
*/
- function WfsLists($path = "uploads", $value = null, $selected = '', $size = 1, $emptyselect = 0, $type = 0, $prefix = '', $suffix = '')
+ function __construct($path = "uploads", $value = null, $selected = '', $size = 1, $emptyselect = 0, $type = 0, $prefix = '', $suffix = '')
{
$this->value = $value;
$this->selection = $selected;
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt 2014-04-19 23:21:34 UTC (rev 12463)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt 2014-04-20 09:47:08 UTC (rev 12464)
@@ -1,5 +1,6 @@
-<b><u>=> Version 3.23 Beta (2014-04-19)</u></b>
-- replacing "or" with "||" (mamba)
+<b><u>=> Version 3.23 Beta (2014-04-20)</u></b>
+- small changes based on testing tool feedback (mamba)
+- replacing "or" with "||", and "and" with "&&" (mamba)
- replaced template extensions from .html to .tpl (mamba)
- replaced Thickbox with MagnificPopup (mamba)
- fixed: source code for HTML5/CSS3 (mamba)
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php 2014-04-19 23:21:34 UTC (rev 12463)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php 2014-04-20 09:47:08 UTC (rev 12464)
@@ -43,7 +43,7 @@
return @round(
$bytes / pow(1000, ($i = floor(log($bytes, 1000)))),
$precision
- ) . ' ' . $unit[$i];
+ ) . ' ' . $unit[(int)$i];
}
/**
@@ -60,7 +60,7 @@
return @round(
$bytes / pow(1024, ($i = floor(log($bytes, 1024)))),
$precision
- ) . ' ' . $unit[$i];
+ ) . ' ' . $unit[(int)$i];
}
/**
@@ -575,7 +575,8 @@
function wfdownloads_formatErrors($errors = array())
{
$ret = '';
- foreach ($errors as $key => $value) {
+//mb foreach ($errors as $key => $value) {
+ foreach ($errors as $value) {
$ret .= "<br /> - {$value}";
}
@@ -698,7 +699,7 @@
*/
function wfdownloads_serverStats()
{
- $wfdownloads = WfdownloadsWfdownloads::getInstance();
+//mb $wfdownloads = WfdownloadsWfdownloads::getInstance();
global $xoopsDB;
$html = "";
$sql = "SELECT metavalue";
@@ -1487,6 +1488,7 @@
flush();
}
if (connection_status() !== CONNECTION_NORMAL) {
+ //TODO traslation
echo "Connection aborted";
}
fclose($handle);
@@ -1496,9 +1498,11 @@
readfile($filePath);
}
} else {
+ //TODO traslation
echo 'File does not exist!';
}
} else {
+ //TODO traslation
echo 'There is no file to download!';
}
}
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/help/help.html
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/help/help.html 2014-04-19 23:21:34 UTC (rev 12463)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/help/help.html 2014-04-20 09:47:08 UTC (rev 12464)
@@ -61,7 +61,6 @@
<h4 class="odd">Tutorial</h4>
<p class="even">
- You can see more info <a href="<{$xoops_url}>/modules/wfdownloads/docs/english/readme.html" title="Wfdownloads Detailed Help"
- alt="Wfdownloads Detailed Help"/> here</a>.
+ You can see more info <a href="<{$xoops_url}>/modules/wfdownloads/docs/english/readme.html" title="Wfdownloads Detailed Help" alt="Wfdownloads Detailed Help"/> here</a>.
</p>
</div>
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/help/tips_tricks.html
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/help/tips_tricks.html 2014-04-19 23:21:34 UTC (rev 12463)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/help/tips_tricks.html 2014-04-20 09:47:08 UTC (rev 12464)
@@ -1,24 +1,22 @@
<div id="help-template" class="outer">
<h1 class="head">Help:
- <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/wfdownloads/admin/index.php" title="Back to the administration of Wfdownloads">
- Wfdownloads
- <img src="<{xoAdminIcons home.png}>" alt="Back to the Administration of Wfdownloads"/>
- </a>
+ <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/wfdownloads/admin/index.php" title="Back to the administration of Wfdownloads">Wfdownloads<img src="<{xoAdminIcons home.png}>" alt="Back to the Administration of Wfdownloads"/></a>
</h1>
<h4>Upload files</h4>
+
+ <div class="even">
+ <span style="font-weight: bold;">How set maximum upload file size limit?</span>
+ </div>
+ <div class="odd">
+ <p>Maximum upload file size limit is the mimimum value between:</p>
+ <ul>
+ <li>Max upload size permitted: <span style="font-weight: bold;">upload_max_filesize</span> directive in php.ini</li>
+ <li>Max post size permitted: <span style="font-weight: bold;">post_max_size</span> directive in php.ini</li>
+ <li>Memory limit: <span style="font-weight: bold;">memory_limit directive</span> in php.ini</li>
+ <li>Module preferences: <span style="font-weight: bold;">[upload files] Max file size (bytes)</span></li>
+ </ul>
<div class="even">
- <span style="font-weight: bold;">How set maximum upload file size limit?</span>
- </div>
- <div class="odd">
- <p>Maximum upload file size limit is the mimimum value between:</p>
- <ul>
- <li>Max upload size permitted: <span style="font-weight: bold;">upload_max_filesize</span> directive in php.ini</li>
- <li>Max post size permitted: <span style="font-weight: bold;">post_max_size</span> directive in php.ini</li>
- <li>Memory limit: <span style="font-weight: bold;">memory_limit directive</span> in php.ini</li>
- <li>Module preferences: <span style="font-weight: bold;">[upload files] Max file size (bytes)</span></li>
- </ul>
- <div class="even">
<span style="font-weight: bold;">How can I upload files bigger than maximum upload file size limit?</span>
</div>
<div class="odd">
@@ -27,18 +25,21 @@
<li>use an ftp client to upload file in <span style="font-weight: bold;">Module preferences > [upload files] Upload directory</span> directory</li>
<li>create a new Download and fill
<ul>
- <li><span style="font-weight: bold;">"Local file name"</span> field with the path relative to <span style="font-weight: bold;">Module preferences > [upload files] Upload directory</span></li>
+ <li><span style="font-weight: bold;">"Local file name"</span> field with the path relative to <span style="font-weight: bold;">Module preferences > [upload files] Upload directory</span>
+ </li>
<li><span style="font-weight: bold;">"File type"</span> field with the file mimetype</li>
</ul>
</li>
</ol>
</div>
- <h4>Download files</h4>
+ <h4>Download files</h4>
+
<div class="even">
<span style='font-weight: bold;'>Are there some limits in download file size?</span>
</div>
<div class="odd">
<p>No, this module split a big file and serve it chunk by chunk, to avoid errors by exceeding the memory_limit setting.</p>
</div>
+ </div>
</div>
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_categorieslist.tpl
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_categorieslist.tpl 2014-04-19 23:21:34 UTC (rev 12463)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_categorieslist.tpl 2014-04-20 09:47:08 UTC (rev 12464)
@@ -10,27 +10,23 @@
<th><{$smarty.const._AM_WFDOWNLOADS_ACTION}></th>
</tr>
<{foreach item=sorted_category from=$sorted_categories}>
- <tr class="<{cycle values='even, odd'}>">
- <td><{$sorted_category.category.cid}></td>
- <td>
- <{section name=indent loop=$sorted_category.level-1 step=1}}>-<{/section}>
- <a href='../viewcat.php?cid=<{$sorted_category.category.cid}>'><{$sorted_category.category.title}></a>
- </td>
- <td>
- <input type="text" name="new_weights[<{$sorted_category.category.cid}>]" size="5" maxlength="5"
- value="<{$sorted_category.category.weight}>"/>
- </td>
- <td><{$sorted_category.category.description}></td>
- <td align='center'>
- <a href="?op=category.edit&cid=<{$sorted_category.category.cid}>" title="<{$smarty.const._EDIT}>"><img
- src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._EDIT}>" alt="<{$smarty.const._EDIT}>"/></a>
- <a href="?op=category.delete&cid=<{$sorted_category.category.cid}>" title="<{$smarty.const._DELETE}>"><img
- src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._DELETE}>" alt="<{$smarty.const._DELETE}>"/></a>
- <a href="?op=category.move&cid=<{$sorted_category.category.cid}>" title="<{$smarty.const._AM_WFDOWNLOADS_BMOVE}>"><img
- src="<{xoModuleIcons16 forward.png}>" title="<{$smarty.const._AM_WFDOWNLOADS_BMOVE}>"
- alt="<{$smarty.const._AM_WFDOWNLOADS_BMOVE}>"/></a>
- </td>
- </tr>
+ <tr class="<{cycle values='even, odd'}>">
+ <td><{$sorted_category.category.cid}></td>
+ <td>
+ <{section name=indent loop=$sorted_category.level-1 step=1}>-<{/section}>
+ <a href='../viewcat.php?cid=<{$sorted_category.category.cid}>'><{$sorted_category.category.title}></a>
+ </td>
+ <td>
+ <input type="text" name="new_weights[<{$sorted_category.category.cid}>]" size="5" maxlength="5"
+ value="<{$sorted_category.category.weight}>"/>
+ </td>
+ <td><{$sorted_category.category.description}></td>
+ <td align='center'>
+ <a href="?op=category.edit&cid=<{$sorted_category.category.cid}>" title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._EDIT}>" alt="<{$smarty.const._EDIT}>"/></a>
+ <a href="?op=category.delete&cid=<{$sorted_category.category.cid}>" title="<{$smarty.const._DELETE}>"><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._DELETE}>" alt="<{$smarty.const._DELETE}>"/></a>
+ <a href="?op=category.move&cid=<{$sorted_category.category.cid}>" title="<{$smarty.const._AM_WFDOWNLOADS_BMOVE}>"><img src="<{xoModuleIcons16 forward.png}>" title="<{$smarty.const._AM_WFDOWNLOADS_BMOVE}>" alt="<{$smarty.const._AM_WFDOWNLOADS_BMOVE}>"/></a>
+ </td>
+ </tr>
<{/foreach}>
<tr>
<td colspan="1"> </td>
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.tpl
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.tpl 2014-04-19 23:21:34 UTC (rev 12463)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.tpl 2014-04-20 09:47:08 UTC (rev 12464)
@@ -2,326 +2,317 @@
<fieldset>
<legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFDOWNLOADS_MINDEX_PUBLISHEDDOWN}></legend>
<{if ($published_downloads_count == 0)}>
- <{$smarty.const._AM_WFDOWNLOADS_MINDEX_NODOWNLOADSFOUND}>
+ <{$smarty.const._AM_WFDOWNLOADS_MINDEX_NODOWNLOADSFOUND}>
<{else}>
- <table class="outer">
- <tr>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ID}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_TITLE}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_FCATEGORY_TITLE}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_POSTER}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_SUBMITTED}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ONLINESTATUS}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_PUBLISHED}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_LOG}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ACTION}></th>
- </tr>
-
- <form id='form_filter' enctype='multipart/form-data' method='post' action='' name='form_filter'>
+ <table class="outer">
<tr>
- <td> </td>
- <td>
- <select id='filter_title_condition' title='<{$smarty.const._AM_WFDOWNLOADS_SEARCH}>' name='filter_title_condition' size='1'>
- <option value='='
- <{if $filter_title_condition == '='}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_EQUAL}></option>
- <option value='LIKE'
- <{if $filter_title_condition == 'LIKE'}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_CONTAINS}></option>
- </select>
- <input id='filter_title' type='text' value='<{$filter_title}>' maxlength='100' size='15' title='' name='filter_title'>
- </td>
- <td>
- <select id='filter_category_title_condition' title='<{$smarty.const._AM_WFDOWNLOADS_SEARCH}>'
- name='filter_category_title_condition' size='1'>
- <option value='='
- <{if $filter_category_title_condition ==
- '='}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_EQUAL}></option>
- <option value='LIKE'
- <{if $filter_category_title_condition ==
- 'LIKE'}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_CONTAINS}></option>
- </select>
- <input id='filter_category_title' type='text' value='<{$filter_category_title}>' maxlength='100' size='15' title=''
- name='filter_category_title'>
- </td>
- <td><{$filter_submitter_select}></td>
- <td>
- <{*
- <select id='filter_date_condition' title='<{$smarty.const._AM_WFDOWNLOADS_SEARCH}>' name='filter_date_condition' size='1'>
- <option value='='
- <{if $filter_date_condition == '='}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_EQUAL}></option>
- <option value='>'
- <{if $filter_date_condition == '>'}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_GREATERTHAN}></option>
- <option value='<'
- <{if $filter_date_condition == '<'}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_LESSTHAN}></option>
- </select>
- <{$filter_date_select}>
- *}>
- </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td align='center'>
- <input id='submit' class='formButton' type='submit' title='<{$smarty.const._AM_WFDOWNLOADS_FILTER}>'
- value='<{$smarty.const._AM_WFDOWNLOADS_FILTER}>' name='submit'>
- </td>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ID}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_TITLE}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_FCATEGORY_TITLE}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_POSTER}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_SUBMITTED}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ONLINESTATUS}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_PUBLISHED}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_LOG}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ACTION}></th>
</tr>
- <input id='op' type='hidden' value='downloads.filter' name='op'>
- </form>
- <{foreach item=download from=$published_downloads}>
- <tr class="<{cycle values='even, odd'}>">
- <td align='center'><{$download.lid}></td>
- <td>
- <a href='../singlefile.php?cid=<{$download.cid}>&lid=<{$download.lid}>'><{$download.title}></a>
- </td>
- <td>
- <a href='../viewcat.php?cid=<{$download.cid}>'><{$download.category_title}></a>
- </td>
- <td><{$download.submitter_uname}></td>
- <td><{$download.published_timestamp}></td>
- <td align='center'>
- <{if $download.offline}>
- <img src="<{xoModuleIcons16 0.png}>"/>
- <{else}>
- <img src="<{xoModuleIcons16 1.png}>"/>
- <{/if}>
- </td>
- <td align='center'>
- <{if $download.published}>
- <img src="<{xoModuleIcons16 1.png}>"/>
- <!--<{$download.published_timestamp}>-->
- <{else}>
- <img src="<{xoModuleIcons16 0.png}>"/>
- <{/if}>
- </td>
- <td>
- <a href='?op=ip_logs.list&lid=<{$download.lid}>' title="<{$smarty.const._AM_WFDOWNLOADS_IP_LOGS}>"><{$smarty.const._AM_WFDOWNLOADS_IP_LOGS}></a>
- </td>
- <td align='center'>
- <a href='?op=download.add&lid=<{$download.lid}>' title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>"
- title="<{$smarty.const._EDIT}>"
- alt="<{$smarty.const._EDIT}>"/></a>
- <a href='?op=download.delete&lid=<{$download.lid}>' title="<{$smarty.const._DELETE}>"><img src="<{xoModuleIcons16 delete.png}>"
- title="<{$smarty.const._DELETE}>"
- alt="<{$smarty.const._DELETE}>"/></a>
- </td>
- </tr>
- <{/foreach}>
- </table>
- <{$published_downloads_pagenav}>
+ <form id='form_filter' enctype='multipart/form-data' method='post' action='' name='form_filter'>
+ <tr>
+ <td> </td>
+ <td>
+ <select id='filter_title_condition' title='<{$smarty.const._AM_WFDOWNLOADS_SEARCH}>' name='filter_title_condition' size='1'>
+ <option value='='<{if $filter_title_condition == '='}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_EQUAL}></option>
+ <option value='LIKE'<{if $filter_title_condition == 'LIKE'}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_CONTAINS}></option>
+ </select>
+ <input id='filter_title' type='text' value='<{$filter_title}>' maxlength='100' size='15' title='' name='filter_title'>
+ </td>
+ <td>
+ <select id='filter_category_title_condition' title='<{$smarty.const._AM_WFDOWNLOADS_SEARCH}>' name='filter_category_title_condition' size='1'>
+ <option value='='<{if $filter_category_title_condition =='='}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_EQUAL}></option>
+ <option value='LIKE' <{if $filter_category_title_condition =='LIKE'}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_CONTAINS}></option>
+ </select>
+ <input id='filter_category_title' type='text' value='<{$filter_category_title}>' maxlength='100' size='15' title='' name='filter_category_title'>
+ </td>
+ <td><{$filter_submitter_select}></td>
+ <td>
+ <{*
+ <select id='filter_date_condition' title='<{$smarty.const._AM_WFDOWNLOADS_SEARCH}>' name='filter_date_condition' size='1'>
+ <option value='='
+ <{if $filter_date_condition == '='}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_EQUAL}></option>
+ <option value='>'
+ <{if $filter_date_condition == '>'}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_GREATERTHAN}></option>
+ <option value='<'
+ <{if $filter_date_condition == '<'}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_LESSTHAN}></option>
+ </select>
+ <{$filter_date_select}>
+ *}>
+ </td>
+ <td> </td>
+ <td> </td>
+ <td> </td>
+ <td align='center'>
+ <input id='submit' class='formButton' type='submit' title='<{$smarty.const._AM_WFDOWNLOADS_FILTER}>' value='<{$smarty.const._AM_WFDOWNLOADS_FILTER}>' name='submit'>
+ </td>
+ </tr>
+ <input id='op' type='hidden' value='downloads.filter' name='op'>
+ </form>
+
+ <{foreach item=download from=$published_downloads}>
+ <tr class="<{cycle values='even, odd'}>">
+ <td align='center'><{$download.lid}></td>
+ <td>
+ <a href='../singlefile.php?cid=<{$download.cid}>&lid=<{$download.lid}>'><{$download.title}></a>
+ </td>
+ <td>
+ <a href='../viewcat.php?cid=<{$download.cid}>'><{$download.category_title}></a>
+ </td>
+ <td><{$download.submitter_uname}></td>
+ <td><{$download.published_timestamp}></td>
+ <td align='center'>
+ <{if $download.offline}>
+ <img src="<{xoModuleIcons16 0.png}>"/>
+ <{else}>
+ <img src="<{xoModuleIcons16 1.png}>"/>
+ <{/if}>
+ </td>
+ <td align='center'>
+ <{if $download.published}>
+ <img src="<{xoModuleIcons16 1.png}>"/>
+ <!--<{$download.published_timestamp}>-->
+ <{else}>
+ <img src="<{xoModuleIcons16 0.png}>"/>
+ <{/if}>
+ </td>
+ <td>
+ <a href='?op=ip_logs.list&lid=<{$download.lid}>' title="<{$smarty.const._AM_WFDOWNLOADS_IP_LOGS}>"><{$smarty.const._AM_WFDOWNLOADS_IP_LOGS}></a>
+ </td>
+ <td align='center'>
+ <a href='?op=download.add&lid=<{$download.lid}>' title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>"
+ title="<{$smarty.const._EDIT}>"
+ alt="<{$smarty.const._EDIT}>"/></a>...
[truncated message content] |
|
From: <be...@us...> - 2014-11-22 04:11:25
|
Revision: 12863
http://sourceforge.net/p/xoops/svn/12863
Author: beckmi
Date: 2014-11-22 04:11:17 +0000 (Sat, 22 Nov 2014)
Log Message:
-----------
replacing dirname(__FILE__), replacing WfdownloadsRequest with XoopsRequest
Modified Paths:
--------------
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/about.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/admin_header.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/clone.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/images.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/import.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/index.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/indexpage.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/menu.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/mimetypes.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/mirrors.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/permissions.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/ratings.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/reportsmodifications.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/reviews.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top_by_cat.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/brokenfile.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/breadcrumb.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/dbupdater.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/download.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/img_uploader.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/ip_log.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/mimetype.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/mirror.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/modification.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/rating.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/report.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/review.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/session.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads_lists.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/xoopstree.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/comment_delete.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/comment_edit.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/comment_new.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/comment_post.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/comment_reply.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/branches/mamba/wfdownloads/header.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/comment_functions.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/common.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/constants.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/directorychecker.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/filechecker.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/notification.inc.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/search.inc.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/index.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/admin.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/help/tips_tricks.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/main.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/modinfo.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/mirror.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/newlist.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/notification_update.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/ratefile.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/review.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/rss.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/singlefile.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/sql/mysql.sql
XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_download.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_newlistindex.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_singlefile.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/topten.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/viewcat.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/visit.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/xoops_version.php
Added Paths:
-----------
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/swishe.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/module_logo_blank.png
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/oninstall.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/onuninstall.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/onupdate.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_am_categorieslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_am_downloadslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_am_ip_logslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_am_mimetypeslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_am_mirrorslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_am_permissions.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_am_ratingslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_am_reportsmodificationslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_am_reviewslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/blocks/wfdownloads_mb_new.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/blocks/wfdownloads_mb_top.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/blocks/wfdownloads_mb_top_by_cat.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_co_breadcrumb.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_co_letterschoice.tpl
Removed Paths:
-------------
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/object.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/request.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/module.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_categorieslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_ip_logslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_mimetypeslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_mirrorslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_permissions.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_ratingslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_reviewslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/blocks/wfdownloads_block_new.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/blocks/wfdownloads_block_top.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/blocks/wfdownloads_block_top_by_cat.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_common_breadcrumb.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_common_letterschoice.tpl
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/about.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/about.php 2014-11-20 16:30:07 UTC (rev 12862)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/about.php 2014-11-22 04:11:17 UTC (rev 12863)
@@ -18,7 +18,7 @@
* @author Xoops Development Team
* @version svn:$id$
*/
-include_once dirname(__FILE__) . '/admin_header.php';
+include_once __DIR__ . '/admin_header.php';
xoops_cp_header();
@@ -27,4 +27,4 @@
echo $aboutAdmin->addNavigation('about.php');
echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
-include 'admin_footer.php';
+include_once __DIR__ . '/admin_footer.php';
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/admin_header.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/admin_header.php 2014-11-20 16:30:07 UTC (rev 12862)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/admin_header.php 2014-11-22 04:11:17 UTC (rev 12863)
@@ -18,8 +18,8 @@
* @author Xoops Development Team
* @version svn:$id$
*/
-include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
-include_once dirname(dirname(__FILE__)) . '/include/common.php';
+include_once dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
+include_once dirname(__DIR__) . '/include/common.php';
// Include xoops admin header
include_once XOOPS_ROOT_PATH . '/include/cp_header.php';
@@ -35,6 +35,6 @@
xoops_loadLanguage('main', $wfdownloads->getModule()->dirname());
if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
- include_once(XOOPS_ROOT_PATH . '/class/template.php');
+ include_once XOOPS_ROOT_PATH . '/class/template.php';
$xoopsTpl = new XoopsTpl();
}
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php 2014-11-20 16:30:07 UTC (rev 12862)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php 2014-11-22 04:11:17 UTC (rev 12863)
@@ -19,47 +19,65 @@
* @version svn:$id$
*/
$currentFile = basename(__FILE__);
-include_once dirname(__FILE__) . '/admin_header.php';
+include_once __DIR__ . '/admin_header.php';
-$op = WfdownloadsRequest::getString('op', 'categories.list');
+// Check directories
+if (!is_dir($wfdownloads->getConfig('uploaddir'))) {
+ redirect_header('index.php', 4, _AM_WFDOWNLOADS_ERROR_UPLOADDIRNOTEXISTS);
+ exit();
+}
+if (!is_dir(XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('mainimagedir'))) {
+ redirect_header('index.php', 4, _AM_WFDOWNLOADS_ERROR_MAINIMAGEDIRNOTEXISTS);
+ exit();
+}
+if (!is_dir(XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('screenshots'))) {
+ redirect_header('index.php', 4, _AM_WFDOWNLOADS_ERROR_SCREENSHOTSDIRNOTEXISTS);
+ exit();
+}
+if (!is_dir(XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('catimage'))) {
+ redirect_header('index.php', 4, _AM_WFDOWNLOADS_ERROR_CATIMAGEDIRNOTEXISTS);
+ exit();
+}
+
+$op = XoopsRequest::getString('op', 'categories.list');
switch ($op) {
- case "category.move":
- case "move":
- $ok = WfdownloadsRequest::getBool('ok', false, 'POST');
+ case 'category.move':
+ case 'move':
+ $ok = XoopsRequest::getBool('ok', false, 'POST');
if ($ok == false) {
- $cid = WfdownloadsRequest::getInt('cid', 0);
+ $cid = XoopsRequest::getInt('cid', 0);
wfdownloads_xoops_cp_header();
include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
- $sform = new XoopsThemeForm(_AM_WFDOWNLOADS_CCATEGORY_MOVE, "move", xoops_getenv('PHP_SELF'));
+ $sform = new XoopsThemeForm(_AM_WFDOWNLOADS_CCATEGORY_MOVE, 'move', xoops_getenv('PHP_SELF'));
- $categories = $wfdownloads->getHandler('category')->getObjects();
- $mytree = new XoopsObjectTree($categories, "cid", "pid");
- $sform->addElement(new XoopsFormLabel(_AM_WFDOWNLOADS_BMODIFY, $mytree->makeSelBox('target', 'title')));
+ $categoryObjs = $wfdownloads->getHandler('category')->getObjects();
+ $categoryObjsTree = new XoopsObjectTree($categoryObjs, 'cid', 'pid');
+ $sform->addElement(new XoopsFormLabel(_AM_WFDOWNLOADS_BMODIFY, $categoryObjsTree->makeSelBox('target', 'title')));
$create_tray = new XoopsFormElementTray('', '');
- $create_tray -> addElement(new XoopsFormHidden('source', $cid));
- $create_tray -> addElement(new XoopsFormHidden('ok', true));
- $create_tray -> addElement(new XoopsFormHidden('op', 'category.move'));
+ $create_tray->addElement(new XoopsFormHidden('source', $cid));
+ $create_tray->addElement(new XoopsFormHidden('ok', true));
+ $create_tray->addElement(new XoopsFormHidden('op', 'category.move'));
$butt_save = new XoopsFormButton('', '', _AM_WFDOWNLOADS_BMOVE, 'submit');
- $butt_save -> setExtra('onclick="this.form.elements.op.value=\'category.move\'"');
- $create_tray -> addElement($butt_save);
+ $butt_save->setExtra('onclick="this.form.elements.op.value=\'category.move\'"');
+ $create_tray->addElement($butt_save);
$butt_cancel = new XoopsFormButton('', '', _AM_WFDOWNLOADS_BCANCEL, 'submit');
- $butt_cancel -> setExtra('onclick="this.form.elements.op.value=\'cancel\'"');
+ $butt_cancel->setExtra('onclick="this.form.elements.op.value=\'cancel\'"');
$create_tray -> addElement($butt_cancel);
- $sform -> addElement($create_tray);
- $sform -> display();
+ $sform->addElement($create_tray);
+ $sform->display();
xoops_cp_footer();
} else {
- $source = WfdownloadsRequest::getInt('source', 0, 'POST');
- $target = WfdownloadsRequest::getInt('target', 0, 'POST');
+ $source = XoopsRequest::getInt('source', 0, 'POST');
+ $target = XoopsRequest::getInt('target', 0, 'POST');
if ($target == $source) {
redirect_header($currentFile . "?op=category.move&ok=0&cid={$source}", 5, _AM_WFDOWNLOADS_CCATEGORY_MODIFY_FAILED);
}
if (!$target) {
redirect_header($currentFile . "?op=category.move&ok=0&cid={$source}", 5, _AM_WFDOWNLOADS_CCATEGORY_MODIFY_FAILEDT);
}
- $result = $wfdownloads->getHandler('download')->updateAll("cid", $target, new Criteria("cid", $source), true);
+ $result = $wfdownloads->getHandler('download')->updateAll('cid', $target, new Criteria('cid', $source), true);
if (!$result) {
$error = _AM_WFDOWNLOADS_DBERROR;
trigger_error($error, E_USER_ERROR);
@@ -69,74 +87,73 @@
}
break;
- case "category.save" :
- case "addCat" :
- $cid = WfdownloadsRequest::getInt('cid', 0, 'POST');
- $pid = WfdownloadsRequest::getInt('pid', 0, 'POST');
- $weight = (isset($_POST["weight"]) && $_POST["weight"] > 0) ? (int) $_POST["weight"] : 0;
+ case 'category.save':
+ case 'addCat':
+ $cid = XoopsRequest::getInt('cid', 0, 'POST');
+ $pid = XoopsRequest::getInt('pid', 0, 'POST');
+ $weight = (isset($_POST['weight']) && $_POST['weight'] > 0) ? (int) $_POST["weight"] : 0;
$down_groups = isset($_POST['groups']) ? $_POST['groups'] : array();
$up_groups = isset($_POST['up_groups']) ? $_POST['up_groups'] : array();
- $spotlighthis = (isset($_POST["lid"])) ? (int) $_POST["lid"] : 0;
- $spotlighttop = (isset($_POST["spotlighttop"]) && ($_POST["spotlighttop"] == 1)) ? 1 : 0;
+ $spotlighthis = (isset($_POST['lid'])) ? (int) $_POST['lid'] : 0;
+ $spotlighttop = (isset($_POST['spotlighttop']) && ($_POST['spotlighttop'] == 1)) ? 1 : 0;
- include_once XOOPS_ROOT_PATH.'/class/uploader.php';
+ include_once XOOPS_ROOT_PATH . '/class/uploader.php';
$allowedMimetypes = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png');
- $maxFileSize = $wfdownloads->getConfig('maxfilesize');
- $maxImgWidth = $wfdownloads->getConfig('maximgwidth');
- $maxImgHeight = $wfdownloads->getConfig('maximgheight');
- $uploadDirectory = XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('catimage');
+ $imgurl = 'blank.png';
+ $maxFileSize = $wfdownloads->getConfig('maxfilesize');
+ $maxImgWidth = $wfdownloads->getConfig('maximgwidth');
+ $maxImgHeight = $wfdownloads->getConfig('maximgheight');
+ $uploadDirectory = XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('catimage');
$uploader = new XoopsMediaUploader($uploadDirectory, $allowedMimetypes, $maxFileSize, $maxImgWidth, $maxImgHeight);
if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
$uploader->setTargetFileName('wfdownloads_' . uniqid(time()) . '--' . strtolower($_FILES['uploadfile']['name']));
$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
if (!$uploader->upload()) {
$errors = $uploader->getErrors();
- redirect_header("javascript:history.go(-1)",3, $errors);
+ redirect_header('javascript:history.go(-1)',3, $errors);
} else {
$imgurl = $uploader->getSavedFileName();
}
} else {
- $imgurl = (isset($_POST["imgurl"]) && $_POST["imgurl"] != "blank.png") ? $myts -> addslashes($_POST["imgurl"]) : "";
+ $imgurl = (isset($_POST['imgurl']) && $_POST['imgurl'] != 'blank.png') ? $myts -> addslashes($_POST['imgurl']) : '';
}
- // Formulize module support (2006/05/04) jpc
- if (wfdownloads_checkModule('formulize')) {
- $formulize_fid = (isset($_POST["formulize_fid"])) ? (int) $_POST["formulize_fid"] : 0;
- }
if (!$cid) {
- $category = $wfdownloads->getHandler('category')->create();
+ $categoryObj = $wfdownloads->getHandler('category')->create();
} else {
- $category = $wfdownloads->getHandler('category')->get($cid);
- $childcats = $wfdownloads->getHandler('category')->getChildCats($category);
+ $categoryObj = $wfdownloads->getHandler('category')->get($cid);
+ $childcats = $wfdownloads->getHandler('category')->getChildCats($categoryObj);
if ($pid == $cid || in_array($pid, array_keys($childcats))) {
- $category->setErrors(_AM_WFDOWNLOADS_CCATEGORY_CHILDASPARENT);
+ $categoryObj->setErrors(_AM_WFDOWNLOADS_CCATEGORY_CHILDASPARENT);
}
}
- $category->setVar('title', $_POST["title"]);
- $category->setVar('pid', $pid);
- $category->setVar('weight', $weight);
- $category->setVar('imgurl', $imgurl);
- $category->setVar('description', $_POST["description"]);
- $category->setVar('summary', $_POST["summary"]);
- $category->setVar('dohtml', isset($_POST['dohtml']));
- $category->setVar('dosmiley', isset($_POST['dosmiley']));
- $category->setVar('doxcode', isset($_POST['doxcode']));
- $category->setVar('doimage', isset($_POST['doimage']));
- $category->setVar('dobr', isset($_POST['dobr']));
- // Formulize module support (2006/05/04) jpc
+ $categoryObj->setVar('title', $_POST['title']);
+ $categoryObj->setVar('pid', $pid);
+ $categoryObj->setVar('weight', $weight);
+ $categoryObj->setVar('imgurl', $imgurl);
+ $categoryObj->setVar('description', $_POST['description']);
+ $categoryObj->setVar('summary', $_POST['summary']);
+ $categoryObj->setVar('dohtml', isset($_POST['dohtml']));
+ $categoryObj->setVar('dosmiley', isset($_POST['dosmiley']));
+ $categoryObj->setVar('doxcode', isset($_POST['doxcode']));
+ $categoryObj->setVar('doimage', isset($_POST['doimage']));
+ $categoryObj->setVar('dobr', isset($_POST['dobr']));
+// Formulize module support (2006/05/04) jpc - start
if (wfdownloads_checkModule('formulize')) {
- $category->setVar('formulize_fid', $formulize_fid);
+ $formulize_fid = (isset($_POST['formulize_fid'])) ? (int) $_POST['formulize_fid'] : 0;
+ $categoryObj->setVar('formulize_fid', $formulize_fid);
}
- $category->setVar('spotlighthis', $spotlighthis);
- $category->setVar('spotlighttop', $spotlighttop);
+// Formulize module support (2006/05/04) jpc - end
+ $categoryObj->setVar('spotlighthis', $spotlighthis);
+ $categoryObj->setVar('spotlighttop', $spotlighttop);
- if (!$wfdownloads->getHandler('category')->insert($category)) {
- echo $category->getHtmlErrors();
+ if (!$wfdownloads->getHandler('category')->insert($categoryObj)) {
+ echo $categoryObj->getHtmlErrors();
}
if (!$cid) {
if ($cid == 0) {
- $newid = (int) $category->getVar('cid');
+ $newid = (int) $categoryObj->getVar('cid');
}
wfdownloads_savePermissions($down_groups, $newid, 'WFDownCatPerm');
wfdownloads_savePermissions($up_groups, $newid, 'WFUpCatPerm');
@@ -144,8 +161,8 @@
$tags = array();
$tags['CATEGORY_NAME'] = $_POST['title'];
$tags['CATEGORY_URL'] = WFDOWNLOADS_URL . '/viewcat.php?cid=' . $newid;
- $notification_handler = & xoops_gethandler('notification');
- $notification_handler -> triggerEvent('global', 0, 'new_category', $tags);
+ $notification_handler = xoops_gethandler('notification');
+ $notification_handler->triggerEvent('global', 0, 'new_category', $tags);
$database_mess = _AM_WFDOWNLOADS_CCATEGORY_CREATED;
} else {
$database_mess = _AM_WFDOWNLOADS_CCATEGORY_MODIFIED;
@@ -155,27 +172,27 @@
redirect_header($currentFile, 1, $database_mess);
break;
- case "category.delete" :
- case "del" :
- $cid = WfdownloadsRequest::getInt('cid', 0);
- $ok = WfdownloadsRequest::getBool('ok', false, 'POST');
- $categories = $wfdownloads->getHandler('category')->getObjects();
- $mytree = new XoopsObjectTree($categories, "cid", "pid");
+ case 'category.delete':
+ case 'del':
+ $cid = XoopsRequest::getInt('cid', 0);
+ $ok = XoopsRequest::getBool('ok', false, 'POST');
+ $categoryObjs = $wfdownloads->getHandler('category')->getObjects();
+ $categoryObjsTree = new XoopsObjectTree($categoryObjs, 'cid', 'pid');
if ($ok == true) {
// get all subcategories under the specified category
- $arr = $mytree -> getAllChild($cid);
- foreach ($arr as $child) {
+ $childCategoryObjs = $categoryObjsTree->getAllChild($cid);
+ foreach ($childCategoryObjs as $childCategoryObj) {
// get all category ids
- $cids[] = $child->getVar('cid');
+ $cids[] = $childCategoryObj->getVar('cid');
}
$cids[] = $cid;
- $criteria = new Criteria("cid", "(" . implode(',', $cids) . ")", "IN");
+ $criteria = new Criteria('cid', '(' . implode(',', $cids) . ')', 'IN');
//get list of downloads in these subcategories
$downloads = $wfdownloads->getHandler('download')->getList($criteria);
- $download_criteria = new Criteria("lid", "(" . implode(',', array_keys($downloads)) . ")", "IN");
+ $download_criteria = new Criteria('lid', '(' . implode(',', array_keys($downloads)) . ')', 'IN');
// now for each download, delete the text data and vote data associated with the download
$wfdownloads->getHandler('rating')->deleteAll($download_criteria);
@@ -203,9 +220,9 @@
}
break;
- case "category.add" :
- case "category.edit" :
- case "modCat":
+ case 'category.add':
+ case 'category.edit':
+ case 'modCat':
wfdownloads_xoops_cp_header();
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation($currentFile);
@@ -215,19 +232,19 @@
echo $adminMenu->renderButton();
if (isset($_REQUEST['cid'])) {
- $category = $wfdownloads->getHandler('category')->get($_REQUEST['cid']);
+ $categoryObj = $wfdownloads->getHandler('category')->get($_REQUEST['cid']);
} else {
- $category = $wfdownloads->getHandler('category')->create();
+ $categoryObj = $wfdownloads->getHandler('category')->create();
}
- $form = $category->getForm();
+ $form = $categoryObj->getForm();
$form -> display();
- include 'admin_footer.php';
+ include_once __DIR__ . '/admin_footer.php';
break;
- case 'categories.list' :
- case 'main' :
- default :
+ case 'categories.list':
+ case 'main':
+ default:
wfdownloads_xoops_cp_header();
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation($currentFile);
@@ -241,14 +258,14 @@
$sorted_categories = wfdownloads_sortCategories();
$GLOBALS['xoopsTpl']->assign('sorted_categories', $sorted_categories);
$GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML() );
- $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_categorieslist.tpl");
+ $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_am_categorieslist.tpl");
} else {
redirect_header("{$currentFile}?op=category.add", 1, _AM_WFDOWNLOADS_CCATEGORY_NOEXISTS);
}
- include 'admin_footer.php';
+ include_once __DIR__ . '/admin_footer.php';
break;
- case 'categories.reorder' :
+ case 'categories.reorder':
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
}
@@ -257,12 +274,12 @@
$new_weights = $_POST['new_weights'];
$ids = array();
foreach ($new_weights as $cid => $new_weight) {
- $category = $wfdownloads->getHandler('category')->get($cid);
- $category->setVar('weight', $new_weight);
- if (!$wfdownloads->getHandler('category')->insert($category)) {
- redirect_header($currentFile, 3, $category->getErrors());
+ $categoryObj = $wfdownloads->getHandler('category')->get($cid);
+ $categoryObj->setVar('weight', $new_weight);
+ if (!$wfdownloads->getHandler('category')->insert($categoryObj)) {
+ redirect_header($currentFile, 3, $categoryObj->getErrors());
}
- unset($category);
+ unset($categoryObj);
}
redirect_header($currentFile, 1, _AM_WFDOWNLOADS_CATEGORIES_REORDERED);
exit();
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/clone.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/clone.php 2014-11-20 16:30:07 UTC (rev 12862)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/clone.php 2014-11-22 04:11:17 UTC (rev 12863)
@@ -19,7 +19,7 @@
* @version svn:$id$
*/
$currentFile = basename(__FILE__);
-include_once dirname(__FILE__) . '/admin_header.php';
+include_once __DIR__ . '/admin_header.php';
if (@$_POST['op'] == 'submit') {
if (!$GLOBALS['xoopsSecurity']->check()) {
@@ -38,10 +38,14 @@
if ($cloneDirname && is_dir(XOOPS_ROOT_PATH . '/modules/' . $cloneDirname)) {
redirect_header($currentFile, 3, sprintf(_AM_WFDOWNLOADS_CLONE_EXISTS, $cloneDirname));
}
+ // Check dirname length for template file name length issues (template file name cannot be longer than 50 chars)
+ if (strlen($cloneDirname) > 18) {
+ redirect_header($currentFile, 3, sprintf(_AM_WFDOWNLOADS_CLONE_TOOLONG, $cloneDirname));
+ }
$patterns = array(
- strtolower(WFDOWNLOADS_DIRNAME) => strtolower($cloneDirname),
- strtoupper(WFDOWNLOADS_DIRNAME) => strtoupper($cloneDirname),
+ strtolower(WFDOWNLOADS_DIRNAME) => strtolower($cloneDirname),
+ strtoupper(WFDOWNLOADS_DIRNAME) => strtoupper($cloneDirname),
ucfirst(strtolower(WFDOWNLOADS_DIRNAME)) => ucfirst(strtolower($cloneDirname))
);
@@ -50,7 +54,7 @@
wfdownl...
[truncated message content] |
|
From: <be...@us...> - 2014-11-22 06:06:26
|
Revision: 12864
http://sourceforge.net/p/xoops/svn/12864
Author: beckmi
Date: 2014-11-22 06:06:12 +0000 (Sat, 22 Nov 2014)
Log Message:
-----------
Code Cleanup
Modified Paths:
--------------
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/images.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/import.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/indexpage.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/menu.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/mimetypes.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/mirrors.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/permissions.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/reportsmodifications.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/reviews.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/brokenfile.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/dbupdater.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/download.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/mirror.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/modification.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/multicolumnsthemeform.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/review.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/tree.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads_lists.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/oninstall.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/onuninstall.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/onupdate.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/index.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/admin.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/modinfo.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/mirror.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/ratefile.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/review.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/singlefile.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/viewcat.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/visit.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/xoops_version.php
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php 2014-11-22 04:11:17 UTC (rev 12863)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php 2014-11-22 06:06:12 UTC (rev 12864)
@@ -52,19 +52,19 @@
include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
$sform = new XoopsThemeForm(_AM_WFDOWNLOADS_CCATEGORY_MOVE, 'move', xoops_getenv('PHP_SELF'));
- $categoryObjs = $wfdownloads->getHandler('category')->getObjects();
+ $categoryObjs = $wfdownloads->getHandler('category')->getObjects();
$categoryObjsTree = new XoopsObjectTree($categoryObjs, 'cid', 'pid');
$sform->addElement(new XoopsFormLabel(_AM_WFDOWNLOADS_BMODIFY, $categoryObjsTree->makeSelBox('target', 'title')));
- $create_tray = new XoopsFormElementTray('', '');
- $create_tray->addElement(new XoopsFormHidden('source', $cid));
- $create_tray->addElement(new XoopsFormHidden('ok', true));
- $create_tray->addElement(new XoopsFormHidden('op', 'category.move'));
- $butt_save = new XoopsFormButton('', '', _AM_WFDOWNLOADS_BMOVE, 'submit');
- $butt_save->setExtra('onclick="this.form.elements.op.value=\'category.move\'"');
- $create_tray->addElement($butt_save);
- $butt_cancel = new XoopsFormButton('', '', _AM_WFDOWNLOADS_BCANCEL, 'submit');
- $butt_cancel->setExtra('onclick="this.form.elements.op.value=\'cancel\'"');
- $create_tray -> addElement($butt_cancel);
+ $create_tray = new XoopsFormElementTray('', '');
+ $create_tray->addElement(new XoopsFormHidden('source', $cid));
+ $create_tray->addElement(new XoopsFormHidden('ok', true));
+ $create_tray->addElement(new XoopsFormHidden('op', 'category.move'));
+ $butt_save = new XoopsFormButton('', '', _AM_WFDOWNLOADS_BMOVE, 'submit');
+ $butt_save->setExtra('onclick="this.form.elements.op.value=\'category.move\'"');
+ $create_tray->addElement($butt_save);
+ $butt_cancel = new XoopsFormButton('', '', _AM_WFDOWNLOADS_BCANCEL, 'submit');
+ $butt_cancel->setExtra('onclick="this.form.elements.op.value=\'cancel\'"');
+ $create_tray->addElement($butt_cancel);
$sform->addElement($create_tray);
$sform->display();
xoops_cp_footer();
@@ -89,40 +89,40 @@
case 'category.save':
case 'addCat':
- $cid = XoopsRequest::getInt('cid', 0, 'POST');
- $pid = XoopsRequest::getInt('pid', 0, 'POST');
- $weight = (isset($_POST['weight']) && $_POST['weight'] > 0) ? (int) $_POST["weight"] : 0;
- $down_groups = isset($_POST['groups']) ? $_POST['groups'] : array();
- $up_groups = isset($_POST['up_groups']) ? $_POST['up_groups'] : array();
- $spotlighthis = (isset($_POST['lid'])) ? (int) $_POST['lid'] : 0;
+ $cid = XoopsRequest::getInt('cid', 0, 'POST');
+ $pid = XoopsRequest::getInt('pid', 0, 'POST');
+ $weight = (isset($_POST['weight']) && $_POST['weight'] > 0) ? (int)$_POST["weight"] : 0;
+ $down_groups = isset($_POST['groups']) ? $_POST['groups'] : array();
+ $up_groups = isset($_POST['up_groups']) ? $_POST['up_groups'] : array();
+ $spotlighthis = (isset($_POST['lid'])) ? (int)$_POST['lid'] : 0;
$spotlighttop = (isset($_POST['spotlighttop']) && ($_POST['spotlighttop'] == 1)) ? 1 : 0;
include_once XOOPS_ROOT_PATH . '/class/uploader.php';
$allowedMimetypes = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png');
- $imgurl = 'blank.png';
- $maxFileSize = $wfdownloads->getConfig('maxfilesize');
- $maxImgWidth = $wfdownloads->getConfig('maximgwidth');
- $maxImgHeight = $wfdownloads->getConfig('maximgheight');
- $uploadDirectory = XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('catimage');
- $uploader = new XoopsMediaUploader($uploadDirectory, $allowedMimetypes, $maxFileSize, $maxImgWidth, $maxImgHeight);
+ $imgurl = 'blank.png';
+ $maxFileSize = $wfdownloads->getConfig('maxfilesize');
+ $maxImgWidth = $wfdownloads->getConfig('maximgwidth');
+ $maxImgHeight = $wfdownloads->getConfig('maximgheight');
+ $uploadDirectory = XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('catimage');
+ $uploader = new XoopsMediaUploader($uploadDirectory, $allowedMimetypes, $maxFileSize, $maxImgWidth, $maxImgHeight);
if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
$uploader->setTargetFileName('wfdownloads_' . uniqid(time()) . '--' . strtolower($_FILES['uploadfile']['name']));
$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
if (!$uploader->upload()) {
$errors = $uploader->getErrors();
- redirect_header('javascript:history.go(-1)',3, $errors);
+ redirect_header('javascript:history.go(-1)', 3, $errors);
} else {
$imgurl = $uploader->getSavedFileName();
}
} else {
- $imgurl = (isset($_POST['imgurl']) && $_POST['imgurl'] != 'blank.png') ? $myts -> addslashes($_POST['imgurl']) : '';
+ $imgurl = (isset($_POST['imgurl']) && $_POST['imgurl'] != 'blank.png') ? $myts->addslashes($_POST['imgurl']) : '';
}
if (!$cid) {
$categoryObj = $wfdownloads->getHandler('category')->create();
} else {
$categoryObj = $wfdownloads->getHandler('category')->get($cid);
- $childcats = $wfdownloads->getHandler('category')->getChildCats($categoryObj);
+ $childcats = $wfdownloads->getHandler('category')->getChildCats($categoryObj);
if ($pid == $cid || in_array($pid, array_keys($childcats))) {
$categoryObj->setErrors(_AM_WFDOWNLOADS_CCATEGORY_CHILDASPARENT);
}
@@ -141,7 +141,7 @@
$categoryObj->setVar('dobr', isset($_POST['dobr']));
// Formulize module support (2006/05/04) jpc - start
if (wfdownloads_checkModule('formulize')) {
- $formulize_fid = (isset($_POST['formulize_fid'])) ? (int) $_POST['formulize_fid'] : 0;
+ $formulize_fid = (isset($_POST['formulize_fid'])) ? (int)$_POST['formulize_fid'] : 0;
$categoryObj->setVar('formulize_fid', $formulize_fid);
}
// Formulize module support (2006/05/04) jpc - end
@@ -153,15 +153,15 @@
}
if (!$cid) {
if ($cid == 0) {
- $newid = (int) $categoryObj->getVar('cid');
+ $newid = (int)$categoryObj->getVar('cid');
}
wfdownloads_savePermissions($down_groups, $newid, 'WFDownCatPerm');
wfdownloads_savePermissions($up_groups, $newid, 'WFUpCatPerm');
// Notify of new category
- $tags = array();
+ $tags = array();
$tags['CATEGORY_NAME'] = $_POST['title'];
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . '/viewcat.php?cid=' . $newid;
- $notification_handler = xoops_gethandler('notification');
+ $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . '/viewcat.php?cid=' . $newid;
+ $notification_handler = xoops_gethandler('notification');
$notification_handler->triggerEvent('global', 0, 'new_category', $tags);
$database_mess = _AM_WFDOWNLOADS_CCATEGORY_CREATED;
} else {
@@ -174,11 +174,11 @@
case 'category.delete':
case 'del':
- $cid = XoopsRequest::getInt('cid', 0);
- $ok = XoopsRequest::getBool('ok', false, 'POST');
- $categoryObjs = $wfdownloads->getHandler('category')->getObjects();
+ $cid = XoopsRequest::getInt('cid', 0);
+ $ok = XoopsRequest::getBool('ok', false, 'POST');
+ $categoryObjs = $wfdownloads->getHandler('category')->getObjects();
$categoryObjsTree = new XoopsObjectTree($categoryObjs, 'cid', 'pid');
- if ($ok == true) {
+ if ($ok === true) {
// get all subcategories under the specified category
$childCategoryObjs = $categoryObjsTree->getAllChild($cid);
foreach ($childCategoryObjs as $childCategoryObj) {
@@ -199,7 +199,7 @@
$wfdownloads->getHandler('report')->deleteAll($download_criteria);
$wfdownloads->getHandler('download')->deleteAll($download_criteria);
foreach (array_keys($downloads) as $lid) {
- xoops_comment_delete($wfdownloads->getModule()->mid(), (int) $lid);
+ xoops_comment_delete($wfdownloads->getModule()->mid(), (int)$lid);
}
// all downloads for each category is deleted, now delete the category data
@@ -207,8 +207,8 @@
$error = _AM_WFDOWNLOADS_DBERROR;
foreach ($cids as $cid) {
- xoops_groupperm_deletebymoditem ($wfdownloads->getModule()->mid(), 'WFDownCatPerm', $cid);
- xoops_groupperm_deletebymoditem ($wfdownloads->getModule() -> mid(), 'WFUpCatPerm', $cid);
+ xoops_groupperm_deletebymoditem($wfdownloads->getModule()->mid(), 'WFDownCatPerm', $cid);
+ xoops_groupperm_deletebymoditem($wfdownloads->getModule()->mid(), 'WFUpCatPerm', $cid);
}
redirect_header($currentFile, 1, _AM_WFDOWNLOADS_CCATEGORY_DELETED);
@@ -237,7 +237,7 @@
$categoryObj = $wfdownloads->getHandler('category')->create();
}
$form = $categoryObj->getForm();
- $form -> display();
+ $form->display();
include_once __DIR__ . '/admin_footer.php';
break;
@@ -257,7 +257,7 @@
if ($totalCategories > 0) {
$sorted_categories = wfdownloads_sortCategories();
$GLOBALS['xoopsTpl']->assign('sorted_categories', $sorted_categories);
- $GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML() );
+ $GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML());
$GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_am_categorieslist.tpl");
} else {
redirect_header("{$currentFile}?op=category.add", 1, _AM_WFDOWNLOADS_CCATEGORY_NOEXISTS);
@@ -267,12 +267,12 @@
case 'categories.reorder':
if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
+ redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
if (isset($_POST['new_weights']) && count($_POST['new_weights']) > 0) {
$new_weights = $_POST['new_weights'];
- $ids = array();
+ $ids = array();
foreach ($new_weights as $cid => $new_weight) {
$categoryObj = $wfdownloads->getHandler('category')->get($cid);
$categoryObj->setVar('weight', $new_weight);
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php 2014-11-22 04:11:17 UTC (rev 12863)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php 2014-11-22 06:06:12 UTC (rev 12864)
@@ -59,8 +59,8 @@
// Allowed mimetypes list
echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFDOWNLOADS_FILE_ALLOWEDAMIME . "</legend>\n";
echo "<div style='padding: 8px;'>\n";
- $criteria = new Criteria("mime_admin", true);
- $mimetypes = $wfdownloads->getHandler('mimetype')->getList($criteria);
+ $criteria = new Criteria("mime_admin", true);
+ $mimetypes = $wfdownloads->getHandler('mimetype')->getList($criteria);
$allowMimetypes = implode(' | ', $mimetypes);
echo $allowMimetypes;
echo "</div>\n";
@@ -77,16 +77,16 @@
redirect_header($currentFile, 4, _AM_WFDOWNLOADS_DOWN_ERROR_CATEGORYNOTFOUND);
exit();
}
- $title = preg_replace("/{category}/", $categoryObj->getVar('title'), _AM_WFDOWNLOADS_FILE_EDIT);
+ $title = preg_replace("/{category}/", $categoryObj->getVar('title'), _AM_WFDOWNLOADS_FILE_EDIT);
$title12 = preg_replace("/{category}/", $categoryObj->getVar('title'), _AM_WFDOWNLOADS_FFS_1STEP);
$title22 = preg_replace("/{category}/", $categoryObj->getVar('title'), _AM_WFDOWNLOADS_FFS_EDITDOWNLOADTITLE);
} else {
// create download
$downloadObj = $wfdownloads->getHandler('download')->create();
- $cid = XoopsRequest::getInt('cid', 0, 'POST');
+ $cid = XoopsRequest::getInt('cid', 0, 'POST');
$categoryObj = $wfdownloads->getHandler('category')->get($cid);
$downloadObj->setVar('cid', $cid);
- $title = preg_replace("/{category}/", $categoryObj->getVar('title'), _AM_WFDOWNLOADS_FILE_CREATE);
+ $title = preg_replace("/{category}/", $categoryObj->getVar('title'), _AM_WFDOWNLOADS_FILE_CREATE);
$title12 = preg_replace("/{category}/", $categoryObj->getVar('title'), _AM_WFDOWNLOADS_FFS_1STEP);
$title22 = preg_replace("/{category}/", $categoryObj->getVar('title'), _AM_WFDOWNLOADS_FFS_DOWNLOADTITLE);
}
@@ -97,15 +97,16 @@
$sform = $downloadObj->getAdminForm($title);
} elseif ((isset($_POST['submit_category']) && !empty($_POST['submit_category']))) {
// two steps form: 2nd step
- $fid = $categoryObj->getVar('formulize_fid');
+ $fid = $categoryObj->getVar('formulize_fid');
$customArray = array();
if ($fid) {
include_once XOOPS_ROOT_PATH . '/modules/formulize/include/formdisplay.php';
include_once XOOPS_ROOT_PATH . '/modules/formulize/include/functions.php';
- $customArray['fid'] = $fid;
+ $customArray['fid'] = $fid;
$customArray['formulize_mgr'] = xoops_getmodulehandler('elements', 'formulize');
- $customArray['groups'] = $GLOBALS['xoopsUser'] ? $GLOBALS['xoopsUser']->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
- $customArray['prevEntry'] = getEntryValues( // is a Formulize function
+ $customArray['groups'] = $GLOBALS['xoopsUser'] ? $GLOBALS['xoopsUser']->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
+ $customArray['prevEntry'] = getEntryValues(
+ // is a Formulize function
$downloadObj->getVar('formulize_idreq'),
$customArray['formulize_mgr'],
$customArray['groups'],
@@ -124,7 +125,7 @@
} else {
$owner = getEntryOwner($customArray['entry'], $fid); // is a Formulize function
}
- $ownerGroups = $member_handler->getGroupsByUser($owner, false);
+ $ownerGroups = $member_handler->getGroupsByUser($owner, false);
$customArray['owner_groups'] = $ownerGroups;
}
$sform = $downloadObj->getAdminForm($title22, $customArray);
@@ -192,9 +193,9 @@
foreach ($regUserRatingObjs as $regUserRatingObj) {
$formatted_date = XoopsLocal::formatTimestamp($regUserRatingObj->getVar('ratingtimestamp'), 'l');
- $userAvgRating = isset($userRatings[$regUserRatingObj->getVar('ratinguser')]) ? $userRatings[$regUserRatingObj->getVar('ratinguser')]['avg'] : 0;
- $userVotes = isset($userRatings[$regUserRatingObj->getVar('ratinguser')]) ? $userRatings[$regUserRatingObj->getVar('ratinguser')]['count'] : 0;
- $ratingUserName = XoopsUser :: getUnameFromId($regUserRatingObj->getVar('ratinguser'));
+ $userAvgRating = isset($userRatings[$regUserRatingObj->getVar('ratinguser')]) ? $userRatings[$regUserRatingObj->getVar('ratinguser')]['avg'] : 0;
+ $userVotes = isset($userRatings[$regUserRatingObj->getVar('ratinguser')]) ? $userRatings[$regUserRatingObj->getVar('ratinguser')]['count'] : 0;
+ $ratingUserName = XoopsUser:: getUnameFromId($regUserRatingObj->getVar('ratinguser'));
echo "
<tr><td class='head'>$ratingUserName</td>\n
@@ -204,8 +205,7 @@
<td class='even'>$userVotes</th>\n
<td class='even'>$formatted_date</th>\n
<td class='even'>\n
- <a href='{$currentFile}?op=vote.delete&lid={$lid}&rid=" . $regUserRatingObj->getVar('ratingid') . "'>"
- . $imagearray['deleteimg'] . "</a>\n
+ <a href='{$currentFile}?op=vote.delete&lid={$lid}&rid=" . $regUserRatingObj->getVar('ratingid') . "'>" . $imagearray['deleteimg'] . "</a>\n
</th></tr>\n
";
}
@@ -227,14 +227,14 @@
if ($anonUserRatingCount == 0) {
echo "<tr><td colspan='7' class='even'><b>" . _AM_WFDOWNLOADS_VOTE_NOUNREGVOTES . "</b></td></tr>";
} else {
- $criteria = new Criteria('ratinguser', 0);
- $userRatings = $wfdownloads->getHandler('rating')->getUserAverage($criteria);
+ $criteria = new Criteria('ratinguser', 0);
+ $userRatings = $wfdownloads->getHandler('rating')->getUserAverage($criteria);
$anonUserRatingObjs = $wfdownloads->getHandler('rating')->getObjects($anonUserCriteria);
foreach (array_keys($anonUserRatingObjs) as $anonUserRatingObj) {
$formatted_date = XoopsLocal::formatTimestamp($anonUserRatingObj->getVar('ratingtimestamp'), 'l');
- $userAvgRating = isset($userRatings['avg']) ? $userRatings['avg'] : 0;
- $userVotes = isset($userRatings['count']) ? $userRatings['count'] : 0;
+ $userAvgRating = isset($userRatings['avg']) ? $userRatings['avg'] : 0;
+ $userVotes = isset($userRatings['count']) ? $userRatings['count'] : 0;
$ratingUserName = $GLOBALS['xoopsConfig']['anonymous'];
@@ -246,8 +246,7 @@
<td class='even'>$userVotes</th>\n
<td class='even'>$formatted_date</th>\n
<td class='even'>\n
- <a href='{$currentFile}?op=vote.delete&lid={$lid}&rid=" . $anonUserRatingObj->getVar('ratingid') . "'>"
- . $imagearray['deleteimg'] . "</a>\n
+ <a href='{$currentFile}?op=vote.delete&lid={$lid}&rid=" . $anonUserRatingObj->getVar('ratingid') . "'>" . $imagearray['deleteimg'] . "</a>\n
</th></tr>\n
";
}
@@ -260,27 +259,27 @@
case 'download.save':
case 'addDownload':
- $lid = XoopsRequest::getInt('lid', 0, 'POST');
- $cid = XoopsRequest::getInt('cid', 0, 'POST');
+ $lid = XoopsRequest::getInt('lid', 0, 'POST');
+ $cid = XoopsRequest::getInt('cid', 0, 'POST');
$status = XoopsRequest::getInt('status', _WFDOWNLOADS_STATUS_UPDATED, 'POST');
if ($lid > 0) {
$thisIsANewRecord = false; /* Added by Lankford on 2007/3/21 */
- $downloadObj = $wfdownloads->getHandler('download')->get($lid);
+ $downloadObj = $wfdownloads->getHandler('download')->get($lid);
} else {
$thisIsANewRecord = true; /* Added by Lankford on 2007/3/21 */
- $downloadObj = $wfdownloads->getHandler('download')->create();
+ $downloadObj = $wfdownloads->getHandler('download')->create();
}
// Define URL
if (empty($_FILES['userfile']['name'])) {
if ($_POST['url'] && $_POST['url'] != '' && $_POST['url'] != 'http://') {
- $url = ($_POST['url'] != 'http://') ? $_POST['url'] : '';
+ $url = ($_POST['url'] != 'http://') ? $_POST['url'] : '';
$filename = '';
$filetype = '';
// Get size from form
- $size = (empty($_POST['size']) || !is_numeric($_POST['size'])) ? 0 : (int) $_POST['size'];
+ $size = (empty($_POST['size']) || !is_numeric($_POST['size'])) ? 0 : (int)$_POST['size'];
} else {
- $url = ($_POST['url'] != 'http://') ? $_POST['url'] : '';
+ $url = ($_POST['url'] != 'http://') ? $_POST['url'] : '';
$filename = $_POST['filename'];
$filetype = $_POST['filetype'];
$filePath = $wfdownloads->getConfig('uploaddir') . '/' . $filename;
@@ -291,12 +290,12 @@
$downloadObj->setVar('filename', $filename);
$downloadObj->setVar('filetype', $filetype);
} else {
- $down = wfdownloads_uploading($_FILES, $wfdownloads->getConfig('uploaddir'), '', $currentFile, 0, false, true);
- $url = ($_POST['url'] != 'http://') ? $_POST['url'] : '';
- $size = $down['size'];
+ $down = wfdownloads_uploading($_FILES, $wfdownloads->getConfig('uploaddir'), '', $currentFile, 0, false, true);
+ $url = ($_POST['url'] != 'http://') ? $_POST['url'] : '';
+ $size = $down['size'];
$title = $_FILES['userfile']['name'];
- $ext = rtrim(strrchr($title, '.'), '.');
+ $ext = rtrim(strrchr($title, '.'), '.');
$title = str_replace($ext, '', $title);
$title = (isset($_POST['title_checkbox']) && $_POST['title_checkbox'] == 1) ? $title : trim($_POST['title']);
@@ -306,7 +305,7 @@
$downloadObj->setVar('filetype', $filetype);
}
// Get data from form
- $screenshots = array();
+ $screenshots = array();
$screenshots[] = ($_POST['screenshot'] != 'blank.png') ? $_POST['screenshot'] : '';
$screenshots[] = ($_POST['screenshot2'] != 'blank.png') ? $_POST['screenshot2'] : '';
$screenshots[] = ($_POST['screenshot3'] != 'blank.png') ? $_POST['screenshot3'] : '';
@@ -326,11 +325,11 @@
// If both conditions are true, then trigger all three notifications related to modified records.
if (!$thisIsANewRecord && ($downloadObj->getVar('version') != $version)) {
// Trigger the three events related to modified files (one for the file, category, and global event categories respectively)
- $tags = array();
- $tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
- $categoryObj = $wfdownloads->getHandler('category')->get($cid);
- $tags['FILE_VERSION'] = $version;
+ $tags = array();
+ $tags['FILE_NAME'] = $title;
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
+ $categoryObj = $wfdownloads->getHandler('category')->get($cid);
+ $tags['FILE_VERSION'] = $version;
$tags['CATEGORY_NAME'] = $categoryObj->getVar('title');
$tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid='{$cid}";
@@ -377,12 +376,12 @@
$versiontypes = (isset($_POST['versiontypes'])) ? $_POST['versiontypes'] : '';
$downloadObj->setVar('versiontypes', $versiontypes);
- $dhistory = (isset($_POST['dhistory'])) ? $_POST['dhistory'] : '';
+ $dhistory = (isset($_POST['dhistory'])) ? $_POST['dhistory'] : '';
$dhistoryhistory = (isset($_POST['dhistoryaddedd'])) ? $_POST['dhistoryaddedd'] : '';
if ($lid > 0 && !empty($dhistoryhistory)) {
$dhistory = $dhistory . "\n\n";
- $time = time();
+ $time = time();
$dhistory .= _AM_WFDOWNLOADS_FILE_HISTORYVERS . $version . _AM_WFDOWNLOADS_FILE_HISTORDATE . XoopsLocal::formatTimestamp($time, 'l') . "\n\n";
$dhistory .= $dhistoryhistory;
}
@@ -398,7 +397,7 @@
$offline = ($_POST['offline'] == true) ? true : false;
$downloadObj->setVar('offline', $offline);
- $approved = (isset($_POST['approved']) && $_POST['approved'] == true) ? true : false;
+ $approved = (isset($_POST['approved']) && $_POST['approved'] == true) ? true : false;
$notifypub = (isset($_POST['notifypub']) && $_POST['notifypub'] == true);
$expiredate = 0;
@@ -406,7 +405,7 @@
$publishdate = time();
} else {
$publishdate = $_POST['was_published'];
- $expiredate = $_POST['was_expired'];
+ $expiredate = $_POST['was_expired'];
}
if ($approved == 1 && empty($publishdate)) {
$publishdate = time();
@@ -452,17 +451,17 @@
} else {
print 'no idreq';
$entries[$fid][0] = '';
- $owner = '';
+ $owner = '';
}
$cid = $downloadObj->getVar('cid');
} else {
$entries[$fid][0] = '';
- $owner = '';
+ $owner = '';
}
$ownerGroups = $member_handler->getGroupsByUser($owner, false);
- $uid = !empty($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
- $groups = $GLOBALS['xoopsUser'] ? $GLOBALS['xoopsUser']->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
- $entries = handleSubmission(
+ $uid = !empty($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
+ $groups = $GLOBALS['xoopsUser'] ? $GLOBALS['xoopsUser']->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
+ $entries = handleSubmission(
$formulizeElements_handler,
$entries,
$uid,
@@ -480,24 +479,24 @@
}
// Formulize module support (2006/05/04) jpc - end
$wfdownloads->getHandler('download')->insert($downloadObj);
- $newid = (int) $downloadObj->getVar('lid');
+ $newid = (int)$downloadObj->getVar('lid');
// Send notifications
if (!$lid) {
- $tags = array();
- $tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&l...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X