Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12140] XoopsModules/wfdownloads/trunk/wfdownloads
|
From: <luc...@us...> - 2013-10-05 23:30:54
|
Revision: 12140
http://sourceforge.net/p/xoops/svn/12140
Author: luciorota
Date: 2013-10-05 23:30:51 +0000 (Sat, 05 Oct 2013)
Log Message:
-----------
fixed error in download.php
added "infinite" screenshots support // IN PROGRESS
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/import.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/module.php
XoopsModules/wfdownloads/trunk/wfdownloads/sql/mysql.sql
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2013-10-05 23:10:55 UTC (rev 12139)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2013-10-05 23:30:51 UTC (rev 12140)
@@ -76,6 +76,7 @@
// Added Formulize module support (2006/05/04) jpc - start
if (!wfdownloads_checkModule('formulize')) {
$sform = $download->getAdminForm($title);
+ $sform->display();
} elseif ((isset($_POST['submit_category']) && !empty($_POST['submit_category'])) || $lid) {
$fid = $category->getVar('formulize_fid');
$customArray = array();
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/import.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/import.php 2013-10-05 23:10:55 UTC (rev 12139)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/import.php 2013-10-05 23:30:51 UTC (rev 12140)
@@ -288,9 +288,9 @@
echo "Imported {$xoopsDB->getAffectedRows()} categories into {$destination['cat']}<br />";
//Import data into downloads table
$sql = "INSERT INTO {$destination['downloads']} (";
- $sql.= " `cid`, `old_lid`, `old_cid`, `title`, `url`, `filename`, `filetype`, `homepage`, `version`, `size`, `platform`, `screenshot`, `screenshot2`, `screenshot3`, `screenshot4`, `submitter`, `publisher`, `status`, `date`, `hits`, `rating`, `votes`, `comments`, `license`, `mirror`, `price`, `paypalemail`, `features`, `requirements`, `homepagetitle`, `forumid`, `limitations`, `versiontypes`, `dhistory`, `published`, `expired`, `updated`, `offline`, `summary`, `description`, `ipaddress`, `notifypub`, `formulize_idreq`";
+ $sql.= " `cid`, `old_lid`, `old_cid`, `title`, `url`, `filename`, `filetype`, `homepage`, `version`, `size`, `platform`, `screenshot`, `screenshot2`, `screenshot3`, `screenshot4`, `submitter`, `publisher`, `status`, `date`, `hits`, `rating`, `votes`, `comments`, `license`, `mirror`, `price`, `paypalemail`, `features`, `requirements`, `homepagetitle`, `forumid`, `limitations`, `versiontypes`, `dhistory`, `published`, `expired`, `updated`, `offline`, `summary`, `description`, `ipaddress`, `notifypub`, `formulize_idreq`, `screenshots`";
$sql.= " ) SELECT ";
- $sql.= " 0, `lid`, `cid`, `title`, `url`, `filename`, `filetype`, `homepage`, `version`, `size`, `platform`, `screenshot`, `screenshot2`, `screenshot3`, `screenshot4`, `submitter`, `publisher`, `status`, `date`, `hits`, `rating`, `votes`, `comments`, `license`, `mirror`, `price`, `paypalemail`, `features`, `requirements`, `homepagetitle`, `forumid`, `limitations`, `versiontypes`, `dhistory`, `published`, `expired`, `updated`, `offline`, `summary`, `description`, `ipaddress`, `notifypub`, `formulize_idreq`";
+ $sql.= " 0, `lid`, `cid`, `title`, `url`, `filename`, `filetype`, `homepage`, `version`, `size`, `platform`, `screenshot`, `screenshot2`, `screenshot3`, `screenshot4`, `submitter`, `publisher`, `status`, `date`, `hits`, `rating`, `votes`, `comments`, `license`, `mirror`, `price`, `paypalemail`, `features`, `requirements`, `homepagetitle`, `forumid`, `limitations`, `versiontypes`, `dhistory`, `published`, `expired`, `updated`, `offline`, `summary`, `description`, `ipaddress`, `notifypub`, `formulize_idreq`, `screenshots`";
$sql.= " FROM {$source['downloads']}";
$xoopsDB->query($sql);
echo "Imported {$xoopsDB->getAffectedRows()} downloads into {$destination['downloads']}<br />";
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/include/module.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/module.php 2013-10-05 23:10:55 UTC (rev 12139)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/module.php 2013-10-05 23:30:51 UTC (rev 12140)
@@ -71,50 +71,68 @@
// =========================================================================================
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'");
+ $dbupdater = new WfdownloadsDbupdater();
- //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);
+ $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),
+ "screenshots" => array("Type" => "text NOT NULL default ''", "Default" => true)
+ );
+ //$renamed_fields = array(
+ // "old_name" => "new_name"
+ //);
+ 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);
- return $ret;
}
// =========================================================================================
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/sql/mysql.sql
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/sql/mysql.sql 2013-10-05 23:10:55 UTC (rev 12139)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/sql/mysql.sql 2013-10-05 23:30:51 UTC (rev 12140)
@@ -101,6 +101,7 @@
ipaddress varchar(120) NOT NULL default '0',
notifypub int(1) NOT NULL default '0',
formulize_idreq int(5) NOT NULL default '0',
+ screenshots text NOT NULL default '',
PRIMARY KEY (lid),
KEY cid (cid),
KEY status (status),
|
