Menu
▾
▴
xoops-svn
|
From: <be...@us...> - 2012-12-17 05:15:06
|
Revision: 10423
http://sourceforge.net/p/xoops/svn/10423
Author: beckmi
Date: 2012-12-17 05:15:03 +0000 (Mon, 17 Dec 2012)
Log Message:
-----------
Updating to 3.21 Final
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/trunk/wfdownloads/docs/lang_diff.txt
XoopsModules/wfdownloads/trunk/wfdownloads/docs/readme.txt
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2012-12-17 04:58:36 UTC (rev 10422)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2012-12-17 05:15:03 UTC (rev 10423)
@@ -1,3 +1,7 @@
+<b><u>=> Version 3.21 Final (2012-12-16)</u></b>
+
+- Final Release (mamba)
+
<b><u>=> Version 3.21 Beta 1 (2012-07-30)</u></b>
- Converted to XOOPS 2.5.5 Admin GUI (mamba)
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/lang_diff.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/lang_diff.txt 2012-12-17 04:58:36 UTC (rev 10422)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/lang_diff.txt 2012-12-17 05:15:03 UTC (rev 10423)
@@ -10,13 +10,9 @@
x renamed
---------------------------------------
-2.33 Beta 1 2012-07-23
+3.21 Beta 1 2012-07-30
---------------------------------------
-__admin.php__
-+ _AM_OLEDRION_ADD_ATTRIBUTE
-+ _AM_OLEDRION_EDIT_ATTRIBUTE
-
-
-New file to translate :
- /xoops/modules/admin/gateways/paypal/language/mylanguage/main.php
\ No newline at end of file
+__modinfo.php__
++ _MI_WFD_DB_IMPORT
++ _MI_WFD_HELP
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/readme.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/readme.txt 2012-12-17 04:58:36 UTC (rev 10422)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/readme.txt 2012-12-17 05:15:03 UTC (rev 10423)
@@ -9,7 +9,7 @@
What is WF-Downloads ?
======================
-WF-Downloads is an advanced Downloads module for your XOOPS 2.x site. With this powerfull module, you can easily set a downloads section on your site and offer unlimited amount of files to your users. The module supports subcategories, has a fully integrated permissions system as well as a complete notifications system.
+WF-Downloads is an advanced Downloads module for your XOOPS 2.x site. With this powerful module, you can easily set a downloads section on your site and offer unlimited amount of files to your users. The module supports subcategories, has a fully integrated permissions system as well as a complete notifications system.
How to install or Update WF-Downloads
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2012-12-17 04:58:36 UTC (rev 10422)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2012-12-17 05:15:03 UTC (rev 10423)
@@ -13,7 +13,7 @@
$modversion['name'] = _MI_WFD_NAME;
$modversion['version'] = 3.21;
$modversion['releasedate'] = "2008-05-10";
-$modversion['status'] = "RC2";
+$modversion['status'] = "Final";
$modversion['description'] = _MI_WFD_DESC;
$modversion['author'] = "The SmartFactory";
$modversion['credits'] = "This module was originally based on Mydownloads, and refactored by Catzwolf and the WF-Projects team. Then it became a project of The SmartFactory who continued the excellent work started by the WF-Projects team.";
@@ -29,10 +29,10 @@
$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16';
$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
//about
-$modversion['release_date'] = '2012/07/30';
+$modversion['release_date'] = '2012/12/16';
$modversion["module_website_url"] = "http://www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "Beta 1";
+$modversion["module_status"] = "Final";
$modversion['min_php'] = '5.2';
$modversion['min_xoops'] = "2.5.5";
$modversion['min_admin'] = '1.1';
|
|
From: <luc...@us...> - 2013-03-13 20:16:58
|
Revision: 11221
http://sourceforge.net/p/xoops/svn/11221
Author: luciorota
Date: 2013-03-13 20:16:55 +0000 (Wed, 13 Mar 2013)
Log Message:
-----------
fixed minor bugs in update procedure
v3.21FINAL -> v3.22RC1
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/include/update.php
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/include/update.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/update.php 2013-03-13 18:35:25 UTC (rev 11220)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/update.php 2013-03-13 20:16:55 UTC (rev 11221)
@@ -34,12 +34,11 @@
function xoops_module_update_wfdownloads($module) {
ob_start();
invert_nohtm_dohtml_values();
- update_tables_to_300();
+ update_tables_to_322();
$feedback = ob_get_clean();
if (method_exists($module, "setMessage")) {
$module->setMessage($feedback);
- }
- else {
+ } else {
echo $feedback;
}
wfdownloads_SetMeta("version", "3.2.010"); //Set meta version to current
@@ -50,214 +49,225 @@
// This function updates any existing table of a 2.x version to the format used
// in the release of WF-Downloads 3.00
// =========================================================================================
-function update_tables_to_300()
-{
- $dbupdater = new WfdownloadsDbupdater();
+function update_tables_to_322() {
+ $dbupdater = new WfdownloadsDbupdater();
- if (!wfdownloads_TableExists('wfdownloads_meta')) {
- // Create table wfdownloads_meta
+ if (!wfdownloads_TableExists('wfdownloads_meta')) {
+ // Create table wfdownloads_meta
$table = new WfdownloadsTable('wfdownloads_meta');
- $table->setStructure( "CREATE TABLE %s (
- metakey varchar(50) NOT NULL default '',
- metavalue varchar(255) NOT NULL default '',
- PRIMARY KEY (metakey))
- TYPE=MyISAM;");
-
+ $table->setStructure("CREATE TABLE %s (
+ metakey varchar(50) NOT NULL default '',
+ metavalue varchar(255) NOT NULL default '',
+ PRIMARY KEY (metakey))
+ ENGINE=MyISAM;");
$table->setData(sprintf("'version', %s", round($GLOBALS['xoopsModule']->getVar('version') / 100, 2)));
if ($dbupdater->updateTable($table)) {
echo "wfdownloads_meta table created<br />";
}
- }
+ }
+
if (!wfdownloads_TableExists('wfdownloads_mirrors')) {
- // Create table wfdownloads_mirror
+ // Create table wfdownloads_mirror
$table = new WfdownloadsTable('wfdownloads_mirrors');
- $table->setStructure( "CREATE TABLE %s (
- mirror_id int(11) unsigned NOT NULL auto_increment,
- lid int(11) NOT NULL default '0',
- title varchar(255) NOT NULL default '',
- homeurl varchar(100) NOT NULL default '',
- location varchar(255) NOT NULL default '',
- continent varchar(255) NOT NULL default '',
- downurl varchar(255) NOT NULL default '',
- submit int(11) NOT NULL default '0',
- date int(11) NOT NULL default '0',
- uid int(10) NOT NULL default '0',
- PRIMARY KEY (mirror_id),
- KEY categoryid (lid))
- TYPE=MyISAM;");
+ $table->setStructure("CREATE TABLE %s (
+ mirror_id int(11) unsigned NOT NULL auto_increment,
+ lid int(11) NOT NULL default '0',
+ title varchar(255) NOT NULL default '',
+ homeurl varchar(100) NOT NULL default '',
+ location varchar(255) NOT NULL default '',
+ continent varchar(255) NOT NULL default '',
+ downurl varchar(255) NOT NULL default '',
+ submit int(11) NOT NULL default '0',
+ date int(11) NOT NULL default '0',
+ uid int(10) NOT NULL default '0',
+ PRIMARY KEY (mirror_id),
+ KEY categoryid (lid))
+ ENGINE=MyISAM;");
+ if ($dbupdater->updateTable($table)) {
+ echo "wfdownloads_mirrors table created<br />";
+ }
+ }
+ if (!wfdownloads_TableExists('wfdownloads_ip_log')) {
+ // Create table wfdownloads_ip_log
+ $table = new WfdownloadsTable('wfdownloads_ip_log');
+ $table->setStructure("CREATE TABLE %s (
+ ip_logid int(11) NOT NULL auto_increment,
+ lid int(11) NOT NULL default '0',
+ uid int(11) NOT NULL default '0',
+ date int(11) NOT NULL default '0',
+ ip_address varchar(20) NOT NULL default '',
+ PRIMARY KEY (ip_logid)
+ ENGINE=MyISAM;");
if ($dbupdater->updateTable($table)) {
echo "wfdownloads_mirrors table created<br />";
}
- }
+ }
- $download_fields = array(
- "lid" => array("Type" => "int(11) unsigned NOT NULL auto_increment", "Default" => false),
- "cid" => array("Type" => "int(5) unsigned NOT NULL default '0'", "Default" => true),
- "title" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
- "url" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
- "filename" => array("Type" => "varchar(150) NOT NULL default ''", "Default" => true),
- "filetype" => array("Type" => "varchar(100) NOT NULL default ''", "Default" => true),
- "homepage" => array("Type" => "varchar(100) NOT NULL default ''", "Default" => true),
- "version" => array("Type" => "varchar(20) NOT NULL default ''", "Default" => true),
- "size" => array("Type" => "int(8) NOT NULL default '0'", "Default" => true),
- "platform" => array("Type" => "varchar(50) NOT NULL default ''", "Default" => true),
- "screenshot" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
- "screenshot2" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
- "screenshot3" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
- "screenshot4" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
- "submitter" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
- "publisher" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
- "status" => array("Type" => "tinyint(2) NOT NULL default '0'", "Default" => true),
- "date" => array("Type" => "int(10) NOT NULL default '0'", "Default" => true),
- "hits" => array("Type" => "int(11) unsigned NOT NULL default '0'", "Default" => true),
- "rating" => array("Type" => "double(6,4) NOT NULL default '0.0000'", "Default" => true),
- "votes" => array("Type" => "int(11) unsigned NOT NULL default '0'", "Default" => true),
- "comments" => array("Type" => "int(11) unsigned NOT NULL default '0'", "Default" => true),
- "license" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
- "mirror" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
- "price" => array("Type" => "varchar(10) NOT NULL default 'Free'", "Default" => true),
- "paypalemail" =>array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
- "features" => array("Type" => "text NOT NULL", "Default" => false),
- "requirements" =>array("Type" => "text NOT NULL", "Default" => false),
- "homepagetitle" =>array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
- "forumid" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
- "limitations" =>array("Type" => "varchar(255) NOT NULL default '30 day trial'", "Default" => true),
- "versiontypes" =>array("Type" => "varchar(255) NOT NULL default 'None'", "Default" => true),
- "dhistory" => array("Type" => "text NOT NULL", "Default" => false),
- "published" => array("Type" => "int(11) NOT NULL default '1089662528'", "Default" => true),
- "expired" => array("Type" => "int(10) NOT NULL default '0'", "Default" => true),
- "updated" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
- "offline" => array("Type" => "tinyint(1) NOT NULL default '0'", "Default" => true),
- "description" =>array("Type" => "text NOT NULL", "Default" => false),
- "ipaddress" => array("Type" => "varchar(120) NOT NULL default '0'", "Default" => true),
- "notifypub" => array("Type" => "int(1) NOT NULL default '0'", "Default" => true),
- "summary" => array("Type" => "text NOT NULL", "Default" => false),
- "formulize_idreq" => array("Type" => "int(5) NOT NULL default '0'", "Default" => true));
-
- $renamed_fields = array(
- "logourl" => "screenshot"
- );
-
- echo "<br /><B>Checking Download table</B><br />";
- $download_handler = xoops_getmodulehandler('download', 'wfdownloads');
- $download_table = new WfdownloadsTable("wfdownloads_downloads");
- $fields = get_table_info($download_handler->table, $download_fields);
- // Check for renamed fields
+ $download_fields = array(
+ "lid" => array("Type" => "int(11) unsigned NOT NULL auto_increment", "Default" => false),
+ "cid" => array("Type" => "int(5) unsigned NOT NULL default '0'", "Default" => true),
+ "title" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "url" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "filename" => array("Type" => "varchar(150) NOT NULL default ''", "Default" => true),
+ "filetype" => array("Type" => "varchar(100) NOT NULL default ''", "Default" => true),
+ "homepage" => array("Type" => "varchar(100) NOT NULL default ''", "Default" => true),
+ "version" => array("Type" => "varchar(20) NOT NULL default ''", "Default" => true),
+ "size" => array("Type" => "int(8) NOT NULL default '0'", "Default" => true),
+ "platform" => array("Type" => "varchar(50) NOT NULL default ''", "Default" => true),
+ "screenshot" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "screenshot2" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "screenshot3" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "screenshot4" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "submitter" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
+ "publisher" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "status" => array("Type" => "tinyint(2) NOT NULL default '0'", "Default" => true),
+ "date" => array("Type" => "int(10) NOT NULL default '0'", "Default" => true),
+ "hits" => array("Type" => "int(11) unsigned NOT NULL default '0'", "Default" => true),
+ "rating" => array("Type" => "double(6,4) NOT NULL default '0.0000'", "Default" => true),
+ "votes" => array("Type" => "int(11) unsigned NOT NULL default '0'", "Default" => true),
+ "comments" => array("Type" => "int(11) unsigned NOT NULL default '0'", "Default" => true),
+ "license" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "mirror" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "price" => array("Type" => "varchar(10) NOT NULL default 'Free'", "Default" => true),
+ "paypalemail" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "features" => array("Type" => "text NOT NULL", "Default" => false),
+ "requirements" => array("Type" => "text NOT NULL", "Default" => false),
+ "homepagetitle" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "forumid" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
+ "limitations" => array("Type" => "varchar(255) NOT NULL default '30 day trial'", "Default" => true),
+ "versiontypes" => array("Type" => "varchar(255) NOT NULL default 'None'", "Default" => true),
+ "dhistory" => array("Type" => "text NOT NULL", "Default" => false),
+ "published" => array("Type" => "int(11) NOT NULL default '1089662528'", "Default" => true),
+ "expired" => array("Type" => "int(10) NOT NULL default '0'", "Default" => true),
+ "updated" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
+ "offline" => array("Type" => "tinyint(1) NOT NULL default '0'", "Default" => true),
+ "description" => array("Type" => "text NOT NULL", "Default" => false),
+ "ipaddress" => array("Type" => "varchar(120) NOT NULL default '0'", "Default" => true),
+ "notifypub" => array("Type" => "int(1) NOT NULL default '0'", "Default" => true),
+ "summary" => array("Type" => "text NOT NULL", "Default" => false),
+ "formulize_idreq" =>array("Type" => "int(5) NOT NULL default '0'", "Default" => true)
+ );
+ $renamed_fields = array(
+ "logourl" => "screenshot"
+ );
+ echo "<br /><B>Checking Download table</B><br />";
+ $download_handler = xoops_getmodulehandler('download', 'wfdownloads');
+ $download_table = new WfdownloadsTable("wfdownloads_downloads");
+ $fields = get_table_info($download_handler->table, $download_fields);
+ // Check for renamed fields
rename_fields($download_table, $renamed_fields, $fields, $download_fields);
- update_table($download_fields, $fields, $download_table);
+ update_table($download_fields, $fields, $download_table);
if ($dbupdater->updateTable($download_table)) {
echo "Downloads table updated<br />";
}
- unset($fields);
+ unset($fields);
- $mod_fields = array(
- "requestid" => array("Type" => "int(11) NOT NULL auto_increment", "Default" => false),
- "lid" => array("Type" => "int(11) unsigned NOT NULL default '0'", "Default" => true),
- "cid" => array("Type" => "int(5) unsigned NOT NULL default '0'", "Default" => true),
- "title" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
- "url" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
- "filename" => array("Type" => "varchar(150) NOT NULL default ''", "Default" => true),
- "filetype" => array("Type" => "varchar(100) NOT NULL default ''", "Default" => true),
- "homepage" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
- "version" => array("Type" => "varchar(20) NOT NULL default ''", "Default" => true),
- "size" => array("Type" => "int(8) NOT NULL default '0'", "Default" => true),
- "platform" => array("Type" => "varchar(50) NOT NULL default ''", "Default" => true),
- "screenshot" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
- "screenshot2" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
- "screenshot3" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
- "screenshot4" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
- "submitter" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
- "publisher" => array("Type" => "text NOT NULL", "Default" => false),
- "status" => array("Type" => "tinyint(2) NOT NULL default '0'", "Default" => true),
- "date" => array("Type" => "int(10) NOT NULL default '0'", "Default" => true),
- "hits" => array("Type" => "int(11) unsigned NOT NULL default '0'", "Default" => true),
- "rating" => array("Type" => "double(6,4) NOT NULL default '0.0000'", "Default" => true),
- "votes" => array("Type" => "int(11) unsigned NOT NULL default '0'", "Default" => true),
- "comments" => array("Type" => "int(11) unsigned NOT NULL default '0'", "Default" => true),
- "license" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
- "mirror" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
- "price" => array("Type" => "varchar(10) NOT NULL default 'Free'", "Default" => true),
- "paypalemail" =>array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
- "features" => array("Type" => "text NOT NULL", "Default" => false),
- "requirements" =>array("Type" => "text NOT NULL", "Default" => false),
- "homepagetitle" =>array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
- "forumid" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
- "limitations" =>array("Type" => "varchar(255) NOT NULL default '30 day trial'", "Default" => true),
- "versiontypes" =>array("Type" => "varchar(255) NOT NULL default 'None'", "Default" => true),
- "dhistory" => array("Type" => "text NOT NULL", "Default" => false),
- "published" => array("Type" => "int(10) NOT NULL default '0'", "Default" => true),
- "expired" => array("Type" => "int(10) NOT NULL default '0'", "Default" => true),
- "updated" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
- "offline" => array("Type" => "tinyint(1) NOT NULL default '0'", "Default" => true),
- "summary" => array("Type" => "text NOT NULL", "Default" => false),
- "description" =>array("Type" => "text NOT NULL", "Default" => false),
- "modifysubmitter" =>array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
- "requestdate" =>array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
- "formulize_idreq" => array("Type" => "int(5) NOT NULL default '0'", "Default" => true));
+ $mod_fields = array(
+ "requestid" => array("Type" => "int(11) NOT NULL auto_increment", "Default" => false),
+ "lid" => array("Type" => "int(11) unsigned NOT NULL default '0'", "Default" => true),
+ "cid" => array("Type" => "int(5) unsigned NOT NULL default '0'", "Default" => true),
+ "title" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "url" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "filename" => array("Type" => "varchar(150) NOT NULL default ''", "Default" => true),
+ "filetype" => array("Type" => "varchar(100) NOT NULL default ''", "Default" => true),
+ "homepage" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "version" => array("Type" => "varchar(20) NOT NULL default ''", "Default" => true),
+ "size" => array("Type" => "int(8) NOT NULL default '0'", "Default" => true),
+ "platform" => array("Type" => "varchar(50) NOT NULL default ''", "Default" => true),
+ "screenshot" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "screenshot2" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "screenshot3" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "screenshot4" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "submitter" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
+ "publisher" => array("Type" => "text NOT NULL", "Default" => false),
+ "status" => array("Type" => "tinyint(2) NOT NULL default '0'", "Default" => true),
+ "date" => array("Type" => "int(10) NOT NULL default '0'", "Default" => true),
+ "hits" => array("Type" => "int(11) unsigned NOT NULL default '0'", "Default" => true),
+ "rating" => array("Type" => "double(6,4) NOT NULL default '0.0000'", "Default" => true),
+ "votes" => array("Type" => "int(11) unsigned NOT NULL default '0'", "Default" => true),
+ "comments" => array("Type" => "int(11) unsigned NOT NULL default '0'", "Default" => true),
+ "license" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "mirror" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "price" => array("Type" => "varchar(10) NOT NULL default 'Free'", "Default" => true),
+ "paypalemail" =>array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "features" => array("Type" => "text NOT NULL", "Default" => false),
+ "requirements" =>array("Type" => "text NOT NULL", "Default" => false),
+ "homepagetitle" =>array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "forumid" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
+ "limitations" =>array("Type" => "varchar(255) NOT NULL default '30 day trial'", "Default" => true),
+ "versiontypes" =>array("Type" => "varchar(255) NOT NULL default 'None'", "Default" => true),
+ "dhistory" => array("Type" => "text NOT NULL", "Default" => false),
+ "published" => array("Type" => "int(10) NOT NULL default '0'", "Default" => true),
+ "expired" => array("Type" => "int(10) NOT NULL default '0'", "Default" => true),
+ "updated" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
+ "offline" => array("Type" => "tinyint(1) NOT NULL default '0'", "Default" => true),
+ "summary" => array("Type" => "text NOT NULL", "Default" => false),
+ "description" =>array("Type" => "text NOT NULL", "Default" => false),
+ "modifysubmitter" =>array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
+ "requestdate" =>array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
+ "formulize_idreq" => array("Type" => "int(5) NOT NULL default '0'", "Default" => true)
+ );
+ $renamed_fields = array(
+ "logourl" => "screenshot"
+ );
+ echo "<br /><B>Checking Modified Downloads table</B><br />";
+ $mod_handler = xoops_getmodulehandler('modification', 'wfdownloads');
+ $mod_table = new WfdownloadsTable("wfdownloads_mod");
+ $fields = get_table_info($mod_handler->table, $mod_fields);
+ rename_fields($mod_table, $renamed_fields, $fields, $mod_fields);
+ update_table($mod_fields, $fields, $mod_table);
+ if ($dbupdater->updateTable($mod_table)) {
+ echo "Modified Downloads table updated <br />";
+ }
+ unset($fields);
- $renamed_fields = array(
- "logourl" => "screenshot"
- );
+ $cat_fields = array(
+ "cid" => array("Type" => "int(5) unsigned NOT NULL auto_increment", "Default" => false),
+ "pid" => array("Type" => "int(5) unsigned NOT NULL default '0'", "Default" => true),
+ "title" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "imgurl" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "description" => array("Type" => "text NOT NULL default ''", "Default" => true),
+ "total" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
+ "summary" => array("Type" => "text NOT NULL", "Default" => false),
+ "spotlighttop" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
+ "spotlighthis" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
+ "dohtml" => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
+ "dosmiley" => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
+ "doxcode" => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
+ "doimage" => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
+ "dobr" => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
+ "weight" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
+ "formulize_fid" => array("Type" => "int(5) NOT NULL default '0'", "Default" => true)
+ );
+ echo "<br /><B>Checking Category table</B><br />";
+ $cat_handler = xoops_getmodulehandler('category', 'wfdownloads');
+ $cat_table = new WfdownloadsTable("wfdownloads_cat");
+ $fields = get_table_info($cat_handler->table, $cat_fields);
+ update_table($cat_fields, $fields, $cat_table);
+ if ($dbupdater->updateTable($cat_table)) {
+ echo "Category table updated<br />";
+ }
+ unset($fields);
- echo "<br /><B>Checking Modified Downloads table</B><br />";
- $mod_handler = xoops_getmodulehandler('modification', 'wfdownloads');
- $mod_table = new WfdownloadsTable("wfdownloads_mod");
- $fields = get_table_info($mod_handler->table, $mod_fields);
- rename_fields($mod_table, $renamed_fields, $fields, $mod_fields);
- update_table($mod_fields, $fields, $mod_table);
- if ($dbupdater->updateTable($mod_table)) {
- echo "Modified Downloads table updated <br />";
- }
- unset($fields);
-
-
- $cat_fields = array(
- "cid" => array("Type" => "int(5) unsigned NOT NULL auto_increment", "Default" => false),
- "pid" => array("Type" => "int(5) unsigned NOT NULL default '0'", "Default" => true),
- "title" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
- "imgurl" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
- "description" => array("Type" => "text NOT NULL default ''", "Default" => true),
- "total" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
- "summary" => array("Type" => "text NOT NULL", "Default" => false),
- "spotlighttop" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
- "spotlighthis" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
- "dohtml" => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
- "dosmiley" => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
- "doxcode" => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
- "doimage" => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
- "dobr" => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
- "weight" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
- "formulize_fid" => array("Type" => "int(5) NOT NULL default '0'", "Default" => true)
- );
- echo "<br /><B>Checking Category table</B><br />";
- $cat_handler = xoops_getmodulehandler('category', 'wfdownloads');
- $cat_table = new WfdownloadsTable("wfdownloads_cat");
- $fields = get_table_info($cat_handler->table, $cat_fields);
- update_table($cat_fields, $fields, $cat_table);
- if ($dbupdater->updateTable($cat_table)) {
- echo "Category table updated<br />";
- }
- unset($fields);
-
- $broken_fields = array(
- "reportid" => array("Type" => "int(5) NOT NULL auto_increment", "Default" => false),
- "lid" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
- "sender" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
- "ip" => array("Type" => "varchar(20) NOT NULL default ''", "Default" => true),
- "date" => array("Type" => "varchar(11) NOT NULL default '0'", "Default" => true),
- "confirmed" => array("Type" => "tinyint(1) NOT NULL default '0'", "Default" => true),
- "acknowledged" => array("Type" => "tinyint(1) NOT NULL default '0'", "Default" => true)
- );
- echo "<br /><B>Checking Broken Report table</B><br />";
- $broken_handler = xoops_getmodulehandler('report', 'wfdownloads');
- $broken_table = new WfdownloadsTable("wfdownloads_broken");
- $fields = get_table_info($broken_handler->table, $broken_fields);
- update_table($broken_fields, $fields, $broken_table);
- if ($dbupdater->updateTable($broken_table)) {
- echo "Broken Reports table updated<br />";
- }
- unset($fields);
+ $broken_fields = array(
+ "reportid" => array("Type" => "int(5) NOT NULL auto_increment", "Default" => false),
+ "lid" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
+ "sender" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
+ "ip" => array("Type" => "varchar(20) NOT NULL default ''", "Default" => true),
+ "date" => array("Type" => "varchar(11) NOT NULL default '0'", "Default" => true),
+ "confirmed" => array("Type" => "tinyint(1) NOT NULL default '0'", "Default" => true),
+ "acknowledged" => array("Type" => "tinyint(1) NOT NULL default '0'", "Default" => true)
+ );
+ echo "<br /><B>Checking Broken Report table</B><br />";
+ $broken_handler = xoops_getmodulehandler('report', 'wfdownloads');
+ $broken_table = new WfdownloadsTable("wfdownloads_broken");
+ $fields = get_table_info($broken_handler->table, $broken_fields);
+ update_table($broken_fields, $fields, $broken_table);
+ if ($dbupdater->updateTable($broken_table)) {
+ echo "Broken Reports table updated<br />";
+ }
+ unset($fields);
}
// =========================================================================================
@@ -265,19 +275,18 @@
// the wfdownloads_cat table into dohtml, dosmilies and so on. Therefore the logic will change
// 0=yes 1=no and the currently stored value need to be changed accordingly
// =========================================================================================
-function invert_nohtm_dohtml_values()
-{
+function invert_nohtm_dohtml_values() {
$ret = array();
- global $xoopsDB;
- $cat_handler = xoops_getmodulehandler('category', 'wfdownloads');
- $result = $xoopsDB->query("SHOW COLUMNS FROM ".$cat_handler->table);
- while ($existing_field = $xoopsDB->fetchArray($result)) {
- $fields[$existing_field['Field']] = $existing_field['Type'];
- }
- if (in_array("nohtml", array_keys($fields))) {
- $dbupdater = new WfdownloadsDbupdater();
- //Invert column values
- // alter options in wfdownloads_cat
+ global $xoopsDB;
+ $cat_handler = xoops_getmodulehandler('category', 'wfdownloads');
+ $result = $xoopsDB->query("SHOW COLUMNS FROM ".$cat_handler->table);
+ while ($existing_field = $xoopsDB->fetchArray($result)) {
+ $fields[$existing_field['Field']] = $existing_field['Type'];
+ }
+ if (in_array("nohtml", array_keys($fields))) {
+ $dbupdater = new WfdownloadsDbupdater();
+ //Invert column values
+ // alte...
[truncated message content] |
|
From: <be...@us...> - 2013-03-23 09:58:41
|
Revision: 11288
http://sourceforge.net/p/xoops/svn/11288
Author: beckmi
Date: 2013-03-23 09:58:37 +0000 (Sat, 23 Mar 2013)
Log Message:
-----------
fixed calculations for file voting results view in admin
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/main.php
XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/main.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/main.php 2013-03-23 02:09:50 UTC (rev 11287)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/main.php 2013-03-23 09:58:37 UTC (rev 11288)
@@ -137,7 +137,7 @@
$regvotes = $rating_handler->getObjects($reg_criteria);
$anon_criteria = new CriteriaCompo(new Criteria('lid', $lid));
- $anon_criteria->add(new Criteria("ratinguser", 0, ">"));
+ $anon_criteria->add(new Criteria("ratinguser", 0, "="));
$votesanon = $rating_handler->getCount($anon_criteria);
$anon_criteria->setSort("ratingtimestamp");
$anon_criteria->setOrder("DESC");
@@ -176,8 +176,8 @@
$uids[] = $regvotes[$i]->getVar('ratinguser');
}
- $criteria = new Criteria("uid", "(".implode(',', $uids).")", "IN");
- $criteria->setGroupby("uid");
+ $criteria = new Criteria("ratinguser", "(".implode(',', $uids).")", "IN");
+ $criteria->setGroupby("ratinguser");
$userratings = $rating_handler->getUserAverage($criteria);
@@ -219,12 +219,13 @@
echo "<tr><td colspan='7' align='center' class='even'><b>" . _AM_WFD_VOTE_NOUNREGVOTES . "</b></td></tr>";
}
else {
- $criteria = new Criteria("uid", 0);
+ $criteria = new Criteria("ratinguser", 0);
$userratings = $rating_handler->getUserAverage($criteria);
+ $anonvotes = $rating_handler->getObjects($anon_criteria);
- foreach (array_keys($regvotes) as $i) {
- $formatted_date = formatTimestamp($regvotes[$i]->getVar('ratingtimestamp'), $xoopsModuleConfig['dateformat']);
+ foreach (array_keys($anonvotes) as $i) {
+ $formatted_date = formatTimestamp($anonvotes[$i]->getVar('ratingtimestamp'), $xoopsModuleConfig['dateformat']);
$useravgrating = isset($userratings['avg']) ? $userratings["avg"] : 0;
$uservotes = isset($userratings['count']) ? $userratings["count"] : 0;
@@ -232,13 +233,13 @@
echo "
<tr><td align='center' class='head'>$ratinguname</td>\n
- <td align='center' class='even'>".$regvotes[$i]->getVar('ratinghostname')."</th>\n
- <td align='center' class='even'>".$regvotes[$i]->getVar('rating')."</th>\n
+ <td align='center' class='even'>".$anonvotes[$i]->getVar('ratinghostname')."</th>\n
+ <td align='center' class='even'>".$anonvotes[$i]->getVar('rating')."</th>\n
<td align='center' class='even'>$useravgrating</th>\n
<td align='center' class='even'>$uservotes</th>\n
<td align='center' class='even'>$formatted_date</th>\n
<td align='center' class='even'>\n
- <a href='".WFDOWNLOADS_URL."admin/main.php?op=delVote&lid=" . $lid . "&rid=" . $regvotes[$i]->getVar('ratingid') . "'>" . $imagearray['deleteimg'] . "</a>\n
+ <a href='".WFDOWNLOADS_URL."admin/main.php?op=delVote&lid=" . $lid . "&rid=" . $anonvotes[$i]->getVar('ratingid') . "'>" . $imagearray['deleteimg'] . "</a>\n
</th></tr>\n
";
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-03-23 02:09:50 UTC (rev 11287)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-03-23 09:58:37 UTC (rev 11288)
@@ -1,3 +1,7 @@
+<b><u>=> Version 3.22 RC1 (2013-03-23)</u></b>
+- fixed minor bugs in update procedure (luciorota)
+- fixed calculations for file voting results view in admin (mamba)
+
<b><u>=> Version 3.21 Final (2012-12-16)</u></b>
- Final Release (mamba)
|
|
From: <be...@us...> - 2013-03-23 10:12:23
|
Revision: 11289
http://sourceforge.net/p/xoops/svn/11289
Author: beckmi
Date: 2013-03-23 10:12:20 +0000 (Sat, 23 Mar 2013)
Log Message:
-----------
updated deprecated "xoops_getLinkedUnameFromId"
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirror.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/modifications.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/newdownloads.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/permissions.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/review.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/votedata.php
XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/mimetype.php
XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/trunk/wfdownloads/images/screenshots/thumbs/140x79_imonfire.gif
XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/search.inc.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/main.php
XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php
XoopsModules/wfdownloads/trunk/wfdownloads/review.php
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_download.html
Added Paths:
-----------
XoopsModules/wfdownloads/trunk/wfdownloads/docs/english/index.html
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirror.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirror.php 2013-03-23 09:58:37 UTC (rev 11288)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirror.php 2013-03-23 10:12:20 UTC (rev 11289)
@@ -97,6 +97,7 @@
case "mirrors":
case "default":
global $xoopsDB, $imagearray, $xoopsModule;
+ xoops_load('XoopsUserUtility');
$start = isset($_GET['start']) ? intval($_GET['start']) : 0;
$start2 = isset($_GET['start2']) ? intval($_GET['start2']) : 0;
@@ -161,7 +162,7 @@
foreach (array_keys($mirrors) as $i) {
$mirror_id = $mirrors[$i]->getVar('mirror_id');
$title = isset($downloads[$mirrors[$i]->getVar('lid')]) ? $downloads[$mirrors[$i]->getVar('lid')] : "";
- $submitter = xoops_getLinkedUnameFromId(intval($mirrors[$i]->getVar('uid')));
+ $submitter = XoopsUserUtility::getUnameFromId(intval($mirrors[$i]->getVar('uid')));
$datetime = formatTimestamp($mirrors[$i]->getVar('date'), $xoopsModuleConfig['dateformat']);
$status = "<a href='".WFDOWNLOADS_URL."admin/mirror.php?op=approve_mirror&mirror_id=" . $mirror_id . "'>" . $imagearray['approve'] . "</a>";
$modify = "<a href='".WFDOWNLOADS_URL."admin/mirror.php?op=edit_mirror&mirror_id=" . $mirror_id . "'>" . $imagearray['editimg'] . "</a>";
@@ -214,7 +215,7 @@
$mirror_id2 = $mirrors2[$i2]->getVar('mirror_id');
$mirror_title2 = $mirrors2[$i2]->getVar('title');
$title2 = isset($downloads[$mirrors2[$i2]->getVar('lid')]) ? $downloads[$mirrors2[$i2]->getVar('lid')] : "";
- $submitter2 = xoops_getLinkedUnameFromId(intval($mirrors2[$i2]->getVar('uid')));
+ $submitter2 = XoopsUserUtility::getUnameFromId(intval($mirrors2[$i2]->getVar('uid')));
$datetime2 = formatTimestamp($mirrors2[$i2]->getVar('date'), $xoopsModuleConfig['dateformat']);
$modify2 = "<a href='".WFDOWNLOADS_URL."admin/mirror.php?op=edit_mirror&mirror_id=" . intval($mirror_id2) . "'>" . $imagearray['editimg'] . "</a>";
$delete2 = "<a href='".WFDOWNLOADS_URL."admin/mirror.php?op=del_mirror&mirror_id=" . intval($mirror_id2) . "'>" . $imagearray['deleteimg'] . "</a>";
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/modifications.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/modifications.php 2013-03-23 09:58:37 UTC (rev 11288)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/modifications.php 2013-03-23 10:12:20 UTC (rev 11289)
@@ -9,6 +9,7 @@
*/
include 'admin_header.php';
+xoops_load('XoopsUserUtility');
if (!isset($_POST['op']))
{
@@ -39,7 +40,7 @@
$download = $download_handler->get($modification->getVar('lid'));
$orig_user = new XoopsUser($download->getVar('submitter'));
- $submittername = xoops_getLinkedUnameFromId($download->getVar('submitter')); // $orig_user->getvar("uname");
+ $submittername = XoopsUserUtility::getUnameFromId($download->getVar('submitter')); // $orig_user->getvar("uname");
$submitteremail = $orig_user->getVar("email");
echo "<div><b>" . _AM_WFD_MOD_MODPOSTER . "</b> $submittername</div>";
@@ -118,7 +119,7 @@
$sform->display();
$modify_user = new XoopsUser($modification->getVar('modifysubmitter'));
- $modifyname = xoops_getLinkedUnameFromId(intval($modify_user->getVar('uid')));
+ $modifyname = XoopsUserUtility::getUnameFromId(intval($modify_user->getVar('uid')));
$modifyemail = $modify_user->getVar("email");
echo "<div><b>" . _AM_WFD_MOD_MODIFYSUBMITTER . "</b> $modifyname</div>";
@@ -305,7 +306,7 @@
{
foreach ($modifications as $modification)
{
- $submitter = xoops_getLinkedUnameFromId($modification->getVar('modifysubmitter'));
+ $submitter = XoopsUserUtility::getUnameFromId($modification->getVar('modifysubmitter'));
$requestdate = formatTimestamp($modification->getVar('requestdate'), $xoopsModuleConfig['dateformat']);
echo "
<tr>\n
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/newdownloads.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/newdownloads.php 2013-03-23 09:58:37 UTC (rev 11288)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/newdownloads.php 2013-03-23 10:12:20 UTC (rev 11289)
@@ -56,6 +56,7 @@
default:
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+ xoops_load('XoopsUserUtility');
$start = isset($_GET['start']) ? intval($_GET['start']) : 0;
@@ -102,7 +103,7 @@
$size = $myts->htmlSpecialChars($new['size']);
$platform = $myts->htmlSpecialChars($new['platform']);
$logourl = $myts->htmlSpecialChars($new['screenshot']);
- $submitter = xoops_getLinkedUnameFromId($new['submitter']);
+ $submitter = XoopsUserUtility::getUnameFromId($new['submitter']);
$datetime = formatTimestamp($new['date'], $xoopsModuleConfig['dateformat']);
$status = "<a href='".WFDOWNLOADS_URL."admin/newdownloads.php?op=approve&lid=" . $new['lid'] . "'>" . $imagearray['approve'] . "</a>";
$modify = "<a href='".WFDOWNLOADS_URL."admin/main.php?op=Download&lid=" . $new['lid'] . "'>" . $imagearray['editimg'] . "</a>";
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/permissions.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/permissions.php 2013-03-23 09:58:37 UTC (rev 11288)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/permissions.php 2013-03-23 10:12:20 UTC (rev 11289)
@@ -21,7 +21,7 @@
<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFD_PERM_CPERMISSIONS . "</legend>\n
<div style='padding: 2px;'>\n";
-$cat_form = new XoopsGroupPermForm('', $xoopsModule->getVar('mid'), 'WFDownCatPerm', _AM_WFD_PERM_CSELECTPERMISSIONS );
+$cat_form = new XoopsGroupPermForm('', $xoopsModule->getVar('mid'), 'WFDownCatPerm', _AM_WFD_PERM_CSELECTPERMISSIONS,'admin/permissions.php');
$category_handler = xoops_getmodulehandler('category');
$categories = $category_handler->getObjects();
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/review.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/review.php 2013-03-23 09:58:37 UTC (rev 11288)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/review.php 2013-03-23 10:12:20 UTC (rev 11289)
@@ -99,6 +99,7 @@
case "reviews":
case "default":
global $xoopsDB, $imagearray, $xoopsModule;
+ xoops_load('XoopsUserUtility');
$start = isset($_GET['start']) ? intval($_GET['start']) : 0;
$start2 = isset($_GET['start2']) ? intval($_GET['start2']) : 0;
@@ -164,7 +165,7 @@
$review_id = $reviews[$i]->getVar('review_id');
$review_title = $reviews[$i]->getVar('title');
$title = isset($downloads[$reviews[$i]->getVar('lid')]) ? $downloads[$reviews[$i]->getVar('lid')] : "";
- $submitter = xoops_getLinkedUnameFromId(intval($reviews[$i]->getVar('uid')));
+ $submitter = XoopsUserUtility::getUnameFromId(intval($reviews[$i]->getVar('uid')));
$datetime = formatTimestamp($reviews[$i]->getVar('date'), $xoopsModuleConfig['dateformat']);
$status = "<a href='".WFDOWNLOADS_URL."admin/review.php?op=approve_review&review_id=" . intval($review_id) . "'>" . $imagearray['approve'] . "</a>";
$modify = "<a href='".WFDOWNLOADS_URL."admin/review.php?op=edit_review&review_id=" . intval($review_id) . "'>" . $imagearray['editimg'] . "</a>";
@@ -218,7 +219,7 @@
$review_id2 = $reviews2[$i2]->getVar('review_id');
$review_title2 = $reviews2[$i2]->getVar('title');
$title2 = isset($downloads[$reviews2[$i2]->getVar('lid')]) ? $downloads[$reviews2[$i2]->getVar('lid')] : "";
- $submitter2 = xoops_getLinkedUnameFromId(intval($reviews2[$i2]->getVar('uid')));
+ $submitter2 = XoopsUserUtility::getUnameFromId(intval($reviews2[$i2]->getVar('uid')));
$datetime2 = formatTimestamp($reviews2[$i2]->getVar('date'), $xoopsModuleConfig['dateformat']);
$modify2 = "<a href='".WFDOWNLOADS_URL."admin/review.php?op=edit_review&review_id=" . intval($review_id2) . "'>" . $imagearray['editimg'] . "</a>";
$delete2 = "<a href='".WFDOWNLOADS_URL."admin/review.php?op=del_review&review_id=" . intval($review_id2) . "'>" . $imagearray['deleteimg'] . "</a>";
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/votedata.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/votedata.php 2013-03-23 09:58:37 UTC (rev 11288)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/votedata.php 2013-03-23 10:12:20 UTC (rev 11289)
@@ -53,7 +53,7 @@
<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFD_VOTE_DISPLAYVOTES . "</legend>\n
<div style='padding: 8px;'>\n
<div><b>" . _AM_WFD_VOTE_USERAVG . ": </b>$useravgrating</div>\n
- <div><b>" . _AM_WFD_VOTE_TOTALRATE . ": </b>$uservotes</div>\n
+ <div><b>" . _AM_WFD_VOTE_TOTALRATE . ": </b>$votes</div>\n
<div style='padding: 8px;'>\n
<li>" . $imagearray['deleteimg'] . " " . _AM_WFD_VOTE_DELETEDSC . "</li>
<div>\n
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php 2013-03-23 09:58:37 UTC (rev 11288)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php 2013-03-23 10:12:20 UTC (rev 11289)
@@ -102,6 +102,7 @@
include XOOPS_ROOT_PATH . '/header.php';
$xoopsTpl->assign('catarray', $catarray);
+ xoops_load('XoopsUserUtility');
$report_handler = xoops_getmodulehandler('report');
$report = $report_handler->getObjects(new Criteria('lid', $lid));
@@ -111,7 +112,7 @@
$broken['title'] = trim($download->getVar('title'));
$broken['id'] = $report_obj->getVar('reportid');
- $broken['reporter'] = xoops_getLinkedUnameFromId(intval($report_obj->getVar('sender')));
+ $broken['reporter'] = XoopsUserUtility::getUnameFromId(intval($report_obj->getVar('sender')));
$broken['date'] = formatTimestamp($report_obj->getVar('published'), $xoopsModuleConfig['dateformat']);
$broken['acknowledged'] = ($report_obj->getVar('acknowledged') == 1) ? _YES : _NO ;
$broken['confirmed'] = ($report_obj->getVar('confirmed') == 1) ? _YES : _NO ;
@@ -127,7 +128,7 @@
$time = ($download->getVar('updated') != 0) ? $download->getVar('updated') : $download->getVar('published');
$down['updated'] = formatTimestamp($time, $xoopsModuleConfig['dateformat']);
$is_updated = ($download->getVar('updated') != 0) ? _MD_WFD_UPDATEDON : _MD_WFD_SUBMITDATE;
- $down['publisher'] = xoops_getLinkedUnameFromId(intval($download->getVar('submitter')));
+ $down['publisher'] = XoopsUserUtility::getUnameFromId(intval($download->getVar('submitter')));
$xoopsTpl->assign('file_id', $lid);
$xoopsTpl->assign('lang_subdate' , $is_updated);
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-03-23 09:58:37 UTC (rev 11288)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-03-23 10:12:20 UTC (rev 11289)
@@ -83,6 +83,7 @@
function getDownloadInfo() {
global $xoopsModuleConfig, $xoopsConfig;
global $xoopsUser, $xoopsModule, $myts;
+ xoops_load('XoopsUserUtility');
$down['id'] = intval($this->getVar('lid'));
$down['cid'] = intval($this->getVar('cid'));
@@ -237,7 +238,7 @@
$down['limitations'] = ($this->getVar('limitations') == "") ? _MD_WFD_NOTSPECIFIED : $myts->htmlSpecialChars(trim($xoopsModuleConfig['limitations'][$this->getVar('limitations')]));
$down['versiontypes'] = ($this->getVar('versiontypes') == "") ? _MD_WFD_NOTSPECIFIED : $myts->htmlSpecialChars(trim($xoopsModuleConfig['versiontypes'][$this->getVar('versiontypes')]));
$down['license'] = ($this->getVar('license')=="") ? _MD_WFD_NOTSPECIFIED : $myts->htmlSpecialChars(trim($xoopsModuleConfig['license'][$this->getVar('license')]));
- $down['submitter'] = xoops_getLinkedUnameFromId($this->getVar('submitter'));
+ $down['submitter'] = XoopsUserUtility::getUnameFromId($this->getVar('submitter'));
$publisher = $this->getVar('publisher');
if (!empty($publisher))
{
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/mimetype.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/mimetype.php 2013-03-23 09:58:37 UTC (rev 11288)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/mimetype.php 2013-03-23 10:12:20 UTC (rev 11289)
@@ -39,7 +39,7 @@
mime_admin int(1) NOT NULL default '1',
mime_user int(1) NOT NULL default '0',
KEY mime_id (mime_id)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
*/
class WfdownloadsMimetype extends XoopsObject {
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-03-23 09:58:37 UTC (rev 11288)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-03-23 10:12:20 UTC (rev 11289)
@@ -1,6 +1,9 @@
<b><u>=> Version 3.22 RC1 (2013-03-23)</u></b>
- fixed minor bugs in update procedure (luciorota)
- fixed calculations for file voting results view in admin (mamba)
+- updated deprecated "xoops_getLinkedUnameFromId" (mamba)
+- added check for "category" in search (mamba)
+- added 'admin/permissions.php' to new XoopsGroupPermForm, as return URL (mamba)
<b><u>=> Version 3.21 Final (2012-12-16)</u></b>
Added: XoopsModules/wfdownloads/trunk/wfdownloads/docs/english/index.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/english/index.html (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/english/index.html 2013-03-23 10:12:20 UTC (rev 11289)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/images/screenshots/thumbs/140x79_imonfire.gif
===================================================================
(Binary files differ)
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php 2013-03-23 09:58:37 UTC (rev 11288)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php 2013-03-23 10:12:20 UTC (rev 11289)
@@ -1523,10 +1523,12 @@
{
global $myts, $imagearray;
+ xoops_load('XoopsUserUtility');
+
$lid = intval($published['lid']);
$cid = intval($published['cid']);
$title = "<a href='../singlefile.php?cid=" . $cid . "&lid=" . $lid . "'>" . $myts->htmlSpecialChars(trim($published['title'])) . "</a>";;
- $submitter = xoops_getLinkedUnameFromId(intval($published['submitter']));
+ $submitter = XoopsUserUtility::getUnameFromId(intval($published['submitter']));
$publish = formatTimestamp($published['published'], 's');
$status = ($published['published'] > 0) ? $imagearray['online'] : "<a href='newdownloads.php'>" . $imagearray['offline'] . "</a>";
$offline = ($published['offline'] == 0) ? $imagearray['online'] : $imagearray['offline'];
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/include/search.inc.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/search.inc.php 2013-03-23 09:58:37 UTC (rev 11288)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/search.inc.php 2013-03-23 10:12:20 UTC (rev 11289)
@@ -72,7 +72,7 @@
foreach($allowed_cats as $cid)
{
$category = $category_handler->get(intval($cid));
- if ($fid = $category->getVar('formulize_fid'))
+ if (isset($category) && $fid = $category->getVar('formulize_fid'))
{
$fids[] = $fid;
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/main.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/main.php 2013-03-23 09:58:37 UTC (rev 11288)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/main.php 2013-03-23 10:12:20 UTC (rev 11289)
@@ -75,7 +75,7 @@
define("_MD_WFD_PLATFORMC","Platform: ");
define("_MD_WFD_PRICE","Price");
define("_MD_WFD_LIMITS","Limitations");
-define("_MD_WFD_VERSIONTYPES","Release Status:");
+define("_MD_WFD_VERSIONTYPES","Release Status");
define("_MD_WFD_DOWNLICENSE","License");
define("_MD_WFD_NOTSPECIFIED","Not Specified");
define("_MD_WFD_MIRRORSITE","Download Mirror");
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php 2013-03-23 09:58:37 UTC (rev 11288)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php 2013-03-23 10:12:20 UTC (rev 11289)
@@ -12,6 +12,7 @@
include_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
global $xoopsModuleConfig, $myts, $xoopsUser;
+xoops_load('XoopsUserUtility');
$gperm_handler =& xoops_gethandler('groupperm');
$groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
@@ -99,7 +100,7 @@
}
$down_mirror['add_mirror'] = $add_mirror;
$down_mirror['date'] = formatTimestamp($down_mirror['date'], $xoopsModuleConfig['dateformat']);
- $down_mirror['submitter'] = xoops_getLinkedUnameFromId(intval($down_mirror['uid']));
+ $down_mirror['submitter'] = XoopsUserUtility::getUnameFromId(intval($down_mirror['uid']));
$xoopsTpl->append('down_mirror', $down_mirror);
}
$xoopsTpl->assign('lang_mirror_found', sprintf(_MD_WFD_MIRROR_TOTAL, $mirror_amount));
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/review.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/review.php 2013-03-23 09:58:37 UTC (rev 11288)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/review.php 2013-03-23 10:12:20 UTC (rev 11289)
@@ -12,6 +12,7 @@
include_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
global $xoopsModuleConfig, $myts, $xoopsUser;
+xoops_load('XoopsUserUtility');
$gperm_handler =& xoops_gethandler('groupperm');
$groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
@@ -76,7 +77,7 @@
{
$down_review = $reviews[$i]->toArray();
$down_review['date'] = formatTimestamp($down_review['date'], $xoopsModuleConfig['dateformat']);
- $down_review['submitter'] = xoops_getLinkedUnameFromId(intval($down_review['uid']));
+ $down_review['submitter'] = XoopsUserUtility::getUnameFromId(intval($down_review['uid']));
$review_rating = round(number_format($down_review['rated'], 0) / 2);
$rateimg = "rate$review_rating.gif";
$down_review['rated_img'] = $rateimg;
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_download.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_download.html 2013-03-23 09:58:37 UTC (rev 11288)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_download.html 2013-03-23 10:12:20 UTC (rev 11289)
@@ -68,7 +68,7 @@
<{/if}>
<div><b><{$smarty.const._MD_WFD_VERSIONTYPES}>:</b> <{$down.versiontypes}></div>
<div>
- <div><b><{$smarty.const._MD_WFD_DOWNLOADHITS}></b> <{$down.hits}></div>
+ <div><b><{$smarty.const._MD_WFD_DOWNLOADHITS}>:</b> <{$down.hits}></div>
<div><b><{$smarty.const._MD_WFD_FILESIZE}>:</b> <{$down.size}></div>
<{if $down.homepage != ''}>
<div><b><{$smarty.const._MD_WFD_HOMEPAGE}>:</b> <{$down.homepage|wordwrap:50:"\n":true}></div>
|
|
From: <be...@us...> - 2013-03-23 14:41:04
|
Revision: 11293
http://sourceforge.net/p/xoops/svn/11293
Author: beckmi
Date: 2013-03-23 14:41:00 +0000 (Sat, 23 Mar 2013)
Log Message:
-----------
fixed deprecated "mysql_list_tables", fixed MIME permissions check for Admin
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-03-23 12:44:31 UTC (rev 11292)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-03-23 14:41:00 UTC (rev 11293)
@@ -4,6 +4,8 @@
- updated deprecated "xoops_getLinkedUnameFromId" (mamba)
- added check for "category" in search (mamba)
- added 'admin/permissions.php' to new XoopsGroupPermForm, as return URL (mamba)
+- fixed deprecated "mysql_list_tables"
+- fixed MIME permissions for Admin (it was submitting 0 as default, which is for user) (mamba)
<b><u>=> Version 3.21 Final (2012-12-16)</u></b>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php 2013-03-23 12:44:31 UTC (rev 11292)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php 2013-03-23 14:41:00 UTC (rev 11293)
@@ -56,7 +56,10 @@
//Verifies that a MySQL table exists
$xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
$realname = $xoopsDB->prefix($table);
- $ret = mysql_list_tables(XOOPS_DB_NAME, $xoopsDB->conn);
+
+ $sql = "SHOW TABLES FROM ".XOOPS_DB_NAME;
+ $ret = $xoopsDB->queryF($sql);
+
while (list($m_table)=$xoopsDB->fetchRow($ret)) {
if ($m_table == $realname) {
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/submit.php 2013-03-23 12:44:31 UTC (rev 11292)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/submit.php 2013-03-23 14:41:00 UTC (rev 11293)
@@ -11,264 +11,235 @@
include 'header.php';
include_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
-$myts = &MyTextSanitizer::getInstance(); // MyTextSanitizer object
+$myts = & MyTextSanitizer::getInstance(); // MyTextSanitizer object
$mytree = new XoopsTree($xoopsDB->prefix('wfdownloads_cat'), "cid", "pid");
global $xoopsModuleConfig, $xoopsUser, $xoopsModule;
$submissions = 0;
-if (is_object($xoopsUser) && ($xoopsModuleConfig['submissions'] == 2 || $xoopsModuleConfig['submissions'] == 4))
-{
- $groups = $xoopsUser->getGroups();
- if (array_intersect($xoopsModuleConfig['submitarts'], $groups))
- {
- $submissions = 1;
+if (is_object($xoopsUser) && ($xoopsModuleConfig['submissions'] == 2 || $xoopsModuleConfig['submissions'] == 4)) {
+ $groups = $xoopsUser->getGroups();
+ if (array_intersect($xoopsModuleConfig['submitarts'], $groups)) {
+ $submissions = 1;
}
} else {
- if (!is_object($xoopsUser) && ($xoopsModuleConfig['anonpost'] == 2 || $xoopsModuleConfig['anonpost'] == 4))
- {
- $submissions = 1;
+ if (!is_object($xoopsUser) && ($xoopsModuleConfig['anonpost'] == 2 || $xoopsModuleConfig['anonpost'] == 4)) {
+ $submissions = 1;
} else {
- redirect_header(XOOPS_URL . '/user.php', 5, _MD_WFD_MUSTREGFIRST);
- }
+ redirect_header(XOOPS_URL . '/user.php', 5, _MD_WFD_MUSTREGFIRST);
+ }
}
if (!$submissions == 1) {
- redirect_header(WFDOWNLOADS_URL.'index.php', 5, _MD_WFD_NOTALLOWESTOSUBMIT);
+ redirect_header(WFDOWNLOADS_URL . 'index.php', 5, _MD_WFD_NOTALLOWESTOSUBMIT);
}
if (is_object($xoopsUser) && !$xoopsUser->isAdmin()) {
if ($xoopsUser->getVar('posts') < $xoopsModuleConfig['upload_minposts']) {
- redirect_header("index.php",5,_MD_WFD_UPLOADMINPOSTS);
+ redirect_header("index.php", 5, _MD_WFD_UPLOADMINPOSTS);
}
}
-if (isset($_POST['submit']) && !empty($_POST['submit']))
-{
+if (isset($_POST['submit']) && !empty($_POST['submit'])) {
$notify = !empty($_POST['notify']) ? 1 : 0;
- $lid = (!empty($_POST['lid'])) ? intval($_POST['lid']) : 0 ;
- $cid = (!empty($_POST['cid'])) ? intval($_POST['cid']) : 0 ;
+ $lid = (!empty($_POST['lid'])) ? intval($_POST['lid']) : 0;
+ $cid = (!empty($_POST['cid'])) ? intval($_POST['cid']) : 0;
- if (empty($_FILES['userfile']['name']))
- {
- if ($_POST["url"] && $_POST["url"] != "" && $_POST["url"] != "http://")
- {
- $url = ($_POST["url"] != "http://") ? $_POST["url"] : '';
- $filename = '';
- $filetype = '';
- } else {
- $url = ($_POST["url"] != "http://") ? $_POST["url"] : '';
- $filename = $_POST['filename'];
- $filetype = $_POST['filetype'];
- }
- $size = ((empty($_POST["size"]) || !is_numeric($_POST["size"]))) ? 0 : intval($_POST["size"]);
+ if (empty($_FILES['userfile']['name'])) {
+ if ($_POST["url"] && $_POST["url"] != "" && $_POST["url"] != "http://") {
+ $url = ($_POST["url"] != "http://") ? $_POST["url"] : '';
+ $filename = '';
+ $filetype = '';
+ } else {
+ $url = ($_POST["url"] != "http://") ? $_POST["url"] : '';
+ $filename = $_POST['filename'];
+ $filetype = $_POST['filetype'];
+ }
+ $size = ((empty($_POST["size"]) || !is_numeric($_POST["size"]))) ? 0 : intval($_POST["size"]);
$title = trim($_POST["title"]);
- }
- else
- {
+ } else {
global $_FILES;
- $down = wfd_uploading($_FILES, $xoopsModuleConfig['uploaddir'], "", "index.php", 0, 0, 0);
- $url = ($_POST["url"] != "http://") ? $_POST["url"] : '';
- $size = $down['size'];
+ $usertype = 0;
+ if (is_object($xoopsUser) && $xoopsUser->isAdmin()) {
+ $usertype = 1;
+ }
+
+ $down = wfd_uploading($_FILES, $xoopsModuleConfig['uploaddir'], "", "index.php", 0, 0, $usertype);
+ $url = ($_POST["url"] != "http://") ? $_POST["url"] : '';
+ $size = $down['size'];
$filename = $down['filename'];
$filetype = $_FILES['userfile']['type'];
- $title = $_FILES['userfile']['name'];
- $title = rtrim(wfd_strrrchr($title, "."), ".");
- $title = (isset($_POST["title_checkbox"]) && $_POST["title_checkbox"] == 1) ? $title : trim($_POST["title"]);
+ $title = $_FILES['userfile']['name'];
+ $title = rtrim(wfd_strrrchr($title, "."), ".");
+ $title = (isset($_POST["title_checkbox"]) && $_POST["title_checkbox"] == 1) ? $title : trim($_POST["title"]);
}
- if ((isset($_FILES['screenshot']['name']) && !empty($_FILES['screenshot']['name'])))
- {
- $allowed_mimetypes = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png');
- $maxfilesize = $xoopsModuleConfig['maxfilesize'];
- $maxfilewidth = $xoopsModuleConfig['maximgwidth'];
- $maxfileheight = $xoopsModuleConfig['maximgheight'];
- $uploaddir = XOOPS_ROOT_PATH . "/" . $xoopsModuleConfig['screenshots'] . "/";
- $screenshot = strtolower($_FILES['screenshot']['name']);
+ if ((isset($_FILES['screenshot']['name']) && !empty($_FILES['screenshot']['name']))) {
+ $allowed_mimetypes = array(
+ 'image/gif',
+ 'image/jpeg',
+ 'image/pjpeg',
+ 'image/x-png',
+ 'image/png'
+ );
+ $maxfilesize = $xoopsModuleConfig['maxfilesize'];
+ $maxfilewidth = $xoopsModuleConfig['maximgwidth'];
+ $maxfileheight = $xoopsModuleConfig['maximgheight'];
+ $uploaddir = XOOPS_ROOT_PATH . "/" . $xoopsModuleConfig['screenshots'] . "/";
+ $screenshot = strtolower($_FILES['screenshot']['name']);
- include_once WFDOWNLOADS_ROOT_PATH.'class/img_uploader.php';
+ include_once WFDOWNLOADS_ROOT_PATH . 'class/img_uploader.php';
$uploader = new XoopsMediaImgUploader($uploaddir, $allowed_mimetypes, $maxfilesize, $maxfilewidth, $maxfileheight);
- if ($uploader->fetchMedia($_POST['xoops_upload_file'][1]))
- {
- if (!$uploader->upload())
- {
+ if ($uploader->fetchMedia($_POST['xoops_upload_file'][1])) {
+ if (!$uploader->upload()) {
$errors = $uploader->getErrors();
- @unlink($uploaddir.$screenshot);
- redirect_header(WFDOWNLOADS_URL.'index.php?op=downloadsConfigMenu', 1, $errors);
+ @unlink($uploaddir . $screenshot);
+ redirect_header(WFDOWNLOADS_URL . 'index.php?op=downloadsConfigMenu', 1, $errors);
+ } else {
}
- else
- {
- }
- }
- else
- {
+ } else {
$errors = $uploader->getErrors();
- @unlink($uploaddir.$screenshot);
- redirect_header(WFDOWNLOADS_URL.'index.php?op=downloadsConfigMenu', 1, $errors);
+ @unlink($uploaddir . $screenshot);
+ redirect_header(WFDOWNLOADS_URL . 'index.php?op=downloadsConfigMenu', 1, $errors);
}
+ } else {
+ $screenshot = '';
}
- else
- {
- $screenshot = '';
- }
-if ($xoopsModuleConfig['max_screenshot'] >= 2)
-{
- if ((isset($_FILES['screenshot2']['name']) && !empty($_FILES['screenshot2']['name'])))
- {
- $allowed_mimetypes = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png');
- $maxfilesize = $xoopsModuleConfig['maxfilesize'];
- $maxfilewidth = $xoopsModuleConfig['maximgwidth'];
- $maxfileheight = $xoopsModuleConfig['maximgheight'];
- $uploaddir = XOOPS_ROOT_PATH . "/" . $xoopsModuleConfig['screenshots'] . "/";
- $screenshot2 = strtolower($_FILES['screenshot2']['name']);
+ if ($xoopsModuleConfig['max_screenshot'] >= 2) {
+ if ((isset($_FILES['screenshot2']['name']) && !empty($_FILES['screenshot2']['name']))) {
+ $allowed_mimetypes = array(
+ 'image/gif',
+ 'image/jpeg',
+ 'image/pjpeg',
+ 'image/x-png',
+ 'image/png'
+ );
+ $maxfilesize = $xoopsModuleConfig['maxfilesize'];
+ $maxfilewidth = $xoopsModuleConfig['maximgwidth'];
+ $maxfileheight = $xoopsModuleConfig['maximgheight'];
+ $uploaddir = XOOPS_ROOT_PATH . "/" . $xoopsModuleConfig['screenshots'] . "/";
+ $screenshot2 = strtolower($_FILES['screenshot2']['name']);
- include_once WFDOWNLOADS_ROOT_PATH.'class/img_uploader.php';
- $uploader = new XoopsMediaImgUploader($uploaddir, $allowed_mimetypes, $maxfilesize, $maxfilewidth, $maxfileheight);
+ include_once WFDOWNLOADS_ROOT_PATH . 'class/img_uploader.php';
+ $uploader = new XoopsMediaImgUploader($uploaddir, $allowed_mimetypes, $maxfilesize, $maxfilewidth, $maxfileheight);
- if ($uploader->fetchMedia($_POST['xoops_upload_file'][2]))
- {
- if (!$uploader->upload())
- {
+ if ($uploader->fetchMedia($_POST['xoops_upload_file'][2])) {
+ if (!$uploader->upload()) {
+ $errors = $uploader->getErrors();
+ @unlink($uploaddir . $screenshot2);
+ redirect_header(WFDOWNLOADS_URL . 'index.php?op=downloadsConfigMenu', 1, $errors);
+ } else {
+ }
+ } else {
$errors = $uploader->getErrors();
- @unlink($uploaddir.$screenshot2);
- redirect_header(WFDOWNLOADS_URL.'index.php?op=downloadsConfigMenu', 1, $errors);
+ @unlink($uploaddir . $screenshot2);
+ redirect_header(WFDOWNLOADS_URL . 'index.php?op=downloadsConfigMenu', 1, $errors);
}
- else
- {
- }
+ } else {
+ $screenshot2 = '';
}
- else
- {
- $errors = $uploader->getErrors();
- @unlink($uploaddir.$screenshot2);
- redirect_header(WFDOWNLOADS_URL.'index.php?op=downloadsConfigMenu', 1, $errors);
- }
+ } else {
+ $screenshot2 = '';
}
- else
- {
- $screenshot2 = '';
- }
-}
-else
-{
- $screenshot2 = '';
-}
-if ($xoopsModuleConfig['max_screenshot'] >= 3)
-{
- if ((isset($_FILES['screenshot3']['name']) && !empty($_FILES['screenshot3']['name'])))
- {
- $allowed_mimetypes = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png');
- $maxfilesize = $xoopsModuleConfig['maxfilesize'];
- $maxfilewidth = $xoopsModuleConfig['maximgwidth'];
- $maxfileheight = $xoopsModuleConfig['maximgheight'];
- $uploaddir = XOOPS_ROOT_PATH . "/" . $xoopsModuleConfig['screenshots'] . "/";
- $screenshot3 = strtolower($_FILES['screenshot3']['name']);
+ if ($xoopsModuleConfig['max_screenshot'] >= 3) {
+ if ((isset($_FILES['screenshot3']['name']) && !empty($_FILES['screenshot3']['name']))) {
+ $allowed_mimetypes = array(
+ 'image/gif',
+ 'image/jpeg',
+ 'image/pjpeg',
+ 'image/x-png',
+ 'image/png'
+ );
+ $maxfilesize = $xoopsModuleConfig['maxfilesize'];
+ $maxfilewidth = $xoopsModuleConfig['maximgwidth'];
+ $maxfileheight = $xoopsModuleConfig['maximgheight'];
+ $uploaddir = XOOPS_ROOT_PATH . "/" . $xoopsModuleConfig['screenshots'] . "/";
+ $screenshot3 = strtolower($_FILES['screenshot3']['name']);
- include_once WFDOWNLOADS_ROOT_PATH.'class/img_uploader.php';
- $uploader = new XoopsMediaImgUploader($uploaddir, $allowed_mimetypes, $maxfilesize, $maxfilewidth, $maxfileheight);
+ include_once WFDOWNLOADS_ROOT_PATH . 'class/img_uploader.php';
+ $uploader = new XoopsMediaImgUploader($uploaddir, $allowed_mimetypes, $maxfilesize, $maxfilewidth, $maxfileheight);
- if ($uploader->fetchMedia($_POST['xoops_upload_file'][3]))
- {
- if (!$uploader->upload())
- {
+ if ($uploader->fetchMedia($_POST['xoops_upload_file'][3])) {
+ if (!$uploader->upload()) {
+ $errors = $uploader->getErrors();
+ @unlink($uploaddir . $screenshot3);
+ redirect_header(WFDOWNLOADS_URL . 'index.php?op=downloadsConfigMenu', 1, $errors);
+ } else {
+ }
+ } else {
$errors = $uploader->getErrors();
- @unlink($uploaddir.$screenshot3);
- redirect_header(WFDOWNLOADS_URL.'index.php?op=downloadsConfigMenu', 1, $errors);
+ @unlink($uploaddir . $screenshot3);
+ redirect_header(WFDOWNLOADS_URL . 'index.php?op=downloadsConfigMenu', 1, $errors);
}
- else
- {
- }
+ } else {
+ $screenshot3 = '';
}
- else
- {
- $errors = $uploader->getErrors();
- @unlink($uploaddir.$screenshot3);
- redirect_header(WFDOWNLOADS_URL.'index.php?op=downloadsConfigMenu', 1, $errors);
- }
+ } else {
+ $screenshot3 = '';
}
- else
- {
- $screenshot3 = '';
- }
-}
-else
-{
- $screenshot3 = '';
-}
-if ($xoopsModuleConfig['max_screenshot'] >= 4)
-{
- if ((isset($_FILES['screenshot4']['name']) && !empty($_FILES['screenshot4']['name'])))
- {
- $allowed_mimetypes = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png');
- $maxfilesize = $xoopsModuleConfig['maxfilesize'];
- $maxfilewidth = $xoopsModuleConfig['maximgwidth'];
- $maxfileheight = $xoopsModuleConfig['maximgheight'];
- $uploaddir = XOOPS_ROOT_PATH . "/" . $xoopsModuleConfig['screenshots'] . "/";
- $screenshot4 = strtolower($_FILES['screenshot4']['name']);
+ if ($xoopsModuleConfig['max_screenshot'] >= 4) {
+ if ((isset($_FILES['screenshot4']['name']) && !empty($_FILES['screenshot4']['name']))) {
+ $allowed_mimetypes = array(
+ 'image/gif',
+ 'image/jpeg',
+ 'image/pjpeg',
+ 'image/x-png',
+ 'image/png'
+ );
+ $maxfilesize = $xoopsModuleConfig['maxfilesize'];
+ $maxfilewidth = $xoopsModuleConfig['maximgwidth'];
+ $maxfileheight = $xoopsModuleConfig['maximgheight'];
+ $uploaddir = XOOPS_ROOT_PATH . "/" . $xoopsModuleConfig['screenshots'] . "/";
+ $screenshot4 = strtolower($_FILES['screenshot4']['name']);
- include_once WFDOWNLOADS_ROOT_PATH.'class/img_uploader.php';
- $uploader = new XoopsMediaImgUploader($uploaddir, $allowed_mimetypes, $maxfilesize, $maxfilewidth, $maxfileheight);
+ include_once WFDOWNLOADS_ROOT_PATH . 'class/img_uploader.php';
+ $uploader = new XoopsMediaImgUploader($uploaddir, $allowed_mimetypes, $maxfilesize, $maxfilewidth, $maxfileheight);
- if ($uploader->fetchMedia($_POST['xoops_upload_file'][4]))
- {
- if (!$uploader->upload())
- {
+ if ($uploader->fetchMedia($_POST['xoops_upload_file'][4])) {
+ if (!$uploader->upload()) {
+ $errors = $uploader->getErrors();
+ @unlink($uploaddir . $screenshot4);
+ redirect_header(WFDOWNLOADS_URL . 'index.php?op=downloadsConfigMenu', 1, $errors);
+ } else {
+ }
+ } else {
$errors = $uploader->getErrors();
- @unlink($uploaddir.$screenshot4);
- redirect_header(WFDOWNLOADS_URL.'index.php?op=downloadsConfigMenu', 1, $errors);
+ @unlink($uploaddir . $screenshot4);
+ redirect_header(WFDOWNLOADS_URL . 'index.php?op=downloadsConfigMenu', 1, $errors);
}
- else
- {
- }
+ } else {
+ $screenshot4 = '';
}
- else
- {
- $errors = $uploader->getErrors();
- @unlink($uploaddir.$screenshot4);
- redirect_header(WFDOWNLOADS_URL.'index.php?op=downloadsConfigMenu', 1, $errors);
- }
+ } else {
+ $screenshot4 = '';
}
- else
- {
- $screenshot4 = '';
- }
-}
-else
-{
- $screenshot4 = '';
-}
$download_handler = xoops_getmodulehandler('download');
if ($lid > 0) {
- $thisIsANewRecord = false; /* Added by Lankford on 2007/3/21 */
-
- if ($xoopsModuleConfig['autoapprove'] == 2 || $xoopsModuleConfig['autoapprove'] == 4)
- {
+ $thisIsANewRecord = false; /* Added by Lankford on 2007/3/21 */
+
+ if ($xoopsModuleConfig['autoapprove'] == 2 || $xoopsModuleConfig['autoapprove'] == 4) {
$download = $download_handler->get($lid);
- }
- else {
+ } else {
$modification_handler = xoops_getmodulehandler('modification');
- $download = $modification_handler->create();
+ $download = $modification_handler->create();
$download->setVar('lid', $lid);
}
- }
- else {
- $thisIsANewRecord = true; /* Added by Lankford on 2007/3/21 */
-
+ } else {
+ $thisIsANewRecord = true; /* Added by Lankford on 2007/3/21 */
+
$download = $download_handler->create();
- if ($xoopsModuleConfig['autoapprove'] == 2 || $xoopsModuleConfig['autoapprove'] == 4)
- {
+ if ($xoopsModuleConfig['autoapprove'] == 2 || $xoopsModuleConfig['autoapprove'] == 4) {
$download->setVar("published", time());
$download->setVar("status", 1);
- }
- else {
+ } else {
$download->setVar('published', 0);
$download->setVar('status', 0);
}
@@ -278,46 +249,44 @@
// added - start - March 4 2006 - jpc
// Now that the $download object has been instantiated, handle the Formulize part of the submission...
- $category_handler = xoops_getmodulehandler('category');
- $category = $category_handler->get($cid);
- $fid = $category->getVar('formulize_fid');
- if($fid) {
- global $xoopsUser;
- include_once XOOPS_ROOT_PATH . "/modules/formulize/include/formread.php";
- include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
+ $category_handler = xoops_getmodulehandler('category');
+ $category = $category_handler->get($cid);
+ $fid = $category->getVar('formulize_fid');
+ if ($fid) {
+ global $xoopsUser;
+ include_once XOOPS_ROOT_PATH . "/modules/formulize/include/formread.php";
+ include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
- $formulize_mgr =& xoops_getmodulehandler('elements', 'formulize');
+ $formulize_mgr =& xoops_getmodulehandler('elements', 'formulize');
- if ($lid) {
- $entries[$fid][0] = $download->getVar('formulize_idreq');
- if($entries[$fid][0]) {
+ if ($lid) {
+ $entries[$fid][0] = $download->getVar('formulize_idreq');
+ if ($entries[$fid][0]) {
$owner = getEntryOwner($entries[$fid][0]);
- } else {
+ } else {
$entries[$fid][0] = "";
- $owner = "";
- }
- $cid = $download->getVar('cid');
- } else {
- $entries[$fid][0] = "";
- $owner = "";
- }
- $member_handler =& xoops_gethandler('member');
- $owner_groups =& $member_handler->getGroupsByUser($owner, FALSE);
- $uid = !empty($xoopsUser) ? intval($xoopsUser->getVar('uid')) : 0;
- $groups = $xoopsUser ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
+ $owner = "";
+ }
+ $cid = $download->getVar('cid');
+ } else {
+ $entries[$fid][0] = "";
+ $owner = "";
+ }
+ $member_handler =& xoops_gethandler('member');
+ $owner_groups =& $member_handler->getGroupsByUser($owner, FALSE);
+ $uid = !empty($xoopsUser) ? intval($xoopsUser->getVar('uid')) : 0;
+ $groups = $xoopsUser ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
- $entries = handleSubmission($formulize_mgr, $entries, $uid, $owner, $fid, $owner_groups, $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, $owner_groups, $groups, "new"); // "new" causes xoops token check to be skipped, since WF-downloads should be doing that
- if (!$owner)
- {
- $id_req = $entries[$fid][0];
- $download->setVar('formulize_idreq', $id_req);
- }
- }
+ if (!$owner) {
+ $id_req = $entries[$fid][0];
+ $download->setVar('formulize_idreq', $id_req);
+ }
+ }
// added - end - March 4 2006 - jpc
- if (!empty($_POST["homepage"]) || $_POST["homepage"] != "http://")
- {
+ if (!empty($_POST["homepage"]) || $_POST["homepage"] != "http://") {
$download->setVar('homepage', formatURL(trim($_POST["homepage"])));
$download->setVar('homepagetitle', trim($_POST["homepagetitle"]));
}
@@ -326,7 +295,7 @@
$download->setVar('cid', intval($cid));
$download->setVar('filename', $filename);
$download->setVar('filetype', $filetype);
-
+
/* Added by Lankford on 2007/3/21 */
// Here, I want to know if:
// a) Are they actually changing the value of version, or is it the same?
@@ -335,33 +304,33 @@
$version = (!empty($_POST["version"])) ? trim($_POST["version"]) : 0;
if (!$thisIsANewRecord and ($download->getVar('version') != $version)) {
- // Trigger the three events related to modified files (one for the file, category, and global event categories respectively)
- $notification_handler = &xoops_gethandler('notification');
- $tags = array();
- $tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL.'singlefile.php?cid=' . intval($cid) . '&lid=' . intval($lid);
- $category_handler = xoops_getmodulehandler('category');
- $category = $category_handler->get($cid);
- $tags['FILE_VERSION'] = $version;
+ // Trigger the three events related to modified files (one for the file, category, and global event categories respectively)
+ $notification_handler = & xoops_gethandler('notification');
+ $tags = array();
+ $tags['FILE_NAME'] = $title;
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . 'singlefile.php?cid=' . intval($cid) . '&lid=' . intval($lid);
+ $category_handler = xoops_getmodulehandler('category');
+ $category = $category_handler->get($cid);
+ $tags['FILE_VERSION'] = $version;
$tags['CATEGORY_NAME'] = $category->getVar('title');
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL.'viewcat.php?cid=' . intval($cid);
+ $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . 'viewcat.php?cid=' . intval($cid);
- if ($xoopsModuleConfig['autoapprove'] == 2 || $xoopsModuleConfig['autoapprove'] == 4)
- { // Then this change will be automatically approved, so the notification needs to go out.
+ if ($xoopsModuleConfig['autoapprove'] == 2 || $xoopsModuleConfig['autoapprove'] == 4
+ ) { // 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);
$notification_handler->triggerEvent('file', $lid, 'filemodified', $tags);
}
}
/* End add block */
-
+
$download->setVar('version', $_POST["version"]);
$download->setVar('size', $size);
$download->setVar('platform', $_POST["platform"]);
- $download->setVar('screenshot', $screenshot);
- $download->setVar('screenshot2', $screenshot2);
- $download->setVar('screenshot3', $screenshot3);
- $download->setVar('screenshot4', $screenshot4);
+ $download->setVar('screenshot', $screenshot);
+ $download->setVar('screenshot2', $screenshot2);
+ $download->setVar('screenshot3', $screenshot3);
+ $download->setVar('screenshot4', $screenshot4);
$download->setVar('summary', $_POST["summary"]);
$download->setVar('description', $_POST["description"]);
$submitter = !empty($xoopsUser) ? intval($xoopsUser->getVar('uid')) : 0;
@@ -379,12 +348,11 @@
$download->setVar('limitations', $limitations);
$versiontypes = (isset($_POST["versiontypes"])) ? $myts->addslashes($_POST["versiontypes"]) : '';
$download->setVar('versiontypes', $versiontypes);
- $dhistory = (isset($_POST["dhistory"])) ? $myts->addslashes($_POST["dhistory"]) : '';
+ $dhistory = (isset($_POST["dhistory"])) ? $myts->addslashes($_POST["dhistory"]) : '';
$dhistoryhistory = (isset($_POST["dhistoryaddedd"])) ? $myts->addslashes($_POST["dhistoryaddedd"]) : '';
- if ($lid > 0 && !empty($dhistoryhistory))
- {
+ if ($lid > 0 && !empty($dhistoryhistory)) {
$dhistory = $dhistory . "\n\n";
- $time = time();
+ $time = time();
$dhistory .= "<b>" . formatTimestamp($time, $xoopsModuleConfig['dateformat']) . "</b>\n\n";
$dhistory .= $dhistoryhistory;
}
@@ -393,61 +361,55 @@
$download->setVar('offline', $offline);
$download->setVar('date', time());
- $screenshot = '';
+ $screenshot = '';
$screenshot2 = '';
$screenshot3 = '';
$screenshot4 = '';
- if ($lid == 0)
- {
+ if ($lid == 0) {
$notifypub = (isset($_POST['notifypub']) && $_POST['notifypub'] == 1) ? 1 : 0;
$download->setVar('notifypub', $notifypub);
$download->setVar('ipaddress', $_SERVER['REMOTE_ADDR']);
- if (!$download_handler->insert($download))
- {
+ if (!$download_handler->insert($download)) {
$error = _MD_WFD_INFONOSAVEDB;
trigger_error($error, E_USER_ERROR);
}
- $newid = intval($download->getVar('lid'));
- $groups = array(1, 2);
+ $newid = intval($download->getVar('lid'));
+ $groups = array(
+ 1,
+ 2
+ );
/*
* Notify of new link (anywhere) and new link in category
*/
- $notification_handler = &xoops_gethandler('notification');
- $tags = array();
- $tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL.'singlefile.php?cid=' . intval($cid) . '&lid=' . $newid;
- $category_handler = xoops_getmodulehandler('category');
- $category = $category_handler->get($cid);
+ $notification_handler = & xoops_gethandler('notification');
+ $tags = array();
+ $tags['FILE_NAME'] = $title;
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . 'singlefile.php?cid=' . intval($cid) . '&lid=' . $newid;
+ $category_handler = xoops_getmodulehandler('category');
+ $category = $category_handler->get($cid);
$tags['CATEGORY_NAME'] = $category->getVar('title');
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL.'viewcat.php?cid=' . intval($cid);
+ $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . 'viewcat.php?cid=' . intval($cid);
- if ($xoopsModuleConfig['autoapprove'] == 2 || $xoopsModuleConfig['autoapprove'] == 4)
- {
+ if ($xoopsModuleConfig['autoapprove'] == 2 || $xoopsModuleConfig['autoapprove'] == 4) {
$notification_handler->triggerEvent('global', 0, 'new_file', $tags);
$notification_handler->triggerEvent('category', $cid, 'new_file', $t...
[truncated message content] |
|
From: <be...@us...> - 2013-04-21 03:24:21
|
Revision: 11415
http://sourceforge.net/p/xoops/svn/11415
Author: beckmi
Date: 2013-04-21 03:24:16 +0000 (Sun, 21 Apr 2013)
Log Message:
-----------
added dynamic editor selection, fixed few English translations
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/blocks/wfdownloads_top.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/trunk/wfdownloads/docs/credits.txt
XoopsModules/wfdownloads/trunk/wfdownloads/docs/readme.txt
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/main.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/french/admin.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/german/admin.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/persian/admin.php
XoopsModules/wfdownloads/trunk/wfdownloads/templates/blocks/wfdownloads_block_new.html
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/blocks/wfdownloads_top.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/blocks/wfdownloads_top.php 2013-04-20 18:15:43 UTC (rev 11414)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/blocks/wfdownloads_top.php 2013-04-21 03:24:16 UTC (rev 11415)
@@ -55,6 +55,9 @@
{
$download['date'] = formatTimestamp($download['published'], $wfModuleConfig['dateformat']);
}
+ else {
+ $download['date'] = formatTimestamp($download['date'], $wfModuleConfig['dateformat']);
+ }
$download['dirname'] = $wfModule->dirname();
$block['downloads'][] = $download;
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-04-20 18:15:43 UTC (rev 11414)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-04-21 03:24:16 UTC (rev 11415)
@@ -75,6 +75,12 @@
$this->initVar('ipaddress', XOBJ_DTYPE_TXTBOX, '');
$this->initVar('notifypub', XOBJ_DTYPE_INT, 0);
+ $this->initVar('dohtml', XOBJ_DTYPE_INT, 1, false);
+ $this->initVar('dosmiley', XOBJ_DTYPE_INT, 1, false);
+ $this->initVar('doxcode', XOBJ_DTYPE_INT, 1, false);
+ $this->initVar('doimage', XOBJ_DTYPE_INT, 1, false);
+ $this->initVar('dobr', XOBJ_DTYPE_INT, 1, false);
+
// added - start - March 4 2006 - jpc
$this->initVar('formulize_idreq', XOBJ_DTYPE_INT, 0);
// added - end - March 4 2006 - jpc
@@ -493,50 +499,106 @@
// changed - end - March 4 2006 - jpc
// changed and added - start - April 22, 2006 - jwe
- if(count($customArray) == 0) {
- $sform -> addElement(new XoopsFormText(_AM_WFD_FILE_HOMEPAGETITLE, 'homepagetitle', 50, 255, $this->getVar('homepagetitle', 'e')), false);
- $sform -> addElement(new XoopsFormText(_AM_WFD_FILE_HOMEPAGE, 'homepage', 50, 255, $this->getVar('homepage', 'e')), false);
- $sform -> addElement(new XoopsFormText(_AM_WFD_FILE_VERSION, 'version', 10, 20, $this->getVar('version', 'e')), false);
- $sform -> addElement(new XoopsFormText(_AM_WFD_FILE_PUBLISHER, 'publisher', 50, 255, $this->getVar('publisher', 'e')), false);
- $sform -> addElement(new XoopsFormText(_AM_WFD_FILE_SIZE, 'size', 10, 20, $this->getVar('size', 'e')), false);
+ if (count($customArray) == 0) {
+ $sform->addElement(new XoopsFormText(_AM_WFD_FILE_HOMEPAGETITLE, 'homepagetitle', 50, 255, $this->getVar('homepagetitle', 'e')), false);
+ $sform->addElement(new XoopsFormText(_AM_WFD_FILE_HOMEPAGE, 'homepage', 50, 255, $this->getVar('homepage', 'e')), false);
+ $sform->addElement(new XoopsFormText(_AM_WFD_FILE_VERSION, 'version', 10, 20, $this->getVar('version', 'e')), false);
+ $sform->addElement(new XoopsFormText(_AM_WFD_FILE_PUBLISHER, 'publisher', 50, 255, $this->getVar('publisher', 'e')), false);
+ $sform->addElement(new XoopsFormText(_AM_WFD_FILE_SIZE, 'size', 10, 20, $this->getVar('size', 'e')), false);
- $platform_array = $xoopsModuleConfig['platform'];
- $platform_select = new XoopsFormSelect('', 'platform', $this->getVar('platform', 'e'), '', '', 0);
- $platform_select -> addOptionArray($platform_array);
- $platform_tray = new XoopsFormElementTray(_AM_WFD_FILE_PLATFORM, ' ');
- $platform_tray -> addElement($platform_select);
- $sform -> addElement($platform_tray);
+ $platform_array = $xoopsModuleConfig['platform'];
+ $platform_select = new XoopsFormSelect('', 'platform', $this->getVar('platform', 'e'), '', '', 0);
+ $platform_select->addOptionArray($platform_array);
+ $platform_tray = new XoopsFormElementTray(_AM_WFD_FILE_PLATFORM, ' ');
+ $platform_tray->addElement($platform_select);
+ $sform->addElement($platform_tray);
- $license_array = $xoopsModuleConfig['license'];
- $license_select = new XoopsFormSelect('', 'license', $this->getVar('license', 'e'), '', '', 0);
- $license_select -> addOptionArray($license_array);
- $license_tray = new XoopsFormElementTray(_AM_WFD_FILE_LICENCE, ' ');
- $license_tray -> addElement($license_select);
- $sform -> addElement($license_tray);
+ $license_array = $xoopsModuleConfig['license'];
+ $license_select = new XoopsFormSelect('', 'license', $this->getVar('license', 'e'), '', '', 0);
+ $license_select->addOptionArray($license_array);
+ $license_tray = new XoopsFormElementTray(_AM_WFD_FILE_LICENCE, ' ');
+ $license_tray->addElement($license_select);
+ $sform->addElement($license_tray);
- $limitations_array = $xoopsModuleConfig['limitations'];
- $limitations_select = new XoopsFormSelect('', 'limitations', $this->getVar('limitations', 'e'), '', '', 0);
- $limitations_select -> addOptionArray($limitations_array);
- $limitations_tray = new XoopsFormElementTray(_AM_WFD_FILE_LIMITATIONS, ' ');
- $limitations_tray -> addElement($limitations_select);
- $sform -> addElement($limitations_tray);
+ $limitations_array = $xoopsModuleConfig['limitations'];
+ $limitations_select = new XoopsFormSelect('', 'limitations', $this->getVar('limitations', 'e'), '', '', 0);
+ $limitations_select->addOptionArray($limitations_array);
+ $limitations_tray = new XoopsFormElementTray(_AM_WFD_FILE_LIMITATIONS, ' ');
+ $limitations_tray->addElement($limitations_select);
+ $sform->addElement($limitations_tray);
- $versiontypes_array = $xoopsModuleConfig['versiontypes'];
- $versiontypes_select = new XoopsFormSelect('', 'versiontypes', $this->getVar('versiontypes', 'e'), '', '', 0);
- $versiontypes_select -> addOptionArray($versiontypes_array);
- $versiontypes_tray = new XoopsFormElementTray(_AM_WFD_FILE_VERSIONTYPES, ' ');
- $versiontypes_tray -> addElement($versiontypes_select);
- $sform -> addElement($versiontypes_tray);
+ $versiontypes_array = $xoopsModuleConfig['versiontypes'];
+ $versiontypes_select = new XoopsFormSelect('', 'versiontypes', $this->getVar('versiontypes', 'e'), '', '', 0);
+ $versiontypes_select->addOptionArray($versiontypes_array);
+ $versiontypes_tray = new XoopsFormElementTray(_AM_WFD_FILE_VERSIONTYPES, ' ');
+ $versiontypes_tray->addElement($versiontypes_select);
+ $sform->addElement($versiontypes_tray);
- $sform -> addElement(new XoopsFormText(_AM_WFD_FILE_PRICE, 'price', 10, 20, $this->getVar('price', 'e')), false);
+ $sform->addElement(new XoopsFormText(_AM_WFD_FILE_PRICE, 'price', 10, 20, $this->getVar('price', 'e')), false);
- $sform -> addElement(new XoopsFormDhtmlTextArea(_AM_WFD_FILE_SUMMARY, 'summary', $this->getVar('summary', 'e'), 10, 60, "smartHiddenSummary"), false);
- $sform -> addElement(new XoopsFormDhtmlTextArea(_AM_WFD_FILE_DESCRIPTION, 'description', $this->getVar('description', 'e'), 15, 60, "smartHiddenDescription"), true);
- $sform -> addElement(new XoopsFormTextArea(_AM_WFD_FILE_KEYFEATURES, 'features', $this->getVar('features', 'e'), 7, 60), false);
- $sform -> addElement(new XoopsFormTextArea(_AM_WFD_FILE_REQUIREMENTS, 'requirements', $this->getVar('requirements', 'e'), 7, 60), false);
- } else { // if we are using a custom form, then add in the form's elements here
- $sform -> addElement(new XoopsFormDhtmlTextArea(_AM_WFD_FILE_DESCRIPTION, 'description', $this->getVar('description', 'e'), 15, 60, "smartHiddenDescription"), true);
- $sform -> addElement(new XoopsFormHidden('size', $this->getVar('size', 'e')));
+// $sform -> addElement(new XoopsFormDhtmlTextArea(_AM_WFD_FILE_SUMMARY, 'summary', $this->getVar('summary', 'e'), 10, 60, "smartHiddenSummary"), false);
+
+ $optionsTrayNote = new XoopsFormElementTray(_AM_WFD_FILE_SUMMARY, '<br />');
+ if (class_exists('XoopsFormEditor')) {
+ $options['name'] = 'summary';
+ $options['value'] = $this->getVar('summary', 'e');
+ $options['rows'] = 10;
+ $options['cols'] = '100%';
+ $options['width'] = '100%';
+ $options['height'] = '200px';
+ $formSummary = new XoopsFormEditor('', $xoopsModuleConfig['editor_options'], $options, $nohtml = false, $onfailure = 'textarea');
+ $optionsTrayNote->addElement($formSummary);
+ } else {
+ $formSummary = new XoopsFormDhtmlTextArea('', 'summary', $this->getVar('summary', 'e'), 10, 60, "smartHiddenSummary");
+ $optionsTrayNote->addElement($formSummary);
+ }
+ $sform->addElement($optionsTrayNote);
+
+
+// $sform -> addElement(new XoopsFormDhtmlTextArea(_AM_WFD_FILE_DESCRIPTION, 'description', $this->getVar('description', 'e'), 15, 60, "smartHiddenDescription"), true);
+
+
+ $optionsTrayNote2 = new XoopsFormElementTray(_AM_WFD_FILE_DESCRIPTION, '<br />');
+ if (class_exists('XoopsFormEditor')) {
+ $options['name'] = 'description';
+ $options['value'] = $this->getVar('description', 'e');
+ $options['rows'] = 15;
+ $options['cols'] = '100%';
+ $options['width'] = '100%';
+ $options['height'] = '200px';
+ $formDescription = new XoopsFormEditor('', $xoopsModuleConfig['editor_options'], $options, $nohtml = false, $onfailure = 'textarea');
+ $optionsTrayNote2->addElement($formDescription, true);
+ } else {
+ $formDescription = new XoopsFormDhtmlTextArea('', 'description', $this->getVar('description', 'e'), 15, 60, "smartHiddenDescription");
+ $optionsTrayNote2->addElement($formDescription, true);
+ }
+ $sform->addElement($optionsTrayNote2);
+
+
+ $sform->addElement(new XoopsFormTextArea(_AM_WFD_FILE_KEYFEATURES, 'features', $this->getVar('features', 'e'), 7, 60), false);
+ $sform->addElement(new XoopsFormTextArea(_AM_WFD_FILE_REQUIREMENTS, 'requirements', $this->getVar('requirements', 'e'), 7, 60), false);
+ } else { // if we are using a custom form, then add in the form's elements here
+
+// $sform -> addElement(new XoopsFormDhtmlTextArea(_AM_WFD_FILE_DESCRIPTION, 'description', $this->getVar('description', 'e'), 15, 60, "smartHiddenDescription"), true);
+
+ $optionsTrayNote2 = new XoopsFormElementTray(_AM_WFD_FILE_DESCRIPTION, '<br />');
+ if (class_exists('XoopsFormEditor')) {
+ $options['name'] = 'description';
+ $options['value'] = $this->getVar('description', 'e');
+ $options['rows'] = 15;
+ $options['cols'] = '100%';
+ $options['width'] = '100%';
+ $options['height'] = '200px';
+ $formDescription = new XoopsFormEditor('', $xoopsModuleConfig['editor_options'], $options, $nohtml = false, $onfailure = 'textarea');
+ $optionsTrayNote2->addElement($formDescription, true);
+ } else {
+ $formDescription = new XoopsFormDhtmlTextArea('', 'description', $this->getVar('description', 'e'), 15, 60, "smartHiddenDescription");
+ $optionsTrayNote2->addElement($formDescription, true);
+ }
+ $sform->addElement($optionsTrayNote2);
+
+
+ $sform -> addElement(new XoopsFormHidden('size', $this->getVar('size', 'e')));
$sform = compileElements($customArray['fid'], $sform, $customArray['formulize_mgr'], $customArray['prevEntry'], $customArray['entry'], $customArray['go_back'], $customArray['parentLinks'], $customArray['owner_groups'], $customArray['groups']);
}
// Changed and added - end - April 22, 2006 - jwe
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-04-20 18:15:43 UTC (rev 11414)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-04-21 03:24:16 UTC (rev 11415)
@@ -1,3 +1,7 @@
+<b><u>=> Version 3.22 RC2 (2013-04-20)</u></b>
+- added dynamic Editor selection (mamba)
+- fixed few English translations (mamba)
+
<b><u>=> Version 3.22 RC1 (2013-03-23)</u></b>
- fixed minor bugs in update procedure (luciorota)
- fixed calculations for file voting results view in admin (mamba)
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/credits.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/credits.txt 2013-04-20 18:15:43 UTC (rev 11414)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/credits.txt 2013-04-21 03:24:16 UTC (rev 11415)
@@ -1,8 +1,10 @@
Credits
===============
-WF-Downloads is forked from the original Xoops mydownloads module and heavily rewritten with added features.
+WF-Downloads is forked from the original XOOPS MyDownloads module and heavily rewritten with added features.
+As of version 3.21, WF-Downloads is maintained by the XOOPS Development Team
+
Coding:
ackbarr, catzwolf aka john_n, felix, gladiac, marcan, mercibe, mithrandir, m0nty, nboseret, phppp, smd, Jegelstaff
@@ -13,7 +15,7 @@
WF-Projects & The SmartFactory Team: ackbarr, amayer, bender, catzwolf, david, dqflyer, draven, felix, frankblack, gladiac, hervet, marcan, marco, mercibe, m0nty, phppp, predator, rectifier, reliableSol, tom, xpider, xtheme, Jegelstaff
Credits for original 'mydownloads':
-Original Xoops Team
+Original XOOPS Team
Onokazu, Buennagel, The Wanderer and all the others
We would also like to thank:
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/readme.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/readme.txt 2013-04-20 18:15:43 UTC (rev 11414)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/readme.txt 2013-04-21 03:24:16 UTC (rev 11415)
@@ -1,7 +1,7 @@
/**
* $Id: readme.txt,v 1.3 2006/04/11 20:50:34 malanciault Exp $
* Module: WF-Downloads
-* Author: The SmartFactory <www.smartfactory.ca>
+* Author: The SmartFactory
* Licence: GNU
*/
@@ -17,7 +17,7 @@
For information on how to install or update this module, please read the module documentation, available in the module package:
-\wfdownloads\docs\english\readme.html
+\wfdownloads\docs\install.txt
!!! Please read the docs before updating or installing !!!
@@ -27,10 +27,7 @@
To see which language constants have been modified, have a look at the diff file here :
-\wfdownloads\docs\english
+\wfdownloads\docs\lang_diff.txt
-.:: The SmartFactory ::.
-.:: Open Source : smartfactory.ca ::.
-.:: Professionnal : inboxsolutions.net ::.
-.:: su...@sm... ::.
\ No newline at end of file
+XOOPS Development Team
\ No newline at end of file
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-04-20 18:15:43 UTC (rev 11414)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-04-21 03:24:16 UTC (rev 11415)
@@ -22,7 +22,7 @@
define("_AM_WFD_BUPLOAD","Upload");
define("_AM_WFD_BDELETEIMAGE","Delete Selected Image");
define("_AM_WFD_BRETURN","Return to where you where!");
-define("_AM_WFD_DBERROR","Database Access Error: Please report this error to the SmartFactory Website");
+define("_AM_WFD_DBERROR","Database Access Error: Please report this error to the XOOPS Website");
//Banned Users
define("_AM_WFD_NONBANNED","Not Banned");
define("_AM_WFD_BANNED","Banned");
@@ -112,7 +112,7 @@
define("_AM_WFD_PERM_PERMSNOTE","<div><b>NOTE:</b> Please be aware that even if you’ve set correct viewing permissions here, a group might not see the articles or blocks if you don’t also grant that group permissions to access the module. To do that, go to <b>System admin > Groups</b>, choose the appropriate group and click the checkboxes to grant its members the access.</div>");
define("_AM_WFD_PERM_CPERMISSIONS","Category Permissions");
define("_AM_WFD_PERM_CSELECTPERMISSIONS","Select categories that each group is allowed to view");
-define("_AM_WFD_PERM_CNOCATEGORY","Cannot set permission's: No Categories's have been created yet!");
+define("_AM_WFD_PERM_CNOCATEGORY","Cannot set permission's: No Categories have been created yet!");
define("_AM_WFD_PERM_FPERMISSIONS","File Permissions");
define("_AM_WFD_PERM_FNOFILES","Cannot set permission's: No files have been created yet!");
define("_AM_WFD_PERM_FSELECTPERMISSIONS","Select the files that each group is allowed to view");
@@ -182,7 +182,7 @@
define("_AM_WFD_SUB_APPROVEWAITINGFILE","<b>Approve</b> new file information without validation.");
define("_AM_WFD_SUB_EDITWAITINGFILE","<b>Edit</b> new file information and then approve.");
define("_AM_WFD_SUB_DELETEWAITINGFILE","<b>Delete</b> the new file information.");
-define("_AM_WFD_SUB_NOFILESWAITING","There are no files that match this critera");
+define("_AM_WFD_SUB_NOFILESWAITING","There are no files that match this criteria");
define("_AM_WFD_SUB_NEWFILECREATED","New File Data Created and Database Updated Successfully");
// Mimetypes
define("_AM_WFD_MIME_ID","ID");
@@ -195,7 +195,7 @@
define("_AM_WFD_MIME_MODIFYF","Modify Mimetype");
define("_AM_WFD_MIME_EXTF","File Extension:");
define("_AM_WFD_MIME_NAMEF","Application Type/Name:<div style='padding-top: 8px;'><span style='font-weight: normal;'>Enter application associated with this extension.</span></div>");
-define("_AM_WFD_MIME_TYPEF","Mimetypes:<div style='padding-top: 8px;'><span style='font-weight: normal;'>Enter each mimetype associated with the file extension. Each mimetype must be seperated with a space.</span></div>");
+define("_AM_WFD_MIME_TYPEF","Mimetypes:<div style='padding-top: 8px;'><span style='font-weight: normal;'>Enter each Mimetype associated with the file extension. Each Mimetype must be separated with a space.</span></div>");
define("_AM_WFD_MIME_ADMINF","Allowed Admin Mimetype");
define("_AM_WFD_MIME_ADMINFINFO","<b>Mimetypes that are available for Admin uploads:</b>");
define("_AM_WFD_MIME_USERF","Allowed User Mimetype");
@@ -203,7 +203,7 @@
define("_AM_WFD_MIME_NOMIMEINFO","No mimetypes selected.");
define("_AM_WFD_MIME_FINDMIMETYPE","Find New Mimetype:");
define("_AM_WFD_MIME_EXTFIND","Search File Extension:<div style='padding-top: 8px;'><span style='font-weight: normal;'>Enter file extension you wish to search.</span></div>");
-define("_AM_WFD_MIME_INFOTEXT","<ul><li>New mimetypes can be created, edit or deleted easily via this form.</li>
+define("_AM_WFD_MIME_INFOTEXT","<ul><li>New Mimetypes can be created, edited or deleted easily via this form.</li>
<li>Search for a new mimetypes via an external website.</li>
<li>View displayed mimetypes for Admin and User uploads.</li>
<li>Change mimetype upload status.</li></ul>
@@ -251,7 +251,7 @@
define("_AM_WFD_MOD_MODTITLE","Title");
define("_AM_WFD_MOD_MODPOSTER","Original Poster: ");
define("_AM_WFD_MOD_DATE","Submitted");
-define("_AM_WFD_MOD_NOMODREQUEST","There are no requests that match this critera");
+define("_AM_WFD_MOD_NOMODREQUEST","There are no requests that match this criteria");
define("_AM_WFD_MOD_MODIFYSUBMIT","Submitter");
define("_AM_WFD_MOD_ORIGINAL","Orginal Download Details");
define("_AM_WFD_MOD_REQDELETED","Modification request removed from the database");
@@ -265,7 +265,7 @@
define("_AM_WFD_MOD_MODTITLE","Title");
define("_AM_WFD_MOD_MODPOSTER","Original Poster: ");
define("_AM_WFD_MOD_DATE","Submitted");
-define("_AM_WFD_MOD_NOMODREQUEST","There are no requests that match this critera");
+define("_AM_WFD_MOD_NOMODREQUEST","There are no requests that match this criteria");
define("_AM_WFD_MOD_TITLE","Download Title: ");
define("_AM_WFD_MOD_LID","Download ID: ");
define("_AM_WFD_MOD_CID","Category: ");
@@ -293,12 +293,12 @@
define("_AM_WFD_MOD_MODIFYSUBMITTER","Submitter: ");
define("_AM_WFD_MOD_MODIFYSUBMIT","Submitter");
define("_AM_WFD_MOD_PROPOSED","Proposed Download Details");
-define("_AM_WFD_MOD_ORIGINAL","Orginal Download Details");
+define("_AM_WFD_MOD_ORIGINAL","Original Download Details");
define("_AM_WFD_MOD_REQDELETED","Modification request removed from the database");
define("_AM_WFD_MOD_REQUPDATED","Selected Download Modified and Database Updated Successfully");
define('_AM_WFD_MOD_VIEW','View');
-define("_AM_WFD_MOD_FILENAME","Local Filename: ");
-define("_AM_WFD_MOD_FILETYPE","Local Filetype: ");
+define("_AM_WFD_MOD_FILENAME","Local File name: ");
+define("_AM_WFD_MOD_FILETYPE","Local File type: ");
define("_AM_WFD_MOD_STATUS","Status: ");
define("_AM_WFD_MOD_RATING","Rating: ");
define("_AM_WFD_MOD_HITS","Hits: ");
@@ -337,7 +337,7 @@
//File management
define("_AM_WFD_FILE_SUBMITTERID","Submitter User Id: <br /><br />Leave this as it is, Unless you want to change who submitted the download");
define("_AM_WFD_FILE_ID","File ID: ");
-define("_AM_WFD_FILE_IP","Uploaders IP Address: ");
+define("_AM_WFD_FILE_IP","Uploader's IP Address: ");
define("_AM_WFD_FILE_ALLOWEDAMIME","<div style='padding-top: 4px; padding-bottom: 4px;'><b>Allowed Admin File Extensions</b>:</div>");
define("_AM_WFD_FILE_MODIFYFILE","Modify File Information");
define("_AM_WFD_FILE_CREATENEWFILE","Create New File");
@@ -360,8 +360,8 @@
define("_AM_WFD_FILE_LICENCE","Software Licence: ");
define("_AM_WFD_FILE_LIMITATIONS","Software limitations: ");
define("_AM_WFD_FILE_PRICE","Price: ");
-define("_AM_WFD_FILE_KEYFEATURES","Key Features:<br /><br /><span style='font-weight: normal;'>Seperate each Key Feature with a |</span>");
-define("_AM_WFD_FILE_REQUIREMENTS","System Requirements:<br /><br /><span style='font-weight: normal;'>Seperate each Requirement with |</span>");
+define("_AM_WFD_FILE_KEYFEATURES","Key Features:<br /><br /><span style='font-weight: normal;'>Separate each Key Feature with a |</span>");
+define("_AM_WFD_FILE_REQUIREMENTS","System Requirements:<br /><br /><span style='font-weight: normal;'>Separate each Requirement with |</span>");
define("_AM_WFD_FILE_HISTORY","Download History Edit:<br /><br /><span style='font-weight: normal;'>Add New Download History and only use this field to if you need to edit the previous history.</span>");
define("_AM_WFD_FILE_HISTORYD","Add New Download History:<br /><br /><span style='font-weight: normal;'>The version Number and date will be added automatically</span>");
define("_AM_WFD_FILE_HISTORYVERS","<b>Version: </b>");
@@ -414,7 +414,7 @@
define("_AM_WFD_BROKEN_ACKDESC","<b>Acknowledged</b> Set Acknowledged state of broken file report.");
define("_AM_WFD_BROKEN_ACK_ALT","Acknowledge state of broken file report");
define("_AM_WFD_BROKEN_CONFIRMDESC","<b>Confirmed</b> Set confirmed state of broken file report.");
-define("_AM_WFD_BROKEN_CONFIRM_ALT","Confirme state of broken file report");
+define("_AM_WFD_BROKEN_CONFIRM_ALT","Confirm state of broken file report");
define("_AM_WFD_BROKEN_ID","ID");
define("_AM_WFD_BROKEN_TITLE","Title");
@@ -422,7 +422,7 @@
define("_AM_WFD_BROKEN_FILESUBMITTER","Submitter");
define("_AM_WFD_BROKEN_DATESUBMITTED","Submit Date");
define("_AM_WFD_BROKEN_ACTION","Action");
-define("_AM_WFD_BROKEN_NOFILEMATCH","There are no Broken reports that match this critera");
+define("_AM_WFD_BROKEN_NOFILEMATCH","There are no Broken reports that match this criteria");
define("_AM_WFD_BROKENFILEDELETED","Download description removed from database and broken report removed");
define("_AM_WFD_BROKEN_DOWNLOAD_DONT_EXISTS","The file does not exists anymore");
@@ -566,10 +566,9 @@
define("_AM_WFD_MINDEX_LOG","Logs");
define("_AM_WFD_IP_LOGS","View logs");
define("_AM_WFD_EMPTY_LOG","No logs recorded.");
-define("_AM_WFD_LOG_FOR_LID","Here is the list of the downloaders IP address for %s");
+define("_AM_WFD_LOG_FOR_LID","Here is the list of the downloader's IP address for %s");
define("_AM_WFD_IP_ADDRESS","IP Address");
define("_AM_WFD_DATE","Download date");
define("_AM_WFD_BACK","<< Back");
define("_AM_WFD_USER","User");
-define("_AM_WFD_ANONYMOUS","Anonymous User");
-?>
\ No newline at end of file
+define("_AM_WFD_ANONYMOUS","Anonymous User");
\ No newline at end of file
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/main.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/main.php 2013-04-20 18:15:43 UTC (rev 11414)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/main.php 2013-04-21 03:24:16 UTC (rev 11415)
@@ -111,7 +111,7 @@
define("_MD_WFD_NORATING","No rating selected.");
define("_MD_WFD_CANTVOTEOWN","You cannot vote on the resource you submitted.<br />All votes are logged and reviewed.");
define("_MD_WFD_SUBMITDOWNLOAD","Submit Download");
-define("_MD_WFD_SUB_SNEWMNAMEDESC","<ul><li>All new Downloads's are subject to validation and may take up to 24 hours before they appear in our listing.</li><li>We reserve the rights to refuse any submitted download or change the content without approval.</li></ul>");
+define("_MD_WFD_SUB_SNEWMNAMEDESC","<ul><li>All new Downloads are subject to validation and may take up to 24 hours before they appear in our listing.</li><li>We reserve the rights to refuse any submitted download or change the content without approval.</li></ul>");
define("_MD_WFD_MAINLISTING","Main Category Listings");
define("_MD_WFD_LASTWEEK","Last Week");
define("_MD_WFD_LAST30DAYS","Last 30 Days");
@@ -175,8 +175,8 @@
define("_MD_WFD_ISNOTAPPROVED","Your submission has to be approved by a moderator first.");
define("_MD_WFD_LICENCEC","Software Licence: ");
define("_MD_WFD_LIMITATIONS","Software limitations: ");
-define("_MD_WFD_KEYFEATURESC","Key Features:<br /><br /><span style='font-weight: normal;'>Seperate each Key Feature with a |</span>");
-define("_MD_WFD_REQUIREMENTSC","System Requirements:<br /><br /><span style='font-weight: normal;'>Seperate each Requirement with |</span>");
+define("_MD_WFD_KEYFEATURESC","Key Features:<br /><br /><span style='font-weight: normal;'>Separate each Key Feature with a |</span>");
+define("_MD_WFD_REQUIREMENTSC","System Requirements:<br /><br /><span style='font-weight: normal;'>Separate each Requirement with |</span>");
define("_MD_WFD_HISTORYC","Download History:");
define("_MD_WFD_HISTORYD","Add New Download History:<br /><br /><span style='font-weight: normal;'>The Submit date will automatically be added to this.</span>");
define("_MD_WFD_HOMEPAGETITLEC","Home Page Title: ");
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php 2013-04-20 18:15:43 UTC (rev 11414)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php 2013-04-21 03:24:16 UTC (rev 11415)
@@ -16,8 +16,8 @@
define("_MI_WFD_DESC","Creates a downloads section where users can download/submit/rate various files.");
// Names of blocks for this module (Not all module has blocks)
-define("_MI_WFD_BNAME1","Recent WF-Downloads");
-define("_MI_WFD_BNAME2","Top WF-Downloads");
+define("_MI_WFD_BNAME1","Recent Downloads");
+define("_MI_WFD_BNAME2","Top Downloads");
define("_MI_WFD_BNAME3","Top Downloads by top categories");
// Sub menu titles
@@ -254,27 +254,27 @@
define('_MI_WFD_MODULE_DISCLAIMER',"Disclaimer");
define('_MI_WFD_RELEASE',"Release Date: ");
-define('_MI_WFD_MODULE_MAILLIST',"SmartFactory Mailing Lists");
+define('_MI_WFD_MODULE_MAILLIST',"XOOPS Mailing Lists");
define('_MI_WFD_MODULE_MAILANNOUNCEMENTS',"Announcements Mailing List");
define('_MI_WFD_MODULE_MAILBUGS',"Bug Mailing List");
define('_MI_WFD_MODULE_MAILFEATURES',"Features Mailing List");
-define('_MI_WFD_MODULE_MAILANNOUNCEMENTSDSC',"Get the latest announcements from SmartFactory.");
+define('_MI_WFD_MODULE_MAILANNOUNCEMENTSDSC',"Get the latest announcements from XOOPS.");
define('_MI_WFD_MODULE_MAILBUGSDSC',"Bug Tracking and submission mailing list");
define('_MI_WFD_MODULE_MAILFEATURESDSC',"Request New Features mailing list.");
-define('_MI_WFD_WARNINGTEXT',"THE SOFTWARE IS PROVIDED BY SMARTFACTORY \"AS IS\" AND \"WITH ALL FAULTS.\"
-SMARTFACTORY MAKES NO REPRESENTATIONS OR WARRAN...
[truncated message content] |
|
From: <luc...@us...> - 2013-05-19 07:06:30
|
Revision: 11555
http://sourceforge.net/p/xoops/svn/11555
Author: luciorota
Date: 2013-05-19 07:06:25 +0000 (Sun, 19 May 2013)
Log Message:
-----------
added: permission by category.php
fixed: language definition in modinfo.php
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/admin_header2.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokendown.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/cookies.js
XoopsModules/wfdownloads/trunk/wfdownloads/admin/funcs.js
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/ip_log.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/main.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirror.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/modifications.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/newdownloads.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/newstory.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/permissions.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/review.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/update.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/upload.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/votedata.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/index.html
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/class/wfd_lists.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/footer.php
XoopsModules/wfdownloads/trunk/wfdownloads/header.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/index.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/submit.php
XoopsModules/wfdownloads/trunk/wfdownloads/thickbox.css
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
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/about.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/about.php 2013-05-18 12:45:32 UTC (rev 11554)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/about.php 2013-05-19 07:06:25 UTC (rev 11555)
@@ -27,4 +27,4 @@
echo $aboutAdmin->addNavigation('about.php');
echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
-include 'admin_footer.php';
\ No newline at end of file
+include 'admin_footer.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_footer.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_footer.php 2013-05-18 12:45:32 UTC (rev 11554)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_footer.php 2013-05-19 07:06:25 UTC (rev 11555)
@@ -25,4 +25,4 @@
." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
."</div>";
-xoops_cp_footer();
\ No newline at end of file
+xoops_cp_footer();
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-05-18 12:45:32 UTC (rev 11554)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-05-19 07:06:25 UTC (rev 11555)
@@ -42,32 +42,32 @@
xoops_loadLanguage('modinfo', $thisModuleDir);
xoops_loadLanguage('main', $thisModuleDir);
-$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
-$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
+$pathIcon16 = '../' . $xoopsModule->getInfo('icons16');
+$pathIcon32 = '../' . $xoopsModule->getInfo('icons32');
$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
$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'>",
+ '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'>",
+ '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'>"
- );
+ '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'>"
+ );
-if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){
- include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
- }else{
- redirect_header("../../../admin.php", 5, _AM_BIRTHDAY_MODULEADMIN_MISSING, false);
- }
\ No newline at end of file
+if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php'))){
+ include_once $GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php');
+} else {
+ redirect_header("../../../admin.php", 5, _AM_BIRTHDAY_MODULEADMIN_MISSING, false);
+}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header2.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header2.php 2013-05-18 12:45:32 UTC (rev 11554)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header2.php 2013-05-19 07:06:25 UTC (rev 11555)
@@ -1,38 +1,36 @@
-<?php
-/**
- * $Id: admin_header.php,v 1.5 2007/08/10 20:59:33 m0nty_ Exp $
- * Module: WF-Downloads
- * Version: v2.0.5a
- * Release Date: 26 july 2004
- * Author: WF-Sections
- * Licence: GNU
- */
-
-include '../../../include/cp_header.php';
-include_once(XOOPS_ROOT_PATH . '/modules/wfdownloads/include/functions.php');
-include_once(XOOPS_ROOT_PATH . '/modules/wfdownloads/include/common.php');
-
-include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-
-$myts = &MyTextSanitizer::getInstance();
-
-$imagearray = array(
- 'editimg' => "<img src='../images/icon/edit.gif' alt='" . _AM_WFD_ICO_EDIT . "' title='" . _AM_WFD_ICO_EDIT . "' align='middle'>",
- 'deleteimg' => "<img src='../images/icon/delete.gif' alt='" . _AM_WFD_ICO_DELETE . "' title='" . _AM_WFD_ICO_DELETE . "' align='middle'>",
- 'online' => "<img src='../images/icon/on.gif' alt='" . _AM_WFD_ICO_ONLINE . "' title='" . _AM_WFD_ICO_ONLINE . "' align='middle'>",
- 'offline' => "<img src='../images/icon/off.gif' alt='" . _AM_WFD_ICO_OFFLINE . "' title='" . _AM_WFD_ICO_OFFLINE . "' align='middle'>",
- 'approved' => "<img src='../images/icon/on.gif' alt=''" . _AM_WFD_ICO_APPROVED . "' title=''" . _AM_WFD_ICO_APPROVED . "' align='middle'>",
- 'notapproved' => "<img src='../images/icon/off.gif' alt='" . _AM_WFD_ICO_NOTAPPROVED . "' title='" . _AM_WFD_ICO_NOTAPPROVED . "' align='middle'>",
- 'relatedfaq' => "<img src='../images/icon/link.gif' alt='" . _AM_WFD_ICO_LINK . "' title='" . _AM_WFD_ICO_LINK . "' align='middle'>",
- 'relatedurl' => "<img src='../images/icon/urllink.gif' alt='" . _AM_WFD_ICO_URL . "' title='" . _AM_WFD_ICO_URL . "' align='middle'>",
- 'addfaq' => "<img src='../images/icon/add.gif' alt='" . _AM_WFD_ICO_ADD . "' title='" . _AM_WFD_ICO_ADD . "' align='middle'>",
- 'approve' => "<img src='../images/icon/approve.gif' alt='" . _AM_WFD_ICO_APPROVE . "' title='" . _AM_WFD_ICO_APPROVE . "' align='middle'>",
- 'statsimg' => "<img src='../images/icon/stats.gif' alt='" . _AM_WFD_ICO_STATS . "' title='" . _AM_WFD_ICO_STATS . "' align='middle'>",
- 'ignore' => "<img src='../images/icon/ignore.gif' alt='" . _AM_WFD_ICO_IGNORE . "' title='" . _AM_WFD_ICO_IGNORE . "' align='middle'>",
- 'ack_yes' => "<img src='../images/icon/on.gif' alt='" . _AM_WFD_ICO_ACK . "' title='" . _AM_WFD_ICO_ACK . "' align='middle'>",
- 'ack_no' => "<img src='../images/icon/off.gif' alt='" . _AM_WFD_ICO_REPORT . "' title='" . _AM_WFD_ICO_REPORT . "' align='middle'>",
- 'con_yes' => "<img src='../images/icon/on.gif' alt='" . _AM_WFD_ICO_CONFIRM . "' title='" . _AM_WFD_ICO_CONFIRM . "' align='middle'>",
- 'con_no' => "<img src='../images/icon/off.gif' alt='" . _AM_WFD_ICO_CONBROKEN . "' title='" . _AM_WFD_ICO_CONBROKEN . "' align='middle'>"
- );
-
-?>
\ No newline at end of file
+<?php
+/**
+ * $Id: admin_header.php,v 1.5 2007/08/10 20:59:33 m0nty_ Exp $
+ * Module: WF-Downloads
+ * Version: v2.0.5a
+ * Release Date: 26 july 2004
+ * Author: WF-Sections
+ * Licence: GNU
+ */
+
+include '../../../include/cp_header.php';
+include_once(XOOPS_ROOT_PATH . '/modules/wfdownloads/include/functions.php');
+include_once(XOOPS_ROOT_PATH . '/modules/wfdownloads/include/common.php');
+
+include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+
+$myts = &MyTextSanitizer::getInstance();
+
+$imagearray = array(
+ 'editimg' => "<img src='../images/icon/edit.gif' alt='" . _AM_WFD_ICO_EDIT . "' title='" . _AM_WFD_ICO_EDIT . "' align='middle'>",
+ 'deleteimg' => "<img src='../images/icon/delete.gif' alt='" . _AM_WFD_ICO_DELETE . "' title='" . _AM_WFD_ICO_DELETE . "' align='middle'>",
+ 'online' => "<img src='../images/icon/on.gif' alt='" . _AM_WFD_ICO_ONLINE . "' title='" . _AM_WFD_ICO_ONLINE . "' align='middle'>",
+ 'offline' => "<img src='../images/icon/off.gif' alt='" . _AM_WFD_ICO_OFFLINE . "' title='" . _AM_WFD_ICO_OFFLINE . "' align='middle'>",
+ 'approved' => "<img src='../images/icon/on.gif' alt=''" . _AM_WFD_ICO_APPROVED . "' title=''" . _AM_WFD_ICO_APPROVED . "' align='middle'>",
+ 'notapproved' => "<img src='../images/icon/off.gif' alt='" . _AM_WFD_ICO_NOTAPPROVED . "' title='" . _AM_WFD_ICO_NOTAPPROVED . "' align='middle'>",
+ 'relatedfaq' => "<img src='../images/icon/link.gif' alt='" . _AM_WFD_ICO_LINK . "' title='" . _AM_WFD_ICO_LINK . "' align='middle'>",
+ 'relatedurl' => "<img src='../images/icon/urllink.gif' alt='" . _AM_WFD_ICO_URL . "' title='" . _AM_WFD_ICO_URL . "' align='middle'>",
+ 'addfaq' => "<img src='../images/icon/add.gif' alt='" . _AM_WFD_ICO_ADD . "' title='" . _AM_WFD_ICO_ADD . "' align='middle'>",
+ 'approve' => "<img src='../images/icon/approve.gif' alt='" . _AM_WFD_ICO_APPROVE . "' title='" . _AM_WFD_ICO_APPROVE . "' align='middle'>",
+ 'statsimg' => "<img src='../images/icon/stats.gif' alt='" . _AM_WFD_ICO_STATS . "' title='" . _AM_WFD_ICO_STATS . "' align='middle'>",
+ 'ignore' => "<img src='../images/icon/ignore.gif' alt='" . _AM_WFD_ICO_IGNORE . "' title='" . _AM_WFD_ICO_IGNORE . "' align='middle'>",
+ 'ack_yes' => "<img src='../images/icon/on.gif' alt='" . _AM_WFD_ICO_ACK . "' title='" . _AM_WFD_ICO_ACK . "' align='middle'>",
+ 'ack_no' => "<img src='../images/icon/off.gif' alt='" . _AM_WFD_ICO_REPORT . "' title='" . _AM_WFD_ICO_REPORT . "' align='middle'>",
+ 'con_yes' => "<img src='../images/icon/on.gif' alt='" . _AM_WFD_ICO_CONFIRM . "' title='" . _AM_WFD_ICO_CONFIRM . "' align='middle'>",
+ 'con_no' => "<img src='../images/icon/off.gif' alt='" . _AM_WFD_ICO_CONBROKEN . "' title='" . _AM_WFD_ICO_CONBROKEN . "' align='middle'>"
+ );
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokendown.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokendown.php 2013-05-18 12:45:32 UTC (rev 11554)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokendown.php 2013-05-19 07:06:25 UTC (rev 11555)
@@ -1,189 +1,175 @@
-<?php
-/**
- * $Id: brokendown.php,v 1.7 2007/09/30 12:39:13 m0nty_ Exp $
- * Module: WF-Downloads
- * Version: v2.0.5a
- * Release Date: 26 july 2004
- * Author: WF-Sections
- * Licence: GNU
- */
-
-include 'admin_header.php';
-
-$op = '';
-
-if (!isset($_POST['op']))
-{
- $op = isset($_GET['op']) ? $_GET['op'] : 'listBrokenDownloads';
-}
-else
-{
- $op = $_POST['op'];
-}
-
-$lid = (isset($_GET['lid'])) ? intval($_GET['lid']) : 0;
-
-switch ($op)
-{
- case "updateNotice":
- $report_handler = xoops_getmodulehandler('report');
- if (isset($_GET['ack']))
- {
- $acknowledged = (isset($_GET['ack']) && $_GET['ack'] == 0) ? 1 : 0;
- $report_handler->updateAll("acknowledged", $acknowledged, new Criteria("lid", $lid), true);
- $update_mess = _AM_WFD_BROKEN_NOWACK;
- }
-
- if (isset($_GET['con']))
- {
- $confirmed = (isset($_GET['con']) && $_GET['con'] == 0) ? 1 : 0;
- $report_handler->updateAll("confirmed", $confirmed, new Criteria("lid", $lid), true);
- $update_mess = _AM_WFD_BROKEN_NOWCON;
- }
- redirect_header(WFDOWNLOADS_URL.'admin/brokendown.php?op=default', 1, $update_mess);
- break;
-
- case "delBrokenDownloads":
- $criteria = new Criteria('lid', intval($lid));
- $report_handler = xoops_getmodulehandler('report');
- $report = $report_handler->getObjects($criteria);
- if (isset($report[0])) {
- $report_handler->delete($report[0], true);
- }
- $download_handler = xoops_getmodulehandler('download');
- $download = $download_handler->get($lid);
- $download_handler->delete($download, true);
- redirect_header(WFDOWNLOADS_URL.'admin/brokendown.php?op=default', 1, _AM_WFD_BROKENFILEDELETED);
- break;
-
- case "ignoreBrokenDownloads":
- $criteria = new Criteria('lid', intval($lid));
- $report_handler = xoops_getmodulehandler('report');
- $report = $report_handler->getObjects($criteria);
- if (isset($report[0])) {
- $report_handler->delete($report[0], true);
- }
-
- redirect_header(WFDOWNLOADS_URL.'admin/brokendown.php?op=default', 1, _AM_WFD_BROKEN_FILEIGNORED);
- break;
-
- default:
- case "listBrokenDownloads":
- case "default":
-
- global $xoopsDB, $imagearray, $xoopsModule;
- $report_handler = xoops_getmodulehandler('report');
- $reports = $report_handler->getObjects();
- $totalbrokendownloads = count($reports);
-
- wfdownloads_xoops_cp_header();
-
-
- //wfdownloads_adminMenu(3, _AM_WFD_BROKEN_FILE);
-
- echo "
- <fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFD_BROKEN_REPORTINFO . "</legend>\n
- <div style='padding: 8px;'>" . _AM_WFD_BROKEN_REPORTSNO . " <b>$totalbrokendownloads</b><div>\n
- <div style='padding: 8px;'>\n
- <ul><li>" . $imagearray['ignore'] . " " . _AM_WFD_BROKEN_IGNOREDESC . "</li>\n
- <li>" . $imagearray['editimg'] . " " . _AM_WFD_BROKEN_EDITDESC . "</li>
- <li>" . $imagearray['deleteimg'] . " " . _AM_WFD_BROKEN_DELETEDESC . "</li>\n
- <li>" . $imagearray['ack_yes'] . " " . _AM_WFD_BROKEN_ACKDESC . "</li>
- <li>" . $imagearray['con_yes'] . " " . _AM_WFD_BROKEN_CONFIRMDESC . "</li>
- </ul></div>\n
- </fieldset><br />\n
-
- <table width='100%' border='0' cellspacing='1' cellpadding = '2' class='outer'>\n
- <tr align = 'center'>\n
- <th width = '3%' align = 'center'>" . _AM_WFD_BROKEN_ID . "</th>\n
- <th width = '35%' align = 'left'>" . _AM_WFD_BROKEN_TITLE . "</th>\n
- <th>" . _AM_WFD_BROKEN_REPORTER . "</th>\n
- <th>" . _AM_WFD_BROKEN_FILESUBMITTER . "</th>\n
- <th>" . _AM_WFD_BROKEN_DATESUBMITTED . "</th>\n
- <th align='center'>" . _AM_WFD_BROKEN_ACTION . "</th>\n
- </tr>\n
- ";
-
- if ($totalbrokendownloads == 0)
- {
- echo "<tr align = 'center'><td align = 'center' class='head' colspan = '6'>" . _AM_WFD_BROKEN_NOFILEMATCH . "</td></tr>";
- }
- else
- {
- foreach (array_keys($reports) as $i) {
- $lids[] = $reports[$i]->getVar('lid');
- $uids[] = $reports[$i]->getVar('sender');
- }
- $download_handler = xoops_getmodulehandler('download');
- $downloads = $download_handler->getObjects(new Criteria('lid', "(".implode(',', array_unique($lids)).")", "IN"), true);
-
- foreach (array_keys($downloads) as $i) {
- $uids[] = $downloads[$i]->getVar('submitter');
- }
-
- $member_handler = xoops_gethandler('member');
- $users = $member_handler->getUsers(new Criteria("uid", "(".implode(',', array_unique($uids)).")", "IN"), true);
-
- foreach (array_keys($reports) as $i) {
- // Does the download exists ?
- if (isset($downloads[$reports[$i]->getVar('lid')])) {
- $submitter = isset($users[$downloads[$reports[$i]->getVar('lid')]->getVar('submitter')]) ? $users[$downloads[$reports[$i]->getVar('lid')]->getVar('submitter')] : false;
- $download = $downloads[$reports[$i]->getVar('lid')];
- $download_link = "<a href='" . WFDOWNLOADS_URL."singlefile.php?cid=" . $download->getVar('cid') . "&lid=" . $download->getVar('lid') . "' target='_blank'>" . $download->getVar('title') . "</a>";
- $submitteremail = is_object($submitter) ? $submitter->getVar('email') : '';
- $submitteruname = is_object($submitter) ? $submitter->getVar('uname') : $xoopsConfig['anonymous'];
- } else {
- $submitter = '';
- $download_link = _AM_WFD_BROKEN_DOWNLOAD_DONT_EXISTS;
- $submitteremail = '';
- $submitteruname = $xoopsConfig['anonymous'];
- }
-
- $sender = isset($users[$reports[$i]->getVar('sender')]) ? $users[$reports[$i]->getVar('sender')] : "";
- $senderemail = isset($users[$reports[$i]->getVar('sender')]) ? $users[$reports[$i]->getVar('sender')]->getVar('email') : "";
- $sendername = isset($users[$reports[$i]->getVar('sender')]) ? $users[$reports[$i]->getVar('sender')]->getVar('uname') : $xoopsConfig['anonymous'];
-
- $lid = intval($download->getVar('lid'));
-
- $ingnore_link = "<a href='".WFDOWNLOADS_URL."admin/brokendown.php?op=ignoreBrokenDownloads&lid=".$lid."' alt='" . _AM_WFD_BROKEN_IGNORE_ALT . "' title='" . _AM_WFD_BROKEN_IGNORE_ALT . "'>" . $imagearray['ignore'] . "</a>";
- $edit_link = "<a href='".WFDOWNLOADS_URL."admin/main.php?op=Download&lid=".$lid."' alt='" . _AM_WFD_BROKEN_EDIT_ALT . "' title='" . _AM_WFD_BROKEN_EDIT_ALT . "'> " . $imagearray['editimg'] . " </a>";
- $delete_link = "<a href='".WFDOWNLOADS_URL."admin/brokendown.php?op=delBrokenDownloads&lid=".$lid."' alt='" . _AM_WFD_BROKEN_DELETE_ALT . "' title='" . _AM_WFD_BROKEN_DELETE_ALT . "'>" . $imagearray['deleteimg'] . "</a>";
- $ack_image = ($reports[$i]->getVar('acknowledged')) ? $imagearray['ack_yes'] : $imagearray['ack_no'];
- $ack_link = "<a href='".WFDOWNLOADS_URL."admin/brokendown.php?op=updateNotice&lid=".$lid."&ack=".$reports[$i]->getVar('acknowledged')."' alt='" . _AM_WFD_BROKEN_ACK_ALT . "' title='" . _AM_WFD_BROKEN_ACK_ALT . "'>" . $ack_image . "</a>";
- $con_image = ($reports[$i]->getVar('confirmed')) ? $imagearray['con_yes'] : $imagearray['con_no'];
- $con_link = "<a href='".WFDOWNLOADS_URL."admin/brokendown.php?op=updateNotice&lid=".$lid."&con=".$reports[$i]->getVar('confirmed')."' alt='" . _AM_WFD_BROKEN_CONFIRM_ALT . "' title='" . _AM_WFD_BROKEN_CONFIRM_ALT . "'>" . $con_image . " </a>\n";
-
- echo "
- <tr align = 'center'>\n
- <td class = 'head'>".$reports[$i]->getVar('reportid')."</td>\n
- <td class = 'even' align = 'left'>$download_link</td>\n
- ";
- if ($senderemail == "")
- {
- echo "<td class = 'even'>".$sendername." (".$reports[$i]->getVar('ip').")";
- }
- else
- {
- echo "<td class = 'even'><a href='mailto:".$senderemail."'>".$sendername."</a> (".$reports[$i]->getVar('ip').")";
- }
- if ($submitteremail == '')
- {
- echo "<td class = 'even'>".$submitteruname;
- }
- else
- {
- echo "<td class = 'even'><a href='mailto:".$submitteremail."'>".$submitteruname."</a>";
- }
- echo "
- </td>\n
- <td class='even' align='center'>" . formatTimestamp($reports[$i]->getVar('date'), $xoopsModuleConfig['dateformat']) . "</td>\n
- <td align='center' class = 'even' nowrap>\n
- $ingnore_link $edit_link $delete_link $ack_link $con_link
- </td></tr>\n
- ";
- }
- }
- echo"</table>";
-}
-//xoops_cp_footer();
-include 'admin_footer.php';
\ No newline at end of file
+<?php
+/**
+ * $Id: brokendown.php,v 1.7 2007/09/30 12:39:13 m0nty_ Exp $
+ * Module: WF-Downloads
+ * Version: v2.0.5a
+ * Release Date: 26 july 2004
+ * Author: WF-Sections
+ * Licence: GNU
+ */
+
+include 'admin_header.php';
+
+$op = '';
+
+if (!isset($_POST['op'])) {
+ $op = isset($_GET['op']) ? $_GET['op'] : 'listBrokenDownloads';
+} else {
+ $op = $_POST['op'];
+}
+
+$lid = (isset($_GET['lid'])) ? intval($_GET['lid']) : 0;
+
+switch ($op)
+{
+ case "updateNotice":
+ $report_handler = xoops_getmodulehandler('report');
+ if (isset($_GET['ack'])) {
+ $acknowledged = (isset($_GET['ack']) && $_GET['ack'] == 0) ? 1 : 0;
+ $report_handler->updateAll("acknowledged", $acknowledged, new Criteria("lid", $lid), true);
+ $update_mess = _AM_WFD_BROKEN_NOWACK;
+ }
+
+ if (isset($_GET['con'])) {
+ $confirmed = (isset($_GET['con']) && $_GET['con'] == 0) ? 1 : 0;
+ $report_handler->updateAll("confirmed", $confirmed, new Criteria("lid", $lid), true);
+ $update_mess = _AM_WFD_BROKEN_NOWCON;
+ }
+ redirect_header(WFDOWNLOADS_URL.'admin/brokendown.php?op=default', 1, $update_mess);
+ break;
+
+ case "delBrokenDownloads":
+ $criteria = new Criteria('lid', intval($lid));
+ $report_handler = xoops_getmodulehandler('report');
+ $report = $report_handler->getObjects($criteria);
+ if (isset($report[0])) {
+ $report_handler->delete($report[0], true);
+ }
+ $download_handler = xoops_getmodulehandler('download');
+ $download = $download_handler->get($lid);
+ $download_handler->delete($download, true);
+ redirect_header(WFDOWNLOADS_URL.'admin/brokendown.php?op=default', 1, _AM_WFD_BROKENFILEDELETED);
+ break;
+
+ case "ignoreBrokenDownloads":
+ $criteria = new Criteria('lid', intval($lid));
+ $report_handler = xoops_getmodulehandler('report');
+ $report = $report_handler->getObjects($criteria);
+ if (isset($report[0])) {
+ $report_handler->delete($report[0], true);
+ }
+
+ redirect_header(WFDOWNLOADS_URL.'admin/brokendown.php?op=default', 1, _AM_WFD_BROKEN_FILEIGNORED);
+ break;
+
+ default:
+ case "listBrokenDownloads":
+ case "default":
+
+ global $xoopsDB, $imagearray, $xoopsModule;
+ $report_handler = xoops_getmodulehandler('report');
+ $reports = $report_handler->getObjects();
+ $totalbrokendownloads = count($reports);
+
+ wfdownloads_xoops_cp_header();
+
+
+ //wfdownloads_adminMenu(3, _AM_WFD_BROKEN_FILE);
+
+ echo "
+ <fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFD_BROKEN_REPORTINFO . "</legend>\n
+ <div style='padding: 8px;'>" . _AM_WFD_BROKEN_REPORTSNO . " <b>$totalbrokendownloads</b><div>\n
+ <div style='padding: 8px;'>\n
+ <ul><li>" . $imagearray['ignore'] . " " . _AM_WFD_BROKEN_IGNOREDESC . "</li>\n
+ <li>" . $imagearray['editimg'] . " " . _AM_WFD_BROKEN_EDITDESC . "</li>
+ <li>" . $imagearray['deleteimg'] . " " . _AM_WFD_BROKEN_DELETEDESC . "</li>\n
+ <li>" . $imagearray['ack_yes'] . " " . _AM_WFD_BROKEN_ACKDESC . "</li>
+ <li>" . $imagearray['con_yes'] . " " . _AM_WFD_BROKEN_CONFIRMDESC . "</li>
+ </ul></div>\n
+ </fieldset><br />\n
+
+ <table width='100%' border='0' cellspacing='1' cellpadding = '2' class='outer'>\n
+ <tr align = 'center'>\n
+ <th width = '3%' align = 'center'>" . _AM_WFD_BROKEN_ID . "</th>\n
+ <th width = '35%' align = 'left'>" . _AM_WFD_BROKEN_TITLE . "</th>\n
+ <th>" . _AM_WFD_BROKEN_REPORTER . "</th>\n
+ <th>" . _AM_WFD_BROKEN_FILESUBMITTER . "</th>\n
+ <th>" . _AM_WFD_BROKEN_DATESUBMITTED . "</th>\n
+ <th align='center'>" . _AM_WFD_BROKEN_ACTION . "</th>\n
+ </tr>\n
+ ";
+
+ if ($t...
[truncated message content] |
|
From: <luc...@us...> - 2013-05-24 21:43:04
|
Revision: 11584
http://sourceforge.net/p/xoops/svn/11584
Author: luciorota
Date: 2013-05-24 21:43:01 +0000 (Fri, 24 May 2013)
Log Message:
-----------
code cleanup
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/admin_header2.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokendown.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/cookies.js
XoopsModules/wfdownloads/trunk/wfdownloads/admin/funcs.js
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/ip_log.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirror.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/modifications.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/newdownloads.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/newstory.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/permissions.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/review.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/update.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/votedata.php
XoopsModules/wfdownloads/trunk/wfdownloads/blocks/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/blocks/wfdownloads_top.php
XoopsModules/wfdownloads/trunk/wfdownloads/blocks/wfdownloads_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/index.html
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/class/wfd_lists.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/english/__about.html
XoopsModules/wfdownloads/trunk/wfdownloads/docs/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/footer.php
XoopsModules/wfdownloads/trunk/wfdownloads/header.php
XoopsModules/wfdownloads/trunk/wfdownloads/images/category/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/images/category/thumbs/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/images/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/images/screenshots/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/images/screenshots/thumbs/140x79_imonfire.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/screenshots/thumbs/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/include/comment_functions.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/common.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/include/js/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/include/notification.inc.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/search.inc.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/update.php
XoopsModules/wfdownloads/trunk/wfdownloads/index.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help.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/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/sql/wfdownloads.sql
XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
XoopsModules/wfdownloads/trunk/wfdownloads/thickbox.css
XoopsModules/wfdownloads/trunk/wfdownloads/topten.php
XoopsModules/wfdownloads/trunk/wfdownloads/uploads/index.html
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/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/imageupload.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/index.html
Removed Paths:
-------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/main.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/upload.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/about.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/about.php 2013-05-24 21:34:18 UTC (rev 11583)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/about.php 2013-05-24 21:43:01 UTC (rev 11584)
@@ -1,23 +1,23 @@
<?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.
+ 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.
*/
-
/**
- * @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
- * @since
- * @author XOOPS Development Team
- * @version $Id $
+ * WF-Downloads module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package wfdownload
+ * @since 3.23
+ * @author WF-Sections, Xoops Development Team, luciorota
+ * @version svn:$Id$
*/
-
include_once dirname(__FILE__) . '/admin_header.php';
xoops_cp_header();
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_footer.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_footer.php 2013-05-24 21:34:18 UTC (rev 11583)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_footer.php 2013-05-24 21:43:01 UTC (rev 11584)
@@ -1,23 +1,23 @@
<?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.
+ 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.
*/
-
/**
- * @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
- * @since
- * @author XOOPS Development Team
- * @version $Id $
+ * WF-Downloads module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package wfdownload
+ * @since 3.23
+ * @author WF-Sections, Xoops Development Team, luciorota
+ * @version svn:$Id$
*/
-
echo "<div class='adminfooter'>\n"
." <div style='text-align: center;'>\n"
." <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-05-24 21:34:18 UTC (rev 11583)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-05-24 21:43:01 UTC (rev 11584)
@@ -1,23 +1,23 @@
<?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.
+ 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.
*/
-
/**
- * @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
- * @since
- * @author XOOPS Development Team
- * @version $Id $
+ * WF-Downloads module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package wfdownload
+ * @since 3.23
+ * @author WF-Sections, Xoops Development Team, luciorota
+ * @version svn:$Id$
*/
-
$path = dirname(dirname(dirname(dirname(__FILE__))));
include_once $path . '/mainfile.php';
include_once $path . '/include/cp_functions.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header2.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header2.php 2013-05-24 21:34:18 UTC (rev 11583)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header2.php 2013-05-24 21:43:01 UTC (rev 11584)
@@ -1,13 +1,23 @@
<?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.
+ */
/**
- * $Id: admin_header.php,v 1.5 2007/08/10 20:59:33 m0nty_ Exp $
- * Module: WF-Downloads
- * Version: v2.0.5a
- * Release Date: 26 july 2004
- * Author: WF-Sections
- * Licence: GNU
+ * WF-Downloads module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package wfdownload
+ * @since 3.23
+ * @author WF-Sections, Xoops Development Team, luciorota
+ * @version svn:$Id$
*/
-
include '../../../include/cp_header.php';
include_once(XOOPS_ROOT_PATH . '/modules/wfdownloads/include/functions.php');
include_once(XOOPS_ROOT_PATH . '/modules/wfdownloads/include/common.php');
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokendown.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokendown.php 2013-05-24 21:34:18 UTC (rev 11583)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokendown.php 2013-05-24 21:43:01 UTC (rev 11584)
@@ -1,13 +1,23 @@
<?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.
+ */
/**
- * $Id: brokendown.php,v 1.7 2007/09/30 12:39:13 m0nty_ Exp $
- * Module: WF-Downloads
- * Version: v2.0.5a
- * Release Date: 26 july 2004
- * Author: WF-Sections
- * Licence: GNU
+ * WF-Downloads module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package wfdownload
+ * @since 3.23
+ * @author WF-Sections, Xoops Development Team, luciorota
+ * @version svn:$Id$
*/
-
include 'admin_header.php';
$op = '';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php 2013-05-24 21:34:18 UTC (rev 11583)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php 2013-05-24 21:43:01 UTC (rev 11584)
@@ -1,11 +1,22 @@
<?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.
+ */
/**
- * $Id: category.php,v 1.11 2007/09/30 12:39:13 m0nty_ Exp $
- * Module: WF-Downloads
- * Version: v2.0.5a
- * Release Date: 26 july 2004
- * Author: WF-Sections
- * Licence: GNU
+ * WF-Downloads module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package wfdownload
+ * @since 3.23
+ * @author WF-Sections, Xoops Development Team, luciorota
+ * @version svn:$Id$
*/
include 'admin_header.php';
include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
@@ -100,7 +111,7 @@
global $xoopsDB, $myts, $_FILES, $xoopsModuleConfig;
$cid = (isset($_POST["cid"])) ? intval($_POST["cid"]) : 0;
- $groups = isset($_POST['groups']) ? $_POST['groups'] : array();
+ $down_groups = isset($_POST['groups']) ? $_POST['groups'] : array();
// hack upload - start
$up_groups = isset($_POST['up_groups']) ? $_POST['up_groups'] : array();
// hack upload - end
@@ -160,7 +171,7 @@
if ($cid == 0) {
$newid = intval($category->getVar('cid'));
}
- wfd_save_Permissions($groups, $newid, 'WFDownCatPerm');
+ wfd_save_Permissions($down_groups, $newid, 'WFDownCatPerm');
// hack upload - start
wfd_save_Permissions($up_groups, $newid, 'WFUpCatPerm');
// hack upload - end
@@ -178,7 +189,7 @@
else
{
$database_mess = _AM_WFD_CCATEGORY_MODIFIED;
- wfd_save_Permissions($groups, $cid, 'WFDownCatPerm');
+ wfd_save_Permissions($down_groups, $cid, 'WFDownCatPerm');
// hack upload - start
wfd_save_Permissions($up_groups, $cid, 'WFUpCatPerm');
// hack upload - end
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/cookies.js
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/cookies.js 2013-05-24 21:34:18 UTC (rev 11583)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/cookies.js 2013-05-24 21:43:01 UTC (rev 11584)
@@ -1,4 +1,24 @@
+/*
+ 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.
+ */
/**
+ * WF-Downloads module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package wfdownload
+ * @since 3.23
+ * @author WF-Sections, Xoops Development Team, luciorota
+ * @version svn:$Id$
+ */
+
+/**
* Read the JavaScript cookies tutorial at:
* http://www.netspade.com/articles/javascript/cookies.xml
*/
Added: XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php 2013-05-24 21:43:01 UTC (rev 11584)
@@ -0,0 +1,692 @@
+<?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.
+ */
+/**
+ * WF-Downloads module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package wfdownload
+ * @since 3.23
+ * @author WF-Sections, Xoops Development Team, luciorota
+ * @version svn:$Id$
+ */
+include 'admin_header.php';
+include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
+include_once WFDOWNLOADS_ROOT_PATH.'class/wfd_lists.php';
+include_once XOOPS_ROOT_PATH . '/class/tree.php';
+include_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
+
+function Download()
+{
+ $download_handler = xoops_getmodulehandler('download');
+ $category_handler = xoops_getmodulehandler('category');
+
+ $lid = wfdownloads_CleanVars($_REQUEST, 'lid', 0, 'int');
+
+ $numrows = $category_handler->getCount();
+ if ($numrows) {
+ wfdownloads_xoops_cp_header();
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation('download.php');
+
+ $adminMenu = new ModuleAdmin();
+ $adminMenu->addItemButton(_MI_WFD_BINDEX, 'download.php?op=list', 'list');
+ $adminMenu->addItemButton(_AM_WFD_FFS_DOWNLOADTITLE, 'download.php?op=Download', 'add');
+ echo $adminMenu->renderButton();
+
+ // allowed mimetypes list
+ echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFD_FILE_ALLOWEDAMIME . "</legend>\n";
+ echo "<div style='padding: 8px;'>\n";
+ $mime_handler = xoops_getmodulehandler('mimetype');
+ $criteria = new Criteria("mime_admin", 1);
+ $mimetypes = $mime_handler->getList($criteria);
+ $allowmimetypes = implode(' | ', $mimetypes);
+ echo $allowmimetypes;
+ echo "</div>\n";
+ echo "</fieldset><br />\n";
+
+ if ($lid) {
+ $download = $download_handler->get($lid);
+ $title = _AM_WFD_FILE_MODIFYFILE;
+ // added - start - March 4 2006 - jpc
+ $cid = intval($download->getVar('cid'));
+ $category = $category_handler->get($cid);
+ // added - end - March 4 2006 - jpc
+ // changed - start - April 22 2006 - jwe
+ //$title = _AM_WFD_FILE_MODIFYFILE;
+ $title = preg_replace("/{category}/", $category->getVar('title'), _AM_WFD_FFS_EDITDOWNLOADTITLE);
+ // changed - end - April 22 2006 - jwe
+ } else {
+ $download = $download_handler->create();
+ $title = _AM_WFD_FILE_CREATENEWFILE;
+ // added - start - March 4 2006 - jpc
+ $cid = (!empty($_POST['cid'])) ? intval($_POST['cid']) : 0 ;
+ $download->setVar('cid', $cid);
+ $category = $category_handler->get($cid);
+ // added - end - March 4 2006 - jpc
+ // changed - start - April 22 2006 - jwe
+ //$title = _AM_WFD_FILE_CREATENEWFILE;
+ $title = preg_replace("/{category}/", $category->getVar('title'), _AM_WFD_FFS_DOWNLOADTITLE);
+ // changed - end - April 22 2006 - jwe
+ }
+
+ // changed - start - March 4 2006 - jpc
+ if ((isset($_POST['submit_category']) && !empty($_POST['submit_category'])) || $lid) {
+
+ $fid = $category->getVar('formulize_fid');
+ $customArray = array();
+ if($fid) {
+ global $xoopsUser;
+ include_once XOOPS_ROOT_PATH . "/modules/formulize/include/formdisplay.php";
+ include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
+
+ $customArray['fid'] = $fid;
+ $customArray['formulize_mgr'] =& xoops_getmodulehandler('elements', 'formulize');
+ $customArray['groups'] = $xoopsUser ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
+ $customArray['prevEntry'] = getEntryValues($download->getVar('formulize_idreq'), $customArray['formulize_mgr'], $customArray['groups'], $fid);
+ $customArray['entry'] = $download->getVar('formulize_idreq');
+ $customArray['go_back'] = "";
+ $customArray['parentLinks'] = "";
+
+ $owner = getEntryOwner($entry);
+ $member_handler =& xoops_gethandler('member');
+ $owner_groups =& $member_handler->getGroupsByUser($owner, FALSE);
+
+ $customArray['owner_groups'] = $owner_groups;
+ }
+ $sform = $download->getAdminForm($title, $customArray);
+ } elseif(file_exists(XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php")) {
+ $sform = $download->getCategoryForm();
+ } else {
+ $sform = $download->getAdminForm($title);
+ }
+ $sform->display();
+ // changed - end - March 4 2006 - jpc
+ } else {
+ redirect_header(WFDOWNLOADS_URL.'admin/category.php?', 1, _AM_WFD_CCATEGORY_NOEXISTS);
+ exit();
+ }
+
+ if ($lid) {
+ global $imagearray;
+ // Vote data
+ $rating_handler = xoops_getmodulehandler('rating');
+ $totalvotes = $rating_handler->getCount();
+
+ $reg_criteria = new CriteriaCompo(new Criteria('lid', $lid));
+ $reg_criteria->add(new Criteria("ratinguser", 0, ">"));
+ $votesreg = $rating_handler->getCount($reg_criteria);
+ $reg_criteria->setSort("ratingtimestamp");
+ $reg_criteria->setOrder("DESC");
+ $regvotes = $rating_handler->getObjects($reg_criteria);
+
+ $anon_criteria = new CriteriaCompo(new Criteria('lid', $lid));
+ $anon_criteria->add(new Criteria("ratinguser", 0, "="));
+ $votesanon = $rating_handler->getCount($anon_criteria);
+ $anon_criteria->setSort("ratingtimestamp");
+ $anon_criteria->setOrder("DESC");
+
+ echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFD_VOTE_RATINGINFOMATION . "</legend>\n";
+ echo "<div style='padding: 8px;'><b>" . _AM_WFD_VOTE_TOTALVOTES . "</b>" . $totalvotes . "<br /><br />\n";
+
+ printf(_AM_WFD_VOTE_REGUSERVOTES, $votesreg);
+
+ echo "<br />";
+
+ printf(_AM_WFD_VOTE_ANONUSERVOTES, $votesanon);
+
+ echo "
+ </div>\n
+ <table width='100%' cellspacing='1' cellpadding='2' class='outer'>\n
+ <tr>\n
+ <th align='center'>" . _AM_WFD_VOTE_USER . "</td>\n
+ <th align='center'>" . _AM_WFD_VOTE_IP . "</td>\n
+ <th align='center'>" . _AM_WFD_VOTE_RATING . "</td>\n
+ <th align='center'>" . _AM_WFD_VOTE_USERAVG . "</td>\n
+ <th align='center'>" . _AM_WFD_VOTE_TOTALRATE . "</td>\n
+ <th align='center'>" . _AM_WFD_VOTE_DATE . "</td>\n
+ <th align='center'>" . _AM_WFD_MINDEX_ACTION . "</td>\n
+ </tr>\n
+ ";
+
+ if ($votesreg == 0) {
+ echo "<tr><td align='center' colspan='7' class='even'><b>" . _AM_WFD_VOTE_NOREGVOTES . "</b></td></tr>";
+ } else {
+ foreach (array_keys($regvotes) as $i) {
+ $uids[] = $regvotes[$i]->getVar('ratinguser');
+ }
+
+ $criteria = new Criteria("ratinguser", "(".implode(',', $uids).")", "IN");
+ $criteria->setGroupby("ratinguser");
+ $userratings = $rating_handler->getUserAverage($criteria);
+
+
+ foreach (array_keys($regvotes) as $i) {
+ $formatted_date = formatTimestamp($regvotes[$i]->getVar('ratingtimestamp'), $xoopsModuleConfig['dateformat']);
+ $useravgrating = isset($userratings[$regvotes[$i]->getVar('ratinguser')]) ? $userratings[$regvotes[$i]->getVar('ratinguser')]["avg"] : 0;
+ $uservotes = isset($userratings[$regvotes[$i]->getVar('ratinguser')]) ? $userratings[$regvotes[$i]->getVar('ratinguser')]["count"] : 0;
+ $ratinguname = XoopsUser :: getUnameFromId($regvotes[$i]->getVar('ratinguser'));
+
+ echo "
+ <tr><td align='center' class='head'>$ratinguname</td>\n
+ <td align='center' class='even'>" . $regvotes[$i]->getVar('ratinghostname') . "</th>\n
+ <td align='center' class='even'>" . $regvotes[$i]->getVar('rating') . "</th>\n
+ <td align='center' class='even'>$useravgrating</th>\n
+ <td align='center' class='even'>$uservotes</th>\n
+ <td align='center' class='even'>$formatted_date</th>\n
+ <td align='center' class='even'>\n
+ <a href='" . WFDOWNLOADS_URL . "admin/download.php?op=delVote&lid=" . $lid . "&rid=" . $regvotes[$i]->getVar('ratingid') . "'>" . $imagearray['deleteimg'] . "</a>\n
+ </th></tr>\n
+ ";
+ }
+ }
+ echo "
+ </table>\n
+ <br />\n
+ <table width='100%' cellspacing='1' cellpadding='2' class='outer'>\n
+ <tr>\n
+ <th align='center'>" . _AM_WFD_VOTE_USER . "</td>\n
+ <th align='center'>" . _AM_WFD_VOTE_IP . "</td>\n
+ <th align='center'>" . _AM_WFD_VOTE_RATING . "</td>\n
+ <th align='center'>" . _AM_WFD_VOTE_USERAVG . "</td>\n
+ <th align='center'>" . _AM_WFD_VOTE_TOTALRATE . "</td>\n
+ <th align='center'>" . _AM_WFD_VOTE_DATE . "</td>\n
+ <th align='center'>" . _AM_WFD_MINDEX_ACTION . "</td>\n
+ </tr>\n
+ ";
+ if ($votesanon == 0) {
+ echo "<tr><td colspan='7' align='center' class='even'><b>" . _AM_WFD_VOTE_NOUNREGVOTES . "</b></td></tr>";
+ } else {
+ $criteria = new Criteria("ratinguser", 0);
+ $userratings = $rating_handler->getUserAverage($criteria);
+ $anonvotes = $rating_handler->getObjects($anon_criteria);
+
+ foreach (array_keys($anonvotes) as $i) {
+ $formatted_date = formatTimestamp($anonvotes[$i]->getVar('ratingtimestamp'), $xoopsModuleConfig['dateformat']);
+ $useravgrating = isset($userratings['avg']) ? $userratings["avg"] : 0;...
[truncated message content] |
|
From: <luc...@us...> - 2013-05-28 18:51:14
|
Revision: 11601
http://sourceforge.net/p/xoops/svn/11601
Author: luciorota
Date: 2013-05-28 18:51:10 +0000 (Tue, 28 May 2013)
Log Message:
-----------
admin side: categories manager improved using templates
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/category.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/mimetype.php
XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Added Paths:
-----------
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_categorylist.html
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-05-28 16:21:46 UTC (rev 11600)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-05-28 18:51:10 UTC (rev 11601)
@@ -71,3 +71,8 @@
} else {
redirect_header("../../../admin.php", 5, _AM_BIRTHDAY_MODULEADMIN_MISSING, false);
}
+
+if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
+ include_once(XOOPS_ROOT_PATH . "/class/template.php");
+ $xoopsTpl = new XoopsTpl();
+}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php 2013-05-28 16:21:46 UTC (rev 11600)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php 2013-05-28 18:51:10 UTC (rev 11601)
@@ -22,38 +22,35 @@
include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
include_once XOOPS_ROOT_PATH . '/class/tree.php';
-$op = '';
-
function createcat($cid = 0)
{
- include_once WFDOWNLOADS_ROOT_PATH.'class/wfd_lists.php';
+ include_once WFDOWNLOADS_ROOT_PATH . 'class/wfd_lists.php';
include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
$category_handler = xoops_getmodulehandler('category');
$heading = _AM_WFD_CCATEGORY_CREATENEW;
-
- if ($cid > 0)
- {
+ if ($cid > 0) {
$category = $category_handler->get($cid);
$heading = _AM_WFD_CCATEGORY_MODIFY;
} else {
$category = $category_handler->create();
}
-
$sform = $category->getForm($heading);
$sform -> display();
}
-$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : 'main';
-switch ($op)
-{
- case "move":
- if (!isset($_POST['ok']))
- {
- $cid = (isset($_POST['cid'])) ? intval($_POST['cid']) : intval($_GET['cid']);
+$op = wfdownloads_CleanVars($_REQUEST, 'op', 'categories.list', 'string');
+
+switch ($op) {
+ case "category.move" :
+ case "move" :
+ $ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
+ if ($ok == false) {
+ $cid = wfdownloads_CleanVars($_REQUEST, 'cid', 0, 'int');
+
wfdownloads_xoops_cp_header();
//wfdownloads_adminMenu(2, _AM_WFD_MCATEGORY);
@@ -64,60 +61,47 @@
$categories = $category_handler->getObjects();
$mytree = new XoopsObjectTree($categories, "cid", "pid");
$sform->addElement(new XoopsFormLabel(_AM_WFD_BMODIFY, $mytree->makeSelBox('target', 'title')));
-
- $create_tray = new XoopsFormElementTray('', '');
- $create_tray -> addElement(new XoopsFormHidden('source', $cid));
- $create_tray -> addElement(new XoopsFormHidden('ok', 1));
- $create_tray -> addElement(new XoopsFormHidden('op', 'move'));
- $butt_save = new XoopsFormButton('', '', _AM_WFD_BMOVE, 'submit');
- $butt_save -> setExtra('onclick="this.form.elements.op.value=\'move\'"');
- $create_tray -> addElement($butt_save);
- $butt_cancel = new XoopsFormButton('', '', _AM_WFD_BCANCEL, 'submit');
- $butt_cancel -> setExtra('onclick="this.form.elements.op.value=\'cancel\'"');
- $create_tray -> addElement($butt_cancel);
+ $create_tray = new XoopsFormElementTray('', '');
+ $create_tray -> addElement(new XoopsFormHidden('source', $cid));
+ $create_tray -> addElement(new XoopsFormHidden('ok', true));
+ $create_tray -> addElement(new XoopsFormHidden('op', 'category.move'));
+ $butt_save = new XoopsFormButton('', '', _AM_WFD_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 -> setExtra('onclick="this.form.elements.op.value=\'cancel\'"');
+ $create_tray -> addElement($butt_cancel);
$sform -> addElement($create_tray);
$sform -> display();
xoops_cp_footer();
- }
- else
- {
- global $xoopsDB;
-
- $source = intval($_POST['source']);
- $target = intval($_POST['target']);
- if ($target == $source)
- {
- redirect_header(WFDOWNLOADS_URL.'admin/category.php?op=move&ok=0&cid=$source', 5, _AM_WFD_CCATEGORY_MODIFY_FAILED);
+ } else {
+ $source = wfdownloads_CleanVars($_POST, 'source', 0, 'int');
+ $target = wfdownloads_CleanVars($_POST, 'target', 0, 'int');
+ if ($target == $source) {
+ redirect_header(WFDOWNLOADS_URL . "admin/category.php?op=category.move&ok=0&cid={$source}", 5, _AM_WFD_CCATEGORY_MODIFY_FAILED);
}
-
- if (!$target)
- {
- redirect_header(WFDOWNLOADS_URL.'admin/category.php?op=move&ok=0&cid=$source', 5, _AM_WFD_CCATEGORY_MODIFY_FAILEDT);
+ if (!$target) {
+ redirect_header(WFDOWNLOADS_URL . "admin/category.php?op=category.move&ok=0&cid={$source}", 5, _AM_WFD_CCATEGORY_MODIFY_FAILEDT);
}
$download_handler = xoops_getmodulehandler('download');
- $result = $download_handler->updateAll("cid", $target, new Criteria("cid", intval($source)), true);
- if (!$result)
- {
+ $result = $download_handler->updateAll("cid", $target, new Criteria("cid", $source), true);
+ if (!$result) {
$error = _AM_WFD_DBERROR;
trigger_error($error, E_USER_ERROR);
}
- redirect_header(WFDOWNLOADS_URL.'admin/category.php?op=default', 1, _AM_WFD_CCATEGORY_MODIFY_MOVED);
+ redirect_header(WFDOWNLOADS_URL . 'admin/category.php', 1, _AM_WFD_CCATEGORY_MODIFY_MOVED);
exit();
}
break;
- case "addCat":
-
- global $xoopsDB, $myts, $_FILES, $xoopsModuleConfig;
-
- $cid = (isset($_POST["cid"])) ? intval($_POST["cid"]) : 0;
+ case "category.save" :
+ case "addCat" :
+ $cid = wfdownloads_CleanVars($_POST, 'cid', 0, 'int');
$down_groups = isset($_POST['groups']) ? $_POST['groups'] : array();
-// hack upload - start
$up_groups = isset($_POST['up_groups']) ? $_POST['up_groups'] : array();
-// hack upload - end
- $pid = (isset($_POST["pid"])) ? intval($_POST["pid"]) : 0;
- $weight = (isset($_POST["weight"]) && $_POST["weight"] > 0) ? intval($_POST["weight"]) : 0;
- $spotlighthis = (isset($_POST["lid"])) ? intval($_POST["lid"]) : 0;
+ $pid = (isset($_POST["pid"])) ? (int)$_POST["pid"] : 0;
+ $weight = (isset($_POST["weight"]) && $_POST["weight"] > 0) ? (int)$_POST["weight"] : 0;
+ $spotlighthis = (isset($_POST["lid"])) ? (int)$_POST["lid"] : 0;
$spotlighttop = (isset($_POST["spotlighttop"]) && ($_POST["spotlighttop"] == 1)) ? 1 : 0;
$imgurl = ($_POST["imgurl"] && $_POST["imgurl"] != "blank.png") ? $myts -> addslashes($_POST["imgurl"]) : "";
@@ -128,22 +112,18 @@
$dobr = isset($_POST['dobr']);
$category_handler = xoops_getmodulehandler('category');
- if (!$cid)
- {
+ if (!$cid) {
$category = $category_handler->create();
- }
- else {
+ } else {
$category = $category_handler->get($cid);
$childcats = $category_handler->getChildCats($category);
if ($pid == $cid || in_array($pid, array_keys($childcats))) {
$category->setErrors(_AM_WFD_CCATEGORY_CHILDASPARENT);
}
}
-
// added - start - March 4 2006 - jpc
- $formulize_fid = (isset($_POST["formulize_fid"])) ? intval($_POST["formulize_fid"]) : 0;
+ $formulize_fid = (isset($_POST["formulize_fid"])) ? (int)$_POST["formulize_fid"] : 0;
// added - end - March 4 2006 - jpc
-
$category->setVar('title', $_POST["title"]);
$category->setVar('description', $_POST["description"]);
$category->setVar('summary', $_POST["summary"]);
@@ -157,75 +137,61 @@
$category->setVar('spotlighthis', $spotlighthis);
$category->setVar('spotlighttop', $spotlighttop);
$category->setVar('imgurl', $imgurl);
-
// added - start - March 4 2006 - jpc
$category->setVar('formulize_fid', $formulize_fid);
// added - end - March 4 2006 - jpc
-
$result = $category_handler->insert($category);
if (!$result) {
echo $category->getHtmlErrors();
}
- if (!$cid)
- {
+ if (!$cid) {
if ($cid == 0) {
- $newid = intval($category->getVar('cid'));
+ $newid = (int)$category->getVar('cid');
}
wfd_save_Permissions($down_groups, $newid, 'WFDownCatPerm');
-// hack upload - start
wfd_save_Permissions($up_groups, $newid, 'WFUpCatPerm');
-// hack upload - end
/**
* Notify of new category
*/
- global $xoopsModule;
$tags = array();
$tags['CATEGORY_NAME'] = $_POST['title'];
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL.'viewcat.php?cid=' . $newid;
+ $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;
- }
- else
- {
+ } else {
$database_mess = _AM_WFD_CCATEGORY_MODIFIED;
wfd_save_Permissions($down_groups, $cid, 'WFDownCatPerm');
-// hack upload - start
wfd_save_Permissions($up_groups, $cid, 'WFUpCatPerm');
-// hack upload - end
}
- redirect_header(WFDOWNLOADS_URL.'admin/category.php', 1, $database_mess);
+ redirect_header(WFDOWNLOADS_URL . 'admin/category.php', 1, $database_mess);
break;
- case "del":
-
- global $xoopsDB, $xoopsModule;
-
- $cid = (isset($_POST['cid']) && is_numeric($_POST['cid'])) ? intval($_POST['cid']) : intval($_GET['cid']);
- $ok = (isset($_POST['ok']) && $_POST['ok'] == 1) ? intval($_POST['ok']) : 0;
+ case "category.delete" :
+ case "del" :
+ $cid = wfdownloads_CleanVars($_REQUEST, 'cid', 0, 'int');
+ $ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
$category_handler = xoops_getmodulehandler('category');
$categories = $category_handler->getObjects();
$mytree = new XoopsObjectTree($categories, "cid", "pid");
- if ($ok == 1)
- {
+ if ($ok == true) {
// get all subcategories under the specified category
$arr = $mytree -> getAllChild($cid);
- foreach($arr as $child)
- {
+ foreach($arr as $child) {
// get all category ids
$cids[] = $child->getVar('cid');
}
$cids[] = $cid;
- $criteria = new Criteria("cid", "(".implode(',', $cids).")", "IN");
+ $criteria = new Criteria("cid", "(" . implode(',', $cids) . ")", "IN");
$download_handler = xoops_getmodulehandler('download');
//get list of downloads in these subcategories
$downloads = $download_handler->getList($criteria);
- $download_criteria = new Criteria("lid", "(".implode(',', array_keys($downloads)).")", "IN");
+ $download_criteria = new Criteria("lid", "(" . implode(',', array_keys($downloads)) . ")", "IN");
$rating_handler = xoops_getmodulehandler('rating');
$report_handler = xoops_getmodulehandler('report');
@@ -235,7 +201,7 @@
$report_handler->deleteAll($download_criteria);
$download_handler->deleteAll($download_criteria);
foreach (array_keys($downloads) as $lid) {
- xoops_comment_delete($xoopsModule->getVar('mid'), intval($lid));
+ xoops_comment_delete($xoopsModule->getVar('mid'), (int)$lid);
}
// all downloads for each category is deleted, now delete the category data
@@ -243,68 +209,77 @@
$error = _AM_WFD_DBERROR;
foreach ($cids as $cid) {
- xoops_groupperm_deletebymoditem (intval($xoopsModule->getVar('mid')), 'WFDownCatPerm', $cid);
-// hack upload - start
+ xoops_groupperm_deletebymoditem ((int)$xoopsModule->getVar('mid'), 'WFDownCatPerm', $cid);
xoops_groupperm_deletebymoditem ($xoopsModule -> getVar('mid'), 'WFUpCatPerm', $cid);
-// hack upload - end
}
- redirect_header(WFDOWNLOADS_URL.'admin/category.php', 1, _AM_WFD_CCATEGORY_DELETED);
+ redirect_header(WFDOWNLOADS_URL . 'admin/category.php', 1, _AM_WFD_CCATEGORY_DELETED);
exit();
- }
- else
- {
+ } else {
wfdownloads_xoops_cp_header();
- xoops_confirm(array('op' => 'del', 'cid' => $cid, 'ok' => 1), 'category.php', _AM_WFD_CCATEGORY_AREUSURE);
+ xoops_confirm(array('op' => 'category.delete', 'cid' => $cid, 'ok' => true), 'category.php', _AM_WFD_CCATEGORY_AREUSURE);
xoops_cp_footer();
}
break;
+ case "category.add" :
+ case "category.edit" :
case "modCat":
- $cid = (isset($_POST['cid'])) ? intval($_POST['cid']) : 0;
+ $cid = wfdownloads_CleanVars($_REQUEST, 'cid', 0, 'int');
wfdownloads_xoops_cp_header();
- //wfdownloads_adminMenu(2, _AM_WFD_MCATEGORY);
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation('category.php');
+ $adminMenu = new ModuleAdmin();
+ $adminMenu->addItemButton(_MI_WFD_BINDEX, 'category.php?op=categories.list', 'list');
+ $adminMenu->addItemButton(_AM_WFD_CCATEGORY_CREATENEW, 'category.php?op=category.add', 'add');
+ echo $adminMenu->renderButton();
+
createcat($cid);
xoops_cp_footer();
break;
- case 'main':
- default:
-
+ case 'categories.list' :
+ case 'main' :
+ default :
wfdownloads_xoops_cp_header();
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation('category.php');
- //wfdownloads_adminMenu(2, _AM_WFD_MCATEGORY);
+ $adminMenu = new ModuleAdmin();
+ $adminMenu->addItemButton(_MI_WFD_BINDEX, 'category.php?op=categories.list', 'list');
+ $adminMenu->addItemButton(_AM_WFD_CCATEGORY_CREATENEW, 'category.php?op=category.add', 'add');
+ echo $adminMenu->renderButton();
- include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
$totalcats = wfd_totalcategory();
-
- if ($totalcats > 0)
- {
- $sform = new XoopsThemeForm(_AM_WFD_CCATEGORY_MODIFY, "category", $_SERVER['REQUEST_URI']);
- $category_handler = xoops_getmodulehandler('category');
- $categories = $category_handler->getObjects();
- $mytree = new XoopsObjectTree($categories, "cid", "pid");
- $sform->addElement(new XoopsFormLabel(_AM_WFD_CCATEGORY_MODIFY_TITLE, $mytree->makeSelBox('cid', 'title')));
-
- $dup_tray = new XoopsFormElementTray('', '');
- $dup_tray -> addElement(new XoopsFormHidden('op', 'modCat'));
- $butt_dup = new XoopsFormButton('', '', _AM_WFD_BMODIFY, 'submit');
- $butt_dup -> setExtra('onclick="this.form.elements.op.value=\'modCat\'"');
- $dup_tray -> addElement($butt_dup);
- $butt_move = new XoopsFormButton('', '', _AM_WFD_BMOVE, 'submit');
- $butt_move -> setExtra('onclick="this.form.elements.op.value=\'move\'"');
- $dup_tray -> addElement($butt_move);
- $butt_dupct = new XoopsFormButton('', '', _AM_WFD_BDELETE, 'submit');
- $butt_dupct -> setExtra('onclick="this.form.elements.op.value=\'del\'"');
- $dup_tray -> addElement($butt_dupct);
- $sform -> addElement($dup_tray);
- $sform -> display();
+ if ($totalcats > 0) {
+ $sorted_categories = wfd_sortCategories();
+ $GLOBALS['xoopsTpl']->assign('sorted_categories', $sorted_categories);
+ $GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML() );
+ $GLOBALS['xoopsTpl']->display("db:wfdownloads_admin_categorylist.html");
+ } else {
+ redirect_header('category.php?op=category.add', 1, _AM_WFD_CCATEGORY_NOEXISTS);
}
-
- createcat(0);
-//xoops_cp_footer();
-include 'admin_footer.php';
+ include 'admin_footer.php';
break;
+
+case 'categories.reorder' :
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
+ }
+ $category_handler = xoops_getmodulehandler('category', 'wfdownloads');
+ if (isset($_POST['category_ids']) && count($_POST['category_ids']) > 0) {
+ $new_weights = $_POST['new_weights'];
+ $ids = array();
+ foreach ($new_weights as $cid => $new_weight ) {
+ $category = $category_handler->get($cid);
+ $category->setVar('weight', $new_weight);
+ if (!$category_handler->insert($category)) {
+ redirect_header('category.php', 3, $category->getErrors());
+ }
+ unset($category);
+ }
+ redirect_header('category.php?op=categories.list', 1, _AM_WFD_CATEGORIES_REORDERED);
+ exit();
+ }
+ break;
}
\ No newline at end of file
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php 2013-05-28 16:21:46 UTC (rev 11600)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php 2013-05-28 18:51:10 UTC (rev 11601)
@@ -27,6 +27,7 @@
function Download()
{
+ global $xoopsUser, $imagearray;
$download_handler = xoops_getmodulehandler('download');
$category_handler = xoops_getmodulehandler('category');
@@ -39,15 +40,15 @@
echo $indexAdmin->addNavigation('download.php');
$adminMenu = new ModuleAdmin();
- $adminMenu->addItemButton(_MI_WFD_BINDEX, 'download.php?op=list', 'list');
- $adminMenu->addItemButton(_AM_WFD_FFS_DOWNLOADTITLE, 'download.php?op=Download', 'add');
+ $adminMenu->addItemButton(_MI_WFD_BINDEX, 'download.php?op=downloads.list', 'list');
+ $adminMenu->addItemButton(_AM_WFD_FFS_DOWNLOADTITLE, 'download.php?op=download.add', 'add');
echo $adminMenu->renderButton();
// allowed mimetypes list
echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFD_FILE_ALLOWEDAMIME . "</legend>\n";
echo "<div style='padding: 8px;'>\n";
$mime_handler = xoops_getmodulehandler('mimetype');
- $criteria = new Criteria("mime_admin", 1);
+ $criteria = new Criteria("mime_admin", true);
$mimetypes = $mime_handler->getList($criteria);
$allowmimetypes = implode(' | ', $mimetypes);
echo $allowmimetypes;
@@ -62,7 +63,7 @@
$category = $category_handler->get($cid);
// added - end - March 4 2006 - jpc
// changed - start - April 22 2006 - jwe
- //$title = _AM_WFD_FILE_MODIFYFILE;
+ //$title = _AM_WFD_FILE_MODIFYFILE;
$title = preg_replace("/{category}/", $category->getVar('title'), _AM_WFD_FFS_EDITDOWNLOADTITLE);
// changed - end - April 22 2006 - jwe
} else {
@@ -85,7 +86,6 @@
$fid = $category->getVar('formulize_fid');
$customArray = array();
if($fid) {
- global $xoopsUser;
include_once XOOPS_ROOT_PATH . "/modules/formulize/include/formdisplay.php";
include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
@@ -112,13 +112,12 @@
$sform->display();
// changed - end - March 4 2006 - jpc
} else {
- redirect_header(WFDOWNLOADS_URL.'admin/category.php?', 1, _AM_WFD_CCATEGORY_NOEXISTS);
+ redirect_header(WFDOWNLOADS_URL . 'admin/category.php?', 1, _AM_WFD_CCATEGORY_NOEXISTS);
exit();
}
+ // Vote data list/manager
if ($lid) {
- global $imagearray;
- // Vote data
$rating_handler = xoops_getmodulehandler('rating');
$totalvotes = $rating_handler->getCount();
@@ -136,7 +135,7 @@
$anon_criteria->setOrder("DESC");
echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFD_VOTE_RATINGINFOMATION . "</legend>\n";
- echo "<div style='padding: 8px;'><b>" . _AM_WFD_VOTE_TOTALVOTES . "</b>" . $totalvotes . "<br /><br />\n";
+ echo "<div style='padding: 8px;'><b>" . _AM_WFD_VOTE_TOTALVOTES . "</b>{$totalvotes}<br /><br />\n";
printf(_AM_WFD_VOTE_REGUSERVOTES, $votesreg);
@@ -148,18 +147,18 @@
</div>\n
<table width='100%' cellspacing='1' cellpadding='2' class='outer'>\n
<tr>\n
- <th align='center'>" . _AM_WFD_VOTE_USER . "</td>\n
- <th align='center'>" . _AM_WFD_VOTE_IP . "</td>\n
- <th align='center'>" . _AM_WFD_VOTE_RATING . "</td>\n
- <th align='center'>" . _AM_WFD_VOTE_USERAVG . "</td>\n
- <th align='center'>" . _AM_WFD_VOTE_TOTALRATE . "</td>\n
- <th align='center'>" . _AM_WFD_VOTE_DATE . "</td>\n
- <th align='center'>" . _AM_WFD_MINDEX_ACTION . "</td>\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
</tr>\n
";
if ($votesreg == 0) {
- echo "<tr><td align='center' colspan='7' class='even'><b>" . _AM_WFD_VOTE_NOREGVOTES . "</b></td></tr>";
+ echo "<tr><td colspan='7' class='even'><b>" . _AM_WFD_VOTE_NOREGVOTES . "</b></td></tr>";
} else {
foreach (array_keys($regvotes) as $i) {
$uids[] = $regvotes[$i]->getVar('ratinguser');
@@ -177,14 +176,14 @@
$ratinguname = XoopsUser :: getUnameFromId($regvotes[$i]->getVar('ratinguser'));
echo "
- <tr><td align='center' class='head'>$ratinguname</td>\n
- <td align='center' class='even'>" . $regvotes[$i]->getVar('ratinghostname') . "</th>\n
- <td align='center' class='even'>" . $regvotes[$i]->getVar('rating') . "</th>\n
- <td align='center' class='even'>$useravgrating</th>\n
- <td align='center' class='even'>$uservotes</th>\n
- <td align='center' class='even'>$formatted_date</th>\n
- <td align='center' class='even'>\n
- <a href='" . WFDOWNLOADS_URL . "admin/download.php?op=delVote&lid=" . $lid . "&rid=" . $regvotes[$i]->getVar('ratingid') . "'>" . $imagearray['deleteimg'] . "</a>\n
+ <tr><td class='head'>$ratinguname</td>\n
+ <td class='even'>" . $regvotes[$i]->getVar('ratinghostname') . "</th>\n
+ <td class='even'>" . $regvotes[$i]->getVar('rating') . "</th>\n
+ <td class='even'>$useravgrating</th>\n
+ <td class='even'>$uservotes</th>\n
+ <td class='even'>$formatted_date</th>\n
+ <td class='even'>\n
+ <a href='" . WFDOWNLOADS_URL . "admin/download.php?op=vote.delete&lid={$lid}&rid=" . $regvotes[$i]->getVar('ratingid') . "'>" . $imagearray['deleteimg'] . "</a>\n
</th></tr>\n
";
}
@@ -194,17 +193,17 @@
<br />\n
<table width='100%' cellspacing='1' cellpadding='2' class='outer'>\n
<tr>\n
- <th align='center'>" . _AM_WFD_VOTE_USER . "</td>\n
- <th align='center'>" . _AM_WFD_VOTE_IP . "</td>\n
- <th align='center'>" . _AM_WFD_VOTE_RATING . "</td>\n
- <th align='center'>" . _AM_WFD_VOTE_USERAVG . "</td>\n
- <th align='center'>" . _AM_WFD_VOTE_TOTALRATE . "</td>\n
- <th align='center'>" . _AM_WFD_VOTE_DATE . "</td>\n
- <th align='center'>" . _AM_WFD_MINDEX_ACTION . "</td>\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
</tr>\n
";
if ($votesanon == 0) {
- echo "<tr><td colspan='7' align='center' class='even'><b>" . _AM_WFD_VOTE_NOUNREGVOTES . "</b></td></tr>";
+ echo "<tr><td colspan='7' class='even'><b>" . _AM_WFD_VOTE_NOUNREGVOTES . "</b></td></tr>";
} else {
$criteria = new Criteria("ratinguser", 0);
$userratings = $rating_handler->getUserAverage($criteria);
@@ -218,40 +217,29 @@
$ratinguname = $GLOBALS['xoopsConfig']['anonymous'];
echo "
- <tr><td align='center' class='head'>$ratinguname</td>\n
- <td align='center' class='even'>" . $anonvotes[$i]->getVar('ratinghostname') . "</th>\n
- <td align='center' class='even'>" . $anonvotes[$i]->getVar('rating') . "</th>\n
- <td align='center' class='even'>$useravgrating</th>\n
- <td align='center' class='even'>$uservotes</th>\n
- <td align='center' class='even'>$formatted_date</th>\n
- <td align='center' class='even'>\n
- <a href='" . WFDOWNLOADS_URL . "admin/download.php?op=delVote&lid=" . $lid . "&rid=" . $anonvotes[$i]->getVar('ratingid') . "'>" . $imagearray['deleteimg'] . "</a>\n
+ <tr><td class='head'>$ratinguname</td>\n
+ <td class='even'>" . $anonvotes[$i]->getVar('ratinghostname') . "</th>\n
+ <td class='even'>" . $anonvotes[$i]->getVar('rating') . "</th>\n
+ <td class='even'>$useravgrating</th>\n
+ <td class='even'>$uservotes</th>\n
+ <td class='even'>$formatted_date</th>\n
+ <td class='even'>\n
+ <a href='" . WFDOWNLOADS_URL . "admin/download.php?op=vote.delete&lid=" . $lid . "&rid=" . $anonvotes[$i]->getVar('ratingid') . "'>" . $imagearray['deleteimg'] . "</a>\n
</th></tr>\n
";
}
}
- echo "
- </table>\n
- </fieldset>\n
- ";
+ echo "</table>\n";
+ echo "</fieldset>\n";
}
xoops_cp_footer();
}
-function delVote()
-{
- global $_GET;
- $rating_handler = xoops_getmodulehandler('rating');
- $rating = $rating_handler->get($_GET['rid']);
- if ($rating_handler->delete($rating, true)) {
- wfd_updaterating(intval($rating->getVar('lid')));
- }
- redirect_header(WFDOWNLOADS_URL . 'admin/download.php', 1, _AM_WFD_VOTE_VOTEDELETED);
-}
+
function addDownload()
{
- global $xoopsUser, $xoopsModuleConfig;
+ global $xoopsUser, $xoopsModuleConfig, $_FILES;
$lid = (!empty($_POST['lid'])) ? intval($_POST['lid']) : 0;
$cid = (!empty($_POST['cid'])) ? intval($_POST['cid']) : 0;
@@ -260,11 +248,9 @@
$download_handler = xoops_getmodulehandler('download');
if ($lid > 0) {
$thisIsANewRecord = false; /* Added by Lankford on 2007/3/21 */
-
$download = $download_handler->get($lid);
} else {
$thisIsANewRecord = true; /* Added by Lankford on 2007/3/21 */
-
$download = $download_handler->create();
}
@@ -286,8 +272,6 @@
$download->setVar('filename', $filename);
$download->setVar('filetype', $filetype);
} else {
- global $_FILES;
-
$down = wfd_uploading($_FILES, $xoopsModuleConfig['uploaddir'], "", "download.php", 0, 0);
$url = ($_POST["url"] != "http://") ? $_POST["url"] : '';
$size = $down['size'];
@@ -401,19 +385,15 @@
$publishdate = $_POST['was_published'];
$expiredate = $_POST['was_expired'];
}
-
- if ($approved == 1 && empt...
[truncated message content] |
|
From: <luc...@us...> - 2013-05-29 21:00:27
|
Revision: 11604
http://sourceforge.net/p/xoops/svn/11604
Author: luciorota
Date: 2013-05-29 21:00:23 +0000 (Wed, 29 May 2013)
Log Message:
-----------
admin side: download manager uses templates
admin side: vote/rating manager uses templates
bug fix: visit.php
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/votedata.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
XoopsModules/wfdownloads/trunk/wfdownloads/ratefile.php
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_categorylist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_ratefile.html
XoopsModules/wfdownloads/trunk/wfdownloads/visit.php
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Added Paths:
-----------
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_downloadlist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_reviewlist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_votedatalist.html
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-05-28 19:19:24 UTC (rev 11603)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-05-29 21:00:23 UTC (rev 11604)
@@ -76,3 +76,10 @@
include_once(XOOPS_ROOT_PATH . "/class/template.php");
$xoopsTpl = new XoopsTpl();
}
+
+$report_handler = xoops_getmodulehandler('report', $GLOBALS['xoopsModule']->getVar('dirname'));
+$review_handler = xoops_getmodulehandler('review', $GLOBALS['xoopsModule']->getVar('dirname'));
+$mirror_handler = xoops_getmodulehandler('mirror', $GLOBALS['xoopsModule']->getVar('dirname'));
+$modification_handler = xoops_getmodulehandler('modification', $GLOBALS['xoopsModule']->getVar('dirname'));
+$download_handler = xoops_getmodulehandler('download', $GLOBALS['xoopsModule']->getVar('dirname'));
+$category_handler = xoops_getmodulehandler('category', $GLOBALS['xoopsModule']->getVar('dirname'));
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php 2013-05-28 19:19:24 UTC (rev 11603)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php 2013-05-29 21:00:23 UTC (rev 11604)
@@ -250,8 +250,8 @@
$adminMenu->addItemButton(_AM_WFD_CCATEGORY_CREATENEW, 'category.php?op=category.add', 'add');
echo $adminMenu->renderButton();
- $totalcats = wfd_totalcategory();
- if ($totalcats > 0) {
+ $totalCategories = wfd_totalcategory();
+ if ($totalCategories > 0) {
$sorted_categories = wfd_sortCategories();
$GLOBALS['xoopsTpl']->assign('sorted_categories', $sorted_categories);
$GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML() );
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php 2013-05-28 19:19:24 UTC (rev 11603)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php 2013-05-29 21:00:23 UTC (rev 11604)
@@ -556,21 +556,19 @@
case "downloads.list" :
case 'main' :
default :
- global $xoopsUser, $xoopsDB, $xoopsConfig;
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+
+ $categories = $category_handler->getObjects();
+
$start = wfdownloads_CleanVars($_GET, 'start', 0, 'int');
$start1 = wfdownloads_CleanVars($_GET, 'start1', 0, 'int');
$start2 = wfdownloads_CleanVars($_GET, 'start2', 0, 'int');
$start3 = wfdownloads_CleanVars($_GET, 'start3', 0, 'int');
$start4 = wfdownloads_CleanVars($_GET, 'start4', 0, 'int');
+
$totalcats = wfd_totalcategory();
+ $categories = $category_handler->getObjects(null, true, false);
- $report_handler = xoops_getmodulehandler('report');
- $review_handler = xoops_getmodulehandler('review');
- $mirror_handler = xoops_getmodulehandler('mirror');
- $modification_handler = xoops_getmodulehandler('modification');
- $download_handler = xoops_getmodulehandler('download');
-
$totalbrokendownloads = $report_handler->getCount();
$totalmodrequests = $modification_handler->getCount();
$newreviews = $review_handler->getCount();
@@ -581,7 +579,7 @@
wfdownloads_xoops_cp_header();
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation('download.php');
-
+
$adminMenu = new ModuleAdmin();
$adminMenu->addItemButton(_MI_WFD_BINDEX, 'download.php?op=list', 'list');
$adminMenu->addItemButton(_AM_WFD_FFS_DOWNLOADTITLE, 'download.php?op=Download', 'add');
@@ -590,80 +588,98 @@
if ($totaldownloads > 0) {
// Published Downloads
$criteria = new CriteriaCompo();
- $criteria->setLimit($xoopsModuleConfig['admin_perpage']);
- $criteria->setStart($start);
$criteria->setSort("published");
$criteria->setOrder("DESC");
- $published_array = $download_handler->getActiveDownloads($criteria);
- $published_array_count = $download_handler->getActiveCount();
-
- wfd_downlistheader(_AM_WFD_MINDEX_PUBLISHEDDOWN);
- if ($published_array_count > 0) {
- foreach (array_keys($published_array) as $i) {
- wfd_downlistbody($published_array[$i]->toArray());
+ $criteria->setStart($start);
+ $criteria->setLimit($xoopsModuleConfig['admin_perpage']);
+ $published_downloads = $download_handler->getActiveDownloads($criteria);
+ $published_downloads_count = $download_handler->getActiveCount();
+ $GLOBALS['xoopsTpl']->assign('published_downloads_count', $published_downloads_count);
+ if ($published_downloads_count > 0) {
+ foreach ($published_downloads as $published_download) {
+ $published_download_array = $published_download->toArray();
+ $published_download_array['title_html'] = $myts->htmlSpecialChars(trim($published_download_array['title']));
+ $published_download_array['category_title'] = $categories[$published_download_array['cid']]['title'];
+ $published_download_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($published_download_array['submitter']);
+ $published_download_array['published_timestamp'] = formatTimestamp($published_download_array['published'], _DATESTRING);
+ $GLOBALS['xoopsTpl']->append('published_downloads', $published_download_array);
}
- } else {
- wfd_downlistfooter();
}
- wfd_downlistpagenav($published_array_count, $start, 'art');
+ $pagenav = new XoopsPageNav($published_downloads_count, $xoopsModuleConfig['admin_perpage'], $start1, 'start1');
+ $GLOBALS['xoopsTpl']->assign('published_downloads_pagenav', $pagenav->renderNav());
+
// Auto Published Downloads
$criteria = new Criteria("published", time(), ">");
- $auto_publish_count = $download_handler->getCount($criteria);
$criteria->setSort("published");
$criteria->setOrder("ASC");
+ $criteria->setStart($start2);
$criteria->setLimit($xoopsModuleConfig['admin_perpage']);
- $criteria->setStart($start2);
- $auto_published_array = $download_handler->getObjects($criteria);
-
- wfd_downlistheader(_AM_WFD_MINDEX_AUTOPUBLISHEDDOWN);
- if ($auto_publish_count > 0) {
- foreach (array_keys($auto_published_array) as $i) {
- wfd_downlistbody($auto_published_array[$i]->toArray());
+ $auto_published_downloads = $download_handler->getObjects($criteria);
+ $auto_published_downloads_count = $download_handler->getCount($criteria);
+ $GLOBALS['xoopsTpl']->assign('auto_published_downloads_count', $auto_published_downloads_count);
+ if ($auto_published_downloads_count > 0) {
+ foreach ($auto_published_downloads as $auto_published_download) {
+ $auto_published_download_array = $auto_published_download->toArray();
+ $auto_published_download_array['title_html'] = $myts->htmlSpecialChars(trim($auto_published_download_array['title']));
+ $auto_published_download_array['category_title'] = $categories[$auto_published_download_array['cid']]['title'];
+ $auto_published_download_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($auto_published_download_array['submitter']);
+ $auto_published_download_array['published_timestamp'] = formatTimestamp($auto_published_download_array['published'], _DATESTRING);
+ $GLOBALS['xoopsTpl']->append('auto_published_downloads', $auto_published_download_array);
}
- } else {
- wfd_downlistfooter();
}
- wfd_downlistpagenav($auto_publish_count, $start2, 'art2');
+ $pagenav = new XoopsPageNav($auto_published_downloads_count, $xoopsModuleConfig['admin_perpage'], $start2, 'start2');
+ $GLOBALS['xoopsTpl']->assign('auto_published_downloads_pagenav', $pagenav->renderNav());
+
// Expired downloads
$criteria = new CriteriaCompo();
$criteria->add(new Criteria("expired", time(), "<"), 'AND');
$criteria->add(new Criteria("expired", 0, "<>"), 'AND');
- $expired_count = $download_handler->getCount($criteria);
$criteria->setSort("expired");
$criteria->setOrder("ASC");
+ $criteria->setStart($start3);
$criteria->setLimit($xoopsModuleConfig['admin_perpage']);
- $criteria->setStart($start3);
- $expired_array = $download_handler->getObjects($criteria);
-
- wfd_downlistheader(_AM_WFD_MINDEX_EXPIREDDOWN);
- if ($expired_count > 0) {
- foreach (array_keys($expired_array) as $i) {
- wfd_downlistbody($expired_array[$i]->toArray());
+ $expired_downloads = $download_handler->getObjects($criteria);
+ $expired_downloads_count = $download_handler->getCount($criteria);
+ $GLOBALS['xoopsTpl']->assign('expired_downloads_count', $expired_downloads_count);
+ if ($expired_downloads_count > 0) {
+ foreach ($expired_downloads as $expired_download) {
+ $expired_download_array = $expired_download->toArray();
+ $expired_download_array['title_html'] = $myts->htmlSpecialChars(trim($expired_download_array['title']));
+ $expired_download_array['category_title'] = $categories[$expired_download_array['cid']]['title'];
+ $expired_download_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($expired_download_array['submitter']);
+ $expired_download_array['published_timestamp'] = formatTimestamp($expired_download_array['published'], _DATESTRING);
+ $GLOBALS['xoopsTpl']->append('expired_downloads', $expired_download_array);
}
- } else {
- wfd_downlistfooter();
}
- wfd_downlistpagenav($expired_count, $start3, 'art3');
- // Offline download
+ $pagenav = new XoopsPageNav($expired_downloads_count, $xoopsModuleConfig['admin_perpage'], $start3, 'start3');
+ $GLOBALS['xoopsTpl']->assign('expired_downloads_pagenav', $pagenav->renderNav());
+
+ // Offline downloads
$criteria = new Criteria("offline", 1);
- $offline_count = $download_handler->getCount($criteria);
$criteria->setSort("published");
$criteria->setOrder("ASC");
+ $criteria->setStart($start4);
$criteria->setLimit($xoopsModuleConfig['admin_perpage']);
- $criteria->setStart($start4);
- $offline_array = $download_handler->getObjects($criteria);
+ $offline_downloads_count = $download_handler->getCount($criteria);
+ $offline_downloads = $download_handler->getObjects($criteria);
+ $offline_downloads_count = $download_handler->getCount($criteria);
+ $GLOBALS['xoopsTpl']->assign('offline_downloads_count', $offline_downloads_count);
+ if ($offline_downloads_count > 0) {
+ foreach ($offline_downloads as $offline_download) {
+ $offline_download_array = $offline_download->toArray();
+ $offline_download_array['title_html'] = $myts->htmlSpecialChars(trim($offline_download_array['title']));
+ $offline_download_array['category_title'] = $categories[$offline_download_array['cid']]['title'];
+ $offline_download_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($offline_download_array['submitter']);
+ $offline_download_array['published_timestamp'] = formatTimestamp($offline_download_array['published'], _DATESTRING);
- wfd_downlistheader(_AM_WFD_MINDEX_OFFLINEDOWN);
- if ($offline_count > 0) {
- foreach (array_keys($offline_array) as $i) {
- wfd_downlistbody($offline_array[$i]->toArray());
+ $GLOBALS['xoopsTpl']->append('offline_downloads', $offline_download_array);
}
- } else {
- wfd_downlistfooter();
}
- wfd_downlistpagenav($offline_count, $start4, 'art4');
+ $pagenav = new XoopsPageNav($offline_downloads_count, $xoopsModuleConfig['admin_perpage'], $start4, 'start4');
+ $GLOBALS['xoopsTpl']->assign('offline_downloads_pagenav', $pagenav->renderNav());
+
+ $GLOBALS['xoopsTpl']->display("db:wfdownloads_admin_downloadlist.html");
}
- //xoops_cp_footer();
- include_once "admin_footer.php";
+ include 'admin_footer.php';
break;
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/votedata.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/votedata.php 2013-05-28 19:19:24 UTC (rev 11603)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/votedata.php 2013-05-29 21:00:23 UTC (rev 11604)
@@ -19,37 +19,33 @@
* @version svn:$Id$
*/
include 'admin_header.php';
+$rating_handler = xoops_getmodulehandler('rating');
-$op = "";
+$op = wfdownloads_CleanVars($_REQUEST, 'op', 'votes.list', 'string');
-if (isset($_REQUEST['op'])) $op = $_REQUEST['op'];
-$rating_handler = xoops_getmodulehandler('rating');
-switch ($op)
-{
+switch ($op) {
+ case 'vote.delete' :
case "delVote":
- $rid = intval($_GET['rid']);
- $lid = intval($_GET['lid']);
+ $rid = wfdownloads_CleanVars($_GET, 'rid', null, 'int');
+ $lid = wfdownloads_CleanVars($_GET, 'lid', null, 'int');
$rating_handler->deleteAll(new Criteria("ratingid", $rid), true);
wfd_updaterating($lid);
- redirect_header(WFDOWNLOADS_URL.'admin/votedata.php', 1, _AM_WFD_VOTEDELETED);
+ redirect_header(WFDOWNLOADS_URL . 'admin/votedata.php', 1, _AM_WFD_VOTEDELETED);
break;
- case 'main':
+ case 'votes.list' :
default:
-
- global $xoopsDB, $imagearray;
-
- $start = isset($_GET['start']) ? intval($_GET['start']) : 0;
+ $start = wfdownloads_CleanVars($_GET, 'start', 0, 'int');
$useravgrating = '0';
$uservotes = '0';
$criteria = new CriteriaCompo();
$criteria->setSort('ratingtimestamp');
$criteria->setOrder("DESC");
+ $criteria->setStart($start);;
$criteria->setLimit(20);
- $criteria->setStart($start);;
$ratings = $rating_handler->getObjects($criteria);
- $votes = count($ratings);
+ $votes = count($ratings);
$useravgrating = $rating_handler->getUserAverage();
$useravgrating = number_format($useravgrating["avg"], 2);
@@ -57,61 +53,29 @@
wfdownloads_xoops_cp_header();
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation('votedata.php');
- //wfdownloads_adminMenu(8, _AM_WFD_VOTE_RATINGINFOMATION);
-
- echo "
- <fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFD_VOTE_DISPLAYVOTES . "</legend>\n
- <div style='padding: 8px;'>\n
- <div><b>" . _AM_WFD_VOTE_USERAVG . ": </b>$useravgrating</div>\n
- <div><b>" . _AM_WFD_VOTE_TOTALRATE . ": </b>$votes</div>\n
- <div style='padding: 8px;'>\n
- <li>" . $imagearray['deleteimg'] . " " . _AM_WFD_VOTE_DELETEDSC . "</li>
- <div>\n
- </fieldset>\n
- <br />\n
-
- <table width='100%' cellspacing='1' cellpadding='2' class='outer'>\n
- <tr>\n
- <th align='center'>" . _AM_WFD_VOTE_ID . "</th>\n
- <th align='center'>" . _AM_WFD_VOTE_USER . "</th>\n
- <th align='center'>" . _AM_WFD_VOTE_IP . "</th>\n
- <th align='center'>" . _AM_WFD_VOTE_FILETITLE . "</th>\n
- <th align='center'>" . _AM_WFD_VOTE_RATING . "</th>\n
- <th align='center'>" . _AM_WFD_VOTE_DATE . "</th>\n
- <th align='center'>" . _AM_WFD_MINDEX_ACTION . "</th></tr>\n";
-
- if ($votes == 0)
- {
- echo "<tr><td align='center' colspan='7' class='head'>" . _AM_WFD_VOTE_NOVOTES . "</td></tr>";
- }
- else {
- foreach (array_keys($ratings) as $i) {
- $lids[] = $ratings[$i]->getVar('lid');
+
+ $GLOBALS['xoopsTpl']->assign('votes', $votes);
+ $GLOBALS['xoopsTpl']->assign('useravgrating', $useravgrating);
+ if ($votes > 0) {
+ foreach ($ratings as $rating) {
+ $lids[] = $rating->getVar('lid');
}
$download_handler = xoops_getmodulehandler('download');
- $downloads = $download_handler->getObjects(new Criteria("lid", "(".implode(',', array_unique($lids)).")", "IN"), true);
- foreach (array_keys($ratings) as $i) {
- $formatted_date = formatTimestamp($ratings[$i]->getVar('ratingtimestamp'), $xoopsModuleConfig['dateformat']);
- $ratinguname = XoopsUser::getUnameFromId($ratings[$i]->getVar('ratinguser'));
- echo "
- <tr>\n
- <td class='head' align='center'>".$ratings[$i]->getVar('ratingid')."</td>\n
- <td class='even' align='center'>".$ratings[$i]->getVar('ratinguname')."</td>\n
- <td class='even' align='center'>".$ratings[$i]->getVar('ratinghostname')."</td>\n
- <td class='even' align='center'>".$downloads[$ratings[$i]->getVar('lid')]->getVar('title')."</td>\n
- <td class='even' align='center'>".$ratings[$i]->getVar('rating')."</td>\n
- <td class='even' align='center'>$formatted_date</td>\n
- <td class='even' align='center'><b><a href='".WFDOWNLOADS_URL."admin/votedata.php?op=delVote&lid=".$ratings[$i]->getVar('lid')."&rid=".$ratings[$i]->getVar('ratingid')."'>".$imagearray['deleteimg']."</a></b></td>\n
- </tr>\n";
+ $downloads = $download_handler->getObjects(new Criteria("lid", "(" . implode(',', array_unique($lids)) . ")", "IN"), true);
+ foreach ($ratings as $rating) {
+ $rating_array = $rating->toArray();
+ $rating_array['formatted_date'] = formatTimestamp($rating->getVar('ratingtimestamp'), _DATESTRING);
+ $rating_array['submitter_uname'] = XoopsUser::getUnameFromId($rating->getVar('ratinguser'));
+ $rating_array['download_title'] = $downloads[$rating->getVar('lid')]->getVar('title');
+ $GLOBALS['xoopsTpl']->append('ratings', $rating_array);
}
}
- echo "</table>";
- //Include page navigation
- include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
- $page = ($votes > 20) ? _AM_WFD_MINDEX_PAGE : '';
- $pagenav = new XoopsPageNav($page, 20, $start, 'start');
- echo '<div align="right" style="padding: 8px;">' . $page . '' . $pagenav->renderNav() . '</div>';
+ //Include page navigation
+ include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+ $pagenav = new XoopsPageNav(_AM_WFD_MINDEX_PAGE, 20, $start, 'start');
+ $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
+
+ $GLOBALS['xoopsTpl']->display("db:wfdownloads_admin_votedatalist.html");
+ include 'admin_footer.php';
break;
}
-//xoops_cp_footer();
-include_once "admin_footer.php";
\ No newline at end of file
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-05-28 19:19:24 UTC (rev 11603)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-05-29 21:00:23 UTC (rev 11604)
@@ -411,16 +411,19 @@
$sform -> addElement(new XoopsFormLabel(_AM_WFD_FILE_IP, $this->getVar('ipaddress')));
}
- $titles_tray = new XoopsFormElementTray(_AM_WFD_FILE_TITLE, '<br />');
- $titles = new XoopsFormText('', 'title', 50, 255, $this->getVar('title', 'e'));
- $titles_tray -> addElement($titles);
- $titles_checkbox = new XoopsFormCheckBox('', "title_checkbox", 0);
- $titles_checkbox -> addOption(1, _AM_WFD_FILE_USE_UPLOAD_TITLE);
- $titles_tray -> addElement($titles_checkbox);
+ $titles_tray = new XoopsFormElementTray(_AM_WFD_FILE_TITLE, '<br />');
+ $titles = new XoopsFormText('', 'title', 50, 255, $this->getVar('title', 'e'));
+ $titles_tray -> addElement($titles);
+ $titles_checkbox = new XoopsFormCheckBox('', "title_checkbox", 0);
+ $titles_checkbox -> addOption(1, _AM_WFD_FILE_USE_UPLOAD_TITLE);
+ $titles_tray -> addElement($titles_checkbox);
$sform -> addElement($titles_tray);
if (!$this->isNew()) {
- $sform -> addElement(new XoopsFormText(_AM_WFD_FILE_SUBMITTERID, 'submitter', 10, 10, $this->getVar('submitter', 'e')), true);
+ //$sform -> addElement(new XoopsFormText(_AM_WFD_FILE_SUBMITTERID, 'submitter', 10, 10, $this->getVar('submitter', 'e')), true);
+ $submitter_select = new XoopsFormSelectUser (_AM_WFD_FILE_SUBMITTER, 'submitter', false, $this->getVar('submitter', 'e'), 1, false);
+ $submitter_select->setDescription(_AM_WFD_FILE_SUBMITTER_DESC);
+ $sform -> addElement($submitter_select);
} else {
$sform -> addElement(new XoopsFormHidden('submitter', $xoopsUser->getVar('uid', 'e')));
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-05-28 19:19:24 UTC (rev 11603)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-05-29 21:00:23 UTC (rev 11604)
@@ -1,4 +1,4 @@
-<b><u>=> Version 3.23 (2013-05-25)</u></b>
+<b><u>=> Version 3.23 Beta 1 (2013-05-29)</u></b>
- refactorized admin menu (luciorota)
- added: sort subcategories by cid or title or weight (luciorota)
- fixed: update procedure now updates also permissions (luciorota)
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-05-28 19:19:24 UTC (rev 11603)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-05-29 21:00:23 UTC (rev 11604)
@@ -336,50 +336,50 @@
//File management
define("_AM_WFD_FILE_SUBMITTERID","Submitter User Id: <br /><br />Leave this as it is, Unless you want to change who submitted the download");
-define("_AM_WFD_FILE_ID","File ID: ");
-define("_AM_WFD_FILE_IP","Uploader's IP Address: ");
-define("_AM_WFD_FILE_ALLOWEDAMIME","<div style='padding-top: 4px; padding-bottom: 4px;'><b>Allowed Admin File Extensions</b>:</div>");
+define("_AM_WFD_FILE_ID","File ID");
+define("_AM_WFD_FILE_IP","Uploader's IP Address");
+define("_AM_WFD_FILE_ALLOWEDAMIME","<div style='padding-top: 4px; padding-bottom: 4px;'><b>Allowed Admin File Extensions</b></div>");
define("_AM_WFD_FILE_MODIFYFILE","Modify File Information");
define("_AM_WFD_FILE_CREATENEWFILE","Create New File");
-define("_AM_WFD_FILE_TITLE","File Title: ");
-define("_AM_WFD_FILE_DLURL","Remote URL: ");
-define("_AM_WFD_FILE_FILENAME","Local Filename:<br /><br /><span style='font-weight: normal;'>Note: If using local file as download, then you must also enter the correct filetype below!</span>");
-define("_AM_WFD_FILE_FILETYPE","File Type: ");
-define("_AM_WFD_FILE_MIRRORURL","File Mirror: ");
-define("_AM_WFD_FILE_SUMMARY","File Summary: ");
-define("_AM_WFD_FILE_DESCRIPTION","File Description: ");
-define("_AM_WFD_FILE_DUPLOAD"," Upload File:");
-define("_AM_WFD_FILE_CATEGORY","Select Category: ");
-define("_AM_WFD_FILE_HOMEPAGETITLE","Home Page Title: ");
-define("_AM_WFD_FILE_HOMEPAGE","Home Page: ");
-define("_AM_WFD_FILE_SIZE","File Size: ");
-define("_AM_WFD_FILE_VERSION","File Version: ");
-define("_AM_WFD_FILE_VERSIONTYPES","Release Status: ");
-define("_AM_WFD_FILE_PUBLISHER","File Publisher: ");
-define("_AM_WFD_FILE_PLATFORM","Software Platform: ");
-define("_AM_WFD_FILE_LICENCE","Software Licence: ");
-define("_AM_WFD_FILE_LIMITATIONS","Software limitations: ");
+define("_AM_WFD_FILE_TITLE","File Title");
+define("_AM_WFD_FILE_DLURL","Remote URL");
+define("_AM_WFD_FILE_FILENAME","Local Filename<br /><br /><span style='font-weight: normal;'>Note: If using local file as download, then you must also enter the correct filetype below!</span>");
+define("_AM_WFD_FILE_FILETYPE","File Type");
+define("_AM_WFD_FILE_MIRRORURL","File Mirror");
+define("_AM_WFD_FILE_SUMMARY","File Summary");
+define("_AM_WFD_FILE_DESCRIPTION","File Description");
+define("_AM_WFD_FILE_DUPLOAD"," Upload File");
+define("_AM_WFD_FILE_CATEGORY","Select Category");
+define("_AM_WFD_FILE_HOMEPAGETITLE","Home Page Title");
+define("_AM_WFD_FILE_HOMEPAGE","Home Page");
+define("_AM_WFD_FILE_SIZE","File Size");
+define("_AM_WFD_FILE_VERSION","File Version");
+define("_AM_WFD_FILE_VERSIONTYPES","Release Status");
+define("_AM_WFD_FILE_PUBLISHER","File Publisher");
+define("_AM_WFD_FILE_PLATFORM","Software Platform");
+define("_AM_WFD_FILE_LICENCE","Software Licence");
+define("_AM_WFD_FILE_LIMITATIONS","Software limitations");
define("_AM_WFD_FILE_PRICE","Price: ");
-define("_AM_WFD_FILE_KEYFEATURES","Key Features:<br /><br /><span style='font-weight: normal;'>Separate each Key Feature with a |</span>");
-define("_AM_WFD_FILE_REQUIREMENTS","System Requirements:<br /><br /><span style='font-weight: normal;'>Separate each Requirement with |</span>");
-define("_AM_WFD_FILE_HISTORY","Download History Edit:<br /><br /><span style='font-weight: normal;'>Add New Download History and only use this field to if you need to edit the previous history.</span>");
-define("_AM_WFD_FILE_HISTORYD","Add New Download History:<br /><br /><span style='font-weight: normal;'>The version Number and date will be added automatically</span>");
-define("_AM_WFD_FILE_HISTORYVERS","<b>Version: </b>");
-define("_AM_WFD_FILE_HISTORDATE"," <b>Updated:</b> ");
-define("_AM_WFD_FILE_FILESSTATUS"," Set Download offline?<br /><br /><span style='font-weight: normal;'>Download will not be viewable to all users.</span>");
+define("_AM_WFD_FILE_KEYFEATURES","Key Features<br /><br /><span style='font-weight: normal;'>Separate each Key Feature with a |</span>");
+define("_AM_WFD_FILE_REQUIREMENTS","System Requirements<br /><br /><span style='font-weight: normal;'>Separate each Requirement with |</span>");
+define("_AM_WFD_FILE_HISTORY","Download History Edit<br /><br /><span style='font-weight: normal;'>Add New Download History and only use this field to if you need to edit the previous history.</span>");
+define("_AM_WFD_FILE_HISTORYD","Add New Download History<br /><br /><span style='font-weight: normal;'>The version Number and date will be added automatically</span>");
+define("_AM_WFD_FILE_HISTORYVERS","<b>Version</b>");
+define("_AM_WFD_FILE_HISTORDATE"," <b>Updated</b> ");
+define("_AM_WFD_FILE_FILESSTATUS"," Set Download offline<br /><br /><span style='font-weight: normal;'>Download will not be viewable to all users.</span>");
define("_AM_WFD_FILE_SETASUPDATED"," Set Download Status as Updated?<br /><br /><span style='font-weight: normal;'>Download will Display updated icon.</span>");
-define("_AM_WFD_FILE_SHOTIMAGE","Select Screenshot Image: <br /><br /><span style='font-weight: normal;'>Note that screenshots will only be displayed if activated in module preferences.</span>");
+define("_AM_WFD_FILE_SHOTIMAGE","Select Screenshot Image<br /><br /><span style='font-weight: normal;'>Note that screenshots will only be displayed if activated in module preferences.</span>");
define("_AM_WFD_FILE_DISCUSSINFORUM","Add Discuss in this Forum?");
define("_AM_WFD_FILE_PUBLISHDATE","File Publish Date:");
define("_AM_WFD_FILE_EXPIREDATE","File Expire Date:");
-define("_AM_WFD_FILE_CLEARPUBLISHDATE","<br /><br />Remove Publish date:");
-define("_AM_WFD_FILE_CLEAREXPIREDATE","<br /><br />Remove Expire date:");
+define("_AM_WFD_FILE_CLEARPUBLISHDATE","<br /><br />Remove Publish date");
+define("_A...
[truncated message content] |
|
From: <luc...@us...> - 2013-05-30 21:46:37
|
Revision: 11605
http://sourceforge.net/p/xoops/svn/11605
Author: luciorota
Date: 2013-05-30 21:46:33 +0000 (Thu, 30 May 2013)
Log Message:
-----------
admin side: review uses templates
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/review.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/votedata.php
XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_categorylist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_downloadlist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_reviewlist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_votedatalist.html
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Added Paths:
-----------
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_mimetypelist.html
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-05-29 21:00:23 UTC (rev 11604)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-05-30 21:46:33 UTC (rev 11605)
@@ -83,3 +83,6 @@
$modification_handler = xoops_getmodulehandler('modification', $GLOBALS['xoopsModule']->getVar('dirname'));
$download_handler = xoops_getmodulehandler('download', $GLOBALS['xoopsModule']->getVar('dirname'));
$category_handler = xoops_getmodulehandler('category', $GLOBALS['xoopsModule']->getVar('dirname'));
+$mime_handler = xoops_getmodulehandler('mimetype', $GLOBALS['xoopsModule']->getVar('dirname'));
+
+$member_handler = xoops_gethandler("member");
\ No newline at end of file
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php 2013-05-29 21:00:23 UTC (rev 11604)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php 2013-05-30 21:46:33 UTC (rev 11605)
@@ -52,7 +52,6 @@
$cid = wfdownloads_CleanVars($_REQUEST, 'cid', 0, 'int');
wfdownloads_xoops_cp_header();
- //wfdownloads_adminMenu(2, _AM_WFD_MCATEGORY);
include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
$sform = new XoopsThemeForm(_AM_WFD_CCATEGORY_MOVE, "move", xoops_getenv('PHP_SELF'));
@@ -179,7 +178,7 @@
// get all subcategories under the specified category
$arr = $mytree -> getAllChild($cid);
- foreach($arr as $child) {
+ foreach($arr as $child) {
// get all category ids
$cids[] = $child->getVar('cid');
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php 2013-05-29 21:00:23 UTC (rev 11604)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php 2013-05-30 21:46:33 UTC (rev 11605)
@@ -56,28 +56,22 @@
echo "</fieldset><br />\n";
if ($lid) {
- $download = $download_handler->get($lid);
- $title = _AM_WFD_FILE_MODIFYFILE;
- // added - start - March 4 2006 - jpc
- $cid = intval($download->getVar('cid'));
- $category = $category_handler->get($cid);
- // added - end - March 4 2006 - jpc
- // changed - start - April 22 2006 - jwe
- //$title = _AM_WFD_FILE_MODIFYFILE;
+ if (!$download = $download_handler->get($lid)) {
+ redirect_header('download.php', 4, _AM_WFD_DOWN_ERROR_FILENOTFOUND);
+ exit();
+ }
+ $cid = $download->getVar('cid');
+ if(!$category = $category_handler->get($cid)) {
+ redirect_header('download.php', 4, _AM_WFD_DOWN_ERROR_CATEGORYNOTFOUND);
+ exit();
+ }
$title = preg_replace("/{category}/", $category->getVar('title'), _AM_WFD_FFS_EDITDOWNLOADTITLE);
- // changed - end - April 22 2006 - jwe
} else {
$download = $download_handler->create();
- $title = _AM_WFD_FILE_CREATENEWFILE;
- // added - start - March 4 2006 - jpc
- $cid = (!empty($_POST['cid'])) ? intval($_POST['cid']) : 0 ;
+ $cid = wfdownloads_CleanVars($_POST, 'cid', 0, 'int');
+ $category = $category_handler->get($cid);
$download->setVar('cid', $cid);
- $category = $category_handler->get($cid);
- // added - end - March 4 2006 - jpc
- // changed - start - April 22 2006 - jwe
- //$title = _AM_WFD_FILE_CREATENEWFILE;
$title = preg_replace("/{category}/", $category->getVar('title'), _AM_WFD_FFS_DOWNLOADTITLE);
- // changed - end - April 22 2006 - jwe
}
// changed - start - March 4 2006 - jpc
@@ -99,7 +93,7 @@
$owner = getEntryOwner($entry);
$member_handler =& xoops_gethandler('member');
- $owner_groups =& $member_handler->getGroupsByUser($owner, FALSE);
+ $owner_groups =& $member_handler->getGroupsByUser($owner, false);
$customArray['owner_groups'] = $owner_groups;
}
@@ -497,6 +491,7 @@
addDownload();
break;
+ case "download.edit" :
case "download.add" :
case "Download" :
Download();
@@ -507,7 +502,10 @@
$lid = wfdownloads_CleanVars($_REQUEST, 'lid', 0, 'int');
$ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
$download_handler = xoops_getmodulehandler('download');
- $download = $download_handler->get($lid);
+ if (!$download = $download_handler->get($lid)) {
+ redirect_header('download.php', 4, _AM_WFD_DOWN_ERROR_FILENOTFOUND);
+ exit();
+ }
$title = $download->getVar('title');
if ($ok = true) {
$file = $xoopsModuleConfig['uploaddir'] . "/" . $download->getVar('filename');
@@ -560,7 +558,6 @@
$categories = $category_handler->getObjects();
- $start = wfdownloads_CleanVars($_GET, 'start', 0, 'int');
$start1 = wfdownloads_CleanVars($_GET, 'start1', 0, 'int');
$start2 = wfdownloads_CleanVars($_GET, 'start2', 0, 'int');
$start3 = wfdownloads_CleanVars($_GET, 'start3', 0, 'int');
@@ -590,7 +587,7 @@
$criteria = new CriteriaCompo();
$criteria->setSort("published");
$criteria->setOrder("DESC");
- $criteria->setStart($start);
+ $criteria->setStart($start1);
$criteria->setLimit($xoopsModuleConfig['admin_perpage']);
$published_downloads = $download_handler->getActiveDownloads($criteria);
$published_downloads_count = $download_handler->getActiveCount();
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php 2013-05-29 21:00:23 UTC (rev 11604)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php 2013-05-30 21:46:33 UTC (rev 11605)
@@ -44,15 +44,14 @@
$sform -> addElement(new XoopsFormText(_AM_WFD_MIME_EXTF, 'mime_ext', 5, 60, $mimetype->getVar('mime_ext', 'e')), true);
$sform -> addElement(new XoopsFormText(_AM_WFD_MIME_NAMEF, 'mime_name', 50, 255, $mimetype->getVar('mime_name', 'e')), true);
$sform -> addElement(new XoopsFormTextArea(_AM_WFD_MIME_TYPEF, 'mime_type', $mimetype->getVar('mime_types', 'e'), 7, 60));
- $madmin_radio = new XoopsFormRadioYN(_AM_WFD_MIME_ADMINF, 'mime_admin', $mimetype->getVar('mime_admin', 'e'), ' ' . _YES . '', ' ' . _NO . '');
+ $madmin_radio = new XoopsFormRadioYN(_AM_WFD_MIME_ADMINF, 'mime_admin', $mimetype->getVar('mime_admin', 'e'), ' ' . _YES . '', ' ' . _NO . '');
$sform -> addElement($madmin_radio);
- $muser_radio = new XoopsFormRadioYN(_AM_WFD_MIME_USERF, 'mime_user', $mimetype->getVar('mime_user', 'e'), ' ' . _YES . '', ' ' . _NO . '');
+ $muser_radio = new XoopsFormRadioYN(_AM_WFD_MIME_USERF, 'mime_user', $mimetype->getVar('mime_user', 'e'), ' ' . _YES . '', ' ' . _NO . '');
$sform -> addElement($muser_radio);
$button_tray = new XoopsFormElementTray('', '');
$hidden = new XoopsFormHidden('op', 'save');
$button_tray -> addElement($hidden);
-
if (!$mime_id) {
$butt_create = new XoopsFormButton('', '', _AM_WFD_MIME_CREATE, 'submit');
$butt_create -> setExtra('onclick="this.form.elements.op.value=\'save\'"');
@@ -74,7 +73,6 @@
$butt_cancel -> setExtra('onclick="history.go(-1)"');
$button_tray -> addElement($butt_cancel);
}
-
$sform -> addElement($button_tray);
$sform -> display();
@@ -93,18 +91,16 @@
switch ($op) {
case 'openurl':
$fileext = trim($_POST['fileext']);
- $url = "http://filext.com/detaillist.php?extdetail=" . $fileext . "";
+ $url = "http://filext.com/detaillist.php?extdetail={$fileext}";
if (!headers_sent()) {
header("Location: $url");
} else {
- echo "<meta http-equiv='refresh' content='0;url=$url target='_blank''>\r\n";
+ echo "<meta http-equiv='refresh' content='0;url={$url} target='_blank''>\r\n";
}
break;
case 'update';
- $mime_id = (isset($_REQUEST['mime_id'])) ? intval($_REQUEST['mime_id']) : 0;
-
- $mime_handler = xoops_getmodulehandler('mimetype');
+ $mime_id = wfdownloads_CleanVars($_REQUEST, 'mime_id', 0, 'int');
$mimetype = $mime_handler->get($mime_id);
if (isset($_REQUEST['admin']) && $_REQUEST['admin'] == 1) {
@@ -128,24 +124,22 @@
redirect_header(WFDOWNLOADS_URL . "admin/mimetypes.php?start=" . intval($_GET['start']) . "", 0, _AM_WFD_MIME_MODIFIED);
break;
+ case 'mimetype.save':
case 'save':
- $mime_id = (isset($_POST['mime_id']) && $_POST['mime_id'] > 0) ? $_POST['mime_id'] : 0;
+ $mime_id = wfdownloads_CleanVars($_POST, 'mime_id', 0, 'int');
+ $mimetype = $mime_handler->get($mime_id);
- $mime_handler = xoops_getmodulehandler('mimetype');
- $mimetype = $mime_handler->get($mime_id);
$mimetype->setVar('mime_ext', $_POST['mime_ext']);
$mimetype->setVar('mime_name', $_POST['mime_name']);
$mimetype->setVar('mime_types', $_POST['mime_type']);
- $mimetype->setVar('mime_admin', intval($_POST['mime_admin']));
- $mimetype->setVar('mime_user', intval($_POST['mime_user']));
-
- $result = $mime_handler->insert($mimetype);
- $error = "Could not update mimetype information:";
- if (!$result) {
+ $mimetype->setVar('mime_admin', (int)$_POST['mime_admin']);
+ $mimetype->setVar('mime_user', (int)$_POST['mime_user']);
+ if (!$mime_handler->insert($mimetype)) {
+ $error = "Could not update mimetype information:";
trigger_error($error, E_USER_ERROR);
}
$dbupted = ($mime_id == 0) ? _AM_WFD_MIME_CREATED : _AM_WFD_MIME_MODIFIED;
- redirect_header(WFDOWNLOADS_URL.'admin/mimetypes.php', 1, $dbupted);
+ redirect_header('amimetypes.php', 1, $dbupted);
break;
case 'saveall':
@@ -167,16 +161,14 @@
redirect_header(WFDOWNLOADS_URL.'admin/mimetypes.php', 1, _AM_WFD_MIME_MODIFIED);
break;
+ case "mimetype.delete":
case "delete":
- global $xoopsDB;
-
- $confirm = (isset($_POST['confirm'])) ? 1 : 0;
-
- $mime_handler = xoops_getmodulehandler('mimetype');
- $mimetype = $mime_handler->get($_REQUEST['mime_id']);
- if ($confirm) {
+ $mime_id = wfdownloads_CleanVars($_REQUEST, 'mime_id', 0, 'int');
+ $ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
+ $mimetype = $mime_handler->get($mime_id);
+ if ($ok == true) {
if ($mime_handler->delete($mimetype)) {
- redirect_header(WFDOWNLOADS_URL.'admin/mimetypes.php', 1, sprintf(_AM_WFD_MIME_MIMEDELETED, $mimetype->getVar('mime_name')));
+ redirect_header('mimetypes.php', 1, sprintf(_AM_WFD_MIME_MIMEDELETED, $mimetype->getVar('mime_name')));
} else {
$error = "" . _AM_WFD_EVENNEWS_DBERROR . ": <br /><br />" . $sql;
trigger_error($error, E_USER_ERROR);
@@ -184,24 +176,23 @@
exit();
} else {
wfdownloads_xoops_cp_header();
- xoops_confirm(array('op' => 'delete', 'mime_id' => $mimetype->getVar('mime_id'), 'confirm' => 1), WFDOWNLOADS_URL . 'admin/mimetypes.php', _AM_WFD_MIME_DELETETHIS . "<br /><br>" . $mimetype->getVar('mime_name'), _AM_WFD_MIME_DELETE);
+ xoops_confirm(array('op' => 'mimetype.delete', 'mime_id' => $mime_id, 'ok' => true), WFDOWNLOADS_URL . 'admin/mimetypes.php', _AM_WFD_MIME_DELETETHIS . "<br /><br>" . $mimetype->getVar('mime_name'), _AM_WFD_MIME_DELETE);
xoops_cp_footer();
}
break;
+ case 'mimetype.edit':
case 'edit':
wfdownloads_xoops_cp_header();
- //wfdownloads_adminMenu(7, _AM_WFD_MMIMETYPES);
edit_mimetype($_GET['mime_id']);
xoops_cp_footer();
break;
+ case 'mimetypes.list':
case 'main':
default:
- global $xoopsUser, $xoopsDB, $xoopsModuleConfig;
- $start = isset($_GET['start']) ? intval($_GET['start']) : 0;
+ $start = wfdownloads_CleanVars($_GET, 'start', 0, 'int');
- $mime_handler = xoops_getmodulehandler('mimetype');
$criteria = new CriteriaCompo();
$criteria->setSort("mime_name");
$criteria->setStart($start);
@@ -212,7 +203,6 @@
wfdownloads_xoops_cp_header();
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation('mimetypes.php');
- //wfdownloads_adminMenu(7, _AM_WFD_MMIMETYPES);
echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFD_MIME_MODIFYF . "</legend>\n";
echo "<div style='padding: 8px;'>" . _AM_WFD_MIME_INFOTEXT . "</div>\n";
@@ -297,7 +287,6 @@
$page = ($mime_num > 20) ? _AM_WFD_MINDEX_PAGE : '';
$pagenav = new XoopsPageNav($mime_num, 20, $start, 'start');
echo "<div align='right' style='padding: 8px;'>" . $page . '' . $pagenav -> renderNav() . '</div>';
- //xoops_cp_footer();
include_once "admin_footer.php";
break;
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/review.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/review.php 2013-05-29 21:00:23 UTC (rev 11604)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/review.php 2013-05-30 21:46:33 UTC (rev 11605)
@@ -19,243 +19,135 @@
* @version svn:$Id$
*/
include 'admin_header.php';
+$review_handler = xoops_getmodulehandler('review');
-$op = '';
+$op = wfdownloads_CleanVars($_REQUEST, 'op', 'reviews.list', 'string');
+$lid = wfdownloads_CleanVars($_REQUEST, 'lid', 0, 'int');
-if (!isset($_POST['op']))
-{
- $op = isset($_GET['op']) ? $_GET['op'] : 'reviews';
-}
-else
-{
- $op = $_POST['op'];
-}
+switch ($op) {
+ case "review.delete" :
+ $review_id = wfdownloads_CleanVars($_REQUEST, 'review_id', 0, 'int');
+ $ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
+ $review = $review_handler->get($review_id);
+ if ($ok == true) {
+ $review_handler->delete($review);
+ redirect_header('review.php', 1, sprintf(_AM_WFD_FILE_FILEWASDELETED, $review->getVar('title')));
+ exit();
+ } else {
+ wfdownloads_xoops_cp_header();
+ xoops_confirm(array('op' => 'review.delete', 'review_id' => $review_id, 'ok' => true), 'review.php', _AM_WFD_FILE_REALLYDELETEDTHIS . "<br /><br>" . $review->getVar('title'), _AM_WFD_BDELETE);
+ xoops_cp_footer();
+ }
+ break;
-$lid = (isset($_GET['lid'])) ? intval($_GET['lid']) : 0;
+ case "review.approve":
+ $review_id = wfdownloads_CleanVars($_REQUEST, 'review_id', 0, 'int');
+ $ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
+ $review = $review_handler->get($review_id);
+ if ($ok == true) {
+ $review->setVar('submit', 1);
+ $review_handler->insert($review);
+ redirect_header('review.php?op=default', 1, sprintf( _AM_WFD_REV_REVIEW_UPDATED, $review->getVar('title')));
+ exit();
+ } else {
+ wfdownloads_xoops_cp_header();
+ xoops_confirm(array('op' => 'review.approve', 'review_id' => $review->getVar('review_id'), 'ok' => true), 'review.php', _AM_WFD_REVIEW_APPROVETHIS . "<br /><br>" . $review->getVar('title'), _AM_WFD_REVIEW_APPROVETHIS);
+ xoops_cp_footer();
+ }
+ break;
-switch ($op)
-{
- case "del_review":
+ case "review.edit":
+ $review_id = wfdownloads_CleanVars($_REQUEST, 'review_id', 0, 'int');
+ $ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
+ $review = $review_handler->get($review_id);
+ if ($ok == true) {
+ $review->setVar('title', trim($_POST['title']));
+ $review->setVar('review', trim($_POST['review']));
+ $review->setVar('rated', (int)$_POST['rated']);
+ $review->setVar('submit', (int)$_POST['approve']);
+ $review_handler->insert($review);
+ redirect_header('review.php', 1, _AM_WFD_REV_REVIEW_UPDATED);
+ exit();
+ } else {
+ wfdownloads_xoops_cp_header();
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation('review.php');
+ $sform = $review->getForm();
+ $sform -> display();
+ xoops_cp_footer();
+ }
+ break;
- $confirm = (isset($_REQUEST['confirm'])) ? 1 : 0;
- $review_handler = xoops_getmodulehandler('review');
- $review_id = intval($_REQUEST['review_id']);
- $review = $review_handler->get($review_id);
- if ($confirm)
- {
- $review_handler->delete($review);
- redirect_header(WFDOWNLOADS_URL.'admin/review.php?op=default', 1, sprintf(_AM_WFD_FILE_FILEWASDELETED, $review->getVar('title')));
- exit();
- }
- else
- {
- wfdownloads_xoops_cp_header();
- xoops_confirm(array('op' => 'del_review', 'review_id' => $review->getVar('review_id'), 'confirm' => 1), WFDOWNLOADS_URL.'admin/review.php?op=default', _AM_WFD_FILE_REALLYDELETEDTHIS . "<br /><br>" . $review->getVar('title'), _AM_WFD_BDELETE);
- xoops_cp_footer();
- }
- break;
+ case "reviews.list":
+ default:
+ $start_waiting = wfdownloads_CleanVars($_GET, 'start_waiting', 0, 'int');
+ $start_published = wfdownloads_CleanVars($_GET, 'start_published', 0, 'int');
- case "approve_review":
+ $criteria_waiting = new Criteria("submit", false);
+ $num_waiting = $review_handler->getCount($criteria_waiting);
+ $criteria_waiting->setSort("date");
+ $criteria_waiting->setOrder("DESC");
+ $criteria_waiting->setLimit($xoopsModuleConfig['admin_perpage']);
+ $criteria_waiting->setStart($start_waiting);
+ $reviews_waiting = $review_handler->getObjects($criteria_waiting);
- $confirm = (isset($_REQUEST['confirm'])) ? 1 : 0;
- $review_handler = xoops_getmodulehandler('review');
- $review_id = intval($_REQUEST['review_id']);
- $review = $review_handler->get($review_id);
- if ($confirm)
- {
- $review->setVar('submit', 1);
- $review_handler->insert($review);
- redirect_header(WFDOWNLOADS_URL.'admin/review.php?op=default', 1, sprintf( _AM_WFD_REV_REVIEW_UPDATED, $review->getVar('title')));
- exit();
- }
- else
- {
- wfdownloads_xoops_cp_header();
- xoops_confirm(array('op' => 'approve_review', 'review_id' => $review->getVar('review_id'), 'confirm' => 1), WFDOWNLOADS_URL.'admin/review.php?op=default', _AM_WFD_REVIEW_APPROVETHIS . "<br /><br>" . $review->getVar('title'), _AM_WFD_REVIEW_APPROVETHIS);
- xoops_cp_footer();
- }
- break;
+ $criteria_published = new Criteria("submit", true);
+ $num_published = $review_handler->getCount($criteria_published);
+ $criteria_published->setSort("date");
+ $criteria_published->setOrder("DESC");
+ $criteria_published->setLimit($xoopsModuleConfig['admin_perpage']);
+ $criteria_published->setStart($start_published);
+ $reviews_published = $review_handler->getObjects($criteria_published);
- case "edit_review":
-
- $confirm = (isset($_REQUEST['confirm'])) ? 1 : 0;
- $review_handler = xoops_getmodulehandler('review');
- $review_id = intval($_REQUEST['review_id']);
- $review = $review_handler->get($review_id);
- if ($confirm)
- {
- $review->setVar('title', trim($_POST['title']));
- $review->setVar('review', trim($_POST['review']));
- $review->setVar('rated', intval($_POST['rated']));
- $review->setVar('submit', intval($_POST['approve']));
- $review_handler->insert($review);
- redirect_header(WFDOWNLOADS_URL.'admin/review.php?op=default', 1, _AM_WFD_REV_REVIEW_UPDATED);
- exit();
- }
- else
- {
wfdownloads_xoops_cp_header();
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation('review.php');
- //wfdownloads_adminMenu(4, _AM_WFD_AREVIEWS);
- $sform = $review->getForm();
- $sform -> display();
- xoops_cp_footer();
- }
- break;
+ $GLOBALS['xoopsTpl']->assign('reviews_waiting_count', $num_waiting);
+ $GLOBALS['xoopsTpl']->assign('reviews_published_count', $num_published);
- default:
- case "reviews":
- case "default":
- global $xoopsDB, $imagearray, $xoopsModule;
- xoops_load('XoopsUserUtility');
- $start = isset($_GET['start']) ? intval($_GET['start']) : 0;
- $start2 = isset($_GET['start2']) ? intval($_GET['start2']) : 0;
-
- $review_handler = xoops_getmodulehandler('review');
- $criteria = new Criteria("submit", 0);
- $criteria2 = new Criteria("submit", 1);
- $num = $review_handler->getCount($criteria);
- $num2 = $review_handler->getCount($criteria2);
- $criteria->setSort("date");
- $criteria2->setSort("date");
- $criteria->setOrder("DESC");
- $criteria2->setOrder("DESC");
- $criteria->setLimit($xoopsModuleConfig['admin_perpage']);
- $criteria2->setLimit($xoopsModuleConfig['admin_perpage']);
- $criteria->setStart($start);
- $criteria2->setStart($start2);
- $reviews = $review_handler->getObjects($criteria);
- $reviews2 = $review_handler->getObjects($criteria2);
-
- wfdownloads_xoops_cp_header();
- $indexAdmin = new ModuleAdmin();
- echo $indexAdmin->addNavigation('review.php');
- //wfdownloads_adminMenu(4, _AM_WFD_AREVIEWS);
-
- echo "
- <fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFD_AREVIEWS_INFO . "</legend>\n
- <div style='padding: 8px;'>" . _AM_WFD_AREVIEWS_WAITING . " <b>$num</b><div>\n
- <div style='padding: 8px;'>" . _AM_WFD_REV_REVIEW_TOTAL . " <b>$num2</b><div>\n
- <div style='padding: 8px;'>\n
- <li>" . $imagearray['approve'] . " " . _AM_WFD_AREVIEWS_APPROVE . "\n
- <li>" . $imagearray['editimg'] . " " . _AM_WFD_AREVIEWS_EDIT . "\n
- <li>" . $imagearray['deleteimg'] . " " . _AM_WFD_AREVIEWS_DELETE . "</div>\n
- </div>\n
- </fieldset><br />\n
-
- <table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>\n
- <tr>\n
- <td class='head' align='center' width = '100%' colspan='6'><b>" . _AM_WFD_REV_REVIEW_WAITING . "</b></td>\n
- </tr><br /><br />\n
- <tr>\n
- <td class='bg3' align='center' width = '3%'><b>" . _AM_WFD_REV_ID . "</b></td>\n
- <td class='bg3' width = '20%'><b>" . _AM_WFD_REV_TITLE . "</b></td>\n
- <td class='bg3' width = '30%'><b>" . _AM_WFD_REV_REVIEWTITLE . "</b></td>\n
- <td class='bg3' align='center' width = '15%'><b>" . _AM_WFD_REV_POSTER . "</b></td>\n
- <td class='bg3' align='center' width = '15%'><b>" . _AM_WFD_REV_SUBMITDATE . "</b></td>\n
- <td class='bg3' align='center' width = '7%'><b>" . _AM_WFD_REV_ACTION . "</b></td>\n
- </tr>\n
- ";
- if ($num > 0)
- {
- foreach (array_keys($reviews) as $i)
- {
- $lids[] = $reviews[$i]->getVar('lid');
- $uids[] = $reviews[$i]->getVar('uid');
+ if ($num_waiting > 0) {
+ foreach ($reviews_waiting as $review_waiting) {
+ $lids_waiting[] = $review_waiting->getVar('lid');
+ $uids_waiting[] = $review_waiting->getVar('uid');
+ }
+ $downloads = $download_handler->getObjects(new Criteria("lid", "(" . implode(',', array_unique($lids_waiting)) . ")", "IN"), true, false);
+ $users = $member_handler->getUserList(new Criteria("uid", "(" . implode(',', $uids_waiting) . ")"));
+ foreach ($reviews_waiting as $review_waiting) {
+ $review_waiting_array = $review_waiting->toArray();
+ $review_waiting_array['download_title'] = isset($downloads[$review_waiting->getVar('lid')]) ? $downloads[$review_waiting->getVar('lid')]['title'] : "";
+ $review_waiting_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($review_waiting->getVar('uid'));
+ $review_waiting_array['formatted_date'] = formatTimestamp($review_waiting->getVar('date'), _DATESTRING);
+ $GLOBALS['xoopsTpl']->append('reviews_waiting', $review_waiting_array);
+ }
+ //Include page navigation
+ include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+ $pagenav_waiting = new XoopsPageNav($num_waiting, $xoopsModuleConfig['admin_perpage'] , $start_waiting, 'start_waiting');
+ $GLOBALS['xoopsTpl']->assign('reviews_waiting_pagenav', $pagenav_waiting -> renderNav());
}
- $download_handler = xoops_getmodulehandler('download');
- $member_handler = xoops_gethandler("member");
- $downloads = $download_handler->getList(new Criteria("lid", "(".implode(',', $lids).")", "IN"));
- $users = $member_handler->getUserList(new Criteria("uid", "(".implode(',', $uids).")"));
-
- foreach (array_keys($reviews) as $i) {
- $review_id = $reviews[$i]->getVar('review_id');
- $review_title = $reviews[$i]->getVar('title');
- $title = isset($downloads[$reviews[$i]->getVar('lid')]) ? $downloads[$reviews[$i]->getVar('lid')] : "";
- $submitter = XoopsUserUtility::getUnameFromId(intval($reviews[$i]->getVar('uid')));
- $datetime = formatTimestamp($reviews[$i]->getVar('date'), $xoopsModuleConfig['dateformat']);
- $status = "<a href='".WFDOWNLOADS_URL."admin/review.php?op=approve_review&review_id=" . intval($review_id) . "'>" . $imagearray['approve'] . "</a>";
- $modify = "<a href='".WFDOWNLOADS_URL."admin/review.php?op=edit_review&review_id=" . intval($review_id) . "'>" . $imagearray['editimg'] . "</a>";
- $delete = "<a href='".WFDOWNLOADS_URL."admin/review.php?op=del_review&review_id=" . intval($review_id) . "'>" . $imagearray['deleteimg'] . "</a>";
- echo "
- <tr>\n
- <td class='head' align='center'>" . $review_id . "</td>\n
- <td class='even' nowrap><a href='".WFDOWNLOADS_URL."admin/main.php?op=Download&lid=" . intval($reviews[$i]->getVar('lid')) . "'>" . $title . "</a></td>\n
- <td class='even' nowrap><a href='".WFDOWNLOADS_URL."admin/review.php?op=edit_review&review_id=" . intval($review_id) . "'>" . $review_title . "</a></td>\n
- <td class='even' align='center' nowrap>$submitter</td>\n
- <td class='even' align='center'>" . $datetime . "</td>\n
- <td class='even' align='center' nowrap>$status $modify $delete</td>\n
- </tr>\n
- ";
+ if ($num_published > 0) {
+ foreach ($reviews_published as $review_published) {
+ $lids_published[] = $review_published->getVar('lid');
+ $uids_published[] = $review_published->getVar('uid');
+ }
+ $downloads = $download_handler->getObjects(new Criteria("lid", "(" . implode(',', array_unique($lids_published)) . ")", "IN"), true, false);
+ $users = $member_handler->getUserList(new Criteria("uid", "(" . implode(',', $uids_published) . ")"));
+ foreach ($reviews_published as $review_published) {
+ $review_published_array = $review_published->toArray();
+ $review_published_array['download_title'] = isset($downloads[$review_published->getVar('lid')]) ? $downloads[$review_published->getVar('lid')]['title'] : "";
+ $review_published_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($review_published->getVar('uid'));
+ $review_published_array['formatted_date'] = formatTimestamp($review_published->getVar('date'), _DATESTRING);
+ $GLOBALS['xoopsTpl']->append('reviews_published', $review_published_array);
+ }
+ //Include page navigation
+ include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+ $pagenav_published = new XoopsPageNav($num_published, $xoopsModuleConfig['admin_perpage'] , $start_published, 'start_published');
+ $GLOBALS['xoopsTpl']->assign('reviews_published_pagenav', $pagenav_published -> renderNav());
}
- }
- else
- {
- echo "<tr...
[truncated message content] |
|
From: <luc...@us...> - 2013-05-31 23:11:36
|
Revision: 11606
http://sourceforge.net/p/xoops/svn/11606
Author: luciorota
Date: 2013-05-31 23:11:31 +0000 (Fri, 31 May 2013)
Log Message:
-----------
admin side: now mirrors manager uses templates
admin side: now reviewss manager uses templates
admin side: now votes manager uses templates
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokendown.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirror.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/review.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/votedata.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/mimetype.php
XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/trunk/wfdownloads/include/update.php
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_categorylist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_reviewlist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_votedatalist.html
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Added Paths:
-----------
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_mirrorlist.html
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-05-30 21:46:33 UTC (rev 11605)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-05-31 23:11:31 UTC (rev 11606)
@@ -18,34 +18,35 @@
* @author WF-Sections, Xoops Development Team, luciorota
* @version svn:$Id$
*/
-$path = dirname(dirname(dirname(dirname(__FILE__))));
-include_once $path . '/mainfile.php';
-include_once $path . '/include/cp_functions.php';
-require_once $path . '/include/cp_header.php';
+include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
+$thisModuleDirname = basename(dirname(dirname( __FILE__ ) ));
-include_once(XOOPS_ROOT_PATH . '/modules/wfdownloads/include/functions.php');
-include_once(XOOPS_ROOT_PATH . '/modules/wfdownloads/include/common.php');
-
+// Include xoops admin header
+include_once XOOPS_ROOT_PATH . '/include/cp_header.php';
include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+include_once XOOPS_ROOT_PATH . '/class/tree.php';
+include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+xoops_load ('XoopsUserUtility');
-$myts = &MyTextSanitizer::getInstance();
+$module_handler =& xoops_gethandler('module');
+$xoopsModule = & $module_handler->getByDirname($thisModuleDirname);
-global $xoopsModule;
+$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
+$pathImageIcon = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16');
+$pathImageAdmin = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32');
+$pathImageModule = XOOPS_URL . '/modules/'. $thisModuleDirname .'/images';
-$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
-
-//if functions.php file exist
-//require_once dirname(dirname(__FILE__)) . '/include/functions.php';
-
-// Load language files
-xoops_loadLanguage('admin', $thisModuleDir);
-xoops_loadLanguage('modinfo', $thisModuleDir);
-xoops_loadLanguage('main', $thisModuleDir);
-
$pathIcon16 = '../' . $xoopsModule->getInfo('icons16');
$pathIcon32 = '../' . $xoopsModule->getInfo('icons32');
$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
+
+include_once(XOOPS_ROOT_PATH . '/modules/wfdownloads/include/functions.php');
+include_once(XOOPS_ROOT_PATH . '/modules/wfdownloads/include/common.php');
+
+$myts = &MyTextSanitizer::getInstance();
+
+
$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'>",
@@ -69,7 +70,7 @@
if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php'))){
include_once $GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php');
} else {
- redirect_header("../../../admin.php", 5, _AM_BIRTHDAY_MODULEADMIN_MISSING, false);
+ redirect_header("../../../admin.php", 5, _AM_WFD_MODULEADMIN_MISSING, false);
}
if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
@@ -77,12 +78,18 @@
$xoopsTpl = new XoopsTpl();
}
-$report_handler = xoops_getmodulehandler('report', $GLOBALS['xoopsModule']->getVar('dirname'));
-$review_handler = xoops_getmodulehandler('review', $GLOBALS['xoopsModule']->getVar('dirname'));
-$mirror_handler = xoops_getmodulehandler('mirror', $GLOBALS['xoopsModule']->getVar('dirname'));
-$modification_handler = xoops_getmodulehandler('modification', $GLOBALS['xoopsModule']->getVar('dirname'));
-$download_handler = xoops_getmodulehandler('download', $GLOBALS['xoopsModule']->getVar('dirname'));
-$category_handler = xoops_getmodulehandler('category', $GLOBALS['xoopsModule']->getVar('dirname'));
-$mime_handler = xoops_getmodulehandler('mimetype', $GLOBALS['xoopsModule']->getVar('dirname'));
+// Load language files
+xoops_loadLanguage('admin', $thisModuleDirname);
+xoops_loadLanguage('modinfo', $thisModuleDirname);
+xoops_loadLanguage('main', $thisModuleDirname);
+// LOad handlers
+$report_handler = xoops_getmodulehandler('report', $thisModuleDirname);
+$review_handler = xoops_getmodulehandler('review', $thisModuleDirname);
+$mirror_handler = xoops_getmodulehandler('mirror', $thisModuleDirname);
+$modification_handler = xoops_getmodulehandler('modification', $thisModuleDirname);
+$download_handler = xoops_getmodulehandler('download', $thisModuleDirname);
+$category_handler = xoops_getmodulehandler('category', $thisModuleDirname);
+$mime_handler = xoops_getmodulehandler('mimetype', $thisModuleDirname);
+
$member_handler = xoops_gethandler("member");
\ No newline at end of file
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokendown.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokendown.php 2013-05-30 21:46:33 UTC (rev 11605)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokendown.php 2013-05-31 23:11:31 UTC (rev 11606)
@@ -18,6 +18,7 @@
* @author WF-Sections, Xoops Development Team, luciorota
* @version svn:$Id$
*/
+ $currentFile = basename(__FILE__);
include 'admin_header.php';
$op = '';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php 2013-05-30 21:46:33 UTC (rev 11605)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php 2013-05-31 23:11:31 UTC (rev 11606)
@@ -18,6 +18,7 @@
* @author WF-Sections, Xoops Development Team, luciorota
* @version svn:$Id$
*/
+$currentFile = basename(__FILE__);
include 'admin_header.php';
include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
include_once XOOPS_ROOT_PATH . '/class/tree.php';
@@ -77,10 +78,10 @@
$source = wfdownloads_CleanVars($_POST, 'source', 0, 'int');
$target = wfdownloads_CleanVars($_POST, 'target', 0, 'int');
if ($target == $source) {
- redirect_header(WFDOWNLOADS_URL . "admin/category.php?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_WFD_CCATEGORY_MODIFY_FAILED);
}
if (!$target) {
- redirect_header(WFDOWNLOADS_URL . "admin/category.php?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_WFD_CCATEGORY_MODIFY_FAILEDT);
}
$download_handler = xoops_getmodulehandler('download');
$result = $download_handler->updateAll("cid", $target, new Criteria("cid", $source), true);
@@ -88,7 +89,7 @@
$error = _AM_WFD_DBERROR;
trigger_error($error, E_USER_ERROR);
}
- redirect_header(WFDOWNLOADS_URL . 'admin/category.php', 1, _AM_WFD_CCATEGORY_MODIFY_MOVED);
+ redirect_header($currentFile, 1, _AM_WFD_CCATEGORY_MODIFY_MOVED);
exit();
}
break;
@@ -163,7 +164,7 @@
wfd_save_Permissions($down_groups, $cid, 'WFDownCatPerm');
wfd_save_Permissions($up_groups, $cid, 'WFUpCatPerm');
}
- redirect_header(WFDOWNLOADS_URL . 'admin/category.php', 1, $database_mess);
+ redirect_header($currentFile, 1, $database_mess);
break;
case "category.delete" :
@@ -212,11 +213,11 @@
xoops_groupperm_deletebymoditem ($xoopsModule -> getVar('mid'), 'WFUpCatPerm', $cid);
}
- redirect_header(WFDOWNLOADS_URL . 'admin/category.php', 1, _AM_WFD_CCATEGORY_DELETED);
+ redirect_header($currentFile, 1, _AM_WFD_CCATEGORY_DELETED);
exit();
} else {
wfdownloads_xoops_cp_header();
- xoops_confirm(array('op' => 'category.delete', 'cid' => $cid, 'ok' => true), 'category.php', _AM_WFD_CCATEGORY_AREUSURE);
+ xoops_confirm(array('op' => 'category.delete', 'cid' => $cid, 'ok' => true), $currentFile, _AM_WFD_CCATEGORY_AREUSURE);
xoops_cp_footer();
}
break;
@@ -227,10 +228,10 @@
$cid = wfdownloads_CleanVars($_REQUEST, 'cid', 0, 'int');
wfdownloads_xoops_cp_header();
$indexAdmin = new ModuleAdmin();
- echo $indexAdmin->addNavigation('category.php');
+ echo $indexAdmin->addNavigation($currentFile);
$adminMenu = new ModuleAdmin();
- $adminMenu->addItemButton(_MI_WFD_BINDEX, 'category.php?op=categories.list', 'list');
- $adminMenu->addItemButton(_AM_WFD_CCATEGORY_CREATENEW, 'category.php?op=category.add', 'add');
+ $adminMenu->addItemButton(_MI_WFD_BINDEX, "{$currentFile}?op=categories.list", 'list');
+ $adminMenu->addItemButton(_AM_WFD_CCATEGORY_CREATENEW, "{$currentFile}?op=category.add", 'add');
echo $adminMenu->renderButton();
createcat($cid);
@@ -242,11 +243,11 @@
default :
wfdownloads_xoops_cp_header();
$indexAdmin = new ModuleAdmin();
- echo $indexAdmin->addNavigation('category.php');
+ echo $indexAdmin->addNavigation($currentFile);
$adminMenu = new ModuleAdmin();
- $adminMenu->addItemButton(_MI_WFD_BINDEX, 'category.php?op=categories.list', 'list');
- $adminMenu->addItemButton(_AM_WFD_CCATEGORY_CREATENEW, 'category.php?op=category.add', 'add');
+ $adminMenu->addItemButton(_MI_WFD_BINDEX, "{$currentFile}?op=categories.list", 'list');
+ $adminMenu->addItemButton(_AM_WFD_CCATEGORY_CREATENEW, "{$currentFile}?op=category.add", 'add');
echo $adminMenu->renderButton();
$totalCategories = wfd_totalcategory();
@@ -256,29 +257,30 @@
$GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML() );
$GLOBALS['xoopsTpl']->display("db:wfdownloads_admin_categorylist.html");
} else {
- redirect_header('category.php?op=category.add', 1, _AM_WFD_CCATEGORY_NOEXISTS);
+ redirect_header("{$currentFile}?op=category.add", 1, _AM_WFD_CCATEGORY_NOEXISTS);
}
include 'admin_footer.php';
break;
-case 'categories.reorder' :
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
- }
- $category_handler = xoops_getmodulehandler('category', 'wfdownloads');
- if (isset($_POST['category_ids']) && count($_POST['category_ids']) > 0) {
- $new_weights = $_POST['new_weights'];
- $ids = array();
- foreach ($new_weights as $cid => $new_weight ) {
- $category = $category_handler->get($cid);
- $category->setVar('weight', $new_weight);
- if (!$category_handler->insert($category)) {
- redirect_header('category.php', 3, $category->getErrors());
+ case 'categories.reorder' :
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
+ }
+
+ $category_handler = xoops_getmodulehandler('category', 'wfdownloads');
+ if (isset($_POST['new_weights']) && count($_POST['new_weights']) > 0) {
+ $new_weights = $_POST['new_weights'];
+ $ids = array();
+ foreach ($new_weights as $cid => $new_weight ) {
+ $category = $category_handler->get($cid);
+ $category->setVar('weight', $new_weight);
+ if (!$category_handler->insert($category)) {
+ redirect_header($currentFile, 3, $category->getErrors());
+ }
+ unset($category);
}
- unset($category);
+ redirect_header($currentFile, 1, _AM_WFD_CATEGORIES_REORDERED);
+ exit();
}
- redirect_header('category.php?op=categories.list', 1, _AM_WFD_CATEGORIES_REORDERED);
- exit();
- }
- break;
+ break;
}
\ No newline at end of file
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php 2013-05-30 21:46:33 UTC (rev 11605)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php 2013-05-31 23:11:31 UTC (rev 11606)
@@ -18,6 +18,7 @@
* @author WF-Sections, Xoops Development Team, luciorota
* @version svn:$Id$
*/
+$currentFile = basename(__FILE__);
include 'admin_header.php';
include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
@@ -37,11 +38,11 @@
if ($numrows) {
wfdownloads_xoops_cp_header();
$indexAdmin = new ModuleAdmin();
- echo $indexAdmin->addNavigation('download.php');
+ echo $indexAdmin->addNavigation($currentFile);
$adminMenu = new ModuleAdmin();
- $adminMenu->addItemButton(_MI_WFD_BINDEX, 'download.php?op=downloads.list', 'list');
- $adminMenu->addItemButton(_AM_WFD_FFS_DOWNLOADTITLE, 'download.php?op=download.add', 'add');
+ $adminMenu->addItemButton(_MI_WFD_BINDEX, "{$currentFile}?op=downloads.list", 'list');
+ $adminMenu->addItemButton(_AM_WFD_FFS_DOWNLOADTITLE, "{$currentFile}?op=download.add", 'add');
echo $adminMenu->renderButton();
// allowed mimetypes list
@@ -57,12 +58,12 @@
if ($lid) {
if (!$download = $download_handler->get($lid)) {
- redirect_header('download.php', 4, _AM_WFD_DOWN_ERROR_FILENOTFOUND);
+ redirect_header($currentFile, 4, _AM_WFD_DOWN_ERROR_FILENOTFOUND);
exit();
}
$cid = $download->getVar('cid');
if(!$category = $category_handler->get($cid)) {
- redirect_header('download.php', 4, _AM_WFD_DOWN_ERROR_CATEGORYNOTFOUND);
+ redirect_header($currentFile, 4, _AM_WFD_DOWN_ERROR_CATEGORYNOTFOUND);
exit();
}
$title = preg_replace("/{category}/", $category->getVar('title'), _AM_WFD_FFS_EDITDOWNLOADTITLE);
@@ -106,7 +107,7 @@
$sform->display();
// changed - end - March 4 2006 - jpc
} else {
- redirect_header(WFDOWNLOADS_URL . 'admin/category.php?', 1, _AM_WFD_CCATEGORY_NOEXISTS);
+ redirect_header('category.php', 1, _AM_WFD_CCATEGORY_NOEXISTS);
exit();
}
@@ -177,7 +178,7 @@
<td class='even'>$uservotes</th>\n
<td class='even'>$formatted_date</th>\n
<td class='even'>\n
- <a href='" . WFDOWNLOADS_URL . "admin/download.php?op=vote.delete&lid={$lid}&rid=" . $regvotes[$i]->getVar('ratingid') . "'>" . $imagearray['deleteimg'] . "</a>\n
+ <a href='{$currentFile}?op=vote.delete&lid={$lid}&rid=" . $regvotes[$i]->getVar('ratingid') . "'>" . $imagearray['deleteimg'] . "</a>\n
</th></tr>\n
";
}
@@ -218,7 +219,7 @@
<td class='even'>$uservotes</th>\n
<td class='even'>$formatted_date</th>\n
<td class='even'>\n
- <a href='" . WFDOWNLOADS_URL . "admin/download.php?op=vote.delete&lid=" . $lid . "&rid=" . $anonvotes[$i]->getVar('ratingid') . "'>" . $imagearray['deleteimg'] . "</a>\n
+ <a href='{$currentFile}?op=vote.delete&lid={$lid}&rid=" . $anonvotes[$i]->getVar('ratingid') . "'>" . $imagearray['deleteimg'] . "</a>\n
</th></tr>\n
";
}
@@ -266,7 +267,7 @@
$download->setVar('filename', $filename);
$download->setVar('filetype', $filetype);
} else {
- $down = wfd_uploading($_FILES, $xoopsModuleConfig['uploaddir'], "", "download.php", 0, 0);
+ $down = wfd_uploading($_FILES, $xoopsModuleConfig['uploaddir'], "", $currentFile, 0, 0);
$url = ($_POST["url"] != "http://") ? $_POST["url"] : '';
$size = $down['size'];
$title = $_FILES['userfile']['name'];
@@ -451,13 +452,13 @@
if (!$lid) {
$tags = array();
$tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL . 'singlefile.php?cid=' . $cid . '&lid=' . $newid;
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . "singlefile.php?cid={$cid}&lid={$newid}";
// changed - start - March 4 2006 - jpc
//$category_handler = xoops_getmodulehandler('category');
//$category = $category_handler->get($cid);
// changed - end - March 4 2006 - jpc
$tags['CATEGORY_NAME'] = $category->getVar('title');
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . 'viewcat.php?cid=' . $cid;
+ $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "viewcat.php?cid={$cid}";
$notification_handler = & xoops_gethandler('notification');
$notification_handler -> triggerEvent('global', 0, 'new_file', $tags);
$notification_handler -> triggerEvent('category', $cid, 'new_file', $tags);
@@ -465,7 +466,7 @@
if ($lid && $approved && $notifypub) {
$tags = array();
$tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL . 'singlefile.php?cid=' . $cid . '&lid=' . $lid;
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . "singlefile.php?cid={$cid}&lid={$lid}";
$category_handler = xoops_getmodulehandler('category');
$category = $category_handler->get($cid);
$tags['CATEGORY_NAME'] = $category->getVar('title');
@@ -478,7 +479,7 @@
$message = (!$lid) ? _AM_WFD_FILE_NEWFILEUPLOAD : _AM_WFD_FILE_FILEMODIFIEDUPDATE ;
$message = ($lid && !$_POST['was_published'] && $approved) ? _AM_WFD_FILE_FILEAPPROVED : $message;
- redirect_header(WFDOWNLOADS_URL . 'admin/download.php', 1, $message);
+ redirect_header($currentFile, 1, $message);
}
@@ -503,7 +504,7 @@
$ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
$download_handler = xoops_getmodulehandler('download');
if (!$download = $download_handler->get($lid)) {
- redirect_header('download.php', 4, _AM_WFD_DOWN_ERROR_FILENOTFOUND);
+ redirect_header($currentFile, 4, _AM_WFD_DOWN_ERROR_FILENOTFOUND);
exit();
}
$title = $download->getVar('title');
@@ -514,11 +515,11 @@
@unlink($file);
}
$download_handler->delete($download);
- redirect_header(WFDOWNLOADS_URL . 'admin/download.php', 1, sprintf(_AM_WFD_FILE_FILEWASDELETED, $title));
+ redirect_header($currentFile, 1, sprintf(_AM_WFD_FILE_FILEWASDELETED, $title));
exit();
} else {
wfdownloads_xoops_cp_header();
- xoops_confirm(array('op' => 'download.delete', 'lid' => $lid, 'ok' => true, 'title' => $title), 'download.php', _AM_WFD_FILE_REALLYDELETEDTHIS . "<br /><br>" . $title, _DELETE);
+ xoops_confirm(array('op' => 'download.delete', 'lid' => $lid, 'ok' => true, 'title' => $title), $currentFile, _AM_WFD_FILE_REALLYDELETEDTHIS . "<br /><br>" . $title, _DELETE);
xoops_cp_footer();
}
break;
@@ -530,13 +531,13 @@
if ($rating_handler->delete($rating, true)) {
wfd_updaterating(intval($rating->getVar('lid')));
}
- redirect_header(WFDOWNLOADS_URL . 'admin/download.php', 1, _AM_WFD_VOTE_VOTEDELETED);
+ redirect_header($currentFile, 1, _AM_WFD_VOTE_VOTEDELETED);
break;
// added - start - March 4 2006 - jpc
case "patch_formulize" :
if(!isset($_POST['patch_formulize'])) {
- print "<form action=\"download.php?op=patch_formulize\" method=post>";
+ print "<form action=\"{$currentFile}?op=patch_formulize\" method=post>";
print "<input type = submit name=patch_formulize value=\"Apply Patch for Formulize\">";
print "</form>";
} else {
@@ -575,11 +576,11 @@
wfdownloads_xoops_cp_header();
$indexAdmin = new ModuleAdmin();
- echo $indexAdmin->addNavigation('download.php');
+ echo $indexAdmin->addNavigation($currentFile);
$adminMenu = new ModuleAdmin();
- $adminMenu->addItemButton(_MI_WFD_BINDEX, 'download.php?op=list', 'list');
- $adminMenu->addItemButton(_AM_WFD_FFS_DOWNLOADTITLE, 'download.php?op=Download', 'add');
+ $adminMenu->addItemButton(_MI_WFD_BINDEX, $currentFile . "?op=list", 'list');
+ $adminMenu->addItemButton(_AM_WFD_FFS_DOWNLOADTITLE, $currentFile . "?op=Download", 'add');
echo $adminMenu->renderButton();
if ($totaldownloads > 0) {
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php 2013-05-30 21:46:33 UTC (rev 11605)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php 2013-05-31 23:11:31 UTC (rev 11606)
@@ -18,6 +18,7 @@
* @author WF-Sections, Xoops Development Team, luciorota
* @version svn:$Id$
*/
+$currentFile = basename(__FILE__);
include 'admin_header.php';
$op = wfdownloads_CleanVars($_REQUEST, 'op', '', 'string');
@@ -121,7 +122,7 @@
if (!$result) {
trigger_error($error, E_USER_ERROR);
}
- redirect_header(WFDOWNLOADS_URL . "admin/mimetypes.php?start=" . intval($_GET['start']) . "", 0, _AM_WFD_MIME_MODIFIED);
+ redirect_header("{$currentFile}?start=" . intval($_GET['start']) . "", 0, _AM_WFD_MIME_MODIFIED);
break;
case 'mimetype.save':
@@ -139,7 +140,7 @@
trigger_error($error, E_USER_ERROR);
}
$dbupted = ($mime_id == 0) ? _AM_WFD_MIME_CREATED : _AM_WFD_MIME_MODIFIED;
- redirect_header('amimetypes.php', 1, $dbupted);
+ redirect_header($currentFile, 1, $dbupted);
break;
case 'saveall':
@@ -158,7 +159,7 @@
$error = "Could not update mimetype information:";
trigger_error($error, E_USER_ERROR);
}
- redirect_header(WFDOWNLOADS_URL.'admin/mimetypes.php', 1, _AM_WFD_MIME_MODIFIED);
+ redirect_header($currentFile, 1, _AM_WFD_MIME_MODIFIED);
break;
case "mimetype.delete":
@@ -168,7 +169,7 @@
$mimetype = $mime_handler->get($mime_id);
if ($ok == true) {
if ($mime_handler->delete($mimetype)) {
- redirect_header('mimetypes.php', 1, sprintf(_AM_WFD_MIME_MIMEDELETED, $mimetype->getVar('mime_name')));
+ redirect_header($currentFile, 1, sprintf(_AM_WFD_MIME_MIMEDELETED, $mimetype->getVar('mime_name')));
} else {
$error = "" . _AM_WFD_EVENNEWS_DBERROR . ": <br /><br />" . $sql;
trigger_error($error, E_USER_ERROR);
@@ -176,7 +177,7 @@
exit();
} else {
wfdownloads_xoops_cp_header();
- xoops_confirm(array('op' => 'mimetype.delete', 'mime_id' => $mime_id, 'ok' => true), WFDOWNLOADS_URL . 'admin/mimetypes.php', _AM_WFD_MIME_DELETETHIS . "<br /><br>" . $mimetype->getVar('mime_name'), _AM_WFD_MIME_DELETE);
+ xoops_confirm(array('op' => 'mimetype.delete', 'mime_id' => $mime_id, 'ok' => true), $currentFile, _AM_WFD_MIME_DELETETHIS . "<br /><br>" . $mimetype->getVar('mime_name'), _AM_WFD_MIME_DELETE);
xoops_cp_footer();
}
break;
@@ -202,7 +203,7 @@
wfdownloads_xoops_cp_header();
$indexAdmin = new ModuleAdmin();
- echo $indexAdmin->addNavigation('mimetypes.php');
+ echo $indexAdmin->addNavigation($currentFile);
echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFD_MIME_MODIFYF . "</legend>\n";
echo "<div style='padding: 8px;'>" . _AM_WFD_MIME_INFOTEXT . "</div>\n";
@@ -248,18 +249,18 @@
echo "</tr>";
foreach (array_keys($mimetypes) as $i) {
echo "<tr>";
- $image_array = array("<a href='".WFDOWNLOADS_URL . "admin/mimetypes.php?op=edit&mime_id=" . $mimetypes[$i]->getVar('mime_id') . "'>" . $imagearray['editimg'] . "</a>
- <a href='" . WFDOWNLOADS_URL . "admin/mimetypes.php?op=delete&mime_id=" . $mimetypes[$i]->getVar('mime_id') . "'>" . $imagearray['deleteimg'] . "</a>");
+ $image_array = array("<a href='{$currentFile}?op=mimetype.edit&mime_id=" . $mimetypes[$i]->getVar('mime_id') . "'>" . $imagearray['editimg'] . "</a>
+ <a href='{$currentFile}?op=mimetype.delete&mime_id=" . $mimetypes[$i]->getVar('mime_id') . "'>" . $imagearray['deleteimg'] . "</a>");
echo "<td align='center' class='head'>" . $mimetypes[$i]->getVar('mime_id') . "</td>";
echo "<td class='even'>" . $mimetypes[$i]->getVar('mime_name') . "</td>";
echo "<td align='center' class='even'>." . $mimetypes[$i]->getVar('mime_ext') . "</td>";
$yes_admin_image = ($mimetypes[$i]->getVar('mime_admin')) ? $imagearray['online'] : $imagearray['offline'];
- $image_admin = "<a href='" . WFDOWNLOADS_URL . "admin/mimetypes.php?op=update&admin=1&mime_id=" . $mimetypes[$i]->getVar('mime_id') . "&start=" . $start . "'>" . $yes_admin_image . "</a>";
+ $image_admin = "<a href='{$currentFile}?op=update&admin=1&mime_id=" . $mimetypes[$i]->getVar('mime_id') . "&start=" . $start . "'>" . $yes_admin_image . "</a>";
echo "<td align='center' width='10%' class='even'>" . $image_admin . "</td>";
$yes_user_image = ($mimetypes[$i]->getVar('mime_user')) ? $imagearray['online'] : $imagearray['offline'];
- $image_user = "<a href='" . WFDOWNLOADS_URL . "admin/mimetypes.php?op=update&user=1&mime_id=" . $mimetypes[$i]->getVar('mime_id') . "&start=" . $start . "'>" . $yes_user_image . "</a>";
+ $image_user = "<a href='{$currentFile}?op=update&user=1&mime_id=" . $mimetypes[$i]->getVar('mime_id') . "&start=" . $start . "'>" . $yes_user_image . "</a>";
echo "<td align='center' width='10%' class='even'>" . $image_user . "</td>";
echo "<td align='center' class='even'>";
foreach ($image_array as $images) {
@@ -272,12 +273,12 @@
echo "<td class='even'></td>\n";
echo "<td align='center' class='even'></td>\n";
- $admin_imgon = "<a href='" . WFDOWNLOADS_URL . "admin/mimetypes.php?op=saveall&admin=1&type_all=1'>" . $imagearray['online'] . "</a>";
- $admin_imgoff = "<a href='" . WFDOWNLOADS_URL . "admin/mimetypes.php?op=saveall&admin=1&type_all=0'>" . $imagearray['offline'] . "</a>";
+ $admin_imgon = "<a href='{$currentFile}?op=saveall&admin=1&type_all=1'>" . $imagearray['online'] . "</a>";
+ $admin_imgoff = "<a href='{$currentFile}?op=saveall&admin=1&type_all=0'>" . $imagearray['offline'] . "</a>";
echo "<td align='center' width='10%' class='even'>" . $admin_imgon . " " . $admin_imgoff . "</td>";
- $user_imgon = "<a href='" . WFDOWNLOADS_URL . "admin/mimetypes.php?op=saveall&user=1&type_all=1'>" . $imagearray['online'] . "</a>";
- $user_imgoff = "<a href='" . WFDOWNLOADS_URL . "admin/mimetypes.php?op=saveall&user=1&type_all=0'>" . $imagearray['offline'] . "</a>";
+ $user_imgon = "<a href='{$currentFile}?op=saveall&user=1&type_all=1'>" . $imagearray['online'] . "</a>";
+ $user_imgoff = "<a href='{$currentFile}?op=saveall&user=1&type_all=0'>" . $imagearray['offline'] . "</a>";
echo "<td align='center' width='10%' class='even'>" . $user_imgon . " " . $user_imgoff . "</td>\n";
echo "<td align='center' class='even'>\n";
echo "</td></tr>\n";
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirror.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirror.php 2013-05-30 21:46:33 UTC (rev 11605)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirror.php 2013-05-31 23:11:31 UTC (rev 11606)
@@ -18,96 +18,140 @@
* @author WF-Sections, Xoops Development Team, luciorota
* @version svn:$Id$
*/
+$currentFile = basename(__FILE__);
include 'admin_header.php';
-$op = '';
+$op = wfdownloads_Clea...
[truncated message content] |
|
From: <luc...@us...> - 2013-06-02 20:07:01
|
Revision: 11608
http://sourceforge.net/p/xoops/svn/11608
Author: luciorota
Date: 2013-06-02 20:06:58 +0000 (Sun, 02 Jun 2013)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Added Paths:
-----------
XoopsModules/wfdownloads/trunk/wfdownloads/images/wfdownloads_logo.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/wfdownloads_logo.png
XoopsModules/wfdownloads/trunk/wfdownloads/include/module.php
Removed Paths:
-------------
XoopsModules/wfdownloads/trunk/wfdownloads/images/module_logo.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/module_logo.png
XoopsModules/wfdownloads/trunk/wfdownloads/include/update.php
Deleted: XoopsModules/wfdownloads/trunk/wfdownloads/images/module_logo.gif
===================================================================
(Binary files differ)
Deleted: XoopsModules/wfdownloads/trunk/wfdownloads/images/module_logo.png
===================================================================
(Binary files differ)
Copied: XoopsModules/wfdownloads/trunk/wfdownloads/images/wfdownloads_logo.gif (from rev 11600, XoopsModules/wfdownloads/trunk/wfdownloads/images/module_logo.gif)
===================================================================
(Binary files differ)
Copied: XoopsModules/wfdownloads/trunk/wfdownloads/images/wfdownloads_logo.png (from rev 11600, XoopsModules/wfdownloads/trunk/wfdownloads/images/module_logo.png)
===================================================================
(Binary files differ)
Copied: XoopsModules/wfdownloads/trunk/wfdownloads/include/module.php (from rev 11606, XoopsModules/wfdownloads/trunk/wfdownloads/include/update.php)
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/module.php (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/module.php 2013-06-02 20:06:58 UTC (rev 11608)
@@ -0,0 +1,468 @@
+<?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.
+ */
+/**
+ * WF-Downloads module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package wfdownload
+ * @since 3.23
+ * @author WF-Sections, Xoops Development Team, luciorota
+ * @version svn:$Id$
+ */
+if (!defined("XOOPS_ROOT_PATH")) {
+ die("Xoops root path not defined");
+}
+include_once(XOOPS_ROOT_PATH . "/modules/wfdownloads/class/dbupdater.php");
+include_once(XOOPS_ROOT_PATH . "/modules/wfdownloads/include/functions.php");
+@include_once(XOOPS_ROOT_PATH . "/modules/wfdownloads/language/" . $xoopsConfig['language'] . "/admin.php");
+
+function xoops_module_update_wfdownloads($module, $prev_version) {
+ ob_start();
+ invert_nohtm_dohtml_values();
+ if ($prev_version <= 322)
+ update_tables_to_322($module);
+ if ($prev_version <= 323)
+ update_permissions_to_323($module);
+ update_tables_to_323($module);
+ $feedback = ob_get_clean();
+ if (method_exists($module, "setMessage")) {
+ $module->setMessage($feedback);
+ } else {
+ echo $feedback;
+ }
+ wfdownloads_SetMeta("version", "3.23"); //Set meta version to current
+ return true;
+}
+
+// =========================================================================================
+// This function updates any existing table of a 2.x version to the format used
+// in the release of WF-Downloads 3.00
+// =========================================================================================
+function update_tables_to_323($module) {
+ $ret = array();
+ global $xoopsDB;
+/* IN PROGRESS
+ $cat_handler = xoops_getmodulehandler('category', 'wfdownloads');
+ $result = $xoopsDB->query("SHOW COLUMNS FROM " . $cat_handler->table);
+ while ($existing_field = $xoopsDB->fetchArray($result)) {
+ $fields[$existing_field['Field']] = $existing_field['Type'];
+ }
+ if (in_array("nohtml", array_keys($fields))) {
+ $dbupdater = new WfdownloadsDbupdater();
+ //Invert column values
+ // alter options in wfdownloads_cat
+ $table = new WfdownloadsTable('wfdownloads_cat');
+ $table->addAlteredField('nohtml', "dohtml tinyint(1) NOT NULL DEFAULT '1'");
+ $table->addAlteredField('nosmiley', "dosmiley tinyint(1) NOT NULL DEFAULT '1'");
+ $table->addAlteredField('noxcodes', "doxcode tinyint(1) NOT NULL DEFAULT '1'");
+ $table->addAlteredField('noimages', "doimage tinyint(1) NOT NULL DEFAULT '1'");
+ $table->addAlteredField('nobreak', "dobr tinyint(1) NOT NULL DEFAULT '1'");
+
+ //inverting values no=1 <=> do=0
+ // have to store teporarly as value = 2 to
+ // avoid putting everithing to same value
+ // if you change 1 to 0, then 0 to one,
+ // every value will be 1, follow me?
+ $table->addUpdatedWhere('dohtml', 2,'=1');
+ $table->addUpdatedWhere('dohtml', 1,'=0');
+ $table->addUpdatedWhere('dohtml', 0,'=2');
+
+ $table->addUpdatedWhere('dosmiley', 2,'=1');
+ $table->addUpdatedWhere('dosmiley', 1,'=0');
+ $table->addUpdatedWhere('dosmiley', 0,'=2');
+
+ $table->addUpdatedWhere('doxcode', 2,'=1');
+ $table->addUpdatedWhere('doxcode', 1,'=0');
+ $table->addUpdatedWhere('doxcode', 0,'=2');
+
+ $table->addUpdatedWhere('doimage', 2,'=1');
+ $table->addUpdatedWhere('doimage', 1,'=0');
+ $table->addUpdatedWhere('doimage', 0,'=2');
+ $ret = $dbupdater->updateTable($table);
+ }
+*/
+ return $ret;
+}
+
+// =========================================================================================
+// This function updates permissions to WF-Downloads 3.23 permissions
+// add 'WFUpCatPerm' permission where is set 'WFDownCatPerm' permission
+// =========================================================================================
+function update_permissions_to_323($module) {
+ $gperm_handler = & xoops_gethandler('groupperm');
+ $category_handler = xoops_getmodulehandler('category', $module->dirname());
+
+
+ $cids = $category_handler->getIds();
+ if (count($cids) > 0) {
+ echo "<br /><B>Adding upload permissions to categories</B><br />";
+ foreach ($cids as $cid) {
+ $down_groups_ids = $gperm_handler->getGroupIds('WFDownCatPerm', $cid, $module->mid());
+ foreach ($down_groups_ids as $down_group_id) {
+ //$gperm_handler->deleteByModule($module->mid(), 'WFUpCatPerm', $cid);
+ $gperm_handler->addRight('WFUpCatPerm', $cid, $down_group_id, $module->mid());
+ }
+ }
+ } else {
+ echo "<br /><B>No categories, no permissions</B><br />";
+ }
+}
+
+// =========================================================================================
+// This function updates any existing table of a 2.x version to the format used
+// in the release of WF-Downloads 3.00
+// =========================================================================================
+function update_tables_to_322($module) {
+ $dbupdater = new WfdownloadsDbupdater();
+
+ if (!wfdownloads_TableExists('wfdownloads_meta')) {
+ // Create table wfdownloads_meta
+ $table = new WfdownloadsTable('wfdownloads_meta');
+ $table->setStructure("CREATE TABLE %s (
+ metakey varchar(50) NOT NULL default '',
+ metavalue varchar(255) NOT NULL default '',
+ PRIMARY KEY (metakey))
+ ENGINE=MyISAM;");
+ $table->setData(sprintf("'version', %s", round($GLOBALS['xoopsModule']->getVar('version') / 100, 2)));
+ if ($dbupdater->updateTable($table)) {
+ echo "wfdownloads_meta table created<br />";
+ }
+ }
+
+ if (!wfdownloads_TableExists('wfdownloads_mirrors')) {
+ // Create table wfdownloads_mirror
+ $table = new WfdownloadsTable('wfdownloads_mirrors');
+ $table->setStructure("CREATE TABLE %s (
+ mirror_id int(11) unsigned NOT NULL auto_increment,
+ lid int(11) NOT NULL default '0',
+ title varchar(255) NOT NULL default '',
+ homeurl varchar(100) NOT NULL default '',
+ location varchar(255) NOT NULL default '',
+ continent varchar(255) NOT NULL default '',
+ downurl varchar(255) NOT NULL default '',
+ submit int(11) NOT NULL default '0',
+ date int(11) NOT NULL default '0',
+ uid int(10) NOT NULL default '0',
+ PRIMARY KEY (mirror_id),
+ KEY categoryid (lid))
+ ENGINE=MyISAM;");
+ if ($dbupdater->updateTable($table)) {
+ echo "wfdownloads_mirrors table created<br />";
+ }
+ }
+
+ if (!wfdownloads_TableExists('wfdownloads_ip_log')) {
+ // Create table wfdownloads_ip_log
+ $table = new WfdownloadsTable('wfdownloads_ip_log');
+ $table->setStructure("CREATE TABLE %s (
+ ip_logid int(11) NOT NULL auto_increment,
+ lid int(11) NOT NULL default '0',
+ uid int(11) NOT NULL default '0',
+ date int(11) NOT NULL default '0',
+ ip_address varchar(20) NOT NULL default '',
+ PRIMARY KEY (ip_logid)
+ ENGINE=MyISAM;");
+ if ($dbupdater->updateTable($table)) {
+ echo "wfdownloads_mirrors table created<br />";
+ }
+ }
+
+ $download_fields = array(
+ "lid" => array("Type" => "int(11) unsigned NOT NULL auto_increment", "Default" => false),
+ "cid" => array("Type" => "int(5) unsigned NOT NULL default '0'", "Default" => true),
+ "title" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "url" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "filename" => array("Type" => "varchar(150) NOT NULL default ''", "Default" => true),
+ "filetype" => array("Type" => "varchar(100) NOT NULL default ''", "Default" => true),
+ "homepage" => array("Type" => "varchar(100) NOT NULL default ''", "Default" => true),
+ "version" => array("Type" => "varchar(20) NOT NULL default ''", "Default" => true),
+ "size" => array("Type" => "int(8) NOT NULL default '0'", "Default" => true),
+ "platform" => array("Type" => "varchar(50) NOT NULL default ''", "Default" => true),
+ "screenshot" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "screenshot2" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "screenshot3" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "screenshot4" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "submitter" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
+ "publisher" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "status" => array("Type" => "tinyint(2) NOT NULL default '0'", "Default" => true),
+ "date" => array("Type" => "int(10) NOT NULL default '0'", "Default" => true),
+ "hits" => array("Type" => "int(11) unsigned NOT NULL default '0'", "Default" => true),
+ "rating" => array("Type" => "double(6,4) NOT NULL default '0.0000'", "Default" => true),
+ "votes" => array("Type" => "int(11) unsigned NOT NULL default '0'", "Default" => true),
+ "comments" => array("Type" => "int(11) unsigned NOT NULL default '0'", "Default" => true),
+ "license" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "mirror" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "price" => array("Type" => "varchar(10) NOT NULL default 'Free'", "Default" => true),
+ "paypalemail" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "features" => array("Type" => "text NOT NULL", "Default" => false),
+ "requirements" => array("Type" => "text NOT NULL", "Default" => false),
+ "homepagetitle" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "forumid" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
+ "limitations" => array("Type" => "varchar(255) NOT NULL default '30 day trial'", "Default" => true),
+ "versiontypes" => array("Type" => "varchar(255) NOT NULL default 'None'", "Default" => true),
+ "dhistory" => array("Type" => "text NOT NULL", "Default" => false),
+ "published" => array("Type" => "int(11) NOT NULL default '1089662528'", "Default" => true),
+ "expired" => array("Type" => "int(10) NOT NULL default '0'", "Default" => true),
+ "updated" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
+ "offline" => array("Type" => "tinyint(1) NOT NULL default '0'", "Default" => true),
+ "description" => array("Type" => "text NOT NULL", "Default" => false),
+ "ipaddress" => array("Type" => "varchar(120) NOT NULL default '0'", "Default" => true),
+ "notifypub" => array("Type" => "int(1) NOT NULL default '0'", "Default" => true),
+ "summary" => array("Type" => "text NOT NULL", "Default" => false),
+ "formulize_idreq" => array("Type" => "int(5) NOT NULL default '0'", "Default" => true)
+ );
+ $renamed_fields = array(
+ "logourl" => "screenshot"
+ );
+ echo "<br /><B>Checking Download table</B><br />";
+ $download_handler = xoops_getmodulehandler('download', 'wfdownloads');
+ $download_table = new WfdownloadsTable("wfdownloads_downloads");
+ $fields = get_table_info($download_handler->table, $download_fields);
+ // Check for renamed fields
+ rename_fields($download_table, $renamed_fields, $fields, $download_fields);
+ update_table($download_fields, $fields, $download_table);
+ if ($dbupdater->updateTable($download_table)) {
+ echo "Downloads table updated<br />";
+ }
+ unset($fields);
+
+ $mod_fields = array(
+ "requestid" => array("Type" => "int(11) NOT NULL auto_increment", "Default" => false),
+ "lid" => array("Type" => "int(11) unsigned NOT NULL default '0'", "Default" => true),
+ "cid" => array("Type" => "int(5) unsigned NOT NULL default '0'", "Default" => true),
+ "title" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "url" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "filename" => array("Type" => "varchar(150) NOT NULL default ''", "Default" => true),
+ "filetype" => array("Type" => "varchar(100) NOT NULL default ''", "Default" => true),
+ "homepage" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "version" => array("Type" => "varchar(20) NOT NULL default ''", "Default" => true),
+ "size" => array("Type" => "int(8) NOT NULL default '0'", "Default" => true),
+ "platform" => array("Type" => "varchar(50) NOT NULL default ''", "Default" => true),
+ "screenshot" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "screenshot2" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "screenshot3" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "screenshot4" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "submitter" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
+ "publisher" => array("Type" => "text NOT NULL", "Default" => false),
+ "status" => array("Type" => "tinyint(2) NOT NULL default '0'", "Default" => true),
+ "date" => array("Type" => "int(10) NOT NULL default '0'", "Default" => true),
+ "hits" => array("Type" => "int(11) unsigned NOT NULL default '0'", "Default" => true),
+ "rating" => array("Type" => "double(6,4) NOT NULL default '0.0000'", "Default" => true),
+ "votes" => array("Type" => "int(11) unsigned NOT NULL default '0'", "Default" => true),
+ "comments" => array("Type" => "int(11) unsigned NOT NULL default '0'", "Default" => true),
+ "license" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "mirror" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "price" => array("Type" => "varchar(10) NOT NULL default 'Free'", "Default" => true),
+ "paypalemail" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "features" => array("Type" => "text NOT NULL", "Default" => false),
+ "requirements" => array("Type" => "text NOT NULL", "Default" => false),
+ "homepagetitle" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "forumid" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
+ "limitations" => array("Type" => "varchar(255) NOT NULL default '30 day trial'", "Default" => true),
+ "versiontypes" => array("Type" => "varchar(255) NOT NULL default 'None'", "Default" => true),
+ "dhistory" => array("Type" => "text NOT NULL", "Default" => false),
+ "published" => array("Type" => "int(10) NOT NULL default '0'", "Default" => true),
+ "expired" => array("Type" => "int(10) NOT NULL default '0'", "Default" => true),
+ "updated" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
+ "offline" => array("Type" => "tinyint(1) NOT NULL default '0'", "Default" => true),
+ "summary" => array("Type" => "text NOT NULL", "Default" => false),
+ "description" => array("Type" => "text NOT NULL", "Default" => false),
+ "modifysubmitter" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
+ "requestdate" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
+ "formulize_idreq" => array("Type" => "int(5) NOT NULL default '0'", "Default" => true)
+ );
+ $renamed_fields = array(
+ "logourl" => "screenshot"
+ );
+ echo "<br /><B>Checking Modified Downloads table</B><br />";
+ $mod_handler = xoops_getmodulehandler('modification', 'wfdownloads');
+ $mod_table = new WfdownloadsTable("wfdownloads_mod");
+ $fields = get_table_info($mod_handler->table, $mod_fields);
+ rename_fields($mod_table, $renamed_fields, $fields, $mod_fields);
+ update_table($mod_fields, $fields, $mod_table);
+ if ($dbupdater->updateTable($mod_table)) {
+ echo "Modified Downloads table updated <br />";
+ }
+ unset($fields);
+
+ $cat_fields = array(
+ "cid" => array("Type" => "int(5) unsigned NOT NULL auto_increment", "Default" => false),
+ "pid" => array("Type" => "int(5) unsigned NOT NULL default '0'", "Default" => true),
+ "title" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "imgurl" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "description" => array("Type" => "text NOT NULL default ''", "Default" => true),
+ "total" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
+ "summary" => array("Type" => "text NOT NULL", "Default" => false),
+ "spotlighttop" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
+ "spotlighthis" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
+ "dohtml" => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
+ "dosmiley" => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
+ "doxcode" => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
+ "doimage" => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
+ "dobr" => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
+ "weight" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
+ "formulize_fid" => array("Type" => "int(5) NOT NULL default '0'", "Default" => true)
+ );
+ echo "<br /><B>Checking Category table</B><br />";
+ $cat_handler = xoops_getmodulehandler('category', 'wfdownloads');
+ $cat_table = new WfdownloadsTable("wfdownloads_cat");
+ $fields = get_table_info($cat_handler->table, $cat_fields);
+ update_table($cat_fields, $fields, $cat_table);
+ if ($dbupdater->updateTable($cat_table)) {
+ echo "Category table updated<br />";
+ }
+ unset($fields);
+
+ $broken_fields = array(
+ "reportid" => array("Type" => "int(5) NOT NULL auto_increment", "Default" => false),
+ "lid" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
+ "sender" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
+ "ip" => array("Type" => "varchar(20) NOT NULL default ''", "Default" => true),
+ "date" => array("Type" => "varchar(11) NOT NULL default '0'", "Default" => true),
+ "confirmed" => array("Type" => "tinyint(1) NOT NULL default '0'", "Default" => true),
+ "acknowledged" => array("Type" => "tinyint(1) NOT NULL default '0'", "Default" => true)
+ );
+ echo "<br /><B>Checking Broken Report table</B><br />";
+ $broken_handler = xoops_getmodulehandler('report', 'wfdownloads');
+ $broken_table = new WfdownloadsTable("wfdownloads_broken");
+ $fields = get_table_info($broken_handler->table, $broken_fields);
+ update_table($broken_fields, $fields, $broken_table);
+ if ($dbupdater->updateTable($broken_table)) {
+ echo "Broken Reports table updated<br />";
+ }
+ unset($fields);
+}
+
+// =========================================================================================
+// we are going to change the names for the fields like nohtml, nosmilies, noxcode, noimage, nobreak in
+// the wfdownloads_cat table into dohtml, dosmilies and so on. Therefore the logic will change
+// 0=yes 1=no and the currently stored value need to be changed accordingly
+// =========================================================================================
+function invert_nohtm_dohtml_values() {
+ $ret = array();
+ global $xoopsDB;
+ $cat_handler = xoops_getmodulehandler('category', 'wfdownloads');
+ $result = $xoopsDB->query("SHOW COLUMNS FROM ".$cat_handler->table);
+ while ($existing_field = $xoopsDB->fetchArray($result)) {
+ $fields[$existing_field['Field']] = $existing_field['Type'];
+ }
+ if (in_array("nohtml", array_keys($fields))) {
+ $dbupdater = new WfdownloadsDbupdater();
+ //Invert column values
+ // alter options in wfdownloads_cat
+ $table = new WfdownloadsTable('wfdownloads_cat');
+ $table->addAlteredField('nohtml', "dohtml tinyint(1) NOT NULL DEFAULT '1'");
+ $table->addAlteredField('nosmiley', "dosmiley tinyint(1) NOT NULL DEFAULT '1'");
+ $table->addAlteredField('noxcodes', "doxcode tinyint(1) NOT NULL DEFAULT '1'");
+ $table->addAlteredField('noimages', "doimage tinyint(1) NOT NULL DEFAULT '1'");
+ $table->addAlteredField('nobreak', "dobr tinyint(1) NOT NULL DEFAULT '1'");
+
+ //inverting values no=1 <=> do=0
+ // have to store teporarly as value = 2 to
+ // avoid putting everithing to same value
+ // if you change 1 to 0, then 0 to one,
+ // every value will be 1, follow me?
+ $table->addUpdatedWhere('dohtml', 2,'=1');
+ $table->addUpdatedWhere('dohtml', 1,'=0');
+ $table->addUpdatedWhere('dohtml', 0,'=2');
+
+ $table->addUpdatedWhere('dosmiley', 2,'=1');
+ $table->addUpdatedWhere('dosmiley', 1,'=0');
+ $table->addUpdatedWhere('dosmiley', 0,'=2');
+
+ $table->addUpdatedWhere('doxcode', 2,'=1');
+ $table->addUpdatedWhere('doxcode', 1,'=0');
+ $table->addUpdatedWhere('doxcode', 0,'=2');
+
+ $table->addUpdatedWhere('doimage', 2,'=1');
+ $table->addUpdatedWhere('doimage', 1,'=0');
+ $table->addUpdatedWhere('doimage', 0,'=2');
+ $ret = $dbupdater->updateTable($table);
+ }
+ return $ret;
+}
+
+/**
+ * Updates a table by comparing correct fields with existing ones
+ *
+ * @param array $new_fields
+ * @param array $existing_fields
+ * @param WfDownloadsTable $table
+ * @return void
+ */
+function update_table($new_fields, $existing_fields, &$table) {
+ foreach ($new_fields as $field => $fieldinfo) {
+ $type = $fieldinfo["Type"];
+ if (!in_array($field, array_keys($existing_fields) ) ) {
+ //Add field as it is missing
+ $table->addNewField($field, $type);
+ //$xoopsDB->query("ALTER TABLE " . $table . " ADD " . $field . " " . $type);
+ //echo $field . "(" . $type . ") <FONT COLOR='##22DD51'>Added</FONT><br />";
+ } elseif ($existing_fields[$field] != $type) {
+ $table->addAlteredField($field, $field . " " . $type);
+ // check $fields[$field]['type'] for things like "int(10) unsigned"
+ //$xoopsDB->query("ALTER TABLE " . $table . " CHANGE " . $field . " " . $field . " " . $type);
+ //echo $field . " <FONT COLOR='#FF6600'>Changed to</FONT> " . $type . "<br />";
+ } else {
+ //echo $field . " <FONT COLOR='#0033FF'>Uptodate</FONT><br />";
+ }
+ }
+}
+
+/**
+ * Get column information for a table - we'll need to send along an array of fields to determine
+ * whether the "Default" index value should be appended
+ *
+ * @param string $table
+ * @param array $default_fields
+ * @return array
+ */
+function get_table_info($table, $default_fields) {
+ global $xoopsDB;
+ $result = $xoopsDB->query("SHOW COLUMNS FROM " . $table);
+ while ($existing_field = $xoopsDB->fetchArray($result)) {
+ $fields[$existing_field['Field']] = $existing_field['Type'];
+ if ($existing_field['Null'] != "YES") {
+ $fields[$existing_field['Field']] .= " NOT NULL";
+ }
+ if ($existing_field['Extra']) {
+ $fields[$existing_field['Field']] .= " " . $existing_field['Extra'];
+ }
+ if ($default_fields[$existing_field['Field']]['Default']) {
+ $fields[$existing_field['Field']] .= " default '" . $existing_field['Default'] . "'";
+ }
+ }
+ return $fields;
+}
+
+/**
+ * Renames fields in a table and updates the existing fields array to reflect it.
+ *
+ * @param WfDownloadsTable $table
+ * @param array $renamed_fields
+ * @param array $fields
+ * @param array $new_fields
+ * @return array
+ */
+function rename_fields(&$table, $renamed_fields, &$fields, $new_fields) {
+ foreach (array_keys($fields) as $field) {
+ if (in_array($field, array_keys($renamed_fields))) {
+ $new_field_name = $renamed_fields[$field];
+ $new_field_type = $new_fields[$new_field_name]["Type"];
+ $table->addAltered($field, $new_field_name . " " . $new_field_type);
+ //$xoopsDB->query("ALTER TABLE " . $table . " CHANGE " . $field . " " . $new_field_name . " " . $new_field_type);
+ //echo $field." Renamed to ". $new_field_name . "<br />";
+ $fields[$new_field_name] = $new_field_type;
+ }
+ }
+ //return $fields;
+}
Deleted: XoopsModules/wfdownloads/trunk/wfdownloads/include/update.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/update.php 2013-06-01 10:56:08 UTC (rev 11607)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/update.php 2013-06-02 20:06:58 UTC (rev 11608)
@@ -1,468 +0,0 @@
-<?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.
- */
-/**
- * WF-Downloads module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
- * @package wfdownload
- * @since 3.23
- * @author WF-Sections, Xoops Development Team, luciorota
- * @version svn:$Id$
- */
-if (!defined("XOOPS_ROOT_PATH")) {
- die("Xoops root path not defined");
-}
-include_once(XOOPS_ROOT_PATH . "/modules/wfdownloads/class/dbupdater.php");
-include_once(XOOPS_ROOT_PATH . "/modules/wfdownloads/include/functions.php");
-@include_once(XOOPS_ROOT_PATH . "/modules/wfdownloads/language/" . $xoopsConfig['language'] . "/admin.php");
-
-function xoops_module_update_wfdownloads($module, $prev_version) {
- ob_start();
- invert_nohtm_dohtml_values();
- if ($prev_version <= 322)
- update_tables_to_322($module);
- if ($prev_version <= 323)
- update_permissions_to_323($module);
- update_tables_to_323($module);
- $feedback = ob_get_clean();
- if ...
[truncated message content] |
|
From: <luc...@us...> - 2013-06-02 20:11:17
|
Revision: 11609
http://sourceforge.net/p/xoops/svn/11609
Author: luciorota
Date: 2013-06-02 20:11:13 +0000 (Sun, 02 Jun 2013)
Log Message:
-----------
fixed code header
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/admin_header2.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokendown.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/imageupload.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/ip_log.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirror.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/modifications.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/newdownloads.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/newstory.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/permissions.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/review.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/update.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/votedata.php
XoopsModules/wfdownloads/trunk/wfdownloads/blocks/wfdownloads_top.php
XoopsModules/wfdownloads/trunk/wfdownloads/blocks/wfdownloads_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/class/wfd_lists.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/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/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/mirror.php
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/submit.php
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_mimetypelist.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
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/about.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/about.php 2013-06-02 20:06:58 UTC (rev 11608)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/about.php 2013-06-02 20:11:13 UTC (rev 11609)
@@ -12,11 +12,11 @@
* WF-Downloads module
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
* @package wfdownload
* @since 3.23
- * @author WF-Sections, Xoops Development Team, luciorota
- * @version svn:$Id$
+ * @author Xoops Development Team
+ * @version svn:$id$
*/
include_once dirname(__FILE__) . '/admin_header.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_footer.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_footer.php 2013-06-02 20:06:58 UTC (rev 11608)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_footer.php 2013-06-02 20:11:13 UTC (rev 11609)
@@ -12,11 +12,11 @@
* WF-Downloads module
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
* @package wfdownload
* @since 3.23
- * @author WF-Sections, Xoops Development Team, luciorota
- * @version svn:$Id$
+ * @author Xoops Development Team
+ * @version svn:$id$
*/
echo "<div class='adminfooter'>\n"
." <div style='text-align: center;'>\n"
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-06-02 20:06:58 UTC (rev 11608)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-06-02 20:11:13 UTC (rev 11609)
@@ -12,11 +12,11 @@
* WF-Downloads module
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
* @package wfdownload
* @since 3.23
- * @author WF-Sections, Xoops Development Team, luciorota
- * @version svn:$Id$
+ * @author Xoops Development Team
+ * @version svn:$id$
*/
include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
$thisModuleDirname = basename(dirname(dirname( __FILE__ ) ));
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header2.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header2.php 2013-06-02 20:06:58 UTC (rev 11608)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header2.php 2013-06-02 20:11:13 UTC (rev 11609)
@@ -12,11 +12,11 @@
* WF-Downloads module
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
* @package wfdownload
* @since 3.23
- * @author WF-Sections, Xoops Development Team, luciorota
- * @version svn:$Id$
+ * @author Xoops Development Team
+ * @version svn:$id$
*/
include '../../../include/cp_header.php';
include_once(XOOPS_ROOT_PATH . '/modules/wfdownloads/include/functions.php');
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokendown.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokendown.php 2013-06-02 20:06:58 UTC (rev 11608)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokendown.php 2013-06-02 20:11:13 UTC (rev 11609)
@@ -12,11 +12,11 @@
* WF-Downloads module
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
* @package wfdownload
* @since 3.23
- * @author WF-Sections, Xoops Development Team, luciorota
- * @version svn:$Id$
+ * @author Xoops Development Team
+ * @version svn:$id$
*/
$currentFile = basename(__FILE__);
include 'admin_header.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php 2013-06-02 20:06:58 UTC (rev 11608)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php 2013-06-02 20:11:13 UTC (rev 11609)
@@ -12,11 +12,11 @@
* WF-Downloads module
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
* @package wfdownload
* @since 3.23
- * @author WF-Sections, Xoops Development Team, luciorota
- * @version svn:$Id$
+ * @author Xoops Development Team
+ * @version svn:$id$
*/
$currentFile = basename(__FILE__);
include 'admin_header.php';
@@ -226,9 +226,11 @@
case "category.edit" :
case "modCat":
$cid = wfdownloads_CleanVars($_REQUEST, 'cid', 0, 'int');
+
wfdownloads_xoops_cp_header();
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation($currentFile);
+
$adminMenu = new ModuleAdmin();
$adminMenu->addItemButton(_MI_WFD_BINDEX, "{$currentFile}?op=categories.list", 'list');
$adminMenu->addItemButton(_AM_WFD_CCATEGORY_CREATENEW, "{$currentFile}?op=category.add", 'add');
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php 2013-06-02 20:06:58 UTC (rev 11608)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php 2013-06-02 20:11:13 UTC (rev 11609)
@@ -12,11 +12,11 @@
* WF-Downloads module
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
* @package wfdownload
* @since 3.23
- * @author WF-Sections, Xoops Development Team, luciorota
- * @version svn:$Id$
+ * @author Xoops Development Team
+ * @version svn:$id$
*/
$currentFile = basename(__FILE__);
include 'admin_header.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/imageupload.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/imageupload.php 2013-06-02 20:06:58 UTC (rev 11608)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/imageupload.php 2013-06-02 20:11:13 UTC (rev 11609)
@@ -12,11 +12,11 @@
* WF-Downloads module
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
* @package wfdownload
* @since 3.23
- * @author WF-Sections, Xoops Development Team, luciorota
- * @version svn:$Id$
+ * @author Xoops Development Team
+ * @version svn:$id$
*/
include 'admin_header.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/import.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/import.php 2013-06-02 20:06:58 UTC (rev 11608)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/import.php 2013-06-02 20:11:13 UTC (rev 11609)
@@ -12,11 +12,11 @@
* WF-Downloads module
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
* @package wfdownload
* @since 3.23
- * @author WF-Sections, Xoops Development Team, luciorota
- * @version svn:$Id$
+ * @author Xoops Development Team
+ * @version svn:$id$
*/
// ========================================================
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php 2013-06-02 20:06:58 UTC (rev 11608)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php 2013-06-02 20:11:13 UTC (rev 11609)
@@ -12,11 +12,11 @@
* WF-Downloads module
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
* @package wfdownload
* @since 3.23
- * @author WF-Sections, Xoops Development Team, luciorota
- * @version svn:$Id$
+ * @author Xoops Development Team
+ * @version svn:$id$
*/
require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
include_once dirname(__FILE__) . '/admin_header.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/indexpage.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/indexpage.php 2013-06-02 20:06:58 UTC (rev 11608)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/indexpage.php 2013-06-02 20:11:13 UTC (rev 11609)
@@ -12,11 +12,11 @@
* WF-Downloads module
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
* @package wfdownload
* @since 3.23
- * @author WF-Sections, Xoops Development Team, luciorota
- * @version svn:$Id$
+ * @author Xoops Development Team
+ * @version svn:$id$
*/
include 'admin_header.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/ip_log.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/ip_log.php 2013-06-02 20:06:58 UTC (rev 11608)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/ip_log.php 2013-06-02 20:11:13 UTC (rev 11609)
@@ -12,11 +12,11 @@
* WF-Downloads module
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
* @package wfdownload
* @since 3.23
- * @author WF-Sections, Xoops Development Team, luciorota
- * @version svn:$Id$
+ * @author Xoops Development Team
+ * @version svn:$id$
*/
$lid = isset($_GET['lid']) && $_GET['lid'] != '' ? $_GET['lid'] : 0;
if(!$lid) {
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php 2013-06-02 20:06:58 UTC (rev 11608)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php 2013-06-02 20:11:13 UTC (rev 11609)
@@ -12,11 +12,11 @@
* WF-Downloads module
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
* @package wfdownload
* @since 3.23
- * @author WF-Sections, Xoops Development Team, luciorota
- * @version svn:$Id$
+ * @author Xoops Development Team
+ * @version svn:$id$
*/
defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php 2013-06-02 20:06:58 UTC (rev 11608)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php 2013-06-02 20:11:13 UTC (rev 11609)
@@ -12,84 +12,19 @@
* WF-Downloads module
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
* @package wfdownload
* @since 3.23
- * @author WF-Sections, Xoops Development Team, luciorota
- * @version svn:$Id$
+ * @author Xoops Development Team
+ * @version svn:$id$
*/
$currentFile = basename(__FILE__);
include 'admin_header.php';
$op = wfdownloads_CleanVars($_REQUEST, 'op', '', 'string');
-/**
- * edit_mimetype()
- *
- * @param integer $mime_id
- * @return
- */
-function edit_mimetype($mime_id = 0)
-{
- $mime_id = intval($mime_id);
- $mime_handler = xoops_getmodulehandler('mimetype');
-
- if ($mime_id != 0) {
- $mimetype = $mime_handler->get($mime_id);
- } else {
- $mimetype = $mime_handler->create();
- }
-
- $forminfo = ($mime_id == 0) ? _AM_WFD_MIME_CREATEF : _AM_WFD_MIME_MODIFYF;
- $sform = new XoopsThemeForm($forminfo , "op", $_SERVER['REQUEST_URI']);
- $sform -> addElement(new XoopsFormText(_AM_WFD_MIME_EXTF, 'mime_ext', 5, 60, $mimetype->getVar('mime_ext', 'e')), true);
- $sform -> addElement(new XoopsFormText(_AM_WFD_MIME_NAMEF, 'mime_name', 50, 255, $mimetype->getVar('mime_name', 'e')), true);
- $sform -> addElement(new XoopsFormTextArea(_AM_WFD_MIME_TYPEF, 'mime_type', $mimetype->getVar('mime_types', 'e'), 7, 60));
- $madmin_radio = new XoopsFormRadioYN(_AM_WFD_MIME_ADMINF, 'mime_admin', $mimetype->getVar('mime_admin', 'e'), ' ' . _YES . '', ' ' . _NO . '');
- $sform -> addElement($madmin_radio);
- $muser_radio = new XoopsFormRadioYN(_AM_WFD_MIME_USERF, 'mime_user', $mimetype->getVar('mime_user', 'e'), ' ' . _YES . '', ' ' . _NO . '');
- $sform -> addElement($muser_radio);
-
- $button_tray = new XoopsFormElementTray('', '');
- $hidden = new XoopsFormHidden('op', 'save');
- $button_tray -> addElement($hidden);
- if (!$mime_id) {
- $butt_create = new XoopsFormButton('', '', _AM_WFD_MIME_CREATE, 'submit');
- $butt_create -> setExtra('onclick="this.form.elements.op.value=\'save\'"');
- $button_tray -> addElement($butt_create);
-
- $butt_clear = new XoopsFormButton('', '', _AM_WFD_MIME_CLEAR, 'reset');
- $button_tray -> addElement($butt_clear);
-
- $butt_cancel = new XoopsFormButton('', '', _AM_WFD_MIME_CANCEL, 'button');
- $butt_cancel -> setExtra('onclick="history.go(-1)"');
- $button_tray -> addElement($butt_cancel);
- } else {
- $sform->addElement(new XoopsFormHidden('mime_id', $mime_id));
- $butt_create = new XoopsFormButton('', '', _AM_WFD_MIME_MODIFY, 'submit');
- $butt_create -> setExtra('onclick="this.form.elements.op.value=\'save\'"');
- $button_tray -> addElement($butt_create);
-
- $butt_cancel = new XoopsFormButton('', '', _AM_WFD_MIME_CANCEL, 'button');
- $butt_cancel -> setExtra('onclick="history.go(-1)"');
- $button_tray -> addElement($butt_cancel);
- }
- $sform -> addElement($button_tray);
- $sform -> display();
-
- $iform = new XoopsThemeForm(_AM_WFD_MIME_FINDMIMETYPE, "op", $_SERVER['REQUEST_URI']);
- $iform -> addElement(new XoopsFormText(_AM_WFD_MIME_EXTFIND, 'fileext', 5, 60, ""), true);
- $button_tray = new XoopsFormElementTray('', '');
- $hidden = new XoopsFormHidden('op', 'openurl');
- $button_tray -> addElement($hidden);
- $butt_create = new XoopsFormButton('', '', _AM_WFD_MIME_FINDIT, 'submit');
- $butt_create -> setExtra('onclick="this.form.elements.op.value=\'openurl\'"');
- $button_tray -> addElement($butt_create);
- $iform -> addElement($button_tray);
- $iform -> display();
-}
-
switch ($op) {
+/*
case 'openurl':
$fileext = trim($_POST['fileext']);
$url = "http://filext.com/detaillist.php?extdetail={$fileext}";
@@ -99,34 +34,47 @@
echo "<meta http-equiv='refresh' content='0;url={$url} target='_blank''>\r\n";
}
break;
+*/
+ case "mimetype.edit" :
+ case "mimetype.add" :
+ case 'edit':
+ wfdownloads_xoops_cp_header();
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation($currentFile);
- case 'update';
- $mime_id = wfdownloads_CleanVars($_REQUEST, 'mime_id', 0, 'int');
- $mimetype = $mime_handler->get($mime_id);
+ $adminMenu = new ModuleAdmin();
+ $adminMenu->addItemButton(_MI_WFD_BINDEX, "{$currentFile}?op=mimetypes.list", 'list');
+ $adminMenu->addItemButton(_AM_WFD_MIME_CREATEF, "{$currentFile}?op=mimetype.add", 'add');
+ echo $adminMenu->renderButton();
- if (isset($_REQUEST['admin']) && $_REQUEST['admin'] == 1) {
- if ($mimetype->getVar('mime_admin') == 1) {
- $mimetype->setVar('mime_admin', 0);
- } else {
- $mimetype->setVar('mime_admin', 1);
- }
+ echo "<fieldset>\n";
+ echo "<legend style='font-weight: bold; color: #900;'>" . _AM_WFD_MIME_CREATEF . "/" . _AM_WFD_MIME_MODIFYF . "</legend>\n";
+ echo "<div>" . _AM_WFD_MIME_INFOTEXT . "</div>\n";
+ echo "</fieldset>\n";
+
+ if (isset($_REQUEST['mime_id'])) {
+ $mimetype = $mime_handler->get($_REQUEST['mime_id']);
+ } else {
+ $mimetype = $mime_handler->create();
+
}
- if (isset($_REQUEST['user']) && $_REQUEST['user'] == 1) {
- if ($mimetype->getVar('mime_user') == 1) {
- $mimetype->setVar('mime_user', 0);
- } else {
- $mimetype->setVar('mime_user', 1);
- }
- }
- $result = $mime_handler->insert($mimetype, true);
- if (!$result) {
- trigger_error($error, E_USER_ERROR);
- }
- redirect_header("{$currentFile}?start=" . intval($_GET['start']) . "", 0, _AM_WFD_MIME_MODIFIED);
+ $form = $mimetype->getForm();
+ $form->display();
+
+ $extform = new XoopsThemeForm(_AM_WFD_MIME_FINDMIMETYPE, "op", $_SERVER['REQUEST_URI']);
+ $extform -> addElement(new XoopsFormText(_AM_WFD_MIME_EXTFIND, 'fileext', 5, 60, $mimetype->getVar('mime_ext')));
+ $button_open = new XoopsFormButton('', '', _AM_WFD_MIME_FINDIT, 'button');
+ $button_open -> setExtra('onclick="document.getElementById(\'filext_iframe\').src = \'http://filext.com/detaillist.php?extdetail=\' + this.form.elements.fileext.value"');
+ $extform -> addElement($button_open);
+ $extform -> addElement($button_tray);
+ $extform -> display();
+
+ echo "<iframe src='http://filext.com/detaillist.php?extdetail=" . $mimetype->getVar('mime_ext') . "' id='filext_iframe' name='filext_iframe' class='outer' style='width:100%; height:400px;'></iframe>";
+
+ xoops_cp_footer();
break;
case 'mimetype.save':
- case 'save':
$mime_id = wfdownloads_CleanVars($_POST, 'mime_id', 0, 'int');
$mimetype = $mime_handler->get($mime_id);
@@ -136,34 +84,59 @@
$mimetype->setVar('mime_admin', (int)$_POST['mime_admin']);
$mimetype->setVar('mime_user', (int)$_POST['mime_user']);
if (!$mime_handler->insert($mimetype)) {
- $error = "Could not update mimetype information:";
+ $error = "Could not update mimetype information";
trigger_error($error, E_USER_ERROR);
}
$dbupted = ($mime_id == 0) ? _AM_WFD_MIME_CREATED : _AM_WFD_MIME_MODIFIED;
redirect_header($currentFile, 1, $dbupted);
break;
+ case 'mimetype.update';
+ $mime_id = wfdownloads_CleanVars($_REQUEST, 'mime_id', 0, 'int');
+ $mimetype = $mime_handler->get($mime_id);
+
+ if (isset($_REQUEST['admin']) && $_REQUEST['admin'] == true) {
+ if ($mimetype->getVar('mime_admin') == true) {
+ $mimetype->setVar('mime_admin', false);
+ } else {
+ $mimetype->setVar('mime_admin', true);
+ }
+ }
+ if (isset($_REQUEST['user']) && $_REQUEST['user'] == true) {
+ if ($mimetype->getVar('mime_user') == true) {
+ $mimetype->setVar('mime_user', false);
+ } else {
+ $mimetype->setVar('mime_user', true);
+ }
+ }
+ if (!$mime_handler->insert($mimetype, true)) {
+ trigger_error($error, E_USER_ERROR);
+ }
+ redirect_header("{$currentFile}?start=" . intval($_GET['start']) . "", 0, _AM_WFD_MIME_MODIFIED);
+ break;
+
+ case 'mimetypes.update':
case 'saveall':
- $mime_admin = (isset($_GET['admin']) && $_GET['admin'] == 1 ) ? $_GET['admin'] : 0;
- $mime_user = (isset($_GET['user']) && $_GET['user'] == 1) ? $_GET['user'] : 0;
+ $mime_admin = (isset($_GET['admin']) && $_GET['admin'] == true ) ? $_GET['admin'] : false;
+ $mime_user = (isset($_GET['user']) && $_GET['user'] == true) ? $_GET['user'] : false;
$type_all = intval($_GET['type_all']);
- $mime_handler = xoops_getmodulehandler('mimetype');
- if ($mime_admin == 1) {
+ if ($mime_admin == true) {
$field = "mime_admin";
} else {
$field = "mime_user";
}
- $result = $mime_handler->updateAll($field, $type_all);
- if (!$result) {
- $error = "Could not update mimetype information:";
+ $criteria = new CriteriaCompo();
+ $criteria->setStart($start);
+ $criteria->setLimit(20);
+ if (!$mime_handler->updateAll($field, $type_all, $criteria, true)) {
+ $error = "Could not update mimetype information";
trigger_error($error, E_USER_ERROR);
}
- redirect_header($currentFile, 1, _AM_WFD_MIME_MODIFIED);
+ redirect_header("{$currentFile}?start=" . intval($_GET['start']) . "", 1, _AM_WFD_MIME_MODIFIED);
break;
case "mimetype.delete":
- case "delete":
$mime_id = wfdownloads_CleanVars($_REQUEST, 'mime_id', 0, 'int');
$ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
$mimetype = $mime_handler->get($mime_id);
@@ -182,13 +155,6 @@
}
break;
- case 'mimetype.edit':
- case 'edit':
- wfdownloads_xoops_cp_header();
- edit_mimetype($_GET['mime_id']);
- xoops_cp_footer();
- break;
-
case 'mimetypes.list':
case 'main':
default:
@@ -204,26 +170,43 @@
wfdownloads_xoops_cp_header();
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation($currentFile);
+
+ $adminMenu = new ModuleAdmin();
+ $adminMenu->addItemButton(_MI_WFD_BINDEX, "{$currentFile}?op=mimetypes.list", 'list');
+ $adminMenu->addItemButton(_AM_WFD_MIME_CREATEF, "{$currentFile}?op=mimetype.add", 'add');
+ echo $adminMenu->renderButton();
- echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFD_MIME_MODIFYF . "</legend>\n";
- echo "<div style='padding: 8px;'>" . _AM_WFD_MIME_INFOTEXT . "</div>\n";
- echo "</fieldset>\n";
+ $GLOBALS['xoopsTpl']->assign('mimetypes_count', $mime_num);
+ $GLOBALS['xoopsTpl']->assign('start', $start);
- edit_mimetype();
+ if ($mime_num > 0) {
+ $allowAdminMimetypes = array();
+ $allowUserMimetypes = array();
+ foreach ($mimetypes as $mimetype) {
+ if ($mimetype->getVar('mime_admin') == true) {
+ $allowAdminMimetypes[] = $mimetype->getVar('mime_ext');
+ }
+ if ($mimetype->getVar('mime_user') == true) {
+ $allowUserMimetypes[] = $mimetype->getVar('mime_ext');
+ }
+ $mimetype_array = $mimetype->toArray();
+ $GLOBALS['xoopsTpl']->append('mimetypes', $mimetype_array);
+ }
+ $GLOBALS['xoopsTpl']->assign('allowAdminMimetypes', $allowAdminMimetypes);
+ $GLOBALS['xoopsTpl']->assign('allowUserMimetypes', $allowUserMimetypes);
+ //Include page navigation
+ include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+ $p...
[truncated message content] |
|
From: <luc...@us...> - 2013-06-03 19:23:45
|
Revision: 11619
http://sourceforge.net/p/xoops/svn/11619
Author: luciorota
Date: 2013-06-03 19:23:41 +0000 (Mon, 03 Jun 2013)
Log Message:
-----------
moved admin templates
need to reinstall and flush cache to go on
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Added Paths:
-----------
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_categorylist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadlist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_menu.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_mimetypelist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_mirrorlist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_permissions.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reviewlist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_votedatalist.html
Removed Paths:
-------------
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_categorylist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_downloadlist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_menu.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_mimetypelist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_mirrorlist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_reviewlist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_votedatalist.html
Added: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_categorylist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_categorylist.html (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_categorylist.html 2013-06-03 19:23:41 UTC (rev 11619)
@@ -0,0 +1,38 @@
+<form action="category.php" method="post" id="categoriesform">
+<fieldset>
+ <legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFD_FCATEGORY_CATEGORIES_LIST}></legend>
+ <table class="outer">
+ <tr>
+ <th><{$smarty.const._AM_WFD_FCATEGORY_TITLE}></th>
+ <th><{$smarty.const._AM_WFD_FCATEGORY_WEIGHT}></th>
+ <th><{$smarty.const._AM_WFD_FCATEGORY_DESCRIPTION}></th>
+ <th><{$smarty.const._AM_WFD_ACTION}></th>
+ </tr>
+ <{foreach item=sorted_category from=$sorted_categories}>
+ <tr class="<{cycle values='even, odd'}>">
+ <td>
+ <{section name=indent loop=$sorted_category.level-1 step=1}}>-<{/section}><{$sorted_category.category.title}>
+ </td>
+ <td>
+ <input type="text" name="new_weights[<{$sorted_category.category.cid}>]" size="5" maxlength="5" value="<{$sorted_category.category.weight}>" />
+ </td>
+ <td><{$sorted_category.category.description}></td>
+ <td>
+ <a href="?op=category.edit&cid=<{$sorted_category.category.cid}>" title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._EDIT}>" alt="<{$smarty.const._EDIT}>" /></a>
+ <a href="?op=category.delete&cid=<{$sorted_category.category.cid}>" title="<{$smarty.const._DELETE}>"><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._DELETE}>" alt="<{$smarty.const._DELETE}>" /></a>
+ <a href="?op=category.move&cid=<{$sorted_category.category.cid}>" title="<{$smarty.const._AM_WFD_BMOVE}>"><img src="<{xoModuleIcons16 forward.png}>" title="<{$smarty.const._AM_WFD_BMOVE}>" alt="<{$smarty.const._AM_WFD_BMOVE}>" /></a>
+ </td>
+ </tr>
+ <{/foreach}>
+ <tr>
+ <td colspan="1"> </td>
+ <td>
+ <{$token}>
+ <input type="hidden" name="op" value="categories.reorder" />
+ <input type="submit" name="submit" value="<{$smarty.const._AM_WFD_BUTTON_CATEGORIES_REORDER}>" />
+ </td>
+ <td colspan="2"> </td>
+ </tr>
+ </table>
+</fieldset>
+</form>
\ No newline at end of file
Added: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadlist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadlist.html (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadlist.html 2013-06-03 19:23:41 UTC (rev 11619)
@@ -0,0 +1,213 @@
+<form action="download.php" method="post" id="downloadsform">
+<fieldset>
+ <legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFD_MINDEX_PUBLISHEDDOWN}></legend>
+<{if ($published_downloads_count == 0)}>
+ <{$smarty.const._AM_WFD_MINDEX_NODOWNLOADSFOUND}>
+<{else}>
+ <table class="outer">
+ <tr>
+ <th><{$smarty.const._AM_WFD_MINDEX_ID}></th>
+ <th><{$smarty.const._AM_WFD_MINDEX_TITLE}></th>
+ <th><{$smarty.const._AM_WFD_FCATEGORY_TITLE}></th>
+ <th><{$smarty.const._AM_WFD_MINDEX_POSTER}></th>
+ <th><{$smarty.const._AM_WFD_MINDEX_SUBMITTED}></th>
+ <th><{$smarty.const._AM_WFD_MINDEX_ONLINESTATUS}></th>
+ <th><{$smarty.const._AM_WFD_MINDEX_PUBLISHED}></th>
+ <th><{$smarty.const._AM_WFD_MINDEX_ACTION}></th>
+ </tr>
+ <{foreach item=download from=$published_downloads}>
+ <tr class="<{cycle values='even, odd'}>">
+ <td><{$download.lid}></td>
+ <td><a href='../singlefile.php?cid=<{$download.cid}>&lid=<{$download.lid}>'><{$download.title}></a></td>
+ <td><{$download.category_title}></td>
+ <td><{$download.submitter_uname}></td>
+ <td><{$download.published_timestamp}></td>
+ <td>
+ <{if $download.offline}>
+ <img src="<{xoModuleIcons16 off.png}>" />
+ <{else}>
+ <img src="<{xoModuleIcons16 on.png}>" />
+ <{/if}>
+ </td>
+ <td>
+ <{if $download.published}>
+ <img src="<{xoModuleIcons16 on.png}>" />
+ <{else}>
+ <img src="<{xoModuleIcons16 off.png}>" />
+ <{/if}>
+ </td>
+ <td>
+ <a href='download.php?op=download.add&lid=<{$download.lid}>' title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._EDIT}>" alt="<{$smarty.const._EDIT}>" /></a>
+ <a href='download.php?op=download.delete&lid=<{$download.lid}>' title="<{$smarty.const._DELETE}>"><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._DELETE}>" alt="<{$smarty.const._DELETE}>" /></a>
+ <a href='ip_log.php?lid=<{$download.lid}>' title="<{$smarty.const._AM_WFD_IP_LOGS}>"><{$smarty.const._AM_WFD_IP_LOGS}></a>
+ </td>
+ </tr>
+ <{/foreach}>
+ </table>
+ <{$published_downloads_pagenav}>
+<{/if}>
+</fieldset>
+
+<br />
+
+<fieldset>
+ <legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFD_MINDEX_AUTOPUBLISHEDDOWN}></legend>
+ <br />
+<{if ($auto_published_downloads_count == 0)}>
+ <{$smarty.const._AM_WFD_MINDEX_NODOWNLOADSFOUND}>
+<{else}>
+ <table class="outer">
+ <tr>
+ <th><{$smarty.const._AM_WFD_MINDEX_ID}></th>
+ <th><{$smarty.const._AM_WFD_MINDEX_TITLE}></th>
+ <th><{$smarty.const._AM_WFD_FCATEGORY_TITLE}></th>
+ <th><{$smarty.const._AM_WFD_MINDEX_POSTER}></th>
+ <th><{$smarty.const._AM_WFD_MINDEX_SUBMITTED}></th>
+ <th><{$smarty.const._AM_WFD_MINDEX_ONLINESTATUS}></th>
+ <th><{$smarty.const._AM_WFD_MINDEX_PUBLISHED}></th>
+ <th><{$smarty.const._AM_WFD_MINDEX_LOG}></th>
+ <th><{$smarty.const._AM_WFD_MINDEX_ACTION}></th>
+ </tr>
+ <{foreach item=download from=$auto_published_downloads}>
+ <tr class="<{cycle values='even, odd'}>">
+ <td><{$download.lid}></td>
+ <td><a href='../singlefile.php?cid=<{$download.cid}>&lid=<{$download.lid}>'><{$download.title}></a></td>
+ <td><{$download.category_title}></td>
+ <td><{$download.submitter_uname}></td>
+ <td><{$download.published_timestamp}></td>
+ <td>
+ <{if $download.offline}>
+ <img src="<{xoModuleIcons16 off.png}>" />
+ <{else}>
+ <img src="<{xoModuleIcons16 on.png}>" />
+ <{/if}>
+ </td>
+ <td>
+ <{if $download.published}>
+ <img src="<{xoModuleIcons16 on.png}>" />
+ <{else}>
+ <img src="<{xoModuleIcons16 off.png}>" />
+ <{/if}>
+ </td>
+ <td><a href='ip_log.php?lid=<{$download.lid}>'><{$smarty.const._AM_WFD_IP_LOGS}></a></td>
+ <td>
+ <a href='download.php?op=download.add&lid=<{$download.lid}>' title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._EDIT}>" alt="<{$smarty.const._EDIT}>" /></a>
+ <a href='download.php?op=download.delete&lid=<{$download.lid}>' title="<{$smarty.const._DELETE}>"><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._DELETE}>" alt="<{$smarty.const._DELETE}>" /></a>
+ </td>
+ </tr>
+ <{/foreach}>
+ </table>
+ <{$auto_published_downloads_pagenav}>
+<{/if}>
+</fieldset>
+
+<br />
+
+<fieldset>
+ <legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFD_MINDEX_EXPIREDDOWN}></legend>
+ <br />
+<{if ($expired_downloads_count == 0)}>
+ <{$smarty.const._AM_WFD_MINDEX_NODOWNLOADSFOUND}>
+<{else}>
+ <table class="outer">
+ <tr>
+ <th><{$smarty.const._AM_WFD_MINDEX_ID}></th>
+ <th><{$smarty.const._AM_WFD_MINDEX_TITLE}></th>
+ <th><{$smarty.const._AM_WFD_FCATEGORY_TITLE}></th>
+ <th><{$smarty.const._AM_WFD_MINDEX_POSTER}></th>
+ <th><{$smarty.const._AM_WFD_MINDEX_SUBMITTED}></th>
+ <th><{$smarty.const._AM_WFD_MINDEX_ONLINESTATUS}></th>
+ <th><{$smarty.const._AM_WFD_MINDEX_PUBLISHED}></th>
+ <th><{$smarty.const._AM_WFD_MINDEX_LOG}></th>
+ <th><{$smarty.const._AM_WFD_MINDEX_ACTION}></th>
+ </tr>
+ <{foreach item=download from=$expired_downloads}>
+ <tr class="<{cycle values='even, odd'}>">
+ <td><{$download.lid}></td>
+ <td><a href='../singlefile.php?cid=<{$download.cid}>&lid=<{$download.lid}>'><{$download.title}></a></td>
+ <td><{$download.category_title}></td>
+ <td><{$download.submitter_uname}></td>
+ <td><{$download.published_timestamp}></td>
+ <td>
+ <{if $download.offline}>
+ <img src="<{xoModuleIcons16 off.png}>" />
+ <{else}>
+ <img src="<{xoModuleIcons16 on.png}>" />
+ <{/if}>
+ </td>
+ <td>
+ <{if $download.published}>
+ <img src="<{xoModuleIcons16 on.png}>" />
+ <{else}>
+ <img src="<{xoModuleIcons16 off.png}>" />
+ <{/if}>
+ </td>
+ <td><a href='ip_log.php?lid=<{$download.lid}>'><{$smarty.const._AM_WFD_IP_LOGS}></a></td>
+ <td>
+ <a href='download.php?op=download.add&lid=<{$download.lid}>' title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._EDIT}>" alt="<{$smarty.const._EDIT}>" /></a>
+ <a href='download.php?op=download.delete&lid=<{$download.lid}>' title="<{$smarty.const._DELETE}>"><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._DELETE}>" alt="<{$smarty.const._DELETE}>" /></a>
+ </td>
+ </tr>
+ <{/foreach}>
+ </table>
+ <{$expired_downloads_pagenav}>
+<{/if}>
+</fieldset>
+
+<br />
+
+<fieldset>
+ <legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFD_MINDEX_OFFLINEDOWN}></legend>
+ <br />
+<{if ($offline_downloads_count == 0)}>
+ <{$smarty.const._AM_WFD_MINDEX_NODOWNLOADSFOUND}>
+<{else}>
+ <table class="outer">
+ <tr>
+ <th><{$smarty.const._AM_WFD_MINDEX_ID}></th>
+ <th><{$smarty.const._AM_WFD_MINDEX_TITLE}></th>
+ <th><{$smarty.const._AM_WFD_FCATEGORY_TITLE}></th>
+ <th><{$smarty.const._AM_WFD_MINDEX_POSTER}></th>
+ <th><{$smarty.const._AM_WFD_MINDEX_SUBMITTED}></th>
+ <th><{$smarty.const._AM_WFD_MINDEX_ONLINESTATUS}></th>
+ <th><{$smarty.const._AM_WFD_MINDEX_PUBLISHED}></th>
+ <th><{$smarty.const._AM_WFD_MINDEX_LOG}></th>
+ <th><{$smarty.const._AM_WFD_MINDEX_ACTION}></th>
+ </tr>
+ <{foreach item=download from=$offline_downloads}>
+ <tr class="<{cycle values='even, odd'}>">
+ <td><{$download.lid}></td>
+ <td><a href='../singlefile.php?cid=<{$download.cid}>&lid=<{$download.lid}>'><{$download.title}></a></td>
+ <td><{$download.category_title}></td>
+ <td><{$download.submitter_uname}></td>
+ <td><{$download.published_timestamp}></td>
+ <td>
+ <{if $download.offline}>
+ <img src="<{xoModuleIcons16 off.png}>" />
+ <{else}>
+ <img src="<{xoModuleIcons16 on.png}>" />
+ <{/if}>
+ </td>
+ <td>
+ <{if $download.published}>
+ <img src="<{xoModuleIcons16 on.png}>" />
+ <{else}>
+ <img src="<{xoModuleIcons16 off.png}>" />
+ <{/if}>
+ </td>
+ <td><a href='ip_log.php?lid=<{$download.lid}>'><{$smarty.const._AM_WFD_IP_LOGS}></a></td>
+ <td>
+ <a href='download.php?op=download.add&lid=<{$download.lid}>' title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._EDIT}>" alt="<{$smarty.const._EDIT}>" /></a>
+ <a href='download.php?op=download.delete&lid=<{$download.lid}>' title="<{$smarty.const._DELETE}>"><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._DELETE}>" alt="<{$smarty.const._DELETE}>" /></a>
+ </td>
+ </tr>
+ <{/foreach}>
+ </table>
+ <{$offline_downloads_pagenav}>
+<{/if}>
+</fieldset>
+
+
+
+
+</form>
\ No newline at end of file
Added: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_menu.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_menu.html (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_menu.html 2013-06-03 19:23:41 UTC (rev 11619)
@@ -0,0 +1,48 @@
+<style type='text/css'>
+ #buttontop { float:left; width:100%; background: #e7e7e7; font-size:93%; line-height:normal; border-top: 1px solid black; border-left: 1px solid black; border-right: 1px solid black; margin: 0; }
+ #buttonbar { float:left; width:100%; background: #e7e7e7 url('../images/bg.gif') repeat-x left bottom; font-size:93%; line-height:normal; border-left: 1px solid black; border-right: 1px solid black; margin-bottom: 12px; }
+ #buttonbar ul { margin:0; margin-top: 15px; padding:10px 10px 0; list-style:none; }
+ #buttonbar li { display:inline; margin:0; padding:0; }
+ #buttonbar a { float:left; background:url('../images/left_both.gif') no-repeat left top; margin:0; padding:0 0 0 9px; border-bottom:1px solid #000; text-decoration:none; }
+ #buttonbar a span { float:left; display:block; background:url('../images/right_both.gif') no-repeat right top; padding:5px 15px 4px 6px; font-weight:bold; color:#765; }
+ /* Commented Backslash Hack hides rule from IE5-Mac \*/
+ #buttonbar a span {float:none;}
+ /* End IE5-Mac hack */
+ #buttonbar a:hover span { color:#333; }
+ #buttonbar #current a { background-position:0 -150px; border-width:0; }
+ #buttonbar #current a span { background-position:100% -150px; padding-bottom:5px; color:#333; }
+ #buttonbar a:hover { background-position:0% -150px; }
+ #buttonbar a:hover span { background-position:100% -150px; }
+</style>
+
+<div id="buttontop">
+ <table style="width: 100%; padding: 0;" cellspacing="0">
+ <tr>
+ <td style="font-size: 10px; text-align: left; color: #2F5376; padding: 0 6px; line-height: 18px;">
+ <{foreach from=$headermenu key=itemnum item=menuitem}>
+ <a class="nobutton" href="<{$menuitem.link}>"><{$menuitem.title}></a>
+ <{if ($itemnum + 1) <> $headermenucount}>
+ |
+ <{/if}>
+ <{/foreach}>
+ </td>
+ <td style="font-size: 10px; text-align: right; color: #2F5376; padding: 0 6px; line-height: 18px;">
+ <{$breadcrumb}>
+ </td>
+ </tr>
+ </table>
+</div>
+<div id="buttonbar">
+ <ul>
+<{foreach from=$adminmenu key=itemnum item=menuitem}>
+ <{if $itemnum==$current}>
+ <li id="current">
+ <{else}>
+ <li>
+ <{/if}>
+ <a href="../<{$menuitem.link}>"><span><{$menuitem.title}></span></a>
+ </li>
+<{/foreach}>
+ </ul>
+</div>
+<div> </div>
Added: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_mimetypelist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_mimetypelist.html (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_mimetypelist.html 2013-06-03 19:23:41 UTC (rev 11619)
@@ -0,0 +1,91 @@
+<fieldset>
+ <legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFD_MIME_ADMINF}></legend>
+ <{$smarty.const._AM_WFD_MIME_ADMINFINFO}>
+ <br />
+<{if ($allowAdminMimetypes|count)}>
+<{foreach item=allowAdminMimetype from=$allowAdminMimetypes}>
+ <{$allowAdminMimetype}> |
+<{/foreach}>
+<{else}>
+ <{$smarty.const._AM_WFD_MIME_NOMIMEINFO}>
+<{/if}>
+</fieldset>
+
+<br />
+
+<fieldset>
+ <legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFD_MIME_USERF}></legend>
+ <{$smarty.const._AM_WFD_MIME_USERFINFO}>
+ <br />
+<{if ($allowUserMimetypes|count)}>
+<{foreach item=allowUserMimetype from=$allowUserMimetypes}>
+ <{$allowUserMimetype}> |
+<{/foreach}>
+<{else}>
+ <{$smarty.const._AM_WFD_MIME_NOMIMEINFO}>
+<{/if}>
+</fieldset>
+
+<br />
+
+<fieldset>
+ <legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFD_MIME_MIMETYPES_LIST}></legend>
+<{if ($mimetypes_count == 0)}>
+ <{$smarty.const._AM_WFD_MIME_NOMIMETYPES}>
+<{else}>
+ <table class='outer'>
+ <tr>
+ <th><{$smarty.const._AM_WFD_MIME_ID}></th>
+ <th><{$smarty.const._AM_WFD_MIME_NAME}></th>
+ <th><{$smarty.const._AM_WFD_MIME_EXT}></th>
+ <th><{$smarty.const._AM_WFD_MIME_ADMIN}></th>
+ <th><{$smarty.const._AM_WFD_MIME_USER}></th>
+ <th><{$smarty.const._AM_WFD_MINDEX_ACTION}></th>
+ </tr>
+ <{foreach item=mimetype from=$mimetypes}>
+ <tr class="<{cycle values='even, odd'}>">
+ <td class='head'><{$mimetype.mime_id}></td>
+ <td class='even'><{$mimetype.mime_name}></td>
+ <td class='even'>.<{$mimetype.mime_ext}></td>
+ <td class='even'>
+ <a href='?op=mimetype.update&admin=1&mime_id=<{$mimetype.mime_id}>&start=<{$start}>'>
+ <{if ($mimetype.mime_admin == 1)}>
+ <img src="<{xoModuleIcons16 on.png}>" />
+ <{else}>
+ <img src="<{xoModuleIcons16 off.png}>" />
+ <{/if}>
+ </a>
+ </td>
+ <td class='even'>
+ <a href='?op=mimetype.update&user=1&mime_id=<{$mimetype.mime_id}>&start=<{$start}>'>
+ <{if ($mimetype.mime_user == 1)}>
+ <img src="<{xoModuleIcons16 on.png}>" />
+ <{else}>
+ <img src="<{xoModuleIcons16 off.png}>" />
+ <{/if}>
+ </a>
+ </td>
+ <td class='even'>
+ <a href='?op=mimetype.edit&mime_id=<{$mimetype.mime_id}>'><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._EDIT}>" alt="<{$smarty.const._EDIT}>" /></a>
+ <a href='?op=mimetype.delete&mime_id=<{$mimetype.mime_id}>'><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._DELETE}>" alt="<{$smarty.const._DELETE}>" /></a>
+ </td>
+ </tr>
+ <{/foreach}>
+ <tr>
+ <td> </td>
+ <td> </td>
+ <td> </td>
+ <td>
+ <a href='?op=mimetypes.update&admin=1&type_all=1'><img src="<{xoModuleIcons16 on.png}>" /></a>
+ <a href='?op=mimetypes.update&admin=1&type_all=0'><img src="<{xoModuleIcons16 off.png}>" /></a>
+ </td>
+ <td>
+ <a href='?op=mimetypes.update&user=1&type_all=1'><img src="<{xoModuleIcons16 on.png}>" /></a>
+ <a href='?op=mimetypes.update&user=1&type_all=0'><img src="<{xoModuleIcons16 off.png}>" /></a>
+ </td>
+ <td> </td>
+ </tr>
+ </table>
+ <{$mimetypes_pagenav}>
+<{/if}>
+</fieldset>
Added: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_mirrorlist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_mirrorlist.html (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_mirrorlist.html 2013-06-03 19:23:41 UTC (rev 11619)
@@ -0,0 +1,83 @@
+<fieldset>
+ <legend style='font-weight: bold;'><{$smarty.const._AM_WFD_AMIRRORS_INFO}></legend>
+ <p>
+ <{$smarty.const._AM_WFD_AMIRRORS_WAITING}>: <{$mirrors_waiting_count}>
+ <br />
+ <{$smarty.const._AM_WFD_MIRROR_MIRROR_TOTAL}>: <{$mirrors_published_count}>
+ <br />
+ <img src="<{xoModuleIcons16 on.png}>" title="<{$smarty.const._AM_WFD_AMIRRORS_APPROVE}>" alt="<{$smarty.const._AM_WFD_AMIRRORS_APPROVE}>" /> <{$smarty.const._AM_WFD_AMIRRORS_APPROVE}>
+ <br />
+ <img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._AM_WFD_AMIRRORS_EDIT}>" alt="<{$smarty.const._AM_WFD_AMIRRORS_EDIT}>" /> <{$smarty.const._AM_WFD_AMIRRORS_EDIT}>
+ <br />
+ <img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._AM_WFD_AMIRRORS_DELETE}>" alt="<{$smarty.const._AM_WFD_AMIRRORS_DELETE}>" /> <{$smarty.const._AM_WFD_AMIRRORS_DELETE}>
+ </p>
+</fieldset>
+
+<br />
+
+<fieldset>
+ <legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFD_MIRROR_MIRROR_WAITING}></legend>
+<{if ($mirrors_waiting_count == 0)}>
+ <{$smarty.const._AM_WFD_MIRROR_NOWAITINGMIRRORS}>
+<{else}>
+ <table class='outer'>
+ <tr>
+ <th><{$smarty.const._AM_WFD_MIRROR_ID}></th>
+ <th><{$smarty.const._AM_WFD_MIRROR_TITLE}></th>
+ <th><{$smarty.const._AM_WFD_MIRROR_POSTER}></th>
+ <th><{$smarty.const._AM_WFD_MIRROR_SUBMITDATE}></th>
+ <th><{$smarty.const._AM_WFD_REV_ACTION}></th>
+ </tr>
+ <{foreach item=mirror_waiting from=$mirrors_waiting}>
+ <tr class="<{cycle values='even, odd'}>">
+ <td class='head'><{$mirror_waiting.mirror_id}></td>
+ <td class='even'>
+ <a href='download.php?op=download.edit&lid=<{$mirror_waiting.lid}>'><{$mirror_waiting.download_title}></a>
+ </td>
+ <td class='even'><{$mirror_waiting.submitter_uname}></td>
+ <td class='even'><{$mirror_waiting.formatted_date}></td>
+ <td class='even'>
+ <a href='?op=mirror.approve&mirror_id=<{$mirror_waiting.mirror_id}>'><img src="<{xoModuleIcons16 on.png}>" title="<{$smarty.const._AM_WFD_AMIRRORS_APPROVE}>" alt="<{$smarty.const._AM_WFD_AMIRRORS_APPROVE}>" /></a>
+ <a href='?op=mirror.edit&mirror_id=<{$mirror_waiting.mirror_id}>'><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._AM_WFD_AMIRRORS_EDIT}>" alt="<{$smarty.const._AM_WFD_AMIRRORS_EDIT}>" /></a>
+ <a href='?op=mirror.delete&mirror_id=<{$mirror_waiting.mirror_id}>'><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._AM_WFD_AMIRRORS_DELETE}>" alt="<{$smarty.const._AM_WFD_AMIRRORS_DELETE}>" /></a>
+ </td>
+ </tr>
+ <{/foreach}>
+ </table>
+ <{$mirrors_waiting_pagenav}>
+<{/if}>
+</fieldset>
+
+<br />
+
+<fieldset>
+ <legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFD_MIRROR_MIRROR_PUBLISHED}></legend>
+<{if ($mirrors_published_count == 0)}>
+ <{$smarty.const._AM_WFD_MIRROR_NOPUBLISHEDMIRRORS}>
+<{else}>
+ <table class='outer'>
+ <tr>
+ <th><{$smarty.const._AM_WFD_MIRROR_ID}></th>
+ <th><{$smarty.const._AM_WFD_MIRROR_TITLE}></th>
+ <th><{$smarty.const._AM_WFD_MIRROR_POSTER}></th>
+ <th><{$smarty.const._AM_WFD_MIRROR_SUBMITDATE}></th>
+ <th><{$smarty.const._AM_WFD_REV_ACTION}></th>
+ </tr>
+ <{foreach item=mirror_published from=$mirrors_published}>
+ <tr class="<{cycle values='even, odd'}>">
+ <td class='head'><{$mirror_published.mirror_id}></td>
+ <td class='even'>
+ <a href='download.php?op=download.edit&lid=<{$mirror_published.lid}>'><{$mirror_published.download_title}></a>
+ </td>
+ <td class='even'><{$mirror_published.submitter_uname}></td>
+ <td class='even'><{$mirror_published.formatted_date}></td>
+ <td class='even'>
+ <a href='?op=mirror.edit&mirror_id=<{$mirror_published.mirror_id}>'><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._AM_WFD_AMIRRORS_EDIT}>" alt="<{$smarty.const._AM_WFD_AMIRRORS_EDIT}>" /></a>
+ <a href='?op=mirror.delete&mirror_id=<{$mirror_published.mirror_id}>'><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._AM_WFD_AMIRRORS_DELETE}>" alt="<{$smarty.const._AM_WFD_AMIRRORS_DELETE}>" /></a>
+ </td>
+ </tr>
+ <{/foreach}>
+ </table>
+ <{$mirrors_published_pagenav}>
+<{/if}>
+</fieldset>
Added: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_permissions.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_permissions.html (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_permissions.html 2013-06-03 19:23:41 UTC (rev 11619)
@@ -0,0 +1,12 @@
+<fieldset>
+ <legend style='font-weight: bold;'><{$smarty.const._AM_WFD_PERM_NOTE}></legend>
+ <{$smarty.const._AM_WFD_PERM_PERMSNOTE}>
+</fieldset>
+
+<br />
+
+<fieldset>
+ <legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFD_PERM_CPERMISSIONS}></legend>
+ <{$down_cat_form}>
+ <{$up_cat_form}>
+</fieldset>
Added: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reviewlist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reviewlist.html (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reviewlist.html 2013-06-03 19:23:41 UTC (rev 11619)
@@ -0,0 +1,91 @@
+<fieldset>
+ <legend style='font-weight: bold;'><{$smarty.const._AM_WFD_AREVIEWS_INFO}></legend>
+ <p>
+ <{$smarty.const._AM_WFD_AREVIEWS_WAITING}>: <{$reviews_waiting_count}>
+ <br />
+ <{$smarty.const._AM_WFD_REV_REVIEW_TOTAL}>: <{$reviews_published_count}>
+ <br />
+ <img src="<{xoModuleIcons16 on.png}>" title="<{$smarty.const._AM_WFD_AREVIEWS_APPROVE}>" alt="<{$smarty.const._AM_WFD_AREVIEWS_APPROVE}>" /> <{$smarty.const._AM_WFD_AREVIEWS_APPROVE}>
+ <br />
+ <img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._AM_WFD_AREVIEWS_EDIT}>" alt="<{$smarty.const._AM_WFD_AREVIEWS_EDIT}>" /> <{$smarty.const._AM_WFD_AREVIEWS_EDIT}>
+ <br />
+ <img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._AM_WFD_AREVIEWS_DELETE}>" alt="<{$smarty.const._AM_WFD_AREVIEWS_DELETE}>" /> <{$smarty.const._AM_WFD_AREVIEWS_DELETE}>
+ </p>
+</fieldset>
+
+<br />
+
+<fieldset>
+ <legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFD_REV_REVIEW_WAITING}></legend>
+<{if ($reviews_waiting_count == 0)}>
+ <{$smarty.const._AM_WFD_REV_NOWAITINGREVIEWS}>
+<{else}>
+ <table class='outer'>
+ <tr>
+ <th><{$smarty.const._AM_WFD_REV_ID}></th>
+ <th><{$smarty.const._AM_WFD_REV_TITLE}></th>
+ <th><{$smarty.const._AM_WFD_REV_REVIEWTITLE}></th>
+ <th><{$smarty.const._AM_WFD_REV_POSTER}></th>
+ <th><{$smarty.const._AM_WFD_REV_SUBMITDATE}></th>
+ <th><{$smarty.const._AM_WFD_REV_ACTION}></th>
+ </tr>
+ <{foreach item=review_waiting from=$reviews_waiting}>
+ <tr class="<{cycle values='even, odd'}>">
+ <td class='head'><{$review_waiting.review_id}></td>
+ <td class='even'>
+ <a href='download.php?op=download.edit&lid=<{$review_waiting.lid}>'><{$review_waiting.dow...
[truncated message content] |
|
From: <luc...@us...> - 2013-06-03 19:30:35
|
Revision: 11620
http://sourceforge.net/p/xoops/svn/11620
Author: luciorota
Date: 2013-06-03 19:30:30 +0000 (Mon, 03 Jun 2013)
Log Message:
-----------
module standardization: header.php, admin/admin_header.php, xoops_version.php
module standardization: standardize directories/files names/structures
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokendown.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/cookies.js
XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/funcs.js
XoopsModules/wfdownloads/trunk/wfdownloads/admin/imageupload.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirror.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/modifications.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/newdownloads.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/permissions.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/category.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/mimetype.php
XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/trunk/wfdownloads/header.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/common.php
Added Paths:
-----------
XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top.php
XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top_by_cat.php
XoopsModules/wfdownloads/trunk/wfdownloads/sql/mysql.sql
Removed Paths:
-------------
XoopsModules/wfdownloads/trunk/wfdownloads/blocks/wfdownloads_top.php
XoopsModules/wfdownloads/trunk/wfdownloads/blocks/wfdownloads_top_by_cat.php
XoopsModules/wfdownloads/trunk/wfdownloads/sql/wfdownloads.sql
Property Changed:
----------------
XoopsModules/wfdownloads/trunk/wfdownloads/
Index: XoopsModules/wfdownloads/trunk/wfdownloads
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads 2013-06-03 19:23:41 UTC (rev 11619)
+++ XoopsModules/wfdownloads/trunk/wfdownloads 2013-06-03 19:30:30 UTC (rev 11620)
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+.project
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-06-03 19:23:41 UTC (rev 11619)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-06-03 19:30:30 UTC (rev 11620)
@@ -19,7 +19,6 @@
* @version svn:$id$
*/
include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
-$thisModuleDirname = basename(dirname(dirname( __FILE__ ) ));
// Include xoops admin header
include_once XOOPS_ROOT_PATH . '/include/cp_header.php';
@@ -27,27 +26,17 @@
include_once XOOPS_ROOT_PATH . '/class/tree.php';
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
xoops_load ('XoopsUserUtility');
+$myts = &MyTextSanitizer::getInstance();
$module_handler =& xoops_gethandler('module');
-$xoopsModule = & $module_handler->getByDirname($thisModuleDirname);
+$xoopsModule = & $module_handler->getByDirname(basename(dirname(dirname(__FILE__))));
-$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
-$pathImageIcon = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16');
-$pathImageAdmin = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32');
-$pathImageModule = XOOPS_URL . '/modules/'. $thisModuleDirname .'/images';
+$pathIcon16 = XOOPS_URL . '/' . $xoopsModule->getInfo('icons16');
+$pathIcon32 = XOOPS_URL . '/' . $xoopsModule->getInfo('icons32');
-$pathIcon16 = '../' . $xoopsModule->getInfo('icons16');
-$pathIcon32 = '../' . $xoopsModule->getInfo('icons32');
-$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
-
-
-include_once(XOOPS_ROOT_PATH . '/modules/wfdownloads/include/functions.php');
include_once(XOOPS_ROOT_PATH . '/modules/wfdownloads/include/common.php');
-$myts = &MyTextSanitizer::getInstance();
-
-
-$imagearray = array(
+/*$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'>",
@@ -64,32 +53,33 @@
'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'>"
- );
+ );*/
-if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php'))){
- include_once $GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php');
+if ( file_exists($GLOBALS['xoops']->path('/' . $xoopsModule->getInfo('dirmoduleadmin') . '/moduleadmin/moduleadmin.php'))){
+ include_once $GLOBALS['xoops']->path('/' . $xoopsModule->getInfo('dirmoduleadmin') . '/moduleadmin/moduleadmin.php');
} else {
- redirect_header("../../../admin.php", 5, _AM_WFD_MODULEADMIN_MISSING, false);
+ echo xoops_error('/' . $xoopsModule->getInfo('dirmoduleadmin') . '/moduleadmin/ is required!!!');
}
+// Load language files
+xoops_loadLanguage('admin', $xoopsModule->dirname());
+xoops_loadLanguage('modinfo', $xoopsModule->dirname());
+xoops_loadLanguage('main', $xoopsModule->dirname());
+
+// Load handlers
+$report_handler = xoops_getmodulehandler('report', $xoopsModule->dirname());
+$review_handler = xoops_getmodulehandler('review', $xoopsModule->dirname());
+$mirror_handler = xoops_getmodulehandler('mirror', $xoopsModule->dirname());
+$modification_handler = xoops_getmodulehandler('modification', $xoopsModule->dirname());
+$download_handler = xoops_getmodulehandler('download', $xoopsModule->dirname());
+$category_handler = xoops_getmodulehandler('category', $xoopsModule->dirname());
+$mime_handler = xoops_getmodulehandler('mimetype', $xoopsModule->dirname());
+
+$member_handler = xoops_gethandler("member");
+
+
if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
include_once(XOOPS_ROOT_PATH . "/class/template.php");
$xoopsTpl = new XoopsTpl();
}
-
-// Load language files
-xoops_loadLanguage('admin', $thisModuleDirname);
-xoops_loadLanguage('modinfo', $thisModuleDirname);
-xoops_loadLanguage('main', $thisModuleDirname);
-
-// LOad handlers
-$report_handler = xoops_getmodulehandler('report', $thisModuleDirname);
-$review_handler = xoops_getmodulehandler('review', $thisModuleDirname);
-$mirror_handler = xoops_getmodulehandler('mirror', $thisModuleDirname);
-$modification_handler = xoops_getmodulehandler('modification', $thisModuleDirname);
-$download_handler = xoops_getmodulehandler('download', $thisModuleDirname);
-$category_handler = xoops_getmodulehandler('category', $thisModuleDirname);
-$mime_handler = xoops_getmodulehandler('mimetype', $thisModuleDirname);
-
-$member_handler = xoops_gethandler("member");
\ No newline at end of file
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokendown.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokendown.php 2013-06-03 19:23:41 UTC (rev 11619)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokendown.php 2013-06-03 19:30:30 UTC (rev 11620)
@@ -18,21 +18,13 @@
* @author Xoops Development Team
* @version svn:$id$
*/
- $currentFile = basename(__FILE__);
+$currentFile = basename(__FILE__);
include 'admin_header.php';
-$op = '';
+$op = wfdownloads_CleanVars($_REQUEST, 'op', 'brokendownloads.list', 'string');
+$lid = wfdownloads_CleanVars($_REQUEST, 'lid', 0, 'int');
-if (!isset($_POST['op'])) {
- $op = isset($_GET['op']) ? $_GET['op'] : 'listBrokenDownloads';
-} else {
- $op = $_POST['op'];
-}
-
-$lid = (isset($_GET['lid'])) ? intval($_GET['lid']) : 0;
-
-switch ($op)
-{
+switch ($op) {
case "updateNotice":
$report_handler = xoops_getmodulehandler('report');
if (isset($_GET['ack'])) {
@@ -49,6 +41,7 @@
redirect_header(WFDOWNLOADS_URL.'admin/brokendown.php?op=default', 1, $update_mess);
break;
+ case "brokendownload.delete" :
case "delBrokenDownloads":
$criteria = new Criteria('lid', intval($lid));
$report_handler = xoops_getmodulehandler('report');
@@ -62,6 +55,7 @@
redirect_header(WFDOWNLOADS_URL.'admin/brokendown.php?op=default', 1, _AM_WFD_BROKENFILEDELETED);
break;
+ case "brokendownload.ignore" :
case "ignoreBrokenDownloads":
$criteria = new Criteria('lid', intval($lid));
$report_handler = xoops_getmodulehandler('report');
@@ -69,24 +63,19 @@
if (isset($report[0])) {
$report_handler->delete($report[0], true);
}
-
redirect_header(WFDOWNLOADS_URL.'admin/brokendown.php?op=default', 1, _AM_WFD_BROKEN_FILEIGNORED);
break;
default:
+ case "brokendownloads.list" :
case "listBrokenDownloads":
case "default":
-
- global $xoopsDB, $imagearray, $xoopsModule;
$report_handler = xoops_getmodulehandler('report');
$reports = $report_handler->getObjects();
$totalbrokendownloads = count($reports);
wfdownloads_xoops_cp_header();
-
- //wfdownloads_adminMenu(3, _AM_WFD_BROKEN_FILE);
-
echo "
<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFD_BROKEN_REPORTINFO . "</legend>\n
<div style='padding: 8px;'>" . _AM_WFD_BROKEN_REPORTSNO . " <b>$totalbrokendownloads</b><div>\n
@@ -110,77 +99,76 @@
</tr>\n
";
- if ($totalbrokendownloads == 0) {
- echo "<tr align = 'center'><td align = 'center' class='head' colspan = '6'>" . _AM_WFD_BROKEN_NOFILEMATCH . "</td></tr>";
- } else {
- foreach (array_keys($reports) as $i) {
- $lids[] = $reports[$i]->getVar('lid');
- $uids[] = $reports[$i]->getVar('sender');
- }
- $download_handler = xoops_getmodulehandler('download');
- $downloads = $download_handler->getObjects(new Criteria('lid', "(".implode(',', array_unique($lids)).")", "IN"), true);
+ if ($totalbrokendownloads == 0) {
+ echo "<tr align = 'center'><td align = 'center' class='head' colspan = '6'>" . _AM_WFD_BROKEN_NOFILEMATCH . "</td></tr>";
+ } else {
+ foreach (array_keys($reports) as $i) {
+ $lids[] = $reports[$i]->getVar('lid');
+ $uids[] = $reports[$i]->getVar('sender');
+ }
+ $download_handler = xoops_getmodulehandler('download');
+ $downloads = $download_handler->getObjects(new Criteria('lid', "(".implode(',', array_unique($lids)).")", "IN"), true);
- foreach (array_keys($downloads) as $i) {
- $uids[] = $downloads[$i]->getVar('submitter');
- }
+ foreach (array_keys($downloads) as $i) {
+ $uids[] = $downloads[$i]->getVar('submitter');
+ }
- $member_handler = xoops_gethandler('member');
- $users = $member_handler->getUsers(new Criteria("uid", "(" . implode(',', array_unique($uids)) . ")", "IN"), true);
+ $member_handler = xoops_gethandler('member');
+ $users = $member_handler->getUsers(new Criteria("uid", "(" . implode(',', array_unique($uids)) . ")", "IN"), true);
- foreach (array_keys($reports) as $i) {
- // Does the download exists ?
- if (isset($downloads[$reports[$i]->getVar('lid')])) {
- $submitter = isset($users[$downloads[$reports[$i]->getVar('lid')]->getVar('submitter')]) ? $users[$downloads[$reports[$i]->getVar('lid')]->getVar('submitter')] : false;
- $download = $downloads[$reports[$i]->getVar('lid')];
- $download_link = "<a href='" . WFDOWNLOADS_URL."singlefile.php?cid=" . $download->getVar('cid') . "&lid=" . $download->getVar('lid') . "' target='_blank'>" . $download->getVar('title') . "</a>";
- $submitteremail = is_object($submitter) ? $submitter->getVar('email') : '';
- $submitteruname = is_object($submitter) ? $submitter->getVar('uname') : $xoopsConfig['anonymous'];
- } else {
- $submitter = '';
- $download_link = _AM_WFD_BROKEN_DOWNLOAD_DONT_EXISTS;
- $submitteremail = '';
- $submitteruname = $xoopsConfig['anonymous'];
- }
-
- $sender = isset($users[$reports[$i]->getVar('sender')]) ? $users[$reports[$i]->getVar('sender')] : "";
- $senderemail = isset($users[$reports[$i]->getVar('sender')]) ? $users[$reports[$i]->getVar('sender')]->getVar('email') : "";
- $sendername = isset($users[$reports[$i]->getVar('sender')]) ? $users[$reports[$i]->getVar('sender')]->getVar('uname') : $xoopsConfig['anonymous'];
+ foreach (array_keys($reports) as $i) {
+ // Does the download exists ?
+ if (isset($downloads[$reports[$i]->getVar('lid')])) {
+ $submitter = isset($users[$downloads[$reports[$i]->getVar('lid')]->getVar('submitter')]) ? $users[$downloads[$reports[$i]->getVar('lid')]->getVar('submitter')] : false;
+ $download = $downloads[$reports[$i]->getVar('lid')];
+ $download_link = "<a href='" . WFDOWNLOADS_URL."singlefile.php?cid=" . $download->getVar('cid') . "&lid=" . $download->getVar('lid') . "' target='_blank'>" . $download->getVar('title') . "</a>";
+ $submitteremail = is_object($submitter) ? $submitter->getVar('email') : '';
+ $submitteruname = is_object($submitter) ? $submitter->getVar('uname') : $xoopsConfig['anonymous'];
+ } else {
+ $submitter = '';
+ $download_link = _AM_WFD_BROKEN_DOWNLOAD_DONT_EXISTS;
+ $submitteremail = '';
+ $submitteruname = $xoopsConfig['anonymous'];
+ }
- $lid = intval($download->getVar('lid'));
+ $sender = isset($users[$reports[$i]->getVar('sender')]) ? $users[$reports[$i]->getVar('sender')] : "";
+ $senderemail = isset($users[$reports[$i]->getVar('sender')]) ? $users[$reports[$i]->getVar('sender')]->getVar('email') : "";
+ $sendername = isset($users[$reports[$i]->getVar('sender')]) ? $users[$reports[$i]->getVar('sender')]->getVar('uname') : $xoopsConfig['anonymous'];
- $ingnore_link = "<a href='" . WFDOWNLOADS_URL ."admin/brokendown.php?op=ignoreBrokenDownloads&lid=" . $lid . "' alt='" . _AM_WFD_BROKEN_IGNORE_ALT . "' title='" . _AM_WFD_BROKEN_IGNORE_ALT . "'>" . $imagearray['ignore'] . "</a>";
- $edit_link = "<a href='" . WFDOWNLOADS_URL . "admin/main.php?op=Download&lid=" . $lid . "' alt='" . _AM_WFD_BROKEN_EDIT_ALT . "' title='" . _AM_WFD_BROKEN_EDIT_ALT . "'> " . $imagearray['editimg'] . " </a>";
- $delete_link = "<a href='" . WFDOWNLOADS_URL . "admin/brokendown.php?op=delBrokenDownloads&lid=" . $lid . "' alt='" . _AM_WFD_BROKEN_DELETE_ALT . "' title='" . _AM_WFD_BROKEN_DELETE_ALT . "'>" . $imagearray['deleteimg'] . "</a>";
- $ack_image = ($reports[$i]->getVar('acknowledged')) ? $imagearray['ack_yes'] : $imagearray['ack_no'];
- $ack_link = "<a href='" . WFDOWNLOADS_URL . "admin/brokendown.php?op=updateNotice&lid=" . $lid . "&ack=" . $reports[$i]->getVar('acknowledged') . "' alt='" . _AM_WFD_BROKEN_ACK_ALT . "' title='" . _AM_WFD_BROKEN_ACK_ALT . "'>" . $ack_image . "</a>";
- $con_image = ($reports[$i]->getVar('confirmed')) ? $imagearray['con_yes'] : $imagearray['con_no'];
- $con_link = "<a href='" . WFDOWNLOADS_URL . "admin/brokendown.php?op=updateNotice&lid=" . $lid . "&con=" . $reports[$i]->getVar('confirmed') . "' alt='" . _AM_WFD_BROKEN_CONFIRM_ALT . "' title='" . _AM_WFD_BROKEN_CONFIRM_ALT . "'>" . $con_image . " </a>\n";
-
- echo "
- <tr align = 'center'>\n
- <td class = 'head'>" . $reports[$i]->getVar('reportid') . "</td>\n
- <td class = 'even' align = 'left'>$download_link</td>\n
+ $lid = intval($download->getVar('lid'));
+
+ $ingnore_link = "<a href='" . WFDOWNLOADS_URL ."admin/brokendown.php?op=ignoreBrokenDownloads&lid=" . $lid . "' alt='" . _AM_WFD_BROKEN_IGNORE_ALT . "' title='" . _AM_WFD_BROKEN_IGNORE_ALT . "'>" . $imagearray['ignore'] . "</a>";
+ $edit_link = "<a href='" . WFDOWNLOADS_URL . "admin/main.php?op=Download&lid=" . $lid . "' alt='" . _AM_WFD_BROKEN_EDIT_ALT . "' title='" . _AM_WFD_BROKEN_EDIT_ALT . "'> " . $imagearray['editimg'] . " </a>";
+ $delete_link = "<a href='" . WFDOWNLOADS_URL . "admin/brokendown.php?op=delBrokenDownloads&lid=" . $lid . "' alt='" . _AM_WFD_BROKEN_DELETE_ALT . "' title='" . _AM_WFD_BROKEN_DELETE_ALT . "'>" . $imagearray['deleteimg'] . "</a>";
+ $ack_image = ($reports[$i]->getVar('acknowledged')) ? $imagearray['ack_yes'] : $imagearray['ack_no'];
+ $ack_link = "<a href='" . WFDOWNLOADS_URL . "admin/brokendown.php?op=updateNotice&lid=" . $lid . "&ack=" . $reports[$i]->getVar('acknowledged') . "' alt='" . _AM_WFD_BROKEN_ACK_ALT . "' title='" . _AM_WFD_BROKEN_ACK_ALT . "'>" . $ack_image . "</a>";
+ $con_image = ($reports[$i]->getVar('confirmed')) ? $imagearray['con_yes'] : $imagearray['con_no'];
+ $con_link = "<a href='" . WFDOWNLOADS_URL . "admin/brokendown.php?op=updateNotice&lid=" . $lid . "&con=" . $reports[$i]->getVar('confirmed') . "' alt='" . _AM_WFD_BROKEN_CONFIRM_ALT . "' title='" . _AM_WFD_BROKEN_CONFIRM_ALT . "'>" . $con_image . " </a>\n";
+
+ echo "
+ <tr align = 'center'>\n
+ <td class = 'head'>" . $reports[$i]->getVar('reportid') . "</td>\n
+ <td class = 'even' align = 'left'>$download_link</td>\n
+ ";
+ if ($senderemail == "") {
+ echo "<td class = 'even'>" . $sendername . " (" . $reports[$i]->getVar('ip') . ")";
+ } else {
+ echo "<td class = 'even'><a href='mailto:" . $senderemail . "'>" . $sendername . "</a> (" . $reports[$i]->getVar('ip') . ")";
+ }
+ if ($submitteremail == '') {
+ echo "<td class = 'even'>" . $submitteruname;
+ } else {
+ echo "<td class = 'even'><a href='mailto:" . $submitteremail . "'>".$submitteruname."</a>";
+ }
+ echo "
+ </td>\n
+ <td class='even' align='center'>" . formatTimestamp($reports[$i]->getVar('date'), $xoopsModuleConfig['dateformat']) . "</td>\n
+ <td align='center' class = 'even' nowrap>\n
+ $ingnore_link $edit_link $delete_link $ack_link $con_link
+ </td></tr>\n
";
- if ($senderemail == "") {
- echo "<td class = 'even'>" . $sendername . " (" . $reports[$i]->getVar('ip') . ")";
- } else {
- echo "<td class = 'even'><a href='mailto:" . $senderemail . "'>" . $sendername . "</a> (" . $reports[$i]->getVar('ip') . ")";
}
- if ($submitteremail == '') {
- echo "<td class = 'even'>" . $submitteruname;
- } else {
- echo "<td class = 'even'><a href='mailto:" . $submitteremail . "'>".$submitteruname."</a>";
- }
- echo "
- </td>\n
- <td class='even' align='center'>" . formatTimestamp($reports[$i]->getVar('date'), $xoopsModuleConfig['dateformat']) . "</td>\n
- <td align='center' class = 'even' nowrap>\n
- $ingnore_link $edit_link $delete_link $ack_link $con_link
- </td></tr>\n
- ";
}
- }
- echo"</table>";
+ echo"</table>";
+ include 'admin_footer.php';
}
-//xoops_cp_footer();
-include 'admin_footer.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php 2013-06-03 19:23:41 UTC (rev 11619)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php 2013-06-03 19:30:30 UTC (rev 11620)
@@ -23,26 +23,8 @@
include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
include_once XOOPS_ROOT_PATH . '/class/tree.php';
-function createcat($cid = 0)
-{
- include_once WFDOWNLOADS_ROOT_PATH . 'class/wfd_lists.php';
- include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+include_once WFDOWNLOADS_ROOT_PATH . 'class/wfd_lists.php';
- $category_handler = xoops_getmodulehandler('category');
-
- $heading = _AM_WFD_CCATEGORY_CREATENEW;
- if ($cid > 0) {
- $category = $category_handler->get($cid);
- $heading = _AM_WFD_CCATEGORY_MODIFY;
- } else {
- $category = $category_handler->create();
- }
- $sform = $category->getForm($heading);
- $sform -> display();
-}
-
-
-
$op = wfdownloads_CleanVars($_REQUEST, 'op', 'categories.list', 'string');
switch ($op) {
@@ -225,19 +207,24 @@
case "category.add" :
case "category.edit" :
case "modCat":
- $cid = wfdownloads_CleanVars($_REQUEST, 'cid', 0, 'int');
-
wfdownloads_xoops_cp_header();
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation($currentFile);
$adminMenu = new ModuleAdmin();
- $adminMenu->addItemButton(_MI_WFD_BINDEX, "{$currentFile}?op=categories.list", 'list');
+ $adminMenu->addItemButton(_MI_WFD_MENU_CATEGORIES, "{$currentFile}?op=categories.list", 'list');
$adminMenu->addItemButton(_AM_WFD_CCATEGORY_CREATENEW, "{$currentFile}?op=category.add", 'add');
echo $adminMenu->renderButton();
- createcat($cid);
- xoops_cp_footer();
+ if (isset($_REQUEST['cid'])) {
+ $category = $category_handler->get($_REQUEST['cid']);
+ } else {
+ $category = $category_handler->create();
+ }
+ $form = $category->getForm();
+ $form -> display();
+
+ include 'admin_footer.php';
break;
case 'categories.list' :
@@ -248,7 +235,7 @@
echo $indexAdmin->addNavigation($currentFile);
$adminMenu = new ModuleAdmin();
- $adminMenu->addItemButton(_MI_WFD_BINDEX, "{$currentFile}?op=categories.list", 'list');
+ $adminMenu->addItemButton(_MI_WFD_MENU_CATEGORIES, "{$currentFile}?op=categories.list", 'list');
$adminMenu->addItemButton(_AM_WFD_CCATEGORY_CREATENEW, "{$currentFile}?op=category.add", 'add');
echo $adminMenu->renderButton();
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/cookies.js
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/cookies.js 2013-06-03 19:23:41 UTC (rev 11619)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/cookies.js 2013-06-03 19:30:30 UTC (rev 11620)
@@ -11,11 +11,11 @@
* WF-Downloads module
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
* @package wfdownload
* @since 3.23
- * @author WF-Sections, Xoops Development Team, luciorota
- * @version svn:$Id$
+ * @author Xoops Development Team
+ * @version svn:$id$
*/
/**
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php 2013-06-03 19:23:41 UTC (rev 11619)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php 2013-06-03 19:30:30 UTC (rev 11620)
@@ -20,12 +20,222 @@
*/
$currentFile = basename(__FILE__);
include 'admin_header.php';
-include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
include_once WFDOWNLOADS_ROOT_PATH.'class/wfd_lists.php';
-include_once XOOPS_ROOT_PATH . '/class/tree.php';
include_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
+$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : 'downloads.list';
+switch ($op) {
+ case "download.save" :
+ case "addDownload" :
+ addDownload();
+ break;
+
+ case "download.edit" :
+ case "download.add" :
+ case "Download" :
+ wfdownloads_xoops_cp_header();
+ $indexAdmin = new ModuleAdmin();
+ 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');
+ echo $adminMenu->renderButton();
+
+ Download();
+
+ include 'admin_footer.php';
+ break;
+
+ case "download.delete" :
+ case "delDownload" :
+ $lid = wfdownloads_CleanVars($_REQUEST, 'lid', 0, 'int');
+ $ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
+ $download_handler = xoops_getmodulehandler('download');
+ if (!$download = $download_handler->get($lid)) {
+ redirect_header($currentFile, 4, _AM_WFD_DOWN_ERROR_FILENOTFOUND);
+ exit();
+ }
+ $title = $download->getVar('title');
+ if ($ok = true) {
+ $file = $xoopsModuleConfig['uploaddir'] . "/" . $download->getVar('filename');
+ if (is_file($file)) {
+ @chmod($file, 0777);
+ @unlink($file);
+ }
+ $download_handler->delete($download);
+ redirect_header($currentFile, 1, sprintf(_AM_WFD_FILE_FILEWASDELETED, $title));
+ exit();
+ } 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_cp_footer();
+ }
+ break;
+
+ case "vote.delete" :
+ case "delVote" :
+ $rating_handler = xoops_getmodulehandler('rating');
+ $rating = $rating_handler->get($_GET['rid']);
+ if ($rating_handler->delete($rating, true)) {
+ wfd_updaterating(intval($rating->getVar('lid')));
+ }
+ redirect_header($currentFile, 1, _AM_WFD_VOTE_VOTEDELETED);
+ break;
+
+ // added - start - March 4 2006 - jpc
+ case "patch_formulize" :
+ if(!isset($_POST['patch_formulize'])) {
+ print "<form action=\"{$currentFile}?op=patch_formulize\" method=post>";
+ print "<input type = submit name=patch_formulize value=\"Apply Patch for Formulize\">";
+ print "</form>";
+ } else {
+ global $xoopsDB;
+ $sqls[] = "ALTER TABLE " . $xoopsDB->prefix("wfdownloads_cat") . " ADD formulize_fid int(5) NOT NULL default '0';";
+ $sqls[] = "ALTER TABLE " . $xoopsDB->prefix("wfdownloads_downloads") . " ADD formulize_idreq int(5) NOT NULL default '0';";
+ foreach($sqls as $sql)
+ if(!$result = $xoopsDB->queryF($sql))
+ exit("Error patching for Formulize.<br>SQL dump:<br>" . $sql . "<br>Please contact <a hre...@fr...>Freeform Solutions</a> for assistance.");
+ print "Patching for Formulize completed.";
+ }
+ break;
+ // added - end - March 4 2006 - jpc
+
+ case "downloads.list" :
+ default :
+ include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+
+ $categories = $category_handler->getObjects();
+
+ $start1 = wfdownloads_CleanVars($_GET, 'start1', 0, 'int');
+ $start2 = wfdownloads_CleanVars($_GET, 'start2', 0, 'int');
+ $start3 = wfdownloads_CleanVars($_GET, 'start3', 0, 'int');
+ $start4 = wfdownloads_CleanVars($_GET, 'start4', 0, 'int');
+
+ $totalcats = wfd_totalcategory();
+ $categories = $category_handler->getObjects(null, true, false);
+
+ $totalbrokendownloads = $report_handler->getCount();
+ $totalmodrequests = $modification_handler->getCount();
+ $newreviews = $review_handler->getCount();
+ $newmirrors = $mirror_handler->getCount();
+ $totalnewdownloads = $download_handler->getCount(new Criteria("published", 0));
+ $totaldownloads = $download_handler->getCount(new Criteria("published", 0, ">"));
+
+ wfdownloads_xoops_cp_header();
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation($currentFile);
+
+ $adminMenu = new ModuleAdmin();
+ $adminMenu->addItemButton(_MI_WFD_MENU_DOWNLOADS, $currentFile . "?op=list", 'list');
+ $adminMenu->addItemButton(_AM_WFD_FFS_DOWNLOADTITLE, $currentFile . "?op=Download", 'add');
+ echo $adminMenu->renderButton();
+
+ if ($totaldownloads > 0) {
+ // Published Downloads
+ $criteria = new CriteriaCompo();
+ $criteria->setSort("published");
+ $criteria->setOrder("DESC");
...
[truncated message content] |
|
From: <luc...@us...> - 2013-06-03 22:02:40
|
Revision: 11623
http://sourceforge.net/p/xoops/svn/11623
Author: luciorota
Date: 2013-06-03 22:02:35 +0000 (Mon, 03 Jun 2013)
Log Message:
-----------
admin file renamed
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/main.php
XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_categorylist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadlist.html
Added 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/brokens.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/categories.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/cookies.js
XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/funcs.js
XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/import.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/indexpage.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/ip_logs.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/modifications.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/newdownloads.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/permissions.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/ratings.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php
Removed 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/brokendown.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/cookies.js
XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/funcs.js
XoopsModules/wfdownloads/trunk/wfdownloads/admin/imageupload.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/import.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/indexpage.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/ip_log.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirror.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/modifications.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/newdownloads.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/permissions.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/review.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/update.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/votedata.php
Deleted: XoopsModules/wfdownloads/trunk/wfdownloads/admin/about.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/about.php 2013-06-03 20:26:28 UTC (rev 11622)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/about.php 2013-06-03 22:02:35 UTC (rev 11623)
@@ -1,30 +0,0 @@
-<?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.
- */
-/**
- * WF-Downloads 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$
- */
-include_once dirname(__FILE__) . '/admin_header.php';
-
-xoops_cp_header();
-
-$aboutAdmin = new ModuleAdmin();
-
-echo $aboutAdmin->addNavigation('about.php');
-echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
-
-include 'admin_footer.php';
Added: XoopsModules/wfdownloads/trunk/wfdownloads/admin/about.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/about.php (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/about.php 2013-06-03 22:02:35 UTC (rev 11623)
@@ -0,0 +1,30 @@
+<?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.
+ */
+/**
+ * WF-Downloads 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$
+ */
+include_once dirname(__FILE__) . '/admin_header.php';
+
+xoops_cp_header();
+
+$aboutAdmin = new ModuleAdmin();
+
+echo $aboutAdmin->addNavigation('about.php');
+echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
+
+include 'admin_footer.php';
Deleted: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_footer.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_footer.php 2013-06-03 20:26:28 UTC (rev 11622)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_footer.php 2013-06-03 22:02:35 UTC (rev 11623)
@@ -1,28 +0,0 @@
-<?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.
- */
-/**
- * WF-Downloads 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$
- */
-echo "<div class='adminfooter'>\n"
- ." <div style='text-align: center;'>\n"
- ." <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
- ." </div>\n"
- ." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
- ."</div>";
-
-xoops_cp_footer();
Added: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_footer.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_footer.php (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_footer.php 2013-06-03 22:02:35 UTC (rev 11623)
@@ -0,0 +1,28 @@
+<?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.
+ */
+/**
+ * WF-Downloads 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$
+ */
+echo "<div class='adminfooter'>\n"
+ ." <div style='text-align: center;'>\n"
+ ." <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
+ ." </div>\n"
+ ." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
+ ."</div>";
+
+xoops_cp_footer();
Deleted: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-06-03 20:26:28 UTC (rev 11622)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-06-03 22:02:35 UTC (rev 11623)
@@ -1,85 +0,0 @@
-<?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.
- */
-/**
- * WF-Downloads 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$
- */
-include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
-
-// Include xoops admin header
-include_once XOOPS_ROOT_PATH . '/include/cp_header.php';
-include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-include_once XOOPS_ROOT_PATH . '/class/tree.php';
-include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-xoops_load ('XoopsUserUtility');
-$myts = &MyTextSanitizer::getInstance();
-
-$module_handler =& xoops_gethandler('module');
-$xoopsModule = & $module_handler->getByDirname(basename(dirname(dirname(__FILE__))));
-
-$pathIcon16 = XOOPS_URL . '/' . $xoopsModule->getInfo('icons16');
-$pathIcon32 = XOOPS_URL . '/' . $xoopsModule->getInfo('icons32');
-
-include_once(XOOPS_ROOT_PATH . '/modules/wfdownloads/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'>"
- );*/
-
-
-if ( file_exists($GLOBALS['xoops']->path('/' . $xoopsModule->getInfo('dirmoduleadmin') . '/moduleadmin/moduleadmin.php'))){
- include_once $GLOBALS['xoops']->path('/' . $xoopsModule->getInfo('dirmoduleadmin') . '/moduleadmin/moduleadmin.php');
-} else {
- echo xoops_error('/' . $xoopsModule->getInfo('dirmoduleadmin') . '/moduleadmin/ is required!!!');
-}
-
-// Load language files
-xoops_loadLanguage('admin', $xoopsModule->dirname());
-xoops_loadLanguage('modinfo', $xoopsModule->dirname());
-xoops_loadLanguage('main', $xoopsModule->dirname());
-
-// Load handlers
-$report_handler = xoops_getmodulehandler('report', $xoopsModule->dirname());
-$review_handler = xoops_getmodulehandler('review', $xoopsModule->dirname());
-$mirror_handler = xoops_getmodulehandler('mirror', $xoopsModule->dirname());
-$modification_handler = xoops_getmodulehandler('modification', $xoopsModule->dirname());
-$download_handler = xoops_getmodulehandler('download', $xoopsModule->dirname());
-$category_handler = xoops_getmodulehandler('category', $xoopsModule->dirname());
-$mime_handler = xoops_getmodulehandler('mimetype', $xoopsModule->dirname());
-
-$member_handler = xoops_gethandler("member");
-
-
-if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
- include_once(XOOPS_ROOT_PATH . "/class/template.php");
- $xoopsTpl = new XoopsTpl();
-}
Added: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-06-03 22:02:35 UTC (rev 11623)
@@ -0,0 +1,86 @@
+<?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.
+ */
+/**
+ * WF-Downloads 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$
+ */
+include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
+
+// Include xoops admin header
+include_once XOOPS_ROOT_PATH . '/include/cp_header.php';
+include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+include_once XOOPS_ROOT_PATH . '/class/tree.php';
+include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+xoops_load ('XoopsUserUtility');
+$myts = &MyTextSanitizer::getInstance();
+
+$module_handler =& xoops_gethandler('module');
+$xoopsModule = & $module_handler->getByDirname(basename(dirname(dirname(__FILE__))));
+
+$pathIcon16 = XOOPS_URL . '/' . $xoopsModule->getInfo('icons16');
+$pathIcon32 = XOOPS_URL . '/' . $xoopsModule->getInfo('icons32');
+
+include_once(XOOPS_ROOT_PATH . '/modules/wfdownloads/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'>"
+ );*/
+
+
+if ( file_exists($GLOBALS['xoops']->path('/' . $xoopsModule->getInfo('dirmoduleadmin') . '/moduleadmin/moduleadmin.php'))){
+ include_once $GLOBALS['xoops']->path('/' . $xoopsModule->getInfo('dirmoduleadmin') . '/moduleadmin/moduleadmin.php');
+} else {
+ echo xoops_error('/' . $xoopsModule->getInfo('dirmoduleadmin') . '/moduleadmin/ is required!!!');
+}
+
+// Load language files
+xoops_loadLanguage('admin', $xoopsModule->dirname());
+xoops_loadLanguage('modinfo', $xoopsModule->dirname());
+xoops_loadLanguage('main', $xoopsModule->dirname());
+
+// Load handlers
+$report_handler = xoops_getmodulehandler('report', $xoopsModule->dirname());
+$review_handler = xoops_getmodulehandler('review', $xoopsModule->dirname());
+$mirror_handler = xoops_getmodulehandler('mirror', $xoopsModule->dirname());
+$modification_handler = xoops_getmodulehandler('modification', $xoopsModule->dirname());
+$download_handler = xoops_getmodulehandler('download', $xoopsModule->dirname());
+$category_handler = xoops_getmodulehandler('category', $xoopsModule->dirname());
+$mime_handler = xoops_getmodulehandler('mimetype', $xoopsModule->dirname());
+$ip_log_handler = xoops_getmodulehandler('ip_log', $xoopsModule->dirname());
+
+$member_handler = xoops_gethandler("member");
+
+
+if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
+ include_once(XOOPS_ROOT_PATH . "/class/template.php");
+ $xoopsTpl = new XoopsTpl();
+}
Deleted: XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokendown.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokendown.php 2013-06-03 20:26:28 UTC (rev 11622)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokendown.php 2013-06-03 22:02:35 UTC (rev 11623)
@@ -1,174 +0,0 @@
-<?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.
- */
-/**
- * WF-Downloads 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 'admin_header.php';
-
-$op = wfdownloads_CleanVars($_REQUEST, 'op', 'brokendownloads.list', 'string');
-$lid = wfdownloads_CleanVars($_REQUEST, 'lid', 0, 'int');
-
-switch ($op) {
- case "updateNotice":
- $report_handler = xoops_getmodulehandler('report');
- if (isset($_GET['ack'])) {
- $acknowledged = (isset($_GET['ack']) && $_GET['ack'] == 0) ? 1 : 0;
- $report_handler->updateAll("acknowledged", $acknowledged, new Criteria("lid", $lid), true);
- $update_mess = _AM_WFD_BROKEN_NOWACK;
- }
-
- if (isset($_GET['con'])) {
- $confirmed = (isset($_GET['con']) && $_GET['con'] == 0) ? 1 : 0;
- $report_handler->updateAll("confirmed", $confirmed, new Criteria("lid", $lid), true);
- $update_mess = _AM_WFD_BROKEN_NOWCON;
- }
- redirect_header(WFDOWNLOADS_URL.'admin/brokendown.php?op=default', 1, $update_mess);
- break;
-
- case "brokendownload.delete" :
- case "delBrokenDownloads":
- $criteria = new Criteria('lid', intval($lid));
- $report_handler = xoops_getmodulehandler('report');
- $report = $report_handler->getObjects($criteria);
- if (isset($report[0])) {
- $report_handler->delete($report[0], true);
- }
- $download_handler = xoops_getmodulehandler('download');
- $download = $download_handler->get($lid);
- $download_handler->delete($download, true);
- redirect_header(WFDOWNLOADS_URL.'admin/brokendown.php?op=default', 1, _AM_WFD_BROKENFILEDELETED);
- break;
-
- case "brokendownload.ignore" :
- case "ignoreBrokenDownloads":
- $criteria = new Criteria('lid', intval($lid));
- $report_handler = xoops_getmodulehandler('report');
- $report = $report_handler->getObjects($criteria);
- if (isset($report[0])) {
- $report_handler->delete($report[0], true);
- }
- redirect_header(WFDOWNLOADS_URL.'admin/brokendown.php?op=default', 1, _AM_WFD_BROKEN_FILEIGNORED);
- break;
-
- default:
- case "brokendownloads.list" :
- case "listBrokenDownloads":
- case "default":
- $report_handler = xoops_getmodulehandler('report');
- $reports = $report_handler->getObjects();
- $totalbrokendownloads = count($reports);
-
- wfdownloads_xoops_cp_header();
-
- echo "
- <fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFD_BROKEN_REPORTINFO . "</legend>\n
- <div style='padding: 8px;'>" . _AM_WFD_BROKEN_REPORTSNO . " <b>$totalbrokendownloads</b><div>\n
- <div style='padding: 8px;'>\n
- <ul><li>" . $imagearray['ignore'] . " " . _AM_WFD_BROKEN_IGNOREDESC . "</li>\n
- <li>" . $imagearray['editimg'] . " " . _AM_WFD_BROKEN_EDITDESC . "</li>
- <li>" . $imagearray['deleteimg'] . " " . _AM_WFD_BROKEN_DELETEDESC . "</li>\n
- <li>" . $imagearray['ack_yes'] . " " . _AM_WFD_BROKEN_ACKDESC . "</li>
- <li>" . $imagearray['con_yes'] . " " . _AM_WFD_BROKEN_CONFIRMDESC . "</li>
- </ul></div>\n
- </fieldset><br />\n
-
- <table width='100%' border='0' cellspacing='1' cellpadding = '2' class='outer'>\n
- <tr align = 'center'>\n
- <th width = '3%' align = 'center'>" . _AM_WFD_BROKEN_ID . "</th>\n
- <th width = '35%' align = 'left'>" . _AM_WFD_BROKEN_TITLE . "</th>\n
- <th>" . _AM_WFD_BROKEN_REPORTER . "</th>\n
- <th>" . _AM_WFD_BROKEN_FILESUBMITTER . "</th>\n
- <th>" . _AM_WFD_BROKEN_DATESUBMITTED . "</th>\n
- <th align='center'>" . _AM_WFD_BROKEN_ACTION . "</th>\n
- </tr>\n
- ";
-
- if ($totalbrokendownloads == 0) {
- echo "<tr align = 'center'><td align = 'center' class='head' colspan = '6'>" . _AM_WFD_BROKEN_NOFILEMATCH . "</td></tr>";
- } else {
- foreach (array_keys($reports) as $i) {
- $lids[] = $reports[$i]->getVar('lid');
- $uids[] = $reports[$i]->getVar('sender');
- }
- $download_handler = xoops_getmodulehandler('download');
- $downloads = $download_handler->getObjects(new Criteria('lid', "(".implode(',', array_unique($lids)).")", "IN"), true);
-
- foreach (array_keys($downloads) as $i) {
- $uids[] = $downloads[$i]->getVar('submitter');
- }
-
- $member_handler = xoops_gethandler('member');
- $users = $member_handler->getUsers(new Criteria("uid", "(" . implode(',', array_unique($uids)) . ")", "IN"), true);
-
- foreach (array_keys($reports) as $i) {
- // Does the download exists ?
- if (isset($downloads[$reports[$i]->getVar('lid')])) {
- $submitter = isset($users[$downloads[$reports[$i]->getVar('lid')]->getVar('submitter')]) ? $users[$downloads[$reports[$i]->getVar('lid')]->getVar('submitter')] : false;
- $download = $downloads[$reports[$i]->getVar('lid')];
- $download_link = "<a href='" . WFDOWNLOADS_URL."singlefile.php?cid=" . $download->getVar('cid') . "&lid=" . $download->getVar('lid') . "' target='_blank'>" . $download->getVar('title') . "</a>";
- $submitteremail = is_object($submitter) ? $submitter->getVar('email') : '';
- $submitteruname = is_object($submitter) ? $submitter->getVar('uname') : $xoopsConfig['anonymous'];
- } else {
- $submitter = '';
- $download_link = _AM_WFD_BROKEN_DOWNLOAD_DONT_EXISTS;
- $submitteremail = '';
- $submitteruname = $xoopsConfig['anonymous'];
- }
-
- $sender = isset($users[$reports[$i]->getVar('sender')]) ? $users[$reports[$i]->getVar('sender')] : "";
- $senderemail = isset($users[$reports[$i]->getVar('sender')]) ? $users[$reports[$i]->getVar('sender')]->getVar('email') : "";
- $sendername = isset($users[$reports[$i]->getVar('sender')]) ? $users[$reports[$i]->getVar('sender')]->getVar('uname') : $xoopsConfig['anonymous'];
-
- $lid = intval($download->getVar('lid'));
-
- $ingnore_link = "<a href='" . WFDOWNLOADS_URL ."admin/brokendown.php?op=ignoreBrokenDownloads&lid=" . $lid . "' alt='" . _AM_WFD_BROKEN_IGNORE_ALT . "' title='" . _AM_WFD_BROKEN_IGNORE_ALT . "'>" . $imagearray['ignore'] . "</a>";
- $edit_link = "<a href='" . WFDOWNLOADS_URL . "admin/main.php?op=Download&lid=" . $lid . "' alt='" . _AM_WFD_BROKEN_EDIT_ALT . "' title='" . _AM_WFD_BROKEN_EDIT_ALT . "'> " . $imagearray['editimg'] . " </a>";
- $delete_link = "<a href='" . WFDOWNLOADS_URL . "admin/brokendown.php?op=delBrokenDownloads&lid=" . $lid . "' alt='" . _AM_WFD_BROKEN_DELETE_ALT . "' title='" . _AM_WFD_BROKEN_DELETE_ALT . "'>" . $imagearray['deleteimg'] . "</a>";
- $ack_image = ($reports[$i]->getVar('acknowledged')) ? $imagearray['ack_yes'] : $imagearray['ack_no'];
- $ack_link = "<a href='" . WFDOWNLOADS_URL . "admin/brokendown.php?op=updateNotice&lid=" . $lid . "&ack=" . $reports[$i]->getVar('acknowledged') . "' alt='" . _AM_WFD_BROKEN_ACK_ALT . "' title='" . _AM_WFD_BROKEN_ACK_ALT . "'>" . $ack_image . "</a>";
- $con_image = ($reports[$i]->getVar('confirmed')) ? $imagearray['con_yes'] : $imagearray['con_no'];
- $con_link = "<a href='" . WFDOWNLOADS_URL . "admin/brokendown.php?op=updateNotice&lid=" . $lid . "&con=" . $reports[$i]->getVar('confirmed') . "' alt='" . _AM_WFD_BROKEN_CONFIRM_ALT . "' title='" . _AM_WFD_BROKEN_CONFIRM_ALT . "'>" . $con_image . " </a>\n";
-
- echo "
- <tr align = 'center'>\n
- <td class = 'head'>" . $reports[$i]->getVar('reportid') . "</td>\n
- <td class = 'even' align = 'left'>$download_link</td>\n
- ";
- if ($senderemail == "") {
- echo "<td class = 'even'>" . $sendername . " (" . $reports[$i]->getVar('ip') . ")";
- } else {
- echo "<td class = 'even'><a href='mailto:" . $senderemail . "'>" . $sendername . "</a> (" . $reports[$i]->getVar('ip') . ")";
- ...
[truncated message content] |
|
From: <luc...@us...> - 2013-06-04 21:27:00
|
Revision: 11631
http://sourceforge.net/p/xoops/svn/11631
Author: luciorota
Date: 2013-06-04 21:26:57 +0000 (Tue, 04 Jun 2013)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_footer.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokens.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/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/modifications.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/permissions.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/ratings.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php
XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/category.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/trunk/wfdownloads/footer.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/common.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/notification.inc.php
XoopsModules/wfdownloads/trunk/wfdownloads/index.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php
XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php
XoopsModules/wfdownloads/trunk/wfdownloads/newlist.php
XoopsModules/wfdownloads/trunk/wfdownloads/ratefile.php
XoopsModules/wfdownloads/trunk/wfdownloads/review.php
XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php
XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
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
Removed Paths:
-------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/newdownloads.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_footer.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_footer.php 2013-06-04 18:45:00 UTC (rev 11630)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_footer.php 2013-06-04 21:26:57 UTC (rev 11631)
@@ -18,11 +18,11 @@
* @author Xoops Development Team
* @version svn:$id$
*/
-echo "<div class='adminfooter'>\n"
- ." <div style='text-align: center;'>\n"
- ." <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
- ." </div>\n"
- ." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
- ."</div>";
+echo "<div class='adminfooter'>\n";
+echo " <div style='text-align: center;'>\n";
+echo " <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n";
+echo " </div>\n";
+echo "" . _AM_MODULEADMIN_ADMIN_FOOTER . "\n";
+echo "</div>";
xoops_cp_footer();
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-06-04 18:45:00 UTC (rev 11630)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-06-04 21:26:57 UTC (rev 11631)
@@ -68,13 +68,13 @@
xoops_loadLanguage('main', $xoopsModule->dirname());
// Load handlers
-$report_handler = xoops_getmodulehandler('report', $xoopsModule->dirname());
+$category_handler = xoops_getmodulehandler('category', $xoopsModule->dirname());
+$download_handler = xoops_getmodulehandler('download', $xoopsModule->dirname());
$review_handler = xoops_getmodulehandler('review', $xoopsModule->dirname());
$mirror_handler = xoops_getmodulehandler('mirror', $xoopsModule->dirname());
+$mime_handler = xoops_getmodulehandler('mimetype', $xoopsModule->dirname());
+$report_handler = xoops_getmodulehandler('report', $xoopsModule->dirname());
$modification_handler = xoops_getmodulehandler('modification', $xoopsModule->dirname());
-$download_handler = xoops_getmodulehandler('download', $xoopsModule->dirname());
-$category_handler = xoops_getmodulehandler('category', $xoopsModule->dirname());
-$mime_handler = xoops_getmodulehandler('mimetype', $xoopsModule->dirname());
$ip_log_handler = xoops_getmodulehandler('ip_log', $xoopsModule->dirname());
$member_handler = xoops_gethandler("member");
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokens.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokens.php 2013-06-04 18:45:00 UTC (rev 11630)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokens.php 2013-06-04 21:26:57 UTC (rev 11631)
@@ -121,7 +121,7 @@
if (isset($downloads[$reports[$i]->getVar('lid')])) {
$submitter = isset($users[$downloads[$reports[$i]->getVar('lid')]->getVar('submitter')]) ? $users[$downloads[$reports[$i]->getVar('lid')]->getVar('submitter')] : false;
$download = $downloads[$reports[$i]->getVar('lid')];
- $download_link = "<a href='" . WFDOWNLOADS_URL . "singlefile.php?cid=" . $download->getVar('cid') . "&lid=" . $download->getVar('lid') . "' target='_blank'>" . $download->getVar('title') . "</a>";
+ $download_link = "<a href='" . WFDOWNLOADS_URL . "/singlefile.php?cid=" . $download->getVar('cid') . "&lid=" . $download->getVar('lid') . "' target='_blank'>" . $download->getVar('title') . "</a>";
$submitteremail = is_object($submitter) ? $submitter->getVar('email') : '';
$submitteruname = is_object($submitter) ? $submitter->getVar('uname') : $xoopsConfig['anonymous'];
} else {
@@ -138,7 +138,7 @@
$lid = intval($download->getVar('lid'));
$ingnore_link = "<a href='{$currentFile}?op=brokendownload.ignore&lid=" . $lid . "' alt='" . _AM_WFD_BROKEN_IGNORE_ALT . "' title='" . _AM_WFD_BROKEN_IGNORE_ALT . "'>" . $imagearray['ignore'] . "</a>";
- $edit_link = "<a href='" . WFDOWNLOADS_URL . "admin/downloads.php?op=Download&lid=" . $lid . "' alt='" . _AM_WFD_BROKEN_EDIT_ALT . "' title='" . _AM_WFD_BROKEN_EDIT_ALT . "'> " . $imagearray['editimg'] . " </a>";
+ $edit_link = "<a href='" . WFDOWNLOADS_URL . "/admin/downloads.php?op=Download&lid=" . $lid . "' alt='" . _AM_WFD_BROKEN_EDIT_ALT . "' title='" . _AM_WFD_BROKEN_EDIT_ALT . "'> " . $imagearray['editimg'] . " </a>";
$delete_link = "<a href='{$currentFile}?op=brokendownload.delete&lid=" . $lid . "' alt='" . _AM_WFD_BROKEN_DELETE_ALT . "' title='" . _AM_WFD_BROKEN_DELETE_ALT . "'>" . $imagearray['deleteimg'] . "</a>";
$ack_image = ($reports[$i]->getVar('acknowledged')) ? $imagearray['ack_yes'] : $imagearray['ack_no'];
$ack_link = "<a href='{$currentFile}?op=updateNotice&lid=" . $lid . "&ack=" . $reports[$i]->getVar('acknowledged') . "' alt='" . _AM_WFD_BROKEN_ACK_ALT . "' title='" . _AM_WFD_BROKEN_ACK_ALT . "'>" . $ack_image . "</a>";
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/categories.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/categories.php 2013-06-04 18:45:00 UTC (rev 11630)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/categories.php 2013-06-04 21:26:57 UTC (rev 11631)
@@ -23,7 +23,7 @@
include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
include_once XOOPS_ROOT_PATH . '/class/tree.php';
-include_once WFDOWNLOADS_ROOT_PATH . 'class/wfd_lists.php';
+include_once WFDOWNLOADS_ROOT_PATH . '/class/wfd_lists.php';
$op = wfdownloads_CleanVars($_REQUEST, 'op', 'categories.list', 'string');
@@ -137,7 +137,7 @@
*/
$tags = array();
$tags['CATEGORY_NAME'] = $_POST['title'];
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . 'viewcat.php?cid=' . $newid;
+ $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;
@@ -156,11 +156,9 @@
$category_handler = xoops_getmodulehandler('category');
$categories = $category_handler->getObjects();
$mytree = new XoopsObjectTree($categories, "cid", "pid");
-
if ($ok == true) {
// get all subcategories under the specified category
$arr = $mytree -> getAllChild($cid);
-
foreach($arr as $child) {
// get all category ids
$cids[] = $child->getVar('cid');
@@ -191,7 +189,7 @@
$error = _AM_WFD_DBERROR;
foreach ($cids as $cid) {
- xoops_groupperm_deletebymoditem ((int)$xoopsModule->getVar('mid'), 'WFDownCatPerm', $cid);
+ xoops_groupperm_deletebymoditem ($xoopsModule->getVar('mid'), 'WFDownCatPerm', $cid);
xoops_groupperm_deletebymoditem ($xoopsModule -> getVar('mid'), 'WFUpCatPerm', $cid);
}
@@ -244,7 +242,7 @@
$sorted_categories = wfd_sortCategories();
$GLOBALS['xoopsTpl']->assign('sorted_categories', $sorted_categories);
$GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML() );
- $GLOBALS['xoopsTpl']->display("db:wfdownloads_admin_categorylist.html");
+ $GLOBALS['xoopsTpl']->display("db:" . $xoopsModule->dirname() . "_admin_categorieslist.html");
} else {
redirect_header("{$currentFile}?op=category.add", 1, _AM_WFD_CCATEGORY_NOEXISTS);
}
@@ -256,7 +254,6 @@
redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
}
- $category_handler = xoops_getmodulehandler('category', 'wfdownloads');
if (isset($_POST['new_weights']) && count($_POST['new_weights']) > 0) {
$new_weights = $_POST['new_weights'];
$ids = array();
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2013-06-04 18:45:00 UTC (rev 11630)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2013-06-04 21:26:57 UTC (rev 11631)
@@ -21,16 +21,12 @@
$currentFile = basename(__FILE__);
include 'admin_header.php';
include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
-include_once WFDOWNLOADS_ROOT_PATH.'class/wfd_lists.php';
+include_once WFDOWNLOADS_ROOT_PATH . '/class/wfd_lists.php';
include_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : 'downloads.list';
+
switch ($op) {
- case "download.save" :
- case "addDownload" :
- addDownload();
- break;
-
case "download.edit" :
case "download.add" :
case "Download" :
@@ -42,31 +38,37 @@
$adminMenu->addItemButton(_MI_WFD_MENU_DOWNLOADS, "{$currentFile}?op=downloads.list", 'list');
$adminMenu->addItemButton(_AM_WFD_FFS_DOWNLOADTITLE, "{$currentFile}?op=download.add", 'add');
echo $adminMenu->renderButton();
-
- Download();
-
+ addDownload();
include 'admin_footer.php';
break;
+ case "download.save" :
+ case "addDownload" :
+ saveDownload();
+ break;
+
case "download.delete" :
- case "delDownload" :
$lid = wfdownloads_CleanVars($_REQUEST, 'lid', 0, 'int');
$ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
- $download_handler = xoops_getmodulehandler('download');
if (!$download = $download_handler->get($lid)) {
- redirect_header($currentFile, 4, _AM_WFD_DOWN_ERROR_FILENOTFOUND);
+ redirect_header($currentFile, 4, _AM_WFD_ERROR_DOWNLOADNOTFOUND);
exit();
}
$title = $download->getVar('title');
- if ($ok = true) {
+ if ($ok == true) {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
$file = $xoopsModuleConfig['uploaddir'] . "/" . $download->getVar('filename');
if (is_file($file)) {
@chmod($file, 0777);
@unlink($file);
}
- $download_handler->delete($download);
- redirect_header($currentFile, 1, sprintf(_AM_WFD_FILE_FILEWASDELETED, $title));
- exit();
+ if ($download_handler->delete($download)) {
+ redirect_header($currentFile, 1, sprintf(_AM_WFD_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);
@@ -102,16 +104,50 @@
break;
// added - end - March 4 2006 - jpc
+ case "newdownload.approve" :
+ case "approve":
+ $lid = wfdownloads_CleanVars($_REQUEST, 'lid', 0, 'int');
+ $download_handler = xoops_getmodulehandler('download');
+ if (!$download = $download_handler->get($lid)) {
+ redirect_header($currentFile, 4, _AM_WFD_ERROR_DOWNLOADNOTFOUND);
+ exit();
+ }
+ // Update the database
+ $download->setVar('published', time());
+ $download->setVar('status', 1);
+ if (!$download_handler->insert($download, true)) {
+ echo $download->getHtmlErrors();
+ exit();
+ }
+ // Trigger notify
+ $title = $download->getVar('title');
+ $cid = $download->getVar('cid');
+ $category = $category_handler->get($cid);
+ $tags = array();
+ $tags['FILE_NAME'] = $title;
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
+ $tags['CATEGORY_NAME'] = $category->getVar('title');
+ $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid={$cid}";
+ $notification_handler = &xoops_gethandler('notification');
+ $notification_handler->triggerEvent('global', 0, 'new_file', $tags);
+ $notification_handler->triggerEvent('category', $cid, 'new_file', $tags);
+ if ($download->getVar('notifypub')) {
+ $notification_handler->triggerEvent('file', $lid, 'approve', $tags);
+ }
+ redirect_header($currentFile, 1, _AM_WFD_SUB_NEWFILECREATED);
+ break;
+
case "downloads.list" :
default :
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
$categories = $category_handler->getObjects();
- $start1 = wfdownloads_CleanVars($_GET, 'start1', 0, 'int');
- $start2 = wfdownloads_CleanVars($_GET, 'start2', 0, 'int');
- $start3 = wfdownloads_CleanVars($_GET, 'start3', 0, 'int');
- $start4 = wfdownloads_CleanVars($_GET, 'start4', 0, 'int');
+ $start_published = wfdownloads_CleanVars($_GET, 'start_published', 0, 'int');
+ $start_new = wfdownloads_CleanVars($_GET, 'start_new', 0, 'int');
+ $start_auto_published = wfdownloads_CleanVars($_GET, 'start_auto_published', 0, 'int');
+ $start_expired = wfdownloads_CleanVars($_GET, 'start_expired', 0, 'int');
+ $start_offline = wfdownloads_CleanVars($_GET, 'start_offline', 0, 'int');
$totalcats = wfd_totalcategory();
$categories = $category_handler->getObjects(null, true, false);
@@ -128,8 +164,8 @@
echo $indexAdmin->addNavigation($currentFile);
$adminMenu = new ModuleAdmin();
- $adminMenu->addItemButton(_MI_WFD_MENU_DOWNLOADS, $currentFile . "?op=list", 'list');
- $adminMenu->addItemButton(_AM_WFD_FFS_DOWNLOADTITLE, $currentFile . "?op=Download", 'add');
+ $adminMenu->addItemButton(_MI_WFD_MENU_DOWNLOADS, $currentFile . "?op=downloads.list", 'list');
+ $adminMenu->addItemButton(_AM_WFD_FFS_DOWNLOADTITLE, $currentFile . "?op=download.add", 'add');
echo $adminMenu->renderButton();
if ($totaldownloads > 0) {
@@ -137,7 +173,7 @@
$criteria = new CriteriaCompo();
$criteria->setSort("published");
$criteria->setOrder("DESC");
- $criteria->setStart($start1);
+ $criteria->setStart($start_published);
$criteria->setLimit($xoopsModuleConfig['admin_perpage']);
$published_downloads = $download_handler->getActiveDownloads($criteria);
$published_downloads_count = $download_handler->getActiveCount();
@@ -153,14 +189,40 @@
}
}
- $pagenav = new XoopsPageNav($published_downloads_count, $xoopsModuleConfig['admin_perpage'], $start1, 'start1');
+ $pagenav = new XoopsPageNav($published_downloads_count, $xoopsModuleConfig['admin_perpage'], $start_published, 'start_published');
$GLOBALS['xoopsTpl']->assign('published_downloads_pagenav', $pagenav->renderNav());
+ // New Downloads
+ $criteria = new Criteria("published", 0);
+ $criteria->setStart($start_new);
+ $criteria->setLimit($xoopsModuleConfig['admin_perpage']);
+ $new_downloads = $download_handler->getObjects($criteria);
+ $new_downloads_count = $download_handler->getCount($criteria);
+ $GLOBALS['xoopsTpl']->assign('new_downloads_count', $new_downloads_count);
+ if ($new_downloads_count > 0) {
+ foreach ($new_downloads as $new_download) {
+ $new_download_array = $new_download->toArray();
+ $new_download_array['rating'] = number_format($new_download_array['rating'], 2);
+ $new_download_array['title_html'] = $myts->htmlSpecialChars($new_download_array['title']);
+ $url = urldecode($myts->htmlSpecialChars($new_download_array['url']));
+ $homepage = $myts->htmlSpecialChars($new_download_array['homepage']);
+ $version = $myts->htmlSpecialChars($new_download_array['version']);
+ $size = $myts->htmlSpecialChars($new_download_array['size']);
+ $platform = $myts->htmlSpecialChars($new_download_array['platform']);
+ $logourl = $myts->htmlSpecialChars($new_download_array['screenshot']);
+ $new_download_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($new_download_array['submitter']);
+ $new_download_array['date_timestamp'] = formatTimestamp($new_download_array['date'], _DATESTRING);
+ $GLOBALS['xoopsTpl']->append('new_downloads', $new_download_array);
+ }
+ }
+ $pagenav = new XoopsPageNav($new_downloads_count, $xoopsModuleConfig['admin_perpage'], $start_new, 'start_new');
+ $GLOBALS['xoopsTpl']->assign('new_downloads_pagenav', $pagenav->renderNav());
+
// Auto Published Downloads
$criteria = new Criteria("published", time(), ">");
$criteria->setSort("published");
$criteria->setOrder("ASC");
- $criteria->setStart($start2);
+ $criteria->setStart($start_auto_published);
$criteria->setLimit($xoopsModuleConfig['admin_perpage']);
$auto_published_downloads = $download_handler->getObjects($criteria);
$auto_published_downloads_count = $download_handler->getCount($criteria);
@@ -175,7 +237,7 @@
$GLOBALS['xoopsTpl']->append('auto_published_downloads', $auto_published_download_array);
}
}
- $pagenav = new XoopsPageNav($auto_published_downloads_count, $xoopsModuleConfig['admin_perpage'], $start2, 'start2');
+ $pagenav = new XoopsPageNav($auto_published_downloads_count, $xoopsModuleConfig['admin_perpage'], $start_auto_published, 'start_auto_published');
$GLOBALS['xoopsTpl']->assign('auto_published_downloads_pagenav', $pagenav->renderNav());
// Expired downloads
@@ -184,7 +246,7 @@
$criteria->add(new Criteria("expired", 0, "<>"), 'AND');
$criteria->setSort("expired");
$criteria->setOrder("ASC");
- $criteria->setStart($start3);
+ $criteria->setStart($start_expired);
$criteria->setLimit($xoopsModuleConfig['admin_perpage']);
$expired_downloads = $download_handler->getObjects($criteria);
$expired_downloads_count = $download_handler->getCount($criteria);
@@ -199,20 +261,20 @@
$GLOBALS['xoopsTpl']->append('expired_downloads', $expired_download_array);
}
}
- $pagenav = new XoopsPageNav($expired_downloads_count, $xoopsModuleConfig['admin_perpage'], $start3, 'start3');
+ $pagenav = new XoopsPageNav($expired_downloads_count, $xoopsModuleConfig['admin_perpage'], $start_expired, 'start_expired');
$GLOBALS['xoopsTpl']->assign('expired_downloads_pagenav', $pagenav->renderNav());
// Offline downloads
$criteria = new Criteria("offline", 1);
$criteria->setSort("published");
$criteria->setOrder("ASC");
- $criteria->setStart($start4);
+ $criteria->setStart($start_offline);
$criteria->setLimit($xoopsModuleConfig['admin_perpage']);
$offline_downloads_count = $download_handler->getCount($criteria);
$offline_downloads = $download_handler->getObjects($criteria);
$offline_downloads_count = $download_handler->getCount($criteria);
$GLOBALS['xoopsTpl']->assign('offline_downloads_count', $offline_downloads_count);
- if ($offline_downloads_count > 0) {
+ if ($offline_downloads_count > 0) {
foreach ($offline_downloads as $offline_download) {
$offline_download_array = $offline_download->toArray();
$offline_download_array['title_html'] = $myts->htmlSpecialChars(trim($offline_download_array['title']));
@@ -223,22 +285,22 @@
$GLOBALS['xoopsTpl']->append('offline_downloads', $offline_download_array);
}
}
- $pagenav = new XoopsPageNav($offline_downloads_count, $xoopsModuleConfig['admin_perpage'], $start4, 'start4');
+ $pagenav = new XoopsPageNav($offline_downloads_count, $xoopsModuleConfig['admin_perpage'], $start_offline, 'start_offline');
$GLOBALS['xoopsTpl']->assign('offline_downloads_pagenav', $pagenav->renderNav());
-
- $GLOBALS['xoopsTpl']->display("db:wfdownloads_admin_downloadlist.html");
} else {
- echo ("debug2");
+ // NOP
}
+ $GLOBALS['xoopsTpl']->display("db:" . $xoopsModule->dirname() . "_admin_downloadslist.html");
+
include 'admin_footer.php';
break;
}
-function Download()
+function addDownload()
{
- global $xoopsUser, $imagearray;
+ global $xoopsUser, $imagearray, $currentFile;
$download_handler = xoops_getmodulehandler('download');
$category_handler = xoops_getmodulehandler('category');
@@ -364,7 +426,6 @@
$criteria->setGroupby("ratinguser");
$userratings = $rating_handler->getUserAverage($criteria);
-
foreach (array_keys($regvotes) as $i) {
$formatted_date = formatTimestamp($regvotes[$i]->getVar('ratingtimestamp'), $xoopsModuleConfig['dateformat']);
$useravgrating = isset($userratings[$regvotes[$i]->getVar('ratinguser')]) ? $userratings[$regvotes[$i]->getVar('ratinguser')]["avg"] : 0;
@@ -432,9 +493,9 @@
-function addDownload()
+function saveDownload()
{
- global $xoopsUser, $xoopsModuleConfig, $_FILES;
+ global $xoopsUser, $xoopsModuleConfig, $currentFile, $_FILES;
$lid = (!empty($_POST['lid'])) ? intval($_POST['lid']) : 0;
$cid = (!empty($_POST['cid'])) ? intval($_POST['cid']) : 0;
@@ -448,10 +509,7 @@
$thisIsANewRecord = true; /* Added by Lankford on 2007/3/21 */
$download = $download_handler->create();
}
-
- /**
- * Define URL
- */
+ /* Define URL */
if (empty($_FILES['userfile']['name'])) {
if ($_POST["url"] && $_POST["url"] != "" && $_POST["url"] != "http://") {
$url = ($_POST["url"] != "http://") ? $_POST["url"] : '';
@@ -480,10 +538,7 @@
$download->setVar('filename', $filename);
$download->setVar('filetype', $filetype);
}
-
- /**
- * Get data from form
- */
+ /* Get data from form */
$screenshot = ($_POST["screenshot"] != "blank.png") ? $_POST["screenshot"] : '';
$screenshot2 = ($_POST["screenshot2"] != "blank.png") ? $_POST["screenshot2"] : '';
$screenshot3 = ($_POST["screenshot3"] != "blank.png") ? $_POST["screenshot3"] : '';
@@ -506,12 +561,12 @@
$notification_handler = &xoops_gethandler('notification');
$tags = array();
$tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL . 'singlefile.php?cid=' . $cid . '&lid=' . $lid;
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . '/singlefile.php?cid=' . $cid . '&lid=' . $lid;
$category_handler = xoops_getmodulehandler('category');
$category = $category_handler->get($cid);
$tags['FILE_VERSION'] = $version;
$tags['CATEGORY_NAME'] = $category->getVar('title');
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . 'viewcat.php?cid=' . $cid;
+ $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . '/viewcat.php?cid=' . $cid;
if ($xoopsModuleConfig['autoapprove'] == 2 || $xoopsModuleConfig['autoapprove'] == 4) {
// Then this change will be automatically approved, so the notification needs to go out.
@@ -521,7 +576,6 @@
}
}
/* End add block */
-
$download->setVar('version', $version);
$download->setVar('url', $url);
$download->setVar('cid', $cid);
@@ -652,13 +706,13 @@
if (!$lid) {
$tags = array();
$tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL . "singlefile.php?cid={$cid}&lid={$newid}";
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$newid}";
// changed - start - March 4 2006 - jpc
//$category_handler = xoops_getmodulehandler('category');
//$category = $category_handler->get($cid);
// changed - end - March 4 2006 - jpc
$tags['CATEGORY_NAME'] = $category->getVar('title');
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "viewcat.php?cid={$cid}";
+ $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid={$cid}";
$notification_handler = & xoops_gethandler('notification');
$notification_handler -> triggerEvent('global', 0, 'new_file', $tags);
$notification_handler -> triggerEvent('category', $cid, 'new_file', $tags);
@@ -666,11 +720,11 @@
if ($lid && $approved && $notifypub) {
$tags = array();
$tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL . "singlefile.php?cid={$cid}&lid={$lid}";
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
$category_handler = xoops_getmodulehandler('category');
$category = $category_handler->get($cid);
$tags['CATEGORY_NAME'] = $category->getVar('title');
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . 'viewcat.php?cid=' . $cid;
+ $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . '/viewcat.php?cid=' . $cid;
$notification_handler = & xoops_gethandler('notification');
$notification_handler -> triggerEvent('global', 0, 'new_file', $tags);
$notification_handler -> triggerEvent('category', $cid, 'new_file', $tags);
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php 2013-06-04 18:45:00 UTC (rev 11630)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php 2013-06-04 21:26:57 UTC (rev 11631)
@@ -38,7 +38,7 @@
$screenshot = strtolower($_FILES['uploadfile']['name']);
wfd_uploading($screenshot, XOOPS_ROOT_PATH . "/" . $_POST['uploadpath'], $allowed_mimetypes, "images.php", 1, 0, true);
- include_once WFDOWNLOADS_ROOT_PATH . 'class/img_uploader.php';
+ include_once WFDOWNLOADS_ROOT_PATH . '/class/img_uploader.php';
$uploader = new XoopsMediaImgUploader($uploaddir . "/", $allowed_mimetypes, $maxfilesize, $maxfilewidth, $maxfileheight);
redirect_header($currentFile, 2 , _AM_WFD_DOWN_IMAGEUPLOAD);
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/import.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/import.php 2013-06-04 18:45:00 UTC (rev 11630)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/import.php 2013-06-04 21:26:57 UTC (rev 11631)
...
[truncated message content] |
|
From: <luc...@us...> - 2013-06-12 21:07:10
|
Revision: 11662
http://sourceforge.net/p/xoops/svn/11662
Author: luciorota
Date: 2013-06-12 21:07:05 +0000 (Wed, 12 Jun 2013)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/ratings.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php
XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/rating.php
XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/trunk/wfdownloads/header.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/common.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php
XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Added Paths:
-----------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.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_menu.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
Removed Paths:
-------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokens.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/modifications.php
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_categorylist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadlist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_menu.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_mimetypelist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_mirrorlist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_permissions.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reviewlist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_votedatalist.html
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-06-12 20:40:21 UTC (rev 11661)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-06-12 21:07:05 UTC (rev 11662)
@@ -29,12 +29,12 @@
$myts = &MyTextSanitizer::getInstance();
$module_handler =& xoops_gethandler('module');
-$xoopsModule = & $module_handler->getByDirname(basename(dirname(dirname(__FILE__))));
+$xoopsModule =& $module_handler->getByDirname(basename(dirname(dirname(__FILE__))));
$pathIcon16 = XOOPS_URL . '/' . $xoopsModule->getInfo('icons16');
$pathIcon32 = XOOPS_URL . '/' . $xoopsModule->getInfo('icons32');
-include_once(XOOPS_ROOT_PATH . '/modules/wfdownloads/include/common.php');
+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'>",
@@ -67,7 +67,7 @@
xoops_loadLanguage('modinfo', $xoopsModule->dirname());
xoops_loadLanguage('main', $xoopsModule->dirname());
-// Load handlers
+// Load module handlers
$category_handler = xoops_getmodulehandler('category', $xoopsModule->dirname());
$download_handler = xoops_getmodulehandler('download', $xoopsModule->dirname());
$review_handler = xoops_getmodulehandler('review', $xoopsModule->dirname());
@@ -77,9 +77,10 @@
$modification_handler = xoops_getmodulehandler('modification', $xoopsModule->dirname());
$ip_log_handler = xoops_getmodulehandler('ip_log', $xoopsModule->dirname());
+// Load Xoops handlers
$member_handler = xoops_gethandler("member");
+$notification_handler = &xoops_gethandler('notification');
-
if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
include_once(XOOPS_ROOT_PATH . "/class/template.php");
$xoopsTpl = new XoopsTpl();
Deleted: XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokens.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokens.php 2013-06-12 20:40:21 UTC (rev 11661)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokens.php 2013-06-12 21:07:05 UTC (rev 11662)
@@ -1,174 +0,0 @@
-<?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.
- */
-/**
- * WF-Downloads 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 'admin_header.php';
-
-$op = wfdownloads_CleanVars($_REQUEST, 'op', 'brokendownloads.list', 'string');
-$lid = wfdownloads_CleanVars($_REQUEST, 'lid', 0, 'int');
-
-switch ($op) {
- case "updateNotice":
- $report_handler = xoops_getmodulehandler('report');
- if (isset($_GET['ack'])) {
- $acknowledged = (isset($_GET['ack']) && $_GET['ack'] == 0) ? 1 : 0;
- $report_handler->updateAll("acknowledged", $acknowledged, new Criteria("lid", $lid), true);
- $update_mess = _AM_WFD_BROKEN_NOWACK;
- }
-
- if (isset($_GET['con'])) {
- $confirmed = (isset($_GET['con']) && $_GET['con'] == 0) ? 1 : 0;
- $report_handler->updateAll("confirmed", $confirmed, new Criteria("lid", $lid), true);
- $update_mess = _AM_WFD_BROKEN_NOWCON;
- }
- redirect_header($currentFile, 1, $update_mess);
- break;
-
- case "brokendownload.delete" :
- case "delBrokenDownloads":
- $criteria = new Criteria('lid', intval($lid));
- $report_handler = xoops_getmodulehandler('report');
- $report = $report_handler->getObjects($criteria);
- if (isset($report[0])) {
- $report_handler->delete($report[0], true);
- }
- $download_handler = xoops_getmodulehandler('download');
- $download = $download_handler->get($lid);
- $download_handler->delete($download, true);
- redirect_header($currentFile, 1, _AM_WFD_BROKENFILEDELETED);
- break;
-
- case "brokendownload.ignore" :
- case "ignoreBrokenDownloads":
- $criteria = new Criteria('lid', intval($lid));
- $report_handler = xoops_getmodulehandler('report');
- $report = $report_handler->getObjects($criteria);
- if (isset($report[0])) {
- $report_handler->delete($report[0], true);
- }
- redirect_header($currentFile, 1, _AM_WFD_BROKEN_FILEIGNORED);
- break;
-
- default:
- case "brokendownloads.list" :
- case "listBrokenDownloads":
- case "default":
- $report_handler = xoops_getmodulehandler('report');
- $reports = $report_handler->getObjects();
- $totalbrokendownloads = count($reports);
-
- wfdownloads_xoops_cp_header();
-
- echo "
- <fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFD_BROKEN_REPORTINFO . "</legend>\n
- <div style='padding: 8px;'>" . _AM_WFD_BROKEN_REPORTSNO . " <b>{$totalbrokendownloads}</b><div>\n
- <div style='padding: 8px;'>\n
- <ul><li>" . $imagearray['ignore'] . " " . _AM_WFD_BROKEN_IGNOREDESC . "</li>\n
- <li>" . $imagearray['editimg'] . " " . _AM_WFD_BROKEN_EDITDESC . "</li>
- <li>" . $imagearray['deleteimg'] . " " . _AM_WFD_BROKEN_DELETEDESC . "</li>\n
- <li>" . $imagearray['ack_yes'] . " " . _AM_WFD_BROKEN_ACKDESC . "</li>
- <li>" . $imagearray['con_yes'] . " " . _AM_WFD_BROKEN_CONFIRMDESC . "</li>
- </ul></div>\n
- </fieldset><br />\n
-
- <table width='100%' border='0' cellspacing='1' cellpadding = '2' class='outer'>\n
- <tr align = 'center'>\n
- <th width = '3%' align = 'center'>" . _AM_WFD_BROKEN_ID . "</th>\n
- <th width = '35%' align = 'left'>" . _AM_WFD_BROKEN_TITLE . "</th>\n
- <th>" . _AM_WFD_BROKEN_REPORTER . "</th>\n
- <th>" . _AM_WFD_BROKEN_FILESUBMITTER . "</th>\n
- <th>" . _AM_WFD_BROKEN_DATESUBMITTED . "</th>\n
- <th align='center'>" . _AM_WFD_BROKEN_ACTION . "</th>\n
- </tr>\n
- ";
-
- if ($totalbrokendownloads == 0) {
- echo "<tr align = 'center'><td align = 'center' class='head' colspan = '6'>" . _AM_WFD_BROKEN_NOFILEMATCH . "</td></tr>";
- } else {
- foreach (array_keys($reports) as $i) {
- $lids[] = $reports[$i]->getVar('lid');
- $uids[] = $reports[$i]->getVar('sender');
- }
- $download_handler = xoops_getmodulehandler('download');
- $downloads = $download_handler->getObjects(new Criteria('lid', "(".implode(',', array_unique($lids)).")", "IN"), true);
-
- foreach (array_keys($downloads) as $i) {
- $uids[] = $downloads[$i]->getVar('submitter');
- }
-
- $member_handler = xoops_gethandler('member');
- $users = $member_handler->getUsers(new Criteria("uid", "(" . implode(',', array_unique($uids)) . ")", "IN"), true);
-
- foreach (array_keys($reports) as $i) {
- // Does the download exists ?
- if (isset($downloads[$reports[$i]->getVar('lid')])) {
- $submitter = isset($users[$downloads[$reports[$i]->getVar('lid')]->getVar('submitter')]) ? $users[$downloads[$reports[$i]->getVar('lid')]->getVar('submitter')] : false;
- $download = $downloads[$reports[$i]->getVar('lid')];
- $download_link = "<a href='" . WFDOWNLOADS_URL . "/singlefile.php?cid=" . $download->getVar('cid') . "&lid=" . $download->getVar('lid') . "' target='_blank'>" . $download->getVar('title') . "</a>";
- $submitteremail = is_object($submitter) ? $submitter->getVar('email') : '';
- $submitteruname = is_object($submitter) ? $submitter->getVar('uname') : $xoopsConfig['anonymous'];
- } else {
- $submitter = '';
- $download_link = _AM_WFD_BROKEN_DOWNLOAD_DONT_EXISTS;
- $submitteremail = '';
- $submitteruname = $xoopsConfig['anonymous'];
- }
-
- $sender = isset($users[$reports[$i]->getVar('sender')]) ? $users[$reports[$i]->getVar('sender')] : "";
- $senderemail = isset($users[$reports[$i]->getVar('sender')]) ? $users[$reports[$i]->getVar('sender')]->getVar('email') : "";
- $sendername = isset($users[$reports[$i]->getVar('sender')]) ? $users[$reports[$i]->getVar('sender')]->getVar('uname') : $xoopsConfig['anonymous'];
-
- $lid = intval($download->getVar('lid'));
-
- $ingnore_link = "<a href='{$currentFile}?op=brokendownload.ignore&lid=" . $lid . "' alt='" . _AM_WFD_BROKEN_IGNORE_ALT . "' title='" . _AM_WFD_BROKEN_IGNORE_ALT . "'>" . $imagearray['ignore'] . "</a>";
- $edit_link = "<a href='" . WFDOWNLOADS_URL . "/admin/downloads.php?op=Download&lid=" . $lid . "' alt='" . _AM_WFD_BROKEN_EDIT_ALT . "' title='" . _AM_WFD_BROKEN_EDIT_ALT . "'> " . $imagearray['editimg'] . " </a>";
- $delete_link = "<a href='{$currentFile}?op=brokendownload.delete&lid=" . $lid . "' alt='" . _AM_WFD_BROKEN_DELETE_ALT . "' title='" . _AM_WFD_BROKEN_DELETE_ALT . "'>" . $imagearray['deleteimg'] . "</a>";
- $ack_image = ($reports[$i]->getVar('acknowledged')) ? $imagearray['ack_yes'] : $imagearray['ack_no'];
- $ack_link = "<a href='{$currentFile}?op=updateNotice&lid=" . $lid . "&ack=" . $reports[$i]->getVar('acknowledged') . "' alt='" . _AM_WFD_BROKEN_ACK_ALT . "' title='" . _AM_WFD_BROKEN_ACK_ALT . "'>" . $ack_image . "</a>";
- $con_image = ($reports[$i]->getVar('confirmed')) ? $imagearray['con_yes'] : $imagearray['con_no'];
- $con_link = "<a href='{$currentFile}?op=updateNotice&lid=" . $lid . "&con=" . $reports[$i]->getVar('confirmed') . "' alt='" . _AM_WFD_BROKEN_CONFIRM_ALT . "' title='" . _AM_WFD_BROKEN_CONFIRM_ALT . "'>" . $con_image . " </a>\n";
-
- echo "
- <tr align = 'center'>\n
- <td class = 'head'>" . $reports[$i]->getVar('reportid') . "</td>\n
- <td class = 'even' align = 'left'>$download_link</td>\n
- ";
- if ($senderemail == "") {
- echo "<td class = 'even'>" . $sendername . " (" . $reports[$i]->getVar('ip') . ")";
- } else {
- echo "<td class = 'even'><a href='mailto:" . $senderemail . "'>" . $sendername . "</a> (" . $reports[$i]->getVar('ip') . ")";
- }
- if ($submitteremail == '') {
- echo "<td class = 'even'>" . $submitteruname;
- } else {
- echo "<td class = 'even'><a href='mailto:" . $submitteremail . "'>".$submitteruname."</a>";
- }
- echo "
- </td>\n
- <td class='even' align='center'>" . formatTimestamp($reports[$i]->getVar('date'), $xoopsModuleConfig['dateformat']) . "</td>\n
- <td align='center' class = 'even' nowrap>\n
- $ingnore_link $edit_link $delete_link $ack_link $con_link
- </td></tr>\n
- ";
- }
- }
- echo"</table>";
- include 'admin_footer.php';
-}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2013-06-12 20:40:21 UTC (rev 11661)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2013-06-12 21:07:05 UTC (rev 11662)
@@ -193,7 +193,8 @@
$GLOBALS['xoopsTpl']->assign('published_downloads_pagenav', $pagenav->renderNav());
// New Downloads
- $criteria = new Criteria("published", 0);
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria("published", 0));
$criteria->setStart($start_new);
$criteria->setLimit($xoopsModuleConfig['admin_perpage']);
$new_downloads = $download_handler->getObjects($criteria);
@@ -204,6 +205,7 @@
$new_download_array = $new_download->toArray();
$new_download_array['rating'] = number_format($new_download_array['rating'], 2);
$new_download_array['title_html'] = $myts->htmlSpecialChars($new_download_array['title']);
+ $new_download_array['category_title'] = $categories[$published_download_array['cid']]['title'];
$url = urldecode($myts->htmlSpecialChars($new_download_array['url']));
$homepage = $myts->htmlSpecialChars($new_download_array['homepage']);
$version = $myts->htmlSpecialChars($new_download_array['version']);
@@ -219,7 +221,8 @@
$GLOBALS['xoopsTpl']->assign('new_downloads_pagenav', $pagenav->renderNav());
// Auto Published Downloads
- $criteria = new Criteria("published", time(), ">");
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria("published", time(), ">"));
$criteria->setSort("published");
$criteria->setOrder("ASC");
$criteria->setStart($start_auto_published);
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php 2013-06-12 20:40:21 UTC (rev 11661)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php 2013-06-12 21:07:05 UTC (rev 11662)
@@ -77,7 +77,7 @@
if ($totalmodrequests > 0) {
$indexAdmin->addInfoBoxLine(
- _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . '<a href="modifications.php">' . _AM_WFD_SMODREQUEST . '</a><b>'
+ _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . '<a href="reportsmodifications.php">' . _AM_WFD_SMODREQUEST . '</a><b>'
. "</infolabel>", $totalmodrequests, 'Green'
);
} else {
@@ -88,7 +88,7 @@
if ($totalbrokendownloads > 0) {
$indexAdmin->addInfoBoxLine(
- _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . '<a href="brokens.php">' . _AM_WFD_SBROKENSUBMIT . '</a><b>'
+ _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . '<a href="reportsmodifications.php">' . _AM_WFD_SBROKENSUBMIT . '</a><b>'
. "</infolabel>", $totalbrokendownloads, 'Green'
);
} else {
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php 2013-06-12 20:40:21 UTC (rev 11661)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php 2013-06-12 21:07:05 UTC (rev 11662)
@@ -39,22 +39,26 @@
$adminmenu[$i]['link'] = "admin/downloads.php";
$adminmenu[$i]["icon"] = '../../' . $module->getInfo('icons32') . '/download.png';
$i++;
-$adminmenu[$i]['title'] = _MI_WFD_MENU_INDEXPAGE;
-$adminmenu[$i]['link'] = "admin/indexpage.php";
-$adminmenu[$i]["icon"] = '../../' . $module->getInfo('icons32') . '/index.png';
-$i++;
$adminmenu[$i]['title'] = _MI_WFD_MENU_REVIEWS;
$adminmenu[$i]['link'] = "admin/reviews.php";
$adminmenu[$i]["icon"] = '../../' . $module->getInfo('icons32') . '/translations.png';
$i++;
-$adminmenu[$i]['title'] = _MI_WFD_MENU_BROKENS;
-$adminmenu[$i]['link'] = "admin/brokens.php";
+$adminmenu[$i]['title'] = _MI_WFD_MENU_RATINGS;
+$adminmenu[$i]['link'] = "admin/ratings.php";
+$adminmenu[$i]["icon"] = '../../' . $module->getInfo('icons32') . '/button_ok.png';
+$i++;
+$adminmenu[$i]['title'] = _MI_WFD_MENU_REPORTSMODIFICATIONS;
+$adminmenu[$i]['link'] = "admin/reportsmodifications.php";
$adminmenu[$i]["icon"] = '../../' . $module->getInfo('icons32') . '/alert.png';
$i++;
$adminmenu[$i]['title'] = _MI_WFD_MENU_MIRRORS;
$adminmenu[$i]['link'] = "admin/mirrors.php";
$adminmenu[$i]["icon"] = '../../' . $module->getInfo('icons32') . '/list.png';
$i++;
+$adminmenu[$i]['title'] = _MI_WFD_MENU_INDEXPAGE;
+$adminmenu[$i]['link'] = "admin/indexpage.php";
+$adminmenu[$i]["icon"] = '../../' . $module->getInfo('icons32') . '/index.png';
+$i++;
$adminmenu[$i]['title'] = _MI_WFD_MENU_IMAGES;
$adminmenu[$i]['link'] = "admin/images.php";
$adminmenu[$i]["icon"] = '../../' . $module->getInfo('icons32') . '/photo.png';
@@ -63,10 +67,6 @@
$adminmenu[$i]['link'] = "admin/mimetypes.php";
$adminmenu[$i]["icon"] = '../../' . $module->getInfo('icons32') . '/type.png';
$i++;
-$adminmenu[$i]['title'] = _MI_WFD_MENU_RATINGS;
-$adminmenu[$i]['link'] = "admin/ratings.php";
-$adminmenu[$i]["icon"] = '../../' . $module->getInfo('icons32') . '/button_ok.png';
-$i++;
$adminmenu[$i]['title'] = _MI_WFD_MENU_PERMISSIONS;
$adminmenu[$i]['link'] = "admin/permissions.php";
$adminmenu[$i]["icon"] = '../../' . $module->getInfo('icons32') . '/permissions.png';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php 2013-06-12 20:40:21 UTC (rev 11661)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php 2013-06-12 21:07:05 UTC (rev 11662)
@@ -104,7 +104,7 @@
$start_published = wfdownloads_CleanVars($_GET, 'start_published', 0, 'int');
$criteria_waiting = new Criteria("submit", false);
- $num_waiting = $mirror_handler->getCount($criteria_waiting);
+ $waiting_count = $mirror_handler->getCount($criteria_waiting);
$criteria_waiting->setSort("date");
$criteria_waiting->setOrder("DESC");
$criteria_waiting->setLimit($xoopsModuleConfig['admin_perpage']);
@@ -112,17 +112,17 @@
$mirrors_waiting = $mirror_handler->getObjects($criteria_waiting);
$criteria_published = new Criteria("submit", true);
- $num_published = $mirror_handler->getCount($criteria_published);
+ $published_count = $mirror_handler->getCount($criteria_published);
$criteria_published->setSort("date");
$criteria_published->setOrder("DESC");
$criteria_published->setLimit($xoopsModuleConfig['admin_perpage']);
$criteria_published->setStart($start_published);
$mirrors_published = $mirror_handler->getObjects($criteria_published);
- $GLOBALS['xoopsTpl']->assign('mirrors_waiting_count', $num_waiting);
- $GLOBALS['xoopsTpl']->assign('mirrors_published_count', $num_published);
+ $GLOBALS['xoopsTpl']->assign('mirrors_waiting_count', $waiting_count);
+ $GLOBALS['xoopsTpl']->assign('mirrors_published_count', $published_count);
- if ($num_waiting > 0) {
+ if ($waiting_count > 0) {
foreach ($mirrors_waiting as $mirror_waiting) {
$lids_waiting[] = $mirror_waiting->getVar('lid');
$uids_waiting[] = $mirror_waiting->getVar('uid');
@@ -138,11 +138,11 @@
}
//Include page navigation
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
- $pagenav_waiting = new XoopsPageNav($num_waiting, $xoopsModuleConfig['admin_perpage'] , $start_waiting, 'start_waiting');
+ $pagenav_waiting = new XoopsPageNav($waiting_count, $xoopsModuleConfig['admin_perpage'] , $start_waiting, 'start_waiting');
$GLOBALS['xoopsTpl']->assign('mirrors_waiting_pagenav', $pagenav_waiting -> renderNav());
}
- if ($num_published > 0) {
+ if ($published_count > 0) {
foreach ($mirrors_published as $mirror_published) {
$lids_published[] = $mirror_published->getVar('lid');
$uids_published[] = $mirror_published->getVar('uid');
@@ -158,7 +158,7 @@
}
//Include page navigation
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
- $pagenav_published = new XoopsPageNav($num_published, $xoopsModuleConfig['admin_perpage'] , $start_published, 'start_published');
+ $pagenav_published = new XoopsPageNav($published_count, $xoopsModuleConfig['admin_perpage'] , $start_published, 'start_published');
$GLOBALS['xoopsTpl']->assign('mirrors_published_pagenav', $pagenav_published -> renderNav());
}
Deleted: XoopsModules/wfdownloads/trunk/wfdownloads/admin/modifications.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/modifications.php 2013-06-12 20:40:21 UTC (rev 11661)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/modifications.php 2013-06-12 21:07:05 UTC (rev 11662)
@@ -1,309 +0,0 @@
-<?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.
- */
-/**
- * WF-Downloads 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 'admin_header.php';
-
-$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : 'modifications.list';
-
-switch ($op) {
- case "listModReqshow":
- wfdownloads_xoops_cp_header();
-
- $requestid = intval($_GET['requestid']);
-
-
- $modification = $modification_handler->get($requestid);
- $download = $download_handler->get($modification->getVar('lid'));
-
- $orig_user = new XoopsUser($download->getVar('submitter'));
- $submittername = XoopsUserUtility::getUnameFromId($download->getVar('submitter')); // $orig_user->getvar("uname");
- $submitteremail = $orig_user->getVar("email");
-
- echo "<div><b>" . _AM_WFD_MOD_MODPOSTER . "</b> $submittername</div>";
- $not_allowed = array("lid", "submitter", "requestid", "modifysubmitter");
-
- $sform = new XoopsThemeForm(_AM_WFD_MOD_ORIGINAL, "storyform", "index.php");
-
- $keys = $download->getVars();
- foreach (array_keys($keys) as $key) {
- if (in_array($key , $not_allowed)) {
- continue;
- }
- $lang_def = constant("_AM_WFD_MOD_" . strtoupper($key));
-
- $content = $download->getVar($key, 'e');
- switch ($key) {
- case "platform":
- case "license":
- case "limitations":
- case "versiontypes":
- $content = $xoopsModuleConfig[$key][$download->getVar($key)];
- break;
-
- case "cid":
- $category_list = $category_handler->getObjects(new Criteria("cid", $download->getVar($key)));
- if (!isset($category_list[0])) {
- continue;
- }
- $content = $category_list[0]->getVar('title', 'e');
- break;
-
- case "screenshot":
- if ($content != "") {
- $content = "<img src='" . XOOPS_URL . "/" . $xoopsModuleConfig['screenshots'] . "/" . $content . "' width='" . $xoopsModuleConfig['shotwidth'] . "' alt='' title='' />";
- }
- break;
-
- case "screenshot2":
- if ($content != "") {
- $content = "<img src='" . XOOPS_URL . "/" . $xoopsModuleConfig['screenshots'] . "/" . $content . "' width='" . $xoopsModuleConfig['shotwidth'] . "' alt='' title='' />";
- }
- break;
-
- case "screenshot3":
- if ($content != "") {
- $content = "<img src='" . XOOPS_URL . "/" . $xoopsModuleConfig['screenshots'] . "/" . $content . "' width='" . $xoopsModuleConfig['shotwidth'] . "' alt='' title='' />";
- }
- break;
-
- case "screenshot4":
- if ($content != "") {
- $content = "<img src='" . XOOPS_URL . "/" . $xoopsModuleConfig['screenshots'] . "/" . $content . "' width='" . $xoopsModuleConfig['shotwidth'] . "' alt='' title='' />";
- }
- break;
-
- case "features":
- case "requirements":
- if ($content != '') {
- $downrequirements = explode('|', trim($content));
- foreach ($downrequirements as $bi) {
- $content = "<li>" . $bi;
- }
- }
- break;
-
- case "dhistory":
- $content = $myts->displayTarea($content, 1, 0, 0, 0, 1);
- break;
- }
- $sform->addElement(new XoopsFormLabel($lang_def, $content));
- }
- $sform->display();
-
- $modify_user = new XoopsUser($modification->getVar('modifysubmitter'));
- $modifyname = XoopsUserUtility::getUnameFromId(intval($modify_user->getVar('uid')));
- $modifyemail = $modify_user->getVar("email");
-
- echo "<div><b>" . _AM_WFD_MOD_MODIFYSUBMITTER . "</b> $modifyname</div>";
- $sform = new XoopsThemeForm(_AM_WFD_MOD_PROPOSED, "storyform", "modifications.php");
- $keys = $modification->getVars();
- foreach (array_keys($keys) as $key) {
- if (in_array($key , $not_allowed)) {
- continue;
- }
- $lang_def = constant("_AM_WFD_MOD_" . strtoupper($key));
-
- $content = $modification->getVar($key, 'e');
- switch ($key) {
- case "platform":
- case "license":
- case "limitations":
- case "versiontypes":
- $content = $xoopsModuleConfig[$key][$modification->getVar($key)];
- break;
-
- case "cid":
- $category_list = $category_handler->getObjects(new Criteria("cid", $modification->getVar($key)));
- ...
[truncated message content] |
|
From: <luc...@us...> - 2013-07-16 22:38:12
|
Revision: 11832
http://sourceforge.net/p/xoops/svn/11832
Author: luciorota
Date: 2013-07-16 22:38:08 +0000 (Tue, 16 Jul 2013)
Log Message:
-----------
fixed some errors
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php
XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php 2013-07-16 19:39:23 UTC (rev 11831)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php 2013-07-16 22:38:08 UTC (rev 11832)
@@ -22,7 +22,7 @@
include 'admin_header.php';
$op = wfdownloads_CleanVars($_REQUEST, 'op', 'images.list', 'string');
-$rootpath = wfdownloads_CleanVars($_GET, 'rootpath', 0, 'int');
+$rootPath = wfdownloads_CleanVars($_GET, 'rootpath', 0, 'int');
switch ($op) {
case "image.upload" :
@@ -30,20 +30,19 @@
if (file_exists(XOOPS_ROOT_PATH . "/" . $_POST['uploadpath'] . "/" . $_FILES['uploadfile']['name'])) {
redirect_header($currentFile, 2, _AM_WFD_DOWN_IMAGEEXIST);
}
- $allowed_mimetypes = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png');
- $maxfilesize = $xoopsModuleConfig['maxfilesize'];
- $maxfilewidth = $xoopsModuleConfig['maximgwidth'];
- $maxfileheight = $xoopsModuleConfig['maximgheight'];
- $uploaddir = XOOPS_ROOT_PATH."/".$_POST['uploadpath'];
- $screenshot = strtolower($_FILES['uploadfile']['name']);
- wfd_uploading($screenshot, XOOPS_ROOT_PATH . "/" . $_POST['uploadpath'], $allowed_mimetypes, "images.php", 1, 0, true);
+ $allowedMimetypes = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png');
+ $maxFileSize = $xoopsModuleConfig['maxfilesize'];
+ $maxImgWidth = $xoopsModuleConfig['maximgwidth'];
+ $maxImgHeight = $xoopsModuleConfig['maximgheight'];
+ $uploadDir = XOOPS_ROOT_PATH . "/" . $_POST['uploadpath'];
+ $screenShot = strtolower($_FILES['uploadfile']['name']);
+ wfd_uploading($screenShot, XOOPS_ROOT_PATH . "/" . $_POST['uploadpath'], $allowedMimetypes, "images.php", 1, 0, true);
include_once WFDOWNLOADS_ROOT_PATH . '/class/img_uploader.php';
- $uploader = new XoopsMediaImgUploader($uploaddir . "/", $allowed_mimetypes, $maxfilesize, $maxfilewidth, $maxfileheight);
+ $uploader = new XoopsMediaImgUploader($uploadDir . "/", $allowedMimetypes, $maxFileSize, $maxImgWidth, $maxImgHeight);
redirect_header($currentFile, 2 , _AM_WFD_DOWN_IMAGEUPLOAD);
exit();
-
} else {
redirect_header($currentFile, 2 , _AM_WFD_DOWN_NOIMAGEEXIST);
exit();
@@ -54,10 +53,10 @@
$ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
if ($ok == true) {
- $filetodelete = XOOPS_ROOT_PATH . "/" . $_POST['uploadpath'] . "/" . $_POST['downfile'];
- if (file_exists($filetodelete)) {
- chmod($filetodelete, 0666);
- if (@unlink($filetodelete)) {
+ $fileToDelete = XOOPS_ROOT_PATH . "/" . $_POST['uploadpath'] . "/" . $_POST['downfile'];
+ if (file_exists($fileToDelete)) {
+ chmod($fileToDelete, 0666);
+ if (@unlink($fileToDelete)) {
redirect_header($currentFile, 1, _AM_WFD_DOWN_FILEDELETED);
} else {
redirect_header($currentFile, 1, _AM_WFD_DOWN_FILEERRORDELETE);
@@ -77,51 +76,49 @@
case "images.list" :
default:
- include_once WFDOWNLOADS_ROOT_PATH . 'class/wfd_lists.php';
+ include_once WFDOWNLOADS_ROOT_PATH . '/class/wfd_lists.php';
- $displayimage = '';
+ $displayImage = '';
wfdownloads_xoops_cp_header();
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation($currentFile);
- $dirarray = array(1 => $xoopsModuleConfig['catimage'], 2 => $xoopsModuleConfig['screenshots'], 3 => $xoopsModuleConfig['mainimagedir']);
- $namearray = array(1 => _AM_WFD_DOWN_CATIMAGE , 2 => _AM_WFD_DOWN_SCREENSHOTS, 3 => _AM_WFD_DOWN_MAINIMAGEDIR);
- $listarray = array(1 => _AM_WFD_DOWN_FCATIMAGE , 2 => _AM_WFD_DOWN_FSCREENSHOTS, 3 => _AM_WFD_DOWN_FMAINIMAGEDIR);
+ $dirArray = array(1 => $xoopsModuleConfig['catimage'], 2 => $xoopsModuleConfig['screenshots'], 3 => $xoopsModuleConfig['mainimagedir']);
+ $nameArray = array(1 => _AM_WFD_DOWN_CATIMAGE , 2 => _AM_WFD_DOWN_SCREENSHOTS, 3 => _AM_WFD_DOWN_MAINIMAGEDIR);
+ $listArray = array(1 => _AM_WFD_DOWN_FCATIMAGE , 2 => _AM_WFD_DOWN_FSCREENSHOTS, 3 => _AM_WFD_DOWN_FMAINIMAGEDIR);
- //wfdownloads_adminMenu(6, _AM_WFD_MUPLOADS);
- if ($rootpath > 0) {
- echo "<div><b>" . _AM_WFD_DOWN_FUPLOADPATH . "</b> " . XOOPS_ROOT_PATH . "/" . $dirarray[$rootpath] . "</div>\n";
- echo "<div><b>" . _AM_WFD_DOWN_FUPLOADURL . "</b> " . XOOPS_URL . "/" . $dirarray[$rootpath] . "</div><br />\n";
- }
- $pathlist = (isset($listarray[$rootpath])) ? $namearray[$rootpath] : '';
- $namelist = (isset($listarray[$rootpath])) ? $namearray[$rootpath] : '';
+ $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_WFD_DOWN_FUPLOADIMAGETO . $pathList, "op", xoops_getenv('PHP_SELF'));
$iform->setExtra('enctype="multipart/form-data"');
ob_start();
- $iform->addElement(new XoopsFormHidden('dir', $rootpath));
- wfd_getDirSelectOption($namelist, $dirarray, $namearray);
+ $iform->addElement(new XoopsFormHidden('dir', $rootPath));
+ wfd_getDirSelectOption($nameList, $dirArray, $nameArray);
$iform->addElement(new XoopsFormLabel(_AM_WFD_DOWN_FOLDERSELECTION, ob_get_contents()));
ob_end_clean();
- if ($rootpath > 0) {
- $graph_array = &WfsLists::getListTypeAsArray(XOOPS_ROOT_PATH . "/" . $dirarray[$rootpath], $type = "images");
+ 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]));
+
+ $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_select->setExtra("onchange='showImgSelected(\"image\", \"downfile\", \"" . $dirArray[$rootPath] . "\", \"\", \"" . XOOPS_URL . "\")'");
$indeximage_tray = new XoopsFormElementTray(_AM_WFD_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' />"));
+ $indeximage_tray->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . "/" . $dirArray[$rootPath] . "/" . $_REQUEST['downfile'] . "' name='image' id='image' alt='' title='image' />"));
} else {
$indeximage_tray->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . "/uploads/blank.gif' name='image' id='image' alt='' title='image' />"));
}
$iform->addElement($indeximage_tray);
$iform->addElement(new XoopsFormFile(_AM_WFD_DOWN_FUPLOADIMAGE, 'uploadfile', 0));
- $iform->addElement(new XoopsFormHidden('uploadpath', $dirarray[$rootpath]));
- $iform->addElement(new XoopsFormHidden('rootnumber', $rootpath));
+ $iform->addElement(new XoopsFormHidden('uploadpath', $dirArray[$rootPath]));
+ $iform->addElement(new XoopsFormHidden('rootnumber', $rootPath));
$dup_tray = new XoopsFormElementTray('', '');
$dup_tray->addElement(new XoopsFormHidden('op', 'upload'));
@@ -138,4 +135,3 @@
echo wfd_serverstats();
include_once "admin_footer.php";
}
-
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php 2013-07-16 19:39:23 UTC (rev 11831)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php 2013-07-16 22:38:08 UTC (rev 11832)
@@ -32,7 +32,7 @@
redirect_header($currentFile, 4, _AM_WFD_ERROR_MIRRORNOTFOUND);
exit();
}
- if ($ok = true) {
+ if ($ok == true) {
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-07-16 19:39:23 UTC (rev 11831)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-07-16 22:38:08 UTC (rev 11832)
@@ -1,4 +1,4 @@
-<b><u>=> Version 3.23 Beta (2013-06-12)</u></b>
+<b><u>=> Version 3.23 Beta (2013-07-15)</u></b>
- module standardization: header.php, admin/admin_header.php, xoops_version.php
- module standardization: standardize directories/files names/structures
- module standardization: standardize code headers
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-07-16 19:39:23 UTC (rev 11831)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-07-16 22:38:08 UTC (rev 11832)
@@ -45,9 +45,9 @@
$modversion['onUpdate'] = "include/module.php";
$modversion['onUninstall'] = 'include/module.php';
-$modversion['date'] = '2013-06-12';
-$modversion['release_date'] = '2013/06/12';
-$modversion['releasedate'] = "2013-06-12";
+$modversion['date'] = '2013-07-15';
+$modversion['release_date'] = '2013/07/15';
+$modversion['releasedate'] = "2013-07-15";
$modversion['status'] = "BETA";
$modversion['teammembers'] = "Bender, David, FrankBlack, Xpider, M0nty, Mithrandir, Marcan, felix[fx2024], Sudhaker, Jegelstaff";
|
|
From: <luc...@us...> - 2013-07-17 18:21:13
|
Revision: 11837
http://sourceforge.net/p/xoops/svn/11837
Author: luciorota
Date: 2013-07-17 18:21:09 +0000 (Wed, 17 Jul 2013)
Log Message:
-----------
delete images and templates directories
Removed Paths:
-------------
XoopsModules/wfdownloads/trunk/wfdownloads/images/
XoopsModules/wfdownloads/trunk/wfdownloads/templates/
|
|
From: <luc...@us...> - 2013-07-17 18:23:12
|
Revision: 11838
http://sourceforge.net/p/xoops/svn/11838
Author: luciorota
Date: 2013-07-17 18:23:08 +0000 (Wed, 17 Jul 2013)
Log Message:
-----------
refactory images and templates directories
Added Paths:
-----------
XoopsModules/wfdownloads/trunk/wfdownloads/images/
XoopsModules/wfdownloads/trunk/wfdownloads/images/blank.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/brokenimg.png
XoopsModules/wfdownloads/trunk/wfdownloads/images/category/
XoopsModules/wfdownloads/trunk/wfdownloads/images/category/blank.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/category/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/images/category/thumbs/
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/
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/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/screenshots/
XoopsModules/wfdownloads/trunk/wfdownloads/images/screenshots/blank.gif
XoopsModules/wfdownloads/trunk/wfdownloads/images/screenshots/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/images/screenshots/thumbs/
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/images/wfdownloads_logo.png
XoopsModules/wfdownloads/trunk/wfdownloads/images/wfdownloads_logo_old.png
XoopsModules/wfdownloads/trunk/wfdownloads/templates/
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/
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_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/
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_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
Added: XoopsModules/wfdownloads/trunk/wfdownloads/images/blank.gif
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/trunk/wfdownloads/images/blank.gif
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/images/blank.gif 2013-07-17 18:21:09 UTC (rev 11837)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/images/blank.gif 2013-07-17 18:23:08 UTC (rev 11838)
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads/images/blank.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/wfdownloads/trunk/wfdownloads/images/brokenimg.png
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/trunk/wfdownloads/images/brokenimg.png
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/images/brokenimg.png 2013-07-17 18:21:09 UTC (rev 11837)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/images/brokenimg.png 2013-07-17 18:23:08 UTC (rev 11838)
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads/images/brokenimg.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/wfdownloads/trunk/wfdownloads/images/category/blank.gif
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/trunk/wfdownloads/images/category/blank.gif
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/images/category/blank.gif 2013-07-17 18:21:09 UTC (rev 11837)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/images/category/blank.gif 2013-07-17 18:23:08 UTC (rev 11838)
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads/images/category/blank.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/wfdownloads/trunk/wfdownloads/images/category/index.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/images/category/index.html (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/images/category/index.html 2013-07-17 18:23:08 UTC (rev 11838)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/wfdownloads/trunk/wfdownloads/images/category/thumbs/blank.gif
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/trunk/wfdownloads/images/category/thumbs/blank.gif
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/images/category/thumbs/blank.gif 2013-07-17 18:21:09 UTC (rev 11837)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/images/category/thumbs/blank.gif 2013-07-17 18:23:08 UTC (rev 11838)
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads/images/category/thumbs/blank.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/wfdownloads/trunk/wfdownloads/images/category/thumbs/index.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/images/category/thumbs/index.html (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/images/category/thumbs/index.html 2013-07-17 18:23:08 UTC (rev 11838)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/wfdownloads/trunk/wfdownloads/images/down.gif
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/trunk/wfdownloads/images/down.gif
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/images/down.gif 2013-07-17 18:21:09 UTC (rev 11837)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/images/down.gif 2013-07-17 18:23:08 UTC (rev 11838)
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads/images/down.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/approve.gif
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/approve.gif
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/approve.gif 2013-07-17 18:21:09 UTC (rev 11837)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/approve.gif 2013-07-17 18:23:08 UTC (rev 11838)
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/approve.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/arrow.gif
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/arrow.gif
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/arrow.gif 2013-07-17 18:21:09 UTC (rev 11837)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/arrow.gif 2013-07-17 18:23:08 UTC (rev 11838)
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/arrow.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/close12.gif
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/close12.gif
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/close12.gif 2013-07-17 18:21:09 UTC (rev 11837)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/close12.gif 2013-07-17 18:23:08 UTC (rev 11838)
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/close12.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/delete.gif
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/delete.gif
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/delete.gif 2013-07-17 18:21:09 UTC (rev 11837)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/delete.gif 2013-07-17 18:23:08 UTC (rev 11838)
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/delete.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/disabled.gif
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/disabled.gif
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/disabled.gif 2013-07-17 18:21:09 UTC (rev 11837)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/disabled.gif 2013-07-17 18:23:08 UTC (rev 11838)
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/disabled.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/down.gif
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/down.gif
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/down.gif 2013-07-17 18:21:09 UTC (rev 11837)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/down.gif 2013-07-17 18:23:08 UTC (rev 11838)
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/down.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download.gif
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download.gif
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download.gif 2013-07-17 18:21:09 UTC (rev 11837)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download.gif 2013-07-17 18:23:08 UTC (rev 11838)
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download1.gif
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download1.gif
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download1.gif 2013-07-17 18:21:09 UTC (rev 11837)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download1.gif 2013-07-17 18:23:08 UTC (rev 11838)
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download1.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download2.gif
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download2.gif
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download2.gif 2013-07-17 18:21:09 UTC (rev 11837)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download2.gif 2013-07-17 18:23:08 UTC (rev 11838)
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download2.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download3.gif
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download3.gif
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download3.gif 2013-07-17 18:21:09 UTC (rev 11837)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download3.gif 2013-07-17 18:23:08 UTC (rev 11838)
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download3.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download4.gif
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download4.gif
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download4.gif 2013-07-17 18:21:09 UTC (rev 11837)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download4.gif 2013-07-17 18:23:08 UTC (rev 11838)
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/download4.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/downloads.gif
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/downloads.gif
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/downloads.gif 2013-07-17 18:21:09 UTC (rev 11837)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/downloads.gif 2013-07-17 18:23:08 UTC (rev 11838)
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/downloads.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/downloads02.gif
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/downloads02.gif
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/downloads02.gif 2013-07-17 18:21:09 UTC (rev 11837)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/downloads02.gif 2013-07-17 18:23:08 UTC (rev 11838)
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/downloads02.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/downloads03.gif
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/downloads03.gif
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/downloads03.gif 2013-07-17 18:21:09 UTC (rev 11837)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/downloads03.gif 2013-07-17 18:23:08 UTC (rev 11838)
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/downloads03.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/edit.gif
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/edit.gif
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/edit.gif 2013-07-17 18:21:09 UTC (rev 11837)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/edit.gif 2013-07-17 18:23:08 UTC (rev 11838)
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/edit.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/forum.gif
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/forum.gif
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/forum.gif 2013-07-17 18:21:09 UTC (rev 11837)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/forum.gif 2013-07-17 18:23:08 UTC (rev 11838)
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/forum.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/ignore.gif
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/ignore.gif
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/ignore.gif 2013-07-17 18:21:09 UTC (rev 11837)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/ignore.gif 2013-07-17 18:23:08 UTC (rev 11838)
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/ignore.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/ignore.png
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/ignore.png
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/ignore.png 2013-07-17 18:21:09 UTC (rev 11837)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/ignore.png 2013-07-17 18:23:08 UTC (rev 11838)
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/ignore.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/index.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/index.html (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/index.html 2013-07-17 18:23:08 UTC (rev 11838)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/link.png
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/link.png
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/link.png 2013-07-17 18:21:09 UTC (rev 11837)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/link.png 2013-07-17 18:23:08 UTC (rev 11838)
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/link.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/newred.gif
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/newred.gif
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/newred.gif 2013-07-17 18:21:09 UTC (rev 11837)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/newred.gif 2013-07-17 18:23:08 UTC (rev 11838)
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/newred.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/off.gif
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/off.gif
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/off.gif 2013-07-17 18:21:09 UTC (rev 11837)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/off.gif 2013-07-17 18:23:08 UTC (rev 11838)
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/off.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/on.gif
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/on.gif
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/on.gif 2013-07-17 18:21:09 UTC (rev 11837)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/on.gif 2013-07-17 18:23:08 UTC (rev 11838)
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/on.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/open12.gif
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/open12.gif
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/open12.gif 2013-07-17 18:21:09 UTC (rev 11837)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/open12.gif 2013-07-17 18:23:08 UTC (rev 11838)
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/open12.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/pop.gif
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/pop.gif
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/pop.gif 2013-07-17 18:21:09 UTC (rev 11837)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/images/icon/pop.gif 2013-07-17 18:23:08 UTC (re...
[truncated message content] |
|
From: <luc...@us...> - 2013-07-17 18:24:27
|
Revision: 11839
http://sourceforge.net/p/xoops/svn/11839
Author: luciorota
Date: 2013-07-17 18:24:25 +0000 (Wed, 17 Jul 2013)
Log Message:
-----------
- changed preferences order
- fixed errors
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/class/mirror.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/review.php
XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/mirror.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/mirror.php 2013-07-17 18:23:08 UTC (rev 11838)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/mirror.php 2013-07-17 18:24:25 UTC (rev 11839)
@@ -28,23 +28,30 @@
$this->initVar('title', XOBJ_DTYPE_TXTBOX);
$this->initVar('homeurl', XOBJ_DTYPE_URL, 'http://');
$this->initVar('location', XOBJ_DTYPE_TXTBOX);
- $this->initVar('continent', XOBJ_DTYPE_TXTBOX);
+ $this->initVar('continent', XOBJ_DTYPE_TXTBOX, _MD_WFD_CONT4);
$this->initVar('downurl', XOBJ_DTYPE_URL, '');
- $this->initVar('submit', XOBJ_DTYPE_INT);
+ $this->initVar('submit', XOBJ_DTYPE_INT); // boolean
$this->initVar('date', XOBJ_DTYPE_INT);
$this->initVar('uid', XOBJ_DTYPE_INT);
}
function getForm() {
- include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
- $uid = !empty($xoopsUser) ? intval($xoopsUser->getVar('uid')) : 0;
+ include_once XOOPS_ROOT_PATH . "/class/xoopsformloader.php";
+ $uid = !empty($xoopsUser) ? (int)($xoopsUser->getVar('uid')) : 0;
$sform = new XoopsThemeForm(_AM_WFD_MIRROR_SNEWMNAMEDESC, "mirrorform", $_SERVER['REQUEST_URI']);
- $sform -> addElement(new XoopsFormText(_AM_WFD_MIRROR_FHOMEURLTITLE, 'title', 30, 40, $this->getVar('title', 'e')), true);
- $sform -> addElement(new XoopsFormText(_AM_WFD_MIRROR_FHOMEURL, 'homeurl', 30, 40, $this->getVar('homeurl', 'e')), true);
- $sform -> addElement(new XoopsFormText(_AM_WFD_MIRROR_LOCATION, 'location', 30, 40, $this->getVar('location', 'e')), true);
+ $sform -> addElement(new XoopsFormText(_AM_WFD_MIRROR_FHOMEURLTITLE, 'title', 50, 255, $this->getVar('title', 'e')), true);
+ $sform -> addElement(new XoopsFormText(_AM_WFD_MIRROR_FHOMEURL, 'homeurl', 50, 255, $this->getVar('homeurl', 'e')), true);
+ $sform -> addElement(new XoopsFormText(_AM_WFD_MIRROR_LOCATION, 'location', 50, 255, $this->getVar('location', 'e')), true);
$continent_select = new XoopsFormSelect(_AM_WFD_MIRROR_CONTINENT, "continent", $this->getVar('continent'));
- $continent_select->addOptionArray(array(_AM_WFD_CONT1 => _AM_WFD_CONT1, _AM_WFD_CONT2 => _AM_WFD_CONT2, _AM_WFD_CONT3 => _AM_WFD_CONT3, _AM_WFD_CONT4 => _AM_WFD_CONT4, _AM_WFD_CONT5 => _AM_WFD_CONT5, _AM_WFD_CONT6 => _AM_WFD_CONT6, _AM_WFD_CONT7 => _AM_WFD_CONT7));
+ $continent_select->addOptionArray(array(
+ _AM_WFD_CONT1 => _AM_WFD_CONT1,
+ _AM_WFD_CONT2 => _AM_WFD_CONT2,
+ _AM_WFD_CONT3 => _AM_WFD_CONT3,
+ _AM_WFD_CONT4 => _AM_WFD_CONT4,
+ _AM_WFD_CONT5 => _AM_WFD_CONT5,
+ _AM_WFD_CONT6 => _AM_WFD_CONT6,
+ _AM_WFD_CONT7 => _AM_WFD_CONT7));
$sform -> addElement($continent_select);
$sform -> addElement(new XoopsFormText(_AM_WFD_MIRROR_DOWNURL, 'downurl', 50, 255, $this->getVar('downurl', 'e')), true);
@@ -53,17 +60,17 @@
$approve_checkbox -> addOption(1, " ");
$sform -> addElement($approve_checkbox);
- $sform -> addElement(new XoopsFormHidden("lid", intval($this->getVar('lid'))));
- $sform -> addElement(new XoopsFormHidden("mirror_id", intval($this->getVar('mirror_id'))));
+ $sform -> addElement(new XoopsFormHidden("lid", (int)($this->getVar('lid'))));
+ $sform -> addElement(new XoopsFormHidden("mirror_id", (int)($this->getVar('mirror_id'))));
$sform -> addElement(new XoopsFormHidden("uid", $uid));
$sform -> addElement(new XoopsFormHidden("confirm", 1));
$button_tray = new XoopsFormElementTray('', '');
- $hidden = new XoopsFormHidden('op', 'save');
+ $hidden = new XoopsFormHidden('op', '');
$button_tray -> addElement($hidden);
if ($this->isNew()) {
$butt_create = new XoopsFormButton('', '', _AM_WFD_BSAVE, 'submit');
- $butt_create -> setExtra('onclick="this.form.elements.op.value=\'edit_mirror\'"');
+ $butt_create -> setExtra('onclick="this.form.elements.op.value=\'mirror.save\'"');
$button_tray -> addElement($butt_create);
$butt_clear = new XoopsFormButton('', '', _AM_WFD_BRESET, 'reset');
@@ -74,11 +81,11 @@
$button_tray -> addElement($butt_cancel);
} else {
$butt_create = new XoopsFormButton('', '', _AM_WFD_BSAVE, 'submit');
- $butt_create -> setExtra('onclick="this.form.elements.op.value=\'edit_mirror\'"');
+ $butt_create -> setExtra('onclick="this.form.elements.op.value=\'mirror.save\'"');
$button_tray -> addElement($butt_create);
$butt_delete = new XoopsFormButton('', '', _AM_WFD_BDELETE, 'submit');
- $butt_delete -> setExtra('onclick="this.form.elements.op.value=\'del_mirror\'"');
+ $butt_delete -> setExtra('onclick="this.form.elements.op.value=\'mirror.delete\'"');
$button_tray -> addElement($butt_delete);
$butt_cancel = new XoopsFormButton('', '', _AM_WFD_BCANCEL, 'button');
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/review.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/review.php 2013-07-17 18:23:08 UTC (rev 11838)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/review.php 2013-07-17 18:24:25 UTC (rev 11839)
@@ -28,7 +28,7 @@
$this->initVar('lid', XOBJ_DTYPE_INT);
$this->initVar('title', XOBJ_DTYPE_TXTBOX);
$this->initVar('review', XOBJ_DTYPE_TXTAREA);
- $this->initVar('submit', XOBJ_DTYPE_INT);
+ $this->initVar('submit', XOBJ_DTYPE_INT); // boolean
$this->initVar('date', XOBJ_DTYPE_INT);
$this->initVar('uid', XOBJ_DTYPE_INT);
$this->initVar('rated', XOBJ_DTYPE_INT);
@@ -36,7 +36,7 @@
function getForm() {
include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
- $uid = !empty($xoopsUser) ? intval($xoopsUser->getVar('uid')) : 0;
+ $uid = !empty($xoopsUser) ? (int)($xoopsUser->getVar('uid')) : 0;
$sform = new XoopsThemeForm(_AM_WFD_REV_SNEWMNAMEDESC, "reviewform", $_SERVER['REQUEST_URI']);
$sform -> addElement(new XoopsFormText(_AM_WFD_REV_FTITLE, 'title', 30, 40, $this->getVar('title', 'e')), true);
@@ -50,17 +50,17 @@
$approve_checkbox -> addOption(1, " ");
$sform -> addElement($approve_checkbox);
- $sform -> addElement(new XoopsFormHidden("lid", intval($this->getVar('lid'))));
+ $sform -> addElement(new XoopsFormHidden("lid", (int)($this->getVar('lid'))));
$sform -> addElement(new XoopsFormHidden("uid", $uid));
- $sform -> addElement(new XoopsFormHidden("review_id", intval($this->getVar('review_id'))));
+ $sform -> addElement(new XoopsFormHidden("review_id", (int)($this->getVar('review_id'))));
$sform -> addElement(new XoopsFormHidden("confirm", 1));
$button_tray = new XoopsFormElementTray('', '');
- $hidden = new XoopsFormHidden('op', 'save');
+ $hidden = new XoopsFormHidden('op', '');
$button_tray -> addElement($hidden);
if ($this->isNew()) {
$butt_create = new XoopsFormButton('', '', _AM_WFD_BSAVE, 'submit');
- $butt_create -> setExtra('onclick="this.form.elements.op.value=\'edit_review\'"');
+ $butt_create -> setExtra('onclick="this.form.elements.op.value=\'review.save\'"');
$button_tray -> addElement($butt_create);
$butt_clear = new XoopsFormButton('', '', _AM_WFD_BRESET, 'reset');
@@ -71,11 +71,11 @@
$button_tray -> addElement($butt_cancel);
} else {
$butt_create = new XoopsFormButton('', '', _AM_WFD_BSAVE, 'submit');
- $butt_create -> setExtra('onclick="this.form.elements.op.value=\'edit_review\'"');
+ $butt_create -> setExtra('onclick="this.form.elements.op.value=\'review.save\'"');
$button_tray -> addElement($butt_create);
$butt_delete = new XoopsFormButton('', '', _AM_WFD_BDELETE, 'submit');
- $butt_delete -> setExtra('onclick="this.form.elements.op.value=\'del_review\'"');
+ $butt_delete -> setExtra('onclick="this.form.elements.op.value=\'review.delete\'"');
$button_tray -> addElement($butt_delete);
$butt_cancel = new XoopsFormButton('', '', _AM_WFD_BCANCEL, 'button');
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-07-17 18:23:08 UTC (rev 11838)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-07-17 18:24:25 UTC (rev 11839)
@@ -1,4 +1,4 @@
-<b><u>=> Version 3.23 Beta (2013-07-15)</u></b>
+<b><u>=> Version 3.23 Beta (2013-07-17)</u></b>
- module standardization: header.php, admin/admin_header.php, xoops_version.php
- module standardization: standardize directories/files names/structures
- module standardization: standardize code headers
@@ -9,6 +9,8 @@
- fixed: deprecated "XoopsTree" (luciorota)
- fixed: templates (luciorota)
- removed: unapgraded languages (luciorota)
+- removed: unused templates (luciorota)
+- removed: unused images files (luciorota)
<b><u>=> Version 3.22 RC3 (2013-05-19)</u></b>
- added permission: upload by category (luciorota)
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php 2013-07-17 18:23:08 UTC (rev 11838)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php 2013-07-17 18:24:25 UTC (rev 11839)
@@ -345,39 +345,6 @@
-function wfdownloads_adminMenu ($currentoption = 0, $breadcrumb = '' ) {
-
- include_once XOOPS_ROOT_PATH . '/class/template.php';
-
- // global $xoopsDB, $xoopsModule, $xoopsConfig, $xoopsModuleConfig;
- global $xoopsModule, $xoopsConfig;
-
- if (file_exists( WFDOWNLOADS_ROOT_PATH . '/language/' . $xoopsConfig['language'] . '/modinfo.php')) {
- include_once WFDOWNLOADS_ROOT_PATH . '/language/' . $xoopsConfig['language'] . '/modinfo.php';
- } else {
- include_once WFDOWNLOADS_ROOT_PATH . '/language/english/modinfo.php';
- }
- if (file_exists( WFDOWNLOADS_ROOT_PATH . '/language/' . $xoopsConfig['language'] . '/admin.php')) {
- include_once WFDOWNLOADS_ROOT_PATH . '/language/' . $xoopsConfig['language'] . '/admin.php';
- } else {
- include_once WFDOWNLOADS_ROOT_PATH . '/language/english/admin.php';
- }
- include 'menu.php';
-
- $tpl = new XoopsTpl();
- $tpl->assign( array(
- 'headermenu' => $headermenu,
- 'adminmenu' => $adminmenu,
- 'current' => $currentoption,
- 'breadcrumb' => $breadcrumb,
- 'headermenucount' => count($headermenu)
- ) );
- $tpl->display( 'db:wfdownloads_admin_menu.html' );
- echo "<br />\n";
-}
-
-
-
function wfdownloads_collapsableBar($tablename = '', $iconname = '', $tabletitle = '', $tabledsc='')
{
global $xoopsModule;
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php 2013-07-17 18:23:08 UTC (rev 11838)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php 2013-07-17 18:24:25 UTC (rev 11839)
@@ -75,7 +75,7 @@
$mirror_handler = xoops_getmodulehandler('mirror');
$criteria = new CriteriaCompo(new Criteria("lid", $lid));
- $criteria->add(new Criteria("submit", 1));
+ $criteria->add(new Criteria("submit", 1)); // true
$mirror_amount = $mirror_handler->getCount($criteria);
$criteria->setSort("date");
$criteria->setLimit(5);
@@ -96,13 +96,13 @@
$down_mirror = $mirrors[$i]->toArray();
if ($xoopsModuleConfig['enable_onlinechk'] == 1) {
$serverurl = str_replace('http://', '', trim($down_mirror['homeurl']));
- $down_mirror['isonline'] = intval(wfd_mirroronline($serverurl));
+ $down_mirror['isonline'] = (int)(wfd_mirroronline($serverurl));
} else {
$down_mirror['isonline'] = 2;
}
$down_mirror['add_mirror'] = $add_mirror;
$down_mirror['date'] = formatTimestamp($down_mirror['date'], $xoopsModuleConfig['dateformat']);
- $down_mirror['submitter'] = XoopsUserUtility::getUnameFromId(intval($down_mirror['uid']));
+ $down_mirror['submitter'] = XoopsUserUtility::getUnameFromId((int)($down_mirror['uid']));
$xoopsTpl->append('down_mirror', $down_mirror);
}
$xoopsTpl->assign('lang_mirror_found', sprintf(_MD_WFD_MIRROR_TOTAL, $mirror_amount));
@@ -130,7 +130,7 @@
}
if (!empty($_POST['submit'])) {
- $uid = !empty($xoopsUser) ? intval($xoopsUser->getVar('uid')) : 0;
+ $uid = !empty($xoopsUser) ? (int)($xoopsUser->getVar('uid')) : 0;
$mirror_handler = xoops_getmodulehandler('mirror');
$mirror = $mirror_handler->create();
@@ -139,7 +139,7 @@
$mirror->setVar('location', trim($_POST["location"]));
$mirror->setVar('continent', trim($_POST["continent"]));
$mirror->setVar('downurl', trim($_POST["downurl"]));
- $mirror->setVar('lid', intval($_POST["lid"]));
+ $mirror->setVar('lid', (int)($_POST["lid"]));
$mirror->setVar('uid', $uid);
$mirror->setVar('date', time());
if (($xoopsModuleConfig['autoapprove'] == 1 || $xoopsModuleConfig['autoapprove'] == 2) && !$wfdownloads_isAdmin) {
@@ -159,7 +159,7 @@
} else {
include XOOPS_ROOT_PATH . '/header.php';
include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
- $uid = !empty($xoopsUser) ? intval($xoopsUser->getVar('uid')) : 0;
+ $uid = !empty($xoopsUser) ? (int)($xoopsUser->getVar('uid')) : 0;
$xoTheme->addStylesheet(WFDOWNLOADS_URL . '/module.css');
$xoTheme->addStylesheet(WFDOWNLOADS_URL . '/thickbox.css');
@@ -172,7 +172,7 @@
$sform->addElement(new XoopsFormText(_MD_WFD_MIRROR_HOMEURLTITLE, 'title', 50, 255), true);
$sform->addElement(new XoopsFormText(_MD_WFD_MIRROR_HOMEURL, 'homeurl', 50, 255), true);
$sform->addElement(new XoopsFormText(_MD_WFD_MIRROR_LOCATION, 'location', 50, 255), true);
- $continent_select = new XoopsFormSelect(_MD_WFD_MIRROR_CONTINENT, "continent", _MD_WFD_CONT4);
+ $continent_select = new XoopsFormSelect(_MD_WFD_MIRROR_CONTINENT, "continent");
$continent_select->addOptionArray(array(
_MD_WFD_CONT1 => _MD_WFD_CONT1,
_MD_WFD_CONT2 => _MD_WFD_CONT2,
@@ -183,8 +183,8 @@
_MD_WFD_CONT7 => _MD_WFD_CONT7));
$sform->addElement($continent_select);
$sform->addElement(new XoopsFormText(_MD_WFD_MIRROR_DOWNURL, 'downurl', 50, 255), true);
- $sform->addElement(new XoopsFormHidden("lid", intval($_GET['lid'])));
- $sform->addElement(new XoopsFormHidden("cid", intval($_GET['cid'])));
+ $sform->addElement(new XoopsFormHidden("lid", (int)($_GET['lid'])));
+ $sform->addElement(new XoopsFormHidden("cid", (int)($_GET['cid'])));
$sform->addElement(new XoopsFormHidden("uid", $uid));
$button_tray = new XoopsFormElementTray('', '');
$button_tray->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-07-17 18:23:08 UTC (rev 11838)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-07-17 18:24:25 UTC (rev 11839)
@@ -45,9 +45,9 @@
$modversion['onUpdate'] = "include/module.php";
$modversion['onUninstall'] = 'include/module.php';
-$modversion['date'] = '2013-07-15';
-$modversion['release_date'] = '2013/07/15';
-$modversion['releasedate'] = "2013-07-15";
+$modversion['date'] = '2013-07-17';
+$modversion['release_date'] = '2013/07/17';
+$modversion['releasedate'] = "2013-07-17";
$modversion['status'] = "BETA";
$modversion['teammembers'] = "Bender, David, FrankBlack, Xpider, M0nty, Mithrandir, Marcan, felix[fx2024], Sudhaker, Jegelstaff";
@@ -246,9 +246,6 @@
$modversion['templates'][$i]['file'] = $modversion['dirname'] . '_mirrors.html';
$modversion['templates'][$i]['description'] = '';
$i++;
-$modversion['templates'][$i]['file'] = $modversion['dirname'] . '_admin_menu.html';
-$modversion['templates'][$i]['description'] = '(Admin) Tabs bar for administration pages';
-$i++;
$modversion['templates'][$i]['file'] = $modversion['dirname'] . '_disclaimer.html';
$modversion['templates'][$i]['description'] = '';
@@ -310,15 +307,6 @@
'default' => 'dhtmltextarea');
$modversion['config'][] = array(
- 'name' => 'popular',
- 'title' => '_MI_WFD_POPULAR',
- 'description' => '_MI_WFD_POPULARDSC',
- 'formtype' => 'select',
- 'valuetype' => 'int',
- 'options' => array('5' => 5, '10' => 10, '50' => 50, '100' => 100, '200' => 200, '500' => 500, '1000' => 1000),
- 'default' => 100);
-
-$modversion['config'][] = array(
'name' => 'displayicons',
'title' => '_MI_WFD_ICONDISPLAY',
'description' => '_MI_WFD_DISPLAYICONDSC',
@@ -331,6 +319,31 @@
'default' => 1);
$modversion['config'][] = array(
+ 'name' => 'popular',
+ 'title' => '_MI_WFD_POPULAR',
+ 'description' => '_MI_WFD_POPULARDSC',
+ 'formtype' => 'select',
+ 'valuetype' => 'int',
+ 'options' => array('5' => 5, '10' => 10, '50' => 50, '100' => 100, '200' => 200, '500' => 500, '1000' => 1000),
+ 'default' => 100);
+
+$modversion['config'][] = array(
+ 'name' => 'daysnew',
+ 'title' => '_MI_WFD_DAYSNEW',
+ 'description' => '_MI_WFD_DAYSNEWDSC',
+ 'formtype' => 'textbox',
+ 'valuetype' => 'int',
+ 'default' => 10);
+
+$modversion['config'][] = array(
+ 'name' => 'daysupdated',
+ 'title' => '_MI_WFD_DAYSUPDATED',
+ 'description' => '_MI_WFD_DAYSUPDATEDDSC',
+ 'formtype' => 'textbox',
+ 'valuetype' => 'int',
+ 'default' => 10);
+
+$modversion['config'][] = array(
'name' => 'perpage',
'title' => '_MI_WFD_PERPAGE',
'description' => '_MI_WFD_PERPAGEDSC',
@@ -444,6 +457,14 @@
'default' => 1);
$modversion['config'][] = array(
+ 'name' => 'usethumbs',
+ 'title' => '_MI_WFD_USETHUMBS',
+ 'description' => '_MI_WFD_USETHUMBSDSC',
+ 'formtype' => 'yesno',
+ 'valuetype' => 'int',
+ 'default' => false);
+
+$modversion['config'][] = array(
'name' => 'shotwidth',
'title' => '_MI_WFD_SHOTWIDTH',
'description' => '_MI_WFD_SHOTWIDTHDSC',
@@ -460,14 +481,22 @@
'default' => 79);
$modversion['config'][] = array(
- 'name' => 'usethumbs',
- 'title' => '_MI_WFD_USETHUMBS',
- 'description' => '_MI_WFD_USETHUMBSDSC',
+ 'name' => 'keepaspect',
+ 'title' => '_MI_WFD_KEEPASPECT',
+ 'description' => '_MI_WFD_KEEPASPECTDSC',
'formtype' => 'yesno',
'valuetype' => 'int',
'default' => false);
$modversion['config'][] = array(
+ 'name' => 'imagequality',
+ 'title' => '_MI_WFD_QUALITY',
+ 'description' => '_MI_WFD_QUALITYDSC',
+ 'formtype' => 'textbox',
+ 'valuetype' => 'int',
+ 'default' => 100);
+
+$modversion['config'][] = array(
'name' => 'updatethumbs',
'title' => '_MI_WFD_IMGUPDATE',
'description' => '_MI_WFD_IMGUPDATEDSC',
@@ -476,14 +505,6 @@
'default' => false);
$modversion['config'][] = array(
- 'name' => 'imagequality',
- 'title' => '_MI_WFD_QUALITY',
- 'description' => '_MI_WFD_QUALITYDSC',
- 'formtype' => 'textbox',
- 'valuetype' => 'int',
- 'default' => 100);
-
-$modversion['config'][] = array(
'name' => 'filesuploads_configs',
'title' => '',
'description' => '',
@@ -524,14 +545,6 @@
'default' => 600);
$modversion['config'][] = array(
- 'name' => 'keepaspect',
- 'title' => '_MI_WFD_KEEPASPECT',
- 'description' => '_MI_WFD_KEEPASPECTDSC',
- 'formtype' => 'yesno',
- 'valuetype' => 'int',
- 'default' => false);
-
-$modversion['config'][] = array(
'name' => 'catimage',
'title' => '_MI_WFD_CATEGORYIMG',
'description' => '_MI_WFD_CATEGORYIMGDSC',
@@ -796,22 +809,6 @@
'valuetype' => 'int',
'default' => true);
-$modversion['config'][] = array(
- 'name' => 'daysnew',
- 'title' => '_MI_WFD_DAYSNEW',
- 'description' => '_MI_WFD_DAYSNEWDSC',
- 'formtype' => 'textbox',
- 'valuetype' => 'int',
- 'default' => 10);
-
-$modversion['config'][] = array(
- 'name' => 'daysupdated',
- 'title' => '_MI_WFD_DAYSUPDATED',
- 'description' => '_MI_WFD_DAYSUPDATEDDSC',
- 'formtype' => 'textbox',
- 'valuetype' => 'int',
- 'default' => 10);
-
/* // Not completed yet
$modversion['config'][] = array(
'name' => 'mirrorimage',
|
|
From: <luc...@us...> - 2013-07-19 20:28:05
|
Revision: 11846
http://sourceforge.net/p/xoops/svn/11846
Author: luciorota
Date: 2013-07-19 20:28:00 +0000 (Fri, 19 Jul 2013)
Log Message:
-----------
fixed errors
added/changed some language definitions for better understanding
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php
XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/mimetype.php
XoopsModules/wfdownloads/trunk/wfdownloads/header.php
XoopsModules/wfdownloads/trunk/wfdownloads/index.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php
XoopsModules/wfdownloads/trunk/wfdownloads/newlist.php
XoopsModules/wfdownloads/trunk/wfdownloads/ratefile.php
XoopsModules/wfdownloads/trunk/wfdownloads/review.php
XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php
XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_mirrorslist.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/topten.php
XoopsModules/wfdownloads/trunk/wfdownloads/viewcat.php
XoopsModules/wfdownloads/trunk/wfdownloads/visit.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-07-18 17:43:06 UTC (rev 11845)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-07-19 20:28:00 UTC (rev 11846)
@@ -76,10 +76,12 @@
$report_handler = xoops_getmodulehandler('report', $xoopsModule->dirname());
$modification_handler = xoops_getmodulehandler('modification', $xoopsModule->dirname());
$ip_log_handler = xoops_getmodulehandler('ip_log', $xoopsModule->dirname());
+$rating_handler = xoops_getmodulehandler('rating', $xoopsModule->dirname());
// Load Xoops handlers
-$member_handler = xoops_gethandler("member");
+$member_handler = xoops_gethandler('member');
$notification_handler = &xoops_gethandler('notification');
+$gperm_handler = xoops_gethandler('groupperm');
if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
include_once(XOOPS_ROOT_PATH . "/class/template.php");
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php 2013-07-18 17:43:06 UTC (rev 11845)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php 2013-07-19 20:28:00 UTC (rev 11846)
@@ -41,7 +41,7 @@
$totaldownloads = $download_handler->getCount(new Criteria("published", 0, ">"));
$indexAdmin->addInfoBox(_AM_WFD_MINDEX_DOWNSUMMARY);
-
+// Categories
if ($totalcats > 0) {
$indexAdmin->addInfoBoxLine(
_AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . '<a href="categories.php">' . _AM_WFD_SCATEGORY . '</a><b>'
@@ -52,7 +52,7 @@
_AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . _AM_WFD_SCATEGORY . "</infolabel>", $totalcats, 'Green'
);
}
-
+// Downloads
if ($totaldownloads > 0) {
$indexAdmin->addInfoBoxLine(
_AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . '<a href="downloads.php">' . _AM_WFD_SFILES . '</a><b>'
@@ -63,10 +63,10 @@
_AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . _AM_WFD_SFILES . "</infolabel>", $totaldownloads, 'Green'
);
}
-
+// New/waiting downloads
if ($totalnewdownloads > 0) {
$indexAdmin->addInfoBoxLine(
- _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . '<a href="newdownloads.php">' . _AM_WFD_SNEWFILESVAL . '</a><b>'
+ _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . '<a href="downloads.php">' . _AM_WFD_SNEWFILESVAL . '</a><b>'
. "</infolabel>", $totalnewdownloads, 'Green'
);
} else {
@@ -74,7 +74,18 @@
_AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . _AM_WFD_SNEWFILESVAL . "</infolabel>", $totalnewdownloads, 'Green'
);
}
-
+// Reviews
+if ($newreviews > 0) {
+ $indexAdmin->addInfoBoxLine(
+ _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . '<a href="reviews.php">' . _AM_WFD_SREVIEWS . '</a><b>'
+ . "</infolabel>", $newreviews, 'Green'
+ );
+} else {
+ $indexAdmin->addInfoBoxLine(
+ _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . _AM_WFD_SREVIEWS . "</infolabel>", $newreviews, 'Green'
+ );
+}
+// Modifications
if ($totalmodrequests > 0) {
$indexAdmin->addInfoBoxLine(
_AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . '<a href="reportsmodifications.php">' . _AM_WFD_SMODREQUEST . '</a><b>'
@@ -85,7 +96,7 @@
_AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . _AM_WFD_SMODREQUEST . "</infolabel>", $totalmodrequests, 'Green'
);
}
-
+// Brokens reports
if ($totalbrokendownloads > 0) {
$indexAdmin->addInfoBoxLine(
_AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . '<a href="reportsmodifications.php">' . _AM_WFD_SBROKENSUBMIT . '</a><b>'
@@ -96,18 +107,7 @@
_AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . _AM_WFD_SBROKENSUBMIT . "</infolabel>", $totalbrokendownloads, 'Green'
);
}
-
-if ($newreviews > 0) {
- $indexAdmin->addInfoBoxLine(
- _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . '<a href="reviews.php">' . _AM_WFD_SREVIEWS . '</a><b>'
- . "</infolabel>", $newreviews, 'Green'
- );
-} else {
- $indexAdmin->addInfoBoxLine(
- _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . _AM_WFD_SREVIEWS . "</infolabel>", $newreviews, 'Green'
- );
-}
-
+// Mirrors
if ($newmirrors > 0) {
$indexAdmin->addInfoBoxLine(
_AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . '<a href="mirrors.php">' . _AM_WFD_SMIRRORS . '</a><b>'
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php 2013-07-18 17:43:06 UTC (rev 11845)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php 2013-07-19 20:28:00 UTC (rev 11846)
@@ -61,7 +61,10 @@
$form->display();
$extform = new XoopsThemeForm(_AM_WFD_MIME_FINDMIMETYPE, "op", $_SERVER['REQUEST_URI']);
- $extform -> addElement(new XoopsFormText(_AM_WFD_MIME_EXTFIND, 'fileext', 5, 60, $mimetype->getVar('mime_ext')));
+
+ $fileext_text = new XoopsFormText(_AM_WFD_MIME_EXTFIND, 'fileext', 5, 60, $mimetype->getVar('mime_ext'));
+ $fileext_text->setDescription(_AM_WFD_MIME_EXTFIND_DESC);
+ $extform -> addElement($fileext_text);
$button_open = new XoopsFormButton('', '', _AM_WFD_MIME_FINDIT, 'button');
$button_open -> setExtra('onclick="document.getElementById(\'filext_iframe\').src = \'http://filext.com/detaillist.php?extdetail=\' + this.form.elements.fileext.value"');
$extform -> addElement($button_open);
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php 2013-07-18 17:43:06 UTC (rev 11845)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php 2013-07-19 20:28:00 UTC (rev 11846)
@@ -308,9 +308,9 @@
// Does the download exists ?
if (isset($downloads[$report->getVar('lid')])) {
$download = $downloads[$report->getVar('lid')];
- $report_array['download_lid'] = $download->getVar('title');
+ $report_array['download_lid'] = $download->getVar('lid');
$report_array['download_cid'] = $download->getVar('cid');
- $report_array['download_title'] = $download->getVar('lid');
+ $report_array['download_title'] = $download->getVar('title');
$submitter = isset($users[$downloads[$report->getVar('lid')]->getVar('submitter')]) ? $users[$downloads[$report->getVar('lid')]->getVar('submitter')] : false;
$report_array['submitter_email'] = is_object($submitter) ? $submitter->getVar('email') : '';
$report_array['submitter_uname'] = is_object($submitter) ? $submitter->getVar('uname') : $xoopsConfig['anonymous'];
@@ -356,17 +356,8 @@
$GLOBALS['xoopsTpl']->assign('modifications_pagenav', $pagenav_modification -> renderNav());
}
-
-
-
-
-
-
-
-
-
$GLOBALS['xoopsTpl']->display("db:" . $xoopsModule->dirname() . "_admin_reportsmodificationslist.html");
include_once "admin_footer.php";
break;
-}
\ No newline at end of file
+}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php 2013-07-18 17:43:06 UTC (rev 11845)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php 2013-07-19 20:28:00 UTC (rev 11846)
@@ -18,8 +18,8 @@
* @author Xoops Development Team
* @version svn:$id$
*/
+$currentFile = basename(__FILE__);
include 'header.php';
-$download_handler = xoops_getmodulehandler('download');
if (!empty($_POST['submit'])) {
$lid = wfdownloads_CleanVars($_POST, 'lid', 0, 'int');
@@ -37,7 +37,6 @@
* Check if REG user is trying to report twice.
*/
$criteria = new Criteria("lid", $lid);
- $report_handler = xoops_getmodulehandler('report');
$count = $report_handler->getCount($criteria);
if ($count > 0) {
redirect_header('index.php', 2, _MD_WFD_ALREADYREPORTED);
@@ -59,10 +58,9 @@
/**
* Send email to the owner of the download stating that it is broken
*/
- $member_handler = xoops_gethandler('member');
$user = $member_handler->getUser($download->getVar('submitter'));
$subdate = formatTimestamp($download->getVar('published'), $xoopsModuleConfig['dateformat']);
- $cid = intval($download->getVar('cid'));
+ $cid = (int)($download->getVar('cid'));
$title = $download->getVar('title');
$subject = _MD_WFD_BROKENREPORTED;
@@ -106,11 +104,9 @@
$xoopsTpl->assign('catarray', $catarray);
xoops_load('XoopsUserUtility');
- $report_handler = xoops_getmodulehandler('report');
$report = $report_handler->getObjects(new Criteria('lid', $lid));
if (isset($report[0])) {
$report_obj = $report[0];
- global $xoopsModuleConfig;
$broken['title'] = trim($download->getVar('title'));
$broken['id'] = $report_obj->getVar('reportid');
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-07-18 17:43:06 UTC (rev 11845)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-07-19 20:28:00 UTC (rev 11846)
@@ -620,7 +620,7 @@
$ispublished = ($this->getVar('published') > time()) ? 1 : 0 ;
$publishdates = ($this->getVar('published') > time()) ? _AM_WFD_FILE_PUBLISHDATESET . formatTimestamp($this->getVar('published', 'e'), "Y-m-d H:s") : _AM_WFD_FILE_SETDATETIMEPUBLISH;
$publishdate_checkbox = new XoopsFormCheckBox('', 'publishdateactivate', $ispublished);
- $publishdate_checkbox -> addOption(1, $publishdates . "<br /><br />");
+ $publishdate_checkbox -> addOption(1, $publishdates . "<br />");
if (!$this->isNew()) {
$sform -> addElement(new XoopsFormHidden('was_published', $this->getVar('published', 'e')));
@@ -630,26 +630,26 @@
$publishdate_tray = new XoopsFormElementTray(_AM_WFD_FILE_PUBLISHDATE, '');
$publishdate_tray -> addElement($publishdate_checkbox);
$publishdate_tray -> addElement(new XoopsFormDateTime($publishtext, 'published', 15, $this->getVar('published', 'e')));
- $publishdate_tray -> addElement(new XoopsFormRadioYN(_AM_WFD_FILE_CLEARPUBLISHDATE, 'clearpublish', 0, ' ' . _YES . '', ' ' . _NO . ''));
+ $publishdate_tray -> addElement(new XoopsFormRadioYN(_AM_WFD_FILE_CLEARPUBLISHDATE, 'clearpublish', 0));
$sform -> addElement($publishdate_tray);
$isexpired = ($this->getVar('expired', 'e') > time()) ? 1: 0 ;
$expiredates = ($this->getVar('expired', 'e') > time()) ? _AM_WFD_FILE_EXPIREDATESET . formatTimestamp($this->getVar('expired'), 'Y-m-d H:s') : _AM_WFD_FILE_SETDATETIMEEXPIRE;
$warning = ($this->getVar('published') > $this->getVar('expired') && $this->getVar('expired') > time()) ? _AM_WFD_FILE_EXPIREWARNING : '';
$expiredate_checkbox = new XoopsFormCheckBox('', 'expiredateactivate', $isexpired);
- $expiredate_checkbox -> addOption(1, $expiredates . "<br /><br />");
+ $expiredate_checkbox -> addOption(1, $expiredates . "<br />");
$expiredate_tray = new XoopsFormElementTray(_AM_WFD_FILE_EXPIREDATE . $warning, '');
$expiredate_tray -> addElement($expiredate_checkbox);
- $expiredate_tray -> addElement(new XoopsFormDateTime(_AM_WFD_FILE_SETEXPIREDATE . "<br />", 'expired', 15, $this->getVar('expired')));
- $expiredate_tray -> addElement(new XoopsFormRadioYN(_AM_WFD_FILE_CLEAREXPIREDATE, 'clearexpire', 0, ' ' . _YES . '', ' ' . _NO . ''));
+ $expiredate_tray -> addElement(new XoopsFormDateTime(_AM_WFD_FILE_SETEXPIREDATE, 'expired', 15, $this->getVar('expired')));
+ $expiredate_tray -> addElement(new XoopsFormRadioYN(_AM_WFD_FILE_CLEAREXPIREDATE, 'clearexpire', 0));
$sform -> addElement($expiredate_tray);
- $filestatus_radio = new XoopsFormRadioYN(_AM_WFD_FILE_FILESSTATUS, 'offline', $this->getVar('offline', 'e'), ' ' . _YES . '', ' ' . _NO . '');
+ $filestatus_radio = new XoopsFormRadioYN(_AM_WFD_FILE_FILESSTATUS, 'offline', $this->getVar('offline', 'e'));
$sform -> addElement($filestatus_radio);
$up_dated = ($this->getVar('updated', 'e') == 0) ? 0 : 1;
- $file_updated_radio = new XoopsFormRadioYN(_AM_WFD_FILE_SETASUPDATED, 'up_dated', $up_dated, ' ' . _YES . '', ' ' . _NO . '');
+ $file_updated_radio = new XoopsFormRadioYN(_AM_WFD_FILE_SETASUPDATED, 'up_dated', $up_dated);
$sform -> addElement($file_updated_radio);
if (!$this->isNew() && $this->getVar('published') == 0) {
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/mimetype.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/mimetype.php 2013-07-18 17:43:06 UTC (rev 11845)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/mimetype.php 2013-07-19 20:28:00 UTC (rev 11846)
@@ -53,12 +53,22 @@
$form = new XoopsThemeForm($title, 'form_error', $action, 'post', true);
$form->setExtra('enctype="multipart/form-data"');
- $form -> addElement(new XoopsFormText(_AM_WFD_MIME_EXTF, 'mime_ext', 5, 60, $this->getVar('mime_ext', 'e')), true);
- $form -> addElement(new XoopsFormText(_AM_WFD_MIME_NAMEF, 'mime_name', 50, 255, $this->getVar('mime_name', 'e')), true);
- $form -> addElement(new XoopsFormTextArea(_AM_WFD_MIME_TYPEF, 'mime_type', $this->getVar('mime_types', 'e'), 7, 60));
- $madmin_radio = new XoopsFormRadioYN(_AM_WFD_MIME_ADMINF, 'mime_admin', $this->getVar('mime_admin', 'e'), _YES, _NO);
- $form -> addElement($madmin_radio);
- $muser_radio = new XoopsFormRadioYN(_AM_WFD_MIME_USERF, 'mime_user', $this->getVar('mime_user', 'e'), _YES, _NO);
+ $mime_ext_text = new XoopsFormText(_AM_WFD_MIME_EXTF, 'mime_ext', 5, 60, $this->getVar('mime_ext', 'e'));
+ $mime_ext_text->setDescription(_AM_WFD_MIME_EXTF_DESC);
+ $form->addElement($mime_ext_text, true);
+
+ $mime_name_text = new XoopsFormText(_AM_WFD_MIME_NAMEF, 'mime_name', 50, 255, $this->getVar('mime_name', 'e'));
+ $mime_name_text->setDescription(_AM_WFD_MIME_NAMEF_DESC);
+ $form->addElement($mime_name_text, true);
+
+ $mime_type_textarea = new XoopsFormTextArea(_AM_WFD_MIME_TYPEF, 'mime_type', $this->getVar('mime_types', 'e'));
+ $mime_type_textarea->setDescription(_AM_WFD_MIME_TYPEF_DESC);
+ $form->addElement($mime_type_textarea, 7, 60);
+
+ $madmin_radio = new XoopsFormRadioYN(_AM_WFD_MIME_ADMINF, 'mime_admin', $this->getVar('mime_admin', 'e'));
+ $form->addElement($madmin_radio);
+
+ $muser_radio = new XoopsFormRadioYN(_AM_WFD_MIME_USERF, 'mime_user', $this->getVar('mime_user', 'e'));
$form -> addElement($muser_radio);
$form -> addElement(new XoopsFormHidden('op', 'save'));
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/header.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/header.php 2013-07-18 17:43:06 UTC (rev 11845)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/header.php 2013-07-19 20:28:00 UTC (rev 11846)
@@ -20,6 +20,9 @@
*/
include_once dirname(dirname(dirname(__FILE__))) . '/mainfile.php';
+include_once XOOPS_ROOT_PATH . '/class/tree.php';
+include_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
+xoops_load('XoopsUserUtility'); // MyTextSanitizer object
$myts = MyTextSanitizer::getInstance();
$module_handler =& xoops_gethandler('module');
@@ -31,8 +34,18 @@
// and you trust your users when uploading files, it is recommended to not allow anonymous uploads if you do so!!
//define('PROTECTOR_SKIP_FILESCHECKER', true);
-// Load handlers
+// Load module handlers
$category_handler = xoops_getmodulehandler('category', $xoopsModule->dirname());
$download_handler = xoops_getmodulehandler('download', $xoopsModule->dirname());
+$review_handler = xoops_getmodulehandler('review', $xoopsModule->dirname());
+$mirror_handler = xoops_getmodulehandler('mirror', $xoopsModule->dirname());
+$mime_handler = xoops_getmodulehandler('mimetype', $xoopsModule->dirname());
+$report_handler = xoops_getmodulehandler('report', $xoopsModule->dirname());
+$modification_handler = xoops_getmodulehandler('modification', $xoopsModule->dirname());
+$ip_log_handler = xoops_getmodulehandler('ip_log', $xoopsModule->dirname());
+$rating_handler = xoops_getmodulehandler('rating', $xoopsModule->dirname());
-$notification_handler = & xoops_gethandler('notification');
+// Load Xoops handlers
+$member_handler = xoops_gethandler('member');
+$notification_handler = &xoops_gethandler('notification');
+$gperm_handler = xoops_gethandler('groupperm');
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/index.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/index.php 2013-07-18 17:43:06 UTC (rev 11845)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/index.php 2013-07-19 20:28:00 UTC (rev 11846)
@@ -18,8 +18,8 @@
* @author Xoops Development Team
* @version svn:$id$
*/
+$currentFile = basename(__FILE__);
include 'header.php';
-include_once XOOPS_ROOT_PATH . '/class/tree.php';
$xoopsOption['template_main'] = 'wfdownloads_index.html';
include XOOPS_ROOT_PATH . '/header.php';
@@ -28,7 +28,6 @@
$xoTheme->addStylesheet(WFDOWNLOADS_URL . '/thickbox.css');
$xoopsTpl->assign('wfdownloads_url', WFDOWNLOADS_URL . '/');
-$category_handler = xoops_getmodulehandler('category');
$cat_criteria = new CriteriaCompo();
$cat_criteria->setSort('weight ASC, title');
$categories = $category_handler->getObjects($cat_criteria);
@@ -65,8 +64,7 @@
$countin = 0;
$groups = (is_object($xoopsUser)) ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
-$module_id = intval($xoopsModule->getVar('mid'));
-$gperm_handler = &xoops_gethandler('groupperm');
+$module_id = (int)($xoopsModule->getVar('mid'));
/**
* Begin Main page download info
@@ -160,21 +158,21 @@
unset($subcategories);
$xoopsTpl->append('categories', array(
'image' => $imgurl,
- 'id' => intval($cats[$i]->getVar('cid')),
+ 'id' => (int)($cats[$i]->getVar('cid')),
'title' => $cats[$i]->getVar('title'),
'summary' => $cats[$i]->getVar('summary'),
- 'totaldownloads' => intval($download_count),
- 'count' => intval($count),
+ 'totaldownloads' => (int)($download_count),
+ 'count' => (int)($count),
'alttext' => $indicator['alttext']));
} else {
$xoopsTpl->append('categories', array(
'image' => $imgurl,
- 'id' => intval($cats[$i]->getVar('cid')),
+ 'id' => (int)($cats[$i]->getVar('cid')),
'title' => $cats[$i]->getVar('title'),
'summary' => $cats[$i]->getVar('summary'),
'subcategories' => $subcategories,
- 'totaldownloads' => intval($download_count),
- 'count' => intval($count),
+ 'totaldownloads' => (int)($download_count),
+ 'count' => (int)($count),
'alttext' => $indicator['alttext']));
}
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-07-18 17:43:06 UTC (rev 11845)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-07-19 20:28:00 UTC (rev 11846)
@@ -18,192 +18,192 @@
define("_AM_WFD_BCANCEL","Cancel");
define("_AM_WFD_BSAVE","Save");
define("_AM_WFD_BRESET","Reset");
-define("_AM_WFD_BMOVE","Move Files");
+define("_AM_WFD_BMOVE","Move files");
define("_AM_WFD_BUPLOAD","Upload");
-define("_AM_WFD_BDELETEIMAGE","Delete Selected Image");
+define("_AM_WFD_BDELETEIMAGE","Delete selected image");
define("_AM_WFD_BRETURN","Return to where you where!");
-define("_AM_WFD_DBERROR","Database Access Error: Please report this error to the XOOPS Website");
+define("_AM_WFD_DBERROR","Database access error: please report this error to the XOOPS Website");
//Banned Users
define("_AM_WFD_NONBANNED","Not Banned");
define("_AM_WFD_BANNED","Banned");
define("_AM_WFD_EDITBANNED","Edit Banned Users");
// Other Options
-define("_AM_WFD_TEXTOPTIONS","Text Options:");
-define("_AM_WFD_ALLOWHTML"," Allow HTML Tags");
-define("_AM_WFD_ALLOWSMILEY"," Allow Smiley Icons");
-define("_AM_WFD_ALLOWXCODE"," Allow XOOPS Codes");
-define("_AM_WFD_ALLOWIMAGES"," Allow Images");
-define("_AM_WFD_ALLOWBREAK"," Use XOOPS linebreak conversion?");
-define("_AM_WFD_UPLOADFILE","File Uploaded Successfully");
+define("_AM_WFD_TEXTOPTIONS","Text options");
+define("_AM_WFD_ALLOWHTML"," Allow HTML tags");
+define("_AM_WFD_ALLOWSMILEY"," Allow smiley icons");
+define("_AM_WFD_ALLOWXCODE"," Allow XOOPS codes");
+define("_AM_WFD_ALLOWIMAGES"," Allow images");
+define("_AM_WFD_ALLOWBREAK"," Use XOOPS linebreak conversion");
+define("_AM_WFD_UPLOADFILE","File uploaded successfully");
define("_AM_WFD_NOMENUITEMS","No menu items within the menu");
// Admin Bread crumb
define("_AM_WFD_PREFS","Preferences");
define("_AM_WFD_PERMISSIONS","Permissions");
-define("_AM_WFD_BINDEX","Main Index");
+define("_AM_WFD_BINDEX","Main index");
define("_AM_WFD_BLOCKADMIN","Blocks");
define("_AM_WFD_GOMODULE","Go to module");
define("_AM_WFD_BHELP","Help");
define("_AM_WFD_ABOUT","About");
// Admin Summary
-define("_AM_WFD_SCATEGORY","Category: %s");
-define("_AM_WFD_SFILES","Files: %s");
-define("_AM_WFD_SNEWFILESVAL","Submitted: %s");
-define("_AM_WFD_SMODREQUEST","Modified: %s");
+define("_AM_WFD_SCATEGORY","Categories: %s");
+define("_AM_WFD_SFILES","Downloads: %s");
+define("_AM_WFD_SNEWFILESVAL","New/waiting downloads: %s");
+define("_AM_WFD_SMODREQUEST","Modifications: %s");
define("_AM_WFD_SREVIEWS","Reviews: %s");
define("_AM_WFD_SMIRRORS","Mirrors: %s");
// Admin Main Menu
-define("_AM_WFD_MCATEGORY","Category Management");
-define("_AM_WFD_INDEXPAGE","Index Page Management");
-define("_AM_WFD_MUPLOADS","Image Upload");
-define("_AM_WFD_MMIMETYPES","Mimetypes Management");
+define("_AM_WFD_MCATEGORY","Categories management");
+define("_AM_WFD_INDEXPAGE","Index page management");
+define("_AM_WFD_MUPLOADS","Images upload");
+define("_AM_WFD_MMIMETYPES","Mimetypes management");
define("_AM_WFD_MCOMMENTS","Comments");
-define("_AM_WFS_MVOTEDATA","Vote Data");
+define("_AM_WFS_MVOTEDATA","Vote data");
// waiting reviews
-define("_AM_WFD_AREVIEWS","Reviews Management");
-define("_AM_WFD_AREVIEWS_WAITING","Reviews Waiting Validation");
-define("_AM_WFD_AREVIEWS_INFO","Reviews Management Information");
+define("_AM_WFD_AREVIEWS","Reviews management");
+define("_AM_WFD_AREVIEWS_WAITING","Reviews waiting validation");
+define("_AM_WFD_AREVIEWS_INFO","Reviews informations");
define("_AM_WFD_AREVIEWS_APPROVE","Approve new review without validation");
define("_AM_WFD_AREVIEWS_APPROVED","Review has been approved.");
define("_AM_WFD_AREVIEWS_EDIT","Edit new review and then approve");
define("_AM_WFD_AREVIEWS_DELETE","Delete the new review information");
// Catgeory defines
-define("_AM_WFD_CCATEGORY_CREATENEW","Create New Category");
-define("_AM_WFD_CCATEGORY_MODIFY","Modify Category");
-define("_AM_WFD_CCATEGORY_MOVE","Move Category Files");
-define("_AM_WFD_CCATEGORY_MODIFY_TITLE","Category Title");
-define("_AM_WFD_CCATEGORY_MODIFY_FAILED","Failed Moving Files: Cannot move to this Category");
-define("_AM_WFD_CCATEGORY_MODIFY_FAILEDT","Failed Moving Files: Cannot find this Category");
-define("_AM_WFD_CCATEGORY_MODIFY_MOVED","Files Moved");
-define("_AM_WFD_CCATEGORY_CREATED","New Category Created and Database Updated Successfully");
-define("_AM_WFD_CCATEGORY_MODIFIED","Selected Category Modified and Database Updated Successfully");
-define("_AM_WFD_CCATEGORY_DELETED","Selected Category Deleted and Database Updated Successfully");
-define("_AM_WFD_CCATEGORY_AREUSURE","WARNING: Are you sure you want to delete this Category and ALL its Files and Comments?");
-define("_AM_WFD_CCATEGORY_NOEXISTS","You must create a Category before you can add a new file");
-define("_AM_WFD_FCATEGORY_GROUPPROMPT","Category Access Permissions");
-define("_AM_WFD_FCATEGORY_TITLE","Category Title");
-define("_AM_WFD_FCATEGORY_WEIGHT","Category Weight");
-define("_AM_WFD_FCATEGORY_SUBCATEGORY","As Sub-Category of");
-define("_AM_WFD_FCATEGORY_CIMAGE","Category Image");
-define("_AM_WFD_FCATEGORY_DESCRIPTION","Category Description");
-define("_AM_WFD_FCATEGORY_SUMMARY","Category Summary");
+define("_AM_WFD_CCATEGORY_CREATENEW","Create new category");
+define("_AM_WFD_CCATEGORY_MODIFY","Modify category");
+define("_AM_WFD_CCATEGORY_MOVE","Move category files");
+define("_AM_WFD_CCATEGORY_MODIFY_TITLE","Category title");
+define("_AM_WFD_CCATEGORY_MODIFY_FAILED","Failed moving files: cannot move to this category");
+define("_AM_WFD_CCATEGORY_MODIFY_FAILEDT","Failed moving files: cannot find this category");
+define("_AM_WFD_CCATEGORY_MODIFY_MOVED","Files moved");
+define("_AM_WFD_CCATEGORY_CREATED","New Category created and database updated successfully");
+define("_AM_WFD_CCATEGORY_MODIFIED","Selected category modified and database updated successfully");
+define("_AM_WFD_CCATEGORY_DELETED","Selected category deleted and database updated successfully");
+define("_AM_WFD_CCATEGORY_AREUSURE","WARNING: Are you sure you want to delete this category and ALL its files and comments?");
+define("_AM_WFD_CCATEGORY_NOEXISTS","You must create a category before you can add a new file");
+define("_AM_WFD_FCATEGORY_GROUPPROMPT","Category access permissions");
+define("_AM_WFD_FCATEGORY_TITLE","Category title");
+define("_AM_WFD_FCATEGORY_WEIGHT","Category weight");
+define("_AM_WFD_FCATEGORY_SUBCATEGORY","As sub-category of");
+define("_AM_WFD_FCATEGORY_CIMAGE","Category image");
+define("_AM_WFD_FCATEGORY_DESCRIPTION","Category description");
+define("_AM_WFD_FCATEGORY_SUMMARY","Category summary");
define("_AM_WFD_CCATEGORY_CHILDASPARENT","You cannot set a child category as the category's parent");
/*
* Index page Defines
*/
-define("_AM_WFD_IPAGE_UPDATED","Index Page Modified and Database Updated Successfully!");
-define("_AM_WFD_IPAGE_INFORMATION","Index Page Information");
-define("_AM_WFD_IPAGE_MODIFY","Modify Index Page");
-define("_AM_WFD_IPAGE_CIMAGE","Select Index Image:");
-define("_AM_WFD_IPAGE_CTITLE","Index Title:");
-define("_AM_WFD_IPAGE_CHEADING","Index Heading:");
-define("_AM_WFD_IPAGE_CHEADINGA","Index Heading Alignment:");
-define("_AM_WFD_IPAGE_CFOOTER","Index Footer:");
-define("_AM_WFD_IPAGE_CFOOTERA","Index Footer Alignment:");
-define("_AM_WFD_IPAGE_CLEFT","Align Left");
-define("_AM_WFD_IPAGE_CCENTER","Align Center");
-define("_AM_WFD_IPAGE_CRIGHT","Align Right");
+define("_AM_WFD_IPAGE_UPDATED","Index page modified and database updated successfully!");
+define("_AM_WFD_IPAGE_INFORMATION","Index page informations");
+define("_AM_WFD_IPAGE_MODIFY","Modify index page");
+define("_AM_WFD_IPAGE_CIMAGE","Select index image");
+define("_AM_WFD_IPAGE_CTITLE","Index title");
+define("_AM_WFD_IPAGE_CHEADING","Index heading");
+define("_AM_WFD_IPAGE_CHEADINGA","Index heading alignment");
+define("_AM_WFD_IPAGE_CFOOTER","Index footer");
+define("_AM_WFD_IPAGE_CFOOTERA","Index footer alignment");
+define("_AM_WFD_IPAGE_CLEFT","Align left");
+define("_A...
[truncated message content] |
|
From: <be...@us...> - 2013-07-23 14:04:53
|
Revision: 11850
http://sourceforge.net/p/xoops/svn/11850
Author: beckmi
Date: 2013-07-23 14:04:50 +0000 (Tue, 23 Jul 2013)
Log Message:
-----------
Adding generic folder checker
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
Added Paths:
-----------
XoopsModules/wfdownloads/trunk/wfdownloads/include/folderchecker.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php 2013-07-22 18:53:14 UTC (rev 11849)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php 2013-07-23 14:04:50 UTC (rev 11850)
@@ -21,6 +21,8 @@
require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
include_once dirname(__FILE__) . '/admin_header.php';
+include_once dirname(dirname(__FILE__)) . '/include/folderchecker.php';
+
xoops_cp_header();
$indexAdmin = new ModuleAdmin();
@@ -119,11 +121,30 @@
);
}
-//---------------------
+//------ check directories ---------------
+$indexAdmin->addConfigBoxLine('');
+$redirectFile = $_SERVER['PHP_SELF'];
+
+$languageConstants = array(_AM_WFD_AVAILABLE,_AM_WFD_NOTAVAILABLE, _AM_WFD_CREATETHEDIR, _AM_WFD_NOTWRITABLE, _AM_WFD_SETMPERM, _AM_WFD_DIRCREATED,_AM_WFD_DIRNOTCREATED,_AM_WFD_PERMSET,_AM_WFD_PERMNOTSET);
+
+$path = $xoopsModuleConfig['uploaddir'] . '/';
+$indexAdmin->addConfigBoxLine(FoldersChecker::getDirectoryStatus($path,0777,$languageConstants,$redirectFile));
+
+$path = XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['screenshots'] . '/';
+$indexAdmin->addConfigBoxLine(FoldersChecker::getDirectoryStatus($path,0777,$languageConstants,$redirectFile));
+
+$path = XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['catimage'] . '/';
+$indexAdmin->addConfigBoxLine(FoldersChecker::getDirectoryStatus($path,0777,$languageConstants,$redirectFile));
+
+
+$path = XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['mainimagedir'] . '/';
+$indexAdmin->addConfigBoxLine(FoldersChecker::getDirectoryStatus($path,0777,$languageConstants,$redirectFile));
+
+//---------------------------
+
echo $indexAdmin->addNavigation('index.php');
echo $indexAdmin->renderIndex();
echo wfd_serverstats();
-//xoops_cp_footer();
include_once "admin_footer.php";
Added: XoopsModules/wfdownloads/trunk/wfdownloads/include/folderchecker.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/folderchecker.php (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/folderchecker.php 2013-07-23 14:04:50 UTC (rev 11850)
@@ -0,0 +1,120 @@
+
+<?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.
+ */
+/**
+ * WF-Downloads 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$
+ */
+
+//defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
+
+/**
+ * Class FoldersChecker
+ * check status of a folder
+ */
+class FoldersChecker
+{
+ /**
+ * @param $path
+ * @param int $mode
+ * @param array $languageConstants
+ * @param $redirectFile
+ *
+ * @return bool|string
+ */
+ public static function getDirectoryStatus($path, $mode = 0777,$languageConstants=array(), $redirectFile)
+ {
+ global $pathIcon16;
+
+ $languageConstants1 = array($languageConstants[5],$languageConstants[6]);
+ $languageConstants2 = array($languageConstants[7],$languageConstants[8]);
+
+ $myWords1 = urlencode(json_encode($languageConstants1));
+ $myWords2 = urlencode(json_encode($languageConstants2));
+
+ if (empty($path)) {
+ return false;
+ }
+ if (!@is_dir($path)) {
+ $path_status = "<img src='" . $pathIcon16 . "/0.png' >" . $path . ' ( ' . $languageConstants[1] . ' ) ' . "<a href=".$_SERVER['PHP_SELF']."?op=createdir&path=$path&redirect=$redirectFile&languageConstants=$myWords1>" . $languageConstants[2] . '</a>';
+ } elseif (@is_writable($path)) {
+ $path_status = "<img src='" . $pathIcon16 . "/1.png' >" . $path . ' ( ' . $languageConstants[0] . ' ) ';
+ $currentMode = (substr(decoct(fileperms($path)), 2));
+ if ($currentMode != decoct($mode)) {$path_status = "<img src='" . $pathIcon16 . "/0.png' >" . $path . sprintf($languageConstants[3],decoct($mode),$currentMode) . "<a href=".$_SERVER['PHP_SELF']."?op=setperm&mode=$mode&path=$path&redirect=$redirectFile&languageConstants=$myWords2> " . $languageConstants[4] . '</a>';
+ }
+ } else {
+ $currentMode = (substr(decoct(fileperms($path)), 2));
+ $path_status = "<img src='" . $pathIcon16 . "/0.png' >" . $path . sprintf($languageConstants[3],decoct($mode),$currentMode) . "<a href=".$_SERVER['PHP_SELF']."?op=setperm&mode=$mode&path=$path&redirect=$redirectFile&languageConstants=$myWords2> " . $languageConstants[4] . '</a>';
+ }
+ return $path_status;
+ }
+
+ /**
+ * @param $target
+ * @param int $mode
+ *
+ * @return bool
+ */
+ public static function createDirectory($target, $mode=0777)
+ {
+ $target = str_replace("..", "", $target);
+ // http://www.php.net/manual/en/function.mkdir.php
+ return is_dir($target) or ( self::createDirectory(dirname($target), $mode) and mkdir($target, $mode) );
+ }
+
+ /**
+ * @param $target
+ * @param int $mode
+ *
+ * @return bool
+ */
+ public static function setDirectoryPermissions($target, $mode = 0777)
+ {
+ $target = str_replace("..", "", $target);
+ return @chmod($target, (int) $mode);
+ }
+}
+
+$op = (isset($_GET['op']))? $_GET['op'] : "";
+
+switch ($op) {
+case "createdir":
+ $languageConstants=array();
+ if (isset($_GET['path'])) $path = $_GET['path'];
+ if (isset($_GET['redirect'])) $redirect = $_GET['redirect'];
+ if (isset($_GET['languageConstants'])) $languageConstants = json_decode($_GET['languageConstants']);
+ $result = FoldersChecker::createDirectory($path);
+ $msg = ($result)?$languageConstants[0]:$languageConstants[1];
+ redirect_header($redirect, 2, $msg . ': ' . $path);
+ exit();
+ break;
+
+case "setperm":
+ $languageConstants=array();
+ if (isset($_GET['path'])) $path = $_GET['path'];
+ if (isset($_GET['mode'])) $mode = $_GET['mode'];
+ if (isset($_GET['redirect'])) $redirect = $_GET['redirect'];
+ if (isset($_GET['languageConstants'])) $languageConstants = json_decode($_GET['languageConstants']);
+ $result = FoldersChecker::setDirectoryPermissions($path, $mode);
+ $msg = ($result)?$languageConstants[0]:$languageConstants[1];
+ redirect_header($redirect, 2, $msg . ': ' . $path);
+ exit();
+ break;
+
+}
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads/include/folderchecker.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/include/functions.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php 2013-07-22 18:53:14 UTC (rev 11849)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php 2013-07-23 14:04:50 UTC (rev 11850)
@@ -23,7 +23,6 @@
}
-
/**
* Recursively sort categories by level and weight
*
@@ -452,68 +451,6 @@
return $modfooter;
}
-
-
-/**
-* Thanks to the NewBB2 Development Team
-*/
-function &wfdownloads_admin_getPathStatus($item, $getStatus=false)
-{
- if ($item == 'root') {
- $path = '';
- } else {
- $path = $item;
- }
-
- $thePath = wfdownloads_getUploadDir(true, $path);
-
- if(empty($thePath)) return false;
- if(@is_writable($thePath)) {
- $pathCheckResult = 1;
- $path_status = _AM_WFD_AVAILABLE;
- } elseif(!@is_dir($thePath)) {
- $pathCheckResult = -1;
- $path_status = _AM_WFD_NOTAVAILABLE . " <a href=main.php?op=createdir&path=$item>" . _AM_WFD_CREATETHEDIR . '</a>';
- } else {
- $pathCheckResult = -2;
- $path_status = _AM_WFD_NOTWRITABLE . " <a href=main.php?op=setperm&path=$item>" . _AM_SCS_SETMPERM . '</a>';
- }
- if (!$getStatus) {
- return $path_status;
- } else {
- return $pathCheckResult;
- }
-}
-
-
-
-/**
-* Thanks to the NewBB2 Development Team
-*/
-function wfdownloads_admin_mkdir($target)
-{
- // http://www.php.net/manual/en/function.mkdir.php
- // saint at corenova.com
- // bart at cdasites dot com
- if (is_dir($target)||empty($target)) return true; // best case check first
- if (file_exists($target) && !is_dir($target)) return false;
- if (wfdownloads_admin_mkdir(substr($target,0,strrpos($target,'/'))))
- if (!file_exists($target)) return mkdir($target); // crawl back up & create dir tree
- return true;
-}
-
-
-
-/**
-* Thanks to the NewBB2 Development Team
-*/
-function wfdownloads_admin_chmod($target, $mode = 0777)
-{
- return @chmod($target, $mode);
-}
-
-
-
function wfdownloads_getUploadDir($local=true, $item=false)
{
if ($item) {
@@ -547,7 +484,6 @@
}
-
function wfdownloads_formatErrors($errors=array())
{
$ret = '';
@@ -722,31 +658,7 @@
$html.= "<ul>\n";
$html.= "<li>" . _AM_WFD_DOWN_SERVERPATH . " <b>" . XOOPS_ROOT_PATH . "</b>\n";
- //
- if (empty($xoopsModuleConfig['uploaddir'])) {
- $html.= "<li>" . _AM_WFD_DOWN_UPLOADPATH . " <b><span style=\"color: red;\">" . _AM_WFD_DOWN_NOTSET . "</span></b>\n";
- } else {
- $html.= "<li>" . _AM_WFD_DOWN_UPLOADPATH . " <b>" . $xoopsModuleConfig['uploaddir'] . "</b>\n";
- }
- //
- if (empty($xoopsModuleConfig['screenshots'])) {
- $html.= "<li>" . _MI_WFD_SCREENSHOTS . " <b><span style=\"color: red;\">" . _AM_WFD_DOWN_NOTSET . "</span></b>\n";
- } else {
- $html.= "<li>" . _MI_WFD_SCREENSHOTS . " <b>" . XOOPS_ROOT_PATH . DS . $xoopsModuleConfig['screenshots'] . "</b>\n";
- }
- //
- if (empty($xoopsModuleConfig['catimage'])) {
- $html.= "<li>" . _MI_WFD_CATEGORYIMG . " <b><span style=\"color: red;\">" . _AM_WFD_DOWN_NOTSET . "</span></b>\n";
- } else {
- $html.= "<li>" . _MI_WFD_CATEGORYIMG . " <b>" . XOOPS_ROOT_PATH . DS . $xoopsModuleConfig['catimage'] . "</b>\n";
- }
- //
- if (empty($xoopsModuleConfig['mainimagedir'])) {
- $html.= "<li>" . _MI_WFD_MAINIMGDIR . " <b><span style=\"color: red;\">" . _AM_WFD_DOWN_NOTSET . "</span></b>\n";
- } else {
- $html.= "<li>" . _MI_WFD_MAINIMGDIR . " <b>" . XOOPS_ROOT_PATH . DS . $xoopsModuleConfig['mainimagedir'] . "</b>\n";
- }
- //
+
$html.= "</ul>\n";
$html.= "<br />\n";
$html.= _AM_WFD_DOWN_UPLOADPATHDSC . "\n";
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-07-22 18:53:14 UTC (rev 11849)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-07-23 14:04:50 UTC (rev 11850)
@@ -618,3 +618,15 @@
define("_AM_WFD_MIME_EXTF_DESC","");
define("_AM_WFD_MIME_NAMEF_DESC","Enter application associated with this extension.");
define("_AM_WFD_MIME_TYPEF_DESC","Enter each mimetype associated with the file extension. Each Mimetype must be separated with a space.");
+
+//directories
+define('_AM_WFD_AVAILABLE',"<span style='color : green;'>Available. </span>");
+define('_AM_WFD_NOTAVAILABLE',"<span style='color : red;'>is not available. </span>");
+define('_AM_WFD_NOTWRITABLE',"<span style='color : red;'>".' should have permission ( %1$d ), but it has ( %2$d )'. '</span>');
+define('_AM_WFD_CREATETHEDIR','Create it');
+define('_AM_WFD_SETMPERM','Set the permission');
+
+define('_AM_WFD_DIRCREATED','The directory has been created');
+define('_AM_WFD_DIRNOTCREATED','The directory can not be created');
+define('_AM_WFD_PERMSET','The permission has been set');
+define('_AM_WFD_PERMNOTSET','The permission can not be set');
|
Thanks for helping keep SourceForge clean.
X