holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Image_transfor is now dual licensed

Browse Source 
lets use upload_url as index
This commit is contained in:
Cornelius Weiß 2005-10-11 22:16:35 +00:00
parent 4a4b6c3aaf
commit ac86dc76e6
3 changed files with 24 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
phpgwapi/js/tinymce/jscripts/tiny_mce/plugins/filemanager/InsertFile/GD.php vendored
View File

@ -1,17 +1,13 @@
<?php
/***********************************************************************
** Title.........: GD Driver
** Version.......: 1.0
** Author........: Xiang Wei ZHUO <wei@zhuo.org>
** 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 <peter@mapledesign.co.uk> |
// | Alan Knowles <alan@akbkhome.com> |
// +----------------------------------------------------------------------+
//
// 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 <vincent@sunlight.tmfweb.nl> |
// +----------------------------------------------------------------------+//
//
// Image Transformation interface using the GD library
//
//
// $Id$
require_once "Transform.php";

22
phpgwapi/js/tinymce/jscripts/tiny_mce/plugins/filemanager/InsertFile/Transform.php vendored
View File

@ -1,23 +1,13 @@
<?php
/***********************************************************************
** Title.........: Image Transformation Interface
** Version.......: 1.0
** Author........: Xiang Wei ZHUO <wei@zhuo.org>
** 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 <peter@mapledesign.co.uk> |
// | Alan Knowles <alan@akbkhome.com> |
// | Vincent Oostindie <vincent@sunlight.tmfweb.nl> |

6
phpgwapi/js/tinymce/jscripts/tiny_mce/plugins/filemanager/InsertFile/config.inc.php vendored
View File

@ -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 = '/';
?>
?>