Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[11832] XoopsModules/wfdownloads/trunk/wfdownloads
|
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";
|
