Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12177] XoopsModules/wfdownloads/trunk/wfdownloads/ admin
|
From: <luc...@us...> - 2013-10-15 22:20:15
|
Revision: 12177
http://sourceforge.net/p/xoops/svn/12177
Author: luciorota
Date: 2013-10-15 22:20:13 +0000 (Tue, 15 Oct 2013)
Log Message:
-----------
small improvements in categories and indexpage forms
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/categories.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/indexpage.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/categories.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/categories.php 2013-10-15 21:25:44 UTC (rev 12176)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/categories.php 2013-10-15 22:20:13 UTC (rev 12177)
@@ -88,7 +88,6 @@
$uploader = new XoopsMediaUploader($uploadDirectory, $allowedMimetypes, $maxFileSize, $maxImgWidth, $maxImgHeight);
if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
$uploader->setTargetFileName('wfdownloads_' . uniqid(time()) . '--' . strtolower($_FILES['uploadfile']['name']));
- //$uploader->setPrefix('wfdownloads_' . uniqid(time()) . '--');
$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
if (!$uploader->upload()) {
$errors = $uploader->getErrors();
@@ -97,7 +96,7 @@
$imgurl = $uploader->getSavedFileName();
}
} else {
- $imgurl = ($_POST["imgurl"] && $_POST["imgurl"] != "blank.png") ? $myts -> addslashes($_POST["imgurl"]) : "";
+ $imgurl = (isset($_POST["imgurl"]) && $_POST["imgurl"] != "blank.png") ? $myts -> addslashes($_POST["imgurl"]) : "";
}
// Formulize module support (2006/05/04) jpc
if (wfdownloads_checkModule('formulize') < 300) {
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/indexpage.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/indexpage.php 2013-10-15 21:25:44 UTC (rev 12176)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/indexpage.php 2013-10-15 22:20:13 UTC (rev 12177)
@@ -24,10 +24,29 @@
$op = WfdownloadsRequest::getString('op', 'indexpage.form');
switch ($op) {
case "indexpage.save":
+ // Get post parameters
$indexheading = $myts->addslashes($_POST['indexheading']);
$indexheader = $myts->addslashes($_POST['indexheader']);
$indexfooter = $myts->addslashes($_POST['indexfooter']);
- $indeximage = $myts->addslashes($_POST['indeximage']);
+ include_once XOOPS_ROOT_PATH.'/class/uploader.php';
+ $allowedMimetypes = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png');
+ $maxFileSize = $wfdownloads->getConfig('maxfilesize');
+ $maxImgWidth = $wfdownloads->getConfig('maximgwidth');
+ $maxImgHeight = $wfdownloads->getConfig('maximgheight');
+ $uploadDirectory = XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('mainimagedir');
+ $uploader = new XoopsMediaUploader($uploadDirectory, $allowedMimetypes, $maxFileSize, $maxImgWidth, $maxImgHeight);
+ if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
+ $uploader->setTargetFileName('wfdownloads_' . uniqid(time()) . '--' . strtolower($_FILES['uploadfile']['name']));
+ $uploader->fetchMedia($_POST['xoops_upload_file'][0]);
+ if (!$uploader->upload()) {
+ $errors = $uploader->getErrors();
+ redirect_header("javascript:history.go(-1)",3, $errors);
+ } else {
+ $indeximage = $uploader->getSavedFileName();
+ }
+ } else {
+ $indeximage = (isset($_POST["indeximage"]) && $_POST["indeximage"] != "blank.png") ? $myts->addslashes($_POST['indeximage']) : "";
+ }
$nohtml = isset($_POST['nohtml']);
$nosmiley = isset($_POST['nosmiley']);
$noxcodes = isset($_POST['noxcodes']);
@@ -35,12 +54,20 @@
$nobreak = isset($_POST['nobreak']);
$indexheaderalign = $_POST['indexheaderalign'];
$indexfooteralign = $_POST['indexfooteralign'];
-
- $xoopsDB->query(
- "update " . $xoopsDB->prefix("wfdownloads_indexpage") . " set indexheading='$indexheading', indexheader='$indexheader', indexfooter='$indexfooter', indeximage='$indeximage', indexheaderalign='$indexheaderalign', indexfooteralign='$indexfooteralign', nohtml='"
- . intval($nohtml) . "', nosmiley='" . intval($nosmiley) . "', noxcodes='" . intval($noxcodes) . "', noimages='" . intval($noimages)
- . "', nobreak='" . intval($nobreak) . "' "
- );
+ // Update db
+ $sql = "update {$xoopsDB->prefix("wfdownloads_indexpage")} set";
+ $sql.= " indexheading='{$indexheading}',";
+ $sql.= " indexheader='{$indexheader}',";
+ $sql.= " indexfooter='{$indexfooter}',";
+ $sql.= " indeximage='{$indeximage}',";
+ $sql.= " indexheaderalign='{$indexheaderalign}',";
+ $sql.= " indexfooteralign='{$indexfooteralign}',";
+ $sql.= " nohtml='{$nohtml}',";
+ $sql.= " nosmiley='{$nosmiley}',";
+ $sql.= " noxcodes='{$noxcodes}',";
+ $sql.= " noimages='{$noimages}',";
+ $sql.= " nobreak='{$nobreak}' ";
+ $xoopsDB->query($sql);
redirect_header(WFDOWNLOADS_URL . '/admin/indexpage.php', 1, _AM_WFDOWNLOADS_IPAGE_UPDATED);
exit();
@@ -51,10 +78,9 @@
include_once WFDOWNLOADS_ROOT_PATH . '/class/wfdownloads_lists.php';
include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
- $result = $xoopsDB->query(
- "SELECT indeximage, indexheading, indexheader, indexfooter, nohtml, nosmiley, noxcodes, noimages, nobreak, indexheaderalign, indexfooteralign FROM "
- . $xoopsDB->prefix('wfdownloads_indexpage') . " "
- );
+ $sql = "SELECT indeximage, indexheading, indexheader, indexfooter, nohtml, nosmiley, noxcodes, noimages, nobreak, indexheaderalign, indexfooteralign";
+ $sql.= " FROM {$xoopsDB->prefix('wfdownloads_indexpage')} ";
+ $result = $xoopsDB->query($sql);
list($indeximage, $indexheading, $indexheader, $indexfooter, $nohtml, $nosmiley, $noxcodes, $noimages, $nobreak, $indexheaderalign,
$indexfooteralign)
= $xoopsDB->fetchrow($result);
@@ -68,63 +94,59 @@
echo "</fieldset>\n";
$sform = new XoopsThemeForm(_AM_WFDOWNLOADS_IPAGE_MODIFY, "op", xoops_getenv('PHP_SELF'));
+ $sform->setExtra('enctype="multipart/form-data"');
+ // indexpage: indexheading
$sform->addElement(new XoopsFormText(_AM_WFDOWNLOADS_IPAGE_CTITLE, 'indexheading', 60, 60, $indexheading), false);
- $graph_array = WfsLists::getListTypeAsArray(XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('mainimagedir'), $type = "images");
- $indeximage_select = new XoopsFormSelect('', 'indeximage', $indeximage);
- $indeximage_select->addOptionArray($graph_array);
- $indeximage_select->setExtra(
- "onchange='showImgSelected(\"image\", \"indeximage\", \"" . $wfdownloads->getConfig('mainimagedir') . "\", \"\", \"" . XOOPS_URL . "\")'"
- );
- $indeximage_tray = new XoopsFormElementTray(_AM_WFDOWNLOADS_IPAGE_CIMAGE, ' ');
- $indeximage_tray->addElement($indeximage_select);
- if (!empty($indeximage)) {
- $indeximage_tray->addElement(
- new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . '/' . $wfdownloads->getConfig('mainimagedir') . '/' . $indeximage
- . "' 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' />")
- );
- }
+ // indexpage: indeximage
+ $indeximage_path = $indeximage ? $wfdownloads->getConfig('mainimagedir') . '/' . $indeximage : WFDOWNLOADS_IMAGES_URL . '/blank.gif';
+ $indeximage_tray = new XoopsFormElementTray(_AM_WFDOWNLOADS_IPAGE_CIMAGE, '<br />');
+ $indeximage_tray->addElement(new XoopsFormLabel(_AM_WFDOWNLOADS_DOWN_FUPLOADPATH, XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('mainimagedir')));
+ $indeximage_tray->addElement(new XoopsFormLabel(_AM_WFDOWNLOADS_DOWN_FUPLOADURL, XOOPS_URL . '/' . $wfdownloads->getConfig('mainimagedir')));
+ $graph_array = & WfsLists::getListTypeAsArray(XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('mainimagedir'), $type = "images");
+ $indeximage_select = new XoopsFormSelect('', 'indeximage', $indeximage);
+ $indeximage_select->addOptionArray($graph_array);
+ $indeximage_select->setExtra(
+ "onchange='showImgSelected(\"image\", \"indeximage\", \"" . $wfdownloads->getConfig('mainimagedir') . "\", \"\", \"" . XOOPS_URL . "\")'"
+ );
+ $indeximage_tray->addElement($indeximage_select, false);
+ $indeximage_tray->addElement( new XoopsFormLabel( '', "<img src='" . XOOPS_URL . "/" . $indeximage_path . "' name='image' id='image' alt='' />" ) );
+ $indeximage_tray->addElement(new XoopsFormFile(_AM_WFDOWNLOADS_BUPLOAD , 'uploadfile', 0), false);
$sform->addElement($indeximage_tray);
-
+ // indexpage: indexheader
$sform->addElement(new XoopsFormDhtmlTextArea(_AM_WFDOWNLOADS_IPAGE_CHEADING, 'indexheader', $indexheader, 15, 60));
+ // indexpage: indexheaderalign
$headeralign_select = new XoopsFormSelect(_AM_WFDOWNLOADS_IPAGE_CHEADINGA, "indexheaderalign", $indexheaderalign);
$headeralign_select->addOptionArray(
array("left" => _AM_WFDOWNLOADS_IPAGE_CLEFT, "right" => _AM_WFDOWNLOADS_IPAGE_CRIGHT, "center" => _AM_WFDOWNLOADS_IPAGE_CCENTER)
);
$sform->addElement($headeralign_select);
+ // indexpage: indexfooter
$sform->addElement(new XoopsFormDhtmlTextArea(_AM_WFDOWNLOADS_IPAGE_CFOOTER, 'indexfooter', $indexfooter, 15, 60));
+ // indexpage: indexfooteralign
$footeralign_select = new XoopsFormSelect(_AM_WFDOWNLOADS_IPAGE_CFOOTERA, "indexfooteralign", $indexfooteralign);
$footeralign_select->addOptionArray(
array("left" => _AM_WFDOWNLOADS_IPAGE_CLEFT, "right" => _AM_WFDOWNLOADS_IPAGE_CRIGHT, "center" => _AM_WFDOWNLOADS_IPAGE_CCENTER)
);
$sform->addElement($footeralign_select);
-
+ // indexpage: nohtml, nosmailey, noxcodes, noimages, nobreak
$options_tray = new XoopsFormElementTray(_AM_WFDOWNLOADS_TEXTOPTIONS, '<br />');
-
$html_checkbox = new XoopsFormCheckBox('', 'nohtml', $nohtml);
$html_checkbox->addOption(1, _AM_WFDOWNLOADS_ALLOWHTML);
$options_tray->addElement($html_checkbox);
-
$smiley_checkbox = new XoopsFormCheckBox('', 'nosmiley', $nosmiley);
$smiley_checkbox->addOption(1, _AM_WFDOWNLOADS_ALLOWSMILEY);
$options_tray->addElement($smiley_checkbox);
-
$xcodes_checkbox = new XoopsFormCheckBox('', 'noxcodes', $noxcodes);
$xcodes_checkbox->addOption(1, _AM_WFDOWNLOADS_ALLOWXCODE);
$options_tray->addElement($xcodes_checkbox);
-
$noimages_checkbox = new XoopsFormCheckBox('', 'noimages', $noimages);
$noimages_checkbox->addOption(1, _AM_WFDOWNLOADS_ALLOWIMAGES);
$options_tray->addElement($noimages_checkbox);
-
$breaks_checkbox = new XoopsFormCheckBox('', 'nobreak', $nobreak);
$breaks_checkbox->addOption(1, _AM_WFDOWNLOADS_ALLOWBREAK);
$options_tray->addElement($breaks_checkbox);
$sform->addElement($options_tray);
-
+ // form: button try
$button_tray = new XoopsFormElementTray('', '');
$hidden = new XoopsFormHidden('op', 'indexpage.save');
$button_tray->addElement($hidden);
|
