From ac86dc76e6c700a6b5b68ec2d26ef712903473a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cornelius=20Wei=C3=9F?= Date: Tue, 11 Oct 2005 22:16:35 +0000 Subject: [PATCH] Image_transfor is now dual licensed lets use upload_url as index --- .../plugins/filemanager/InsertFile/GD.php | 37 +++++++------------ .../filemanager/InsertFile/Transform.php | 22 ++++------- .../filemanager/InsertFile/config.inc.php | 6 +-- 3 files changed, 24 insertions(+), 41 deletions(-) diff --git a/phpgwapi/js/tinymce/jscripts/tiny_mce/plugins/filemanager/InsertFile/GD.php b/phpgwapi/js/tinymce/jscripts/tiny_mce/plugins/filemanager/InsertFile/GD.php index 19fa1d45d7..586d5bf487 100644 --- a/phpgwapi/js/tinymce/jscripts/tiny_mce/plugins/filemanager/InsertFile/GD.php +++ b/phpgwapi/js/tinymce/jscripts/tiny_mce/plugins/filemanager/InsertFile/GD.php @@ -1,17 +1,13 @@ -** Filename......: GD.php -** Last changed..: 30 Aug 2003 -** Notes.........: Orginal is from PEAR -**/ // +----------------------------------------------------------------------+ // | PHP Version 4 | // +----------------------------------------------------------------------+ // | Copyright (c) 1997-2002 The PHP Group | // +----------------------------------------------------------------------+ +// | This software is available under the two different licenses | +// | mentioned below. To use this software you must chose, and qualify, | +// |for one of those. | +// +----------------------------------------------------------------------+ // | This source file is subject to version 2.02 of the PHP license, | // | that is bundled with this package in the file LICENSE, and is | // | available at through the world-wide-web at | @@ -20,27 +16,20 @@ // | obtain it through the world-wide-web, please send a note to | // | license@php.net so we can mail you a copy immediately. | // +----------------------------------------------------------------------+ +// | This program is free software; you can redistribute it and/or modify | +// | it under the terms of the GNU Lesser General Public License as | +// | published by the Free Software Foundation; version 2 of the License. | +// +----------------------------------------------------------------------+ // | Authors: Peter Bowyer | // | Alan Knowles | -// +----------------------------------------------------------------------+ -// -// Usage : -// $img = new Image_Transform_GD(); -// $angle = -78; -// $img->load('magick.png'); -// -// if($img->rotate($angle,array('autoresize'=>true,'color_mask'=>array(255,0,0)))){ -// $img->addText(array('text'=>"Rotation $angle",'x'=>0,'y'=>100,'font'=>'/usr/share/fonts/default/TrueType/cogb____.ttf')); -// $img->display(); -// } else { -// echo "Error"; -// } -// -// -// $Id$ +// | Vincent Oostindie | +// +----------------------------------------------------------------------+// // // Image Transformation interface using the GD library // +// +// $Id$ + require_once "Transform.php"; diff --git a/phpgwapi/js/tinymce/jscripts/tiny_mce/plugins/filemanager/InsertFile/Transform.php b/phpgwapi/js/tinymce/jscripts/tiny_mce/plugins/filemanager/InsertFile/Transform.php index 4d78b29894..e60e09d60b 100644 --- a/phpgwapi/js/tinymce/jscripts/tiny_mce/plugins/filemanager/InsertFile/Transform.php +++ b/phpgwapi/js/tinymce/jscripts/tiny_mce/plugins/filemanager/InsertFile/Transform.php @@ -1,23 +1,13 @@ -** Filename......: Transform.php -** Last changed..: 30 Aug 2003 -** Notes.........: Orginal is from PEAR - - Added a few extra, - - create unique filename in a particular directory, - used for temp image files. - - added cropping to GD, NetPBM, ImageMagick -**/ - // +----------------------------------------------------------------------+ // | PHP Version 4 | // +----------------------------------------------------------------------+ // | Copyright (c) 1997-2002 The PHP Group | // +----------------------------------------------------------------------+ +// | This software is available under the two different licenses | +// | mentioned below. To use this software you must chose, and qualify, | +// |for one of those. | +// +----------------------------------------------------------------------+ // | This source file is subject to version 2.02 of the PHP license, | // | that is bundled with this package in the file LICENSE, and is | // | available at through the world-wide-web at | @@ -26,6 +16,10 @@ // | obtain it through the world-wide-web, please send a note to | // | license@php.net so we can mail you a copy immediately. | // +----------------------------------------------------------------------+ +// | This program is free software; you can redistribute it and/or modify | +// | it under the terms of the GNU Lesser General Public License as | +// | published by the Free Software Foundation; version 2 of the License. | +// +----------------------------------------------------------------------+ // | Authors: Peter Bowyer | // | Alan Knowles | // | Vincent Oostindie | diff --git a/phpgwapi/js/tinymce/jscripts/tiny_mce/plugins/filemanager/InsertFile/config.inc.php b/phpgwapi/js/tinymce/jscripts/tiny_mce/plugins/filemanager/InsertFile/config.inc.php index 0bdf314630..0283851a64 100644 --- a/phpgwapi/js/tinymce/jscripts/tiny_mce/plugins/filemanager/InsertFile/config.inc.php +++ b/phpgwapi/js/tinymce/jscripts/tiny_mce/plugins/filemanager/InsertFile/config.inc.php @@ -50,9 +50,9 @@ if(is_writeable($sessdata['upload_dir'])) { $MY_DOCUMENT_ROOT = $BASE_DIR = $sessdata['upload_dir']; - if (isset($sessdata['base_url']) && !empty($sessdata['base_url'])) + if (isset($sessdata['upload_url']) && !empty($sessdata['upload_url'])) { - $MY_BASE_URL = $sessdata['base_url']; + $MY_BASE_URL = $sessdata['upload_url']; } else { @@ -195,4 +195,4 @@ else require('lang/lang-en.php'); $MY_PATH = '/'; $MY_UP_PATH = '/'; -?> \ No newline at end of file +?>