diff --git a/Assets/Connector/FileManager.php b/Assets/Connector/FileManager.php
old mode 100644
new mode 100755
index f9ef84b..c2d1df9
--- a/Assets/Connector/FileManager.php
+++ b/Assets/Connector/FileManager.php
@@ -15,7 +15,7 @@
*
* Copyright:
* Copyright (c) 2009-2011 [Christoph Pojer](http://cpojer.net)
- * Backend: FileManager & FMgr4Alias Copyright (c) 2011 [Ger Hobbelt](http://hobbelt.com)
+ * Backend: FileManager & FileManagerWithAliasSupport Copyright (c) 2011 [Ger Hobbelt](http://hobbelt.com)
*
* Dependencies:
* - Tooling.php
@@ -23,23 +23,25 @@
* - getId3 Library
*
* Options:
- * - directory: (string) The URI base directory to be used for the FileManager ('URI path' i.e. an absolute path here would be rooted at DocumentRoot: '/' == DocumentRoot)
- * - assetBasePath: (string, optional) The URI path to all images and swf files used by the filemanager
+ * - documentRootPath: (string) The URI base directory to be used for the FileManager ('URI path' i.e. an absolute path here would be rooted at DocumentRoot: '/' == DocumentRoot)
+ * - assetPath: (string, optional) The URI path to all images and swf files used by the filemanager
* - thumbnailPath: (string) The URI path where the thumbnails of the pictures will be saved
- * - mimeTypesPath: (string, optional) The filesystem path to the MimeTypes.ini file. May exist in a place outside the DocumentRoot tree.
+ * - thumbSmallSize: (integer) The (maximum) width / height in pixels of the thumb48 'small' thumbnails produced by this backend
+ * - thumbBigSize: (integer) The (maximum) width / height in pixels of the thumb250 'big' thumbnails produced by this backend
+ * - mimeTypesFilePath: (string, optional) The filesystem path to the MimeTypes.ini file. May exist in a place outside the DocumentRoot tree.
* - dateFormat: (string, defaults to *j M Y - H:i*) The format in which dates should be displayed
* - maxUploadSize: (integer, defaults to *20280000* bytes) The maximum file size for upload in bytes
* - maxImageDimension: (array, defaults to *array('width' => 1024, 'height' => 768)*) The maximum number of pixels in height and width an image can have, if the user enables "resize on upload".
- * - upload: (boolean, defaults to *false*) allow uploads, this is also set in the FileManager.js (this here is only for security protection when uploads should be deactivated)
- * - destroy: (boolean, defaults to *false*) allow files to get deleted, this is also set in the FileManager.js (this here is only for security protection when file/directory delete operations should be deactivated)
- * - create: (boolean, defaults to *false*) allow creating new subdirectories, this is also set in the FileManager.js (this here is only for security protection when dir creates should be deactivated)
- * - move: (boolean, defaults to *false*) allow file and directory move/rename and copy, this is also set in the FileManager.js (this here is only for security protection when rename/move/copy should be deactivated)
- * - download: (boolean, defaults to *false*) allow downloads, this is also set in the FileManager.js (this here is only for security protection when downloads should be deactivated)
- * - allowExtChange: (boolean, defaults to *false*) allow the file extension to be changed when performing a rename operation.
- * - safe: (boolean, defaults to *true*) If true, disallows 'exe', 'dll', 'php', 'php3', 'php4', 'php5', 'phps' and saves them as 'txt' instead.
+ * - upload: (boolean, defaults to *FALSE*) allow uploads, this is also set in the FileManager.js (this here is only for security protection when uploads should be deactivated)
+ * - destroy: (boolean, defaults to *FALSE*) allow files to get deleted, this is also set in the FileManager.js (this here is only for security protection when file/directory delete operations should be deactivated)
+ * - create: (boolean, defaults to *FALSE*) allow creating new subdirectories, this is also set in the FileManager.js (this here is only for security protection when dir creates should be deactivated)
+ * - move: (boolean, defaults to *FALSE*) allow file and directory move/rename and copy, this is also set in the FileManager.js (this here is only for security protection when rename/move/copy should be deactivated)
+ * - download: (boolean, defaults to *FALSE*) allow downloads, this is also set in the FileManager.js (this here is only for security protection when downloads should be deactivated)
+ * - allowExtChange: (boolean, defaults to *FALSE*) allow the file extension to be changed when performing a rename operation.
+ * - safe: (boolean, defaults to *TRUE*) If TRUE, disallows 'exe', 'dll', 'php', 'php3', 'php4', 'php5', 'phps' and saves them as 'txt' instead.
* - chmod: (integer, default is 0777) the permissions set to the uploaded files and created thumbnails (must have a leading "0", e.g. 0777)
* - filter: (string, defaults to *null*) If not empty, this is a list of allowed mimetypes (overruled by the GET request 'filter' parameter: single requests can thus overrule the common setup in the constructor for this option)
- * - showHiddenFoldersAndFiles: (boolean, defaults to *false*) whether or not to show 'dotted' directories and files -- such files are considered 'hidden' on UNIX file systems
+ * - showHiddenFoldersAndFiles: (boolean, defaults to *FALSE*) whether or not to show 'dotted' directories and files -- such files are considered 'hidden' on UNIX file systems
* - ViewIsAuthorized_cb (function/reference, default is *null*) authentication + authorization callback which can be used to determine whether the given directory may be viewed.
* The parameter $action = 'view'.
* - DetailIsAuthorized_cb (function/reference, default is *null*) authentication + authorization callback which can be used to determine whether the given file may be inspected (and the details listed).
@@ -56,480 +58,55 @@
* Note that currently support for copying subdirectories is missing.
* The parameter $action = 'move'.
*
- * Obsoleted options:
- * - maxImageSize: (integer, default is 1024) The maximum number of pixels in both height and width an image can have, if the user enables "resize on upload". (This option is obsoleted by the 'suggestedMaxImageDimension' option.)
*
- *
- * About the action permissions (upload|destroy|create|move|download):
- *
- * All the option "permissions" are set to FALSE by default. Developers should always SPECIFICALLY enable a permission to have that permission, for two reasons:
- *
- * 1. Developers forget to disable permissions, they don't forget to enable them (because things don't work!)
- *
- * 2. Having open permissions by default leaves potential for security vulnerabilities where those open permissions are exploited.
- *
- *
- * For all authorization hooks (callback functions) the following applies:
- *
- * The callback should return TRUE for yes (permission granted), FALSE for no (permission denied).
- * Parameters sent to the callback are:
- * ($this, $action, $fileinfo)
- * where $fileinfo is an array containing info about the file being uploaded, $action is a (string) identifying the current operation, $this is a reference to this FileManager instance.
- * $action was included as a redundant parameter to each callback as a simple means to allow users to hook a single callback function to all the authorization hooks, without the need to create a wrapper function for each.
- *
- * For more info about the hook parameter $fileinfo contents and a basic implementation, see further below (section 'Hooks: Detailed Interface Specification') and the examples in
- * Demos/FM-common.php, Demos/manager.php and Demos/selectImage.php
- *
- *
- * Notes on relative paths and safety / security:
- *
- * If any option is specifying a relative path, e.g. '../Assets' or 'Media/Stuff/', this is assumed to be relative to the request URI path,
- * i.e. dirname($_SERVER['SCRIPT_NAME']).
- *
- * Requests may post/submit relative paths as arguments to their FileManager events/actions in $_GET/$_POST, and those relative paths will be
- * regarded as relative to the request URI handling script path, i.e. dirname($_SERVER['SCRIPT_NAME']) to make the most
- * sense from bother server and client coding perspective.
- *
- *
- * We also assume that any of the paths may be specified from the outside, so each path is processed and filtered to prevent malicious intent
- * from succeeding. (An example of such would be an attacker posting his own 'destroy' event request requesting the destruction of
- * '../../../../../../../../../etc/passwd' for example. In more complex rigs, the attack may be assisted through attacks at these options' paths,
- * so these are subjected to the same scrutiny in here.)
- *
- * All paths, absolute or relative, as passed to the event handlers (see the onXXX methods of this class) are ENFORCED TO ABIDE THE RULE
- * 'every path resides within the options['directory'] a.k.a. BASEDIR rooted tree' without exception.
- * Because we can do without exceptions to important rules. ;-)
- *
- * When paths apparently don't, they are coerced into adherence to this rule; when this fails, an exception is thrown internally and an error
- * will be reported and the action temrinated.
- *
- * 'LEGAL URL paths':
- *
- * Paths which adhere to the aforementioned rule are so-called LEGAL URL paths; their 'root' equals BASEDIR.
- *
- * BASEDIR equals the path pointed at by the options['directory'] setting. It is therefore imperative that you ensure this value is
- * correctly set up; worst case, this setting will equal DocumentRoot.
- * In other words: you'll never be able to reach any file or directory outside this site's DocumentRoot directory tree, ever.
- *
- *
- * Path transformations:
- *
- * To allow arbitrary directory/path mapping algorithms to be applied (e.g. when implementing Alias support such as available in the
- * derived class FileManagerWithAliasSupport), all paths are, on every change/edit, transformed from their LEGAL URL representation to
- * their 'absolute URI path' (which is suitable to be used in links and references in HTML output) and 'absolute physical filesystem path'
- * equivalents.
- * By enforcing such a unidirectional transformation we implicitly support non-reversible and hard-to-reverse path aliasing mechanisms,
- * e.g. complex regex+context based path manipulations in the server.
- *
- *
- * When you need your paths to be restricted to the bounds of the options['directory'] tree (which is a subtree of the DocumentRoot based
- * tree), you may wish to use the 'legal' class of path transformation member functions:
- *
- * - legal2abs_url_path()
- * - rel2abs_legal_url_path()
- * - legal_url_path2file_path()
- *
- * When you have a 'absolute URI path' or a path relative in URI space (implicitly relative to dirname($_SERVER['SCRIPT_NAME']) ), you can
- * transform such a path to either a guaranteed-absolute URI space path or a filesystem path:
- *
- * - rel2abs_url_path()
- * - url_path2file_path()
- *
- * Any other path transformations are ILLEGAL and DANGEROUS. The only other possibly legal transformation is from absolute URI path to
- * BASEDIR-based LEGAL URL path, as the URI path space is assumed to be linear and contiguous. However, this operation is HIGHLY discouraged
- * as it is a very strong indicator of other faulty logic, so we do NOT offer a method for this.
- *
- *
- * Hooks: Detailed Interface Specification:
- *
- * All 'authorization' callback hooks share a common interface specification (function parameter set). This is by design, so one callback
- * function can be used to process any and all of these events:
- *
- * Function prototype:
- *
- * function CallbackFunction($mgr, $action, &$info)
- *
- * where
- *
- * $msg: (object) reference to the current FileManager class instance. Can be used to invoke public FileManager methods inside
- * the callback.
- *
- * $action: (string) identifies the event being processed. Can be one of these:
- *
- * 'create' create new directory
- * 'move' move or copy a file or directory
- * 'destroy' delete a file or directory
- * 'upload' upload a single file (when performing a bulk upload, each file will be uploaded individually)
- * 'download' download a file
- * 'view' show a directory listing (in either 'list' or 'thumb' mode)
- * 'detail' show detailed information about the file and, whn possible, provide a link to a (largish) thumbnail
- *
- * $info (array) carries all the details. Some of which can even be manipulated if your callbac is more than just an
- * authentication / authorization checker. ;-)
- * For more detail, see the next major section.
- *
- * The callback should return a boolean, where TRUE means the session/client is authorized to execute the action, while FALSE
- * will cause the backend to report an authentication error and abort the action.
- *
- * Exceptions throwing from the callback:
- *
- * Note that you may choose to throw exceptions from inside the callback; those will be caught and transformed to proper error reports.
- *
- * You may either throw any exceptions based on either the FileManagerException or Exception classes. When you format the exception
- * message as "XYZ:data", where 'XYZ' is a alphanumeric-only word, this will be transformed to a i18n-support string, where
- * 'backend.XYZ' must map to a translation string (e.g. 'backend.nofile', see also the Language/Language.XX.js files) and the optional
- * 'data' tail will be appended to the translated message.
- *
- *
- * $info: the details:
- *
- * Here is the list of $info members per $action event code:
- *
- * 'upload':
- *
- * $info[] contains:
- *
- * 'legal_dir_url' (string) LEGAL URI path to the directory where the file is being uploaded. You may invoke
- * $dir = $mgr->legal_url_path2file_path($legal_dir_url);
- * to obtain the physical filesystem path (also available in the 'dir' $info entry, by the way!), or
- * $dir_url = $mgr->legal2abs_url_path($legal_dir_url);
- * to obtain the absolute URI path for the given directory.
- *
- * 'dir' (string) physical filesystem path to the directory where the file is being uploaded.
- *
- * 'raw_filename' (string) the raw, unprocessed filename of the file being being uploaded, as specified by the client.
- *
- * WARNING: 'raw_filename' may contain anything illegal, such as directory paths instead of just a filename,
- * filesystem-illegal characters and what-not. Use 'name'+'extension' instead if you want to know
- * where the upload will end up.
- *
- * 'filename' (string) the filename, plus extension, of the file being uploaded; this filename is ensured
- * to be both filesystem-legal, unique and not yet existing in the given directory.
- *
- * Note that the file name extension has already been cleaned, including 'safe' mode processing,
- * i.e. any uploaded binary executable will have been assigned the extension '.txt' already, when
- * FileManager's options['safe'] is enabled.
- *
- * 'tmp_filepath' (string) filesystem path pointing at the temporary storage location of the uploaded file: you can
- * access the file data available here to optionally validate the uploaded content.
- *
- * 'meta_data' (array) the content sniffed infor as produced by getID3
- *
- * 'mime' (string) the mime type as sniffed from the file
- *
- * 'mime_filter' (optional, string) mime filter as specified by the client: a comma-separated string containing
- * full or partial mime types, where a 'partial' mime types is the part of a mime type before
- * and including the slash, e.g. 'image/'
- *
- * 'mime_filters' (optional, array of strings) the set of allowed mime types, derived from the 'mime_filter' setting.
- *
- * 'size' (integer) number of bytes of the uploaded file
- *
- * 'maxsize' (integer) the configured maximum number of bytes for any single upload
- *
- * 'overwrite' (boolean) FALSE: the uploaded file will not overwrite any existing file, it will fail instead.
- *
- * Set to TRUE (and adjust the 'name' and 'extension' entries as you desire) when you wish to overwrite
- * an existing file.
- *
- * 'resize' (boolean) TRUE: any uploaded images are resized to the configured maximum dimensions before they
- * are stored on disk.
- *
- * 'chmod' (integer) UNIX access rights (default: 0666) for the file-to-be-created (RW for user,group,world).
- *
- * Note that the eXecutable bits have already been stripped before the callback was invoked.
- *
- * 'preliminary_json' (array) the JSON data collected so far; when ['status']==1, then we're performing a regular upload
- * operation, when the ['status']==0, we are performing a defective upload operation.
- *
- * 'validation_failure' (string) NULL: no validation error has been detected before the callback was invoked; non-NULL, e.g.
- * "nofile": the string passed as message parameter of the FileManagerException, which will be thrown
- * after the callback has returned. (You may alter the 'validation_failure' string value to change the
- * reported error, or set it to NULL to turn off the validation error report entirely -- we assume you
- * will have corrected the other fileinfo[] items as well, when resetting the validation error.
- *
- *
- * Note that this request originates from a Macromedia Flash client: hence you'll need to use the
- * $_POST[session_name()] value to manually set the PHP session_id() before you start your your session
- * again.
- *
- * The frontend-specified options.propagateData items will be available as $_POST[] items.
- *
- * The frontend-specified options.uploadAuthData items will be available as $_POST[] items.
- *
- *
- * 'download':
- *
- * $info[] contains:
- *
- * 'legal_url' (string) LEGAL URI path to the file to be downloaded. You may invoke
- * $dir = $mgr->legal_url_path2file_path($legal_url);
- * to obtain the physical filesystem path (also available in the 'file' $info entry, by the way!), or
- * $url = $mgr->legal2abs_url_path($legal_url);
- * to obtain the absolute URI path for the given file.
- *
- * 'file' (string) physical filesystem path to the file being downloaded.
- *
- * 'meta_data' (array) the content sniffed infor as produced by getID3
- *
- * 'mime' (string) the mime type as sniffed from the file
- *
- * 'mime_filter' (optional, string) mime filter as specified by the client: a comma-separated string containing
- * full or partial mime types, where a 'partial' mime types is the part of a mime type before
- * and including the slash, e.g. 'image/'
- *
- * 'mime_filters' (optional, array of strings) the set of allowed mime types, derived from the 'mime_filter' setting.
- *
- * 'validation_failure' (string) NULL: no validation error has been detected before the callback was invoked; non-NULL, e.g.
- * "nofile": the string passed as message parameter of the FileManagerException, which will be thrown
- * after the callback has returned. (You may alter the 'validation_failure' string value to change the
- * reported error, or set it to NULL to turn off the validation error report entirely -- we assume you
- * will have corrected the other fileinfo[] items as well, when resetting the validation error.
- *
- * The frontend-specified options.propagateData items will be available as $_POST[] items.
- *
- *
- * 'create': // create directory
- *
- * $info[] contains:
- *
- * 'legal_url' (string) LEGAL URI path to the parent directory of the directory being created. You may invoke
- * $dir = $mgr->legal_url_path2file_path($legal_url);
- * to obtain the physical filesystem path (also available in the 'dir' $info entry, by the way!), or
- * $url = $mgr->legal2abs_url_path($legal_url);
- * to obtain the absolute URI path for this parent directory.
- *
- * 'dir' (string) physical filesystem path to the parent directory of the directory being created.
- *
- * 'raw_name' (string) the name of the directory to be created, as specified by the client (unfiltered!)
- *
- * 'uniq_name' (string) the name of the directory to be created, filtered and ensured to be both unique and
- * not-yet-existing in the filesystem.
- *
- * 'newdir' (string) the filesystem absolute path to the directory to be created; identical to:
- * $newdir = $mgr->legal_url_path2file_path($legal_url . $uniq_name);
- * Note the above: all paths are transformed from URI space to physical disk every time a change occurs;
- * this allows us to map even not-existing 'directories' to possibly disparate filesystem locations.
- *
- * 'chmod' (integer) UNIX access rights (default: 0777) for the directory-to-be-created (RWX for user,group,world)
- *
- * 'preliminary_json' (array) the JSON data collected so far; when ['status']==1, then we're performing a regular 'create'
- * operation, when the ['status']==0, we are performing a defective 'create' operation.
- *
- * 'validation_failure' (string) NULL: no validation error has been detected before the callback was invoked; non-NULL, e.g.
- * "nofile": the string passed as message parameter of the FileManagerException, which will be thrown
- * after the callback has returned. (You may alter the 'validation_failure' string value to change the
- * reported error, or set it to NULL to turn off the validation error report entirely -- we assume you
- * will have corrected the other fileinfo[] items as well, when resetting the validation error.
- *
- * The frontend-specified options.propagateData items will be available as $_POST[] items.
- *
- *
- * 'destroy':
- *
- * $info[] contains:
- *
- * 'legal_url' (string) LEGAL URI path to the file/directory to be deleted. You may invoke
- * $dir = $mgr->legal_url_path2file_path($legal_url);
- * to obtain the physical filesystem path (also available in the 'file' $info entry, by the way!), or
- * $url = $mgr->legal2abs_url_path($legal_url);
- * to obtain the absolute URI path for the given file/directory.
- *
- * 'file' (string) physical filesystem path to the file/directory being deleted.
- *
- * 'meta_data' (array) the content sniffed infor as produced by getID3
- *
- * 'mime' (string) the mime type as sniffed from the file / directory (directories are mime type: 'text/directory')
- *
- * 'mime_filter' (optional, string) mime filter as specified by the client: a comma-separated string containing
- * full or partial mime types, where a 'partial' mime types is the part of a mime type before
- * and including the slash, e.g. 'image/'
- *
- * 'mime_filters' (optional, array of strings) the set of allowed mime types, derived from the 'mime_filter' setting.
- *
- * Note that the 'mime_filters', if any, are applied to the 'delete' operation in a special way: only
- * files matching one of the mime types in this list will be deleted; anything else will remain intact.
- * This can be used to selectively clean a directory tree.
- *
- * The design idea behind this approach is that you are only allowed what you can see ('view'), so
- * all 'view' restrictions should equally to the 'delete' operation.
- *
- * 'preliminary_json' (array) the JSON data collected so far; when ['status']==1, then we're performing a regular 'destroy'
- * operation, when the ['status']==0, we are performing a defective 'destroy' operation.
- *
- * 'validation_failure' (string) NULL: no validation error has been detected before the callback was invoked; non-NULL, e.g.
- * "nofile": the string passed as message parameter of the FileManagerException, which will be thrown
- * after the callback has returned. (You may alter the 'validation_failure' string value to change the
- * reported error, or set it to NULL to turn off the validation error report entirely -- we assume you
- * will have corrected the other fileinfo[] items as well, when resetting the validation error.
- *
- * The frontend-specified options.propagateData items will be available as $_POST[] items.
- *
- *
- * 'move': // move or copy!
- *
- * $info[] contains:
- *
- * 'legal_url' (string) LEGAL URI path to the source parent directory of the file/directory being moved/copied. You may invoke
- * $dir = $mgr->legal_url_path2file_path($legal_url);
- * to obtain the physical filesystem path (also available in the 'dir' $info entry, by the way!), or
- * $url = $mgr->legal2abs_url_path($legal_url);
- * to obtain the absolute URI path for the given directory.
- *
- * 'dir' (string) physical filesystem path to the source parent directory of the file/directory being moved/copied.
- *
- * 'path' (string) physical filesystem path to the file/directory being moved/copied itself; this is the full source path.
- *
- * 'name' (string) the name itself of the file/directory being moved/copied; this is the source name.
- *
- * 'legal_newurl' (string) LEGAL URI path to the target parent directory of the file/directory being moved/copied. You may invoke
- * $dir = $mgr->legal_url_path2file_path($legal_url);
- * to obtain the physical filesystem path (also available in the 'dir' $info entry, by the way!), or
- * $url = $mgr->legal2abs_url_path($legal_url);
- * to obtain the absolute URI path for the given directory.
- *
- * 'newdir' (string) physical filesystem path to the target parent directory of the file/directory being moved/copied;
- * this is the full path of the directory where the file/directory will be moved/copied to. (filesystem absolute)
- *
- * 'newpath' (string) physical filesystem path to the target file/directory being moved/copied itself; this is the full destination path,
- * i.e. the full path of where the file/directory should be renamed/moved to. (filesystem absolute)
- *
- * 'newname' (string) the target name itself of the file/directory being moved/copied; this is the destination name.
- *
- * This filename is ensured to be both filesystem-legal, unique and not yet existing in the given target directory.
- *
- * 'rename' (boolean) TRUE when a file/directory RENAME operation is requested (name change, staying within the same
- * parent directory). FALSE otherwise.
- *
- * 'is_dir' (boolean) TRUE when the subject is a directory itself, FALSE when it is a regular file.
- *
- * 'function' (string) PHP call which will perform the operation. ('rename' or 'copy')
- *
- * 'preliminary_json' (array) the JSON data collected so far; when ['status']==1, then we're performing a regular 'move'
- * operation, when the ['status']==0, we are performing a defective 'move' operation.
- *
- * 'validation_failure' (string) NULL: no validation error has been detected before the callback was invoked; non-NULL, e.g.
- * "nofile": the string passed as message parameter of the FileManagerException, which will be thrown
- * after the callback has returned. (You may alter the 'validation_failure' string value to change the
- * reported error, or set it to NULL to turn off the validation error report entirely -- we assume you
- * will have corrected the other fileinfo[] items as well, when resetting the validation error.
- *
- * The frontend-specified options.propagateData items will be available as $_POST[] items.
- *
- *
- * 'view':
- *
- * $info[] contains:
- *
- * 'legal_url' (string) LEGAL URI path to the directory being viewed/scanned. You may invoke
- * $dir = $mgr->legal_url_path2file_path($legal_url);
- * to obtain the physical filesystem path (also available in the 'dir' $info entry, by the way!), or
- * $url = $mgr->legal2abs_url_path($legal_url);
- * to obtain the absolute URI path for the scanned directory.
- *
- * 'dir' (string) physical filesystem path to the directory being viewed/scanned.
- *
- * 'collection' (dual array of strings) arrays of files and directories (including '..' entry at the top when this is a
- * subdirectory of the FM-managed tree): only names, not full paths. The files array is located at the
- * ['files'] index, while the directories are available at the ['dirs'] index.
- *
- * 'meta_data' (array) the content sniffed infor as produced by getID3
- *
- * 'mime_filter' (optional, string) mime filter as specified by the client: a comma-separated string containing
- * full or partial mime types, where a 'partial' mime types is the part of a mime type before
- * and including the slash, e.g. 'image/'
- *
- * 'mime_filters' (optional, array of strings) the set of allowed mime types, derived from the 'mime_filter' setting.
- *
- * 'file_preselect' (optional, string) filename of a file in this directory which should be located and selected.
- * When found, the backend will provide an index number pointing at the corresponding JSON files[]
- * entry to assist the front-end in jumping to that particular item in the view.
- *
- * 'preliminary_json' (array) the JSON data collected so far; when ['status']==1, then we're performing a regular view
- * operation (possibly as the second half of a copy/move/delete operation), when the ['status']==0,
- * we are performing a view operation as the second part of another otherwise failed action, e.g. a
- * failed 'create directory'.
- *
- * 'validation_failure' (string) NULL: no validation error has been detected before the callback was invoked; non-NULL, e.g.
- * "nofile": the string passed as message parameter of the FileManagerException, which will be thrown
- * after the callback has returned. (You may alter the 'validation_failure' string value to change the
- * reported error, or set it to NULL to turn off the validation error report entirely -- we assume you
- * will have corrected the other fileinfo[] items as well, when resetting the validation error.
- *
- * The frontend-specified options.propagateData items will be available as $_POST[] items.
- *
- *
- * 'detail':
- *
- * $info[] contains:
- *
- * 'legal_url' (string) LEGAL URI path to the file/directory being inspected. You may invoke
- * $dir = $mgr->legal_url_path2file_path($legal_url);
- * to obtain the physical filesystem path (also available in the 'file' $info entry, by the way!), or
- * $url = $mgr->legal2abs_url_path($legal_url);
- * to obtain the absolute URI path for the given file.
- *
- * 'file' (string) physical filesystem path to the file being inspected.
- *
- * 'meta_data' (array) the content sniffed infor as produced by getID3
- *
- * 'mime' (string) the mime type as sniffed from the file
- *
- * 'mime_filter' (optional, string) mime filter as specified by the client: a comma-separated string containing
- * full or partial mime types, where a 'partial' mime types is the part of a mime type before
- * and including the slash, e.g. 'image/'
- *
- * 'mime_filters' (optional, array of strings) the set of allowed mime types, derived from the 'mime_filter' setting.
- *
- * 'preliminary_json' (array) the JSON data collected so far; when ['status']==1, then we're performing a regular 'detail'
- * operation, when the ['status']==0, we are performing a defective 'detail' operation.
- *
- * 'validation_failure' (string) NULL: no validation error has been detected before the callback was invoked; non-NULL, e.g.
- * "nofile": the string passed as message parameter of the FileManagerException, which will be thrown
- * after the callback has returned. (You may alter the 'validation_failure' string value to change the
- * reported error, or set it to NULL to turn off the validation error report entirely -- we assume you
- * will have corrected the other fileinfo[] items as well, when resetting the validation error.
- *
- * The frontend-specified options.propagateData items will be available as $_POST[] items.
- *
- *
- *
- * Developer Notes:
- *
- * - member functions which have a commented out 'static' keyword have it removed by design: it makes for easier overloading through
- * inheritance that way and meanwhile there's no pressing need to have those (public) member functions acccessible from the outside world
- * without having an instance of the FileManager class itself round at the same time.
*/
// ----------- compatibility checks ----------------------------------------------------------------------------
if (version_compare(PHP_VERSION, '5.2.0') < 0)
{
// die horribly: server does not match our requirements!
- header('HTTP/1.0 500 FileManager requires PHP 5.2.0 or later', true, 500); // Internal server error
+ header('HTTP/1.0 500 FileManager requires PHP 5.2.0 or later', TRUE, 500); // Internal server error
throw Exception('FileManager requires PHP 5.2.0 or later'); // this exception will most probably not be caught; that's our intent!
}
-if (function_exists('UploadIsAuthenticated'))
-{
- // die horribly: user has not upgraded his callback hook(s)!
- header('HTTP/1.0 500 FileManager callback has not been upgraded!', true, 500); // Internal server error
- throw Exception('FileManager callback has not been upgraded!'); // this exception will most probably not be caught; that's our intent!
-}
-
//-------------------------------------------------------------------------------------------------------------
if (!defined('DEVELOPMENT')) define('DEVELOPMENT', 0); // make sure this #define is always known to us
-
require(strtr(dirname(__FILE__), '\\', '/') . '/Tooling.php');
require(strtr(dirname(__FILE__), '\\', '/') . '/Image.class.php');
require(strtr(dirname(__FILE__), '\\', '/') . '/Assets/getid3/getid3.php');
+/*
+require(strtr(dirname(__FILE__), '\\', '/') . '/Filemanager/Tooling.php');
+require(strtr(dirname(__FILE__), '\\', '/') . '/Filemanager/Image.class.php');
+require(strtr(dirname(__FILE__), '\\', '/') . '/getid3/getid3.php');
+*/
+
+
+
+
+# Should log to the same directory as this file
+require(strtr(dirname(__FILE__), '\\', '/') . '/KLogger.php');
+
+/*
+$log->logInfo('Info Test');
+$log->logNotice('Notice Test');
+$log->logWarn('Warn Test');
+$log->logError('Error Test');
+$log->logFatal('Fatal Test');
+$log->logAlert('Alert Test');
+$log->logCrit('Crit test');
+$log->logEmerg('Emerg Test');
+*/
+
+
+
// the jpeg quality for the largest thumbnails (smaller ones are automatically done at increasingly higher quality)
-define('MTFM_THUMBNAIL_JPEG_QUALITY', 75);
+define('MTFM_THUMBNAIL_JPEG_QUALITY', 80);
// the number of directory levels in the thumbnail cache; set to 2 when you expect to handle huge image collections.
//
@@ -542,7 +119,7 @@
define('MTFM_MIN_GETID3_CACHESIZE', 16);
// allow MTFM to use finfo_open() to help us produce mime types for files. This is slower than the basic file extension to mimetype mapping
-define('MTFM_USE_FINFO_OPEN', false);
+define('MTFM_USE_FINFO_OPEN', FALSE);
@@ -552,13 +129,6 @@
// flags for clean_ID3info_results()
define('MTFM_CLEAN_ID3_STRIP_EMBEDDED_IMAGES', 0x0001);
-// 'UsageMode' bits; these work as bit flags:
-define('MTFM_USAGE_ASYNC_THUMB250_PRODUCTION', 0x0001);
-define('MTFM_USAGE_ASYNC_THUMB48_PRODUCTION', 0x0002);
-define('MTFM_USAGE_AGGRESSIVE_META_INFO_CACHING', 0x0004);
-// and some aggregates for ease of use:
-define('MTFM_USAGE_BASIC', 0);
-define('MTFM_USAGE_SPEED_FREAK', MTFM_USAGE_ASYNC_THUMB250_PRODUCTION | MTFM_USAGE_ASYNC_THUMB48_PRODUCTION | MTFM_USAGE_AGGRESSIVE_META_INFO_CACHING);
@@ -571,7 +141,7 @@
*
* Makes sure the generated (thumbpath) template is unique for each source file ('$legal_url'). We prevent
* reduced performance for large file sets: all thumbnails/templates derived from any files in the entire
- * FileManager-managed directory tree, rooted by options['directory'], can become a huge collection,
+ * FileManager-managed directory tree, rooted by options['documentRootPath'], can become a huge collection,
* so we distribute them across a (thumbnail/cache) directory tree, which is created on demand.
*
* The thumbnails cache directory tree is determined by the MD5 of the full path to the source file ($legal_url),
@@ -599,23 +169,28 @@ class MTFMCacheItem
protected $cache_file;
- public function __construct($fm_obj, $legal_url, $prefetch = false, $persistent_edits = true)
+ public function __construct($fm_obj, $legal_url, $prefetch = FALSE, $persistent_edits = TRUE)
{
$this->init($fm_obj, $legal_url, $prefetch, $persistent_edits);
+
+ $this->log = KLogger::instance(dirname(__FILE__), KLogger::DEBUG);
+
+
}
- public function init($fm_obj, $legal_url, $prefetch = false, $persistent_edits)
+ public function init($fm_obj, $legal_url, $prefetch = FALSE, $persistent_edits)
{
- $this->dirty = false;
+ $this->dirty = FALSE;
$this->persistent_edits = $persistent_edits;
- $this->loaded = false;
+ $this->loaded = FALSE;
$this->store = array();
$fmopts = $fm_obj->getSettings();
$this->legal_url = $legal_url;
- $this->file = $fm_obj->legal_url_path2file_path($legal_url);
- $this->fstat = null;
+// $this->file = $fm_obj->legal_url_path2file_path($legal_url);
+ $this->file = $fm_obj->getAbsolutePath($legal_url);
+ $this->fstat = NULL;
$fi = pathinfo($legal_url);
if (is_dir($this->file))
@@ -667,7 +242,11 @@ public function init($fm_obj, $legal_url, $prefetch = false, $persistent_edits)
$dircode = substr($dircode, 4);
$fn = substr($fn . $dircode, 0, 38);
- $this->cache_dir_url = $fmopts['thumbnailPath'] . $dir;
+ $this->cache_dir_url = $fmopts['thumbnailCacheUrl'] . $dir;
+
+
+
+
$this->cache_dir = $fmopts['thumbnailCacheDir'] . $dir;
$this->cache_dir_mode = $fmopts['chmod'];
$this->cache_base = $fn;
@@ -686,7 +265,7 @@ public function load()
{
if (!$this->loaded)
{
- $this->loaded = true; // always mark as loaded, even when the load fails
+ $this->loaded = TRUE; // always mark as loaded, even when the load fails
if (!is_array($this->fstat) && file_exists($this->file))
{
@@ -702,7 +281,7 @@ public function load()
&& $statdata[7] == $this->fstat[7] // size
)
{
- if (!DEVELOPMENT)
+ if ( ! DEVELOPMENT)
{
// mix disk cache data with items already existing in RAM cache: we use a delayed-load scheme which necessitates this.
$this->store = array_merge($data, $this->store);
@@ -717,9 +296,9 @@ public function load()
}
}
- public function delete($every_ting_baby = false)
+ public function delete($every_ting_baby = FALSE)
{
- $rv = true;
+ $rv = TRUE;
$dir = $this->cache_dir;
$dir_exists = file_exists($dir);
@@ -731,7 +310,7 @@ public function delete($every_ting_baby = false)
$dir_and_mask = $dir . $this->cache_base . '*';
$coll = safe_glob($dir_and_mask, GLOB_NODOTS | GLOB_NOSORT);
- if ($coll !== false)
+ if ($coll !== FALSE)
{
foreach($coll['files'] as $filename)
{
@@ -759,8 +338,8 @@ public function delete($every_ting_baby = false)
}
// also clear the data cached in RAM:
- $this->dirty = false;
- $this->loaded = true; // we know the cache file doesn't exist any longer, so don't bother trying to load it again later on!
+ $this->dirty = FALSE;
+ $this->loaded = TRUE; // we know the cache file doesn't exist any longer, so don't bother trying to load it again later on!
$this->store = array();
return $rv;
@@ -786,9 +365,9 @@ public function __destruct()
// legal URL: ' . $this->legal_url . '
-$statdata = ' . var_export($this->fstat, true) . ';
+$statdata = ' . var_export($this->fstat, TRUE) . ';
-$data = ' . var_export($this->store, true) . ';' . PHP_EOL;
+$data = ' . var_export($this->store, TRUE) . ';' . PHP_EOL;
@file_put_contents($this->cache_file, $data);
}
@@ -797,7 +376,7 @@ public function __destruct()
/*
* @param boolean $persistent (default: TRUE) TRUE when we should also check the persistent cache storage for this item/key
*/
- public function fetch($key, $persistent = true)
+ public function fetch($key, $persistent = TRUE)
{
if (isset($this->store[$key]))
{
@@ -813,13 +392,13 @@ public function fetch($key, $persistent = true)
}
}
- return null;
+ return NULL;
}
/*
* @param boolean $persistent (default: TRUE) TRUE when we should also store this item/key in the persistent cache storage
*/
- public function store($key, $value, $persistent = true)
+ public function store($key, $value, $persistent = TRUE)
{
if (isset($this->store[$key]))
{
@@ -832,13 +411,13 @@ public function store($key, $value, $persistent = true)
public function getThumbPath($dimensions)
{
- assert(!empty($dimensions));
+ assert( ! empty($dimensions));
return $this->cache_dir . $this->cache_base . '-' . $dimensions . $this->cache_tnext;
}
public function getThumbURL($dimensions)
{
- assert(!empty($dimensions));
+ assert( ! empty($dimensions));
return $this->cache_dir_url . $this->cache_base . '-' . $dimensions . $this->cache_tnext;
}
@@ -846,20 +425,20 @@ public function mkCacheDir()
{
if (!is_dir($this->cache_dir))
{
- @mkdir($this->cache_dir, $this->cache_dir_mode, true);
- return true;
+ @mkdir($this->cache_dir, $this->cache_dir_mode, TRUE);
+ return TRUE;
}
- return false;
+ return FALSE;
}
public function getMimeType()
{
- if (!empty($this->store['mime_type']))
+ if ( ! empty($this->store['mime_type']))
{
return $this->store['mime_type'];
}
//$mime = $fm_obj->getMimeFromExt($file);
- return null;
+ return NULL;
}
}
@@ -891,9 +470,9 @@ public function __construct($min_cache_size)
*
* You can store any arbitrary data in a cache slot: it doesn't have to be a MTFMCacheItem instance.
*/
- public function &pick($key, $fm_obj = null, $create_if_not_exist = true)
+ public function &pick($key, $fm_obj = NULL, $create_if_not_exist = TRUE)
{
- assert(!empty($key));
+ assert( ! empty($key));
$age_limit = $this->store_lru_ts - $this->min_cache_size;
@@ -955,20 +534,20 @@ public function &pick($key, $fm_obj = null, $create_if_not_exist = true)
* add this slot (empty for now) to the cache. Only do this AFTER the pruning, so it won't risk being
* picked by the random process in there. We _need_ this one right now. ;-)
*/
- $this->store[$key] = (!empty($fm_obj) ? new MTFMCacheItem($fm_obj, $key) : null);
+ $this->store[$key] = ( ! empty($fm_obj) ? new MTFMCacheItem($fm_obj, $key) : NULL);
$this->store_ts[$key] = $this->store_lru_ts++;
}
else
{
// do not clutter the cache; all we're probably after this time is the assistance of a MTFMCacheItem:
- // provide a dummy cache entry, nulled and all; we won't be saving the stored data, if any, anyhow.
+ // provide a dummy cache entry, NULLed and all; we won't be saving the stored data, if any, anyhow.
if (isset($this->store['!']) && !empty($fm_obj))
{
- $this->store['!']->init($fm_obj, $key, false, false);
+ $this->store['!']->init($fm_obj, $key, FALSE, FALSE);
}
else
{
- $this->store['!'] = (!empty($fm_obj) ? new MTFMCacheItem($fm_obj, $key, false, false) : null);
+ $this->store['!'] = ( ! empty($fm_obj) ? new MTFMCacheItem($fm_obj, $key, FALSE, FALSE) : NULL);
}
$this->store_ts['!'] = 0;
$key = '!';
@@ -989,186 +568,168 @@ class FileManager
protected $options;
protected $getid3;
protected $getid3_cache;
- protected $icon_cache; // cache the icon paths per size (large/small) and file extension
+ protected $icon_cache; // cache the icon paths per size (large/small) and file extension
+ protected $documentRootPath;
protected $thumbnailCacheDir;
- protected $thumbnailCacheParentDir; // assistant precalculated value for scandir/view
- protected $managedBaseDir; // precalculated filesystem path eqv. of options['directory']
-
+ protected $thumbnailCacheParentDir; // assistant precalculated value for scandir/view
+ protected $managedBaseDir; // precalculated filesystem path eqv. of options['documentRootPath']
+ protected $assetPath; // Assets absolute filesystem path
+
+ protected $mimeTypesFilePath;
+
+
public function __construct($options)
{
+ // LOG
+ $this->log = KLogger::instance(dirname(__FILE__), KLogger::DEBUG);
+
$this->options = array_merge(array(
+
/*
* Note that all default paths as listed below are transformed to DocumentRoot-based paths
* through the getRealPath() invocations further below:
*/
- 'directory' => null, // the root of the 'legal URI' directory tree, to be managed by MTFM. MUST be in the DocumentRoot tree.
- 'assetBasePath' => null, // may sit outside options['directory'] but MUST be in the DocumentRoot tree
- 'thumbnailPath' => null, // may sit outside options['directory'] but MUST be in the DocumentRoot tree
- 'mimeTypesPath' => strtr(dirname(__FILE__), '\\', '/') . '/MimeTypes.ini', // an absolute filesystem path anywhere; when relative, it will be assumed to be against SERVER['SCRIPT_NAME']
- 'documentRootPath' => null, // an absolute filesystem path pointing at URI path '/'. Default: SERVER['DOCUMENT_ROOT']
+ 'requestScript' => NULL, // default is $_SERVER['SCRIPT_NAME']
+
+ 'baseUrl' => NULL, // an absolute filesystem path pointing at URI path '/'. Default: SERVER['DOCUMENT_ROOT']
+ 'documentRootPath' => NULL, // an absolute filesystem path pointing at URI path '/'. Default: SERVER['DOCUMENT_ROOT']
+ 'directory' => NULL, // Relative to the the DocumentRoot path.
+ 'assetPath' => NULL, // may sit outside options['documentRootPath'] but MUST be in the DocumentRoot tree
+ 'thumbnailPath' => NULL, // may sit outside options['documentRootPath'] but MUST be in the DocumentRoot tree
+
+ 'thumbSmallSize' => 48, // Used for thumb48 creation
+ 'thumbBigSize' => 250, // Used for thumb250 creation
+ 'mimeTypesFilePath' => strtr(dirname(__FILE__), '\\', '/') . '/MimeTypes.ini', // an absolute filesystem path anywhere; when relative, it will be assumed to be against options['requestScript']
+
'dateFormat' => 'j M Y - H:i',
'maxUploadSize' => 2600 * 2600 * 3,
- // 'maxImageSize' => 99999, // OBSOLETED, replaced by 'suggestedMaxImageDimension'
- 'maxImageDimension' => array('width' => 1024, 'height' => 768), // Allow to specify the "Resize Large Images" tolerance level.
- 'upload' => false,
- 'destroy' => false,
- 'create' => false,
- 'move' => false,
- 'download' => false,
- /* ^^^ this last one is easily circumnavigated if it's about images: when you can view 'em, you can 'download' them anyway.
- * However, for other mime types which are not previewable / viewable 'in their full bluntal nugity' ;-) , this will
- * be a strong deterent.
- *
- * Think Springer Verlag and PDFs, for instance. You can have 'em, but only /after/ you've ...
- */
- 'allowExtChange' => false,
- 'safe' => true,
- 'filter' => null,
+
+ 'maxImageDimension' => array('width' => 1024, 'height' => 768), // Allow to specify the "Resize Large Images" tolerance level.
+ 'upload' => FALSE,
+ 'destroy' => FALSE,
+ 'create' => FALSE,
+ 'move' => FALSE,
+ 'download' => FALSE,
+
+ 'allowExtChange' => FALSE,
+ 'safe' => TRUE,
+ 'filter' => NULL,
'chmod' => 0777,
- 'ViewIsAuthorized_cb' => null,
- 'DetailIsAuthorized_cb' => null,
- 'UploadIsAuthorized_cb' => null,
- 'DownloadIsAuthorized_cb' => null,
- 'CreateIsAuthorized_cb' => null,
- 'DestroyIsAuthorized_cb' => null,
- 'MoveIsAuthorized_cb' => null,
- 'showHiddenFoldersAndFiles' => false, // Hide dot dirs/files ?
- 'UsageMode' => MTFM_USAGE_BASIC
+ 'cleanFileName' => TRUE,
+
+ 'ViewIsAuthorized_cb' => NULL,
+ 'DetailIsAuthorized_cb' => NULL,
+ 'UploadIsAuthorized_cb' => NULL,
+ 'DownloadIsAuthorized_cb' => NULL,
+ 'CreateIsAuthorized_cb' => NULL,
+ 'DestroyIsAuthorized_cb' => NULL,
+ 'MoveIsAuthorized_cb' => NULL,
+ 'showHiddenFoldersAndFiles' => FALSE // Hide dot dirs/files ?
), (is_array($options) ? $options : array()));
- // transform the obsoleted/deprecated options:
- if (!empty($this->options['maxImageSize']) && $this->options['maxImageSize'] != 1024 && $this->options['maxImageDimension']['width'] == 1024 && $this->options['maxImageDimension']['height'] == 768)
- {
- $this->options['maxImageDimension'] = array('width' => $this->options['maxImageSize'], 'height' => $this->options['maxImageSize']);
- }
-
- $assumed_root = null;
- if (!empty($this->options['documentRootPath']))
- {
+ $assumed_root = NULL;
+ if ( ! empty($this->options['documentRootPath']))
$assumed_root = realpath($this->options['documentRootPath']);
- }
+
if (empty($assumed_root))
- {
$assumed_root = realpath($_SERVER['DOCUMENT_ROOT']);
- }
+
$assumed_root = strtr($assumed_root, '\\', '/');
$assumed_root = rtrim($assumed_root, '/');
- $this->options['documentRootPath'] = $assumed_root;
- // only calculate the guestimated defaults when they are indeed required:
- if ($this->options['directory'] == null || $this->options['assetBasePath'] == null || $this->options['thumbnailPath'] == null)
- {
- $my_path = @realpath(dirname(__FILE__));
- $my_path = strtr($my_path, '\\', '/');
- if (!FileManagerUtility::endsWith($my_path, '/'))
- {
- $my_path .= '/';
- }
- $my_assumed_url_path = str_replace($assumed_root, '', $my_path);
- // we throw an Exception here because when these do not apply, the user should have specified all three these entries!
- if (empty($assumed_root) || empty($my_path) || !FileManagerUtility::startsWith($my_path, $assumed_root))
- {
- throw new FileManagerException('nofile');
- }
-
- if ($this->options['directory'] == null)
- {
- $this->options['directory'] = $my_assumed_url_path . '../../Demos/Files/';
- }
- if ($this->options['assetBasePath'] == null)
- {
- $this->options['assetBasePath'] = $my_assumed_url_path . '../../Demos/Files/../../Assets/';
- }
- if ($this->options['thumbnailPath'] == null)
- {
- $this->options['thumbnailPath'] = $my_assumed_url_path . '../../Demos/Files/../../Assets/Thumbs/';
- }
- }
-
- /*
- * make sure we start with a very predictable and LEGAL options['directory'] setting, so that the checks applied to the
- * (possibly) user specified value for this bugger acvtually can check out okay AS LONG AS IT'S INSIDE the DocumentRoot-based
- * directory tree:
- */
- $new_root = $this->options['directory'];
- $this->options['directory'] = '/'; // use DocumentRoot temporarily as THE root for this optional transform
- $this->options['directory'] = $this->rel2abs_url_path($new_root . '/');
+ // apply default to requestScript:
+ if (empty($this->options['requestScript']))
+ $this->options['requestScript'] = $this->getRequestURI();
- $this->managedBaseDir = $this->url_path2file_path($this->options['directory']);
+ $this->options['thumbnailPath'] = self::addTrailingSlash($this->options['thumbnailPath']);
- // now that the correct options['directory'] has been set up, go and check/clean the other paths in the options[]:
+ $this->baseUrl = $this->options['baseUrl'];
+
+ $this->documentRootPath = self::addTrailingSlash($assumed_root);
+
+ // Assets
+ $this->options['assetPath'] = self::addTrailingSlash($this->options['assetPath']);
+ $this->assetPath = self::addTrailingSlash(realpath($this->documentRootPath . $this->options['assetPath']));
+ $this->assetUrl = $this->baseUrl . trim($this->options['assetPath'], '/') .'/';
+
+ $this->managedBaseDir = $this->documentRootPath . trim($this->options['directory'], '/') .'/';
+ $this->managedBaseUrl = $this->baseUrl . trim($this->options['directory'], '/') .'/';
- $this->options['thumbnailPath'] = $this->rel2abs_url_path($this->options['thumbnailPath'] . '/');
- $this->thumbnailCacheDir = $this->url_path2file_path($this->options['thumbnailPath']); // precalculate this value; safe as we can assume the entire cache dirtree maps 1:1 to filesystem.
- $this->thumbnailCacheParentDir = $this->url_path2file_path(self::getParentDir($this->options['thumbnailPath'])); // precalculate this value as well; used by scandir/view
+ // By default for the moment
+ // This way of config allows to change easily the store folder of thumbs if wished
+ $this->thumbnailCacheDir = $this->documentRootPath . trim($this->options['thumbnailPath'], '/') .'/';
+ $this->thumbnailCacheUrl = $this->baseUrl . trim($this->options['thumbnailPath'], '/') .'/';
+ $this->thumbnailCacheParentDir = $this->documentRootPath . (self::getParentDir($this->options['thumbnailPath']));
- $this->options['assetBasePath'] = $this->rel2abs_url_path($this->options['assetBasePath'] . '/');
+ // Mimes types file
+ $mimeTypesFilePath = @realpath($this->options['mimeTypesFilePath']);
- $this->options['mimeTypesPath'] = @realpath($this->options['mimeTypesPath']);
- if (empty($this->options['mimeTypesPath']))
- {
+ if (empty($mimeTypesFilePath))
throw new FileManagerException('nofile');
- }
- $this->options['mimeTypesPath'] = strtr($this->options['mimeTypesPath'], '\\', '/');
+
+ $this->mimeTypesFilePath = strtr($mimeTypesFilePath, '\\', '/');
// getID3 is slower as it *copies* the image to the temp dir before processing: see GetDataImageSize().
// This is done as getID3 can also analyze *embedded* images, for which this approach is required.
$this->getid3 = new getID3();
$this->getid3->setOption(array('encoding' => 'UTF-8'));
- //$this->getid3->encoding = 'UTF-8';
-
$this->getid3_cache = new MTFMCache(MTFM_MIN_GETID3_CACHESIZE);
$this->icon_cache = array(array(), array());
+
}
-
+
+
/**
- * @return array the FileManager options and settings.
+ * Returns the FileManager options and settings.
+ * Used by MTFMCacheItem
+ *
+ * @return Array Array if settings
+ *
*/
public function getSettings()
{
return array_merge(array(
- 'basedir' => $this->url_path2file_path($this->options['directory']),
- 'thumbnailCacheDir' => $this->thumbnailCacheDir,
- 'thumbnailCacheParentDir' => $this->thumbnailCacheParentDir,
- 'managedBaseDir' => $this->managedBaseDir
+ 'thumbnailCacheUrl' => $this->thumbnailCacheUrl,
+ 'thumbnailCacheDir' => $this->thumbnailCacheDir,
+ 'thumbnailCacheParentDir' => $this->thumbnailCacheParentDir,
+ 'managedBaseDir' => $this->managedBaseDir,
+ 'chmod' => $this->options['chmod']
), $this->options);
}
-
-
/**
* Central entry point for any client side request.
*/
- public function fireEvent($event = null)
+ public function fireEvent($event = NULL)
{
- $event = (!empty($event) ? 'on' . ucfirst($event) : null);
+ $event = ( ! empty($event) ? 'on' . ucfirst($event) : NULL);
if (!$event || !method_exists($this, $event)) $event = 'onView';
$this->{$event}();
}
-
-
-
-
/**
* Generalized 'view' handler, which produces a directory listing.
*
* Return the directory listing in a nested array, suitable for JSON encoding.
*/
- protected function _onView($legal_url, $json, $mime_filter, $file_preselect_arg = null, $filemask = '*')
+ protected function _onView($legal_url, $json, $mime_filter, $file_preselect_arg = NULL, $filemask = '*')
{
$v_ex_code = 'nofile';
- $dir = $this->legal_url_path2file_path($legal_url);
- $doubledot = null;
- $coll = null;
+// $dir = $this->legal_url_path2file_path($legal_url);
+
+ $dir = $this->managedBaseDir . $legal_url;
+
+ $doubledot = NULL;
+ $coll = NULL;
+
if (is_dir($dir))
{
/*
@@ -1201,8 +762,8 @@ protected function _onView($legal_url, $json, $mime_filter, $file_preselect_arg
* Code: TODO
*/
- $coll = $this->scandir($dir, $filemask, false, 0, ($this->options['showHiddenFoldersAndFiles'] ? ~GLOB_NOHIDDEN : ~0));
- if ($coll !== false)
+ $coll = $this->scandir($dir, $filemask, FALSE, 0, ($this->options['showHiddenFoldersAndFiles'] ? ~GLOB_NOHIDDEN : ~0));
+ if ($coll !== FALSE)
{
/*
* To ensure '..' ends up at the very top of the view, no matter what the other entries in $coll['dirs'][] are made of,
@@ -1210,15 +771,15 @@ protected function _onView($legal_url, $json, $mime_filter, $file_preselect_arg
* let the sort run.
*/
$doubledot = array_pop($coll['dirs']);
- if ($doubledot !== null && $doubledot !== '..')
+ if ($doubledot !== NULL && $doubledot !== '..')
{
$coll['dirs'][] = $doubledot;
- $doubledot = null;
+ $doubledot = NULL;
}
natcasesort($coll['dirs']);
natcasesort($coll['files']);
- $v_ex_code = null;
+ $v_ex_code = NULL;
}
}
@@ -1235,12 +796,12 @@ protected function _onView($legal_url, $json, $mime_filter, $file_preselect_arg
'validation_failure' => $v_ex_code
);
- if (!empty($this->options['ViewIsAuthorized_cb']) && function_exists($this->options['ViewIsAuthorized_cb']) && !$this->options['ViewIsAuthorized_cb']($this, 'view', $fileinfo))
+ if ( ! empty($this->options['ViewIsAuthorized_cb']) && function_exists($this->options['ViewIsAuthorized_cb']) && !$this->options['ViewIsAuthorized_cb']($this, 'view', $fileinfo))
{
$v_ex_code = $fileinfo['validation_failure'];
if (empty($v_ex_code)) $v_ex_code = 'authorized';
}
- if (!empty($v_ex_code))
+ if ( ! empty($v_ex_code))
throw new FileManagerException($v_ex_code);
$legal_url = $fileinfo['legal_url'];
@@ -1255,9 +816,9 @@ protected function _onView($legal_url, $json, $mime_filter, $file_preselect_arg
$out = array(array(), array());
$mime = 'text/directory';
- $iconspec = false;
+ $iconspec = FALSE;
- if ($doubledot !== null)
+ if ($doubledot !== NULL)
{
$filename = '..';
@@ -1266,12 +827,17 @@ protected function _onView($legal_url, $json, $mime_filter, $file_preselect_arg
// must transform here so alias/etc. expansions inside legal_url_path2file_path() get a chance:
$file = $this->legal_url_path2file_path($l_url);
+/*
+$this->log->logInfo('$l_url : ' . $l_url);
+$this->log->logInfo('$file : ' . $file);
+*/
+
$iconspec = 'is.directory_up';
- $icon48 = $this->getIcon($iconspec, false);
+ $icon48 = $this->getIcon($iconspec, FALSE);
$icon48_e = FileManagerUtility::rawurlencode_path($icon48);
- $icon = $this->getIcon($iconspec, true);
+ $icon = $this->getIcon($iconspec, TRUE);
$icon_e = FileManagerUtility::rawurlencode_path($icon);
$out[1][] = array(
@@ -1286,10 +852,10 @@ protected function _onView($legal_url, $json, $mime_filter, $file_preselect_arg
// now precalc the directory-common items (a.k.a. invariant computation / common subexpression hoisting)
$iconspec_d = 'is.directory';
- $icon48_d = $this->getIcon($iconspec_d, false);
+ $icon48_d = $this->getIcon($iconspec_d, FALSE);
$icon48_de = FileManagerUtility::rawurlencode_path($icon48_d);
- $icon_d = $this->getIcon($iconspec_d, true);
+ $icon_d = $this->getIcon($iconspec_d, TRUE);
$icon_de = FileManagerUtility::rawurlencode_path($icon_d);
foreach ($coll['dirs'] as $filename)
@@ -1336,10 +902,10 @@ protected function _onView($legal_url, $json, $mime_filter, $file_preselect_arg
* For now, simply assign a basic icon to any and all; the 'detail' event will replace this item in the frontend
* when the time has arrives when that 'detail' request has been answered.
*/
- $icon48 = $this->getIcon($iconspec, false);
+ $icon48 = $this->getIcon($iconspec, FALSE);
$icon48_e = FileManagerUtility::rawurlencode_path($icon48);
- $icon = $this->getIcon($iconspec, true);
+ $icon = $this->getIcon($iconspec, TRUE);
$icon_e = FileManagerUtility::rawurlencode_path($icon);
$out[0][] = array(
@@ -1347,7 +913,7 @@ protected function _onView($legal_url, $json, $mime_filter, $file_preselect_arg
'name' => $filename,
'mime' => $mime,
// we don't know the thumbnail paths yet --> this will trigger deferred requests: (event=detail, mode=direct)
- 'thumbs_deferred' => true,
+ 'thumbs_deferred' => TRUE,
'icon48' => $icon48_e,
'icon' => $icon_e
);
@@ -1355,20 +921,20 @@ protected function _onView($legal_url, $json, $mime_filter, $file_preselect_arg
}
return array_merge((is_array($json) ? $json : array()), array(
- 'root' => substr($this->options['directory'], 1),
- 'this_dir' => array(
- 'path' => $legal_url,
- 'name' => basename($legal_url),
- 'date' => date($this->options['dateFormat'], @filemtime($dir)),
- 'mime' => 'text/directory',
- 'icon48' => $icon48_de,
- 'icon' => $icon_de
- ),
- 'preselect_index' => ($file_preselect_index >= 0 ? $file_preselect_index + count($out[1]) + 1 : 0),
- 'preselect_name' => ($file_preselect_index >= 0 ? $file_preselect_arg : null),
- 'dirs' => $out[1],
- 'files' => $out[0]
- ));
+ 'root' => substr($this->documentRootPath, 1),
+ 'this_dir' => array(
+ 'path' => $legal_url,
+ 'name' => basename($legal_url),
+ 'date' => date($this->options['dateFormat'], @filemtime($dir)),
+ 'mime' => 'text/directory',
+ 'icon48' => $icon48_de,
+ 'icon' => $icon_de
+ ),
+ 'preselect_index' => ($file_preselect_index >= 0 ? $file_preselect_index + count($out[1]) + 1 : 0),
+ 'preselect_name' => ($file_preselect_index >= 0 ? $file_preselect_arg : NULL),
+ 'dirs' => $out[1],
+ 'files' => $out[0]
+ ));
}
/**
@@ -1378,7 +944,7 @@ protected function _onView($legal_url, $json, $mime_filter, $file_preselect_arg
*
* Expected parameters:
*
- * $_POST['directory'] path relative to basedir a.k.a. options['directory'] root
+ * $_POST['directory'] path relative to basedir a.k.a. options['documentRootPath'] root
*
* $_POST['file_preselect'] optional filename or path:
* when a filename, this is the filename of a file in this directory
@@ -1400,9 +966,9 @@ protected function _onView($legal_url, $json, $mime_filter, $file_preselect_arg
* transforms them to LEGAL URI paths.
*
* When the specified path is illegal, i.e. does not reside inside the
- * options['directory']-rooted LEGAL URI subtree, it will be discarded
+ * options['documentRootPath']-rooted LEGAL URI subtree, it will be discarded
* entirely (as all file paths, whether they are absolute or relative,
- * must end up inside the options['directory']-rooted subtree to be
+ * must end up inside the options['documentRootPath']-rooted subtree to be
* considered manageable files) and the process will continue as if
* the $_POST['file_preselect'] entry had not been set.
*
@@ -1427,14 +993,11 @@ protected function onView()
{
// try to produce the view; if it b0rks, retry with the parent, until we've arrived at the basedir:
// then we fail more severely.
-
- $emsg = null;
- $jserr = array(
- 'status' => 1
- );
+ $emsg = NULL;
+ $jserr = array('status' => 1);
$mime_filter = $this->getPOSTparam('filter', $this->options['filter']);
- $legal_url = null;
+ $legal_url = NULL;
try
{
@@ -1444,10 +1007,10 @@ protected function onView()
$file_preselect_arg = $this->getPOSTparam('file_preselect');
try
{
- if (!empty($file_preselect_arg))
+ if ( ! empty($file_preselect_arg))
{
// check if this a path instead of just a basename, then convert to legal_url and split across filename and directory.
- if (strpos($file_preselect_arg, '/') !== false)
+ if (strpos($file_preselect_arg, '/') !== FALSE)
{
// this will also convert a relative path to an absolute path before transforming it to a LEGAL URI path:
$legal_presel = $this->abs2legal_url_path($file_preselect_arg);
@@ -1456,7 +1019,7 @@ protected function onView()
$file_preselect_arg = $prseli['basename'];
// override the directory!
$legal_url = $prseli['dirname'];
- $legal_url = self::enforceTrailingSlash($legal_url);
+ $legal_url = self::addTrailingSlash($legal_url);
}
else
{
@@ -1467,63 +1030,63 @@ protected function onView()
catch(FileManagerException $e)
{
// discard the preselect input entirely:
- $file_preselect_arg = null;
+ $file_preselect_arg = NULL;
}
}
catch(FileManagerException $e)
{
$emsg = $e->getMessage();
$legal_url = '/';
- $file_preselect_arg = null;
+ $file_preselect_arg = NULL;
}
catch(Exception $e)
{
// catching other severe failures; since this can be anything it may not be a translation keyword in the message...
$emsg = $e->getMessage();
$legal_url = '/';
- $file_preselect_arg = null;
+ $file_preselect_arg = NULL;
}
// loop until we drop below the bottomdir; meanwhile getDir() above guarantees that $dir is a subdir of bottomdir, hence dir >= bottomdir.
$original_legal_url = $legal_url;
+
do
{
try
{
$rv = $this->_onView($legal_url, $jserr, $mime_filter, $file_preselect_arg);
-
- $this->sendHttpHeaders('Content-Type: application/json');
-
+// $this->sendHttpHeaders('Content-Type: application/json');
echo json_encode($rv);
return;
}
catch(FileManagerException $e)
{
- if ($emsg === null)
+ if ($emsg === NULL)
$emsg = $e->getMessage();
}
catch(Exception $e)
{
// catching other severe failures; since this can be anything it may not be a translation keyword in the message...
- if ($emsg === null)
+ if ($emsg === NULL)
$emsg = $e->getMessage();
}
// step down to the parent dir and retry:
$legal_url = self::getParentDir($legal_url);
- $file_preselect_arg = null;
+ $file_preselect_arg = NULL;
$jserr['status']++;
- } while ($legal_url !== false);
+ } while ($legal_url !== FALSE);
$this->modify_json4exception($jserr, $emsg, 'path = ' . $original_legal_url);
$this->sendHttpHeaders('Content-Type: application/json');
// when we fail here, it's pretty darn bad and nothing to it.
- // just push the error JSON as go.
+ // just push the error JSON and go.
echo json_encode($jserr);
+ die();
}
/**
@@ -1534,7 +1097,7 @@ protected function onView()
*
* Expected parameters:
*
- * $_POST['directory'] path relative to basedir a.k.a. options['directory'] root
+ * $_POST['directory'] path relative to basedir a.k.a. options['documentRootPath'] root
*
* $_POST['file'] filename (including extension, of course) of the file to
* be detailed.
@@ -1553,6 +1116,16 @@ protected function onView()
* will neglect to provide those, expecting the frontend to
* delay-load them through another 'event=detail / mode=direct'
* request later on.
+ * 'metaHTML': show the metadata as extra HTML content in
+ * the preview pane (you can also turn that off using CSS:
+ * div.filemanager div.filemanager-diag-dump
+ * {
+ * display: none;
+ * }
+ * 'metaJSON': deliver the extra getID3 metadata in JSON format
+ * in the json['metadata'] field.
+ *
+ * Modes can be mixed by adding a '+' between them.
*
* Errors will produce a JSON encoded error report, including at least two fields:
*
@@ -1562,94 +1135,84 @@ protected function onView()
*/
protected function onDetail()
{
- $emsg = null;
- $legal_url = null;
- $file_arg = null;
+ $emsg = NULL;
+ $legal_url = NULL;
+ $file_arg = NULL;
$jserr = array(
- 'status' => 1
- );
+ 'status' => 1
+ );
try
{
$v_ex_code = 'nofile';
$mode = $this->getPOSTparam('mode');
+ $mode = explode('+', $mode);
+ if (empty($mode)) $mode = array();
- $file_arg = $this->getPOSTparam('file');
-
- $dir_arg = $this->getPOSTparam('directory');
- $legal_url = $this->rel2abs_legal_url_path($dir_arg . '/');
-
- $mime_filter = $this->getPOSTparam('filter', $this->options['filter']);
+ $file_arg = $this->getPOSTparam('file');
+ $mime_filter = $this->getPOSTparam('filter', $this->options['filter']);
$mime_filters = $this->getAllowedMimeTypes($mime_filter);
- $filename = null;
- $file = null;
- $mime = null;
- $meta = null;
- if (!empty($file_arg))
+ $filename = NULL;
+ $file = NULL;
+ $mime = NULL;
+ $meta = NULL;
+
+ if ( ! empty($file_arg))
{
$filename = basename($file_arg);
- // must normalize the combo as the user CAN legitimally request filename == '.' (directory detail view) for this event!
- $path = $this->rel2abs_legal_url_path($legal_url . $filename);
- //echo " path = $path, ($legal_url . $filename);\n";
- $legal_url = $path;
- // must transform here so alias/etc. expansions inside legal_url_path2file_path() get a chance:
- $file = $this->legal_url_path2file_path($legal_url);
+
+ // relative to document root
+ $rel_path = $this->normalize($this->normalize($this->getPOSTparam('directory')) . '/'. $filename);
+
+ // absolute system file path
+ $file = $this->getAbsolutePath($rel_path);
if (is_readable($file))
{
if (is_file($file))
{
- $meta = $this->getFileInfo($file, $legal_url);
+ $meta = $this->getFileInfo($file, $rel_path);
$mime = $meta->getMimeType();
+
if (!$this->IsAllowedMimeType($mime, $mime_filters))
- {
$v_ex_code = 'extension';
- }
else
- {
- $v_ex_code = null;
- }
+ $v_ex_code = NULL;
}
else if (is_dir($file))
{
$mime = 'text/directory';
- $v_ex_code = null;
+ $v_ex_code = NULL;
}
}
}
$fileinfo = array(
- 'legal_url' => $legal_url,
- 'file' => $file,
- 'mode' => $mode,
- 'meta_data' => $meta,
- 'mime' => $mime,
- 'mime_filter' => $mime_filter,
- 'mime_filters' => $mime_filters,
- 'preliminary_json' => $jserr,
- 'validation_failure' => $v_ex_code
- );
+ 'legal_url' => $rel_path,
+ 'file' => $file,
+ 'mode' => $mode,
+ 'meta_data' => $meta,
+ 'mime' => $mime,
+ 'mime_filter' => $mime_filter,
+ 'mime_filters' => $mime_filters,
+ 'preliminary_json' => $jserr,
+ 'validation_failure' => $v_ex_code
+ );
- if (!empty($this->options['DetailIsAuthorized_cb']) && function_exists($this->options['DetailIsAuthorized_cb']) && !$this->options['DetailIsAuthorized_cb']($this, 'detail', $fileinfo))
+ if ( ! empty($this->options['DetailIsAuthorized_cb']) && function_exists($this->options['DetailIsAuthorized_cb']) && !$this->options['DetailIsAuthorized_cb']($this, 'detail', $fileinfo))
{
+
$v_ex_code = $fileinfo['validation_failure'];
if (empty($v_ex_code)) $v_ex_code = 'authorized';
}
- if (!empty($v_ex_code))
+ if ( ! empty($v_ex_code))
+ {
throw new FileManagerException($v_ex_code);
+ }
- $legal_url = $fileinfo['legal_url'];
- //$file = $fileinfo['file'];
- $mode = $fileinfo['mode'];
- $meta = $fileinfo['meta_data'];
- //$mime = $fileinfo['mime'];
- $mime_filter = $fileinfo['mime_filter'];
- $mime_filters = $fileinfo['mime_filters'];
- $jserr = $fileinfo['preliminary_json'];
-
- $jserr = $this->extractDetailInfo($jserr, $legal_url, $meta, $mime_filter, $mime_filters, $mode);
+ $jserr = $this->extractDetailInfo($jserr, $rel_path, $meta, $mime_filter, $mime_filters, $mode);
$this->sendHttpHeaders('Content-Type: application/json');
@@ -1668,31 +1231,31 @@ protected function onDetail()
$this->modify_json4exception($jserr, $emsg, 'file = ' . $file_arg . ', path = ' . $legal_url);
- $icon48 = $this->getIconForError($emsg, 'is.default-error', false);
+ $icon48 = $this->getIconForError($emsg, 'is.default-error', FALSE);
$icon48_e = FileManagerUtility::rawurlencode_path($icon48);
- $icon = $this->getIconForError($emsg, 'is.default-error', true);
+ $icon = $this->getIconForError($emsg, 'is.default-error', TRUE);
$icon_e = FileManagerUtility::rawurlencode_path($icon);
- $jserr['thumb250'] = $icon48_e;
- $jserr['thumb48'] = $icon48_e;
+ $jserr['thumb250'] = NULL;
+ $jserr['thumb48'] = NULL;
$jserr['icon48'] = $icon48_e;
$jserr['icon'] = $icon_e;
$postdiag_err_HTML = '
';
}
@@ -2904,7 +2487,7 @@ public function extractDetailInfo($json_in, $legal_url, &$meta, $mime_filter, $m
// are we delaying the thumbnail generation? When yes, then we need to infer the thumbnail dimensions *anyway*!
if (empty($thumb48) && $thumbnails_done_or_deferred)
{
- $dims = $this->predictThumbDimensions($width, $height, 48, 48);
+ $dims = $this->predictThumbDimensions($width, $height, $this->options['thumbSmallSize'], $this->options['thumbSmallSize']);
$json['thumb48_width'] = $dims['width'];
$json['thumb48_height'] = $dims['height'];
@@ -2916,10 +2499,10 @@ public function extractDetailInfo($json_in, $legal_url, &$meta, $mime_filter, $m
// to show the loader.gif in the preview tag, we MUST set a width+height there, so we guestimate the thumbnail250 size as accurately as possible
//
// derive size from original:
- $dims = $this->predictThumbDimensions($width, $height, 250, 250);
+ $dims = $this->predictThumbDimensions($width, $height, $this->options['thumbBigSize'], $this->options['thumbBigSize']);
$preview_HTML = '
-
+ ';
$json['thumb250_width'] = $dims['width'];
@@ -2935,14 +2518,14 @@ public function extractDetailInfo($json_in, $legal_url, &$meta, $mime_filter, $m
}
// else: defer the $preview_HTML production until we're at the end of this and have fetched the actual thumbnail dimensions
- if (!empty($emsg))
+ if ( ! empty($emsg))
{
// use the abilities of modify_json4exception() to munge/format the exception message:
$jsa = array('error' => '');
$this->modify_json4exception($jsa, $emsg, 'path = ' . $url);
$postdiag_err_HTML .= "\n" . '
';
}
$json['content'] = self::compressHTML($content);
+ $json['metadata'] = ($metaJSON_mode ? $fi4dump : NULL);
return array_merge((is_array($json_in) ? $json_in : array()), $json);
}
@@ -3358,7 +2964,7 @@ public function extractDetailInfo($json_in, $legal_url, &$meta, $mime_filter, $m
*/
public /* static */ function getID3infoItem($getid3_info_obj, $default_value /* , ... */ )
{
- $rv = false;
+ $rv = FALSE;
$argc = func_num_args();
for ($i = 2; $i < $argc; $i++)
@@ -3408,18 +3014,18 @@ protected function extract_ID3info_embedded_image(&$arr)
else if (is_array($value))
{
$rv = $this->extract_ID3info_embedded_image($value);
- if ($rv !== false)
+ if ($rv !== FALSE)
return $rv;
}
}
}
- return false;
+ return FALSE;
}
protected function fold_quicktime_subatoms(&$arr, &$inject, $key_prefix)
{
- $satms = false;
- if (!empty($arr['subatoms']) && is_array($arr['subatoms']) && !empty($arr['hierarchy']) && !empty($arr['name']) && $arr['hierarchy'] == $arr['name'])
+ $satms = FALSE;
+ if ( ! empty($arr['subatoms']) && is_array($arr['subatoms']) && !empty($arr['hierarchy']) && !empty($arr['name']) && $arr['hierarchy'] == $arr['name'])
{
// fold these up all the way to the root:
$key_prefix .= '.' . $arr['hierarchy'];
@@ -3437,7 +3043,7 @@ protected function fold_quicktime_subatoms(&$arr, &$inject, $key_prefix)
}
}
- if ($satms !== false)
+ if ($satms !== FALSE)
{
$this->fold_quicktime_subatoms($inject[$key_prefix], $inject, $key_prefix);
}
@@ -3561,10 +3167,10 @@ protected function clean_ID3info_results_r(&$arr, $flags)
unset($newarr);
}
- $activity = true;
+ $activity = TRUE;
while ($activity)
{
- $activity = false; // assume there's nothing to do anymore. Prove us wrong now...
+ $activity = FALSE; // assume there's nothing to do anymore. Prove us wrong now...
// heuristic #2: when the number of items in the array which are themselves arrays is 80%, contract the set
$todo = array();
@@ -3622,7 +3228,7 @@ protected function clean_ID3info_results_r(&$arr, $flags)
}
}
$arr = $inject;
- $activity = true;
+ $activity = TRUE;
}
}
@@ -3676,7 +3282,7 @@ protected function clean_ID3info_results_r(&$arr, $flags)
$str = $this->mkSafeUTF8(trim(strtr(getid3_lib::iconv_fallback($arr['encoding'], 'UTF-8', $value), "\x00", ' ')));
$temp = unpack('H*', $value);
$temp = str_split($temp[1], 8);
- $value = new BinaryDataContainer(implode(' ', $temp) . (!empty($str) ? ' (' . $str . ')' : ''));
+ $value = new BinaryDataContainer(implode(' ', $temp) . ( ! empty($str) ? ' (' . $str . ')' : ''));
}
else if ( ($key === 'data' && is_string($value) && isset($arr['offset']) && isset($arr['size'])) // AVI offset/size/data items: data = binary
|| ($key === 'type_specific_data' && is_string($value) /* && isset($arr['type_specific_len']) */ ) // munch WMV/RM 'type specific data': binary ('type specific len' will occur alongside, but not in WMV)
@@ -3699,7 +3305,7 @@ protected function clean_ID3info_results_r(&$arr, $flags)
$temp = unpack('H*', $value);
$temp = str_split($temp[1], 8);
$temp = implode(' ', $temp);
- $value = new BinaryDataContainer($temp . (!empty($str) > 0 ? ' (' . $str . ')' : ''));
+ $value = new BinaryDataContainer($temp . ( ! empty($str) > 0 ? ' (' . $str . ')' : ''));
}
else
{
@@ -3717,12 +3323,12 @@ protected function clean_ID3info_results_r(&$arr, $flags)
else if (is_array($value))
{
// heuristic #3: when the value is an array of integers, implode them to a comma-separated list (string) instead:
- $is_all_ints = true;
+ $is_all_ints = TRUE;
for ($sk = count($value) - 1; $sk >= 0; --$sk)
{
if (!array_key_exists($sk, $value) || !is_int($value[$sk]))
{
- $is_all_ints = false;
+ $is_all_ints = FALSE;
break;
}
}
@@ -3755,7 +3361,7 @@ protected function clean_ID3info_results_r(&$arr, $flags)
// check if we can turn it into something UTF8-LEGAL; when not, we hexdump!
$im = str_replace('?', '&QMaRK;', $value);
$dst = $this->mkSafeUTF8($im);
- if (strpos($dst, '?') === false)
+ if (strpos($dst, '?') === FALSE)
{
// it's a UTF-8 legal string now!
$arr = str_replace('&QMaRK;', '?', $dst);
@@ -3786,15 +3392,15 @@ protected function clean_ID3info_results_r(&$arr, $flags)
}
else if (is_object($arr) && !isset($arr->id3_procsupport_obj))
{
- $arr = new BinaryDataContainer('(object) ' . $this->mkSafeUTF8(print_r($arr, true)));
+ $arr = new BinaryDataContainer('(object) ' . $this->mkSafeUTF8(print_r($arr, TRUE)));
}
else if (is_resource($arr))
{
- $arr = new BinaryDataContainer('(resource) ' . $this->mkSafeUTF8(print_r($arr, true)));
+ $arr = new BinaryDataContainer('(resource) ' . $this->mkSafeUTF8(print_r($arr, TRUE)));
}
else
{
- $arr = new BinaryDataContainer('(unidentified type: ' . gettype($arr) . ') ' . $this->mkSafeUTF8(print_r($arr, true)));
+ $arr = new BinaryDataContainer('(unidentified type: ' . gettype($arr) . ') ' . $this->mkSafeUTF8(print_r($arr, TRUE)));
}
}
@@ -3834,17 +3440,17 @@ protected function clean_ID3info_results(&$arr, $flags = 0)
*/
protected function unlink($legal_url, $mime_filters)
{
- $rv = true;
+ $rv = TRUE;
// must transform here so alias/etc. expansions inside legal_url_path2file_path() get a chance:
$file = $this->legal_url_path2file_path($legal_url);
if (is_dir($file))
{
- $dir = self::enforceTrailingSlash($file);
- $url = self::enforceTrailingSlash($legal_url);
- $coll = $this->scandir($dir, '*', false, 0, ~GLOB_NOHIDDEN);
- if ($coll !== false)
+ $dir = self::addTrailingSlash($file);
+ $url = self::addTrailingSlash($legal_url);
+ $coll = $this->scandir($dir, '*', FALSE, 0, ~GLOB_NOHIDDEN);
+ if ($coll !== FALSE)
{
foreach ($coll['dirs'] as $f)
{
@@ -3860,7 +3466,7 @@ protected function unlink($legal_url, $mime_filters)
}
else
{
- $rv = false;
+ $rv = FALSE;
}
$rv &= @rmdir($file);
@@ -3871,14 +3477,14 @@ protected function unlink($legal_url, $mime_filters)
{
$mime = $this->getMimeFromExt($file); // take the fast track to mime type sniffing; we'll live with the (rather low) risk of being inacurate due to accidental/intentional misnaming of the files
if (!$this->IsAllowedMimeType($mime, $mime_filters))
- return false;
+ return FALSE;
}
- $meta = &$this->getid3_cache->pick($legal_url, $this, false);
- assert($meta != null);
+ $meta = &$this->getid3_cache->pick($legal_url, $this, FALSE);
+ assert($meta != NULL);
$rv &= @unlink($file);
- $rv &= $meta->delete(true);
+ $rv &= $meta->delete(TRUE);
unset($meta);
}
@@ -3900,14 +3506,14 @@ protected function unlink($legal_url, $mime_filters)
public function scandir($dir, $filemask, $see_thumbnail_dir, $glob_flags_or, $glob_flags_and)
{
// list files, except the thumbnail folder itself or any file in it:
- $dir = self::enforceTrailingSlash($dir);
+ $dir = self::addTrailingSlash($dir);
- $just_below_thumbnail_dir = false;
+ $just_below_thumbnail_dir = FALSE;
if (!$see_thumbnail_dir)
{
$tnpath = $this->thumbnailCacheDir;
if (FileManagerUtility::startswith($dir, $tnpath))
- return false;
+ return FALSE;
$tnparent = $this->thumbnailCacheParentDir;
$just_below_thumbnail_dir = ($dir == $tnparent);
@@ -3922,7 +3528,7 @@ public function scandir($dir, $filemask, $see_thumbnail_dir, $glob_flags_or, $gl
$flags |= $glob_flags_or;
$coll = safe_glob($dir . $filemask, $flags);
- if ($coll !== false)
+ if ($coll !== FALSE)
{
if ($just_below_thumbnail_dir)
{
@@ -3955,7 +3561,7 @@ public function getSafeExtension($extension, $safe_extension = 'txt', $mandatory
if (!is_string($extension) || $extension === '') // can't use 'empty($extension)' as "0" is a valid extension itself.
{
//enforce a mandatory extension, even when there isn't one (due to filtering or original input producing none)
- return (!empty($mandatory_extension) ? $mandatory_extension : (!empty($safe_extension) ? $safe_extension : $extension));
+ return ( ! empty($mandatory_extension) ? $mandatory_extension : ( ! empty($safe_extension) ? $safe_extension : $extension));
}
$extension = strtolower($extension);
switch ($extension)
@@ -3972,7 +3578,7 @@ public function getSafeExtension($extension, $safe_extension = 'txt', $mandatory
case 'php4':
case 'php5':
case 'phps':
- return (!empty($safe_extension) ? $safe_extension : $extension);
+ return ( ! empty($safe_extension) ? $safe_extension : $extension);
default:
return $extension;
@@ -3988,10 +3594,10 @@ public function IsHiddenNameAllowed($file)
{
if ($file !== '.' && $file !== '..' && $file[0] === '.')
{
- return false;
+ return FALSE;
}
}
- return true;
+ return TRUE;
}
public function IsHiddenPathAllowed($path)
@@ -4004,11 +3610,11 @@ public function IsHiddenPathAllowed($path)
{
if (!$this->IsHiddenNameAllowed($file))
{
- return false;
+ return FALSE;
}
}
}
- return true;
+ return TRUE;
}
@@ -4020,7 +3626,7 @@ public function IsHiddenPathAllowed($path)
* directory. The directory part of the returned value equals $dir.
*
* Return NULL when $file is empty or when the specified directory does not reside within the
- * directory tree rooted by options['directory']
+ * directory tree rooted by options['documentRootPath']
*
* Note that the given filename will be converted to a legal filename, containing a filesystem-legal
* subset of ASCII characters only, before being used and returned by this function.
@@ -4033,7 +3639,7 @@ public function IsHiddenPathAllowed($path)
*/
public function getUniqueName($fileinfo, $dir)
{
- $dir = self::enforceTrailingSlash($dir);
+ $dir = self::addTrailingSlash($dir);
if (is_string($fileinfo))
{
@@ -4042,7 +3648,7 @@ public function getUniqueName($fileinfo, $dir)
if (!is_array($fileinfo))
{
- return null;
+ return NULL;
}
$dotfile = (strlen($fileinfo['filename']) == 0);
@@ -4054,13 +3660,13 @@ public function getUniqueName($fileinfo, $dir)
* This is faster than using a dirscan to collect a set of existing filenames and feeding them as
* an option array to pagetitle(), particularly for large directories.
*/
- $filename = FileManagerUtility::pagetitle($fileinfo['filename'], null, '-_., []()~!@+' /* . '#&' */, '-_,~@+#&');
+ $filename = FileManagerUtility::pagetitle($fileinfo['filename'], NULL, '-_., []()~!@+' /* . '#&' */, '-_,~@+#&');
if (!$filename && !$dotfile)
- return null;
+ return NULL;
// also clean up the extension: only allow alphanumerics in there!
- $ext = FileManagerUtility::pagetitle(isset($fileinfo['extension']) ? $fileinfo['extension'] : null);
- $ext = (strlen($ext) > 0 ? '.' . $ext : null);
+ $ext = FileManagerUtility::pagetitle(isset($fileinfo['extension']) ? $fileinfo['extension'] : NULL);
+ $ext = (strlen($ext) > 0 ? '.' . $ext : NULL);
// make sure the generated filename is SAFE:
$fname = $filename . $ext;
$file = $dir . $fname;
@@ -4113,7 +3719,7 @@ public function getUniqueName($fileinfo, $dir)
*
* Note: exists as a method in this class, so you can override it when you override getThumb().
*/
- public function predictThumbDimensions($orig_x, $orig_y, $max_x = null, $max_y = null, $ratio = true, $resizeWhenSmaller = false)
+ public function predictThumbDimensions($orig_x, $orig_y, $max_x = NULL, $max_y = NULL, $ratio = TRUE, $resizeWhenSmaller = FALSE)
{
return Image::calculate_resize_dimensions($orig_x, $orig_y, $max_x, $max_y, $ratio, $resizeWhenSmaller);
}
@@ -4142,14 +3748,24 @@ public function getIcon($file, $smallIcon)
}
$largeDir = (!$smallIcon ? 'Large/' : '');
- $url_path = $this->options['assetBasePath'] . 'Images/Icons/' . $largeDir . $ext . '.png';
- $path = (is_file($this->url_path2file_path($url_path)))
- ? $url_path
- : $this->options['assetBasePath'] . 'Images/Icons/' . $largeDir . 'default.png';
- $this->icon_cache[!$smallIcon][$ext] = $path;
+ $icon_path = $this->assetPath . 'Images/Icons/' . $largeDir . $ext . '.png';
+ $icon_url = $this->options['assetPath'] . 'Images/Icons/' . $largeDir . $ext . '.png';
- return $path;
+
+ $url = (is_file($icon_path))
+ ? $icon_url
+ : $this->options['assetPath'] . 'Images/Icons/' . $largeDir . 'default.png';
+
+/*
+ $this->log->logInfo('$icon_path : ' . $icon_path);
+ $this->log->logInfo('ICON url : ' . $url);
+*/
+
+
+ $this->icon_cache[!$smallIcon][$ext] = $url;
+
+ return $url;
}
/**
@@ -4171,26 +3787,28 @@ public function getIcon($file, $smallIcon)
* @param integer $height the maximum number of pixels for height of the
* thumbnail.
*/
- public function getThumb($meta, $path, $width, $height, $onlyIfExistsInCache = false)
+ public function getThumb($meta, $path, $width, $height, $onlyIfExistsInCache = FALSE)
{
+ // @notice : Correct
$thumbPath = $meta->getThumbPath($width . 'x' . $height);
- if (!is_file($thumbPath))
+
+ if ( ! is_file($thumbPath))
{
if ($onlyIfExistsInCache)
- return false;
+ return FALSE;
// make sure the cache subdirectory exists where we are going to store the thumbnail:
$meta->mkCacheDir();
$img = new Image($path);
+
// generally save as lossy / lower-Q jpeg to reduce filesize, unless orig is PNG/GIF, higher quality for smaller thumbnails:
- $img->resize($width, $height)->save($thumbPath, min(98, max(MTFM_THUMBNAIL_JPEG_QUALITY, MTFM_THUMBNAIL_JPEG_QUALITY + 0.15 * (250 - min($width, $height)))), true);
+ $img->resize($width, $height)->save($thumbPath, min(98, max(MTFM_THUMBNAIL_JPEG_QUALITY, MTFM_THUMBNAIL_JPEG_QUALITY + 0.15 * (250 - min($width, $height)))), TRUE);
if (DEVELOPMENT)
{
$imginfo = $img->getMetaInfo();
$meta->store('img_info', $imginfo);
-
$meta->store('memory used', number_format(memory_get_peak_usage() / 1E6, 1) . ' MB');
$meta->store('memory estimated', number_format(@$imginfo['fileinfo']['usage_guestimate'] / 1E6, 1) . ' MB');
$meta->store('memory suggested', number_format(@$imginfo['fileinfo']['usage_min_advised'] / 1E6, 1) . ' MB');
@@ -4209,26 +3827,26 @@ public function getIconForError($emsg, $original_filename, $small_icon)
if (empty($emsg))
{
// just go and pick the extension-related icon for this one; nothing is wrong today, it seems.
- $thumb_path = (!empty($original_filename) ? $original_filename : 'is.default-missing');
+ $thumb_path = ( ! empty($original_filename) ? $original_filename : 'is.default-missing');
}
else
{
$thumb_path = 'is.default-error';
- if (strpos($emsg, 'img_will_not_fit') !== false)
+ if (strpos($emsg, 'img_will_not_fit') !== FALSE)
{
$thumb_path = 'is.oversized_img';
}
- else if (strpos($emsg, 'nofile') !== false)
+ else if (strpos($emsg, 'nofile') !== FALSE)
{
$thumb_path = 'is.default-missing';
}
- else if (strpos($emsg, 'unsupported_imgfmt') !== false)
+ else if (strpos($emsg, 'unsupported_imgfmt') !== FALSE)
{
// just go and pick the extension-related icon for this one; nothing seriously wrong here.
- $thumb_path = (!empty($original_filename) ? $original_filename : $thumb_path);
+ $thumb_path = ( ! empty($original_filename) ? $original_filename : $thumb_path);
}
- else if (strpos($emsg, 'image') !== false)
+ else if (strpos($emsg, 'image') !== FALSE)
{
$thumb_path = 'badly.broken_img';
}
@@ -4288,9 +3906,9 @@ public function mkSafeUTF8($str)
if (!mb_check_encoding($str, 'UTF-8') || $str !== mb_convert_encoding(mb_convert_encoding($str, 'UTF-32', 'UTF-8'), 'UTF-8', 'UTF-32'))
{
- $encoding = mb_detect_encoding($str, 'auto, ISO-8859-1', true);
+ $encoding = mb_detect_encoding($str, 'auto, ISO-8859-1', TRUE);
$im = str_replace('?', '&qmark;', $str);
- if ($encoding !== false)
+ if ($encoding !== FALSE)
{
$dst = mb_convert_encoding($im, 'UTF-8', $encoding);
}
@@ -4301,14 +3919,14 @@ public function mkSafeUTF8($str)
//$dst = utf8_encode($im);
//$dst = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-8', $im);
- if (!mb_check_encoding($dst, 'UTF-8') || $dst !== mb_convert_encoding(mb_convert_encoding($dst, 'UTF-32', 'UTF-8'), 'UTF-8', 'UTF-32') || strpos($dst, '?') !== false)
+ if (!mb_check_encoding($dst, 'UTF-8') || $dst !== mb_convert_encoding(mb_convert_encoding($dst, 'UTF-32', 'UTF-8'), 'UTF-8', 'UTF-32') || strpos($dst, '?') !== FALSE)
{
// not UTF8 yet... try them all
$encs = mb_list_encodings();
foreach ($encs as $encoding)
{
$dst = mb_convert_encoding($im, 'UTF-8', $encoding);
- if (mb_check_encoding($dst, 'UTF-8') && $dst === mb_convert_encoding(mb_convert_encoding($dst, 'UTF-32', 'UTF-8'), 'UTF-8', 'UTF-32') && strpos($dst, '?') === false)
+ if (mb_check_encoding($dst, 'UTF-8') && $dst === mb_convert_encoding(mb_convert_encoding($dst, 'UTF-32', 'UTF-8'), 'UTF-8', 'UTF-32') && strpos($dst, '?') === FALSE)
{
return str_replace('&qmark;', '?', $dst);
}
@@ -4348,16 +3966,16 @@ public static function getParentDir($path)
* so we'd rather not use dirname() :-(
*/
if (!is_string($path))
- return false;
+ return FALSE;
$path = rtrim($path, '/');
// empty directory or a path with only 1 character in it cannot be a parent+child: that would be 2 at the very least when it's '/a': parent is root '/' then:
if (strlen($path) <= 1)
- return false;
+ return FALSE;
$p2 = strrpos($path, '/' /* , -1 */ ); // -1 as extra offset is not good enough? Nope. At least not for my Win32 PHP 5.3.1. Yeah, sounds like a PHP bug to me. So we rtrim() now...
- if ($p2 === false)
+ if ($p2 === FALSE)
{
- return false; // tampering!
+ return FALSE; // tampering!
}
$prev = substr($path, 0, $p2 + 1);
return $prev;
@@ -4368,16 +3986,29 @@ public static function getParentDir($path)
* For example, if the request was 'http://site.org/dir1/dir2/script.php', then this method will
* return '/dir1/dir2/script.php'.
*
- * This is equivalent to $_SERVER['SCRIPT_NAME']
+ * By default, this is equivalent to $_SERVER['SCRIPT_NAME'].
+ *
+ * This default can be overridden by specifying the options['requestScript'] when invoking the constructor.
*/
- public /* static */ function getRequestScriptURI()
+
+ public function getRequestURI()
{
+ return strtr($_SERVER['SCRIPT_NAME'], '\\', '/');
+
+/*
+ if ( ! empty($this->options['requestScript']))
+ {
+ return $this->options['requestScript'];
+ }
+
// see also: http://php.about.com/od/learnphp/qt/_SERVER_PHP.htm
$path = strtr($_SERVER['SCRIPT_NAME'], '\\', '/');
return $path;
+*/
}
+
/**
* Return the URI absolute path to the directory pointed at by the current URI request.
* For example, if the request was 'http://site.org/dir1/dir2/script', then this method will
@@ -4385,11 +4016,12 @@ public static function getParentDir($path)
*
* Note that the path is returned WITH a trailing slash '/'.
*/
- public /* static */ function getRequestPath()
+ public function getRequestPath()
{
- // see also: http://php.about.com/od/learnphp/qt/_SERVER_PHP.htm
- $path = self::getParentDir($this->getRequestScriptURI());
- $path = self::enforceTrailingSlash($path);
+ $path = self::getParentDir($this->getRequestURI());
+ $path = self::addTrailingSlash($path);
+
+//echo('path : ' . $path);
return $path;
}
@@ -4402,10 +4034,14 @@ public static function getParentDir($path)
*
* Throw an exception when the operation failed to produce a legal path.
*/
- public /* static */ function normalize($path)
+ public function normalize($path)
{
+
$path = preg_replace('/(\\\|\/)+/', '/', $path);
+ $path = '/' . ltrim($path, '/');
+
+
/*
* fold '../' directory parts to prevent malicious paths such as 'a/../../../../../../../../../etc/'
* from succeeding
@@ -4427,7 +4063,7 @@ public static function getParentDir($path)
$path = '/' . $matches[2];
}
- while (($pos = strpos($path, '/..')) !== false)
+ while (($pos = strpos($path, '/..')) !== FALSE)
{
$prev = substr($path, 0, $pos);
/*
@@ -4440,7 +4076,7 @@ public static function getParentDir($path)
* so we'd rather not use dirname() :-(
*/
$p2 = strrpos($prev, '/');
- if ($p2 === false)
+ if ($p2 === FALSE)
{
throw new FileManagerException('path_tampering:' . $path);
}
@@ -4484,7 +4120,7 @@ public function rel2abs_url_path($path)
}
/**
- * Accept an absolute URI path, i.e. rooted against DocumentRoot, and transform it to a LEGAL URI absolute path, i.e. rooted against options['directory'].
+ * Accept an absolute URI path, i.e. rooted against DocumentRoot, and transform it to a LEGAL URI absolute path, i.e. rooted against options['documentRootPath'].
*
* Relative paths are assumed to be relative to the current request path, i.e. the getRequestPath() produced path.
*
@@ -4492,17 +4128,17 @@ public function rel2abs_url_path($path)
*
* Returns a fully normalized LEGAL URI path.
*
- * Throws a FileManagerException when the given path cannot be converted to a LEGAL URL, i.e. when it resides outside the options['directory'] subtree.
+ * Throws a FileManagerException when the given path cannot be converted to a LEGAL URL, i.e. when it resides outside the options['documentRootPath'] subtree.
*/
public function abs2legal_url_path($path)
{
- $root = $this->options['directory'];
+ $root = $this->documentRootPath;
$path = $this->rel2abs_url_path($path);
- // but we MUST make sure the path is still a LEGAL URI, i.e. sitting inside options['directory']:
+ // but we MUST make sure the path is still a LEGAL URI, i.e. sitting inside options['documentRootPath']:
if (strlen($path) < strlen($root))
- $path = self::enforceTrailingSlash($path);
+ $path = self::addTrailingSlash($path);
if (!FileManagerUtility::startsWith($path, $root))
{
@@ -4515,9 +4151,12 @@ public function abs2legal_url_path($path)
}
/**
- * Accept a URI relative or absolute LEGAL URI path and transform it to an absolute URI path, i.e. rooted against DocumentRoot.
+ * Accept a relative or absolute LEGAL URI path and transform it to an absolute URI path, i.e. rooted against DocumentRoot.
*
- * Relative paths are assumed to be relative to the current request path, i.e. the getRequestPath() produced path.
+ * Relative paths are assumed to be relative to the options['documentRootPath'] directory. This makes them equivalent to absolute paths within
+ * the LEGAL URI tree and this fact may seem odd. Alas, the FM frontend sends requests without the leading slash and it's those that
+ * we wish to resolve here, after all. So, yes, this deviates from the general principle applied elesewhere in the code. :-(
+ * Nevertheless, it's easier than scanning and tweaking the FM frontend everywhere.
*
* Note: as it uses normalize(), any illegal path will throw a FileManagerException
*
@@ -4525,32 +4164,20 @@ public function abs2legal_url_path($path)
*/
public function legal2abs_url_path($path)
{
- $root = $this->options['directory'];
-
- $path = strtr($path, '\\', '/');
- if (FileManagerUtility::startsWith($path, '/'))
- {
- // clip the trailing '/' off the $root path as $path has a leading '/' already:
- $path = substr($root, 0, -1) . $path;
- }
+ $path = $this->rel2abs_legal_url_path($path);
- $path = $this->rel2abs_url_path($path);
+ $root = $this->documentRootPath;
- // but we MUST make sure the path is still a LEGAL URI, i.e. sutting inside options['directory']:
- if (strlen($path) < strlen($root))
- $path = self::enforceTrailingSlash($path);
+ // clip the trailing '/' off the $root path as $path has a leading '/' already:
+ $path = substr($root, 0, -1) . $path;
- if (!FileManagerUtility::startsWith($path, $root))
- {
- throw new FileManagerException('path_tampering:' . $path);
- }
return $path;
}
/**
- * Accept a URI relative or absolute LEGAL URI path and transform it to an absolute LEGAL URI path, i.e. rooted against options['directory'].
+ * Accept a relative or absolute LEGAL URI path and transform it to an absolute LEGAL URI path, i.e. rooted against options['documentRootPath'].
*
- * Relative paths are assumed to be relative to the options['directory'] directory. This makes them equivalent to absolute paths within
+ * Relative paths are assumed to be relative to the options['documentRootPath'] directory. This makes them equivalent to absolute paths within
* the LEGAL URI tree and this fact may seem odd. Alas, the FM frontend sends requests without the leading slash and it's those that
* we wish to resolve here, after all. So, yes, this deviates from the general principle applied elesewhere in the code. :-(
* Nevertheless, it's easier than scanning and tweaking the FM frontend everywhere.
@@ -4561,25 +4188,11 @@ public function legal2abs_url_path($path)
*/
public function rel2abs_legal_url_path($path)
{
- if (0) // TODO: remove the 'relative is based on options['directory']' hack when the frontend has been fixed...
- {
- $path = $this->legal2abs_url_path($path);
-
- $root = $this->options['directory'];
-
- // clip the trailing '/' off the $root path before reduction:
- $path = str_replace(substr($root, 0, -1), '', $path);
- }
- else
- {
- $path = strtr($path, '\\', '/');
- if (!FileManagerUtility::startsWith($path, '/'))
- {
- $path = '/' . $path;
- }
+ $path = strtr($path, '\\', '/');
+
+ $path = '/' . ltrim($path, '/');
- $path = $this->normalize($path);
- }
+ $path = $this->normalize($path);
return $path;
}
@@ -4594,14 +4207,15 @@ public function rel2abs_legal_url_path($path)
public function url_path2file_path($url_path)
{
$url_path = $this->rel2abs_url_path($url_path);
+//log_message('error', 'url_path2file_path :' . $url_path);
+//log_message('error', 'FileSystemPath4SiteDocumentRoot :' . $this->options['FileSystemPath4SiteDocumentRoot']);
+ $path = $this->documentRootPath . $url_path;
- $path = $this->options['documentRootPath'] . $url_path;
- //$path = $this->normalize($path); -- taken care of by rel2abs_url_path already
return $path;
}
/**
- * Return the filesystem absolute path for the relative URI path or absolute LEGAL URI path.
+ * Return the filesystem absolute path for the relative or absolute LEGAL URI path.
*
* Note: as it uses normalize(), any illegal path will throw an FileManagerException
*
@@ -4616,12 +4230,24 @@ public function legal_url_path2file_path($url_path)
return $path;
}
- public static function enforceTrailingSlash($string)
+ public static function addTrailingSlash($string)
{
- return (strrpos($string, '/') === strlen($string) - 1 ? $string : $string . '/');
+ return rtrim($string, '/') . '/';
}
+
+
+ public function getAbsolutePath($path)
+ {
+ $path = $this->normalize($path);
+ return rtrim($this->managedBaseDir, '/') . $path;
+ }
+ public function getAbsoluteUrl($path)
+ {
+ $path = $this->normalize($path);
+ return rtrim($this->managedBaseUrl, '/') . $path;
+ }
@@ -4638,7 +4264,7 @@ public static function compressHTML($str)
}
- protected /* static */ function modify_json4exception(&$jserr, $emsg, $target_info = null)
+ protected /* static */ function modify_json4exception(&$jserr, $emsg, $target_info = NULL)
{
if (empty($emsg))
return;
@@ -4655,9 +4281,18 @@ public static function compressHTML($str)
}
else
{
- $extra1 = (!empty($e[1]) ? $this->mkSafe4Display($e[1]) : '');
- $extra2 = (!empty($target_info) ? ' (' . $this->mkSafe4Display($target_info) . ')' : '');
- $jserr['error'] = $emsg = '${backend.' . $e[0] . '}' . $extra1 . $extra2;
+ $extra1 = ( ! empty($e[1]) ? $this->mkSafe4Display($e[1]) : '');
+ $extra2 = ( ! empty($target_info) ? ' (' . $this->mkSafe4Display($target_info) . ')' : '');
+ $jserr['error'] = $emsg = '${backend.' . $e[0] . '}';
+ if ($e[0] != 'disabled')
+ {
+ // only append the extra data when it's NOT the 'disabled on this server' message!
+ $jserr['error'] .= $extra1 . $extra2;
+ }
+ else
+ {
+ $jserr['error'] .= ' (${' . $extra1 . '})';
+ }
}
$jserr['status'] = 0;
}
@@ -4668,15 +4303,15 @@ public static function compressHTML($str)
- public function getAllowedMimeTypes($mime_filter = null)
+ public function getAllowedMimeTypes($mime_filter = NULL)
{
$mimeTypes = array();
- if (empty($mime_filter)) return null;
+ if (empty($mime_filter)) return NULL;
$mset = explode(',', $mime_filter);
for($i = count($mset) - 1; $i >= 0; $i--)
{
- if (strpos($mset[$i], '/') === false)
+ if (strpos($mset[$i], '/') === FALSE)
$mset[$i] .= '/';
}
@@ -4705,7 +4340,7 @@ public function getMimeTypeDefinitions()
if (!$mimes)
{
- $mimes = parse_ini_file($this->options['mimeTypesPath']);
+ $mimes = parse_ini_file($this->mimeTypesFilePath);
if (is_array($mimes))
{
@@ -4713,8 +4348,8 @@ public function getMimeTypeDefinitions()
{
$m = explode(',', (string)$v);
$mimes[$k] = $m[0];
- $p = null;
- if (!empty($m[1]))
+ $p = NULL;
+ if ( ! empty($m[1]))
{
$p = trim($m[1]);
}
@@ -4730,7 +4365,7 @@ public function getMimeTypeDefinitions()
}
else
{
- $mimes = false;
+ $mimes = FALSE;
}
}
@@ -4742,9 +4377,9 @@ public function getMimeTypeDefinitions()
public function IsAllowedMimeType($mime_type, $mime_filters)
{
if (empty($mime_type))
- return false;
+ return FALSE;
if (!is_array($mime_filters))
- return true;
+ return TRUE;
return in_array($mime_type, $mime_filters);
}
@@ -4758,10 +4393,10 @@ public function getMimeFromExt($file)
{
$ext = strtolower(pathinfo($file, PATHINFO_EXTENSION));
- $mime = null;
+ $mime = NULL;
if (MTFM_USE_FINFO_OPEN)
{
- $ini = error_reporting(0);
+// $ini = error_reporting(0);
if (function_exists('finfo_open') && $f = finfo_open(FILEINFO_MIME, getenv('MAGIC')))
{
$mime = finfo_file($f, $file);
@@ -4770,7 +4405,7 @@ public function getMimeFromExt($file)
$mime = $ma[0];
finfo_close($f);
}
- error_reporting($ini);
+// error_reporting($ini);
}
if ((empty($mime) || $mime === 'application/octet-stream') && strlen($ext) > 0)
@@ -4802,13 +4437,13 @@ public function getExtFromMime($mime)
if (array_key_exists($mime, $mime2ext_arr))
return $mime2ext_arr[$mime];
- return null;
+ return NULL;
}
/**
* Returns (if possible) all info about the given file, mimetype, dimensions, the works
*
- * @param string $file physical filesystem path to the file we want to know all about
+ * @param string $file physical filesystem path to the file we want to get info
*
* @param string $legal_url
* 'legal URL path' to the file; used as the key to the corresponding
@@ -4818,19 +4453,19 @@ public function getExtFromMime($mime)
*
* @return the info array as produced by getID3::analyze(), as part of a MTFMCacheEntry reference
*/
- public function getFileInfo($file, $legal_url)
+ public function getFileInfo($file, $legal_url, $force_recheck = FALSE)
{
// when hash exists in cache, return that one:
$meta = &$this->getid3_cache->pick($legal_url, $this);
- assert($meta != null);
+ assert($meta != NULL);
$mime_check = $meta->fetch('mime_type');
- if (empty($mime_check))
+ if (empty($mime_check) || $force_recheck)
{
// cache entry is not yet filled: we'll have to do the hard work now and store it.
if (is_dir($file))
{
- $meta->store('mime_type', 'text/directory', false);
- $meta->store('analysis', null, false);
+ $meta->store('mime_type', 'text/directory', FALSE);
+ $meta->store('analysis', NULL, FALSE);
}
else
{
@@ -4857,7 +4492,7 @@ public function getFileInfo($file, $legal_url)
- protected /* static */ function getGETparam($name, $default_value = null)
+ protected function getGETparam($name, $default_value = NULL)
{
if (is_array($_GET) && !empty($_GET[$name]))
{
@@ -4872,7 +4507,7 @@ public function getFileInfo($file, $legal_url)
return $default_value;
}
- protected /* static */ function getPOSTparam($name, $default_value = null)
+ protected function getPOSTparam($name, $default_value = NULL)
{
if (is_array($_POST) && !empty($_POST[$name]))
{
@@ -4953,7 +4588,7 @@ public static function startsWith($string, $look)
*
* @return cleaned-up and uniquified name derived from ($data).
*/
- public static function pagetitle($data, $options = null, $extra_allowed_chars = null, $trim_chars = null)
+ public static function pagetitle($data, $options = NULL, $extra_allowed_chars = NULL, $trim_chars = NULL)
{
static $regex;
if (!$regex){
@@ -5011,12 +4646,31 @@ public static function isBinary($str)
{
$c = ord($str[$i]);
// do not accept ANY codes below SPACE, except TAB, CR and LF.
- if ($c == 255 || ($c < 32 /* SPACE */ && $c != 9 && $c != 10 && $c != 13)) return true;
+ if ($c == 255 || ($c < 32 /* SPACE */ && $c != 9 && $c != 10 && $c != 13)) return TRUE;
}
- return false;
+ return FALSE;
}
+
+ public static function cleanUrl($str, $replace=array(), $delimiter='-')
+ {
+ setlocale(LC_ALL, 'en_US.UTF8');
+
+ if( !empty($replace) ) {
+ $str = str_replace((array)$replace, ' ', $str);
+ }
+
+ $clean = iconv('UTF-8', 'ASCII//TRANSLIT', $str);
+ $clean = preg_replace("/[^a-zA-Z0-9\/_.|+ -]/", '', $clean);
+ $clean = strtolower(trim($clean, '-. '));
+ $clean = preg_replace("/[\/_|+ -]+/", $delimiter, $clean);
+ return $clean;
+ }
+
+
+
+
/**
* Apply rawurlencode() to each of the elements of the given path
*
@@ -5053,7 +4707,7 @@ public static function fmt_bytecount($val, $precision = 1)
*
* Attempts some 'intelligent' conversions for better readability and information compacting.
*/
- public static function table_var_dump(&$variable, $wrap_in_td = false, $show_types = false, $level = 0)
+ public static function table_var_dump(&$variable, $wrap_in_td = FALSE, $show_types = FALSE, $level = 0)
{
$returnstring = '';
if (is_array($variable))
@@ -5062,8 +4716,20 @@ public static function table_var_dump(&$variable, $wrap_in_td = false, $show_typ
$returnstring .= '
';
foreach ($variable as $key => &$value)
{
- $overlarge_key_class = (strlen($key) >= 20 ? 'overlarge' : ''); // this is a heuristic based on the current frontend CSS; this spares me a long walk over all the nodes using JS to measure and adjust those nodes which truly need it.
- $returnstring .= '
' . $key . '';
+ // Assign an extra class representing the (rounded) width in number of characters 'or more':
+ // You can use this as a width approximation in pixels to style (very) wide items. It saves
+ // a long run through all the nodes in JS, just to measure the actual width and correct any
+ // overlap occurring in there.
+ $keylen = strlen($key);
+ $threshold = 10;
+ $overlarge_key_class = '';
+ while ($keylen >= $threshold)
+ {
+ $overlarge_key_class .= ' overlarger' . sprintf('%04d', $threshold);
+ $threshold *= 1.6;
+ }
+
+ $returnstring .= '
'] = " ***\n";
- $rv = strtr($rv, $trans);
-
- $rv = html_entity_decode(strip_tags($rv), ENT_NOQUOTES, 'UTF-8');
- }
-
- if ($dump_options & DUMP2LOG_WRITE_TO_FILE)
- {
- $fname = strtr(dirname(__FILE__), '\\', '/') . '/' . $fname;
-
- if (@file_put_contents($fname, $rv) === false)
- {
- throw new Exception('b0rk at ' . $fname);
- }
- }
-
- if ($dump_options & DUMP2LOG_FORMAT_AS_HTML)
- {
- $rv = preg_replace('/^.*?(.+)<\/body>.*?$/sD', '\\1', $rv);
- }
-
- if ($dump_options & DUMP2LOG_WRITE_TO_STDOUT)
- {
- echo $rv;
- }
-
- return array('filename' => $fname, 'content' => $rv);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-/**
- * dumper useful in development
- */
-define('__MTFM_VARDUMP_DEFAULT_OPTIONS', (0
- | DUMP2LOG_SERVER_GLOBALS
- | DUMP2LOG_ENV_GLOBALS
- | DUMP2LOG_SESSION_GLOBALS
- | DUMP2LOG_POST_GLOBALS
- | DUMP2LOG_GET_GLOBALS
- | DUMP2LOG_REQUEST_GLOBALS
- | DUMP2LOG_FILES_GLOBALS
- | DUMP2LOG_COOKIE_GLOBALS
- //| DUMP2LOG_STACKTRACE
- | DUMP2LOG_SORT
- //| DUMP2LOG_FORMAT_AS_HTML
- | DUMP2LOG_WRITE_TO_FILE
- //| DUMP2LOG_WRITE_TO_STDOUT
- ));
-function FM_vardumper($mgr = null, $action = null, $info = null, $extra = null, $dump_options = __MTFM_VARDUMP_DEFAULT_OPTIONS)
-{
- if (DEVELOPMENT)
- {
- if ($mgr)
- $settings = $mgr->getSettings();
- else
- $settings = null;
-
- //$mimetdefs = $mgr->getMimeTypeDefinitions();
-
- // log request data:
- $data = array(
- "FileManager::action" => $action,
- "FileManager::info" => $info,
- "FileManager::settings" => $settings
- );
- if (!empty($extra))
- {
- $data['extra'] = $extra;
- }
-
- dump_request_to_logfile($data, $dump_options, array(
- 'origin-section' => basename($_SERVER['REQUEST_URI']) . '-' . $action
- ));
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-/**
- * Just a simple wrapper around the FileManager class constructor. Assumes a series of option defaults for the Demos,
- * which you may override by providing your own in $options.
- *
- * Returns an instantiated FileManager instance, which you can use to process the incoming request.
- */
-function mkNewFileManager($options = null)
-{
- $Aliases = array();
-
- if (SITE_USES_ALIASES)
- {
- //
- // http://httpd.apache.org/docs/2.2/mod/mod_alias.html -- we emulate the Alias statement. Sort of.
- //
- // In principle each entry in this array should copy a Alias/VhostAlias/... web server configuration line.
- //
- // When filesystem paths are 'real time constructed', e.g. through complex regex manipulations, you will need
- // to derive your own class from FileManagerWithAliasSupport or FileManager and implement/override
- // the offending member functions in there, using the FileManagerWithAliasSupport implementation as a guide.
- //
- // NOTE that the above caveat applies to very complex rigs only, e.g. where a single URL points at different
- // physical locations, depending on who's logged in, or where the request is originating from.
- //
- // As long as you can construct a static URI path to disk mapping, you are good to go using the Aliases[]
- // array below!
- //
- $Aliases = array(
- '/c/lib/includes/js/mootools-filemanager/Demos/Files/alias' => "D:/xxx",
- '/c/lib/includes/js/mootools-filemanager/Demos/Files/d' => "D:/xxx.tobesorted",
- '/c/lib/includes/js/mootools-filemanager/Demos/Files/u' => "D:/websites-uploadarea",
-
- '/c/lib/includes/js/mootools-filemanager/Demos/Files' => "D:/experiment"
- );
- }
-
- $options = array_merge(array(
- //'directory' => $fm_basedir . 'Files/', // absolute paths: as the relative ones, they sit in URI space, i.e. assume DocumentRoot is root '/'
-
- 'directory' => 'Files/', // relative paths: are relative to the URI request script path, i.e. dirname(__FILE__) or rather: $_SERVER['SCRIPT_NAME']
- 'thumbnailPath' => 'Files/Thumbnails/',
- 'assetBasePath' => '../Assets',
- 'chmod' => 0777,
- //'maxUploadSize' => 1024 * 1024 * 5,
- //'upload' => false,
- //'destroy' => false,
- //'create' => false,
- //'move' => false,
- //'download' => false,
- //'filter' => 'image/',
- 'allowExtChange' => true, // allow file name extensions to be changed; the default however is: NO (FALSE)
- 'UploadIsAuthorized_cb' => 'FM_IsAuthorized',
- 'DownloadIsAuthorized_cb' => 'FM_IsAuthorized',
- 'CreateIsAuthorized_cb' => 'FM_IsAuthorized',
- 'DestroyIsAuthorized_cb' => 'FM_IsAuthorized',
- 'MoveIsAuthorized_cb' => 'FM_IsAuthorized',
- 'ViewIsAuthorized_cb' => 'FM_IsAuthorized',
- 'DetailIsAuthorized_cb' => 'FM_IsAuthorized',
- 'ThumbnailIsAuthorized_cb' => 'FM_IsAuthorized',
-
- // FileManagerWithAliasSupport-specific options:
- 'Aliases' => $Aliases,
- 'RequestScriptURI' => strtr($_SERVER['SCRIPT_NAME'], '\\', '/') // or whatever URL you fancy. As long as the run-time ends up invoking the $browser class instantiated below on each request
- ), (is_array($options) ? $options : array()));
-
- if (SITE_USES_ALIASES)
- {
- $browser = new FileManagerWithAliasSupport($options);
- }
- else
- {
- $browser = new FileManager($options);
- }
- return $browser;
-}
-
-
-
-
-
-
-
-
-
-
-/**
-Start the session, whether the session ID is passed through the URL query section or as a cookie.
-*/
-function session_start_ex($override = false)
-{
- /*
- * Load session if not already done by CCMS!
- */
- if (empty($_SESSION))
- {
- $sesid = session_id();
- $sesname = session_name();
- // the SWF.Upload / FancyUpload FLASH components do pass along the cookies, but as extra URL query entities:
- if (!empty($_POST[$sesname]))
- {
- // legalize the sessionID; just a precaution for malicious intent
- $alt_sesid = preg_replace('/[^A-Za-z0-9]/', 'X', $_POST[$sesname]);
-
- /*
- * Before we set the sessionID, we'd better make darn sure it's a legitimate request instead of a hacker trying to get in:
- *
- * however, before we can access any $_SESSION[] variables do we have to load the session for the given ID.
- */
- session_id($alt_sesid);
- if (!session_start())
- {
- header('HTTP/1.0 403 Forbidden', true, 403);
- die('session_start_ex() failed');
- }
-
- /*
- check the 'secret' value to doublecheck the legality of the session: did it originate from one of the demo entry pages?
- */
- if (empty($_SESSION['FileManager']) || $_SESSION['FileManager'] !== 'DemoMagick')
- {
- //echo " :: illegal session override! IGNORED! \n";
-
- // do not nuke the first session; this might have been a interloper trying a attack... let it all run its natural course.
- if (0)
- {
- if (ini_get('session.use_cookies'))
- {
- $params = session_get_cookie_params();
- if (!empty($params['ccms_userID']))
- {
- setcookie(session_name(), '', time() - 42000,
- $params['path'], $params['domain'],
- $params['secure'], $params['httponly']
- );
- }
- }
-
- // Generate a new session_id
- session_regenerate_id();
-
- // Finally, destroy the session.
- if(session_destroy())
- {
- header('HTTP/1.0 403 Forbidden', true, 403);
- die('session_start_ex() failed');
- }
- }
- session_write_close();
- session_regenerate_id();
- session_id($sesid);
- }
- }
- else
- {
- if (!session_start())
- {
- header('HTTP/1.0 403 Forbidden', true, 403);
- die('session_start_ex(ALT) failed');
- }
- }
- }
- else if ($override)
- {
- $sesid = session_id();
- $sesname = session_name();
- // the SWF.Upload / FancyUpload FLASH components do pass along the cookies, but as extra URL query entities:
- if (!empty($_POST[$sesname]))
- {
- // legalize the sessionID; just a precaution for malicious intent
- $alt_sesid = preg_replace('/[^A-Za-z0-9]/', 'X', $_POST[$sesname]);
-
- // did we already activate this session?
- if ($sesid === $alt_sesid)
- {
- // yep. We're done!
- return;
- }
- else
- {
- // close running session:
- session_regenerate_id();
- //session_destroy();
- session_write_close();
- unset($_SESSION);
-
- /*
- * Before we set the sessionID, we'd better make darn sure it's a legitimate request instead of a hacker trying to get in:
- *
- * however, before we can access any $_SESSION[] variables do we have to load the session for the given ID.
- */
- session_id($alt_sesid);
- if (!session_start())
- {
- header('HTTP/1.0 403 Forbidden', true, 403);
- die('session_start_ex() failed');
- }
-
- /*
- check the 'secret' value to doublecheck the legality of the session: did it originate from one of the demo entry pages?
- */
- if (empty($_SESSION['FileManager']) || $_SESSION['FileManager'] !== 'DemoMagick')
- {
- //echo " :: illegal session override! IGNORED! \n";
-
- // do not nuke the first session; this might have been a interloper trying a attack... let it all run its natural course.
- if (0)
- {
- if (ini_get('session.use_cookies'))
- {
- $params = session_get_cookie_params();
- if (!empty($params['ccms_userID']))
- {
- setcookie(session_name(), '', time() - 42000,
- $params['path'], $params['domain'],
- $params['secure'], $params['httponly']
- );
- }
- }
-
- // Generate a new session_id
- session_regenerate_id();
-
- // Finally, destroy the session.
- if(session_destroy())
- {
- header('HTTP/1.0 403 Forbidden', true, 403);
- die('session_start_ex() failed');
- }
- }
- session_write_close();
- session_regenerate_id();
- session_id($sesid);
- }
- }
- }
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-/*
- * FileManager event callback: Please add your own authentication / authorization here.
- *
- * Note that this function serves as a custom callback for all FileManager
- * authentication/authorization requests, but you may of course provide
- * different functions for each of the FM callbacks.
- *
- * Return TRUE when the session/client is authorized to execute the action, FALSE
- * otherwise.
- *
- * NOTE: the customer code in here may edit the $fileinfo items and have those edits picked up by FM.
- * E.g. changing the filename on write/move, fixing filename extensions based on file content sniffed mimetype, etc.
- *
- * See the Assets/Connector/FileManager.php file for extended info about this callback and the parameters passed into it.
- *
- *
- * Notes:
- *
- * Just for the sake of the demo, did we include exceptions being thrown in here; in a real situation you wouldn't
- * need those in the circumstances they are used right now. You /may/ use exceptions to signal other faults, though.
- */
-function FM_IsAuthorized($mgr, $action, &$info)
-{
- // Start session, if not already started
- session_name('alt_session_name');
- session_start_ex();
-
- //$settings = $mgr->getSettings();
- //$mimetdefs = $mgr->getMimeTypeDefinitions();
-
- // log request data:
- FM_vardumper($mgr, $action, $info);
-
- // when the session, started in the demo entry pages, doesn't exist or is not valid, we do not allow ANYTHING any more:
- if (empty($_SESSION))
- {
- session_write_close();
- throw new FileManagerException('authorized: The session is non-existent.');
- return false;
- }
-
- if (empty($_SESSION['FileManager']) || $_SESSION['FileManager'] !== 'DemoMagick')
- {
- session_write_close();
- throw new FileManagerException('authorized: The session is illegal, as it does not contain the mandatory magic value set up by the demo entry pages.');
- return false;
- }
-
-
- /*
- * authenticate / authorize:
- * this sample is a bogus authorization, but you can perform simple to highly
- * sophisticated authentications / authorizations here, e.g. even ones which also check permissions
- * related to what is being uploaded right now (different permissions required for file mimetypes,
- * e.g. images: any authorized user; while other file types which are more susceptible to carrying
- * illicit payloads requiring at least 'power/trusted user' permissions, ...)
- */
-
- $rv = false;
- switch ($action)
- {
- case 'upload':
- /*
- * Note that the TinyMCE demo currently has this sestting set to 'NO' to simulate an UNauthorized user, for the sake of the demo.
- */
- $rv = ($_SESSION['UploadAuth'] == 'yes');
- break;
-
- case 'download':
- $rv = true;
- break;
-
- case 'create': // create directory
- case 'destroy':
- case 'move': // move or copy!
- case 'view':
- $rv = true;
- break;
-
- case 'detail':
- /*
- * For the demo, we deny generation of thumbnails for images in a certain size range: 500KB - 2MB, jpeg only.
- *
- * To showcase the nasty/cool (depending on your disposition) things you can do in this callback, we
- * force the thumbnail to become a thumbnail of the 'nuke':
- */
- $fsize = @filesize($info['file']);
- /*
- * When the thumbnail request is made, the demo will error on
- * bison-head-with-horns (Ray Rauch, U.S. Fish and Wildlife Service).jpg
- * fruits-vegetables-milk-and-yogurt (Peggy Greb, U.S. Department of Agriculture).jpg
- * intentionally with the next bit of code; just to give you an idea what can be done in here.
- *
- * you can do a similar thing for any other request and have a good file fail or a bad file recover and succeed,
- * simply by patching the $info[] items.
- */
- if (SHOW_CUSTOM_CALLBACK_WORK && $info['mime'] == 'image/jpeg' && $fsize >= 180 * 1024 && $fsize <= 200 * 1024)
- {
- // force the manager to fetch the 'nuke' icon:
- $info['filename'] = 'is.default-error';
-
- // and nuke the mimetype to make sure it does go for the icon, always:
- $info['mime'] = 'icon/icon';
-
- // and act as if we authorized the action. Meanwhile, we just nuked it.
- }
- $rv = true;
- break;
-
- default:
- // unknown operation. Internal server error.
- $rv = false;
- break;
- }
-
- // make sure the session is closed (and unlocked) before the bulk of the work is performed: better parallelism server-side.
- session_write_close();
-
- return $rv;
-}
-
-
-
-
-
-
-
-// Do *NOT* add a close tag here! Any whitespace after that makes PHP output both a Content-Type: test/html header AND the whitespace as content.
-// This BREAKS any operation (such as mootools-filemanager::event=thumbnail) which outputs BINARY DATA (in that particular case, PHP spits out an image)
-// The safest way to prevent ANY PHP file from producing undesirable [whitespace] output is to never add that ?-> close tag.
diff --git a/Demos/demos.css b/Demos/demos.css
deleted file mode 100644
index ed31687..0000000
--- a/Demos/demos.css
+++ /dev/null
@@ -1,172 +0,0 @@
-
-body
-{
- font-size: 11px;
- font-family: Tahoma, sans-serif;
-}
-
-h1, h2
-{
- margin: 0 0 10px 0;
- padding: 0;
-
- color: #666;
- font-weight: normal;
- font-size: 24px;
- letter-spacing: 1px;
- word-spacing: 2px;
- line-height: 22px;
- min-height: 25px;
-}
-
-h2
-{
- margin-top: 3em;
-}
-
-h1 span
-{
- font-size: 11px;
- letter-spacing: 0;
- word-spacing: 0;
- text-shadow: none;
-}
-
-.blue
-{
- color: #1f52b0;
-}
-
-div.content
-{
- min-width: 650px;
- min-height: 200px;
- margin: 23px 34px;
- padding: 10px 17px;
- border: 1px solid #b2b2b2;
- background: #fff;
- box-shadow: rgba(0, 0, 0, 0.3) 0 0 10px;
- -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 0 10px;
- -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 0 10px;
-}
-
-div.content div.example
-{
- float: left;
- clear: both;
- margin: 10px 0;
-}
-
-div.selected-file div
-{
- padding: 3px;
-
- line-height: 1.5em;
-}
-
-div.selected-file div img.preview
-{
- padding: 3px;
-}
-
-button
-{
- margin: 5px 0;
-}
-
-
-/* http://labnol.blogspot.com/2006/10/html-css-trick-for-displaying-code.html */
-pre
-{
- white-space: pre-wrap; /* css-3 */
- white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */
- white-space: -pre-wrap; /* Opera 4-6 */
- white-space: -o-pre-wrap; /* Opera 7 */
- word-wrap: break-word; /* Internet Explorer 5.5+ */
-}
-
-div.go_home
-{
- float: right;
-}
-
-
-#gallery-tn-container
-{
- margin: 15px;
- padding: 5px;
- border: 1px solid #b2a0a0;
- background: #fffafa;
- box-shadow: rgba(255, 0, 0, 0.3) 0 0 10px;
- -moz-box-shadow: rgba(255, 0, 0, 0.3) 0 0 10px;
- -webkit-box-shadow: rgba(255, 0, 0, 0.3) 0 0 10px;
-}
-
-#gallery-tn-container div
-{
- float: left;
-
- /* border: green solid 1px; */
- margin: 5px;
-
-}
-
-#gallery-tn-container div a
-{
- display: block;
- /*
- width: 250px;
- height: 250px;
- */
- border: 1px solid #b2a0a0;
- background: #eee2e2;
- padding: 0;
- margin: 0;
-
- text-align: center;
- margin-left: auto;
- margin-right: auto;
-}
-
-#gallery-tn-container div a img
-{
- padding: 0;
- margin: 0;
-}
-
-/*
- * http://www.smashingmagazine.com/2007/05/01/css-float-theory-things-you-should-know/
- * -->
- * http://www.positioniseverything.net/easyclearing.html
- * -->
- * http://blogs.sitepoint.com/simple-clearing-of-floats/
- */
-#gallery-tn-container
-{
- overflow: auto;
-}
-
-
-
-/*
-http://jsfiddle.net/api/post/mootools/1.3/dependencies/more,art/
-*/
-
-.slider
-{
- background: #CCC;
- height: 16px;
- width: 300px;
-}
-.slider .knob
-{
- background: #000;
- width: 16px;
- height: 16px;
-
- cursor: pointer;
- -moz-border-radius: 6px;
- -webkit-border-radius: 6px;
- border-radius: 6px;
-}
-
diff --git a/Demos/home_16x16.png b/Demos/home_16x16.png
deleted file mode 100644
index 604b50c..0000000
Binary files a/Demos/home_16x16.png and /dev/null differ
diff --git a/Demos/index.html b/Demos/index.html
new file mode 100644
index 0000000..97c1a61
--- /dev/null
+++ b/Demos/index.html
@@ -0,0 +1,252 @@
+
+
+
+ MooTools FileManager Testground
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
FileManager Demo
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
In a container (can be a window, a div..)
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Demos/index.php b/Demos/index.php
index 1c3dcd6..f9bf880 100644
--- a/Demos/index.php
+++ b/Demos/index.php
@@ -19,6 +19,19 @@
/* the remainder of the code does not need access to the session data. */
session_write_close();
+if (0)
+{
+ // and add a couple other, slightly malicious cookies to check whether Flash will crash on it, or not.
+ setcookie("ASP.NET_SessionId", 'ASP.NET: b0rk b0rk b0rk & ... b0rk!', time() + 600,
+ $params['path'], $params['domain'],
+ $params['secure'], $params['httponly']
+ );
+ setcookie('.1!#$%20X', 'b0rk b0rk b0rk & ... b0rk!', time() + 600,
+ $params['path'], $params['domain'],
+ $params['secure'], $params['httponly']
+ );
+}
+
?>
@@ -26,10 +39,69 @@
MooTools FileManager Testground
-
+
+
+
+
+
@@ -53,11 +125,8 @@
hideOnClick: true,
assetBasePath: '../Assets',
// uploadAuthData is deprecated; use propagateData instead. The session cookie(s) are passed through Flash automatically, these days...
- //
- // and a couple of extra user defined parameters sent with EVERY request:
- propagateData: {
- origin: 'demo-FM-1',
- extra_data: 'ExtraData'
+ uploadAuthData: {
+ session: 'MySessionData'
},
upload: true,
download: true,
@@ -67,62 +136,217 @@
createFolders: true,
// selectable: true,
hideQonDelete: false, // DO ask 'are you sure' when the user hits the 'delete' button
- verbose: true, // log a lot of activity to console (when it exists)
onComplete: function(path, file, mgr) {
- if (typeof console !== 'undefined' && console.log) console.log('MFM.onComplete: ', path, file, mgr);
+ if (typeof console !== 'undefined' && console.log) console.log('MFM.onComplete: ' + path + ', ' + debug.dump(file) + ', ' + debug.dump(mgr, 0, 1, 60, 'object,function,string:empty'));
},
onModify: function(file, json, mode, mgr) {
- if (typeof console !== 'undefined' && console.log) console.log('MFM.onModify: ', mode, file, json, mgr);
+ if (typeof console !== 'undefined' && console.log) console.log('MFM.onModify: ' + mode + ', ' + debug.dump(file) + ', ' + debug.dump(json) + ', ' + debug.dump(mgr, 0, 1, 60, 'object,function,string:empty'));
},
onShow: function(mgr) {
- if (typeof console !== 'undefined' && console.log) console.log('MFM.onShow: ', mgr);
+ if (typeof console !== 'undefined' && console.log) console.log('MFM.onShow: ' + debug.dump(mgr, 0, 1, 60, 'object,function,string:empty'));
},
onHide: function(mgr) {
- if (typeof console !== 'undefined' && console.log) console.log('MFM.onHide: ', mgr);
+ if (typeof console !== 'undefined' && console.log) console.log('MFM.onHide: ' + debug.dump(mgr, 0, 1, 60, 'object,function,string:empty'));
},
onScroll: function(e, mgr) {
- if (typeof console !== 'undefined' && console.log) console.log('MFM.onScroll: ', e, mgr);
+ if (typeof console !== 'undefined' && console.log) console.log('MFM.onScroll: ' + debug.dump(e) + ', ' + debug.dump(mgr, 0, 1, 60, 'object,function,string:empty'));
},
onPreview: function(src, mgr, el) {
- if (typeof console !== 'undefined' && console.log) console.log('MFM.onPreview: ', src, el, mgr);
+ if (typeof console !== 'undefined' && console.log) console.log('MFM.onPreview: ' + debug.dump(src) + ', ' + debug.dump(el) + ', ' + debug.dump(mgr, 0, 1, 60, 'object,function,string:empty'));
},
onDetails: function(json, mgr) {
- if (typeof console !== 'undefined' && console.log) console.log('MFM.onDetails: ', json, mgr);
+ if (typeof console !== 'undefined' && console.log) console.log('MFM.onDetails: ' + debug.dump(json) + ', ' + debug.dump(mgr, 0, 1, 60, 'object,function,string:empty'));
},
onHidePreview: function(mgr) {
- if (typeof console !== 'undefined' && console.log) console.log('MFM.onHidePreview: ', mgr);
+ if (typeof console !== 'undefined' && console.log) console.log('MFM.onHidePreview: ' + debug.dump(mgr, 0, 1, 60, 'object,function,string:empty'));
+ },
+ // and a couple of extra user defined parameters sent with EVERY request:
+ propagateData: {
+ origin: 'demo-FM-1'
}
});
$('example1').addEvent('click', manager1.show.bind(manager1));
+ /* Select a file */
+ var el = $('example2');
+ var div, manager2;
+ var complete = function(path, file, mgr) {
+ el.set('value', path);
+ if (div) {
+ div.destroy();
+ }
+ var icon = new Asset.image(
+ mgr.assetBasePath+'Images/cancel.png',
+ {
+ 'class': 'file-cancel',
+ title: 'deselect'
+ }).addEvent('click', function(e){
+ e.stop();
+ el.set('value', '');
+ var self = this;
+ div.fade(0).get('tween').chain(function(){
+ div.destroy();
+ mgr.tips.hide();
+ mgr.tips.detach(self);
+ });
+ });
+ mgr.tips.attach(icon);
+
+ var img = null;
+ var mimetype = file.mime;
+ if (mimetype && mimetype.contains('image/'))
+ {
+ img = new Element('div', {
+ 'text': 'Click on the thumbnail to view the image/file in a lightbox (milkbox)'
+ }).adopt(
+ new Element('br'),
+ new Element('a', {
+ 'data-milkbox': 'single',
+ 'title': file.name,
+ 'href': path // no need to URLencode the path as FM does it already: encodeURI(path) // see also: http://www.javascripter.net/faq/escape.htm
+ }).adopt(new Element('img', {
+ 'src': (file.thumb250 ? file.thumb250 : file.icon),
+ 'class': 'preview',
+ 'alt': 'preview (picked)'
+ }))
+ );
+ }
+
+ div = new Element('div', {'class': 'selected-file', text: 'Selected file: '}).adopt(
+ new Asset.image(file.icon, {'class': 'mime-icon'}),
+ new Element('span', {text: file.name}),
+ icon,
+ img
+ ).inject(el, 'after');
+
+ if (img && typeof milkbox != 'undefined')
+ {
+ milkbox.reloadPageGalleries();
+ }
+ };
+
+ manager2 = new FileManager({
+ url: 'selectImage.php',
+ language: 'en',
+ filter: 'image',
+ hideOnClick: true,
+ assetBasePath: '../Assets',
+ // uploadAuthData is deprecated; use propagateData instead. The session cookie(s) are passed through Flash automatically, these days...
+ uploadAuthData: {
+ session: 'MySessionData'
+ },
+ selectable: true,
+ upload: true,
+ destroy: true,
+ rename: true,
+ move_or_copy: true,
+ createFolders: true,
+ onComplete: complete,
+ // and a couple of extra user defined parameters sent with EVERY request:
+ propagateData: {
+ origin: 'demo-selectFile'
+ }
+ });
+
+ el.setStyle('display', 'none');
+ var val = el.get('value');
+ if (val) {
+ var file_ext = val.split('.').getLast();
+ complete.apply(manager2, [val, {
+ name: val.split('/').getLast(),
+ mime: 'image/' + file_ext,
+ icon: '../Assets/Images/Icons/'+file_ext+'.png'
+ }, manager2]);
+ }
+
+ new Element('button', {'class': 'browser', text: 'Select an image'}).addEvent('click', manager2.show.bind(manager2)).inject(el, 'before');
+
+ /* Localized Example */
+ var manager3 = new FileManager({
+ url: 'manager.php',
+ language: 'de',
+ hideOnClick: true,
+ assetBasePath: '../Assets',
+ // uploadAuthData is deprecated; use propagateData instead. The session cookie(s) are passed through Flash automatically, these days...
+ uploadAuthData: {
+ session: 'MySessionData'
+ },
+ upload: true,
+ destroy: true,
+ rename: true,
+ move_or_copy: true,
+ createFolders: true,
+ // and a couple of extra user defined parameters sent with EVERY request:
+ propagateData: {
+ origin: 'demo-clickedLink'
+ }
+ });
+ $('example3').addEvent('click', manager3.show.bind(manager3));
+
+
+ /* Gallery Example */
+ var global = this;
+ var example4 = $('myGallery');
+ var manager4 = new FileManager.Gallery({
+ url: 'selectImage.php?exhibit=A', // 'manager.php', but with a bogus query parameter included: latest FM can cope with such an URI
+ assetBasePath: '../Assets',
+ filter: 'image',
+ hideOnClick: true,
+ // uploadAuthData is deprecated; use propagateData instead. The session cookie(s) are passed through Flash automatically, these days...
+ uploadAuthData: {
+ session: 'MySessionData'
+ },
+ propagateData: {
+ origin: 'demo-Gallery'
+ },
+ onShow: function(mgr) {
+ if (typeof console !== 'undefined' && console.log) console.log('GALLERY.onShow: ' + debug.dump(mgr, 0, 1, 60, 'object,function,string:empty'));
+ var obj;
+ Function.attempt(function(){
+ var gallist = example4.get('value');
+ if (typeof console !== 'undefined' && console.log) console.log('GALLERY list: ' + debug.dump(gallist, 0, 1, 60, 'function'));
+ obj = JSON.decode(gallist);
+ });
+ this.populate(obj);
+ },
+ onComplete: function(serialized, files, mgr){
+ if (typeof console !== 'undefined' && console.log) console.log('GALLERY.onComplete: ' + debug.dump(serialized) + ', ' + debug.dump(files) + ', ' + debug.dump(mgr, 0, 1, 60, 'object,function,string:empty'));
+
+ example4.set('value', JSON.encode(serialized));
+ }
+ });
+ $('example4').addEvent('click', manager4.show.bind(manager4));
});
-
-
\ No newline at end of file
diff --git a/Demos/selectImage.php b/Demos/selectImage.php
deleted file mode 100644
index c41ad94..0000000
--- a/Demos/selectImage.php
+++ /dev/null
@@ -1,70 +0,0 @@
- $fm_basedir . 'Files/', // absolute paths: as the relative ones, they sit in URI space, i.e. assume DocumentRoot is root '/'
-
- 'directory' => 'Files/', // relative paths: are relative to the URI request script path, i.e. dirname(__FILE__) or rather: $_SERVER['SCRIPT_NAME']
-
- 'filter' => 'image/',
- 'upload' => true,
- 'destroy' => false,
- 'create' => true,
- 'move' => true,
- 'download' => false,
- 'allowExtChange' => false // allow file name extensions to be changed; the default however is: NO (FALSE)
-));
-
-
-
-$event_cmd = (!empty($_GET['event']) ? $_GET['event'] : null);
-
-// log request data:
-FM_vardumper($browser, 'init' . $event_cmd);
-
-
-
-// and process the request:
-$browser->fireEvent($event_cmd);
-
-
-
-
-
-
-// Do *NOT* add a close tag here! Any whitespace after that makes PHP output both a Content-Type: test/html header AND the whitespace as content.
-// This BREAKS any operation (such as mootools-filemanager::event=thumbnail) which outputs BINARY DATA (in that particular case, PHP spits out an image)
-// The safest way to prevent ANY PHP file from producing undesirable [whitespace] output is to never add that ?-> close tag.
diff --git a/Demos/test-backend-basics.php b/Demos/test-backend-basics.php
deleted file mode 100644
index 5f675fa..0000000
--- a/Demos/test-backend-basics.php
+++ /dev/null
@@ -1,398 +0,0 @@
-
-
-
-
- MooTools FileManager Backend Testground
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Source/FileManager.TinyMCE.js b/Source/FileManager.TinyMCE.js
index 89bc289..cb2189a 100644
--- a/Source/FileManager.TinyMCE.js
+++ b/Source/FileManager.TinyMCE.js
@@ -18,67 +18,50 @@ Usage:
*/
FileManager.TinyMCE = function(options){
- /*
- * field: Id of the element to set value in.
- * url: value currently stored in the indicated element
- * type: Type of browser to open image/file/flash: 'file' ~ page links, 'image' ~ insert picture, 'media' ~ insert media/movie
- * win: window object reference
- */
- return function(field, url, type, win){
- var manager = new FileManager(Object.append({
- onComplete: function(path, file, mgr) {
- if (!win.document) return;
- win.document.getElementById(field).value = path;
- if (win.ImageDialog) {
- win.ImageDialog.showPreviewImage(path, 1);
- }
- this.container.destroy();
- }
- }, options(type),
- {
- zIndex: 400000,
- styles: {
- 'width': '90%',
- 'height': '90%'
- }
- }));
- //manager.dragZIndex = 400002;
- //manager.SwiffZIndex = 400003;
- //manager.filemanager.setStyle('width','90%');
- //manager.filemanager.setStyle('height','90%');
- //manager.filemanager.setStyle('zIndex', 400001);
- //if (manager.overlay) manager.overlay.el.setStyle('zIndex', 400000); // i.e. only do this when FileManager settings has 'hideOverlay: false' (default)
- //document.id(manager.tips).setStyle('zIndex', 400010);
- var src = win.document.getElementById(field).value;
+ /*
+ * field: Id of the element to set value in.
+ * url: value currently stored in the indicated element
+ * type: Type of browser to open image/file/flash: 'file' ~ page links, 'image' ~ insert picture, 'media' ~ insert media/movie
+ * win: window object reference
+ */
+ return function(field, url, type, win){
+ var manager; // jsLint warning fix
+ manager = new FileManager(Object.append({
+ onComplete: function(path, file, mgr) {
+ if (!win.document)
+ return;
+ //path = manager.escapeRFC3986(path);
+ win.document.getElementById(field).value = path;
+ if (win.ImageDialog) {
+ win.ImageDialog.showPreviewImage(path, 1);
+ }
+ this.container.destroy();
+ }
+ }, options(type),
+ {
+ zIndex: 400000,
+ styles: {
+ 'width': '90%',
+ 'height': '90%'
+ }
+ }));
+ var src = win.document.getElementById(field).value;
- src = decodeURI(src);
+ src = decodeURI(src);
- if (src.length > 0)
- {
- src = this.documentBaseURI.toAbsolute(src);
- }
- if (src.match(/^[a-z]+:/i))
- {
- // strip off scheme + authority sections:
- src = src.replace(/^[a-z]+:(\/\/?)[^\/]*/i, '');
- }
+ if (src.length > 0)
+ {
+ src = this.documentBaseURI.toAbsolute(src);
+ }
+ if (src.match(/^[a-z]+:/i))
+ {
+ // strip off scheme + authority sections:
+ src = src.replace(/^[a-z]+:(\/\/?)[^\/]*/i, '');
+ }
- // pass full path to 'preselect': backend will take care of it for us
- manager.show(null, null, (src.length > 0 ? src : null));
- return manager;
- };
+ // pass full path to 'preselect': backend will take care of it for us
+ manager.show(null, null, (src.length > 0 ? src : null));
+ return manager;
+ };
};
-//FileManager.implement('SwiffZIndex', 400003);
-
-//FileManager.Dialog = new Class({
-//
-// Extends: FileManager.Dialog,
-//
-// initialize: function(text, options){
-// this.parent(text, options);
-// this.el.setStyle('zIndex', 400010);
-// this.overlay.el.setStyle('zIndex', 400009);
-// }
-//});
-
diff --git a/Source/FileManager.js b/Source/FileManager.js
index f4640b2..2a41925 100644
--- a/Source/FileManager.js
+++ b/Source/FileManager.js
@@ -8,8 +8,8 @@ authors: Christoph Pojer (@cpojer), Fabian Vogelsteller (@frozeman)
license: MIT-style license
requires:
- core/1.3.1: '*'
- more/1.3.1.1: [Request.Queue, Array.Extras, String.QueryString, Hash, Element.Delegation, Element.Measure, Fx.Scroll, Fx.SmoothScroll, Drag, Drag.Move, Assets, Tips ]
+ core/1.3.2: '*'
+ more/1.3.2.1: [Request.Queue, Array.Extras, String.QueryString, Hash, Element.Delegation, Element.Measure, Fx.Scroll, Fx.SmoothScroll, Drag, Drag.Move, Assets, Tips, Scroller ]
provides: Filemanager
@@ -27,54 +27,9 @@ var FileManager = new Class({
ID: null,
options: {
- /*
- * onComplete: function( // Fired when the 'Select' button is clicked
- * path, // URLencoded absolute URL path to selected file
- * file, // the file specs object: .name, .path, .size, .date, .mime, .icon, .icon48, .thumb48, .thumb250
- * fmobj // reference to the FileManager instance which fired the event
- * )
- *
- * onModify: function( // Fired when either the 'Rename' or 'Delete' icons are clicked or when a file is drag&dropped.
- * // Fired AFTER the action is executed.
- * file, // a CLONE of the file specs object: .name, .path, .size, .date, .mime, .icon, .icon48, .thumb48, .thumb250
- * json, // The JSON data as sent by the server for this 'destroy/rename/move/copy' request
- * mode, // string specifying the action: 'destroy', 'rename', 'move', 'copy'
- * fmobj // reference to the FileManager instance which fired the event
- * )
- *
- * onShow: function( // Fired AFTER the file manager is rendered
- * fmobj // reference to the FileManager instance which fired the event
- * )
- *
- * onHide: function( // Fired AFTER the file manager is removed from the DOM
- * fmobj // reference to the FileManager instance which fired the event
- * )
- *
- * onScroll: function( // Cascade of the window scroll event
- * e, // reference to the event object (argument passed from the window.scroll event)
- * fmobj // reference to the FileManager instance which fired the event
- * )
- *
- * onPreview: function( // Fired when the preview thumbnail image is clicked
- * src, // this.get('src') ???
- * fmobj, // reference to the FileManager instance which fired the event
- * el // reference to the 'this' ~ the element which was clicked
- * )
- *
- * onDetails: function( // Fired when an item is picked from the files list to be previewed
- * // Fired AFTER the server request is completed and BEFORE the preview is rendered.
- * json, // The JSON data as sent by the server for this 'detail' request
- * fmobj // reference to the FileManager instance which fired the event
- * )
- *
- * onHidePreview: function( // Fired when the preview is hidden (e.g. when uploading)
- * // Fired BEFORE the preview is removed from the DOM.
- * fmobj // reference to the FileManager instance which fired the event
- * )
- */
- directory: '',
+ directory: '', // (string) the directory (relative path) which should be loaded on startup (show).
url: null,
- assetBasePath: null,
+ assetsUrl: null,
language: 'en',
selectable: false,
destroy: false,
@@ -83,21 +38,24 @@ var FileManager = new Class({
download: false,
createFolders: false,
filter: '',
+ detailInfoMode: '', // (string) whether you want to receive extra metadata on select/etc. and/or view this metadata in the preview pane (modes: '', '+metaHTML', '+metaJSON'. Modes may be combined)
+ deliverPathAsLegalURL: false, // (boolean) TRUE: deliver 'legal URL' paths, i.e. PHP::options['URLpath4FileManagedDirTree']-rooted (~ this.root), FALSE: deliver absolute URI paths.
hideOnClick: false,
hideClose: false,
hideOverlay: false,
hideQonDelete: false,
- verbose: false,
+ hideOnSelect: true, // (boolean). Default to true. If set to false, it leavers the FM open after a picture select.
+ thumbSize4DirGallery: 120, // To set the thumb gallery container size for each thumb (dir-gal-thumb-bg); depending on size, it will pick either the small or large thumbnail provided by the backend and scale that one
zIndex: 1000,
styles: {},
listPaginationSize: 100, // add pagination per N items for huge directories (speed up interaction)
listPaginationAvgWaitTime: 2000, // adaptive pagination: strive to, on average, not spend more than this on rendering a directory chunk
- propagateData: {}, // extra query parameters sent with every request to the backend
standalone: true, // (boolean). Default to true. If set to false, returns the Filemanager without enclosing window / overlay.
+ advancedEffects: true, // (boolean). Default to true. Fading effect on panels. Slow when large thumbs dir.
parentContainer: null, // (string). ID of the parent container. If not set, FM will consider its first container parent for fitSizes();
- hideOnSelect: true, // (boolean). Default to true. If set to false, it leavers the FM open after a picture select.
-
+ propagateData: {}, // extra query parameters sent with every request to the backend
+ verbose: false,
mkServerRequestURL: null // (function) specify your own alternative URL/POST data constructor when you use a framework/system which requires such. function([object] fm_obj, [string] request_code, [assoc.array] post_data)
},
@@ -119,7 +77,9 @@ var FileManager = new Class({
this.diag.verbose = this.options.verbose;
this.ID = String.uniqueID();
this.droppables = [];
- this.assetBasePath = this.options.assetBasePath.replace(/(\/|\\)*$/, '/');
+ // Relative or absolute URL to the Filemanager assets
+ this.assetsUrl = this.options.assetsUrl.replace(/(\/|\\)*$/, '/');
+
this.root = null;
this.CurrentDir = null;
this.listType = 'list';
@@ -140,11 +100,11 @@ var FileManager = new Class({
// timer for dir-gallery click / dblclick events:
this.dir_gallery_click_timer = null;
-
var dbg_cnt = 0;
this.RequestQueue = new Request.Queue({
- concurrent: 3, // 3 --> 75% max load on a quad core server
+ // 3 --> 75% max load on a quad core server
+ concurrent: 3,
autoAdvance: true,
stopOnFailure: false,
@@ -153,8 +113,6 @@ var FileManager = new Class({
}).bind(this),
onComplete: (function(name){
- //this.diag.log('request queue: onComplete: ', arguments);
-
// clean out the item from the queue; doesn't seem to happen automatically :-(
var cnt = 0;
Object.each(this.RequestQueue.requests, function() {
@@ -215,13 +173,12 @@ var FileManager = new Class({
this.language = Object.merge(this.language, FileManager.Language[this.options.language]);
}
-// Partikule
+ // Hides the overlay / close button in standalone mode
if (!this.options.standalone)
{
this.options.hideOverlay = true;
this.options.hideClose = true;
}
-// /Partikule
this.container = new Element('div', {
'class': 'filemanager-container' + (Browser.opera ? ' filemanager-engine-presto' : '') + (Browser.ie ? ' filemanager-engine-trident' : '') + (Browser.ie8 ? '4' : '') + (Browser.ie9 ? '5' : ''),
@@ -239,19 +196,12 @@ var FileManager = new Class({
})
}).inject(this.container);
this.header = new Element('div', {
- 'class': 'filemanager-header' /* ,
- styles:
- {
- 'z-index': this.options.zIndex + 3
- } */
+ 'class': 'filemanager-header'
}).inject(this.filemanager);
this.menu = new Element('div', {
- 'class': 'filemanager-menu' /* ,
- styles:
- {
- 'z-index': this.options.zIndex + 2
- } */
+ 'class': 'filemanager-menu'
}).inject(this.filemanager);
+
this.loader = new Element('div', {'class': 'loader', opacity: 0, tween: {duration: 'short'}}).inject(this.header);
this.previewLoader = new Element('div', {'class': 'loader', opacity: 0, tween: {duration: 'short'}});
this.browserLoader = new Element('div', {'class': 'loader', opacity: 0, tween: {duration: 'short'}});
@@ -271,15 +221,12 @@ var FileManager = new Class({
}).bind(this));
this.header.adopt(this.pathTitle,this.clickablePath);
-// Partikule
-// Because the header is positioned -30px before the container, we hide it for the moment if the FM isn't standalone.
-// Need to think about a better integration
+ // Because the header is positioned -30px before the container, we hide it for the moment if the FM isn't standalone.
if (!this.options.standalone)
{
this.header.hide();
this.filemanager.setStyle('width', '100%');
}
-// /Partikule
var self = this;
@@ -287,74 +234,8 @@ var FileManager = new Class({
this.browserheader = new Element('div',{'class': 'filemanager-browserheader'}).inject(this.browsercontainer);
this.browserheader.adopt(this.browserLoader);
this.browserScroll = new Element('div', {'class': 'filemanager-browserscroll'}).inject(this.browsercontainer).addEvents({
- 'mouseover': (function(e) {
- //this.diag.log('mouseover: ', e);
-
- // sync mouse and keyboard-driven browsing: the keyboard requires that we keep track of the hovered item,
- // so we cannot simply leave it to a :hover CSS style. Instead, we find out which element is currently
- // hovered:
- var row = null;
- if (e.target)
- {
- row = (e.target.hasClass('fi') ? e.target : e.target.getParent('span.fi'));
- if (row)
- {
- row.addClass('hover');
- }
- }
- this.browser.getElements('span.fi.hover').each(function(span) {
- // prevent screen flicker: only remove the class for /other/ nodes:
- if (span != row) {
- span.removeClass('hover');
- var rowicons = span.getElements('img.browser-icon');
- if (rowicons)
- {
- rowicons.each(function(icon) {
- icon.set('tween', {duration: 'short'}).fade(0);
- });
- }
- }
- });
-
- if (row)
- {
- var icons = row.getElements('img.browser-icon');
- if (icons)
- {
- icons.each(function(icon) {
- if (e.target == icon)
- {
- icon.set('tween', {duration: 'short'}).fade(1);
- }
- else
- {
- icon.set('tween', {duration: 'short'}).fade(0.5);
- }
- });
- }
- }
- }).bind(this),
-
- /* 'mouseout' */
- 'mouseleave': (function(e) {
- //this.diag.log('mouseout: ', e);
-
- // only bother us when the mouse cursor has just left the browser area; anything inside there is handled
- // by the recurring 'mouseover' event above...
- //
- // - do NOT remove the 'hover' marker from the row; it will be used by the keyboard!
- // - DO fade out the action icons, though!
- this.browser.getElements('span.fi.hover').each(function(span) {
- var rowicons = span.getElements('img.browser-icon');
- if (rowicons)
- {
- rowicons.each(function(icon) {
- icon.set('tween', {duration: 'short'}).fade(0);
- });
- }
- });
-
- }).bind(this)
+ 'mouseover': this.mouseOver4browserScroll.bind(this),
+ 'mouseleave': this.mouseLeave4browserScroll.bind(this)
});
this.browserMenu_thumb = new Element('a',{
'id':'toggle_side_boxes',
@@ -372,32 +253,26 @@ var FileManager = new Class({
click: this.toggleList.bind(this)
});
-// Partikule : Thumbs list in preview panel
+ // Add a scroller to scroll the browser list when dragging a file
+ this.scroller = new Scroller(this.browserScroll, {
+ onChange: function(x, y)
+ {
+ // restrict scrolling to Y direction only!
+ var scroll = this.element.getScroll();
+ self.diag.log('scroller.onChange: ', x, y, scroll);
+ this.element.scrollTo(scroll.x, y);
+ }
+ });
+
+ // Thumbs list in preview panel
this.browserMenu_thumbList = new Element('a',{
'id': 'show_dir_thumb_gallery',
'title': this.language.show_dir_thumb_gallery
}).addEvent('click', function()
{
- // do NOT change the jsGET history carrying our browsing so far; the fact we want to view the dirtree should
- // *NOT* blow away the recall in which directory we are (and what item is currently selected):
-
- //if (typeof jsGET !== 'undefined')
- // jsGET.clear();
-
- // no need to request the dirscan again: after all, we only wish to render another view of the same directory.
- // (This means, however, that we MAY requesting any deferred thumbnails)
-
- //self.load(self.options.directory, true);
- //return self.deselect(); // nothing to return on a click event, anyway. And do NOT loose the selection!
-
- // the code you need here is identical to clicking on the current directory in the top path bar:
-
- // show the 'directory' info in the detail pane again (this is a way to get back from previewing single files to previewing the directory as a gallery)
this.diag.log('show_dir_Thumb_gallery button click: current directory!', this.CurrentDir, ', startdir: ', this.options.directory);
this.fillInfo();
}.bind(this));
-// /Partikule
-
this.browser_dragndrop_info = new Element('a',{
'id':'drag_n_drop',
@@ -432,9 +307,8 @@ var FileManager = new Class({
});
this.browser_paging.adopt([this.browser_paging_first, this.browser_paging_prev, this.browser_paging_info, this.browser_paging_next, this.browser_paging_last]);
-// Partikule : Added the browserMenu_thumbList to the browserheader
+ // Added the browserMenu_thumbList to the browserheader
this.browserheader.adopt([this.browserMenu_thumbList, this.browserMenu_thumb, this.browserMenu_list, this.browser_dragndrop_info, this.browser_paging]);
-// /Partikule
this.browser = new Element('ul', {'class': 'filemanager-browser'}).inject(this.browserScroll);
@@ -463,55 +337,32 @@ var FileManager = new Class({
// use some CSS to reorganise it a bit in the custom event handler. So we create "filemanager-preview-area" which
// will contain the h2 for the preview and also the preview content returned from
// Backend/FileManager.php
- this.preview_area = new Element('div', {'class': 'filemanager-preview-area',
+ this.preview_area = new Element('div', {
+ 'class': 'filemanager-preview-area',
styles:
{
opacity: 0
}
});
-// Partikule. Removed new Element('h2', {'class': 'filemanager-headline' :
-// 1. To gain more vertical space for preview
-// 2. Because the user knows this is info about the file
this.preview_area.adopt([
- //new Element('h2', {'class': 'filemanager-headline', text: this.language.more}),
this.preview
]);
-// Partikule.
-// 1. To gain more vertical space for preview
-// 2. Because the user knows this is info about the file
-// 3. Less is more :-)
this.info.adopt([this.info_head, this.preview_area]).inject(this.filemanager);
-// /Partikule
-
-// Partikule
-// Add of the thumbnail list in the preview panel
-
-// We fill this one while we render the directory tree view to ensure that the deferred thumbnail loading system
-// (using 'detail / mode=direct' requests to obtain the actual thumbnail paths) doesn't become a seriously complex
-// mess.
-// This way, any updates coming from the server are automatically edited into this list; whether it is shown or
-// not depends on the decisions in fillInfo()
-//
-// Usage:
-// - One doubleclick on one thumb in this list will select the file : quicker select
-// - One click displays the preview, but with the file in bigger format : less clicks to see the picture wider.
// Thumbs list container (in preview panel)
this.dir_filelist = new Element('div', {'class': 'filemanager-filelist'});
-// /Partikule
-
if (!this.options.hideClose) {
this.closeIcon = new Element('a', {
'class': 'filemanager-close',
opacity: 0.5,
title: this.language.close,
events: {click: this.hide.bind(this)}
- }).inject(this.filemanager).addEvent('mouseover',function() {
+ }).inject(this.filemanager).addEvent('mouseenter',function() {
this.fade(1);
- }).addEvent('mouseout',function() {
+ }).addEvent('mouseleave',function() {
this.fade(0.5);
});
}
@@ -535,17 +386,51 @@ var FileManager = new Class({
this.tips.attach(this.closeIcon);
}
- this.imageadd = new Asset.image(this.assetBasePath + 'Images/add.png', {
- 'class': 'browser-add',
+ this.imagedragstate = Asset.image(this.assetsUrl + 'Images/transparent.gif', {
+ 'class': 'browser-dragstate',
styles:
{
'z-index': this.options.zIndex + 1600
}
- }).set('opacity', 0).set('tween', {duration: 'short'}).inject(this.container);
+ }).inject(this.container);
+ this.imagedragstate.changeState = function(new_state)
+ {
+ /* 'this' points at this.imagedragstate in here! */
+ if (new_state !== this.current_state)
+ {
+ switch (new_state)
+ {
+ default:
+ this.setStyles({
+ 'background-position': '0px 0px',
+ 'display': 'none'
+ });
+ break;
+
+ case 1: // move
+ this.setStyles({
+ 'background-position': '0px -16px',
+ 'display': 'block'
+ });
+ break;
+
+ case 2: // copy
+ this.setStyles({
+ 'background-position': '0px -32px',
+ 'display': 'block'
+ });
+ break;
-// Partikule : Moved a little bit more on the bottom...
-// this.container.inject(document.body);
-// /Partikule
+ case 3: // cannot drop here...
+ this.setStyles({
+ 'background-position': '0px -48px',
+ 'display': 'block'
+ });
+ break;
+ }
+ this.current_state = new_state;
+ }
+ };
if (!this.options.hideOverlay) {
this.overlay = new Overlay(Object.append((this.options.hideOnClick ? {
@@ -564,15 +449,15 @@ var FileManager = new Class({
this.bound = {
keydown: (function(e)
{
- // at least FF on Win will trigger this function multiple times when keys are depressed for a long time. Hence time consuming actions are don in 'keyup' whenever possible.
-
+ // at least FF on Win will trigger this function multiple times when keys are depressed for a long time.
+ // Hence time consuming actions are don in 'keyup' whenever possible.
this.diag.log('keydown: key press: ', e);
if (e.control || e.meta)
{
if (this.drag_is_active && !this.ctrl_key_pressed)
{
- // only init the fade when actually switching CONTROL key states!
- this.imageadd.fade(1);
+ // only init the change when actually switching CONTROL key states!
+ this.imagedragstate.changeState(2);
}
this.ctrl_key_pressed = true;
}
@@ -585,8 +470,8 @@ var FileManager = new Class({
{
if (/* this.drag_is_active && */ this.ctrl_key_pressed)
{
- // only init the fade when actually switching CONTROL key states!
- this.imageadd.fade(0);
+ // only init the change when actually switching CONTROL key states!
+ this.imagedragstate.changeState(1);
}
this.ctrl_key_pressed = false;
}
@@ -601,8 +486,10 @@ var FileManager = new Class({
break;
case 'esc':
- e.stop();
- this.hide();
+ if (this.standalone == true) {
+ e.stop();
+ this.hide();
+ }
break;
}
}
@@ -620,7 +507,7 @@ var FileManager = new Class({
case 'home':
case 'end':
case 'enter':
- case 'delete':
+// case 'delete':
e.preventDefault();
this.browserSelection(e.key);
break;
@@ -634,7 +521,6 @@ var FileManager = new Class({
}).bind(this)
};
-// Partikule
if (this.options.standalone)
{
this.container.inject(document.body);
@@ -644,8 +530,6 @@ var FileManager = new Class({
}
else
{
-// Partikule : Removed the autostart bacause of the standalone mode.
-// Certainly a better way to do that...
this.options.hideOverlay = true;
}
return this;
@@ -679,20 +563,97 @@ var FileManager = new Class({
return (j.dirs.length + j.files.length <= pagesize * 4);
},
+ mouseOver4browserScroll: function(e) {
+ this.diag.log('browserScroll.mouseover: ', e);
+
+ // see comment at the drag&drop section further below about the 'mouseleave' / 'mouseover' trouble due to the dragged element:
+ // here we make sure we don't 'track' the element hover while a drag&drop is in progress:
+ if (this.drag_is_active) {
+ return;
+ }
+
+ // sync mouse and keyboard-driven browsing: the keyboard requires that we keep track of the hovered item,
+ // so we cannot simply leave it to a :hover CSS style. Instead, we find out which element is currently
+ // hovered:
+ var row = null;
+ if (e.target)
+ {
+ row = (e.target.hasClass('fi') ? e.target : e.target.getParent('span.fi'));
+ if (row)
+ {
+ row.addClass('hover');
+ }
+ }
+ this.browser.getElements('span.fi.hover').each(function(span) {
+ // prevent screen flicker: only remove the class for /other/ nodes:
+ if (span != row) {
+ span.removeClass('hover');
+ var rowicons = span.getElements('img.browser-icon');
+ if (rowicons)
+ {
+ rowicons.each(function(icon) {
+ icon.hide();
+ });
+ }
+ }
+ });
+
+ if (row)
+ {
+ var icons = row.getElements('img.browser-icon');
+ if (icons)
+ {
+ icons.each(function(icon) {
+ if (e.target == icon)
+ {
+ icon.show();
+ }
+ else
+ {
+ icon.show();
+ }
+ });
+ }
+ }
+ },
+
+ mouseLeave4browserScroll: function(e) {
+ this.diag.log('browserScroll.mouseleave: ', e);
+
+ if (this.drag_is_active) {
+ return;
+ }
+
+ // - do NOT remove the 'hover' marker from the row; it will be used by the keyboard!
+ // - DO fade out the action icons, though!
+ this.browser.getElements('span.fi.hover').each(function(span) {
+ var rowicons = span.getElements('img.browser-icon');
+ if (rowicons)
+ {
+ rowicons.each(function(icon) {
+ icon.hide();
+ });
+ }
+ });
+ },
+
/*
* default method to produce a suitable request URL/POST; as several frameworks out there employ url rewriting, one way or another,
* we now allow users to provide their own construction method to replace this one: simply provide your own method in
- * options.mkServerRequestURL
+ * options.mkServerRequestURL
* Like this one, it MUST return an object, containing two properties:
*
* url: (string) contains the URL sent to the server for the given event/request (which is always transmitted as a POST request)
* data: (assoc. array): extra parameters added to this POST. (Mainly there in case a framework wants to have the 'event' parameter
* transmitted as a POST data element, rather than having it included in the request URL itself in some form.
+ *
+ * WARNING: 'this' in here is actually **NOT** pointing at the FM instance; use 'fm_obj' for that!
+ *
+ * In fact, 'this' points at the 'fm_obj.options' object, but consider that an 'undocumented feature'
+ * as it may change in the future without notice!
*/
mkServerRequestURL: function(fm_obj, request_code, post_data)
{
- // WARNING: 'this' in here is actually **NOT** pointing at the FM instance; use 'fm_obj' for that! (In fact, 'this' points at the 'options' object, but consider that an 'undocumented feature' as it may change in the future without notice!)
-
return {
url: fm_obj.options.url + (fm_obj.options.url.indexOf('?') == -1 ? '?' : '&') + Object.toQueryString({
event: request_code
@@ -703,7 +664,6 @@ var FileManager = new Class({
fitSizes: function()
{
-// Partikule : Add the standalone check
if (this.options.standalone)
{
this.filemanager.center(this.offsets);
@@ -717,7 +677,6 @@ var FileManager = new Class({
this.filemanager.setStyle('height', parentSize.y);
}
}
-// /Partikule
var containerSize = this.filemanager.getSize();
var headerSize = this.browserheader.getSize();
@@ -739,17 +698,13 @@ var FileManager = new Class({
return encodeURI(s.toString()).replace(/\+/g, '%2B').replace(/#/g, '%23');
},
unescapeRFC3986: function(s) {
- return decodeURI(s.toString());
+ return decodeURI(s.toString().replace(/%23/g, '#').replace(/%2B/g, '+'));
},
// -> catch a click on an element in the file/folder browser
- relayClick: function(e, el) {
+ relayClickOnItemInLeftPanel: function(e, el) {
if (e) e.stop();
- // ignore mouse clicks while drag&drop + resulting copy/move is pending.
- //
- // Theoretically only the first click originates from the same mouse event as the 'drop' event, so we
- // COULD reset 'drop_pending' after processing that one.
if (this.drop_pending != 0)
{
this.drop_pending = 0;
@@ -759,7 +714,7 @@ var FileManager = new Class({
this.storeHistory = true;
var file = el.retrieve('file');
- this.diag.log('on relayClick file = ', file, ', current directory: ', this.CurrentDir, '@ el = ', el);
+ this.diag.log('on relayClickOnItemInLeftPanel file = ', file, ', current directory: ', this.CurrentDir, '@ el = ', el);
if (el.retrieve('edit')) {
el.eliminate('edit');
return;
@@ -773,34 +728,29 @@ var FileManager = new Class({
return;
}
- // when we're right smack in the middle of a drag&drop, which may end up as a MOVE, do NOT send a 'detail' request
- // alongside (through fillInfo) as that may lock the file being moved, server-side.
- // It's good enough to disable the detail view, if we want/need to.
- //
- // Note that this.drop_pending tracks the state of the drag&drop state machine -- more functions may check this one!
if (this.Current) {
this.Current.removeClass('selected');
}
- // ONLY do this when we're doing a COPY or on a failed attempt...
+
// CORRECTION: as even a failed 'drop' action will have moved the cursor, we can't keep this one selected right now:
this.Current = el.addClass('selected');
- // We need to have Current assigned before fillInfo because fillInfo adds to it
+
this.fillInfo(file);
this.switchButton4Current();
}
},
-// Partikule
-
/**
* Catches both single and double click on thumb list icon in the directory preview thumb/gallery list
*/
- relayDblClick: function(e, self, dg_el, file, clicks)
+ relaySingleOrDoubleClick: function(e, self, dg_el, file, clicks)
{
- if (e) e.stop();
+ // IE7 / IE8 event problem
+ if( ! Browser.ie)
+ if (e) e.stop();
- this.diag.log('on relayDblClick file = ', file, ', current dir: ', this.CurrentDir, ', # clicks: ', clicks);
+ this.diag.log('on relaySingleOrDoubleClick file = ', file, ', current dir: ', this.CurrentDir, ', # clicks: ', clicks);
this.tips.hide();
@@ -812,9 +762,6 @@ var FileManager = new Class({
}
this.Current = el_ref.addClass('selected');
- file = el_ref.retrieve('file');
-
- this.CurrentFile = file;
// now make sure we can see the selected item in the left pane: scroll there:
this.browserSelection('none');
@@ -827,12 +774,10 @@ var FileManager = new Class({
else
{
// the single-click action is to simulate a click on the corresponding line in the directory view (left pane)
- this.relayClick(e, el_ref);
+ this.relayClickOnItemInLeftPanel(e, el_ref);
}
},
-// /Partikule
-
toggleList: function(e) {
if (e) e.stop();
@@ -863,11 +808,13 @@ var FileManager = new Class({
*
* Is fired for two reasons:
*
- * 1) the user clicked on a file or directory to view and that change was also pushed to the history through one or more jsGET.set() calls.
+ * 1) the user clicked on a file or directory to view and that change was also pushed to the history
+ * through one or more jsGET.set() calls.
* (In this case, we've already done what needed doing, so we should not redo that effort in here!)
*
* 2) the user went back in browser history or manually edited the URI hash section.
- * (This is an 'change from the outside' and exactly what this listener is for. This time around, we should follow up on those changes!)
+ * (This is an 'change from the outside' and exactly what this listener is for.
+ * This time around, we should follow up on those changes!)
*/
hashHistory: function(vars)
{
@@ -919,7 +866,6 @@ var FileManager = new Class({
return;
}
this.fmShown = true;
- this.onShow = false;
if (typeof preselect === 'undefined') preselect = null;
if (typeof loaddir === 'undefined') loaddir = null;
@@ -942,17 +888,11 @@ var FileManager = new Class({
loaddir = this.options.directory;
}
}
- if (preselect)
- {
- this.diag.log('on show: set onShow on PRESELECT: ', preselect);
- this.onShow = true;
- }
// get and set history
if (typeof jsGET !== 'undefined') {
if (jsGET.get('fmFile')) {
this.diag.log('on show: set onShow on fmFile: ', jsGET.get('fmFile'));
- this.onShow = true;
}
if (jsGET.get('fmListType') != null) {
$$('.filemanager-browserheader a.listType').set('opacity',0.5);
@@ -975,9 +915,11 @@ var FileManager = new Class({
}
this.show_our_info_sections(false);
- this.container.fade(0).setStyles({
- display: 'block'
- });
+ this.container.hide();
+
+ // this.container.fade(0).setStyles({
+ // display: 'block'
+ // });
window.addEvents({
'scroll': this.bound.scroll,
@@ -991,18 +933,17 @@ var FileManager = new Class({
document.addEvent('keydown', this.bound.keyboardInput);
else
document.addEvent('keypress', this.bound.keyboardInput);
- this.container.fade(1);
+ this.container.show();
this.fitSizes();
this.fireEvent('show', [this]);
this.fireHooks('show');
-// Partikule : If not standalone, returns the HTML content
+ // If not standalone, returns the HTML content
if (!this.options.standalone)
{
return this.container;
}
-// /Partikule
},
hide: function(e) {
@@ -1044,6 +985,8 @@ var FileManager = new Class({
show_our_info_sections: function(state) {
if (!state)
{
+ // this.info_head.hide();
+ // this.preview_area.hide();
this.info_head.fade(0).get('tween').chain(function() {
this.element.setStyle('display', 'none');
});
@@ -1053,6 +996,8 @@ var FileManager = new Class({
}
else
{
+ // this.info_head.show()
+ // this.preview_area.show();
this.info_head.setStyle('display', 'block').fade(1);
this.preview_area.setStyle('display', 'block').fade(1);
}
@@ -1066,18 +1011,18 @@ var FileManager = new Class({
var file = this.Current.retrieve('file');
this.fireEvent('complete', [
- this.escapeRFC3986(this.normalize('/' + this.root + file.path)), // the absolute URL for the selected file, rawURLencoded
- file, // the file specs: .name, .path, .size, .date, .mime, .icon, .icon48, .thumb48, .thumb250
+ // the absolute URL for the selected file, rawURLencoded
+ (this.options.deliverPathAsLegalURL ? file.path : this.escapeRFC3986(this.normalize('/' + this.root + file.path))),
+ // the file specs: .name, .path, .size, .date, .mime, .icon, .icon48, .thumb48, .thumb250
+ file,
this
]);
-// Partikule
-// Why Hide ? For some usage, it can be useful to keep it open (more than 3 files and it will be really annoying to re-open the FM for each file select)
+ // Only hide if hideOnSelect is true
if (this.options.hideOnSelect)
{
this.hide();
}
-// /Partikule
},
download_on_click: function(e) {
@@ -1091,6 +1036,9 @@ var FileManager = new Class({
},
download: function(file) {
+ var self = this;
+ var dummyframe_active = false;
+
// the chained display:none code inside the Tips class doesn't fire when the 'Save As' dialog box appears right away (happens in FF3.6.15 at least):
if (this.tips.tip) {
this.tips.tip.setStyle('display', 'none');
@@ -1110,7 +1058,50 @@ var FileManager = new Class({
this.downloadForm = null;
}
- this.downloadIframe = (new IFrame()).set({src: 'about:blank', name: '_downloadIframe'}).setStyles({display:'none'});
+ this.downloadIframe = new IFrame({
+ src: 'about:blank',
+ name: '_downloadIframe',
+ styles: {
+ display: 'none'
+ },
+ events: {
+ load: function()
+ {
+ var iframe = this;
+ self.diag.log('download response: ', this, ', iframe: ', self.downloadIframe, ', ready: ', (1 * dummyframe_active));
+
+ // make sure we don't act on premature firing of the event in MSIE / Safari browsers:
+ if (!dummyframe_active)
+ return;
+
+ var response = null;
+ Function.attempt(function() {
+ response = iframe.contentDocument.documentElement.textContent;
+ },
+ function() {
+ response = iframe.contentWindow.document.innerText;
+ },
+ function() {
+ response = iframe.contentDocument.innerText;
+ },
+ function() {
+ response = "{status: 0, error: \"Download: download assumed okay: can't find response.\"}";
+ }
+ );
+
+ var j = JSON.decode(response);
+
+ if (j && !j.status)
+ {
+ self.showError('' + j.error);
+ }
+ else if (!j)
+ {
+// self.showError('bugger! No or faulty JSON response! ' + response);
+ }
+ }
+ }
+ });
this.menu.adopt(this.downloadIframe);
this.downloadForm = new Element('form', {target: '_downloadIframe', method: 'post', enctype: 'multipart/form-data'});
@@ -1131,6 +1122,8 @@ var FileManager = new Class({
this.downloadForm.adopt((new Element('input')).set({type: 'hidden', name: k, value: v}));
}.bind(this));
+ dummyframe_active = true;
+
return this.downloadForm.submit();
},
@@ -1138,7 +1131,7 @@ var FileManager = new Class({
e.stop();
var input = new Element('input', {'class': 'createDirectory'});
var click_ok_f = (function(e) {
- this.diag.log('create on click: KEYBOARD handler: key press: ', e);
+// this.diag.log('create on click: KEYBOARD handler: key press: ', e);
if (e.key === 'enter') {
e.stopPropagation();
@@ -1322,6 +1315,19 @@ var FileManager = new Class({
this.browserLoader.fade(1);
+ if ((typeof jsGET !== 'undefined') && this.storeHistory)
+ {
+ if (file.mime !== 'text/directory')
+ {
+ // TODO: really, a full check should also check whether the fmPath equals the this.CurrentDir.path
+ if (file.name === jsGET.get('fmFile'))
+ {
+ // this will ensure the subsequent fill() action will revert the detail view to the directory details.
+ jsGET.remove(['fmFile']);
+ }
+ }
+ }
+
var tx_cfg = this.options.mkServerRequestURL(this, 'destroy', {
file: file.name,
directory: this.CurrentDir.path,
@@ -1341,14 +1347,13 @@ var FileManager = new Class({
this.fireEvent('modify', [Object.clone(file), j, 'destroy', this]);
// remove entry from cached JSON directory list and remove the item from the view.
- // This is particularly important when working on a paginated directory and afterwards the pages are jumped back & forth:
- // the next time around, this item should NOT appear in the list anymore!
+ // Also, this call will clear the detail pane view if the deleted file is shown over there.
this.deselect(file.element);
var rerendering_list = false;
if (this.view_fill_json)
{
- this.delete_from_dircache(file); /* do NOT use j.name, as that one can be 'cleaned up' as part of the 'move' operation! */
+ this.delete_from_dircache(file);
// minor caveat: when we paginate the directory list, then browsing to the next page will skip one item (which would
// have been the first on the next page). The brute-force fix for this is to force a re-render of the page when in
@@ -1507,6 +1512,11 @@ var FileManager = new Class({
if (csel != null)
csel.removeClass('selected');
}
+ else if (direction === 'none')
+ {
+ // select the current item (don't look for selected / hover classes to find out who is selected)
+ current = this.Current;
+ }
else if (this.browser.getElement('span.fi.hover') == null && this.browser.getElement('span.fi.selected') == null)
{
// none is selected: select first item (folder/file)
@@ -1528,7 +1538,7 @@ var FileManager = new Class({
span.removeClass('hover');
});
- var stepsize = 1, next, currentFile;
+ var stepsize = 1, next, file;
switch (direction) {
// go down
@@ -1629,13 +1639,13 @@ var FileManager = new Class({
csel.removeClass('selected');
current.addClass('selected');
- currentFile = current.retrieve('file');
- this.diag.log('on key ENTER file = ', currentFile);
- if (currentFile.mime === 'text/directory') {
- this.load(currentFile.dir + currentFile.name /*.replace(this.root,'')*/);
+ file = current.retrieve('file');
+ this.diag.log('on key ENTER file = ', file);
+ if (file.mime === 'text/directory') {
+ this.load(file.path);
}
else {
- this.fillInfo(currentFile);
+ this.fillInfo(file);
}
break;
@@ -1658,9 +1668,9 @@ var FileManager = new Class({
next.addClass('hover');
}
- currentFile = current.retrieve('file');
- this.diag.log('on key DELETE file = ', currentFile);
- this.destroy(currentFile);
+ file = current.retrieve('file');
+ this.diag.log('on key DELETE file = ', file);
+ this.destroy(file);
current = next;
this.Current = current;
@@ -1706,13 +1716,14 @@ var FileManager = new Class({
var icons = el.getElements('img.browser-icon');
if (icons) {
icons.each(function(icon) {
- icon.fade(0);
+ icon.hide();
+ //icon.fade(0);
});
}
this.diag.log('DISABLE keyboard up/down on revert');
this.drag_is_active = false;
- this.imageadd.fade(0);
+ this.imagedragstate.changeState(0);
},
// clicked 'first' button in the paged list/thumb view:
@@ -1815,26 +1826,18 @@ var FileManager = new Class({
span.removeClass('hover');
});
- this.diag.log('# fill: file = ', j, ', onShow: ', this.onShow, ', mgr: ', this);
+ this.diag.log('# fill: JSON = ', j, ', mgr: ', this);
this.root = j.root;
this.CurrentDir = j.this_dir;
- if (!this.onShow) {
- this.diag.log('fill internal: fillInfo: file = ', j, j.this_dir);
- this.fillInfo(j.this_dir); // XXXX
- }
this.browser.empty();
-// Partikule
-// Add of the thumbnail list in the preview panel: blow away any pre-existing list now, as we'll generate a new one now:
-
+ // Adding the thumbnail list in the preview panel: blow away any pre-existing list now, as we'll generate a new one now:
this.dir_filelist.empty();
-// /Partikule
-
// set history
- if (typeof jsGET !== 'undefined' && this.storeHistory && j.this_dir.mime === 'text/directory')
+ if (typeof jsGET !== 'undefined' && this.storeHistory)
{
- jsGET.set({'fmPath': j.path});
+ jsGET.set({'fmPath': this.CurrentDir.path});
}
var current_path = this.normalize(this.root + this.CurrentDir.path);
@@ -1847,15 +1850,16 @@ var FileManager = new Class({
this.showError('' + j.error);
return false;
}
- var rootPath = j.root.slice(0,-1).split('/');
- rootPath.pop();
+ var rootPath = '/' + j.root;
+ var rootParent = this.dirname(rootPath);
+ var rplen = rootParent.length;
current_path.split('/').each((function(folderName) {
if (!folderName) return;
pre.push(folderName);
- var path = ('/'+pre.join('/')+'/').replace(j.root,'');
- this.diag.log('on fill: display directory path chuncks: root = ', j.root, ', path: ' , path, ', folder: ', folderName);
- if (rootPath.contains(folderName)) {
+ var path = ('/'+pre.join('/')+'/');
+ this.diag.log('on fill: display directory path chunks: JSON root = ', j.root, ', path: ' , path, ', folder: ', folderName, ', root: ', rootPath, ', parent: ', rootParent);
+ if (path.length <= rplen) {
// add non-clickable path
text.push(new Element('span', {'class': 'icon', text: folderName}));
} else {
@@ -1865,8 +1869,9 @@ var FileManager = new Class({
href: '#',
text: folderName
}).addEvent('click', (function(e) {
- this.diag.log('path section - click event: ', e, path);
e.stop();
+ path = path.replace(j.root,'');
+ this.diag.log('## path section - click event: ', e, ', path: ', path);
this.load(path);
}).bind(this))
);
@@ -1895,16 +1900,6 @@ var FileManager = new Class({
* For very large directories, where the number of directories in there and/or the number of files is HUGE (> 200),
* we DISABLE drag&drop functionality.
*
- * Yes, we could have opted for the alternative, which is splitting up the .makeDraggable() activity in multiple
- * setTimeout(callback, 0) initiated chunks in order to spare the user the hassle of a 'slow script' dialog,
- * but in reality drag&drop is ludicrous in such an environment; currently we do not (yet) support autoscrolling
- * the list to enable drag&dropping it to elements further away that the current viewport can hold at the same time,
- * but drag&drop in a 500+ image carrying directory is resulting in a significant load of the browser anyway;
- * alternative means to move/copy files should be provided in such cases instead.
- *
- * Hence we run through the list here and abort / limit the drag&drop assignment process when the hardcoded number of
- * directories or files have been reached (support_DnD_for_this_dir).
- *
* TODO: make these numbers 'auto adaptive' based on timing measurements: how long does it take to initialize
* a view on YOUR machine? --> adjust limits accordingly.
*/
@@ -1973,6 +1968,9 @@ var FileManager = new Class({
// remember pagination position history
this.store_view_fill_startindex(startindex);
+ // reset the fillInfo fire marker:
+ this.fillInfoOnFillFired = false;
+
this.view_fill_timer = this.fill_chunkwise_1.delay(1, this, [startindex, endindex, endindex - startindex, pagesize, support_DnD_for_this_dir, starttime, els, kbd_dir, preselect]);
return true;
@@ -1984,7 +1982,7 @@ var FileManager = new Class({
new Element('span', {
'class': this.listType,
'styles': {
- 'background-image': 'url(' + (thumbnail_url ? thumbnail_url : this.assetBasePath + 'Images/loader.gif') + ')'
+ 'background-image': 'url(' + (thumbnail_url ? thumbnail_url : this.assetsUrl + 'Images/loader.gif') + ')'
}
}).addClass('fm-thumb-bg'),
new Element('span', {'class': 'filemanager-filename', text: file.name, title: file.name})
@@ -1993,14 +1991,6 @@ var FileManager = new Class({
dir_gallery_item_maker: function(thumbnail_url, file)
{
- // as we want the thumbnails line up reasonably well in a grid and have no huge white areas thanks to long filenames,
- // we strip the filename on display. When the user wishes to know the full filename, he can hover over the image, anyway.
- var fname = file.name;
- if (fname.length > 6)
- {
- fname = fname.substr(0, 6) + '...';
- }
-
var el = new Element('div', {
'class': 'fi',
'title': file.name
@@ -2008,18 +1998,91 @@ var FileManager = new Class({
new Element('div', {
'class': 'dir-gal-thumb-bg',
'styles': {
- 'background-image': 'url(' + (thumbnail_url ? thumbnail_url : this.assetBasePath + 'Images/loader.gif') + ')'
+ 'width': this.options.thumbSize4DirGallery + 'px',
+ 'height': this.options.thumbSize4DirGallery + 'px',
+ 'background-image': 'url(' + (thumbnail_url ? thumbnail_url : this.assetsUrl + 'Images/loader.gif') + ')'
}
}),
new Element('div', {
'class': 'name',
- 'text': fname
+ 'styles': {
+ 'width': this.options.thumbSize4DirGallery + 'px'
+ },
+ 'text': file.name
})
);
this.tips.attach(el);
return el;
},
+ dir_gallery_set_actual_img: function(file, dg_el)
+ {
+ // calculate which thumb to use and how to center it:
+ var img_url, iw, ih, ds, mt, mb, ml, mr, ratio;
+
+ ds = this.options.thumbSize4DirGallery;
+ if (ds > 48)
+ {
+ img_url = file.thumb250;
+ iw = file.thumb250_width;
+ ih = file.thumb250_height;
+ }
+ else
+ {
+ img_url = file.thumb48;
+ iw = file.thumb48_width;
+ ih = file.thumb48_height;
+ }
+
+ // 'zoom' image to fit area:
+ if (iw > ds)
+ {
+ var redux = ds / iw;
+ iw *= redux;
+ ih *= redux;
+ }
+ if (ih > ds)
+ {
+ var redux = ds / ih;
+ iw *= redux;
+ ih *= redux;
+ }
+ iw = Math.round(iw);
+ ih = Math.round(ih);
+ ml = Math.round((ds - iw) / 2);
+ mr = ds - ml - iw;
+ mt = Math.round((ds - ih) / 2);
+ mb = ds - mt - ih;
+
+ var self = this;
+
+ Asset.image(img_url, {
+ styles: {
+ width: iw,
+ height: ih,
+ 'margin-left': ml,
+ 'margin-top': mt,
+ 'margin-right': mr,
+ 'margin-bottom': mb
+ },
+ onLoad: function() {
+ var img_el = this;
+ var img_div = dg_el.getElement('div.dir-gal-thumb-bg').setStyle('background-image', '');
+ img_div.adopt(img_el);
+ },
+ onError: function() {
+ self.diag.log('dirgallery image asset: error!');
+ var iconpath = self.URLpath4assets + 'Images/Icons/Large/default-error.png';
+ dg_el.getElement('div.dir-gal-thumb-bg').setStyle('background-image', 'url(' + iconpath + ')');
+ },
+ onAbort: function() {
+ self.diag.log('dirgallery image asset: ABORT!');
+ var iconpath = self.URLpath4assets + 'Images/Icons/Large/default-error.png';
+ dg_el.getElement('div.dir-gal-thumb-bg').setStyle('background-image', 'url(' + iconpath + ')');
+ }
+ });
+ },
+
/*
* The old one-function-does-all fill() would take an awful long time when processing large directories. This function
* contains the most costly code chunk of the old fill() and has adjusted the looping through the j.dirs[] and j.files[] lists
@@ -2040,15 +2103,6 @@ var FileManager = new Class({
var duration = new Date().getTime() - starttime;
//this.diag.log(' + time duration @ fill_chunkwise_1(', startindex, '): ', duration);
- /*
- * Note that the '< j.dirs.length' / '< j.files.length' checks MUST be kept around: one of the fastest ways to abort/cancel
- * the render is emptying the dirs[] + files[] array, as that would abort the loop on the '< j.dirs.length' / '< j.files.length'
- * condition.
- *
- * This, together with killing our delay-timer, is done when anyone calls reset_view_fill_store() to
- * abort this render pronto.
- */
-
// first loop: only render directories, when the indexes fit the range: 0 .. j.dirs.length-1
// Assume several directory aspects, such as no thumbnail hassle (it's one of two icons anyway, really!)
var el, editButtons;
@@ -2089,7 +2143,7 @@ var FileManager = new Class({
el.addEvent('click', (function(e) {
self.diag.log('is_dir:CLICK: ', e);
var node = this;
- self.relayClick.apply(self, [e, node]);
+ self.relayClickOnItemInLeftPanel.apply(self, [e, node]);
}).bind(el));
editButtons = [];
@@ -2102,8 +2156,7 @@ var FileManager = new Class({
}
editButtons.each(function(v) {
- //icons.push(
- new Asset.image(this.assetBasePath + 'Images/' + v + '.png', {title: this.language[v]}).addClass('browser-icon').set('opacity', 0).addEvent('mouseup', (function(e, target) {
+ Asset.image(this.assetsUrl + 'Images/' + v + '.png', {title: this.language[v]}).addClass('browser-icon').hide().addEvent('mouseup', (function(e, target) {
// this = el, self = FM instance
e.preventDefault();
this.store('edit', true);
@@ -2112,11 +2165,10 @@ var FileManager = new Class({
self.tips.hide();
self[v](file);
}).bind(el)).inject(el,'top');
- //);
}, this);
els[1].push(el);
- //if (file.name === '..') el.fade(0.7);
+
el.inject(new Element('li',{'class':this.listType}).inject(this.browser)).store('parent', el.getParent());
//icons = $$(icons.map((function(icon) {
// this.showFunctions(icon,icon,0.5,1);
@@ -2166,34 +2218,31 @@ var FileManager = new Class({
// As we now have two views into the directory, we have to fetch the thumbnails, even when we're in 'list' view: the direcory gallery will need them!
// Besides, fetching the thumbs and all right after we render the directory also makes these thumbs + metadata available for drag&drop gallery and
// 'select mode', so they don't always have to ask for the meta data when it is required there and then.
- if (file.thumb48 || /* this.listType !== 'thumb' || */ !file.thumbs_deferred)
+ if (file.thumb48 || !file.thumbs_deferred)
{
// This is just a raw image
el = this.list_row_maker((this.listType === 'thumb' ? (file.thumb48 ? file.thumb48 : file.icon48) : file.icon), file);
- dg_el = this.dir_gallery_item_maker((file.thumb48 ? file.thumb48 : file.icon48), file);
+ dg_el = this.dir_gallery_item_maker(file.icon48, file);
+ if (file.thumb48)
+ {
+ this.dir_gallery_set_actual_img(file, dg_el);
+ }
}
else // thumbs_deferred...
{
- // We must AJAX POST our propagateData, so we need to do the post and take the url to the
- // thumbnail from the post results.
- //
- // The alternative here, taking only 1 round trip instead of 2, would have been to FORM POST
- // to a tiny iframe, which is suitably sized to contain the generated thumbnail and the POST
- // actually returning the binary image data, thus the iframe contents becoming the thumbnail image.
-
// update this one alongside the 'el':
dg_el = this.dir_gallery_item_maker(file.icon48, file);
el = (function(file, dg_el) { // Closure
- var iconpath = this.assetBasePath + 'Images/Icons/' + (this.listType === 'thumb' ? 'Large/' : '') + 'default-error.png';
+ var iconpath = this.assetsUrl + 'Images/Icons/' + (this.listType === 'thumb' ? 'Large/' : '') + 'default-error.png';
var list_row = this.list_row_maker((this.listType === 'thumb' ? file.icon48 : file.icon), file);
var tx_cfg = this.options.mkServerRequestURL(this, 'detail', {
directory: this.dirname(file.path),
file: file.name,
filter: this.options.filter,
- mode: 'direct'
+ mode: 'direct' + this.options.detailInfoMode
});
var req = new FileManager.Request({
@@ -2210,7 +2259,10 @@ var FileManager = new Class({
else
{
list_row.getElement('span.fm-thumb-bg').setStyle('background-image', 'url(' + (this.listType === 'thumb' ? j.thumb48 : j.icon) + ')');
- dg_el.getElement('div.dir-gal-thumb-bg').setStyle('background-image', 'url(' + j.thumb48 + ')');
+ if (j.thumb48)
+ {
+ this.dir_gallery_set_actual_img(j, dg_el);
+ }
}
// update the stored json for this file as well:
@@ -2242,62 +2294,6 @@ var FileManager = new Class({
}).bind(this)(file, dg_el);
}
- /*
- * WARNING: for some (to me) incomprehensible reason the old code which bound the event handlers to 'this==self' and which used the 'el' variable
- * available here, does NOT WORK ANY MORE - tested in FF3.6. Turns out 'el' is pointing anywhere but where you want it by the time
- * the event handler is executed.
- *
- * The 'solution' which I found was to rely on the 'self' reference instead and bind to 'el'. If the one wouldn't work, the other shouldn't,
- * but there you have it: this way around it works. FF3.6.14 :-(
- *
- * EDIT 2011/03/16: the problem started as soon as the old Array.each(function(...) {...}) by the chunked code which uses a for loop:
- *
- * http://jibbering.com/faq/notes/closures/
- *
- * as it says there:
- *
- * A closure is formed when one of those inner functions is made accessible outside of the function in which it was
- * contained, so that it may be executed after the outer function has returned. At which point it still has access to
- * the local variables, parameters and inner function declarations of its outer function. Those local variables,
- * parameter and function declarations (initially) >>>> have the values that they had when the outer function returned <<<<
- * and may be interacted with by the inner function.
- *
- * The >>>> <<<< emphasis is mine: in the .each() code, each el was a separate individual, while due to the for loop,
- * the last 'el' to exist at all is the one created during the last round of the loop in that chunk. Which explains the
- * observed behaviour before the fix: the file names associated with the 'el' element object were always pointing
- * at some item further down the list, not necessarily the very last one, but always these references were 'grouped':
- * multiple rows would produce the same filename.
- *
- * EXTRA: 2011/04/09: why you don't want to add this event for any draggable item!
- *
- * It turns out that IE9 (IE6-8 untested as I write this) and Opera do NOT fire the 'click' event after the drag operation is
- * 'cancel'led, while other browsers fire both (Chrome/Safari/FF3).
- * For the latter ones, the event handler sequence after a simple click on a draggable item is:
- * - Drag::onBeforeStart
- * - Drag::onCancel
- * - 'click'
- * while a tiny amount of dragging produces this sequence instead:
- * - Drag::onBeforeStart
- * - Drag::onStart
- * - Drag::onDrop
- * - 'click'
- *
- * Meanwhile, Opera and IE9 do this:
- * - Drag::onBeforeStart
- * - Drag::onCancel
- * - **NO** click event!
- * while a tiny amount of dragging produces this sequence instead:
- * - Drag::onBeforeStart
- * - Drag::onStart
- * - Drag::onDrop
- * - **NO** click event!
- *
- * which explains why the old implementation did not simply register this 'click' event handler and had 'revert' fake the 'click'
- * event instead.
- * HOWEVER, the old way, using revert() (now called revert_drag_n_drop()) was WAY too happy to hit the 'click' event handler. In
- * fact, the only spot where such 'manually firing' was desirable is when the drag operation is CANCELLED. And only there!
- */
-
// 2011/04/09: only register the 'click' event when the element is NOT a draggable:
if (!support_DnD_for_this_dir)
{
@@ -2305,22 +2301,19 @@ var FileManager = new Class({
el.addEvent('click', (function(e) {
self.diag.log('is_file:CLICK: ', e);
var node = this;
- self.relayClick.apply(self, [e, node]);
+ self.relayClickOnItemInLeftPanel.apply(self, [e, node]);
}).bind(el));
}
editButtons = [];
- // download icon
- if (this.options.download) {
- if (this.options.download) editButtons.push('download');
- }
- // rename, delete icon
+ // download, rename, delete icon
+ if (this.options.download) editButtons.push('download');
if (this.options.rename) editButtons.push('rename');
if (this.options.destroy) editButtons.push('destroy');
editButtons.each(function(v) {
- new Asset.image(this.assetBasePath + 'Images/' + v + '.png', {title: this.language[v]}).addClass('browser-icon').set('opacity', 0).addEvent('mouseup', (function(e, target) {
+ Asset.image(this.assetsUrl + 'Images/' + v + '.png', {title: this.language[v]}).addClass('browser-icon').hide().addEvent('mouseup', (function(e, target) {
// this = el, self = FM instance
e.preventDefault();
this.store('edit', true);
@@ -2335,8 +2328,8 @@ var FileManager = new Class({
el.inject(new Element('li',{'class':this.listType}).inject(this.browser)).store('parent', el.getParent());
// ->> LOAD the FILE/IMAGE from history when PAGE gets REFRESHED (only directly after refresh)
- //this.diag.log('fill on PRESELECT (test): onShow = ', this.onShow, ', file = ', file, ', fmFile = ', fmFile, ', preselect = ', preselect);
- if (this.onShow)
+ //this.diag.log('fill on PRESELECT (test): onShow = ', this.fillInfoOnFillFired, ', file = ', file, ', fmFile = ', fmFile, ', preselect = ', preselect);
+ if (!this.fillInfoOnFillFired)
{
if (preselect)
{
@@ -2348,6 +2341,7 @@ var FileManager = new Class({
file.element.addClass('selected');
this.diag.log('fill on PRESELECT: fillInfo: file = ', file);
this.fillInfo(file);
+ this.fillInfoOnFillFired = true;
}
}
else if (fmFile)
@@ -2360,19 +2354,12 @@ var FileManager = new Class({
file.element.addClass('selected');
this.diag.log('fill: fillInfo: file = ', file);
this.fillInfo(file);
+ this.fillInfoOnFillFired = true;
}
}
- else
- {
- this.diag.log('fill: RESET onShow: file = ', file);
- this.onShow = false;
- }
}
-// Partikule
-// Thumbs list
-
// use a closure to keep a reference to the current dg_el, otherwise dg_el, file, etc. will carry the values they got at the end of the loop!
(function(dg_el, el, file)
{
@@ -2380,22 +2367,28 @@ var FileManager = new Class({
'click': function(e)
{
clearTimeout(self.dir_gallery_click_timer);
- self.dir_gallery_click_timer = self.relayDblClick.delay(700, self, [e, this, dg_el, file, 1]);
+ self.dir_gallery_click_timer = self.relaySingleOrDoubleClick.delay(700, self, [e, this, dg_el, file, 1]);
},
'dblclick': function(e)
{
- clearTimeout(this.dir_gallery_click_timer);
- this.dir_gallery_click_timer = self.relayDblClick.delay(0, self, [e, this, dg_el, file, 2]);
+ clearTimeout(self.dir_gallery_click_timer);
+ self.dir_gallery_click_timer = self.relaySingleOrDoubleClick.delay(0, self, [e, this, dg_el, file, 2]);
}
});
dg_el.inject(this.dir_filelist);
}).bind(this)(dg_el, el, file);
-
-// / Partikule
}
}
+ // when we get here, we have rendered all files in the current page and we know whether we have fired off a fillInfo on a preselect/history-recalled file now, or not:
+ if (!this.fillInfoOnFillFired)
+ {
+ this.diag.log('fill internal: fillInfo: file = ', j, j.this_dir);
+ this.fillInfo(j.this_dir);
+ this.fillInfoOnFillFired = true;
+ }
+
// check how much we've consumed so far:
duration = new Date().getTime() - starttime;
//this.diag.log(' + time taken in array traversal = ', duration);
@@ -2417,34 +2410,57 @@ var FileManager = new Class({
duration = new Date().getTime() - starttime;
//this.diag.log(' + time taken in array traversal + revert = ', duration);
- if (support_DnD_for_this_dir) {
+ if (support_DnD_for_this_dir)
+ {
+ var self = this;
+
// -> make draggable
$$(els[0]).makeDraggable({
- droppables: $$(this.droppables.combine(els[1])),
- //stopPropagation: true,
- onDrag: (function(el, e) {
- this.imageadd.setStyles({
- 'left': e.page.x + 25,
- 'top': e.page.y + 25
+ droppables: $$(els[1]),
+
+ // We position the element relative to its original position; this ensures the drag always works with arbitrary container.
+ onDrag: (function(el, e)
+ {
+ var dpos = el.retrieve('delta_pos');
+ if (this.browserScroll.contains(el)) this.diag.log('~~~ positions while dragging: ', dpos, e, 1 * this.browserScroll.contains(el));
+
+ el.setStyles({
+ display: 'block',
+ left: e.page.x - dpos.x + 12,
+ top: e.page.y - dpos.y + 10
});
+
+ this.imagedragstate.setStyles({
+ 'left': e.page.x - dpos.x - 12,
+ 'top': e.page.y - dpos.y + 2
+ });
+
+ this.scroller.getCoords(e);
+
}).bind(this),
onBeforeStart: (function(el) {
- this.diag.log('draggable:onBeforeStart', el);
- var position = el.getPosition();
- el.addClass('drag').setStyles({
- 'z-index': this.options.zIndex + 1500,
- 'position': 'absolute',
- 'width': el.getWidth() - el.getStyle('paddingLeft').toInt() - el.getStyle('paddingRight').toInt(),
- 'left': position.x,
- 'top': position.y
- }).inject(this.container);
+
+ var dpos = self.container.getPosition();
+
+ // fetch this Drag.Move instance:
+ var dragger = el.retrieve('dragger');
+ var mouse_start = dragger.mouse.start; // contains the event.page.x/y values
+
+ dpos.mouse_start = mouse_start;
+ el.store('delta_pos', dpos);
+ this.diag.log('~~~ positions before start: ', dpos, this.container.getPosition(), el.getPosition(), this.browsercontainer.getPosition(), 1 * this.browserScroll.contains(el));
+
+ // start the scroller; sensitive areas are top and bottom 20% of the total height:
+ this.scroller.options.area = this.browserScroll.getSize().y * 0.2;
+ this.scroller.start();
}).bind(this),
// FIX: do not deselect item when aborting dragging _another_ item!
onCancel: (function(el) {
this.diag.log('draggable:onCancel', el);
+ this.scroller.stop();
this.revert_drag_n_drop(el);
/*
* Fixing the 'click' on FF+Opera (other browsers do get that event for any item which is made draggable):
@@ -2455,33 +2471,49 @@ var FileManager = new Class({
* So we then manually fire the 'click' event. See also the comment near the 'click' event handler registration in fill_chunkwise_1()
* about the different behaviour in different browsers.
*/
- this.relayClick(null, el);
+ this.relayClickOnItemInLeftPanel(null, el);
}).bind(this),
- onStart: (function(el) {
+ onStart: (function(el, e) {
this.diag.log('draggable:onStart', el);
this.tips.hide();
- el.fade(0.7).addClass('move');
+ var position = el.getPosition();
+ var dpos = el.retrieve('delta_pos');
+ // this.diag.log('~~~ positions at start: ', position, dpos, e, 1 * this.browserScroll.contains(el));
- this.diag.log('ENABLE keyboard up/down on drag start');
+ el.addClass('drag').setStyles({
+ 'z-index': this.options.zIndex + 1500,
+ 'position': 'absolute',
+ 'width': el.getWidth() - el.getStyle('paddingLeft').toInt() - el.getStyle('paddingRight').toInt(),
+ 'display': 'none',
+ 'left': e.page.x - dpos.x,
+ 'top': e.page.y - dpos.y
+ }).inject(this.container);
+
+ el.fade(0.7).addClass('move');
- // FIX wrong visual when CONTROL key is kept depressed between drag&drops: the old code discarded the relevant keyboard handler; we simply switch visuals but keep the keyboard handler active.
- // This state change will be reverted in revert_drag_n_drop().
this.drag_is_active = true;
- this.imageadd.fade(0 + this.ctrl_key_pressed);
+
+ this.imagedragstate.setStyles({
+ 'left': dpos.x - dpos.x - 12,
+ 'top': dpos.y - dpos.y + 2
+ }).changeState(1 + this.ctrl_key_pressed);
}).bind(this),
- onEnter: function(el, droppable) {
+ onEnter: (function(el, droppable) {
droppable.addClass('droppable');
- },
+ this.imagedragstate.changeState(1 + this.ctrl_key_pressed);
+ }).bind(this),
- onLeave: function(el, droppable) {
+ onLeave: (function(el, droppable) {
droppable.removeClass('droppable');
- },
+ this.imagedragstate.changeState(3);
+ }).bind(this),
onDrop: (function(el, droppable, e) {
this.diag.log('draggable:onDrop', el, droppable, e);
+ this.scroller.stop();
var is_a_move = !(e.control || e.meta);
this.drop_pending = 1 + is_a_move;
@@ -2499,7 +2531,7 @@ var FileManager = new Class({
if (this.onDragComplete(el, droppable)) {
this.drop_pending = 0;
- this.revert_drag_n_drop(el); // go and request the details anew, then refresh them in the view
+ this.revert_drag_n_drop(el);
return;
}
@@ -2507,17 +2539,17 @@ var FileManager = new Class({
this.diag.log('on drop dir = ', dir);
}
- if ((!this.options.move_or_copy) || (is_a_move && !droppable)) {
+ if ((!this.options.move_or_copy) || (is_a_move && !dir)) {
this.drop_pending = 0;
- this.revert_drag_n_drop(el); // go and request the details anew, then refresh them in the view
+ this.revert_drag_n_drop(el);
return;
}
- this.revert_drag_n_drop(el); // do not send the 'detail' request in here: this.drop_pending takes care of that!
+ this.revert_drag_n_drop(el);
var file = el.retrieve('file');
- this.diag.log('on drop file = ', file, ', current dir:', this.CurrentDir, ', droppable: ', droppable);
+ this.diag.log('on drop file = ', file, ', current dir:', this.CurrentDir, ', droppable: ', droppable, ', dir: ', dir);
if (this.Request) this.Request.cancel();
@@ -2552,7 +2584,8 @@ var FileManager = new Class({
if (this.view_fill_json)
{
- this.delete_from_dircache(file); /* do NOT use j.name, as that one can be 'cleaned up' as part of the 'move' operation! */
+ /* do NOT use the resulting j.name, as that one can be 'cleaned up' as part of the 'move' operation! */
+ this.delete_from_dircache(file);
// minor caveat: when we paginate the directory list, then browsing to the next page will skip one item (which would
// have been the first on the next page). The brute-force fix for this is to force a re-render of the page when in
@@ -2647,7 +2680,6 @@ var FileManager = new Class({
this.adaptive_update_pagination_size(render_count, render_count, render_count, pagesize, duration, 1.0 / 5.0, 1.0, 0);
// we're done: erase the timer so it can be garbage collected
- //this.RequestQueue.cancel_bulk('fill'); -- do NOT do this!
clearTimeout(this.view_fill_timer);
this.view_fill_timer = null;
@@ -2719,7 +2751,7 @@ var FileManager = new Class({
if (file.mime !== 'text/directory')
jsGET.set({'fmFile': file.name});
else
- jsGET.set({'fmFile': ''});
+ jsGET.remove(['fmFile']);
}
var icon = file.icon;
@@ -2732,8 +2764,6 @@ var FileManager = new Class({
this.preview.empty();
- //if (file.mime === 'text/directory') return;
-
if (this.drop_pending == 0)
{
if (this.Request) this.Request.cancel();
@@ -2744,10 +2774,11 @@ var FileManager = new Class({
var tx_cfg = this.options.mkServerRequestURL(this, 'detail', {
directory: this.dirname(file.path),
- // fixup for *directory* detail requests: (file.mime === 'text/directory'
- file: (file.mime === 'text/directory' && file.name === '') ? '/' : file.name,
+ // fixup for root directory detail requests:
+ file: (file.mime === 'text/directory' && file.path === '/') ? '/' : file.name,
filter: this.options.filter,
- mode: 'auto' // provide either direct links to the thumbnails (when available in cache) or PHP event trigger URLs for delayed thumbnail image creation (performance optimization: faster page render)
+ // provide either direct links to the thumbnails (when available in cache) or PHP event trigger URLs for delayed thumbnail image creation (performance optimization: faster page render):
+ mode: 'auto' + this.options.detailInfoMode
});
this.Request = new FileManager.Request({
@@ -2807,7 +2838,7 @@ var FileManager = new Class({
if (prev && !j.thumb250 && j.thumbs_deferred)
{
- var iconpath = this.assetBasePath + 'Images/Icons/Large/default-error.png';
+ var iconpath = this.assetsUrl + 'Images/Icons/Large/default-error.png';
if (0)
{
@@ -2823,7 +2854,7 @@ var FileManager = new Class({
directory: this.dirname(file.path),
file: file.name,
filter: this.options.filter,
- mode: 'direct'
+ mode: 'direct' + this.options.detailInfoMode
});
var req = new FileManager.Request({
@@ -2840,11 +2871,6 @@ var FileManager = new Class({
prev.set('src', img_url);
prev.addEvent('load', function() {
- // when the thumb250 image has loaded, remove the loader animation in the background ...
- //this.setStyle('background', 'none');
- // ... AND blow away the encoded 'width' and 'height' styles: after all, the thumb250 generation MAY have failed.
- // In that case, an icon is produced by the backend, but it will have different dimensions, and we don't want to
- // distort THAT one, either.
this.setStyles({
'width': '',
'height': '',
@@ -2858,7 +2884,6 @@ var FileManager = new Class({
this.fireEvent('details', [j, this]);
// update the stored json for this file as well:
-
// now mix with the previously existing 'file' info (as produced by a 'view' run):
file = Object.merge(file, j);
@@ -2945,11 +2970,17 @@ var FileManager = new Class({
$(appearOn).addEvents({
mouseenter: (function() {
- this.set('opacity', opacity[0]);
- }).bind(icon),
+ // see comment at the drag&drop section further above about the 'mouseleave' / 'mouseover' trouble due to the dragged element:
+ // here we make sure we don't 'track' the element hover while a drag&drop is in progress:
+ if (this.drag_is_active) {
+ return;
+ }
+
+ icon.set('opacity', opacity[0]);
+ }).bind(this),
mouseleave: (function() {
- this.set('opacity', opacity[1]);
- }).bind(icon)
+ icon.set('opacity', opacity[1]);
+ }).bind(this)
});
return icon;
},
@@ -3012,7 +3043,8 @@ var FileManager = new Class({
this.reset_fill();
- this.view_fill_json = ((j && j.status) ? j : null); // clear out the old JSON data and set up possibly new data.
+ // clear out the old JSON data and set up possibly new data.
+ this.view_fill_json = ((j && j.status) ? j : null);
// ^^^ the latest JSON array describing the entire list; used with pagination to hop through huge dirs without repeatedly
// consulting the server. The server doesn't need to know we're so slow we need pagination now! ;-)
},
@@ -3169,14 +3201,111 @@ var FileManager = new Class({
if (typeof console !== 'undefined')
{
- if (console.info)
+ // WARNING: MS IE9 (+ v8?) says: this object doesn't support the 'apply' method. :-(((
+ // Also, MSIE 8/9 doesn't show object dumps like you'd expect; Firebug Lite allegedly fixes that,
+ // but this is code which intends to 'hide' all that shite, so we can simply write diag.log() and
+ // not bother where it will end up.
+ if (console.info && console.info.apply)
{
console.info.apply(console, arguments);
}
- else if (console.log)
+ else if (console.log && console.log.apply)
{
console.log.apply(console, arguments);
}
+ else if (console.info || console.log)
+ {
+ // the MSIE downgrade
+ var l = (console.info || console.log);
+ var a;
+ var lt = '';
+ var m, e, v;
+ var multiobj = 0; // count items dumped without inter-WS
+ for (a in arguments)
+ {
+ multiobj++;
+ a = arguments[a];
+ switch (typeof a)
+ {
+ case 'undefined':
+ lt += '(undefined)';
+ break;
+
+ case 'null':
+ lt += '(null)';
+ break;
+
+ case 'object':
+ lt += '{';
+ m = '';
+ for (e in a)
+ {
+ lt += m;
+
+ v = a[e];
+ //if (typeof e !== 'string') continue;
+ switch (typeof v)
+ {
+ case 'function':
+ continue; // skip these
+
+ case 'undefined':
+ lt += e + ': (undefined)';
+ break;
+
+ case 'null':
+ lt += e + ': (null)';
+ break;
+
+ case 'object':
+ // nuts of course: IE9 has objects which turn out as === null and clunk on .toString() as a consequence >:-S
+ if (v === null)
+ {
+ lt += e + ': (null)';
+ }
+ else
+ {
+ lt += e + ': ' + v.toString();
+ }
+ break;
+
+ case 'string':
+ lt += e + ': "' + v + '"';
+ break;
+
+ default:
+ lt += e + ': ' + v.toString();
+ break;
+ }
+ m = ', ';
+ }
+ lt += '}';
+ break;
+
+ case 'string':
+ // reset inter-WS formatting assist:
+ multiobj = 0;
+ lt += a;
+ break;
+
+ default:
+ try
+ {
+ m = a.toString();
+ }
+ catch (e)
+ {
+ m = '(*clunk*)';
+ }
+ lt += v;
+ break;
+ }
+ if (multiobj >= 1)
+ {
+ lt += ' ';
+ }
+ }
+ }
}
}
}
@@ -3253,6 +3382,9 @@ Asset.javascript(__MFM_ASSETS_DIR__+'/js/milkbox/milkbox.js');
Asset.css(__MFM_ASSETS_DIR__+'/js/milkbox/css/milkbox.css');
Asset.css(__MFM_ASSETS_DIR__+'/Css/FileManager.css');
Asset.css(__MFM_ASSETS_DIR__+'/Css/Additions.css');
+if (Browser.ie && Browser.version <= 7) {
+ Asset.css(__MFM_ASSETS_DIR__+'/Css/FileManager_ie7.css');
+}
Asset.javascript(__MFM_ASSETS_DIR__+'/js/jsGET.js', {
events: {
load: (function() {
@@ -3392,8 +3524,6 @@ FileManager.Dialog = new Class({
if (('autofocus' in autofocus_el) && !(Browser.Engine && Browser.Engine.webkit))
{
// HTML5 support: see http://diveintohtml5.org/detect.html
- //
- // Unfortunately, it's not really working for me in webkit browsers (Chrome, Safari) :-((
autofocus_el.set('autofocus', 'autofocus');
autofocus_el = null;
}
@@ -3408,7 +3538,7 @@ FileManager.Dialog = new Class({
// and http://www.mkyong.com/javascript/focus-is-not-working-in-ie-solution/
if (autofocus_el)
{
- if (0) // the delay suggested as a fix there is part of the fade()...
+ if (0)
{
(function(el) {
el.focus();
@@ -3416,8 +3546,6 @@ FileManager.Dialog = new Class({
}
else
{
- //autofocus_el.set('tabIndex', 0); // http://code.google.com/p/chromium/issues/detail?id=27868#c15
- // ^-- not needed. When you debug JS in a Webkit browser, you're toast when it comes to getting input field focus, period. :-(
autofocus_el.focus();
}
}
@@ -3446,14 +3574,15 @@ FileManager.Dialog = new Class({
// make sure the dialog never is larger than the viewport!
var ddim = this.el.getSize();
var vdim = window.getSize();
- var maxx = (vdim.x - 20) * 0.85; // heuristic: make dialog a little smaller than the screen itself and keep a place for possible outer scrollbars
+ // heuristic: make dialog a little smaller than the screen itself and keep a place for possible outer scrollbars
+ var maxx = (vdim.x - 20) * 0.85;
if (ddim.x >= maxx)
{
this.el.setStyle('width', maxx.toInt());
}
ddim = this.el.getSize();
var cdim = this.content_el.getSize();
- var maxy = (vdim.y - 20) * 0.85; // heuristic: make dialog a little less high than the screen itself and keep a place for possible outer scrollbars
+ var maxy = (vdim.y - 20) * 0.85;
if (ddim.y >= maxy)
{
// first attempt to correct this by making the dialog wider:
@@ -3565,10 +3694,12 @@ this.Overlay = new Class({
this.destroy();
}
else {
- this.el.setStyles({
- width: document.getScrollWidth(),
- height: document.getScrollHeight()
- });
+ if (!Browser.ie) {
+ this.el.setStyles({
+ width: document.getScrollWidth(),
+ height: document.getScrollHeight()
+ });
+ }
}
},
diff --git a/Source/Gallery.js b/Source/Gallery.js
old mode 100644
new mode 100755
index 525f441..61c4bc2
--- a/Source/Gallery.js
+++ b/Source/Gallery.js
@@ -56,6 +56,9 @@ FileManager.Gallery = new Class({
},
show: function(self) {
+ self.gallery.empty();
+ self.files = {};
+
self.show_gallery();
self.populate();
},
@@ -257,8 +260,10 @@ FileManager.Gallery = new Class({
// determine how many images we can show next to one another:
var galWidthComp = 2; // 2px not accounted for in the Width calculation; without these the width slowly grows instead of 'jump' to fit one more/less image horizontally
var imgMarginWidth = 4; // 4px unaccounted for in the element width
- var radiiCorr = 20; // correction for the radii in the FileManager container: looks better that way
+ var radiiCorr = 40; // correction for the radii in the FileManager container: looks better that way; must at least be 20
var imgWidth = 84; // derived from current CSS; bad form to do it this way, but this is a good guess when there's no image in there yet.
+ var scrollbarCorr = 20; // correction for optional Y scrollbar when the number of images doesn't fit in two rows anymore.
+
var imgs = this.galleryContainer.getElements('li');
if (imgs && imgs[0])
{
@@ -266,10 +271,10 @@ FileManager.Gallery = new Class({
imgWidth = imgs[0].getWidth() + imgMarginWidth;
}
var galWidth = this.galleryContainer.getWidth();
- var g_rem = galWidth % imgWidth;
- var img_cnt = Math.floor((size.x - g_rem - radiiCorr) / imgWidth);
+ var g_rem = (galWidth - scrollbarCorr) % imgWidth;
+ var img_cnt = Math.floor((size.x - g_rem - scrollbarCorr - radiiCorr) / imgWidth);
if (img_cnt < 3) img_cnt = 3;
- var gw = img_cnt * imgWidth + g_rem;
+ var gw = img_cnt * imgWidth + g_rem + scrollbarCorr;
this.galleryContainer.setStyles({
top: pos.y + size.y - 1,
@@ -441,7 +446,7 @@ FileManager.Gallery = new Class({
mb = ch - mt - h;
var self = this;
- var img = new Asset.image(pic, {
+ var img = Asset.image(pic, {
styles: {
width: w,
height: h,
@@ -462,12 +467,12 @@ FileManager.Gallery = new Class({
},
onError: function() {
self.diag.log('image asset: error!');
- var iconpath = self.assetBasePath + 'Images/Icons/Large/default-error.png';
+ var iconpath = self.URLpath4assets + 'Images/Icons/Large/default-error.png';
this.src = iconpath;
},
onAbort: function() {
self.diag.log('image asset: ABORT!');
- var iconpath = self.assetBasePath + 'Images/Icons/Large/default-error.png';
+ var iconpath = self.URLpath4assets + 'Images/Icons/Large/default-error.png';
this.src = iconpath;
}
});
@@ -516,7 +521,7 @@ FileManager.Gallery = new Class({
// store & display item in gallery:
var self = this;
- var destroyIcon = new Asset.image(this.assetBasePath + 'Images/destroy.png').set({
+ var destroyIcon = Asset.image(this.URLpath4assets + 'Images/destroy.png').set({
'class': 'filemanager-remove',
title: this.language.gallery.remove,
events: {
@@ -571,7 +576,7 @@ FileManager.Gallery = new Class({
directory: this.dirname(file.path),
file: file.name,
filter: this.options.filter,
- mode: 'direct' // provide direct links to the thumbnail files
+ mode: 'direct' + this.options.detailInfoMode // provide direct links to the thumbnail files
});
var req = new FileManager.Request({
@@ -755,6 +760,8 @@ FileManager.Gallery = new Class({
{
// we've got work to do, folks!
var i;
+ var abs_root = this.normalize('/' + this.root);
+
for (i = 0; i < count; ++i)
{
// LIFO queue:
@@ -763,7 +770,7 @@ FileManager.Gallery = new Class({
// coded so that we support 'legal URL space' items and 'absolute URL path' items at the same time:
// when paths start with the root directory, we'll strip that off to make them 'legal URL space' compliant filespecs.
- if (path.indexOf(this.root) === 0)
+ if (path.indexOf(abs_root) === 0)
{
path = path.substr(this.root.length);
}
@@ -785,11 +792,16 @@ FileManager.Gallery = new Class({
var serialized = {};
var metas = {};
var index = 0;
- Object.each(this.files,function(file) {
- serialized[file.legal_path] = (file.caption || '');
+ Object.each(this.files,function(file)
+ {
+ var path = (this.options.deliverPathAsLegalURL ? file.file.path : this.escapeRFC3986(this.normalize('/' + this.root + file.file.path))); // the absolute URL for the given file, rawURLencoded
+ var caption = (file.caption || '');
+ serialized[path] = caption;
var m = Object.clone(file.file);
m['order_no'] = index++;
- metas[file.legal_path] = m;
+ m['caption'] = caption;
+ m['pathRFC3986'] = path;
+ metas[path] = m;
}, this);
this.keepGalleryData = true;
this.hide(e);
diff --git a/Source/NoFlash.Uploader.js b/Source/NoFlash.Uploader.js
index 6f227f4..7c061fc 100644
--- a/Source/NoFlash.Uploader.js
+++ b/Source/NoFlash.Uploader.js
@@ -18,7 +18,7 @@ provides: Filemanager.NoFlashUploader
* While the flash uploader is preferable, sometimes it is not possible to use it due to
* server restrictions (eg, mod_security), or perhaps users refuse to use flash.
*
- * This Upload handler will allow the MFM to continue to function, without multiple-upload-at-once
+ * This Upload handler will allow the MTFM to continue to function, without multiple-upload-at-once
* function and without progress bars. But otherwise, it should work.
*/
FileManager.implement({
@@ -26,9 +26,7 @@ FileManager.implement({
options: {
resizeImages: true,
upload: true,
-
- // Is there a useful reason to have this different from propagateData... dubious :-/
- uploadAuthData: {}
+ uploadAuthData: {} // deprecated; use FileManager.propagateData instead!
},
hooks: {
@@ -39,35 +37,28 @@ FileManager.implement({
},
cleanup: {
- upload: function(){
- if (!this.options.upload || !this.upload) {
- return;
- }
-
- try {
- if (this.upload.uploader) {
- this.upload.uploader.set('opacity', 0).dispose();
- }
- }
- catch(e) { }
+ upload: function() {
+ this.hideUpload();
}
}
},
- _dummyframe: null,
-
- onDialogOpenWhenUpload: function(){
+ onDialogOpenWhenUpload: function() {
},
- onDialogCloseWhenUpload: function(){
+ onDialogCloseWhenUpload: function() {
},
// Writing to file input values is not permitted, we replace the field to blank it.
make_file_input: function(form_el)
{
- var fileinput = (new Element('input')).set({type: 'file', 'name': 'Filedata'}).setStyles({width: 120});
+ var fileinput = (new Element('input')).set({
+ type: 'file',
+ name: 'Filedata',
+ id: 'filemanager_upload_Filedata'
+ });
if (form_el.getElement('input[type=file]'))
{
fileinput.replaces(form_el.getElement('input[type=file]'));
@@ -79,149 +70,202 @@ FileManager.implement({
return form_el;
},
-
- startUpload: function()
+ hideUpload: function()
{
- if (!this.options.upload) {
- return;
+ if (!this.options.upload || !this.upload) return;
+
+ if (this.upload.uploadButton.label)
+ {
+ this.upload.uploadButton.label.fade(0).get('tween').chain(function() {
+ this.element.dispose().destroy();
+ });
+ this.upload.uploadButton.label = null;
+ }
+ if (this.upload.uploadButton)
+ {
+ this.upload.uploadButton.fade(0).get('tween').chain(function() {
+ this.element.dispose().destroy();
+ });
+ this.upload.uploadButton = null;
+ }
+ if (this.upload.form)
+ {
+ this.upload.inputs = null;
+
+ this.upload.form.dispose().destroy();
+ this.upload.form = null;
+ }
+ this.menu.setStyle('height', '');
+
+ if (this.upload.resizer)
+ {
+ this.upload.resizer.dispose().destroy();
+ this.upload.resizer = null;
}
// discard old iframe, if it exists:
- if (this._dummyframe)
+ if (this.upload.dummyframe)
{
// remove from the menu (dispose) and trash it (destroy)
- this._dummyframe.dispose().destroy();
- this._dummyframe = null;
+ this.upload.dummyframe.dispose().destroy();
+ this.upload.dummyframe = null;
}
+ },
- var mfm = this;
-
- var f = (new Element('form'))
- //.set('action', tx_cfg.url)
- .set('method', 'post')
- .set('enctype', 'multipart/form-data')
- .set('target', 'dummyframe')
- .setStyles({ 'float': 'left', 'padding-left': '3px', 'display': 'block'});
-
- var uploadButton = this.addMenuButton('upload').addEvents({
- click: function(e) {
- e.stop();
- mfm.browserLoader.set('opacity', 1);
- f.action = tx_cfg.url;
- // TODO: fixup the resize setting!
- // resize: ((this.label && this.label.getElement('.checkbox').hasClass('checkboxChecked')) ? 1 : 0)
-
- f.submit();
- },
- mouseenter: function(){
- this.addClass('hover');
- },
- mouseleave: function(){
- this.removeClass('hover');
- this.blur();
- },
- mousedown: function(){
- this.focus();
- }
- });
+ startUpload: function()
+ {
+ if (!this.options.upload) {
+ return;
+ }
- this.menu.adopt(uploadButton);
+ var self = this;
+
+ this.upload = {
+ inputs: {},
+ resizer: null,
+ dummyframe: null,
+ dummyframe_active: false, // prevent premature firing of the load event (hello, MSIE!) to cause us serious trouble in there
+
+ form: (new Element('form'))
+ //.set('action', tx_cfg.url)
+ .set('method', 'post')
+ .set('enctype', 'multipart/form-data')
+ .set('encoding', 'multipart/form-data') // IE7
+ .set('target', 'dummyframe')
+ .setStyles({
+ 'float': 'left',
+ 'padding-left': '3px',
+ 'display': 'block'
+ }),
+
+ uploadButton: this.addMenuButton('upload').inject(this.menu, 'bottom').addEvents({
+ click: function(e) {
+ e.stop();
+ self.browserLoader.fade(1);
+ self.upload.form.action = tx_cfg.url;
+
+ // Update curent dir path to form hidden field
+ self.upload.inputs['directory'].setProperty('value', self.CurrentDir.path);
+
+ self.upload.dummyframe_active = true; // NOW you may fire when ready...
+
+ self.upload.form.submit();
+ },
+ mouseenter: function() {
+ this.addClass('hover');
+ },
+ mouseleave: function() {
+ this.removeClass('hover');
+ this.blur();
+ },
+ mousedown: function() {
+ this.focus();
+ }
+ }),
- if (this.options.resizeImages){
- var resizer = new Element('div', {'class': 'checkbox'});
- var check = (function(){
- this.toggleClass('checkboxChecked');
- }).bind(resizer);
-
- check();
- uploadButton.label = new Element('label').adopt(
- resizer, new Element('span', {text: this.language.resizeImages})
- ).addEvent('click', check).inject(this.menu);
- }
+ lastFileUploaded: null, // name of the last successfully uploaded file; will be preselected in the list view
+ error_count: 0
+ };
var tx_cfg = this.options.mkServerRequestURL(this, 'upload', Object.merge({},
this.options.propagateData,
(this.options.uploadAuthData || {}), {
- directory: this.CurrentDir.path,
+ directory: (this.CurrentDir ? this.CurrentDir.path : null),
filter: this.options.filter,
- resize: this.options.resizeImages, // TODO: must be updated when button is clicked
+ resize: this.options.resizeImages,
reportContentType: 'text/plain' // Safer for iframes: the default 'application/json' mime type would cause FF3.X to pop up a save/view dialog!
}));
+ // Create hidden input for each form data
Object.each(tx_cfg.data, function(v, k){
- f.adopt((new Element('input')).set({type: 'hidden', name: k, value: v}));
+ var input = new Element('input').set({type: 'hidden', name: k, value: v, id: 'filemanager_upload_' + k });
+ self.upload.form.adopt(input);
+ self.upload.inputs[k] = input;
});
- this.make_file_input(f);
-
- f.inject(this.menu, 'top');
+ if (this.options.resizeImages)
+ {
+ this.upload.resizer = new Element('div', {'class': 'checkbox'});
+ var check = (function()
+ {
+ this.toggleClass('checkboxChecked');
- this._dummyframe = (new IFrame).set({src: 'about:blank', name: 'dummyframe'}).setStyles({display: 'none'});
- this.menu.adopt(this._dummyframe);
+ // Update the resize hidden field
+ self.upload.inputs['resize'].setProperty('value', (this.hasClass('checkboxChecked')) ? 1 : 0);
+ }).bind(this.upload.resizer);
+ check();
+ this.upload.uploadButton.label = new Element('label', { 'class': 'filemanager-resize' }).adopt(
+ this.upload.resizer,
+ new Element('span', {text: this.language.resizeImages})
+ ).addEvent('click', check).inject(this.menu);
+ }
- this._dummyframe.addEvent('load', function()
- {
- mfm.browserLoader.fade(0);
+ this.make_file_input(self.upload.form);
- try
- {
- var response;
- try
- {
- response = this.contentDocument.documentElement.textContent;
- }
- catch(e) {}
+ self.upload.form.inject(this.menu, 'top');
+ //this.menu.setStyle('height', '60px');
- if (!response)
- {
- try
- {
- response = this.contentWindow.document.innerText;
- }
- catch(e) {}
- }
+ // discard old iframe, if it exists:
+ if (this.upload.dummyframe)
+ {
+ // remove from the menu (dispose) and trash it (destroy)
+ this.upload.dummyframe.dispose().destroy();
+ this.upload.dummyframe = null;
+ }
- if (!response)
- {
- try
- {
- response = this.contentDocument.innerText;
- }
- catch(e) {}
- }
+ this.upload.dummyframe = (new IFrame).set({src: 'about:blank', name: 'dummyframe'}).setStyles({display: 'none'});
+ this.menu.adopt(this.upload.dummyframe);
- if (!response)
- {
- throw "Can't find response.";
+ this.upload.dummyframe.addEvent('load', function()
+ {
+ var iframe = this;
+ self.diag.log('NoFlash upload response: ', this, ', iframe: ', self.upload.dummyframe, ', ready:', (1 * self.upload.dummyframe_active));
+
+ // make sure we don't act on premature firing of the event in MSIE browsers:
+ if (!self.upload.dummyframe_active)
+ return;
+
+ self.browserLoader.fade(0);
+
+ var response = null;
+ Function.attempt(function() {
+ response = iframe.contentDocument.documentElement.textContent;
+ },
+ function() {
+ response = iframe.contentWindow.document.innerText;
+ },
+ function() {
+ response = iframe.contentDocument.innerText;
+ },
+ function() {
+ // Maybe this.contentDocument.documentElement.innerText isn't where we need to look?
+ //debugger;
+ response = "{status: 0, error: \"noFlashUpload: document innerText grab FAIL: Can't find response.\"}";
}
+ );
- response = JSON.decode(response);
+ var j = JSON.decode(response);
- if (response && !response.status)
- {
- mfm.showError('' + response.error);
- mfm.load(mfm.CurrentDir.path);
- }
- else if (response)
- {
- // mfm.onShow = true; // why exactly do we need to set this, what purpose does the default of NOT preselecting the thing we asked to preselect have?
- mfm.load(mfm.dirname(response.path), response.name);
- }
- else
- {
- this.showError('bugger! No JSON response!');
- mfm.load(mfm.CurrentDir.path);
- }
+ if (j && !j.status)
+ {
+ self.showError('' + j.error);
+ self.load(self.CurrentDir.path);
}
- catch(e)
+ else if (j)
{
- // Maybe this.contentDocument.documentElement.innerText isn't where we need to look?
- //debugger;
- mfm.diag.log('noFlashUpload: document innerText grab FAIL:', e, this, tx_cfg);
- mfm.load(mfm.CurrentDir.path);
+ self.load(self.CurrentDir.path, j.name);
+ }
+ else
+ {
+ // IE9 fires the load event on init! :-(
+ if (self.CurrentDir)
+ {
+// self.showError('bugger! No or faulty JSON response! ' + response);
+ self.load(self.CurrentDir.path);
+ }
}
- mfm.make_file_input(f);
+ self.make_file_input(self.upload.form);
});
}
});
diff --git a/Source/Uploader.js b/Source/Uploader.js
index bf0b9c6..ce7bbdc 100644
--- a/Source/Uploader.js
+++ b/Source/Uploader.js
@@ -20,7 +20,7 @@ FileManager.implement({
resizeImages: true,
upload: true,
uploadAuthData: {}, // deprecated; use FileManager.propagateData instead!
- uploadTimeLimit: 260,
+ uploadTimeLimit: 300,
uploadFileSizeMax: 2600 * 2600 * 25
},
@@ -33,21 +33,17 @@ FileManager.implement({
cleanup: {
upload: function() {
+
if (!this.options.upload || !this.upload) return;
- if (this.upload.uploader) {
- this.upload.uploader.fade(0).get('tween').chain(function() {
- this.element.dispose();
- });
- }
+ if (this.upload.uploader) this.upload.uploader.dispose();
+ if (this.upload.button) this.upload.button.dispose();
+ if (this.upload.list) this.upload.list.dispose();
+ if (this.swf.box) this.swf.box.dispose();
}
}
},
- lastFileUploaded: null, // name of the last successfully uploaded file; will be preselected in the list view
- error_count: 0,
-
-
onDialogOpenWhenUpload: function() {
if (this.swf && this.swf.box) this.swf.box.setStyle('visibility', 'hidden');
},
@@ -81,7 +77,9 @@ FileManager.implement({
uploader: new Element('div', {opacity: 0, 'class': 'filemanager-uploader-area'}).adopt(
new Element('h2', {text: this.language.upload}),
new Element('div', {'class': 'filemanager-uploader'})
- )
+ ),
+ lastFileUploaded: null, // name of the last successfully uploaded file; will be preselected in the list view
+ error_count: 0
};
this.upload.uploader.getElement('div').adopt(this.upload.list);
@@ -148,10 +146,10 @@ FileManager.implement({
});
this.ui = {};
- this.ui.icon = new Asset.image(self.assetBasePath+'Images/Icons/' + this.extension + '.png', {
+ this.ui.icon = new Asset.image(self.URLpath4assets+'Images/Icons/' + this.extension + '.png', {
'class': 'icon',
onerror: function() {
- new Asset.image(self.assetBasePath + 'Images/Icons/default.png').replaces(this);
+ new Asset.image(self.URLpath4assets + 'Images/Icons/default.png').replaces(this);
}
});
this.ui.element = new Element('li', {'class': 'file', id: 'file-' + this.id});
@@ -164,14 +162,14 @@ FileManager.implement({
this.ui.size = new Element('span', {'class': 'file-size', text: Swiff.Uploader.formatUnit(this.size, 'b')});
var file = this;
- this.ui.cancel = new Asset.image(self.assetBasePath+'Images/cancel.png', {'class': 'file-cancel', title: self.language.cancel}).addEvent('click', function() {
+ this.ui.cancel = new Asset.image(self.URLpath4assets+'Images/cancel.png', {'class': 'file-cancel', title: self.language.cancel}).addEvent('click', function() {
file.remove();
self.tips.hide();
self.tips.detach(this);
});
self.tips.attach(this.ui.cancel);
- var progress = new Element('img', {'class': 'file-progress', src: self.assetBasePath+'Images/bar.gif'});
+ var progress = new Element('img', {'class': 'file-progress', src: self.URLpath4assets+'Images/bar.gif'});
this.ui.element.adopt(
this.ui.cancel,
@@ -197,11 +195,11 @@ FileManager.implement({
// when all items in the list have been cancelled/removed, and the transmission of the files is done, i.e. after the onComplete has fired, destroy the list!
var cnt = self.upload.list.getElements('li').length;
- if (cnt == 0 && this.has_completed)
+
+// if (cnt == 0 && this.has_completed)
+ if (cnt == 0 )
{
- self.upload.uploader.fade(0).get('tween').chain(function() {
- self.upload.uploader.setStyle('display', 'none');
- });
+ self.upload.uploader.setStyle('display', 'none');
}
},
@@ -275,7 +273,7 @@ FileManager.implement({
if (failure)
{
- self.error_count++;
+ self.upload.error_count++;
}
// don't wait for the cute delays to start updating the directory view!
@@ -302,11 +300,9 @@ FileManager.implement({
};
this.diag.log('Uploader: SWF init');
- this.lastFileUploaded = null;
- this.error_count = 0;
this.swf = new Swiff.Uploader({
id: 'SwiffFileManagerUpload',
- path: this.assetBasePath + 'Swiff.Uploader.swf',
+ path: this.URLpath4assets + 'Swiff.Uploader.swf',
queued: false,
target: this.upload.button,
allowDuplicates: true,
@@ -321,7 +317,7 @@ FileManager.implement({
timeLimit: self.options.uploadTimeLimit,
fileSizeMax: self.options.uploadFileSizeMax,
typeFilter: this.getFileTypes(),
- zIndex: this.options.zIndex + 3000,
+ zIndex: this.options.zIndex + 400000,
onSelectSuccess: function() {
self.diag.log('FlashUploader: onSelectSuccess', arguments, ', fileList: ', self.swf.fileList);
//self.fillInfo();
@@ -339,17 +335,16 @@ FileManager.implement({
this.diag.log('upload:onComplete', info, cnt, fcnt);
// add a 5 second delay when there were upload errors:
(function() {
- this.onShow = true;
- this.load(this.CurrentDir.path, this.lastFileUploaded);
+ this.load(this.CurrentDir.path, this.upload.lastFileUploaded);
// this.fillInfo();
- }).bind(this).delay(this.error_count > 0 ? 5500 : 1);
+ }).bind(this).delay(this.upload.error_count > 0 ? 5500 : 1);
}.bind(this),
onFileComplete: function(f) {
self.diag.log('FlashUploader: onFileComplete', arguments, ', fileList: ', self.swf.fileList);
- self.lastFileUploaded = f.name;
+ self.upload.lastFileUploaded = f.name;
},
onFail: function(error) {
- self.diag.log('FlashUploader: onFail', arguments, ', fileList: ', self.swf.fileList);
+ self.diag.log('FlashUploader: onFail', arguments, ', swf: ', self.swf, ', fileList: ', (typeof self.swf !== 'undefined' ? self.swf : '---'));
if (error !== 'empty') {
$$(self.upload.button, self.upload.label).dispose();
self.showError(self.language.flash[error] || self.language.flash.flash);
diff --git a/dev_status.txt b/dev_status.txt
new file mode 100644
index 0000000..caa6625
--- /dev/null
+++ b/dev_status.txt
@@ -0,0 +1,5 @@
+
+Line 2428 :
+// Store thumb 250 path in meta with getThumb
+// or try to get it through
+// $thumbPath = $meta->getThumbPath($width . 'x' . $height);
+ 
Basic FileManager Demo