Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[12797] XoopsModules/wfdownloads/branches/luciorota/ wfdownloads
|
From: <luc...@us...> - 2014-09-22 19:57:20
|
Revision: 12797
http://sourceforge.net/p/xoops/svn/12797
Author: luciorota
Date: 2014-09-22 19:57:08 +0000 (Mon, 22 Sep 2014)
Log Message:
-----------
fixed bug in var names, standardize var names
fixed bug in db
uses screenshots filed and improved update function (task: add possibility to have all the screenshots you wish IN PROGRESS)
changed some configuration default values
Modified Paths:
--------------
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/reportsmodifications.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/brokenfile.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/category.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/download.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/img_uploader.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/notification.inc.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/oninstall.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/onuninstall.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/onupdate.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/ratefile.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/rss.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/singlefile.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/sql/mysql.sql
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/submit.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/templates/wfdownloads_download.tpl
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/templates/wfdownloads_singlefile.tpl
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/viewcat.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/xoops_version.php
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/downloads.php 2014-09-22 08:23:59 UTC (rev 12796)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/downloads.php 2014-09-22 19:57:08 UTC (rev 12797)
@@ -273,14 +273,14 @@
}
// Define URL
if (empty($_FILES['userfile']['name'])) {
- if ($_POST['url'] && $_POST['url'] != '' && $_POST['url'] != "http://") {
- $url = ($_POST['url'] != "http://") ? $_POST['url'] : '';
+ if ($_POST['url'] && $_POST['url'] != '' && $_POST['url'] != 'http://') {
+ $url = ($_POST['url'] != 'http://') ? $_POST['url'] : '';
$filename = '';
$filetype = '';
// Get size from form
- $size = (empty($_POST['size']) || !is_numeric($_POST['size'])) ? 0 : (int) $_POST["size"];
+ $size = (empty($_POST['size']) || !is_numeric($_POST['size'])) ? 0 : (int) $_POST['size'];
} else {
- $url = ($_POST["url"] != "http://") ? $_POST['url'] : '';
+ $url = ($_POST['url'] != 'http://') ? $_POST['url'] : '';
$filename = $_POST['filename'];
$filetype = $_POST['filetype'];
$filePath = $wfdownloads->getConfig('uploaddir') . '/' . $filename;
@@ -292,7 +292,7 @@
$downloadObj->setVar('filetype', $filetype);
} else {
$down = wfdownloads_uploading($_FILES, $wfdownloads->getConfig('uploaddir'), '', $currentFile, 0, false, true);
- $url = ($_POST['url'] != "http://") ? $_POST["url"] : '';
+ $url = ($_POST['url'] != 'http://') ? $_POST['url'] : '';
$size = $down['size'];
$title = $_FILES['userfile']['name'];
@@ -306,12 +306,13 @@
$downloadObj->setVar('filetype', $filetype);
}
// 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'] : '';
- $screenshot4 = ($_POST['screenshot4'] != 'blank.png') ? $_POST['screenshot4'] : '';
+ $screenshots = array();
+ $screenshots[] = ($_POST['screenshot'] != 'blank.png') ? $_POST['screenshot'] : '';
+ $screenshots[] = ($_POST['screenshot2'] != 'blank.png') ? $_POST['screenshot2'] : '';
+ $screenshots[] = ($_POST['screenshot3'] != 'blank.png') ? $_POST['screenshot3'] : '';
+ $screenshots[] = ($_POST['screenshot4'] != 'blank.png') ? $_POST['screenshot4'] : '';
- if (!empty($_POST['homepage']) || $_POST['homepage'] != "http://") {
+ if (!empty($_POST['homepage']) || $_POST['homepage'] != 'http://') {
$downloadObj->setVar('homepage', trim($_POST['homepage']));
$downloadObj->setVar('homepagetitle', trim($_POST['homepagetitle']));
}
@@ -349,10 +350,11 @@
$downloadObj->setVar('title', $title);
$downloadObj->setVar('status', $status);
$downloadObj->setVar('size', $size);
- $downloadObj->setVar('screenshot', $screenshot);
- $downloadObj->setVar('screenshot2', $screenshot2);
- $downloadObj->setVar('screenshot3', $screenshot3);
- $downloadObj->setVar('screenshot4', $screenshot4);
+ $downloadObj->setVar('screenshot', $screenshots[0]); // old style
+ $downloadObj->setVar('screenshot2', $screenshots[1]); // old style
+ $downloadObj->setVar('screenshot3', $screenshots[2]); // old style
+ $downloadObj->setVar('screenshot4', $screenshots[3]); // old style
+ $downloadObj->setVar('screenshots', $screenshots); // new style
$downloadObj->setVar('platform', trim($_POST['platform']));
$downloadObj->setVar('summary', trim($_POST['summary']));
$downloadObj->setVar('description', trim($_POST['description']));
@@ -438,7 +440,7 @@
if ($fid) {
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');
+ $formulizeElements_handler = xoops_getmodulehandler('elements', 'formulize');
if ($lid) {
$entries[$fid][0] = $downloadObj->getVar('formulize_idreq');
if ($entries[$fid][0]) {
@@ -461,7 +463,7 @@
$uid = !empty($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
$groups = $GLOBALS['xoopsUser'] ? $GLOBALS['xoopsUser']->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
$entries = handleSubmission(
- $formulize_mgr,
+ $formulizeElements_handler,
$entries,
$uid,
$owner,
@@ -687,14 +689,14 @@
foreach ($publishedDownloadObjs as $publishedDownloadObj) {
$publishedDownload_array = $publishedDownloadObj->toArray();
$publishedDownload_array['title_html'] = $myts->htmlSpecialChars(trim($publishedDownload_array['title']));
- $publishedDownload_array['category_title'] = $categories[$publishedDownload_array['cid']]['title'];
+ $publishedDownload_array['category_title'] = $categoryObjs[$publishedDownload_array['cid']]['title'];
$publishedDownload_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($publishedDownload_array['submitter']);
$publishedDownload_array['published_formatted'] = XoopsLocal::formatTimestamp($publishedDownload_array['published'], 'l');
$GLOBALS['xoopsTpl']->append('published_downloads', $publishedDownload_array);
}
}
- $pagenav = new XoopsPageNav($publishedDownloadsCount, $wfdownloads->getConfig('admin_perpage'), $start_published, 'start_published');
+ $pagenav = new XoopsPageNav($publishedDownloadCount, $wfdownloads->getConfig('admin_perpage'), $start_published, 'start_published');
$GLOBALS['xoopsTpl']->assign('filter_title', $filter_title);
$GLOBALS['xoopsTpl']->assign('filter_title_condition', $filter_title_condition);
$GLOBALS['xoopsTpl']->assign('filter_category_title', $filter_category_title);
@@ -733,7 +735,7 @@
$version = $myts->htmlSpecialChars($newDownload_array['version']);
$size = $myts->htmlSpecialChars($newDownload_array['size']);
$platform = $myts->htmlSpecialChars($newDownload_array['platform']);
- $logourl = $myts->htmlSpecialChars($newDownload_array['screenshot']);
+ $logourl = $myts->htmlSpecialChars($newDownload_array['screenshot']); // IN PROGRESS
$newDownload_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($newDownload_array['submitter']);
$newDownload_array['date_formatted'] = XoopsLocal::formatTimestamp($newDownload_array['date'], 'l');
$GLOBALS['xoopsTpl']->append('new_downloads', $newDownload_array);
@@ -780,12 +782,12 @@
$GLOBALS['xoopsTpl']->assign('expired_downloads_count', $expiredDownloadCount);
if ($expiredDownloadCount > 0) {
foreach ($expiredDownloadObjs as $expiredDownloadObj) {
- $expired_download_array = $expiredDownloadObj->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_formatted'] = XoopsLocal::formatTimestamp($expired_download_array['published'], 'l');
- $GLOBALS['xoopsTpl']->append('expired_downloads', $expired_download_array);
+ $expiredDownload_array = $expiredDownloadObj->toArray();
+ $expiredDownload_array['title_html'] = $myts->htmlSpecialChars(trim($expiredDownload_array['title']));
+ $expiredDownload_array['category_title'] = $categories[$expiredDownload_array['cid']]['title'];
+ $expiredDownload_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($expiredDownload_array['submitter']);
+ $expiredDownload_array['published_formatted'] = XoopsLocal::formatTimestamp($expiredDownload_array['published'], 'l');
+ $GLOBALS['xoopsTpl']->append('expired_downloads', $expiredDownload_array);
}
}
$pagenav = new XoopsPageNav($expiredDownloadCount, $wfdownloads->getConfig('admin_perpage'), $start_expired, 'start_expired');
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/reportsmodifications.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/reportsmodifications.php 2014-09-22 08:23:59 UTC (rev 12796)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/reportsmodifications.php 2014-09-22 19:57:08 UTC (rev 12797)
@@ -350,17 +350,17 @@
$submitter = isset($users[$downloadObjs[$reportObj->getVar('lid')]->getVar('submitter')])
? $users[$downloadObjs[$reportObj->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'];
+ $report_array['submitter_uname'] = is_object($submitter) ? $submitter->getVar('uname') : $GLOBALS['xoopsConfig']['anonymous'];
} else {
$report_array['download_lid'] = false;
$download_link = _AM_WFDOWNLOADS_BROKEN_DOWNLOAD_DONT_EXISTS;
$report_array['submitter_email'] = '';
- $report_array['submitter_uname'] = $xoopsConfig['anonymous'];
+ $report_array['submitter_uname'] = $GLOBALS['xoopsConfig']['anonymous'];
}
$sender = isset($users[$reportObj->getVar('sender')]) ? $users[$reportObj->getVar('sender')] : '';
$report_array['reporter_email'] = isset($users[$reportObj->getVar('sender')]) ? $users[$reportObj->getVar('sender')]->getVar('email') : '';
$report_array['reporter_uname'] = isset($users[$reportObj->getVar('sender')]) ? $users[$reportObj->getVar('sender')]->getVar('uname')
- : $xoopsConfig['anonymous'];
+ : $GLOBALS['xoopsConfig']['anonymous'];
$report_array['formatted_date'] = XoopsLocal::formatTimestamp($reportObj->getVar('date'), 'l');
$GLOBALS['xoopsTpl']->append('reports', $report_array);
}
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/brokenfile.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/brokenfile.php 2014-09-22 08:23:59 UTC (rev 12796)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/brokenfile.php 2014-09-22 19:57:08 UTC (rev 12797)
@@ -97,16 +97,16 @@
$xoopsMailer = & getMailer();
$xoopsMailer->useMail();
- $template_dir = WFDOWNLOADS_ROOT_PATH . '/language/' . $xoopsConfig['language'] . '/mail_template';
+ $template_dir = WFDOWNLOADS_ROOT_PATH . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/mail_template';
$xoopsMailer->setTemplateDir($template_dir);
$xoopsMailer->setTemplate('filebroken_notify.tpl');
$xoopsMailer->setToEmails($user->email());
- $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
- $xoopsMailer->setFromName($xoopsConfig['sitename']);
+ $xoopsMailer->setFromEmail($GLOBALS['xoopsConfig']['adminmail']);
+ $xoopsMailer->setFromName($GLOBALS['xoopsConfig']['sitename']);
$xoopsMailer->assign('X_UNAME', $user->uname());
- $xoopsMailer->assign('SITENAME', $xoopsConfig['sitename']);
- $xoopsMailer->assign('X_ADMINMAIL', $xoopsConfig['adminmail']);
+ $xoopsMailer->assign('SITENAME', $GLOBALS['xoopsConfig']['sitename']);
+ $xoopsMailer->assign('X_ADMINMAIL', $GLOBALS['xoopsConfig']['adminmail']);
$xoopsMailer->assign('X_SITEURL', XOOPS_URL . '/');
$xoopsMailer->assign('X_TITLE', $title);
$xoopsMailer->assign('X_SUB_DATE', $subdate);
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/category.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/category.php 2014-09-22 08:23:59 UTC (rev 12796)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/category.php 2014-09-22 19:57:08 UTC (rev 12797)
@@ -321,7 +321,7 @@
$allsubcats_linked_totop = array();
foreach ($this->allCategories as $cid => $category) {
$parentCategoryObjs = $categoryObjsTree->getAllParent($cid);
- if (count($parents) == 0) {
+ if (count($parentCategoryObjs) == 0) {
// is a top category
$allsubcats_linked_totop[$cid] = $cid;
} else {
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/download.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/download.php 2014-09-22 08:23:59 UTC (rev 12796)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/download.php 2014-09-22 19:57:08 UTC (rev 12797)
@@ -131,7 +131,6 @@
function getDownloadInfo()
{
- global $xoopsConfig, $myts;
xoops_load('XoopsUserUtility');
$download['id'] = $this->getVar('lid');
@@ -176,95 +175,99 @@
$download['url'] = $this->getVar('url');
$download['filename'] = $this->getVar('filename');
$download['filetype'] = $this->getVar('filetype');
-
- if ($this->getVar('screenshot')) {
- $download['screenshot_full'] = $this->getVar('screenshot');
- if ($this->getVar('screenshot')
+/*
+ if ($this->getVar('screenshot')) { // IN PROGRESS
+ $download['screenshot_full'] = $this->getVar('screenshot'); // IN PROGRESS
+ $download['screenshot_full1'] = $this->getVar('screenshot'); // IN PROGRESS
+ if ($this->getVar('screenshot') // IN PROGRESS
&& file_exists(XOOPS_ROOT_PATH . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . xoops_trim($this->getVar('screenshot')))
) {
if ($this->wfdownloads->getConfig('usethumbs') == true) {
$download['screenshot_thumb'] = wfdownloads_createThumb(
- $download['screenshot_full'],
- $this->wfdownloads->getConfig('screenshots'),
- 'thumbs',
- $this->wfdownloads->getConfig('shotwidth'),
- $this->wfdownloads->getConfig('shotheight'),
- $this->wfdownloads->getConfig('imagequality'),
- $this->wfdownloads->getConfig('updatethumbs'),
- $this->wfdownloads->getConfig('keepaspect')
+ $download['screenshot_full'], $this->wfdownloads->getConfig('screenshots'), 'thumbs',
+ $this->wfdownloads->getConfig('shotwidth'), $this->wfdownloads->getConfig('shotheight'),
+ $this->wfdownloads->getConfig('imagequality'), $this->wfdownloads->getConfig('updatethumbs'), $this->wfdownloads->getConfig('keepaspect')
);
} else {
$download['screenshot_thumb'] = XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . xoops_trim($this->getVar('screenshot'));
}
+ $download['screenshot_thumb1'] = $download['screenshot_thumb']; // IN PROGRESS
}
}
- if ($this->getVar('screenshot2') && $this->wfdownloads->getConfig('max_screenshot') >= 2) {
+ if ($this->getVar('screenshot2') && $this->wfdownloads->getConfig('max_screenshot') >= 2) { // IN PROGRESS
$download['screenshot_full2'] = $this->getVar('screenshot2');
if ($this->getVar('screenshot2')
&& file_exists(XOOPS_ROOT_PATH . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . xoops_trim($this->getVar('screenshot2')))
) {
if ($this->wfdownloads->getConfig('usethumbs') == true) {
$download['screenshot_thumb2'] = wfdownloads_createThumb(
- $download['screenshot_full2'],
- $this->wfdownloads->getConfig('screenshots'),
- 'thumbs',
- $this->wfdownloads->getConfig('shotwidth'),
- $this->wfdownloads->getConfig('shotheight'),
- $this->wfdownloads->getConfig('imagequality'),
- $this->wfdownloads->getConfig('updatethumbs'),
- $this->wfdownloads->getConfig('keepaspect')
+ $download['screenshot_full2'], $this->wfdownloads->getConfig('screenshots'), 'thumbs',
+ $this->wfdownloads->getConfig('shotwidth'), $this->wfdownloads->getConfig('shotheight'),
+ $this->wfdownloads->getConfig('imagequality'), $this->wfdownloads->getConfig('updatethumbs'), $this->wfdownloads->getConfig('keepaspect')
);
} else {
$download['screenshot_thumb2'] = XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . xoops_trim($this->getVar('screenshot2'));
}
}
}
- if ($this->getVar('screenshot3') && $this->wfdownloads->getConfig('max_screenshot') >= 3) {
+ if ($this->getVar('screenshot3') && $this->wfdownloads->getConfig('max_screenshot') >= 3) { // IN PROGRESS
$download['screenshot_full3'] = $this->getVar('screenshot3');
if ($this->getVar('screenshot3')
&& file_exists(XOOPS_ROOT_PATH . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . xoops_trim($this->getVar('screenshot3')))
) {
if ($this->wfdownloads->getConfig('usethumbs') == true) {
$download['screenshot_thumb3'] = wfdownloads_createThumb(
- $download['screenshot_full3'],
- $this->wfdownloads->getConfig('screenshots'),
- 'thumbs',
- $this->wfdownloads->getConfig('shotwidth'),
- $this->wfdownloads->getConfig('shotheight'),
- $this->wfdownloads->getConfig('imagequality'),
- $this->wfdownloads->getConfig('updatethumbs'),
- $this->wfdownloads->getConfig('keepaspect')
+ $download['screenshot_full3'], $this->wfdownloads->getConfig('screenshots'), 'thumbs',
+ $this->wfdownloads->getConfig('shotwidth'), $this->wfdownloads->getConfig('shotheight'),
+ $this->wfdownloads->getConfig('imagequality'), $this->wfdownloads->getConfig('updatethumbs'), $this->wfdownloads->getConfig('keepaspect')
);
} else {
$download['screenshot_thumb3'] = XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . xoops_trim($this->getVar('screenshot3'));
}
}
}
- if ($this->getVar('screenshot4') && $this->wfdownloads->getConfig('max_screenshot') >= 4) {
+ if ($this->getVar('screenshot4') && $this->wfdownloads->getConfig('max_screenshot') >= 4) { // IN PROGRESS
$download['screenshot_full4'] = $this->getVar('screenshot4');
if ($this->getVar('screenshot4')
&& file_exists(XOOPS_ROOT_PATH . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . xoops_trim($this->getVar('screenshot4')))
) {
if ($this->wfdownloads->getConfig('usethumbs') == true) {
$download['screenshot_thumb4'] = wfdownloads_createThumb(
- $download['screenshot_full4'],
- $this->wfdownloads->getConfig('screenshots'),
- 'thumbs',
- $this->wfdownloads->getConfig('shotwidth'),
- $this->wfdownloads->getConfig('shotheight'),
- $this->wfdownloads->getConfig('imagequality'),
- $this->wfdownloads->getConfig('updatethumbs'),
- $this->wfdownloads->getConfig('keepaspect')
+ $download['screenshot_full4'], $this->wfdownloads->getConfig('screenshots'), 'thumbs',
+ $this->wfdownloads->getConfig('shotwidth'), $this->wfdownloads->getConfig('shotheight'),
+ $this->wfdownloads->getConfig('imagequality'), $this->wfdownloads->getConfig('updatethumbs'), $this->wfdownloads->getConfig('keepaspect')
);
} else {
$download['screenshot_thumb4'] = XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . xoops_trim($this->getVar('screenshot4'));
}
}
}
+*/
+ // IN PROGRESS
+ $screenshots = $this->getVar('screenshots');
+ $download['screenshots'] = array();
+ foreach ($screenshots as $key => $screenshot) {
+ if (file_exists(XOOPS_ROOT_PATH . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . xoops_trim($screenshot))) {
+ if ($this->wfdownloads->getConfig('usethumbs') == true
+ && $screenshot != ''
+ ) {
+ $screenshot_thumb = wfdownloads_createThumb(
+ $screenshot, $this->wfdownloads->getConfig('screenshots'), 'thumbs',
+ $this->wfdownloads->getConfig('shotwidth'), $this->wfdownloads->getConfig('shotheight'),
+ $this->wfdownloads->getConfig('imagequality'), $this->wfdownloads->getConfig('updatethumbs'), $this->wfdownloads->getConfig('keepaspect')
+ );
+ } else {
+ $screenshot_thumb = XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . xoops_trim($screenshot);
+ }
+ $download['screenshots'][$key]['filename'] = $screenshot;
+ $download['screenshots'][$key]['thumb_url'] = $screenshot_thumb;
+ unset($screenshot_thumb);
+ }
+ }
//
$download['homepage'] = (!$this->getVar('homepage') || $this->getVar('homepage') == 'http://')
? ''
- : $myts->htmlSpecialChars(trim($this->getVar('homepage')));
+ : $GLOBALS['myts']->htmlSpecialChars(trim($this->getVar('homepage')));
//
$homepagetitle = $this->getVar('homepagetitle');
if ($download['homepage'] && !empty($download['homepage'])) {
@@ -306,8 +309,8 @@
// patch for multilanguage summary if xlanguage module is installed
if (wfdownloads_checkModule('xlanguage')) {
global $xlanguage;
- include_once(XOOPS_ROOT_PATH . '/modules/xlanguage/include/vars.php');
- include_once(XOOPS_ROOT_PATH . '/modules/xlanguage/include/functions.php');
+ include_once XOOPS_ROOT_PATH . '/modules/xlanguage/include/vars.php' ;
+ include_once XOOPS_ROOT_PATH . '/modules/xlanguage/include/functions.php';
$download['summary'] = xlanguage_ml($download['summary']);
}
// html or plain text auto summary
@@ -330,17 +333,17 @@
$limitationsArray = $this->wfdownloads->getConfig('limitations');
$download['limitations'] = ($this->getVar('limitations') == '')
? _MD_WFDOWNLOADS_NOTSPECIFIED
- : $myts->htmlSpecialChars(trim($limitationsArray[$this->getVar('limitations')]));
+ : $GLOBALS['myts']->htmlSpecialChars(trim($limitationsArray[$this->getVar('limitations')]));
//
$versiontypesArray = $this->wfdownloads->getConfig('versiontypes');
$download['versiontypes'] = ($this->getVar('versionypes') == '')
? _MD_WFDOWNLOADS_NOTSPECIFIED
- : $myts->htmlSpecialChars(trim($versiontypesArray[$this->getVar('versiontypes')]));
+ : $GLOBALS['myts']->htmlSpecialChars(trim($versiontypesArray[$this->getVar('versiontypes')]));
$licenseArray = $this->wfdownloads->getConfig('license');
//
$download['license'] = ($this->getVar('license') == '')
? _MD_WFDOWNLOADS_NOTSPECIFIED
- : $myts->htmlSpecialChars(trim($licenseArray[$this->getVar('license')]));
+ : $GLOBALS['myts']->htmlSpecialChars(trim($licenseArray[$this->getVar('license')]));
//
$download['submitter'] = XoopsUserUtility::getUnameFromId($this->getVar('submitter'));
//
@@ -350,10 +353,10 @@
: '';
//
$platformArray = $this->wfdownloads->getConfig('platform');
- $download['platform'] = $myts->htmlSpecialChars($platformArray[$this->getVar('platform')]);
+ $download['platform'] = $GLOBALS['myts']->htmlSpecialChars($platformArray[$this->getVar('platform')]);
//
$history = $this->getVar('dhistory', 'n');
- $download['history'] = $myts->displayTarea($history, true);
+ $download['history'] = $GLOBALS['myts']->displayTarea($history, true);
//
$download['features'] = array();
if ($this->getVar('features')) {
@@ -371,9 +374,9 @@
}
}
//
- $download['mail_subject'] = rawurlencode(sprintf(_MD_WFDOWNLOADS_INTFILEFOUND, $xoopsConfig['sitename']));
+ $download['mail_subject'] = rawurlencode(sprintf(_MD_WFDOWNLOADS_INTFILEFOUND, $GLOBALS['xoopsConfig']['sitename']));
//
- $download['mail_body'] = rawurlencode(sprintf(_MD_WFDOWNLOADS_INTFILEFOUND, $xoopsConfig['sitename']) . ': ' . WFDOWNLOADS_URL . '/singlefile.php?cid=' . $download['cid'] . '&lid=' . $download['id']);
+ $download['mail_body'] = rawurlencode(sprintf(_MD_WFDOWNLOADS_INTFILEFOUND, $GLOBALS['xoopsConfig']['sitename']) . ': ' . WFDOWNLOADS_URL . '/singlefile.php?cid=' . $download['cid'] . '&lid=' . $download['id']);
//
$download['isadmin'] = (wfdownloads_userIsAdmin()) ? true : false;
//
@@ -417,7 +420,7 @@
// file url
$fullFilename = trim($download['filename']);
if ((!$download['url'] == '' && !$download['url'] == 'http://') || $fullFilename == '') {
- $download['file_url'] = $myts->htmlSpecialChars(preg_replace('/javascript:/si', 'javascript:', $download['url']), ENT_QUOTES);
+ $download['file_url'] = $GLOBALS['myts']->htmlSpecialChars(preg_replace('/javascript:/si', 'javascript:', $download['url']), ENT_QUOTES);
} else {
$download['file_url'] = XOOPS_URL . str_replace(XOOPS_ROOT_PATH, '', $this->wfdownloads->getConfig('uploaddir')) . '/' . stripslashes(trim($fullFilename));
}
@@ -632,15 +635,15 @@
if (($this->wfdownloads->getConfig('useruploads') && array_intersect($this->wfdownloads->getConfig('useruploadsgroup'), $groups))
|| wfdownloads_userIsAdmin()
) {
- $sform->addElement(new XoopsFormFile(_MD_WFDOWNLOADS_DUPLOADSCRSHOT, 'screenshot', 0), false);
+ $sform->addElement(new XoopsFormFile(_MD_WFDOWNLOADS_DUPLOADSCRSHOT, 'screenshot', 0), false); // IN PROGRESS
if ($this->wfdownloads->getConfig('max_screenshot') >= 2) {
- $sform->addElement(new XoopsFormFile(_MD_WFDOWNLOADS_DUPLOADSCRSHOT, 'screenshot2', 0), false);
+ $sform->addElement(new XoopsFormFile(_MD_WFDOWNLOADS_DUPLOADSCRSHOT, 'screenshot2', 0), false); // IN PROGRESS
}
if ($this->wfdownloads->getConfig('max_screenshot') >= 3) {
- $sform->addElement(new XoopsFormFile(_MD_WFDOWNLOADS_DUPLOADSCRSHOT, 'screenshot3', 0), false);
+ $sform->addElement(new XoopsFormFile(_MD_WFDOWNLOADS_DUPLOADSCRSHOT, 'screenshot3', 0), false); // IN PROGRESS
}
if ($this->wfdownloads->getConfig('max_screenshot') >= 4) {
- $sform->addElement(new XoopsFormFile(_MD_WFDOWNLOADS_DUPLOADSCRSHOT, 'screenshot4', 0), false);
+ $sform->addElement(new XoopsFormFile(_MD_WFDOWNLOADS_DUPLOADSCRSHOT, 'screenshot4', 0), false); // IN PROGRESS
}
}
@@ -916,111 +919,64 @@
if (!$this->isNew() && $this->getVar('dhistory') != '') {
$sform->addElement(new XoopsFormTextArea(_AM_WFDOWNLOADS_FILE_HISTORYD, 'dhistoryaddedd', '', 7, 60), false);
}
+
// download: screenshot
- $graph_array = WfsLists::getListTypeAsArray(XOOPS_ROOT_PATH . '/' . $this->wfdownloads->getConfig('screenshots'), 'images');
- $indeximage_select = new XoopsFormSelect('', 'screenshot', $this->getVar('screenshot', 'e'));
- $indeximage_select->addOptionArray($graph_array);
- $indeximage_select->setExtra(
- "onchange='showImgSelected(\"image1\", \"screenshot\", \"" . $this->wfdownloads->getConfig('screenshots') . "\", \"\", \"" . XOOPS_URL
- . "\")'"
- );
- $indeximage_tray = new XoopsFormElementTray(_AM_WFDOWNLOADS_FILE_SHOTIMAGE, ' ');
- $indeximage_tray->addElement($indeximage_select);
- if ($this->getVar('screenshot') != '') {
- $indeximage_tray->addElement(
- new XoopsFormLabel('',
- "<br /><br /><img src='" . XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . $this->getVar(
- 'screenshot',
- 'e'
- ) . "' id='image1' alt='' title='screenshot 1' />")
- );
+ $graph_array1 = WfsLists::getListTypeAsArray(XOOPS_ROOT_PATH . '/' . $this->wfdownloads->getConfig('screenshots'), 'images');
+ $indeximage_select1 = new XoopsFormSelect('', 'screenshot', $this->getVar('screenshot', 'e'));
+ $indeximage_select1->addOptionArray($graph_array1);
+ $indeximage_select1->setExtra("onchange='showImgSelected(\"image1\", \"screenshot\", \"" . $this->wfdownloads->getConfig('screenshots') . "\", \"\", \"" . XOOPS_URL . "\")'");
+ $indeximage_tray1 = new XoopsFormElementTray(_AM_WFDOWNLOADS_FILE_SHOTIMAGE, ' ');
+ $indeximage_tray1->addElement($indeximage_select1);
+ if ($this->getVar('screenshot') != '') { // IN PROGRESS
+ $indeximage_tray1->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . $this->getVar('screenshot', 'e') . "' id='image1' alt='' title='screenshot 1' />"));
} else {
- $indeximage_tray->addElement(
- new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . "/uploads/blank.gif' id='image1' alt='' title='' />")
- );
+ $indeximage_tray1->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . "/uploads/blank.gif' id='image1' alt='' title='' />"));
}
- $sform->addElement($indeximage_tray);
+ $sform->addElement($indeximage_tray1);
+
// download: screenshot2
- $graph_array2 = & WfsLists :: getListTypeAsArray(
- XOOPS_ROOT_PATH . '/' . $this->wfdownloads->getConfig('screenshots'),
- $type = 'images'
- );
+ $graph_array2 = WfsLists::getListTypeAsArray(XOOPS_ROOT_PATH . '/' . $this->wfdownloads->getConfig('screenshots'), 'images');
$indeximage_select2 = new XoopsFormSelect('', 'screenshot2', $this->getVar('screenshot2', 'e'));
$indeximage_select2->addOptionArray($graph_array2);
- $indeximage_select2->setExtra(
- "onchange='showImgSelected(\"image2\", \"screenshot2\", \"" . $this->wfdownloads->getConfig('screenshots') . "\", \"\", \"" . XOOPS_URL
- . "\")'"
- );
+ $indeximage_select2->setExtra("onchange='showImgSelected(\"image2\", \"screenshot2\", \"" . $this->wfdownloads->getConfig('screenshots') . "\", \"\", \"" . XOOPS_URL . "\")'");
$indeximage_tray2 = new XoopsFormElementTray(_AM_WFDOWNLOADS_FILE_SHOTIMAGE, ' ');
$indeximage_tray2->addElement($indeximage_select2);
if ($this->getVar('screenshot2') != '') {
- $indeximage_tray2->addElement(
- new XoopsFormLabel('',
- "<br /><br /><img src='" . XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . $this->getVar(
- 'screenshot2',
- 'e'
- ) . "' id='image2' alt='' title='screenshot 2' />")
- );
+ $indeximage_tray2->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . $this->getVar('screenshot2', 'e') . "' id='image2' alt='' title='screenshot 2' />"));
} else {
- $indeximage_tray2->addElement(
- new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . "/uploads/blank.gif' id='image2' alt='' title='' />")
- );
+ $indeximage_tray2->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . "/uploads/blank.gif' id='image2' alt='' title='' />"));
}
$sform->addElement($indeximage_tray2);
+
// download: screenshot3
- $graph_array3 = & WfsLists :: getListTypeAsArray(
- XOOPS_ROOT_PATH . '/' . $this->wfdownloads->getConfig('screenshots'),
- $type = "images"
- );
+ $graph_array3 = WfsLists::getListTypeAsArray(XOOPS_ROOT_PATH . '/' . $this->wfdownloads->getConfig('screenshots'), 'images');
$indeximage_select3 = new XoopsFormSelect('', 'screenshot3', $this->getVar('screenshot3', 'e', true));
$indeximage_select3->addOptionArray($graph_array3);
- $indeximage_select3->setExtra(
- "onchange='showImgSelected(\"image3\", \"screenshot3\", \"" . $this->wfdownloads->getConfig('screenshots') . "\", \"\", \"" . XOOPS_URL
- . "\")'"
- );
+ $indeximage_select3->setExtra("onchange='showImgSelected(\"image3\", \"screenshot3\", \"" . $this->wfdownloads->getConfig('screenshots') . "\", \"\", \"" . XOOPS_URL . "\")'");
$indeximage_tray3 = new XoopsFormElementTray(_AM_WFDOWNLOADS_FILE_SHOTIMAGE, ' ');
$indeximage_tray3->addElement($indeximage_select3);
if ($this->getVar('screenshot3') != '') {
- $indeximage_tray3->addElement(
- new XoopsFormLabel('',
- "<br /><br /><img src='" . XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . $this->getVar(
- 'screenshot3',
- 'e'
- ) . "' id='image3' alt='' title='screenshot 3' />")
- );
+ $indeximage_tray3->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . $this->getVar('screenshot3', 'e') . "' id='image3' alt='' title='screenshot 3' />"));
} else {
- $indeximage_tray3->addElement(
- new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . "/uploads/blank.gif' id='image3' alt='' title='' />")
- );
+ $indeximage_tray3->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . "/uploads/blank.gif' id='image3' alt='' title='' />"));
}
$sform->addElement($indeximage_tray3);
+
// download: screenshot4
- $graph_array4 = & WfsLists :: getListTypeAsArray(
- XOOPS_ROOT_PATH . '/' . $this->wfdownloads->getConfig('screenshots'),
- $type = 'images'
- );
+ $graph_array4 = WfsLists::getListTypeAsArray(
+ XOOPS_ROOT_PATH . '/' . $this->wfdownloads->getConfig('screenshots'), 'images');
$indeximage_select4 = new XoopsFormSelect('', 'screenshot4', $this->getVar('screenshot4', 'e'));
$indeximage_select4->addOptionArray($graph_array4);
- $indeximage_select4->setExtra(
- "onchange='showImgSelected(\"image4\", \"screenshot4\", \"" . $this->wfdownloads->getConfig('screenshots') . "\", \"\", \"" . XOOPS_URL
- . "\")'"
- );
+ $indeximage_select4->setExtra("onchange='showImgSelected(\"image4\", \"screenshot4\", \"" . $this->wfdownloads->getConfig('screenshots') . "\", \"\", \"" . XOOPS_URL . "\")'");
$indeximage_tray4 = new XoopsFormElementTray(_AM_WFDOWNLOADS_FILE_SHOTIMAGE, ' ');
$indeximage_tray4->addElement($indeximage_select4);
if ($this->getVar('screenshot4') != "") {
- $indeximage_tray4->addElement(
- new XoopsFormLabel('',
- "<br /><br /><img src='" . XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . $this->getVar(
- 'screenshot4',
- 'e'
- ) . "' id='image4' alt='' title='screenshot 4' />")
- );
+ $indeximage_tray4->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . $this->getVar('screenshot4', 'e') . "' id='image4' alt='' title='screenshot 4' />"));
} else {
- $indeximage_tray4->addElement(
- new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . "/uploads/blank.gif' id='image4' alt='' title='' />")
- );
+ $indeximage_tray4->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . "/uploads/blank.gif' id='image4' alt='' title='' />"));
}
$sform->addElement($indeximage_tray4);
+
$sform->insertBreak(sprintf(_AM_WFDOWNLOADS_FILE_MUSTBEVALID, "<b>" . $this->wfdownloads->getConfig('screenshots') . "</b>"), "even");
// download: published
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/img_uploader.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/img_uploader.php 2014-09-22 08:23:59 UTC (rev 12796)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/img_uploader.php 2014-09-22 19:57:08 UTC (rev 12797)
@@ -71,8 +71,8 @@
* @copyright (c) 2000-2003 The Xoops Project - www.xoops.org
*/
mt_srand((double) microtime() * 1000000);
-//require_once XOOPS_ROOT_PATH . "/modules/wfdownloads/class/uploader.php";
-require_once XOOPS_ROOT_PATH . "/class/uploader.php";
+//require_once XOOPS_ROOT_PATH . '/modules/wfdownloads/class/uploader.php';
+require_once XOOPS_ROOT_PATH . '/class/uploader.php';
/**
* Class XoopsMediaImgUploader
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/docs/changelog.txt 2014-09-22 08:23:59 UTC (rev 12796)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/docs/changelog.txt 2014-09-22 19:57:08 UTC (rev 12797)
@@ -1,4 +1,4 @@
-<b><u>=> Version 3.23 RC2 (2014-09-03)</u></b>
+<b><u>=> Version 3.23 RC2 (2014-09-22)</u></b>
- todo: Swish-e files indexing support
- removed obsolete eval() that was used for PHP4 (mamba)
- removed object.php file (mamba)
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/notification.inc.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/notification.inc.php 2014-09-22 08:23:59 UTC (rev 12796)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/notification.inc.php 2014-09-22 19:57:08 UTC (rev 12797)
@@ -25,7 +25,7 @@
*/
function wfdownloads_notify_iteminfo($category, $item_id)
{
- global $xoopsModule, $xoopsModuleConfig, $xoopsConfig;
+ global $xoopsModule, $xoopsModuleConfig;
if (empty($xoopsModule) || $xoopsModule->dirname() != 'wfdownloads') {
$module_handler = xoops_gethandler('module');
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/oninstall.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/oninstall.php 2014-09-22 08:23:59 UTC (rev 12796)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/oninstall.php 2014-09-22 19:57:08 UTC (rev 12797)
@@ -20,7 +20,7 @@
*/
defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(__FILE__) . '/common.php';
-@include_once WFDOWNLOADS_ROOT_PATH . '/language/' . $xoopsConfig['language'] . '/admin.php';
+@include_once WFDOWNLOADS_ROOT_PATH . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/admin.php';
define('INDEX_FILE_PATH', XOOPS_ROOT_PATH . '/uploads/index.html');
define('BLANK_FILE_PATH', XOOPS_ROOT_PATH . '/uploads/blank.gif');
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/onuninstall.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/onuninstall.php 2014-09-22 08:23:59 UTC (rev 12796)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/onuninstall.php 2014-09-22 19:57:08 UTC (rev 12797)
@@ -20,7 +20,7 @@
*/
defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(__FILE__) . '/common.php';
-@include_once WFDOWNLOADS_ROOT_PATH . '/language/' . $xoopsConfig['language'] . '/admin.php';
+@include_once WFDOWNLOADS_ROOT_PATH . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/admin.php';
/**
* @param $xoopsModule
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/onupdate.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/onupdate.php 2014-09-22 08:23:59 UTC (rev 12796)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/onupdate.php 2014-09-22 19:57:08 UTC (rev 12797)
@@ -20,26 +20,26 @@
*/
defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(__FILE__) . '/common.php';
-@include_once WFDOWNLOADS_ROOT_PATH . '/language/' . $xoopsConfig['language'] . '/admin.php';
+@include_once WFDOWNLOADS_ROOT_PATH . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/admin.php';
include_once WFDOWNLOADS_ROOT_PATH . '/class/dbupdater.php';
/**
* @param $xoopsModule
- * @param $prev_version
+ * @param $previousVersion
*
* @return bool
*/
-function xoops_module_update_wfdownloads(&$xoopsModule, $prev_version)
+function xoops_module_update_wfdownloads(&$xoopsModule, $previousVersion)
{
ob_start();
invert_nohtm_dohtml_values();
- if ($prev_version <= 322) {
+ if ($previousVersion < 322) {
update_tables_to_322($xoopsModule);
}
- if ($prev_version <= 323) {
+ if ($previousVersion < 323) {
update_permissions_to_323($xoopsModule);
+ update_tables_to_323($xoopsModule);
}
- update_tables_to_323($xoopsModule);
$feedback = ob_get_clean();
if (method_exists($xoopsModule, 'setMessage')) {
$xoopsModule->setMessage($feedback);
@@ -106,7 +106,7 @@
"summary" => array("Type" => "text NOT NULL", "Default" => false),
"formulize_idreq" => array("Type" => "int(5) NOT NULL default '0'", "Default" => true),
// added 3.23
- "screenshots" => array("Type" => "text NOT NULL default ''", "Default" => true),
+ "screenshots" => array("Type" => "text NOT NULL", "Default" => true),
"dohtml" => array("Type" => "tinyint(1) NOT NULL default '0'", "Default" => true),
"dosmiley" => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
"doxcode" => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
@@ -118,7 +118,7 @@
//);
echo "<br /><span style='font-weight: bold;'>Checking Download table</span><br />";
$download_handler = xoops_getmodulehandler('download', 'wfdownloads');
- $download_table = new WfdownloadsTable("wfdownloads_downloads");
+ $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);
@@ -128,7 +128,20 @@
echo "Downloads table updated<br />";
}
unset($fields);
+ // populate screenshots with screenshot, screenshot2, screenshot3, screenshot4 values
+ $downloadsObjs = $download_handler->getObjects();
+ foreach ($downloadsObjs as $downloadsObj) {
+ $screenshots = array();
+ $screenshots[] = $downloadsObj->getVar('screenshot');
+ $screenshots[] = $downloadsObj->getVar('screenshot2');
+ $screenshots[] = $downloadsObj->getVar('screenshot3');
+ $screenshots[] = $downloadsObj->getVar('screenshot4');
+ $downloadsObj->setVar('screenshots', $screenshots);
+ unset($screenshots);
+ $download_handler->insert($downloadsObj);
+ }
+
// update wfdownloads_mod table
$mod_fields = array(
"requestid" => array("Type" => "int(11) NOT NULL auto_increment", "Default" => false),
@@ -189,7 +202,7 @@
//);
echo "<br /><span style='font-weight: bold;'>Checking Modified Downloads table</span><br />";
$mod_handler = xoops_getmodulehandler('modification', 'wfdownloads');
- $mod_table = new WfdownloadsTable("wfdownloads_mod");
+ $mod_table = new WfdownloadsTable('wfdownloads_mod');
$fields = get_table_info($mod_handler->table, $mod_fields);
// check for renamed fields
//rename_fields($mod_table, $renamed_fields, $fields, $mod_fields);
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/ratefile.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/ratefile.php 2014-09-22 08:23:59 UTC (rev 12796)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/ratefile.php 2014-09-22 19:57:08 UTC (rev 12797)
@@ -110,7 +110,7 @@
if ($wfdownloads->getHandler('rating')->insert($ratingObj)) {
// All is well. Calculate Score & Add to Summary (for quick retrieval & sorting) to DB.
wfdownloads_updateRating($lid);
- $thankyouMessage = _MD_WFDOWNLOADS_VOTEAPPRE . "<br />" . sprintf(_MD_WFDOWNLOADS_THANKYOU, $xoopsConfig['sitename']);
+ $thankyouMessage = _MD_WFDOWNLOADS_VOTEAPPRE . "<br />" . sprintf(_MD_WFDOWNLOADS_THANKYOU, $GLOBALS['xoopsConfig']['sitename']);
redirect_header("singlefile.php?cid={$cid}&lid={$lid}", 4, $thankyouMessage);
} else {
echo $ratingObj->getHtmlErrors();
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/rss.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/rss.php 2014-09-22 08:23:59 UTC (rev 12796)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/rss.php 2014-09-22 19:57:08 UTC (rev 12797)
@@ -31,7 +31,7 @@
$xoopsOption['template_main'] = 'system_' . $feed_type . '.tpl';
error_reporting(0);
-include_once(XOOPS_ROOT_PATH . '/class/template.php');
+include_once XOOPS_ROOT_PATH . '/class/template.php';
$xoopsTpl = new XoopsTpl();
// Find case
@@ -63,7 +63,7 @@
}
$xoopsTpl->caching = true;
-$xoopsTpl->cache_lifetime = $xoopsConfig['module_cache'][(int) $wfdownloads->getModule()->mid()];
+$xoopsTpl->cache_lifetime = $GLOBALS['xoopsConfig']['module_cache'][(int) $wfdownloads->getModule()->mid()];
if (!$xoopsTpl->is_cached('db:' . $xoopsOption['template_main'], $cache_prefix)) {
// Get content
$limit = 30;
@@ -77,8 +77,8 @@
default:
case 'all':
$shorthand = 'all';
- $title = $xoopsConfig['sitename'] . ' - ' . htmlspecialchars($wfdownloads->getModule()->getVar('name'), ENT_QUOTES);
- $desc = $xoopsConfig['slogan'];
+ $title = $GLOBALS['xoopsConfig']['sitename'] . ' - ' . htmlspecialchars($wfdownloads->getModule()->getVar('name'), ENT_QUOTES);
+ $desc = $GLOBALS['xoopsConfig']['slogan'];
$channel_url = XOOPS_URL . '/modules/' . $wfdownloads->getModule()->getVat('dirname') . '/rss.php';
$criteria->add(new Criteria('cid', '(' . implode(',', $allowedDownCategoriesIds) . ')', 'IN'));
@@ -88,8 +88,8 @@
case 'category':
$shorthand = 'cat';
- $title = $xoopsConfig['sitename'] . ' - ' . htmlspecialchars($categoryObj->getVar('title'), ENT_QUOTES);
- $desc = $xoopsConfig['slogan'] . ' - ' . htmlspecialchars($categoryObj->getVar('title'), ENT_QUOTES);
+ $title = $GLOBALS['xoopsConfig']['sitename'] . ' - ' . htmlspecialchars($categoryObj->getVar('title'), ENT_QUOTES);
+ $desc = $GLOBALS['xoopsConfig']['slogan'] . ' - ' . htmlspecialchars($categoryObj->getVar('title'), ENT_QUOTES);
$channel_url = XOOPS_URL . '/modules/' . $wfdownloads->getModule()->getVat('dirname') . '/rss.php?cid=' . (int) $categoryObj->getVar('cid');
$criteria->add(new Criteria('cid', (int) $categoryObj->getVar('cid')));
@@ -103,9 +103,9 @@
$xoopsTpl->assign('channel_desc', xoops_utf8_encode($desc, 'n'));
$xoopsTpl->assign('channel_link', $channel_url);
$xoopsTpl->assign('channel_lastbuild', formatTimestamp(time(), $feed_type));
- $xoopsTpl->assign('channel_webmaster', $xoopsConfig['adminmail']);
- $xoopsTpl->assign('channel_editor', $xoopsConfig['adminmail']);
- $xoopsTpl->assign('channel_editor_name', $xoopsConfig['sitename']);
+ $xoopsTpl->assign('channel_webmaster', $GLOBALS['xoopsConfig']['adminmail']);
+ $xoopsTpl->assign('channel_editor', $GLOBALS['xoopsConfig']['adminmail']);
+ $xoopsTpl->assign('channel_editor_name', $GLOBALS['xoopsConfig']['sitename']);
$xoopsTpl->assign('channel_category', $wfdownloads->getModule()->getVar('name', 'e'));
$xoopsTpl->assign('channel_generator', 'PHP');
$xoopsTpl->assign('channel_language', _LANGCODE);
@@ -128,7 +128,7 @@
$link = $url . 'singlefile.php?lid=' . (int) $item->getVar('lid');
$title = htmlspecialchars($item->getVar('title', 'n'));
$teaser = htmlspecialchars($item->getVar('summary', 'n'));
- $author = isset($users[$item->getVar('submitter')]) ? isset($users[$item->getVar('submitter')]) : $xoopsConfig['anonymous'];
+ $author = isset($users[$item->getVar('submitter')]) ? isset($users[$item->getVar('submitter')]) : $GLOBALS['xoopsConfig']['anonymous'];
$xoopsTpl->append(
'items',
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/singlefile.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/singlefile.php 2014-09-22 08:23:59 UTC (rev 12796)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/singlefile.php 2014-09-22 19:57:08 UTC (rev 12797)
@@ -241,7 +241,7 @@
} else {
$user_reviews = "cid={$cid}&lid={$lid}\">" . _MD_WFDOWNLOADS_NOUSERREVIEWS;
}
-$xoopsTpl->assign('lang_user_reviews', $xoopsConfig['sitename'] . ' ' . _MD_WFDOWNLOADS_USERREVIEWSTITLE);
+$xoopsTpl->assign('lang_user_reviews', $GLOBALS['xoopsConfig']['sitename'] . ' ' . _MD_WFDOWNLOADS_USERREVIEWSTITLE);
$xoopsTpl->assign('lang_UserReviews', sprintf($user_reviews, $downloadObj->getVar('title')));
$xoopsTpl->assign('review_amount', $reviewCount);
@@ -255,7 +255,7 @@
} else {
$user_mirrors = "cid={$cid}&lid={$lid}\">" . _MD_WFDOWNLOADS_NOUSERMIRRORS;
}
-$xoopsTpl->assign('lang_user_mirrors', $xoopsConfig['sitename'] . ' ' . _MD_WFDOWNLOADS_USERMIRRORSTITLE);
+$xoopsTpl->assign('lang_user_mirrors', $GLOBALS['xoopsConfig']['sitename'] . ' ' . _MD_WFDOWNLOADS_USERMIRRORSTITLE);
$xoopsTpl->assign('lang_UserMirrors', sprintf($user_mirrors, $downloadObj->getVar('title')));
$xoopsTpl->assign('mirror_amount', $mirrorCount);
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/sql/mysql.sql
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/sql/mysql.sql 2014-09-22 08:23:59 UTC (rev 12796)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/sql/mysql.sql 2014-09-22 19:57:08 UTC (rev 12797)
@@ -3,14 +3,14 @@
#
CREATE TABLE wfdownloads_broken (
- reportid int(5) NOT NULL auto_increment,
- lid int(11) NOT NULL default '0',
- sender int(11) NOT NULL default '0',
- ip varchar(20) NOT NULL default '',
- date varchar(11) NOT NULL default '0',
- confirmed tinyint(1) NOT NULL default '0',
- acknowledged tinyint(1) NOT NULL default '0',
- PRIMARY KEY (reportid),
+ reportid int(5) NOT NULL auto_increment,
+ lid int(11) NOT NULL default '0',
+ sender int(11) NOT NULL default '0',
+ ip varchar(20) NOT NULL default '',
+ date varchar(11) NOT NULL default '0',
+ confirmed tinyint(1) NOT NULL default '0',
+ acknowledged tinyint(1) NOT NULL default '0',
+ PRIMARY KEY (reportid),
KEY lid (lid),
KEY sender (sender),
KEY ip (ip)
@@ -28,23 +28,23 @@
#
CREATE TABLE wfdownloads_cat (
- cid int(5) unsigned NOT NULL auto_increment,
- pid int(5) unsigned NOT NULL default '0',
- title varchar(255) NOT NULL default '',
- imgurl varchar(255) NOT NULL default '',
- description text NOT NULL,
- total int(11) NOT NULL default '0',
- summary text NOT NULL,
- spotlighttop int(11) NOT NULL default '0',
- spotlighthis int(11) NOT NULL default '0',
- dohtml tinyint(1) NOT NULL default '0',
- dosmiley tinyint(1) NOT NULL default '1',
- doxcode tinyint(1) NOT NULL default '1',
- doimage tinyint(1) NOT NULL default '1',
- dobr tinyint(1) NOT NULL default '1',
- weight int(11) NOT NULL default '0',
- formulize_fid int(5) NOT NULL default '0',
- PRIMARY KEY (cid),
+ cid int(5) unsigned NOT NULL auto_increment,
+ pid int(5) unsigned NOT NULL default '0',
+ title varchar(255) NOT NULL default '',
+ imgurl varchar(255) NOT NULL default '',
+ description text NOT NULL,
+ total int(11) NOT NULL default '0',
+ summary text NOT NULL,
+ spotlighttop int(11) NOT NULL default '0',
+ spotlighthis int(11) NOT NULL default '0',
+ dohtml tinyint(1) NOT NULL default '0',
+ dosmiley tinyint(1) NOT NULL default '1',
+ doxcode tinyint(1) NOT NULL default '1',
+ doimage tinyint(1) NOT NULL default '1',
+ dobr tinyint(1) NOT NULL default '1',
+ weight int(11) NOT NULL default '0',
+ formulize_fid int(5) NOT NULL default '0',
+ PRIMARY KEY (cid),
KEY pid (pid)
) ENGINE=MyISAM;
@@ -59,55 +59,55 @@
#
CREATE TABLE wfdownloads_downloads (
- lid int(11) unsigned NOT NULL auto_increment,
- cid int(5) unsigned NOT NULL default '0',
- title varchar(255) NOT NULL default '',
- url varchar(255) NOT NULL default '',
- filename varchar(150) NOT NULL default '',
- filetype varchar(100) NOT NULL default '',
- homepage varchar(100) NOT NULL default '',
- version varchar(20) NOT NULL default '',
- size int(8) NOT NULL default '0',
- platform varchar(50) NOT NULL default '',
- screenshot varchar(255) NOT NULL default '',
- screenshot2 varchar(255) NOT NULL default '',
- screenshot3 varchar(255) NOT NULL default '',
- screenshot4 varchar(255) NOT NULL default '',
- submitter int(11) NOT NULL default '0',
- publisher varchar(255) NOT NULL default '',
- status tinyint(2) NOT NULL default '0',
- date int(10) NOT NULL default '0',
- hits int(11) unsigned NOT NULL default '0',
- rating double(6,4) NOT NULL default '0.0000',
- votes int(11) unsigned NOT NULL default '0',
- comments int(11) unsigned NOT NULL default '0',
- license varchar(255) NOT NULL default '',
- mirror varchar(255) NOT NULL d...
[truncated message content] |
