Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[10192] XoopsModules/slideshow/trunk/slideshow
|
From: <vo...@us...> - 2012-09-26 11:51:02
|
Revision: 10192
http://xoops.svn.sourceforge.net/xoops/?rev=10192&view=rev
Author: voltan1
Date: 2012-09-26 11:50:53 +0000 (Wed, 26 Sep 2012)
Log Message:
-----------
Fix some bugs
Modified Paths:
--------------
XoopsModules/slideshow/trunk/slideshow/admin/backend.php
XoopsModules/slideshow/trunk/slideshow/class/item.php
XoopsModules/slideshow/trunk/slideshow/xoops_version.php
Modified: XoopsModules/slideshow/trunk/slideshow/admin/backend.php
===================================================================
--- XoopsModules/slideshow/trunk/slideshow/admin/backend.php 2012-09-26 09:52:13 UTC (rev 10191)
+++ XoopsModules/slideshow/trunk/slideshow/admin/backend.php 2012-09-26 11:50:53 UTC (rev 10192)
@@ -84,13 +84,12 @@
case 'additem' :
$obj = $item_handler->create ();
- $obj->setVars ( $_REQUEST );
+ $obj->setVars ( $_POST );
$obj->setVar ( 'item_create', time () );
$obj->setVar ( 'item_order', $item_handler->setitemorder() );
- $item_handler->uploadimg ( $obj, $_REQUEST ['item_img'] );
- $item_handler->uploadthumb ( $obj, $_REQUEST ['item_thumb'] );
-
- if($_REQUEST['item_default'] == 1) {
+ $obj->setVar ( 'item_img', $item_handler->uploadimg ( $_POST ['item_img'] ) );
+ $obj->setVar ( 'item_thumb', $item_handler->uploadthumb ( $_POST ['item_thumb'] ) );
+ if($_POST['item_default'] == 1) {
$item_handler->updateAll ( 'item_default', 0, $obj );
}
@@ -111,14 +110,10 @@
if ($item_id > 0) {
$obj = $item_handler->get ($item_id);
$obj->setVars ( $_REQUEST );
-
$obj->setVar ( 'item_order', $item_handler->setitemorder() );
- $item_handler->uploadimg ( $obj, $_REQUEST ['item_img'] );
-
if($_REQUEST['item_default'] == 1) {
$item_handler->updateAll ( 'item_default', 0, $obj );
}
-
if (! $item_handler->insert ( $obj )) {
redirect_header ( 'onclick="javascript:history.go(-1);"', 1, _AM_SLIDESHOW_MSG_ERROR );
xoops_cp_footer ();
Modified: XoopsModules/slideshow/trunk/slideshow/class/item.php
===================================================================
--- XoopsModules/slideshow/trunk/slideshow/class/item.php 2012-09-26 09:52:13 UTC (rev 10191)
+++ XoopsModules/slideshow/trunk/slideshow/class/item.php 2012-09-26 11:50:53 UTC (rev 10192)
@@ -110,14 +110,18 @@
$imgdir = '/uploads/slideshow/image/';
$fileseltray_item_img = new XoopsFormElementTray ( _AM_SLIDESHOW_ITEM_IMG, '<br />' );
$fileseltray_item_img->addElement ( new XoopsFormLabel ( '', "<img style='max-width: 500px; max-height: 500px;' src='" . XOOPS_URL . $imgdir . $item_img . "' name='image_item' id='image_item' alt='' />" ) );
- $fileseltray_item_img->addElement ( new XoopsFormFile ( _AM_SLIDESHOW_ITEM_FORMUPLOAD, 'item_img', xoops_getModuleOption ( 'img_size', 'slideshow' ) ), false );
+ if ($this->isNew ()) {
+ $fileseltray_item_img->addElement ( new XoopsFormFile ( _AM_SLIDESHOW_ITEM_FORMUPLOAD, 'item_img', xoops_getModuleOption ( 'img_size', 'slideshow' ) ), false );
+ }
$form->addElement ( $fileseltray_item_img );
// thumb
$item_thumb = $this->getVar ( 'item_thumb' ) ? $this->getVar ( 'item_thumb' ) : 'blank.gif';
$thumbdir = '/uploads/slideshow/thumb/';
$fileseltray_item_thumb = new XoopsFormElementTray ( _AM_SLIDESHOW_ITEM_THUMB, '<br />' );
- $fileseltray_item_thumb->addElement ( new XoopsFormLabel ( '', "<img style='max-width: 200px; max-height: 200px;' src='" . XOOPS_URL . $thumbdir . $thumb_img . "' name='image_item' id='image_item' alt='' />" ) );
- $fileseltray_item_thumb->addElement ( new XoopsFormFile ( _AM_SLIDESHOW_ITEM_FORMUPLOAD, 'item_thumb', xoops_getModuleOption ( 'img_size', 'slideshow' ) ), false );
+ $fileseltray_item_thumb->addElement ( new XoopsFormLabel ( '', "<img style='max-width: 200px; max-height: 200px;' src='" . XOOPS_URL . $thumbdir . $item_thumb . "' name='image_item' id='image_item' alt='' />" ) );
+ if ($this->isNew ()) {
+ $fileseltray_item_thumb->addElement ( new XoopsFormFile ( _AM_SLIDESHOW_ITEM_FORMUPLOAD, 'item_thumb', xoops_getModuleOption ( 'img_size', 'slideshow' ) ), false );
+ }
$form->addElement ( $fileseltray_item_thumb );
// Button
$button_tray = new XoopsFormElementTray ( '', '' );
@@ -159,7 +163,7 @@
return $order;
}
- public function uploadimg($obj, $image) {
+ public function uploadimg($image) {
include_once XOOPS_ROOT_PATH . "/class/uploader.php";
$uploader_img = new XoopsMediaUploader (
XOOPS_ROOT_PATH . '/uploads/slideshow/image/',
@@ -169,48 +173,48 @@
xoops_getModuleOption ( 'img_maxheight', 'slideshow' )
);
if ($uploader_img->fetchMedia ( 'item_img' )) {
- $uploader_img->setPrefix ( 'slideshow_' );
- $uploader_img->fetchMedia ( 'item_img' );
- if (! $uploader_img->upload ()) {
- $errors = $uploader_img->getErrors ();
- fmcontent_Redirect ( "javascript:history.go(-1)", 3, $errors );
- xoops_cp_footer ();
- exit ();
- } else {
- $obj->setVar ( 'item_img', $uploader_img->getSavedFileName () );
- }
+ $uploader_img->setPrefix ( 'slideshow_' );
+ $uploader_img->fetchMedia ( 'item_img' );
+ if (! $uploader_img->upload ()) {
+ redirect_header ( 'slideshow.php?op=new_item', 1, $uploader_img->getErrors ());
+ xoops_cp_footer ();
+ exit ();
+ } else {
+ return $uploader_img->getSavedFileName ();
+ }
} else {
- if (isset ( $image )) {
- $obj->setVar ( 'item_img', $image );
- }
+ if (isset ( $image )) {
+ return $image;
+ }
}
+ return '';
}
public function uploadthumb($obj, $thumb) {
include_once XOOPS_ROOT_PATH . "/class/uploader.php";
- $uploader_thumb = new XoopsMediaUploader (
+ $uploader_img = new XoopsMediaUploader (
XOOPS_ROOT_PATH . '/uploads/slideshow/thumb/',
xoops_getModuleOption ( 'img_mime', 'slideshow' ),
xoops_getModuleOption ( 'img_size', 'slideshow' ),
xoops_getModuleOption ( 'img_maxwidth', 'slideshow' ),
xoops_getModuleOption ( 'img_maxheight', 'slideshow' )
);
- if ($uploader_thumb->fetchMedia ( 'item_thumb' )) {
- $uploader_thumb->setPrefix ( 'slideshow_' );
- $uploader_thumb->fetchMedia ( 'item_thumb' );
- if (! $uploader_thumb->upload ()) {
- $errors = $uploader_thumb->getErrors ();
- fmcontent_Redirect ( "javascript:history.go(-1)", 3, $errors );
- xoops_cp_footer ();
- exit ();
- } else {
- $obj->setVar ( 'item_thumb', $uploader_thumb->getSavedFileName () );
- }
+ if ($uploader_img->fetchMedia ( 'item_thumb' )) {
+ $uploader_img->setPrefix ( 'slideshow_' );
+ $uploader_img->fetchMedia ( 'item_thumb' );
+ if (! $uploader_img->upload ()) {
+ redirect_header ( 'slideshow.php?op=new_item', 1, $uploader_img->getErrors ());
+ xoops_cp_footer ();
+ exit ();
+ } else {
+ return $uploader_img->getSavedFileName ();
+ }
} else {
- if (isset ( $thumb )) {
- $obj->setVar ( 'item_thumb', $thumb );
- }
+ if (isset ( $image )) {
+ return $image;
+ }
}
+ return '';
}
public function itemSAdminList($info) {
Modified: XoopsModules/slideshow/trunk/slideshow/xoops_version.php
===================================================================
--- XoopsModules/slideshow/trunk/slideshow/xoops_version.php 2012-09-26 09:52:13 UTC (rev 10191)
+++ XoopsModules/slideshow/trunk/slideshow/xoops_version.php 2012-09-26 11:50:53 UTC (rev 10192)
@@ -120,7 +120,7 @@
'description' => '_MI_SLIDESHOW_IMAGE_MAXWIDTH_DESC',
'formtype' => 'textbox',
'valuetype' => 'text',
- 'default' => '700');
+ 'default' => '1200');
$modversion['config'][] = array(
'name' => 'img_maxheight',
@@ -128,5 +128,5 @@
'description' => '_MI_SLIDESHOW_IMAGE_MAXHEIGHT_DESC',
'formtype' => 'textbox',
'valuetype' => 'text',
- 'default' => '700');
+ 'default' => '1200');
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|