|
From: <be...@us...> - 2014-06-14 08:16:39
|
Revision: 12586
http://sourceforge.net/p/xoops/svn/12586
Author: beckmi
Date: 2014-06-14 08:16:24 +0000 (Sat, 14 Jun 2014)
Log Message:
-----------
Reverting to 12444
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/multicolumnsthemeform.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/object.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/request.php
XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/trunk/wfdownloads/docs/credits.txt
XoopsModules/wfdownloads/trunk/wfdownloads/docs/history.txt
XoopsModules/wfdownloads/trunk/wfdownloads/docs/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/docs/install.txt
XoopsModules/wfdownloads/trunk/wfdownloads/docs/lang_diff.txt
XoopsModules/wfdownloads/trunk/wfdownloads/docs/license.txt
XoopsModules/wfdownloads/trunk/wfdownloads/docs/readme.txt
XoopsModules/wfdownloads/trunk/wfdownloads/images/VeraBd.ttf
XoopsModules/wfdownloads/trunk/wfdownloads/images/blank.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/brokenimg.png
XoopsModules/wfdownloads/trunk/wfdownloads/images/category/blank.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/category/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/images/category/thumbs/blank.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/category/thumbs/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/images/down.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/approve.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/arrow.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/close12.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/delete.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/disabled.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/down.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download1.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download2.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download3.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download4.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/downloads.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/downloads02.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/downloads03.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/edit.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/forum.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/ignore.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/ignore.png
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/link.png
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/newred.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/off.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/on.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/open12.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/pop.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/rate0.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/rate1.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/rate2.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/rate3.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/rate4.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/rate5.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/reviews.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/rss.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/statistics.png
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/update.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/world_link.png
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon32/database_go.png
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon32/editcopy.png
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon32/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/images/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/images/loadingAnimation.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/logo-en.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/logo.png
XoopsModules/wfdownloads/trunk/wfdownloads/images/module_logo.png
XoopsModules/wfdownloads/trunk/wfdownloads/images/screenshots/blank.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/screenshots/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/images/screenshots/thumbs/blank.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/screenshots/thumbs/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/images/size2.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/up.gif
XoopsModules/wfdownloads/trunk/wfdownloads/include/constants.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/search.inc.php
XoopsModules/wfdownloads/trunk/wfdownloads/js/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/js/jquery.ThickBox/loadingAnimation.gif
XoopsModules/wfdownloads/trunk/wfdownloads/js/jquery.ThickBox/thickbox-compressed.js
XoopsModules/wfdownloads/trunk/wfdownloads/js/jquery.ThickBox/thickbox.css
XoopsModules/wfdownloads/trunk/wfdownloads/js/jquery.ThickBox/thickbox.js
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/README.md
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/DO NOT CHANGE THESE FILES. USE -src- FOLDER.txt
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/background.png
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/bigplay.png
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/bigplay.svg
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/controls-ted.png
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/controls-wmp-bg.png
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/controls-wmp.png
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/controls.png
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/controls.svg
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/flashmediaelement-cdn.swf
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/flashmediaelement.swf
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/loading.gif
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/mediaelement-and-player.min.js
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/mediaelement.min.js
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/mediaelementplayer.min.css
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/mediaelementplayer.min.js
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/mejs-skins.css
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/silverlightmediaelement.xap
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/blocks.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/directorychecker.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/filechecker.php
XoopsModules/wfdownloads/trunk/wfdownloads/sql/mysql.sql
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_categorieslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_ip_logslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_mimetypeslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_mirrorslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_permissions.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_ratingslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reviewslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/blocks/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/blocks/wfdownloads_block_new.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/blocks/wfdownloads_block_top.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/blocks/wfdownloads_block_top_by_cat.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_brokenfile.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_common_breadcrumb.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_common_letterschoice.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_disclaimer.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_download.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_footer.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_header.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_index.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_mirrors.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_newlistindex.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_ratefile.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_reviews.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_singlefile.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_submit.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_topten.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_viewcat.html
XoopsModules/wfdownloads/trunk/wfdownloads/uploads/index.html
Added Paths:
-----------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/
XoopsModules/wfdownloads/trunk/wfdownloads/blocks/
XoopsModules/wfdownloads/trunk/wfdownloads/blocks/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top.php
XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top_by_cat.php
XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/
XoopsModules/wfdownloads/trunk/wfdownloads/comment_delete.php
XoopsModules/wfdownloads/trunk/wfdownloads/comment_edit.php
XoopsModules/wfdownloads/trunk/wfdownloads/comment_new.php
XoopsModules/wfdownloads/trunk/wfdownloads/comment_post.php
XoopsModules/wfdownloads/trunk/wfdownloads/comment_reply.php
XoopsModules/wfdownloads/trunk/wfdownloads/docs/
XoopsModules/wfdownloads/trunk/wfdownloads/footer.php
XoopsModules/wfdownloads/trunk/wfdownloads/header.php
XoopsModules/wfdownloads/trunk/wfdownloads/images/
XoopsModules/wfdownloads/trunk/wfdownloads/include/
XoopsModules/wfdownloads/trunk/wfdownloads/index.php
XoopsModules/wfdownloads/trunk/wfdownloads/js/
XoopsModules/wfdownloads/trunk/wfdownloads/language/
XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php
XoopsModules/wfdownloads/trunk/wfdownloads/module.css
XoopsModules/wfdownloads/trunk/wfdownloads/newlist.php
XoopsModules/wfdownloads/trunk/wfdownloads/notification_update.php
XoopsModules/wfdownloads/trunk/wfdownloads/ratefile.php
XoopsModules/wfdownloads/trunk/wfdownloads/review.php
XoopsModules/wfdownloads/trunk/wfdownloads/rss.php
XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php
XoopsModules/wfdownloads/trunk/wfdownloads/sql/
XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
XoopsModules/wfdownloads/trunk/wfdownloads/templates/
XoopsModules/wfdownloads/trunk/wfdownloads/topten.php
XoopsModules/wfdownloads/trunk/wfdownloads/uploads/
XoopsModules/wfdownloads/trunk/wfdownloads/viewcat.php
XoopsModules/wfdownloads/trunk/wfdownloads/visit.php
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Property Changed:
----------------
XoopsModules/wfdownloads/trunk/wfdownloads/images/VeraBd.ttf
XoopsModules/wfdownloads/trunk/wfdownloads/images/blank.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/brokenimg.png
XoopsModules/wfdownloads/trunk/wfdownloads/images/category/blank.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/category/thumbs/blank.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/down.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/approve.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/arrow.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/close12.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/delete.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/disabled.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/down.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download1.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download2.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download3.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download4.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/downloads.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/downloads02.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/downloads03.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/edit.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/forum.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/ignore.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/ignore.png
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/link.png
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/newred.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/off.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/on.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/open12.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/pop.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/rate0.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/rate1.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/rate2.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/rate3.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/rate4.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/rate5.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/reviews.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/rss.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/statistics.png
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/update.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/world_link.png
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon32/database_go.png
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon32/editcopy.png
XoopsModules/wfdownloads/trunk/wfdownloads/images/loadingAnimation.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/logo-en.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/logo.png
XoopsModules/wfdownloads/trunk/wfdownloads/images/module_logo.png
XoopsModules/wfdownloads/trunk/wfdownloads/images/screenshots/blank.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/screenshots/thumbs/blank.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/size2.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/up.gif
XoopsModules/wfdownloads/trunk/wfdownloads/js/jquery.ThickBox/loadingAnimation.gif
XoopsModules/wfdownloads/trunk/wfdownloads/js/jquery.ThickBox/thickbox-compressed.js
XoopsModules/wfdownloads/trunk/wfdownloads/js/jquery.ThickBox/thickbox.js
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/background.png
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/bigplay.png
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/controls-ted.png
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/controls-wmp-bg.png
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/controls-wmp.png
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/controls.png
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/flashmediaelement-cdn.swf
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/flashmediaelement.swf
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/loading.gif
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/mediaelement-and-player.min.js
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/mediaelement.min.js
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/mediaelementplayer.min.js
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/silverlightmediaelement.xap
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php 2014-05-28 22:48:37 UTC (rev 12555)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php 2014-06-14 08:16:24 UTC (rev 12586)
@@ -31,55 +31,55 @@
$adminmenu[$i]["title"] = _MI_WFDOWNLOADS_MENU_HOME;
$adminmenu[$i]['link'] = "admin/index.php";
$adminmenu[$i]["icon"] = $pathIcon32 . '/home.png';
-$i++;
+++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_CATEGORIES;
$adminmenu[$i]['link'] = "admin/categories.php";
$adminmenu[$i]["icon"] = $pathIcon32 . '/category.png';
-$i++;
+++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_DOWNLOADS;
$adminmenu[$i]['link'] = "admin/downloads.php";
$adminmenu[$i]["icon"] = $pathIcon32 . '/download.png';
-$i++;
+++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_REVIEWS;
$adminmenu[$i]['link'] = "admin/reviews.php";
$adminmenu[$i]["icon"] = $pathIcon32 . '/translations.png';
-$i++;
+++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_RATINGS;
$adminmenu[$i]['link'] = "admin/ratings.php";
$adminmenu[$i]["icon"] = $pathIcon32 . '/button_ok.png';
-$i++;
+++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_REPORTSMODIFICATIONS;
$adminmenu[$i]['link'] = "admin/reportsmodifications.php";
$adminmenu[$i]["icon"] = $pathIcon32 . '/alert.png';
-$i++;
+++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_MIRRORS;
$adminmenu[$i]['link'] = "admin/mirrors.php";
$adminmenu[$i]["icon"] = $pathIcon32 . '/list.png';
-$i++;
+++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_INDEXPAGE;
$adminmenu[$i]['link'] = "admin/indexpage.php";
$adminmenu[$i]["icon"] = $pathIcon32 . '/index.png';
-$i++;
+++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_IMAGES;
$adminmenu[$i]['link'] = "admin/images.php";
$adminmenu[$i]["icon"] = $pathIcon32 . '/photo.png';
-$i++;
+++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_MIMETYPES;
$adminmenu[$i]['link'] = "admin/mimetypes.php";
$adminmenu[$i]["icon"] = $pathIcon32 . '/type.png';
-$i++;
+++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_PERMISSIONS;
$adminmenu[$i]['link'] = "admin/permissions.php";
$adminmenu[$i]["icon"] = $pathIcon32 . '/permissions.png';
-$i++;
+++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_IMPORT;
$adminmenu[$i]['link'] = "admin/import.php";
$adminmenu[$i]["icon"] = './images/icon32/database_go.png';
-$i++;
+++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_CLONE;
$adminmenu[$i]['link'] = "admin/clone.php";
$adminmenu[$i]["icon"] = './images/icon32/editcopy.png';
-$i++;
+++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_ABOUT;
$adminmenu[$i]['link'] = "admin/about.php";
$adminmenu[$i]["icon"] = $pathIcon32 . '/about.png';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php 2014-05-28 22:48:37 UTC (rev 12555)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php 2014-06-14 08:16:24 UTC (rev 12586)
@@ -61,14 +61,12 @@
redirect_header($currentFile, 1, _AM_WFDOWNLOADS_BROKEN_FILEIGNORED);
break;
-
-
case "modification.show":
$requestid = WfdownloadsRequest::getInt('requestid', 0);
$modification = $wfdownloads->getHandler('modification')->get($requestid);
$modify_user = new XoopsUser($modification->getVar('modifysubmitter'));
- $modifyname = XoopsUserUtility::getUnameFromId((int)$modify_user->getVar('uid'));
+ $modifyname = XoopsUserUtility::getUnameFromId((int) $modify_user->getVar('uid'));
$modifyemail = $modify_user->getVar('email');
$download = $wfdownloads->getHandler('download')->get($modification->getVar('lid'));
@@ -208,12 +206,12 @@
$modificationFormElement = new XoopsFormLabel('', $modificationContent);
$mcform->addElement($downloadFormElement, false, $i, 1);
$mcform->addElement($modificationFormElement, false, $i, 2);
- $i++;
+ ++$i;
}
$button_tray = new XoopsFormElementTray('', '');
$button_tray->addElement(new XoopsFormHidden('requestid', $requestid));
- $button_tray->addElement(new XoopsFormHidden('lid', (int)$modification->getVar('lid')));
+ $button_tray->addElement(new XoopsFormHidden('lid', (int) $modification->getVar('lid')));
$hidden = new XoopsFormHidden('op', 'modification.change');
$button_tray->addElement($hidden);
if (!$modification->isNew()) {
@@ -230,7 +228,7 @@
$mcform->addElement($button_tray, false, $i, 2);
$mcform->display();
-
+
xoops_cp_footer();
exit();
break;
Added: XoopsModules/wfdownloads/trunk/wfdownloads/blocks/index.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/blocks/index.html (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/blocks/index.html 2014-06-14 08:16:24 UTC (rev 12586)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top.php (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top.php 2014-06-14 08:16:24 UTC (rev 12586)
@@ -0,0 +1,82 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * Wfdownloads module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package wfdownload
+ * @since 3.23
+ * @author Xoops Development Team
+ * @version svn:$id$
+ */
+
+/**
+ * Function: b_mydownloads_top_show
+ * Input : $options[0] = date for the most recent downloads
+ * hits for the most popular downloads
+ * $block['content'] = The optional above content
+ * $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');
+include_once dirname(dirname(__FILE__)) . '/include/common.php';
+function wfdownloads_top_show($options)
+{
+ global $xoopsUser;
+ $wfdownloads = WfdownloadsWfdownloads::getInstance();
+
+ $groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
+ $gperm_handler = xoops_gethandler('groupperm');
+ $allowedDownCategoriesIds = $gperm_handler->getItemIds('WFDownCatPerm', $groups, $wfdownloads->getModule()->mid());
+
+ $block = array();
+
+ // get downloads
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('cid', '(' . implode(',', $allowedDownCategoriesIds) . ')', 'IN'));
+ $criteria->add(new Criteria('offline', false));
+ $criteria->setSort($options[0]);
+ $criteria->setOrder('DESC');
+ $criteria->setLimit($options[1]);
+ $downloads = $wfdownloads->getHandler('download')->getObjects($criteria);
+
+ foreach (array_keys($downloads) as $i) {
+ $download = $downloads[$i]->toArray();
+ if (!in_array((int)$download['cid'], $allowedDownCategoriesIds)) {
+ continue;
+ }
+ $download['title'] = xoops_substr($download['title'], 0, ($options[2] - 1));
+ $download['id'] = (int)$download['lid'];
+ if ($options[0] == 'published') {
+ $download['date'] = formatTimestamp($download['published'], $wfdownloads->getConfig('dateformat'));
+ } else {
+ $download['date'] = formatTimestamp($download['date'], $wfdownloads->getConfig('dateformat'));
+ }
+ $download['dirname'] = $wfdownloads->getModule()->dirname();
+ $block['downloads'][] = $download;
+ }
+
+ return $block;
+}
+
+function wfdownloads_top_edit($options)
+{
+ $form = "" . _MB_WFDOWNLOADS_DISP . " ";
+ $form .= "<input type='hidden' name='options[]' value='" . ($options[0] == 'published') ? 'published' : 'hits' . "' />";
+ $form .= "<input type='text' name='options[]' value='" . $options[1] . "' /> " . _MB_WFDOWNLOADS_FILES . "";
+ $form .= "<br />";
+ $form
+ .=
+ "" . _MB_WFDOWNLOADS_CHARS . " <input type='text' name='options[]' value='" . $options[2] . "' /> " . _MB_WFDOWNLOADS_LENGTH . "";
+
+ return $form;
+}
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top_by_cat.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top_by_cat.php (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top_by_cat.php 2014-06-14 08:16:24 UTC (rev 12586)
@@ -0,0 +1,94 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * Wfdownloads module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package wfdownload
+ * @since 3.23
+ * @author Xoops Development Team
+ * @version svn:$id$
+ */
+
+/**
+ * Function: b_mydownloads_top_by_cat_show
+ * Input : $options[0] = date for the most recent downloads
+ * hits for the most popular downloads
+ * $block['content'] = The optional above content
+ * $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');
+include_once dirname(dirname(__FILE__)) . '/include/common.php';
+function wfdownloads_top_by_cat_show($options)
+{
+ global $xoopsUser;
+ $wfdownloads = WfdownloadsWfdownloads::getInstance();
+
+ $gperm_handler = xoops_gethandler('groupperm');
+ $groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
+ $allowedDownCategoriesIds = $gperm_handler->getItemIds('WFDownCatPerm', $groups, $wfdownloads->getModule()->mid());
+
+ $block = array();
+
+ // get downloads
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('cid', '(' . implode(',', $allowedDownCategoriesIds) . ')', 'IN'));
+ $criteria->add(new Criteria('offline', false));
+ $criteria->setSort('date');
+ $criteria->setOrder('DESC');
+ $criteria->setLimit($options[1]);
+ $downloads = $wfdownloads->getHandler('download')->getObjects($criteria);
+
+ foreach (array_keys($downloads) as $i) {
+ $download = $downloads[$i]->toArray();
+ if (!in_array((int)$download['cid'], $allowedDownCategoriesIds)) {
+ continue;
+ }
+ $download['title'] = xoops_substr($download['title'], 0, ($options[2] - 1));
+ $download['id'] = (int)$download['lid'];
+ if ($options[0] == 'published') {
+ $download['date'] = formatTimestamp($download['published'], $wfdownloads->getConfig('dateformat'));
+ } else {
+ $download['date'] = formatTimestamp($download['date'], $wfdownloads->getConfig('dateformat'));
+ }
+ $download['dirname'] = $wfdownloads->getModule()->dirname();
+ $block['downloads'][] = $download;
+ }
+
+ $allsubcats_linked_totop = $wfdownloads->getHandler('category')->getAllSubcatsTopParentCid();
+
+ foreach ($wfdownloads->getHandler('category')->topCategories as $cid) {
+ $block['topcats'][$cid]['title'] = $wfdownloads->getHandler('category')->allCategories[$cid]->getVar('title');
+ $block['topcats'][$cid]['cid'] = $cid;
+ $block['topcats'][$cid]['imgurl'] = $wfdownloads->getHandler('category')->allCategories[$cid]->getVar('imgurl');
+ }
+
+ foreach ($block['downloads'] as $key => $value) {
+ $block['topcats'][$allsubcats_linked_totop[$value['cid']]]['downloads'][] = $value;
+ }
+
+ return $block;
+}
+
+function wfdownloads_top_by_cat_edit($options)
+{
+ $form = "" . _MB_WFDOWNLOADS_DISP . " ";
+ $form .= "<input type='hidden' name='options[]' value='" . ($options[0] == 'published') ? 'published' : 'hits' . "' />";
+ $form .= "<input type='text' name='options[]' value='" . $options[1] . "' /> " . _MB_WFDOWNLOADS_FILES . "";
+ $form .= "<br />";
+ $form
+ .=
+ "" . _MB_WFDOWNLOADS_CHARS . " <input type='text' name='options[]' value='" . $options[2] . "' /> " . _MB_WFDOWNLOADS_LENGTH . "";
+
+ return $form;
+}
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top_by_cat.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php 2014-06-14 08:16:24 UTC (rev 12586)
@@ -0,0 +1,195 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * Wfdownloads module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package wfdownload
+ * @since 3.23
+ * @author Xoops Development Team
+ * @version svn:$id$
+ */
+$currentFile = basename(__FILE__);
+include 'header.php';
+
+$lid = WfdownloadsRequest::getInt('lid', 0);
+$download = $wfdownloads->getHandler('download')->get($lid);
+if (empty($download)) {
+ redirect_header('index.php', 3, _CO_WFDOWNLOADS_ERROR_NODOWNLOAD);
+}
+$cid = WfdownloadsRequest::getInt('cid', $download->getVar('cid'));
+$category = $wfdownloads->getHandler('category')->get($cid);
+if (empty($category)) {
+ redirect_header('index.php', 3, _CO_WFDOWNLOADS_ERROR_NOCATEGORY);
+}
+
+// Download not published, expired or taken offline - redirect
+if (
+ $download->getVar('published') == 0 ||
+ $download->getVar('published') > time() ||
+ $download->getVar('offline') == true ||
+ ($download->getVar('expired') == true && $download->getVar('expired') < time()) ||
+ $download->getVar('status') == _WFDOWNLOADS_STATUS_WAITING) {
+ redirect_header('index.php', 3, _MD_WFDOWNLOADS_NODOWNLOAD);
+}
+
+// Check permissions
+if ($wfdownloads->getConfig('enable_brokenreports') == false && !wfdownloads_userIsAdmin()) {
+ redirect_header('index.php', 3, _NOPERM);
+}
+
+// Breadcrumb
+include_once XOOPS_ROOT_PATH . "/class/tree.php";
+$categoriesTree = new XoopsObjectTree($wfdownloads->getHandler('category')->getObjects(), 'cid', 'pid');
+$breadcrumb = new WfdownloadsBreadcrumb();
+$breadcrumb->addLink($wfdownloads->getModule()->getVar('name'), WFDOWNLOADS_URL);
+foreach (array_reverse($categoriesTree->getAllParent($cid)) as $parentCategory) {
+ $breadcrumb->addLink($parentCategory->getVar('title'), "viewcat.php?cid=" . $parentCategory->getVar('cid'));
+}
+$breadcrumb->addLink($category->getVar('title'), "viewcat.php?cid={$cid}");
+$breadcrumb->addLink($download->getVar('title'), "singlefile.php?lid={$lid}");
+
+
+$op = WfdownloadsRequest::getString('op', 'report.add');
+switch ($op) {
+ case "report.add" :
+ default :
+ // Get report sender 'uid'
+ $senderUid = is_object($xoopsUser) ? (int)$xoopsUser->getVar('uid') : 0;
+ $senderIp = getenv('REMOTE_ADDR');
+
+ if (!empty($_POST['submit'])) {
+ // Check if REG user is trying to report twice
+ $criteria = new Criteria('lid', $lid);
+ $reportsCount = $wfdownloads->getHandler('report')->getCount($criteria);
+ if ($reportsCount > 0) {
+ redirect_header('index.php', 2, _MD_WFDOWNLOADS_ALREADYREPORTED);
+ } else {
+ $report = $wfdownloads->getHandler('report')->create();
+ $report->setVar('lid', $lid);
+ $report->setVar('sender', $senderUid);
+ $report->setVar('ip', $senderIp);
+ $report->setVar('date', time());
+ $report->setVar('confirmed', 0);
+ $report->setVar('acknowledged', 0);
+ if ($wfdownloads->getHandler('report')->insert($report)) {
+ // All is well
+ // Send notification
+ $tags = array();
+ $tags['BROKENREPORTS_URL'] = WFDOWNLOADS_URL . '/admin/reportsmodifications.php?op=reports.modifications.list';
+ $notification_handler->triggerEvent('global', 0, 'file_broken', $tags);
+
+ // Send email to the owner of the download stating that it is broken
+ $user = $member_handler->getUser($download->getVar('submitter'));
+ $subdate = formatTimestamp($download->getVar('published'), $wfdownloads->getConfig('dateformat'));
+ $cid = $download->getVar('cid');
+ $title = $download->getVar('title');
+ $subject = _MD_WFDOWNLOADS_BROKENREPORTED;
+
+ $xoopsMailer = & getMailer();
+ $xoopsMailer->useMail();
+ $template_dir = WFDOWNLOADS_ROOT_PATH . "/language/" . $xoopsConfig['language'] . "/mail_template";
+
+ $xoopsMailer->setTemplateDir($template_dir);
+ $xoopsMailer->setTemplate('filebroken_notify.tpl');
+ $xoopsMailer->setToEmails($user->email());
+ $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
+ $xoopsMailer->setFromName($xoopsConfig['sitename']);
+ $xoopsMailer->assign("X_UNAME", $user->uname());
+ $xoopsMailer->assign("SITENAME", $xoopsConfig['sitename']);
+ $xoopsMailer->assign("X_ADMINMAIL", $xoopsConfig['adminmail']);
+ $xoopsMailer->assign('X_SITEURL', XOOPS_URL . '/');
+ $xoopsMailer->assign("X_TITLE", $title);
+ $xoopsMailer->assign("X_SUB_DATE", $subdate);
+ $xoopsMailer->assign('X_DOWNLOAD', WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}");
+ $xoopsMailer->setSubject($subject);
+ $xoopsMailer->send();
+ redirect_header('index.php', 2, _MD_WFDOWNLOADS_BROKENREPORTED);
+ exit();
+ } else {
+ echo $report->getHtmlErrors();
+ }
+ }
+ } else {
+ $xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_brokenfile.html";
+ include XOOPS_ROOT_PATH . '/header.php';
+
+ // Begin Main page Heading etc
+ $catarray['imageheader'] = wfdownloads_headerImage();
+ $xoopsTpl->assign('catarray', $catarray);
+
+ $xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery.js');
+ $xoTheme->addScript(WFDOWNLOADS_URL . '/js/jquery.ThickBox/thickbox-compressed.js');
+ $xoTheme->addStylesheet(WFDOWNLOADS_URL . '/js/jquery.ThickBox/thickbox.css');
+ $xoTheme->addStylesheet(WFDOWNLOADS_URL . '/module.css');
+
+ $xoopsTpl->assign('wfdownloads_url', WFDOWNLOADS_URL . '/');
+
+ // Breadcrumb
+ $breadcrumb->addLink(_MD_WFDOWNLOADS_REPORTBROKEN, '');
+ $xoopsTpl->assign('wfdownloads_breadcrumb', $breadcrumb->render());
+
+ // Generate form
+ include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+ $sform = new XoopsThemeForm(_MD_WFDOWNLOADS_RATETHISFILE, 'reportform', xoops_getenv('PHP_SELF'));
+ $sform->addElement(new XoopsFormHidden('lid', $lid));
+ $sform->addElement(new XoopsFormHidden('cid', $cid));
+ $sform->addElement(new XoopsFormHidden('uid', $senderUid));
+ $button_tray = new XoopsFormElementTray('', '');
+ $submit_button = new XoopsFormButton('', 'submit', _MD_WFDOWNLOADS_SUBMITBROKEN, 'submit');
+ $button_tray->addElement($submit_button);
+ $cancel_button = new XoopsFormButton('', '', _CANCEL, 'button');
+ $cancel_button->setExtra('onclick="history.go(-1)"');
+ $button_tray->addElement($cancel_button);
+ $sform->addElement($button_tray);
+ $xoopsTpl->assign('reportform', $sform->render());
+ $xoopsTpl->assign(
+ 'download',
+ array('lid' => $lid, 'cid' => $cid, 'title' => $download->getVar('title'), 'description' => $download->getVar('description'))
+ );
+
+ $criteria = new Criteria('lid', $lid);
+ $reports = $wfdownloads->getHandler('report')->getObjects($criteria);
+ //print_r($reports);
+ if (count($reports) > 0) {
+ $report = $reports[0];
+
+ $broken['title'] = trim($download->getVar('title'));
+ $broken['id'] = $report->getVar('reportid');
+ $broken['reporter'] = XoopsUserUtility::getUnameFromId((int)$report->getVar('sender'));
+ $broken['date'] = formatTimestamp($report->getVar('published'), $wfdownloads->getConfig('dateformat'));
+ $broken['acknowledged'] = ($report->getVar('acknowledged') == 1) ? _YES : _NO;
+ $broken['confirmed'] = ($report->getVar('confirmed') == 1) ? _YES : _NO;
+
+ $xoopsTpl->assign('brokenreportexists', true);
+ $xoopsTpl->assign('broken', $broken);
+ $xoopsTpl->assign('brokenreport', true); // this definition is not removed for backward compatibility issues
+ } else {
+ // file info
+ $down['title'] = trim($download->getVar('title'));
+ $down['homepage'] = $myts->makeClickable(formatURL(trim($download->getVar('homepage'))));
+ $time = ($download->getVar('updated') != false) ? $download->getVar('updated') : $download->getVar('published');
+ $down['updated'] = formatTimestamp($time, $wfdownloads->getConfig('dateformat'));
+ $is_updated = ($download->getVar('updated') != false) ? _MD_WFDOWNLOADS_UPDATEDON : _MD_WFDOWNLOADS_SUBMITDATE;
+ $down['publisher'] = XoopsUserUtility::getUnameFromId((int)$download->getVar('submitter'));
+
+ $xoopsTpl->assign('brokenreportexists', false);
+ $xoopsTpl->assign('file_id', $lid);
+ $xoopsTpl->assign('lang_subdate', $is_updated);
+ $xoopsTpl->assign('is_updated', $download->getVar('updated'));
+ $xoopsTpl->assign('lid', $lid);
+ $xoopsTpl->assign('down', $down);
+ }
+ include 'footer.php';
+ }
+ break;
+}
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/multicolumnsthemeform.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/multicolumnsthemeform.php 2014-05-28 22:48:37 UTC (rev 12555)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/multicolumnsthemeform.php 2014-06-14 08:16:24 UTC (rev 12586)
@@ -1,237 +1,238 @@
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-/**
- * WfdownloadsMulticolumnsThemeForm Class
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author lucio <luc...@gm...>
- * @package Wfdownloads
- * @since 3.23
- * @version $Id:$
- */
-
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
-xoops_load('XoopsForm');
-
-/**
- * Form that will output formatted as a HTML table
- *
- * No styles and no JavaScript to check for required fields.
- */
-class WfdownloadsMulticolumnsThemeForm extends XoopsForm
-{
- /**
- * number of two-dimensional array (matrix) rows
- *
- * @var int
- */
- var $_rows = 0;
-
- /**
- * return number of rows
- *
- * @return int
- */
- public function getCountRows()
- {
- return $this->_rows;
- }
-
- /**
- * number of two-dimensional array (matrix) columns
- *
- * @var int
- */
- var $_columns = 0;
-
- /**
- * return number of columns
- *
- * @return int
- */
- public function getCountColumns()
- {
- return $this->_columns;
- }
-
- /**
- * two-dimensional array (matrix) of {@link XoopsFormElement} objects
- *
- * @var array
- */
- var $_elements = array();
-
- /**
- * mono-dimensional array of column titles
- *
- * @var array
- */
- var $_titles = array();
-
- /**
- * Add an element to the form
- *
- * @param object $ &$formElement reference to a {@link XoopsFormElement}
- * @param bool $required is this a "required" element?
- * @param int $row two-dimensional array (matrix) row (0 first key)
- * @param int $column two-dimensional array (matrix) column (0 first key)
- */
- public function addElement($formElement, $required = false, $row = null, $column = null)
- {
- if (is_null($row))
- $row = $this->_rows;
- if (is_null($column))
- $column = ($this->_columns == 0) ? $this->_columns : $this->_columns - 1; // add new element as new row of the last column
- if (is_string($formElement)) {
- $this->_elements[$row][$column] = $formElement;
- if ($row >= $this->_rows)
- $this->_rows = $row + 1;
- if ($column >= $this->_columns)
- $this->_columns = $column + 1;
- } elseif (is_subclass_of($formElement, 'xoopsformelement')) {
- $this->_elements[$row][$column] = &$formElement;
- if ($row >= $this->_rows)
- $this->_rows = $row + 1;
- if ($column >= $this->_columns)
- $this->_columns = $column + 1;
- if (! $formElement->isContainer()) {
- if ($required) {
- $formElement->_required = true;
- $this->_required[] = &$formElement;
- }
- } else {
- $required_elements = &$formElement->getRequired();
- $count = count($required_elements);
- for ($i = 0; $i < $count; $i ++) {
- $this->_required[] = &$required_elements[$i];
- }
- }
- }
- }
-
- public function addRow($elements)
- {
- foreach ($elements as $key => $element) {
- $this->addElement($element, false, $this->_rows, $key);
- }
- }
-
- public function addColumn($elements)
- {
- foreach ($elements as $key => $element) {
- $this->addElement($element, false, $key, $this->_columns);
- }
- }
-
- public function addForm($form)
- {
- foreach ($form->getElements() as $element) {
- $this->addElement($element, $element->isRequired(), $key, $this->_columns);
- }
- }
-
- public function setTitles($titles)
- {
- if (is_array($titles)) {
- foreach($titles as $key => $title) {
- $this->_titles[$key] = $title;
- }
- } else {
- $this->_title = $titles;
- }
- }
-
- /**
- * create HTML to output the form as a theme-enabled table with validation.
- *
- * YOU SHOULD AVOID TO USE THE FOLLOWING Nocolspan METHOD, IT WILL BE REMOVED
- *
- * To use the noColspan simply use the following example:
- *
- * $colspan = new XoopsFormDhtmlTextArea( '', 'key', $value, '100%', '100%' );
- * $colspan->setNocolspan();
- * $form->addElement( $colspan );
- *
- * @return string
- */
- function render()
- {
- $ele_name = $this->getName();
- $ret = "";
- $ret .= "<form name='{$ele_name}' id='{$ele_name}' action='{$this->getAction()}' method='{$this->getMethod()}' onsubmit='return xoopsFormValidate_{$ele_name}();' {$this->getExtra()} >" . NWLINE;
- $ret .= "<table width='100%' class='outer' cellspacing='1'>" . NWLINE;
- $ret .= "<tr><th colspan='{$this->_columns}'>{$this->getTitle()}</th></tr>" . NWLINE;
- if (count($this->_titles) > 0) {
- $ret .= "<tr>";
- for ($column = 0; $column < $this->_columns; $column++) {
- $ret .= "<th>";
- $ret .= (isset($this->_titles[$column])) ? "{$this->_titles[$column]}" : " ";
- $ret .= "</th>" . NWLINE;
- }
- $ret .= "</tr>";
- }
- $hidden = '';
- $class = 'even';
- for ($row = 0; $row < $this->_rows; $row++) {
- $ret .= "<tr>";
- for ($column = 0; $column < $this->_columns; $column++) {
- $ret .= "<td class='{$class}'>";
- if (isset($this->_elements[$row][$column])) {
- $ele = $this->_elements[$row][$column];
- } else {
- $ele = ' ';
- }
- if (!is_object($ele)) {
- $ret .= $ele;
- } else if (!$ele->isHidden()) {
- if (!$ele->getNocolspan()) {
- //$ret .= '<tr valign="top" align="left"><td class="head">';
- if (($caption = $ele->getCaption()) != '') {
- $ret .= "<div class='xoops-form-element-caption" . ($ele->isRequired() ? '-required' : '') . "'>";
- $ret .= "<span class='caption-text'>{$caption}</span>";
- $ret .= "<span class='caption-marker'>*</span>";
- $ret .= "</div>";
- }
- if (($desc = $ele->getDescription()) != '') {
- $ret .= "<div class='xoops-form-element-help'>{$desc}</div>";
- }
- //$ret .= '</td><td class="' . $class . '">';
- $ret .= $ele->render();
- //$ret .= '</td></tr>' . NWLINE;
- } else {
- //$ret .= '<tr valign="top" align="left"><td class="head" colspan="2">';
- if (($caption = $ele->getCaption()) != '') {
- $ret .= "<div class='xoops-form-element-caption" . ($ele->isRequired() ? '-required' : '') . "'>";
- $ret .= "<span class='caption-text'>{$caption}</span>";
- $ret .= "<span class='caption-marker'>*</span>";
- $ret .= "</div>";
- }
- //$ret .= '</td></tr>' . NWLINE;
- //$ret .= '<tr valign="top" align="left"><td class="' . $class . '" colspan="' . $this->_columns . '">';
- $ret .= $ele->render();
- //$ret .= '</td></tr>' . NWLINE;
- }
- } else {
- $hidden .= $ele->render();
- }
- $ret .= "</td>";
- }
- $ret .= "</tr>";
- }
- $ret .= "</table>" . NWLINE;
- $ret .= "{$hidden}" . NWLINE;
- $ret .= "</form>" . NWLINE;
- $ret .= $this->renderValidationJS(true);
- return $ret;
- }
-}
\ No newline at end of file
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * WfdownloadsMulticolumnsThemeForm Class
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author lucio <luc...@gm...>
+ * @package Wfdownloads
+ * @since 3.23
+ * @version $Id:$
+ */
+
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+xoops_load('XoopsForm');
+
+/**
+ * Form that will output formatted as a HTML table
+ *
+ * No styles and no JavaScript to check for required fields.
+ */
+class WfdownloadsMulticolumnsThemeForm extends XoopsForm
+{
+ /**
+ * number of two-dimensional array (matrix) rows
+ *
+ * @var int
+ */
+ var $_rows = 0;
+
+ /**
+ * return number of rows
+ *
+ * @return int
+ */
+ public function getCountRows()
+ {
+ return $this->_rows;
+ }
+
+ /**
+ * number of two-dimensional array (matrix) columns
+ *
+ * @var int
+ */
+ var $_columns = 0;
+
+ /**
+ * return number of columns
+ *
+ * @return int
+ */
+ public function getCountColumns()
+ {
+ return $this->_columns;
+ }
+
+ /**
+ * two-dimensional array (matrix) of {@link XoopsFormElement} objects
+ *
+ * @var array
+ */
+ var $_elements = array();
+
+ /**
+ * mono-dimensional array of column titles
+ *
+ * @var array
+ */
+ var $_titles = array();
+
+ /**
+ * Add an element to the form
+ *
+ * @param object $ &$formElement reference to a {@link XoopsFormElement}
+ * @param bool $required is this a "required" element?
+ * @param int $row two-dimensional array (matrix) row (0 first key)
+ * @param int $column two-dimensional array (matrix) column (0 first key)
+ */
+ public function addElement($formElement, $required = false, $row = null, $column = null)
+ {
+ if (is_null($row))
+ $row = $this->_rows;
+ if (is_null($column))
+ $column = ($this->_columns == 0) ? $this->_columns : $this->_columns - 1; // add new element as new row of the last column
+ if (is_string($formElement)) {
+ $this->_elements[$row][$column] = $formElement;
+ if ($row >= $this->_rows)
+ $this->_rows = $row + 1;
+ if ($column >= $this->_columns)
+ $this->_columns = $column + 1;
+ } elseif (is_subclass_of($formElement, 'xoopsformelement')) {
+ $this->_elements[$row][$column] = &$formElement;
+ if ($row >= $this->_rows)
+ $this->_rows = $row + 1;
+ if ($column >= $this->_columns)
+ $this->_columns = $column + 1;
+ if (! $formElement->isContainer()) {
+ if ($required) {
+ $formElement->_required = true;
+ $this->_required[] = &$formElement;
+ }
+ } else {
+ $required_elements = &$formElement->getRequired();
+ $count = count($required_elements);
+ for ($i = 0; $i < $count; ++$i) {
+ $this->_required[] = &$required_elements[$i];
+ }
+ }
+ }
+ }
+
+ public function addRow($elements)
+ {
+ foreach ($elements as $key => $element) {
+ $this->addElement($element, false, $this->_rows, $key);
+ }
+ }
+
+ public function addColumn($elements)
+ {
+ foreach ($elements as $key => $element) {
+ $this->addElement($element, false, $key, $this->_columns);
+ }
+ }
+
+ public function addForm($form)
+ {
+ foreach ($form->getElements() as $element) {
+ $this->addElement($element, $element->isRequired(), $key, $this->_columns);
+ }
+ }
+
+ public function setTitles($titles)
+ {
+ if (is_array($titles)) {
+ foreach ($titles as $key => $title) {
+ $this->_titles[$key] = $title;
+ }
+ } else {
+ $this->_title = $titles;
+ }
+ }
+
+ /**
+ * create HTML to output the form as a theme-enabled table with validation.
+ *
+ * YOU SHOULD AVOID TO USE THE FOLLOWING Nocolspan METHOD, IT WILL BE REMOVED
+ *
+ * To use the noColspan simply use the following example:
+ *
+ * $colspan = new XoopsFormDhtmlTextArea( '', 'key', $value, '100%', '100%' );
+ * $colspan->setNocolspan();
+ * $form->addElement( $colspan );
+ *
+ * @return string
+ */
+ function render()
+ {
+ $ele_name = $this->getName();
+ $ret = "";
+ $ret .= "<form name='{$ele_name}' id='{$ele_name}' action='{$this->getAction()}' method='{$this->getMethod()}' onsubmit='return xoopsFormValidate_{$ele_name}();' {$this->getExtra()} >" . NWLINE;
+ $ret .= "<table width='100%' class='outer' cellspacing='1'>" . NWLINE;
+ $ret .= "<tr><th colspan='{$this->_columns}'>{$this->getTitle()}</th></tr>" . NWLINE;
+ if (count($this->_titles) > 0) {
+ $ret .= "<tr>";
+ for ($column = 0; $column < $this->_columns; ++$column) {
+ $ret .= "<th>";
+ $ret .= (isset($this->_titles[$column])) ? "{$this->_titles[$column]}" : " ";
+ $ret .= "</th>" . NWLINE;
+ }
+ $ret .= "</tr>";
+ }
+ $hidden = '';
+ $class = 'even';
+ for ($row = 0; $row < $this->_rows; ++$row) {
+ $ret .= "<tr>";
+ for ($column = 0; $column < $this->_columns; ++$column) {
+ $ret .= "<td class='{$class}'>";
+ if (isset($this->_elements[$row][$column])) {
+ $ele = $this->_elements[$row][$column];
+ } else {
+ $ele = ' ';
+ }
+ if (!is_object($ele)) {
+ $ret .= $ele;
+ } elseif (!$ele->isHidden()) {
+ if (!$ele->getNocolspan()) {
+ //$ret .= '<tr valign="top" align="left"><td class="head">';
+ if (($caption = $ele->getCaption()) != '') {
+ $ret .= "<div class='xoops-form-element-caption" . ($ele->isRequired() ? '-required' : '') . "'>";
+ $ret .= "<span class='caption-text'>{$caption}</span>";
+ $ret .= "<span class='caption-marker'>*</span>";
+ $ret .= "</div>";
+ }
+ if (($desc = $ele->getDescription()) != '') {
+ $ret .= "<div class='xoops-form-element-help'>{$desc}</div>";
+ }
+ //$ret .= '</td><td class="' . $class . '">';
+ $ret .= $ele->render();
+ //$ret .= '</td></tr>' . NWLINE;
+ } else {
+ //$ret .= '<tr valign="top" align="left"><td class="head" colspan="2">';
+ if (($caption = $ele->getCaption()) != '') {
+ $ret .= "<div class='xoops-form-element-caption" . ($ele->isRequired() ? '-required' : '') . "'>";
+ $ret .= "<span class='caption-text'>{$caption}</span>";
+ $ret .= "<span class='caption-marker'>*</span>";
+ $ret .= "</div>";
+ }
+ //$ret .= '</td></tr>' . NWLINE;
+ //$ret .= '<tr valign="top" align="left"><td class="' . $class . '" colspan="' . $this->_columns . '">';
+ $ret .= $ele->render();
+ //$ret .= '</td></tr>' . NWLINE;
+ }
+ } else {
+ $hidden .= $ele->render();
+ }
+ $ret .= "</td>";
+ }
+ $ret .= "</tr>";
+ }
+ $ret .= "</table>" . NWLINE;
+ $ret .= "{$hidden}" . NWLINE;
+ $ret .= "</form>" . NWLINE;
+ $ret .= $this->renderValidationJS(true);
+
+ return $ret;
+ }
+}...
[truncated message content] |