diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 95b3898..ef46981 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,23 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="6935a589-a69e-4859-b244-568b82d978d5" name="默认更改列表" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/check.php" beforeDir="false" afterPath="$PROJECT_DIR$/check.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/config.php" beforeDir="false" afterPath="$PROJECT_DIR$/config.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/tinyfilemanager.php" beforeDir="false" afterPath="$PROJECT_DIR$/tinyfilemanager.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/crossdomain/config.php" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/crossdomain/file.php" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/crossdomain/libs/class.upload.php" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/crossdomain/libs/function.php" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/crossdomain/libs/imgcompress.php" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/crossdomain/libs/lang/class.upload.xx_XX.php" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/crossdomain/libs/lang/class.upload.zh_CN.gb-2312.php" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/crossdomain/libs/lang/class.upload.zh_CN.php" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/crossdomain/public/static/hkxzy.ttf" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/crossdomain/public/static/watermark.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/crossdomain/read.txt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/file.php" beforeDir="false" afterPath="$PROJECT_DIR$/file.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/libs/function.php" beforeDir="false" afterPath="$PROJECT_DIR$/libs/function.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -21,42 +34,56 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/tinyfilemanager.php">
+        <entry file="file://$PROJECT_DIR$/file.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="654">
-              <caret line="27" column="76" selection-start-line="27" selection-start-column="76" selection-end-line="27" selection-end-column="76" />
-              <folding>
-                <element signature="n#style#0;n#textarea#0;n#!!top" expanded="true" />
-                <element signature="e#1#7#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="855">
+              <caret line="90" column="5" selection-start-line="90" selection-start-column="5" selection-end-line="90" selection-end-column="5" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/check.php">
+        <entry file="file://$PROJECT_DIR$/config.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="650">
-              <caret line="25" column="5" selection-start-line="25" selection-start-column="5" selection-end-line="25" selection-end-column="5" />
+            <state relative-caret-position="78">
+              <caret line="9" column="36" selection-start-line="9" selection-start-column="36" selection-end-line="9" selection-end-column="36" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/libs/function.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="439">
+              <caret line="125" column="13" lean-forward="true" selection-start-line="125" selection-start-column="13" selection-end-line="125" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/index.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1115">
+              <caret line="83" column="52" selection-start-line="83" selection-start-column="52" selection-end-line="83" selection-end-column="52" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/libs/WaterMask.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="52">
+              <caret line="2" column="6" selection-start-line="2" selection-start-column="6" selection-end-line="2" selection-end-column="6" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/config.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="75">
-              <caret line="18" column="16" lean-forward="true" selection-start-line="18" selection-start-column="16" selection-end-line="18" selection-end-column="16" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/README.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="596">
-                <caret line="20" column="32" lean-forward="true" selection-start-line="20" selection-start-column="3" selection-end-line="20" selection-end-column="32" />
+              <first_editor relative-caret-position="388">
+                <caret line="96" column="10" selection-start-line="96" selection-start-column="10" selection-end-line="96" selection-end-column="10" />
               </first_editor>
               <second_editor />
             </state>
@@ -68,6 +95,7 @@
   <component name="FindInProjectRecents">
     <findStrings>
       <find>.js</find>
+      <find>compress</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -76,13 +104,16 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/test.php" />
         <option value="$PROJECT_DIR$/libs/header.php" />
-        <option value="$PROJECT_DIR$/libs/footer.php" />
-        <option value="$PROJECT_DIR$/README.md" />
         <option value="$PROJECT_DIR$/tinyfilemanager.php" />
         <option value="$PROJECT_DIR$/check.php" />
+        <option value="$PROJECT_DIR$/libs/footer.php" />
+        <option value="$PROJECT_DIR$/file.php" />
+        <option value="$PROJECT_DIR$/libs/function.php" />
+        <option value="$PROJECT_DIR$/test.php" />
+        <option value="$PROJECT_DIR$/index.php" />
         <option value="$PROJECT_DIR$/config.php" />
+        <option value="$PROJECT_DIR$/README.md" />
       </list>
     </option>
   </component>
@@ -91,37 +122,21 @@
       <path value="$PROJECT_DIR$/../../php/php-7.1.13-nts" />
     </include_path>
   </component>
-  <component name="ProjectConfigurationFiles">
-    <option name="files">
-      <list>
-        <option value="$PROJECT_DIR$/.idea/EasyImages2.0.iml" />
-        <option value="$PROJECT_DIR$/.idea/misc.xml" />
-        <option value="$PROJECT_DIR$/.idea/php.xml" />
-        <option value="$PROJECT_DIR$/.idea/vcs.xml" />
-        <option value="$PROJECT_DIR$/.idea/modules.xml" />
-        <option value="$PROJECT_DIR$/.idea/codeStyles/Project.xml" />
-        <option value="$PROJECT_DIR$/.idea/codeStyles/codeStyleConfig.xml" />
-        <option value="$PROJECT_DIR$/.idea/EasyImages2.0.iml" />
-        <option value="$PROJECT_DIR$/.idea/misc.xml" />
-        <option value="$PROJECT_DIR$/.idea/php.xml" />
-        <option value="$PROJECT_DIR$/.idea/vcs.xml" />
-        <option value="$PROJECT_DIR$/.idea/modules.xml" />
-        <option value="$PROJECT_DIR$/.idea/codeStyles/Project.xml" />
-        <option value="$PROJECT_DIR$/.idea/codeStyles/codeStyleConfig.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="83" />
-    <option name="y" value="297" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="570" />
+    <option name="y" value="72" />
     <option name="width" value="1932" />
-    <option name="height" value="1066" />
+    <option name="height" value="1087" />
+  </component>
+  <component name="ProjectLevelVcsManager">
+    <ConfirmationsSetting value="1" id="添加" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -138,15 +153,16 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="ASKED_SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
+    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="nodejs_package_manager_path" value="npm" />
     <property name="settings.editor.selected.configurable" value="configurable.group.editor" />
     <property name="settings.editor.splitter.proportion" value="0.2" />
   </component>
@@ -184,23 +200,33 @@
       <updated>1560938705595</updated>
       <workItem from="1560938706662" duration="371000" />
       <workItem from="1560939151180" duration="1037000" />
-      <workItem from="1560964225388" duration="759000" />
+      <workItem from="1560964225388" duration="863000" />
+      <workItem from="1561130577720" duration="28000" />
+      <workItem from="1561140923199" duration="52000" />
+      <workItem from="1561272975978" duration="6000" />
+      <workItem from="1561273128787" duration="8000" />
+      <workItem from="1561489019295" duration="905000" />
+      <workItem from="1561560280581" duration="19000" />
+      <workItem from="1561560373126" duration="2951000" />
+      <workItem from="1561563657674" duration="69000" />
+      <workItem from="1561565172255" duration="54000" />
+      <workItem from="1561565295297" duration="223000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="2167000" />
+    <option name="totallyTimeSpent" value="6586000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="83" y="297" width="1932" height="1066" extended-state="0" />
+    <frame x="-8" y="-8" width="1936" height="1066" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25587606" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.28731343" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info active="true" anchor="bottom" id="Find" order="1" visible="true" weight="0.3290461" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.3290461" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.32180294" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -222,17 +248,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/test.php" />
-    <entry file="file://$PROJECT_DIR$/libs/function.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2938">
-          <caret line="113" column="1" selection-start-line="113" selection-start-column="1" selection-end-line="113" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/index.php">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/libs/header.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="702">
@@ -240,23 +255,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/libs/footer.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="366">
-          <caret line="36" selection-start-line="36" selection-end-line="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="596">
-            <caret line="20" column="32" lean-forward="true" selection-start-line="20" selection-start-column="3" selection-end-line="20" selection-end-column="32" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/tinyfilemanager.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="654">
@@ -275,10 +273,57 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/libs/footer.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="832">
+          <caret line="32" column="11" selection-start-line="32" selection-start-column="11" selection-end-line="32" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/crossdomain/file.php" />
+    <entry file="file://$PROJECT_DIR$/test.php" />
+    <entry file="file://$PROJECT_DIR$/libs/WaterMask.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="52">
+          <caret line="2" column="6" selection-start-line="2" selection-start-column="6" selection-end-line="2" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/index.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1115">
+          <caret line="83" column="52" selection-start-line="83" selection-start-column="52" selection-end-line="83" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/file.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="855">
+          <caret line="90" column="5" selection-start-line="90" selection-start-column="5" selection-end-line="90" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/config.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="18" column="16" lean-forward="true" selection-start-line="18" selection-start-column="16" selection-end-line="18" selection-end-column="16" />
+        <state relative-caret-position="78">
+          <caret line="9" column="36" selection-start-line="9" selection-start-column="36" selection-end-line="9" selection-end-column="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/libs/function.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="439">
+          <caret line="125" column="13" lean-forward="true" selection-start-line="125" selection-start-column="13" selection-end-line="125" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="388">
+            <caret line="96" column="10" selection-start-line="96" selection-start-column="10" selection-end-line="96" selection-end-column="10" />
+          </first_editor>
+          <second_editor />
         </state>
       </provider>
     </entry>
