Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[9843] XoopsModules/TDMPicture/trunk/TDMPicture
|
From: <lor...@us...> - 2012-07-10 16:16:18
|
Revision: 9843
http://xoops.svn.sourceforge.net/xoops/?rev=9843&view=rev
Author: lord_venom
Date: 2012-07-10 16:16:12 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
remove edit_img
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php
XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php
XoopsModules/TDMPicture/trunk/TDMPicture/download.php
XoopsModules/TDMPicture/trunk/TDMPicture/modfile.php
XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php 2012-07-10 13:22:59 UTC (rev 9842)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php 2012-07-10 16:16:12 UTC (rev 9843)
@@ -182,72 +182,7 @@
}
break;
- case "save_img":
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header('index.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
- }
- if (isset($_REQUEST['file_id'])) {
- $obj =& $file_handler->get($_REQUEST['file_id']);
- } else {
- $obj =& $file_handler->create();
- }
-
- if (!empty($xoopsUser) && $xoopsUser->getVar('uid') == $obj->getVar('file_uid') OR $xoopsUser->isAdmin())
- {
- $targ_w = $targ_h = 150;
- $jpeg_quality = 90;
- $uploaddir = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/upload/";
-
- $src = TDMPICTURE_UPLOADS_PATH.$obj->getVar('file_file');
- $img_r = imagecreatefromjpeg($src);
- $dst_r = ImageCreateTrueColor( $_REQUEST['w'], $_REQUEST['h'] );
-
- imagecopyresampled($dst_r,$img_r,0,0,$_POST['x'],$_REQUEST['y'],
- $_REQUEST['w'], $_REQUEST['h'],$_REQUEST['w'],$_REQUEST['h']);
-
- $erreur = ImageJpeg ($dst_r, TDMPICTURE_UPLOADS_PATH.$obj->getVar('file_file'), $xoopsModuleConfig['tdmpicture_thumb_quality']);
-
- //insert
- $obj->setVar('file_size', @filesize($src));
- $obj->setVar('file_indate', time());
- $obj->setVar('file_display', $_REQUEST['file_display']);
- $obj->setVar('file_type', 'image/jpeg');
- $obj->setVar('file_res_x', $_REQUEST['w']);
- $obj->setVar('file_res_y', $_REQUEST['h']);
- //thumb
- $thumb = new Thumbnail(TDMPICTURE_UPLOADS_PATH.$obj->getVar('file_file'));
- switch($xoopsModuleConfig['tdmpicture_thumb_style']) {
-
- case "center":
- default:
- $thumb->cropFromCenter($xoopsModuleConfig['tdmpicture_thumb_width']);
- break;
-
- case "limit-width-height":
- $thumb->resize($xoopsModuleConfig['tdmpicture_thumb_width'],$xoopsModuleConfig['tdmpicture_thumb_heigth']);
- break;
-
- case "limit-width":
- $thumb->resize($xoopsModuleConfig['tdmpicture_thumb_width'], "");
- break;
-
- case "limit-height":
- $thumb->resize("",$xoopsModuleConfig['tdmpicture_thumb_heigth']);
- break;
- }
- $thumb->save(TDMPICTURE_THUMB_PATH.$obj->getVar('file_file'),$xoopsModuleConfig['tdmpicture_thumb_quality']);
- $erreur .= $file_handler->insert($obj);
- }
-
- if ($erreur) {
- redirect_header('files.php', 2, _AM_TDMPICTURE_BASE);
- } else {
- redirect_header('files.php', 2, _AM_TDMPICTURE_BASEERROR);
- }
-
- break;
-
case "edit":
//admin menu
$category_admin = new ModuleAdmin();
@@ -261,19 +196,6 @@
$form->display();
break;
- case "edit_img":
- //admin menu
- $category_admin = new ModuleAdmin();
- echo $category_admin->addNavigation('files.php');
- $category_admin->addItemButton(_AM_TDMPICTURE_FILE_UPLOAD, 'files.php?op=upload', 'add');
- $category_admin->addItemButton(_AM_TDMPICTURE_LIST_FILE, 'files.php?op=list', 'list');
- echo $category_admin->renderButton();
-
- $obj = $file_handler->get($_REQUEST['file_id']);
- $form = $obj->getImg();
- $form->display();
- break;
-
case "delete":
$obj =& $file_handler->get($_REQUEST['file_id']);
if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) {
@@ -488,7 +410,7 @@
echo '<td align="center" style="vertical-align:middle;">';
echo '<a href="files.php?op=edit&file_id='.$file_id.'"><img src=' . $pathIcon16.'/edit.png border="0" alt="'._AM_TDMPICTURE_MODIFY.'" title="'._AM_TDMPICTURE_MODIFY.'"></a>';
echo '<a href="files.php?op=delete&file_id='.$file_id.'"><img src=' . $pathIcon16.'/delete.png border="0" alt="'._AM_TDMPICTURE_DELETE.'" title="'._AM_TDMPICTURE_DELETE.'"></a>';
- echo '<a href="files.php?op=edit_img&file_id='.$file_id.'"><img src="./../images/picture_edit.png" border="0" alt="'._AM_TDMPICTURE_EDITIMG.'" title="'._AM_TDMPICTURE_EDITIMG.'"></a>';
+ //echo '<a href="files.php?op=edit_img&file_id='.$file_id.'"><img src="./../images/picture_edit.png" border="0" alt="'._AM_TDMPICTURE_EDITIMG.'" title="'._AM_TDMPICTURE_EDITIMG.'"></a>';
echo '</td>';
echo '</tr>';
}
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php 2012-07-10 13:22:59 UTC (rev 9842)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php 2012-07-10 16:16:12 UTC (rev 9843)
@@ -289,107 +289,7 @@
}
- function getImg($action = false)
- {
-
- global $xoopsUser, $xoopsDB, $xoopsModule, $xoopsModuleConfig;
-
- if ($action === false) {
- $action = $_SERVER['REQUEST_URI'];
- }
- $title = $this->isNew() ? sprintf(_MD_TDMPICTURE_ADD) : sprintf(_MD_TDMPICTURE_EDIT);
- include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
-
- $form = new XoopsThemeForm($title, 'form', $action, 'post', true);
- $form->setExtra('enctype="multipart/form-data" onsubmit="return checkCoords();"');
-
- //$form->addElement(new XoopsFormText(_MD_TDMPICTURE_TITLE, 'cat_title', 80, 255, $this->getVar('cat_title')));
- if (!$this->isNew()) {
- //Load groups
- $form->addElement(new XoopsFormHidden('id', $this->getVar('cat_id')));
- }
-
- //on test l'existance de l'image
- $img = $this->getVar("file_file") ? $this->getVar("file_file") : 'blank.gif';
- $imgpath = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/upload/".$img;
- if (file_exists($imgpath)) {
- $file_img = XOOPS_URL. "/modules/".$xoopsModule->dirname()."/upload/".$this->getVar("file_file");
- } else {
- $file_img = XOOPS_URL. "/modules/".$xoopsModule->dirname()."/upload/blank.gif";
- }
-
- echo '<script language="Javascript">
- var $tdmpicture = jQuery.noConflict();
- $tdmpicture(document).ready(function(){
-
- $tdmpicture("#cropbox").Jcrop({
- onChange: showCoords,
- onSelect: showCoords,
- aspectRatio: 0
- });
-
- });
-
-function showCoords(c)
-{
- var $tdmpicture = jQuery.noConflict();
- $tdmpicture("#x").val(c.x);
- $tdmpicture("#y").val(c.y);
- $tdmpicture("#x2").val(c.x2);
- $tdmpicture("#y2").val(c.y2);
- $tdmpicture("#w").val(c.w);
- $tdmpicture("#h").val(c.h);
-};
-
-function checkCoords()
- {
- if (parseInt($("#x").val())) return true;
- alert("Please select a crop region then press submit.");
- return false;
- };
-</script>';
-
- echo '<div style="border:1px solid #ccc;" align="center"><img src="'.$file_img.'" alt="" title="" id="cropbox" >
- <br />';
-
-
- $form->insertBreak('<div align="center">'._MD_TDMPICTURE_NEWTHUMB.'</div>', 'odd');
-$img = new XoopsFormElementTray(_MD_TDMPICTURE_RECAD,'');
-$img->addElement(new XoopsFormText('X1', 'x', 4, 4, ''));
-$img->addElement(new XoopsFormText('Y1', 'y', 4, 4, ''));
-$img->addElement(new XoopsFormText('X2', 'x2', 4, 4, ''));
-$img->addElement(new XoopsFormText('Y2', 'y2', 4, 4, ''));
-$img->addElement(new XoopsFormText('W', 'w', 4, 4, ''));
-$img->addElement(new XoopsFormText('H', 'h', 4, 4, ''));
-$form->addElement($img);
-
-//visible
-if ( is_object($xoopsUser) && $xoopsUser->isAdmin()) {
- $form->addElement(new XoopsFormRadioYN(_MD_TDMPICTURE_DISPLAYUSER, 'file_display', $this->getVar('file_display'), _YES, _NO));
- }else {
-
- $gperm_handler =& xoops_gethandler('groupperm');
-
- if (is_object($xoopsUser)) {
- $groups = $xoopsUser->getGroups();
- } else {
- $groups = XOOPS_GROUP_ANONYMOUS;
- }
-
- if ($gperm_handler->checkRight('tdmpicture_view', 256, $groups, $xoopsModule->getVar('mid'))) {
- $form->addElement(new XoopsFormHidden('file_display', 1));
- }else {
- $form->addElement(new XoopsFormHidden('file_display', 0));
- }
- }
-
- $form->addElement(new XoopsFormHidden('op', 'save_img'));
- $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
-
- return $form;
- }
-
}
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/download.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/download.php 2012-07-10 13:22:59 UTC (rev 9842)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/download.php 2012-07-10 16:16:12 UTC (rev 9843)
@@ -59,5 +59,10 @@
//header('Content-Type: application/force-download');
//header ('Content-Disposition: attachment; filename='.$document_file.'');
//header('Content-length: '.$document->getVar("file_size"));
-echo "<html><head><meta http-equiv=\"Refresh\" content=\"0; URL=".$document_file."\"></meta></head><body></body></html>";
+ header('Content-Type: application/force-download');
+ header('Content-Disposition: attachment; filename='.basename($document_file));
+ readfile($document_file);
+
+
+//echo "<html><head><meta http-equiv=\"Refresh\" content=\"0; URL=".$document_file."\"></meta></head><body></body></html>";
?>
\ No newline at end of file
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/modfile.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/modfile.php 2012-07-10 13:22:59 UTC (rev 9842)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/modfile.php 2012-07-10 16:16:12 UTC (rev 9843)
@@ -92,79 +92,8 @@
}
break;
-
- //modifier image
- case "edit_img":
-
- //perm
-if (!$gperm_handler->checkRight('tdmpicture_view', 128, $groups, $xoopsModule->getVar('mid'))) {
-redirect_header(XOOPS_URL, 2,_MD_TDMPICTURE_NOPERM);
-exit();
-}
-
- $obj = $file_handler->get($_REQUEST['file_id']);
- if (!empty($xoopsUser) && $xoopsUser->getVar('uid') == $obj->getVar('file_uid') OR $xoopsUser->isAdmin())
- {
- $form = $obj->getImg();
- $form->display();
- } else {
- redirect_header(TDMPICTURE_URL, 2, _MD_TDMPICTURE_NOPERM);
- }
- break;
- case "save_img":
-
-//perm
-if (!$gperm_handler->checkRight('tdmpicture_view', 128, $groups, $xoopsModule->getVar('mid'))) {
-redirect_header(XOOPS_URL, 2,_MD_TDMPICTURE_NOPERM);
-exit();
-}
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header('index.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
- }
- if (isset($_REQUEST['file_id'])) {
- $obj =& $file_handler->get($_REQUEST['file_id']);
- } else {
- $obj =& $file_handler->create();
- }
-
- if (!empty($xoopsUser) && $xoopsUser->getVar('uid') == $obj->getVar('file_uid') OR $xoopsUser->isAdmin())
- {
- $targ_w = $targ_h = 150;
- $jpeg_quality = 90;
- $uploaddir = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/upload/";
-
- $src = TDMPICTURE_UPLOADS_PATH.$obj->getVar('file_file');
- $img_r = imagecreatefromjpeg($src);
- $dst_r = ImageCreateTrueColor( $_REQUEST['w'], $_REQUEST['h'] );
-
- imagecopyresampled($dst_r,$img_r,0,0,$_POST['x'],$_REQUEST['y'],
- $_REQUEST['w'], $_REQUEST['h'],$_REQUEST['w'],$_REQUEST['h']);
-
- $erreur = ImageJpeg ($dst_r, TDMPICTURE_UPLOADS_PATH.$obj->getVar('file_file'), $xoopsModuleConfig['tdmpicture_thumb_quality']);
- //insert
- $obj->setVar('file_size', @filesize($src));
- $obj->setVar('file_indate', time());
- $obj->setVar('file_display', $_REQUEST['file_display']);
- $obj->setVar('file_type', 'image/jpeg');
- $obj->setVar('file_res_x', $_REQUEST['w']);
- $obj->setVar('file_res_y', $_REQUEST['h']);
- //thumb
- $thumb = new Thumbnail(TDMPICTURE_UPLOADS_PATH.$obj->getVar('file_file'));
- $thumb->resize($xoopsModuleConfig['tdmpicture_thumb_width'],$xoopsModuleConfig['tdmpicture_thumb_heigth']);
- $thumb->save(TDMPICTURE_THUMB_PATH.$obj->getVar('file_file'),$xoopsModuleConfig['tdmpicture_thumb_quality']);
- $erreur .= $file_handler->insert($obj);
- }
-
- if ($erreur) {
- redirect_header('javascript:history.go(-2)', 2, _AM_TDMPICTURE_BASE);
- } else {
- redirect_header(TDMPICTURE_URL, 2, _AM_TDMPICTURE_BASEERROR);
- }
-
- break;
-
case "delete":
//perm
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html 2012-07-10 13:22:59 UTC (rev 9842)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html 2012-07-10 16:16:12 UTC (rev 9843)
@@ -106,7 +106,6 @@
<div align="center">
<{if $file.edit}>
<a href="<{$smarty.const.TDMPICTURE_URL}>/modfile.php?op=edit&file_id=<{$file.id}>"><img src="<{xoModuleIcons16 edit.png}>"></a>
-<a href="<{$smarty.const.TDMPICTURE_URL}>/modfile.php?op=edit_img&file_id=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/picture_edit.png"></a>
<{/if}>
<{if $file.del}>
<a href="<{$smarty.const.TDMPICTURE_URL}>/modfile.php?op=delete&file_id=<{$file.id}>"><img src="<{xoModuleIcons16 delete.png}>"></a>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
