geekwright / XoopsCore

htdocs/class/xoopseditor/tinymce4/external_plugins/filemanager/lang/pl.php

Spacing +68 added lines, -68 removed lines

@@ -1,74 +1,74 @@
 <?php
-define('lang_Select','Wybierz');
-define('lang_Erase','Wyczyść');
-define('lang_Open','Otwórz');
-define('lang_Confirm_del','Czy jesteś pewien, że chcesz usunąć ten plik?');
-define('lang_All','Wszystkie');
-define('lang_Files','Pliki');
-define('lang_Images','Zdjęcia');
-define('lang_Archives','Archiwa');
-define('lang_Error_Upload','Plik przekracza maksymalny dozwolony rozmiar.');
-define('lang_Error_extension','Niedozwolone rozszerzenie pliku.');
-define('lang_Upload_file','Wgraj plik');
-define('lang_Filters','Filtr widoku');
-define('lang_Videos','Filmy');
-define('lang_Music','Muzyka');
-define('lang_New_Folder','Dodaj nowy folder');
-define('lang_Folder_Created','Folder został utworzony poprawnie');
-define('lang_Existing_Folder','Istniejący folder');
-define('lang_Confirm_Folder_del','Czy jesteś pewien, że chcesz usunąć folder i wszystko co znajduje się w nim?');
-define('lang_Return_Files_List','Powrót do listy plików');
-define('lang_Preview','Podgląd');
-define('lang_Download','Pobierz');
-define('lang_Insert_Folder_Name','Podaj nazwę folderu:');
-define('lang_Root','root');
-define('lang_Rename','Zmień nazwę');
-define('lang_Back','[..]');
-define('lang_View','Widok');
-define('lang_View_list','Lista');
-define('lang_View_columns_list','Kolumny');
-define('lang_View_boxes','Bloki');
-define('lang_Toolbar','Pasek');
-define('lang_Actions','Opcje');
-define('lang_Rename_existing_file','Ten plik już tutaj umieszczono');
-define('lang_Rename_existing_folder','Ten folder już tutaj utworzono');
-define('lang_Empty_name','Nie podano wymaganej nazwy');
-define('lang_Text_filter','wpisz txt');
-define('lang_Swipe_help','Kliknij w nazwę pliku/folderu by wyświetlić dostępne opcje');
-define('lang_Upload_base','Wgrywanie standardowe');
-define('lang_Upload_java','Wgrywanie przez skrypty JS (dla dużych plików)');
-define('lang_Upload_java_help',"Jeżeli ten aplet JS nie powoduje wgrywania 1. Sprawdź czy masz pobraną i uruchomioną obsługę skryptów w JAVA na stronie JAVA <a href='http://java.com/en/download/'>[pobierz]</a> 2. Upewnij się, że nie jest to blokada wynikająca z ustawień zapory firewall");
-define('lang_Upload_base_help',"Metoda zwana Przeciągnij & Upuść pliki w poniższy obszar, lub kliknij weń (dotyczy tylko najnowszych przeglądarek), lub wybierz plik i kliknij w przycisk. Kiedy zakończy się proces wgrywania, kliknij wyżej na przycisk by zakończyć.");
-define('lang_Type_dir','FLD');
-define('lang_Type','wg. typu');
-define('lang_Dimension','Wymiary');
-define('lang_Size','wg. wagi');
-define('lang_Date','wg. daty');
-define('lang_Filename','wg. nazwy');
-define('lang_Operations','Opcje');
-define('lang_Date_type','d-m-y');
-define('lang_OK','OK');
-define('lang_Cancel','Anuluj');
-define('lang_Sorting','SORTOWANIE');
-define('lang_Show_url','show URL');
-define('lang_Extract','extract here');
-define('lang_File_info','file info');
-define('lang_Edit_image','edit image');
-define('lang_Duplicate','Duplicate');
+define('lang_Select', 'Wybierz');
+define('lang_Erase', 'Wyczyść');
+define('lang_Open', 'Otwórz');
+define('lang_Confirm_del', 'Czy jesteś pewien, że chcesz usunąć ten plik?');
+define('lang_All', 'Wszystkie');
+define('lang_Files', 'Pliki');
+define('lang_Images', 'Zdjęcia');
+define('lang_Archives', 'Archiwa');
+define('lang_Error_Upload', 'Plik przekracza maksymalny dozwolony rozmiar.');
+define('lang_Error_extension', 'Niedozwolone rozszerzenie pliku.');
+define('lang_Upload_file', 'Wgraj plik');
+define('lang_Filters', 'Filtr widoku');
+define('lang_Videos', 'Filmy');
+define('lang_Music', 'Muzyka');
+define('lang_New_Folder', 'Dodaj nowy folder');
+define('lang_Folder_Created', 'Folder został utworzony poprawnie');
+define('lang_Existing_Folder', 'Istniejący folder');
+define('lang_Confirm_Folder_del', 'Czy jesteś pewien, że chcesz usunąć folder i wszystko co znajduje się w nim?');
+define('lang_Return_Files_List', 'Powrót do listy plików');
+define('lang_Preview', 'Podgląd');
+define('lang_Download', 'Pobierz');
+define('lang_Insert_Folder_Name', 'Podaj nazwę folderu:');
+define('lang_Root', 'root');
+define('lang_Rename', 'Zmień nazwę');
+define('lang_Back', '[..]');
+define('lang_View', 'Widok');
+define('lang_View_list', 'Lista');
+define('lang_View_columns_list', 'Kolumny');
+define('lang_View_boxes', 'Bloki');
+define('lang_Toolbar', 'Pasek');
+define('lang_Actions', 'Opcje');
+define('lang_Rename_existing_file', 'Ten plik już tutaj umieszczono');
+define('lang_Rename_existing_folder', 'Ten folder już tutaj utworzono');
+define('lang_Empty_name', 'Nie podano wymaganej nazwy');
+define('lang_Text_filter', 'wpisz txt');
+define('lang_Swipe_help', 'Kliknij w nazwę pliku/folderu by wyświetlić dostępne opcje');
+define('lang_Upload_base', 'Wgrywanie standardowe');
+define('lang_Upload_java', 'Wgrywanie przez skrypty JS (dla dużych plików)');
+define('lang_Upload_java_help', "Jeżeli ten aplet JS nie powoduje wgrywania 1. Sprawdź czy masz pobraną i uruchomioną obsługę skryptów w JAVA na stronie JAVA <a href='http://java.com/en/download/'>[pobierz]</a> 2. Upewnij się, że nie jest to blokada wynikająca z ustawień zapory firewall");
+define('lang_Upload_base_help', "Metoda zwana Przeciągnij & Upuść pliki w poniższy obszar, lub kliknij weń (dotyczy tylko najnowszych przeglądarek), lub wybierz plik i kliknij w przycisk. Kiedy zakończy się proces wgrywania, kliknij wyżej na przycisk by zakończyć.");
+define('lang_Type_dir', 'FLD');
+define('lang_Type', 'wg. typu');
+define('lang_Dimension', 'Wymiary');
+define('lang_Size', 'wg. wagi');
+define('lang_Date', 'wg. daty');
+define('lang_Filename', 'wg. nazwy');
+define('lang_Operations', 'Opcje');
+define('lang_Date_type', 'd-m-y');
+define('lang_OK', 'OK');
+define('lang_Cancel', 'Anuluj');
+define('lang_Sorting', 'SORTOWANIE');
+define('lang_Show_url', 'show URL');
+define('lang_Extract', 'extract here');
+define('lang_File_info', 'file info');
+define('lang_Edit_image', 'edit image');
+define('lang_Duplicate', 'Duplicate');
 define('lang_Folders', 'Folders');
-define('lang_Copy','Copy');
-define('lang_Cut','Cut');
-define('lang_Paste','Paste');
+define('lang_Copy', 'Copy');
+define('lang_Cut', 'Cut');
+define('lang_Paste', 'Paste');
 define('lang_CB', 'CB'); // clipboard
-define('lang_Paste_Here','Paste to this directory');
-define('lang_Paste_Confirm','Are you sure you want to paste to this directory? This will overwrite existing files/folders if encountered any.');
-define('lang_Paste_Failed','Failed to paste file(s)');
-define('lang_Clear_Clipboard','Clear clipboard');
-define('lang_Clear_Clipboard_Confirm','Are you sure you want to clear the clipboard?');
-define('lang_Files_ON_Clipboard','There are files on the clipboard.');
-define('lang_Copy_Cut_Size_Limit','The selected files/folders are too big to %s. Limit: %d MB/operation'); // %s = cut or copy
-define('lang_Copy_Cut_Count_Limit','You selected too many files/folders to %s. Limit: %d files/operation'); // %s = cut or copy
-define('lang_Copy_Cut_Not_Allowed','You are not allowed to %s files.'); // %s(1) = cut or copy, %s(2) = files or folders
+define('lang_Paste_Here', 'Paste to this directory');
+define('lang_Paste_Confirm', 'Are you sure you want to paste to this directory? This will overwrite existing files/folders if encountered any.');
+define('lang_Paste_Failed', 'Failed to paste file(s)');
+define('lang_Clear_Clipboard', 'Clear clipboard');
+define('lang_Clear_Clipboard_Confirm', 'Are you sure you want to clear the clipboard?');
+define('lang_Files_ON_Clipboard', 'There are files on the clipboard.');
+define('lang_Copy_Cut_Size_Limit', 'The selected files/folders are too big to %s. Limit: %d MB/operation'); // %s = cut or copy
+define('lang_Copy_Cut_Count_Limit', 'You selected too many files/folders to %s. Limit: %d files/operation'); // %s = cut or copy
+define('lang_Copy_Cut_Not_Allowed', 'You are not allowed to %s files.'); // %s(1) = cut or copy, %s(2) = files or folders
 define('lang_Aviary_No_Save', 'Could not save image');
 define('lang_Zip_No_Extract', 'Could not extract. File might be corrupt.');
 define('lang_Zip_Invalid', 'This extension is not supported. Valid: zip, gz, tar.');

htdocs/class/xoopseditor/tinymce4/external_plugins/filemanager/lang/bg_BG.php

Spacing +68 added lines, -68 removed lines

@@ -1,74 +1,74 @@
 <?php
-define('lang_Select','Избери');
-define('lang_Erase','Изтрий');
-define('lang_Open','Отвори');
-define('lang_Confirm_del','Сигурни ли сте, че искате да изтриете този файл?');
-define('lang_All','Всичко');
-define('lang_Files','Файлове');
-define('lang_Images','Изображения');
-define('lang_Archives','Архиви');
-define('lang_Error_Upload','Каченият файл надминава максимално разрешената големина.');
-define('lang_Error_extension','Това файлово разширение не е позволено.');
-define('lang_Upload_file','Качете файл');
-define('lang_Filters','Папка');
-define('lang_Videos','Видео');
-define('lang_Music','Музика');
-define('lang_New_Folder','Нова папка');
-define('lang_Folder_Created','Папката е правилно създадена');
-define('lang_Existing_Folder','Съществуваща папка');
-define('lang_Confirm_Folder_del','Сигурни ли сте, че искате да изтриете папката и всичко, което се съдържа с нея?');
-define('lang_Return_Files_List','Връщане към списъка с файлове');
-define('lang_Preview','Преглед');
-define('lang_Download','Свали');
-define('lang_Insert_Folder_Name','Въведете име на папката:');
-define('lang_Root','root');
-define('lang_Rename','Преименуване');
-define('lang_Back','обратно');
-define('lang_View','View');
-define('lang_View_list','List view');
-define('lang_View_columns_list','Columns list view');
-define('lang_View_boxes','Box view');
-define('lang_Toolbar','Toolbar');
-define('lang_Actions','Actions');
-define('lang_Rename_existing_file','The file is already existing');
-define('lang_Rename_existing_folder','The folder is already existing');
-define('lang_Empty_name','The name is empty');
-define('lang_Text_filter','text filter');
-define('lang_Swipe_help','Swipe the name of file/folder to show options');
-define('lang_Upload_base','Base upload');
-define('lang_Upload_java','JAVA upload (big size files)');
-define('lang_Upload_java_help',"If the Java Applet don't load 1. make sure you have Java installed otherwise <a href='http://java.com/en/download/'>[download link]</a> 2. make sure nothing is blocked from firewall");
-define('lang_Upload_base_help',"Drag & Drop file/s inside above area or click in it (for modern browsers) otherwise select the file and click on button. When the upload end, click on upper return button.");
-define('lang_Type_dir','dir');
-define('lang_Type','Type');
-define('lang_Dimension','Dimension');
-define('lang_Size','Size');
-define('lang_Date','Date');
-define('lang_Filename','Name');
-define('lang_Operations','Operations');
-define('lang_Date_type','y-m-d');
-define('lang_OK','OK');
-define('lang_Cancel','Cancel');
-define('lang_Sorting','sorting');
-define('lang_Show_url','show URL');
-define('lang_Extract','extract here');
-define('lang_File_info','file info');
-define('lang_Edit_image','edit image');
-define('lang_Duplicate','Duplicate');
+define('lang_Select', 'Избери');
+define('lang_Erase', 'Изтрий');
+define('lang_Open', 'Отвори');
+define('lang_Confirm_del', 'Сигурни ли сте, че искате да изтриете този файл?');
+define('lang_All', 'Всичко');
+define('lang_Files', 'Файлове');
+define('lang_Images', 'Изображения');
+define('lang_Archives', 'Архиви');
+define('lang_Error_Upload', 'Каченият файл надминава максимално разрешената големина.');
+define('lang_Error_extension', 'Това файлово разширение не е позволено.');
+define('lang_Upload_file', 'Качете файл');
+define('lang_Filters', 'Папка');
+define('lang_Videos', 'Видео');
+define('lang_Music', 'Музика');
+define('lang_New_Folder', 'Нова папка');
+define('lang_Folder_Created', 'Папката е правилно създадена');
+define('lang_Existing_Folder', 'Съществуваща папка');
+define('lang_Confirm_Folder_del', 'Сигурни ли сте, че искате да изтриете папката и всичко, което се съдържа с нея?');
+define('lang_Return_Files_List', 'Връщане към списъка с файлове');
+define('lang_Preview', 'Преглед');
+define('lang_Download', 'Свали');
+define('lang_Insert_Folder_Name', 'Въведете име на папката:');
+define('lang_Root', 'root');
+define('lang_Rename', 'Преименуване');
+define('lang_Back', 'обратно');
+define('lang_View', 'View');
+define('lang_View_list', 'List view');
+define('lang_View_columns_list', 'Columns list view');
+define('lang_View_boxes', 'Box view');
+define('lang_Toolbar', 'Toolbar');
+define('lang_Actions', 'Actions');
+define('lang_Rename_existing_file', 'The file is already existing');
+define('lang_Rename_existing_folder', 'The folder is already existing');
+define('lang_Empty_name', 'The name is empty');
+define('lang_Text_filter', 'text filter');
+define('lang_Swipe_help', 'Swipe the name of file/folder to show options');
+define('lang_Upload_base', 'Base upload');
+define('lang_Upload_java', 'JAVA upload (big size files)');
+define('lang_Upload_java_help', "If the Java Applet don't load 1. make sure you have Java installed otherwise <a href='http://java.com/en/download/'>[download link]</a> 2. make sure nothing is blocked from firewall");
+define('lang_Upload_base_help', "Drag & Drop file/s inside above area or click in it (for modern browsers) otherwise select the file and click on button. When the upload end, click on upper return button.");
+define('lang_Type_dir', 'dir');
+define('lang_Type', 'Type');
+define('lang_Dimension', 'Dimension');
+define('lang_Size', 'Size');
+define('lang_Date', 'Date');
+define('lang_Filename', 'Name');
+define('lang_Operations', 'Operations');
+define('lang_Date_type', 'y-m-d');
+define('lang_OK', 'OK');
+define('lang_Cancel', 'Cancel');
+define('lang_Sorting', 'sorting');
+define('lang_Show_url', 'show URL');
+define('lang_Extract', 'extract here');
+define('lang_File_info', 'file info');
+define('lang_Edit_image', 'edit image');
+define('lang_Duplicate', 'Duplicate');
 define('lang_Folders', 'Folders');
-define('lang_Copy','Copy');
-define('lang_Cut','Cut');
-define('lang_Paste','Paste');
+define('lang_Copy', 'Copy');
+define('lang_Cut', 'Cut');
+define('lang_Paste', 'Paste');
 define('lang_CB', 'CB'); // clipboard
-define('lang_Paste_Here','Paste to this directory');
-define('lang_Paste_Confirm','Are you sure you want to paste to this directory? This will overwrite existing files/folders if encountered any.');
-define('lang_Paste_Failed','Failed to paste file(s)');
-define('lang_Clear_Clipboard','Clear clipboard');
-define('lang_Clear_Clipboard_Confirm','Are you sure you want to clear the clipboard?');
-define('lang_Files_ON_Clipboard','There are files on the clipboard.');
-define('lang_Copy_Cut_Size_Limit','The selected files/folders are too big to %s. Limit: %d MB/operation'); // %s = cut or copy
-define('lang_Copy_Cut_Count_Limit','You selected too many files/folders to %s. Limit: %d files/operation'); // %s = cut or copy
-define('lang_Copy_Cut_Not_Allowed','You are not allowed to %s files.'); // %s(1) = cut or copy, %s(2) = files or folders
+define('lang_Paste_Here', 'Paste to this directory');
+define('lang_Paste_Confirm', 'Are you sure you want to paste to this directory? This will overwrite existing files/folders if encountered any.');
+define('lang_Paste_Failed', 'Failed to paste file(s)');
+define('lang_Clear_Clipboard', 'Clear clipboard');
+define('lang_Clear_Clipboard_Confirm', 'Are you sure you want to clear the clipboard?');
+define('lang_Files_ON_Clipboard', 'There are files on the clipboard.');
+define('lang_Copy_Cut_Size_Limit', 'The selected files/folders are too big to %s. Limit: %d MB/operation'); // %s = cut or copy
+define('lang_Copy_Cut_Count_Limit', 'You selected too many files/folders to %s. Limit: %d files/operation'); // %s = cut or copy
+define('lang_Copy_Cut_Not_Allowed', 'You are not allowed to %s files.'); // %s(1) = cut or copy, %s(2) = files or folders
 define('lang_Aviary_No_Save', 'Could not save image');
 define('lang_Zip_No_Extract', 'Could not extract. File might be corrupt.');
 define('lang_Zip_Invalid', 'This extension is not supported. Valid: zip, gz, tar.');

htdocs/class/xoopseditor/tinymce4/external_plugins/filemanager/lang/nb_NO.php

Spacing +68 added lines, -68 removed lines

@@ -1,74 +1,74 @@
 <?php
-define('lang_Select','Velg');
-define('lang_Erase','Slett');
-define('lang_Open','Åpne');
-define('lang_Confirm_del','Er du sikker på at du vil slette denne filen?');
-define('lang_All','Alle');
-define('lang_Files','Filer');
-define('lang_Images','Bilder');
-define('lang_Archives','Arkiv');
-define('lang_Error_Upload','Den opplastede filen overskrider maksimal tillatt størrelse.');
-define('lang_Error_extension','Filtypen er ikke tillatt.');
-define('lang_Upload_file','Last opp fil');
-define('lang_Filters','Filter');
-define('lang_Videos','Videoer');
-define('lang_Music','Musikk');
-define('lang_New_Folder','Ny mappe');
-define('lang_Folder_Created','Mappe opprettet');
-define('lang_Existing_Folder','Eksisterende mappe');
-define('lang_Confirm_Folder_del','Er du sikker på at du vil slette mappen og alt innholdet?');
-define('lang_Return_Files_List','Tilbake til filoversikten');
-define('lang_Preview','Forhåndsvisning');
-define('lang_Download','Last ned');
-define('lang_Insert_Folder_Name','Gi mappen et navn:');
-define('lang_Root','Rot');
-define('lang_Rename','Gi nytt navn');
-define('lang_Back','Tilbake');
-define('lang_View','Visning');
-define('lang_View_list','Listevisning');
-define('lang_View_columns_list','Side ved side');
-define('lang_View_boxes','Boksvisning');
-define('lang_Toolbar','Verktøylinje');
-define('lang_Actions','Gjøremål');
-define('lang_Rename_existing_file','Filen er allerede opprettet');
-define('lang_Rename_existing_folder','Mappen er allerede opprettet');
-define('lang_Empty_name','Tomt navn');
-define('lang_Text_filter','Tekst-filter');
-define('lang_Swipe_help','Sveip filnavnet/mappenavnet for å vise alternativer');
-define('lang_Upload_base','Vanlig opplasting');
-define('lang_Upload_java','Java-opplasting (store filer)');
-define('lang_Upload_java_help',"Hvis java-appleten ikke lastes: 1. Sjekk om Java er installert, hvis ikke <a href='http://java.com/en/download/'>last ned Java</a> 2. Sjekk brannmur-innstillingene.");
-define('lang_Upload_base_help',"Dra og slipp filen(e) i området over eller klikk (virker for moderne nettlesere). Ved bruk av gammel nettleser: Velg filen og klikk på knappen. Når opplastingen er ferdig, klikk på tilbake-knappen øverst.");
-define('lang_Type_dir','Mappe');
-define('lang_Type','Type');
-define('lang_Dimension','Dimensjoner');
-define('lang_Size','Størrelse');
-define('lang_Date','Dato');
-define('lang_Filename','Filnavn');
-define('lang_Operations','Handlinger');
-define('lang_Date_type','d.m.y');
-define('lang_OK','OK');
-define('lang_Cancel','Avbryt');
-define('lang_Sorting','Sortering');
-define('lang_Show_url','Vis URL');
-define('lang_Extract','Pakk ut her');
-define('lang_File_info','Fil-info');
-define('lang_Edit_image','Rediger bilde');
-define('lang_Duplicate','Duplikat');
+define('lang_Select', 'Velg');
+define('lang_Erase', 'Slett');
+define('lang_Open', 'Åpne');
+define('lang_Confirm_del', 'Er du sikker på at du vil slette denne filen?');
+define('lang_All', 'Alle');
+define('lang_Files', 'Filer');
+define('lang_Images', 'Bilder');
+define('lang_Archives', 'Arkiv');
+define('lang_Error_Upload', 'Den opplastede filen overskrider maksimal tillatt størrelse.');
+define('lang_Error_extension', 'Filtypen er ikke tillatt.');
+define('lang_Upload_file', 'Last opp fil');
+define('lang_Filters', 'Filter');
+define('lang_Videos', 'Videoer');
+define('lang_Music', 'Musikk');
+define('lang_New_Folder', 'Ny mappe');
+define('lang_Folder_Created', 'Mappe opprettet');
+define('lang_Existing_Folder', 'Eksisterende mappe');
+define('lang_Confirm_Folder_del', 'Er du sikker på at du vil slette mappen og alt innholdet?');
+define('lang_Return_Files_List', 'Tilbake til filoversikten');
+define('lang_Preview', 'Forhåndsvisning');
+define('lang_Download', 'Last ned');
+define('lang_Insert_Folder_Name', 'Gi mappen et navn:');
+define('lang_Root', 'Rot');
+define('lang_Rename', 'Gi nytt navn');
+define('lang_Back', 'Tilbake');
+define('lang_View', 'Visning');
+define('lang_View_list', 'Listevisning');
+define('lang_View_columns_list', 'Side ved side');
+define('lang_View_boxes', 'Boksvisning');
+define('lang_Toolbar', 'Verktøylinje');
+define('lang_Actions', 'Gjøremål');
+define('lang_Rename_existing_file', 'Filen er allerede opprettet');
+define('lang_Rename_existing_folder', 'Mappen er allerede opprettet');
+define('lang_Empty_name', 'Tomt navn');
+define('lang_Text_filter', 'Tekst-filter');
+define('lang_Swipe_help', 'Sveip filnavnet/mappenavnet for å vise alternativer');
+define('lang_Upload_base', 'Vanlig opplasting');
+define('lang_Upload_java', 'Java-opplasting (store filer)');
+define('lang_Upload_java_help', "Hvis java-appleten ikke lastes: 1. Sjekk om Java er installert, hvis ikke <a href='http://java.com/en/download/'>last ned Java</a> 2. Sjekk brannmur-innstillingene.");
+define('lang_Upload_base_help', "Dra og slipp filen(e) i området over eller klikk (virker for moderne nettlesere). Ved bruk av gammel nettleser: Velg filen og klikk på knappen. Når opplastingen er ferdig, klikk på tilbake-knappen øverst.");
+define('lang_Type_dir', 'Mappe');
+define('lang_Type', 'Type');
+define('lang_Dimension', 'Dimensjoner');
+define('lang_Size', 'Størrelse');
+define('lang_Date', 'Dato');
+define('lang_Filename', 'Filnavn');
+define('lang_Operations', 'Handlinger');
+define('lang_Date_type', 'd.m.y');
+define('lang_OK', 'OK');
+define('lang_Cancel', 'Avbryt');
+define('lang_Sorting', 'Sortering');
+define('lang_Show_url', 'Vis URL');
+define('lang_Extract', 'Pakk ut her');
+define('lang_File_info', 'Fil-info');
+define('lang_Edit_image', 'Rediger bilde');
+define('lang_Duplicate', 'Duplikat');
 define('lang_Folders', 'Mapper');
-define('lang_Copy','Kopier');
-define('lang_Cut','Klipp ut');
-define('lang_Paste','Lim inn');
+define('lang_Copy', 'Kopier');
+define('lang_Cut', 'Klipp ut');
+define('lang_Paste', 'Lim inn');
 define('lang_CB', 'Utklippstavle'); // clipboard
-define('lang_Paste_Here','Lim inn i denne mappen');
-define('lang_Paste_Confirm','Er du sikker på at du vil lime inn i denne mappen? Dette vil overskrive eventuelle eksisterende filer eller mapper.');
-define('lang_Paste_Failed','Lim inn feilet');
-define('lang_Clear_Clipboard','Tøm utklippstavlen');
-define('lang_Clear_Clipboard_Confirm','Er du sikker på at du vil tømme utklippstavlen?');
-define('lang_Files_ON_Clipboard','Der er filer på utklippstavlen.');
-define('lang_Copy_Cut_Size_Limit','De valgte filene/mappene er for store for %s. Grense: %d MB/operasjon'); // %s = cut or copy
-define('lang_Copy_Cut_Count_Limit','Du valgte for mange filer/mapper for %s. Grense: %d filer/operasjon'); // %s = cut or copy
-define('lang_Copy_Cut_Not_Allowed','Du har ikke lov til å %s filer.'); // %s(1) = cut or copy, %s(2) = files or folders
+define('lang_Paste_Here', 'Lim inn i denne mappen');
+define('lang_Paste_Confirm', 'Er du sikker på at du vil lime inn i denne mappen? Dette vil overskrive eventuelle eksisterende filer eller mapper.');
+define('lang_Paste_Failed', 'Lim inn feilet');
+define('lang_Clear_Clipboard', 'Tøm utklippstavlen');
+define('lang_Clear_Clipboard_Confirm', 'Er du sikker på at du vil tømme utklippstavlen?');
+define('lang_Files_ON_Clipboard', 'Der er filer på utklippstavlen.');
+define('lang_Copy_Cut_Size_Limit', 'De valgte filene/mappene er for store for %s. Grense: %d MB/operasjon'); // %s = cut or copy
+define('lang_Copy_Cut_Count_Limit', 'Du valgte for mange filer/mapper for %s. Grense: %d filer/operasjon'); // %s = cut or copy
+define('lang_Copy_Cut_Not_Allowed', 'Du har ikke lov til å %s filer.'); // %s(1) = cut or copy, %s(2) = files or folders
 define('lang_Aviary_No_Save', 'Kunne ikke lagre bildet');
 define('lang_Zip_No_Extract', 'Kunne ikke pakke ut. Filen er muligens ødelagt.');
 define('lang_Zip_Invalid', 'Dette filetternavnet er ikke støttet. Valide filer: zip, gz, tar.');

htdocs/class/xoopseditor/tinymce4/external_plugins/filemanager/uploader/jupload.php

Indentation +641 added lines, -641 removed lines

@@ -54,403 +54,403 @@ 
 
 class JUpload {
 
-	var $appletparams;
-	var $classparams;
-	var $files;
-
-	public function JUpload($appletparams = array(), $classparams = array()) {
-		if (gettype($classparams) !== 'array')
-		$this->abort('Invalid type of parameter classparams: Expecting an array');
-		if (gettype($appletparams) !== 'array')
-		$this->abort('Invalid type of parameter appletparams: Expecting an array');
-
-		// set some defaults for the applet params
-		if (!isset($appletparams['afterUploadURL']))
-		$appletparams['afterUploadURL'] = $_SERVER['PHP_SELF'] . '?afterupload=1';
-		if (!isset($appletparams['name']))
-		$appletparams['name'] = 'JUpload';
-		if (!isset($appletparams['archive']))
-		$appletparams['archive'] = 'wjhk.jupload.jar';
-		if (!isset($appletparams['code']))
-		$appletparams['code'] = 'wjhk.jupload2.JUploadApplet';
-		if (!isset($appletparams['debugLevel']))
-		$appletparams['debugLevel'] = 0;
-		if (!isset($appletparams['httpUploadParameterType']))
-		$appletparams['httpUploadParameterType'] = 'array';
-		if (!isset($appletparams['showLogWindow']))
-		$appletparams['showLogWindow'] = ($appletparams['debugLevel'] > 0) ? 'true' : 'false';
-		if (!isset($appletparams['width']))
-		$appletparams['width'] = 640;
-		if (!isset($appletparams['height']))
-		$appletparams['height'] = ($appletparams['showLogWindow'] === 'true') ? 500 : 300;
-		if (!isset($appletparams['mayscript']))
-		$appletparams['mayscript'] = 'true';
-		if (!isset($appletparams['scriptable']))
-		$appletparams['scriptable'] = 'false';
-		//if (!isset($appletparams['stringUploadSuccess']))
-		$appletparams['stringUploadSuccess'] = 'SUCCESS';
-		//if (!isset($appletparams['stringUploadError']))
-		$appletparams['stringUploadError'] = 'ERROR: (.*)';
-		$maxpost = $this->tobytes(ini_get('post_max_size'));
-		$maxmem = $this->tobytes(ini_get('memory_limit'));
-		$maxfs = $this->tobytes(ini_get('upload_max_filesize'));
-		$obd = ini_get('open_basedir');
-		if (!isset($appletparams['maxChunkSize'])) {
-			$maxchunk = ($maxpost < $maxmem) ? $maxpost : $maxmem;
-			$maxchunk = ($maxchunk < $maxfs) ? $maxchunk : $maxfs;
-			$maxchunk /= 4;
-			$optchunk = (500000 > $maxchunk) ? $maxchunk : 500000;
-			$appletparams['maxChunkSize'] = $optchunk;
-		}
-		$appletparams['maxChunkSize'] = $this->tobytes($appletparams['maxChunkSize']);
-		if (!isset($appletparams['maxFileSize']))
-		$appletparams['maxFileSize'] = $maxfs;
-		$appletparams['maxFileSize'] = $this->tobytes($appletparams['maxFileSize']);
-		if (isset($classparams['errormail'])) {
-			$appletparams['urlToSendErrorTo'] = $_SERVER["PHP_SELF"] . '?errormail';
-		}
-
-		// Same for class parameters
-		if (!isset($classparams['demo_mode']))
-		$classparams['demo_mode'] = false;
-		if ($classparams['demo_mode']) {
-			$classparams['create_destdir'] = false;
-			$classparams['allow_subdirs'] = true;
-			$classparams['allow_zerosized'] = true;
-			$classparams['duplicate'] = 'overwrite';
-		}
-		if (!isset($classparams['debug_php']))											// set true to log some messages in PHP log
-		$classparams['debug_php'] = false;
-		if (!isset($this->classparams['allowed_mime_types']))				// array of allowed MIME type
-		$classparams['allowed_mime_types'] = 'all';
-		if (!isset($this->classparams['allowed_file_extensions'])) 	// array of allowed file extensions
-		$classparams['allowed_file_extensions'] = 'all';
-		if (!isset($classparams['verbose_errors']))						// shouldn't display server info on a production site!
-		$classparams['verbose_errors'] = true;
-		if (!isset($classparams['session_regenerate']))
-		$classparams['session_regenerate'] = false;
-		if (!isset($classparams['create_destdir']))
-		$classparams['create_destdir'] = true;
-		if (!isset($classparams['allow_subdirs']))
-		$classparams['allow_subdirs'] = false;
-		if (!isset($classparams['spaces_in_subdirs']))
-		$classparams['spaces_in_subdirs'] = false;
-		if (!isset($classparams['allow_zerosized']))
-		$classparams['allow_zerosized'] = false;
-		if (!isset($classparams['duplicate']))
-		$classparams['duplicate'] = 'rename';
-		if (!isset($classparams['dirperm']))
-		$classparams['dirperm'] = 0755;
-		if (!isset($classparams['fileperm']))
-		$classparams['fileperm'] = 0644;
-		if (!isset($classparams['destdir'])) {
-			if ($obd != '')
-			$classparams['destdir'] = $obd;
-			else
-			$classparams['destdir'] = '/var/tmp/jupload_test';
-		}else{
-			$classparams['destdir']=str_replace('~',' ',$classparams['destdir']);
-		}
-		if ($classparams['create_destdir']) {
-			$_umask = umask(0); 	// override the system mask
-			@mkdir($classparams['destdir'], $classparams['dirperm']);
-			umask($_umask);
-		}
-		if (!is_dir($classparams['destdir']) && is_writable($classparams['destdir']))
-		$this->abort('Destination dir not accessible');
-		if (!isset($classparams['tmp_prefix']))
-		$classparams['tmp_prefix'] = 'jutmp.';
-		if (!isset($classparams['var_prefix']))
-		$classparams['var_prefix'] = 'juvar.';
-		if (!isset($classparams['jscript_wrapper']))
-		$classparams['jscript_wrapper'] = 'JUploadSetProperty';
-		if (!isset($classparams['tag_jscript']))
-		$classparams['tag_jscript'] = '<!--JUPLOAD_JSCRIPT-->';
-		if (!isset($classparams['tag_applet']))
-		$classparams['tag_applet'] = '<!--JUPLOAD_APPLET-->';
-		if (!isset($classparams['tag_flist']))
-		$classparams['tag_flist'] = '<!--JUPLOAD_FILES-->';
-		if (!isset($classparams['http_flist_start']))
-		$classparams['http_flist_start'] =
-            		"<table border='1'><TR><TH>Filename</TH><TH>file size</TH><TH>Relative path</TH><TH>Full name</TH><TH>md5sum</TH><TH>Specific parameters</TH></TR>";
-		if (!isset($classparams['http_flist_end']))
-		$classparams['http_flist_end'] = "</table>\n";
-		if (!isset($classparams['http_flist_file_before']))
-		$classparams['http_flist_file_before'] = "<tr><td>";
-		if (!isset($classparams['http_flist_file_between']))
-		$classparams['http_flist_file_between'] = "</td><td>";
-		if (!isset($classparams['http_flist_file_after']))
-		$classparams['http_flist_file_after'] = "</td></tr>\n";
-
-		$this->appletparams = $appletparams;
-		$this->classparams = $classparams;
-		$this->page_start();
-	}
-
-	/**
-	 * Return an array of uploaded files * The array contains: name, size, tmp_name, error,
-	 * relativePath, md5sum, mimetype, fullName, path
-	 */
-	public function uploadedfiles() {
-		return $this->files;
-	}
-
-	/**
-	 * Log a message on the current output, as a HTML comment.
-	 */
-	protected function logDebug($function, $msg, $htmlComment=true) {
-		$output = "[DEBUG] [$function] $msg";
-		if ($htmlComment) {
-			echo("<!-- $output -->\r\n");
-		} else {
-			echo("$output\r\n");
-		}
-	}
-
-	/**
-	 * Log a message to the PHP log.
-	 * Declared "protected" so it may be Extended if you require customised logging (e.g. particular log file location).
-	 */
-	protected function logPHPDebug($function, $msg) {
-		if ($this->classparams['debug_php'] === true) {
-			$output = "[DEBUG] [$function] ".$this->arrayexpand($msg);
-			error_log($output);
-		}
-	}
-
-	private function arrayexpand($array) {
-		$output = '';
-		if (is_array($array)) {
-			foreach ($array as $key => $value) {
-				$output .= "\n ".$key.' => '.$this->arrayexpand($value);
-			}
-		} else {
-			$output .= $array;
-		}
-		return $output;
-	}
-
-
-	/**
-	 * Convert a value ending in 'G','M' or 'K' to bytes
-	 *
-	 */
-	private function tobytes($val) {
-		$val = trim($val);
-		$last = fix_strtolower($val{strlen($val)-1});
-		switch($last) {
-			case 'g':
-				$val *= 1024;
-			case 'm':
-				$val *= 1024;
-			case 'k':
-				$val *= 1024;
-		}
-		return $val;
-	}
-
-	/**
-	 * Build a string, containing a javascript wrapper function
-	 * for setting applet properties via JavaScript. This is necessary,
-	 * because we use the "modern" method of including the applet (using
-	 * <object> resp. <embed> tags) in order to trigger automatic JRE downloading.
-	 * Therefore, in Netscape-like browsers, the applet is accessible via
-	 * the document.embeds[] array while in others, it is accessible via the
-	 * document.applets[] array.
-	 *
-	 * @return A string, containing the necessary wrapper function (named JUploadSetProperty)
-	 */
-	private function str_jsinit() {
-		$N = "\n";
-		$name = $this->appletparams['name'];
-		$ret = '<script type="text/javascript">'.$N;
-		$ret .= '<!--'.$N;
-		$ret .= 'function '.$this->classparams['jscript_wrapper'].'(name, value) {'.$N;
-		$ret .= '  document.applets["'.$name.'"] == null || document.applets["'.$name.'"].setProperty(name,value);'.$N;
-		$ret .= '  document.embeds["'.$name.'"] == null || document.embeds["'.$name.'"].setProperty(name,value);'.$N;
-		$ret .= '}'.$N;
-		$ret .= '//-->'.$N;
-		$ret .= '</script>';
-		return $ret;
-	}
-
-	/**
-	 * Build a string, containing the applet tag with all parameters.
-	 *
-	 * @return A string, containing the applet tag
-	 */
-	private function str_applet() {
-		$N = "\n";
-		$params = $this->appletparams;
-		// return the actual applet tag
-		$ret = '<object classid = "clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"'.$N;
-		$ret .= '  codebase = "http://java.sun.com/update/1.5.0/jinstall-1_5-windows-i586.cab#Version=5,0,0,3"'.$N;
-		$ret .= '  width = "'.$params['width'].'"'.$N;
-		$ret .= '  height = "'.$params['height'].'"'.$N;
-		$ret .= '  name = "'.$params['name'].'">'.$N;
-		foreach ($params as $key => $val) {
-			if ($key !== 'width' && $key !== 'height')
-			$ret .= '  <param name = "'.$key.'" value = "'.$val.'" />'.$N;
-		}
-		$ret .= '  <comment>'.$N;
-		$ret .= '    <embed'.$N;
-		$ret .= '      type = "application/x-java-applet;version=1.5"'.$N;
-		foreach ($params as $key => $val)
-		$ret .= '      '.$key.' = "'.$val.'"'.$N;
-		$ret .= '      pluginspage = "http://java.sun.com/products/plugin/index.html#download">'.$N;
-		$ret .= '      <noembed>'.$N;
-		$ret .= '        Java 1.5 or higher plugin required.'.$N;
-		$ret .= '      </noembed>'.$N;
-		$ret .= '    </embed>'.$N;
-		$ret .= '  </comment>'.$N;
-		$ret .= '</object>';
-		return $ret;
-	}
-
-	private function abort($msg = '') {
-		$this->cleanup();
-		if ($msg != '')
-		die(str_replace('(.*)',$msg,$this->appletparams['stringUploadError'])."\n");
-		exit;
-	}
-
-	private function warning($msg = '') {
-		$this->cleanup();
-		if ($msg != '')
-		echo('WARNING: '.$msg."\n");
-		echo $this->appletparams['stringUploadSuccess']."\n";
-		exit;
-	}
-
-	private function cleanup() {
-		// remove all uploaded files of *this* request
-		if (isset($_FILES)) {
-			foreach ($_FILES as $key => $val)
-			@unlink($val['tmp_name']);
-		}
-		// remove accumulated file, if any.
-		@unlink($this->classparams['destdir'].'/'.$this->classparams['tmp_prefix'].session_id());
-		@unlink($this->classparams['destdir'].'/'.$this->classparams['tmp_prefix'].'tmp'.session_id());
-		// reset session var
-		$_SESSION['RF'][$this->classparams['var_prefix'].'size'] = 0;
-		return;
-	}
-
-	private function mkdirp($path) {
-		// create subdir (hierary) below destdir;
-		$dirs = explode('/', $path);
-		$path = $this->classparams['destdir'];
-		foreach ($dirs as $dir) {
-			$path .= '/'.$dir;
-			if (!file_exists($path)) {  // @ does NOT always supress the error!
-				$_umask = umask(0); 	// override the system mask
-				@mkdir($path, $this->classparams['dirperm']);
-				umask($_umask);
-			}
-		}
-		if (!is_dir($path) && is_writable($path))
-		$this->abort('Destination dir not accessible');
-	}
-
-	/**
-	 * This method:
-	 * - Replaces some potentially dangerous characters by '_' (in the given name an relative path)
-	 * - Checks if a files of the same name already exists.
-	 * 		- If no: no problem.
-	 * 		- If yes, and the duplicate class param is set to rename, the file is renamed.
-	 * 		- If yes, and the duplicate class param is set to overwrite, the file is not renamed. The existing one will be erased.
-	 * 		- If yes, and the duplicate class param is set to reject, an error is thrown.
-	 */
-	private function dstfinal(&$name, &$subdir) {
-		$name = preg_replace('![`$\\\\/|]!', '_', $name);
-		if ($this->classparams['allow_subdirs'] && ($subdir != '')) {
-			$subdir = trim(preg_replace('!\\\\!','/',$subdir),'/');
-			$subdir = preg_replace('![`$|]!', '_', $subdir);
-			if (!$this->classparams['spaces_in_subdirs']) {
-				$subdir = str_replace(' ','_',$subdir);
-			}
-			// recursively create subdir
-			if (!$this->classparams['demo_mode'])
-			$this->mkdirp($subdir);
-			// append a slash
-			$subdir .= '/';
-		} else {
-			$subdir = '';
-		}
-		$ret = $this->classparams['destdir'].'/'.$subdir.$name;
-		if (file_exists($ret)) {
-			if ($this->classparams['duplicate'] === 'overwrite') {
-				return $ret;
-			}
-			if ($this->classparams['duplicate'] === 'reject') {
-				$this->abort('A file with the same name already exists');
-			}
-			if ($this->classparams['duplicate'] === 'warning') {
-				$this->warning("File $name already exists - rejected");
-			}
-			if ($this->classparams['duplicate'] === 'rename') {
-				$cnt = 1;
-				$dir = $this->classparams['destdir'].'/'.$subdir;
-				$ext = strrchr($name, '.');
-				if ($ext) {
-					$nameWithoutExtension = substr($name, 0, strlen($name) - strlen($ext));
-				} else {
-					$ext = '';
-					$nameWithoutExtension = $name;
-				}
-
-				$rtry = $dir.$nameWithoutExtension.'_'.$cnt.$ext;
-				while (file_exists($rtry)) {
-					$cnt++;
-					$rtry = $dir.$nameWithoutExtension.'._'.$cnt.$ext;
-				}
-				//We store the result name in the byReference name parameter.
-				$name = $nameWithoutExtension.'_'.$cnt.$ext;
-				$ret = $rtry;
-			}
-		}
-		return $ret;
-	}
-
-	/**
-	 * Example function to process the files uploaded.  This one simply displays the files' data.
-	 *
-	 */
-	public function defaultAfterUploadManagement() {
-		$flist = '[defaultAfterUploadManagement] Nb uploaded files is: ' . sizeof($this->files);
-		$flist = $this->classparams['http_flist_start'];
-		foreach ($this->files as $f) {
-			//$f is an array, that contains all info about the uploaded file.
-			$this->logDebug('defaultAfterUploadManagement', "  Reading file ${f['name']}");
-			$flist .= $this->classparams['http_flist_file_before'];
-			$flist .= $f['name'];
-			$flist .= $this->classparams['http_flist_file_between'];
-			$flist .= $f['size'];
-			$flist .= $this->classparams['http_flist_file_between'];
-			$flist .= $f['relativePath'];
-			$flist .= $this->classparams['http_flist_file_between'];
-			$flist .= $f['fullName'];
-			$flist .= $this->classparams['http_flist_file_between'];
-			$flist .= $f['md5sum'];
-			$addBR = false;
-			foreach ($f as $key=>$value) {
-				//If it's a specific key, let's display it:
-				if ($key !== 'name' && $key !== 'size' && $key !== 'relativePath' && $key !== 'fullName' && $key !== 'md5sum') {
-					if ($addBR) {
-						$flist .= "<br>";
-					} else {
-						// First line. We must add a new 'official' list separator.
-						$flist .= $this->classparams['http_flist_file_between'];
-						$addBR = true;
-					}
-					$flist .= "$key => $value";
-				}
-			}
-			$flist .= $this->classparams['http_flist_file_after'];
-	}
-	$flist .= $this->classparams['http_flist_end'];
-
-	return $flist;
+    var $appletparams;
+    var $classparams;
+    var $files;
+
+    public function JUpload($appletparams = array(), $classparams = array()) {
+        if (gettype($classparams) !== 'array')
+        $this->abort('Invalid type of parameter classparams: Expecting an array');
+        if (gettype($appletparams) !== 'array')
+        $this->abort('Invalid type of parameter appletparams: Expecting an array');
+
+        // set some defaults for the applet params
+        if (!isset($appletparams['afterUploadURL']))
+        $appletparams['afterUploadURL'] = $_SERVER['PHP_SELF'] . '?afterupload=1';
+        if (!isset($appletparams['name']))
+        $appletparams['name'] = 'JUpload';
+        if (!isset($appletparams['archive']))
+        $appletparams['archive'] = 'wjhk.jupload.jar';
+        if (!isset($appletparams['code']))
+        $appletparams['code'] = 'wjhk.jupload2.JUploadApplet';
+        if (!isset($appletparams['debugLevel']))
+        $appletparams['debugLevel'] = 0;
+        if (!isset($appletparams['httpUploadParameterType']))
+        $appletparams['httpUploadParameterType'] = 'array';
+        if (!isset($appletparams['showLogWindow']))
+        $appletparams['showLogWindow'] = ($appletparams['debugLevel'] > 0) ? 'true' : 'false';
+        if (!isset($appletparams['width']))
+        $appletparams['width'] = 640;
+        if (!isset($appletparams['height']))
+        $appletparams['height'] = ($appletparams['showLogWindow'] === 'true') ? 500 : 300;
+        if (!isset($appletparams['mayscript']))
+        $appletparams['mayscript'] = 'true';
+        if (!isset($appletparams['scriptable']))
+        $appletparams['scriptable'] = 'false';
+        //if (!isset($appletparams['stringUploadSuccess']))
+        $appletparams['stringUploadSuccess'] = 'SUCCESS';
+        //if (!isset($appletparams['stringUploadError']))
+        $appletparams['stringUploadError'] = 'ERROR: (.*)';
+        $maxpost = $this->tobytes(ini_get('post_max_size'));
+        $maxmem = $this->tobytes(ini_get('memory_limit'));
+        $maxfs = $this->tobytes(ini_get('upload_max_filesize'));
+        $obd = ini_get('open_basedir');
+        if (!isset($appletparams['maxChunkSize'])) {
+            $maxchunk = ($maxpost < $maxmem) ? $maxpost : $maxmem;
+            $maxchunk = ($maxchunk < $maxfs) ? $maxchunk : $maxfs;
+            $maxchunk /= 4;
+            $optchunk = (500000 > $maxchunk) ? $maxchunk : 500000;
+            $appletparams['maxChunkSize'] = $optchunk;
+        }
+        $appletparams['maxChunkSize'] = $this->tobytes($appletparams['maxChunkSize']);
+        if (!isset($appletparams['maxFileSize']))
+        $appletparams['maxFileSize'] = $maxfs;
+        $appletparams['maxFileSize'] = $this->tobytes($appletparams['maxFileSize']);
+        if (isset($classparams['errormail'])) {
+            $appletparams['urlToSendErrorTo'] = $_SERVER["PHP_SELF"] . '?errormail';
+        }
+
+        // Same for class parameters
+        if (!isset($classparams['demo_mode']))
+        $classparams['demo_mode'] = false;
+        if ($classparams['demo_mode']) {
+            $classparams['create_destdir'] = false;
+            $classparams['allow_subdirs'] = true;
+            $classparams['allow_zerosized'] = true;
+            $classparams['duplicate'] = 'overwrite';
+        }
+        if (!isset($classparams['debug_php']))											// set true to log some messages in PHP log
+        $classparams['debug_php'] = false;
+        if (!isset($this->classparams['allowed_mime_types']))				// array of allowed MIME type
+        $classparams['allowed_mime_types'] = 'all';
+        if (!isset($this->classparams['allowed_file_extensions'])) 	// array of allowed file extensions
+        $classparams['allowed_file_extensions'] = 'all';
+        if (!isset($classparams['verbose_errors']))						// shouldn't display server info on a production site!
+        $classparams['verbose_errors'] = true;
+        if (!isset($classparams['session_regenerate']))
+        $classparams['session_regenerate'] = false;
+        if (!isset($classparams['create_destdir']))
+        $classparams['create_destdir'] = true;
+        if (!isset($classparams['allow_subdirs']))
+        $classparams['allow_subdirs'] = false;
+        if (!isset($classparams['spaces_in_subdirs']))
+        $classparams['spaces_in_subdirs'] = false;
+        if (!isset($classparams['allow_zerosized']))
+        $classparams['allow_zerosized'] = false;
+        if (!isset($classparams['duplicate']))
+        $classparams['duplicate'] = 'rename';
+        if (!isset($classparams['dirperm']))
+        $classparams['dirperm'] = 0755;
+        if (!isset($classparams['fileperm']))
+        $classparams['fileperm'] = 0644;
+        if (!isset($classparams['destdir'])) {
+            if ($obd != '')
+            $classparams['destdir'] = $obd;
+            else
+            $classparams['destdir'] = '/var/tmp/jupload_test';
+        }else{
+            $classparams['destdir']=str_replace('~',' ',$classparams['destdir']);
+        }
+        if ($classparams['create_destdir']) {
+            $_umask = umask(0); 	// override the system mask
+            @mkdir($classparams['destdir'], $classparams['dirperm']);
+            umask($_umask);
+        }
+        if (!is_dir($classparams['destdir']) && is_writable($classparams['destdir']))
+        $this->abort('Destination dir not accessible');
+        if (!isset($classparams['tmp_prefix']))
+        $classparams['tmp_prefix'] = 'jutmp.';
+        if (!isset($classparams['var_prefix']))
+        $classparams['var_prefix'] = 'juvar.';
+        if (!isset($classparams['jscript_wrapper']))
+        $classparams['jscript_wrapper'] = 'JUploadSetProperty';
+        if (!isset($classparams['tag_jscript']))
+        $classparams['tag_jscript'] = '<!--JUPLOAD_JSCRIPT-->';
+        if (!isset($classparams['tag_applet']))
+        $classparams['tag_applet'] = '<!--JUPLOAD_APPLET-->';
+        if (!isset($classparams['tag_flist']))
+        $classparams['tag_flist'] = '<!--JUPLOAD_FILES-->';
+        if (!isset($classparams['http_flist_start']))
+        $classparams['http_flist_start'] =
+                    "<table border='1'><TR><TH>Filename</TH><TH>file size</TH><TH>Relative path</TH><TH>Full name</TH><TH>md5sum</TH><TH>Specific parameters</TH></TR>";
+        if (!isset($classparams['http_flist_end']))
+        $classparams['http_flist_end'] = "</table>\n";
+        if (!isset($classparams['http_flist_file_before']))
+        $classparams['http_flist_file_before'] = "<tr><td>";
+        if (!isset($classparams['http_flist_file_between']))
+        $classparams['http_flist_file_between'] = "</td><td>";
+        if (!isset($classparams['http_flist_file_after']))
+        $classparams['http_flist_file_after'] = "</td></tr>\n";
+
+        $this->appletparams = $appletparams;
+        $this->classparams = $classparams;
+        $this->page_start();
+    }
+
+    /**
+     * Return an array of uploaded files * The array contains: name, size, tmp_name, error,
+     * relativePath, md5sum, mimetype, fullName, path
+     */
+    public function uploadedfiles() {
+        return $this->files;
+    }
+
+    /**
+     * Log a message on the current output, as a HTML comment.
+     */
+    protected function logDebug($function, $msg, $htmlComment=true) {
+        $output = "[DEBUG] [$function] $msg";
+        if ($htmlComment) {
+            echo("<!-- $output -->\r\n");
+        } else {
+            echo("$output\r\n");
+        }
+    }
+
+    /**
+     * Log a message to the PHP log.
+     * Declared "protected" so it may be Extended if you require customised logging (e.g. particular log file location).
+     */
+    protected function logPHPDebug($function, $msg) {
+        if ($this->classparams['debug_php'] === true) {
+            $output = "[DEBUG] [$function] ".$this->arrayexpand($msg);
+            error_log($output);
+        }
+    }
+
+    private function arrayexpand($array) {
+        $output = '';
+        if (is_array($array)) {
+            foreach ($array as $key => $value) {
+                $output .= "\n ".$key.' => '.$this->arrayexpand($value);
+            }
+        } else {
+            $output .= $array;
+        }
+        return $output;
+    }
+
+
+    /**
+     * Convert a value ending in 'G','M' or 'K' to bytes
+     *
+     */
+    private function tobytes($val) {
+        $val = trim($val);
+        $last = fix_strtolower($val{strlen($val)-1});
+        switch($last) {
+            case 'g':
+                $val *= 1024;
+            case 'm':
+                $val *= 1024;
+            case 'k':
+                $val *= 1024;
+        }
+        return $val;
+    }
+
+    /**
+     * Build a string, containing a javascript wrapper function
+     * for setting applet properties via JavaScript. This is necessary,
+     * because we use the "modern" method of including the applet (using
+     * <object> resp. <embed> tags) in order to trigger automatic JRE downloading.
+     * Therefore, in Netscape-like browsers, the applet is accessible via
+     * the document.embeds[] array while in others, it is accessible via the
+     * document.applets[] array.
+     *
+     * @return A string, containing the necessary wrapper function (named JUploadSetProperty)
+     */
+    private function str_jsinit() {
+        $N = "\n";
+        $name = $this->appletparams['name'];
+        $ret = '<script type="text/javascript">'.$N;
+        $ret .= '<!--'.$N;
+        $ret .= 'function '.$this->classparams['jscript_wrapper'].'(name, value) {'.$N;
+        $ret .= '  document.applets["'.$name.'"] == null || document.applets["'.$name.'"].setProperty(name,value);'.$N;
+        $ret .= '  document.embeds["'.$name.'"] == null || document.embeds["'.$name.'"].setProperty(name,value);'.$N;
+        $ret .= '}'.$N;
+        $ret .= '//-->'.$N;
+        $ret .= '</script>';
+        return $ret;
+    }
+
+    /**
+     * Build a string, containing the applet tag with all parameters.
+     *
+     * @return A string, containing the applet tag
+     */
+    private function str_applet() {
+        $N = "\n";
+        $params = $this->appletparams;
+        // return the actual applet tag
+        $ret = '<object classid = "clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"'.$N;
+        $ret .= '  codebase = "http://java.sun.com/update/1.5.0/jinstall-1_5-windows-i586.cab#Version=5,0,0,3"'.$N;
+        $ret .= '  width = "'.$params['width'].'"'.$N;
+        $ret .= '  height = "'.$params['height'].'"'.$N;
+        $ret .= '  name = "'.$params['name'].'">'.$N;
+        foreach ($params as $key => $val) {
+            if ($key !== 'width' && $key !== 'height')
+            $ret .= '  <param name = "'.$key.'" value = "'.$val.'" />'.$N;
+        }
+        $ret .= '  <comment>'.$N;
+        $ret .= '    <embed'.$N;
+        $ret .= '      type = "application/x-java-applet;version=1.5"'.$N;
+        foreach ($params as $key => $val)
+        $ret .= '      '.$key.' = "'.$val.'"'.$N;
+        $ret .= '      pluginspage = "http://java.sun.com/products/plugin/index.html#download">'.$N;
+        $ret .= '      <noembed>'.$N;
+        $ret .= '        Java 1.5 or higher plugin required.'.$N;
+        $ret .= '      </noembed>'.$N;
+        $ret .= '    </embed>'.$N;
+        $ret .= '  </comment>'.$N;
+        $ret .= '</object>';
+        return $ret;
+    }
+
+    private function abort($msg = '') {
+        $this->cleanup();
+        if ($msg != '')
+        die(str_replace('(.*)',$msg,$this->appletparams['stringUploadError'])."\n");
+        exit;
+    }
+
+    private function warning($msg = '') {
+        $this->cleanup();
+        if ($msg != '')
+        echo('WARNING: '.$msg."\n");
+        echo $this->appletparams['stringUploadSuccess']."\n";
+        exit;
+    }
+
+    private function cleanup() {
+        // remove all uploaded files of *this* request
+        if (isset($_FILES)) {
+            foreach ($_FILES as $key => $val)
+            @unlink($val['tmp_name']);
+        }
+        // remove accumulated file, if any.
+        @unlink($this->classparams['destdir'].'/'.$this->classparams['tmp_prefix'].session_id());
+        @unlink($this->classparams['destdir'].'/'.$this->classparams['tmp_prefix'].'tmp'.session_id());
+        // reset session var
+        $_SESSION['RF'][$this->classparams['var_prefix'].'size'] = 0;
+        return;
+    }
+
+    private function mkdirp($path) {
+        // create subdir (hierary) below destdir;
+        $dirs = explode('/', $path);
+        $path = $this->classparams['destdir'];
+        foreach ($dirs as $dir) {
+            $path .= '/'.$dir;
+            if (!file_exists($path)) {  // @ does NOT always supress the error!
+                $_umask = umask(0); 	// override the system mask
+                @mkdir($path, $this->classparams['dirperm']);
+                umask($_umask);
+            }
+        }
+        if (!is_dir($path) && is_writable($path))
+        $this->abort('Destination dir not accessible');
+    }
+
+    /**
+     * This method:
+     * - Replaces some potentially dangerous characters by '_' (in the given name an relative path)
+     * - Checks if a files of the same name already exists.
+     * 		- If no: no problem.
+     * 		- If yes, and the duplicate class param is set to rename, the file is renamed.
+     * 		- If yes, and the duplicate class param is set to overwrite, the file is not renamed. The existing one will be erased.
+     * 		- If yes, and the duplicate class param is set to reject, an error is thrown.
+     */
+    private function dstfinal(&$name, &$subdir) {
+        $name = preg_replace('![`$\\\\/|]!', '_', $name);
+        if ($this->classparams['allow_subdirs'] && ($subdir != '')) {
+            $subdir = trim(preg_replace('!\\\\!','/',$subdir),'/');
+            $subdir = preg_replace('![`$|]!', '_', $subdir);
+            if (!$this->classparams['spaces_in_subdirs']) {
+                $subdir = str_replace(' ','_',$subdir);
+            }
+            // recursively create subdir
+            if (!$this->classparams['demo_mode'])
+            $this->mkdirp($subdir);
+            // append a slash
+            $subdir .= '/';
+        } else {
+            $subdir = '';
+        }
+        $ret = $this->classparams['destdir'].'/'.$subdir.$name;
+        if (file_exists($ret)) {
+            if ($this->classparams['duplicate'] === 'overwrite') {
+                return $ret;
+            }
+            if ($this->classparams['duplicate'] === 'reject') {
+                $this->abort('A file with the same name already exists');
+            }
+            if ($this->classparams['duplicate'] === 'warning') {
+                $this->warning("File $name already exists - rejected");
+            }
+            if ($this->classparams['duplicate'] === 'rename') {
+                $cnt = 1;
+                $dir = $this->classparams['destdir'].'/'.$subdir;
+                $ext = strrchr($name, '.');
+                if ($ext) {
+                    $nameWithoutExtension = substr($name, 0, strlen($name) - strlen($ext));
+                } else {
+                    $ext = '';
+                    $nameWithoutExtension = $name;
+                }
+
+                $rtry = $dir.$nameWithoutExtension.'_'.$cnt.$ext;
+                while (file_exists($rtry)) {
+                    $cnt++;
+                    $rtry = $dir.$nameWithoutExtension.'._'.$cnt.$ext;
+                }
+                //We store the result name in the byReference name parameter.
+                $name = $nameWithoutExtension.'_'.$cnt.$ext;
+                $ret = $rtry;
+            }
+        }
+        return $ret;
+    }
+
+    /**
+     * Example function to process the files uploaded.  This one simply displays the files' data.
+     *
+     */
+    public function defaultAfterUploadManagement() {
+        $flist = '[defaultAfterUploadManagement] Nb uploaded files is: ' . sizeof($this->files);
+        $flist = $this->classparams['http_flist_start'];
+        foreach ($this->files as $f) {
+            //$f is an array, that contains all info about the uploaded file.
+            $this->logDebug('defaultAfterUploadManagement', "  Reading file ${f['name']}");
+            $flist .= $this->classparams['http_flist_file_before'];
+            $flist .= $f['name'];
+            $flist .= $this->classparams['http_flist_file_between'];
+            $flist .= $f['size'];
+            $flist .= $this->classparams['http_flist_file_between'];
+            $flist .= $f['relativePath'];
+            $flist .= $this->classparams['http_flist_file_between'];
+            $flist .= $f['fullName'];
+            $flist .= $this->classparams['http_flist_file_between'];
+            $flist .= $f['md5sum'];
+            $addBR = false;
+            foreach ($f as $key=>$value) {
+                //If it's a specific key, let's display it:
+                if ($key !== 'name' && $key !== 'size' && $key !== 'relativePath' && $key !== 'fullName' && $key !== 'md5sum') {
+                    if ($addBR) {
+                        $flist .= "<br>";
+                    } else {
+                        // First line. We must add a new 'official' list separator.
+                        $flist .= $this->classparams['http_flist_file_between'];
+                        $addBR = true;
+                    }
+                    $flist .= "$key => $value";
+                }
+            }
+            $flist .= $this->classparams['http_flist_file_after'];
+    }
+    $flist .= $this->classparams['http_flist_end'];
+
+    return $flist;
 }
 
 /**
@@ -459,9 +459,9 @@ 
  * See the tag_jscript and tag_applet class parameters.
  */
 private function generateAppletTag($str) {
-	$this->logDebug('generateAppletTag', 'Entering function');
-	$str = preg_replace('/'.$this->classparams['tag_jscript'].'/', $this->str_jsinit(), $str);
-	return preg_replace('/'.$this->classparams['tag_applet'].'/', $this->str_applet(), $str);
+    $this->logDebug('generateAppletTag', 'Entering function');
+    $str = preg_replace('/'.$this->classparams['tag_jscript'].'/', $this->str_jsinit(), $str);
+    return preg_replace('/'.$this->classparams['tag_applet'].'/', $this->str_applet(), $str);
 }
 
 /**
@@ -471,8 +471,8 @@ 
  * This *must* be public, because it is called from PHP's output buffering
  */
 public function interceptBeforeUpload($str) {
-	$this->logDebug('interceptBeforeUpload', 'Entering function');
-	return $this->generateAppletTag($str);
+    $this->logDebug('interceptBeforeUpload', 'Entering function');
+    return $this->generateAppletTag($str);
 }
 
 /**
@@ -481,36 +481,36 @@ 
  * This *must* be public, because it is called from PHP's output buffering.
  */
 public function interceptAfterUpload($str) {
-	$this->logDebug('interceptAfterUpload', 'Entering function');
-	$this->logPHPDebug('interceptAfterUpload', $this->files);
-
-	if (count($this->files) > 0) {
-		if (isset($this->classparams['callbackAfterUploadManagement'])) {
-			$this->logDebug('interceptAfterUpload', 'Before call of ' .$this->classparams['callbackAfterUploadManagement']);
-			$strForFListContent = call_user_func($this->classparams['callbackAfterUploadManagement'], $this, $this->files);
-		} else {
-			$strForFListContent = $this->defaultAfterUploadManagement();
-		}
-		$str = preg_replace('/'.$this->classparams['tag_flist'].'/', $strForFListContent, $str);
-	}
-	return $this->generateAppletTag($str);
+    $this->logDebug('interceptAfterUpload', 'Entering function');
+    $this->logPHPDebug('interceptAfterUpload', $this->files);
+
+    if (count($this->files) > 0) {
+        if (isset($this->classparams['callbackAfterUploadManagement'])) {
+            $this->logDebug('interceptAfterUpload', 'Before call of ' .$this->classparams['callbackAfterUploadManagement']);
+            $strForFListContent = call_user_func($this->classparams['callbackAfterUploadManagement'], $this, $this->files);
+        } else {
+            $strForFListContent = $this->defaultAfterUploadManagement();
+        }
+        $str = preg_replace('/'.$this->classparams['tag_flist'].'/', $strForFListContent, $str);
+    }
+    return $this->generateAppletTag($str);
 }
 
 /**
  * This method manages the receiving of the debug log, when an error occurs.
  */
 private function receive_debug_log() {
-	// handle error report
-	if (isset($_POST['description']) && isset($_POST['log'])) {
-		$msg = $_POST['log'];
-		mail($this->classparams['errormail'], $_POST['description'], $msg);
-	} else {
-		if (isset($_SERVER['SERVER_ADMIN']))
-		mail($_SERVER['SERVER_ADMIN'], 'Empty jupload error log',
+    // handle error report
+    if (isset($_POST['description']) && isset($_POST['log'])) {
+        $msg = $_POST['log'];
+        mail($this->classparams['errormail'], $_POST['description'], $msg);
+    } else {
+        if (isset($_SERVER['SERVER_ADMIN']))
+        mail($_SERVER['SERVER_ADMIN'], 'Empty jupload error log',
                     'An empty log has just been posted.');
-		$this->logPHPDebug('receive_debug_log', 'Empty error log received');
-	}
-	exit;
+        $this->logPHPDebug('receive_debug_log', 'Empty error log received');
+    }
+    exit;
 }
 
 /**
@@ -522,180 +522,180 @@ 
  * Or you can Extend the class and redeclare defaultAfterUploadManagement() to your needs.
  */
 private function receive_uploaded_files() {
-	$this->logDebug('receive_uploaded_files', 'Entering POST management');
-
-	if (session_id() == '') {
-		session_start();
-	}
-	// we check for the session *after* handling possible error log
-	// because an error could have happened because the session-id is missing.
-	if (!isset($_SESSION['RF'][$this->classparams['var_prefix'].'size'])) {
-		$this->abort('Invalid session (in afterupload, POST, check of size)');
-	}
-	if (!isset($_SESSION['RF'][$this->classparams['var_prefix'].'files'])) {
-		$this->abort('Invalid session (in afterupload, POST, check of files)');
-	}
-	$this->files = $_SESSION['RF'][$this->classparams['var_prefix'].'files'];
-	if (!is_array($this->files)) {
-		$this->abort('Invalid session (in afterupload, POST, is_array(files))');
-	}
-	if ($this->appletparams['sendMD5Sum'] === 'true'  &&  !isset($_POST['md5sum'])) {
-		$this->abort('Required POST variable md5sum is missing');
-	}
-	$cnt = 0;
-	foreach ($_FILES as $key => $value) {
-		//Let's read the $_FILES data
-		if (isset($files_data)) {
-			unset($files_data);
-		}
-		$jupart			= (isset($_POST['jupart']))		 		? (int)$_POST['jupart']		: 0;
-		$jufinal		= (isset($_POST['jufinal']))	 		? (int)$_POST['jufinal']	: 1;
-		$relpaths		= (isset($_POST['relpathinfo'])) 	? $_POST['relpathinfo']		: null;
-		$md5sums		= (isset($_POST['md5sum']))				? $_POST['md5sum']				: null;
-		$mimetypes 	= (isset($_POST['mimetype'])) 	 	? $_POST['mimetype'] 			: null;
-		//$relpaths = (isset($_POST["relpathinfo$cnt"])) ? $_POST["relpathinfo$cnt"] : null;
-		//$md5sums = (isset($_POST["md5sum$cnt"])) ? $_POST["md5sum$cnt"] : null;
-
-		if (gettype($relpaths) === 'string') {
-			$relpaths = array($relpaths);
-		}
-		if (gettype($md5sums) === 'string') {
-			$md5sums = array($md5sums);
-		}
-		if ($this->appletparams['sendMD5Sum'] === 'true'  && !is_array($md5sums)) {
-			$this->abort('Expecting an array of MD5 checksums');
-		}
-		if (!is_array($relpaths)) {
-			$this->abort('Expecting an array of relative paths');
-		}
-		if (!is_array($mimetypes)) {
-			$this->abort('Expecting an array of MIME types');
-		}
-		// Check the MIME type (note: this is easily forged!)
-		if (isset($this->classparams['allowed_mime_types']) && is_array($this->classparams['allowed_mime_types'])) {
-			if (!in_array($mimetypes[$cnt], $this->classparams['allowed_mime_types'])) {
-				$this->abort('MIME type '.$mimetypes[$cnt].' not allowed');
-			}
-		}
-		if (isset($this->classparams['allowed_file_extensions']) && is_array($this->classparams['allowed_file_extensions'])) {
-			$fileExtension = substr(strrchr($value['name'][$cnt], "."), 1);
-			if (!in_array($fileExtension, $this->classparams['allowed_file_extensions'])) {
-				$this->abort('File extension '.$fileExtension.' not allowed');
-			}
-		}
-
-		$dstdir = $this->classparams['destdir'];
-		$dstname = $dstdir.'/'.$this->classparams['tmp_prefix'].session_id();
-		$tmpname = $dstdir.'/'.$this->classparams['tmp_prefix'].'tmp'.session_id();
-
-		// Controls are now done. Let's store the current uploaded files properties in an array, for future use.
-		$files_data['name']					= $value['name'][$cnt];
-		$files_data['size']					= 'not calculated yet';
-		$files_data['tmp_name']			= $value['tmp_name'][$cnt];
-		$files_data['error']    		= $value['error'][$cnt];
-		$files_data['relativePath'] = $relpaths[$cnt];
-		$files_data['md5sum']  			= $md5sums[$cnt];
-		$files_data['mimetype']  		= $mimetypes[$cnt];
-
-		if (!move_uploaded_file($files_data['tmp_name'], $tmpname)) {
-			if ($classparams['verbose_errors']) {
-				$this->abort("Unable to move uploaded file (from ${files_data['tmp_name']} to $tmpname)");
-		} else {
-			trigger_error("Unable to move uploaded file (from ${files_data['tmp_name']} to $tmpname)",E_USER_WARNING);
-			$this->abort("Unable to move uploaded file");
-	}
+    $this->logDebug('receive_uploaded_files', 'Entering POST management');
+
+    if (session_id() == '') {
+        session_start();
+    }
+    // we check for the session *after* handling possible error log
+    // because an error could have happened because the session-id is missing.
+    if (!isset($_SESSION['RF'][$this->classparams['var_prefix'].'size'])) {
+        $this->abort('Invalid session (in afterupload, POST, check of size)');
+    }
+    if (!isset($_SESSION['RF'][$this->classparams['var_prefix'].'files'])) {
+        $this->abort('Invalid session (in afterupload, POST, check of files)');
+    }
+    $this->files = $_SESSION['RF'][$this->classparams['var_prefix'].'files'];
+    if (!is_array($this->files)) {
+        $this->abort('Invalid session (in afterupload, POST, is_array(files))');
+    }
+    if ($this->appletparams['sendMD5Sum'] === 'true'  &&  !isset($_POST['md5sum'])) {
+        $this->abort('Required POST variable md5sum is missing');
+    }
+    $cnt = 0;
+    foreach ($_FILES as $key => $value) {
+        //Let's read the $_FILES data
+        if (isset($files_data)) {
+            unset($files_data);
+        }
+        $jupart			= (isset($_POST['jupart']))		 		? (int)$_POST['jupart']		: 0;
+        $jufinal		= (isset($_POST['jufinal']))	 		? (int)$_POST['jufinal']	: 1;
+        $relpaths		= (isset($_POST['relpathinfo'])) 	? $_POST['relpathinfo']		: null;
+        $md5sums		= (isset($_POST['md5sum']))				? $_POST['md5sum']				: null;
+        $mimetypes 	= (isset($_POST['mimetype'])) 	 	? $_POST['mimetype'] 			: null;
+        //$relpaths = (isset($_POST["relpathinfo$cnt"])) ? $_POST["relpathinfo$cnt"] : null;
+        //$md5sums = (isset($_POST["md5sum$cnt"])) ? $_POST["md5sum$cnt"] : null;
+
+        if (gettype($relpaths) === 'string') {
+            $relpaths = array($relpaths);
+        }
+        if (gettype($md5sums) === 'string') {
+            $md5sums = array($md5sums);
+        }
+        if ($this->appletparams['sendMD5Sum'] === 'true'  && !is_array($md5sums)) {
+            $this->abort('Expecting an array of MD5 checksums');
+        }
+        if (!is_array($relpaths)) {
+            $this->abort('Expecting an array of relative paths');
+        }
+        if (!is_array($mimetypes)) {
+            $this->abort('Expecting an array of MIME types');
+        }
+        // Check the MIME type (note: this is easily forged!)
+        if (isset($this->classparams['allowed_mime_types']) && is_array($this->classparams['allowed_mime_types'])) {
+            if (!in_array($mimetypes[$cnt], $this->classparams['allowed_mime_types'])) {
+                $this->abort('MIME type '.$mimetypes[$cnt].' not allowed');
+            }
+        }
+        if (isset($this->classparams['allowed_file_extensions']) && is_array($this->classparams['allowed_file_extensions'])) {
+            $fileExtension = substr(strrchr($value['name'][$cnt], "."), 1);
+            if (!in_array($fileExtension, $this->classparams['allowed_file_extensions'])) {
+                $this->abort('File extension '.$fileExtension.' not allowed');
+            }
+        }
+
+        $dstdir = $this->classparams['destdir'];
+        $dstname = $dstdir.'/'.$this->classparams['tmp_prefix'].session_id();
+        $tmpname = $dstdir.'/'.$this->classparams['tmp_prefix'].'tmp'.session_id();
+
+        // Controls are now done. Let's store the current uploaded files properties in an array, for future use.
+        $files_data['name']					= $value['name'][$cnt];
+        $files_data['size']					= 'not calculated yet';
+        $files_data['tmp_name']			= $value['tmp_name'][$cnt];
+        $files_data['error']    		= $value['error'][$cnt];
+        $files_data['relativePath'] = $relpaths[$cnt];
+        $files_data['md5sum']  			= $md5sums[$cnt];
+        $files_data['mimetype']  		= $mimetypes[$cnt];
+
+        if (!move_uploaded_file($files_data['tmp_name'], $tmpname)) {
+            if ($classparams['verbose_errors']) {
+                $this->abort("Unable to move uploaded file (from ${files_data['tmp_name']} to $tmpname)");
+        } else {
+            trigger_error("Unable to move uploaded file (from ${files_data['tmp_name']} to $tmpname)",E_USER_WARNING);
+            $this->abort("Unable to move uploaded file");
+    }
 }
 
 // In demo mode, no file storing is done. We just delete the newly uploaded file.
 if ($this->classparams['demo_mode']) {
-	if ($jufinal || (!$jupart)) {
-		if ($jupart) {
-			$files_data['size']		= ($jupart-1) * $this->appletparams['maxChunkSize'] + filesize($tmpname);
-		} else {
-			$files_data['size']		= filesize($tmpname);
-		}
-		$files_data['fullName']	= 'Demo mode<BR>No file storing';
-		array_push($this->files, $files_data);
-	}
-	unlink($tmpname);
-	$cnt++;
-	continue;
+    if ($jufinal || (!$jupart)) {
+        if ($jupart) {
+            $files_data['size']		= ($jupart-1) * $this->appletparams['maxChunkSize'] + filesize($tmpname);
+        } else {
+            $files_data['size']		= filesize($tmpname);
+        }
+        $files_data['fullName']	= 'Demo mode<BR>No file storing';
+        array_push($this->files, $files_data);
+    }
+    unlink($tmpname);
+    $cnt++;
+    continue;
 }
 //If we get here, the upload is a real one (no demo)
 if ($jupart) {
-	// got a chunk of a multi-part upload
-	$len = filesize($tmpname);
-	$_SESSION['RF'][$this->classparams['var_prefix'].'size'] += $len;
-	if ($len > 0) {
-		$src = fopen($tmpname, 'rb');
-		$dst = fopen($dstname, ($jupart == 1) ? 'wb' : 'ab');
-		while ($len > 0) {
-			$rlen = ($len > 8192) ? 8192 : $len;
-			$buf = fread($src, $rlen);
-			if (!$buf) {
-				fclose($src);
-				fclose($dst);
-				unlink($dstname);
-				$this->abort('read IO error');
-			}
-			if (!fwrite($dst, $buf, $rlen)) {
-				fclose($src);
-				fclose($dst);
-				unlink($dstname);
-				$this->abort('write IO error');
-			}
-			$len -= $rlen;
-		}
-		fclose($src);
-		fclose($dst);
-		unlink($tmpname);
-	}
-	if ($jufinal) {
-		// This is the last chunk. Check total lenght and
-		// rename it to it's final name.
-		$dlen = filesize($dstname);
-		if ($dlen != $_SESSION['RF'][$this->classparams['var_prefix'].'size'])
-		$this->abort('file size mismatch');
-		if ($this->appletparams['sendMD5Sum'] === 'true' ) {
-			if ($md5sums[$cnt] != md5_file($dstname))
-			$this->abort('MD5 checksum mismatch');
-		}
-		// remove zero sized files
-		if (($dlen > 0) || $this->classparams['allow_zerosized']) {
-			$dstfinal = $this->dstfinal($files_data['name'],$files_data['relativePath']);
-			if (!rename($dstname, $dstfinal))
-			$this->abort('rename IO error');
-			$_umask = umask(0); 	// override the system mask
-			if (!chmod($dstfinal, $this->classparams['fileperm']))
-				$this->abort('chmod IO error');
-			umask($_umask);
-			$files_data['size']		= filesize($dstfinal);
-			$files_data['fullName']	= $dstfinal;
-			$files_data['path']	= fix_dirname($dstfinal);
-			array_push($this->files, $files_data);
-		} else {
-			unlink($dstname);
-		}
-		// reset session var
-		$_SESSION['RF'][$this->classparams['var_prefix'].'size'] = 0;
-	}
+    // got a chunk of a multi-part upload
+    $len = filesize($tmpname);
+    $_SESSION['RF'][$this->classparams['var_prefix'].'size'] += $len;
+    if ($len > 0) {
+        $src = fopen($tmpname, 'rb');
+        $dst = fopen($dstname, ($jupart == 1) ? 'wb' : 'ab');
+        while ($len > 0) {
+            $rlen = ($len > 8192) ? 8192 : $len;
+            $buf = fread($src, $rlen);
+            if (!$buf) {
+                fclose($src);
+                fclose($dst);
+                unlink($dstname);
+                $this->abort('read IO error');
+            }
+            if (!fwrite($dst, $buf, $rlen)) {
+                fclose($src);
+                fclose($dst);
+                unlink($dstname);
+                $this->abort('write IO error');
+            }
+            $len -= $rlen;
+        }
+        fclose($src);
+        fclose($dst);
+        unlink($tmpname);
+    }
+    if ($jufinal) {
+        // This is the last chunk. Check total lenght and
+        // rename it to it's final name.
+        $dlen = filesize($dstname);
+        if ($dlen != $_SESSION['RF'][$this->classparams['var_prefix'].'size'])
+        $this->abort('file size mismatch');
+        if ($this->appletparams['sendMD5Sum'] === 'true' ) {
+            if ($md5sums[$cnt] != md5_file($dstname))
+            $this->abort('MD5 checksum mismatch');
+        }
+        // remove zero sized files
+        if (($dlen > 0) || $this->classparams['allow_zerosized']) {
+            $dstfinal = $this->dstfinal($files_data['name'],$files_data['relativePath']);
+            if (!rename($dstname, $dstfinal))
+            $this->abort('rename IO error');
+            $_umask = umask(0); 	// override the system mask
+            if (!chmod($dstfinal, $this->classparams['fileperm']))
+                $this->abort('chmod IO error');
+            umask($_umask);
+            $files_data['size']		= filesize($dstfinal);
+            $files_data['fullName']	= $dstfinal;
+            $files_data['path']	= fix_dirname($dstfinal);
+            array_push($this->files, $files_data);
+        } else {
+            unlink($dstname);
+        }
+        // reset session var
+        $_SESSION['RF'][$this->classparams['var_prefix'].'size'] = 0;
+    }
 } else {
-	// Got a single file upload. Trivial.
-	if ($this->appletparams['sendMD5Sum'] === 'true' ) {
-		if ($md5sums[$cnt] != md5_file($tmpname))
-			$this->abort('MD5 checksum mismatch');
-	}
-	$dstfinal = $this->dstfinal($files_data['name'],$files_data['relativePath']);
-	if (!rename($tmpname, $dstfinal))
-	$this->abort('rename IO error');
-	$_umask = umask(0); 	// override the system mask
-	if (!chmod($dstfinal, $this->classparams['fileperm']))
-		$this->abort('chmod IO error');
-	umask($_umask);
-	$files_data['size']		= filesize($dstfinal);
-	$files_data['fullName']	= $dstfinal;
-	$files_data['path']	= fix_dirname($dstfinal);
-	array_push($this->files, $files_data);
+    // Got a single file upload. Trivial.
+    if ($this->appletparams['sendMD5Sum'] === 'true' ) {
+        if ($md5sums[$cnt] != md5_file($tmpname))
+            $this->abort('MD5 checksum mismatch');
+    }
+    $dstfinal = $this->dstfinal($files_data['name'],$files_data['relativePath']);
+    if (!rename($tmpname, $dstfinal))
+    $this->abort('rename IO error');
+    $_umask = umask(0); 	// override the system mask
+    if (!chmod($dstfinal, $this->classparams['fileperm']))
+        $this->abort('chmod IO error');
+    umask($_umask);
+    $files_data['size']		= filesize($dstfinal);
+    $files_data['fullName']	= $dstfinal;
+    $files_data['path']	= fix_dirname($dstfinal);
+    array_push($this->files, $files_data);
 }
 $cnt++;
 }
@@ -711,56 +711,56 @@ 
  *
  */
 private function page_start() {
-	$this->logDebug('page_start', 'Entering function');
-
-	// If the applet checks for the serverProtocol, it issues a HEAD request
-	// -> Simply return an empty doc.
-	if ($_SERVER['REQUEST_METHOD'] === 'HEAD') {
-		// Nothing to do
-
-	} else if ($_SERVER['REQUEST_METHOD'] === 'GET') {
-		// A GET request means: return upload page
-		$this->logDebug('page_start', 'Entering GET management');
-
-		if (session_id() == '') {
-			session_start();
-		}
-		if (isset($_GET['afterupload'])) {
-			$this->logDebug('page_start', 'afterupload is set');
-			if (!isset($_SESSION['RF'][$this->classparams['var_prefix'].'files'])) {
-				$this->abort('Invalid session (in afterupload, GET, check of $_SESSION["RF"]): files array is not set');
-			}
-			$this->files = $_SESSION['RF'][$this->classparams['var_prefix'].'files'];
-			if (!is_array($this->files)) {
-				$this->abort('Invalid session (in afterupload, GET, check of is_array(files)): files is not an array');
-			}
-			// clear session data ready for new upload
-			$_SESSION['RF'][$this->classparams['var_prefix'].'files'] = array();
-
-			// start intercepting the content of the calling page, to display the upload result.
-			ob_start(array(& $this, 'interceptAfterUpload'));
-
-		} else {
-			$this->logDebug('page_start', 'afterupload is not set');
-			if ($this->classparams['session_regenerate']) {
-				session_regenerate_id(true);
-			}
-			$this->files = array();
-			$_SESSION['RF'][$this->classparams['var_prefix'].'size'] = 0;
-			$_SESSION['RF'][$this->classparams['var_prefix'].'files'] = $this->files;
-			// start intercepting the content of the calling page, to display the applet tag.
-			ob_start(array(& $this, 'interceptBeforeUpload'));
-		}
-
-	} else if ($_SERVER['REQUEST_METHOD'] === 'POST') {
-		// If we got a POST request, this is the real work.
-		if (isset($_GET['errormail'])) {
-			//Hum, an error occurs on server side. Let's manage the debug log, that we just received.
-			$this->receive_debug_log();
-		} else {
-			$this->receive_uploaded_files();
-		}
-	}
+    $this->logDebug('page_start', 'Entering function');
+
+    // If the applet checks for the serverProtocol, it issues a HEAD request
+    // -> Simply return an empty doc.
+    if ($_SERVER['REQUEST_METHOD'] === 'HEAD') {
+        // Nothing to do
+
+    } else if ($_SERVER['REQUEST_METHOD'] === 'GET') {
+        // A GET request means: return upload page
+        $this->logDebug('page_start', 'Entering GET management');
+
+        if (session_id() == '') {
+            session_start();
+        }
+        if (isset($_GET['afterupload'])) {
+            $this->logDebug('page_start', 'afterupload is set');
+            if (!isset($_SESSION['RF'][$this->classparams['var_prefix'].'files'])) {
+                $this->abort('Invalid session (in afterupload, GET, check of $_SESSION["RF"]): files array is not set');
+            }
+            $this->files = $_SESSION['RF'][$this->classparams['var_prefix'].'files'];
+            if (!is_array($this->files)) {
+                $this->abort('Invalid session (in afterupload, GET, check of is_array(files)): files is not an array');
+            }
+            // clear session data ready for new upload
+            $_SESSION['RF'][$this->classparams['var_prefix'].'files'] = array();
+
+            // start intercepting the content of the calling page, to display the upload result.
+            ob_start(array(& $this, 'interceptAfterUpload'));
+
+        } else {
+            $this->logDebug('page_start', 'afterupload is not set');
+            if ($this->classparams['session_regenerate']) {
+                session_regenerate_id(true);
+            }
+            $this->files = array();
+            $_SESSION['RF'][$this->classparams['var_prefix'].'size'] = 0;
+            $_SESSION['RF'][$this->classparams['var_prefix'].'files'] = $this->files;
+            // start intercepting the content of the calling page, to display the applet tag.
+            ob_start(array(& $this, 'interceptBeforeUpload'));
+        }
+
+    } else if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+        // If we got a POST request, this is the real work.
+        if (isset($_GET['errormail'])) {
+            //Hum, an error occurs on server side. Let's manage the debug log, that we just received.
+            $this->receive_debug_log();
+        } else {
+            $this->receive_uploaded_files();
+        }
+    }
 }
 }
 

Spacing +37 added lines, -37 removed lines

@@ -66,7 +66,7 @@ 
 
 		// set some defaults for the applet params
 		if (!isset($appletparams['afterUploadURL']))
-		$appletparams['afterUploadURL'] = $_SERVER['PHP_SELF'] . '?afterupload=1';
+		$appletparams['afterUploadURL'] = $_SERVER['PHP_SELF'].'?afterupload=1';
 		if (!isset($appletparams['name']))
 		$appletparams['name'] = 'JUpload';
 		if (!isset($appletparams['archive']))
@@ -107,7 +107,7 @@ 
 		$appletparams['maxFileSize'] = $maxfs;
 		$appletparams['maxFileSize'] = $this->tobytes($appletparams['maxFileSize']);
 		if (isset($classparams['errormail'])) {
-			$appletparams['urlToSendErrorTo'] = $_SERVER["PHP_SELF"] . '?errormail';
+			$appletparams['urlToSendErrorTo'] = $_SERVER["PHP_SELF"].'?errormail';
 		}
 
 		// Same for class parameters
@@ -148,11 +148,11 @@ 
 			$classparams['destdir'] = $obd;
 			else
 			$classparams['destdir'] = '/var/tmp/jupload_test';
-		}else{
-			$classparams['destdir']=str_replace('~',' ',$classparams['destdir']);
+		} else {
+			$classparams['destdir'] = str_replace('~', ' ', $classparams['destdir']);
 		}
 		if ($classparams['create_destdir']) {
-			$_umask = umask(0); 	// override the system mask
+			$_umask = umask(0); // override the system mask
 			@mkdir($classparams['destdir'], $classparams['dirperm']);
 			umask($_umask);
 		}
@@ -198,7 +198,7 @@ 
 	/**
 	 * Log a message on the current output, as a HTML comment.
 	 */
-	protected function logDebug($function, $msg, $htmlComment=true) {
+	protected function logDebug($function, $msg, $htmlComment = true) {
 		$output = "[DEBUG] [$function] $msg";
 		if ($htmlComment) {
 			echo("<!-- $output -->\r\n");
@@ -237,8 +237,8 @@ 
 	 */
 	private function tobytes($val) {
 		$val = trim($val);
-		$last = fix_strtolower($val{strlen($val)-1});
-		switch($last) {
+		$last = fix_strtolower($val{strlen($val) - 1});
+		switch ($last) {
 			case 'g':
 				$val *= 1024;
 			case 'm':
@@ -310,7 +310,7 @@ 
 	private function abort($msg = '') {
 		$this->cleanup();
 		if ($msg != '')
-		die(str_replace('(.*)',$msg,$this->appletparams['stringUploadError'])."\n");
+		die(str_replace('(.*)', $msg, $this->appletparams['stringUploadError'])."\n");
 		exit;
 	}
 
@@ -343,7 +343,7 @@ 
 		foreach ($dirs as $dir) {
 			$path .= '/'.$dir;
 			if (!file_exists($path)) {  // @ does NOT always supress the error!
-				$_umask = umask(0); 	// override the system mask
+				$_umask = umask(0); // override the system mask
 				@mkdir($path, $this->classparams['dirperm']);
 				umask($_umask);
 			}
@@ -364,10 +364,10 @@ 
 	private function dstfinal(&$name, &$subdir) {
 		$name = preg_replace('![`$\\\\/|]!', '_', $name);
 		if ($this->classparams['allow_subdirs'] && ($subdir != '')) {
-			$subdir = trim(preg_replace('!\\\\!','/',$subdir),'/');
+			$subdir = trim(preg_replace('!\\\\!', '/', $subdir), '/');
 			$subdir = preg_replace('![`$|]!', '_', $subdir);
 			if (!$this->classparams['spaces_in_subdirs']) {
-				$subdir = str_replace(' ','_',$subdir);
+				$subdir = str_replace(' ', '_', $subdir);
 			}
 			// recursively create subdir
 			if (!$this->classparams['demo_mode'])
@@ -417,7 +417,7 @@ 
 	 *
 	 */
 	public function defaultAfterUploadManagement() {
-		$flist = '[defaultAfterUploadManagement] Nb uploaded files is: ' . sizeof($this->files);
+		$flist = '[defaultAfterUploadManagement] Nb uploaded files is: '.sizeof($this->files);
 		$flist = $this->classparams['http_flist_start'];
 		foreach ($this->files as $f) {
 			//$f is an array, that contains all info about the uploaded file.
@@ -486,7 +486,7 @@ 
 
 	if (count($this->files) > 0) {
 		if (isset($this->classparams['callbackAfterUploadManagement'])) {
-			$this->logDebug('interceptAfterUpload', 'Before call of ' .$this->classparams['callbackAfterUploadManagement']);
+			$this->logDebug('interceptAfterUpload', 'Before call of '.$this->classparams['callbackAfterUploadManagement']);
 			$strForFListContent = call_user_func($this->classparams['callbackAfterUploadManagement'], $this, $this->files);
 		} else {
 			$strForFListContent = $this->defaultAfterUploadManagement();
@@ -539,7 +539,7 @@ 
 	if (!is_array($this->files)) {
 		$this->abort('Invalid session (in afterupload, POST, is_array(files))');
 	}
-	if ($this->appletparams['sendMD5Sum'] === 'true'  &&  !isset($_POST['md5sum'])) {
+	if ($this->appletparams['sendMD5Sum'] === 'true' && !isset($_POST['md5sum'])) {
 		$this->abort('Required POST variable md5sum is missing');
 	}
 	$cnt = 0;
@@ -548,11 +548,11 @@ 
 		if (isset($files_data)) {
 			unset($files_data);
 		}
-		$jupart			= (isset($_POST['jupart']))		 		? (int)$_POST['jupart']		: 0;
-		$jufinal		= (isset($_POST['jufinal']))	 		? (int)$_POST['jufinal']	: 1;
-		$relpaths		= (isset($_POST['relpathinfo'])) 	? $_POST['relpathinfo']		: null;
-		$md5sums		= (isset($_POST['md5sum']))				? $_POST['md5sum']				: null;
-		$mimetypes 	= (isset($_POST['mimetype'])) 	 	? $_POST['mimetype'] 			: null;
+		$jupart			= (isset($_POST['jupart'])) ? (int)$_POST['jupart'] : 0;
+		$jufinal		= (isset($_POST['jufinal'])) ? (int)$_POST['jufinal'] : 1;
+		$relpaths = (isset($_POST['relpathinfo'])) ? $_POST['relpathinfo'] : null;
+		$md5sums		= (isset($_POST['md5sum'])) ? $_POST['md5sum'] : null;
+		$mimetypes = (isset($_POST['mimetype'])) ? $_POST['mimetype'] : null;
 		//$relpaths = (isset($_POST["relpathinfo$cnt"])) ? $_POST["relpathinfo$cnt"] : null;
 		//$md5sums = (isset($_POST["md5sum$cnt"])) ? $_POST["md5sum$cnt"] : null;
 
@@ -562,7 +562,7 @@ 
 		if (gettype($md5sums) === 'string') {
 			$md5sums = array($md5sums);
 		}
-		if ($this->appletparams['sendMD5Sum'] === 'true'  && !is_array($md5sums)) {
+		if ($this->appletparams['sendMD5Sum'] === 'true' && !is_array($md5sums)) {
 			$this->abort('Expecting an array of MD5 checksums');
 		}
 		if (!is_array($relpaths)) {
@@ -595,13 +595,13 @@ 
 		$files_data['error']    		= $value['error'][$cnt];
 		$files_data['relativePath'] = $relpaths[$cnt];
 		$files_data['md5sum']  			= $md5sums[$cnt];
-		$files_data['mimetype']  		= $mimetypes[$cnt];
+		$files_data['mimetype'] = $mimetypes[$cnt];
 
 		if (!move_uploaded_file($files_data['tmp_name'], $tmpname)) {
 			if ($classparams['verbose_errors']) {
 				$this->abort("Unable to move uploaded file (from ${files_data['tmp_name']} to $tmpname)");
 		} else {
-			trigger_error("Unable to move uploaded file (from ${files_data['tmp_name']} to $tmpname)",E_USER_WARNING);
+			trigger_error("Unable to move uploaded file (from ${files_data['tmp_name']} to $tmpname)", E_USER_WARNING);
 			$this->abort("Unable to move uploaded file");
 	}
 }
@@ -610,11 +610,11 @@ 
 if ($this->classparams['demo_mode']) {
 	if ($jufinal || (!$jupart)) {
 		if ($jupart) {
-			$files_data['size']		= ($jupart-1) * $this->appletparams['maxChunkSize'] + filesize($tmpname);
+			$files_data['size']		= ($jupart - 1) * $this->appletparams['maxChunkSize'] + filesize($tmpname);
 		} else {
 			$files_data['size']		= filesize($tmpname);
 		}
-		$files_data['fullName']	= 'Demo mode<BR>No file storing';
+		$files_data['fullName'] = 'Demo mode<BR>No file storing';
 		array_push($this->files, $files_data);
 	}
 	unlink($tmpname);
@@ -656,22 +656,22 @@ 
 		$dlen = filesize($dstname);
 		if ($dlen != $_SESSION['RF'][$this->classparams['var_prefix'].'size'])
 		$this->abort('file size mismatch');
-		if ($this->appletparams['sendMD5Sum'] === 'true' ) {
+		if ($this->appletparams['sendMD5Sum'] === 'true') {
 			if ($md5sums[$cnt] != md5_file($dstname))
 			$this->abort('MD5 checksum mismatch');
 		}
 		// remove zero sized files
 		if (($dlen > 0) || $this->classparams['allow_zerosized']) {
-			$dstfinal = $this->dstfinal($files_data['name'],$files_data['relativePath']);
+			$dstfinal = $this->dstfinal($files_data['name'], $files_data['relativePath']);
 			if (!rename($dstname, $dstfinal))
 			$this->abort('rename IO error');
-			$_umask = umask(0); 	// override the system mask
+			$_umask = umask(0); // override the system mask
 			if (!chmod($dstfinal, $this->classparams['fileperm']))
 				$this->abort('chmod IO error');
 			umask($_umask);
-			$files_data['size']		= filesize($dstfinal);
-			$files_data['fullName']	= $dstfinal;
-			$files_data['path']	= fix_dirname($dstfinal);
+			$files_data['size'] = filesize($dstfinal);
+			$files_data['fullName'] = $dstfinal;
+			$files_data['path'] = fix_dirname($dstfinal);
 			array_push($this->files, $files_data);
 		} else {
 			unlink($dstname);
@@ -681,20 +681,20 @@ 
 	}
 } else {
 	// Got a single file upload. Trivial.
-	if ($this->appletparams['sendMD5Sum'] === 'true' ) {
+	if ($this->appletparams['sendMD5Sum'] === 'true') {
 		if ($md5sums[$cnt] != md5_file($tmpname))
 			$this->abort('MD5 checksum mismatch');
 	}
-	$dstfinal = $this->dstfinal($files_data['name'],$files_data['relativePath']);
+	$dstfinal = $this->dstfinal($files_data['name'], $files_data['relativePath']);
 	if (!rename($tmpname, $dstfinal))
 	$this->abort('rename IO error');
-	$_umask = umask(0); 	// override the system mask
+	$_umask = umask(0); // override the system mask
 	if (!chmod($dstfinal, $this->classparams['fileperm']))
 		$this->abort('chmod IO error');
 	umask($_umask);
-	$files_data['size']		= filesize($dstfinal);
-	$files_data['fullName']	= $dstfinal;
-	$files_data['path']	= fix_dirname($dstfinal);
+	$files_data['size'] = filesize($dstfinal);
+	$files_data['fullName'] = $dstfinal;
+	$files_data['path'] = fix_dirname($dstfinal);
 	array_push($this->files, $files_data);
 }
 $cnt++;

Braces +168 added lines, -109 removed lines

@@ -59,34 +59,47 @@ 
 	var $files;
 
 	public function JUpload($appletparams = array(), $classparams = array()) {
-		if (gettype($classparams) !== 'array')
-		$this->abort('Invalid type of parameter classparams: Expecting an array');
-		if (gettype($appletparams) !== 'array')
-		$this->abort('Invalid type of parameter appletparams: Expecting an array');
+		if (gettype($classparams) !== 'array') {
+				$this->abort('Invalid type of parameter classparams: Expecting an array');
+		}
+		if (gettype($appletparams) !== 'array') {
+				$this->abort('Invalid type of parameter appletparams: Expecting an array');
+		}
 
 		// set some defaults for the applet params
-		if (!isset($appletparams['afterUploadURL']))
-		$appletparams['afterUploadURL'] = $_SERVER['PHP_SELF'] . '?afterupload=1';
-		if (!isset($appletparams['name']))
-		$appletparams['name'] = 'JUpload';
-		if (!isset($appletparams['archive']))
-		$appletparams['archive'] = 'wjhk.jupload.jar';
-		if (!isset($appletparams['code']))
-		$appletparams['code'] = 'wjhk.jupload2.JUploadApplet';
-		if (!isset($appletparams['debugLevel']))
-		$appletparams['debugLevel'] = 0;
-		if (!isset($appletparams['httpUploadParameterType']))
-		$appletparams['httpUploadParameterType'] = 'array';
-		if (!isset($appletparams['showLogWindow']))
-		$appletparams['showLogWindow'] = ($appletparams['debugLevel'] > 0) ? 'true' : 'false';
-		if (!isset($appletparams['width']))
-		$appletparams['width'] = 640;
-		if (!isset($appletparams['height']))
-		$appletparams['height'] = ($appletparams['showLogWindow'] === 'true') ? 500 : 300;
-		if (!isset($appletparams['mayscript']))
-		$appletparams['mayscript'] = 'true';
-		if (!isset($appletparams['scriptable']))
-		$appletparams['scriptable'] = 'false';
+		if (!isset($appletparams['afterUploadURL'])) {
+				$appletparams['afterUploadURL'] = $_SERVER['PHP_SELF'] . '?afterupload=1';
+		}
+		if (!isset($appletparams['name'])) {
+				$appletparams['name'] = 'JUpload';
+		}
+		if (!isset($appletparams['archive'])) {
+				$appletparams['archive'] = 'wjhk.jupload.jar';
+		}
+		if (!isset($appletparams['code'])) {
+				$appletparams['code'] = 'wjhk.jupload2.JUploadApplet';
+		}
+		if (!isset($appletparams['debugLevel'])) {
+				$appletparams['debugLevel'] = 0;
+		}
+		if (!isset($appletparams['httpUploadParameterType'])) {
+				$appletparams['httpUploadParameterType'] = 'array';
+		}
+		if (!isset($appletparams['showLogWindow'])) {
+				$appletparams['showLogWindow'] = ($appletparams['debugLevel'] > 0) ? 'true' : 'false';
+		}
+		if (!isset($appletparams['width'])) {
+				$appletparams['width'] = 640;
+		}
+		if (!isset($appletparams['height'])) {
+				$appletparams['height'] = ($appletparams['showLogWindow'] === 'true') ? 500 : 300;
+		}
+		if (!isset($appletparams['mayscript'])) {
+				$appletparams['mayscript'] = 'true';
+		}
+		if (!isset($appletparams['scriptable'])) {
+				$appletparams['scriptable'] = 'false';
+		}
 		//if (!isset($appletparams['stringUploadSuccess']))
 		$appletparams['stringUploadSuccess'] = 'SUCCESS';
 		//if (!isset($appletparams['stringUploadError']))
@@ -103,52 +116,71 @@ 
 			$appletparams['maxChunkSize'] = $optchunk;
 		}
 		$appletparams['maxChunkSize'] = $this->tobytes($appletparams['maxChunkSize']);
-		if (!isset($appletparams['maxFileSize']))
-		$appletparams['maxFileSize'] = $maxfs;
+		if (!isset($appletparams['maxFileSize'])) {
+				$appletparams['maxFileSize'] = $maxfs;
+		}
 		$appletparams['maxFileSize'] = $this->tobytes($appletparams['maxFileSize']);
 		if (isset($classparams['errormail'])) {
 			$appletparams['urlToSendErrorTo'] = $_SERVER["PHP_SELF"] . '?errormail';
 		}
 
 		// Same for class parameters
-		if (!isset($classparams['demo_mode']))
-		$classparams['demo_mode'] = false;
+		if (!isset($classparams['demo_mode'])) {
+				$classparams['demo_mode'] = false;
+		}
 		if ($classparams['demo_mode']) {
 			$classparams['create_destdir'] = false;
 			$classparams['allow_subdirs'] = true;
 			$classparams['allow_zerosized'] = true;
 			$classparams['duplicate'] = 'overwrite';
 		}
-		if (!isset($classparams['debug_php']))											// set true to log some messages in PHP log
+		if (!isset($classparams['debug_php'])) {
+		    // set true to log some messages in PHP log
 		$classparams['debug_php'] = false;
-		if (!isset($this->classparams['allowed_mime_types']))				// array of allowed MIME type
+		}
+		if (!isset($this->classparams['allowed_mime_types'])) {
+		    // array of allowed MIME type
 		$classparams['allowed_mime_types'] = 'all';
-		if (!isset($this->classparams['allowed_file_extensions'])) 	// array of allowed file extensions
+		}
+		if (!isset($this->classparams['allowed_file_extensions'])) {
+		    // array of allowed file extensions
 		$classparams['allowed_file_extensions'] = 'all';
-		if (!isset($classparams['verbose_errors']))						// shouldn't display server info on a production site!
+		}
+		if (!isset($classparams['verbose_errors'])) {
+		    // shouldn't display server info on a production site!
 		$classparams['verbose_errors'] = true;
-		if (!isset($classparams['session_regenerate']))
-		$classparams['session_regenerate'] = false;
-		if (!isset($classparams['create_destdir']))
-		$classparams['create_destdir'] = true;
-		if (!isset($classparams['allow_subdirs']))
-		$classparams['allow_subdirs'] = false;
-		if (!isset($classparams['spaces_in_subdirs']))
-		$classparams['spaces_in_subdirs'] = false;
-		if (!isset($classparams['allow_zerosized']))
-		$classparams['allow_zerosized'] = false;
-		if (!isset($classparams['duplicate']))
-		$classparams['duplicate'] = 'rename';
-		if (!isset($classparams['dirperm']))
-		$classparams['dirperm'] = 0755;
-		if (!isset($classparams['fileperm']))
-		$classparams['fileperm'] = 0644;
+		}
+		if (!isset($classparams['session_regenerate'])) {
+				$classparams['session_regenerate'] = false;
+		}
+		if (!isset($classparams['create_destdir'])) {
+				$classparams['create_destdir'] = true;
+		}
+		if (!isset($classparams['allow_subdirs'])) {
+				$classparams['allow_subdirs'] = false;
+		}
+		if (!isset($classparams['spaces_in_subdirs'])) {
+				$classparams['spaces_in_subdirs'] = false;
+		}
+		if (!isset($classparams['allow_zerosized'])) {
+				$classparams['allow_zerosized'] = false;
+		}
+		if (!isset($classparams['duplicate'])) {
+				$classparams['duplicate'] = 'rename';
+		}
+		if (!isset($classparams['dirperm'])) {
+				$classparams['dirperm'] = 0755;
+		}
+		if (!isset($classparams['fileperm'])) {
+				$classparams['fileperm'] = 0644;
+		}
 		if (!isset($classparams['destdir'])) {
-			if ($obd != '')
-			$classparams['destdir'] = $obd;
-			else
-			$classparams['destdir'] = '/var/tmp/jupload_test';
-		}else{
+			if ($obd != '') {
+						$classparams['destdir'] = $obd;
+			} else {
+						$classparams['destdir'] = '/var/tmp/jupload_test';
+			}
+		} else{
 			$classparams['destdir']=str_replace('~',' ',$classparams['destdir']);
 		}
 		if ($classparams['create_destdir']) {
@@ -156,31 +188,43 @@ 
 			@mkdir($classparams['destdir'], $classparams['dirperm']);
 			umask($_umask);
 		}
-		if (!is_dir($classparams['destdir']) && is_writable($classparams['destdir']))
-		$this->abort('Destination dir not accessible');
-		if (!isset($classparams['tmp_prefix']))
-		$classparams['tmp_prefix'] = 'jutmp.';
-		if (!isset($classparams['var_prefix']))
-		$classparams['var_prefix'] = 'juvar.';
-		if (!isset($classparams['jscript_wrapper']))
-		$classparams['jscript_wrapper'] = 'JUploadSetProperty';
-		if (!isset($classparams['tag_jscript']))
-		$classparams['tag_jscript'] = '<!--JUPLOAD_JSCRIPT-->';
-		if (!isset($classparams['tag_applet']))
-		$classparams['tag_applet'] = '<!--JUPLOAD_APPLET-->';
-		if (!isset($classparams['tag_flist']))
-		$classparams['tag_flist'] = '<!--JUPLOAD_FILES-->';
-		if (!isset($classparams['http_flist_start']))
-		$classparams['http_flist_start'] =
+		if (!is_dir($classparams['destdir']) && is_writable($classparams['destdir'])) {
+				$this->abort('Destination dir not accessible');
+		}
+		if (!isset($classparams['tmp_prefix'])) {
+				$classparams['tmp_prefix'] = 'jutmp.';
+		}
+		if (!isset($classparams['var_prefix'])) {
+				$classparams['var_prefix'] = 'juvar.';
+		}
+		if (!isset($classparams['jscript_wrapper'])) {
+				$classparams['jscript_wrapper'] = 'JUploadSetProperty';
+		}
+		if (!isset($classparams['tag_jscript'])) {
+				$classparams['tag_jscript'] = '<!--JUPLOAD_JSCRIPT-->';
+		}
+		if (!isset($classparams['tag_applet'])) {
+				$classparams['tag_applet'] = '<!--JUPLOAD_APPLET-->';
+		}
+		if (!isset($classparams['tag_flist'])) {
+				$classparams['tag_flist'] = '<!--JUPLOAD_FILES-->';
+		}
+		if (!isset($classparams['http_flist_start'])) {
+				$classparams['http_flist_start'] =
             		"<table border='1'><TR><TH>Filename</TH><TH>file size</TH><TH>Relative path</TH><TH>Full name</TH><TH>md5sum</TH><TH>Specific parameters</TH></TR>";
-		if (!isset($classparams['http_flist_end']))
-		$classparams['http_flist_end'] = "</table>\n";
-		if (!isset($classparams['http_flist_file_before']))
-		$classparams['http_flist_file_before'] = "<tr><td>";
-		if (!isset($classparams['http_flist_file_between']))
-		$classparams['http_flist_file_between'] = "</td><td>";
-		if (!isset($classparams['http_flist_file_after']))
-		$classparams['http_flist_file_after'] = "</td></tr>\n";
+		}
+		if (!isset($classparams['http_flist_end'])) {
+				$classparams['http_flist_end'] = "</table>\n";
+		}
+		if (!isset($classparams['http_flist_file_before'])) {
+				$classparams['http_flist_file_before'] = "<tr><td>";
+		}
+		if (!isset($classparams['http_flist_file_between'])) {
+				$classparams['http_flist_file_between'] = "</td><td>";
+		}
+		if (!isset($classparams['http_flist_file_after'])) {
+				$classparams['http_flist_file_after'] = "</td></tr>\n";
+		}
 
 		$this->appletparams = $appletparams;
 		$this->classparams = $classparams;
@@ -289,14 +333,16 @@ 
 		$ret .= '  height = "'.$params['height'].'"'.$N;
 		$ret .= '  name = "'.$params['name'].'">'.$N;
 		foreach ($params as $key => $val) {
-			if ($key !== 'width' && $key !== 'height')
-			$ret .= '  <param name = "'.$key.'" value = "'.$val.'" />'.$N;
+			if ($key !== 'width' && $key !== 'height') {
+						$ret .= '  <param name = "'.$key.'" value = "'.$val.'" />'.$N;
+			}
 		}
 		$ret .= '  <comment>'.$N;
 		$ret .= '    <embed'.$N;
 		$ret .= '      type = "application/x-java-applet;version=1.5"'.$N;
-		foreach ($params as $key => $val)
-		$ret .= '      '.$key.' = "'.$val.'"'.$N;
+		foreach ($params as $key => $val) {
+				$ret .= '      '.$key.' = "'.$val.'"'.$N;
+		}
 		$ret .= '      pluginspage = "http://java.sun.com/products/plugin/index.html#download">'.$N;
 		$ret .= '      <noembed>'.$N;
 		$ret .= '        Java 1.5 or higher plugin required.'.$N;
@@ -309,15 +355,17 @@ 
 
 	private function abort($msg = '') {
 		$this->cleanup();
-		if ($msg != '')
-		die(str_replace('(.*)',$msg,$this->appletparams['stringUploadError'])."\n");
+		if ($msg != '') {
+				die(str_replace('(.*)',$msg,$this->appletparams['stringUploadError'])."\n");
+		}
 		exit;
 	}
 
 	private function warning($msg = '') {
 		$this->cleanup();
-		if ($msg != '')
-		echo('WARNING: '.$msg."\n");
+		if ($msg != '') {
+				echo('WARNING: '.$msg."\n");
+		}
 		echo $this->appletparams['stringUploadSuccess']."\n";
 		exit;
 	}
@@ -325,8 +373,9 @@ 
 	private function cleanup() {
 		// remove all uploaded files of *this* request
 		if (isset($_FILES)) {
-			foreach ($_FILES as $key => $val)
-			@unlink($val['tmp_name']);
+			foreach ($_FILES as $key => $val) {
+						@unlink($val['tmp_name']);
+			}
 		}
 		// remove accumulated file, if any.
 		@unlink($this->classparams['destdir'].'/'.$this->classparams['tmp_prefix'].session_id());
@@ -348,8 +397,9 @@ 
 				umask($_umask);
 			}
 		}
-		if (!is_dir($path) && is_writable($path))
-		$this->abort('Destination dir not accessible');
+		if (!is_dir($path) && is_writable($path)) {
+				$this->abort('Destination dir not accessible');
+		}
 	}
 
 	/**
@@ -370,8 +420,9 @@ 
 				$subdir = str_replace(' ','_',$subdir);
 			}
 			// recursively create subdir
-			if (!$this->classparams['demo_mode'])
-			$this->mkdirp($subdir);
+			if (!$this->classparams['demo_mode']) {
+						$this->mkdirp($subdir);
+			}
 			// append a slash
 			$subdir .= '/';
 		} else {
@@ -505,9 +556,10 @@ 
 		$msg = $_POST['log'];
 		mail($this->classparams['errormail'], $_POST['description'], $msg);
 	} else {
-		if (isset($_SERVER['SERVER_ADMIN']))
-		mail($_SERVER['SERVER_ADMIN'], 'Empty jupload error log',
+		if (isset($_SERVER['SERVER_ADMIN'])) {
+				mail($_SERVER['SERVER_ADMIN'], 'Empty jupload error log',
                     'An empty log has just been posted.');
+		}
 		$this->logPHPDebug('receive_debug_log', 'Empty error log received');
 	}
 	exit;
@@ -654,20 +706,24 @@ 
 		// This is the last chunk. Check total lenght and
 		// rename it to it's final name.
 		$dlen = filesize($dstname);
-		if ($dlen != $_SESSION['RF'][$this->classparams['var_prefix'].'size'])
-		$this->abort('file size mismatch');
+		if ($dlen != $_SESSION['RF'][$this->classparams['var_prefix'].'size']) {
+				$this->abort('file size mismatch');
+		}
 		if ($this->appletparams['sendMD5Sum'] === 'true' ) {
-			if ($md5sums[$cnt] != md5_file($dstname))
-			$this->abort('MD5 checksum mismatch');
+			if ($md5sums[$cnt] != md5_file($dstname)) {
+						$this->abort('MD5 checksum mismatch');
+			}
 		}
 		// remove zero sized files
 		if (($dlen > 0) || $this->classparams['allow_zerosized']) {
 			$dstfinal = $this->dstfinal($files_data['name'],$files_data['relativePath']);
-			if (!rename($dstname, $dstfinal))
-			$this->abort('rename IO error');
+			if (!rename($dstname, $dstfinal)) {
+						$this->abort('rename IO error');
+			}
 			$_umask = umask(0); 	// override the system mask
-			if (!chmod($dstfinal, $this->classparams['fileperm']))
-				$this->abort('chmod IO error');
+			if (!chmod($dstfinal, $this->classparams['fileperm'])) {
+							$this->abort('chmod IO error');
+			}
 			umask($_umask);
 			$files_data['size']		= filesize($dstfinal);
 			$files_data['fullName']	= $dstfinal;
@@ -682,15 +738,18 @@ 
 } else {
 	// Got a single file upload. Trivial.
 	if ($this->appletparams['sendMD5Sum'] === 'true' ) {
-		if ($md5sums[$cnt] != md5_file($tmpname))
-			$this->abort('MD5 checksum mismatch');
+		if ($md5sums[$cnt] != md5_file($tmpname)) {
+					$this->abort('MD5 checksum mismatch');
+		}
 	}
 	$dstfinal = $this->dstfinal($files_data['name'],$files_data['relativePath']);
-	if (!rename($tmpname, $dstfinal))
-	$this->abort('rename IO error');
+	if (!rename($tmpname, $dstfinal)) {
+		$this->abort('rename IO error');
+	}
 	$_umask = umask(0); 	// override the system mask
-	if (!chmod($dstfinal, $this->classparams['fileperm']))
-		$this->abort('chmod IO error');
+	if (!chmod($dstfinal, $this->classparams['fileperm'])) {
+			$this->abort('chmod IO error');
+	}
 	umask($_umask);
 	$files_data['size']		= filesize($dstfinal);
 	$files_data['fullName']	= $dstfinal;

htdocs/class/xoopseditor/tinymce4/external_plugins/filemanager/uploader/success.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
     <style>
 	body{padding:0px; margin:0px;}
     </style>
-    <meta http-equiv="refresh" content="3;url=index.php?path=<?php echo strip_tags(preg_replace( "/[^a-zA-Z0-9\.\[\]_| -]/", '',$_GET['path'])); ?>">
+    <meta http-equiv="refresh" content="3;url=index.php?path=<?php echo strip_tags(preg_replace("/[^a-zA-Z0-9\.\[\]_| -]/", '', $_GET['path'])); ?>">
   </head>
   <body>
     <center><br/><br/>

htdocs/class/xoopseditor/tinymce4/external_plugins/filemanager/uploader/index.php

Indentation +15 added lines, -15 removed lines

@@ -17,8 +17,8 @@ 
     if($path==$current_path)  $cycle=false;
     
     if(file_exists($path."config.php")){
-	require_once($path."config.php");
-	$cycle=false;
+    require_once($path."config.php");
+    $cycle=false;
     }
     $path=fix_dirname($path)."/";
 }
@@ -44,11 +44,11 @@ 
  * @param $file The array wich contains info about all uploaded files.
  */
 function handle_uploaded_files($juploadPhpSupportClass, $files) {
-	return
-		"<P>We are in the 'handle_uploaded_files' callback function, in the index.php script. To avoid double coding, we "
-		. "just call the default behavior of the JUpload PHP class. Just replace this by your code...</P>"
-		. $juploadPhpSupportClass->defaultAfterUploadManagement();
-		;
+    return
+        "<P>We are in the 'handle_uploaded_files' callback function, in the index.php script. To avoid double coding, we "
+        . "just call the default behavior of the JUpload PHP class. Just replace this by your code...</P>"
+        . $juploadPhpSupportClass->defaultAfterUploadManagement();
+        ;
 
 }
 ////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -65,17 +65,17 @@ 
 // see all details http://jupload.sourceforge.net/howto-customization.html
 //
 $appletParameters = array(
-		//Default value is ... maximum size for a file on the current FS. 2G is problably too much already.
+        //Default value is ... maximum size for a file on the current FS. 2G is problably too much already.
         'maxFileSize' => $JAVAMaxSizeUpload.'G',
         //
         //In the sourceforge project structure, the applet jar file is one folder below. Default
         //configuration is ok, if wjhk.jupload.jar is in the same folder as the script containing this call.
         'archive' => 'wjhk.jupload.jar',
-	'showLogWindow' => 'false',
-	'width' => '100%',
-	'height' =>'358px',
-	'name' => 'No limit Uploader',
-	'allowedFileExtensions' => implode('/',$ext),
+    'showLogWindow' => 'false',
+    'width' => '100%',
+    'height' =>'358px',
+    'name' => 'No limit Uploader',
+    'allowedFileExtensions' => implode('/',$ext),
         //To manage, other jar files, like the ftp jar files if postURL is an FTP URL:
         //'archive' => 'wjhk.jupload.jar,jakarta-commons-oro.jar,jakarta-commons-net.jar',
         //
@@ -94,13 +94,13 @@ 
 // for htaccess protected folders 
 if((isset($_SERVER['PHP_AUTH_USER']) && $_SERVER['PHP_AUTH_USER'] != '') && $_SERVER['PHP_AUTH_USER'] != '' && $_SERVER['PHP_AUTH_USER'] != '') 
 {
-	$appletParameters['specificHeaders'] = 'Authorization: Basic '.base64_encode($_SERVER['PHP_AUTH_USER'].":".$_SERVER['PHP_AUTH_PW']);
+    $appletParameters['specificHeaders'] = 'Authorization: Basic '.base64_encode($_SERVER['PHP_AUTH_USER'].":".$_SERVER['PHP_AUTH_PW']);
 }
 
 //
 //Then: the jupload PHP class parameters
 $classParameters = array(
-		//Files won't be stored on the server. Useful for first tests of the applet behavior ... and sourceforge demo site !
+        //Files won't be stored on the server. Useful for first tests of the applet behavior ... and sourceforge demo site !
         'demo_mode' => false,
         //
         //Allow creation of subdirectories, when uploading several folders/files (drag and drop a folder on the applet to use it).

Spacing +16 added lines, -16 removed lines

@@ -1,33 +1,33 @@ 
 <?php
 
 include '../config/config.php';
-if(!$java_upload) die('forbidden');
-if($_SESSION['RF']["verify"] !== "RESPONSIVEfilemanager") die('forbidden');
+if (!$java_upload) die('forbidden');
+if ($_SESSION['RF']["verify"] !== "RESPONSIVEfilemanager") die('forbidden');
 
 //Let's load the 'interesting' stuff ...  ;-)
 include 'jupload.php';
 include '../include/utils.php';
 
-$path=$current_path.$_GET['path'];
-$cycle=true;
-$max_cycles=50;
-$i=0;
-while($cycle && $i<$max_cycles){
+$path = $current_path.$_GET['path'];
+$cycle = true;
+$max_cycles = 50;
+$i = 0;
+while ($cycle && $i < $max_cycles) {
     $i++;
-    if($path==$current_path)  $cycle=false;
+    if ($path == $current_path)  $cycle = false;
     
-    if(file_exists($path."config.php")){
+    if (file_exists($path."config.php")) {
 	require_once($path."config.php");
-	$cycle=false;
+	$cycle = false;
     }
-    $path=fix_dirname($path)."/";
+    $path = fix_dirname($path)."/";
 }
 
-$path="../".$current_path.$_GET['path'];
+$path = "../".$current_path.$_GET['path'];
 
-if(strpos($_GET['path'],'../')!==FALSE || strpos($_GET['path'],'./')!==FALSE || strpos($_GET['path'],'/')===0) die ('path error');
+if (strpos($_GET['path'], '../') !== FALSE || strpos($_GET['path'], './') !== FALSE || strpos($_GET['path'], '/') === 0) die ('path error');
 
-$path=str_replace(' ','~',$path);
+$path = str_replace(' ', '~', $path);
 ////////////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////   The user callback function, that can be called after upload   ////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -75,7 +75,7 @@ 
 	'width' => '100%',
 	'height' =>'358px',
 	'name' => 'No limit Uploader',
-	'allowedFileExtensions' => implode('/',$ext),
+	'allowedFileExtensions' => implode('/', $ext),
         //To manage, other jar files, like the ftp jar files if postURL is an FTP URL:
         //'archive' => 'wjhk.jupload.jar,jakarta-commons-oro.jar,jakarta-commons-net.jar',
         //
@@ -92,7 +92,7 @@ 
     );
 
 // for htaccess protected folders 
-if((isset($_SERVER['PHP_AUTH_USER']) && $_SERVER['PHP_AUTH_USER'] != '') && $_SERVER['PHP_AUTH_USER'] != '' && $_SERVER['PHP_AUTH_USER'] != '') 
+if ((isset($_SERVER['PHP_AUTH_USER']) && $_SERVER['PHP_AUTH_USER'] != '') && $_SERVER['PHP_AUTH_USER'] != '' && $_SERVER['PHP_AUTH_USER'] != '') 
 {
 	$appletParameters['specificHeaders'] = 'Authorization: Basic '.base64_encode($_SERVER['PHP_AUTH_USER'].":".$_SERVER['PHP_AUTH_PW']);
 }

Braces +12 added lines, -4 removed lines

@@ -1,8 +1,12 @@ 
 <?php
 
 include '../config/config.php';
-if(!$java_upload) die('forbidden');
-if($_SESSION['RF']["verify"] !== "RESPONSIVEfilemanager") die('forbidden');
+if(!$java_upload) {
+    die('forbidden');
+}
+if($_SESSION['RF']["verify"] !== "RESPONSIVEfilemanager") {
+    die('forbidden');
+}
 
 //Let's load the 'interesting' stuff ...  ;-)
 include 'jupload.php';
@@ -14,7 +18,9 @@ 
 $i=0;
 while($cycle && $i<$max_cycles){
     $i++;
-    if($path==$current_path)  $cycle=false;
+    if($path==$current_path) {
+        $cycle=false;
+    }
     
     if(file_exists($path."config.php")){
 	require_once($path."config.php");
@@ -25,7 +31,9 @@ 
 
 $path="../".$current_path.$_GET['path'];
 
-if(strpos($_GET['path'],'../')!==FALSE || strpos($_GET['path'],'./')!==FALSE || strpos($_GET['path'],'/')===0) die ('path error');
+if(strpos($_GET['path'],'../')!==FALSE || strpos($_GET['path'],'./')!==FALSE || strpos($_GET['path'],'/')===0) {
+    die ('path error');
+}
 
 $path=str_replace(' ','~',$path);
 ////////////////////////////////////////////////////////////////////////////////////////////////////////

htdocs/class/xoopseditor/tinymce4/external_plugins/filemanager/ajax_calls.php

Indentation +160 added lines, -160 removed lines

@@ -5,137 +5,137 @@ 
 include('include/utils.php');
 
 if (isset($_SESSION['RF']['language_file']) && file_exists($_SESSION['RF']['language_file'])){
-	include($_SESSION['RF']['language_file']);
+    include($_SESSION['RF']['language_file']);
 }
 else {
-	die('Language file is missing!');
+    die('Language file is missing!');
 }
 
 if(isset($_GET['action'])) 
 {
     switch($_GET['action']) 
     {
-		case 'view':
-		    if(isset($_GET['type'])) {
-				$_SESSION['RF']["view_type"] = $_GET['type'];
-			}
-			else {
-				die('view type number missing');
-			}
-			break;
-		case 'sort':
-			if(isset($_GET['sort_by'])) {
-				$_SESSION['RF']["sort_by"] = $_GET['sort_by'];
-			}
+        case 'view':
+            if(isset($_GET['type'])) {
+                $_SESSION['RF']["view_type"] = $_GET['type'];
+            }
+            else {
+                die('view type number missing');
+            }
+            break;
+        case 'sort':
+            if(isset($_GET['sort_by'])) {
+                $_SESSION['RF']["sort_by"] = $_GET['sort_by'];
+            }
 			
-			if(isset($_GET['descending'])) {
-				$_SESSION['RF']["descending"] = $_GET['descending'] === "TRUE";
-			}
-			break;
-		case 'image_size': // not used
-	    	$pos = strpos($_POST['path'],$upload_dir);
-			if ($pos !== FALSE) 
-			{
-				$info=getimagesize(substr_replace($_POST['path'],$current_path,$pos,strlen($upload_dir)));
-				echo json_encode($info);
-			}
-	    	break;
-		case 'save_img':
-		    $info=pathinfo($_POST['name']);
+            if(isset($_GET['descending'])) {
+                $_SESSION['RF']["descending"] = $_GET['descending'] === "TRUE";
+            }
+            break;
+        case 'image_size': // not used
+            $pos = strpos($_POST['path'],$upload_dir);
+            if ($pos !== FALSE) 
+            {
+                $info=getimagesize(substr_replace($_POST['path'],$current_path,$pos,strlen($upload_dir)));
+                echo json_encode($info);
+            }
+            break;
+        case 'save_img':
+            $info=pathinfo($_POST['name']);
 
-		    if (strpos($_POST['path'], '/') === 0
-			|| strpos($_POST['path'], '../') !== FALSE
-			|| strpos($_POST['path'], './') === 0
-			|| strpos($_POST['url'], 'http://featherfiles.aviary.com/') !== 0
-			|| $_POST['name'] != fix_filename($_POST['name'], $transliteration)
-			|| !in_array(strtolower($info['extension']), array('jpg','jpeg','png')))
-		    {
-			    die('wrong data');
-			}
+            if (strpos($_POST['path'], '/') === 0
+            || strpos($_POST['path'], '../') !== FALSE
+            || strpos($_POST['path'], './') === 0
+            || strpos($_POST['url'], 'http://featherfiles.aviary.com/') !== 0
+            || $_POST['name'] != fix_filename($_POST['name'], $transliteration)
+            || !in_array(strtolower($info['extension']), array('jpg','jpeg','png')))
+            {
+                die('wrong data');
+            }
 
-		    $image_data = get_file_by_url($_POST['url']);
-		    if ($image_data === FALSE) 
-		    {
-		        die(lang_Aviary_No_Save);
-		    }
+            $image_data = get_file_by_url($_POST['url']);
+            if ($image_data === FALSE) 
+            {
+                die(lang_Aviary_No_Save);
+            }
 
-		    file_put_contents($current_path.$_POST['path'].$_POST['name'],$image_data);
+            file_put_contents($current_path.$_POST['path'].$_POST['name'],$image_data);
 
-		    create_img_gd($current_path.$_POST['path'].$_POST['name'], $thumbs_base_path.$_POST['path'].$_POST['name'], 122, 91);
-		    // TODO something with this function cause its blowing my mind
-		    new_thumbnails_creation($current_path.$_POST['path'],$current_path.$_POST['path'].$_POST['name'],$_POST['name'],$current_path,$relative_image_creation,$relative_path_from_current_pos,$relative_image_creation_name_to_prepend,$relative_image_creation_name_to_append,$relative_image_creation_width,$relative_image_creation_height,$fixed_image_creation,$fixed_path_from_filemanager,$fixed_image_creation_name_to_prepend,$fixed_image_creation_to_append,$fixed_image_creation_width,$fixed_image_creation_height);
-		    break;
-		case 'extract':
-		    if(strpos($_POST['path'],'/')===0 || strpos($_POST['path'],'../')!==FALSE || strpos($_POST['path'],'./')===0) {
-				die('wrong path');
-			}
+            create_img_gd($current_path.$_POST['path'].$_POST['name'], $thumbs_base_path.$_POST['path'].$_POST['name'], 122, 91);
+            // TODO something with this function cause its blowing my mind
+            new_thumbnails_creation($current_path.$_POST['path'],$current_path.$_POST['path'].$_POST['name'],$_POST['name'],$current_path,$relative_image_creation,$relative_path_from_current_pos,$relative_image_creation_name_to_prepend,$relative_image_creation_name_to_append,$relative_image_creation_width,$relative_image_creation_height,$fixed_image_creation,$fixed_path_from_filemanager,$fixed_image_creation_name_to_prepend,$fixed_image_creation_to_append,$fixed_image_creation_width,$fixed_image_creation_height);
+            break;
+        case 'extract':
+            if(strpos($_POST['path'],'/')===0 || strpos($_POST['path'],'../')!==FALSE || strpos($_POST['path'],'./')===0) {
+                die('wrong path');
+            }
 
-		    $path = $current_path.$_POST['path'];
-		    $info = pathinfo($path);
-		    $base_folder = $current_path.fix_dirname($_POST['path'])."/";
+            $path = $current_path.$_POST['path'];
+            $info = pathinfo($path);
+            $base_folder = $current_path.fix_dirname($_POST['path'])."/";
 
-		    switch($info['extension'])
-		    {
-				case "zip":
-				    $zip = new ZipArchive;
-				    if ($zip->open($path) === TRUE) {
-						//make all the folders
-						for($i = 0; $i < $zip->numFiles; $i++) 
-						{ 
-						    $OnlyFileName = $zip->getNameIndex($i);
-						    $FullFileName = $zip->statIndex($i);    
-						    if (substr($FullFileName['name'], -1, 1) ==="/")
-						    {
-								create_folder($base_folder.$FullFileName['name']);
-						    }
-						}
-						//unzip into the folders
-						for($i = 0; $i < $zip->numFiles; $i++) 
-						{ 
-						    $OnlyFileName = $zip->getNameIndex($i);
-						    $FullFileName = $zip->statIndex($i);    
+            switch($info['extension'])
+            {
+                case "zip":
+                    $zip = new ZipArchive;
+                    if ($zip->open($path) === TRUE) {
+                        //make all the folders
+                        for($i = 0; $i < $zip->numFiles; $i++) 
+                        { 
+                            $OnlyFileName = $zip->getNameIndex($i);
+                            $FullFileName = $zip->statIndex($i);    
+                            if (substr($FullFileName['name'], -1, 1) ==="/")
+                            {
+                                create_folder($base_folder.$FullFileName['name']);
+                            }
+                        }
+                        //unzip into the folders
+                        for($i = 0; $i < $zip->numFiles; $i++) 
+                        { 
+                            $OnlyFileName = $zip->getNameIndex($i);
+                            $FullFileName = $zip->statIndex($i);    
 					    
-						    if (!(substr($FullFileName['name'], -1, 1) ==="/"))
-						    {
-								$fileinfo = pathinfo($OnlyFileName);
-								if(in_array(strtolower($fileinfo['extension']),$ext))
-								{
-								    copy('zip://'. $path .'#'. $OnlyFileName , $base_folder.$FullFileName['name'] ); 
-								} 
-						    }
-						}
-						$zip->close();
-				    }
-				    else {
-						die(lang_Zip_No_Extract);
-				    }
+                            if (!(substr($FullFileName['name'], -1, 1) ==="/"))
+                            {
+                                $fileinfo = pathinfo($OnlyFileName);
+                                if(in_array(strtolower($fileinfo['extension']),$ext))
+                                {
+                                    copy('zip://'. $path .'#'. $OnlyFileName , $base_folder.$FullFileName['name'] ); 
+                                } 
+                            }
+                        }
+                        $zip->close();
+                    }
+                    else {
+                        die(lang_Zip_No_Extract);
+                    }
 
-				    break;
+                    break;
 
-				case "gz":
-				    $p = new PharData($path);
-				    $p->decompress(); // creates files.tar
+                case "gz":
+                    $p = new PharData($path);
+                    $p->decompress(); // creates files.tar
 
-				    break;
+                    break;
 
-				case "tar":
-				    // unarchive from the tar
-				    $phar = new PharData($path);
-				    $phar->decompressFiles();
-				    $files = array();
-				    check_files_extensions_on_phar( $phar, $files, '', $ext );
-				    $phar->extractTo( $current_path.fix_dirname( $_POST['path'] )."/", $files, TRUE );
+                case "tar":
+                    // unarchive from the tar
+                    $phar = new PharData($path);
+                    $phar->decompressFiles();
+                    $files = array();
+                    check_files_extensions_on_phar( $phar, $files, '', $ext );
+                    $phar->extractTo( $current_path.fix_dirname( $_POST['path'] )."/", $files, TRUE );
 
-				    break;
+                    break;
 
-				default:
-					die(lang_Zip_Invalid);
-		    }
-		    break;
-		case 'media_preview':    
-			$preview_file = $_GET["file"];
-			$info = pathinfo($preview_file);
-			?>
+                default:
+                    die(lang_Zip_Invalid);
+            }
+            break;
+        case 'media_preview':    
+            $preview_file = $_GET["file"];
+            $info = pathinfo($preview_file);
+            ?>
 			<div id="jp_container_1" class="jp-video " style="margin:0 auto;">
 			    <div class="jp-type-single">
 			      <div id="jquery_jplayer_1" class="jp-jplayer"></div>
@@ -184,8 +184,8 @@ 
 			    </div>
 			  </div>
 			<?php
-			if(in_array(strtolower($info['extension']), $ext_music)) {
-			?>
+            if(in_array(strtolower($info['extension']), $ext_music)) {
+            ?>
 
 				<script type="text/javascript">
 				    $(document).ready(function(){
@@ -210,8 +210,8 @@ 
 				  </script>
 
 			<?php
-			} elseif(in_array(strtolower($info['extension']), $ext_video)) {
-			?>
+            } elseif(in_array(strtolower($info['extension']), $ext_video)) {
+            ?>
 			    
 			    <script type="text/javascript">
 			    $(document).ready(function(){
@@ -235,63 +235,63 @@ 
 			  </script>
 			    
 			<?php
-			}
-			break;
-		case 'copy_cut':
-			if ($_POST['sub_action'] !== 'copy' && $_POST['sub_action'] !== 'cut') {
-				die('wrong sub-action');
-			}
+            }
+            break;
+        case 'copy_cut':
+            if ($_POST['sub_action'] !== 'copy' && $_POST['sub_action'] !== 'cut') {
+                die('wrong sub-action');
+            }
 
-			if (trim($_POST['path']) == '' || trim($_POST['path_thumb']) == '') {
-				die('no path');
-			}
+            if (trim($_POST['path']) == '' || trim($_POST['path_thumb']) == '') {
+                die('no path');
+            }
 
-			$path = $current_path.$_POST['path'];
-		    $info = pathinfo($path);
-		    $base_folder = $current_path.fix_dirname($_POST['path'])."/";
+            $path = $current_path.$_POST['path'];
+            $info = pathinfo($path);
+            $base_folder = $current_path.fix_dirname($_POST['path'])."/";
 
-			if (is_dir($path))
-			{
-				// can't copy/cut dirs
-				if ($copy_cut_dirs === FALSE){
-					die(sprintf(lang_Copy_Cut_Not_Allowed, ($_POST['sub_action'] === 'copy' ? lcfirst(lang_Copy) : lcfirst(lang_Cut)), lang_Folders));
-				}
+            if (is_dir($path))
+            {
+                // can't copy/cut dirs
+                if ($copy_cut_dirs === FALSE){
+                    die(sprintf(lang_Copy_Cut_Not_Allowed, ($_POST['sub_action'] === 'copy' ? lcfirst(lang_Copy) : lcfirst(lang_Cut)), lang_Folders));
+                }
 
-				// size over limit
-				if ($copy_cut_max_size !== FALSE && is_int($copy_cut_max_size)){
-					if (($copy_cut_max_size * 1024 * 1024) < foldersize($path)){
-						die(sprintf(lang_Copy_Cut_Size_Limit, ($_POST['sub_action'] === 'copy' ? lcfirst(lang_Copy) : lcfirst(lang_Cut)), $copy_cut_max_size));
-					}
-				}
+                // size over limit
+                if ($copy_cut_max_size !== FALSE && is_int($copy_cut_max_size)){
+                    if (($copy_cut_max_size * 1024 * 1024) < foldersize($path)){
+                        die(sprintf(lang_Copy_Cut_Size_Limit, ($_POST['sub_action'] === 'copy' ? lcfirst(lang_Copy) : lcfirst(lang_Cut)), $copy_cut_max_size));
+                    }
+                }
 
-				// file count over limit
-				if ($copy_cut_max_count !== FALSE && is_int($copy_cut_max_count)){
-					if ($copy_cut_max_count < filescount($path)){
-						die(sprintf(lang_Copy_Cut_Count_Limit, ($_POST['sub_action'] === 'copy' ? lcfirst(lang_Copy) : lcfirst(lang_Cut)), $copy_cut_max_count));
-					}
-				}
-			}
-			else {
-				// can't copy/cut files
-				if ($copy_cut_files === FALSE){
-					die(sprintf(lang_Copy_Cut_Not_Allowed, ($_POST['sub_action'] === 'copy' ? lcfirst(lang_Copy) : lcfirst(lang_Cut)), lang_Files));
-				}
-			}
+                // file count over limit
+                if ($copy_cut_max_count !== FALSE && is_int($copy_cut_max_count)){
+                    if ($copy_cut_max_count < filescount($path)){
+                        die(sprintf(lang_Copy_Cut_Count_Limit, ($_POST['sub_action'] === 'copy' ? lcfirst(lang_Copy) : lcfirst(lang_Cut)), $copy_cut_max_count));
+                    }
+                }
+            }
+            else {
+                // can't copy/cut files
+                if ($copy_cut_files === FALSE){
+                    die(sprintf(lang_Copy_Cut_Not_Allowed, ($_POST['sub_action'] === 'copy' ? lcfirst(lang_Copy) : lcfirst(lang_Cut)), lang_Files));
+                }
+            }
 
-			$_SESSION['RF']['clipboard']['path'] = $path;
-			$_SESSION['RF']['clipboard']['path_thumb'] = $_POST['path_thumb'];
-			$_SESSION['RF']['clipboard_action'] = $_POST['sub_action'];
-			break;
-		case 'clear_clipboard':
-			$_SESSION['RF']['clipboard'] = NULL;
-			$_SESSION['RF']['clipboard_action'] = NULL;
-			break;
-	    default: die('no action passed');
+            $_SESSION['RF']['clipboard']['path'] = $path;
+            $_SESSION['RF']['clipboard']['path_thumb'] = $_POST['path_thumb'];
+            $_SESSION['RF']['clipboard_action'] = $_POST['sub_action'];
+            break;
+        case 'clear_clipboard':
+            $_SESSION['RF']['clipboard'] = NULL;
+            $_SESSION['RF']['clipboard_action'] = NULL;
+            break;
+        default: die('no action passed');
     }
 }
 else 
 {
-	die('no action passed');
+    die('no action passed');
 }
 
 ?>
\ No newline at end of file

Spacing +31 added lines, -31 removed lines

@@ -1,22 +1,22 @@ 
 <?php
 
 include('config/config.php');
-if($_SESSION['RF']["verify"] !== "RESPONSIVEfilemanager") die('Access Denied!');
+if ($_SESSION['RF']["verify"] !== "RESPONSIVEfilemanager") die('Access Denied!');
 include('include/utils.php');
 
-if (isset($_SESSION['RF']['language_file']) && file_exists($_SESSION['RF']['language_file'])){
+if (isset($_SESSION['RF']['language_file']) && file_exists($_SESSION['RF']['language_file'])) {
 	include($_SESSION['RF']['language_file']);
 }
 else {
 	die('Language file is missing!');
 }
 
-if(isset($_GET['action'])) 
+if (isset($_GET['action'])) 
 {
-    switch($_GET['action']) 
+    switch ($_GET['action']) 
     {
 		case 'view':
-		    if(isset($_GET['type'])) {
+		    if (isset($_GET['type'])) {
 				$_SESSION['RF']["view_type"] = $_GET['type'];
 			}
 			else {
@@ -24,31 +24,31 @@ 
 			}
 			break;
 		case 'sort':
-			if(isset($_GET['sort_by'])) {
+			if (isset($_GET['sort_by'])) {
 				$_SESSION['RF']["sort_by"] = $_GET['sort_by'];
 			}
 			
-			if(isset($_GET['descending'])) {
+			if (isset($_GET['descending'])) {
 				$_SESSION['RF']["descending"] = $_GET['descending'] === "TRUE";
 			}
 			break;
 		case 'image_size': // not used
-	    	$pos = strpos($_POST['path'],$upload_dir);
+	    	$pos = strpos($_POST['path'], $upload_dir);
 			if ($pos !== FALSE) 
 			{
-				$info=getimagesize(substr_replace($_POST['path'],$current_path,$pos,strlen($upload_dir)));
+				$info = getimagesize(substr_replace($_POST['path'], $current_path, $pos, strlen($upload_dir)));
 				echo json_encode($info);
 			}
 	    	break;
 		case 'save_img':
-		    $info=pathinfo($_POST['name']);
+		    $info = pathinfo($_POST['name']);
 
 		    if (strpos($_POST['path'], '/') === 0
 			|| strpos($_POST['path'], '../') !== FALSE
 			|| strpos($_POST['path'], './') === 0
 			|| strpos($_POST['url'], 'http://featherfiles.aviary.com/') !== 0
 			|| $_POST['name'] != fix_filename($_POST['name'], $transliteration)
-			|| !in_array(strtolower($info['extension']), array('jpg','jpeg','png')))
+			|| !in_array(strtolower($info['extension']), array('jpg', 'jpeg', 'png')))
 		    {
 			    die('wrong data');
 			}
@@ -59,14 +59,14 @@ 
 		        die(lang_Aviary_No_Save);
 		    }
 
-		    file_put_contents($current_path.$_POST['path'].$_POST['name'],$image_data);
+		    file_put_contents($current_path.$_POST['path'].$_POST['name'], $image_data);
 
 		    create_img_gd($current_path.$_POST['path'].$_POST['name'], $thumbs_base_path.$_POST['path'].$_POST['name'], 122, 91);
 		    // TODO something with this function cause its blowing my mind
-		    new_thumbnails_creation($current_path.$_POST['path'],$current_path.$_POST['path'].$_POST['name'],$_POST['name'],$current_path,$relative_image_creation,$relative_path_from_current_pos,$relative_image_creation_name_to_prepend,$relative_image_creation_name_to_append,$relative_image_creation_width,$relative_image_creation_height,$fixed_image_creation,$fixed_path_from_filemanager,$fixed_image_creation_name_to_prepend,$fixed_image_creation_to_append,$fixed_image_creation_width,$fixed_image_creation_height);
+		    new_thumbnails_creation($current_path.$_POST['path'], $current_path.$_POST['path'].$_POST['name'], $_POST['name'], $current_path, $relative_image_creation, $relative_path_from_current_pos, $relative_image_creation_name_to_prepend, $relative_image_creation_name_to_append, $relative_image_creation_width, $relative_image_creation_height, $fixed_image_creation, $fixed_path_from_filemanager, $fixed_image_creation_name_to_prepend, $fixed_image_creation_to_append, $fixed_image_creation_width, $fixed_image_creation_height);
 		    break;
 		case 'extract':
-		    if(strpos($_POST['path'],'/')===0 || strpos($_POST['path'],'../')!==FALSE || strpos($_POST['path'],'./')===0) {
+		    if (strpos($_POST['path'], '/') === 0 || strpos($_POST['path'], '../') !== FALSE || strpos($_POST['path'], './') === 0) {
 				die('wrong path');
 			}
 
@@ -74,33 +74,33 @@ 
 		    $info = pathinfo($path);
 		    $base_folder = $current_path.fix_dirname($_POST['path'])."/";
 
-		    switch($info['extension'])
+		    switch ($info['extension'])
 		    {
 				case "zip":
 				    $zip = new ZipArchive;
 				    if ($zip->open($path) === TRUE) {
 						//make all the folders
-						for($i = 0; $i < $zip->numFiles; $i++) 
+						for ($i = 0; $i < $zip->numFiles; $i++) 
 						{ 
 						    $OnlyFileName = $zip->getNameIndex($i);
 						    $FullFileName = $zip->statIndex($i);    
-						    if (substr($FullFileName['name'], -1, 1) ==="/")
+						    if (substr($FullFileName['name'], -1, 1) === "/")
 						    {
 								create_folder($base_folder.$FullFileName['name']);
 						    }
 						}
 						//unzip into the folders
-						for($i = 0; $i < $zip->numFiles; $i++) 
+						for ($i = 0; $i < $zip->numFiles; $i++) 
 						{ 
 						    $OnlyFileName = $zip->getNameIndex($i);
 						    $FullFileName = $zip->statIndex($i);    
 					    
-						    if (!(substr($FullFileName['name'], -1, 1) ==="/"))
+						    if (!(substr($FullFileName['name'], -1, 1) === "/"))
 						    {
 								$fileinfo = pathinfo($OnlyFileName);
-								if(in_array(strtolower($fileinfo['extension']),$ext))
+								if (in_array(strtolower($fileinfo['extension']), $ext))
 								{
-								    copy('zip://'. $path .'#'. $OnlyFileName , $base_folder.$FullFileName['name'] ); 
+								    copy('zip://'.$path.'#'.$OnlyFileName, $base_folder.$FullFileName['name']); 
 								} 
 						    }
 						}
@@ -123,8 +123,8 @@ 
 				    $phar = new PharData($path);
 				    $phar->decompressFiles();
 				    $files = array();
-				    check_files_extensions_on_phar( $phar, $files, '', $ext );
-				    $phar->extractTo( $current_path.fix_dirname( $_POST['path'] )."/", $files, TRUE );
+				    check_files_extensions_on_phar($phar, $files, '', $ext);
+				    $phar->extractTo($current_path.fix_dirname($_POST['path'])."/", $files, TRUE);
 
 				    break;
 
@@ -184,7 +184,7 @@ 
 			    </div>
 			  </div>
 			<?php
-			if(in_array(strtolower($info['extension']), $ext_music)) {
+			if (in_array(strtolower($info['extension']), $ext_music)) {
 			?>
 
 				<script type="text/javascript">
@@ -210,7 +210,7 @@ 
 				  </script>
 
 			<?php
-			} elseif(in_array(strtolower($info['extension']), $ext_video)) {
+			} elseif (in_array(strtolower($info['extension']), $ext_video)) {
 			?>
 			    
 			    <script type="text/javascript">
@@ -253,27 +253,27 @@ 
 			if (is_dir($path))
 			{
 				// can't copy/cut dirs
-				if ($copy_cut_dirs === FALSE){
+				if ($copy_cut_dirs === FALSE) {
 					die(sprintf(lang_Copy_Cut_Not_Allowed, ($_POST['sub_action'] === 'copy' ? lcfirst(lang_Copy) : lcfirst(lang_Cut)), lang_Folders));
 				}
 
 				// size over limit
-				if ($copy_cut_max_size !== FALSE && is_int($copy_cut_max_size)){
-					if (($copy_cut_max_size * 1024 * 1024) < foldersize($path)){
+				if ($copy_cut_max_size !== FALSE && is_int($copy_cut_max_size)) {
+					if (($copy_cut_max_size * 1024 * 1024) < foldersize($path)) {
 						die(sprintf(lang_Copy_Cut_Size_Limit, ($_POST['sub_action'] === 'copy' ? lcfirst(lang_Copy) : lcfirst(lang_Cut)), $copy_cut_max_size));
 					}
 				}
 
 				// file count over limit
-				if ($copy_cut_max_count !== FALSE && is_int($copy_cut_max_count)){
-					if ($copy_cut_max_count < filescount($path)){
+				if ($copy_cut_max_count !== FALSE && is_int($copy_cut_max_count)) {
+					if ($copy_cut_max_count < filescount($path)) {
 						die(sprintf(lang_Copy_Cut_Count_Limit, ($_POST['sub_action'] === 'copy' ? lcfirst(lang_Copy) : lcfirst(lang_Cut)), $copy_cut_max_count));
 					}
 				}
 			}
 			else {
 				// can't copy/cut files
-				if ($copy_cut_files === FALSE){
+				if ($copy_cut_files === FALSE) {
 					die(sprintf(lang_Copy_Cut_Not_Allowed, ($_POST['sub_action'] === 'copy' ? lcfirst(lang_Copy) : lcfirst(lang_Cut)), lang_Files));
 				}
 			}

Braces +8 added lines, -11 removed lines

@@ -1,13 +1,14 @@ 
 <?php
 
 include('config/config.php');
-if($_SESSION['RF']["verify"] !== "RESPONSIVEfilemanager") die('Access Denied!');
+if($_SESSION['RF']["verify"] !== "RESPONSIVEfilemanager") {
+    die('Access Denied!');
+}
 include('include/utils.php');
 
 if (isset($_SESSION['RF']['language_file']) && file_exists($_SESSION['RF']['language_file'])){
 	include($_SESSION['RF']['language_file']);
-}
-else {
+} else {
 	die('Language file is missing!');
 }
 
@@ -18,8 +19,7 @@ 
 		case 'view':
 		    if(isset($_GET['type'])) {
 				$_SESSION['RF']["view_type"] = $_GET['type'];
-			}
-			else {
+			} else {
 				die('view type number missing');
 			}
 			break;
@@ -105,8 +105,7 @@ 
 						    }
 						}
 						$zip->close();
-				    }
-				    else {
+				    } else {
 						die(lang_Zip_No_Extract);
 				    }
 
@@ -270,8 +269,7 @@ 
 						die(sprintf(lang_Copy_Cut_Count_Limit, ($_POST['sub_action'] === 'copy' ? lcfirst(lang_Copy) : lcfirst(lang_Cut)), $copy_cut_max_count));
 					}
 				}
-			}
-			else {
+			} else {
 				// can't copy/cut files
 				if ($copy_cut_files === FALSE){
 					die(sprintf(lang_Copy_Cut_Not_Allowed, ($_POST['sub_action'] === 'copy' ? lcfirst(lang_Copy) : lcfirst(lang_Cut)), lang_Files));
@@ -288,8 +286,7 @@ 
 			break;
 	    default: die('no action passed');
     }
-}
-else 
+} else 
 {
 	die('no action passed');
 }

htdocs/class/xoopseditor/tinymce4/external_plugins/filemanager/upload.php

Indentation +71 added lines, -71 removed lines

@@ -26,8 +26,8 @@ 
     $i++;
     if($path==$current_path)  $cycle=false;
     if(file_exists($path."config.php")){
-	require_once($path."config.php");
-	$cycle=false;
+    require_once($path."config.php");
+    $cycle=false;
     }
     $path=fix_dirname($path).'/';
 }
@@ -36,83 +36,83 @@ 
 if (!empty($_FILES)) {
     $info=pathinfo($_FILES['file']['name']);
     if(in_array(fix_strtolower($info['extension']), $ext)){
-	$tempFile = $_FILES['file']['tmp_name'];   
+    $tempFile = $_FILES['file']['tmp_name'];   
 	  
-	$targetPath = $storeFolder;
-	$targetPathThumb = $storeFolderThumb;
-	$_FILES['file']['name'] = fix_filename($_FILES['file']['name'],$transliteration);
+    $targetPath = $storeFolder;
+    $targetPathThumb = $storeFolderThumb;
+    $_FILES['file']['name'] = fix_filename($_FILES['file']['name'],$transliteration);
 	 
-	if(file_exists($targetPath.$_FILES['file']['name'])){
-	    $i = 1;
-	    $info=pathinfo($_FILES['file']['name']);
-	    while(file_exists($targetPath.$info['filename']."_".$i.".".$info['extension'])) {
-		    $i++;
-	    }
-	    $_FILES['file']['name']=$info['filename']."_".$i.".".$info['extension'];
-	}
-	$targetFile =  $targetPath. $_FILES['file']['name']; 
-	$targetFileThumb =  $targetPathThumb. $_FILES['file']['name'];
+    if(file_exists($targetPath.$_FILES['file']['name'])){
+        $i = 1;
+        $info=pathinfo($_FILES['file']['name']);
+        while(file_exists($targetPath.$info['filename']."_".$i.".".$info['extension'])) {
+            $i++;
+        }
+        $_FILES['file']['name']=$info['filename']."_".$i.".".$info['extension'];
+    }
+    $targetFile =  $targetPath. $_FILES['file']['name']; 
+    $targetFileThumb =  $targetPathThumb. $_FILES['file']['name'];
 	
-	if(in_array(fix_strtolower($info['extension']),$ext_img)) $is_img=true;
-	else $is_img=false;
+    if(in_array(fix_strtolower($info['extension']),$ext_img)) $is_img=true;
+    else $is_img=false;
 	
 	
-	move_uploaded_file($tempFile,$targetFile);
-	chmod($targetFile, 0755);
+    move_uploaded_file($tempFile,$targetFile);
+    chmod($targetFile, 0755);
 	
-	if($is_img){
-	    $memory_error=false;
-	    if(!create_img_gd($targetFile, $targetFileThumb, 122, 91)){
-		$memory_error=false;
-	    }else{
-		if(!new_thumbnails_creation($targetPath,$targetFile,$_FILES['file']['name'],$current_path,$relative_image_creation,$relative_path_from_current_pos,$relative_image_creation_name_to_prepend,$relative_image_creation_name_to_append,$relative_image_creation_width,$relative_image_creation_height,$fixed_image_creation,$fixed_path_from_filemanager,$fixed_image_creation_name_to_prepend,$fixed_image_creation_to_append,$fixed_image_creation_width,$fixed_image_creation_height)){
-		    $memory_error=false;
-		}else{		    
-		    $imginfo =getimagesize($targetFile);
-		    $srcWidth = $imginfo[0];
-		    $srcHeight = $imginfo[1];
+    if($is_img){
+        $memory_error=false;
+        if(!create_img_gd($targetFile, $targetFileThumb, 122, 91)){
+        $memory_error=false;
+        }else{
+        if(!new_thumbnails_creation($targetPath,$targetFile,$_FILES['file']['name'],$current_path,$relative_image_creation,$relative_path_from_current_pos,$relative_image_creation_name_to_prepend,$relative_image_creation_name_to_append,$relative_image_creation_width,$relative_image_creation_height,$fixed_image_creation,$fixed_path_from_filemanager,$fixed_image_creation_name_to_prepend,$fixed_image_creation_to_append,$fixed_image_creation_width,$fixed_image_creation_height)){
+            $memory_error=false;
+        }else{		    
+            $imginfo =getimagesize($targetFile);
+            $srcWidth = $imginfo[0];
+            $srcHeight = $imginfo[1];
 		    
-		    if($image_resizing){
-			if($image_resizing_width==0){
-			    if($image_resizing_height==0){
-				$image_resizing_width=$srcWidth;
-				$image_resizing_height =$srcHeight;
-			    }else{
-				$image_resizing_width=$image_resizing_height*$srcWidth/$srcHeight;
-			}
-			}elseif($image_resizing_height==0){
-			    $image_resizing_height =$image_resizing_width*$srcHeight/$srcWidth;
-			}
-			$srcWidth=$image_resizing_width;
-			$srcHeight=$image_resizing_height;
-			create_img_gd($targetFile, $targetFile, $image_resizing_width, $image_resizing_height);
-		    }
-		    //max resizing limit control
-		    $resize=false;
-		    if($image_max_width!=0 && $srcWidth >$image_max_width){
-			$resize=true;
-			$srcHeight=$image_max_width*$srcHeight/$srcWidth;
-			$srcWidth=$image_max_width;
-		    }
-		    if($image_max_height!=0 && $srcHeight >$image_max_height){
-			$resize=true;
-			$srcWidth =$image_max_height*$srcWidth/$srcHeight;
-			$srcHeight =$image_max_height;
-		    }
-		    if($resize)
-			create_img_gd($targetFile, $targetFile, $srcWidth, $srcHeight);
-		}
-	    }		
-	    if($memory_error){
-		//error
-		unlink($targetFile);
-		header('HTTP/1.1 406 Not enought Memory',true,406);
-		exit();
-	    }
-	}
+            if($image_resizing){
+            if($image_resizing_width==0){
+                if($image_resizing_height==0){
+                $image_resizing_width=$srcWidth;
+                $image_resizing_height =$srcHeight;
+                }else{
+                $image_resizing_width=$image_resizing_height*$srcWidth/$srcHeight;
+            }
+            }elseif($image_resizing_height==0){
+                $image_resizing_height =$image_resizing_width*$srcHeight/$srcWidth;
+            }
+            $srcWidth=$image_resizing_width;
+            $srcHeight=$image_resizing_height;
+            create_img_gd($targetFile, $targetFile, $image_resizing_width, $image_resizing_height);
+            }
+            //max resizing limit control
+            $resize=false;
+            if($image_max_width!=0 && $srcWidth >$image_max_width){
+            $resize=true;
+            $srcHeight=$image_max_width*$srcHeight/$srcWidth;
+            $srcWidth=$image_max_width;
+            }
+            if($image_max_height!=0 && $srcHeight >$image_max_height){
+            $resize=true;
+            $srcWidth =$image_max_height*$srcWidth/$srcHeight;
+            $srcHeight =$image_max_height;
+            }
+            if($resize)
+            create_img_gd($targetFile, $targetFile, $srcWidth, $srcHeight);
+        }
+        }		
+        if($memory_error){
+        //error
+        unlink($targetFile);
+        header('HTTP/1.1 406 Not enought Memory',true,406);
+        exit();
+        }
+    }
     }else{
-	header('HTTP/1.1 406 file not permitted',true,406);
-	exit();
+    header('HTTP/1.1 406 file not permitted',true,406);
+    exit();
     }
 }else{
     header('HTTP/1.1 405 Bad Request', true, 405);

Spacing +67 added lines, -67 removed lines

@@ -1,124 +1,124 @@ 
 <?php
 include('config/config.php');
-if($_SESSION['RF']["verify"] !== "RESPONSIVEfilemanager") die('forbiden');
+if ($_SESSION['RF']["verify"] !== "RESPONSIVEfilemanager") die('forbiden');
 include('include/utils.php');
 
 
 $storeFolder = $_POST['path'];
 $storeFolderThumb = $_POST['path_thumb'];
 
-$path_pos=strpos($storeFolder,$current_path);
-$thumb_pos=strpos($_POST['path_thumb'],$thumbs_base_path);
-if($path_pos!==0 
-    || $thumb_pos !==0
-    || strpos($storeFolderThumb,'../',strlen($thumbs_base_path))!==FALSE
-    || strpos($storeFolderThumb,'./',strlen($thumbs_base_path))!==FALSE
-    || strpos($storeFolder,'../',strlen($current_path))!==FALSE
-    || strpos($storeFolder,'./',strlen($current_path))!==FALSE )
+$path_pos = strpos($storeFolder, $current_path);
+$thumb_pos = strpos($_POST['path_thumb'], $thumbs_base_path);
+if ($path_pos !== 0 
+    || $thumb_pos !== 0
+    || strpos($storeFolderThumb, '../', strlen($thumbs_base_path)) !== FALSE
+    || strpos($storeFolderThumb, './', strlen($thumbs_base_path)) !== FALSE
+    || strpos($storeFolder, '../', strlen($current_path)) !== FALSE
+    || strpos($storeFolder, './', strlen($current_path)) !== FALSE)
     die('wrong path');
 
 
-$path=$storeFolder;
-$cycle=true;
-$max_cycles=50;
-$i=0;
-while($cycle && $i<$max_cycles){
+$path = $storeFolder;
+$cycle = true;
+$max_cycles = 50;
+$i = 0;
+while ($cycle && $i < $max_cycles) {
     $i++;
-    if($path==$current_path)  $cycle=false;
-    if(file_exists($path."config.php")){
+    if ($path == $current_path)  $cycle = false;
+    if (file_exists($path."config.php")) {
 	require_once($path."config.php");
-	$cycle=false;
+	$cycle = false;
     }
-    $path=fix_dirname($path).'/';
+    $path = fix_dirname($path).'/';
 }
 
 
 if (!empty($_FILES)) {
-    $info=pathinfo($_FILES['file']['name']);
-    if(in_array(fix_strtolower($info['extension']), $ext)){
+    $info = pathinfo($_FILES['file']['name']);
+    if (in_array(fix_strtolower($info['extension']), $ext)) {
 	$tempFile = $_FILES['file']['tmp_name'];   
 	  
 	$targetPath = $storeFolder;
 	$targetPathThumb = $storeFolderThumb;
-	$_FILES['file']['name'] = fix_filename($_FILES['file']['name'],$transliteration);
+	$_FILES['file']['name'] = fix_filename($_FILES['file']['name'], $transliteration);
 	 
-	if(file_exists($targetPath.$_FILES['file']['name'])){
+	if (file_exists($targetPath.$_FILES['file']['name'])) {
 	    $i = 1;
-	    $info=pathinfo($_FILES['file']['name']);
-	    while(file_exists($targetPath.$info['filename']."_".$i.".".$info['extension'])) {
+	    $info = pathinfo($_FILES['file']['name']);
+	    while (file_exists($targetPath.$info['filename']."_".$i.".".$info['extension'])) {
 		    $i++;
 	    }
-	    $_FILES['file']['name']=$info['filename']."_".$i.".".$info['extension'];
+	    $_FILES['file']['name'] = $info['filename']."_".$i.".".$info['extension'];
 	}
-	$targetFile =  $targetPath. $_FILES['file']['name']; 
-	$targetFileThumb =  $targetPathThumb. $_FILES['file']['name'];
+	$targetFile = $targetPath.$_FILES['file']['name']; 
+	$targetFileThumb = $targetPathThumb.$_FILES['file']['name'];
 	
-	if(in_array(fix_strtolower($info['extension']),$ext_img)) $is_img=true;
-	else $is_img=false;
+	if (in_array(fix_strtolower($info['extension']), $ext_img)) $is_img = true;
+	else $is_img = false;
 	
 	
-	move_uploaded_file($tempFile,$targetFile);
+	move_uploaded_file($tempFile, $targetFile);
 	chmod($targetFile, 0755);
 	
-	if($is_img){
-	    $memory_error=false;
-	    if(!create_img_gd($targetFile, $targetFileThumb, 122, 91)){
-		$memory_error=false;
-	    }else{
-		if(!new_thumbnails_creation($targetPath,$targetFile,$_FILES['file']['name'],$current_path,$relative_image_creation,$relative_path_from_current_pos,$relative_image_creation_name_to_prepend,$relative_image_creation_name_to_append,$relative_image_creation_width,$relative_image_creation_height,$fixed_image_creation,$fixed_path_from_filemanager,$fixed_image_creation_name_to_prepend,$fixed_image_creation_to_append,$fixed_image_creation_width,$fixed_image_creation_height)){
-		    $memory_error=false;
-		}else{		    
-		    $imginfo =getimagesize($targetFile);
+	if ($is_img) {
+	    $memory_error = false;
+	    if (!create_img_gd($targetFile, $targetFileThumb, 122, 91)) {
+		$memory_error = false;
+	    } else {
+		if (!new_thumbnails_creation($targetPath, $targetFile, $_FILES['file']['name'], $current_path, $relative_image_creation, $relative_path_from_current_pos, $relative_image_creation_name_to_prepend, $relative_image_creation_name_to_append, $relative_image_creation_width, $relative_image_creation_height, $fixed_image_creation, $fixed_path_from_filemanager, $fixed_image_creation_name_to_prepend, $fixed_image_creation_to_append, $fixed_image_creation_width, $fixed_image_creation_height)) {
+		    $memory_error = false;
+		} else {		    
+		    $imginfo = getimagesize($targetFile);
 		    $srcWidth = $imginfo[0];
 		    $srcHeight = $imginfo[1];
 		    
-		    if($image_resizing){
-			if($image_resizing_width==0){
-			    if($image_resizing_height==0){
-				$image_resizing_width=$srcWidth;
-				$image_resizing_height =$srcHeight;
-			    }else{
-				$image_resizing_width=$image_resizing_height*$srcWidth/$srcHeight;
+		    if ($image_resizing) {
+			if ($image_resizing_width == 0) {
+			    if ($image_resizing_height == 0) {
+				$image_resizing_width = $srcWidth;
+				$image_resizing_height = $srcHeight;
+			    } else {
+				$image_resizing_width = $image_resizing_height * $srcWidth / $srcHeight;
 			}
-			}elseif($image_resizing_height==0){
-			    $image_resizing_height =$image_resizing_width*$srcHeight/$srcWidth;
+			}elseif ($image_resizing_height == 0) {
+			    $image_resizing_height = $image_resizing_width * $srcHeight / $srcWidth;
 			}
-			$srcWidth=$image_resizing_width;
-			$srcHeight=$image_resizing_height;
+			$srcWidth = $image_resizing_width;
+			$srcHeight = $image_resizing_height;
 			create_img_gd($targetFile, $targetFile, $image_resizing_width, $image_resizing_height);
 		    }
 		    //max resizing limit control
-		    $resize=false;
-		    if($image_max_width!=0 && $srcWidth >$image_max_width){
-			$resize=true;
-			$srcHeight=$image_max_width*$srcHeight/$srcWidth;
-			$srcWidth=$image_max_width;
+		    $resize = false;
+		    if ($image_max_width != 0 && $srcWidth > $image_max_width) {
+			$resize = true;
+			$srcHeight = $image_max_width * $srcHeight / $srcWidth;
+			$srcWidth = $image_max_width;
 		    }
-		    if($image_max_height!=0 && $srcHeight >$image_max_height){
-			$resize=true;
-			$srcWidth =$image_max_height*$srcWidth/$srcHeight;
-			$srcHeight =$image_max_height;
+		    if ($image_max_height != 0 && $srcHeight > $image_max_height) {
+			$resize = true;
+			$srcWidth = $image_max_height * $srcWidth / $srcHeight;
+			$srcHeight = $image_max_height;
 		    }
-		    if($resize)
+		    if ($resize)
 			create_img_gd($targetFile, $targetFile, $srcWidth, $srcHeight);
 		}
 	    }		
-	    if($memory_error){
+	    if ($memory_error) {
 		//error
 		unlink($targetFile);
-		header('HTTP/1.1 406 Not enought Memory',true,406);
+		header('HTTP/1.1 406 Not enought Memory', true, 406);
 		exit();
 	    }
 	}
-    }else{
-	header('HTTP/1.1 406 file not permitted',true,406);
+    } else {
+	header('HTTP/1.1 406 file not permitted', true, 406);
 	exit();
     }
-}else{
+} else {
     header('HTTP/1.1 405 Bad Request', true, 405);
     exit();
 }
-if(isset($_POST['submit'])){
+if (isset($_POST['submit'])) {
     $query = http_build_query(array(
         'type'      => $_POST['type'],
         'lang'      => $_POST['lang'],
@@ -126,5 +126,5 @@ 
         'field_id'  => $_POST['field_id'],
         'fldr'      => $_POST['fldr'],
     ));
-    header("location: dialog.php?" . $query);
+    header("location: dialog.php?".$query);
 }

Braces +22 added lines, -13 removed lines

@@ -1,6 +1,8 @@ 
 <?php
 include('config/config.php');
-if($_SESSION['RF']["verify"] !== "RESPONSIVEfilemanager") die('forbiden');
+if($_SESSION['RF']["verify"] !== "RESPONSIVEfilemanager") {
+    die('forbiden');
+}
 include('include/utils.php');
 
 
@@ -14,8 +16,9 @@ 
     || strpos($storeFolderThumb,'../',strlen($thumbs_base_path))!==FALSE
     || strpos($storeFolderThumb,'./',strlen($thumbs_base_path))!==FALSE
     || strpos($storeFolder,'../',strlen($current_path))!==FALSE
-    || strpos($storeFolder,'./',strlen($current_path))!==FALSE )
+    || strpos($storeFolder,'./',strlen($current_path))!==FALSE ) {
     die('wrong path');
+}
 
 
 $path=$storeFolder;
@@ -24,7 +27,9 @@ 
 $i=0;
 while($cycle && $i<$max_cycles){
     $i++;
-    if($path==$current_path)  $cycle=false;
+    if($path==$current_path) {
+        $cycle=false;
+    }
     if(file_exists($path."config.php")){
 	require_once($path."config.php");
 	$cycle=false;
@@ -53,8 +58,11 @@ 
 	$targetFile =  $targetPath. $_FILES['file']['name']; 
 	$targetFileThumb =  $targetPathThumb. $_FILES['file']['name'];
 	
-	if(in_array(fix_strtolower($info['extension']),$ext_img)) $is_img=true;
-	else $is_img=false;
+	if(in_array(fix_strtolower($info['extension']),$ext_img)) {
+	    $is_img=true;
+	} else {
+	    $is_img=false;
+	}
 	
 	
 	move_uploaded_file($tempFile,$targetFile);
@@ -64,10 +72,10 @@ 
 	    $memory_error=false;
 	    if(!create_img_gd($targetFile, $targetFileThumb, 122, 91)){
 		$memory_error=false;
-	    }else{
+	    } else{
 		if(!new_thumbnails_creation($targetPath,$targetFile,$_FILES['file']['name'],$current_path,$relative_image_creation,$relative_path_from_current_pos,$relative_image_creation_name_to_prepend,$relative_image_creation_name_to_append,$relative_image_creation_width,$relative_image_creation_height,$fixed_image_creation,$fixed_path_from_filemanager,$fixed_image_creation_name_to_prepend,$fixed_image_creation_to_append,$fixed_image_creation_width,$fixed_image_creation_height)){
 		    $memory_error=false;
-		}else{		    
+		} else{		    
 		    $imginfo =getimagesize($targetFile);
 		    $srcWidth = $imginfo[0];
 		    $srcHeight = $imginfo[1];
@@ -77,10 +85,10 @@ 
 			    if($image_resizing_height==0){
 				$image_resizing_width=$srcWidth;
 				$image_resizing_height =$srcHeight;
-			    }else{
+			    } else{
 				$image_resizing_width=$image_resizing_height*$srcWidth/$srcHeight;
 			}
-			}elseif($image_resizing_height==0){
+			} elseif($image_resizing_height==0){
 			    $image_resizing_height =$image_resizing_width*$srcHeight/$srcWidth;
 			}
 			$srcWidth=$image_resizing_width;
@@ -99,8 +107,9 @@ 
 			$srcWidth =$image_max_height*$srcWidth/$srcHeight;
 			$srcHeight =$image_max_height;
 		    }
-		    if($resize)
-			create_img_gd($targetFile, $targetFile, $srcWidth, $srcHeight);
+		    if($resize) {
+		    			create_img_gd($targetFile, $targetFile, $srcWidth, $srcHeight);
+		    }
 		}
 	    }		
 	    if($memory_error){
@@ -110,11 +119,11 @@ 
 		exit();
 	    }
 	}
-    }else{
+    } else{
 	header('HTTP/1.1 406 file not permitted',true,406);
 	exit();
     }
-}else{
+} else{
     header('HTTP/1.1 405 Bad Request', true, 405);
     exit();
 }

htdocs/class/xoopseditor/tinymce4/external_plugins/filemanager/include/php_image_magician.php

Indentation +1067 added lines, -1067 removed lines

@@ -1,163 +1,163 @@ 
 <?php
-   # ========================================================================#
-   #
-   #  This work is licensed under the Creative Commons Attribution 3.0 Unported
-   #  License. To view a copy of this license,
-   #  visit http://creativecommons.org/licenses/by/3.0/ or send a letter to
-   #  Creative Commons, 444 Castro Street, Suite 900, Mountain View, California,
-   #  94041, USA.
-   #
-   #  All rights reserved.
-   #
-   #  Author:    Jarrod Oberto
-   #  Version:   1.5.1
-   #  Date:      10-05-11
-   #  Purpose:   Provide tools for image manipulation using GD
-   #  Param In:  See functions.
-   #  Param Out: Produces a resized image
-   #  Requires : Requires PHP GD library.
-   #  Usage Example:
-   #                     include("lib/php_image_magician.php");
-   #                     $magicianObj = new resize('images/car.jpg');
-   #                     $magicianObj -> resizeImage(150, 100, 0);
-   #                     $magicianObj -> saveImage('images/car_small.jpg', 100);
-   #
-   #        - See end of doc for more examples -
-   #
-   #  Supported file types include: jpg, png, gif, bmp, psd (read)
-   #
-   #
-   #
-   #  The following functions are taken from phpThumb() [available from
-   #    http://phpthumb.sourceforge.net], and are used with written permission
-   #  from James Heinrich.
-   #    - GD2BMPstring
-   #      - GetPixelColor
-   #      - LittleEndian2String
-   #
-   #  The following functions are from Marc Hibbins and are used with written
-   #  permission (are also under the Attribution-ShareAlike
-   #  [http://creativecommons.org/licenses/by-sa/3.0/] license.
-   #    -
-   #
-   #  PhpPsdReader is used with written permission from Tim de Koning.
-   #  [http://www.kingsquare.nl/phppsdreader]
-   #
-   #
-   #
-   #  Modificatoin history
-   #  Date      Initials  Ver Description
-   #  10-05-11  J.C.O   0.0 Initial build
-   #  01-06-11  J.C.O   0.1.1   * Added reflections
-   #              * Added Rounded corners
-   #              * You can now use PNG interlacing
-   #              * Added shadow
-   #              * Added caption box
-   #              * Added vintage filter
-   #              * Added dynamic image resizing (resize on the fly)
-   #              * minor bug fixes
-   #  05-06-11  J.C.O   0.1.1.1 * Fixed undefined variables
-   #  17-06-11  J.C.O   0.1.2   * Added image_batch_class.php class
-   #              * Minor bug fixes
-   #  26-07-11  J.C.O   0.1.4 * Added support for external images
-   #              * Can now set the crop poisition
-   #  03-08-11  J.C.O   0.1.5 * Added reset() method to reset resource to
-   #                original input file.
-   #              * Added method addTextToCaptionBox() to
-   #                simplify adding text to a caption box.
-   #              * Added experimental writeIPTC. (not finished)
-   #              * Added experimental readIPTC. (not finished)
-   #  11-08-11  J.C.O     * Added initial border presets.
-   #  30-08-11  J.C.O     * Added 'auto' crop option to crop portrait
-   #                images near the top.
-   #  08-09-11  J.C.O     * Added cropImage() method to allow standalone
-   #                cropping.
-   #  17-09-11  J.C.O     * Added setCropFromTop() set method - set the
-   #                percentage to crop from the top when using
-   #                crop 'auto' option.
-   #              * Added setTransparency() set method - allows you
-   #                to turn transparency off (like when saving
-   #                as a jpg).
-   #              * Added setFillColor() set method - set the
-   #                background color to use instead of transparency.
-   #  05-11-11  J.C.O   0.1.5.1 * Fixed interlacing option
-   #  0-07-12  J.C.O   1.0
-   #
-   #  Known issues & Limitations:
-   # -------------------------------
-   #  Not so much an issue, the image is destroyed on the deconstruct rather than
-   #  when we have finished with it. The reason for this is that we don't know
-   #  when we're finished with it as you can both save the image and display
-   #  it directly to the screen (imagedestroy($this->imageResized))
-   #
-   #  Opening BMP files is slow. A test with 884 bmp files processed in a loop
-   #  takes forever - over 5 min. This test inlcuded opening the file, then
-   #  getting and displaying its width and height.
-   #
-   #  $forceStretch:
-   # -------------------------------
-   #  On by default.
-   #  $forceStretch can be disabled by calling method setForceStretch with false
-   #  parameter. If disabled, if an images original size is smaller than the size
-   #  specified by the user, the original size will be used. This is useful when
-   #  dealing with small images.
-   #
-   #  If enabled, images smaller than the size specified will be stretched to
-   #  that size.
-   #
-   #  Tips:
-   # -------------------------------
-   #  * If you're resizing a transparent png and saving it as a jpg, set
-   #  $keepTransparency to false with: $magicianObj->setTransparency(false);
-   #
-   #  FEATURES:
-   #    * EASY TO USE
-   #    * BMP SUPPORT (read & write)
-   #    * PSD (photoshop) support (read)
-   #    * RESIZE IMAGES
-   #      - Preserve transparency (png, gif)
-   #      - Apply sharpening (jpg) (requires PHP >= 5.1.0)
-   #      - Set image quality (jpg, png)
-   #      - Resize modes:
-   #        - exact size
-   #        - resize by width (auto height)
-   #        - resize by height (auto width)
-   #        - auto (automatically determine the best of the above modes to use)
-   #        - crop - resize as best as it can then crop the rest
-   #      - Force stretching of smaller images (upscale)
-   #    * APPLY FILTERS
-   #      - Convert to grey scale
-   #      - Convert to black and white
-   #      - Convert to sepia
-   #      - Convert to negative
-   #    * ROTATE IMAGES
-   #      - Rotate using predefined "left", "right", or "180"; or any custom degree amount
-   #    * EXTRACT EXIF DATA (requires exif module)
-   #      - make
-   #      - model
-   #      - date
-   #      - exposure
-   #      - aperture
-   #      - f-stop
-   #      - iso
-   #      - focal length
-   #      - exposure program
-   #      - metering mode
-   #      - flash status
-   #      - creator
-   #      - copyright
-   #    * ADD WATERMARK
-   #      - Specify exact x, y placement
-   #      - Or, specify using one of the 9 pre-defined placements such as "tl"
-   #        (for top left), "m" (for middle), "br" (for bottom right)
-   #        - also specify padding from edge amount (optional).
-   #      - Set opacity of watermark (png).
-   #    * ADD BORDER
-   #    * USE HEX WHEN SPECIFYING COLORS (eg: #ffffff)
-   #    * SAVE IMAGE OR OUTPUT TO SCREEN
-   #
-   #
-   # ========================================================================#
+    # ========================================================================#
+    #
+    #  This work is licensed under the Creative Commons Attribution 3.0 Unported
+    #  License. To view a copy of this license,
+    #  visit http://creativecommons.org/licenses/by/3.0/ or send a letter to
+    #  Creative Commons, 444 Castro Street, Suite 900, Mountain View, California,
+    #  94041, USA.
+    #
+    #  All rights reserved.
+    #
+    #  Author:    Jarrod Oberto
+    #  Version:   1.5.1
+    #  Date:      10-05-11
+    #  Purpose:   Provide tools for image manipulation using GD
+    #  Param In:  See functions.
+    #  Param Out: Produces a resized image
+    #  Requires : Requires PHP GD library.
+    #  Usage Example:
+    #                     include("lib/php_image_magician.php");
+    #                     $magicianObj = new resize('images/car.jpg');
+    #                     $magicianObj -> resizeImage(150, 100, 0);
+    #                     $magicianObj -> saveImage('images/car_small.jpg', 100);
+    #
+    #        - See end of doc for more examples -
+    #
+    #  Supported file types include: jpg, png, gif, bmp, psd (read)
+    #
+    #
+    #
+    #  The following functions are taken from phpThumb() [available from
+    #    http://phpthumb.sourceforge.net], and are used with written permission
+    #  from James Heinrich.
+    #    - GD2BMPstring
+    #      - GetPixelColor
+    #      - LittleEndian2String
+    #
+    #  The following functions are from Marc Hibbins and are used with written
+    #  permission (are also under the Attribution-ShareAlike
+    #  [http://creativecommons.org/licenses/by-sa/3.0/] license.
+    #    -
+    #
+    #  PhpPsdReader is used with written permission from Tim de Koning.
+    #  [http://www.kingsquare.nl/phppsdreader]
+    #
+    #
+    #
+    #  Modificatoin history
+    #  Date      Initials  Ver Description
+    #  10-05-11  J.C.O   0.0 Initial build
+    #  01-06-11  J.C.O   0.1.1   * Added reflections
+    #              * Added Rounded corners
+    #              * You can now use PNG interlacing
+    #              * Added shadow
+    #              * Added caption box
+    #              * Added vintage filter
+    #              * Added dynamic image resizing (resize on the fly)
+    #              * minor bug fixes
+    #  05-06-11  J.C.O   0.1.1.1 * Fixed undefined variables
+    #  17-06-11  J.C.O   0.1.2   * Added image_batch_class.php class
+    #              * Minor bug fixes
+    #  26-07-11  J.C.O   0.1.4 * Added support for external images
+    #              * Can now set the crop poisition
+    #  03-08-11  J.C.O   0.1.5 * Added reset() method to reset resource to
+    #                original input file.
+    #              * Added method addTextToCaptionBox() to
+    #                simplify adding text to a caption box.
+    #              * Added experimental writeIPTC. (not finished)
+    #              * Added experimental readIPTC. (not finished)
+    #  11-08-11  J.C.O     * Added initial border presets.
+    #  30-08-11  J.C.O     * Added 'auto' crop option to crop portrait
+    #                images near the top.
+    #  08-09-11  J.C.O     * Added cropImage() method to allow standalone
+    #                cropping.
+    #  17-09-11  J.C.O     * Added setCropFromTop() set method - set the
+    #                percentage to crop from the top when using
+    #                crop 'auto' option.
+    #              * Added setTransparency() set method - allows you
+    #                to turn transparency off (like when saving
+    #                as a jpg).
+    #              * Added setFillColor() set method - set the
+    #                background color to use instead of transparency.
+    #  05-11-11  J.C.O   0.1.5.1 * Fixed interlacing option
+    #  0-07-12  J.C.O   1.0
+    #
+    #  Known issues & Limitations:
+    # -------------------------------
+    #  Not so much an issue, the image is destroyed on the deconstruct rather than
+    #  when we have finished with it. The reason for this is that we don't know
+    #  when we're finished with it as you can both save the image and display
+    #  it directly to the screen (imagedestroy($this->imageResized))
+    #
+    #  Opening BMP files is slow. A test with 884 bmp files processed in a loop
+    #  takes forever - over 5 min. This test inlcuded opening the file, then
+    #  getting and displaying its width and height.
+    #
+    #  $forceStretch:
+    # -------------------------------
+    #  On by default.
+    #  $forceStretch can be disabled by calling method setForceStretch with false
+    #  parameter. If disabled, if an images original size is smaller than the size
+    #  specified by the user, the original size will be used. This is useful when
+    #  dealing with small images.
+    #
+    #  If enabled, images smaller than the size specified will be stretched to
+    #  that size.
+    #
+    #  Tips:
+    # -------------------------------
+    #  * If you're resizing a transparent png and saving it as a jpg, set
+    #  $keepTransparency to false with: $magicianObj->setTransparency(false);
+    #
+    #  FEATURES:
+    #    * EASY TO USE
+    #    * BMP SUPPORT (read & write)
+    #    * PSD (photoshop) support (read)
+    #    * RESIZE IMAGES
+    #      - Preserve transparency (png, gif)
+    #      - Apply sharpening (jpg) (requires PHP >= 5.1.0)
+    #      - Set image quality (jpg, png)
+    #      - Resize modes:
+    #        - exact size
+    #        - resize by width (auto height)
+    #        - resize by height (auto width)
+    #        - auto (automatically determine the best of the above modes to use)
+    #        - crop - resize as best as it can then crop the rest
+    #      - Force stretching of smaller images (upscale)
+    #    * APPLY FILTERS
+    #      - Convert to grey scale
+    #      - Convert to black and white
+    #      - Convert to sepia
+    #      - Convert to negative
+    #    * ROTATE IMAGES
+    #      - Rotate using predefined "left", "right", or "180"; or any custom degree amount
+    #    * EXTRACT EXIF DATA (requires exif module)
+    #      - make
+    #      - model
+    #      - date
+    #      - exposure
+    #      - aperture
+    #      - f-stop
+    #      - iso
+    #      - focal length
+    #      - exposure program
+    #      - metering mode
+    #      - flash status
+    #      - creator
+    #      - copyright
+    #    * ADD WATERMARK
+    #      - Specify exact x, y placement
+    #      - Or, specify using one of the 9 pre-defined placements such as "tl"
+    #        (for top left), "m" (for middle), "br" (for bottom right)
+    #        - also specify padding from edge amount (optional).
+    #      - Set opacity of watermark (png).
+    #    * ADD BORDER
+    #    * USE HEX WHEN SPECIFYING COLORS (eg: #ffffff)
+    #    * SAVE IMAGE OR OUTPUT TO SCREEN
+    #
+    #
+    # ========================================================================#
 
 
 class imageLib
@@ -171,37 +171,37 @@ 
     private $width;         # Current width (width after resize)
     private $height;
     private $imageSize;
-  private $fileExtension;
+    private $fileExtension;
 
-  private $debug = true;
-  private $errorArray = array();
+    private $debug = true;
+    private $errorArray = array();
 
-  private $forceStretch = true;
-  private $aggresiveSharpening = false;
+    private $forceStretch = true;
+    private $aggresiveSharpening = false;
 
-  private $transparentArray = array('.png', '.gif');
-  private $keepTransparency = true;
-  private $fillColorArray = array('r'=>255, 'g'=>255, 'b'=>255);
+    private $transparentArray = array('.png', '.gif');
+    private $keepTransparency = true;
+    private $fillColorArray = array('r'=>255, 'g'=>255, 'b'=>255);
 
-  private $sharpenArray = array('jpg');
+    private $sharpenArray = array('jpg');
 
-  private $psdReaderPath;
-  private $filterOverlayPath;
+    private $psdReaderPath;
+    private $filterOverlayPath;
 
-  private $isInterlace;
+    private $isInterlace;
 
-  private $captionBoxPositionArray = array();
+    private $captionBoxPositionArray = array();
 
-  private $fontDir = 'fonts';
+    private $fontDir = 'fonts';
 
-  private $cropFromTopPercent = 10;
+    private $cropFromTopPercent = 10;
 
 
 ## --------------------------------------------------------
 
     function __construct($fileName)
     # Author:     Jarrod Oberto
-  # Date:     27-02-08
+    # Date:     27-02-08
     # Purpose:    Constructor
     # Param in:   $fileName: File name and path.
     # Param out:  n/a
@@ -246,20 +246,20 @@ 
             $this->imageSize = getimagesize($this->fileName);
 
         } else {
-      $this->errorArray[] = 'File is not an image';
+        $this->errorArray[] = 'File is not an image';
     }
     }
 
 ## --------------------------------------------------------
 
-  private function initialise () {
+    private function initialise () {
 
     $this->psdReaderPath = __DIR__ . '/classPhpPsdReader.php';
     $this->filterOverlayPath = __DIR__ . '/filters';
 
     // *** Set if image should be interlaced or not.
     $this->isInterlace = false;
-  }
+    }
 
 
 
@@ -278,18 +278,18 @@ 
     #                          1 / portrait = keep aspect set height;
     #                          2 / landscape = keep aspect set width;
     #                          3 / auto = auto;
-  #                          4 / crop= resize and crop;
-  #
-  #         $option can also be an array containing options for
-  #         cropping. E.G., array('crop', 'r')
-  #
-  #         This array only applies to 'crop' and the 'r' refers to
-  #         "crop right". Other value include; tl, t, tr, l, m (default),
-  #         r, bl, b, br, or you can specify your own co-ords (which
-  #         isn't recommended.
-  #
-  #       $sharpen:    true: sharpen (jpg only);
-  #                false: don't sharpen
+    #                          4 / crop= resize and crop;
+    #
+    #         $option can also be an array containing options for
+    #         cropping. E.G., array('crop', 'r')
+    #
+    #         This array only applies to 'crop' and the 'r' refers to
+    #         "crop right". Other value include; tl, t, tr, l, m (default),
+    #         r, bl, b, br, or you can specify your own co-ords (which
+    #         isn't recommended.
+    #
+    #       $sharpen:    true: sharpen (jpg only);
+    #                false: don't sharpen
     # Param out:  n/a
     # Reference:
     # Notes:      To clarify the $option input:
@@ -298,24 +298,24 @@ 
     #                   is set. The width will be calculated and set automatically
     #                   to a the value that keeps the original aspect ratio.
     #               2 = The same but based on the width. We try make the image the
-  #                  biggest size we can while stil fitting inside the box size
+    #                  biggest size we can while stil fitting inside the box size
     #               3 = Depending whether the image is landscape or portrait, this
     #                   will automatically determine whether to resize via
     #                   dimension 1,2 or 0
-  #               4 = Will resize and then crop the image for best fit
-  #
-  #       forceStretch can be applied to options 1,2,3 and 4
+    #               4 = Will resize and then crop the image for best fit
+    #
+    #       forceStretch can be applied to options 1,2,3 and 4
     #
     {
 
     // *** We can pass in an array of options to change the crop position
     $cropPos = 'm';
     if (is_array($option) && fix_strtolower($option[0]) === 'crop') {
-      $cropPos = $option[1];         # get the crop option
+        $cropPos = $option[1];         # get the crop option
     } else if (strpos($option, '-') !== false) {
-      // *** Or pass in a hyphen seperated option
-      $optionPiecesArray = explode('-', $option);
-      $cropPos = end($optionPiecesArray);
+        // *** Or pass in a hyphen seperated option
+        $optionPiecesArray = explode('-', $option);
+        $cropPos = end($optionPiecesArray);
     }
 
     // *** Check the option is valid
@@ -339,16 +339,16 @@ 
     // *** If '4', then crop too
     if ($option == 4 || $option === 'crop') {
 
-      if (($optimalWidth >= $newWidth && $optimalHeight >= $newHeight)) {
+        if (($optimalWidth >= $newWidth && $optimalHeight >= $newHeight)) {
         $this->crop($optimalWidth, $optimalHeight, $newWidth, $newHeight, $cropPos);
-      }
+        }
     }
 
     // *** If Rotate.
     if ($autoRotate) {
 
-      $exifData = $this->getExif(false);
-      if (count($exifData) > 0) {
+        $exifData = $this->getExif(false);
+        if (count($exifData) > 0) {
 
         switch($exifData['orientation']) {
             case 8:
@@ -361,34 +361,34 @@ 
                 $this->imageResized = imagerotate($this->imageResized,-90,0);
                 break;
         }
-      }
+        }
     }
 
     // *** Sharpen image (if jpg and the user wishes to do so)
     if ($sharpen && in_array($this->fileExtension, $this->sharpenArray)) {
 
-      // *** Sharpen
-      $this->sharpen();
+        // *** Sharpen
+        $this->sharpen();
     }
     }
 
 ## --------------------------------------------------------
 
-  public function cropImage($newWidth, $newHeight, $cropPos = 'm')
+    public function cropImage($newWidth, $newHeight, $cropPos = 'm')
     # Author:     Jarrod Oberto
     # Date:       08-09-11
     # Purpose:    Crops the image
     # Param in:   $newWidth: crop with
     #             $newHeight: crop height
-  #       $cropPos: Can be any of the following:
-  #             tl, t, tr, l, m, r, bl, b, br, auto
-  #           Or:
-  #             a custom position such as '30x50'
+    #       $cropPos: Can be any of the following:
+    #             tl, t, tr, l, m, r, bl, b, br, auto
+    #           Or:
+    #             a custom position such as '30x50'
     # Param out:  n/a
     # Reference:
     # Notes:
     #
-  {
+    {
 
     // *** Make sure the file passed in is valid
     if (!$this->image) { if ($this->debug) { throw new Exception('file ' . $this->getFileName() .' is missing or invalid'); }else{ throw new Exception(); }};
@@ -396,11 +396,11 @@ 
     $this->imageResized = $this->image;
     $this->crop($this->width, $this->height, $newWidth, $newHeight, $cropPos);
 
-  }
+    }
 
 ## --------------------------------------------------------
 
-  private function keepTransparancy($width, $height, $im)
+    private function keepTransparancy($width, $height, $im)
     # Author:     Jarrod Oberto
     # Date:       08-04-11
     # Purpose:    Keep transparency for png and gif image
@@ -409,18 +409,18 @@ 
     # Reference:
     # Notes:
     #
-  {
+    {
     // *** If PNG, perform some transparency retention actions (gif untested)
     if (in_array($this->fileExtension, $this->transparentArray) && $this->keepTransparency) {
-      imagealphablending($im, false);
-      imagesavealpha($im, true);
-      $transparent = imagecolorallocatealpha($im, 255, 255, 255, 127);
-      imagefilledrectangle($im, 0, 0, $width, $height, $transparent);
+        imagealphablending($im, false);
+        imagesavealpha($im, true);
+        $transparent = imagecolorallocatealpha($im, 255, 255, 255, 127);
+        imagefilledrectangle($im, 0, 0, $width, $height, $transparent);
     } else {
-      $color = imagecolorallocate($im, $this->fillColorArray['r'], $this->fillColorArray['g'], $this->fillColorArray['b']);
-      imagefilledrectangle($im, 0, 0, $width, $height, $color);
+        $color = imagecolorallocate($im, $this->fillColorArray['r'], $this->fillColorArray['g'], $this->fillColorArray['b']);
+        imagefilledrectangle($im, 0, 0, $width, $height, $color);
+    }
     }
-  }
 
 ## --------------------------------------------------------
 
@@ -456,102 +456,102 @@ 
 
 ## --------------------------------------------------------
 
-  private function getCropPlacing($optimalWidth, $optimalHeight, $newWidth, $newHeight, $pos='m')
-  #
-  # Author:   Jarrod Oberto
-  # Date:   July 11
-  # Purpose:  Set the cropping area.
-  # Params in:
-  # Params out: (array) the crop x and y co-ordinates.
-  # Notes:    When specifying the exact pixel crop position (eg 10x15), be
-  #       very careful as it's easy to crop out of the image leaving
-  #       black borders.
-  #
-  {
+    private function getCropPlacing($optimalWidth, $optimalHeight, $newWidth, $newHeight, $pos='m')
+    #
+    # Author:   Jarrod Oberto
+    # Date:   July 11
+    # Purpose:  Set the cropping area.
+    # Params in:
+    # Params out: (array) the crop x and y co-ordinates.
+    # Notes:    When specifying the exact pixel crop position (eg 10x15), be
+    #       very careful as it's easy to crop out of the image leaving
+    #       black borders.
+    #
+    {
     $pos = fix_strtolower($pos);
 
     // *** If co-ords have been entered
     if (strstr($pos, 'x')) {
-      $pos = str_replace(' ', '', $pos);
+        $pos = str_replace(' ', '', $pos);
 
-      $xyArray = explode('x', $pos);
-      list($cropStartX, $cropStartY) = $xyArray;
+        $xyArray = explode('x', $pos);
+        list($cropStartX, $cropStartY) = $xyArray;
 
     } else {
 
-      switch ($pos) {
+        switch ($pos) {
         case 'tl':
           $cropStartX = 0;
-          $cropStartY = 0;
-          break;
+            $cropStartY = 0;
+            break;
 
         case 't':
           $cropStartX = ( $optimalWidth / 2) - ( $newWidth /2 );
-          $cropStartY = 0;
-          break;
+            $cropStartY = 0;
+            break;
 
         case 'tr':
           $cropStartX = $optimalWidth - $newWidth;
-          $cropStartY = 0;
-          break;
+            $cropStartY = 0;
+            break;
 
         case 'l':
           $cropStartX = 0;
-          $cropStartY = ( $optimalHeight/ 2) - ( $newHeight/2 );
-          break;
+            $cropStartY = ( $optimalHeight/ 2) - ( $newHeight/2 );
+            break;
 
         case 'm':
           $cropStartX = ( $optimalWidth / 2) - ( $newWidth /2 );
-          $cropStartY = ( $optimalHeight/ 2) - ( $newHeight/2 );
-          break;
+            $cropStartY = ( $optimalHeight/ 2) - ( $newHeight/2 );
+            break;
 
         case 'r':
           $cropStartX = $optimalWidth - $newWidth;
-          $cropStartY = ( $optimalHeight/ 2) - ( $newHeight/2 );
-          break;
+            $cropStartY = ( $optimalHeight/ 2) - ( $newHeight/2 );
+            break;
 
         case 'bl':
           $cropStartX = 0;
-          $cropStartY = $optimalHeight - $newHeight;
-          break;
+            $cropStartY = $optimalHeight - $newHeight;
+            break;
 
         case 'b':
           $cropStartX = ( $optimalWidth / 2) - ( $newWidth /2 );
-          $cropStartY = $optimalHeight - $newHeight;
-          break;
+            $cropStartY = $optimalHeight - $newHeight;
+            break;
 
         case 'br':
           $cropStartX = $optimalWidth - $newWidth;
-          $cropStartY = $optimalHeight - $newHeight;
-          break;
+            $cropStartY = $optimalHeight - $newHeight;
+            break;
 
         case 'auto':
           // *** If image is a portrait crop from top, not center. v1.5
           if ($optimalHeight > $optimalWidth) {
             $cropStartX = ( $optimalWidth / 2) - ( $newWidth /2 );
             $cropStartY = ($this->cropFromTopPercent /100) * $optimalHeight;
-          } else {
+            } else {
 
             // *** Else crop from the center
             $cropStartX = ( $optimalWidth / 2) - ( $newWidth /2 );
             $cropStartY = ( $optimalHeight/ 2) - ( $newHeight/2 );
-          }
-          break;
+            }
+            break;
 
         default:
           // *** Default to center
           $cropStartX = ( $optimalWidth / 2) - ( $newWidth /2 );
-          $cropStartY = ( $optimalHeight/ 2) - ( $newHeight/2 );
-          break;
-      }
+            $cropStartY = ( $optimalHeight/ 2) - ( $newHeight/2 );
+            break;
+        }
     }
 
     return array('x' => $cropStartX, 'y' => $cropStartY);
-  }
+    }
 
 ## --------------------------------------------------------
 
-  private function getDimensions($newWidth, $newHeight, $option)
+    private function getDimensions($newWidth, $newHeight, $option)
     # Author:     Jarrod Oberto
     # Date:       17-11-09
     # Purpose:    Get new image dimensions based on user specificaions
@@ -560,8 +560,8 @@ 
     # Param out:  Array of new width and height values
     # Reference:
     # Notes:    If $option = 3 then this function is call recursivly
-  #
-  #       To clarify the $option input:
+    #
+    #       To clarify the $option input:
     #               0 = The exact height and width dimensions you set.
     #               1 = Whatever height is passed in will be the height that
     #                   is set. The width will be calculated and set automatically
@@ -570,9 +570,9 @@ 
     #               3 = Depending whether the image is landscape or portrait, this
     #                   will automatically determine whether to resize via
     #                   dimension 1,2 or 0.
-  #               4 = Resize the image as much as possible, then crop the
-  #         remainder.
-  {
+    #               4 = Resize the image as much as possible, then crop the
+    #         remainder.
+    {
 
         switch ((string)($option))
         {
@@ -599,7 +599,7 @@ 
         $optimalWidth = $dimensionsArray['optimalWidth'];
         $optimalHeight = $dimensionsArray['optimalHeight'];
                 break;
-      case '4':
+        case '4':
       case 'crop':
                 $dimensionsArray = $this->getOptimalCrop($newWidth, $newHeight);
         $optimalWidth = $dimensionsArray['optimalWidth'];
@@ -608,7 +608,7 @@ 
         }
 
     return array('optimalWidth' => $optimalWidth, 'optimalHeight' => $optimalHeight);
-  }
+    }
 
 ## --------------------------------------------------------
 
@@ -617,10 +617,10 @@ 
     // *** If forcing is off...
     if (!$this->forceStretch) {
 
-      // *** ...check if actual height is less than target height
-      if ($this->height < $newHeight) {
+        // *** ...check if actual height is less than target height
+        if ($this->height < $newHeight) {
         return array('optimalWidth' => $this->width, 'optimalHeight' => $this->height);
-      }
+        }
     }
 
         $ratio = $this->width / $this->height;
@@ -638,10 +638,10 @@ 
     // *** If forcing is off...
     if (!$this->forceStretch) {
 
-      // *** ...check if actual width is less than target width
-      if ($this->width < $newWidth) {
+        // *** ...check if actual width is less than target width
+        if ($this->width < $newWidth) {
         return array('optimalWidth' => $this->width, 'optimalHeight' => $this->height);
-      }
+        }
     }
 
     $ratio = $this->height / $this->width;
@@ -665,10 +665,10 @@ 
     // *** If forcing is off...
     if (!$this->forceStretch) {
 
-      // *** ...check if actual size is less than target size
-      if ($this->width < $newWidth && $this->height < $newHeight) {
+        // *** ...check if actual size is less than target size
+        if ($this->width < $newWidth && $this->height < $newHeight) {
         return array('optimalWidth' => $this->width, 'optimalHeight' => $this->height);
-      }
+        }
     }
 
         if ($this->height < $this->width)
@@ -678,8 +678,8 @@ 
             //$optimalHeight= $this->getSizeByFixedWidth($newWidth);
 
             $dimensionsArray = $this->getSizeByFixedWidth($newWidth, $newHeight);
-      $optimalWidth = $dimensionsArray['optimalWidth'];
-      $optimalHeight = $dimensionsArray['optimalHeight'];
+        $optimalWidth = $dimensionsArray['optimalWidth'];
+        $optimalHeight = $dimensionsArray['optimalHeight'];
         }
         elseif ($this->height > $this->width)
         // *** Image to be resized is taller (portrait)
@@ -688,30 +688,30 @@ 
             //$optimalHeight= $newHeight;
 
             $dimensionsArray = $this->getSizeByFixedHeight($newWidth, $newHeight);
-      $optimalWidth = $dimensionsArray['optimalWidth'];
-      $optimalHeight = $dimensionsArray['optimalHeight'];
+        $optimalWidth = $dimensionsArray['optimalWidth'];
+        $optimalHeight = $dimensionsArray['optimalHeight'];
         }
     else
         // *** Image to be resizerd is a square
         {
 
-      if ($newHeight < $newWidth) {
-          //$optimalWidth = $newWidth;
+        if ($newHeight < $newWidth) {
+            //$optimalWidth = $newWidth;
         //$optimalHeight= $this->getSizeByFixedWidth($newWidth);
                 $dimensionsArray = $this->getSizeByFixedWidth($newWidth, $newHeight);
         $optimalWidth = $dimensionsArray['optimalWidth'];
         $optimalHeight = $dimensionsArray['optimalHeight'];
-      } else if ($newHeight > $newWidth) {
-          //$optimalWidth = $this->getSizeByFixedHeight($newHeight);
+        } else if ($newHeight > $newWidth) {
+            //$optimalWidth = $this->getSizeByFixedHeight($newHeight);
             //$optimalHeight= $newHeight;
                 $dimensionsArray = $this->getSizeByFixedHeight($newWidth, $newHeight);
         $optimalWidth = $dimensionsArray['optimalWidth'];
         $optimalHeight = $dimensionsArray['optimalHeight'];
-      } else {
+        } else {
         // *** Sqaure being resized to a square
         $optimalWidth = $newWidth;
         $optimalHeight= $newHeight;
-      }
+        }
         }
 
     return array('optimalWidth' => $optimalWidth, 'optimalHeight' => $optimalHeight);
@@ -720,64 +720,64 @@ 
 ## --------------------------------------------------------
 
     private function getOptimalCrop($newWidth, $newHeight)
-  # Author:     Jarrod Oberto
+    # Author:     Jarrod Oberto
     # Date:       17-11-09
     # Purpose:    Get optimal crop dimensions
     # Param in:   width and height as requested by user (fig 3)
     # Param out:  Array of optimal width and height (fig 2)
     # Reference:
     # Notes:      The optimal width and height return are not the same as the
-  #       same as the width and height passed in. For example:
-  #
-  #
-  #   |-----------------|     |------------|       |-------|
-  #   |             |   =>  |**|      |**|   =>  |       |
-  #   |             |     |**|      |**|       |       |
+    #       same as the width and height passed in. For example:
+    #
+    #
+    #   |-----------------|     |------------|       |-------|
+    #   |             |   =>  |**|      |**|   =>  |       |
+    #   |             |     |**|      |**|       |       |
     #   |           |       |------------|       |-------|
-  #   |-----------------|
-  #        original                optimal             crop
-  #              size                   size               size
-  #  Fig          1                      2                  3
-  #
-  #       300 x 250           150 x 125          150 x 100
-  #
-  #    The optimal size is the smallest size (that is closest to the crop size)
-  #    while retaining proportion/ratio.
-  #
-  #  The crop size is the optimal size that has been cropped on one axis to
-  #  make the image the exact size specified by the user.
-  #
-  #               * represent cropped area
-  #
-  {
+    #   |-----------------|
+    #        original                optimal             crop
+    #              size                   size               size
+    #  Fig          1                      2                  3
+    #
+    #       300 x 250           150 x 125          150 x 100
+    #
+    #    The optimal size is the smallest size (that is closest to the crop size)
+    #    while retaining proportion/ratio.
+    #
+    #  The crop size is the optimal size that has been cropped on one axis to
+    #  make the image the exact size specified by the user.
+    #
+    #               * represent cropped area
+    #
+    {
 
     // *** If forcing is off...
     if (!$this->forceStretch) {
 
-      // *** ...check if actual size is less than target size
-      if ($this->width < $newWidth && $this->height < $newHeight) {
+        // *** ...check if actual size is less than target size
+        if ($this->width < $newWidth && $this->height < $newHeight) {
         return array('optimalWidth' => $this->width, 'optimalHeight' => $this->height);
-      }
+        }
     }
 
     $heightRatio = $this->height / $newHeight;
     $widthRatio  = $this->width /  $newWidth;
 
     if ($heightRatio < $widthRatio) {
-      $optimalRatio = $heightRatio;
+        $optimalRatio = $heightRatio;
     } else {
-      $optimalRatio = $widthRatio;
+        $optimalRatio = $widthRatio;
     }
 
     $optimalHeight = round( $this->height / $optimalRatio );
     $optimalWidth  = round( $this->width  / $optimalRatio );
 
     return array('optimalWidth' => $optimalWidth, 'optimalHeight' => $optimalHeight);
-  }
+    }
 
 ## --------------------------------------------------------
 
-  private function sharpen()
+    private function sharpen()
     # Author:     Jarrod Oberto
     # Date:       08 04 2011
     # Purpose:    Sharpen image
@@ -786,56 +786,56 @@ 
     # Reference:
     # Notes:
     # Credit:   Incorporates Joe Lencioni (August 6, 2008) code
-  {
+    {
 
     if (version_compare(PHP_VERSION, '5.1.0') >= 0) {
 
-      // ***
-      if ($this->aggresiveSharpening) { # A more aggressive sharpening solution
+        // ***
+        if ($this->aggresiveSharpening) { # A more aggressive sharpening solution
 
         $sharpenMatrix = array( array( -1, -1, -1 ),
-                         array( -1, 16, -1 ),
-                         array( -1, -1, -1 ) );
+                            array( -1, 16, -1 ),
+                            array( -1, -1, -1 ) );
         $divisor = 8;
         $offset = 0;
 
         imageconvolution($this->imageResized, $sharpenMatrix, $divisor, $offset);
-      }
-      else # More subtle and personally more desirable
-      {
+        }
+        else # More subtle and personally more desirable
+        {
         $sharpness  = $this->findSharp($this->widthOriginal, $this->width);
 
         $sharpenMatrix  = array(
-          array(-1, -2, -1),
-          array(-2, $sharpness + 12, -2), //Lessen the effect of a filter by increasing the value in the center cell
-          array(-1, -2, -1)
+            array(-1, -2, -1),
+            array(-2, $sharpness + 12, -2), //Lessen the effect of a filter by increasing the value in the center cell
+            array(-1, -2, -1)
         );
         $divisor    = $sharpness; // adjusts brightness
         $offset     = 0;
         imageconvolution($this->imageResized, $sharpenMatrix, $divisor, $offset);
-      }
+        }
     }
     else
     {
-      if ($this->debug) { throw new Exception('Sharpening required PHP 5.1.0 or greater.'); }
+        if ($this->debug) { throw new Exception('Sharpening required PHP 5.1.0 or greater.'); }
+    }
     }
-  }
 
-  ## --------------------------------------------------------
+    ## --------------------------------------------------------
 
-  private function sharpen2($level)
-  {
-      $sharpenMatrix  = array(
+    private function sharpen2($level)
+    {
+        $sharpenMatrix  = array(
         array($level, $level, $level),
         array($level, (8*$level)+1, $level), //Lessen the effect of a filter by increasing the value in the center cell
         array($level, $level, $level)
-      );
+        );
 
-  }
+    }
 
 ## --------------------------------------------------------
 
-  private function findSharp($orig, $final)
+    private function findSharp($orig, $final)
     # Author:     Ryan Rud (http://adryrun.com)
     # Purpose:    Find optimal sharpness
     # Param in:   n/a
@@ -843,7 +843,7 @@ 
     # Reference:
     # Notes:
     #
-  {
+    {
     $final  = $final * (750.0 / $orig);
     $a    = 52;
     $b    = -0.27810650887573124;
@@ -852,11 +852,11 @@ 
     $result = $a + $b * $final + $c * $final * $final;
 
     return max(round($result), 0);
-  }
+    }
 
 ## --------------------------------------------------------
 
-  private function prepOption($option)
+    private function prepOption($option)
     # Author:     Jarrod Oberto
     # Purpose:    Prep option like change the passed in option to lowercase
     # Param in:   (str/int) $option: eg. 'exact', 'crop'. 0, 4
@@ -864,23 +864,23 @@ 
     # Reference:
     # Notes:
     #
-  {
+    {
     if (is_array($option)) {
-      if (fix_strtolower($option[0]) === 'crop' && count($option) == 2) {
+        if (fix_strtolower($option[0]) === 'crop' && count($option) == 2) {
         return 'crop';
-      } else {
+        } else {
         throw new Exception('Crop resize option array is badly formatted.');
-      }
+        }
     } else if (strpos($option, 'crop') !== false) {
-      return 'crop';
+        return 'crop';
     }
 
     if (is_string($option)) {
-      return fix_strtolower($option);
+        return fix_strtolower($option);
     }
 
     return $option;
-  }
+    }
 
 
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*-
@@ -894,29 +894,29 @@ 
 #
 
 
-  public function borderPreset($preset)
-  {
+    public function borderPreset($preset)
+    {
     switch ($preset)
     {
 
-      case 'simple':
+        case 'simple':
         $this->addBorder(7, '#fff');
         $this->addBorder(6, '#f2f1f0');
         $this->addBorder(2, '#fff');
         $this->addBorder(1, '#ccc');
         break;
-      default:
+        default:
         break;
     }
 
-  }
+    }
 
 
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*-
   Draw border
 *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
-  public function addBorder($thickness = 1, $rgbArray = array(255, 255, 255))
+    public function addBorder($thickness = 1, $rgbArray = array(255, 255, 255))
     # Author:     Jarrod Oberto
     # Date:       05-05-11
     # Purpose:    Add a border to the image
@@ -925,35 +925,35 @@ 
     # Reference:
     # Notes:    This border is added to the INSIDE of the image
     #
-  {
+    {
     if ($this->imageResized) {
 
-      $rgbArray = $this->formatColor($rgbArray);
-      $r = $rgbArray['r'];
-      $g = $rgbArray['g'];
-      $b = $rgbArray['b'];
+        $rgbArray = $this->formatColor($rgbArray);
+        $r = $rgbArray['r'];
+        $g = $rgbArray['g'];
+        $b = $rgbArray['b'];
 
 
-      $x1 = 0;
-      $y1 = 0;
-      $x2 = imagesx($this->imageResized) - 1;
-      $y2 = imagesy($this->imageResized) - 1;
+        $x1 = 0;
+        $y1 = 0;
+        $x2 = imagesx($this->imageResized) - 1;
+        $y2 = imagesy($this->imageResized) - 1;
 
-      $rgbArray = imagecolorallocate($this->imageResized, $r, $g, $b);
+        $rgbArray = imagecolorallocate($this->imageResized, $r, $g, $b);
 
 
-      for($i = 0; $i < $thickness; $i++) {
-          imagerectangle($this->imageResized, $x1++, $y1++, $x2--, $y2--, $rgbArray);
-      }
+        for($i = 0; $i < $thickness; $i++) {
+            imagerectangle($this->imageResized, $x1++, $y1++, $x2--, $y2--, $rgbArray);
+        }
+    }
     }
-  }
 
 
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*-
   Gray Scale
 *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
-  public function greyScale()
+    public function greyScale()
     # Author:     Jarrod Oberto
     # Date:       07-05-2011
     # Purpose:    Make image greyscale
@@ -962,16 +962,16 @@ 
     # Reference:
     # Notes:
     #
-  {
+    {
     if ($this->imageResized) {
-      imagefilter($this->imageResized, IMG_FILTER_GRAYSCALE);
+        imagefilter($this->imageResized, IMG_FILTER_GRAYSCALE);
     }
 
-  }
+    }
 
-  ## --------------------------------------------------------
+    ## --------------------------------------------------------
 
-  public function greyScaleEnhanced()
+    public function greyScaleEnhanced()
     # Author:     Jarrod Oberto
     # Date:       07-05-2011
     # Purpose:    Make image greyscale
@@ -980,29 +980,29 @@ 
     # Reference:
     # Notes:
     #
-  {
+    {
     if ($this->imageResized) {
-      imagefilter($this->imageResized, IMG_FILTER_GRAYSCALE);
-      imagefilter($this->imageResized, IMG_FILTER_CONTRAST, -15);
-      imagefilter($this->imageResized, IMG_FILTER_BRIGHTNESS, 2);
-      $this->sharpen($this->width);
+        imagefilter($this->imageResized, IMG_FILTER_GRAYSCALE);
+        imagefilter($this->imageResized, IMG_FILTER_CONTRAST, -15);
+        imagefilter($this->imageResized, IMG_FILTER_BRIGHTNESS, 2);
+        $this->sharpen($this->width);
+    }
     }
-  }
 
-  ## --------------------------------------------------------
+    ## --------------------------------------------------------
 
-  public function greyScaleDramatic()
-  # Alias of gd_filter_monopin
-  {
+    public function greyScaleDramatic()
+    # Alias of gd_filter_monopin
+    {
     $this->gd_filter_monopin();
-  }
+    }
 
 
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*-
   Black 'n White
 *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
-  public function blackAndWhite()
+    public function blackAndWhite()
     # Author:     Jarrod Oberto
     # Date:       07-05-2011
     # Purpose:    Make image black and white
@@ -1011,21 +1011,21 @@ 
     # Reference:
     # Notes:
     #
-  {
+    {
     if ($this->imageResized) {
 
-      imagefilter($this->imageResized, IMG_FILTER_GRAYSCALE);
-      imagefilter($this->imageResized, IMG_FILTER_CONTRAST, -1000);
+        imagefilter($this->imageResized, IMG_FILTER_GRAYSCALE);
+        imagefilter($this->imageResized, IMG_FILTER_CONTRAST, -1000);
     }
 
-  }
+    }
 
 
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*-
   Negative
 *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
-  public function negative()
+    public function negative()
     # Author:     Jarrod Oberto
     # Date:       07-05-2011
     # Purpose:    Make image negative
@@ -1034,20 +1034,20 @@ 
     # Reference:
     # Notes:
     #
-  {
+    {
     if ($this->imageResized) {
 
-      imagefilter($this->imageResized, IMG_FILTER_NEGATE);
+        imagefilter($this->imageResized, IMG_FILTER_NEGATE);
     }
 
-  }
+    }
 
 
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*-
   Sepia
 *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
-  public function sepia()
+    public function sepia()
     # Author:     Jarrod Oberto
     # Date:       07-05-2011
     # Purpose:    Make image sepia
@@ -1056,90 +1056,90 @@ 
     # Reference:
     # Notes:
     #
-  {
+    {
     if ($this->imageResized) {
-      imagefilter($this->imageResized, IMG_FILTER_GRAYSCALE);
-      imagefilter($this->imageResized, IMG_FILTER_BRIGHTNESS, -10);
-      imagefilter($this->imageResized, IMG_FILTER_CONTRAST, -20);
-      imagefilter($this->imageResized, IMG_FILTER_COLORIZE, 60, 30, -15);
+        imagefilter($this->imageResized, IMG_FILTER_GRAYSCALE);
+        imagefilter($this->imageResized, IMG_FILTER_BRIGHTNESS, -10);
+        imagefilter($this->imageResized, IMG_FILTER_CONTRAST, -20);
+        imagefilter($this->imageResized, IMG_FILTER_COLORIZE, 60, 30, -15);
+    }
     }
-  }
 
-  ## --------------------------------------------------------
+    ## --------------------------------------------------------
 
-  public function sepia2()
+    public function sepia2()
 
-  {
+    {
     if ($this->imageResized) {
 
-      $total = imagecolorstotal( $this->imageResized );
-      for ( $i = 0; $i < $total; $i++ ) {
+        $total = imagecolorstotal( $this->imageResized );
+        for ( $i = 0; $i < $total; $i++ ) {
         $index = imagecolorsforindex( $this->imageResized, $i );
         $red = ( $index["red"] * 0.393 + $index["green"] * 0.769 + $index["blue"] * 0.189 ) / 1.351;
         $green = ( $index["red"] * 0.349 + $index["green"] * 0.686 + $index["blue"] * 0.168 ) / 1.203;
         $blue = ( $index["red"] * 0.272 + $index["green"] * 0.534 + $index["blue"] * 0.131 ) / 2.140;
         imagecolorset( $this->imageResized, $i, $red, $green, $blue );
-      }
+        }
 
 
     }
-  }
+    }
 
 
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*-
   Vintage
 *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
-  public function vintage()
-  # Alias of gd_filter_monopin
-  {
+    public function vintage()
+    # Alias of gd_filter_monopin
+    {
     $this->gd_filter_vintage();
-  }
+    }
 
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*-
   Presets By Marc Hibbins
 *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
 
-  /** Apply 'Monopin' preset */
-  public function gd_filter_monopin()
-  {
+    /** Apply 'Monopin' preset */
+    public function gd_filter_monopin()
+    {
 
     if ($this->imageResized) {
-      imagefilter($this->imageResized, IMG_FILTER_GRAYSCALE);
-      imagefilter($this->imageResized, IMG_FILTER_BRIGHTNESS, -15);
-      imagefilter($this->imageResized, IMG_FILTER_CONTRAST, -15);
-      $this->imageResized = $this->gd_apply_overlay($this->imageResized, 'vignette', 100);
+        imagefilter($this->imageResized, IMG_FILTER_GRAYSCALE);
+        imagefilter($this->imageResized, IMG_FILTER_BRIGHTNESS, -15);
+        imagefilter($this->imageResized, IMG_FILTER_CONTRAST, -15);
+        $this->imageResized = $this->gd_apply_overlay($this->imageResized, 'vignette', 100);
+    }
     }
-  }
 
-  ## --------------------------------------------------------
+    ## --------------------------------------------------------
 
-  public function gd_filter_vintage()
-  {
+    public function gd_filter_vintage()
+    {
     if ($this->imageResized) {
-      $this->imageResized = $this->gd_apply_overlay($this->imageResized, 'vignette', 45);
-      imagefilter($this->imageResized, IMG_FILTER_BRIGHTNESS, 20);
-      imagefilter($this->imageResized, IMG_FILTER_CONTRAST, -35);
-      imagefilter($this->imageResized, IMG_FILTER_COLORIZE, 60, -10, 35);
-      imagefilter($this->imageResized, IMG_FILTER_SMOOTH, 7);
-      $this->imageResized = $this->gd_apply_overlay($this->imageResized, 'scratch', 10);
-    }
-  }
-
-  ## --------------------------------------------------------
-
-  /** Apply a PNG overlay */
-  private function gd_apply_overlay($im, $type, $amount)
-  #
-  # Original Author:    Marc Hibbins
-  # License:  Attribution-ShareAlike 3.0
-  # Purpose:
-  # Params in:
-  # Params out:
-  # Notes:
-  #
-  {
+        $this->imageResized = $this->gd_apply_overlay($this->imageResized, 'vignette', 45);
+        imagefilter($this->imageResized, IMG_FILTER_BRIGHTNESS, 20);
+        imagefilter($this->imageResized, IMG_FILTER_CONTRAST, -35);
+        imagefilter($this->imageResized, IMG_FILTER_COLORIZE, 60, -10, 35);
+        imagefilter($this->imageResized, IMG_FILTER_SMOOTH, 7);
+        $this->imageResized = $this->gd_apply_overlay($this->imageResized, 'scratch', 10);
+    }
+    }
+
+    ## --------------------------------------------------------
+
+    /** Apply a PNG overlay */
+    private function gd_apply_overlay($im, $type, $amount)
+    #
+    # Original Author:    Marc Hibbins
+    # License:  Attribution-ShareAlike 3.0
+    # Purpose:
+    # Params in:
+    # Params out:
+    # Notes:
+    #
+    {
     $width = imagesx($im);
     $height = imagesy($im);
     $filter = imagecreatetruecolor($width, $height);
@@ -1162,15 +1162,15 @@ 
 
     imagedestroy($comp);
     return $im;
-  }
+    }
 
 
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*-
   Colorise
 *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
-  public function image_colorize($rgb) {
-      imagetruecolortopalette($this->imageResized,true,256);
+    public function image_colorize($rgb) {
+        imagetruecolortopalette($this->imageResized,true,256);
     $numColors = imagecolorstotal($this->imageResized);
 
     for ($x = 0; $x < $numColors; $x++) {
@@ -1179,24 +1179,24 @@ 
     // calculate grayscale in percent
     $grayscale = ($r + $g + $b) / 3 / 0xff;
 
-      imagecolorset($this->imageResized,$x,
-      $grayscale * $rgb[0],
-      $grayscale * $rgb[1],
-      $grayscale * $rgb[2]
+        imagecolorset($this->imageResized,$x,
+        $grayscale * $rgb[0],
+        $grayscale * $rgb[1],
+        $grayscale * $rgb[2]
     );
 
     }
 
     return true;
-  }
+    }
 
 
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*-
   Reflection
 *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
-  public function addReflection($reflectionHeight = 50, $startingTransparency = 30, $inside = false, $bgColor = '#fff', $stretch=false, $divider = 0)
-  {
+    public function addReflection($reflectionHeight = 50, $startingTransparency = 30, $inside = false, $bgColor = '#fff', $stretch=false, $divider = 0)
+    {
 
     // *** Convert color
     $rgbArray = $this->formatColor($bgColor);
@@ -1221,7 +1221,7 @@ 
     $bg = imagecreatetruecolor($this->width, $reflectionHeight);
 
     for ($x = 0; $x < $this->width; $x++) {
-      imagecopy($bg, $im, $x, 0, $this->width-$x -1, 0, 1, $reflectionHeight);
+        imagecopy($bg, $im, $x, 0, $this->width-$x -1, 0, 1, $reflectionHeight);
     }
     $im = $bg;
 
@@ -1230,16 +1230,16 @@ 
 
     // *** Fade
     if ($stretch) {
-      $step = 100/($reflectionHeight + $startingTransparency);
+        $step = 100/($reflectionHeight + $startingTransparency);
     } else{
-      $step = 100/$reflectionHeight;
+        $step = 100/$reflectionHeight;
     }
     for($i=0; $i<=$reflectionHeight; $i++){
 
-      if($startingTransparency>100) $startingTransparency = 100;
-      if($startingTransparency< 1) $startingTransparency = 1;
-      imagecopymerge($bg, $li, 0, $i, 0, 0, $this->width, 1, $startingTransparency);
-      $startingTransparency+=$step;
+        if($startingTransparency>100) $startingTransparency = 100;
+        if($startingTransparency< 1) $startingTransparency = 1;
+        imagecopymerge($bg, $li, 0, $i, 0, 0, $this->width, 1, $startingTransparency);
+        $startingTransparency+=$step;
     }
 
     // *** Apply fade
@@ -1254,126 +1254,126 @@ 
     // *** Determines if the reflection should be displayed inside or outside the image
     if ($inside) {
 
-      // Create new blank image with sizes.
-      $final = imagecreatetruecolor($this->width, $this->height);
+        // Create new blank image with sizes.
+        $final = imagecreatetruecolor($this->width, $this->height);
 
-      imagecopymerge ($final, $this->imageResized, 0, 0, 0, $reflectionHeight, $this->width, $this->height - $reflectionHeight, 100);
-      imagecopymerge ($final, $im, 0, $this->height - $reflectionHeight, 0, 0, $x, $y, 100);
+        imagecopymerge ($final, $this->imageResized, 0, 0, 0, $reflectionHeight, $this->width, $this->height - $reflectionHeight, 100);
+        imagecopymerge ($final, $im, 0, $this->height - $reflectionHeight, 0, 0, $x, $y, 100);
 
     } else {
 
-      // Create new blank image with sizes.
-      $final = imagecreatetruecolor($this->width, $this->height + $y);
+        // Create new blank image with sizes.
+        $final = imagecreatetruecolor($this->width, $this->height + $y);
 
-      imagecopymerge ($final, $this->imageResized, 0, 0, 0, 0, $this->width, $this->height, 100);
-      imagecopymerge ($final, $im, 0, $this->height, 0, 0, $x, $y, 100);
+        imagecopymerge ($final, $this->imageResized, 0, 0, 0, 0, $this->width, $this->height, 100);
+        imagecopymerge ($final, $im, 0, $this->height, 0, 0, $x, $y, 100);
     }
 
     $this->imageResized = $final;
 
     imagedestroy($li);
     imagedestroy($im);
-  }
+    }
 
 
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*-
   Rotate
 *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
-  public function rotate($value = 90, $bgColor = 'transparent')
+    public function rotate($value = 90, $bgColor = 'transparent')
     # Author:     Jarrod Oberto
     # Date:       07-05-2011
     # Purpose:    Rotate image
     # Param in:   (mixed) $degrees: (int) number of degress to rotate image
-  #               (str) param "left": rotate left
-  #               (str) param "right": rotate right
-  #               (str) param "upside": upside-down image
+    #               (str) param "left": rotate left
+    #               (str) param "right": rotate right
+    #               (str) param "upside": upside-down image
     # Param out:
     # Reference:
     # Notes:    The default direction of imageRotate() is counter clockwise.
     #
-  {
+    {
     if ($this->imageResized) {
 
-      if (is_integer($value)) {
+        if (is_integer($value)) {
         $degrees = $value;
-      }
+        }
 
-      // *** Convert color
-      $rgbArray = $this->formatColor($bgColor);
-      $r = $rgbArray['r'];
-      $g = $rgbArray['g'];
-      $b = $rgbArray['b'];
-      if (isset($rgbArray['a'])) {$a = $rgbArray['a']; }
+        // *** Convert color
+        $rgbArray = $this->formatColor($bgColor);
+        $r = $rgbArray['r'];
+        $g = $rgbArray['g'];
+        $b = $rgbArray['b'];
+        if (isset($rgbArray['a'])) {$a = $rgbArray['a']; }
 
-      if (is_string($value)) {
+        if (is_string($value)) {
 
         $value = fix_strtolower($value);
 
         switch ($value) {
-          case 'left':
+            case 'left':
             $degrees = 90;
             break;
-          case 'right':
+            case 'right':
             $degrees = 270;
             break;
-          case 'upside':
+            case 'upside':
             $degrees = 180;
             break;
-          default:
+            default:
             break;
         }
 
-      }
+        }
 
-      // *** The default direction of imageRotate() is counter clockwise
-      //   * This makes it clockwise
-      $degrees = 360 - $degrees;
+        // *** The default direction of imageRotate() is counter clockwise
+        //   * This makes it clockwise
+        $degrees = 360 - $degrees;
 
-      // *** Create background color
-      $bg = imagecolorallocatealpha($this->imageResized, $r, $g, $b, $a);
+        // *** Create background color
+        $bg = imagecolorallocatealpha($this->imageResized, $r, $g, $b, $a);
 
-      // *** Fill with background
+        // *** Fill with background
         imagefill($this->imageResized, 0, 0 , $bg);
 
-      // *** Rotate
-      $this->imageResized = imagerotate($this->imageResized, $degrees, $bg); // Rotate 45 degrees and allocated the transparent colour as the one to make transparent (obviously)
+        // *** Rotate
+        $this->imageResized = imagerotate($this->imageResized, $degrees, $bg); // Rotate 45 degrees and allocated the transparent colour as the one to make transparent (obviously)
 
-      // Ensure alpha transparency
+        // Ensure alpha transparency
         imagesavealpha($this->imageResized,true);
 
     }
-  }
+    }
 
 
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*-
   Round corners
 *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
-  public function roundCorners($radius = 5,  $bgColor = 'transparent')
+    public function roundCorners($radius = 5,  $bgColor = 'transparent')
     # Author:     Jarrod Oberto
     # Date:       19-05-2011
     # Purpose:    Create rounded corners on your image
     # Param in:   (int) radius = the amount of curvature
-  #       (mixed) $bgColor = the corner background color
+    #       (mixed) $bgColor = the corner background color
     # Param out:  n/a
     # Reference:
     # Notes:
     #
-  {
+    {
 
     // *** Check if the user wants transparency
     $isTransparent = false;
     if (!is_array($bgColor)) {
-      if (fix_strtolower($bgColor) === 'transparent') {
+        if (fix_strtolower($bgColor) === 'transparent') {
         $isTransparent = true;
-      }
+        }
     }
 
 
     // *** If we use transparency, we need to color our curved mask with a unique color
     if ($isTransparent) {
-      $bgColor = $this->findUnusedGreen();
+        $bgColor = $this->findUnusedGreen();
     }
 
     // *** Convert color
@@ -1389,11 +1389,11 @@ 
     $cornerImg = imagecreatetruecolor($radius, $radius);
     //$cornerImg = imagecreate($radius, $radius);
 
-      //imagealphablending($cornerImg, true);
-      //imagesavealpha($cornerImg, true);
+        //imagealphablending($cornerImg, true);
+        //imagesavealpha($cornerImg, true);
 
-      //imagealphablending($this->imageResized, false);
-      //imagesavealpha($this->imageResized, true);
+        //imagealphablending($this->imageResized, false);
+        //imagesavealpha($this->imageResized, true);
 
     // *** Give it a color
     $maskColor = imagecolorallocate($cornerImg, 0, 0, 0);
@@ -1433,30 +1433,30 @@ 
 
     // *** If corners are to be transparent, we fill our chromakey color as transparent.
     if ($isTransparent) {
-      //imagecolortransparent($this->imageResized, $imagebgColor);
-      $this->imageResized = $this->transparentImage($this->imageResized);
-      imagesavealpha($this->imageResized, true);
+        //imagecolortransparent($this->imageResized, $imagebgColor);
+        $this->imageResized = $this->transparentImage($this->imageResized);
+        imagesavealpha($this->imageResized, true);
     }
 
-  }
+    }
 
 
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*-
   Shadow
 *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
-  public function addShadow($shadowAngle=45, $blur=15, $bgColor='transparent')
-  #
-  # Author:   Jarrod Oberto (Adapted from Pascal Naidon)
-  # Ref:    http://www.les-stooges.org/pascal/webdesign/vignettes/index.php?la=en
-  # Purpose:  Add a drop shadow to your image
-  # Params in:  (int) $angle: the angle of the shadow
-  #       (int) $blur: the blur distance
-  #       (mixed) $bgColor: the color of the background
-  # Params out:
-  # Notes:
-  #
-  {
+    public function addShadow($shadowAngle=45, $blur=15, $bgColor='transparent')
+    #
+    # Author:   Jarrod Oberto (Adapted from Pascal Naidon)
+    # Ref:    http://www.les-stooges.org/pascal/webdesign/vignettes/index.php?la=en
+    # Purpose:  Add a drop shadow to your image
+    # Params in:  (int) $angle: the angle of the shadow
+    #       (int) $blur: the blur distance
+    #       (mixed) $bgColor: the color of the background
+    # Params out:
+    # Notes:
+    #
+    {
     // *** A higher number results in a smoother shadow
     define('STEPS', $blur*2);
 
@@ -1468,20 +1468,20 @@ 
 
 
     if ($shadowAngle == 0) {
-      $distWidth = 0;
-      $distHeight = 0;
+        $distWidth = 0;
+        $distHeight = 0;
     } else {
-      $distWidth = $shadowDistance * cos(deg2rad($shadowAngle));
-      $distHeight = $shadowDistance * sin(deg2rad($shadowAngle));
+        $distWidth = $shadowDistance * cos(deg2rad($shadowAngle));
+        $distHeight = $shadowDistance * sin(deg2rad($shadowAngle));
     }
 
 
     // *** Convert color
     if (fix_strtolower($bgColor) !== 'transparent') {
-      $rgbArray = $this->formatColor($bgColor);
-      $r0 = $rgbArray['r'];
-      $g0 = $rgbArray['g'];
-      $b0 = $rgbArray['b'];
+        $rgbArray = $this->formatColor($bgColor);
+        $r0 = $rgbArray['r'];
+        $g0 = $rgbArray['g'];
+        $b0 = $rgbArray['b'];
     }
 
 
@@ -1490,7 +1490,7 @@ 
     $height = $this->height;
 
 
-      $newImage = imagecreatetruecolor($width, $height);
+        $newImage = imagecreatetruecolor($width, $height);
     imagecopyresampled($newImage, $image, 0, 0, 0, 0, $width, $height, $width, $height);
 
 
@@ -1507,18 +1507,18 @@ 
 
     // *** Shadow (alpha)
     $shadow = imagecreatetruecolor($width+$blurWidth,$height+$blurHeight);
-      imagealphablending($shadow, false);
+        imagealphablending($shadow, false);
     $colour = imagecolorallocate($shadow, 0, 0, 0);
     imagefilledrectangle($shadow, 0, 0, $width+$blurWidth, $height+$blurHeight, $colour);
 
 
     for($i=0;$i<=STEPS;$i++) {
 
-      $t = ((1.0*$i)/STEPS);
-      $intensity = 255*$t*$t;
+        $t = ((1.0*$i)/STEPS);
+        $intensity = 255*$t*$t;
 
-      $colour = imagecolorallocate($shadow, $intensity, $intensity, $intensity);
-      $points = array(
+        $colour = imagecolorallocate($shadow, $intensity, $intensity, $intensity);
+        $points = array(
         $blurWidth*$t,        $blurHeight,     // Point 1 (x, y)
         $blurWidth,         $blurHeight*$t,  // Point 2 (x, y)
         $width,           $blurHeight*$t,  // Point 3 (x, y)
@@ -1527,20 +1527,20 @@ 
         $width,           $height+$blurHeight*(1-$t),  // Point 6 (x, y)
         $blurWidth,         $height+$blurHeight*(1-$t),  // Point 7 (x, y)
         $blurWidth*$t,        $height      // Point 8 (x, y)
-      );
-      imagepolygon($shadow, $points, 8, $colour);
+        );
+        imagepolygon($shadow, $points, 8, $colour);
     }
 
     for($i=0;$i<=STEPS;$i++) {
 
-      $t = ((1.0*$i)/STEPS);
+        $t = ((1.0*$i)/STEPS);
         $intensity = 255*$t*$t;
 
-      $colour = imagecolorallocate($shadow, $intensity, $intensity, $intensity);
-      imagefilledarc($shadow, $blurWidth-1, $blurHeight-1, 2*(1-$t)*$blurWidth, 2*(1-$t)*$blurHeight, 180, 268, $colour, IMG_ARC_PIE);
-      imagefilledarc($shadow, $width, $blurHeight-1, 2*(1-$t)*$blurWidth, 2*(1-$t)*$blurHeight, 270, 358, $colour, IMG_ARC_PIE);
-      imagefilledarc($shadow, $width, $height, 2*(1-$t)*$blurWidth, 2*(1-$t)*$blurHeight, 0, 90, $colour, IMG_ARC_PIE);
-      imagefilledarc($shadow, $blurWidth-1, $height, 2*(1-$t)*$blurWidth, 2*(1-$t)*$blurHeight, 90, 180, $colour, IMG_ARC_PIE);
+        $colour = imagecolorallocate($shadow, $intensity, $intensity, $intensity);
+        imagefilledarc($shadow, $blurWidth-1, $blurHeight-1, 2*(1-$t)*$blurWidth, 2*(1-$t)*$blurHeight, 180, 268, $colour, IMG_ARC_PIE);
+        imagefilledarc($shadow, $width, $blurHeight-1, 2*(1-$t)*$blurWidth, 2*(1-$t)*$blurHeight, 270, 358, $colour, IMG_ARC_PIE);
+        imagefilledarc($shadow, $width, $height, 2*(1-$t)*$blurWidth, 2*(1-$t)*$blurHeight, 0, 90, $colour, IMG_ARC_PIE);
+        imagefilledarc($shadow, $blurWidth-1, $height, 2*(1-$t)*$blurWidth, 2*(1-$t)*$blurHeight, 90, 180, $colour, IMG_ARC_PIE);
     }
 
 
@@ -1553,7 +1553,7 @@ 
         imagealphablending($rgb, false);
 
         for ($theX=0;$theX<imagesx($rgb);$theX++){
-      for ($theY=0;$theY<imagesy($rgb);$theY++){
+        for ($theY=0;$theY<imagesy($rgb);$theY++){
 
         // *** Get the RGB values for every pixel of the RGB image
         $colArray = imagecolorat($rgb,$theX,$theY);
@@ -1569,14 +1569,14 @@ 
 
         // *** Create color
         if(fix_strtolower($bgColor) === 'transparent') {
-          $myColour = imagecolorallocatealpha($rgb,$r,$g,$b,$a);
+            $myColour = imagecolorallocatealpha($rgb,$r,$g,$b,$a);
         } else {
-          $myColour = imagecolorallocate($rgb,$r*(1.0-$t)+$r0*$t,$g*(1.0-$t)+$g0*$t,$b*(1.0-$t)+$b0*$t);
+            $myColour = imagecolorallocate($rgb,$r*(1.0-$t)+$r0*$t,$g*(1.0-$t)+$g0*$t,$b*(1.0-$t)+$b0*$t);
         }
 
         // *** Add color to new rgb image
         imagesetpixel($rgb, $theX, $theY, $myColour);
-      }
+        }
     }
 
     imagealphablending($rgb, true);
@@ -1587,68 +1587,68 @@ 
     imagedestroy($image);
     imagedestroy($newImage);
     imagedestroy($shadow);
-  }
+    }
 
 
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*-
   Add Caption Box
 *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
-  public function addCaptionBox($side='b', $thickness=50, $padding=0, $bgColor='#000', $transaprencyAmount=30)
-  #
-  # Author:   Jarrod Oberto
-  # Date:   26 May 2011
-  # Purpose:  Add a caption box
-  # Params in:  (str) $side: the side to add the caption box (t, r, b, or l).
-  #       (int) $thickness: how thick you want the caption box to be.
-  #       (mixed) $bgColor: The color of the caption box.
-  #       (int) $transaprencyAmount: The amount of transparency to be
-  #       applied.
-  # Params out: n/a
-  # Notes:
-  #
-  {
-      $side = fix_strtolower($side);
-
-      // *** Convert color
-      $rgbArray = $this->formatColor($bgColor);
-      $r = $rgbArray['r'];
-      $g = $rgbArray['g'];
-      $b = $rgbArray['b'];
-
-      $positionArray = $this->calculateCaptionBoxPosition($side, $thickness, $padding);
-
-      // *** Store incase we want to use method addTextToCaptionBox()
-      $this->captionBoxPositionArray = $positionArray;
-
-
-      $transaprencyAmount = $this->invertTransparency($transaprencyAmount, 127, false);
-      $transparent = imagecolorallocatealpha($this->imageResized, $r, $g, $b, $transaprencyAmount);
-      imagefilledrectangle($this->imageResized, $positionArray['x1'], $positionArray['y1'], $positionArray['x2'], $positionArray['y2'], $transparent);
-  }
-
-  ## --------------------------------------------------------
-
-  public function addTextToCaptionBox($text, $fontColor='#fff', $fontSize = 12, $angle = 0, $font = null)
-  #
-  # Author:   Jarrod Oberto
-  # Date:   03 Aug 11
-  # Purpose:  Simplify adding text to a caption box by automatically
-  #       locating the center of the caption box
-  # Params in:  The usually text paams (less a couple)
-  # Params out: n/a
-  # Notes:
-  #
-  {
+    public function addCaptionBox($side='b', $thickness=50, $padding=0, $bgColor='#000', $transaprencyAmount=30)
+    #
+    # Author:   Jarrod Oberto
+    # Date:   26 May 2011
+    # Purpose:  Add a caption box
+    # Params in:  (str) $side: the side to add the caption box (t, r, b, or l).
+    #       (int) $thickness: how thick you want the caption box to be.
+    #       (mixed) $bgColor: The color of the caption box.
+    #       (int) $transaprencyAmount: The amount of transparency to be
+    #       applied.
+    # Params out: n/a
+    # Notes:
+    #
+    {
+        $side = fix_strtolower($side);
+
+        // *** Convert color
+        $rgbArray = $this->formatColor($bgColor);
+        $r = $rgbArray['r'];
+        $g = $rgbArray['g'];
+        $b = $rgbArray['b'];
+
+        $positionArray = $this->calculateCaptionBoxPosition($side, $thickness, $padding);
+
+        // *** Store incase we want to use method addTextToCaptionBox()
+        $this->captionBoxPositionArray = $positionArray;
+
+
+        $transaprencyAmount = $this->invertTransparency($transaprencyAmount, 127, false);
+        $transparent = imagecolorallocatealpha($this->imageResized, $r, $g, $b, $transaprencyAmount);
+        imagefilledrectangle($this->imageResized, $positionArray['x1'], $positionArray['y1'], $positionArray['x2'], $positionArray['y2'], $transparent);
+    }
+
+    ## --------------------------------------------------------
+
+    public function addTextToCaptionBox($text, $fontColor='#fff', $fontSize = 12, $angle = 0, $font = null)
+    #
+    # Author:   Jarrod Oberto
+    # Date:   03 Aug 11
+    # Purpose:  Simplify adding text to a caption box by automatically
+    #       locating the center of the caption box
+    # Params in:  The usually text paams (less a couple)
+    # Params out: n/a
+    # Notes:
+    #
+    {
 
     // *** Get the caption box measurements
     if (count($this->captionBoxPositionArray) == 4) {
-      $x1 = $this->captionBoxPositionArray['x1'];
-      $x2 = $this->captionBoxPositionArray['x2'];
-      $y1 = $this->captionBoxPositionArray['y1'];
-      $y2 = $this->captionBoxPositionArray['y2'];
+        $x1 = $this->captionBoxPositionArray['x1'];
+        $x2 = $this->captionBoxPositionArray['x2'];
+        $y1 = $this->captionBoxPositionArray['y1'];
+        $y2 = $this->captionBoxPositionArray['y2'];
     } else {
-      if ($this->debug) { throw new Exception('No caption box found.'); }else{ return false; }
+        if ($this->debug) { throw new Exception('No caption box found.'); }else{ return false; }
     }
 
 
@@ -1672,53 +1672,53 @@ 
 
     $this->addText($text, $pos, $padding = 0, $fontColor, $fontSize, $angle, $font);
 
-  }
+    }
 
-  ## --------------------------------------------------------
+    ## --------------------------------------------------------
 
-  private function calculateCaptionBoxPosition($side, $thickness, $padding)
-  {
+    private function calculateCaptionBoxPosition($side, $thickness, $padding)
+    {
     $positionArray = array();
 
     switch ($side) {
-      case 't':
+        case 't':
         $positionArray['x1'] = 0;
         $positionArray['y1'] = $padding;
         $positionArray['x2'] = $this->width;
         $positionArray['y2'] = $thickness + $padding;
         break;
-      case 'r':
+        case 'r':
         $positionArray['x1'] = $this->width - $thickness - $padding;
         $positionArray['y1'] = 0;
         $positionArray['x2'] = $this->width - $padding;
         $positionArray['y2'] = $this->height;
         break;
-      case 'b':
+        case 'b':
         $positionArray['x1'] = 0;
         $positionArray['y1'] = $this->height - $thickness - $padding;
         $positionArray['x2'] = $this->width;
         $positionArray['y2'] = $this->height - $padding;
         break;
-      case 'l':
+        case 'l':
         $positionArray['x1'] = $padding;
         $positionArray['y1'] = 0;
         $positionArray['x2'] = $thickness + $padding;
         $positionArray['y2'] = $this->height;
         break;
 
-      default:
+        default:
         break;
     }
 
     return $positionArray;
 
-  }
+    }
 
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*-
   Get EXIF Data
 *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
-  public function getExif($debug=false)
+    public function getExif($debug=false)
     # Author:     Jarrod Oberto
     # Date:       07-05-2011
     # Purpose:    Get image EXIF data
@@ -1728,7 +1728,7 @@ 
     # Notes:
     # 23 May 13 : added orientation flag -jco
     #
-  {
+    {
 
     if (!$this->debug || !$debug) { $debug = false; }
 
@@ -1742,21 +1742,21 @@ 
     $ev = $exifData['ApertureValue'];
     $apPeicesArray = explode('/', $ev);
     if (count($apPeicesArray) == 2) {
-      $apertureValue = round($apPeicesArray[0] / $apPeicesArray[1], 2, PHP_ROUND_HALF_DOWN) . ' EV';
+        $apertureValue = round($apPeicesArray[0] / $apPeicesArray[1], 2, PHP_ROUND_HALF_DOWN) . ' EV';
     } else { $apertureValue = '';}
 
     // *** Format the focal length
     $focalLength = $exifData['FocalLength'];
     $flPeicesArray = explode('/', $focalLength);
     if (count($flPeicesArray) == 2) {
-      $focalLength = $flPeicesArray[0] / $flPeicesArray[1] . '.0 mm';
+        $focalLength = $flPeicesArray[0] / $flPeicesArray[1] . '.0 mm';
     } else { $focalLength = '';}
 
     // *** Format fNumber
     $fNumber = $exifData['FNumber'];
     $fnPeicesArray = explode('/', $fNumber);
     if (count($fnPeicesArray) == 2) {
-      $fNumber = $fnPeicesArray[0] / $fnPeicesArray[1];
+        $fNumber = $fnPeicesArray[0] / $fnPeicesArray[1];
     } else { $fNumber = '';}
 
     // *** Resolve ExposureProgram
@@ -1774,63 +1774,63 @@ 
 
 
     if (isset($exifData['Make'])) {
-      $exifDataArray['make'] = $exifData['Make'];
+        $exifDataArray['make'] = $exifData['Make'];
     } else { $exifDataArray['make'] = ''; }
 
     if (isset($exifData['Model'])) {
-      $exifDataArray['model'] = $exifData['Model'];
+        $exifDataArray['model'] = $exifData['Model'];
     } else { $exifDataArray['model'] = ''; }
 
     if (isset($exifData['DateTime'])) {
-      $exifDataArray['date'] = $exifData['DateTime'];
+        $exifDataArray['date'] = $exifData['DateTime'];
     } else { $exifDataArray['date'] = ''; }
 
     if (isset($exifData['ExposureTime'])) {
-      $exifDataArray['exposure time'] = $exifData['ExposureTime'] . ' sec.';
+        $exifDataArray['exposure time'] = $exifData['ExposureTime'] . ' sec.';
     } else { $exifDataArray['exposure time'] = ''; }
 
     if ($apertureValue != '') {
-      $exifDataArray['aperture value'] = $apertureValue;
+        $exifDataArray['aperture value'] = $apertureValue;
     } else { $exifDataArray['aperture value'] = ''; }
 
     if (isset($exifData['COMPUTED']['ApertureFNumber'])) {
-      $exifDataArray['f-stop'] = $exifData['COMPUTED']['ApertureFNumber'];
+        $exifDataArray['f-stop'] = $exifData['COMPUTED']['ApertureFNumber'];
     } else { $exifDataArray['f-stop'] = ''; }
 
     if (isset($exifData['FNumber'])) {
-      $exifDataArray['fnumber'] = $exifData['FNumber'];
+        $exifDataArray['fnumber'] = $exifData['FNumber'];
     } else { $exifDataArray['fnumber'] = ''; }
 
     if ($fNumber != '') {
-      $exifDataArray['fnumber value'] = $fNumber;
+        $exifDataArray['fnumber value'] = $fNumber;
     } else { $exifDataArray['fnumber value'] = ''; }
 
     if (isset($exifData['ISOSpeedRatings'])) {
-      $exifDataArray['iso'] = $exifData['ISOSpeedRatings'];
+        $exifDataArray['iso'] = $exifData['ISOSpeedRatings'];
     } else { $exifDataArray['iso'] = ''; }
 
     if ($focalLength != '') {
-      $exifDataArray['focal length'] = $focalLength;
+        $exifDataArray['focal length'] = $focalLength;
     } else { $exifDataArray['focal length'] = ''; }
 
     if (isset($ep)) {
-      $exifDataArray['exposure program'] = $ep;
+        $exifDataArray['exposure program'] = $ep;
     } else { $exifDataArray['exposure program'] = ''; }
 
     if ($mm != '') {
-      $exifDataArray['metering mode'] = $mm;
+        $exifDataArray['metering mode'] = $mm;
     } else { $exifDataArray['metering mode'] = ''; }
 
     if ($flash != '') {
-      $exifDataArray['flash status'] = $flash;
+        $exifDataArray['flash status'] = $flash;
     } else { $exifDataArray['flash status'] = ''; }
 
     if (isset($exifData['Artist'])) {
-      $exifDataArray['creator'] = $exifData['Artist'] ;
+        $exifDataArray['creator'] = $exifData['Artist'] ;
     } else { $exifDataArray['creator'] = ''; }
 
     if (isset($exifData['Copyright'])) {
-      $exifDataArray['copyright'] = $exifData['Copyright'];
+        $exifDataArray['copyright'] = $exifData['Copyright'];
     } else { $exifDataArray['copyright'] = ''; }
 
     // *** Orientation
@@ -1839,164 +1839,164 @@ 
     } else { $exifDataArray['orientation'] = ''; }
 
     return $exifDataArray;
-  }
+    }
 
-  ## --------------------------------------------------------
+    ## --------------------------------------------------------
 
-  private function resolveExposureProgram($ep)
-  {
+    private function resolveExposureProgram($ep)
+    {
     switch ($ep) {
-      case 0:
+        case 0:
         $ep = '';
         break;
-      case 1:
+        case 1:
         $ep = 'manual';
         break;
-      case 2:
+        case 2:
         $ep = 'normal program';
         break;
-      case 3:
+        case 3:
         $ep = 'aperture priority';
         break;
-      case 4:
+        case 4:
         $ep = 'shutter priority';
         break;
-      case 5:
+        case 5:
         $ep = 'creative program';
         break;
-      case 6:
+        case 6:
         $ep = 'action program';
         break;
-      case 7:
+        case 7:
         $ep = 'portrait mode';
         break;
-      case 8:
+        case 8:
         $ep = 'landscape mode';
         break;
 
-      default:
+        default:
         break;
     }
 
     return $ep;
-  }
+    }
 
-  ## --------------------------------------------------------
+    ## --------------------------------------------------------
 
-  private function resolveMeteringMode($mm)
-  {
+    private function resolveMeteringMode($mm)
+    {
     switch ($mm) {
-      case 0:
+        case 0:
         $mm = 'unknown';
         break;
-      case 1:
+        case 1:
         $mm = 'average';
         break;
-      case 2:
+        case 2:
         $mm = 'center weighted average';
         break;
-      case 3:
+        case 3:
         $mm = 'spot';
         break;
-      case 4:
+        case 4:
         $mm = 'multi spot';
         break;
-      case 5:
+        case 5:
         $mm = 'pattern';
         break;
-      case 6:
+        case 6:
         $mm = 'partial';
         break;
-      case 255:
+        case 255:
         $mm = 'other';
         break;
 
-      default:
+        default:
         break;
     }
 
     return $mm;
-  }
+    }
 
-  ## --------------------------------------------------------
+    ## --------------------------------------------------------
 
-  private function resolveFlash($flash)
-  {
+    private function resolveFlash($flash)
+    {
     switch ($flash) {
-      case 0:
+        case 0:
         $flash = 'flash did not fire';
         break;
-      case 1:
+        case 1:
         $flash = 'flash fired';
         break;
-      case 5:
+        case 5:
         $flash = 'strobe return light not detected';
         break;
-      case 7:
+        case 7:
         $flash = 'strobe return light detected';
         break;
-      case 9:
+        case 9:
         $flash = 'flash fired, compulsory flash mode';
         break;
-      case 13:
+        case 13:
         $flash = 'flash fired, compulsory flash mode, return light not detected';
         break;
-      case 15:
+        case 15:
         $flash = 'flash fired, compulsory flash mode, return light detected';
         break;
-      case 16:
+        case 16:
         $flash = 'flash did not fire, compulsory flash mode';
         break;
-      case 24:
+        case 24:
         $flash = 'flash did not fire, auto mode';
         break;
-      case 25:
+        case 25:
         $flash = 'flash fired, auto mode';
         break;
-      case 29:
+        case 29:
         $flash = 'flash fired, auto mode, return light not detected';
         break;
-      case 31:
+        case 31:
         $flash = 'flash fired, auto mode, return light detected';
         break;
-      case 32:
+        case 32:
         $flash = 'no flash function';
         break;
-      case 65:
+        case 65:
         $flash = 'flash fired, red-eye reduction mode';
         break;
-      case 69:
+        case 69:
         $flash = 'flash fired, red-eye reduction mode, return light not detected';
         break;
-      case 71:
+        case 71:
         $flash = 'flash fired, red-eye reduction mode, return light detected';
         break;
-      case 73:
+        case 73:
         $flash = 'flash fired, compulsory flash mode, red-eye reduction mode';
         break;
-      case 77:
+        case 77:
         $flash = 'flash fired, compulsory flash mode, red-eye reduction mode, return light not detected';
         break;
-      case 79:
+        case 79:
         $flash = 'flash fired, compulsory flash mode, red-eye reduction mode, return light detected';
         break;
-      case 89:
+        case 89:
         $flash = 'flash fired, auto mode, red-eye reduction mode';
         break;
-      case 93:
+        case 93:
         $flash = 'flash fired, auto mode, return light not detected, red-eye reduction mode';
         break;
-      case 95:
+        case 95:
         $flash = 'flash fired, auto mode, return light detected, red-eye reduction mode';
         break;
 
-      default:
+        default:
         break;
     }
 
     return $flash;
 
-  }
+    }
 
 
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*-
@@ -2008,61 +2008,61 @@ 
   Write IPTC Data
 *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
-  public function writeIPTCcaption($value)
-  # Caption
-  {
+    public function writeIPTCcaption($value)
+    # Caption
+    {
     $this->writeIPTC(120, $value);
-  }
+    }
 
-  ## --------------------------------------------------------
+    ## --------------------------------------------------------
 
-  public function writeIPTCwriter($value)
-  {
+    public function writeIPTCwriter($value)
+    {
     //$this->writeIPTC(65, $value);
-  }
+    }
 
-  ## --------------------------------------------------------
+    ## --------------------------------------------------------
 
-  private function writeIPTC($dat, $value)
-  {
+    private function writeIPTC($dat, $value)
+    {
 
     # LIMIT TO JPG
 
     $caption_block = $this->iptc_maketag(2, $dat, $value);
     $image_string = iptcembed($caption_block, $this->fileName);
     file_put_contents('iptc.jpg', $image_string);
-  }
+    }
 
 ## --------------------------------------------------------
 
-  private function iptc_maketag($rec,$dat,$val)
-  # Author:   Thies C. Arntzen
-  # Purpose:    Function to format the new IPTC text
-  # Param in:   $rec: Application record. (We’re working with #2)
-  #       $dat: Index. (120 for caption, 118 for contact. See the IPTC IIM
-  #         specification:
-  #         http://www.iptc.org/std/IIM/4.1/specification/IIMV4.1.pdf
-  #       $val: Value/data/text. Make sure this is within the length
-  #         constraints of the IPTC IIM specification
-  # Ref:      http://blog.peterhaza.no/working-with-image-meta-data-in-exif-and-iptc-headers-from-php/
-  #       http://php.net/manual/en/function.iptcembed.php
-  #
-  {
+    private function iptc_maketag($rec,$dat,$val)
+    # Author:   Thies C. Arntzen
+    # Purpose:    Function to format the new IPTC text
+    # Param in:   $rec: Application record. (We’re working with #2)
+    #       $dat: Index. (120 for caption, 118 for contact. See the IPTC IIM
+    #         specification:
+    #         http://www.iptc.org/std/IIM/4.1/specification/IIMV4.1.pdf
+    #       $val: Value/data/text. Make sure this is within the length
+    #         constraints of the IPTC IIM specification
+    # Ref:      http://blog.peterhaza.no/working-with-image-meta-data-in-exif-and-iptc-headers-from-php/
+    #       http://php.net/manual/en/function.iptcembed.php
+    #
+    {
     $len = strlen($val);
     if ($len < 0x8000)
-      return chr(0x1c).chr($rec).chr($dat).
-      chr($len >> 8).
-      chr($len & 0xff).
-      $val;
+        return chr(0x1c).chr($rec).chr($dat).
+        chr($len >> 8).
+        chr($len & 0xff).
+        $val;
     else
-      return chr(0x1c).chr($rec).chr($dat).
-      chr(0x80).chr(0x04).
-      chr(($len >> 24) & 0xff).
-      chr(($len >> 16) & 0xff).
-      chr(($len >> 8 ) & 0xff).
-      chr(($len ) & 0xff).
-      $val;
-  }
+        return chr(0x1c).chr($rec).chr($dat).
+        chr(0x80).chr(0x04).
+        chr(($len >> 24) & 0xff).
+        chr(($len >> 16) & 0xff).
+        chr(($len >> 8 ) & 0xff).
+        chr(($len ) & 0xff).
+        $val;
+    }
 
 
 
@@ -2070,23 +2070,23 @@ 
   Write XMP Data
 *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
-  //http://xmpphptoolkit.sourceforge.net/
+    //http://xmpphptoolkit.sourceforge.net/
 
 
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*-
   Add Text
 *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
-  public function addText($text, $pos = '20x20', $padding = 0, $fontColor='#fff', $fontSize = 12, $angle = 0, $font = null)
+    public function addText($text, $pos = '20x20', $padding = 0, $fontColor='#fff', $fontSize = 12, $angle = 0, $font = null)
     # Author:     Jarrod Oberto
-  # Date:       18-11-09
+    # Date:       18-11-09
     # Purpose:    Add text to an image
     # Param in:
     # Param out:
     # Reference:  http://php.net/manual/en/function.imagettftext.php
     # Notes:      Make sure you supply the font.
     #
-  {
+    {
 
     // *** Convert color
     $rgbArray = $this->formatColor($fontColor);
@@ -2111,12 +2111,12 @@ 
 
     // *** Add text
     imagettftext($this->imageResized, $fontSize, $angle, $x, $y, $fontColor, $font, $text);
-  }
+    }
 
-  ## --------------------------------------------------------
+    ## --------------------------------------------------------
 
-  private function getTextFont($font)
-  {
+    private function getTextFont($font)
+    {
     // *** Font path (shou
     $fontPath =  __DIR__ . '/' . $this->fontDir;
 
@@ -2127,25 +2127,25 @@ 
     // *** Check if the passed in font exsits...
     if ($font == null || !file_exists($font)) {
 
-      // *** ...If not, default to this font.
-      $font = $fontPath . '/arimo.ttf';
+        // *** ...If not, default to this font.
+        $font = $fontPath . '/arimo.ttf';
 
-      // *** Check our default font exists...
-      if (!file_exists($font)) {
+        // *** Check our default font exists...
+        if (!file_exists($font)) {
 
         // *** If not, return false
         if ($this->debug) { throw new Exception('Font not found'); }else{ return false; }
-      }
+        }
     }
 
     return $font;
 
-  }
+    }
 
-  ## --------------------------------------------------------
+    ## --------------------------------------------------------
 
-  private function getTextSize($fontSize, $angle, $font, $text)
-  {
+    private function getTextSize($fontSize, $angle, $font, $text)
+    {
 
     // *** Define box (so we can get the width)
     $box = @imagettfbbox($fontSize, $angle, $font, $text);
@@ -2157,39 +2157,39 @@ 
     $textHeight = abs($box[5] - $box[1]);
 
     return array('height' => $textHeight, 'width' => $textWidth);
-  }
+    }
 
 
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*-
   Add Watermark
 *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
-  public function addWatermark($watermarkImage, $pos, $padding = 0, $opacity = 0)
+    public function addWatermark($watermarkImage, $pos, $padding = 0, $opacity = 0)
     # Author:     Jarrod Oberto
     # Date:       18-11-09
     # Purpose:    Add watermark image
     # Param in:   (str) $watermark: The watermark image
-  #       (str) $pos: Could be a pre-determined position such as:
-  #           tl = top left,
-  #           t  = top (middle),
-  #           tr = top right,
-  #           l  = left,
-  #           m  = middle,
-  #           r  = right,
-  #           bl = bottom left,
-  #           b  = bottom (middle),
-  #           br = bottom right
-  #         Or, it could be a co-ordinate position such as: 50x100
-  #
-  #       (int) $padding: If using a pre-determined position you can
-  #         adjust the padding from the edges by passing an amount
-  #         in pixels. If using co-ordinates, this value is ignored.
+    #       (str) $pos: Could be a pre-determined position such as:
+    #           tl = top left,
+    #           t  = top (middle),
+    #           tr = top right,
+    #           l  = left,
+    #           m  = middle,
+    #           r  = right,
+    #           bl = bottom left,
+    #           b  = bottom (middle),
+    #           br = bottom right
+    #         Or, it could be a co-ordinate position such as: 50x100
+    #
+    #       (int) $padding: If using a pre-determined position you can
+    #         adjust the padding from the edges by passing an amount
+    #         in pixels. If using co-ordinates, this value is ignored.
     # Param out:
     # Reference:  http://www.php.net/manual/en/image.examples-watermark.php
     # Notes:      Based on example in reference.
-  #
     #
-  {
+    #
+    {
 
     // Load the stamp and the photo to apply the watermark to
     $stamp = $this->openImage ($watermarkImage);    # stamp
@@ -2207,132 +2207,132 @@ 
     // *** Set watermark opacity
     if (fix_strtolower(strrchr($watermarkImage, '.')) === '.png') {
 
-      $opacity = $this->invertTransparency($opacity, 100);
-      $this->filterOpacity($stamp, $opacity);
+        $opacity = $this->invertTransparency($opacity, 100);
+        $this->filterOpacity($stamp, $opacity);
     }
 
     // Copy the watermark image onto our photo
     imagecopy($im, $stamp, $x, $y, 0, 0, imagesx($stamp), imagesy($stamp));
 
-  }
-
-  ## --------------------------------------------------------
-
-  private function calculatePosition($pos, $padding, $assetWidth, $assetHeight, $upperLeft = true)
-  #
-  # Author:   Jarrod Oberto
-  # Date:   08-05-11
-  # Purpose:  Calculate the x, y pixel cordinates of the asset to place
-  # Params in:  (str) $pos: Either something like: "tl", "l", "br" or an
-  #         exact position like: "100x50"
-  #       (int) $padding: The amount of padding from the edge. Only
-  #         used for the predefined $pos.
-  #       (int) $assetWidth: The width of the asset to add to the image
-  #       (int) $assetHeight: The height of the asset to add to the image
-  #       (bol) $upperLeft: if true, the asset will be positioned based
-  #         on the upper left x, y coords. If false, it means you're
-  #         using the lower left as the basepoint and this will
-  #         convert it to the upper left position
-  # Params out:
-  # NOTE: this is done from the UPPER left corner!! But will convert lower
-  #   left basepoints to upper left if $upperleft is set to false
-  #
-  #
-  {
+    }
+
+    ## --------------------------------------------------------
+
+    private function calculatePosition($pos, $padding, $assetWidth, $assetHeight, $upperLeft = true)
+    #
+    # Author:   Jarrod Oberto
+    # Date:   08-05-11
+    # Purpose:  Calculate the x, y pixel cordinates of the asset to place
+    # Params in:  (str) $pos: Either something like: "tl", "l", "br" or an
+    #         exact position like: "100x50"
+    #       (int) $padding: The amount of padding from the edge. Only
+    #         used for the predefined $pos.
+    #       (int) $assetWidth: The width of the asset to add to the image
+    #       (int) $assetHeight: The height of the asset to add to the image
+    #       (bol) $upperLeft: if true, the asset will be positioned based
+    #         on the upper left x, y coords. If false, it means you're
+    #         using the lower left as the basepoint and this will
+    #         convert it to the upper left position
+    # Params out:
+    # NOTE: this is done from the UPPER left corner!! But will convert lower
+    #   left basepoints to upper left if $upperleft is set to false
+    #
+    #
+    {
     $pos = fix_strtolower($pos);
 
     // *** If co-ords have been entered
     if (strstr($pos, 'x')) {
-      $pos = str_replace(' ', '', $pos);
+        $pos = str_replace(' ', '', $pos);
 
-      $xyArray = explode('x', $pos);
-      list($width, $height) = $xyArray;
+        $xyArray = explode('x', $pos);
+        list($width, $height) = $xyArray;
 
     } else {
 
-      switch ($pos) {
+        switch ($pos) {
         case 'tl':
           $width = 0 + $padding;
-          $height = 0 + $padding;
-          break;
+            $height = 0 + $padding;
+            break;
 
         case 't':
           $width = ($this->width / 2) - ($assetWidth / 2);
-          $height = 0 + $padding;
-          break;
+            $height = 0 + $padding;
+            break;
 
         case 'tr':
           $width = $this->width - $assetWidth - $padding;
-          $height = 0 + $padding;;
-          break;
+            $height = 0 + $padding;;
+            break;
 
         case 'l':
           $width = 0 + $padding;
-          $height = ($this->height / 2) - ($assetHeight / 2);
-          break;
+            $height = ($this->height / 2) - ($assetHeight / 2);
+            break;
 
         case 'm':
           $width = ($this->width / 2) - ($assetWidth / 2);
-          $height = ($this->height / 2) - ($assetHeight / 2);
-          break;
+            $height = ($this->height / 2) - ($assetHeight / 2);
+            break;
 
         case 'r':
           $width = $this->width - $assetWidth - $padding;
-          $height = ($this->height / 2) - ($assetHeight / 2);
-          break;
+            $height = ($this->height / 2) - ($assetHeight / 2);
+            break;
 
         case 'bl':
           $width = 0 + $padding;
-          $height = $this->height - $assetHeight - $padding;
-          break;
+            $height = $this->height - $assetHeight - $padding;
+            break;
 
         case 'b':
           $width = ($this->width / 2) - ($assetWidth / 2);
-          $height = $this->height - $assetHeight - $padding;
-          break;
+            $height = $this->height - $assetHeight - $padding;
+            break;
 
         case 'br':
           $width = $this->width - $assetWidth - $padding;
-          $height = $this->height - $assetHeight - $padding;
-          break;
+            $height = $this->height - $assetHeight - $padding;
+            break;
 
         default:
           $width = 0;
-          $height = 0;
-          break;
-      }
+            $height = 0;
+            break;
+        }
     }
 
     if (!$upperLeft) {
-      $height = $height + $assetHeight;
+        $height = $height + $assetHeight;
     }
 
     return array('width' => $width, 'height' => $height);
-  }
+    }
 
 
-  ## --------------------------------------------------------
+    ## --------------------------------------------------------
 
-  private function filterOpacity(&$img, $opacity = 75)
-  #
-  # Author:     aiden dot mail at freemail dot hu
-  # Author date:  29-03-08 08:16
-  # Date added:   08-05-11
-  # Purpose:    Change opacity of image
-  # Params in:    $img: Image resource id
-  #         (int) $opacity: the opacity amount: 0-100, 100 being not opaque.
-  # Params out:   (bool) true on success, else false
-  # Ref:      http://www.php.net/manual/en/function.imagefilter.php#82162
-  # Notes:      png only
-  #
-  {
+    private function filterOpacity(&$img, $opacity = 75)
+    #
+    # Author:     aiden dot mail at freemail dot hu
+    # Author date:  29-03-08 08:16
+    # Date added:   08-05-11
+    # Purpose:    Change opacity of image
+    # Params in:    $img: Image resource id
+    #         (int) $opacity: the opacity amount: 0-100, 100 being not opaque.
+    # Params out:   (bool) true on success, else false
+    # Ref:      http://www.php.net/manual/en/function.imagefilter.php#82162
+    # Notes:      png only
+    #
+    {
 
     if (!isset($opacity)) {
-      return false;
+        return false;
     }
 
     if ($opacity == 100) {
-      return true;
+        return true;
     }
 
     $opacity /= 100;
@@ -2347,37 +2347,37 @@ 
     //find the most opaque pixel in the image (the one with the smallest alpha value)
     $minalpha = 127;
     for ($x = 0; $x < $w; $x++)
-      for ($y = 0; $y < $h; $y++) {
+        for ($y = 0; $y < $h; $y++) {
         $alpha = ( imagecolorat($img, $x, $y) >> 24 ) & 0xFF;
         if ($alpha < $minalpha) {
-          $minalpha = $alpha;
+            $minalpha = $alpha;
+        }
         }
-      }
 
     //loop through image pixels and modify alpha for each
     for ($x = 0; $x < $w; $x++) {
-      for ($y = 0; $y < $h; $y++) {
+        for ($y = 0; $y < $h; $y++) {
         //get current alpha value (represents the TANSPARENCY!)
         $colorxy = imagecolorat($img, $x, $y);
         $alpha = ( $colorxy >> 24 ) & 0xFF;
         //calculate new alpha
         if ($minalpha !== 127) {
-          $alpha = 127 + 127 * $opacity * ( $alpha - 127 ) / ( 127 - $minalpha );
+            $alpha = 127 + 127 * $opacity * ( $alpha - 127 ) / ( 127 - $minalpha );
         } else {
-          $alpha += 127 * $opacity;
+            $alpha += 127 * $opacity;
         }
         //get the color index with new alpha
         $alphacolorxy = imagecolorallocatealpha($img, ( $colorxy >> 16 ) & 0xFF, ( $colorxy >> 8 ) & 0xFF, $colorxy & 0xFF, $alpha);
         //set pixel with the new color + opacity
         if (!imagesetpixel($img, $x, $y, $alphacolorxy)) {
 
-          return false;
+            return false;
+        }
         }
-      }
     }
 
     return true;
-  }
+    }
 
 ## --------------------------------------------------------
 
@@ -2429,18 +2429,18 @@ 
 
 ## --------------------------------------------------------
 
-  public function reset()
-  #
-  # Author:   Jarrod Oberto
-  # Date:   30-08-11
-  # Purpose:  Reset the resource (allow further editing)
-  # Params in:
-  # Params out:
-  # Notes:
-  #
-  {
+    public function reset()
+    #
+    # Author:   Jarrod Oberto
+    # Date:   30-08-11
+    # Purpose:  Reset the resource (allow further editing)
+    # Params in:
+    # Params out:
+    # Notes:
+    #
+    {
     $this->__construct($this->fileName);
-  }
+    }
 
 ## --------------------------------------------------------
 
@@ -2453,11 +2453,11 @@ 
     # Param out:  n/a
     # Reference:
     # Notes:    * gif doesn't have a quality parameter
-  #       * jpg has a quality setting 0-100 (100 being the best)
+    #       * jpg has a quality setting 0-100 (100 being the best)
     #       * png has a quality setting 0-9 (0 being the best)
-  #
-  #             * bmp files have no native support for bmp files. We use a
-  #       third party class to save as bmp.
+    #
+    #             * bmp files have no native support for bmp files. We use a
+    #       third party class to save as bmp.
     {
 
     // *** Perform a check or two.
@@ -2478,14 +2478,14 @@ 
             case '.jpeg':
         $this->checkInterlaceImage($this->isInterlace);
         if (imagetypes() & IMG_JPG) {
-          imagejpeg($this->imageResized, $savePath, $imageQuality);
+            imagejpeg($this->imageResized, $savePath, $imageQuality);
         } else { $error = 'jpg'; }
                 break;
 
             case '.gif':
         $this->checkInterlaceImage($this->isInterlace);
         if (imagetypes() & IMG_GIF) {
-          imagegif($this->imageResized, $savePath);
+            imagegif($this->imageResized, $savePath);
         } else { $error = 'gif'; }
                 break;
 
@@ -2498,13 +2498,13 @@ 
 
         $this->checkInterlaceImage($this->isInterlace);
         if (imagetypes() & IMG_PNG) {
-           imagepng($this->imageResized, $savePath, $invertScaleQuality);
+            imagepng($this->imageResized, $savePath, $invertScaleQuality);
         } else { $error = 'png'; }
                 break;
 
             case '.bmp':
         file_put_contents($savePath, $this->GD2BMPstring($this->imageResized));
-          break;
+            break;
 
 
             // ... etc
@@ -2519,13 +2519,13 @@ 
 
     // *** Display error if a file type is not supported.
     if ($error != '') {
-      $this->errorArray[] = $error . ' support is NOT enabled. File not saved.';
+        $this->errorArray[] = $error . ' support is NOT enabled. File not saved.';
     }
     }
 
 ## --------------------------------------------------------
 
-  public function displayImage($fileType = 'jpg', $imageQuality="100")
+    public function displayImage($fileType = 'jpg', $imageQuality="100")
     # Author:     Jarrod Oberto
     # Date:       18-11-09
     # Purpose:    Display images directly to the browser
@@ -2534,7 +2534,7 @@ 
     # Reference:
     # Notes:
     #
-  {
+    {
 
     if (!is_resource($this->imageResized)) { if ($this->debug) { throw new Exception('saveImage: This is not a resource.'); }else{ throw new Exception(); }}
 
@@ -2560,7 +2560,7 @@ 
 
         imagepng($this->imageResized, '', $invertScaleQuality);
         break;
-      case 'bmp':
+        case 'bmp':
         echo 'bmp file format is not supported.';
         break;
 
@@ -2573,41 +2573,41 @@ 
 
 
     //imagedestroy($this->imageResized);
-  }
+    }
 
 ## --------------------------------------------------------
 
-  public function setTransparency($bool)
-  # Sep 2011
-  {
+    public function setTransparency($bool)
+    # Sep 2011
+    {
     $this->keepTransparency = $bool;
-  }
+    }
 
 ## --------------------------------------------------------
 
-  public function setFillColor($value)
-  # Sep 2011
+    public function setFillColor($value)
+    # Sep 2011
     # Param in:   (mixed) $value: (array) Could be an array of RGB
-  #               (str) Could be hex #ffffff or #fff, fff, ffffff
-  #
-  # If the keepTransparency is set to false, then no transparency is to be used.
-  # This is ideal when you want to save as jpg.
-  #
-  # this method allows you to set the background color to use instead of
-  # transparency.
-  #
-  {
+    #               (str) Could be hex #ffffff or #fff, fff, ffffff
+    #
+    # If the keepTransparency is set to false, then no transparency is to be used.
+    # This is ideal when you want to save as jpg.
+    #
+    # this method allows you to set the background color to use instead of
+    # transparency.
+    #
+    {
     $colorArray = $this->formatColor($value);
     $this->fillColorArray = $colorArray;
-  }
+    }
 
 ## --------------------------------------------------------
 
-  public function setCropFromTop($value)
-  # Sep 2011
-  {
+    public function setCropFromTop($value)
+    # Sep 2011
+    {
     $this->cropFromTopPercent = $value;
-  }
+    }
 
 ## --------------------------------------------------------
 
@@ -2728,7 +2728,7 @@ 
 
 ## --------------------------------------------------------
 
-  public function getFileName()
+    public function getFileName()
     # Author:     Jarrod Oberto
     # Date:       10-09-08
     # Purpose:
@@ -2738,40 +2738,40 @@ 
     # Notes:
     #
     {
-      return $this->fileName;
+        return $this->fileName;
     }
 
 ## --------------------------------------------------------
 
-  public function getHeight()
+    public function getHeight()
     {
-      return $this->height;
+        return $this->height;
     }
 
 ## --------------------------------------------------------
 
-  public function getWidth()
+    public function getWidth()
     {
-      return $this->width;
+        return $this->width;
     }
 
 ## --------------------------------------------------------
 
-  public function getOriginalHeight()
+    public function getOriginalHeight()
     {
-      return $this->heightOriginal;
+        return $this->heightOriginal;
     }
 
 ## --------------------------------------------------------
 
-  public function getOriginalWidth()
+    public function getOriginalWidth()
     {
-      return $this->widthOriginal;
+        return $this->widthOriginal;
     }
 
 ## --------------------------------------------------------
 
-  public function getErrors()
+    public function getErrors()
     # Author:     Jarrod Oberto
     # Date:       19-11-09
     # Purpose:    Returns the error array
@@ -2780,252 +2780,252 @@ 
     # Reference:
     # Notes:
     #
-  {
+    {
     return $this->errorArray;
-  }
+    }
 
 ## --------------------------------------------------------
 
-  private function checkInterlaceImage($isEnabled)
-  # jpg will use progressive (they don't use interace)
-  {
+    private function checkInterlaceImage($isEnabled)
+    # jpg will use progressive (they don't use interace)
+    {
     if ($isEnabled) {
-      imageinterlace($this->imageResized, $isEnabled);
+        imageinterlace($this->imageResized, $isEnabled);
+    }
     }
-  }
 
 ## --------------------------------------------------------
 
-  protected function formatColor($value)
+    protected function formatColor($value)
     # Author:     Jarrod Oberto
     # Date:       09-05-11
     # Purpose:    Determine color method passed in and return color as RGB
     # Param in:   (mixed) $value: (array) Could be an array of RGB
-  #               (str) Could be hex #ffffff or #fff, fff, ffffff
+    #               (str) Could be hex #ffffff or #fff, fff, ffffff
     # Param out:
     # Reference:
     # Notes:
     #
-  {
+    {
     $rgbArray = array();
 
     // *** If it's an array it should be R, G, B
     if (is_array($value)) {
 
-      if (key($value) == 0 && count($value) == 3) {
+        if (key($value) == 0 && count($value) == 3) {
 
         $rgbArray['r'] = $value[0];
         $rgbArray['g'] = $value[1];
         $rgbArray['b'] = $value[2];
 
-      } else {
+        } else {
         $rgbArray = $value;
-      }
+        }
     } else if (fix_strtolower($value) === 'transparent') {
 
-      $rgbArray = array(
+        $rgbArray = array(
         'r' => 255,
         'g' => 255,
         'b' => 255,
         'a' => 127
-      );
+        );
 
     } else {
 
-      // *** ...Else it should be hex. Let's make it RGB
-      $rgbArray = $this -> hex2dec($value);
+        // *** ...Else it should be hex. Let's make it RGB
+        $rgbArray = $this -> hex2dec($value);
     }
 
     return $rgbArray;
-  }
+    }
 
-  ## --------------------------------------------------------
+    ## --------------------------------------------------------
 
-  function hex2dec($hex)
-  # Purpose:  Convert #hex color to RGB
-  {
+    function hex2dec($hex)
+    # Purpose:  Convert #hex color to RGB
+    {
     $color = str_replace('#', '', $hex);
 
     if (strlen($color) == 3) {
-      $color = $color . $color;
+        $color = $color . $color;
     }
 
     $rgb = array(
-      'r' => hexdec(substr($color, 0, 2)),
-      'g' => hexdec(substr($color, 2, 2)),
-      'b' => hexdec(substr($color, 4, 2)),
-      'a' => 0
+        'r' => hexdec(substr($color, 0, 2)),
+        'g' => hexdec(substr($color, 2, 2)),
+        'b' => hexdec(substr($color, 4, 2)),
+        'a' => 0
     );
     return $rgb;
-  }
+    }
 
-  ## --------------------------------------------------------
+    ## --------------------------------------------------------
 
-  private function createImageColor ($colorArray)
-  {
+    private function createImageColor ($colorArray)
+    {
     $r = $colorArray['r'];
     $g = $colorArray['g'];
     $b = $colorArray['b'];
 
     return imagecolorallocate($this->imageResized, $r, $g, $b);
-  }
+    }
 
-  ## --------------------------------------------------------
+    ## --------------------------------------------------------
 
-  private function testColorExists($colorArray)
-  {
+    private function testColorExists($colorArray)
+    {
     $r = $colorArray['r'];
     $g = $colorArray['g'];
     $b = $colorArray['b'];
 
     if (imagecolorexact($this->imageResized, $r, $g, $b) == -1) {
-      return false;
+        return false;
     } else {
-      return true;
+        return true;
+    }
     }
-  }
 
-  ## --------------------------------------------------------
+    ## --------------------------------------------------------
 
-  private function findUnusedGreen()
-  # Purpose:  We find a green color suitable to use like green-screen effect.
-  #     Therefore, the color must not exist in the image.
-  {
+    private function findUnusedGreen()
+    # Purpose:  We find a green color suitable to use like green-screen effect.
+    #     Therefore, the color must not exist in the image.
+    {
     $green = 255;
 
     do {
 
-      $greenChroma = array(0, $green, 0);
-      $colorArray = $this->formatColor($greenChroma);
-      $match = $this->testColorExists($colorArray);
-      $green--;
+        $greenChroma = array(0, $green, 0);
+        $colorArray = $this->formatColor($greenChroma);
+        $match = $this->testColorExists($colorArray);
+        $green--;
 
     } while ($match == false && $green > 0);
 
     // *** If no match, just bite the bullet and use green value of 255
     if (!$match) {
-      $greenChroma = array(0, $green, 0);
+        $greenChroma = array(0, $green, 0);
     }
 
     return $greenChroma;
-  }
+    }
 
-  ## --------------------------------------------------------
+    ## --------------------------------------------------------
 
-  private function findUnusedBlue()
-  # Purpose:  We find a green color suitable to use like green-screen effect.
-  #     Therefore, the color must not exist in the image.
-  {
+    private function findUnusedBlue()
+    # Purpose:  We find a green color suitable to use like green-screen effect.
+    #     Therefore, the color must not exist in the image.
+    {
     $blue = 255;
 
     do {
 
-      $blueChroma = array(0, 0, $blue);
-      $colorArray = $this->formatColor($blueChroma);
-      $match = $this->testColorExists($colorArray);
-      $blue--;
+        $blueChroma = array(0, 0, $blue);
+        $colorArray = $this->formatColor($blueChroma);
+        $match = $this->testColorExists($colorArray);
+        $blue--;
 
     } while ($match == false && $blue > 0);
 
     // *** If no match, just bite the bullet and use blue value of 255
     if (!$match) {
-      $blueChroma = array(0, 0, $blue);
+        $blueChroma = array(0, 0, $blue);
     }
 
     return $blueChroma;
-  }
+    }
 
-  ## --------------------------------------------------------
+    ## --------------------------------------------------------
 
-  private function invertTransparency($value, $originalMax, $invert=true)
-  # Purpose:  This does two things:
-  #       1) Convert the range from 0-127 to 0-100
-  #       2) Inverts value to 100 is not transparent while 0 is fully
-  #          transparent (like Photoshop)
-  {
+    private function invertTransparency($value, $originalMax, $invert=true)
+    # Purpose:  This does two things:
+    #       1) Convert the range from 0-127 to 0-100
+    #       2) Inverts value to 100 is not transparent while 0 is fully
+    #          transparent (like Photoshop)
+    {
     // *** Test max range
     if ($value > $originalMax) {
-      $value = $originalMax;
+        $value = $originalMax;
     }
 
     // *** Test min range
     if ($value < 0) {
-      $value = 0;
+        $value = 0;
     }
 
     if ($invert) {
-      return $originalMax - (($value/100) * $originalMax);
+        return $originalMax - (($value/100) * $originalMax);
     } else {
-      return ($value/100) * $originalMax;
+        return ($value/100) * $originalMax;
+    }
     }
-  }
 
-  ## --------------------------------------------------------
+    ## --------------------------------------------------------
 
-  private function transparentImage($src)
-  {
+    private function transparentImage($src)
+    {
     // *** making images with white bg transparent
     $r1 = 0;
     $g1 = 255;
     $b1 = 0;
     for ($x = 0; $x < imagesx($src); ++$x) {
-      for ($y = 0; $y < imagesy($src); ++$y) {
+        for ($y = 0; $y < imagesy($src); ++$y) {
         $color = imagecolorat($src, $x, $y);
         $r = ($color >> 16) & 0xFF;
         $g = ($color >> 8) & 0xFF;
         $b = $color & 0xFF;
         for ($i = 0; $i < 270; $i++) {
-          //if ($r . $g . $b == ($r1 + $i) . ($g1 + $i) . ($b1 + $i)) {
-          if ($r == 0 && $g == 255 && $b == 0) {
-          //if ($g == 255) {
+            //if ($r . $g . $b == ($r1 + $i) . ($g1 + $i) . ($b1 + $i)) {
+            if ($r == 0 && $g == 255 && $b == 0) {
+            //if ($g == 255) {
             $trans_colour = imagecolorallocatealpha($src, 0, 0, 0, 127);
             imagefill($src, $x, $y, $trans_colour);
-          }
+            }
+        }
         }
-      }
     }
 
     return $src;
-  }
+    }
 
-  ## --------------------------------------------------------
+    ## --------------------------------------------------------
 
-  function checkStringStartsWith($needle, $haystack)
-  # Check if a string starts with a specific pattern
-  {
+    function checkStringStartsWith($needle, $haystack)
+    # Check if a string starts with a specific pattern
+    {
     return (substr($haystack, 0, strlen($needle))==$needle);
-  }
+    }
 
 
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*-
   BMP SUPPORT (SAVING) - James Heinrich
 *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
-  private function GD2BMPstring(&$gd_image)
+    private function GD2BMPstring(&$gd_image)
     # Author:     James Heinrich
     # Purpose:    Save file as type bmp
     # Param in:   The image canvas (passed as ref)
     # Param out:
     # Reference:
     # Notes:    This code was stripped out of two external files
-  #       (phpthumb.bmp.php,phpthumb.functions.php) and added below to
-  #       avoid dependancies.
+    #       (phpthumb.bmp.php,phpthumb.functions.php) and added below to
+    #       avoid dependancies.
     #
-  {
+    {
     $imageX = imagesx($gd_image);
     $imageY = imagesy($gd_image);
 
     $BMP = '';
     for ($y = ($imageY - 1); $y >= 0; $y--) {
-      $thisline = '';
-      for ($x = 0; $x < $imageX; $x++) {
+        $thisline = '';
+        for ($x = 0; $x < $imageX; $x++) {
         $argb = $this->GetPixelColor($gd_image, $x, $y);
         $thisline .= chr($argb['blue']).chr($argb['green']).chr($argb['red']);
-      }
-      while (strlen($thisline) % 4) {
+        }
+        while (strlen($thisline) % 4) {
         $thisline .= "\x00";
-      }
-      $BMP .= $thisline;
+        }
+        $BMP .= $thisline;
     }
 
     $bmpSize = strlen($BMP) + 14 + 40;
@@ -3050,11 +3050,11 @@ 
     $BITMAPINFOHEADER .= $this->LittleEndian2String(       0, 4); // DWORD  biClrImportant;
 
     return $BITMAPFILEHEADER.$BITMAPINFOHEADER.$BMP;
-  }
+    }
 
 ## --------------------------------------------------------
 
-  private function GetPixelColor(&$img, $x, $y)
+    private function GetPixelColor(&$img, $x, $y)
     # Author:     James Heinrich
     # Purpose:
     # Param in:
@@ -3062,16 +3062,16 @@ 
     # Reference:
     # Notes:
     #
-  {
+    {
     if (!is_resource($img)) {
-      return false;
+        return false;
     }
     return @imagecolorsforindex($img, @imagecolorat($img, $x, $y));
-  }
+    }
 
 ## --------------------------------------------------------
 
-  private function LittleEndian2String($number, $minbytes=1)
+    private function LittleEndian2String($number, $minbytes=1)
     # Author:     James Heinrich
     # Purpose:    BMP SUPPORT (SAVING)
     # Param in:
@@ -3079,34 +3079,34 @@ 
     # Reference:
     # Notes:
     #
-  {
+    {
     $intstring = '';
     while ($number > 0) {
-      $intstring = $intstring.chr($number & 255);
-      $number >>= 8;
+        $intstring = $intstring.chr($number & 255);
+        $number >>= 8;
     }
     return str_pad($intstring, $minbytes, "\x00", STR_PAD_RIGHT);
-  }
+    }
 
 
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*-
   BMP SUPPORT (READING)
 *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
-  private function ImageCreateFromBMP($filename)
+    private function ImageCreateFromBMP($filename)
     # Author:     DHKold
     # Date:     The 15th of June 2005
-  # Version:    2.0B
+    # Version:    2.0B
     # Purpose:    To create an image from a BMP file.
     # Param in:   BMP file to open.
     # Param out:  Return a resource like the other ImageCreateFrom functions
     # Reference:  http://us3.php.net/manual/en/function.imagecreate.php#53879
-  # Bug fix:    Author:   domelca at terra dot es
-  #       Date:   06 March 2008
-  #       Fix:    Correct 16bit BMP support
+    # Bug fix:    Author:   domelca at terra dot es
+    #       Date:   06 March 2008
+    #       Fix:    Correct 16bit BMP support
     # Notes:
-  #
-  {
+    #
+    {
 
     //Ouverture du fichier en mode binaire
     if (! $f1 = fopen($filename,"rb")) return FALSE;
@@ -3117,8 +3117,8 @@ 
 
     //2 : Chargement des ent�tes BMP
     $BMP = unpack('Vheader_size/Vwidth/Vheight/vplanes/vbits_per_pixel'.
-           '/Vcompression/Vsize_bitmap/Vhoriz_resolution'.
-           '/Vvert_resolution/Vcolors_used/Vcolors_important', fread($f1,40));
+            '/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'];
@@ -3126,7 +3126,7 @@ 
     $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'] -= floor($BMP['width']*$BMP['bytes_per_pixel']/4);
     $BMP['decal'] = 4-(4*$BMP['decal']);
 
     if ($BMP['decal'] == 4) $BMP['decal'] = 0;
@@ -3135,7 +3135,7 @@ 
     $PALETTE = array();
     if ($BMP['colors'] < 16777216)
     {
-      $PALETTE = unpack('V'.$BMP['colors'], fread($f1,$BMP['colors']*4));
+        $PALETTE = unpack('V'.$BMP['colors'], fread($f1,$BMP['colors']*4));
     }
 
     //4 : Cr�ation de l'image
@@ -3147,15 +3147,15 @@ 
     $Y = $BMP['height']-1;
     while ($Y >= 0)
     {
-      $X=0;
-      while ($X < $BMP['width'])
-      {
+        $X=0;
+        while ($X < $BMP['width'])
+        {
         if ($BMP['bits_per_pixel'] == 24)
-          $COLOR = unpack("V",substr($IMG,$P,3).$VIDE);
+            $COLOR = unpack("V",substr($IMG,$P,3).$VIDE);
         elseif ($BMP['bits_per_pixel'] == 16)
         {
 
-          /*
+            /*
            * BMP 16bit fix
            * =================
            *
@@ -3167,94 +3167,94 @@ 
            *
            */
 
-          // *** Original code (don't work)
-          //$COLOR = unpack("n",substr($IMG,$P,2));
-          //$COLOR[1] = $PALETTE[$COLOR[1]+1];
+            // *** Original code (don't work)
+            //$COLOR = unpack("n",substr($IMG,$P,2));
+            //$COLOR[1] = $PALETTE[$COLOR[1]+1];
 
-          $COLOR = unpack("v",substr($IMG,$P,2));
-          $blue = ($COLOR[1] & 0x001f) << 3;
-          $green = ($COLOR[1] & 0x07e0) >> 3;
-          $red = ($COLOR[1] & 0xf800) >> 8;
-          $COLOR[1] = $red * 65536 + $green * 256 + $blue;
+            $COLOR = unpack("v",substr($IMG,$P,2));
+            $blue = ($COLOR[1] & 0x001f) << 3;
+            $green = ($COLOR[1] & 0x07e0) >> 3;
+            $red = ($COLOR[1] & 0xf800) >> 8;
+            $COLOR[1] = $red * 65536 + $green * 256 + $blue;
 
         }
         elseif ($BMP['bits_per_pixel'] == 8)
         {
-          $COLOR = unpack("n",$VIDE.substr($IMG,$P,1));
-          $COLOR[1] = $PALETTE[$COLOR[1]+1];
+            $COLOR = unpack("n",$VIDE.substr($IMG,$P,1));
+            $COLOR[1] = $PALETTE[$COLOR[1]+1];
         }
         elseif ($BMP['bits_per_pixel'] == 4)
         {
-          $COLOR = unpack("n",$VIDE.substr($IMG,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];
+            $COLOR = unpack("n",$VIDE.substr($IMG,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($IMG,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];
+            $COLOR = unpack("n",$VIDE.substr($IMG,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;
+            return FALSE;
 
         imagesetpixel($res,$X,$Y,$COLOR[1]);
         $X++;
         $P += $BMP['bytes_per_pixel'];
-      }
+        }
 
-      $Y--;
-      $P+=$BMP['decal'];
+        $Y--;
+        $P+=$BMP['decal'];
     }
     //Fermeture du fichier
     fclose($f1);
 
     return $res;
-  }
+    }
 
 
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*-
   PSD SUPPORT (READING)
 *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
-  private function imagecreatefrompsd($fileName)
-  # Author:     Tim de Koning
-  # Version:    1.3
-  # Purpose:    To create an image from a PSD file.
-  # Param in:   PSD file to open.
-  # Param out:  Return a resource like the other ImageCreateFrom functions
-  # Reference:  http://www.kingsquare.nl/phppsdreader
-  # Notes:
-  #
-  {
+    private function imagecreatefrompsd($fileName)
+    # Author:     Tim de Koning
+    # Version:    1.3
+    # Purpose:    To create an image from a PSD file.
+    # Param in:   PSD file to open.
+    # Param out:  Return a resource like the other ImageCreateFrom functions
+    # Reference:  http://www.kingsquare.nl/phppsdreader
+    # Notes:
+    #
+    {
     if (file_exists($this->psdReaderPath)) {
 
 
-      include_once($this->psdReaderPath);
+        include_once($this->psdReaderPath);
 
-      $psdReader = new PhpPsdReader($fileName);
+        $psdReader = new PhpPsdReader($fileName);
 
-      if (isset($psdReader->infoArray['error'])) return '';
-      else return $psdReader->getImage();
+        if (isset($psdReader->infoArray['error'])) return '';
+        else return $psdReader->getImage();
     } else {
-      return false;
+        return false;
+    }
     }
-  }
 
 ## --------------------------------------------------------
 
     public function __destruct() {
     if (is_resource($this->imageResized)) {
-      imagedestroy($this->imageResized);
+        imagedestroy($this->imageResized);
+    }
     }
-  }
 
 ## --------------------------------------------------------
 

Spacing +208 added lines, -208 removed lines

@@ -166,9 +166,9 @@ 
     private $fileName;
     private $image;
     protected $imageResized;
-    private $widthOriginal;     # Always be the original width
+    private $widthOriginal; # Always be the original width
     private $heightOriginal;
-    private $width;         # Current width (width after resize)
+    private $width; # Current width (width after resize)
     private $height;
     private $imageSize;
   private $fileExtension;
@@ -209,7 +209,7 @@ 
     # Notes:
     #
     {
-    if (!$this->testGDInstalled()) { if ($this->debug) { throw new Exception('The GD Library is not installed.'); }else{ throw new Exception(); }};
+    if (!$this->testGDInstalled()) { if ($this->debug) { throw new Exception('The GD Library is not installed.'); } else { throw new Exception(); }};
 
     $this->initialise();
 
@@ -252,10 +252,10 @@ 
 
 ## --------------------------------------------------------
 
-  private function initialise () {
+  private function initialise() {
 
-    $this->psdReaderPath = __DIR__ . '/classPhpPsdReader.php';
-    $this->filterOverlayPath = __DIR__ . '/filters';
+    $this->psdReaderPath = __DIR__.'/classPhpPsdReader.php';
+    $this->filterOverlayPath = __DIR__.'/filters';
 
     // *** Set if image should be interlaced or not.
     $this->isInterlace = false;
@@ -311,7 +311,7 @@ 
     // *** We can pass in an array of options to change the crop position
     $cropPos = 'm';
     if (is_array($option) && fix_strtolower($option[0]) === 'crop') {
-      $cropPos = $option[1];         # get the crop option
+      $cropPos = $option[1]; # get the crop option
     } else if (strpos($option, '-') !== false) {
       // *** Or pass in a hyphen seperated option
       $optionPiecesArray = explode('-', $option);
@@ -322,7 +322,7 @@ 
     $option = $this->prepOption($option);
 
     // *** Make sure the file passed in is valid
-    if (!$this->image) { if ($this->debug) { throw new Exception('file ' . $this->getFileName() .' is missing or invalid'); }else{ throw new Exception(); }};
+    if (!$this->image) { if ($this->debug) { throw new Exception('file '.$this->getFileName().' is missing or invalid'); } else { throw new Exception(); }};
 
     // *** Get optimal width and height - based on $option
     $dimensionsArray = $this->getDimensions($newWidth, $newHeight, $option);
@@ -350,15 +350,15 @@ 
       $exifData = $this->getExif(false);
       if (count($exifData) > 0) {
 
-        switch($exifData['orientation']) {
+        switch ($exifData['orientation']) {
             case 8:
-                $this->imageResized = imagerotate($this->imageResized,90,0);
+                $this->imageResized = imagerotate($this->imageResized, 90, 0);
                 break;
             case 3:
-                $this->imageResized = imagerotate($this->imageResized,180,0);
+                $this->imageResized = imagerotate($this->imageResized, 180, 0);
                 break;
             case 6:
-                $this->imageResized = imagerotate($this->imageResized,-90,0);
+                $this->imageResized = imagerotate($this->imageResized, -90, 0);
                 break;
         }
       }
@@ -391,7 +391,7 @@ 
   {
 
     // *** Make sure the file passed in is valid
-    if (!$this->image) { if ($this->debug) { throw new Exception('file ' . $this->getFileName() .' is missing or invalid'); }else{ throw new Exception(); }};
+    if (!$this->image) { if ($this->debug) { throw new Exception('file '.$this->getFileName().' is missing or invalid'); } else { throw new Exception(); }};
 
     $this->imageResized = $this->image;
     $this->crop($this->width, $this->height, $newWidth, $newHeight, $cropPos);
@@ -442,9 +442,9 @@ 
     $cropStartY = $cropArray['y'];
 
     // *** Crop this bad boy
-    $crop = imagecreatetruecolor($newWidth , $newHeight);
+    $crop = imagecreatetruecolor($newWidth, $newHeight);
     $this->keepTransparancy($optimalWidth, $optimalHeight, $crop);
-    imagecopyresampled($crop, $this->imageResized, 0, 0, $cropStartX, $cropStartY, $newWidth, $newHeight , $newWidth, $newHeight);
+    imagecopyresampled($crop, $this->imageResized, 0, 0, $cropStartX, $cropStartY, $newWidth, $newHeight, $newWidth, $newHeight);
 
     $this->imageResized = $crop;
 
@@ -456,7 +456,7 @@ 
 
 ## --------------------------------------------------------
 
-  private function getCropPlacing($optimalWidth, $optimalHeight, $newWidth, $newHeight, $pos='m')
+  private function getCropPlacing($optimalWidth, $optimalHeight, $newWidth, $newHeight, $pos = 'm')
   #
   # Author:   Jarrod Oberto
   # Date:   July 11
@@ -486,7 +486,7 @@ 
           break;
 
         case 't':
-          $cropStartX = ( $optimalWidth / 2) - ( $newWidth /2 );
+          $cropStartX = ($optimalWidth / 2) - ($newWidth / 2);
           $cropStartY = 0;
           break;
 
@@ -497,17 +497,17 @@ 
 
         case 'l':
           $cropStartX = 0;
-          $cropStartY = ( $optimalHeight/ 2) - ( $newHeight/2 );
+          $cropStartY = ($optimalHeight / 2) - ($newHeight / 2);
           break;
 
         case 'm':
-          $cropStartX = ( $optimalWidth / 2) - ( $newWidth /2 );
-          $cropStartY = ( $optimalHeight/ 2) - ( $newHeight/2 );
+          $cropStartX = ($optimalWidth / 2) - ($newWidth / 2);
+          $cropStartY = ($optimalHeight / 2) - ($newHeight / 2);
           break;
 
         case 'r':
           $cropStartX = $optimalWidth - $newWidth;
-          $cropStartY = ( $optimalHeight/ 2) - ( $newHeight/2 );
+          $cropStartY = ($optimalHeight / 2) - ($newHeight / 2);
           break;
 
         case 'bl':
@@ -516,7 +516,7 @@ 
           break;
 
         case 'b':
-          $cropStartX = ( $optimalWidth / 2) - ( $newWidth /2 );
+          $cropStartX = ($optimalWidth / 2) - ($newWidth / 2);
           $cropStartY = $optimalHeight - $newHeight;
           break;
 
@@ -528,20 +528,20 @@ 
         case 'auto':
           // *** If image is a portrait crop from top, not center. v1.5
           if ($optimalHeight > $optimalWidth) {
-            $cropStartX = ( $optimalWidth / 2) - ( $newWidth /2 );
-            $cropStartY = ($this->cropFromTopPercent /100) * $optimalHeight;
+            $cropStartX = ($optimalWidth / 2) - ($newWidth / 2);
+            $cropStartY = ($this->cropFromTopPercent / 100) * $optimalHeight;
           } else {
 
             // *** Else crop from the center
-            $cropStartX = ( $optimalWidth / 2) - ( $newWidth /2 );
-            $cropStartY = ( $optimalHeight/ 2) - ( $newHeight/2 );
+            $cropStartX = ($optimalWidth / 2) - ($newWidth / 2);
+            $cropStartY = ($optimalHeight / 2) - ($newHeight / 2);
           }
           break;
 
         default:
           // *** Default to center
-          $cropStartX = ( $optimalWidth / 2) - ( $newWidth /2 );
-          $cropStartY = ( $optimalHeight/ 2) - ( $newHeight/2 );
+          $cropStartX = ($optimalWidth / 2) - ($newWidth / 2);
+          $cropStartY = ($optimalHeight / 2) - ($newHeight / 2);
           break;
       }
     }
@@ -579,7 +579,7 @@ 
             case '0':
       case 'exact':
                 $optimalWidth = $newWidth;
-                $optimalHeight= $newHeight;
+                $optimalHeight = $newHeight;
                 break;
             case '1':
       case 'portrait':
@@ -710,7 +710,7 @@ 
       } else {
         // *** Sqaure being resized to a square
         $optimalWidth = $newWidth;
-        $optimalHeight= $newHeight;
+        $optimalHeight = $newHeight;
       }
         }
 
@@ -761,7 +761,7 @@ 
     }
 
     $heightRatio = $this->height / $newHeight;
-    $widthRatio  = $this->width /  $newWidth;
+    $widthRatio  = $this->width / $newWidth;
 
     if ($heightRatio < $widthRatio) {
       $optimalRatio = $heightRatio;
@@ -769,8 +769,8 @@ 
       $optimalRatio = $widthRatio;
     }
 
-    $optimalHeight = round( $this->height / $optimalRatio );
-    $optimalWidth  = round( $this->width  / $optimalRatio );
+    $optimalHeight = round($this->height / $optimalRatio);
+    $optimalWidth  = round($this->width / $optimalRatio);
 
     return array('optimalWidth' => $optimalWidth, 'optimalHeight' => $optimalHeight);
   }
@@ -793,9 +793,9 @@ 
       // ***
       if ($this->aggresiveSharpening) { # A more aggressive sharpening solution
 
-        $sharpenMatrix = array( array( -1, -1, -1 ),
+        $sharpenMatrix = array(array( -1, -1, -1 ),
                          array( -1, 16, -1 ),
-                         array( -1, -1, -1 ) );
+                         array( -1, -1, -1 ));
         $divisor = 8;
         $offset = 0;
 
@@ -803,9 +803,9 @@ 
       }
       else # More subtle and personally more desirable
       {
-        $sharpness  = $this->findSharp($this->widthOriginal, $this->width);
+        $sharpness = $this->findSharp($this->widthOriginal, $this->width);
 
-        $sharpenMatrix  = array(
+        $sharpenMatrix = array(
           array(-1, -2, -1),
           array(-2, $sharpness + 12, -2), //Lessen the effect of a filter by increasing the value in the center cell
           array(-1, -2, -1)
@@ -825,9 +825,9 @@ 
 
   private function sharpen2($level)
   {
-      $sharpenMatrix  = array(
+      $sharpenMatrix = array(
         array($level, $level, $level),
-        array($level, (8*$level)+1, $level), //Lessen the effect of a filter by increasing the value in the center cell
+        array($level, (8 * $level) + 1, $level), //Lessen the effect of a filter by increasing the value in the center cell
         array($level, $level, $level)
       );
 
@@ -844,7 +844,7 @@ 
     # Notes:
     #
   {
-    $final  = $final * (750.0 / $orig);
+    $final = $final * (750.0 / $orig);
     $a    = 52;
     $b    = -0.27810650887573124;
     $c    = .00047337278106508946;
@@ -942,7 +942,7 @@ 
       $rgbArray = imagecolorallocate($this->imageResized, $r, $g, $b);
 
 
-      for($i = 0; $i < $thickness; $i++) {
+      for ($i = 0; $i < $thickness; $i++) {
           imagerectangle($this->imageResized, $x1++, $y1++, $x2--, $y2--, $rgbArray);
       }
     }
@@ -1072,13 +1072,13 @@ 
   {
     if ($this->imageResized) {
 
-      $total = imagecolorstotal( $this->imageResized );
-      for ( $i = 0; $i < $total; $i++ ) {
-        $index = imagecolorsforindex( $this->imageResized, $i );
-        $red = ( $index["red"] * 0.393 + $index["green"] * 0.769 + $index["blue"] * 0.189 ) / 1.351;
-        $green = ( $index["red"] * 0.349 + $index["green"] * 0.686 + $index["blue"] * 0.168 ) / 1.203;
-        $blue = ( $index["red"] * 0.272 + $index["green"] * 0.534 + $index["blue"] * 0.131 ) / 2.140;
-        imagecolorset( $this->imageResized, $i, $red, $green, $blue );
+      $total = imagecolorstotal($this->imageResized);
+      for ($i = 0; $i < $total; $i++) {
+        $index = imagecolorsforindex($this->imageResized, $i);
+        $red = ($index["red"] * 0.393 + $index["green"] * 0.769 + $index["blue"] * 0.189) / 1.351;
+        $green = ($index["red"] * 0.349 + $index["green"] * 0.686 + $index["blue"] * 0.168) / 1.203;
+        $blue = ($index["red"] * 0.272 + $index["green"] * 0.534 + $index["blue"] * 0.131) / 2.140;
+        imagecolorset($this->imageResized, $i, $red, $green, $blue);
       }
 
 
@@ -1151,7 +1151,7 @@ 
     imagefilledrectangle($filter, 0, 0, $width, $height, $transparent);
 
     // *** Resize overlay
-    $overlay = $this->filterOverlayPath . '/' . $type . '.png';
+    $overlay = $this->filterOverlayPath.'/'.$type.'.png';
     $png = imagecreatefrompng($overlay);
     imagecopyresampled($filter, $png, 0, 0, 0, 0, $width, $height, imagesx($png), imagesy($png));
 
@@ -1170,16 +1170,16 @@ 
 *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
   public function image_colorize($rgb) {
-      imagetruecolortopalette($this->imageResized,true,256);
+      imagetruecolortopalette($this->imageResized, true, 256);
     $numColors = imagecolorstotal($this->imageResized);
 
     for ($x = 0; $x < $numColors; $x++) {
-    list($r,$g,$b) = array_values(imagecolorsforindex($this->imageResized,$x));
+    list($r, $g, $b) = array_values(imagecolorsforindex($this->imageResized, $x));
 
     // calculate grayscale in percent
     $grayscale = ($r + $g + $b) / 3 / 0xff;
 
-      imagecolorset($this->imageResized,$x,
+      imagecolorset($this->imageResized, $x,
       $grayscale * $rgb[0],
       $grayscale * $rgb[1],
       $grayscale * $rgb[2]
@@ -1195,7 +1195,7 @@ 
   Reflection
 *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
-  public function addReflection($reflectionHeight = 50, $startingTransparency = 30, $inside = false, $bgColor = '#fff', $stretch=false, $divider = 0)
+  public function addReflection($reflectionHeight = 50, $startingTransparency = 30, $inside = false, $bgColor = '#fff', $stretch = false, $divider = 0)
   {
 
     // *** Convert color
@@ -1221,7 +1221,7 @@ 
     $bg = imagecreatetruecolor($this->width, $reflectionHeight);
 
     for ($x = 0; $x < $this->width; $x++) {
-      imagecopy($bg, $im, $x, 0, $this->width-$x -1, 0, 1, $reflectionHeight);
+      imagecopy($bg, $im, $x, 0, $this->width - $x - 1, 0, 1, $reflectionHeight);
     }
     $im = $bg;
 
@@ -1230,16 +1230,16 @@ 
 
     // *** Fade
     if ($stretch) {
-      $step = 100/($reflectionHeight + $startingTransparency);
-    } else{
-      $step = 100/$reflectionHeight;
+      $step = 100 / ($reflectionHeight + $startingTransparency);
+    } else {
+      $step = 100 / $reflectionHeight;
     }
-    for($i=0; $i<=$reflectionHeight; $i++){
+    for ($i = 0; $i <= $reflectionHeight; $i++) {
 
-      if($startingTransparency>100) $startingTransparency = 100;
-      if($startingTransparency< 1) $startingTransparency = 1;
+      if ($startingTransparency > 100) $startingTransparency = 100;
+      if ($startingTransparency < 1) $startingTransparency = 1;
       imagecopymerge($bg, $li, 0, $i, 0, 0, $this->width, 1, $startingTransparency);
-      $startingTransparency+=$step;
+      $startingTransparency += $step;
     }
 
     // *** Apply fade
@@ -1257,16 +1257,16 @@ 
       // Create new blank image with sizes.
       $final = imagecreatetruecolor($this->width, $this->height);
 
-      imagecopymerge ($final, $this->imageResized, 0, 0, 0, $reflectionHeight, $this->width, $this->height - $reflectionHeight, 100);
-      imagecopymerge ($final, $im, 0, $this->height - $reflectionHeight, 0, 0, $x, $y, 100);
+      imagecopymerge($final, $this->imageResized, 0, 0, 0, $reflectionHeight, $this->width, $this->height - $reflectionHeight, 100);
+      imagecopymerge($final, $im, 0, $this->height - $reflectionHeight, 0, 0, $x, $y, 100);
 
     } else {
 
       // Create new blank image with sizes.
       $final = imagecreatetruecolor($this->width, $this->height + $y);
 
-      imagecopymerge ($final, $this->imageResized, 0, 0, 0, 0, $this->width, $this->height, 100);
-      imagecopymerge ($final, $im, 0, $this->height, 0, 0, $x, $y, 100);
+      imagecopymerge($final, $this->imageResized, 0, 0, 0, 0, $this->width, $this->height, 100);
+      imagecopymerge($final, $im, 0, $this->height, 0, 0, $x, $y, 100);
     }
 
     $this->imageResized = $final;
@@ -1334,13 +1334,13 @@ 
       $bg = imagecolorallocatealpha($this->imageResized, $r, $g, $b, $a);
 
       // *** Fill with background
-        imagefill($this->imageResized, 0, 0 , $bg);
+        imagefill($this->imageResized, 0, 0, $bg);
 
       // *** Rotate
       $this->imageResized = imagerotate($this->imageResized, $degrees, $bg); // Rotate 45 degrees and allocated the transparent colour as the one to make transparent (obviously)
 
       // Ensure alpha transparency
-        imagesavealpha($this->imageResized,true);
+        imagesavealpha($this->imageResized, true);
 
     }
   }
@@ -1350,7 +1350,7 @@ 
   Round corners
 *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
-  public function roundCorners($radius = 5,  $bgColor = 'transparent')
+  public function roundCorners($radius = 5, $bgColor = 'transparent')
     # Author:     Jarrod Oberto
     # Date:       19-05-2011
     # Purpose:    Create rounded corners on your image
@@ -1414,7 +1414,7 @@ 
     imagefill($cornerImg, 0, 0, $imagebgColor);
 
 
-    imagefilledellipse($cornerImg, $radius, $radius, $radius * 2, $radius * 2, $maskColor );
+    imagefilledellipse($cornerImg, $radius, $radius, $radius * 2, $radius * 2, $maskColor);
 
 
     // *** Map to top left corner
@@ -1445,7 +1445,7 @@ 
   Shadow
 *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
-  public function addShadow($shadowAngle=45, $blur=15, $bgColor='transparent')
+  public function addShadow($shadowAngle = 45, $blur = 15, $bgColor = 'transparent')
   #
   # Author:   Jarrod Oberto (Adapted from Pascal Naidon)
   # Ref:    http://www.les-stooges.org/pascal/webdesign/vignettes/index.php?la=en
@@ -1458,10 +1458,10 @@ 
   #
   {
     // *** A higher number results in a smoother shadow
-    define('STEPS', $blur*2);
+    define('STEPS', $blur * 2);
 
     // *** Set the shadow distance
-    $shadowDistance = $blur*0.25;
+    $shadowDistance = $blur * 0.25;
 
     // *** Set blur width and height
     $blurWidth = $blurHeight = $blur;
@@ -1495,83 +1495,83 @@ 
 
 
     // *** RGB
-    $rgb = imagecreatetruecolor($width+$blurWidth,$height+$blurHeight);
+    $rgb = imagecreatetruecolor($width + $blurWidth, $height + $blurHeight);
     $colour = imagecolorallocate($rgb, 0, 0, 0);
-    imagefilledrectangle($rgb, 0, 0, $width+$blurWidth, $height+$blurHeight, $colour);
+    imagefilledrectangle($rgb, 0, 0, $width + $blurWidth, $height + $blurHeight, $colour);
     $colour = imagecolorallocate($rgb, 255, 255, 255);
     //imagefilledrectangle($rgb, $blurWidth*0.5-$distWidth, $blurHeight*0.5-$distHeight, $width+$blurWidth*0.5-$distWidth, $height+$blurWidth*0.5-$distHeight, $colour);
-    imagefilledrectangle($rgb, $blurWidth*0.5-$distWidth, $blurHeight*0.5-$distHeight, $width+$blurWidth*0.5-$distWidth, $height+$blurWidth*0.5-$distHeight, $colour);
+    imagefilledrectangle($rgb, $blurWidth * 0.5 - $distWidth, $blurHeight * 0.5 - $distHeight, $width + $blurWidth * 0.5 - $distWidth, $height + $blurWidth * 0.5 - $distHeight, $colour);
     //imagecopymerge($rgb, $newImage, 1+$blurWidth*0.5-$distWidth, 1+$blurHeight*0.5-$distHeight, 0,0, $width, $height, 100);
-    imagecopymerge($rgb, $newImage, $blurWidth*0.5-$distWidth, $blurHeight*0.5-$distHeight, 0,0, $width+$blurWidth, $height+$blurHeight, 100);
+    imagecopymerge($rgb, $newImage, $blurWidth * 0.5 - $distWidth, $blurHeight * 0.5 - $distHeight, 0, 0, $width + $blurWidth, $height + $blurHeight, 100);
 
 
     // *** Shadow (alpha)
-    $shadow = imagecreatetruecolor($width+$blurWidth,$height+$blurHeight);
+    $shadow = imagecreatetruecolor($width + $blurWidth, $height + $blurHeight);
       imagealphablending($shadow, false);
     $colour = imagecolorallocate($shadow, 0, 0, 0);
-    imagefilledrectangle($shadow, 0, 0, $width+$blurWidth, $height+$blurHeight, $colour);
+    imagefilledrectangle($shadow, 0, 0, $width + $blurWidth, $height + $blurHeight, $colour);
 
 
-    for($i=0;$i<=STEPS;$i++) {
+    for ($i = 0; $i <= STEPS; $i++) {
 
-      $t = ((1.0*$i)/STEPS);
-      $intensity = 255*$t*$t;
+      $t = ((1.0 * $i) / STEPS);
+      $intensity = 255 * $t * $t;
 
       $colour = imagecolorallocate($shadow, $intensity, $intensity, $intensity);
       $points = array(
-        $blurWidth*$t,        $blurHeight,     // Point 1 (x, y)
-        $blurWidth,         $blurHeight*$t,  // Point 2 (x, y)
-        $width,           $blurHeight*$t,  // Point 3 (x, y)
-        $width+$blurWidth*(1-$t), $blurHeight,     // Point 4 (x, y)
-        $width+$blurWidth*(1-$t), $height,     // Point 5 (x, y)
-        $width,           $height+$blurHeight*(1-$t),  // Point 6 (x, y)
-        $blurWidth,         $height+$blurHeight*(1-$t),  // Point 7 (x, y)
-        $blurWidth*$t,        $height      // Point 8 (x, y)
+        $blurWidth * $t, $blurHeight, // Point 1 (x, y)
+        $blurWidth, $blurHeight * $t, // Point 2 (x, y)
+        $width, $blurHeight * $t, // Point 3 (x, y)
+        $width + $blurWidth * (1 - $t), $blurHeight, // Point 4 (x, y)
+        $width + $blurWidth * (1 - $t), $height, // Point 5 (x, y)
+        $width, $height + $blurHeight * (1 - $t), // Point 6 (x, y)
+        $blurWidth, $height + $blurHeight * (1 - $t), // Point 7 (x, y)
+        $blurWidth * $t, $height      // Point 8 (x, y)
       );
       imagepolygon($shadow, $points, 8, $colour);
     }
 
-    for($i=0;$i<=STEPS;$i++) {
+    for ($i = 0; $i <= STEPS; $i++) {
 
-      $t = ((1.0*$i)/STEPS);
-        $intensity = 255*$t*$t;
+      $t = ((1.0 * $i) / STEPS);
+        $intensity = 255 * $t * $t;
 
       $colour = imagecolorallocate($shadow, $intensity, $intensity, $intensity);
-      imagefilledarc($shadow, $blurWidth-1, $blurHeight-1, 2*(1-$t)*$blurWidth, 2*(1-$t)*$blurHeight, 180, 268, $colour, IMG_ARC_PIE);
-      imagefilledarc($shadow, $width, $blurHeight-1, 2*(1-$t)*$blurWidth, 2*(1-$t)*$blurHeight, 270, 358, $colour, IMG_ARC_PIE);
-      imagefilledarc($shadow, $width, $height, 2*(1-$t)*$blurWidth, 2*(1-$t)*$blurHeight, 0, 90, $colour, IMG_ARC_PIE);
-      imagefilledarc($shadow, $blurWidth-1, $height, 2*(1-$t)*$blurWidth, 2*(1-$t)*$blurHeight, 90, 180, $colour, IMG_ARC_PIE);
+      imagefilledarc($shadow, $blurWidth - 1, $blurHeight - 1, 2 * (1 - $t) * $blurWidth, 2 * (1 - $t) * $blurHeight, 180, 268, $colour, IMG_ARC_PIE);
+      imagefilledarc($shadow, $width, $blurHeight - 1, 2 * (1 - $t) * $blurWidth, 2 * (1 - $t) * $blurHeight, 270, 358, $colour, IMG_ARC_PIE);
+      imagefilledarc($shadow, $width, $height, 2 * (1 - $t) * $blurWidth, 2 * (1 - $t) * $blurHeight, 0, 90, $colour, IMG_ARC_PIE);
+      imagefilledarc($shadow, $blurWidth - 1, $height, 2 * (1 - $t) * $blurWidth, 2 * (1 - $t) * $blurHeight, 90, 180, $colour, IMG_ARC_PIE);
     }
 
 
     $colour = imagecolorallocate($shadow, 255, 255, 255);
     imagefilledrectangle($shadow, $blurWidth, $blurHeight, $width, $height, $colour);
-    imagefilledrectangle($shadow, $blurWidth*0.5-$distWidth, $blurHeight*0.5-$distHeight, $width+$blurWidth*0.5-1-$distWidth, $height+$blurHeight*0.5-1-$distHeight, $colour);
+    imagefilledrectangle($shadow, $blurWidth * 0.5 - $distWidth, $blurHeight * 0.5 - $distHeight, $width + $blurWidth * 0.5 - 1 - $distWidth, $height + $blurHeight * 0.5 - 1 - $distHeight, $colour);
 
 
     // *** The magic
         imagealphablending($rgb, false);
 
-        for ($theX=0;$theX<imagesx($rgb);$theX++){
-      for ($theY=0;$theY<imagesy($rgb);$theY++){
+        for ($theX = 0; $theX < imagesx($rgb); $theX++) {
+      for ($theY = 0; $theY < imagesy($rgb); $theY++) {
 
         // *** Get the RGB values for every pixel of the RGB image
-        $colArray = imagecolorat($rgb,$theX,$theY);
+        $colArray = imagecolorat($rgb, $theX, $theY);
         $r = ($colArray >> 16) & 0xFF;
         $g = ($colArray >> 8) & 0xFF;
         $b = $colArray & 0xFF;
 
         // *** Get the alpha value for every pixel of the shadow image
-        $colArray = imagecolorat($shadow,$theX,$theY);
+        $colArray = imagecolorat($shadow, $theX, $theY);
         $a = $colArray & 0xFF;
-        $a = 127-floor($a/2);
-        $t = $a/128.0;
+        $a = 127 - floor($a / 2);
+        $t = $a / 128.0;
 
         // *** Create color
-        if(fix_strtolower($bgColor) === 'transparent') {
-          $myColour = imagecolorallocatealpha($rgb,$r,$g,$b,$a);
+        if (fix_strtolower($bgColor) === 'transparent') {
+          $myColour = imagecolorallocatealpha($rgb, $r, $g, $b, $a);
         } else {
-          $myColour = imagecolorallocate($rgb,$r*(1.0-$t)+$r0*$t,$g*(1.0-$t)+$g0*$t,$b*(1.0-$t)+$b0*$t);
+          $myColour = imagecolorallocate($rgb, $r * (1.0 - $t) + $r0 * $t, $g * (1.0 - $t) + $g0 * $t, $b * (1.0 - $t) + $b0 * $t);
         }
 
         // *** Add color to new rgb image
@@ -1594,7 +1594,7 @@ 
   Add Caption Box
 *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
-  public function addCaptionBox($side='b', $thickness=50, $padding=0, $bgColor='#000', $transaprencyAmount=30)
+  public function addCaptionBox($side = 'b', $thickness = 50, $padding = 0, $bgColor = '#000', $transaprencyAmount = 30)
   #
   # Author:   Jarrod Oberto
   # Date:   26 May 2011
@@ -1629,7 +1629,7 @@ 
 
   ## --------------------------------------------------------
 
-  public function addTextToCaptionBox($text, $fontColor='#fff', $fontSize = 12, $angle = 0, $font = null)
+  public function addTextToCaptionBox($text, $fontColor = '#fff', $fontSize = 12, $angle = 0, $font = null)
   #
   # Author:   Jarrod Oberto
   # Date:   03 Aug 11
@@ -1648,7 +1648,7 @@ 
       $y1 = $this->captionBoxPositionArray['y1'];
       $y2 = $this->captionBoxPositionArray['y2'];
     } else {
-      if ($this->debug) { throw new Exception('No caption box found.'); }else{ return false; }
+      if ($this->debug) { throw new Exception('No caption box found.'); } else { return false; }
     }
 
 
@@ -1665,10 +1665,10 @@ 
     $boxYMiddle = (($y2 - $y1) / 2);
 
     // *** Box middle - half the text width/height
-    $xPos = ($x1 + $boxXMiddle) - ($textWidth/2);
-    $yPos = ($y1 + $boxYMiddle) - ($textHeight/2);
+    $xPos = ($x1 + $boxXMiddle) - ($textWidth / 2);
+    $yPos = ($y1 + $boxYMiddle) - ($textHeight / 2);
 
-    $pos = $xPos . 'x' . $yPos;
+    $pos = $xPos.'x'.$yPos;
 
     $this->addText($text, $pos, $padding = 0, $fontColor, $fontSize, $angle, $font);
 
@@ -1718,7 +1718,7 @@ 
   Get EXIF Data
 *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
-  public function getExif($debug=false)
+  public function getExif($debug = false)
     # Author:     Jarrod Oberto
     # Date:       07-05-2011
     # Purpose:    Get image EXIF data
@@ -1733,34 +1733,34 @@ 
     if (!$this->debug || !$debug) { $debug = false; }
 
     // *** Check all is good - check the EXIF library exists and the file exists, too.
-    if (!$this->testEXIFInstalled()) { if ($debug) { throw new Exception('The EXIF Library is not installed.'); }else{ return array(); }};
-    if (!file_exists($this->fileName)) { if ($debug) { throw new Exception('Image not found.'); }else{ return array(); }};
-    if ($this->fileExtension !== '.jpg') { if ($debug) { throw new Exception('Metadata not supported for this image type.'); }else{ return array(); }};
+    if (!$this->testEXIFInstalled()) { if ($debug) { throw new Exception('The EXIF Library is not installed.'); } else { return array(); }};
+    if (!file_exists($this->fileName)) { if ($debug) { throw new Exception('Image not found.'); } else { return array(); }};
+    if ($this->fileExtension !== '.jpg') { if ($debug) { throw new Exception('Metadata not supported for this image type.'); } else { return array(); }};
     $exifData = exif_read_data($this->fileName, 'IFD0');
 
     // *** Format the apperture value
     $ev = $exifData['ApertureValue'];
     $apPeicesArray = explode('/', $ev);
     if (count($apPeicesArray) == 2) {
-      $apertureValue = round($apPeicesArray[0] / $apPeicesArray[1], 2, PHP_ROUND_HALF_DOWN) . ' EV';
-    } else { $apertureValue = '';}
+      $apertureValue = round($apPeicesArray[0] / $apPeicesArray[1], 2, PHP_ROUND_HALF_DOWN).' EV';
+    } else { $apertureValue = ''; }
 
     // *** Format the focal length
     $focalLength = $exifData['FocalLength'];
     $flPeicesArray = explode('/', $focalLength);
     if (count($flPeicesArray) == 2) {
-      $focalLength = $flPeicesArray[0] / $flPeicesArray[1] . '.0 mm';
-    } else { $focalLength = '';}
+      $focalLength = $flPeicesArray[0] / $flPeicesArray[1].'.0 mm';
+    } else { $focalLength = ''; }
 
     // *** Format fNumber
     $fNumber = $exifData['FNumber'];
     $fnPeicesArray = explode('/', $fNumber);
     if (count($fnPeicesArray) == 2) {
       $fNumber = $fnPeicesArray[0] / $fnPeicesArray[1];
-    } else { $fNumber = '';}
+    } else { $fNumber = ''; }
 
     // *** Resolve ExposureProgram
-    if (isset($exifData['ExposureProgram'])) { $ep =  $exifData['ExposureProgram']; }
+    if (isset($exifData['ExposureProgram'])) { $ep = $exifData['ExposureProgram']; }
     if (isset($ep)) { $ep = $this->resolveExposureProgram($ep); }
 
 
@@ -1786,7 +1786,7 @@ 
     } else { $exifDataArray['date'] = ''; }
 
     if (isset($exifData['ExposureTime'])) {
-      $exifDataArray['exposure time'] = $exifData['ExposureTime'] . ' sec.';
+      $exifDataArray['exposure time'] = $exifData['ExposureTime'].' sec.';
     } else { $exifDataArray['exposure time'] = ''; }
 
     if ($apertureValue != '') {
@@ -1826,7 +1826,7 @@ 
     } else { $exifDataArray['flash status'] = ''; }
 
     if (isset($exifData['Artist'])) {
-      $exifDataArray['creator'] = $exifData['Artist'] ;
+      $exifDataArray['creator'] = $exifData['Artist'];
     } else { $exifDataArray['creator'] = ''; }
 
     if (isset($exifData['Copyright'])) {
@@ -2035,7 +2035,7 @@ 
 
 ## --------------------------------------------------------
 
-  private function iptc_maketag($rec,$dat,$val)
+  private function iptc_maketag($rec, $dat, $val)
   # Author:   Thies C. Arntzen
   # Purpose:    Function to format the new IPTC text
   # Param in:   $rec: Application record. (We’re working with #2)
@@ -2059,8 +2059,8 @@ 
       chr(0x80).chr(0x04).
       chr(($len >> 24) & 0xff).
       chr(($len >> 16) & 0xff).
-      chr(($len >> 8 ) & 0xff).
-      chr(($len ) & 0xff).
+      chr(($len >> 8) & 0xff).
+      chr(($len) & 0xff).
       $val;
   }
 
@@ -2077,7 +2077,7 @@ 
   Add Text
 *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
-  public function addText($text, $pos = '20x20', $padding = 0, $fontColor='#fff', $fontSize = 12, $angle = 0, $font = null)
+  public function addText($text, $pos = '20x20', $padding = 0, $fontColor = '#fff', $fontSize = 12, $angle = 0, $font = null)
     # Author:     Jarrod Oberto
   # Date:       18-11-09
     # Purpose:    Add text to an image
@@ -2118,23 +2118,23 @@ 
   private function getTextFont($font)
   {
     // *** Font path (shou
-    $fontPath =  __DIR__ . '/' . $this->fontDir;
+    $fontPath = __DIR__.'/'.$this->fontDir;
 
 
     // *** The below is/may be needed depending on your version (see ref)
-    putenv('GDFONTPATH=' . realpath('.'));
+    putenv('GDFONTPATH='.realpath('.'));
 
     // *** Check if the passed in font exsits...
     if ($font == null || !file_exists($font)) {
 
       // *** ...If not, default to this font.
-      $font = $fontPath . '/arimo.ttf';
+      $font = $fontPath.'/arimo.ttf';
 
       // *** Check our default font exists...
       if (!file_exists($font)) {
 
         // *** If not, return false
-        if ($this->debug) { throw new Exception('Font not found'); }else{ return false; }
+        if ($this->debug) { throw new Exception('Font not found'); } else { return false; }
       }
     }
 
@@ -2192,8 +2192,8 @@ 
   {
 
     // Load the stamp and the photo to apply the watermark to
-    $stamp = $this->openImage ($watermarkImage);    # stamp
-    $im = $this->imageResized;            # photo
+    $stamp = $this->openImage($watermarkImage); # stamp
+    $im = $this->imageResized; # photo
 
     // *** Get stamps width and height
     $sx = imagesx($stamp);
@@ -2263,7 +2263,7 @@ 
 
         case 'tr':
           $width = $this->width - $assetWidth - $padding;
-          $height = 0 + $padding;;
+          $height = 0 + $padding; ;
           break;
 
         case 'l':
@@ -2348,7 +2348,7 @@ 
     $minalpha = 127;
     for ($x = 0; $x < $w; $x++)
       for ($y = 0; $y < $h; $y++) {
-        $alpha = ( imagecolorat($img, $x, $y) >> 24 ) & 0xFF;
+        $alpha = (imagecolorat($img, $x, $y) >> 24) & 0xFF;
         if ($alpha < $minalpha) {
           $minalpha = $alpha;
         }
@@ -2359,15 +2359,15 @@ 
       for ($y = 0; $y < $h; $y++) {
         //get current alpha value (represents the TANSPARENCY!)
         $colorxy = imagecolorat($img, $x, $y);
-        $alpha = ( $colorxy >> 24 ) & 0xFF;
+        $alpha = ($colorxy >> 24) & 0xFF;
         //calculate new alpha
         if ($minalpha !== 127) {
-          $alpha = 127 + 127 * $opacity * ( $alpha - 127 ) / ( 127 - $minalpha );
+          $alpha = 127 + 127 * $opacity * ($alpha - 127) / (127 - $minalpha);
         } else {
           $alpha += 127 * $opacity;
         }
         //get the color index with new alpha
-        $alphacolorxy = imagecolorallocatealpha($img, ( $colorxy >> 16 ) & 0xFF, ( $colorxy >> 8 ) & 0xFF, $colorxy & 0xFF, $alpha);
+        $alphacolorxy = imagecolorallocatealpha($img, ($colorxy >> 16) & 0xFF, ($colorxy >> 8) & 0xFF, $colorxy & 0xFF, $alpha);
         //set pixel with the new color + opacity
         if (!imagesetpixel($img, $x, $y, $alphacolorxy)) {
 
@@ -2392,12 +2392,12 @@ 
     #
     {
 
-    if (!file_exists($file) && !$this->checkStringStartsWith('http://', $file)) { if ($this->debug) { throw new Exception('Image not found.'); }else{ throw new Exception(); }};
+    if (!file_exists($file) && !$this->checkStringStartsWith('http://', $file)) { if ($this->debug) { throw new Exception('Image not found.'); } else { throw new Exception(); }};
 
         // *** Get extension
         $extension = strrchr($file, '.');
         $extension = fix_strtolower($extension);
-        switch($extension)
+        switch ($extension)
         {
             case '.jpg':
             case '.jpeg':
@@ -2444,7 +2444,7 @@ 
 
 ## --------------------------------------------------------
 
-    public function saveImage($savePath, $imageQuality="100")
+    public function saveImage($savePath, $imageQuality = "100")
     # Author:     Jarrod Oberto
     # Date:       27-02-08
     # Purpose:    Saves the image
@@ -2461,10 +2461,10 @@ 
     {
 
     // *** Perform a check or two.
-    if (!is_resource($this->imageResized)) { if ($this->debug) { throw new Exception('saveImage: This is not a resource.'); }else{ throw new Exception(); }}
+    if (!is_resource($this->imageResized)) { if ($this->debug) { throw new Exception('saveImage: This is not a resource.'); } else { throw new Exception(); }}
     $fileInfoArray = pathinfo($savePath);
     clearstatcache();
-    if (!is_writable($fileInfoArray['dirname'])) {  if ($this->debug) { throw new Exception('The path is not writable. Please check your permissions.'); }else{ throw new Exception(); }}
+    if (!is_writable($fileInfoArray['dirname'])) {  if ($this->debug) { throw new Exception('The path is not writable. Please check your permissions.'); } else { throw new Exception(); }}
 
     // *** Get extension
         $extension = strrchr($savePath, '.');
@@ -2472,7 +2472,7 @@ 
 
     $error = '';
 
-        switch($extension)
+        switch ($extension)
         {
             case '.jpg':
             case '.jpeg':
@@ -2491,7 +2491,7 @@ 
 
             case '.png':
         // *** Scale quality from 0-100 to 0-9
-        $scaleQuality = round(($imageQuality/100) * 9);
+        $scaleQuality = round(($imageQuality / 100) * 9);
 
         // *** Invert qualit setting as 0 is best, not 9
         $invertScaleQuality = 9 - $scaleQuality;
@@ -2511,7 +2511,7 @@ 
 
             default:
         // *** No extension - No save.
-        $this->errorArray[] = 'This file type (' . $extension . ') is not supported. File not saved.';
+        $this->errorArray[] = 'This file type ('.$extension.') is not supported. File not saved.';
                 break;
         }
 
@@ -2519,13 +2519,13 @@ 
 
     // *** Display error if a file type is not supported.
     if ($error != '') {
-      $this->errorArray[] = $error . ' support is NOT enabled. File not saved.';
+      $this->errorArray[] = $error.' support is NOT enabled. File not saved.';
     }
     }
 
 ## --------------------------------------------------------
 
-  public function displayImage($fileType = 'jpg', $imageQuality="100")
+  public function displayImage($fileType = 'jpg', $imageQuality = "100")
     # Author:     Jarrod Oberto
     # Date:       18-11-09
     # Purpose:    Display images directly to the browser
@@ -2536,9 +2536,9 @@ 
     #
   {
 
-    if (!is_resource($this->imageResized)) { if ($this->debug) { throw new Exception('saveImage: This is not a resource.'); }else{ throw new Exception(); }}
+    if (!is_resource($this->imageResized)) { if ($this->debug) { throw new Exception('saveImage: This is not a resource.'); } else { throw new Exception(); }}
 
-        switch($fileType)
+        switch ($fileType)
         {
             case 'jpg':
             case 'jpeg':
@@ -2553,7 +2553,7 @@ 
         header('Content-type: image/png');
 
         // *** Scale quality from 0-100 to 0-9
-        $scaleQuality = round(($imageQuality/100) * 9);
+        $scaleQuality = round(($imageQuality / 100) * 9);
 
         // *** Invert qualit setting as 0 is best, not 9
         $invertScaleQuality = 9 - $scaleQuality;
@@ -2621,7 +2621,7 @@ 
     # Notes:
     #
     {
-        if(extension_loaded('gd') && function_exists('gd_info'))
+        if (extension_loaded('gd') && function_exists('gd_info'))
         {
             $gdInstalled = true;
         }
@@ -2645,7 +2645,7 @@ 
     # Notes:
     #
     {
-        if(extension_loaded('exif'))
+        if (extension_loaded('exif'))
         {
             $exifInstalled = true;
         }
@@ -2847,7 +2847,7 @@ 
     $color = str_replace('#', '', $hex);
 
     if (strlen($color) == 3) {
-      $color = $color . $color;
+      $color = $color.$color;
     }
 
     $rgb = array(
@@ -2861,7 +2861,7 @@ 
 
   ## --------------------------------------------------------
 
-  private function createImageColor ($colorArray)
+  private function createImageColor($colorArray)
   {
     $r = $colorArray['r'];
     $g = $colorArray['g'];
@@ -2937,7 +2937,7 @@ 
 
   ## --------------------------------------------------------
 
-  private function invertTransparency($value, $originalMax, $invert=true)
+  private function invertTransparency($value, $originalMax, $invert = true)
   # Purpose:  This does two things:
   #       1) Convert the range from 0-127 to 0-100
   #       2) Inverts value to 100 is not transparent while 0 is fully
@@ -2954,9 +2954,9 @@ 
     }
 
     if ($invert) {
-      return $originalMax - (($value/100) * $originalMax);
+      return $originalMax - (($value / 100) * $originalMax);
     } else {
-      return ($value/100) * $originalMax;
+      return ($value / 100) * $originalMax;
     }
   }
 
@@ -2993,7 +2993,7 @@ 
   function checkStringStartsWith($needle, $haystack)
   # Check if a string starts with a specific pattern
   {
-    return (substr($haystack, 0, strlen($needle))==$needle);
+    return (substr($haystack, 0, strlen($needle)) == $needle);
   }
 
 
@@ -3030,24 +3030,24 @@ 
 
     $bmpSize = strlen($BMP) + 14 + 40;
     // BITMAPFILEHEADER [14 bytes] - http://msdn.microsoft.com/library/en-us/gdi/bitmaps_62uq.asp
-    $BITMAPFILEHEADER  = 'BM';                                    // WORD    bfType;
+    $BITMAPFILEHEADER  = 'BM'; // WORD    bfType;
     $BITMAPFILEHEADER .= $this->LittleEndian2String($bmpSize, 4); // DWORD   bfSize;
-    $BITMAPFILEHEADER .= $this->LittleEndian2String(       0, 2); // WORD    bfReserved1;
-    $BITMAPFILEHEADER .= $this->LittleEndian2String(       0, 2); // WORD    bfReserved2;
-    $BITMAPFILEHEADER .= $this->LittleEndian2String(      54, 4); // DWORD   bfOffBits;
+    $BITMAPFILEHEADER .= $this->LittleEndian2String(0, 2); // WORD    bfReserved1;
+    $BITMAPFILEHEADER .= $this->LittleEndian2String(0, 2); // WORD    bfReserved2;
+    $BITMAPFILEHEADER .= $this->LittleEndian2String(54, 4); // DWORD   bfOffBits;
 
     // BITMAPINFOHEADER - [40 bytes] http://msdn.microsoft.com/library/en-us/gdi/bitmaps_1rw2.asp
-    $BITMAPINFOHEADER  = $this->LittleEndian2String(      40, 4); // DWORD  biSize;
-    $BITMAPINFOHEADER .= $this->LittleEndian2String( $imageX, 4); // LONG   biWidth;
-    $BITMAPINFOHEADER .= $this->LittleEndian2String( $imageY, 4); // LONG   biHeight;
-    $BITMAPINFOHEADER .= $this->LittleEndian2String(       1, 2); // WORD   biPlanes;
-    $BITMAPINFOHEADER .= $this->LittleEndian2String(      24, 2); // WORD   biBitCount;
-    $BITMAPINFOHEADER .= $this->LittleEndian2String(       0, 4); // DWORD  biCompression;
-    $BITMAPINFOHEADER .= $this->LittleEndian2String(       0, 4); // DWORD  biSizeImage;
-    $BITMAPINFOHEADER .= $this->LittleEndian2String(    2835, 4); // LONG   biXPelsPerMeter;
-    $BITMAPINFOHEADER .= $this->LittleEndian2String(    2835, 4); // LONG   biYPelsPerMeter;
-    $BITMAPINFOHEADER .= $this->LittleEndian2String(       0, 4); // DWORD  biClrUsed;
-    $BITMAPINFOHEADER .= $this->LittleEndian2String(       0, 4); // DWORD  biClrImportant;
+    $BITMAPINFOHEADER  = $this->LittleEndian2String(40, 4); // DWORD  biSize;
+    $BITMAPINFOHEADER .= $this->LittleEndian2String($imageX, 4); // LONG   biWidth;
+    $BITMAPINFOHEADER .= $this->LittleEndian2String($imageY, 4); // LONG   biHeight;
+    $BITMAPINFOHEADER .= $this->LittleEndian2String(1, 2); // WORD   biPlanes;
+    $BITMAPINFOHEADER .= $this->LittleEndian2String(24, 2); // WORD   biBitCount;
+    $BITMAPINFOHEADER .= $this->LittleEndian2String(0, 4); // DWORD  biCompression;
+    $BITMAPINFOHEADER .= $this->LittleEndian2String(0, 4); // DWORD  biSizeImage;
+    $BITMAPINFOHEADER .= $this->LittleEndian2String(2835, 4); // LONG   biXPelsPerMeter;
+    $BITMAPINFOHEADER .= $this->LittleEndian2String(2835, 4); // LONG   biYPelsPerMeter;
+    $BITMAPINFOHEADER .= $this->LittleEndian2String(0, 4); // DWORD  biClrUsed;
+    $BITMAPINFOHEADER .= $this->LittleEndian2String(0, 4); // DWORD  biClrImportant;
 
     return $BITMAPFILEHEADER.$BITMAPINFOHEADER.$BMP;
   }
@@ -3071,7 +3071,7 @@ 
 
 ## --------------------------------------------------------
 
-  private function LittleEndian2String($number, $minbytes=1)
+  private function LittleEndian2String($number, $minbytes = 1)
     # Author:     James Heinrich
     # Purpose:    BMP SUPPORT (SAVING)
     # Param in:
@@ -3109,25 +3109,25 @@ 
   {
 
     //Ouverture du fichier en mode binaire
-    if (! $f1 = fopen($filename,"rb")) return FALSE;
+    if (!$f1 = fopen($filename, "rb")) return FALSE;
 
     //1 : Chargement des ent�tes FICHIER
-    $FILE = unpack("vfile_type/Vfile_size/Vreserved/Vbitmap_offset", fread($f1,14));
+    $FILE = unpack("vfile_type/Vfile_size/Vreserved/Vbitmap_offset", fread($f1, 14));
     if ($FILE['file_type'] != 19778) return FALSE;
 
     //2 : Chargement des ent�tes BMP
     $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']);
+           '/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_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']);
+    $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;
 
@@ -3135,23 +3135,23 @@ 
     $PALETTE = array();
     if ($BMP['colors'] < 16777216)
     {
-      $PALETTE = unpack('V'.$BMP['colors'], fread($f1,$BMP['colors']*4));
+      $PALETTE = unpack('V'.$BMP['colors'], fread($f1, $BMP['colors'] * 4));
     }
 
     //4 : Cr�ation de l'image
-    $IMG = fread($f1,$BMP['size_bitmap']);
+    $IMG = fread($f1, $BMP['size_bitmap']);
     $VIDE = chr(0);
 
-    $res = imagecreatetruecolor($BMP['width'],$BMP['height']);
+    $res = imagecreatetruecolor($BMP['width'], $BMP['height']);
     $P = 0;
-    $Y = $BMP['height']-1;
+    $Y = $BMP['height'] - 1;
     while ($Y >= 0)
     {
-      $X=0;
+      $X = 0;
       while ($X < $BMP['width'])
       {
         if ($BMP['bits_per_pixel'] == 24)
-          $COLOR = unpack("V",substr($IMG,$P,3).$VIDE);
+          $COLOR = unpack("V", substr($IMG, $P, 3).$VIDE);
         elseif ($BMP['bits_per_pixel'] == 16)
         {
 
@@ -3171,7 +3171,7 @@ 
           //$COLOR = unpack("n",substr($IMG,$P,2));
           //$COLOR[1] = $PALETTE[$COLOR[1]+1];
 
-          $COLOR = unpack("v",substr($IMG,$P,2));
+          $COLOR = unpack("v", substr($IMG, $P, 2));
           $blue = ($COLOR[1] & 0x001f) << 3;
           $green = ($COLOR[1] & 0x07e0) >> 3;
           $red = ($COLOR[1] & 0xf800) >> 8;
@@ -3180,38 +3180,38 @@ 
         }
         elseif ($BMP['bits_per_pixel'] == 8)
         {
-          $COLOR = unpack("n",$VIDE.substr($IMG,$P,1));
-          $COLOR[1] = $PALETTE[$COLOR[1]+1];
+          $COLOR = unpack("n", $VIDE.substr($IMG, $P, 1));
+          $COLOR[1] = $PALETTE[$COLOR[1] + 1];
         }
         elseif ($BMP['bits_per_pixel'] == 4)
         {
-          $COLOR = unpack("n",$VIDE.substr($IMG,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];
+          $COLOR = unpack("n", $VIDE.substr($IMG, 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($IMG,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];
+          $COLOR = unpack("n", $VIDE.substr($IMG, 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]);
+        imagesetpixel($res, $X, $Y, $COLOR[1]);
         $X++;
         $P += $BMP['bytes_per_pixel'];
       }
 
       $Y--;
-      $P+=$BMP['decal'];
+      $P += $BMP['decal'];
     }
     //Fermeture du fichier
     fclose($f1);

Braces +86 added lines, -63 removed lines

@@ -209,7 +209,7 @@ 
     # Notes:
     #
     {
-    if (!$this->testGDInstalled()) { if ($this->debug) { throw new Exception('The GD Library is not installed.'); }else{ throw new Exception(); }};
+    if (!$this->testGDInstalled()) { if ($this->debug) { throw new Exception('The GD Library is not installed.'); } else{ throw new Exception(); }};
 
     $this->initialise();
 
@@ -322,7 +322,7 @@ 
     $option = $this->prepOption($option);
 
     // *** Make sure the file passed in is valid
-    if (!$this->image) { if ($this->debug) { throw new Exception('file ' . $this->getFileName() .' is missing or invalid'); }else{ throw new Exception(); }};
+    if (!$this->image) { if ($this->debug) { throw new Exception('file ' . $this->getFileName() .' is missing or invalid'); } else{ throw new Exception(); }};
 
     // *** Get optimal width and height - based on $option
     $dimensionsArray = $this->getDimensions($newWidth, $newHeight, $option);
@@ -391,7 +391,7 @@ 
   {
 
     // *** Make sure the file passed in is valid
-    if (!$this->image) { if ($this->debug) { throw new Exception('file ' . $this->getFileName() .' is missing or invalid'); }else{ throw new Exception(); }};
+    if (!$this->image) { if ($this->debug) { throw new Exception('file ' . $this->getFileName() .' is missing or invalid'); } else{ throw new Exception(); }};
 
     $this->imageResized = $this->image;
     $this->crop($this->width, $this->height, $newWidth, $newHeight, $cropPos);
@@ -671,27 +671,27 @@ 
       }
     }
 
-        if ($this->height < $this->width)
-        // *** Image to be resized is wider (landscape)
+        if ($this->height < $this->width) {
+                // *** Image to be resized is wider (landscape)
         {
             //$optimalWidth = $newWidth;
             //$optimalHeight= $this->getSizeByFixedWidth($newWidth);
 
             $dimensionsArray = $this->getSizeByFixedWidth($newWidth, $newHeight);
+        }
       $optimalWidth = $dimensionsArray['optimalWidth'];
       $optimalHeight = $dimensionsArray['optimalHeight'];
-        }
-        elseif ($this->height > $this->width)
-        // *** Image to be resized is taller (portrait)
+        } elseif ($this->height > $this->width) {
+                // *** Image to be resized is taller (portrait)
         {
             //$optimalWidth = $this->getSizeByFixedHeight($newHeight);
             //$optimalHeight= $newHeight;
 
             $dimensionsArray = $this->getSizeByFixedHeight($newWidth, $newHeight);
+        }
       $optimalWidth = $dimensionsArray['optimalWidth'];
       $optimalHeight = $dimensionsArray['optimalHeight'];
-        }
-    else
+        } else
         // *** Image to be resizerd is a square
         {
 
@@ -800,8 +800,7 @@ 
         $offset = 0;
 
         imageconvolution($this->imageResized, $sharpenMatrix, $divisor, $offset);
-      }
-      else # More subtle and personally more desirable
+      } else # More subtle and personally more desirable
       {
         $sharpness  = $this->findSharp($this->widthOriginal, $this->width);
 
@@ -814,8 +813,7 @@ 
         $offset     = 0;
         imageconvolution($this->imageResized, $sharpenMatrix, $divisor, $offset);
       }
-    }
-    else
+    } else
     {
       if ($this->debug) { throw new Exception('Sharpening required PHP 5.1.0 or greater.'); }
     }
@@ -1236,8 +1234,12 @@ 
     }
     for($i=0; $i<=$reflectionHeight; $i++){
 
-      if($startingTransparency>100) $startingTransparency = 100;
-      if($startingTransparency< 1) $startingTransparency = 1;
+      if($startingTransparency>100) {
+          $startingTransparency = 100;
+      }
+      if($startingTransparency< 1) {
+          $startingTransparency = 1;
+      }
       imagecopymerge($bg, $li, 0, $i, 0, 0, $this->width, 1, $startingTransparency);
       $startingTransparency+=$step;
     }
@@ -1648,7 +1650,7 @@ 
       $y1 = $this->captionBoxPositionArray['y1'];
       $y2 = $this->captionBoxPositionArray['y2'];
     } else {
-      if ($this->debug) { throw new Exception('No caption box found.'); }else{ return false; }
+      if ($this->debug) { throw new Exception('No caption box found.'); } else{ return false; }
     }
 
 
@@ -1733,9 +1735,9 @@ 
     if (!$this->debug || !$debug) { $debug = false; }
 
     // *** Check all is good - check the EXIF library exists and the file exists, too.
-    if (!$this->testEXIFInstalled()) { if ($debug) { throw new Exception('The EXIF Library is not installed.'); }else{ return array(); }};
-    if (!file_exists($this->fileName)) { if ($debug) { throw new Exception('Image not found.'); }else{ return array(); }};
-    if ($this->fileExtension !== '.jpg') { if ($debug) { throw new Exception('Metadata not supported for this image type.'); }else{ return array(); }};
+    if (!$this->testEXIFInstalled()) { if ($debug) { throw new Exception('The EXIF Library is not installed.'); } else{ return array(); }};
+    if (!file_exists($this->fileName)) { if ($debug) { throw new Exception('Image not found.'); } else{ return array(); }};
+    if ($this->fileExtension !== '.jpg') { if ($debug) { throw new Exception('Metadata not supported for this image type.'); } else{ return array(); }};
     $exifData = exif_read_data($this->fileName, 'IFD0');
 
     // *** Format the apperture value
@@ -2049,19 +2051,20 @@ 
   #
   {
     $len = strlen($val);
-    if ($len < 0x8000)
-      return chr(0x1c).chr($rec).chr($dat).
+    if ($len < 0x8000) {
+          return chr(0x1c).chr($rec).chr($dat).
       chr($len >> 8).
       chr($len & 0xff).
       $val;
-    else
-      return chr(0x1c).chr($rec).chr($dat).
+    } else {
+          return chr(0x1c).chr($rec).chr($dat).
       chr(0x80).chr(0x04).
       chr(($len >> 24) & 0xff).
       chr(($len >> 16) & 0xff).
       chr(($len >> 8 ) & 0xff).
       chr(($len ) & 0xff).
       $val;
+    }
   }
 
 
@@ -2134,7 +2137,7 @@ 
       if (!file_exists($font)) {
 
         // *** If not, return false
-        if ($this->debug) { throw new Exception('Font not found'); }else{ return false; }
+        if ($this->debug) { throw new Exception('Font not found'); } else{ return false; }
       }
     }
 
@@ -2346,8 +2349,10 @@ 
 
     //find the most opaque pixel in the image (the one with the smallest alpha value)
     $minalpha = 127;
-    for ($x = 0; $x < $w; $x++)
-      for ($y = 0; $y < $h; $y++) {
+    for ($x = 0; $x < $w; $x++) {
+          for ($y = 0;
+    }
+    $y < $h; $y++) {
         $alpha = ( imagecolorat($img, $x, $y) >> 24 ) & 0xFF;
         if ($alpha < $minalpha) {
           $minalpha = $alpha;
@@ -2392,7 +2397,7 @@ 
     #
     {
 
-    if (!file_exists($file) && !$this->checkStringStartsWith('http://', $file)) { if ($this->debug) { throw new Exception('Image not found.'); }else{ throw new Exception(); }};
+    if (!file_exists($file) && !$this->checkStringStartsWith('http://', $file)) { if ($this->debug) { throw new Exception('Image not found.'); } else{ throw new Exception(); }};
 
         // *** Get extension
         $extension = strrchr($file, '.');
@@ -2461,10 +2466,10 @@ 
     {
 
     // *** Perform a check or two.
-    if (!is_resource($this->imageResized)) { if ($this->debug) { throw new Exception('saveImage: This is not a resource.'); }else{ throw new Exception(); }}
+    if (!is_resource($this->imageResized)) { if ($this->debug) { throw new Exception('saveImage: This is not a resource.'); } else{ throw new Exception(); }}
     $fileInfoArray = pathinfo($savePath);
     clearstatcache();
-    if (!is_writable($fileInfoArray['dirname'])) {  if ($this->debug) { throw new Exception('The path is not writable. Please check your permissions.'); }else{ throw new Exception(); }}
+    if (!is_writable($fileInfoArray['dirname'])) {  if ($this->debug) { throw new Exception('The path is not writable. Please check your permissions.'); } else{ throw new Exception(); }}
 
     // *** Get extension
         $extension = strrchr($savePath, '.');
@@ -2536,7 +2541,7 @@ 
     #
   {
 
-    if (!is_resource($this->imageResized)) { if ($this->debug) { throw new Exception('saveImage: This is not a resource.'); }else{ throw new Exception(); }}
+    if (!is_resource($this->imageResized)) { if ($this->debug) { throw new Exception('saveImage: This is not a resource.'); } else{ throw new Exception(); }}
 
         switch($fileType)
         {
@@ -2624,8 +2629,7 @@ 
         if(extension_loaded('gd') && function_exists('gd_info'))
         {
             $gdInstalled = true;
-        }
-        else
+        } else
         {
             $gdInstalled = false;
         }
@@ -2648,8 +2652,7 @@ 
         if(extension_loaded('exif'))
         {
             $exifInstalled = true;
-        }
-        else
+        } else
         {
             $exifInstalled = false;
         }
@@ -2672,8 +2675,7 @@ 
         if ($image)
         {
             $fileIsImage = true;
-        }
-        else
+        } else
         {
             $fileIsImage = false;
         }
@@ -3109,11 +3111,15 @@ 
   {
 
     //Ouverture du fichier en mode binaire
-    if (! $f1 = fopen($filename,"rb")) return FALSE;
+    if (! $f1 = fopen($filename,"rb")) {
+        return FALSE;
+    }
 
     //1 : Chargement des ent�tes FICHIER
     $FILE = unpack("vfile_type/Vfile_size/Vreserved/Vbitmap_offset", fread($f1,14));
-    if ($FILE['file_type'] != 19778) return FALSE;
+    if ($FILE['file_type'] != 19778) {
+        return FALSE;
+    }
 
     //2 : Chargement des ent�tes BMP
     $BMP = unpack('Vheader_size/Vwidth/Vheight/vplanes/vbits_per_pixel'.
@@ -3121,7 +3127,9 @@ 
            '/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'];
+    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']);
@@ -3129,7 +3137,9 @@ 
        $BMP['decal'] -= floor($BMP['width']*$BMP['bytes_per_pixel']/4);
     $BMP['decal'] = 4-(4*$BMP['decal']);
 
-    if ($BMP['decal'] == 4) $BMP['decal'] = 0;
+    if ($BMP['decal'] == 4) {
+        $BMP['decal'] = 0;
+    }
 
     //3 : Chargement des couleurs de la palette
     $PALETTE = array();
@@ -3150,9 +3160,9 @@ 
       $X=0;
       while ($X < $BMP['width'])
       {
-        if ($BMP['bits_per_pixel'] == 24)
-          $COLOR = unpack("V",substr($IMG,$P,3).$VIDE);
-        elseif ($BMP['bits_per_pixel'] == 16)
+        if ($BMP['bits_per_pixel'] == 24) {
+                  $COLOR = unpack("V",substr($IMG,$P,3).$VIDE);
+        } elseif ($BMP['bits_per_pixel'] == 16)
         {
 
           /*
@@ -3177,33 +3187,43 @@ 
           $red = ($COLOR[1] & 0xf800) >> 8;
           $COLOR[1] = $red * 65536 + $green * 256 + $blue;
 
-        }
-        elseif ($BMP['bits_per_pixel'] == 8)
+        } elseif ($BMP['bits_per_pixel'] == 8)
         {
           $COLOR = unpack("n",$VIDE.substr($IMG,$P,1));
           $COLOR[1] = $PALETTE[$COLOR[1]+1];
-        }
-        elseif ($BMP['bits_per_pixel'] == 4)
+        } elseif ($BMP['bits_per_pixel'] == 4)
         {
           $COLOR = unpack("n",$VIDE.substr($IMG,floor($P),1));
-          if (($P*2)%2 == 0) $COLOR[1] = ($COLOR[1] >> 4) ; else $COLOR[1] = ($COLOR[1] & 0x0F);
+          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)
+        } elseif ($BMP['bits_per_pixel'] == 1)
         {
           $COLOR = unpack("n",$VIDE.substr($IMG,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);
+          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;
         }
-        else
-          return FALSE;
 
         imagesetpixel($res,$X,$Y,$COLOR[1]);
         $X++;
@@ -3241,8 +3261,11 @@ 
 
       $psdReader = new PhpPsdReader($fileName);
 
-      if (isset($psdReader->infoArray['error'])) return '';
-      else return $psdReader->getImage();
+      if (isset($psdReader->infoArray['error'])) {
+          return '';
+      } else {
+          return $psdReader->getImage();
+      }
     } else {
       return false;
     }