diff --git a/README.md b/README.md
index a0ad285..2eb234b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-![简单图床示例](https://img.545141.com/i/2019/06/14/pv2hm.png
+![简单图床示例](https://i1.100024.xyz/public/data/2019/05/5ce6915f50a1a.png
  "简单图床示例")
-![简单图床示例](https://img.545141.com/i/2019/06/14/plyis.png
+![简单图床示例](https://i1.100024.xyz/public/data/2019/05/5cecf12575f6e.png
  "简单图床示例")
 
 ## EasyImage 简单图床
@@ -91,6 +91,11 @@ header('Access-Control-Allow-Origin:https://A.com/')
 指定域名可以限制别人上传图片！(并不能保证完全能防止，毕竟可以伪造)
 
 ---
+* 2019-6-26 v2.0.2.0
+- 精简压缩代码，使得不再压缩后变大
+- 删除异域上传功能，不再支持异域上传
+- 其他一些细节优化
+
 * 2019-6-14 v2.0.1.9
 
 - 增加复制链接按钮
diff --git a/config.php b/config.php
index bc21642..50e927a 100644
--- a/config.php
+++ b/config.php
@@ -4,9 +4,10 @@
  *
  * @author icret
  * @email  lemonim@qq.com
- * @Github  https://github.com/icret/easyImages
+ * @Github https://github.com/icret/easyImages
+ * @link   https://www.545141.com/902.html
  * @Review 2019-5-21 13:05:20
- * 上传后请打开check.php先检查服务器配置，更改密码等操作
+ * 上传后请打开check.php先检查服务器配置，更改密码，更改域名等操作
  */
 
 // 设置html为utf8
@@ -35,18 +36,14 @@ $config = array(
      'maxSize' => 5242880,
     // 是否开启登录上传 开启:true 关闭false
      'mustLogin' => false,
-    // 登录和管理密码
-     'password' => 'admin',
     // 是否开启管理
-     'tinyfilemanager' => true,
+    'tinyfilemanager' => true,
+    // 登录上传密码和管理密码 管理的管理员账号：admin 密码为下面密码
+     'password' => 'admin',
     // 是否开启API上传
      'apiStatus' => false,
-    // 是否开启异域上传 开启true 关闭 false
-     'crossdomain' => false,
-    // 异域上传域名 末尾需要加'/'
-     'CDomains' => 'https://img.545141.com/crossdomain/',
     // 是否开启水印:0关闭，1文字水印，2图片水印 动态gif不能添加水印
-     'watermark' => 1,
+     'watermark' => 0,
     // 水印文字内容
      'waterText' => '简单图床 img.545141.com',
     /**
@@ -64,15 +61,10 @@ $config = array(
      'textFont' => APP_ROOT . '/public/static/hkxzy.ttf',
     // 图片水印路径 支持GIF,JPG,BMP,PNG和PNG alpha
      'waterImg' => 'public/static/watermark.png',
+    // 允许上传的图片扩展名
+    'extensions'=>array('bmp','jpg','png','tif','gif','pcx','tga','svg','webp','jpeg','tga','svg','ico'),
     // 转换图片为指定格式 可选：''|'png'|'jpeg'|'gif'|'bmp';默认值：''
      'imgConvert' => '',
-    // 是否通过缩放来压缩，如果要保持源图比例，把参数$percent保持为1，范围 0.1-1 0为关闭
-     // 即使原比例压缩，也可大幅度缩小。如果缩小比例，则体积会更小。
-     'compress' => 0.99,
-    // gif和jpeg的压缩质量 压缩等级0-100，压缩后1最小，100最大
-    'imgGifJpgWebp'=> 85,
-    // png的压缩质量 压缩等级0-9，压缩后9最小，0最大
-    'imagepng' => 3,
     //最大宽度
      'maxWidth' => 10240,
     // 最大高度
@@ -93,5 +85,5 @@ $config = array(
      'ad_top' => false,
     //  开启底部广告 如果想添加或修改广告请到 public/static/ad_bot.html
      'ad_bot' => false,
-    'Version' => '2.0.1.9',
+    'Version' => '2.0.2.0',
 );
diff --git a/crossdomain/config.php b/crossdomain/config.php
deleted file mode 100644
index c9ad1d4..0000000
--- a/crossdomain/config.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * EasyImage - 简单图床异域存储配置
- *
- * @author icret
- * @email  lemonim@qq.com
- * @Github  https://github.com/icret/easyImages
- * @Review 2019-5-21 13:05:20
- * 上传后请打开check.php先检查服务器配置，更改密码等操作
- */
-
-// 设置html为utf8
-header('Content-Type:text/html;charset=utf-8');
-//将时区设置为上海时区
-ini_set('date.timezone', 'Asia/Shanghai');
-// 修改内存限制 根据服务器配置选择，低于128M容易出现上传失败，你懂得图片挺占用内存的
-ini_set('memory_limit','512M');
-// 定义当前目录
-define('APP_ROOT', __DIR__);
-
-$config = array(
-    // 网站标题
-     'title' => '简单图床 - EasyImage',
-    // 网站关键字
-     'keywords' => '简单图床,easyimage,无数据库图床',
-    // 网站描述
-     'description' => '支持多文件上传,远程上传,api上传,简单无数据库,直接返回图片url,markdown,bbscode的一款html5图床程序 。',
-    // 网站公告
-     'tips' => ' 单个文件限制5M，每次最多上传30张图片。',
-    // 当前域名,末尾不加"/" 如果是异域上传请修改为当前异域域名
-     'domain' => 'https://img.545141.com/crossdomain',
-    // 存储路径 末尾需要加"/"
-     'path' => '/public/data/',
-    // 最大上传限制 默认为5m 请使用工具转换mb http://www.bejson.com/convert/filesize/
-     'maxSize' => 5242880,
-    // 是否开启登录上传 开启:true 关闭false
-     'mustLogin' => false,
-     // 登录密码 此密码非管理密码
-     'password'=>'7070',
-    // 开启管理 开启后务必修改密码 修改方式请见read.php
-     'tinyfilemanager' => true,
-    // 是否开启API上传
-     'apiStatus' => true,
-    // 是否开启异域上传 开启true 关闭 false
-    'crossdomain'=>false,
-     // 异域上传域名 末尾需要加'/'
-     'CDomains'=>'https://img.545141.com/crossdomain/',
-    // 是否开启水印:0关闭，1文字水印，2图片水印 动态gif不能添加水印
-     'watermark' => 2,
-    // 水印文字内容
-     'waterText' => 'img.545141.com',
-    // 水印位置 T=top，B =bottom，L=left，R=right 'TBLR'中的一个或两个的组合
-     'waterPosition' => 'TB',
-    // 水印文字方向 h水平 v垂直
-     'textDirection' => 'h',
-    // 水印文字颜色
-     'textColor' => '#778899',
-    // 水印文字大小
-     'textSize' => 16,
-    // 字体路径 如果想改变字体，请选择支持中文的 gb2312
-     'textFont' => APP_ROOT.'/public/static/hkxzy.ttf',
-    // 水印边距 px
-     'textPadding' => 10,
-    // 水印透明度
-     'textOpacity' => 100,
-    // 图片水印路径 支持GIF,JPG,BMP,PNG和PNG alpha
-     'waterImg' => 'public/static/watermark.png',
-    // 转换图片为指定格式 可选：''|'png'|'jpeg'|'gif'|'bmp';默认值：''
-     'imgConvert' => '',
-     // 是否通过缩放来压缩，如果要保持源图比例，把参数$percent保持为1，范围 0.1-1
-    // 即使原比例压缩，也可大幅度缩小。如果缩小比例，则体积会更小。
-    'imgcompress_percent' => 0.9,
-    //最大宽度
-     'maxWidth' => 10240,
-    // 最大高度
-     'maxHeight' => 10240,
-    // 最小宽度
-     'minWidth' => 5,
-    // 最小高度
-     'minHeight' => 5,
-    // 等比例缩小图片 宽度和高度请设置 image_x image_y 开启true，关闭false 关闭下mage_x和image_y设置不生效
-     'imgRatio' => false,
-    // 缩减的最大高度
-     'image_x' => 1024,
-    // 缩减的最大宽度
-     'image_y' => 1024,
-    // 开启静态文件CDN 开启true 关闭false
-     'static_cdn' => true,
-    // 开启顶部广告 如果想添加或修改广告请到 public/static/ad_top.html
-     'ad_top' => false,
-    //  开启底部广告 如果想添加或修改广告请到 public/static/ad_bot.html
-     'ad_bot' => false,
-     'Version' => '2.0.0.9'
-);
\ No newline at end of file
diff --git a/crossdomain/file.php b/crossdomain/file.php
deleted file mode 100644
index 1ffb0db..0000000
--- a/crossdomain/file.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-require __DIR__.'/libs/function.php';
-require APP_ROOT.'/libs/class.upload.php';
-
-// 开启异域上传
-header('Access-Control-Allow-Origin:*');
-
-$handle = new upload($_FILES['file'],'zh_CN');
-
-if($handle->uploaded){
-    // 允许上传的mime类型
-    $handle->allowed = array ('image/*');
-    // 文件命名
-    $handle->file_new_name_body = uniqid();
-    // 最大上传限制
-    $handle->file_max_sizes = $config['maxSize'];
-    // 最大宽度
-    $handle->image_max_width = $config['maxWidth'];
-    // 最大高度
-    $handle->image_max_height = $config['maxHeight'];
-    // 最小宽度
-    $handle->image_min_width = $config['minWidth'];
-    // 最小高度
-    $handle->image_min_height = $config['minHeight'];    
-    // 转换图片为指定格式
-    $handle->image_convert = $config['imgConvert'];
-    
-    //等比例缩减图片
-    if($config['imgRatio']){
-        $handle->image_x = $config['image_x'];
-    }
-
-    // 设置水印
-    if ($config['watermark'] > 0){
-        switch ($config['watermark']){
-            case 1: // 文字水印 过滤gif
-                if (isAnimatedGif($handle->file_src_pathname)===0){
-                    $handle->image_text = $config['waterText'];
-                    $handle->image_text_direction = $config['textDirection'];
-                    $handle->image_text_color = $config['textColor'];
-                    $handle->image_text_opacity = $config['textOpacity'];
-                    $handle->image_text_font = $config['textFont'];
-                    $handle->image_text_size = $config['textSize'];
-                    $handle->image_text_padding = $config['textPadding'];
-                    $handle->image_text_position = $config['waterPosition'];
-                }
-                break;
-            case 2: // 图片水印
-                if (isAnimatedGif($handle->file_src_pathname)===0){
-                    $handle->image_watermark             = $config['waterImg'];
-                    $handle->image_watermark_position    = $config['waterPosition'];
-                    $handle->image_watermark_no_zoom_in  = true;
-                    $handle->image_watermark_no_zoom_out = true;
-                }
-                break;
-            default:
-                echo $handle->error;
-                break;
-        }
-    }
-
-    // 存储图片路径:images/201807/
-    $handle->process(APP_ROOT.config_path());
-
-    // 图片完整相对路径:images/201807/0ed7ccfd4dab9cbc.jpg
-    if ($handle->processed){		
-        header('Content-type:text/json');
-        // 上传成功后返回json数据
-        $reJson = array (
-            "result"    =>  'success',
-            "url"       =>  $config['domain'].config_path().$handle->file_dst_name,
-        );
-        echo json_encode($reJson);		
-        $handle->clean();
-    }else{
-        // 上传错误 返回错误信息
-        $reJson = array (
-            "result"      =>  'failed',
-            "message"     =>  $handle->error
-        );
-        echo json_encode($reJson);
-        echo $handle->error;
-    }
-
-    // 上传完成图片后调用imgcompress类压缩图片
-    if($config['imgcompress_percent']>0 && $handle->file_dst_name_ext!='gif'){
-        $source = APP_ROOT.config_path().$handle->file_dst_name; // 原图
-        $dst_img = APP_ROOT.config_path().$handle->file_dst_name; //存放路径
-        $percent = $config['imgcompress_percent'];  #是否缩放压缩
-        $image = (new imgcompress($source,$percent))->compressImg($dst_img);            
-    }
-    
-    unset($handle);
-}
\ No newline at end of file
diff --git a/crossdomain/libs/class.upload.php b/crossdomain/libs/class.upload.php
deleted file mode 100644
index f132f0f..0000000
--- a/crossdomain/libs/class.upload.php
+++ /dev/null
@@ -1,5062 +0,0 @@
-<?php
-// +------------------------------------------------------------------------+
-// | class.upload.php                                                       |
-// +------------------------------------------------------------------------+
-// | Copyright (c) Colin Verot 2003-2018. All rights reserved.              |
-// | Email         colin@verot.net                                          |
-// | Web           http://www.verot.net                                     |
-// +------------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify   |
-// | it under the terms of the GNU General Public License version 2 as      |
-// | published by the Free Software Foundation.                             |
-// |                                                                        |
-// | This program is distributed in the hope that it will be useful,        |
-// | but WITHOUT ANY WARRANTY; without even the implied warranty of         |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          |
-// | GNU General Public License for more details.                           |
-// |                                                                        |
-// | You should have received a copy of the GNU General Public License      |
-// | along with this program; if not, write to the                          |
-// |   Free Software Foundation, Inc., 59 Temple Place, Suite 330,          |
-// |   Boston, MA 02111-1307 USA                                            |
-// |                                                                        |
-// | Please give credit on sites that use class.upload and submit changes   |
-// | of the script so other people can use them as well.                    |
-// | This script is free to use, don't abuse.                               |
-// +------------------------------------------------------------------------+
-
-
-/**
- * Class upload
- *
- * @author    Colin Verot <colin@verot.net>
- * @license   http://opensource.org/licenses/gpl-license.php GNU Public License
- * @copyright Colin Verot
- */
-class upload {
-
-
-    /**
-     * Class version
-     *
-     * @access public
-     * @var string
-     */
-    var $version;
-
-    /**
-     * Uploaded file name
-     *
-     * @access public
-     * @var string
-     */
-    var $file_src_name;
-
-    /**
-     * Uploaded file name body (i.e. without extension)
-     *
-     * @access public
-     * @var string
-     */
-    var $file_src_name_body;
-
-    /**
-     * Uploaded file name extension
-     *
-     * @access public
-     * @var string
-     */
-    var $file_src_name_ext;
-
-    /**
-     * Uploaded file MIME type
-     *
-     * @access public
-     * @var string
-     */
-    var $file_src_mime;
-
-    /**
-     * Uploaded file size, in bytes
-     *
-     * @access public
-     * @var double
-     */
-    var $file_src_size;
-
-    /**
-     * Holds eventual PHP error code from $_FILES
-     *
-     * @access public
-     * @var string
-     */
-    var $file_src_error;
-
-    /**
-     * Uloaded file name, including server path
-     *
-     * @access public
-     * @var string
-     */
-    var $file_src_pathname;
-
-    /**
-     * Uloaded file name temporary copy
-     *
-     * @access private
-     * @var string
-     */
-    var $file_src_temp;
-
-    /**
-     * Destination file name
-     *
-     * @access public
-     * @var string
-     */
-    var $file_dst_path;
-
-    /**
-     * Destination file name
-     *
-     * @access public
-     * @var string
-     */
-    var $file_dst_name;
-
-    /**
-     * Destination file name body (i.e. without extension)
-     *
-     * @access public
-     * @var string
-     */
-    var $file_dst_name_body;
-
-    /**
-     * Destination file extension
-     *
-     * @access public
-     * @var string
-     */
-    var $file_dst_name_ext;
-
-    /**
-     * Destination file name, including path
-     *
-     * @access public
-     * @var string
-     */
-    var $file_dst_pathname;
-
-    /**
-     * Source image width
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_src_x;
-
-    /**
-     * Source image height
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_src_y;
-
-    /**
-     * Source image color depth
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_src_bits;
-
-    /**
-     * Number of pixels
-     *
-     * @access public
-     * @var long
-     */
-    var $image_src_pixels;
-
-    /**
-     * Type of image (png, gif, jpg or bmp)
-     *
-     * @access public
-     * @var string
-     */
-    var $image_src_type;
-
-    /**
-     * Destination image width
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_dst_x;
-
-    /**
-     * Destination image height
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_dst_y;
-
-    /**
-     * Destination image type (png, gif, jpg or bmp)
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_dst_type;
-
-    /**
-     * Supported image formats
-     *
-     * @access private
-     * @var array
-     */
-    var $image_supported;
-
-    /**
-     * Flag to determine if the source file is an image
-     *
-     * @access public
-     * @var boolean
-     */
-    var $file_is_image;
-
-    /**
-     * Flag set after instanciating the class
-     *
-     * Indicates if the file has been uploaded properly
-     *
-     * @access public
-     * @var bool
-     */
-    var $uploaded;
-
-    /**
-     * Flag stopping PHP upload checks
-     *
-     * Indicates whether we instanciated the class with a filename, in which case
-     * we will not check on the validity of the PHP *upload*
-     *
-     * This flag is automatically set to true when working on a local file
-     *
-     * Warning: for uploads, this flag MUST be set to false for security reason
-     *
-     * @access public
-     * @var bool
-     */
-    var $no_upload_check;
-
-    /**
-     * Flag set after calling a process
-     *
-     * Indicates if the processing, and copy of the resulting file went OK
-     *
-     * @access public
-     * @var bool
-     */
-    var $processed;
-
-    /**
-     * Holds eventual error message in plain english
-     *
-     * @access public
-     * @var string
-     */
-    var $error;
-
-    /**
-     * Holds an HTML formatted log
-     *
-     * @access public
-     * @var string
-     */
-    var $log;
-
-
-    // overiddable processing variables
-
-
-    /**
-     * Set this variable to replace the name body (i.e. without extension)
-     *
-     * @access public
-     * @var string
-     */
-    var $file_new_name_body;
-
-    /**
-     * Set this variable to append a string to the file name body
-     *
-     * @access public
-     * @var string
-     */
-    var $file_name_body_add;
-
-    /**
-     * Set this variable to prepend a string to the file name body
-     *
-     * @access public
-     * @var string
-     */
-    var $file_name_body_pre;
-
-    /**
-     * Set this variable to change the file extension
-     *
-     * @access public
-     * @var string
-     */
-    var $file_new_name_ext;
-
-    /**
-     * Set this variable to format the filename (spaces changed to _)
-     *
-     * @access public
-     * @var boolean
-     */
-    var $file_safe_name;
-
-    /**
-     * Forces an extension if the source file doesn't have one
-     *
-     * If the file is an image, then the correct extension will be added
-     * Otherwise, a .txt extension will be chosen
-     *
-     * @access public
-     * @var boolean
-     */
-    var $file_force_extension;
-
-    /**
-     * Set this variable to false if you don't want to check the MIME against the allowed list
-     *
-     * This variable is set to true by default for security reason
-     *
-     * @access public
-     * @var boolean
-     */
-    var $mime_check;
-
-    /**
-     * Set this variable to false in the init() function if you don't want to check the MIME
-     * with Fileinfo PECL extension. On some systems, Fileinfo is known to be buggy, and you
-     * may want to deactivate it in the class code directly.
-     *
-     * You can also set it with the path of the magic database file.
-     * If set to true, the class will try to read the MAGIC environment variable
-     *   and if it is empty, will default to the system's default
-     * If set to an empty string, it will call finfo_open without the path argument
-     *
-     * This variable is set to true by default for security reason
-     *
-     * @access public
-     * @var boolean
-     */
-    var $mime_fileinfo;
-
-    /**
-     * Set this variable to false in the init() function if you don't want to check the MIME
-     * with UNIX file() command
-     *
-     * This variable is set to true by default for security reason
-     *
-     * @access public
-     * @var boolean
-     */
-    var $mime_file;
-
-    /**
-     * Set this variable to false in the init() function if you don't want to check the MIME
-     * with the magic.mime file
-     *
-     * The function mime_content_type() will be deprecated,
-     * and this variable will be set to false in a future release
-     *
-     * This variable is set to true by default for security reason
-     *
-     * @access public
-     * @var boolean
-     */
-    var $mime_magic;
-
-    /**
-     * Set this variable to false in the init() function if you don't want to check the MIME
-     * with getimagesize()
-     *
-     * The class tries to get a MIME type from getimagesize()
-     * If no MIME is returned, it tries to guess the MIME type from the file type
-     *
-     * This variable is set to true by default for security reason
-     *
-     * @access public
-     * @var boolean
-     */
-    var $mime_getimagesize;
-
-    /**
-     * Set this variable to false if you don't want to turn dangerous scripts into simple text files
-     *
-     * @access public
-     * @var boolean
-     */
-    var $no_script;
-
-    /**
-     * Set this variable to true to allow automatic renaming of the file
-     * if the file already exists
-     *
-     * Default value is true
-     *
-     * For instance, on uploading foo.ext,<br>
-     * if foo.ext already exists, upload will be renamed foo_1.ext<br>
-     * and if foo_1.ext already exists, upload will be renamed foo_2.ext<br>
-     *
-     * Note that this option doesn't have any effect if {@link file_overwrite} is true
-     *
-     * @access public
-     * @var bool
-     */
-    var $file_auto_rename;
-
-    /**
-     * Set this variable to true to allow automatic creation of the destination
-     * directory if it is missing (works recursively)
-     *
-     * Default value is true
-     *
-     * @access public
-     * @var bool
-     */
-    var $dir_auto_create;
-
-    /**
-     * Set this variable to true to allow automatic chmod of the destination
-     * directory if it is not writeable
-     *
-     * Default value is true
-     *
-     * @access public
-     * @var bool
-     */
-    var $dir_auto_chmod;
-
-    /**
-     * Set this variable to the default chmod you want the class to use
-     * when creating directories, or attempting to write in a directory
-     *
-     * Default value is 0755 (without quotes)
-     *
-     * @access public
-     * @var bool
-     */
-    var $dir_chmod;
-
-    /**
-     * Set this variable tu true to allow overwriting of an existing file
-     *
-     * Default value is false, so no files will be overwritten
-     *
-     * @access public
-     * @var bool
-     */
-    var $file_overwrite;
-
-    /**
-     * Set this variable to change the maximum size in bytes for an uploaded file
-     *
-     * Default value is the value <i>upload_max_filesize</i> from php.ini
-     *
-     * Value in bytes (integer) or shorthand byte values (string) is allowed.
-     * The available options are K (for Kilobytes), M (for Megabytes) and G (for Gigabytes)
-     *
-     * @access public
-     * @var double
-     */
-    var $file_max_size;
-
-    /**
-     * Set this variable to true to resize the file if it is an image
-     *
-     * You will probably want to set {@link image_x} and {@link image_y}, and maybe one of the ratio variables
-     *
-     * Default value is false (no resizing)
-     *
-     * @access public
-     * @var bool
-     */
-    var $image_resize;
-
-    /**
-     * Set this variable to convert the file if it is an image
-     *
-     * Possibles values are : ''; 'png'; 'jpeg'; 'gif'; 'bmp'
-     *
-     * Default value is '' (no conversion)<br>
-     * If {@link resize} is true, {@link convert} will be set to the source file extension
-     *
-     * @access public
-     * @var string
-     */
-    var $image_convert;
-
-    /**
-     * Set this variable to the wanted (or maximum/minimum) width for the processed image, in pixels
-     *
-     * Default value is 150
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_x;
-
-    /**
-     * Set this variable to the wanted (or maximum/minimum) height for the processed image, in pixels
-     *
-     * Default value is 150
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_y;
-
-    /**
-     * Set this variable to keep the original size ratio to fit within {@link image_x} x {@link image_y}
-     *
-     * Default value is false
-     *
-     * @access public
-     * @var bool
-     */
-    var $image_ratio;
-
-    /**
-     * Set this variable to keep the original size ratio to fit within {@link image_x} x {@link image_y}
-     *
-     * The image will be resized as to fill the whole space, and excedent will be cropped
-     *
-     * Value can also be a string, one or more character from 'TBLR' (top, bottom, left and right)
-     * If set as a string, it determines which side of the image is kept while cropping.
-     * By default, the part of the image kept is in the center, i.e. it crops equally on both sides
-     *
-     * Default value is false
-     *
-     * @access public
-     * @var mixed
-     */
-    var $image_ratio_crop;
-
-    /**
-     * Set this variable to keep the original size ratio to fit within {@link image_x} x {@link image_y}
-     *
-     * The image will be resized to fit entirely in the space, and the rest will be colored.
-     * The default color is white, but can be set with {@link image_default_color}
-     *
-     * Value can also be a string, one or more character from 'TBLR' (top, bottom, left and right)
-     * If set as a string, it determines in which side of the space the image is displayed.
-     * By default, the image is displayed in the center, i.e. it fills the remaining space equally on both sides
-     *
-     * Default value is false
-     *
-     * @access public
-     * @var mixed
-     */
-    var $image_ratio_fill;
-
-    /**
-     * Set this variable to a number of pixels so that {@link image_x} and {@link image_y} are the best match possible
-     *
-     * The image will be resized to have approximatively the number of pixels
-     * The aspect ratio wil be conserved
-     *
-     * Default value is false
-     *
-     * @access public
-     * @var mixed
-     */
-    var $image_ratio_pixels;
-
-    /**
-     * Set this variable to calculate {@link image_x} automatically , using {@link image_y} and conserving ratio
-     *
-     * Default value is false
-     *
-     * @access public
-     * @var bool
-     */
-    var $image_ratio_x;
-
-    /**
-     * Set this variable to calculate {@link image_y} automatically , using {@link image_x} and conserving ratio
-     *
-     * Default value is false
-     *
-     * @access public
-     * @var bool
-     */
-    var $image_ratio_y;
-
-    /**
-     * (deprecated) Set this variable to keep the original size ratio to fit within {@link image_x} x {@link image_y},
-     * but only if original image is bigger
-     *
-     * This setting is soon to be deprecated. Instead, use {@link image_ratio} and {@link image_no_enlarging}
-     *
-     * Default value is false
-     *
-     * @access public
-     * @var bool
-     */
-    var $image_ratio_no_zoom_in;
-
-    /**
-     * (deprecated) Set this variable to keep the original size ratio to fit within {@link image_x} x {@link image_y},
-     * but only if original image is smaller
-     *
-     * Default value is false
-     *
-     * This setting is soon to be deprecated. Instead, use {@link image_ratio} and {@link image_no_shrinking}
-     *
-     * @access public
-     * @var bool
-     */
-    var $image_ratio_no_zoom_out;
-
-    /**
-     * Cancel resizing if the resized image is bigger than the original image, to prevent enlarging
-     *
-     * Default value is false
-     *
-     * @access public
-     * @var bool
-     */
-    var $image_no_enlarging;
-
-    /**
-     * Cancel resizing if the resized image is smaller than the original image, to prevent shrinking
-     *
-     * Default value is false
-     *
-     * @access public
-     * @var bool
-     */
-    var $image_no_shrinking;
-
-    /**
-     * Set this variable to set a maximum image width, above which the upload will be invalid
-     *
-     * Default value is null
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_max_width;
-
-    /**
-     * Set this variable to set a maximum image height, above which the upload will be invalid
-     *
-     * Default value is null
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_max_height;
-
-    /**
-     * Set this variable to set a maximum number of pixels for an image, above which the upload will be invalid
-     *
-     * Default value is null
-     *
-     * @access public
-     * @var long
-     */
-    var $image_max_pixels;
-
-    /**
-     * Set this variable to set a maximum image aspect ratio, above which the upload will be invalid
-     *
-     * Note that ratio = width / height
-     *
-     * Default value is null
-     *
-     * @access public
-     * @var float
-     */
-    var $image_max_ratio;
-
-    /**
-     * Set this variable to set a minimum image width, below which the upload will be invalid
-     *
-     * Default value is null
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_min_width;
-
-    /**
-     * Set this variable to set a minimum image height, below which the upload will be invalid
-     *
-     * Default value is null
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_min_height;
-
-    /**
-     * Set this variable to set a minimum number of pixels for an image, below which the upload will be invalid
-     *
-     * Default value is null
-     *
-     * @access public
-     * @var long
-     */
-    var $image_min_pixels;
-
-    /**
-     * Set this variable to set a minimum image aspect ratio, below which the upload will be invalid
-     *
-     * Note that ratio = width / height
-     *
-     * Default value is null
-     *
-     * @access public
-     * @var float
-     */
-    var $image_min_ratio;
-
-    /**
-     * Compression level for PNG images
-     *
-     * Between 1 (fast but large files) and 9 (slow but smaller files)
-     *
-     * Default value is null (Zlib default)
-     *
-     * @access public
-     * @var integer
-     */
-    var $png_compression;
-
-    /**
-     * Quality of JPEG created/converted destination image
-     *
-     * Default value is 85
-     *
-     * @access public
-     * @var integer
-     */
-    var $jpeg_quality;
-
-    /**
-     * Determines the quality of the JPG image to fit a desired file size
-     *
-     * The JPG quality will be set between 1 and 100%
-     * The calculations are approximations.
-     *
-     * Value in bytes (integer) or shorthand byte values (string) is allowed.
-     * The available options are K (for Kilobytes), M (for Megabytes) and G (for Gigabytes)
-     *
-     * Default value is null (no calculations)
-     *
-     * @access public
-     * @var integer
-     */
-    var $jpeg_size;
-
-    /**
-     * Turns the interlace bit on
-     *
-     * This is actually used only for JPEG images, and defaults to false
-     *
-     * @access public
-     * @var boolean
-     */
-    var $image_interlace;
-
-    /**
-     * Flag set to true when the image is transparent
-     *
-     * This is actually used only for transparent GIFs
-     *
-     * @access public
-     * @var boolean
-     */
-    var $image_is_transparent;
-
-    /**
-     * Transparent color in a palette
-     *
-     * This is actually used only for transparent GIFs
-     *
-     * @access public
-     * @var boolean
-     */
-    var $image_transparent_color;
-
-    /**
-     * Background color, used to paint transparent areas with
-     *
-     * If set, it will forcibly remove transparency by painting transparent areas with the color
-     * This setting will fill in all transparent areas in PNG and GIF, as opposed to {@link image_default_color}
-     * which will do so only in BMP, JPEG, and alpha transparent areas in transparent GIFs
-     * This setting overrides {@link image_default_color}
-     *
-     * Default value is null
-     *
-     * @access public
-     * @var string
-     */
-    var $image_background_color;
-
-    /**
-     * Default color for non alpha-transparent images
-     *
-     * This setting is to be used to define a background color for semi transparent areas
-     * of an alpha transparent when the output format doesn't support alpha transparency
-     * This is useful when, from an alpha transparent PNG image, or an image with alpha transparent features
-     * if you want to output it as a transparent GIFs for instance, you can set a blending color for transparent areas
-     * If you output in JPEG or BMP, this color will be used to fill in the previously transparent areas
-     *
-     * The default color white
-     *
-     * @access public
-     * @var boolean
-     */
-    var $image_default_color;
-
-    /**
-     * Flag set to true when the image is not true color
-     *
-     * @access public
-     * @var boolean
-     */
-    var $image_is_palette;
-
-    /**
-     * Corrects the image brightness
-     *
-     * Value can range between -127 and 127
-     *
-     * Default value is null
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_brightness;
-
-    /**
-     * Corrects the image contrast
-     *
-     * Value can range between -127 and 127
-     *
-     * Default value is null
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_contrast;
-
-    /**
-     * Changes the image opacity
-     *
-     * Value can range between 0 and 100
-     *
-     * Default value is null
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_opacity;
-
-    /**
-     * Applies threshold filter
-     *
-     * Value can range between -127 and 127
-     *
-     * Default value is null
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_threshold;
-
-    /**
-     * Applies a tint on the image
-     *
-     * Value is an hexadecimal color, such as #FFFFFF
-     *
-     * Default value is null
-     *
-     * @access public
-     * @var string;
-     */
-    var $image_tint_color;
-
-    /**
-     * Applies a colored overlay on the image
-     *
-     * Value is an hexadecimal color, such as #FFFFFF
-     *
-     * To use with {@link image_overlay_opacity}
-     *
-     * Default value is null
-     *
-     * @access public
-     * @var string;
-     */
-    var $image_overlay_color;
-
-    /**
-     * Sets the opacity for the colored overlay
-     *
-     * Value is a percentage, as an integer between 0 (transparent) and 100 (opaque)
-     *
-     * Unless used with {@link image_overlay_color}, this setting has no effect
-     *
-     * Default value is 50
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_overlay_opacity;
-
-    /**
-     * Inverts the color of an image
-     *
-     * Default value is FALSE
-     *
-     * @access public
-     * @var boolean;
-     */
-    var $image_negative;
-
-    /**
-     * Turns the image into greyscale
-     *
-     * Default value is FALSE
-     *
-     * @access public
-     * @var boolean;
-     */
-    var $image_greyscale;
-
-    /**
-     * Pixelate an image
-     *
-     * Value is integer, represents the block size
-     *
-     * Default value is null
-     *
-     * @access public
-     * @var integer;
-     */
-    var $image_pixelate;
-
-    /**
-     * Applies an unsharp mask, with alpha transparency support
-     *
-     * Beware that this unsharp mask is quite resource-intensive
-     *
-     * Default value is FALSE
-     *
-     * @access public
-     * @var boolean;
-     */
-    var $image_unsharp;
-
-    /**
-     * Sets the unsharp mask amount
-     *
-     * Value is an integer between 0 and 500, typically between 50 and 200
-     *
-     * Unless used with {@link image_unsharp}, this setting has no effect
-     *
-     * Default value is 80
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_unsharp_amount;
-
-    /**
-     * Sets the unsharp mask radius
-     *
-     * Value is an integer between 0 and 50, typically between 0.5 and 1
-     * It is not recommended to change it, the default works best
-     *
-     * Unless used with {@link image_unsharp}, this setting has no effect
-     *
-     * From PHP 5.1, imageconvolution is used, and this setting has no effect
-     *
-     * Default value is 0.5
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_unsharp_radius;
-
-    /**
-     * Sets the unsharp mask threshold
-     *
-     * Value is an integer between 0 and 255, typically between 0 and 5
-     *
-     * Unless used with {@link image_unsharp}, this setting has no effect
-     *
-     * Default value is 1
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_unsharp_threshold;
-
-    /**
-     * Adds a text label on the image
-     *
-     * Value is a string, any text. Text will not word-wrap, although you can use breaklines in your text "\n"
-     *
-     * If set, this setting allow the use of all other settings starting with image_text_
-     *
-     * Replacement tokens can be used in the string:
-     * <pre>
-     * gd_version    src_name       src_name_body src_name_ext
-     * src_pathname  src_mime       src_x         src_y
-     * src_type      src_bits       src_pixels
-     * src_size      src_size_kb    src_size_mb   src_size_human
-     * dst_path      dst_name_body  dst_pathname
-     * dst_name      dst_name_ext   dst_x         dst_y
-     * date          time           host          server        ip
-     * </pre>
-     * The tokens must be enclosed in square brackets: [dst_x] will be replaced by the width of the picture
-     *
-     * Default value is null
-     *
-     * @access public
-     * @var string;
-     */
-    var $image_text;
-
-    /**
-     * Sets the text direction for the text label
-     *
-     * Value is either 'h' or 'v', as in horizontal and vertical
-     *
-     * Note that if you use a TrueType font, you can use {@link image_text_angle} instead
-     *
-     * Default value is h (horizontal)
-     *
-     * @access public
-     * @var string;
-     */
-    var $image_text_direction;
-
-    /**
-     * Sets the text color for the text label
-     *
-     * Value is an hexadecimal color, such as #FFFFFF
-     *
-     * Default value is #FFFFFF (white)
-     *
-     * @access public
-     * @var string;
-     */
-    var $image_text_color;
-
-    /**
-     * Sets the text opacity in the text label
-     *
-     * Value is a percentage, as an integer between 0 (transparent) and 100 (opaque)
-     *
-     * Default value is 100
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_text_opacity;
-
-    /**
-     * Sets the text background color for the text label
-     *
-     * Value is an hexadecimal color, such as #FFFFFF
-     *
-     * Default value is null (no background)
-     *
-     * @access public
-     * @var string;
-     */
-    var $image_text_background;
-
-    /**
-     * Sets the text background opacity in the text label
-     *
-     * Value is a percentage, as an integer between 0 (transparent) and 100 (opaque)
-     *
-     * Default value is 100
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_text_background_opacity;
-
-    /**
-     * Sets the text font in the text label
-     *
-     * Value is a an integer between 1 and 5 for GD built-in fonts. 1 is the smallest font, 5 the biggest
-     * Value can also be a string, which represents the path to a GDF or TTF font (TrueType).
-     *
-     * Default value is 5
-     *
-     * @access public
-     * @var mixed;
-     */
-    var $image_text_font;
-
-    /**
-     * Sets the text font size for TrueType fonts
-     *
-     * Value is a an integer, and represents the font size in pixels (GD1) or points (GD1)
-     *
-     * Note that this setting is only applicable to TrueType fonts, and has no effects with GD fonts
-     *
-     * Default value is 16
-     *
-     * @access public
-     * @var integer;
-     */
-    var $image_text_size;
-
-    /**
-     * Sets the text angle for TrueType fonts
-     *
-     * Value is a an integer between 0 and 360, in degrees, with 0 degrees being left-to-right reading text.
-     *
-     * Note that this setting is only applicable to TrueType fonts, and has no effects with GD fonts
-     * For GD fonts, you can use {@link image_text_direction} instead
-     *
-     * Default value is null (so it is determined by the value of {@link image_text_direction})
-     *
-     * @access public
-     * @var integer;
-     */
-    var $image_text_angle;
-
-    /**
-     * Sets the text label position within the image
-     *
-     * Value is one or two out of 'TBLR' (top, bottom, left, right)
-     *
-     * The positions are as following:
-     * <pre>
-     *                        TL  T  TR
-     *                        L       R
-     *                        BL  B  BR
-     * </pre>
-     *
-     * Default value is null (centered, horizontal and vertical)
-     *
-     * Note that is {@link image_text_x} and {@link image_text_y} are used, this setting has no effect
-     *
-     * @access public
-     * @var string;
-     */
-    var $image_text_position;
-
-    /**
-     * Sets the text label absolute X position within the image
-     *
-     * Value is in pixels, representing the distance between the left of the image and the label
-     * If a negative value is used, it will represent the distance between the right of the image and the label
-     *
-     * Default value is null (so {@link image_text_position} is used)
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_text_x;
-
-    /**
-     * Sets the text label absolute Y position within the image
-     *
-     * Value is in pixels, representing the distance between the top of the image and the label
-     * If a negative value is used, it will represent the distance between the bottom of the image and the label
-     *
-     * Default value is null (so {@link image_text_position} is used)
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_text_y;
-
-    /**
-     * Sets the text label padding
-     *
-     * Value is in pixels, representing the distance between the text and the label background border
-     *
-     * Default value is 0
-     *
-     * This setting can be overriden by {@link image_text_padding_x} and {@link image_text_padding_y}
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_text_padding;
-
-    /**
-     * Sets the text label horizontal padding
-     *
-     * Value is in pixels, representing the distance between the text and the left and right label background borders
-     *
-     * Default value is null
-     *
-     * If set, this setting overrides the horizontal part of {@link image_text_padding}
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_text_padding_x;
-
-    /**
-     * Sets the text label vertical padding
-     *
-     * Value is in pixels, representing the distance between the text and the top and bottom label background borders
-     *
-     * Default value is null
-     *
-     * If set, his setting overrides the vertical part of {@link image_text_padding}
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_text_padding_y;
-
-    /**
-     * Sets the text alignment
-     *
-     * Value is a string, which can be either 'L', 'C' or 'R'
-     *
-     * Default value is 'C'
-     *
-     * This setting is relevant only if the text has several lines.
-     *
-     * Note that this setting is only applicable to GD fonts, and has no effects with TrueType fonts
-     *
-     * @access public
-     * @var string;
-     */
-    var $image_text_alignment;
-
-    /**
-     * Sets the text line spacing
-     *
-     * Value is an integer, in pixels
-     *
-     * Default value is 0
-     *
-     * This setting is relevant only if the text has several lines.
-     *
-     * Note that this setting is only applicable to GD fonts, and has no effects with TrueType fonts
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_text_line_spacing;
-
-    /**
-     * Sets the height of the reflection
-     *
-     * Value is an integer in pixels, or a string which format can be in pixels or percentage.
-     * For instance, values can be : 40, '40', '40px' or '40%'
-     *
-     * Default value is null, no reflection
-     *
-     * @access public
-     * @var mixed;
-     */
-    var $image_reflection_height;
-
-    /**
-     * Sets the space between the source image and its relection
-     *
-     * Value is an integer in pixels, which can be negative
-     *
-     * Default value is 2
-     *
-     * This setting is relevant only if {@link image_reflection_height} is set
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_reflection_space;
-
-    /**
-     * Sets the initial opacity of the reflection
-     *
-     * Value is an integer between 0 (no opacity) and 100 (full opacity).
-     * The reflection will start from {@link image_reflection_opacity} and end up at 0
-     *
-     * Default value is 60
-     *
-     * This setting is relevant only if {@link image_reflection_height} is set
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_reflection_opacity;
-
-    /**
-     * Automatically rotates the image according to EXIF data (JPEG only)
-     *
-     * Default value is true
-     *
-     * @access public
-     * @var boolean;
-     */
-    var $image_auto_rotate;
-
-    /**
-     * Flips the image vertically or horizontally
-     *
-     * Value is either 'h' or 'v', as in horizontal and vertical
-     *
-     * Default value is null (no flip)
-     *
-     * @access public
-     * @var string;
-     */
-    var $image_flip;
-
-    /**
-     * Rotates the image by increments of 45 degrees
-     *
-     * Value is either 90, 180 or 270
-     *
-     * Default value is null (no rotation)
-     *
-     * @access public
-     * @var string;
-     */
-    var $image_rotate;
-
-    /**
-     * Crops an image
-     *
-     * Values are four dimensions, or two, or one (CSS style)
-     * They represent the amount cropped top, right, bottom and left.
-     * These values can either be in an array, or a space separated string.
-     * Each value can be in pixels (with or without 'px'), or percentage (of the source image)
-     *
-     * For instance, are valid:
-     * <pre>
-     * $foo->image_crop = 20                  OR array(20);
-     * $foo->image_crop = '20px'              OR array('20px');
-     * $foo->image_crop = '20 40'             OR array('20', 40);
-     * $foo->image_crop = '-20 25%'           OR array(-20, '25%');
-     * $foo->image_crop = '20px 25%'          OR array('20px', '25%');
-     * $foo->image_crop = '20% 25%'           OR array('20%', '25%');
-     * $foo->image_crop = '20% 25% 10% 30%'   OR array('20%', '25%', '10%', '30%');
-     * $foo->image_crop = '20px 25px 2px 2px' OR array('20px', '25%px', '2px', '2px');
-     * $foo->image_crop = '20 25% 40px 10%'   OR array(20, '25%', '40px', '10%');
-     * </pre>
-     *
-     * If a value is negative, the image will be expanded, and the extra parts will be filled with black
-     *
-     * Default value is null (no cropping)
-     *
-     * @access public
-     * @var string OR array;
-     */
-    var $image_crop;
-
-    /**
-     * Crops an image, before an eventual resizing
-     *
-     * See {@link image_crop} for valid formats
-     *
-     * Default value is null (no cropping)
-     *
-     * @access public
-     * @var string OR array;
-     */
-    var $image_precrop;
-
-    /**
-     * Adds a bevel border on the image
-     *
-     * Value is a positive integer, representing the thickness of the bevel
-     *
-     * If the bevel colors are the same as the background, it makes a fade out effect
-     *
-     * Default value is null (no bevel)
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_bevel;
-
-    /**
-     * Top and left bevel color
-     *
-     * Value is a color, in hexadecimal format
-     * This setting is used only if {@link image_bevel} is set
-     *
-     * Default value is #FFFFFF
-     *
-     * @access public
-     * @var string;
-     */
-    var $image_bevel_color1;
-
-    /**
-     * Right and bottom bevel color
-     *
-     * Value is a color, in hexadecimal format
-     * This setting is used only if {@link image_bevel} is set
-     *
-     * Default value is #000000
-     *
-     * @access public
-     * @var string;
-     */
-    var $image_bevel_color2;
-
-    /**
-     * Adds a single-color border on the outer of the image
-     *
-     * Values are four dimensions, or two, or one (CSS style)
-     * They represent the border thickness top, right, bottom and left.
-     * These values can either be in an array, or a space separated string.
-     * Each value can be in pixels (with or without 'px'), or percentage (of the source image)
-     *
-     * See {@link image_crop} for valid formats
-     *
-     * If a value is negative, the image will be cropped.
-     * Note that the dimensions of the picture will be increased by the borders' thickness
-     *
-     * Default value is null (no border)
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_border;
-
-    /**
-     * Border color
-     *
-     * Value is a color, in hexadecimal format.
-     * This setting is used only if {@link image_border} is set
-     *
-     * Default value is #FFFFFF
-     *
-     * @access public
-     * @var string;
-     */
-    var $image_border_color;
-
-    /**
-     * Sets the opacity for the borders
-     *
-     * Value is a percentage, as an integer between 0 (transparent) and 100 (opaque)
-     *
-     * Unless used with {@link image_border}, this setting has no effect
-     *
-     * Default value is 100
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_border_opacity;
-
-    /**
-     * Adds a fading-to-transparent border on the image
-     *
-     * Values are four dimensions, or two, or one (CSS style)
-     * They represent the border thickness top, right, bottom and left.
-     * These values can either be in an array, or a space separated string.
-     * Each value can be in pixels (with or without 'px'), or percentage (of the source image)
-     *
-     * See {@link image_crop} for valid formats
-     *
-     * Note that the dimensions of the picture will not be increased by the borders' thickness
-     *
-     * Default value is null (no border)
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_border_transparent;
-
-    /**
-     * Adds a multi-color frame on the outer of the image
-     *
-     * Value is an integer. Two values are possible for now:
-     * 1 for flat border, meaning that the frame is mirrored horizontally and vertically
-     * 2 for crossed border, meaning that the frame will be inversed, as in a bevel effect
-     *
-     * The frame will be composed of colored lines set in {@link image_frame_colors}
-     *
-     * Note that the dimensions of the picture will be increased by the borders' thickness
-     *
-     * Default value is null (no frame)
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_frame;
-
-    /**
-     * Sets the colors used to draw a frame
-     *
-     * Values is a list of n colors in hexadecimal format.
-     * These values can either be in an array, or a space separated string.
-     *
-     * The colors are listed in the following order: from the outset of the image to its center
-     *
-     * For instance, are valid:
-     * <pre>
-     * $foo->image_frame_colors = '#FFFFFF #999999 #666666 #000000';
-     * $foo->image_frame_colors = array('#FFFFFF', '#999999', '#666666', '#000000');
-     * </pre>
-     *
-     * This setting is used only if {@link image_frame} is set
-     *
-     * Default value is '#FFFFFF #999999 #666666 #000000'
-     *
-     * @access public
-     * @var string OR array;
-     */
-    var $image_frame_colors;
-
-    /**
-     * Sets the opacity for the frame
-     *
-     * Value is a percentage, as an integer between 0 (transparent) and 100 (opaque)
-     *
-     * Unless used with {@link image_frame}, this setting has no effect
-     *
-     * Default value is 100
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_frame_opacity;
-
-    /**
-     * Adds a watermark on the image
-     *
-     * Value is a local image filename, relative or absolute. GIF, JPG, BMP and PNG are supported, as well as PNG alpha.
-     *
-     * If set, this setting allow the use of all other settings starting with image_watermark_
-     *
-     * Default value is null
-     *
-     * @access public
-     * @var string;
-     */
-    var $image_watermark;
-
-    /**
-     * Sets the watermarkposition within the image
-     *
-     * Value is one or two out of 'TBLR' (top, bottom, left, right)
-     *
-     * The positions are as following:   TL  T  TR
-     *                                   L       R
-     *                                   BL  B  BR
-     *
-     * Default value is null (centered, horizontal and vertical)
-     *
-     * Note that is {@link image_watermark_x} and {@link image_watermark_y} are used, this setting has no effect
-     *
-     * @access public
-     * @var string;
-     */
-    var $image_watermark_position;
-
-    /**
-     * Sets the watermark absolute X position within the image
-     *
-     * Value is in pixels, representing the distance between the top of the image and the watermark
-     * If a negative value is used, it will represent the distance between the bottom of the image and the watermark
-     *
-     * Default value is null (so {@link image_watermark_position} is used)
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_watermark_x;
-
-    /**
-     * Sets the twatermark absolute Y position within the image
-     *
-     * Value is in pixels, representing the distance between the left of the image and the watermark
-     * If a negative value is used, it will represent the distance between the right of the image and the watermark
-     *
-     * Default value is null (so {@link image_watermark_position} is used)
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_watermark_y;
-
-    /**
-     * Prevents the watermark to be resized up if it is smaller than the image
-     *
-     * If the watermark if smaller than the destination image, taking in account the desired watermark position
-     * then it will be resized up to fill in the image (minus the {@link image_watermark_x} or {@link image_watermark_y} values)
-     *
-     * If you don't want your watermark to be resized in any way, then
-     * set {@link image_watermark_no_zoom_in} and {@link image_watermark_no_zoom_out} to true
-     * If you want your watermark to be resized up or doan to fill in the image better, then
-     * set {@link image_watermark_no_zoom_in} and {@link image_watermark_no_zoom_out} to false
-     *
-     * Default value is true (so the watermark will not be resized up, which is the behaviour most people expect)
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_watermark_no_zoom_in;
-
-    /**
-     * Prevents the watermark to be resized down if it is bigger than the image
-     *
-     * If the watermark if bigger than the destination image, taking in account the desired watermark position
-     * then it will be resized down to fit in the image (minus the {@link image_watermark_x} or {@link image_watermark_y} values)
-     *
-     * If you don't want your watermark to be resized in any way, then
-     * set {@link image_watermark_no_zoom_in} and {@link image_watermark_no_zoom_out} to true
-     * If you want your watermark to be resized up or doan to fill in the image better, then
-     * set {@link image_watermark_no_zoom_in} and {@link image_watermark_no_zoom_out} to false
-     *
-     * Default value is false (so the watermark may be shrinked to fit in the image)
-     *
-     * @access public
-     * @var integer
-     */
-    var $image_watermark_no_zoom_out;
-
-    /**
-     * List of MIME types per extension
-     *
-     * @access private
-     * @var array
-     */
-    var $mime_types;
-
-    /**
-     * Allowed MIME types
-     *
-     * Default is a selection of safe mime-types, but you might want to change it
-     *
-     * Simple wildcards are allowed, such as image/* or application/*
-     * If there is only one MIME type allowed, then it can be a string instead of an array
-     *
-     * @access public
-     * @var array OR string
-     */
-    var $allowed;
-
-    /**
-     * Forbidden MIME types
-     *
-     * Default is a selection of safe mime-types, but you might want to change it
-     * To only check for forbidden MIME types, and allow everything else, set {@link allowed} to array('* / *') without the spaces
-     *
-     * Simple wildcards are allowed, such as image/* or application/*
-     * If there is only one MIME type forbidden, then it can be a string instead of an array
-     *
-     * @access public
-     * @var array OR string
-     */
-    var $forbidden;
-
-    /**
-     * Array of translated error messages
-     *
-     * By default, the language is english (en_GB)
-     * Translations can be in separate files, in a lang/ subdirectory
-     *
-     * @access public
-     * @var array
-     */
-    var $translation;
-
-    /**
-     * Language selected for the translations
-     *
-     * By default, the language is english ("en_GB")
-     *
-     * @access public
-     * @var array
-     */
-    var $lang;
-
-    /**
-     * Init or re-init all the processing variables to their default values
-     *
-     * This function is called in the constructor, and after each call of {@link process}
-     *
-     * @access private
-     */
-    function init() {
-
-        // overiddable variables
-        $this->file_new_name_body       = null;     // replace the name body
-        $this->file_name_body_add       = null;     // append to the name body
-        $this->file_name_body_pre       = null;     // prepend to the name body
-        $this->file_new_name_ext        = null;     // replace the file extension
-        $this->file_safe_name           = true;     // format safely the filename
-        $this->file_force_extension     = true;     // forces extension if there isn't one
-        $this->file_overwrite           = false;    // allows overwritting if the file already exists
-        $this->file_auto_rename         = true;     // auto-rename if the file already exists
-        $this->dir_auto_create          = true;     // auto-creates directory if missing
-        $this->dir_auto_chmod           = true;     // auto-chmod directory if not writeable
-        $this->dir_chmod                = 0755;     // default chmod to use
-
-        $this->no_script                = true;     // turns scripts into test files
-        $this->mime_check               = true;     // checks the mime type against the allowed list
-
-        // these are the different MIME detection methods. if one of these method doesn't work on your
-        // system, you can deactivate it here; just set it to false
-        $this->mime_fileinfo            = true;     // MIME detection with Fileinfo PECL extension
-        $this->mime_file                = true;     // MIME detection with UNIX file() command
-        $this->mime_magic               = true;     // MIME detection with mime_magic (mime_content_type())
-        $this->mime_getimagesize        = true;     // MIME detection with getimagesize()
-
-        // get the default max size from php.ini
-        $this->file_max_size_raw = trim(ini_get('upload_max_filesize'));
-        $this->file_max_size = $this->getsize($this->file_max_size_raw);
-
-        $this->image_resize             = false;    // resize the image
-        $this->image_convert            = '';       // convert. values :''; 'png'; 'jpeg'; 'gif'; 'bmp'
-
-        $this->image_x                  = 150;
-        $this->image_y                  = 150;
-        $this->image_ratio              = false;    // keeps aspect ratio within x and y dimensions
-        $this->image_ratio_crop         = false;    // keeps aspect ratio within x and y dimensions, filling the space
-        $this->image_ratio_fill         = false;    // keeps aspect ratio within x and y dimensions, fitting the image in the space
-        $this->image_ratio_pixels       = false;    // keeps aspect ratio, calculating x and y to reach the number of pixels
-        $this->image_ratio_x            = false;    // calculate the $image_x if true
-        $this->image_ratio_y            = false;    // calculate the $image_y if true
-        $this->image_ratio_no_zoom_in   = false;
-        $this->image_ratio_no_zoom_out  = false;
-        $this->image_no_enlarging       = false;
-        $this->image_no_shrinking       = false;
-
-        $this->png_compression          = null;
-        $this->jpeg_quality             = 85;
-        $this->jpeg_size                = null;
-        $this->image_interlace          = false;
-        $this->image_is_transparent     = false;
-        $this->image_transparent_color  = null;
-        $this->image_background_color   = null;
-        $this->image_default_color      = '#ffffff';
-        $this->image_is_palette         = false;
-
-        $this->image_max_width          = null;
-        $this->image_max_height         = null;
-        $this->image_max_pixels         = null;
-        $this->image_max_ratio          = null;
-        $this->image_min_width          = null;
-        $this->image_min_height         = null;
-        $this->image_min_pixels         = null;
-        $this->image_min_ratio          = null;
-
-        $this->image_brightness         = null;
-        $this->image_contrast           = null;
-        $this->image_opacity            = null;
-        $this->image_threshold          = null;
-        $this->image_tint_color         = null;
-        $this->image_overlay_color      = null;
-        $this->image_overlay_opacity    = null;
-        $this->image_negative           = false;
-        $this->image_greyscale          = false;
-        $this->image_pixelate           = null;
-        $this->image_unsharp            = false;
-        $this->image_unsharp_amount     = 80;
-        $this->image_unsharp_radius     = 0.5;
-        $this->image_unsharp_threshold  = 1;
-
-        $this->image_text               = null;
-        $this->image_text_direction     = null;
-        $this->image_text_color         = '#FFFFFF';
-        $this->image_text_opacity       = 100;
-        $this->image_text_background    = null;
-        $this->image_text_background_opacity = 100;
-        $this->image_text_font          = 5;
-        $this->image_text_size          = 16;
-        $this->image_text_angle         = null;
-        $this->image_text_x             = null;
-        $this->image_text_y             = null;
-        $this->image_text_position      = null;
-        $this->image_text_padding       = 0;
-        $this->image_text_padding_x     = null;
-        $this->image_text_padding_y     = null;
-        $this->image_text_alignment     = 'C';
-        $this->image_text_line_spacing  = 0;
-
-        $this->image_reflection_height  = null;
-        $this->image_reflection_space   = 2;
-        $this->image_reflection_opacity = 60;
-
-        $this->image_watermark          = null;
-        $this->image_watermark_x        = null;
-        $this->image_watermark_y        = null;
-        $this->image_watermark_position = null;
-        $this->image_watermark_no_zoom_in  = true;
-        $this->image_watermark_no_zoom_out = false;
-
-        $this->image_flip               = null;
-        $this->image_auto_rotate        = true;
-        $this->image_rotate             = null;
-        $this->image_crop               = null;
-        $this->image_precrop            = null;
-
-        $this->image_bevel              = null;
-        $this->image_bevel_color1       = '#FFFFFF';
-        $this->image_bevel_color2       = '#000000';
-        $this->image_border             = null;
-        $this->image_border_color       = '#FFFFFF';
-        $this->image_border_opacity     = 100;
-        $this->image_border_transparent = null;
-        $this->image_frame              = null;
-        $this->image_frame_colors       = '#FFFFFF #999999 #666666 #000000';
-        $this->image_frame_opacity      = 100;
-
-        $this->forbidden = array();
-        $this->allowed = array(
-            'application/arj',
-            'application/excel',
-            'application/gnutar',
-            'application/mspowerpoint',
-            'application/msword',
-            'application/octet-stream',
-            'application/onenote',
-            'application/pdf',
-            'application/plain',
-            'application/postscript',
-            'application/powerpoint',
-            'application/rar',
-            'application/rtf',
-            'application/vnd.ms-excel',
-            'application/vnd.ms-excel.addin.macroEnabled.12',
-            'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
-            'application/vnd.ms-excel.sheet.macroEnabled.12',
-            'application/vnd.ms-excel.template.macroEnabled.12',
-            'application/vnd.ms-office',
-            'application/vnd.ms-officetheme',
-            'application/vnd.ms-powerpoint',
-            'application/vnd.ms-powerpoint.addin.macroEnabled.12',
-            'application/vnd.ms-powerpoint.presentation.macroEnabled.12',
-            'application/vnd.ms-powerpoint.slide.macroEnabled.12',
-            'application/vnd.ms-powerpoint.slideshow.macroEnabled.12',
-            'application/vnd.ms-powerpoint.template.macroEnabled.12',
-            'application/vnd.ms-word',
-            'application/vnd.ms-word.document.macroEnabled.12',
-            'application/vnd.ms-word.template.macroEnabled.12',
-            'application/vnd.oasis.opendocument.chart',
-            'application/vnd.oasis.opendocument.database',
-            'application/vnd.oasis.opendocument.formula',
-            'application/vnd.oasis.opendocument.graphics',
-            'application/vnd.oasis.opendocument.graphics-template',
-            'application/vnd.oasis.opendocument.image',
-            'application/vnd.oasis.opendocument.presentation',
-            'application/vnd.oasis.opendocument.presentation-template',
-            'application/vnd.oasis.opendocument.spreadsheet',
-            'application/vnd.oasis.opendocument.spreadsheet-template',
-            'application/vnd.oasis.opendocument.text',
-            'application/vnd.oasis.opendocument.text-master',
-            'application/vnd.oasis.opendocument.text-template',
-            'application/vnd.oasis.opendocument.text-web',
-            'application/vnd.openofficeorg.extension',
-            'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-            'application/vnd.openxmlformats-officedocument.presentationml.slide',
-            'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
-            'application/vnd.openxmlformats-officedocument.presentationml.template',
-            'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-            'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
-            'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-            'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-            'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
-            'application/vocaltec-media-file',
-            'application/wordperfect',
-            'application/x-bittorrent',
-            'application/x-bzip',
-            'application/x-bzip2',
-            'application/x-compressed',
-            'application/x-excel',
-            'application/x-gzip',
-            'application/x-latex',
-            'application/x-midi',
-            'application/xml',
-            'application/x-msexcel',
-            'application/x-rar',
-            'application/x-rar-compressed',
-            'application/x-rtf',
-            'application/x-shockwave-flash',
-            'application/x-sit',
-            'application/x-stuffit',
-            'application/x-troff-msvideo',
-            'application/x-zip',
-            'application/x-zip-compressed',
-            'application/zip',
-            'audio/*',
-            'image/*',
-            'multipart/x-gzip',
-            'multipart/x-zip',
-            'text/plain',
-            'text/rtf',
-            'text/richtext',
-            'text/xml',
-            'video/*',
-            'text/csv'
-        );
-
-        $this->mime_types = array(
-            'jpg' => 'image/jpeg',
-            'jpeg' => 'image/jpeg',
-            'jpe' => 'image/jpeg',
-            'gif' => 'image/gif',
-            'png' => 'image/png',
-            'bmp' => 'image/bmp',
-            'flif' => 'image/flif',
-            'flv' => 'video/x-flv',
-            'js' => 'application/x-javascript',
-            'json' => 'application/json',
-            'tiff' => 'image/tiff',
-            'css' => 'text/css',
-            'xml' => 'application/xml',
-            'doc' => 'application/msword',
-            'xls' => 'application/vnd.ms-excel',
-            'xlt' => 'application/vnd.ms-excel',
-            'xlm' => 'application/vnd.ms-excel',
-            'xld' => 'application/vnd.ms-excel',
-            'xla' => 'application/vnd.ms-excel',
-            'xlc' => 'application/vnd.ms-excel',
-            'xlw' => 'application/vnd.ms-excel',
-            'xll' => 'application/vnd.ms-excel',
-            'ppt' => 'application/vnd.ms-powerpoint',
-            'pps' => 'application/vnd.ms-powerpoint',
-            'rtf' => 'application/rtf',
-            'pdf' => 'application/pdf',
-            'html' => 'text/html',
-            'htm' => 'text/html',
-            'php' => 'text/html',
-            'txt' => 'text/plain',
-            'mpeg' => 'video/mpeg',
-            'mpg' => 'video/mpeg',
-            'mpe' => 'video/mpeg',
-            'mp3' => 'audio/mpeg3',
-            'wav' => 'audio/wav',
-            'aiff' => 'audio/aiff',
-            'aif' => 'audio/aiff',
-            'avi' => 'video/msvideo',
-            'wmv' => 'video/x-ms-wmv',
-            'mov' => 'video/quicktime',
-            'zip' => 'application/zip',
-            'tar' => 'application/x-tar',
-            'swf' => 'application/x-shockwave-flash',
-            'odt' => 'application/vnd.oasis.opendocument.text',
-            'ott' => 'application/vnd.oasis.opendocument.text-template',
-            'oth' => 'application/vnd.oasis.opendocument.text-web',
-            'odm' => 'application/vnd.oasis.opendocument.text-master',
-            'odg' => 'application/vnd.oasis.opendocument.graphics',
-            'otg' => 'application/vnd.oasis.opendocument.graphics-template',
-            'odp' => 'application/vnd.oasis.opendocument.presentation',
-            'otp' => 'application/vnd.oasis.opendocument.presentation-template',
-            'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
-            'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template',
-            'odc' => 'application/vnd.oasis.opendocument.chart',
-            'odf' => 'application/vnd.oasis.opendocument.formula',
-            'odb' => 'application/vnd.oasis.opendocument.database',
-            'odi' => 'application/vnd.oasis.opendocument.image',
-            'oxt' => 'application/vnd.openofficeorg.extension',
-            'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-            'docm' => 'application/vnd.ms-word.document.macroEnabled.12',
-            'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
-            'dotm' => 'application/vnd.ms-word.template.macroEnabled.12',
-            'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-            'xlsm' => 'application/vnd.ms-excel.sheet.macroEnabled.12',
-            'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
-            'xltm' => 'application/vnd.ms-excel.template.macroEnabled.12',
-            'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
-            'xlam' => 'application/vnd.ms-excel.addin.macroEnabled.12',
-            'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-            'pptm' => 'application/vnd.ms-powerpoint.presentation.macroEnabled.12',
-            'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
-            'ppsm' => 'application/vnd.ms-powerpoint.slideshow.macroEnabled.12',
-            'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
-            'potm' => 'application/vnd.ms-powerpoint.template.macroEnabled.12',
-            'ppam' => 'application/vnd.ms-powerpoint.addin.macroEnabled.12',
-            'sldx' => 'application/vnd.openxmlformats-officedocument.presentationml.slide',
-            'sldm' => 'application/vnd.ms-powerpoint.slide.macroEnabled.12',
-            'thmx' => 'application/vnd.ms-officetheme',
-            'onetoc' => 'application/onenote',
-            'onetoc2' => 'application/onenote',
-            'onetmp' => 'application/onenote',
-            'onepkg' => 'application/onenote',
-            'csv' => 'text/csv',
-        );
-
-    }
-
-    /**
-     * Constructor, for PHP5+
-     */
-    function  __construct($file, $lang = 'en_GB')  {
-        $this->upload($file, $lang);
-    }
-
-    /**
-     * Constructor, for PHP4. Checks if the file has been uploaded
-     *
-     * The constructor takes $_FILES['form_field'] array as argument
-     * where form_field is the form field name
-     *
-     * The constructor will check if the file has been uploaded in its temporary location, and
-     * accordingly will set {@link uploaded} (and {@link error} is an error occurred)
-     *
-     * If the file has been uploaded, the constructor will populate all the variables holding the upload
-     * information (none of the processing class variables are used here).
-     * You can have access to information about the file (name, size, MIME type...).
-     *
-     *
-     * Alternatively, you can set the first argument to be a local filename (string)
-     * This allows processing of a local file, as if the file was uploaded
-     *
-     * The optional second argument allows you to set the language for the error messages
-     *
-     * @access private
-     * @param  array  $file $_FILES['form_field']
-     *    or   string $file Local filename
-     * @param  string $lang Optional language code
-     */
-    function upload($file, $lang = 'en_GB') {
-
-        $this->version            = '0.35dev';
-
-        $this->file_src_name      = '';
-        $this->file_src_name_body = '';
-        $this->file_src_name_ext  = '';
-        $this->file_src_mime      = '';
-        $this->file_src_size      = '';
-        $this->file_src_error     = '';
-        $this->file_src_pathname  = '';
-        $this->file_src_temp      = '';
-
-        $this->file_dst_path      = '';
-        $this->file_dst_name      = '';
-        $this->file_dst_name_body = '';
-        $this->file_dst_name_ext  = '';
-        $this->file_dst_pathname  = '';
-
-        $this->image_src_x        = null;
-        $this->image_src_y        = null;
-        $this->image_src_bits     = null;
-        $this->image_src_type     = null;
-        $this->image_src_pixels   = null;
-        $this->image_dst_x        = 0;
-        $this->image_dst_y        = 0;
-        $this->image_dst_type     = '';
-
-        $this->uploaded           = true;
-        $this->no_upload_check    = false;
-        $this->processed          = false;
-        $this->error              = '';
-        $this->log                = '';
-        $this->allowed            = array();
-        $this->forbidden          = array();
-        $this->file_is_image      = false;
-        $this->init();
-        $info                     = null;
-        $mime_from_browser        = null;
-
-        // sets default language
-        $this->translation        = array();
-        $this->translation['file_error']                  = 'File error. Please try again.';
-        $this->translation['local_file_missing']          = 'Local file doesn\'t exist.';
-        $this->translation['local_file_not_readable']     = 'Local file is not readable.';
-        $this->translation['uploaded_too_big_ini']        = 'File upload error (the uploaded file exceeds the upload_max_filesize directive in php.ini).';
-        $this->translation['uploaded_too_big_html']       = 'File upload error (the uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form).';
-        $this->translation['uploaded_partial']            = 'File upload error (the uploaded file was only partially uploaded).';
-        $this->translation['uploaded_missing']            = 'File upload error (no file was uploaded).';
-        $this->translation['uploaded_no_tmp_dir']         = 'File upload error (missing a temporary folder).';
-        $this->translation['uploaded_cant_write']         = 'File upload error (failed to write file to disk).';
-        $this->translation['uploaded_err_extension']      = 'File upload error (file upload stopped by extension).';
-        $this->translation['uploaded_unknown']            = 'File upload error (unknown error code).';
-        $this->translation['try_again']                   = 'File upload error. Please try again.';
-        $this->translation['file_too_big']                = 'File too big.';
-        $this->translation['no_mime']                     = 'MIME type can\'t be detected.';
-        $this->translation['incorrect_file']              = 'Incorrect type of file.';
-        $this->translation['image_too_wide']              = 'Image too wide.';
-        $this->translation['image_too_narrow']            = 'Image too narrow.';
-        $this->translation['image_too_high']              = 'Image too tall.';
-        $this->translation['image_too_short']             = 'Image too short.';
-        $this->translation['ratio_too_high']              = 'Image ratio too high (image too wide).';
-        $this->translation['ratio_too_low']               = 'Image ratio too low (image too high).';
-        $this->translation['too_many_pixels']             = 'Image has too many pixels.';
-        $this->translation['not_enough_pixels']           = 'Image has not enough pixels.';
-        $this->translation['file_not_uploaded']           = 'File not uploaded. Can\'t carry on a process.';
-        $this->translation['already_exists']              = '%s already exists. Please change the file name.';
-        $this->translation['temp_file_missing']           = 'No correct temp source file. Can\'t carry on a process.';
-        $this->translation['source_missing']              = 'No correct uploaded source file. Can\'t carry on a process.';
-        $this->translation['destination_dir']             = 'Destination directory can\'t be created. Can\'t carry on a process.';
-        $this->translation['destination_dir_missing']     = 'Destination directory doesn\'t exist. Can\'t carry on a process.';
-        $this->translation['destination_path_not_dir']    = 'Destination path is not a directory. Can\'t carry on a process.';
-        $this->translation['destination_dir_write']       = 'Destination directory can\'t be made writeable. Can\'t carry on a process.';
-        $this->translation['destination_path_write']      = 'Destination path is not a writeable. Can\'t carry on a process.';
-        $this->translation['temp_file']                   = 'Can\'t create the temporary file. Can\'t carry on a process.';
-        $this->translation['source_not_readable']         = 'Source file is not readable. Can\'t carry on a process.';
-        $this->translation['no_create_support']           = 'No create from %s support.';
-        $this->translation['create_error']                = 'Error in creating %s image from source.';
-        $this->translation['source_invalid']              = 'Can\'t read image source. Not an image?.';
-        $this->translation['gd_missing']                  = 'GD doesn\'t seem to be present.';
-        $this->translation['watermark_no_create_support'] = 'No create from %s support, can\'t read watermark.';
-        $this->translation['watermark_create_error']      = 'No %s read support, can\'t create watermark.';
-        $this->translation['watermark_invalid']           = 'Unknown image format, can\'t read watermark.';
-        $this->translation['file_create']                 = 'No %s create support.';
-        $this->translation['no_conversion_type']          = 'No conversion type defined.';
-        $this->translation['copy_failed']                 = 'Error copying file on the server. copy() failed.';
-        $this->translation['reading_failed']              = 'Error reading the file.';
-
-        // determines the language
-        $this->lang               = $lang;
-        if ($this->lang != 'en_GB' && file_exists(dirname(__FILE__).'/lang') && file_exists(dirname(__FILE__).'/lang/class.upload.' . $lang . '.php')) {
-            $translation = null;
-            include(dirname(__FILE__).'/lang/class.upload.' . $lang . '.php');
-            if (is_array($translation)) {
-                $this->translation = array_merge($this->translation, $translation);
-            } else {
-                $this->lang = 'en_GB';
-            }
-        }
-
-
-        // determines the supported MIME types, and matching image format
-        $this->image_supported = array();
-        if ($this->gdversion()) {
-            if (imagetypes() & IMG_GIF) {
-                $this->image_supported['image/gif'] = 'gif';
-            }
-            if (imagetypes() & IMG_JPG) {
-                $this->image_supported['image/jpg'] = 'jpg';
-                $this->image_supported['image/jpeg'] = 'jpg';
-                $this->image_supported['image/pjpeg'] = 'jpg';
-            }
-            if (imagetypes() & IMG_PNG) {
-                $this->image_supported['image/png'] = 'png';
-                $this->image_supported['image/x-png'] = 'png';
-            }
-            if (imagetypes() & IMG_WBMP) {
-                $this->image_supported['image/bmp'] = 'bmp';
-                $this->image_supported['image/x-ms-bmp'] = 'bmp';
-                $this->image_supported['image/x-windows-bmp'] = 'bmp';
-            }
-        }
-
-        // display some system information
-        if (empty($this->log)) {
-            $this->log .= '<b>system information</b><br />';
-            if ($this->function_enabled('ini_get_all')) {
-                $inis = ini_get_all();
-                $open_basedir = (array_key_exists('open_basedir', $inis) && array_key_exists('local_value', $inis['open_basedir']) && !empty($inis['open_basedir']['local_value'])) ? $inis['open_basedir']['local_value'] : false;
-            } else {
-                $open_basedir = false;
-            }
-            $gd           = $this->gdversion() ? $this->gdversion(true) : 'GD not present';
-            $supported    = trim((in_array('png', $this->image_supported) ? 'png' : '') . ' ' .
-                                 (in_array('jpg', $this->image_supported) ? 'jpg' : '') . ' ' .
-                                 (in_array('gif', $this->image_supported) ? 'gif' : '') . ' ' .
-                                 (in_array('bmp', $this->image_supported) ? 'bmp' : ''));
-            $this->log .= '-&nbsp;class version           : ' . $this->version . '<br />';
-            $this->log .= '-&nbsp;operating system        : ' . PHP_OS . '<br />';
-            $this->log .= '-&nbsp;PHP version             : ' . PHP_VERSION . '<br />';
-            $this->log .= '-&nbsp;GD version              : ' . $gd . '<br />';
-            $this->log .= '-&nbsp;supported image types   : ' . (!empty($supported) ? $supported : 'none') . '<br />';
-            $this->log .= '-&nbsp;open_basedir            : ' . (!empty($open_basedir) ? $open_basedir : 'no restriction') . '<br />';
-            $this->log .= '-&nbsp;upload_max_filesize     : ' . $this->file_max_size_raw . ' (' . $this->file_max_size . ' bytes)<br />';
-            $this->log .= '-&nbsp;language                : ' . $this->lang . '<br />';
-        }
-
-        if (!$file) {
-            $this->uploaded = false;
-            $this->error = $this->translate('file_error');
-        }
-
-        // check if we sent a local filename or a PHP stream rather than a $_FILE element
-        if (!is_array($file)) {
-            if (empty($file)) {
-                $this->uploaded = false;
-                $this->error = $this->translate('file_error');
-            } else {
-                if (substr($file, 0, 4) == 'php:' || substr($file, 0, 5) == 'data:' || substr($file, 0, 7) == 'base64:') {
-                    $data = null;
-
-                    // this is a PHP stream, i.e.not uploaded
-                    if (substr($file, 0, 4) == 'php:') {
-                        $file = preg_replace('/^php:(.*)/i', '$1', $file);
-                        if (!$file) $file = $_SERVER['HTTP_X_FILE_NAME'];
-                        if (!$file) $file = 'unknown';
-                        $data = file_get_contents('php://input');
-                        $this->log .= '<b>source is a PHP stream ' . $file . ' of length ' . strlen($data) . '</b><br />';
-
-                    // this is the raw file data, base64-encoded, i.e.not uploaded
-                    } else if (substr($file, 0, 7) == 'base64:') {
-                        $data = base64_decode(preg_replace('/^base64:(.*)/i', '$1', $file));
-                        $file = 'base64';
-                        $this->log .= '<b>source is a base64 string of length ' . strlen($data) . '</b><br />';
-
-                    // this is the raw file data, base64-encoded, i.e.not uploaded
-                    } else if (substr($file, 0, 5) == 'data:' && strpos($file, 'base64,') !== false) {
-                        $data = base64_decode(preg_replace('/^data:.*base64,(.*)/i', '$1', $file));
-                        $file = 'base64';
-                        $this->log .= '<b>source is a base64 data string of length ' . strlen($data) . '</b><br />';
-
-                    // this is the raw file data, i.e.not uploaded
-                    } else if (substr($file, 0, 5) == 'data:') {
-                        $data = preg_replace('/^data:(.*)/i', '$1', $file);
-                        $file = 'data';
-                        $this->log .= '<b>source is a data string of length ' . strlen($data) . '</b><br />';
-                    }
-
-                    if (!$data) {
-                        $this->log .= '- source is empty!<br />';
-                        $this->uploaded = false;
-                        $this->error = $this->translate('source_invalid');
-                    }
-
-                    $this->no_upload_check = true;
-
-                    if ($this->uploaded) {
-                        $this->log .= '- requires a temp file ... ';
-                        $hash = $this->temp_dir() . md5($file . rand(1, 1000));
-                        if ($data && file_put_contents($hash, $data)) {
-                            $this->file_src_pathname = $hash;
-                            $this->log .= ' file created<br />';
-                            $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;temp file is: ' . $this->file_src_pathname . '<br />';
-                        } else {
-                            $this->log .= ' failed<br />';
-                            $this->uploaded = false;
-                            $this->error = $this->translate('temp_file');
-                        }
-                    }
-
-                    if ($this->uploaded) {
-                        $this->file_src_name       = $file;
-                        $this->log .= '- local file OK<br />';
-                        preg_match('/\.([^\.]*$)/', $this->file_src_name, $extension);
-                        if (is_array($extension) && sizeof($extension) > 0) {
-                            $this->file_src_name_ext      = strtolower($extension[1]);
-                            $this->file_src_name_body     = substr($this->file_src_name, 0, ((strlen($this->file_src_name) - strlen($this->file_src_name_ext)))-1);
-                        } else {
-                            $this->file_src_name_ext      = '';
-                            $this->file_src_name_body     = $this->file_src_name;
-                        }
-                        $this->file_src_size = (file_exists($this->file_src_pathname) ? filesize($this->file_src_pathname) : 0);
-                    }
-                    $this->file_src_error = 0;
-
-                } else {
-                    // this is a local filename, i.e.not uploaded
-                    $this->log .= '<b>source is a local file ' . $file . '</b><br />';
-                    $this->no_upload_check = true;
-
-                    if ($this->uploaded && !file_exists($file)) {
-                        $this->uploaded = false;
-                        $this->error = $this->translate('local_file_missing');
-                    }
-
-                    if ($this->uploaded && !is_readable($file)) {
-                        $this->uploaded = false;
-                        $this->error = $this->translate('local_file_not_readable');
-                    }
-
-                    if ($this->uploaded) {
-                        $this->file_src_pathname   = $file;
-                        $this->file_src_name       = basename($file);
-                        $this->log .= '- local file OK<br />';
-                        preg_match('/\.([^\.]*$)/', $this->file_src_name, $extension);
-                        if (is_array($extension) && sizeof($extension) > 0) {
-                            $this->file_src_name_ext      = strtolower($extension[1]);
-                            $this->file_src_name_body     = substr($this->file_src_name, 0, ((strlen($this->file_src_name) - strlen($this->file_src_name_ext)))-1);
-                        } else {
-                            $this->file_src_name_ext      = '';
-                            $this->file_src_name_body     = $this->file_src_name;
-                        }
-                        $this->file_src_size = (file_exists($this->file_src_pathname) ? filesize($this->file_src_pathname) : 0);
-                    }
-                    $this->file_src_error = 0;
-                }
-            }
-        } else {
-            // this is an element from $_FILE, i.e. an uploaded file
-            $this->log .= '<b>source is an uploaded file</b><br />';
-            if ($this->uploaded) {
-                $this->file_src_error         = trim($file['error']);
-                switch($this->file_src_error) {
-                    case UPLOAD_ERR_OK:
-                        // all is OK
-                        $this->log .= '- upload OK<br />';
-                        break;
-                    case UPLOAD_ERR_INI_SIZE:
-                        $this->uploaded = false;
-                        $this->error = $this->translate('uploaded_too_big_ini');
-                        break;
-                    case UPLOAD_ERR_FORM_SIZE:
-                        $this->uploaded = false;
-                        $this->error = $this->translate('uploaded_too_big_html');
-                        break;
-                    case UPLOAD_ERR_PARTIAL:
-                        $this->uploaded = false;
-                        $this->error = $this->translate('uploaded_partial');
-                        break;
-                    case UPLOAD_ERR_NO_FILE:
-                        $this->uploaded = false;
-                        $this->error = $this->translate('uploaded_missing');
-                        break;
-                    case @UPLOAD_ERR_NO_TMP_DIR:
-                        $this->uploaded = false;
-                        $this->error = $this->translate('uploaded_no_tmp_dir');
-                        break;
-                    case @UPLOAD_ERR_CANT_WRITE:
-                        $this->uploaded = false;
-                        $this->error = $this->translate('uploaded_cant_write');
-                        break;
-                    case @UPLOAD_ERR_EXTENSION:
-                        $this->uploaded = false;
-                        $this->error = $this->translate('uploaded_err_extension');
-                        break;
-                    default:
-                        $this->uploaded = false;
-                        $this->error = $this->translate('uploaded_unknown') . ' ('.$this->file_src_error.')';
-                }
-            }
-
-            if ($this->uploaded) {
-                $this->file_src_pathname   = $file['tmp_name'];
-                $this->file_src_name       = $file['name'];
-                if ($this->file_src_name == '') {
-                    $this->uploaded = false;
-                    $this->error = $this->translate('try_again');
-                }
-            }
-
-            if ($this->uploaded) {
-                $this->log .= '- file name OK<br />';
-                preg_match('/\.([^\.]*$)/', $this->file_src_name, $extension);
-                if (is_array($extension) && sizeof($extension) > 0) {
-                    $this->file_src_name_ext      = strtolower($extension[1]);
-                    $this->file_src_name_body     = substr($this->file_src_name, 0, ((strlen($this->file_src_name) - strlen($this->file_src_name_ext)))-1);
-                } else {
-                    $this->file_src_name_ext      = '';
-                    $this->file_src_name_body     = $this->file_src_name;
-                }
-                $this->file_src_size = $file['size'];
-                $mime_from_browser = $file['type'];
-            }
-        }
-
-        if ($this->uploaded) {
-            $this->log .= '<b>determining MIME type</b><br />';
-            $this->file_src_mime = null;
-
-            // checks MIME type with Fileinfo PECL extension
-            if (!$this->file_src_mime || !is_string($this->file_src_mime) || empty($this->file_src_mime) || strpos($this->file_src_mime, '/') === false) {
-                if ($this->mime_fileinfo) {
-                    $this->log .= '- Checking MIME type with Fileinfo PECL extension<br />';
-                    if ($this->function_enabled('finfo_open')) {
-                        $path = null;
-                        if ($this->mime_fileinfo !== '') {
-                            if ($this->mime_fileinfo === true) {
-                                if (getenv('MAGIC') === false) {
-                                    if (substr(PHP_OS, 0, 3) == 'WIN') {
-                                        $path = realpath(ini_get('extension_dir') . '/../') . '/extras/magic';
-                                        $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;MAGIC path defaults to ' . $path . '<br />';
-                                    }
-                                } else {
-                                    $path = getenv('MAGIC');
-                                    $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;MAGIC path is set to ' . $path . ' from MAGIC variable<br />';
-                                }
-                            } else {
-                                $path = $this->mime_fileinfo;
-                                $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;MAGIC path is set to ' . $path . '<br />';
-                            }
-                        }
-                        if ($path) {
-                            $f = @finfo_open(FILEINFO_MIME, $path);
-                        } else {
-                            $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;MAGIC path will not be used<br />';
-                            $f = @finfo_open(FILEINFO_MIME);
-                        }
-                        if (is_resource($f)) {
-                            $mime = finfo_file($f, realpath($this->file_src_pathname));
-                            finfo_close($f);
-                            $this->file_src_mime = $mime;
-                            $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;MIME type detected as ' . $this->file_src_mime . ' by Fileinfo PECL extension<br />';
-                            if (preg_match("/^([\.\w-]+)\/([\.\w-]+)(.*)$/i", $this->file_src_mime)) {
-                                $this->file_src_mime = preg_replace("/^([\.\w-]+)\/([\.\w-]+)(.*)$/i", '$1/$2', $this->file_src_mime);
-                                $this->log .= '-&nbsp;MIME validated as ' . $this->file_src_mime . '<br />';
-                            } else {
-                                $this->file_src_mime = null;
-                            }
-                        } else {
-                            $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;Fileinfo PECL extension failed (finfo_open)<br />';
-                        }
-                    } elseif (@class_exists('finfo', false)) {
-                        $f = new finfo( FILEINFO_MIME );
-                        if ($f) {
-                            $this->file_src_mime = $f->file(realpath($this->file_src_pathname));
-                            $this->log .= '- MIME type detected as ' . $this->file_src_mime . ' by Fileinfo PECL extension<br />';
-                            if (preg_match("/^([\.\w-]+)\/([\.\w-]+)(.*)$/i", $this->file_src_mime)) {
-                                $this->file_src_mime = preg_replace("/^([\.\w-]+)\/([\.\w-]+)(.*)$/i", '$1/$2', $this->file_src_mime);
-                                $this->log .= '-&nbsp;MIME validated as ' . $this->file_src_mime . '<br />';
-                            } else {
-                                $this->file_src_mime = null;
-                            }
-                        } else {
-                            $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;Fileinfo PECL extension failed (finfo)<br />';
-                        }
-                    } else {
-                        $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;Fileinfo PECL extension not available<br />';
-                    }
-                } else {
-                    $this->log .= '- Fileinfo PECL extension deactivated<br />';
-                }
-            }
-
-            // checks MIME type with shell if unix access is authorized
-            if (!$this->file_src_mime || !is_string($this->file_src_mime) || empty($this->file_src_mime) || strpos($this->file_src_mime, '/') === false) {
-                if ($this->mime_file) {
-                    $this->log .= '- Checking MIME type with UNIX file() command<br />';
-                    if (substr(PHP_OS, 0, 3) != 'WIN') {
-                        if ($this->function_enabled('exec') && $this->function_enabled('escapeshellarg')) {
-                            if (strlen($mime = @exec("file -bi ".escapeshellarg($this->file_src_pathname))) != 0) {
-                                $this->file_src_mime = trim($mime);
-                                $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;MIME type detected as ' . $this->file_src_mime . ' by UNIX file() command<br />';
-                                if (preg_match("/^([\.\w-]+)\/([\.\w-]+)(.*)$/i", $this->file_src_mime)) {
-                                    $this->file_src_mime = preg_replace("/^([\.\w-]+)\/([\.\w-]+)(.*)$/i", '$1/$2', $this->file_src_mime);
-                                    $this->log .= '-&nbsp;MIME validated as ' . $this->file_src_mime . '<br />';
-                                } else {
-                                    $this->file_src_mime = null;
-                                }
-                            } else {
-                                $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;UNIX file() command failed<br />';
-                            }
-                        } else {
-                            $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;PHP exec() function is disabled<br />';
-                        }
-                    } else {
-                        $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;UNIX file() command not availabled<br />';
-                    }
-                } else {
-                    $this->log .= '- UNIX file() command is deactivated<br />';
-                }
-            }
-
-            // checks MIME type with mime_magic
-            if (!$this->file_src_mime || !is_string($this->file_src_mime) || empty($this->file_src_mime) || strpos($this->file_src_mime, '/') === false) {
-                if ($this->mime_magic) {
-                    $this->log .= '- Checking MIME type with mime.magic file (mime_content_type())<br />';
-                    if ($this->function_enabled('mime_content_type')) {
-                        $this->file_src_mime = mime_content_type($this->file_src_pathname);
-                        $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;MIME type detected as ' . $this->file_src_mime . ' by mime_content_type()<br />';
-                        if (preg_match("/^([\.\w-]+)\/([\.\w-]+)(.*)$/i", $this->file_src_mime)) {
-                            $this->file_src_mime = preg_replace("/^([\.\w-]+)\/([\.\w-]+)(.*)$/i", '$1/$2', $this->file_src_mime);
-                            $this->log .= '-&nbsp;MIME validated as ' . $this->file_src_mime . '<br />';
-                        } else {
-                            $this->file_src_mime = null;
-                        }
-                    } else {
-                        $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;mime_content_type() is not available<br />';
-                    }
-                } else {
-                    $this->log .= '- mime.magic file (mime_content_type()) is deactivated<br />';
-                }
-            }
-
-            // checks MIME type with getimagesize()
-            if (!$this->file_src_mime || !is_string($this->file_src_mime) || empty($this->file_src_mime) || strpos($this->file_src_mime, '/') === false) {
-                if ($this->mime_getimagesize) {
-                    $this->log .= '- Checking MIME type with getimagesize()<br />';
-                    $info = getimagesize($this->file_src_pathname);
-                    if (is_array($info) && array_key_exists('mime', $info)) {
-                        $this->file_src_mime = trim($info['mime']);
-                        if (empty($this->file_src_mime)) {
-                            $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;MIME empty, guessing from type<br />';
-                            $mime = (is_array($info) && array_key_exists(2, $info) ? $info[2] : null); // 1 = GIF, 2 = JPG, 3 = PNG
-                            $this->file_src_mime = ($mime==IMAGETYPE_GIF  ? 'image/gif' :
-                                                   ($mime==IMAGETYPE_JPEG ? 'image/jpeg' :
-                                                   ($mime==IMAGETYPE_PNG  ? 'image/png' :
-                                                   ($mime==IMAGETYPE_BMP  ? 'image/bmp' : null))));
-                        }
-                        $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;MIME type detected as ' . $this->file_src_mime . ' by PHP getimagesize() function<br />';
-                        if (preg_match("/^([\.\w-]+)\/([\.\w-]+)(.*)$/i", $this->file_src_mime)) {
-                            $this->file_src_mime = preg_replace("/^([\.\w-]+)\/([\.\w-]+)(.*)$/i", '$1/$2', $this->file_src_mime);
-                            $this->log .= '-&nbsp;MIME validated as ' . $this->file_src_mime . '<br />';
-                        } else {
-                            $this->file_src_mime = null;
-                        }
-                    } else {
-                        $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;getimagesize() failed<br />';
-                    }
-                } else {
-                    $this->log .= '- getimagesize() is deactivated<br />';
-                }
-            }
-
-            // default to MIME from browser (or Flash)
-            if (!empty($mime_from_browser) && !$this->file_src_mime || !is_string($this->file_src_mime) || empty($this->file_src_mime)) {
-                $this->file_src_mime =$mime_from_browser;
-                $this->log .= '- MIME type detected as ' . $this->file_src_mime . ' by browser<br />';
-                if (preg_match("/^([\.\w-]+)\/([\.\w-]+)(.*)$/i", $this->file_src_mime)) {
-                    $this->file_src_mime = preg_replace("/^([\.\w-]+)\/([\.\w-]+)(.*)$/i", '$1/$2', $this->file_src_mime);
-                    $this->log .= '-&nbsp;MIME validated as ' . $this->file_src_mime . '<br />';
-                } else {
-                    $this->file_src_mime = null;
-                }
-            }
-
-            // we need to work some magic if we upload via Flash
-            if ($this->file_src_mime == 'application/octet-stream' || !$this->file_src_mime || !is_string($this->file_src_mime) || empty($this->file_src_mime) || strpos($this->file_src_mime, '/') === false) {
-                if ($this->file_src_mime == 'application/octet-stream') $this->log .= '- Flash may be rewriting MIME as application/octet-stream<br />';
-                $this->log .= '- Try to guess MIME type from file extension (' . $this->file_src_name_ext . '): ';
-                if (array_key_exists($this->file_src_name_ext, $this->mime_types)) $this->file_src_mime = $this->mime_types[$this->file_src_name_ext];
-                if ($this->file_src_mime == 'application/octet-stream') {
-                    $this->log .= 'doesn\'t look like anything known<br />';
-                } else {
-                    $this->log .= 'MIME type set to ' . $this->file_src_mime . '<br />';
-                }
-            }
-
-            if (!$this->file_src_mime || !is_string($this->file_src_mime) || empty($this->file_src_mime) || strpos($this->file_src_mime, '/') === false) {
-                $this->log .= '- MIME type couldn\'t be detected! (' . (string) $this->file_src_mime . ')<br />';
-            }
-
-            // determine whether the file is an image
-            if ($this->file_src_mime && is_string($this->file_src_mime) && !empty($this->file_src_mime) && array_key_exists($this->file_src_mime, $this->image_supported)) {
-                $this->file_is_image = true;
-                $this->image_src_type = $this->image_supported[$this->file_src_mime];
-            }
-
-            // if the file is an image, we gather some useful data
-            if ($this->file_is_image) {
-                if ($h = fopen($this->file_src_pathname, 'r')) {
-                    fclose($h);
-                    $info = getimagesize($this->file_src_pathname);
-                    if (is_array($info)) {
-                        $this->image_src_x    = $info[0];
-                        $this->image_src_y    = $info[1];
-                        $this->image_dst_x    = $this->image_src_x;
-                        $this->image_dst_y    = $this->image_src_y;
-                        $this->image_src_pixels = $this->image_src_x * $this->image_src_y;
-                        $this->image_src_bits = array_key_exists('bits', $info) ? $info['bits'] : null;
-                    } else {
-                        $this->file_is_image = false;
-                        $this->uploaded = false;
-                        $this->log .= '- can\'t retrieve image information, image may have been tampered with<br />';
-                        $this->error = $this->translate('source_invalid');
-                    }
-                } else {
-                    $this->log .= '- can\'t read source file directly. open_basedir restriction in place?<br />';
-                }
-            }
-
-            $this->log .= '<b>source variables</b><br />';
-            $this->log .= '- You can use all these before calling process()<br />';
-            $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;file_src_name         : ' . $this->file_src_name . '<br />';
-            $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;file_src_name_body    : ' . $this->file_src_name_body . '<br />';
-            $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;file_src_name_ext     : ' . $this->file_src_name_ext . '<br />';
-            $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;file_src_pathname     : ' . $this->file_src_pathname . '<br />';
-            $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;file_src_mime         : ' . $this->file_src_mime . '<br />';
-            $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;file_src_size         : ' . $this->file_src_size . ' (max= ' . $this->file_max_size . ')<br />';
-            $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;file_src_error        : ' . $this->file_src_error . '<br />';
-
-            if ($this->file_is_image) {
-                $this->log .= '- source file is an image<br />';
-                $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;image_src_x           : ' . $this->image_src_x . '<br />';
-                $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;image_src_y           : ' . $this->image_src_y . '<br />';
-                $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;image_src_pixels      : ' . $this->image_src_pixels . '<br />';
-                $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;image_src_type        : ' . $this->image_src_type . '<br />';
-                $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;image_src_bits        : ' . $this->image_src_bits . '<br />';
-            }
-        }
-
-    }
-
-    /**
-     * Returns the version of GD
-     *
-     * @access public
-     * @param  boolean  $full Optional flag to get precise version
-     * @return float GD version
-     */
-    function gdversion($full = false) {
-        static $gd_version = null;
-        static $gd_full_version = null;
-        if ($gd_version === null) {
-            if ($this->function_enabled('gd_info')) {
-                $gd = gd_info();
-                $gd = $gd["GD Version"];
-                $regex = "/([\d\.]+)/i";
-            } else {
-                ob_start();
-                phpinfo(8);
-                $gd = ob_get_contents();
-                ob_end_clean();
-                $regex = "/\bgd\s+version\b[^\d\n\r]+?([\d\.]+)/i";
-            }
-            if (preg_match($regex, $gd, $m)) {
-                $gd_full_version = (string) $m[1];
-                $gd_version = (float) $m[1];
-            } else {
-                $gd_full_version = 'none';
-                $gd_version = 0;
-            }
-        }
-        if ($full) {
-            return $gd_full_version;
-        } else {
-            return $gd_version;
-        }
-    }
-
-    /**
-     * Checks if a function is available
-     *
-     * @access private
-     * @param  string  $func Function name
-     * @return boolean Success
-     */
-    function function_enabled($func) {
-        // cache the list of disabled functions
-        static $disabled = null;
-        if ($disabled === null) $disabled = array_map('trim', array_map('strtolower', explode(',', ini_get('disable_functions'))));
-        // cache the list of functions blacklisted by suhosin
-        static $blacklist = null;
-        if ($blacklist === null) $blacklist = extension_loaded('suhosin') ? array_map('trim', array_map('strtolower', explode(',', ini_get('  suhosin.executor.func.blacklist')))) : array();
-        // checks if the function is really enabled
-        return (function_exists($func) && !in_array($func, $disabled) && !in_array($func, $blacklist));
-    }
-
-    /**
-     * Creates directories recursively
-     *
-     * @access private
-     * @param  string  $path Path to create
-     * @param  integer $mode Optional permissions
-     * @return boolean Success
-     */
-    function rmkdir($path, $mode = 0755) {
-        return is_dir($path) || ( $this->rmkdir(dirname($path), $mode) && $this->_mkdir($path, $mode) );
-    }
-
-    /**
-     * Creates directory
-     *
-     * @access private
-     * @param  string  $path Path to create
-     * @param  integer $mode Optional permissions
-     * @return boolean Success
-     */
-    function _mkdir($path, $mode = 0755) {
-        $old = umask(0);
-        $res = @mkdir($path, $mode);
-        umask($old);
-        return $res;
-    }
-
-    /**
-     * Translate error messages
-     *
-     * @access private
-     * @param  string  $str    Message to translate
-     * @param  array   $tokens Optional token values
-     * @return string Translated string
-     */
-    function translate($str, $tokens = array()) {
-        if (array_key_exists($str, $this->translation)) $str = $this->translation[$str];
-        if (is_array($tokens) && sizeof($tokens) > 0)   $str = vsprintf($str, $tokens);
-        return $str;
-    }
-
-    /**
-     * Returns the temp directory
-     *
-     * @access private
-     * @return string Temp directory string
-     */
-    function temp_dir() {
-        $dir = '';
-        if ($this->function_enabled('sys_get_temp_dir')) $dir = sys_get_temp_dir();
-        if (!$dir && $tmp=getenv('TMP'))    $dir = $tmp;
-        if (!$dir && $tmp=getenv('TEMP'))   $dir = $tmp;
-        if (!$dir && $tmp=getenv('TMPDIR')) $dir = $tmp;
-        if (!$dir) {
-            $tmp = tempnam(__FILE__,'');
-            if (file_exists($tmp)) {
-                unlink($tmp);
-                $dir = dirname($tmp);
-            }
-        }
-        if (!$dir) return '';
-        $slash = (strtolower(substr(PHP_OS, 0, 3)) === 'win' ? '\\' : '/');
-        if (substr($dir, -1) != $slash) $dir = $dir . $slash;
-        return $dir;
-    }
-
-    /**
-     * Sanitize a file name
-     *
-     * @access private
-     * @param  string  $filename File name
-     * @return string Sanitized file name
-     */
-    function sanitize($filename) {
-        // remove HTML tags
-        $filename = strip_tags($filename);
-        // remove non-breaking spaces
-        $filename = preg_replace("#\x{00a0}#siu", ' ', $filename);
-        // remove illegal file system characters
-        $filename = str_replace(array_map('chr', range(0, 31)), '', $filename);
-        // remove dangerous characters for file names
-        $chars = array("?", "[", "]", "/", "\\", "=", "<", ">", ":", ";", ",", "'", "\"", "&", "’", "%20",
-                       "+", "$", "#", "*", "(", ")", "|", "~", "`", "!", "{", "}", "%", "+", "^", chr(0));
-        $filename = str_replace($chars, '-', $filename);
-        // remove break/tabs/return carriage
-        $filename = preg_replace('/[\r\n\t -]+/', '-', $filename);
-        // convert some special letters
-        $convert = array('Þ' => 'TH', 'þ' => 'th', 'Ð' => 'DH', 'ð' => 'dh', 'ß' => 'ss',
-                         'Œ' => 'OE', 'œ' => 'oe', 'Æ' => 'AE', 'æ' => 'ae', 'µ' => 'u');
-        $filename = strtr($filename, $convert);
-        // remove foreign accents by converting to HTML entities, and then remove the code
-        $filename = html_entity_decode( $filename, ENT_QUOTES, "utf-8" );
-        $filename = htmlentities($filename, ENT_QUOTES, "utf-8");
-        $filename = preg_replace("/(&)([a-z])([a-z]+;)/i", '$2', $filename);
-        // clean up, and remove repetitions
-        $filename = preg_replace('/_+/', '_', $filename);
-        $filename = preg_replace(array('/ +/', '/-+/'), '-', $filename);
-        $filename = preg_replace(array('/-*\.-*/', '/\.{2,}/'), '.', $filename);
-        // cut to 255 characters
-        $length = 255 - strlen($this->file_dst_name_ext) + 1;
-        $filename = extension_loaded('mbstring') ? mb_strcut($filename, 0, $length, mb_detect_encoding($filename)) : substr($filename, 0, $length);
-        // remove bad characters at start and end
-        $filename = trim($filename, '.-_');
-        return $filename;
-    }
-
-    /**
-     * Decodes colors
-     *
-     * @access private
-     * @param  string  $color  Color string
-     * @return array RGB colors
-     */
-    function getcolors($color) {
-        $color = str_replace('#', '', $color);
-        if (strlen($color) == 3) $color = str_repeat(substr($color, 0, 1), 2) . str_repeat(substr($color, 1, 1), 2) . str_repeat(substr($color, 2, 1), 2);
-        $r = sscanf($color, "%2x%2x%2x");
-        $red   = (is_array($r) && array_key_exists(0, $r) && is_numeric($r[0]) ? $r[0] : 0);
-        $green = (is_array($r) && array_key_exists(1, $r) && is_numeric($r[1]) ? $r[1] : 0);
-        $blue  = (is_array($r) && array_key_exists(2, $r) && is_numeric($r[2]) ? $r[2] : 0);
-        return array($red, $green, $blue);
-    }
-
-    /**
-     * Decodes sizes
-     *
-     * @access private
-     * @param  string  $size  Size in bytes, or shorthand byte options
-     * @return integer Size in bytes
-     */
-    function getsize($size) {
-        if ($size === null) return null;
-        $last = strtolower($size{strlen($size)-1});
-        $size = (int) $size;
-        switch($last) {
-            case 'g':
-                $size *= 1024;
-            case 'm':
-                $size *= 1024;
-            case 'k':
-                $size *= 1024;
-        }
-        return $size;
-    }
-
-    /**
-     * Decodes offsets
-     *
-     * @access private
-     * @param  misc    $offsets  Offsets, as an integer, a string or an array
-     * @param  integer $x        Reference picture width
-     * @param  integer $y        Reference picture height
-     * @param  boolean $round    Round offsets before returning them
-     * @param  boolean $negative Allow negative offsets to be returned
-     * @return array Array of four offsets (TRBL)
-     */
-    function getoffsets($offsets, $x, $y, $round = true, $negative = true) {
-        if (!is_array($offsets)) $offsets = explode(' ', $offsets);
-        if (sizeof($offsets) == 4) {
-             $ct = $offsets[0]; $cr = $offsets[1]; $cb = $offsets[2]; $cl = $offsets[3];
-        } else if (sizeof($offsets) == 2) {
-            $ct = $offsets[0]; $cr = $offsets[1]; $cb = $offsets[0]; $cl = $offsets[1];
-        } else {
-            $ct = $offsets[0]; $cr = $offsets[0]; $cb = $offsets[0]; $cl = $offsets[0];
-        }
-        if (strpos($ct, '%')>0) $ct = $y * (str_replace('%','',$ct) / 100);
-        if (strpos($cr, '%')>0) $cr = $x * (str_replace('%','',$cr) / 100);
-        if (strpos($cb, '%')>0) $cb = $y * (str_replace('%','',$cb) / 100);
-        if (strpos($cl, '%')>0) $cl = $x * (str_replace('%','',$cl) / 100);
-        if (strpos($ct, 'px')>0) $ct = str_replace('px','',$ct);
-        if (strpos($cr, 'px')>0) $cr = str_replace('px','',$cr);
-        if (strpos($cb, 'px')>0) $cb = str_replace('px','',$cb);
-        if (strpos($cl, 'px')>0) $cl = str_replace('px','',$cl);
-        $ct = (int) $ct; $cr = (int) $cr; $cb = (int) $cb; $cl = (int) $cl;
-        if ($round) {
-            $ct = round($ct);
-            $cr = round($cr);
-            $cb = round($cb);
-            $cl = round($cl);
-        }
-        if (!$negative) {
-            if ($ct < 0) $ct = 0;
-            if ($cr < 0) $cr = 0;
-            if ($cb < 0) $cb = 0;
-            if ($cl < 0) $cl = 0;
-        }
-        return array($ct, $cr, $cb, $cl);
-    }
-
-    /**
-     * Creates a container image
-     *
-     * @access private
-     * @param  integer  $x    Width
-     * @param  integer  $y    Height
-     * @param  boolean  $fill Optional flag to draw the background color or not
-     * @param  boolean  $trsp Optional flag to set the background to be transparent
-     * @return resource Container image
-     */
-    function imagecreatenew($x, $y, $fill = true, $trsp = false) {
-        if ($x < 1) $x = 1; if ($y < 1) $y = 1;
-        if ($this->gdversion() >= 2 && !$this->image_is_palette) {
-            // create a true color image
-            $dst_im = imagecreatetruecolor($x, $y);
-            // this preserves transparency in PNGs, in true color
-            if (empty($this->image_background_color) || $trsp) {
-                imagealphablending($dst_im, false );
-                imagefilledrectangle($dst_im, 0, 0, $x, $y, imagecolorallocatealpha($dst_im, 0, 0, 0, 127));
-            }
-        } else {
-            // creates a palette image
-            $dst_im = imagecreate($x, $y);
-            // preserves transparency for palette images, if the original image has transparency
-            if (($fill && $this->image_is_transparent && empty($this->image_background_color)) || $trsp) {
-                imagefilledrectangle($dst_im, 0, 0, $x, $y, $this->image_transparent_color);
-                imagecolortransparent($dst_im, $this->image_transparent_color);
-            }
-        }
-        // fills with background color if any is set
-        if ($fill && !empty($this->image_background_color) && !$trsp) {
-            list($red, $green, $blue) = $this->getcolors($this->image_background_color);
-            $background_color = imagecolorallocate($dst_im, $red, $green, $blue);
-            imagefilledrectangle($dst_im, 0, 0, $x, $y, $background_color);
-        }
-        return $dst_im;
-    }
-
-
-    /**
-     * Transfers an image from the container to the destination image
-     *
-     * @access private
-     * @param  resource $src_im Container image
-     * @param  resource $dst_im Destination image
-     * @return resource Destination image
-     */
-    function imagetransfer($src_im, $dst_im) {
-        if (is_resource($dst_im)) imagedestroy($dst_im);
-        $dst_im = & $src_im;
-        return $dst_im;
-    }
-
-    /**
-     * Merges two images
-     *
-     * If the output format is PNG, then we do it pixel per pixel to retain the alpha channel
-     *
-     * @access private
-     * @param  resource $dst_img Destination image
-     * @param  resource $src_img Overlay image
-     * @param  int      $dst_x   x-coordinate of destination point
-     * @param  int      $dst_y   y-coordinate of destination point
-     * @param  int      $src_x   x-coordinate of source point
-     * @param  int      $src_y   y-coordinate of source point
-     * @param  int      $src_w   Source width
-     * @param  int      $src_h   Source height
-     * @param  int      $pct     Optional percentage of the overlay, between 0 and 100 (default: 100)
-     * @return resource Destination image
-     */
-    function imagecopymergealpha(&$dst_im, &$src_im, $dst_x, $dst_y, $src_x, $src_y, $src_w, $src_h, $pct = 0) {
-        $dst_x = (int) $dst_x;
-        $dst_y = (int) $dst_y;
-        $src_x = (int) $src_x;
-        $src_y = (int) $src_y;
-        $src_w = (int) $src_w;
-        $src_h = (int) $src_h;
-        $pct   = (int) $pct;
-        $dst_w = imagesx($dst_im);
-        $dst_h = imagesy($dst_im);
-
-        for ($y = $src_y; $y < $src_h; $y++) {
-            for ($x = $src_x; $x < $src_w; $x++) {
-
-                if ($x + $dst_x >= 0 && $x + $dst_x < $dst_w && $x + $src_x >= 0 && $x + $src_x < $src_w
-                 && $y + $dst_y >= 0 && $y + $dst_y < $dst_h && $y + $src_y >= 0 && $y + $src_y < $src_h) {
-
-                    $dst_pixel = imagecolorsforindex($dst_im, imagecolorat($dst_im, $x + $dst_x, $y + $dst_y));
-                    $src_pixel = imagecolorsforindex($src_im, imagecolorat($src_im, $x + $src_x, $y + $src_y));
-
-                    $src_alpha = 1 - ($src_pixel['alpha'] / 127);
-                    $dst_alpha = 1 - ($dst_pixel['alpha'] / 127);
-                    $opacity = $src_alpha * $pct / 100;
-                    if ($dst_alpha >= $opacity) $alpha = $dst_alpha;
-                    if ($dst_alpha < $opacity)  $alpha = $opacity;
-                    if ($alpha > 1) $alpha = 1;
-
-                    if ($opacity > 0) {
-                        $dst_red   = round(( ($dst_pixel['red']   * $dst_alpha * (1 - $opacity)) ) );
-                        $dst_green = round(( ($dst_pixel['green'] * $dst_alpha * (1 - $opacity)) ) );
-                        $dst_blue  = round(( ($dst_pixel['blue']  * $dst_alpha * (1 - $opacity)) ) );
-                        $src_red   = round((($src_pixel['red']   * $opacity)) );
-                        $src_green = round((($src_pixel['green'] * $opacity)) );
-                        $src_blue  = round((($src_pixel['blue']  * $opacity)) );
-                        $red   = round(($dst_red   + $src_red  ) / ($dst_alpha * (1 - $opacity) + $opacity));
-                        $green = round(($dst_green + $src_green) / ($dst_alpha * (1 - $opacity) + $opacity));
-                        $blue  = round(($dst_blue  + $src_blue ) / ($dst_alpha * (1 - $opacity) + $opacity));
-                        if ($red   > 255) $red   = 255;
-                        if ($green > 255) $green = 255;
-                        if ($blue  > 255) $blue  = 255;
-                        $alpha =  round((1 - $alpha) * 127);
-                        $color = imagecolorallocatealpha($dst_im, $red, $green, $blue, $alpha);
-                        imagesetpixel($dst_im, $x + $dst_x, $y + $dst_y, $color);
-                    }
-                }
-            }
-        }
-        return true;
-    }
-
-
-
-    /**
-     * Actually uploads the file, and act on it according to the set processing class variables
-     *
-     * This function copies the uploaded file to the given location, eventually performing actions on it.
-     * Typically, you can call {@link process} several times for the same file,
-     * for instance to create a resized image and a thumbnail of the same file.
-     * The original uploaded file remains intact in its temporary location, so you can use {@link process} several times.
-     * You will be able to delete the uploaded file with {@link clean} when you have finished all your {@link process} calls.
-     *
-     * According to the processing class variables set in the calling file, the file can be renamed,
-     * and if it is an image, can be resized or converted.
-     *
-     * When the processing is completed, and the file copied to its new location, the
-     * processing class variables will be reset to their default value.
-     * This allows you to set new properties, and perform another {@link process} on the same uploaded file
-     *
-     * If the function is called with a null or empty argument, then it will return the content of the picture
-     *
-     * It will set {@link processed} (and {@link error} is an error occurred)
-     *
-     * @access public
-     * @param  string $server_path Optional path location of the uploaded file, with an ending slash
-     * @return string Optional content of the image
-     */
-    function process($server_path = null) {
-        $this->error        = '';
-        $this->processed    = true;
-        $return_mode        = false;
-        $return_content     = null;
-
-        // clean up dst variables
-        $this->file_dst_path        = '';
-        $this->file_dst_pathname    = '';
-        $this->file_dst_name        = '';
-        $this->file_dst_name_body   = '';
-        $this->file_dst_name_ext    = '';
-
-        // clean up some parameters
-        $this->file_max_size = $this->getsize($this->file_max_size);
-        $this->jpeg_size = $this->getsize($this->jpeg_size);
-
-        // copy some variables as we need to keep them clean
-        $file_src_name = $this->file_src_name;
-        $file_src_name_body = $this->file_src_name_body;
-        $file_src_name_ext = $this->file_src_name_ext;
-
-        if (!$this->uploaded) {
-            $this->error = $this->translate('file_not_uploaded');
-            $this->processed = false;
-        }
-
-        if ($this->processed) {
-            if (empty($server_path) || is_null($server_path)) {
-                $this->log .= '<b>process file and return the content</b><br />';
-                $return_mode = true;
-            } else {
-                if(strtolower(substr(PHP_OS, 0, 3)) === 'win') {
-                    if (substr($server_path, -1, 1) != '\\') $server_path = $server_path . '\\';
-                } else {
-                    if (substr($server_path, -1, 1) != '/') $server_path = $server_path . '/';
-                }
-                $this->log .= '<b>process file to '  . $server_path . '</b><br />';
-            }
-        }
-
-        if ($this->processed) {
-            // checks file max size
-            if ($this->file_src_size > $this->file_max_size) {
-                $this->processed = false;
-                $this->error = $this->translate('file_too_big') . ' : ' . $this->file_src_size . ' > ' . $this->file_max_size;
-            } else {
-                $this->log .= '- file size OK<br />';
-            }
-        }
-
-        if ($this->processed) {
-            // if we have an image without extension, set it
-            if ($this->file_force_extension && $this->file_is_image && !$this->file_src_name_ext) $file_src_name_ext = $this->image_src_type;
-            // turn dangerous scripts into text files
-            if ($this->no_script) {
-                // if the file has no extension, we try to guess it from the MIME type
-                if ($this->file_force_extension && empty($file_src_name_ext)) {
-                    if ($key = array_search($this->file_src_mime, $this->mime_types)) {
-                        $file_src_name_ext = $key;
-                        $file_src_name = $file_src_name_body . '.' . $file_src_name_ext;
-                        $this->log .= '- file renamed as ' . $file_src_name_body . '.' . $file_src_name_ext . '!<br />';
-                    }
-                }
-                // if the file is text based, or has a dangerous extension, we rename it as .txt
-                if ((((substr($this->file_src_mime, 0, 5) == 'text/' && $this->file_src_mime != 'text/rtf') || strpos($this->file_src_mime, 'javascript') !== false)  && (substr($file_src_name, -4) != '.txt'))
-                    || preg_match('/\.(php|php5|php4|php3|phtml|pl|py|cgi|asp|js)$/i', $this->file_src_name)
-                    || $this->file_force_extension && empty($file_src_name_ext)) {
-                    $this->file_src_mime = 'text/plain';
-                    if ($this->file_src_name_ext) $file_src_name_body = $file_src_name_body . '.' . $this->file_src_name_ext;
-                    $file_src_name_ext = 'txt';
-                    $file_src_name = $file_src_name_body . '.' . $file_src_name_ext;
-                    $this->log .= '- script renamed as ' . $file_src_name_body . '.' . $file_src_name_ext . '!<br />';
-                }
-            }
-
-            if ($this->mime_check && empty($this->file_src_mime)) {
-                $this->processed = false;
-                $this->error = $this->translate('no_mime');
-            } else if ($this->mime_check && !empty($this->file_src_mime) && strpos($this->file_src_mime, '/') !== false) {
-                list($m1, $m2) = explode('/', $this->file_src_mime);
-                $allowed = false;
-                // check wether the mime type is allowed
-                if (!is_array($this->allowed)) $this->allowed = array($this->allowed);
-                foreach($this->allowed as $k => $v) {
-                    list($v1, $v2) = explode('/', $v);
-                    if (($v1 == '*' && $v2 == '*') || ($v1 == $m1 && ($v2 == $m2 || $v2 == '*'))) {
-                        $allowed = true;
-                        break;
-                    }
-                }
-                // check wether the mime type is forbidden
-                if (!is_array($this->forbidden)) $this->forbidden = array($this->forbidden);
-                foreach($this->forbidden as $k => $v) {
-                    list($v1, $v2) = explode('/', $v);
-                    if (($v1 == '*' && $v2 == '*') || ($v1 == $m1 && ($v2 == $m2 || $v2 == '*'))) {
-                        $allowed = false;
-                        break;
-                    }
-                }
-                if (!$allowed) {
-                    $this->processed = false;
-                    $this->error = $this->translate('incorrect_file');
-                } else {
-                    $this->log .= '- file mime OK : ' . $this->file_src_mime . '<br />';
-                }
-            } else {
-                $this->log .= '- file mime (not checked) : ' . $this->file_src_mime . '<br />';
-            }
-
-            // if the file is an image, we can check on its dimensions
-            // these checks are not available if open_basedir restrictions are in place
-            if ($this->file_is_image) {
-                if (is_numeric($this->image_src_x) && is_numeric($this->image_src_y)) {
-                    $ratio = $this->image_src_x / $this->image_src_y;
-                    if (!is_null($this->image_max_width) && $this->image_src_x > $this->image_max_width) {
-                        $this->processed = false;
-                        $this->error = $this->translate('image_too_wide');
-                    }
-                    if (!is_null($this->image_min_width) && $this->image_src_x < $this->image_min_width) {
-                        $this->processed = false;
-                        $this->error = $this->translate('image_too_narrow');
-                    }
-                    if (!is_null($this->image_max_height) && $this->image_src_y > $this->image_max_height) {
-                        $this->processed = false;
-                        $this->error = $this->translate('image_too_high');
-                    }
-                    if (!is_null($this->image_min_height) && $this->image_src_y < $this->image_min_height) {
-                        $this->processed = false;
-                        $this->error = $this->translate('image_too_short');
-                    }
-                    if (!is_null($this->image_max_ratio) && $ratio > $this->image_max_ratio) {
-                        $this->processed = false;
-                        $this->error = $this->translate('ratio_too_high');
-                    }
-                    if (!is_null($this->image_min_ratio) && $ratio < $this->image_min_ratio) {
-                        $this->processed = false;
-                        $this->error = $this->translate('ratio_too_low');
-                    }
-                    if (!is_null($this->image_max_pixels) && $this->image_src_pixels > $this->image_max_pixels) {
-                        $this->processed = false;
-                        $this->error = $this->translate('too_many_pixels');
-                    }
-                    if (!is_null($this->image_min_pixels) && $this->image_src_pixels < $this->image_min_pixels) {
-                        $this->processed = false;
-                        $this->error = $this->translate('not_enough_pixels');
-                    }
-                } else {
-                    $this->log .= '- no image properties available, can\'t enforce dimension checks : ' . $this->file_src_mime . '<br />';
-                }
-            }
-        }
-
-        if ($this->processed) {
-            $this->file_dst_path        = $server_path;
-
-            // repopulate dst variables from src
-            $this->file_dst_name        = $file_src_name;
-            $this->file_dst_name_body   = $file_src_name_body;
-            $this->file_dst_name_ext    = $file_src_name_ext;
-            if ($this->file_overwrite) $this->file_auto_rename = false;
-
-            if ($this->image_convert && $this->file_is_image) { // if we convert as an image
-                $this->file_dst_name_ext  = $this->image_convert;
-                $this->log .= '- new file name ext : ' . $this->file_dst_name_ext . '<br />';
-            }
-            if (!is_null($this->file_new_name_body)) { // rename file body
-                $this->file_dst_name_body = $this->file_new_name_body;
-                $this->log .= '- new file name body : ' . $this->file_new_name_body . '<br />';
-            }
-            if (!is_null($this->file_new_name_ext)) { // rename file ext
-                $this->file_dst_name_ext  = $this->file_new_name_ext;
-                $this->log .= '- new file name ext : ' . $this->file_new_name_ext . '<br />';
-            }
-            if (!is_null($this->file_name_body_add)) { // append a string to the name
-                $this->file_dst_name_body  = $this->file_dst_name_body . $this->file_name_body_add;
-                $this->log .= '- file name body append : ' . $this->file_name_body_add . '<br />';
-            }
-            if (!is_null($this->file_name_body_pre)) { // prepend a string to the name
-                $this->file_dst_name_body  = $this->file_name_body_pre . $this->file_dst_name_body;
-                $this->log .= '- file name body prepend : ' . $this->file_name_body_pre . '<br />';
-            }
-            if ($this->file_safe_name) { // sanitize the name
-                $this->file_dst_name_body = $this->sanitize($this->file_dst_name_body);
-                $this->log .= '- file name safe format<br />';
-            }
-
-            $this->log .= '- destination variables<br />';
-            if (empty($this->file_dst_path) || is_null($this->file_dst_path)) {
-                $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;file_dst_path         : n/a<br />';
-            } else {
-                $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;file_dst_path         : ' . $this->file_dst_path . '<br />';
-            }
-            $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;file_dst_name_body    : ' . $this->file_dst_name_body . '<br />';
-            $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;file_dst_name_ext     : ' . $this->file_dst_name_ext . '<br />';
-
-            // set the destination file name
-            $this->file_dst_name = $this->file_dst_name_body . (!empty($this->file_dst_name_ext) ? '.' . $this->file_dst_name_ext : '');
-
-            if (!$return_mode) {
-                if (!$this->file_auto_rename) {
-                    $this->log .= '- no auto_rename if same filename exists<br />';
-                    $this->file_dst_pathname = $this->file_dst_path . $this->file_dst_name;
-                } else {
-                    $this->log .= '- checking for auto_rename<br />';
-                    $this->file_dst_pathname = $this->file_dst_path . $this->file_dst_name;
-                    $body = $this->file_dst_name_body;
-                    $ext = '';
-                    // if we have changed the extension, then we add our increment before
-                    if ($file_src_name_ext != $this->file_src_name_ext) {
-                        if (substr($this->file_dst_name_body, -1 - strlen($this->file_src_name_ext)) == '.' . $this->file_src_name_ext) {
-                            $body = substr($this->file_dst_name_body, 0, strlen($this->file_dst_name_body) - 1 - strlen($this->file_src_name_ext));
-                            $ext = '.' . $this->file_src_name_ext;
-                        }
-                    }
-                    $cpt = 1;
-                    while (@file_exists($this->file_dst_pathname)) {
-                        $this->file_dst_name_body = $body . '_' . $cpt . $ext;
-                        $this->file_dst_name = $this->file_dst_name_body . (!empty($this->file_dst_name_ext) ? '.' . $this->file_dst_name_ext : '');
-                        $cpt++;
-                        $this->file_dst_pathname = $this->file_dst_path . $this->file_dst_name;
-                    }
-                    if ($cpt>1) $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;auto_rename to ' . $this->file_dst_name . '<br />';
-                }
-
-                $this->log .= '- destination file details<br />';
-                $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;file_dst_name         : ' . $this->file_dst_name . '<br />';
-                $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;file_dst_pathname     : ' . $this->file_dst_pathname . '<br />';
-
-                if ($this->file_overwrite) {
-                     $this->log .= '- no overwrite checking<br />';
-                } else {
-                    if (@file_exists($this->file_dst_pathname)) {
-                        $this->processed = false;
-                        $this->error = $this->translate('already_exists', array($this->file_dst_name));
-                    } else {
-                        $this->log .= '- ' . $this->file_dst_name . ' doesn\'t exist already<br />';
-                    }
-                }
-            }
-        }
-
-        if ($this->processed) {
-            // if we have already moved the uploaded file, we use the temporary copy as source file, and check if it exists
-            if (!empty($this->file_src_temp)) {
-                $this->log .= '- use the temp file instead of the original file since it is a second process<br />';
-                $this->file_src_pathname   = $this->file_src_temp;
-                if (!file_exists($this->file_src_pathname)) {
-                    $this->processed = false;
-                    $this->error = $this->translate('temp_file_missing');
-                }
-            // if we haven't a temp file, and that we do check on uploads, we use is_uploaded_file()
-            } else if (!$this->no_upload_check) {
-                if (!is_uploaded_file($this->file_src_pathname)) {
-                    $this->processed = false;
-                    $this->error = $this->translate('source_missing');
-                }
-            // otherwise, if we don't check on uploaded files (local file for instance), we use file_exists()
-            } else {
-                if (!file_exists($this->file_src_pathname)) {
-                    $this->processed = false;
-                    $this->error = $this->translate('source_missing');
-                }
-            }
-
-            // checks if the destination directory exists, and attempt to create it
-            if (!$return_mode) {
-                if ($this->processed && !file_exists($this->file_dst_path)) {
-                    if ($this->dir_auto_create) {
-                        $this->log .= '- ' . $this->file_dst_path . ' doesn\'t exist. Attempting creation:';
-                        if (!$this->rmkdir($this->file_dst_path, $this->dir_chmod)) {
-                            $this->log .= ' failed<br />';
-                            $this->processed = false;
-                            $this->error = $this->translate('destination_dir');
-                        } else {
-                            $this->log .= ' success<br />';
-                        }
-                    } else {
-                        $this->error = $this->translate('destination_dir_missing');
-                    }
-                }
-
-                if ($this->processed && !is_dir($this->file_dst_path)) {
-                    $this->processed = false;
-                    $this->error = $this->translate('destination_path_not_dir');
-                }
-
-                // checks if the destination directory is writeable, and attempt to make it writeable
-                $hash = md5($this->file_dst_name_body . rand(1, 1000));
-                if ($this->processed && !($f = @fopen($this->file_dst_path . $hash . (!empty($this->file_dst_name_ext) ? '.' . $this->file_dst_name_ext : ''), 'a+'))) {
-                    if ($this->dir_auto_chmod) {
-                        $this->log .= '- ' . $this->file_dst_path . ' is not writeable. Attempting chmod:';
-                        if (!@chmod($this->file_dst_path, $this->dir_chmod)) {
-                            $this->log .= ' failed<br />';
-                            $this->processed = false;
-                            $this->error = $this->translate('destination_dir_write');
-                        } else {
-                            $this->log .= ' success<br />';
-                            if (!($f = @fopen($this->file_dst_path . $hash . (!empty($this->file_dst_name_ext) ? '.' . $this->file_dst_name_ext : ''), 'a+'))) { // we re-check
-                                $this->processed = false;
-                                $this->error = $this->translate('destination_dir_write');
-                            } else {
-                                @fclose($f);
-                            }
-                        }
-                    } else {
-                        $this->processed = false;
-                        $this->error = $this->translate('destination_path_write');
-                    }
-                } else {
-                    if ($this->processed) @fclose($f);
-                    @unlink($this->file_dst_path . $hash . (!empty($this->file_dst_name_ext) ? '.' . $this->file_dst_name_ext : ''));
-                }
-
-
-                // if we have an uploaded file, and if it is the first process, and if we can't access the file directly (open_basedir restriction)
-                // then we create a temp file that will be used as the source file in subsequent processes
-                // the third condition is there to check if the file is not accessible *directly* (it already has positively gone through is_uploaded_file(), so it exists)
-                if (!$this->no_upload_check && empty($this->file_src_temp) && !@file_exists($this->file_src_pathname)) {
-                    $this->log .= '- attempting to use a temp file:';
-                    $hash = md5($this->file_dst_name_body . rand(1, 1000));
-                    if (move_uploaded_file($this->file_src_pathname, $this->file_dst_path . $hash . (!empty($this->file_dst_name_ext) ? '.' . $this->file_dst_name_ext : ''))) {
-                        $this->file_src_pathname = $this->file_dst_path . $hash . (!empty($this->file_dst_name_ext) ? '.' . $this->file_dst_name_ext : '');
-                        $this->file_src_temp = $this->file_src_pathname;
-                        $this->log .= ' file created<br />';
-                        $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;temp file is: ' . $this->file_src_temp . '<br />';
-                    } else {
-                        $this->log .= ' failed<br />';
-                        $this->processed = false;
-                        $this->error = $this->translate('temp_file');
-                    }
-                }
-            }
-        }
-
-        if ($this->processed) {
-
-            // check if we need to autorotate, to automatically pre-rotates the image according to EXIF data (JPEG only)
-            $auto_flip = false;
-            $auto_rotate = 0;
-            if ($this->file_is_image && $this->image_auto_rotate && $this->image_src_type == 'jpg' && $this->function_enabled('exif_read_data')) {
-                $exif = @exif_read_data($this->file_src_pathname);
-                if (is_array($exif) && isset($exif['Orientation'])) {
-                    $orientation = $exif['Orientation'];
-                    switch($orientation) {
-                      case 1:
-                        $this->log .= '- EXIF orientation = 1 : default<br />';
-                        break;
-                      case 2:
-                        $auto_flip = 'v';
-                        $this->log .= '- EXIF orientation = 2 : vertical flip<br />';
-                        break;
-                      case 3:
-                        $auto_rotate = 180;
-                        $this->log .= '- EXIF orientation = 3 : 180 rotate left<br />';
-                        break;
-                      case 4:
-                        $auto_flip = 'h';
-                        $this->log .= '- EXIF orientation = 4 : horizontal flip<br />';
-                        break;
-                      case 5:
-                        $auto_flip = 'h';
-                        $auto_rotate = 90;
-                        $this->log .= '- EXIF orientation = 5 : horizontal flip + 90 rotate right<br />';
-                        break;
-                      case 6:
-                        $auto_rotate = 90;
-                        $this->log .= '- EXIF orientation = 6 : 90 rotate right<br />';
-                        break;
-                      case 7:
-                        $auto_flip = 'v';
-                        $auto_rotate = 90;
-                        $this->log .= '- EXIF orientation = 7 : vertical flip + 90 rotate right<br />';
-                        break;
-                      case 8:
-                        $auto_rotate = 270;
-                        $this->log .= '- EXIF orientation = 8 : 90 rotate left<br />';
-                        break;
-                      default:
-                        $this->log .= '- EXIF orientation = '.$orientation.' : unknown<br />';
-                        break;
-                    }
-                } else {
-                    $this->log .= '- EXIF data is invalid or missing<br />';
-                }
-            } else {
-                if (!$this->image_auto_rotate) {
-                    $this->log .= '- auto-rotate deactivated<br />';
-                } else if (!$this->image_src_type == 'jpg') {
-                    $this->log .= '- auto-rotate applies only to JPEG images<br />';
-                } else if (!$this->function_enabled('exif_read_data')) {
-                    $this->log .= '- auto-rotate requires function exif_read_data to be enabled<br />';
-                }
-            }
-
-            // do we do some image manipulation?
-            $image_manipulation  = ($this->file_is_image && (
-                                    $this->image_resize
-                                 || $this->image_convert != ''
-                                 || is_numeric($this->image_brightness)
-                                 || is_numeric($this->image_contrast)
-                                 || is_numeric($this->image_opacity)
-                                 || is_numeric($this->image_threshold)
-                                 || !empty($this->image_tint_color)
-                                 || !empty($this->image_overlay_color)
-                                 || $this->image_pixelate
-                                 || $this->image_unsharp
-                                 || !empty($this->image_text)
-                                 || $this->image_greyscale
-                                 || $this->image_negative
-                                 || !empty($this->image_watermark)
-                                 || $auto_rotate || $auto_flip
-                                 || is_numeric($this->image_rotate)
-                                 || is_numeric($this->jpeg_size)
-                                 || !empty($this->image_flip)
-                                 || !empty($this->image_crop)
-                                 || !empty($this->image_precrop)
-                                 || !empty($this->image_border)
-                                 || !empty($this->image_border_transparent)
-                                 || $this->image_frame > 0
-                                 || $this->image_bevel > 0
-                                 || $this->image_reflection_height));
-
-            // we do a quick check to ensure the file is really an image
-            // we can do this only now, as it would have failed before in case of open_basedir
-            if ($image_manipulation && !@getimagesize($this->file_src_pathname)) {
-                $this->log .= '- the file is not an image!<br />';
-                $image_manipulation = false;
-            }
-
-            if ($image_manipulation) {
-
-                // make sure GD doesn't complain too much
-                @ini_set("gd.jpeg_ignore_warning", 1);
-
-                // checks if the source file is readable
-                if ($this->processed && !($f = @fopen($this->file_src_pathname, 'r'))) {
-                    $this->processed = false;
-                    $this->error = $this->translate('source_not_readable');
-                } else {
-                    @fclose($f);
-                }
-
-                // we now do all the image manipulations
-                $this->log .= '- image resizing or conversion wanted<br />';
-                if ($this->gdversion()) {
-                    switch($this->image_src_type) {
-                        case 'jpg':
-                            if (!$this->function_enabled('imagecreatefromjpeg')) {
-                                $this->processed = false;
-                                $this->error = $this->translate('no_create_support', array('JPEG'));
-                            } else {
-                                $image_src = @imagecreatefromjpeg($this->file_src_pathname);
-                                if (!$image_src) {
-                                    $this->processed = false;
-                                    $this->error = $this->translate('create_error', array('JPEG'));
-                                } else {
-                                    $this->log .= '- source image is JPEG<br />';
-                                }
-                            }
-                            break;
-                        case 'png':
-                            if (!$this->function_enabled('imagecreatefrompng')) {
-                                $this->processed = false;
-                                $this->error = $this->translate('no_create_support', array('PNG'));
-                            } else {
-                                $image_src = @imagecreatefrompng($this->file_src_pathname);
-                                if (!$image_src) {
-                                    $this->processed = false;
-                                    $this->error = $this->translate('create_error', array('PNG'));
-                                } else {
-                                    $this->log .= '- source image is PNG<br />';
-                                }
-                            }
-                            break;
-                        case 'gif':
-                            if (!$this->function_enabled('imagecreatefromgif')) {
-                                $this->processed = false;
-                                $this->error = $this->translate('no_create_support', array('GIF'));
-                            } else {
-                                $image_src = @imagecreatefromgif($this->file_src_pathname);
-                                if (!$image_src) {
-                                    $this->processed = false;
-                                    $this->error = $this->translate('create_error', array('GIF'));
-                                } else {
-                                    $this->log .= '- source image is GIF<br />';
-                                }
-                            }
-                            break;
-                        case 'bmp':
-                            if (!method_exists($this, 'imagecreatefrombmp')) {
-                                $this->processed = false;
-                                $this->error = $this->translate('no_create_support', array('BMP'));
-                            } else {
-                                $image_src = @$this->imagecreatefrombmp($this->file_src_pathname);
-                                if (!$image_src) {
-                                    $this->processed = false;
-                                    $this->error = $this->translate('create_error', array('BMP'));
-                                } else {
-                                    $this->log .= '- source image is BMP<br />';
-                                }
-                            }
-                            break;
-                        default:
-                            $this->processed = false;
-                            $this->error = $this->translate('source_invalid');
-                    }
-                } else {
-                    $this->processed = false;
-                    $this->error = $this->translate('gd_missing');
-                }
-
-                if ($this->processed && $image_src) {
-
-                    // we have to set image_convert if it is not already
-                    if (empty($this->image_convert)) {
-                        $this->log .= '- setting destination file type to ' . $this->image_src_type . '<br />';
-                        $this->image_convert = $this->image_src_type;
-                    }
-
-                    if (!in_array($this->image_convert, $this->image_supported)) {
-                        $this->image_convert = 'jpg';
-                    }
-
-                    // we set the default color to be the background color if we don't output in a transparent format
-                    if ($this->image_convert != 'png' && $this->image_convert != 'gif' && !empty($this->image_default_color) && empty($this->image_background_color)) $this->image_background_color = $this->image_default_color;
-                    if (!empty($this->image_background_color)) $this->image_default_color = $this->image_background_color;
-                    if (empty($this->image_default_color)) $this->image_default_color = '#FFFFFF';
-
-                    $this->image_src_x = imagesx($image_src);
-                    $this->image_src_y = imagesy($image_src);
-                    $gd_version = $this->gdversion();
-                    $ratio_crop = null;
-
-                    if (!imageistruecolor($image_src)) {  // $this->image_src_type == 'gif'
-                        $this->log .= '- image is detected as having a palette<br />';
-                        $this->image_is_palette = true;
-                        $this->image_transparent_color = imagecolortransparent($image_src);
-                        if ($this->image_transparent_color >= 0 && imagecolorstotal($image_src) > $this->image_transparent_color) {
-                            $this->image_is_transparent = true;
-                            $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;palette image is detected as transparent<br />';
-                        }
-                        // if the image has a palette (GIF), we convert it to true color, preserving transparency
-                        $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;convert palette image to true color<br />';
-                        $true_color = imagecreatetruecolor($this->image_src_x, $this->image_src_y);
-                        imagealphablending($true_color, false);
-                        imagesavealpha($true_color, true);
-                        for ($x = 0; $x < $this->image_src_x; $x++) {
-                            for ($y = 0; $y < $this->image_src_y; $y++) {
-                                if ($this->image_transparent_color >= 0 && imagecolorat($image_src, $x, $y) == $this->image_transparent_color) {
-                                    imagesetpixel($true_color, $x, $y, 127 << 24);
-                                } else {
-                                    $rgb = imagecolorsforindex($image_src, imagecolorat($image_src, $x, $y));
-                                    imagesetpixel($true_color, $x, $y, ($rgb['alpha'] << 24) | ($rgb['red'] << 16) | ($rgb['green'] << 8) | $rgb['blue']);
-                                }
-                            }
-                        }
-                        $image_src = $this->imagetransfer($true_color, $image_src);
-                        imagealphablending($image_src, false);
-                        imagesavealpha($image_src, true);
-                        $this->image_is_palette = false;
-                    }
-
-                    $image_dst = & $image_src;
-
-                    // auto-flip image, according to EXIF data (JPEG only)
-                    if ($gd_version >= 2 && !empty($auto_flip)) {
-                        $this->log .= '- auto-flip image : ' . ($auto_flip == 'v' ? 'vertical' : 'horizontal') . '<br />';
-                        $tmp = $this->imagecreatenew($this->image_src_x, $this->image_src_y);
-                        for ($x = 0; $x < $this->image_src_x; $x++) {
-                            for ($y = 0; $y < $this->image_src_y; $y++){
-                                if (strpos($auto_flip, 'v') !== false) {
-                                    imagecopy($tmp, $image_dst, $this->image_src_x - $x - 1, $y, $x, $y, 1, 1);
-                                } else {
-                                    imagecopy($tmp, $image_dst, $x, $this->image_src_y - $y - 1, $x, $y, 1, 1);
-                                }
-                            }
-                        }
-                        // we transfert tmp into image_dst
-                        $image_dst = $this->imagetransfer($tmp, $image_dst);
-                    }
-
-                    // auto-rotate image, according to EXIF data (JPEG only)
-                    if ($gd_version >= 2 && is_numeric($auto_rotate)) {
-                        if (!in_array($auto_rotate, array(0, 90, 180, 270))) $auto_rotate = 0;
-                        if ($auto_rotate != 0) {
-                            if ($auto_rotate == 90 || $auto_rotate == 270) {
-                                $tmp = $this->imagecreatenew($this->image_src_y, $this->image_src_x);
-                            } else {
-                                $tmp = $this->imagecreatenew($this->image_src_x, $this->image_src_y);
-                            }
-                            $this->log .= '- auto-rotate image : ' . $auto_rotate . '<br />';
-                            for ($x = 0; $x < $this->image_src_x; $x++) {
-                                for ($y = 0; $y < $this->image_src_y; $y++){
-                                    if ($auto_rotate == 90) {
-                                        imagecopy($tmp, $image_dst, $y, $x, $x, $this->image_src_y - $y - 1, 1, 1);
-                                    } else if ($auto_rotate == 180) {
-                                        imagecopy($tmp, $image_dst, $x, $y, $this->image_src_x - $x - 1, $this->image_src_y - $y - 1, 1, 1);
-                                    } else if ($auto_rotate == 270) {
-                                        imagecopy($tmp, $image_dst, $y, $x, $this->image_src_x - $x - 1, $y, 1, 1);
-                                    } else {
-                                        imagecopy($tmp, $image_dst, $x, $y, $x, $y, 1, 1);
-                                    }
-                                }
-                            }
-                            if ($auto_rotate == 90 || $auto_rotate == 270) {
-                                $t = $this->image_src_y;
-                                $this->image_src_y = $this->image_src_x;
-                                $this->image_src_x = $t;
-                            }
-                            // we transfert tmp into image_dst
-                            $image_dst = $this->imagetransfer($tmp, $image_dst);
-                        }
-                    }
-
-                    // pre-crop image, before resizing
-                    if ((!empty($this->image_precrop))) {
-                        list($ct, $cr, $cb, $cl) = $this->getoffsets($this->image_precrop, $this->image_src_x, $this->image_src_y, true, true);
-                        $this->log .= '- pre-crop image : ' . $ct . ' ' . $cr . ' ' . $cb . ' ' . $cl . ' <br />';
-                        $this->image_src_x = $this->image_src_x - $cl - $cr;
-                        $this->image_src_y = $this->image_src_y - $ct - $cb;
-                        if ($this->image_src_x < 1) $this->image_src_x = 1;
-                        if ($this->image_src_y < 1) $this->image_src_y = 1;
-                        $tmp = $this->imagecreatenew($this->image_src_x, $this->image_src_y);
-
-                        // we copy the image into the recieving image
-                        imagecopy($tmp, $image_dst, 0, 0, $cl, $ct, $this->image_src_x, $this->image_src_y);
-
-                        // if we crop with negative margins, we have to make sure the extra bits are the right color, or transparent
-                        if ($ct < 0 || $cr < 0 || $cb < 0 || $cl < 0 ) {
-                            // use the background color if present
-                            if (!empty($this->image_background_color)) {
-                                list($red, $green, $blue) = $this->getcolors($this->image_background_color);
-                                $fill = imagecolorallocate($tmp, $red, $green, $blue);
-                            } else {
-                                $fill = imagecolorallocatealpha($tmp, 0, 0, 0, 127);
-                            }
-                            // fills eventual negative margins
-                            if ($ct < 0) imagefilledrectangle($tmp, 0, 0, $this->image_src_x, -$ct, $fill);
-                            if ($cr < 0) imagefilledrectangle($tmp, $this->image_src_x + $cr, 0, $this->image_src_x, $this->image_src_y, $fill);
-                            if ($cb < 0) imagefilledrectangle($tmp, 0, $this->image_src_y + $cb, $this->image_src_x, $this->image_src_y, $fill);
-                            if ($cl < 0) imagefilledrectangle($tmp, 0, 0, -$cl, $this->image_src_y, $fill);
-                        }
-
-                        // we transfert tmp into image_dst
-                        $image_dst = $this->imagetransfer($tmp, $image_dst);
-                    }
-
-                    // resize image (and move image_src_x, image_src_y dimensions into image_dst_x, image_dst_y)
-                    if ($this->image_resize) {
-                        $this->log .= '- resizing...<br />';
-                        $this->image_dst_x = $this->image_x;
-                        $this->image_dst_y = $this->image_y;
-
-                        // backward compatibility for soon to be deprecated settings
-                        if ($this->image_ratio_no_zoom_in) {
-                            $this->image_ratio = true;
-                            $this->image_no_enlarging = true;
-                        } else if ($this->image_ratio_no_zoom_out) {
-                            $this->image_ratio = true;
-                            $this->image_no_shrinking = true;
-                        }
-
-                        // keeps aspect ratio with x calculated from y
-                        if ($this->image_ratio_x) {
-                            $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;calculate x size<br />';
-                            $this->image_dst_x = round(($this->image_src_x * $this->image_y) / $this->image_src_y);
-                            $this->image_dst_y = $this->image_y;
-
-                        // keeps aspect ratio with y calculated from x
-                        } else if ($this->image_ratio_y) {
-                            $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;calculate y size<br />';
-                            $this->image_dst_x = $this->image_x;
-                            $this->image_dst_y = round(($this->image_src_y * $this->image_x) / $this->image_src_x);
-
-                        // keeps aspect ratio, calculating x and y so that the image is approx the set number of pixels
-                        } else if (is_numeric($this->image_ratio_pixels)) {
-                            $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;calculate x/y size to match a number of pixels<br />';
-                            $pixels = $this->image_src_y * $this->image_src_x;
-                            $diff = sqrt($this->image_ratio_pixels / $pixels);
-                            $this->image_dst_x = round($this->image_src_x * $diff);
-                            $this->image_dst_y = round($this->image_src_y * $diff);
-
-                        // keeps aspect ratio with x and y dimensions, filling the space
-                        } else if ($this->image_ratio_crop) {
-                            if (!is_string($this->image_ratio_crop)) $this->image_ratio_crop = '';
-                            $this->image_ratio_crop = strtolower($this->image_ratio_crop);
-                            if (($this->image_src_x/$this->image_x) > ($this->image_src_y/$this->image_y)) {
-                                $this->image_dst_y = $this->image_y;
-                                $this->image_dst_x = intval($this->image_src_x*($this->image_y / $this->image_src_y));
-                                $ratio_crop = array();
-                                $ratio_crop['x'] = $this->image_dst_x - $this->image_x;
-                                if (strpos($this->image_ratio_crop, 'l') !== false) {
-                                    $ratio_crop['l'] = 0;
-                                    $ratio_crop['r'] = $ratio_crop['x'];
-                                } else if (strpos($this->image_ratio_crop, 'r') !== false) {
-                                    $ratio_crop['l'] = $ratio_crop['x'];
-                                    $ratio_crop['r'] = 0;
-                                } else {
-                                    $ratio_crop['l'] = round($ratio_crop['x']/2);
-                                    $ratio_crop['r'] = $ratio_crop['x'] - $ratio_crop['l'];
-                                }
-                                $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;ratio_crop_x         : ' . $ratio_crop['x'] . ' (' . $ratio_crop['l'] . ';' . $ratio_crop['r'] . ')<br />';
-                                if (is_null($this->image_crop)) $this->image_crop = array(0, 0, 0, 0);
-                            } else {
-                                $this->image_dst_x = $this->image_x;
-                                $this->image_dst_y = intval($this->image_src_y*($this->image_x / $this->image_src_x));
-                                $ratio_crop = array();
-                                $ratio_crop['y'] = $this->image_dst_y - $this->image_y;
-                                if (strpos($this->image_ratio_crop, 't') !== false) {
-                                    $ratio_crop['t'] = 0;
-                                    $ratio_crop['b'] = $ratio_crop['y'];
-                                } else if (strpos($this->image_ratio_crop, 'b') !== false) {
-                                    $ratio_crop['t'] = $ratio_crop['y'];
-                                    $ratio_crop['b'] = 0;
-                                } else {
-                                    $ratio_crop['t'] = round($ratio_crop['y']/2);
-                                    $ratio_crop['b'] = $ratio_crop['y'] - $ratio_crop['t'];
-                                }
-                                $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;ratio_crop_y         : ' . $ratio_crop['y'] . ' (' . $ratio_crop['t'] . ';' . $ratio_crop['b'] . ')<br />';
-                                if (is_null($this->image_crop)) $this->image_crop = array(0, 0, 0, 0);
-                            }
-
-                        // keeps aspect ratio with x and y dimensions, fitting the image in the space, and coloring the rest
-                        } else if ($this->image_ratio_fill) {
-                            if (!is_string($this->image_ratio_fill)) $this->image_ratio_fill = '';
-                            $this->image_ratio_fill = strtolower($this->image_ratio_fill);
-                            if (($this->image_src_x/$this->image_x) < ($this->image_src_y/$this->image_y)) {
-                                $this->image_dst_y = $this->image_y;
-                                $this->image_dst_x = intval($this->image_src_x*($this->image_y / $this->image_src_y));
-                                $ratio_crop = array();
-                                $ratio_crop['x'] = $this->image_dst_x - $this->image_x;
-                                if (strpos($this->image_ratio_fill, 'l') !== false) {
-                                    $ratio_crop['l'] = 0;
-                                    $ratio_crop['r'] = $ratio_crop['x'];
-                                } else if (strpos($this->image_ratio_fill, 'r') !== false) {
-                                    $ratio_crop['l'] = $ratio_crop['x'];
-                                    $ratio_crop['r'] = 0;
-                                } else {
-                                    $ratio_crop['l'] = round($ratio_crop['x']/2);
-                                    $ratio_crop['r'] = $ratio_crop['x'] - $ratio_crop['l'];
-                                }
-                                $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;ratio_fill_x         : ' . $ratio_crop['x'] . ' (' . $ratio_crop['l'] . ';' . $ratio_crop['r'] . ')<br />';
-                                if (is_null($this->image_crop)) $this->image_crop = array(0, 0, 0, 0);
-                            } else {
-                                $this->image_dst_x = $this->image_x;
-                                $this->image_dst_y = intval($this->image_src_y*($this->image_x / $this->image_src_x));
-                                $ratio_crop = array();
-                                $ratio_crop['y'] = $this->image_dst_y - $this->image_y;
-                                if (strpos($this->image_ratio_fill, 't') !== false) {
-                                    $ratio_crop['t'] = 0;
-                                    $ratio_crop['b'] = $ratio_crop['y'];
-                                } else if (strpos($this->image_ratio_fill, 'b') !== false) {
-                                    $ratio_crop['t'] = $ratio_crop['y'];
-                                    $ratio_crop['b'] = 0;
-                                } else {
-                                    $ratio_crop['t'] = round($ratio_crop['y']/2);
-                                    $ratio_crop['b'] = $ratio_crop['y'] - $ratio_crop['t'];
-                                }
-                                $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;ratio_fill_y         : ' . $ratio_crop['y'] . ' (' . $ratio_crop['t'] . ';' . $ratio_crop['b'] . ')<br />';
-                                if (is_null($this->image_crop)) $this->image_crop = array(0, 0, 0, 0);
-                            }
-
-                        // keeps aspect ratio with x and y dimensions
-                        } else if ($this->image_ratio) {
-                            if (($this->image_src_x/$this->image_x) > ($this->image_src_y/$this->image_y)) {
-                                $this->image_dst_x = $this->image_x;
-                                $this->image_dst_y = intval($this->image_src_y*($this->image_x / $this->image_src_x));
-                            } else {
-                                $this->image_dst_y = $this->image_y;
-                                $this->image_dst_x = intval($this->image_src_x*($this->image_y / $this->image_src_y));
-                            }
-
-                        // resize to provided exact dimensions
-                        } else {
-                            $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;use plain sizes<br />';
-                            $this->image_dst_x = $this->image_x;
-                            $this->image_dst_y = $this->image_y;
-                        }
-
-                        if ($this->image_dst_x < 1) $this->image_dst_x = 1;
-                        if ($this->image_dst_y < 1) $this->image_dst_y = 1;
-                        $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;image_src_x y        : ' . $this->image_src_x . ' x ' . $this->image_src_y . '<br />';
-                        $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;image_dst_x y        : ' . $this->image_dst_x . ' x ' . $this->image_dst_y . '<br />';
-
-                        // make sure we don't enlarge the image if we don't want to
-                        if ($this->image_no_enlarging && ($this->image_src_x < $this->image_dst_x || $this->image_src_y < $this->image_dst_y)) {
-                            $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;cancel resizing, as it would enlarge the image!<br />';
-                            $this->image_dst_x = $this->image_src_x;
-                            $this->image_dst_y = $this->image_src_y;
-                            $ratio_crop = null;
-                        }
-
-                        // make sure we don't shrink the image if we don't want to
-                        if ($this->image_no_shrinking && ($this->image_src_x > $this->image_dst_x || $this->image_src_y > $this->image_dst_y)) {
-                            $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;cancel resizing, as it would shrink the image!<br />';
-                            $this->image_dst_x = $this->image_src_x;
-                            $this->image_dst_y = $this->image_src_y;
-                            $ratio_crop = null;
-                        }
-
-                        // resize the image
-                        if ($this->image_dst_x != $this->image_src_x || $this->image_dst_y != $this->image_src_y) {
-                            $tmp = $this->imagecreatenew($this->image_dst_x, $this->image_dst_y);
-
-                            if ($gd_version >= 2) {
-                                $res = imagecopyresampled($tmp, $image_src, 0, 0, 0, 0, $this->image_dst_x, $this->image_dst_y, $this->image_src_x, $this->image_src_y);
-                            } else {
-                                $res = imagecopyresized($tmp, $image_src, 0, 0, 0, 0, $this->image_dst_x, $this->image_dst_y, $this->image_src_x, $this->image_src_y);
-                            }
-
-                            $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;resized image object created<br />';
-                             // we transfert tmp into image_dst
-                            $image_dst = $this->imagetransfer($tmp, $image_dst);
-                        }
-
-                    } else {
-                        $this->image_dst_x = $this->image_src_x;
-                        $this->image_dst_y = $this->image_src_y;
-                    }
-
-                    // crop image (and also crops if image_ratio_crop is used)
-                    if ((!empty($this->image_crop) || !is_null($ratio_crop))) {
-                        list($ct, $cr, $cb, $cl) = $this->getoffsets($this->image_crop, $this->image_dst_x, $this->image_dst_y, true, true);
-                        // we adjust the cropping if we use image_ratio_crop
-                        if (!is_null($ratio_crop)) {
-                            if (array_key_exists('t', $ratio_crop)) $ct += $ratio_crop['t'];
-                            if (array_key_exists('r', $ratio_crop)) $cr += $ratio_crop['r'];
-                            if (array_key_exists('b', $ratio_crop)) $cb += $ratio_crop['b'];
-                            if (array_key_exists('l', $ratio_crop)) $cl += $ratio_crop['l'];
-                        }
-                        if ($ct != 0 || $cr != 0 || $cb != 0 || $cl != 0) {
-                            $this->log .= '- crop image : ' . $ct . ' ' . $cr . ' ' . $cb . ' ' . $cl . ' <br />';
-                            $this->image_dst_x = $this->image_dst_x - $cl - $cr;
-                            $this->image_dst_y = $this->image_dst_y - $ct - $cb;
-                            if ($this->image_dst_x < 1) $this->image_dst_x = 1;
-                            if ($this->image_dst_y < 1) $this->image_dst_y = 1;
-                            $tmp = $this->imagecreatenew($this->image_dst_x, $this->image_dst_y);
-
-                            // we copy the image into the recieving image
-                            imagecopy($tmp, $image_dst, 0, 0, $cl, $ct, $this->image_dst_x, $this->image_dst_y);
-
-                            // if we crop with negative margins, we have to make sure the extra bits are the right color, or transparent
-                            if ($ct < 0 || $cr < 0 || $cb < 0 || $cl < 0 ) {
-                                // use the background color if present
-                                if (!empty($this->image_background_color)) {
-                                    list($red, $green, $blue) = $this->getcolors($this->image_background_color);
-                                    $fill = imagecolorallocate($tmp, $red, $green, $blue);
-                                } else {
-                                    $fill = imagecolorallocatealpha($tmp, 0, 0, 0, 127);
-                                }
-                                // fills eventual negative margins
-                                if ($ct < 0) imagefilledrectangle($tmp, 0, 0, $this->image_dst_x, -$ct-1, $fill);
-                                if ($cr < 0) imagefilledrectangle($tmp, $this->image_dst_x + $cr, 0, $this->image_dst_x, $this->image_dst_y, $fill);
-                                if ($cb < 0) imagefilledrectangle($tmp, 0, $this->image_dst_y + $cb, $this->image_dst_x, $this->image_dst_y, $fill);
-                                if ($cl < 0) imagefilledrectangle($tmp, 0, 0, -$cl-1, $this->image_dst_y, $fill);
-                            }
-
-                            // we transfert tmp into image_dst
-                            $image_dst = $this->imagetransfer($tmp, $image_dst);
-                        }
-                    }
-
-                    // flip image
-                    if ($gd_version >= 2 && !empty($this->image_flip)) {
-                        $this->image_flip = strtolower($this->image_flip);
-                        $this->log .= '- flip image : ' . $this->image_flip . '<br />';
-                        $tmp = $this->imagecreatenew($this->image_dst_x, $this->image_dst_y);
-                        for ($x = 0; $x < $this->image_dst_x; $x++) {
-                            for ($y = 0; $y < $this->image_dst_y; $y++){
-                                if (strpos($this->image_flip, 'v') !== false) {
-                                    imagecopy($tmp, $image_dst, $this->image_dst_x - $x - 1, $y, $x, $y, 1, 1);
-                                } else {
-                                    imagecopy($tmp, $image_dst, $x, $this->image_dst_y - $y - 1, $x, $y, 1, 1);
-                                }
-                            }
-                        }
-                        // we transfert tmp into image_dst
-                        $image_dst = $this->imagetransfer($tmp, $image_dst);
-                    }
-
-                    // rotate image
-                    if ($gd_version >= 2 && is_numeric($this->image_rotate)) {
-                        if (!in_array($this->image_rotate, array(0, 90, 180, 270))) $this->image_rotate = 0;
-                        if ($this->image_rotate != 0) {
-                            if ($this->image_rotate == 90 || $this->image_rotate == 270) {
-                                $tmp = $this->imagecreatenew($this->image_dst_y, $this->image_dst_x);
-                            } else {
-                                $tmp = $this->imagecreatenew($this->image_dst_x, $this->image_dst_y);
-                            }
-                            $this->log .= '- rotate image : ' . $this->image_rotate . '<br />';
-                            for ($x = 0; $x < $this->image_dst_x; $x++) {
-                                for ($y = 0; $y < $this->image_dst_y; $y++){
-                                    if ($this->image_rotate == 90) {
-                                        imagecopy($tmp, $image_dst, $y, $x, $x, $this->image_dst_y - $y - 1, 1, 1);
-                                    } else if ($this->image_rotate == 180) {
-                                        imagecopy($tmp, $image_dst, $x, $y, $this->image_dst_x - $x - 1, $this->image_dst_y - $y - 1, 1, 1);
-                                    } else if ($this->image_rotate == 270) {
-                                        imagecopy($tmp, $image_dst, $y, $x, $this->image_dst_x - $x - 1, $y, 1, 1);
-                                    } else {
-                                        imagecopy($tmp, $image_dst, $x, $y, $x, $y, 1, 1);
-                                    }
-                                }
-                            }
-                            if ($this->image_rotate == 90 || $this->image_rotate == 270) {
-                                $t = $this->image_dst_y;
-                                $this->image_dst_y = $this->image_dst_x;
-                                $this->image_dst_x = $t;
-                            }
-                            // we transfert tmp into image_dst
-                            $image_dst = $this->imagetransfer($tmp, $image_dst);
-                        }
-                    }
-
-                    // pixelate image
-                    if ((is_numeric($this->image_pixelate) && $this->image_pixelate > 0)) {
-                        $this->log .= '- pixelate image (' . $this->image_pixelate . 'px)<br />';
-                        $filter = $this->imagecreatenew($this->image_dst_x, $this->image_dst_y);
-                        if ($gd_version >= 2) {
-                            imagecopyresampled($filter, $image_dst, 0, 0, 0, 0, round($this->image_dst_x / $this->image_pixelate), round($this->image_dst_y / $this->image_pixelate), $this->image_dst_x, $this->image_dst_y);
-                            imagecopyresampled($image_dst, $filter, 0, 0, 0, 0, $this->image_dst_x, $this->image_dst_y, round($this->image_dst_x / $this->image_pixelate), round($this->image_dst_y / $this->image_pixelate));
-                        } else {
-                            imagecopyresized($filter, $image_dst, 0, 0, 0, 0, round($this->image_dst_x / $this->image_pixelate), round($this->image_dst_y / $this->image_pixelate), $this->image_dst_x, $this->image_dst_y);
-                            imagecopyresized($image_dst, $filter, 0, 0, 0, 0, $this->image_dst_x, $this->image_dst_y, round($this->image_dst_x / $this->image_pixelate), round($this->image_dst_y / $this->image_pixelate));
-                        }
-                        imagedestroy($filter);
-                    }
-
-                    // unsharp mask
-                    if ($gd_version >= 2 && $this->image_unsharp && is_numeric($this->image_unsharp_amount) && is_numeric($this->image_unsharp_radius) && is_numeric($this->image_unsharp_threshold)) {
-                        // Unsharp Mask for PHP - version 2.1.1
-                        // Unsharp mask algorithm by Torstein Hønsi 2003-07.
-                        // Used with permission
-                        // Modified to support alpha transparency
-                        if ($this->image_unsharp_amount > 500)    $this->image_unsharp_amount = 500;
-                        $this->image_unsharp_amount = $this->image_unsharp_amount * 0.016;
-                        if ($this->image_unsharp_radius > 50)    $this->image_unsharp_radius = 50;
-                        $this->image_unsharp_radius = $this->image_unsharp_radius * 2;
-                        if ($this->image_unsharp_threshold > 255)    $this->image_unsharp_threshold = 255;
-                        $this->image_unsharp_radius = abs(round($this->image_unsharp_radius));
-                        if ($this->image_unsharp_radius != 0) {
-                            $this->image_dst_x = imagesx($image_dst); $this->image_dst_y = imagesy($image_dst);
-                            $canvas = $this->imagecreatenew($this->image_dst_x, $this->image_dst_y, false, true);
-                            $blur = $this->imagecreatenew($this->image_dst_x, $this->image_dst_y, false, true);
-                            if ($this->function_enabled('imageconvolution')) { // PHP >= 5.1
-                                $matrix = array(array( 1, 2, 1 ), array( 2, 4, 2 ), array( 1, 2, 1 ));
-                                imagecopy($blur, $image_dst, 0, 0, 0, 0, $this->image_dst_x, $this->image_dst_y);
-                                imageconvolution($blur, $matrix, 16, 0);
-                            } else {
-                                for ($i = 0; $i < $this->image_unsharp_radius; $i++) {
-                                    imagecopy($blur, $image_dst, 0, 0, 1, 0, $this->image_dst_x - 1, $this->image_dst_y); // left
-                                    $this->imagecopymergealpha($blur, $image_dst, 1, 0, 0, 0, $this->image_dst_x, $this->image_dst_y, 50); // right
-                                    $this->imagecopymergealpha($blur, $image_dst, 0, 0, 0, 0, $this->image_dst_x, $this->image_dst_y, 50); // center
-                                    imagecopy($canvas, $blur, 0, 0, 0, 0, $this->image_dst_x, $this->image_dst_y);
-                                    $this->imagecopymergealpha($blur, $canvas, 0, 0, 0, 1, $this->image_dst_x, $this->image_dst_y - 1, 33.33333 ); // up
-                                    $this->imagecopymergealpha($blur, $canvas, 0, 1, 0, 0, $this->image_dst_x, $this->image_dst_y, 25); // down
-                                }
-                            }
-                            $p_new = array();
-                            if($this->image_unsharp_threshold>0) {
-                                for ($x = 0; $x < $this->image_dst_x-1; $x++) {
-                                    for ($y = 0; $y < $this->image_dst_y; $y++) {
-                                        $p_orig = imagecolorsforindex($image_dst, imagecolorat($image_dst, $x, $y));
-                                        $p_blur = imagecolorsforindex($blur, imagecolorat($blur, $x, $y));
-                                        $p_new['red'] = (abs($p_orig['red'] - $p_blur['red']) >= $this->image_unsharp_threshold) ? max(0, min(255, ($this->image_unsharp_amount * ($p_orig['red'] - $p_blur['red'])) + $p_orig['red'])) : $p_orig['red'];
-                                        $p_new['green'] = (abs($p_orig['green'] - $p_blur['green']) >= $this->image_unsharp_threshold) ? max(0, min(255, ($this->image_unsharp_amount * ($p_orig['green'] - $p_blur['green'])) + $p_orig['green'])) : $p_orig['green'];
-                                        $p_new['blue'] = (abs($p_orig['blue'] - $p_blur['blue']) >= $this->image_unsharp_threshold) ? max(0, min(255, ($this->image_unsharp_amount * ($p_orig['blue'] - $p_blur['blue'])) + $p_orig['blue'])) : $p_orig['blue'];
-                                        if (($p_orig['red'] != $p_new['red']) || ($p_orig['green'] != $p_new['green']) || ($p_orig['blue'] != $p_new['blue'])) {
-                                            $color = imagecolorallocatealpha($image_dst, $p_new['red'], $p_new['green'], $p_new['blue'], $p_orig['alpha']);
-                                            imagesetpixel($image_dst, $x, $y, $color);
-                                        }
-                                    }
-                                }
-                            } else {
-                                for ($x = 0; $x < $this->image_dst_x; $x++) {
-                                    for ($y = 0; $y < $this->image_dst_y; $y++) {
-                                        $p_orig = imagecolorsforindex($image_dst, imagecolorat($image_dst, $x, $y));
-                                        $p_blur = imagecolorsforindex($blur, imagecolorat($blur, $x, $y));
-                                        $p_new['red'] = ($this->image_unsharp_amount * ($p_orig['red'] - $p_blur['red'])) + $p_orig['red'];
-                                        if ($p_new['red']>255) { $p_new['red']=255; } elseif ($p_new['red']<0) { $p_new['red']=0; }
-                                        $p_new['green'] = ($this->image_unsharp_amount * ($p_orig['green'] - $p_blur['green'])) + $p_orig['green'];
-                                        if ($p_new['green']>255) { $p_new['green']=255; }  elseif ($p_new['green']<0) { $p_new['green']=0; }
-                                        $p_new['blue'] = ($this->image_unsharp_amount * ($p_orig['blue'] - $p_blur['blue'])) + $p_orig['blue'];
-                                        if ($p_new['blue']>255) { $p_new['blue']=255; } elseif ($p_new['blue']<0) { $p_new['blue']=0; }
-                                        $color = imagecolorallocatealpha($image_dst, $p_new['red'], $p_new['green'], $p_new['blue'], $p_orig['alpha']);
-                                        imagesetpixel($image_dst, $x, $y, $color);
-                                    }
-                                }
-                            }
-                            imagedestroy($canvas);
-                            imagedestroy($blur);
-                        }
-                    }
-
-                    // add color overlay
-                    if ($gd_version >= 2 && (is_numeric($this->image_overlay_opacity) && $this->image_overlay_opacity > 0 && !empty($this->image_overlay_color))) {
-                        $this->log .= '- apply color overlay<br />';
-                        list($red, $green, $blue) = $this->getcolors($this->image_overlay_color);
-                        $filter = imagecreatetruecolor($this->image_dst_x, $this->image_dst_y);
-                        $color = imagecolorallocate($filter, $red, $green, $blue);
-                        imagefilledrectangle($filter, 0, 0, $this->image_dst_x, $this->image_dst_y, $color);
-                        $this->imagecopymergealpha($image_dst, $filter, 0, 0, 0, 0, $this->image_dst_x, $this->image_dst_y, $this->image_overlay_opacity);
-                        imagedestroy($filter);
-                    }
-
-                    // add brightness, contrast and tint, turns to greyscale and inverts colors
-                    if ($gd_version >= 2 && ($this->image_negative || $this->image_greyscale || is_numeric($this->image_threshold)|| is_numeric($this->image_brightness) || is_numeric($this->image_contrast) || !empty($this->image_tint_color))) {
-                        $this->log .= '- apply tint, light, contrast correction, negative, greyscale and threshold<br />';
-                        if (!empty($this->image_tint_color)) list($tint_red, $tint_green, $tint_blue) = $this->getcolors($this->image_tint_color);
-                        //imagealphablending($image_dst, true);
-                        for($y=0; $y < $this->image_dst_y; $y++) {
-                            for($x=0; $x < $this->image_dst_x; $x++) {
-                                if ($this->image_greyscale) {
-                                    $pixel = imagecolorsforindex($image_dst, imagecolorat($image_dst, $x, $y));
-                                    $r = $g = $b = round((0.2125 * $pixel['red']) + (0.7154 * $pixel['green']) + (0.0721 * $pixel['blue']));
-                                    $color = imagecolorallocatealpha($image_dst, $r, $g, $b, $pixel['alpha']);
-                                    imagesetpixel($image_dst, $x, $y, $color);
-                                    unset($color); unset($pixel);
-                                }
-                                if (is_numeric($this->image_threshold)) {
-                                    $pixel = imagecolorsforindex($image_dst, imagecolorat($image_dst, $x, $y));
-                                    $c = (round($pixel['red'] + $pixel['green'] + $pixel['blue']) / 3) - 127;
-                                    $r = $g = $b = ($c > $this->image_threshold ? 255 : 0);
-                                    $color = imagecolorallocatealpha($image_dst, $r, $g, $b, $pixel['alpha']);
-                                    imagesetpixel($image_dst, $x, $y, $color);
-                                    unset($color); unset($pixel);
-                                }
-                                if (is_numeric($this->image_brightness)) {
-                                    $pixel = imagecolorsforindex($image_dst, imagecolorat($image_dst, $x, $y));
-                                    $r = max(min(round($pixel['red'] + (($this->image_brightness * 2))), 255), 0);
-                                    $g = max(min(round($pixel['green'] + (($this->image_brightness * 2))), 255), 0);
-                                    $b = max(min(round($pixel['blue'] + (($this->image_brightness * 2))), 255), 0);
-                                    $color = imagecolorallocatealpha($image_dst, $r, $g, $b, $pixel['alpha']);
-                                    imagesetpixel($image_dst, $x, $y, $color);
-                                    unset($color); unset($pixel);
-                                }
-                                if (is_numeric($this->image_contrast)) {
-                                    $pixel = imagecolorsforindex($image_dst, imagecolorat($image_dst, $x, $y));
-                                    $r = max(min(round(($this->image_contrast + 128) * $pixel['red'] / 128), 255), 0);
-                                    $g = max(min(round(($this->image_contrast + 128) * $pixel['green'] / 128), 255), 0);
-                                    $b = max(min(round(($this->image_contrast + 128) * $pixel['blue'] / 128), 255), 0);
-                                    $color = imagecolorallocatealpha($image_dst, $r, $g, $b, $pixel['alpha']);
-                                    imagesetpixel($image_dst, $x, $y, $color);
-                                    unset($color); unset($pixel);
-                                }
-                                if (!empty($this->image_tint_color)) {
-                                    $pixel = imagecolorsforindex($image_dst, imagecolorat($image_dst, $x, $y));
-                                    $r = min(round($tint_red * $pixel['red'] / 169), 255);
-                                    $g = min(round($tint_green * $pixel['green'] / 169), 255);
-                                    $b = min(round($tint_blue * $pixel['blue'] / 169), 255);
-                                    $color = imagecolorallocatealpha($image_dst, $r, $g, $b, $pixel['alpha']);
-                                    imagesetpixel($image_dst, $x, $y, $color);
-                                    unset($color); unset($pixel);
-                                }
-                                if (!empty($this->image_negative)) {
-                                    $pixel = imagecolorsforindex($image_dst, imagecolorat($image_dst, $x, $y));
-                                    $r = round(255 - $pixel['red']);
-                                    $g = round(255 - $pixel['green']);
-                                    $b = round(255 - $pixel['blue']);
-                                    $color = imagecolorallocatealpha($image_dst, $r, $g, $b, $pixel['alpha']);
-                                    imagesetpixel($image_dst, $x, $y, $color);
-                                    unset($color); unset($pixel);
-                                }
-                            }
-                        }
-                    }
-
-                    // adds a border
-                    if ($gd_version >= 2 && !empty($this->image_border)) {
-                        list($ct, $cr, $cb, $cl) = $this->getoffsets($this->image_border, $this->image_dst_x, $this->image_dst_y, true, false);
-                        $this->log .= '- add border : ' . $ct . ' ' . $cr . ' ' . $cb . ' ' . $cl . '<br />';
-                        $this->image_dst_x = $this->image_dst_x + $cl + $cr;
-                        $this->image_dst_y = $this->image_dst_y + $ct + $cb;
-                        if (!empty($this->image_border_color)) list($red, $green, $blue) = $this->getcolors($this->image_border_color);
-                        $opacity = (is_numeric($this->image_border_opacity) ? (int) (127 - $this->image_border_opacity / 100 * 127): 0);
-                        // we now create an image, that we fill with the border color
-                        $tmp = $this->imagecreatenew($this->image_dst_x, $this->image_dst_y);
-                        $background = imagecolorallocatealpha($tmp, $red, $green, $blue, $opacity);
-                        imagefilledrectangle($tmp, 0, 0, $this->image_dst_x, $this->image_dst_y, $background);
-                        // we then copy the source image into the new image, without merging so that only the border is actually kept
-                        imagecopy($tmp, $image_dst, $cl, $ct, 0, 0, $this->image_dst_x - $cr - $cl, $this->image_dst_y - $cb - $ct);
-                        // we transfert tmp into image_dst
-                        $image_dst = $this->imagetransfer($tmp, $image_dst);
-                    }
-
-                    // adds a fading-to-transparent border
-                    if ($gd_version >= 2 && !empty($this->image_border_transparent)) {
-                        list($ct, $cr, $cb, $cl) = $this->getoffsets($this->image_border_transparent, $this->image_dst_x, $this->image_dst_y, true, false);
-                        $this->log .= '- add transparent border : ' . $ct . ' ' . $cr . ' ' . $cb . ' ' . $cl . '<br />';
-                        // we now create an image, that we fill with the border color
-                        $tmp = $this->imagecreatenew($this->image_dst_x, $this->image_dst_y);
-                        // we then copy the source image into the new image, without the borders
-                        imagecopy($tmp, $image_dst, $cl, $ct, $cl, $ct, $this->image_dst_x - $cr - $cl, $this->image_dst_y - $cb - $ct);
-                        // we now add the top border
-                        $opacity = 100;
-                        for ($y = $ct - 1; $y >= 0; $y--) {
-                            $il = (int) ($ct > 0 ? ($cl * ($y / $ct)) : 0);
-                            $ir = (int) ($ct > 0 ? ($cr * ($y / $ct)) : 0);
-                            for ($x = $il; $x < $this->image_dst_x - $ir; $x++) {
-                                $pixel = imagecolorsforindex($image_dst, imagecolorat($image_dst, $x, $y));
-                                $alpha = (1 - ($pixel['alpha'] / 127)) * $opacity / 100;
-                                if ($alpha > 0) {
-                                    if ($alpha > 1) $alpha = 1;
-                                    $color = imagecolorallocatealpha($tmp, $pixel['red'] , $pixel['green'], $pixel['blue'],  round((1 - $alpha) * 127));
-                                    imagesetpixel($tmp, $x, $y, $color);
-                                }
-                            }
-                            if ($opacity > 0) $opacity = $opacity - (100 / $ct);
-                        }
-                        // we now add the right border
-                        $opacity = 100;
-                        for ($x = $this->image_dst_x - $cr; $x < $this->image_dst_x; $x++) {
-                            $it = (int) ($cr > 0 ? ($ct * (($this->image_dst_x - $x - 1) / $cr)) : 0);
-                            $ib = (int) ($cr > 0 ? ($cb * (($this->image_dst_x - $x - 1) / $cr)) : 0);
-                            for ($y = $it; $y < $this->image_dst_y - $ib; $y++) {
-                                $pixel = imagecolorsforindex($image_dst, imagecolorat($image_dst, $x, $y));
-                                $alpha = (1 - ($pixel['alpha'] / 127)) * $opacity / 100;
-                                if ($alpha > 0) {
-                                    if ($alpha > 1) $alpha = 1;
-                                    $color = imagecolorallocatealpha($tmp, $pixel['red'] , $pixel['green'], $pixel['blue'],  round((1 - $alpha) * 127));
-                                    imagesetpixel($tmp, $x, $y, $color);
-                                }
-                            }
-                            if ($opacity > 0) $opacity = $opacity - (100 / $cr);
-                        }
-                        // we now add the bottom border
-                        $opacity = 100;
-                        for ($y = $this->image_dst_y - $cb; $y < $this->image_dst_y; $y++) {
-                            $il = (int) ($cb > 0 ? ($cl * (($this->image_dst_y - $y - 1) / $cb)) : 0);
-                            $ir = (int) ($cb > 0 ? ($cr * (($this->image_dst_y - $y - 1) / $cb)) : 0);
-                            for ($x = $il; $x < $this->image_dst_x - $ir; $x++) {
-                                $pixel = imagecolorsforindex($image_dst, imagecolorat($image_dst, $x, $y));
-                                $alpha = (1 - ($pixel['alpha'] / 127)) * $opacity / 100;
-                                if ($alpha > 0) {
-                                    if ($alpha > 1) $alpha = 1;
-                                    $color = imagecolorallocatealpha($tmp, $pixel['red'] , $pixel['green'], $pixel['blue'],  round((1 - $alpha) * 127));
-                                    imagesetpixel($tmp, $x, $y, $color);
-                                }
-                            }
-                            if ($opacity > 0) $opacity = $opacity - (100 / $cb);
-                        }
-                        // we now add the left border
-                        $opacity = 100;
-                        for ($x = $cl - 1; $x >= 0; $x--) {
-                            $it = (int) ($cl > 0 ? ($ct * ($x / $cl)) : 0);
-                            $ib = (int) ($cl > 0 ? ($cb * ($x / $cl)) : 0);
-                            for ($y = $it; $y < $this->image_dst_y - $ib; $y++) {
-                                $pixel = imagecolorsforindex($image_dst, imagecolorat($image_dst, $x, $y));
-                                $alpha = (1 - ($pixel['alpha'] / 127)) * $opacity / 100;
-                                if ($alpha > 0) {
-                                    if ($alpha > 1) $alpha = 1;
-                                    $color = imagecolorallocatealpha($tmp, $pixel['red'] , $pixel['green'], $pixel['blue'],  round((1 - $alpha) * 127));
-                                    imagesetpixel($tmp, $x, $y, $color);
-                                }
-                            }
-                            if ($opacity > 0) $opacity = $opacity - (100 / $cl);
-                        }
-                        // we transfert tmp into image_dst
-                        $image_dst = $this->imagetransfer($tmp, $image_dst);
-                    }
-
-                    // add frame border
-                    if ($gd_version >= 2 && is_numeric($this->image_frame)) {
-                        if (is_array($this->image_frame_colors)) {
-                            $vars = $this->image_frame_colors;
-                            $this->log .= '- add frame : ' . implode(' ', $this->image_frame_colors) . '<br />';
-                        } else {
-                            $this->log .= '- add frame : ' . $this->image_frame_colors . '<br />';
-                            $vars = explode(' ', $this->image_frame_colors);
-                        }
-                        $nb = sizeof($vars);
-                        $this->image_dst_x = $this->image_dst_x + ($nb * 2);
-                        $this->image_dst_y = $this->image_dst_y + ($nb * 2);
-                        $tmp = $this->imagecreatenew($this->image_dst_x, $this->image_dst_y);
-                        imagecopy($tmp, $image_dst, $nb, $nb, 0, 0, $this->image_dst_x - ($nb * 2), $this->image_dst_y - ($nb * 2));
-                        $opacity = (is_numeric($this->image_frame_opacity) ? (int) (127 - $this->image_frame_opacity / 100 * 127): 0);
-                        for ($i=0; $i<$nb; $i++) {
-                            list($red, $green, $blue) = $this->getcolors($vars[$i]);
-                            $c = imagecolorallocatealpha($tmp, $red, $green, $blue, $opacity);
-                            if ($this->image_frame == 1) {
-                                imageline($tmp, $i, $i, $this->image_dst_x - $i -1, $i, $c);
-                                imageline($tmp, $this->image_dst_x - $i -1, $this->image_dst_y - $i -1, $this->image_dst_x - $i -1, $i, $c);
-                                imageline($tmp, $this->image_dst_x - $i -1, $this->image_dst_y - $i -1, $i, $this->image_dst_y - $i -1, $c);
-                                imageline($tmp, $i, $i, $i, $this->image_dst_y - $i -1, $c);
-                            } else {
-                                imageline($tmp, $i, $i, $this->image_dst_x - $i -1, $i, $c);
-                                imageline($tmp, $this->image_dst_x - $nb + $i, $this->image_dst_y - $nb + $i, $this->image_dst_x - $nb + $i, $nb - $i, $c);
-                                imageline($tmp, $this->image_dst_x - $nb + $i, $this->image_dst_y - $nb + $i, $nb - $i, $this->image_dst_y - $nb + $i, $c);
-                                imageline($tmp, $i, $i, $i, $this->image_dst_y - $i -1, $c);
-                            }
-                        }
-                        // we transfert tmp into image_dst
-                        $image_dst = $this->imagetransfer($tmp, $image_dst);
-                    }
-
-                    // add bevel border
-                    if ($gd_version >= 2 && $this->image_bevel > 0) {
-                        if (empty($this->image_bevel_color1)) $this->image_bevel_color1 = '#FFFFFF';
-                        if (empty($this->image_bevel_color2)) $this->image_bevel_color2 = '#000000';
-                        list($red1, $green1, $blue1) = $this->getcolors($this->image_bevel_color1);
-                        list($red2, $green2, $blue2) = $this->getcolors($this->image_bevel_color2);
-                        $tmp = $this->imagecreatenew($this->image_dst_x, $this->image_dst_y);
-                        imagecopy($tmp, $image_dst, 0, 0, 0, 0, $this->image_dst_x, $this->image_dst_y);
-                        imagealphablending($tmp, true);
-                        for ($i=0; $i<$this->image_bevel; $i++) {
-                            $alpha = round(($i / $this->image_bevel) * 127);
-                            $c1 = imagecolorallocatealpha($tmp, $red1, $green1, $blue1, $alpha);
-                            $c2 = imagecolorallocatealpha($tmp, $red2, $green2, $blue2, $alpha);
-                            imageline($tmp, $i, $i, $this->image_dst_x - $i -1, $i, $c1);
-                            imageline($tmp, $this->image_dst_x - $i -1, $this->image_dst_y - $i, $this->image_dst_x - $i -1, $i, $c2);
-                            imageline($tmp, $this->image_dst_x - $i -1, $this->image_dst_y - $i -1, $i, $this->image_dst_y - $i -1, $c2);
-                            imageline($tmp, $i, $i, $i, $this->image_dst_y - $i -1, $c1);
-                        }
-                        // we transfert tmp into image_dst
-                        $image_dst = $this->imagetransfer($tmp, $image_dst);
-                    }
-
-                    // add watermark image
-                    if ($this->image_watermark!='' && file_exists($this->image_watermark)) {
-                        $this->log .= '- add watermark<br />';
-                        $this->image_watermark_position = strtolower($this->image_watermark_position);
-                        $watermark_info = getimagesize($this->image_watermark);
-                        $watermark_type = (array_key_exists(2, $watermark_info) ? $watermark_info[2] : null); // 1 = GIF, 2 = JPG, 3 = PNG
-                        $watermark_checked = false;
-                        if ($watermark_type == IMAGETYPE_GIF) {
-                            if (!$this->function_enabled('imagecreatefromgif')) {
-                                $this->error = $this->translate('watermark_no_create_support', array('GIF'));
-                            } else {
-                                $filter = @imagecreatefromgif($this->image_watermark);
-                                if (!$filter) {
-                                    $this->error = $this->translate('watermark_create_error', array('GIF'));
-                                } else {
-                                    $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;watermark source image is GIF<br />';
-                                    $watermark_checked = true;
-                                }
-                            }
-                        } else if ($watermark_type == IMAGETYPE_JPEG) {
-                            if (!$this->function_enabled('imagecreatefromjpeg')) {
-                                $this->error = $this->translate('watermark_no_create_support', array('JPEG'));
-                            } else {
-                                $filter = @imagecreatefromjpeg($this->image_watermark);
-                                if (!$filter) {
-                                    $this->error = $this->translate('watermark_create_error', array('JPEG'));
-                                } else {
-                                    $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;watermark source image is JPEG<br />';
-                                    $watermark_checked = true;
-                                }
-                            }
-                        } else if ($watermark_type == IMAGETYPE_PNG) {
-                            if (!$this->function_enabled('imagecreatefrompng')) {
-                                $this->error = $this->translate('watermark_no_create_support', array('PNG'));
-                            } else {
-                                $filter = @imagecreatefrompng($this->image_watermark);
-                                if (!$filter) {
-                                    $this->error = $this->translate('watermark_create_error', array('PNG'));
-                                } else {
-                                    $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;watermark source image is PNG<br />';
-                                    $watermark_checked = true;
-                                }
-                            }
-                        } else if ($watermark_type == IMAGETYPE_BMP) {
-                            if (!method_exists($this, 'imagecreatefrombmp')) {
-                                $this->error = $this->translate('watermark_no_create_support', array('BMP'));
-                            } else {
-                                $filter = @$this->imagecreatefrombmp($this->image_watermark);
-                                if (!$filter) {
-                                    $this->error = $this->translate('watermark_create_error', array('BMP'));
-                                } else {
-                                    $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;watermark source image is BMP<br />';
-                                    $watermark_checked = true;
-                                }
-                            }
-                        } else {
-                            $this->error = $this->translate('watermark_invalid');
-                        }
-                        if ($watermark_checked) {
-                            $watermark_dst_width  = $watermark_src_width  = imagesx($filter);
-                            $watermark_dst_height = $watermark_src_height = imagesy($filter);
-
-                            // if watermark is too large/tall, resize it first
-                            if ((!$this->image_watermark_no_zoom_out && ($watermark_dst_width > $this->image_dst_x || $watermark_dst_height > $this->image_dst_y))
-                             || (!$this->image_watermark_no_zoom_in && $watermark_dst_width < $this->image_dst_x && $watermark_dst_height < $this->image_dst_y)) {
-                                $canvas_width  = $this->image_dst_x - abs($this->image_watermark_x);
-                                $canvas_height = $this->image_dst_y - abs($this->image_watermark_y);
-                                if (($watermark_src_width/$canvas_width) > ($watermark_src_height/$canvas_height)) {
-                                    $watermark_dst_width = $canvas_width;
-                                    $watermark_dst_height = intval($watermark_src_height*($canvas_width / $watermark_src_width));
-                                } else {
-                                    $watermark_dst_height = $canvas_height;
-                                    $watermark_dst_width = intval($watermark_src_width*($canvas_height / $watermark_src_height));
-                                }
-                                $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;watermark resized from '.$watermark_src_width.'x'.$watermark_src_height.' to '.$watermark_dst_width.'x'.$watermark_dst_height.'<br />';
-
-                            }
-                            // determine watermark position
-                            $watermark_x = 0;
-                            $watermark_y = 0;
-                            if (is_numeric($this->image_watermark_x)) {
-                                if ($this->image_watermark_x < 0) {
-                                    $watermark_x = $this->image_dst_x - $watermark_dst_width + $this->image_watermark_x;
-                                } else {
-                                    $watermark_x = $this->image_watermark_x;
-                                }
-                            } else {
-                                if (strpos($this->image_watermark_position, 'r') !== false) {
-                                    $watermark_x = $this->image_dst_x - $watermark_dst_width;
-                                } else if (strpos($this->image_watermark_position, 'l') !== false) {
-                                    $watermark_x = 0;
-                                } else {
-                                    $watermark_x = ($this->image_dst_x - $watermark_dst_width) / 2;
-                                }
-                            }
-                            if (is_numeric($this->image_watermark_y)) {
-                                if ($this->image_watermark_y < 0) {
-                                    $watermark_y = $this->image_dst_y - $watermark_dst_height + $this->image_watermark_y;
-                                } else {
-                                    $watermark_y = $this->image_watermark_y;
-                                }
-                            } else {
-                                if (strpos($this->image_watermark_position, 'b') !== false) {
-                                    $watermark_y = $this->image_dst_y - $watermark_dst_height;
-                                } else if (strpos($this->image_watermark_position, 't') !== false) {
-                                    $watermark_y = 0;
-                                } else {
-                                    $watermark_y = ($this->image_dst_y - $watermark_dst_height) / 2;
-                                }
-                            }
-                            imagealphablending($image_dst, true);
-                            imagecopyresampled($image_dst, $filter, $watermark_x, $watermark_y, 0, 0, $watermark_dst_width, $watermark_dst_height, $watermark_src_width, $watermark_src_height);
-                        } else {
-                            $this->error = $this->translate('watermark_invalid');
-                        }
-                    }
-
-                    // add text
-                    if (!empty($this->image_text)) {
-                        $this->log .= '- add text<br />';
-
-                        // calculate sizes in human readable format
-                        $src_size       = $this->file_src_size / 1024;
-                        $src_size_mb    = number_format($src_size / 1024, 1, ".", " ");
-                        $src_size_kb    = number_format($src_size, 1, ".", " ");
-                        $src_size_human = ($src_size > 1024 ? $src_size_mb . " MB" : $src_size_kb . " kb");
-
-                        $this->image_text = str_replace(
-                            array('[src_name]',
-                                  '[src_name_body]',
-                                  '[src_name_ext]',
-                                  '[src_pathname]',
-                                  '[src_mime]',
-                                  '[src_size]',
-                                  '[src_size_kb]',
-                                  '[src_size_mb]',
-                                  '[src_size_human]',
-                                  '[src_x]',
-                                  '[src_y]',
-                                  '[src_pixels]',
-                                  '[src_type]',
-                                  '[src_bits]',
-                                  '[dst_path]',
-                                  '[dst_name_body]',
-                                  '[dst_name_ext]',
-                                  '[dst_name]',
-                                  '[dst_pathname]',
-                                  '[dst_x]',
-                                  '[dst_y]',
-                                  '[date]',
-                                  '[time]',
-                                  '[host]',
-                                  '[server]',
-                                  '[ip]',
-                                  '[gd_version]'),
-                            array($this->file_src_name,
-                                  $this->file_src_name_body,
-                                  $this->file_src_name_ext,
-                                  $this->file_src_pathname,
-                                  $this->file_src_mime,
-                                  $this->file_src_size,
-                                  $src_size_kb,
-                                  $src_size_mb,
-                                  $src_size_human,
-                                  $this->image_src_x,
-                                  $this->image_src_y,
-                                  $this->image_src_pixels,
-                                  $this->image_src_type,
-                                  $this->image_src_bits,
-                                  $this->file_dst_path,
-                                  $this->file_dst_name_body,
-                                  $this->file_dst_name_ext,
-                                  $this->file_dst_name,
-                                  $this->file_dst_pathname,
-                                  $this->image_dst_x,
-                                  $this->image_dst_y,
-                                  date('Y-m-d'),
-                                  date('H:i:s'),
-                                  (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : 'n/a'),
-                                  (isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : 'n/a'),
-                                  (isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : 'n/a'),
-                                  $this->gdversion(true)),
-                            $this->image_text);
-
-                        if (!is_numeric($this->image_text_padding)) $this->image_text_padding = 0;
-                        if (!is_numeric($this->image_text_line_spacing)) $this->image_text_line_spacing = 0;
-                        if (!is_numeric($this->image_text_padding_x)) $this->image_text_padding_x = $this->image_text_padding;
-                        if (!is_numeric($this->image_text_padding_y)) $this->image_text_padding_y = $this->image_text_padding;
-                        $this->image_text_position = strtolower($this->image_text_position);
-                        $this->image_text_direction = strtolower($this->image_text_direction);
-                        $this->image_text_alignment = strtolower($this->image_text_alignment);
-
-                        $font_type = 'gd';
-
-                        // if the font is a string with a GDF font path, we assume that we might want to load a font
-                        if (!is_numeric($this->image_text_font) && strlen($this->image_text_font) > 4 && substr(strtolower($this->image_text_font), -4) == '.gdf') {
-                            if (strpos($this->image_text_font, '/') === false) $this->image_text_font = "./" . $this->image_text_font;
-                            $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;try to load font ' . $this->image_text_font . '... ';
-                            if ($this->image_text_font = @imageloadfont($this->image_text_font)) {
-                                $this->log .=  'success<br />';
-                            } else {
-                                $this->log .=  'error<br />';
-                                $this->image_text_font = 5;
-                            }
-                        }
-
-                        // if the font is a string with a TTF font path, we check if we can access the font file
-                        if (!is_numeric($this->image_text_font) && strlen($this->image_text_font) > 4 && substr(strtolower($this->image_text_font), -4) == '.ttf') {
-                            $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;try to load font ' . $this->image_text_font . '... ';
-                            if (strpos($this->image_text_font, '/') === false) $this->image_text_font = "./" . $this->image_text_font;
-                            if (file_exists($this->image_text_font) && is_readable($this->image_text_font)) {
-                                $this->log .=  'success<br />';
-                                $font_type = 'tt';
-                            } else {
-                                $this->log .=  'error<br />';
-                                $this->image_text_font = 5;
-                            }
-                        }
-
-                        // get the text bounding box (GD fonts)
-                        if ($font_type == 'gd') {
-                            $text = explode("\n", $this->image_text);
-                            $char_width = imagefontwidth($this->image_text_font);
-                            $char_height = imagefontheight($this->image_text_font);
-                            $text_height = 0;
-                            $text_width = 0;
-                            $line_height = 0;
-                            $line_width = 0;
-                            foreach ($text as $k => $v) {
-                                if ($this->image_text_direction == 'v') {
-                                    $h = ($char_width * strlen($v));
-                                    if ($h > $text_height) $text_height = $h;
-                                    $line_width = $char_height;
-                                    $text_width += $line_width + ($k < (sizeof($text)-1) ? $this->image_text_line_spacing : 0);
-                                } else {
-                                    $w = ($char_width * strlen($v));
-                                    if ($w > $text_width) $text_width = $w;
-                                    $line_height = $char_height;
-                                    $text_height += $line_height + ($k < (sizeof($text)-1) ? $this->image_text_line_spacing : 0);
-                                }
-                            }
-                            $text_width  += (2 * $this->image_text_padding_x);
-                            $text_height += (2 * $this->image_text_padding_y);
-
-                        // get the text bounding box (TrueType fonts)
-                        } else if ($font_type == 'tt') {
-                            $text = $this->image_text;
-                            if (!$this->image_text_angle) $this->image_text_angle = $this->image_text_direction == 'v' ? 90 : 0;
-                            $text_height = 0;
-                            $text_width = 0;
-                            $text_offset_x = 0;
-                            $text_offset_y = 0;
-                            $rect = imagettfbbox($this->image_text_size, $this->image_text_angle, $this->image_text_font, $text );
-                            if ($rect) {
-                                $minX = min(array($rect[0],$rect[2],$rect[4],$rect[6]));
-                                $maxX = max(array($rect[0],$rect[2],$rect[4],$rect[6]));
-                                $minY = min(array($rect[1],$rect[3],$rect[5],$rect[7]));
-                                $maxY = max(array($rect[1],$rect[3],$rect[5],$rect[7]));
-                                $text_offset_x = abs($minX) - 1;
-                                $text_offset_y = abs($minY) - 1;
-                                $text_width = $maxX - $minX + (2 * $this->image_text_padding_x);
-                                $text_height = $maxY - $minY + (2 * $this->image_text_padding_y);
-                            }
-                        }
-
-                        // position the text block
-                        $text_x = 0;
-                        $text_y = 0;
-                        if (is_numeric($this->image_text_x)) {
-                            if ($this->image_text_x < 0) {
-                                $text_x = $this->image_dst_x - $text_width + $this->image_text_x;
-                            } else {
-                                $text_x = $this->image_text_x;
-                            }
-                        } else {
-                            if (strpos($this->image_text_position, 'r') !== false) {
-                                $text_x = $this->image_dst_x - $text_width;
-                            } else if (strpos($this->image_text_position, 'l') !== false) {
-                                $text_x = 0;
-                            } else {
-                                $text_x = ($this->image_dst_x - $text_width) / 2;
-                            }
-                        }
-                        if (is_numeric($this->image_text_y)) {
-                            if ($this->image_text_y < 0) {
-                                $text_y = $this->image_dst_y - $text_height + $this->image_text_y;
-                            } else {
-                                $text_y = $this->image_text_y;
-                            }
-                        } else {
-                            if (strpos($this->image_text_position, 'b') !== false) {
-                                $text_y = $this->image_dst_y - $text_height;
-                            } else if (strpos($this->image_text_position, 't') !== false) {
-                                $text_y = 0;
-                            } else {
-                                $text_y = ($this->image_dst_y - $text_height) / 2;
-                            }
-                        }
-
-                        // add a background, maybe transparent
-                        if (!empty($this->image_text_background)) {
-                            list($red, $green, $blue) = $this->getcolors($this->image_text_background);
-                            if ($gd_version >= 2 && (is_numeric($this->image_text_background_opacity)) && $this->image_text_background_opacity >= 0 && $this->image_text_background_opacity <= 100) {
-                                $filter = imagecreatetruecolor($text_width, $text_height);
-                                $background_color = imagecolorallocate($filter, $red, $green, $blue);
-                                imagefilledrectangle($filter, 0, 0, $text_width, $text_height, $background_color);
-                                $this->imagecopymergealpha($image_dst, $filter, $text_x, $text_y, 0, 0, $text_width, $text_height, $this->image_text_background_opacity);
-                                imagedestroy($filter);
-                            } else {
-                                $background_color = imagecolorallocate($image_dst ,$red, $green, $blue);
-                                imagefilledrectangle($image_dst, $text_x, $text_y, $text_x + $text_width, $text_y + $text_height, $background_color);
-                            }
-                        }
-
-                        $text_x += $this->image_text_padding_x;
-                        $text_y += $this->image_text_padding_y;
-                        $t_width = $text_width - (2 * $this->image_text_padding_x);
-                        $t_height = $text_height - (2 * $this->image_text_padding_y);
-                        list($red, $green, $blue) = $this->getcolors($this->image_text_color);
-
-                        // add the text, maybe transparent
-                        if ($gd_version >= 2 && (is_numeric($this->image_text_opacity)) && $this->image_text_opacity >= 0 && $this->image_text_opacity <= 100) {
-                            if ($t_width < 0) $t_width = 0;
-                            if ($t_height < 0) $t_height = 0;
-                            $filter = $this->imagecreatenew($t_width, $t_height, false, true);
-                            $text_color = imagecolorallocate($filter ,$red, $green, $blue);
-
-                            if ($font_type == 'gd') {
-                                foreach ($text as $k => $v) {
-                                    if ($this->image_text_direction == 'v') {
-                                        imagestringup($filter,
-                                                      $this->image_text_font,
-                                                      $k * ($line_width  + ($k > 0 && $k < (sizeof($text)) ? $this->image_text_line_spacing : 0)),
-                                                      $text_height - (2 * $this->image_text_padding_y) - ($this->image_text_alignment == 'l' ? 0 : (($t_height - strlen($v) * $char_width) / ($this->image_text_alignment == 'r' ? 1 : 2))) ,
-                                                      $v,
-                                                      $text_color);
-                                    } else {
-                                        imagestring($filter,
-                                                    $this->image_text_font,
-                                                    ($this->image_text_alignment == 'l' ? 0 : (($t_width - strlen($v) * $char_width) / ($this->image_text_alignment == 'r' ? 1 : 2))),
-                                                    $k * ($line_height  + ($k > 0 && $k < (sizeof($text)) ? $this->image_text_line_spacing : 0)),
-                                                    $v,
-                                                    $text_color);
-                                    }
-                                }
-                            } else if ($font_type == 'tt') {
-                                imagettftext($filter,
-                                             $this->image_text_size,
-                                             $this->image_text_angle,
-                                             $text_offset_x,
-                                             $text_offset_y,
-                                             $text_color,
-                                             $this->image_text_font,
-                                             $text);
-                            }
-                            $this->imagecopymergealpha($image_dst, $filter, $text_x, $text_y, 0, 0, $t_width, $t_height, $this->image_text_opacity);
-                            imagedestroy($filter);
-
-                        } else {
-                            $text_color = imagecolorallocate($image_dst ,$red, $green, $blue);
-                            if ($font_type == 'gd') {
-                                foreach ($text as $k => $v) {
-                                    if ($this->image_text_direction == 'v') {
-                                        imagestringup($image_dst,
-                                                      $this->image_text_font,
-                                                      $text_x + $k * ($line_width  + ($k > 0 && $k < (sizeof($text)) ? $this->image_text_line_spacing : 0)),
-                                                      $text_y + $text_height - (2 * $this->image_text_padding_y) - ($this->image_text_alignment == 'l' ? 0 : (($t_height - strlen($v) * $char_width) / ($this->image_text_alignment == 'r' ? 1 : 2))),
-                                                      $v,
-                                                      $text_color);
-                                    } else {
-                                        imagestring($image_dst,
-                                                    $this->image_text_font,
-                                                    $text_x + ($this->image_text_alignment == 'l' ? 0 : (($t_width - strlen($v) * $char_width) / ($this->image_text_alignment == 'r' ? 1 : 2))),
-                                                    $text_y + $k * ($line_height  + ($k > 0 && $k < (sizeof($text)) ? $this->image_text_line_spacing : 0)),
-                                                    $v,
-                                                    $text_color);
-                                    }
-                                }
-                            } else if ($font_type == 'tt') {
-                                imagettftext($image_dst,
-                                             $this->image_text_size,
-                                             $this->image_text_angle,
-                                             $text_offset_x + ($this->image_dst_x / 2) - ($text_width / 2) + $this->image_text_padding_x,
-                                             $text_offset_y + ($this->image_dst_y / 2) - ($text_height / 2) + $this->image_text_padding_y,
-                                             $text_color,
-                                             $this->image_text_font,
-                                             $text);
-                            }
-                        }
-                    }
-
-                    // add a reflection
-                    if ($this->image_reflection_height) {
-                        $this->log .= '- add reflection : ' . $this->image_reflection_height . '<br />';
-                        // we decode image_reflection_height, which can be a integer, a string in pixels or percentage
-                        $image_reflection_height = $this->image_reflection_height;
-                        if (strpos($image_reflection_height, '%')>0) $image_reflection_height = $this->image_dst_y * ((int) str_replace('%','',$image_reflection_height) / 100);
-                        if (strpos($image_reflection_height, 'px')>0) $image_reflection_height = (int) str_replace('px','',$image_reflection_height);
-                        $image_reflection_height = (int) $image_reflection_height;
-                        if ($image_reflection_height > $this->image_dst_y) $image_reflection_height = $this->image_dst_y;
-                        if (empty($this->image_reflection_opacity)) $this->image_reflection_opacity = 60;
-                        // create the new destination image
-                        $tmp = $this->imagecreatenew($this->image_dst_x, $this->image_dst_y + $image_reflection_height + $this->image_reflection_space, true);
-                        $transparency = $this->image_reflection_opacity;
-
-                        // copy the original image
-                        imagecopy($tmp, $image_dst, 0, 0, 0, 0, $this->image_dst_x, $this->image_dst_y + ($this->image_reflection_space < 0 ? $this->image_reflection_space : 0));
-
-                        // we have to make sure the extra bit is the right color, or transparent
-                        if ($image_reflection_height + $this->image_reflection_space > 0) {
-                            // use the background color if present
-                            if (!empty($this->image_background_color)) {
-                                list($red, $green, $blue) = $this->getcolors($this->image_background_color);
-                                $fill = imagecolorallocate($tmp, $red, $green, $blue);
-                            } else {
-                                $fill = imagecolorallocatealpha($tmp, 0, 0, 0, 127);
-                            }
-                            // fill in from the edge of the extra bit
-                            imagefill($tmp, round($this->image_dst_x / 2), $this->image_dst_y + $image_reflection_height + $this->image_reflection_space - 1, $fill);
-                        }
-
-                        // copy the reflection
-                        for ($y = 0; $y < $image_reflection_height; $y++) {
-                            for ($x = 0; $x < $this->image_dst_x; $x++) {
-                                $pixel_b = imagecolorsforindex($tmp, imagecolorat($tmp, $x, $y + $this->image_dst_y + $this->image_reflection_space));
-                                $pixel_o = imagecolorsforindex($image_dst, imagecolorat($image_dst, $x, $this->image_dst_y - $y - 1 + ($this->image_reflection_space < 0 ? $this->image_reflection_space : 0)));
-                                $alpha_o = 1 - ($pixel_o['alpha'] / 127);
-                                $alpha_b = 1 - ($pixel_b['alpha'] / 127);
-                                $opacity = $alpha_o * $transparency / 100;
-                                if ($opacity > 0) {
-                                    $red   = round((($pixel_o['red']   * $opacity) + ($pixel_b['red']  ) * $alpha_b) / ($alpha_b + $opacity));
-                                    $green = round((($pixel_o['green'] * $opacity) + ($pixel_b['green']) * $alpha_b) / ($alpha_b + $opacity));
-                                    $blue  = round((($pixel_o['blue']  * $opacity) + ($pixel_b['blue'] ) * $alpha_b) / ($alpha_b + $opacity));
-                                    $alpha = ($opacity + $alpha_b);
-                                    if ($alpha > 1) $alpha = 1;
-                                    $alpha =  round((1 - $alpha) * 127);
-                                    $color = imagecolorallocatealpha($tmp, $red, $green, $blue, $alpha);
-                                    imagesetpixel($tmp, $x, $y + $this->image_dst_y + $this->image_reflection_space, $color);
-                                }
-                            }
-                            if ($transparency > 0) $transparency = $transparency - ($this->image_reflection_opacity / $image_reflection_height);
-                        }
-
-                        // copy the resulting image into the destination image
-                        $this->image_dst_y = $this->image_dst_y + $image_reflection_height + $this->image_reflection_space;
-                        $image_dst = $this->imagetransfer($tmp, $image_dst);
-                    }
-
-                    // change opacity
-                    if ($gd_version >= 2 && is_numeric($this->image_opacity) && $this->image_opacity < 100) {
-                        $this->log .= '- change opacity<br />';
-                        // create the new destination image
-                        $tmp = $this->imagecreatenew($this->image_dst_x, $this->image_dst_y, true);
-                        for($y=0; $y < $this->image_dst_y; $y++) {
-                            for($x=0; $x < $this->image_dst_x; $x++) {
-                                $pixel = imagecolorsforindex($image_dst, imagecolorat($image_dst, $x, $y));
-                                $alpha = $pixel['alpha'] + round((127 - $pixel['alpha']) * (100 - $this->image_opacity) / 100);
-                                if ($alpha > 127) $alpha = 127;
-                                if ($alpha > 0) {
-                                    $color = imagecolorallocatealpha($tmp, $pixel['red'] , $pixel['green'], $pixel['blue'], $alpha);
-                                    imagesetpixel($tmp, $x, $y, $color);
-                                }
-                            }
-                        }
-                        // copy the resulting image into the destination image
-                        $image_dst = $this->imagetransfer($tmp, $image_dst);
-                    }
-
-                    // reduce the JPEG image to a set desired size
-                    if (is_numeric($this->jpeg_size) && $this->jpeg_size > 0 && ($this->image_convert == 'jpeg' || $this->image_convert == 'jpg')) {
-                        // inspired by: JPEGReducer class version 1, 25 November 2004, Author: Huda M ElMatsani, justhuda at netscape dot net
-                        $this->log .= '- JPEG desired file size : ' . $this->jpeg_size . '<br />';
-                        // calculate size of each image. 75%, 50%, and 25% quality
-                        ob_start(); imagejpeg($image_dst,null,75);  $buffer = ob_get_contents(); ob_end_clean();
-                        $size75 = strlen($buffer);
-                        ob_start(); imagejpeg($image_dst,null,50);  $buffer = ob_get_contents(); ob_end_clean();
-                        $size50 = strlen($buffer);
-                        ob_start(); imagejpeg($image_dst,null,25);  $buffer = ob_get_contents(); ob_end_clean();
-                        $size25 = strlen($buffer);
-
-                        // make sure we won't divide by 0
-                        if ($size50 == $size25) $size50++;
-                        if ($size75 == $size50 || $size75 == $size25) $size75++;
-
-                        // calculate gradient of size reduction by quality
-                        $mgrad1 = 25 / ($size50-$size25);
-                        $mgrad2 = 25 / ($size75-$size50);
-                        $mgrad3 = 50 / ($size75-$size25);
-                        $mgrad  = ($mgrad1 + $mgrad2 + $mgrad3) / 3;
-                        // result of approx. quality factor for expected size
-                        $q_factor = round($mgrad * ($this->jpeg_size - $size50) + 50);
-
-                        if ($q_factor<1) {
-                            $this->jpeg_quality=1;
-                        } elseif ($q_factor>100) {
-                            $this->jpeg_quality=100;
-                        } else {
-                            $this->jpeg_quality=$q_factor;
-                        }
-                        $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;JPEG quality factor set to ' . $this->jpeg_quality . '<br />';
-                    }
-
-                    // converts image from true color, and fix transparency if needed
-                    $this->log .= '- converting...<br />';
-                    $this->image_dst_type = $this->image_convert;
-                    switch($this->image_convert) {
-                        case 'gif':
-                            // if the image is true color, we convert it to a palette
-                            if (imageistruecolor($image_dst)) {
-                                $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;true color to palette<br />';
-                                // creates a black and white mask
-                                $mask = array(array());
-                                for ($x = 0; $x < $this->image_dst_x; $x++) {
-                                    for ($y = 0; $y < $this->image_dst_y; $y++) {
-                                        $pixel = imagecolorsforindex($image_dst, imagecolorat($image_dst, $x, $y));
-                                        $mask[$x][$y] = $pixel['alpha'];
-                                    }
-                                }
-                                list($red, $green, $blue) = $this->getcolors($this->image_default_color);
-                                // first, we merge the image with the background color, so we know which colors we will have
-                                for ($x = 0; $x < $this->image_dst_x; $x++) {
-                                    for ($y = 0; $y < $this->image_dst_y; $y++) {
-                                        if ($mask[$x][$y] > 0){
-                                            // we have some transparency. we combine the color with the default color
-                                            $pixel = imagecolorsforindex($image_dst, imagecolorat($image_dst, $x, $y));
-                                            $alpha = ($mask[$x][$y] / 127);
-                                            $pixel['red'] = round(($pixel['red'] * (1 -$alpha) + $red * ($alpha)));
-                                            $pixel['green'] = round(($pixel['green'] * (1 -$alpha) + $green * ($alpha)));
-                                            $pixel['blue'] = round(($pixel['blue'] * (1 -$alpha) + $blue * ($alpha)));
-                                            $color = imagecolorallocate($image_dst, $pixel['red'], $pixel['green'], $pixel['blue']);
-                                            imagesetpixel($image_dst, $x, $y, $color);
-                                        }
-                                    }
-                                }
-                                // transforms the true color image into palette, with its merged default color
-                                if (empty($this->image_background_color)) {
-                                    imagetruecolortopalette($image_dst, true, 255);
-                                    $transparency = imagecolorallocate($image_dst, 254, 1, 253);
-                                    imagecolortransparent($image_dst, $transparency);
-                                    // make the transparent areas transparent
-                                    for ($x = 0; $x < $this->image_dst_x; $x++) {
-                                        for ($y = 0; $y < $this->image_dst_y; $y++) {
-                                            // we test wether we have enough opacity to justify keeping the color
-                                            if ($mask[$x][$y] > 120) imagesetpixel($image_dst, $x, $y, $transparency);
-                                        }
-                                    }
-                                }
-                                unset($mask);
-                            }
-                            break;
-                        case 'jpg':
-                        case 'bmp':
-                            // if the image doesn't support any transparency, then we merge it with the default color
-                            $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;fills in transparency with default color<br />';
-                            list($red, $green, $blue) = $this->getcolors($this->image_default_color);
-                            $transparency = imagecolorallocate($image_dst, $red, $green, $blue);
-                            // make the transaparent areas transparent
-                            for ($x = 0; $x < $this->image_dst_x; $x++) {
-                                for ($y = 0; $y < $this->image_dst_y; $y++) {
-                                    // we test wether we have some transparency, in which case we will merge the colors
-                                    if (imageistruecolor($image_dst)) {
-                                        $rgba = imagecolorat($image_dst, $x, $y);
-                                        $pixel = array('red' => ($rgba >> 16) & 0xFF,
-                                                       'green' => ($rgba >> 8) & 0xFF,
-                                                       'blue' => $rgba & 0xFF,
-                                                       'alpha' => ($rgba & 0x7F000000) >> 24);
-                                    } else {
-                                        $pixel = imagecolorsforindex($image_dst, imagecolorat($image_dst, $x, $y));
-                                    }
-                                    if ($pixel['alpha'] == 127) {
-                                        // we have full transparency. we make the pixel transparent
-                                        imagesetpixel($image_dst, $x, $y, $transparency);
-                                    } else if ($pixel['alpha'] > 0) {
-                                        // we have some transparency. we combine the color with the default color
-                                        $alpha = ($pixel['alpha'] / 127);
-                                        $pixel['red'] = round(($pixel['red'] * (1 -$alpha) + $red * ($alpha)));
-                                        $pixel['green'] = round(($pixel['green'] * (1 -$alpha) + $green * ($alpha)));
-                                        $pixel['blue'] = round(($pixel['blue'] * (1 -$alpha) + $blue * ($alpha)));
-                                        $color = imagecolorclosest($image_dst, $pixel['red'], $pixel['green'], $pixel['blue']);
-                                        imagesetpixel($image_dst, $x, $y, $color);
-                                    }
-                                }
-                            }
-
-                            break;
-                        default:
-                            break;
-                    }
-
-                    // interlace options
-                    if($this->image_interlace) imageinterlace($image_dst, true);
-
-                    // outputs image
-                    $this->log .= '- saving image...<br />';
-                    switch($this->image_convert) {
-                        case 'jpeg':
-                        case 'jpg':
-                            if (!$return_mode) {
-                                $result = @imagejpeg($image_dst, $this->file_dst_pathname, $this->jpeg_quality);
-                            } else {
-                                ob_start();
-                                $result = @imagejpeg($image_dst, null, $this->jpeg_quality);
-                                $return_content = ob_get_contents();
-                                ob_end_clean();
-                            }
-                            if (!$result) {
-                                $this->processed = false;
-                                $this->error = $this->translate('file_create', array('JPEG'));
-                            } else {
-                                $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;JPEG image created<br />';
-                            }
-                            break;
-                        case 'png':
-                            imagealphablending( $image_dst, false );
-                            imagesavealpha( $image_dst, true );
-                            if (!$return_mode) {
-                                if (is_numeric($this->png_compression) && version_compare(PHP_VERSION, '5.1.2') >= 0) {
-                                    $result = @imagepng($image_dst, $this->file_dst_pathname, $this->png_compression);
-                                } else {
-                                    $result = @imagepng($image_dst, $this->file_dst_pathname);
-                                }
-                            } else {
-                                ob_start();
-                                if (is_numeric($this->png_compression) && version_compare(PHP_VERSION, '5.1.2') >= 0) {
-                                    $result = @imagepng($image_dst, null, $this->png_compression);
-                                } else {
-                                    $result = @imagepng($image_dst);
-                                }
-                                $return_content = ob_get_contents();
-                                ob_end_clean();
-                            }
-                            if (!$result) {
-                                $this->processed = false;
-                                $this->error = $this->translate('file_create', array('PNG'));
-                            } else {
-                                $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;PNG image created<br />';
-                            }
-                            break;
-                        case 'gif':
-                            if (!$return_mode) {
-                                $result = @imagegif($image_dst, $this->file_dst_pathname);
-                            } else {
-                                ob_start();
-                                $result = @imagegif($image_dst);
-                                $return_content = ob_get_contents();
-                                ob_end_clean();
-                            }
-                            if (!$result) {
-                                $this->processed = false;
-                                $this->error = $this->translate('file_create', array('GIF'));
-                            } else {
-                                $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;GIF image created<br />';
-                            }
-                            break;
-                        case 'bmp':
-                            if (!$return_mode) {
-                                $result = $this->imagebmp($image_dst, $this->file_dst_pathname);
-                            } else {
-                                ob_start();
-                                $result = $this->imagebmp($image_dst);
-                                $return_content = ob_get_contents();
-                                ob_end_clean();
-                            }
-                            if (!$result) {
-                                $this->processed = false;
-                                $this->error = $this->translate('file_create', array('BMP'));
-                            } else {
-                                $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;BMP image created<br />';
-                            }
-                            break;
-
-                        default:
-                            $this->processed = false;
-                            $this->error = $this->translate('no_conversion_type');
-                    }
-                    if ($this->processed) {
-                        if (is_resource($image_src)) imagedestroy($image_src);
-                        if (is_resource($image_dst)) imagedestroy($image_dst);
-                        $this->log .= '&nbsp;&nbsp;&nbsp;&nbsp;image objects destroyed<br />';
-                    }
-                }
-
-            } else {
-                $this->log .= '- no image processing wanted<br />';
-
-                if (!$return_mode) {
-                    // copy the file to its final destination. we don't use move_uploaded_file here
-                    // if we happen to have open_basedir restrictions, it is a temp file that we copy, not the original uploaded file
-                    if (!copy($this->file_src_pathname, $this->file_dst_pathname)) {
-                        $this->processed = false;
-                        $this->error = $this->translate('copy_failed');
-                    }
-                } else {
-                    // returns the file, so that its content can be received by the caller
-                    $return_content = @file_get_contents($this->file_src_pathname);
-                    if ($return_content === false) {
-                        $this->processed = false;
-                        $this->error = $this->translate('reading_failed');
-                    }
-                }
-            }
-        }
-
-        if ($this->processed) {
-            $this->log .= '- <b>process OK</b><br />';
-        } else {
-            $this->log .= '- <b>error</b>: ' . $this->error . '<br />';
-        }
-
-        // we reinit all the vars
-        $this->init();
-
-        // we may return the image content
-        if ($return_mode) return $return_content;
-
-    }
-
-    /**
-     * Deletes the uploaded file from its temporary location
-     *
-     * When PHP uploads a file, it stores it in a temporary location.
-     * When you {@link process} the file, you actually copy the resulting file to the given location, it doesn't alter the original file.
-     * Once you have processed the file as many times as you wanted, you can delete the uploaded file.
-     * If there is open_basedir restrictions, the uploaded file is in fact a temporary file
-     *
-     * You might want not to use this function if you work on local files, as it will delete the source file
-     *
-     * @access public
-     */
-    function clean() {
-        $this->log .= '<b>cleanup</b><br />';
-        $this->log .= '- delete temp file '  . $this->file_src_pathname . '<br />';
-        @unlink($this->file_src_pathname);
-    }
-
-
-    /**
-     * Opens a BMP image
-     *
-     * This function has been written by DHKold, and is used with permission of the author
-     *
-     * @access public
-     */
-    function imagecreatefrombmp($filename) {
-        if (! $f1 = fopen($filename,"rb")) return false;
-
-        $file = unpack("vfile_type/Vfile_size/Vreserved/Vbitmap_offset", fread($f1,14));
-        if ($file['file_type'] != 19778) return false;
-
-        $bmp = unpack('Vheader_size/Vwidth/Vheight/vplanes/vbits_per_pixel'.
-                      '/Vcompression/Vsize_bitmap/Vhoriz_resolution'.
-                      '/Vvert_resolution/Vcolors_used/Vcolors_important', fread($f1,40));
-        $bmp['colors'] = pow(2,$bmp['bits_per_pixel']);
-        if ($bmp['size_bitmap'] == 0) $bmp['size_bitmap'] = $file['file_size'] - $file['bitmap_offset'];
-        $bmp['bytes_per_pixel'] = $bmp['bits_per_pixel']/8;
-        $bmp['bytes_per_pixel2'] = ceil($bmp['bytes_per_pixel']);
-        $bmp['decal'] = ($bmp['width']*$bmp['bytes_per_pixel']/4);
-        $bmp['decal'] -= floor($bmp['width']*$bmp['bytes_per_pixel']/4);
-        $bmp['decal'] = 4-(4*$bmp['decal']);
-        if ($bmp['decal'] == 4) $bmp['decal'] = 0;
-
-        $palette = array();
-        if ($bmp['colors'] < 16777216) {
-            $palette = unpack('V'.$bmp['colors'], fread($f1,$bmp['colors']*4));
-        }
-
-        $im = fread($f1,$bmp['size_bitmap']);
-        $vide = chr(0);
-
-        $res = imagecreatetruecolor($bmp['width'],$bmp['height']);
-        $P = 0;
-        $Y = $bmp['height']-1;
-        while ($Y >= 0) {
-            $X=0;
-            while ($X < $bmp['width']) {
-                if ($bmp['bits_per_pixel'] == 24)
-                    $color = unpack("V",substr($im,$P,3).$vide);
-                elseif ($bmp['bits_per_pixel'] == 16) {
-                    $color = unpack("n",substr($im,$P,2));
-                    $color[1] = $palette[$color[1]+1];
-                } elseif ($bmp['bits_per_pixel'] == 8) {
-                    $color = unpack("n",$vide.substr($im,$P,1));
-                    $color[1] = $palette[$color[1]+1];
-                } elseif ($bmp['bits_per_pixel'] == 4) {
-                    $color = unpack("n",$vide.substr($im,floor($P),1));
-                    if (($P*2)%2 == 0) $color[1] = ($color[1] >> 4) ; else $color[1] = ($color[1] & 0x0F);
-                    $color[1] = $palette[$color[1]+1];
-                } elseif ($bmp['bits_per_pixel'] == 1)  {
-                    $color = unpack("n",$vide.substr($im,floor($P),1));
-                    if     (($P*8)%8 == 0) $color[1] =  $color[1]        >>7;
-                    elseif (($P*8)%8 == 1) $color[1] = ($color[1] & 0x40)>>6;
-                    elseif (($P*8)%8 == 2) $color[1] = ($color[1] & 0x20)>>5;
-                    elseif (($P*8)%8 == 3) $color[1] = ($color[1] & 0x10)>>4;
-                    elseif (($P*8)%8 == 4) $color[1] = ($color[1] & 0x8)>>3;
-                    elseif (($P*8)%8 == 5) $color[1] = ($color[1] & 0x4)>>2;
-                    elseif (($P*8)%8 == 6) $color[1] = ($color[1] & 0x2)>>1;
-                    elseif (($P*8)%8 == 7) $color[1] = ($color[1] & 0x1);
-                    $color[1] = $palette[$color[1]+1];
-                } else
-                    return false;
-                imagesetpixel($res,$X,$Y,$color[1]);
-                $X++;
-                $P += $bmp['bytes_per_pixel'];
-            }
-            $Y--;
-            $P+=$bmp['decal'];
-        }
-        fclose($f1);
-        return $res;
-    }
-
-    /**
-     * Saves a BMP image
-     *
-     * This function has been published on the PHP website, and can be used freely
-     *
-     * @access public
-     */
-    function imagebmp(&$im, $filename = "") {
-
-        if (!$im) return false;
-        $w = imagesx($im);
-        $h = imagesy($im);
-        $result = '';
-
-        // if the image is not true color, we convert it first
-        if (!imageistruecolor($im)) {
-            $tmp = imagecreatetruecolor($w, $h);
-            imagecopy($tmp, $im, 0, 0, 0, 0, $w, $h);
-            imagedestroy($im);
-            $im = & $tmp;
-        }
-
-        $biBPLine = $w * 3;
-        $biStride = ($biBPLine + 3) & ~3;
-        $biSizeImage = $biStride * $h;
-        $bfOffBits = 54;
-        $bfSize = $bfOffBits + $biSizeImage;
-
-        $result .= substr('BM', 0, 2);
-        $result .=  pack ('VvvV', $bfSize, 0, 0, $bfOffBits);
-        $result .= pack ('VVVvvVVVVVV', 40, $w, $h, 1, 24, 0, $biSizeImage, 0, 0, 0, 0);
-
-        $numpad = $biStride - $biBPLine;
-        for ($y = $h - 1; $y >= 0; --$y) {
-            for ($x = 0; $x < $w; ++$x) {
-                $col = imagecolorat ($im, $x, $y);
-                $result .=  substr(pack ('V', $col), 0, 3);
-            }
-            for ($i = 0; $i < $numpad; ++$i)
-                $result .= pack ('C', 0);
-        }
-
-        if($filename==""){
-            echo $result;
-        } else {
-            $file = fopen($filename, "wb");
-            fwrite($file, $result);
-            fclose($file);
-        }
-        return true;
-    }
-}
-
-?>
diff --git a/crossdomain/libs/function.php b/crossdomain/libs/function.php
deleted file mode 100644
index 89734f1..0000000
--- a/crossdomain/libs/function.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-require __DIR__.'/../config.php';
-
-// 判断GIF图片是否为动态
-function isAnimatedGif($filename) {
-    $fp = fopen($filename, 'rb');
-    $filecontent = fread($fp, filesize($filename));
-    fclose($fp);
-    return strpos($filecontent, chr(0x21) . chr(0xff) . chr(0x0b) . 'NETSCAPE2.0') === FALSE ? 0 : 1;
-}
-
-// 校验登录
-function checkLogin() {
-    global $config;
-    if (!empty( $_POST['password'] ) ) {
-        if ( $_POST['password'] == $config['password'] ) {
-            $psw = $_POST['password'];
-            setcookie('admin',$psw);
-            echo '<code>登录成功</code>';
-        }else{
-            echo '<code>密码错误</code>';
-            exit( include __DIR__ . '/login.php' );
-        }
-    } elseif (!empty( $_COOKIE['admin'] ) ) {
-        if ( $_COOKIE['admin'] == $config['password'] ) {
-
-        }
-    } else {
-        echo '<code>请登录</code>';
-        header('loction:login.php');
-        exit(include __DIR__.'/login.php');
-    }
-}
-
- // 仅允许登录后上传
- function mustLogin(){
-    global $config;
-    if ($config['mustLogin']){
-        checkLogin();
-    }
-}
-
-// 检查配置文件中目录是否存在是否可写
-function config_path(){
-    global $config;
-    $real_path = APP_ROOT.$config['path'];
-    if(!is_dir($real_path)){
-        mkdir($real_path,0777,true);
-    }elseif(!is_writable($real_path)){
-        chmod($real_path,0777);
-    }
-    //创建年目录
-    $real_path = $config['path'].date('Y');
-    if(!is_dir($real_path)){
-        mkdir($real_path,0777);
-    }elseif(!is_writable($real_path)){
-        chmod($real_path,0777);
-    }
-    // 创建月目录
-    $real_path = $real_path.'/'.date('m');
-    if(!is_dir($real_path)){
-        mkdir($real_path,0777);
-    }elseif(!is_writable($real_path)){
-        chmod($real_path,0777);
-    }
-    return $real_path.'/';
-}
-
- // 设置广告
- function showAD($where) {
-    global $config;
-    switch ($where){
-        case 'top':
-            if ($config['ad_top']){
-                include (APP_ROOT.'/public/static/ad_top.html');
-            }
-            break;
-        case 'bot':
-            if ($config['ad_bot']){
-                include (APP_ROOT.'/public/static/ad_bot.html');
-            }
-            break;
-        default:
-            echo '广告函数出错';
-            break;
-    }
-}
-
-// 设置一键CDN
-function static_cdn(){
-    global $config;
-    if ($config['static_cdn']){
-        // 开启CDN
-        return '
-        <link href="https://cdn.bootcss.com/zui/1.8.1/css/zui.min.css" rel="stylesheet">
-        <link href="https://cdn.bootcss.com/zui/1.8.1/lib/uploader/zui.uploader.min.css" rel="stylesheet">
-        
-        <script src="https://cdn.bootcss.com/jquery/3.3.1/jquery.min.js?v3.3.1"></script>
-        <script src="https://cdn.bootcss.com/zui/1.8.1/js/zui.min.js?v1.8.1"></script>
-        <script src="https://cdn.bootcss.com/zui/1.8.1/lib/uploader/zui.uploader.min.js?v1.8.1"></script>
-        <script type="text/javascript" src="https://cdn.jsdelivr.net/gh/icret/easyImages@1.5.3/static/qrcode.min.js?v1"></script>
-        ';
-
-    }else{
-        // 本地文件
-        return '
-         <link href="../public/static/zui/css/zui.min.css?v1.8.1" rel="stylesheet">
-        <link href="../public/static/zui/lib/uploader/zui.uploader.min.css?v1.8.1" rel="stylesheet">
-        
-        <script src="../public/static/jquery.min.js?v3.3.1"></script>
-        <script src="../public/static/zui/js/zui.min.js?v1.8.1"></script>
-        <script src="../public/static/zui/lib/uploader/zui.uploader.min.js?v1.8.1"></script>
-        <script src="../public/static/qrcode.min.js?v1.0"></script>
-        ';
-    }
-}
-
-// 开启管理
-function tinyfilemanager(){
-    global $config;
-    if(!$config['tinyfilemanager']){
-        header('Location: '.$config['domain'].'?not_open_manager');
-        exit;
-    }
-}
-
-// 异域上传
-function crossdomain(){
-    global $config;
-    if($config['crossdomain']){
-        return $config['CDomains'];
-    }
-}
-
-$qqgroup = ' <a target="_blank" href="//shang.qq.com/wpa/qunwpa?idkey=3feb4e8be8f1839f71e53bf2e876de36afc6889b2630c33c877d8df5a5583a6f"><img border="0" src="//pub.idqqimg.com/wpa/images/group.png" alt="EasyImage 简单图床" title="EasyImage 简单图床"></a>';
\ No newline at end of file
diff --git a/crossdomain/libs/imgcompress.php b/crossdomain/libs/imgcompress.php
deleted file mode 100644
index 6aa9cbc..0000000
--- a/crossdomain/libs/imgcompress.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
- 
-/**
- * 压缩类
- * 分享请保持网址。尊重别人劳动成果。谢谢。
- * 图片压缩类：通过缩放来压缩。如果要保持源图比例，把参数$percent保持为1即可。
- * 即使原比例压缩，也可大幅度缩小。数码相机4M图片。也可以缩为700KB左右。如果缩小比例，则体积会更小。
- * 结果：可保存、可直接显示。
- */
-class imgcompress{
- 
-       private $src;
-       private $image;
-       private $imageinfo;
-       private $percent = 0.5;
-       /**
-        * 图片压缩
-        * @param $src 源图
-        * @param float $percent  压缩比例
-        */
-       public function __construct($src, $percent=1)
-       {
-              $this->src = $src;
-              $this->percent = $percent;
-       }
- 
- 
-       /** 高清压缩图片
-        * @param string $saveName  提供图片名（可不带扩展名，用源图扩展名）用于保存。或不提供文件名直接显示
-        */
-       public function compressImg($saveName='')
-       {
-              $this->_openImage();
-              if(!empty($saveName)) $this->_saveImage($saveName);  //保存
-              else $this->_showImage();
-       }
- 
-       /**
-        * 内部：打开图片
-        */
-       private function _openImage()
-       {
-              list($width, $height, $type, $attr) = getimagesize($this->src);
-              $this->imageinfo = array(
-                     'width'=>$width,
-                     'height'=>$height,
-                     'type'=>image_type_to_extension($type,false),
-                     'attr'=>$attr
-              );
-              $fun = "imagecreatefrom".$this->imageinfo['type'];
-              $this->image = $fun($this->src);
-              $this->_thumpImage();
-       }
-       /**
-        * 内部：操作图片
-        */
-       private function _thumpImage()
-       {
-              $new_width = $this->imageinfo['width'] * $this->percent;
-              $new_height = $this->imageinfo['height'] * $this->percent;
-              $image_thump = imagecreatetruecolor($new_width,$new_height);
-              //将原图复制带图片载体上面，并且按照一定比例压缩,极大的保持了清晰度
-              imagecopyresampled($image_thump,$this->image,0,0,0,0,$new_width,$new_height,$this->imageinfo['width'],$this->imageinfo['height']);
-              imagedestroy($this->image);
-              $this->image = $image_thump;
-       }
-       /**
-        * 输出图片:保存图片则用saveImage()
-        */
-       private function _showImage()
-       {
-              header('Content-Type: image/'.$this->imageinfo['type']);
-              $funcs = "image".$this->imageinfo['type'];
-              $funcs($this->image);
-       }
-       /**
-        * 保存图片到硬盘：
-        * @param  string $dstImgName  1、可指定字符串不带后缀的名称，使用源图扩展名 。2、直接指定目标图片名带扩展名。
-        */
-       private function _saveImage($dstImgName)
-       {
-              if(empty($dstImgName)) return false;
-              $allowImgs = ['.jpg', '.jpeg', '.png', '.bmp', '.wbmp','.gif'];   //如果目标图片名有后缀就用目标图片扩展名 后缀，如果没有，则用源图的扩展名
-              $dstExt =  strrchr($dstImgName ,".");
-              $sourseExt = strrchr($this->src ,".");
-              if(!empty($dstExt)) $dstExt =strtolower($dstExt);
-              if(!empty($sourseExt)) $sourseExt =strtolower($sourseExt);
- 
-              //有指定目标名扩展名
-              if(!empty($dstExt) && in_array($dstExt,$allowImgs)){
-                     $dstName = $dstImgName;
-              }elseif(!empty($sourseExt) && in_array($sourseExt,$allowImgs)){
-                     $dstName = $dstImgName.$sourseExt;
-              }else{
-                     $dstName = $dstImgName.$this->imageinfo['type'];
-              }
-              $funcs = "image".$this->imageinfo['type'];
-              $funcs($this->image,$dstName);
-       }
- 
-       /**
-        * 销毁图片
-        */
-       public function __destruct(){
-              imagedestroy($this->image);
-       }
- 
-}
-
-/* 调用方法
-$source = '1.jpg; // 原图
-$dst_img = '2.jpg'; //可加存放路径
-$percent = 1;  #原图压缩，不缩放
-$image = (new imgcompress($source,$percent))->compressImg($dst_img);
-------------------------------------------------------------------------
-// 原压缩设置，其实就是提取了上面类中的精华
-
-       $file = __DIR__.config_path().$handle->file_dst_name;
-        $percent = $config['jpg_zip_php'];  //图片压缩比
-        list($width, $height) = getimagesize($file); //获取原图尺寸
-        //缩放尺寸
-        $newwidth = $width * $percent;
-        $newheight = $height * $percent;
-        $src_im = imagecreatefromjpeg($file);
-        $dst_im = imagecreatetruecolor($newwidth, $newheight);
-        imagecopyresized($dst_im, $src_im, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
-        imagejpeg($dst_im,$file); //输出压缩后的图片
-        imagedestroy($dst_im);
-        imagedestroy($src_im);
- */
\ No newline at end of file
diff --git a/crossdomain/libs/lang/class.upload.xx_XX.php b/crossdomain/libs/lang/class.upload.xx_XX.php
deleted file mode 100644
index cfc33f9..0000000
--- a/crossdomain/libs/lang/class.upload.xx_XX.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-// +------------------------------------------------------------------------+
-// | class.upload.xx_XX.php                                                 |
-// +------------------------------------------------------------------------+
-// | Copyright (c) xxxxxx 200x. All rights reserved.                        |
-// | Version       0.25                                                     |
-// | Last modified xx/xx/200x                                               |
-// | Email         xxx@xxx.xxx                                              |
-// | Web           http://www.xxxx.xxx                                      |
-// +------------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify   |
-// | it under the terms of the GNU General Public License version 2 as      |
-// | published by the Free Software Foundation.                             |
-// |                                                                        |
-// | This program is distributed in the hope that it will be useful,        |
-// | but WITHOUT ANY WARRANTY; without even the implied warranty of         |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          |
-// | GNU General Public License for more details.                           |
-// |                                                                        |
-// | You should have received a copy of the GNU General Public License      |
-// | along with this program; if not, write to the                          |
-// |   Free Software Foundation, Inc., 59 Temple Place, Suite 330,          |
-// |   Boston, MA 02111-1307 USA                                            |
-// |                                                                        |
-// | Please give credit on sites that use class.upload and submit changes   |
-// | of the script so other people can use them as well.                    |
-// | This script is free to use, don't abuse.                               |
-// +------------------------------------------------------------------------+
-
-/**
- * Class upload xxxxxx translation
- *
- * @version   0.28
- * @author    xxxxxxxx (xxx@xxx.xxx)
- * @license   http://opensource.org/licenses/gpl-license.php GNU Public License
- * @copyright xxxxxxxx
- * @package   cmf
- * @subpackage external
- */
-
-    $translation = array();
-    $translation['file_error']                  = 'File error. Please try again.';
-    $translation['local_file_missing']          = 'Local file doesn\'t exist.';
-    $translation['local_file_not_readable']     = 'Local file is not readable.';
-    $translation['uploaded_too_big_ini']        = 'File upload error (the uploaded file exceeds the upload_max_filesize directive in php.ini).';
-    $translation['uploaded_too_big_html']       = 'File upload error (the uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form).';
-    $translation['uploaded_partial']            = 'File upload error (the uploaded file was only partially uploaded).';
-    $translation['uploaded_missing']            = 'File upload error (no file was uploaded).';
-    $translation['uploaded_no_tmp_dir']         = 'File upload error (missing a temporary folder).';
-    $translation['uploaded_cant_write']         = 'File upload error (failed to write file to disk).';
-    $translation['uploaded_err_extension']      = 'File upload error (file upload stopped by extension).';
-    $translation['uploaded_unknown']            = 'File upload error (unknown error code).';
-    $translation['try_again']                   = 'File upload error. Please try again.';
-    $translation['file_too_big']                = 'File too big.';
-    $translation['no_mime']                     = 'MIME type can\'t be detected.';
-    $translation['incorrect_file']              = 'Incorrect type of file.';
-    $translation['image_too_wide']              = 'Image too wide.';
-    $translation['image_too_narrow']            = 'Image too narrow.';
-    $translation['image_too_high']              = 'Image too high.';
-    $translation['image_too_short']             = 'Image too short.';
-    $translation['ratio_too_high']              = 'Image ratio too high (image too wide).';
-    $translation['ratio_too_low']               = 'Image ratio too low (image too high).';
-    $translation['too_many_pixels']             = 'Image has too many pixels.';
-    $translation['not_enough_pixels']           = 'Image has not enough pixels.';
-    $translation['file_not_uploaded']           = 'File not uploaded. Can\'t carry on a process.';
-    $translation['already_exists']              = '%s already exists. Please change the file name.';
-    $translation['temp_file_missing']           = 'No correct temp source file. Can\'t carry on a process.';
-    $translation['source_missing']              = 'No correct uploaded source file. Can\'t carry on a process.';
-    $translation['destination_dir']             = 'Destination directory can\'t be created. Can\'t carry on a process.';
-    $translation['destination_dir_missing']     = 'Destination directory doesn\'t exist. Can\'t carry on a process.';
-    $translation['destination_path_not_dir']    = 'Destination path is not a directory. Can\'t carry on a process.';
-    $translation['destination_dir_write']       = 'Destination directory can\'t be made writeable. Can\'t carry on a process.';
-    $translation['destination_path_write']      = 'Destination path is not a writeable. Can\'t carry on a process.';
-    $translation['temp_file']                   = 'Can\'t create the temporary file. Can\'t carry on a process.';
-    $translation['source_not_readable']         = 'Source file is not readable. Can\'t carry on a process.';
-    $translation['no_create_support']           = 'No create from %s support.';
-    $translation['create_error']                = 'Error in creating %s image from source.';
-    $translation['source_invalid']              = 'Can\'t read image source. Not an image?.';
-    $translation['gd_missing']                  = 'GD doesn\'t seem to be present.';
-    $translation['watermark_no_create_support'] = 'No create from %s support, can\'t read watermark.';
-    $translation['watermark_create_error']      = 'No %s read support, can\'t create watermark.';
-    $translation['watermark_invalid']           = 'Unknown image format, can\'t read watermark.';
-    $translation['file_create']                 = 'No %s create support.';
-    $translation['no_conversion_type']          = 'No conversion type defined.';
-    $translation['copy_failed']                 = 'Error copying file on the server. copy() failed.';
-    $translation['reading_failed']              = 'Error reading the file.';
-
-?>
\ No newline at end of file
diff --git a/crossdomain/libs/lang/class.upload.zh_CN.gb-2312.php b/crossdomain/libs/lang/class.upload.zh_CN.gb-2312.php
deleted file mode 100644
index 4cb4b11..0000000
--- a/crossdomain/libs/lang/class.upload.zh_CN.gb-2312.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-// +------------------------------------------------------------------------+
-// | class.upload.zh_CN.php                                                 |
-// +------------------------------------------------------------------------+
-// | Copyright (c) caoshiwei 2008. All rights reserved.                     |
-// | Version       0.25                                                     |
-// | Last modified 09/29/2008                                               |
-// | Email         caoshiwei@gmail.com                                      |
-// | Web           http://www.hfut.edu.cn                                   |
-// +------------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify   |
-// | it under the terms of the GNU General Public License version 2 as      |
-// | published by the Free Software Foundation.                             |
-// |                                                                        |
-// | This program is distributed in the hope that it will be useful,        |
-// | but WITHOUT ANY WARRANTY; without even the implied warranty of         |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          |
-// | GNU General Public License for more details.                           |
-// |                                                                        |
-// | You should have received a copy of the GNU General Public License      |
-// | along with this program; if not, write to the                          |
-// |   Free Software Foundation, Inc., 59 Temple Place, Suite 330,          |
-// |   Boston, MA 02111-1307 USA                                            |
-// |                                                                        |
-// | Please give credit on sites that use class.upload and submit changes   |
-// | of the script so other people can use them as well.                    |
-// | This script is free to use, don't abuse.                               |
-// +------------------------------------------------------------------------+
-
-/**
- * Class upload Chinese translation
- *
- * @version   0.25
- * @codepage  gb-2312
- * @author    Shiwei Cao (caoshiwei@gmail.com)
- * @license   http://opensource.org/licenses/gpl-license.php GNU Public License
- * @copyright Shiwei Cao
- * @package   cmf
- * @subpackage external
- */
-
-    $translation = array();
-    $translation['file_error']                  = '�ļ������������ԡ�';
-    $translation['local_file_missing']          = '�����ļ������ڡ�';
-    $translation['local_file_not_readable']     = '�����ļ����ɶ��';
-    $translation['uploaded_too_big_ini']        = '�ļ��ϼ����� (�ϴ����ļ���С������php.ini��upload_max_filesize���õĴ�С)��';
-    $translation['uploaded_too_big_html']       = '�ļ��ϼ����� (�ϴ����ļ���С������HTML �����õĴ�С)��';
-    $translation['uploaded_partial']            = '�ļ��ϼ����� (�ϴ����ļ����ֶ�ʧ)��';
-    $translation['uploaded_missing']            = '�ļ��ϼ����� (�ϴ��ļ���ʧ)��';
-    $translation['uploaded_unknown']            = '�ļ��ϼ����� (δ֪����).';
-    $translation['try_again']                   = '�ļ��ϼ����� �����ԡ�';
-    $translation['file_too_big']                = '�ļ�̫����';
-    $translation['no_mime']                     = 'δ֪�ļ����͡�';
-    $translation['incorrect_file']              = '����ȷ���ļ���ʽ��';
-    $translation['image_too_wide']              = 'ͼƬ����̫����';
-    $translation['image_too_narrow']            = 'ͼƬ����̫С��';
-    $translation['image_too_high']              = 'ͼƬ�߶�̫����';
-    $translation['image_too_short']             = 'ͼƬ�߶�̫С��';
-    $translation['ratio_too_high']              = 'ͼƬ��/�߱���̫��(ͼƬ����̫��)��';
-    $translation['ratio_too_low']               = 'ͼƬ��/�߱���̫��(ͼƬ�߶�̫��).';
-    $translation['too_many_pixels']             = 'ͼƬλ��̫�ߡ�';
-    $translation['not_enough_pixels']           = 'ͼƬλ������';
-    $translation['file_not_uploaded']           = '�ļ�δ�ϴ������ܽ��д���';
-    $translation['already_exists']              = '%s �Ѿ����ڣ��������ļ�����';
-    $translation['temp_file_missing']           = '������(��ʱ)Դ�ļ�����ȷ�����ܽ��д���';
-    $translation['source_missing']              = '���ϴ����ļ���ʧ�����ܽ��д���';
-    $translation['destination_dir']             = 'Ŀ���ļ�Ŀ¼���ܱ����������ܽ��д���';
-    $translation['destination_dir_missing']     = 'Ŀ���ļ�Ŀ¼�����ڣ����ܽ��д���';
-    $translation['destination_path_not_dir']    = 'Ŀ¼·������һ����Ч��Ŀ¼�����ܽ��д���';
-    $translation['destination_dir_write']       = '������Ŀ���ļ�Ŀ¼����Ϊ��д�ģ����ܽ��д���';
-    $translation['destination_path_write']      = 'Ŀ¼·���Dz�����д�ģ����ܽ��д���';
-    $translation['temp_file']                   = '���ܴ�����ʱ�ļ������ܽ��д���';
-    $translation['source_not_readable']         = 'Դ�ļ������Զ�����ܽ��д���';
-    $translation['no_create_support']           = '%s ��֧�ִ���';
-    $translation['create_error']                = '��Դ�ļ����� %s ͼƬ�����г���';
-    $translation['source_invalid']              = '�޷���ȡԭʼͼƬ��ȷ���Dz�����ȷ��ͼƬ�ļ���';
-    $translation['gd_missing']                  = 'GD ���񲻿���ʹ�á�';
-    $translation['watermark_no_create_support'] = '%s ������֧��, ���ܶ�ȡˮӡ�ļ���';
-    $translation['watermark_create_error']      = '%s ��֧�ֶ�, ���ܴ���ˮӡ��';
-    $translation['watermark_invalid']           = 'δ֪�ļ���ʽ, �޷���ȡˮӡ�ļ���';
-    $translation['file_create']                 = '%s ��֧�ִ�����';
-    $translation['no_conversion_type']          = 'δ����ת������';
-    $translation['copy_failed']                 = '�ڷ������ϸ����ļ�ʱ���� copy() ����ʧ��.';
-    $translation['reading_failed']              = '��ȡ�����г���';
-
-?>
\ No newline at end of file
diff --git a/crossdomain/libs/lang/class.upload.zh_CN.php b/crossdomain/libs/lang/class.upload.zh_CN.php
deleted file mode 100644
index d7d70f7..0000000
--- a/crossdomain/libs/lang/class.upload.zh_CN.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-// +------------------------------------------------------------------------+
-// | class.upload.zh_CN.php                                                 |
-// +------------------------------------------------------------------------+
-// | Copyright (c) caoshiwei 2008. All rights reserved.                     |
-// | Version       0.25                                                     |
-// | Last modified 09/29/2008                                               |
-// | Email         caoshiwei@gmail.com                                      |
-// | Web           http://www.hfut.edu.cn                                   |
-// +------------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify   |
-// | it under the terms of the GNU General Public License version 2 as      |
-// | published by the Free Software Foundation.                             |
-// |                                                                        |
-// | This program is distributed in the hope that it will be useful,        |
-// | but WITHOUT ANY WARRANTY; without even the implied warranty of         |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          |
-// | GNU General Public License for more details.                           |
-// |                                                                        |
-// | You should have received a copy of the GNU General Public License      |
-// | along with this program; if not, write to the                          |
-// |   Free Software Foundation, Inc., 59 Temple Place, Suite 330,          |
-// |   Boston, MA 02111-1307 USA                                            |
-// |                                                                        |
-// | Please give credit on sites that use class.upload and submit changes   |
-// | of the script so other people can use them as well.                    |
-// | This script is free to use, don't abuse.                               |
-// +------------------------------------------------------------------------+
-
-/**
- * Class upload Chinese translation
- *
- * @version   0.25
- * @author    Shiwei Cao (caoshiwei@gmail.com)
- * @license   http://opensource.org/licenses/gpl-license.php GNU Public License
- * @copyright Shiwei Cao
- * @package   cmf
- * @subpackage external
- */
-
-    $translation = array();
-    $translation['file_error']                  = '文件错误，请重试。';
-    $translation['local_file_missing']          = '本地文件不存在。';
-    $translation['local_file_not_readable']     = '本地文件不可读。';
-    $translation['uploaded_too_big_ini']        = '文件上件出错 (上传的文件大小超过了php.ini中upload_max_filesize设置的大小)。';
-    $translation['uploaded_too_big_html']       = '文件上件出错 (上传的文件大小超过了HTML 表单设置的大小)。';
-    $translation['uploaded_partial']            = '文件上件出错 (上传的文件部分丢失)。';
-    $translation['uploaded_missing']            = '文件上件出错 (上传文件丢失)。';
-    $translation['uploaded_unknown']            = '文件上件出错 (未知错误).';
-    $translation['try_again']                   = '文件上件出错。 请重试。';
-    $translation['file_too_big']                = '文件太大。';
-    $translation['no_mime']                     = '未知文件类型。';
-    $translation['incorrect_file']              = '不正确的文件格式。';
-    $translation['image_too_wide']              = '图片宽度太大。';
-    $translation['image_too_narrow']            = '图片宽度太小。';
-    $translation['image_too_high']              = '图片高度太大。';
-    $translation['image_too_short']             = '图片高度太小。';
-    $translation['ratio_too_high']              = '图片宽/高比率太高(图片宽度太大)。';
-    $translation['ratio_too_low']               = '图片宽/高比率太低(图片高度太大).';
-    $translation['too_many_pixels']             = '图片位数太高。';
-    $translation['not_enough_pixels']           = '图片位数不够';
-    $translation['file_not_uploaded']           = '文件未上传，不能进行处理。';
-    $translation['already_exists']              = '%s 已经存在，请更换文件名。';
-    $translation['temp_file_missing']           = '处理的(临时)源文件不正确，不能进行处理。';
-    $translation['source_missing']              = '已上传的文件丢失，不能进行处理。';
-    $translation['destination_dir']             = '目标文件目录不能被创建，不能进行处理。';
-    $translation['destination_dir_missing']     = '目标文件目录不存在，不能进行处理。';
-    $translation['destination_path_not_dir']    = '目录路径不是一个有效的目录，不能进行处理。';
-    $translation['destination_dir_write']       = '不能让目标文件目录设置为可写的，不能进行处理。';
-    $translation['destination_path_write']      = '目录路径是不可以写的，不能进行处理。';
-    $translation['temp_file']                   = '不能创建临时文件，不能进行处理。';
-    $translation['source_not_readable']         = '源文件不可以读，不能进行处理。';
-    $translation['no_create_support']           = '%s 不支持创建';
-    $translation['create_error']                = '从源文件创建 %s 图片过程中出错。';
-    $translation['source_invalid']              = '无法读取原始图片，确认是不是正确的图片文件？';
-    $translation['gd_missing']                  = 'GD 好像不可以使用。';
-    $translation['watermark_no_create_support'] = '%s 创建不支持, 不能读取水印文件。';
-    $translation['watermark_create_error']      = '%s 不支持读, 不能创建水印。';
-    $translation['watermark_invalid']           = '未知文件格式, 无法读取水印文件。';
-    $translation['file_create']                 = '%s 不支持创建。';
-    $translation['no_conversion_type']          = '未定义转换类型';
-    $translation['copy_failed']                 = '在服务器上复制文件时出错。 copy() 操作失败.';
-    $translation['reading_failed']              = '读取过程中出错。';
-
-?>
\ No newline at end of file
diff --git a/crossdomain/public/static/hkxzy.ttf b/crossdomain/public/static/hkxzy.ttf
deleted file mode 100644
index f892d2f..0000000
Binary files a/crossdomain/public/static/hkxzy.ttf and /dev/null differ
diff --git a/crossdomain/public/static/watermark.png b/crossdomain/public/static/watermark.png
deleted file mode 100644
index ee747de..0000000
Binary files a/crossdomain/public/static/watermark.png and /dev/null differ
diff --git a/crossdomain/read.txt b/crossdomain/read.txt
deleted file mode 100644
index 7065356..0000000
--- a/crossdomain/read.txt
+++ /dev/null
@@ -1 +0,0 @@
-* ����㲻��ʹ�������ϴ�����ɾ�����ļ��У�
\ No newline at end of file
diff --git a/file.php b/file.php
index 2860f5f..330b426 100644
--- a/file.php
+++ b/file.php
@@ -89,48 +89,5 @@ if ($handle->uploaded) {
         );
         echo json_encode($reJson,JSON_UNESCAPED_UNICODE);
     }
-    
-    // 利用 imagecreatefrom*压缩 同时避免设置水印后重复压缩
-    if ($config['compress'] > 0 && $handle->file_dst_name_ext != 'gif' && $config['watermark'] == 0) {
-        $percent = $config['compress']; //图片压缩比
-        list($width, $height) = getimagesize($handle->file_dst_pathname); //获取原图尺寸
-        //缩放尺寸
-        $newwidth = $width * $percent;
-        $newheight = $height * $percent;
-
-        // 创建一个透明的背景图片
-        $dst_im = imagecreatetruecolor($newwidth, $newheight);
-        $bg = imagecolorallocatealpha($dst_im, 0, 0, 0, 127);
-        imagefill($dst_im, 0, 0, $bg);
-        imagesavealpha($dst_im, true);
-
-        if ($handle->file_dst_name_ext === 'jpg' || $handle->file_dst_name_ext === 'jpeg') {
-            $src_im = imagecreatefromjpeg($handle->file_dst_pathname);
-            imagecopyresized($dst_im, $src_im, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
-            imagejpeg($dst_im, $handle->file_dst_pathname,$config['imgGifJpgWebp']); //输出压缩后的图片
-            imagedestroy($dst_im);
-            imagedestroy($src_im);
-        } elseif ($handle->file_dst_name_ext === 'png') {
-            $src_im = imagecreatefrompng($handle->file_dst_pathname);
-            imagecopyresized($dst_im, $src_im, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
-            imagepng($dst_im, $handle->file_dst_pathname,$config['imagepng']); //输出压缩后的图片
-            imagedestroy($dst_im);
-            imagedestroy($src_im);
-        } elseif ($handle->file_dst_name_ext === 'gif') {
-            $src_im = imagecreatefromgif($handle->file_dst_pathname);
-            imagecopyresized($dst_im, $src_im, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
-            imagegif($dst_im, $handle->file_dst_pathname,$config['imgGifJpgWebp']); //输出压缩后的图片
-            imagedestroy($dst_im);
-            imagedestroy($src_im);
-        } elseif ($handle->file_dst_name_ext === 'wbmp') {
-            $src_im = imagecreatefromwbmp($handle->file_dst_pathname);
-            imagecopyresized($dst_im, $src_im, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
-            imagewbmp($dst_im, $handle->file_dst_pathname,$config['imgGifJpgWebp']); //输出压缩后的图片
-            imagedestroy($dst_im);
-            imagedestroy($src_im);
-        }
-
-    }
-
     unset($handle);
 }
\ No newline at end of file
diff --git a/index.php b/index.php
index 1c0b89a..a343844 100644
--- a/index.php
+++ b/index.php
@@ -70,13 +70,9 @@ if (@$_GET['e']==1){
     // 当选择文件后立即自动进行上传操作
     autoUpload: false,
     // 文件上传提交地址
-    url: '<?php echo crossdomain();?>file.php',
-    //图片压缩
-    resize: {
-      quuality: 90,
-    },
+    url: 'file.php',
     // 最大支持的上传文件
-    max_file_size: '5mb',
+    max_file_size: <?php echo $config['maxSize'];?>,
     // 是否分片上传 0为不分片 经测试分片容易使图片上传失败
     chunk_size: 0,
     //点击文件列表上传文件
@@ -85,7 +81,7 @@ if (@$_GET['e']==1){
     filters: { // 只允许上传图片或图标（.ico）
       mime_types: [{
           title: '图片',
-          extensions: 'bmp,jpg,png,tif,gif,pcx,tga,svg,webp,jpeg,tga,svg,webp,ico'
+          extensions: '<?php echo getExtensions();?>'
         },
         {
           title: '图标',
diff --git a/libs/function.php b/libs/function.php
index 1fa399a..129abf6 100644
--- a/libs/function.php
+++ b/libs/function.php
@@ -122,12 +122,16 @@ function tinyfilemanager(){
     }
 }
 
-// 异域上传
-function crossdomain(){
+
+// 获取允许上传的扩展名
+function getExtensions(){
     global $config;
-    if($config['crossdomain']){
-        return $config['CDomains'];
+    $mime = '';
+    for ($i=0;$i<count($config['extensions']);$i++)
+    {
+        $mime.=$config['extensions'][$i].',';
     }
+    return rtrim($mime,',');
 }
 
 //$qqgroup = ' <a target="_blank" href="//shang.qq.com/wpa/qunwpa?idkey=3feb4e8be8f1839f71e53bf2e876de36afc6889b2630c33c877d8df5a5583a6f"><img border="0" src="//pub.idqqimg.com/wpa/images/group.png" alt="EasyImage 简单图床" title="EasyImage 简单图床"></a>';
\ No newline at end of file