Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12069] XoopsModules/wfdownloads/trunk/wfdownloads
|
From: <luc...@us...> - 2013-09-20 19:48:48
|
Revision: 12069
http://sourceforge.net/p/xoops/svn/12069
Author: luciorota
Date: 2013-09-20 19:48:41 +0000 (Fri, 20 Sep 2013)
Log Message:
-----------
- added: module is clonable, built-in module clone function
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/about.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_footer.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/categories.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/import.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/indexpage.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/permissions.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/ratings.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php
XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top.php
XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top_by_cat.php
XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/category.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/dbupdater.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/img_uploader.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/ip_log.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/mimetype.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/mirror.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/modification.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/object.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/rating.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/report.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/review.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/uploader.php
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/changelog.txt
XoopsModules/wfdownloads/trunk/wfdownloads/docs/credits.txt
XoopsModules/wfdownloads/trunk/wfdownloads/docs/history.txt
XoopsModules/wfdownloads/trunk/wfdownloads/docs/lang_diff.txt
XoopsModules/wfdownloads/trunk/wfdownloads/docs/readme.txt
XoopsModules/wfdownloads/trunk/wfdownloads/footer.php
XoopsModules/wfdownloads/trunk/wfdownloads/header.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/comment_functions.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/common.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/constants.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/directorychecker.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/filechecker.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/module.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/notification.inc.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/search.inc.php
XoopsModules/wfdownloads/trunk/wfdownloads/index.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/blocks.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/common.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/directorychecker.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/filechecker.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help.html
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help2.html
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help3.html
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help4.html
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help5.html
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help6.html
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/main.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php
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/mysql.sql
XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
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/wfdownloads_brokenfile.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_topten.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_viewcat.html
XoopsModules/wfdownloads/trunk/wfdownloads/topten.php
XoopsModules/wfdownloads/trunk/wfdownloads/viewcat.php
XoopsModules/wfdownloads/trunk/wfdownloads/visit.php
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Added Paths:
-----------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/clone.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/wfdownloads_lists.php
XoopsModules/wfdownloads/trunk/wfdownloads/images/VeraBd.ttf
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon32/
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon32/editcopy.png
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon32/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/images/module_logo.png
Removed Paths:
-------------
XoopsModules/wfdownloads/trunk/wfdownloads/class/wfd_lists.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/about.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/about.php 2013-09-20 00:06:19 UTC (rev 12068)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/about.php 2013-09-20 19:48:41 UTC (rev 12069)
@@ -9,7 +9,7 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
/**
- * WF-Downloads module
+ * 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)
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_footer.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_footer.php 2013-09-20 00:06:19 UTC (rev 12068)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_footer.php 2013-09-20 19:48:41 UTC (rev 12069)
@@ -9,7 +9,7 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
/**
- * WF-Downloads module
+ * 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)
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-09-20 00:06:19 UTC (rev 12068)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-09-20 19:48:41 UTC (rev 12069)
@@ -9,7 +9,7 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
/**
- * WF-Downloads module
+ * 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)
@@ -37,22 +37,22 @@
include_once dirname(dirname(__FILE__)) . '/include/common.php';
/*$imagearray = array(
- 'editimg' => "<img src='" . $pathIcon16 . '/edit.png'."' alt='" . _AM_WFD_ICO_EDIT . "' title='" . _AM_WFD_ICO_EDIT . "' align='middle'>",
- 'deleteimg' => "<img src='" . $pathIcon16 . '/delete.png'."' alt='" . _AM_WFD_ICO_DELETE . "' title='" . _AM_WFD_ICO_DELETE . "' align='middle'>",
- 'online' => "<img src='" . $pathIcon16 . '/1.png'."' alt='" . _AM_WFD_ICO_ONLINE . "' title='" . _AM_WFD_ICO_ONLINE . "' align='middle'>",
- 'offline' => "<img src='" . $pathIcon16 . '/0.png'."' alt='" . _AM_WFD_ICO_OFFLINE . "' title='" . _AM_WFD_ICO_OFFLINE . "' align='middle'>",
- 'approved' => "<img src='" . $pathIcon16 . '/on.png'."' alt=''" . _AM_WFD_ICO_APPROVED . "' title=''" . _AM_WFD_ICO_APPROVED . "' align='middle'>",
- 'notapproved' => "<img src='" . $pathIcon16 . '/off.png'."' alt='" . _AM_WFD_ICO_NOTAPPROVED . "' title='" . _AM_WFD_ICO_NOTAPPROVED . "' align='middle'>",
- 'relatedfaq' => "<img src='../images/icon/link.png' alt='" . _AM_WFD_ICO_LINK . "' title='" . _AM_WFD_ICO_LINK . "' align='middle'>",
- 'relatedurl' => "<img src='../images/icon/world_link.png' alt='" . _AM_WFD_ICO_URL . "' title='" . _AM_WFD_ICO_URL . "' align='middle'>",
- 'addfaq' => "<img src='" . $pathIcon16 . '/add.png'."' alt='" . _AM_WFD_ICO_ADD . "' title='" . _AM_WFD_ICO_ADD . "' align='middle'>",
- 'approve' => "<img src='" . $pathIcon16 . '/on.png'."' alt='" . _AM_WFD_ICO_APPROVE . "' title='" . _AM_WFD_ICO_APPROVE . "' align='middle'>",
- 'statsimg' => "<img src='../images/icon/statistics.png' alt='" . _AM_WFD_ICO_STATS . "' title='" . _AM_WFD_ICO_STATS . "' align='middle'>",
- 'ignore' => "<img src='../images/icon/ignore.png' alt='" . _AM_WFD_ICO_IGNORE . "' title='" . _AM_WFD_ICO_IGNORE . "' align='middle'>",
- 'ack_yes' => "<img src='" . $pathIcon16 . '/on.png'."' alt='" . _AM_WFD_ICO_ACK . "' title='" . _AM_WFD_ICO_ACK . "' align='middle'>",
- 'ack_no' => "<img src='" . $pathIcon16 . '/off.png'."' alt='" . _AM_WFD_ICO_REPORT . "' title='" . _AM_WFD_ICO_REPORT . "' align='middle'>",
- 'con_yes' => "<img src='" . $pathIcon16 . '/on.png'."' alt='" . _AM_WFD_ICO_CONFIRM . "' title='" . _AM_WFD_ICO_CONFIRM . "' align='middle'>",
- 'con_no' => "<img src='" . $pathIcon16 . '/off.png'."' alt='" . _AM_WFD_ICO_CONBROKEN . "' title='" . _AM_WFD_ICO_CONBROKEN . "' align='middle'>"
+ 'editimg' => "<img src='" . $pathIcon16 . '/edit.png'."' alt='" . _AM_WFDOWNLOADS_ICO_EDIT . "' title='" . _AM_WFDOWNLOADS_ICO_EDIT . "' align='middle'>",
+ 'deleteimg' => "<img src='" . $pathIcon16 . '/delete.png'."' alt='" . _AM_WFDOWNLOADS_ICO_DELETE . "' title='" . _AM_WFDOWNLOADS_ICO_DELETE . "' align='middle'>",
+ 'online' => "<img src='" . $pathIcon16 . '/1.png'."' alt='" . _AM_WFDOWNLOADS_ICO_ONLINE . "' title='" . _AM_WFDOWNLOADS_ICO_ONLINE . "' align='middle'>",
+ 'offline' => "<img src='" . $pathIcon16 . '/0.png'."' alt='" . _AM_WFDOWNLOADS_ICO_OFFLINE . "' title='" . _AM_WFDOWNLOADS_ICO_OFFLINE . "' align='middle'>",
+ 'approved' => "<img src='" . $pathIcon16 . '/on.png'."' alt=''" . _AM_WFDOWNLOADS_ICO_APPROVED . "' title=''" . _AM_WFDOWNLOADS_ICO_APPROVED . "' align='middle'>",
+ 'notapproved' => "<img src='" . $pathIcon16 . '/off.png'."' alt='" . _AM_WFDOWNLOADS_ICO_NOTAPPROVED . "' title='" . _AM_WFDOWNLOADS_ICO_NOTAPPROVED . "' align='middle'>",
+ 'relatedfaq' => "<img src='../images/icon/link.png' alt='" . _AM_WFDOWNLOADS_ICO_LINK . "' title='" . _AM_WFDOWNLOADS_ICO_LINK . "' align='middle'>",
+ 'relatedurl' => "<img src='../images/icon/world_link.png' alt='" . _AM_WFDOWNLOADS_ICO_URL . "' title='" . _AM_WFDOWNLOADS_ICO_URL . "' align='middle'>",
+ 'addfaq' => "<img src='" . $pathIcon16 . '/add.png'."' alt='" . _AM_WFDOWNLOADS_ICO_ADD . "' title='" . _AM_WFDOWNLOADS_ICO_ADD . "' align='middle'>",
+ 'approve' => "<img src='" . $pathIcon16 . '/on.png'."' alt='" . _AM_WFDOWNLOADS_ICO_APPROVE . "' title='" . _AM_WFDOWNLOADS_ICO_APPROVE . "' align='middle'>",
+ 'statsimg' => "<img src='../images/icon/statistics.png' alt='" . _AM_WFDOWNLOADS_ICO_STATS . "' title='" . _AM_WFDOWNLOADS_ICO_STATS . "' align='middle'>",
+ 'ignore' => "<img src='../images/icon/ignore.png' alt='" . _AM_WFDOWNLOADS_ICO_IGNORE . "' title='" . _AM_WFDOWNLOADS_ICO_IGNORE . "' align='middle'>",
+ 'ack_yes' => "<img src='" . $pathIcon16 . '/on.png'."' alt='" . _AM_WFDOWNLOADS_ICO_ACK . "' title='" . _AM_WFDOWNLOADS_ICO_ACK . "' align='middle'>",
+ 'ack_no' => "<img src='" . $pathIcon16 . '/off.png'."' alt='" . _AM_WFDOWNLOADS_ICO_REPORT . "' title='" . _AM_WFDOWNLOADS_ICO_REPORT . "' align='middle'>",
+ 'con_yes' => "<img src='" . $pathIcon16 . '/on.png'."' alt='" . _AM_WFDOWNLOADS_ICO_CONFIRM . "' title='" . _AM_WFDOWNLOADS_ICO_CONFIRM . "' align='middle'>",
+ 'con_no' => "<img src='" . $pathIcon16 . '/off.png'."' alt='" . _AM_WFDOWNLOADS_ICO_CONBROKEN . "' title='" . _AM_WFDOWNLOADS_ICO_CONBROKEN . "' align='middle'>"
);*/
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/categories.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/categories.php 2013-09-20 00:06:19 UTC (rev 12068)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/categories.php 2013-09-20 19:48:41 UTC (rev 12069)
@@ -9,7 +9,7 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
/**
- * WF-Downloads module
+ * 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)
@@ -32,19 +32,19 @@
wfdownloads_xoops_cp_header();
include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
- $sform = new XoopsThemeForm(_AM_WFD_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_WFD_BMODIFY, $mytree->makeSelBox('target', 'title')));
+ $sform->addElement(new XoopsFormLabel(_AM_WFDOWNLOADS_BMODIFY, $mytree->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_WFD_BMOVE, 'submit');
+ $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_WFD_BCANCEL, 'submit');
+ $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);
@@ -54,17 +54,17 @@
$source = WfdownloadsRequest::getInt('source', 0, 'POST');
$target = WfdownloadsRequest::getInt('target', 0, 'POST');
if ($target == $source) {
- redirect_header($currentFile . "?op=category.move&ok=0&cid={$source}", 5, _AM_WFD_CCATEGORY_MODIFY_FAILED);
+ 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_WFD_CCATEGORY_MODIFY_FAILEDT);
+ 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);
if (!$result) {
- $error = _AM_WFD_DBERROR;
+ $error = _AM_WFDOWNLOADS_DBERROR;
trigger_error($error, E_USER_ERROR);
}
- redirect_header($currentFile, 1, _AM_WFD_CCATEGORY_MODIFY_MOVED);
+ redirect_header($currentFile, 1, _AM_WFDOWNLOADS_CCATEGORY_MODIFY_MOVED);
exit();
}
break;
@@ -92,7 +92,7 @@
$category = $wfdownloads->getHandler('category')->get($cid);
$childcats = $wfdownloads->getHandler('category')->getChildCats($category);
if ($pid == $cid || in_array($pid, array_keys($childcats))) {
- $category->setErrors(_AM_WFD_CCATEGORY_CHILDASPARENT);
+ $category->setErrors(_AM_WFDOWNLOADS_CCATEGORY_CHILDASPARENT);
}
}
@@ -135,9 +135,9 @@
$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_WFD_CCATEGORY_CREATED;
+ $database_mess = _AM_WFDOWNLOADS_CCATEGORY_CREATED;
} else {
- $database_mess = _AM_WFD_CCATEGORY_MODIFIED;
+ $database_mess = _AM_WFDOWNLOADS_CCATEGORY_MODIFIED;
wfdownloads_savePermissions($down_groups, $cid, 'WFDownCatPerm');
wfdownloads_savePermissions($up_groups, $cid, 'WFUpCatPerm');
}
@@ -176,18 +176,18 @@
// all downloads for each category is deleted, now delete the category data
$wfdownloads->getHandler('category')->deleteAll($criteria);
- $error = _AM_WFD_DBERROR;
+ $error = _AM_WFDOWNLOADS_DBERROR;
foreach ($cids as $cid) {
xoops_groupperm_deletebymoditem ($wfdownloads->getModule()->mid(), 'WFDownCatPerm', $cid);
xoops_groupperm_deletebymoditem ($wfdownloads->getModule() -> mid(), 'WFUpCatPerm', $cid);
}
- redirect_header($currentFile, 1, _AM_WFD_CCATEGORY_DELETED);
+ redirect_header($currentFile, 1, _AM_WFDOWNLOADS_CCATEGORY_DELETED);
exit();
} else {
wfdownloads_xoops_cp_header();
- xoops_confirm(array('op' => 'category.delete', 'cid' => $cid, 'ok' => true), $currentFile, _AM_WFD_CCATEGORY_AREUSURE);
+ xoops_confirm(array('op' => 'category.delete', 'cid' => $cid, 'ok' => true), $currentFile, _AM_WFDOWNLOADS_CCATEGORY_AREUSURE);
xoops_cp_footer();
}
break;
@@ -200,8 +200,8 @@
echo $indexAdmin->addNavigation($currentFile);
$adminMenu = new ModuleAdmin();
- $adminMenu->addItemButton(_MI_WFD_MENU_CATEGORIES, "{$currentFile}?op=categories.list", 'list');
- $adminMenu->addItemButton(_AM_WFD_CCATEGORY_CREATENEW, "{$currentFile}?op=category.add", 'add');
+ $adminMenu->addItemButton(_MI_WFDOWNLOADS_MENU_CATEGORIES, "{$currentFile}?op=categories.list", 'list');
+ $adminMenu->addItemButton(_AM_WFDOWNLOADS_CCATEGORY_CREATENEW, "{$currentFile}?op=category.add", 'add');
echo $adminMenu->renderButton();
if (isset($_REQUEST['cid'])) {
@@ -223,8 +223,8 @@
echo $indexAdmin->addNavigation($currentFile);
$adminMenu = new ModuleAdmin();
- $adminMenu->addItemButton(_MI_WFD_MENU_CATEGORIES, "{$currentFile}?op=categories.list", 'list');
- $adminMenu->addItemButton(_AM_WFD_CCATEGORY_CREATENEW, "{$currentFile}?op=category.add", 'add');
+ $adminMenu->addItemButton(_MI_WFDOWNLOADS_MENU_CATEGORIES, "{$currentFile}?op=categories.list", 'list');
+ $adminMenu->addItemButton(_AM_WFDOWNLOADS_CCATEGORY_CREATENEW, "{$currentFile}?op=category.add", 'add');
echo $adminMenu->renderButton();
$totalCategories = wfdownloads_categoriesCount();
@@ -234,7 +234,7 @@
$GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML() );
$GLOBALS['xoopsTpl']->display("db:" . $wfdownloads->getModule()->dirname() . "_admin_categorieslist.html");
} else {
- redirect_header("{$currentFile}?op=category.add", 1, _AM_WFD_CCATEGORY_NOEXISTS);
+ redirect_header("{$currentFile}?op=category.add", 1, _AM_WFDOWNLOADS_CCATEGORY_NOEXISTS);
}
include 'admin_footer.php';
break;
@@ -255,7 +255,7 @@
}
unset($category);
}
- redirect_header($currentFile, 1, _AM_WFD_CATEGORIES_REORDERED);
+ redirect_header($currentFile, 1, _AM_WFDOWNLOADS_CATEGORIES_REORDERED);
exit();
}
break;
Added: XoopsModules/wfdownloads/trunk/wfdownloads/admin/clone.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/clone.php (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/clone.php 2013-09-20 19:48:41 UTC (rev 12069)
@@ -0,0 +1,174 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * Wfdownloads module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package wfdownload
+ * @since 3.23
+ * @author Xoops Development Team
+ * @version svn:$id$
+ */
+$currentFile = basename(__FILE__);
+include_once dirname(__FILE__) . '/admin_header.php';
+
+if (@$_POST['op'] == 'submit') {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($currentFile, 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ exit();
+ }
+
+ $cloneDirname = $_POST['clonedirname'];
+
+ //check if name is valid
+ if (empty($clone) || preg_match('/[^a-zA-Z0-9\_\-]/', $cloneDirname)) {
+ redirect_header($currentFile, 3, sprintf(_AM_WFDOWNLOADS_CLONE_INVALIDNAME, $cloneDirname));
+ exit();
+ }
+ // Check wether the cloned module exists or not
+ if ($cloneDirname && is_dir(XOOPS_ROOT_PATH . '/modules/' . $cloneDirname)) {
+ redirect_header($currentFile, 3, sprintf(_AM_WFDOWNLOADS_CLONE_EXISTS, $cloneDirname));
+ }
+
+ $patterns = array(
+ strtolower(WFDOWNLOADS_DIRNAME) => strtolower($cloneDirname),
+ strtoupper(WFDOWNLOADS_DIRNAME) => strtoupper($cloneDirname),
+ ucfirst(strtolower(WFDOWNLOADS_DIRNAME)) => ucfirst(strtolower($cloneDirname))
+ );
+
+ $patKeys = array_keys($patterns);
+ $patValues = array_values($patterns);
+ wfdownloads_cloneFileDir(WFDOWNLOADS_ROOT_PATH);
+ $logocreated = wfdownloads_createLogo(strtolower($cloneDirname));
+
+ $message = "";
+ if (is_dir(XOOPS_ROOT_PATH . '/modules/' . strtolower($cloneDirname))) {
+ $message .= sprintf(_AM_WFDOWNLOADS_CLONE_CONGRAT, "<a href='" . XOOPS_URL . "/modules/system/admin.php?fct=modulesadmin'>" . ucfirst(strtolower($cloneDirname)) . "</a>") . "<br />\n";
+ if (!$logocreated) {
+ $message .= _AM_WFDOWNLOADS_CLONE_IMAGEFAIL;
+ }
+ } else {
+ $message .= _AM_WFDOWNLOADS_CLONE_FAIL;
+ }
+
+ wfdownloads_xoops_cp_header();
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation($currentFile);
+ echo $message;
+ include 'admin_footer.php';
+ exit();
+
+} else {
+ wfdownloads_xoops_cp_header();
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation($currentFile);
+ include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+ $form = new XoopsThemeForm(sprintf(_AM_WFDOWNLOADS_CLONE_TITLE, $wfdownloads->getModule()->getVar('name', 'E')), 'clone', $currentFile, 'post', true);
+ $cloneDirname_text = new XoopsFormText(_AM_WFDOWNLOADS_CLONE_NAME, 'clonedirname', 20, 20, '');
+ $cloneDirname_text->setDescription(_AM_WFDOWNLOADS_CLONE_NAME_DSC);
+ $form->addElement($cloneDirname_text, true);
+ $form->addElement(new XoopsFormHidden('op', 'submit'));
+ $form->addElement(new XoopsFormButton('', '', _SUBMIT, 'submit'));
+ $form->display();
+ include 'admin_footer.php';
+ exit();
+}
+
+
+
+// work around for PHP < 5.0.x
+if (!function_exists('file_put_contents')) {
+ function file_put_contents($filename, $data, $file_append = false)
+ {
+ if ($fp = fopen($filename, (!$file_append ? 'w+' : 'a+'))) {
+ fputs($fp, $data);
+ fclose($fp);
+ }
+ }
+}
+
+// recursive clonning script
+function wfdownloads_cloneFileDir($path)
+{
+ global $patKeys;
+ global $patValues;
+
+ $newPath = str_replace($patKeys[0], $patValues[0], $path);
+
+ if (is_dir($path)) {
+ // create new dir
+ mkdir($newPath);
+ // check all files in dir, and process it
+ if ($handle = opendir($path)) {
+ while ($file = readdir($handle)) {
+ if ($file != '.' && $file != '..' && $file != '.svn') {
+ wfdownloads_cloneFileDir("{$path}/{$file}");
+ }
+ }
+ closedir($handle);
+ }
+ } else {
+ if (preg_match('/(.jpg|.gif|.png|.zip|.ttf)$/i', $path)) {
+ // image
+ copy($path, $newPath);
+ } else {
+ // file, read it
+ $content = file_get_contents($path);
+ $content = str_replace($patKeys, $patValues, $content);
+ file_put_contents($newPath, $content);
+ }
+ }
+}
+
+function wfdownloads_createLogo($dirname)
+{
+ if (!extension_loaded("gd")) {
+ return false;
+ } else {
+ $required_functions = array(
+ "imagecreatetruecolor",
+ "imagecolorallocate",
+ "imagefilledrectangle",
+ "imagejpeg",
+ "imagedestroy",
+ "imageftbbox"
+ );
+ foreach ($required_functions as $func) {
+ if (!function_exists($func)) {
+ return false;
+ }
+ }
+ }
+
+ if (!file_exists($imageBase = XOOPS_ROOT_PATH . "/modules/" . $dirname . "/images/module_logo.png") || !file_exists($font = XOOPS_ROOT_PATH . "/modules/" . $dirname . "/images/VeraBd.ttf")) {
+ return false;
+ }
+
+ $imageModule = imagecreatefrompng($imageBase);
+
+ //Erase old text
+ $grey_color = imagecolorallocate($imageModule, 237, 237, 237);
+ imagefilledrectangle($imageModule, 5, 35, 85, 46, $grey_color);
+
+ // Write text
+ $text_color = imagecolorallocate($imageModule, 0, 0, 0);
+ $space_to_border = (80 - strlen($dirname) * 6.5) / 2;
+ imagefttext($imageModule, 8.5, 0, $space_to_border, 45, $text_color, $font, ucfirst($dirname), array());
+
+ // Set transparency color
+ $white = imagecolorallocatealpha($imageModule, 255, 255, 255, 127);
+ imagefill($imageModule, 0, 0, $white);
+ imagecolortransparent($imageModule, $white);
+ imagepng($imageModule, XOOPS_ROOT_PATH . "/modules/" . $dirname . "/images/module_logo.png");
+ imagedestroy($imageModule);
+ return true;
+}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2013-09-20 00:06:19 UTC (rev 12068)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2013-09-20 19:48:41 UTC (rev 12069)
@@ -9,7 +9,7 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
/**
- * WF-Downloads module
+ * 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)
@@ -31,8 +31,8 @@
echo $indexAdmin->addNavigation($currentFile);
$adminMenu = new ModuleAdmin();
- $adminMenu->addItemButton(_MI_WFD_MENU_DOWNLOADS, "{$currentFile}?op=downloads.list", 'list');
- $adminMenu->addItemButton(_AM_WFD_FFS_DOWNLOADTITLE, "{$currentFile}?op=download.add", 'add');
+ $adminMenu->addItemButton(_MI_WFDOWNLOADS_MENU_DOWNLOADS, "{$currentFile}?op=downloads.list", 'list');
+ $adminMenu->addItemButton(_AM_WFDOWNLOADS_FFS_DOWNLOADTITLE, "{$currentFile}?op=download.add", 'add');
echo $adminMenu->renderButton();
$lid = WfdownloadsRequest::getInt('lid', 0);
@@ -40,7 +40,7 @@
$category_count = $wfdownloads->getHandler('category')->getCount();
if ($category_count) {
// Allowed mimetypes list
- echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFD_FILE_ALLOWEDAMIME . "</legend>\n";
+ 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);
@@ -51,21 +51,21 @@
if ($lid) {
if (!$download = $wfdownloads->getHandler('download')->get($lid)) {
- redirect_header($currentFile, 4, _AM_WFD_DOWN_ERROR_FILENOTFOUND);
+ redirect_header($currentFile, 4, _AM_WFDOWNLOADS_DOWN_ERROR_FILENOTFOUND);
exit();
}
$cid = $download->getVar('cid');
if(!$category = $wfdownloads->getHandler('category')->get($cid)) {
- redirect_header($currentFile, 4, _AM_WFD_DOWN_ERROR_CATEGORYNOTFOUND);
+ redirect_header($currentFile, 4, _AM_WFDOWNLOADS_DOWN_ERROR_CATEGORYNOTFOUND);
exit();
}
- $title = preg_replace("/{category}/", $category->getVar('title'), _AM_WFD_FFS_EDITDOWNLOADTITLE);
+ $title = preg_replace("/{category}/", $category->getVar('title'), _AM_WFDOWNLOADS_FFS_EDITDOWNLOADTITLE);
} else {
$download = $wfdownloads->getHandler('download')->create();
$cid = WfdownloadsRequest::getInt('cid', 0, 'POST');
$category = $wfdownloads->getHandler('category')->get($cid);
$download->setVar('cid', $cid);
- $title = preg_replace("/{category}/", $category->getVar('title'), _AM_WFD_FFS_DOWNLOADTITLE);
+ $title = preg_replace("/{category}/", $category->getVar('title'), _AM_WFDOWNLOADS_FFS_DOWNLOADTITLE);
}
// Added Formulize module support (2006/05/04) jpc - start
@@ -98,7 +98,7 @@
$sform->display();
// Added Formulize module support (2006/05/04) jpc - end
} else {
- redirect_header('categories.php', 1, _AM_WFD_CCATEGORY_NOEXISTS);
+ redirect_header('categories.php', 1, _AM_WFDOWNLOADS_CCATEGORY_NOEXISTS);
exit();
}
@@ -119,31 +119,31 @@
$anonymousCriteria->setSort('ratingtimestamp');
$anonymousCriteria->setOrder('DESC');
- echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFD_VOTE_RATINGINFOMATION . "</legend>\n";
- echo "<div style='padding: 8px;'><b>" . _AM_WFD_VOTE_TOTALVOTES . "</b>{$votes_count}<br /><br />\n";
+ echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFDOWNLOADS_VOTE_RATINGINFOMATION . "</legend>\n";
+ echo "<div style='padding: 8px;'><b>" . _AM_WFDOWNLOADS_VOTE_TOTALVOTES . "</b>{$votes_count}<br /><br />\n";
- printf(_AM_WFD_VOTE_REGUSERVOTES, $votesreg);
+ printf(_AM_WFDOWNLOADS_VOTE_REGUSERVOTES, $votesreg);
echo "<br />";
- printf(_AM_WFD_VOTE_ANONUSERVOTES, $votesanon);
+ printf(_AM_WFDOWNLOADS_VOTE_ANONUSERVOTES, $votesanon);
echo "
</div>\n
<table width='100%' cellspacing='1' cellpadding='2' class='outer'>\n
<tr>\n
- <th>" . _AM_WFD_VOTE_USER . "</td>\n
- <th>" . _AM_WFD_VOTE_IP . "</td>\n
- <th>" . _AM_WFD_VOTE_RATING . "</td>\n
- <th>" . _AM_WFD_VOTE_USERAVG . "</td>\n
- <th>" . _AM_WFD_VOTE_TOTALRATE . "</td>\n
- <th>" . _AM_WFD_VOTE_DATE . "</td>\n
- <th>" . _AM_WFD_MINDEX_ACTION . "</td>\n
+ <th>" . _AM_WFDOWNLOADS_VOTE_USER . "</td>\n
+ <th>" . _AM_WFDOWNLOADS_VOTE_IP . "</td>\n
+ <th>" . _AM_WFDOWNLOADS_VOTE_RATING . "</td>\n
+ <th>" . _AM_WFDOWNLOADS_VOTE_USERAVG . "</td>\n
+ <th>" . _AM_WFDOWNLOADS_VOTE_TOTALRATE . "</td>\n
+ <th>" . _AM_WFDOWNLOADS_VOTE_DATE . "</td>\n
+ <th>" . _AM_WFDOWNLOADS_MINDEX_ACTION . "</td>\n
</tr>\n
";
if ($votesreg == 0) {
- echo "<tr><td colspan='7' class='even'><b>" . _AM_WFD_VOTE_NOREGVOTES . "</b></td></tr>";
+ echo "<tr><td colspan='7' class='even'><b>" . _AM_WFDOWNLOADS_VOTE_NOREGVOTES . "</b></td></tr>";
} else {
foreach (array_keys($regvotes) as $i) {
$uids[] = $regvotes[$i]->getVar('ratinguser');
@@ -177,17 +177,17 @@
<br />\n
<table width='100%' cellspacing='1' cellpadding='2' class='outer'>\n
<tr>\n
- <th>" . _AM_WFD_VOTE_USER . "</td>\n
- <th>" . _AM_WFD_VOTE_IP . "</td>\n
- <th>" . _AM_WFD_VOTE_RATING . "</td>\n
- <th>" . _AM_WFD_VOTE_USERAVG . "</td>\n
- <th>" . _AM_WFD_VOTE_TOTALRATE . "</td>\n
- <th>" . _AM_WFD_VOTE_DATE . "</td>\n
- <th>" . _AM_WFD_MINDEX_ACTION . "</td>\n
+ <th>" . _AM_WFDOWNLOADS_VOTE_USER . "</td>\n
+ <th>" . _AM_WFDOWNLOADS_VOTE_IP . "</td>\n
+ <th>" . _AM_WFDOWNLOADS_VOTE_RATING . "</td>\n
+ <th>" . _AM_WFDOWNLOADS_VOTE_USERAVG . "</td>\n
+ <th>" . _AM_WFDOWNLOADS_VOTE_TOTALRATE . "</td>\n
+ <th>" . _AM_WFDOWNLOADS_VOTE_DATE . "</td>\n
+ <th>" . _AM_WFDOWNLOADS_MINDEX_ACTION . "</td>\n
</tr>\n
";
if ($votesanon == 0) {
- echo "<tr><td colspan='7' class='even'><b>" . _AM_WFD_VOTE_NOUNREGVOTES . "</b></td></tr>";
+ 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);
@@ -289,7 +289,7 @@
$tags['CATEGORY_NAME'] = $category->getVar('title');
$tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid='{$cid}";
- if ($wfdownloads->getConfig('autoapprove') == _WFD_AUTOAPPROVE_DOWNLOAD || $wfdownloads->getConfig('autoapprove') == _WFD_AUTOAPPROVE_BOTH) {
+ if ($wfdownloads->getConfig('autoapprove') == _WFDOWNLOADS_AUTOAPPROVE_DOWNLOAD || $wfdownloads->getConfig('autoapprove') == _WFDOWNLOADS_AUTOAPPROVE_BOTH) {
// Then this change will be automatically approved, so the notification needs to go out.
$notification_handler->triggerEvent('global', 0, 'filemodified', $tags);
$notification_handler->triggerEvent('category', $cid, 'filemodified', $tags);
@@ -330,7 +330,7 @@
if ($lid > 0 && !empty($dhistoryhistory)) {
$dhistory = $dhistory . "\n\n";
$time = time();
- $dhistory .= _AM_WFD_FILE_HISTORYVERS . $version . _AM_WFD_FILE_HISTORDATE . formatTimestamp($time, _DATESTRING) . "\n\n";
+ $dhistory .= _AM_WFDOWNLOADS_FILE_HISTORYVERS . $version . _AM_WFDOWNLOADS_FILE_HISTORDATE . formatTimestamp($time, _DATESTRING) . "\n\n";
$dhistory .= $dhistoryhistory;
}
$download->setVar('dhistory', $dhistory);
@@ -408,7 +408,7 @@
$ownerGroups =& $member_handler->getGroupsByUser($owner, false);
$uid = !empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
$groups = $xoopsUser ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
- $entries = handleSubmission($formulize_mgr, $entries, $uid, $owner, $fid, $ownerGroups, $groups, "new"); // "new" causes xoops token check to be skipped, since WF-downloads should be doing that
+ $entries = handleSubmission($formulize_mgr, $entries, $uid, $owner, $fid, $ownerGroups, $groups, "new"); // "new" causes xoops token check to be skipped, since Wfdownloads should be doing that
if(!$owner) {
$id_req = $entries[$fid][0];
$download->setVar('formulize_idreq', $id_req);
@@ -439,8 +439,8 @@
$notification_handler->triggerEvent('category', $cid, 'new_file', $tags);
$notification_handler->triggerEvent('file', $lid, 'approve', $tags);
}
- $message = (!$lid) ? _AM_WFD_FILE_NEWFILEUPLOAD : _AM_WFD_FILE_FILEMODIFIEDUPDATE ;
- $message = ($lid && !$_POST['was_published'] && $approved) ? _AM_WFD_FILE_FILEAPPROVED : $message;
+ $message = (!$lid) ? _AM_WFDOWNLOADS_FILE_NEWFILEUPLOAD : _AM_WFDOWNLOADS_FILE_FILEMODIFIEDUPDATE ;
+ $message = ($lid && !$_POST['was_published'] && $approved) ? _AM_WFDOWNLOADS_FILE_FILEAPPROVED : $message;
redirect_header($currentFile, 1, $message);
break;
@@ -449,7 +449,7 @@
$lid = WfdownloadsRequest::getInt('lid', 0);
$ok = WfdownloadsRequest::getBool('ok', false, 'POST');
if (!$download = $wfdownloads->getHandler('download')->get($lid)) {
- redirect_header($currentFile, 4, _AM_WFD_ERROR_DOWNLOADNOTFOUND);
+ redirect_header($currentFile, 4, _AM_WFDOWNLOADS_ERROR_DOWNLOADNOTFOUND);
exit();
}
$title = $download->getVar('title');
@@ -463,13 +463,13 @@
@unlink($file);
}
if ($wfdownloads->getHandler('download')->delete($download)) {
- redirect_header($currentFile, 1, sprintf(_AM_WFD_FILE_FILEWASDELETED, $title));
+ redirect_header($currentFile, 1, sprintf(_AM_WFDOWNLOADS_FILE_FILEWASDELETED, $title));
} else {
echo $download->getHtmlErrors();
}
} else {
wfdownloads_xoops_cp_header();
- xoops_confirm(array('op' => 'download.delete', 'lid' => $lid, 'ok' => true, 'title' => $title), $currentFile, _AM_WFD_FILE_REALLYDELETEDTHIS . "<br /><br>" . $title, _DELETE);
+ xoops_confirm(array('op' => 'download.delete', 'lid' => $lid, 'ok' => true, 'title' => $title), $currentFile, _AM_WFDOWNLOADS_FILE_REALLYDELETEDTHIS . "<br /><br>" . $title, _DELETE);
xoops_cp_footer();
}
break;
@@ -480,7 +480,7 @@
if ($wfdownloads->getHandler('rating')->delete($rating, true)) {
wfdownloads_updateRating(intval($rating->getVar('lid')));
}
- redirect_header($currentFile, 1, _AM_WFD_VOTE_VOTEDELETED);
+ redirect_header($currentFile, 1, _AM_WFDOWNLOADS_VOTE_VOTEDELETED);
break;
// Added Formulize module support (2006/05/04) jpc - start
@@ -507,7 +507,7 @@
case "approve" :
$lid = WfdownloadsRequest::getInt('lid', 0);
if (!$download = $wfdownloads->getHandler('download')->get($lid)) {
- redirect_header($currentFile, 4, _AM_WFD_ERROR_DOWNLOADNOTFOUND);
+ redirect_header($currentFile, 4, _AM_WFDOWNLOADS_ERROR_DOWNLOADNOTFOUND);
exit();
}
// Update the database
@@ -531,7 +531,7 @@
if ($download->getVar('notifypub')) {
$notification_handler->triggerEvent('file', $lid, 'approve', $tags);
}
- redirect_header($currentFile, 1, _AM_WFD_SUB_NEWFILECREATED);
+ redirect_header($currentFile, 1, _AM_WFDOWNLOADS_SUB_NEWFILECREATED);
break;
case "downloads.list" :
@@ -569,8 +569,8 @@
echo $indexAdmin->addNavigation($currentFile);
$adminMenu = new ModuleAdmin();
- $adminMenu->addItemButton(_MI_WFD_MENU_DOWNLOADS, $currentFile . "?op=downloads.list", 'list');
- $adminMenu->addItemButton(_AM_WFD_FFS_DOWNLOADTITLE, $currentFile . "?op=download.add", 'add');
+ $adminMenu->addItemButton(_MI_WFDOWNLOADS_MENU_DOWNLOADS, $currentFile . "?op=downloads.list", 'list');
+ $adminMenu->addItemButton(_AM_WFDOWNLOADS_FFS_DOWNLOADTITLE, $currentFile . "?op=download.add", 'add');
echo $adminMenu->renderButton();
if ($totalDownloadsCount > 0) {
@@ -752,8 +752,8 @@
echo $indexAdmin->addNavigation($currentFile);
$adminMenu = new ModuleAdmin();
- $adminMenu->addItemButton(_MI_WFD_MENU_DOWNLOADS, $currentFile . "?op=downloads.list", 'list');
- $adminMenu->addItemButton(_AM_WFD_FFS_DOWNLOADTITLE, $currentFile . "?op=download.add", 'add');
+ $adminMenu->addItemButton(_MI_WFDOWNLOADS_MENU_DOWNLOADS, $currentFile . "?op=downloads.list", 'list');
+ $adminMenu->addItemButton(_AM_WFDOWNLOADS_FFS_DOWNLOADTITLE, $currentFile . "?op=download.add", 'add');
echo $adminMenu->renderButton();
// Get ip logs
@@ -772,7 +772,7 @@
if ($lid != 0) {
$download = $wfdownloads->getHandler('download')->get($lid);
$download_array = $download->toArray();
- $download_array['log_title'] = sprintf(_AM_WFD_LOG_FOR_LID, $download_array['title']);
+ $download_array['log_title'] = sprintf(_AM_WFDOWNLOADS_LOG_FOR_LID, $download_array['title']);
$GLOBALS['xoopsTpl']->assign('download', $download_array);
}
@@ -794,7 +794,7 @@
} else {
foreach($ip_logs as $ip_log){
$ip_log_array = $ip_log->toArray();
- $ip_log_array['uname'] = XoopsUserUtility::getUnameFromId($ip_log_array['uid']);//($ip_log_array['uid'] != 0) ? $userList[$ip_log_array['uid']] : _AM_WFD_ANONYMOUS;
+ $ip_log_array['uname'] = XoopsUserUtility::getUnameFromId($ip_log_array['uid']);//($ip_log_array['uid'] != 0) ? $userList[$ip_log_array['uid']] : _AM_WFDOWNLOADS_ANONYMOUS;
$ip_log_array['date_timestamp'] = formatTimestamp($ip_log_array['date']);
$GLOBALS['xoopsTpl']->append('ip_logs', $ip_log_array);
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php 2013-09-20 00:06:19 UTC (rev 12068)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php 2013-09-20 19:48:41 UTC (rev 12069)
@@ -9,7 +9,7 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
/**
- * WF-Downloads module
+ * 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)
@@ -26,7 +26,7 @@
case "image.upload" :
if ($_FILES['uploadfile']['name'] != "") {
if (file_exists(XOOPS_ROOT_PATH . '/' . $_POST['uploadpath'] . '/' . $_FILES['uploadfile']['name'])) {
- redirect_header($currentFile, 2, _AM_WFD_DOWN_IMAGEEXIST);
+ redirect_header($currentFile, 2, _AM_WFDOWNLOADS_DOWN_IMAGEEXIST);
}
$allowedMimetypes = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png');
$maxFileSize = $wfdownloads->getConfig('maxfilesize');
@@ -39,10 +39,10 @@
include_once WFDOWNLOADS_ROOT_PATH . '/class/img_uploader.php';
$uploader = new XoopsMediaImgUploader($uploadDir . '/', $allowedMimetypes, $maxFileSize, $maxImgWidth, $maxImgHeight);
- redirect_header($currentFile, 2 , _AM_WFD_DOWN_IMAGEUPLOAD);
+ redirect_header($currentFile, 2 , _AM_WFDOWNLOADS_DOWN_IMAGEUPLOAD);
exit();
} else {
- redirect_header($currentFile, 2 , _AM_WFD_DOWN_NOIMAGEEXIST);
+ redirect_header($currentFile, 2 , _AM_WFDOWNLOADS_DOWN_NOIMAGEEXIST);
exit();
}
break;
@@ -55,26 +55,26 @@
if (file_exists($fileToDelete)) {
chmod($fileToDelete, 0666);
if (@unlink($fileToDelete)) {
- redirect_header($currentFile, 1, _AM_WFD_DOWN_FILEDELETED);
+ redirect_header($currentFile, 1, _AM_WFDOWNLOADS_DOWN_FILEDELETED);
} else {
- redirect_header($currentFile, 1, _AM_WFD_DOWN_FILEERRORDELETE);
+ redirect_header($currentFile, 1, _AM_WFDOWNLOADS_DOWN_FILEERRORDELETE);
}
}
exit();
} else {
if (empty($_POST['downfile'])) {
- redirect_header($currentFile, 1, _AM_WFD_DOWN_NOFILEERROR);
+ redirect_header($currentFile, 1, _AM_WFDOWNLOADS_DOWN_NOFILEERROR);
exit();
}
wfdownloads_xoops_cp_header();
- xoops_confirm(array('op' => 'image.delete', 'uploadpath' => $_POST['uploadpath'], 'downfile' => $_POST['downfile'], 'ok' => true), $currentFile, _AM_WFD_DOWN_DELETEFILE . "<br /><br />" . $_POST['downfile'], _AM_WFD_BDELETE);
+ xoops_confirm(array('op' => 'image.delete', 'uploadpath' => $_POST['uploadpath'], 'downfile' => $_POST['downfile'], 'ok' => true), $currentFile, _AM_WFDOWNLOADS_DOWN_DELETEFILE . "<br /><br />" . $_POST['downfile'], _AM_WFDOWNLOADS_BDELETE);
include 'admin_footer.php';
}
break;
case "images.list" :
default:
- include_once WFDOWNLOADS_ROOT_PATH . '/class/wfd_lists.php';
+ include_once WFDOWNLOADS_ROOT_PATH . '/class/wfdownloads_lists.php';
$displayImage = '';
$rootPath = WfdownloadsRequest::getInt('rootpath', 0);
@@ -89,44 +89,44 @@
3 => $wfdownloads->getConfig('mainimagedir')
);
$nameArray = array(
- 1 => _AM_WFD_DOWN_CATIMAGE ,
- 2 => _AM_WFD_DOWN_SCREENSHOTS,
- 3 => _AM_WFD_DOWN_MAINIMAGEDIR
+ 1 => _AM_WFDOWNLOADS_DOWN_CATIMAGE ,
+ 2 => _AM_WFDOWNLOADS_DOWN_SCREENSHOTS,
+ 3 => _AM_WFDOWNLOADS_DOWN_MAINIMAGEDIR
);
$listArray = array(
- 1 => _AM_WFD_DOWN_FCATIMAGE ,
- 2 => _AM_WFD_DOWN_FSCREENSHOTS,
- 3 => _AM_WFD_DOWN_FMAINIMAGEDIR
+ 1 => _AM_WFDOWNLOADS_DOWN_FCATIMAGE ,
+ 2 => _AM_WFDOWNLOADS_DOWN_FSCREENSHOTS,
+ 3 => _AM_WFDOWNLOADS_DOWN_FMAINIMAGEDIR
);
$pathList = (isset($listArray[$rootPath])) ? $nameArray[$rootPath] : '';
$nameList = (isset($listArray[$rootPath])) ? $nameArray[$rootPath] : '';
- $iform = new XoopsThemeForm(_AM_WFD_DOWN_FUPLOADIMAGETO . $pathList, "op", xoops_getenv('PHP_SELF'));
+ $iform = new XoopsThemeForm(_AM_WFDOWNLOADS_DOWN_FUPLOADIMAGETO . $pathList, "op", xoops_getenv('PHP_SELF'));
$iform->setExtra('enctype="multipart/form-data"');
$iform->addElement(new XoopsFormHidden('dir', $rootPath));
ob_start();
echo "<select size='1' name='workd' onchange='location.href=\"{$currentFile}?rootpath=\"+this.options[this.selectedIndex].value'>";
- echo "<option value=''>" . _AM_WFD_DOWN_FOLDERSELECTION . "</option>";
+ echo "<option value=''>" . _AM_WFDOWNLOADS_DOWN_FOLDERSELECTION . "</option>";
foreach($nameArray as $namearray => $workd) {
$opt_selected = ($workd == $nameList) ? 'selected' : '';
echo "<option value='" . htmlspecialchars($namearray, ENT_QUOTES) . "' {$opt_selected}>{$workd}</option>";
}
echo "</select>";
- $iform->addElement(new XoopsFormLabel(_AM_WFD_DOWN_FOLDERSELECTION, ob_get_contents()));
+ $iform->addElement(new XoopsFormLabel(_AM_WFDOWNLOADS_DOWN_FOLDERSELECTION, ob_get_contents()));
ob_end_clean();
if ($rootPath > 0) {
- $iform->addElement(new XoopsFormLabel(_AM_WFD_DOWN_FUPLOADPATH, XOOPS_ROOT_PATH . '/' . $dirArray[$rootPath]));
- $iform->addElement(new XoopsFormLabel(_AM_WFD_DOWN_FUPLOADURL, XOOPS_URL . '/' . $dirArray[$rootPath]));
+ $iform->addElement(new XoopsFormLabel(_AM_WFDOWNLOADS_DOWN_FUPLOADPATH, XOOPS_ROOT_PATH . '/' . $dirArray[$rootPath]));
+ $iform->addElement(new XoopsFormLabel(_AM_WFDOWNLOADS_DOWN_FUPLOADURL, XOOPS_URL . '/' . $dirArray[$rootPath]));
$graph_array = WfsLists::getListTypeAsArray(XOOPS_ROOT_PATH . '/' . $dirArray[$rootPath], $type = "images");
$indeximage_select = new XoopsFormSelect('', 'downfile', '');
$indeximage_select->addOptionArray($graph_array);
$indeximage_select->setExtra("onchange='showImgSelected(\"image\", \"downfile\", \"" . $dirArray[$rootPath] . "\", \"\", \"" . XOOPS_URL . "\")'");
- $indeximage_tray = new XoopsFormElementTray(_AM_WFD_DOWN_FSHOWSELECTEDIMAGE, ' ');
+ $indeximage_tray = new XoopsFormElementTray(_AM_WFDOWNLOADS_DOWN_FSHOWSELECTEDIMAGE, ' ');
$indeximage_tray->addElement($indeximage_select);
if (!empty($_REQUEST['downfile'])) {
$indeximage_tray->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . '/' . $dirArray[$rootPath] . '/' . $_REQUEST['downfile'] . "' name='image' id='image' alt='' title='image' />"));
@@ -135,17 +135,17 @@
}
$iform->addElement($indeximage_tray);
- $iform->addElement(new XoopsFormFile(_AM_WFD_DOWN_FUPLOADIMAGE, 'uploadfile', 0));
+ $iform->addElement(new XoopsFormFile(_AM_WFDOWNLOADS_DOWN_FUPLOADIMAGE, 'uploadfile', 0));
$iform->addElement(new XoopsFormHidden('uploadpath', $dirArray[$rootPath]));
$iform->addElement(new XoopsFormHidden('rootnumber', $rootPath));
$dup_tray = new XoopsFormElementTray('', '');
$dup_tray->addElement(new XoopsFormHidden('op', 'upload'));
- $butt_dup = new XoopsFormButton('', '', _AM_WFD_BUPLOAD, 'submit');
+ $butt_dup = new XoopsFormButton('', '', _AM_WFDOWNLOADS_BUPLOAD, 'submit');
$butt_dup->setExtra('onclick="this.form.elements.op.value=\'image.upload\'"');
$dup_tray->addElement($butt_dup);
- $butt_dupct = new XoopsFormButton('', '', _AM_WFD_BDELETEIMAGE, 'submit');
+ $butt_dupct = new XoopsFormButton('', '', _AM_WFDOWNLOADS_BDELETEIMAGE, 'submit');
$butt_dupct->setExtra('onclick="this.form.elements.op.value=\'image.delete\'"');
$dup_tray->addElement($butt_dupct);
$iform->addElement($dup_tray);
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/import.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/import.php 2013-09-20 00:06:19 UTC (rev 12068)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/import.php 2013-09-20 19:48:41 UTC (rev 12069)
@@ -9,7 +9,7 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
/**
- * WF-Downloads module
+ * 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)
@@ -35,11 +35,11 @@
// Import data from MyDownloads
import_mydownloads_to_wfdownloads();
// Downloads imported
- redirect_header($currentFile, 1, _AM_WFD_IMPORT_IMPORT_OK);
+ redirect_header($currentFile, 1, _AM_WFDOWNLOADS_IMPORT_IMPORT_OK);
exit();
} else {
wfdownloads_xoops_cp_header();
- xoops_confirm(array('op' => 'import.MyDownloads', 'ok' => true), $currentFile, _AM_WFD_IMPORT_RUSURE);
+ xoops_confirm(array('op' => 'import.MyDownloads', 'ok' => true), $currentFile, _AM_WFDOWNLOADS_IMPORT_RUSURE);
xoops_cp_footer();
}
break;
@@ -54,11 +54,11 @@
// Import data from PD-Downloads
import_pddownloads_to_wfdownloads();
// Downloads imported
- redirect_header($currentFile, 1, _AM_WFD_IMPORT_IMPORT_OK);
+ redirect_header($currentFile, 1, _AM_WFDOWNLOADS_IMPORT_IMPORT_OK);
exit();
} else {
wfdownloads_xoops_cp_header();
- xoops_confirm(array('op' => 'import.PD-Downloads', 'ok' => true), $currentFile, _AM_WFD_IMPORT_RUSURE);
+ xoops_confirm(array('op' => 'import.PD-Downloads', 'ok' => true), $currentFile, _AM_WFDOWNLOADS_IMPORT_RUSURE);
xoops_cp_footer();
}
break;
@@ -73,15 +73,34 @@
// Import data from wmpownloads
import_wmpdownloads_to_wfdownloads();
// Downloads imported
- redirect_header($currentFile, 1, _AM_WFD_IMPORT_IMPORT_OK);
+ redirect_header($currentFile, 1, _AM_WFDOWNLOADS_IMPORT_IMPORT_OK);
exit();
} else {
wfdownloads_xoops_cp_header();
- xoops_confirm(array('op' => 'import.wmpownloads', 'ok' => true), $currentFile, _AM_WFD_IMPORT_RUSURE);
+ xoops_confirm(array('op' => 'import.wmpownloads', 'ok' => true), $currentFile, _AM_WFDOWNLOADS_IMPORT_RUSURE);
xoops_cp_footer();
}
break;
+ case "import.wfd322" :
+ $ok = WfdownloadsRequest::getBool('ok', false, 'POST');
+ if ($ok == true) {
+ // Make sure that nohtml is properly changed to dohtml
+ invert_nohtm_dohtml_values();
+ // Ensure that the proper tables are present
+ update_tables_to_300();
+ // Import data from wmpownloads
+ import_wfd_to_wfdownloads();
+ // Downloads imported
+ redirect_header($currentFile, 1, _AM_WFDOWNLOADS_IMPORT_IMPORT_OK);
+ exit();
+ } else {
+ wfdownloads_xoops_cp_header();
+ xoops_confirm(array('op' => 'import.wfdownloads', 'ok' => true), $currentFile, _AM_WFDOWNLOADS_IMPORT_RUSURE);
+ xoops_cp_footer();
+ }
+ break;
+
case "import.menu" :
default:
wfdownloads_xoops_cp_header();
@@ -91,42 +110,57 @@
//ask what to do
include XOOPS_ROOT_PATH . "/class/xoopsformloader.php";
- $form = new XoopsThemeForm(_AM_WFD_IMPORT_BUTTON_IMPORT, "form", $_SERVER['REQUEST_URI']);
+ $form = new XoopsThemeForm(_AM_WFDOWNLOADS_IMPORT_BUTTON_IMPORT, "form", $_SERVER['REQUEST_URI']);
+ // Avoid module to import form itself
+ //Is wfdownloads installed?
+ if ($wfdownloads->getModule()->dirname() != "wf"."downloads") {
+ $got_options = false;
+ if (wfdownloads_checkModule('wf'.'downloads')) {
+ $moduleVersion = round(wfdownloads_checkModule('wf'.'downloads') / 100, 2);
+ $wfdButton = new XoopsFormButton(_AM_WFDOWNLOADS_IMPORT_WFD . '<br />' . $moduleVersion, "wmp_button", _AM_WFDOWNLOADS_IMPORT_BUTTON_IMPORT, "submit");
+ $wfdButton->setExtra("onclick='document.forms.form.op.value=\"import.wfd322\"'");
+ $form->addElement($wfdButton);
+ } else {
+ $wfdLabel = new XoopsFormLabel(_AM_WFDOWNLOADS_IMPORT_WFD, _AM_WFDOWNLOADS_IMPORT_WFD_NOTFOUND);
+ $form->addElement($wfdLabel);
+ }
+ }
+
//Is MyDownloads installed?
- $mydownloadsModule = $module_handler->getByDirname("mydownloads");
$got_options = false;
- if (is_object($mydownloadsModule)) {
- $mydownloadsButton = new XoopsFormButton(_AM_WFD_IMPORT_MYDOWNLOADS, "myd_button", _AM_WFD_IMPORT_BUTTON_IMPORT, "submit");
- $mydownloadsButton->setExtra("onclick='document.forms.form.op.value=\"import.MyDownloads\"'");
- $form->addElement($mydownloadsButton);
+ if (wfdownloads_checkModule('mydownloads')) {
+ $moduleVersion = round(wfdownloads_checkModule('mydownloads') / 100, 2);
+ $sourceButton = new XoopsFormButton(_AM_WFDOWNLOADS_IMPORT_MYDOWNLOADS . '<br />' . $moduleVersion, "myd_button", _AM_WFDOWNLOADS_IMPORT_BUTTON_IMPORT, "submit");
+ $sourceButton->setExtra("onclick='document.forms.form.op.value=\"import.MyDownloads\"'");
+ $form->addElement($sourceButton);
} else {
- $mydownloadsLabel = new XoopsFormLabel(_AM_WFD_IMPORT_MYDOWNLOADS, _AM_WFD_IMPORT_MYDOWNLOADS_NOTFOUND);
- $form->addElement($mydownloadsLabel);
+ $sourceLabel = new XoopsFormLabel(_AM_WFDOWNLOADS_IMPORT_MYDOWNLOADS, _AM_WFDOWNLOADS_IMPORT_MYDOWNLOADS_NOTFOUND);
+ $form->addElement($sourceLabel);
}
//Is PD-Downloads installed?
- $PDdownloadsModule = $module_handler->getByDirname("PDdownloads");
$got_options = false;
- if (is_object($PDdownloadsModule)) {
- $pddownloadsButton = new XoopsFormButton(_AM_WFD_IMPORT_PDDOWNLOADS, "pd_button", _AM_WFD_IMPORT_BUTTON_IMPORT, "submit");
- $pddownloadsButton->setExtra("onclick='document.forms.form.op.value=\"import.PD-Download...
[truncated message content] |
