'; + $form['instructions']['instruction']['#markup'] = t('There is a missing dependency in your configuration that prevents this library from working properly.') . '
'; break; case 'incompatible dependency': - $form['instructions']['instruction']['#markup'] = t('There an incompatible dependency in your configuration that prevent this library to work properly.') . '
'; + $form['instructions']['instruction']['#markup'] = t('There is an incompatible dependency in your configuration that prevents this library from working properly.') . '
'; break; } } @@ -483,6 +554,28 @@ function libraries_admin_sort_title(array $a, array $b) { return strnatcasecmp($a['name'], $b['name']); } +/** + * Returns the library's dependencies, if any. + * + * @param array $library + * A library information array. + * + * @return string + * The dependencies. + */ +function libraries_admin_get_dependencies($library) { + $dependencies = array(); + foreach ($library['dependencies'] as $dependency_name) { + if ($dependency = libraries_info($dependency_name)) { + $dependencies[] = $dependency['name']; + } + else { + $dependencies[] = $dependency_name; + } + } + return implode(', ', $dependencies); +} + /** * Returns the library's provider. * diff --git a/sites/all/modules/contrib/dev/libraries/libraries.api.php b/sites/all/modules/contrib/dev/libraries/libraries.api.php index 71e90e0c..fe0c2418 100644 --- a/sites/all/modules/contrib/dev/libraries/libraries.api.php +++ b/sites/all/modules/contrib/dev/libraries/libraries.api.php @@ -47,6 +47,8 @@ * Unless 'version' is declared or libraries_get_version() is being used as * a version callback, 'version callback' must be declared. In the latter * case, however, 'version arguments' must be declared in the specified way. + * For libraries that provide a package.json file, use + * 'libraries_get_package_json_version' as the version callback. * - version arguments: (optional) A list of arguments to pass to the version * callback. Version arguments can be declared either as an associative * array whose keys are the argument names or as an indexed array without diff --git a/sites/all/modules/contrib/dev/libraries/libraries.drush.inc b/sites/all/modules/contrib/dev/libraries/libraries.drush.inc index 32587135..550b7af5 100644 --- a/sites/all/modules/contrib/dev/libraries/libraries.drush.inc +++ b/sites/all/modules/contrib/dev/libraries/libraries.drush.inc @@ -23,7 +23,9 @@ function libraries_drush_command() { 'arguments' => array( 'libraries' => 'A comma delimited list of library machine names.', ), - 'required-arguments' => TRUE, + 'options' => array( + 'all' => 'Download all registered libraries.', + ), ); return $items; @@ -42,10 +44,7 @@ function libraries_drush_cache_clear(array &$types) { * Clears the library cache. */ function libraries_drush_invalidate_cache() { - // @see drupal_flush_all_caches() - foreach (libraries_flush_caches() as $table) { - cache_clear_all('*', $table, TRUE); - } + libraries_cache_clear(); } /** @@ -109,28 +108,61 @@ function drush_libraries_list() { function drush_libraries_download() { drush_command_include('pm-download'); - $libraries = libraries_info(); + $all_libraries = libraries_detect(); - // @todo Consider supporting downloading all downloadable libraries. - // @todo Consider offering a selection if no library is specified. - foreach (pm_parse_arguments(func_get_args(), FALSE) as $machine_name) { - if (!isset($libraries[$machine_name])) { - $message = dt("The !library library is not registered with Libraries API.\n", array('!library' => $machine_name)); - $message .= dt("Provide an info file for it or implement hook_libraries_info().\n"); - $message .= dt("See hook_libraries_info() for more information.\n"); - drush_set_error('DRUSH_LIBRARY_UKNOWN', $message); - continue; + // Prepare a list of names of downloadable libraries. + $downloadable_names = array(); + foreach ($all_libraries as $machine_name => $library) { + // Skip libraries that are already installed. + // @todo Allow (optionally) re-downloading installing libraries. + if (!empty($library['download file url']) && !$library['installed']) { + $downloadable_names[] = $machine_name; } - $library = $libraries[$machine_name]; + } - if (empty($library['download file url'])) { - $message = dt("The !library library cannot be downloaded.\n", array('!library' => $machine_name)); - $message .= dt("Libraries need to specify a download file URL to support being downloaded via Drush.\n"); - $message .= dt("See hook_libraries_info() for more information.\n"); - drush_set_error('DRUSH_LIBRARY_NOT_DOWNLOADABLE', $message); - continue; + // Gather a list of libraries to download. If '--all' was specified, that + // takes precedence over any other arguments. Otherwise and if no arguments + // are specified, we present a choice of all downloadable libraries. + if (drush_get_option('all', FALSE) && $downloadable_names) { + $machine_names = $downloadable_names; + } + elseif (pm_parse_arguments(func_get_args(), FALSE)) { + $machine_names = array(); + foreach (pm_parse_arguments(func_get_args(), FALSE) as $machine_name) { + // If there was an error with with one of the libraries, continue to try + // to install any remaining libraries. + if (!isset($all_libraries[$machine_name])) { + $message = dt("The !library library is not registered with Libraries API.\n", array('!library' => $machine_name)); + $message .= dt("Provide an info file for it or implement hook_libraries_info().\n"); + $message .= dt("See hook_libraries_info() for more information.\n"); + drush_set_error('DRUSH_LIBRARY_UKNOWN', $message); + continue; + } + if (empty($all_libraries[$machine_name]['download file url'])) { + $message = dt("The !library library cannot be downloaded.\n", array('!library' => $machine_name)); + $message .= dt("Libraries need to specify a download file URL to support being downloaded via Drush.\n"); + $message .= dt("See hook_libraries_info() for more information.\n"); + drush_set_error('DRUSH_LIBRARY_NOT_DOWNLOADABLE', $message); + continue; + } + $machine_names[] = $machine_name; } - $download_url = $library['download file url']; + } + elseif ($downloadable_names) { + $machine_names = drush_choice_multiple(drupal_map_assoc($downloadable_names), FALSE, 'Select which libraries to download.'); + // If the operation was cancelled by the user, or if no libraries were + // selected, bail out without any further error message. + if (!$machine_names) { + return; + } + } + else { + drush_log(dt('There are no registered, uninstalled libraries that can be downloaded.'), 'warning'); + return; + } + + foreach ($machine_names as $machine_name) { + $download_url = $all_libraries[$machine_name]['download file url']; drush_log(dt('Downloading library !name ...', array('!name' => $machine_name))); @@ -205,7 +237,7 @@ function drush_libraries_download() { drush_delete_dir($install_location, TRUE); } else { - drush_log(dt("Skip installation of !project to !dest.", array('!project' => $library['machine name'], '!dest' => $install_location)), 'warning'); + drush_log(dt("Skip installation of !project to !dest.", array('!project' => $machine_name, '!dest' => $install_location)), 'warning'); continue; } } diff --git a/sites/all/modules/contrib/dev/libraries/libraries.info b/sites/all/modules/contrib/dev/libraries/libraries.info index dcd2d486..e721cb4c 100644 --- a/sites/all/modules/contrib/dev/libraries/libraries.info +++ b/sites/all/modules/contrib/dev/libraries/libraries.info @@ -8,9 +8,8 @@ files[] = tests/LibrariesLoadWebTest.test files[] = tests/LibrariesUnitTest.test files[] = tests/LibrariesWebTestBase.test -; Information added by Drupal.org packaging script on 2016-05-12 -version = "7.x-2.3" +; Information added by Drupal.org packaging script on 2018-10-05 +version = "7.x-2.5" core = "7.x" project = "libraries" -datestamp = "1463077450" - +datestamp = "1538770685" diff --git a/sites/all/modules/contrib/dev/libraries/libraries.install b/sites/all/modules/contrib/dev/libraries/libraries.install index ebc4087b..e8c795ff 100644 --- a/sites/all/modules/contrib/dev/libraries/libraries.install +++ b/sites/all/modules/contrib/dev/libraries/libraries.install @@ -34,3 +34,13 @@ function libraries_update_7201() { // during the 7.x-2.x cycle. registry_rebuild(); } + +/** + * Grant the "View library reports" permission to roles with the "View site reports" permission. + */ +function libraries_update_7202() { + $rids = array_keys(user_roles(FALSE, 'access site reports')); + foreach ($rids as $rid) { + _update_7000_user_role_grant_permissions($rid, array('access library reports'), 'libraries'); + } +} diff --git a/sites/all/modules/contrib/dev/libraries/libraries.module b/sites/all/modules/contrib/dev/libraries/libraries.module index 48275250..480289cd 100644 --- a/sites/all/modules/contrib/dev/libraries/libraries.module +++ b/sites/all/modules/contrib/dev/libraries/libraries.module @@ -25,6 +25,29 @@ function libraries_flush_caches() { } } +/** + * Implements hook_admin_menu_cache_info(). + */ +function libraries_admin_menu_cache_info() { + $caches['libraries'] = array( + 'title' => t('Libraries'), + 'callback' => 'libraries_cache_clear', + ); + return $caches; +} + +/** + * Clears the cached library information. + */ +function libraries_cache_clear() { + foreach (libraries_flush_caches() as $bin) { + // Using the wildcard argument leads to DrupalDatabaseCache::clear() + // truncating the libraries cache table which is more performant that + // deleting the rows. + cache_clear_all('*', $bin, TRUE); + } +} + /** * Gets the path of a library. * @@ -56,6 +79,52 @@ function libraries_get_path($name, $base_path = FALSE) { return $path; } +/** + * Returns all enabled themes. + * + * Themes are sorted so that base themes always precede their child themes. + * + * @return array + * An associative array of theme objects keyed by theme name. + */ +function libraries_get_enabled_themes() { + $themes = array(); + foreach (list_themes() as $name => $theme) { + if ($theme->status) { + $themes[$name] = $theme; + } + } + + return libraries_sort_themes($themes); +} + +/** + * Sort a themes array. + * + * @param array $themes + * Array of themes as objects, keyed by theme name. + * @param string $base + * A base theme (internal use only). + * + * @return array + * A similar array to $themes, but sorted in such a way that subthemes are + * always located after its base theme. + */ +function libraries_sort_themes($themes, $base = '') { + $output = array(); + foreach ($themes as $name => $theme) { + if (!isset($theme->base_theme) || $theme->base_theme == $base) { + $output[$name] = $theme; + unset($themes[$name]); + $subthemes = libraries_sort_themes($themes, $name); + foreach ($subthemes as $sub_name => $subtheme) { + $output[$sub_name] = $subtheme; + } + } + } + return $output; +} + /** * Returns an array of library directories. * @@ -77,6 +146,13 @@ function libraries_get_libraries() { $profile = drupal_get_path('profile', drupal_get_profile()); $config = conf_path(); + // $config and $profile should never be empty in a proper Drupal setup. + // However, we should never search into the root filesystem under any + // circumstances, so just bail out in that case. + if (!$profile && !$config) { + return array(); + } + // Similar to 'modules' and 'themes' directories in the root directory, // certain distributions may want to place libraries into a 'libraries' // directory in Drupal's root directory. @@ -358,10 +434,12 @@ function &libraries_info($name = NULL) { } } - // Gather information from hook_libraries_info() in enabled themes. + // Gather information from hook_libraries_info() in enabled themes. Themes + // are sorted to ensure that a base theme's template.php is included before + // its children's ones. $themes = array(); - foreach (list_themes() as $theme_name => $theme_info) { - if ($theme_info->status && file_exists(drupal_get_path('theme', $theme_name) . '/template.php')) { + foreach (libraries_get_enabled_themes() as $theme_name => $theme_info) { + if (file_exists(drupal_get_path('theme', $theme_name) . '/template.php')) { // Collect a list of viable themes for re-use when calling the alter // hook. $themes[] = $theme_name; @@ -546,7 +624,7 @@ function libraries_detect($name = NULL) { $library['version'] = call_user_func_array($library['version callback'], array_merge(array($library), $library['version arguments'])); } else { - $library['version'] = call_user_func($library['version callback'], $library, $library['version arguments']); + $library['version'] = call_user_func_array($library['version callback'], array(&$library, $library['version arguments'])); } if (empty($library['version'])) { $library['error'] = 'not detected'; @@ -887,16 +965,56 @@ function libraries_get_version($library, $options) { fclose($file); } +/** + * Gets the version information from a library's package.json file. + * + * @param $library + * An associative array containing all information about the library. + * @param $options + * This callback expects no option. + * @return + * A string containing the version of the library. + * + * @see libraries_get_path() + */ +function libraries_get_package_json_version($library, $options) { + $file = DRUPAL_ROOT . '/' . $library['library path'] . '/package.json'; + if (!file_exists($file)) { + return; + } + + $content = file_get_contents($file); + if (!$content) { + return; + } + + $data = drupal_json_decode($content); + if (isset($data['version'])) { + return $data['version']; + } +} + /** * Implements hook_help(). */ function libraries_help($path, $arg) { switch ($path) { case 'admin/reports/libraries': - return t('Click on a library for a status report or detailed installation instructions in case the library is not installed correctly.'); + return t('Click on a library for a status report or detailed installation instructions.'); } } +/** + * Implements hook_permission(). + */ +function libraries_permission() { + return array( + 'access library reports' => array( + 'title' => t('View library reports'), + ), + ); +} + /** * Implements hook_menu(). */ @@ -907,7 +1025,7 @@ function libraries_menu() { 'description' => 'An overview of libraries installed on this site.', 'page callback' => 'drupal_get_form', 'page arguments' => array('libraries_admin_overview'), - 'access arguments' => array('access site reports'), + 'access arguments' => array('access library reports'), 'file' => 'libraries.admin.inc' ); $items['admin/reports/libraries/%libraries_ui'] = array( @@ -915,7 +1033,7 @@ function libraries_menu() { 'description' => 'Status overview for a single library', 'page callback' => 'drupal_get_form', 'page arguments' => array('libraries_admin_library_status_form', 3), - 'access arguments' => array('access site reports'), + 'access arguments' => array('access library reports'), 'file' => 'libraries.admin.inc' ); return $items; @@ -944,3 +1062,19 @@ function libraries_menu() { function libraries_ui_load($name) { return libraries_detect($name); } + +/** + * Implements hook_theme(). + */ +function libraries_theme($existing, $type, $theme, $path) { + // Because we extend the 'table' theme function, fetch the respective + // variables dynamically. + $common_theme = drupal_common_theme(); + $variables = $common_theme['table']['variables'] + array('title' => '', 'description' => ''); + return array( + 'libraries_table_with_title' => array( + 'variables' => $variables, + 'file' => 'libraries.theme.inc', + ), + ); +} diff --git a/sites/all/modules/contrib/dev/libraries/libraries.theme.inc b/sites/all/modules/contrib/dev/libraries/libraries.theme.inc new file mode 100644 index 00000000..ff3ed719 --- /dev/null +++ b/sites/all/modules/contrib/dev/libraries/libraries.theme.inc @@ -0,0 +1,36 @@ + array()); + $variables['attributes']['class'][] = 'libraries-table'; +} + +/** + * Returns HTML for a table with a title. + * + * @param array $variables + * An array theme variables. + * + * @return string + * The HTML output for this table with a title. + */ +function theme_libraries_table_with_title(array $variables) { + $output = ''; + $output .= '
' . $variables['title'] . '
'; + $output .= '' . $variables['description'] . '
';
+ $output .= theme_table($variables);
+ return $output;
+}
diff --git a/sites/all/modules/contrib/dev/libraries/tests/LibrariesAdminWebTest.test b/sites/all/modules/contrib/dev/libraries/tests/LibrariesAdminWebTest.test
index a4d2188b..87c9de0e 100644
--- a/sites/all/modules/contrib/dev/libraries/tests/LibrariesAdminWebTest.test
+++ b/sites/all/modules/contrib/dev/libraries/tests/LibrariesAdminWebTest.test
@@ -40,8 +40,20 @@ class LibrariesAdminWebTest extends LibrariesWebTestBase {
* Tests the libraries report at /admin/reports/libraries.
*/
public function testLibrariesReportOverview() {
- $this->getWithPermissions(array('access site reports'), 'admin/reports/libraries');
- $this->assertRaw('Libraries');
+ $this->getWithPermissions(array('access library reports'), 'admin/reports/libraries');
+ // Assert the page title and table titles show up.
+ $this->assertText('Libraries');
+ $this->assertRaw('Installed
'); + $this->assertRaw('Uninstalled
'); + + // Make sure the table headings show up. + $this->assertText('Name'); + $this->assertText('Status'); + $this->assertText('Version'); + $this->assertText('Variants'); + $this->assertText('Dependencies'); + $this->assertText('Provider'); + $this->assertText('Links'); // Make sure that all the libraries are listed. $libraries = libraries_info(); @@ -51,8 +63,7 @@ class LibrariesAdminWebTest extends LibrariesWebTestBase { $this->assertLinkByHref('admin/reports/libraries/' . $library['machine name']); } - // Make sure that all possible statuses are displayed. - $this->assertText('OK'); + // Make sure that all possible error statuses are displayed. $this->assertText('Not found'); $this->assertText('Not detected'); $this->assertText('Not supported'); @@ -73,7 +84,7 @@ class LibrariesAdminWebTest extends LibrariesWebTestBase { * Tests the libraries report for an installed library. */ public function testLibrariesReportInstalled() { - $this->getWithPermissions(array('access site reports'), 'admin/reports/libraries/example_files'); + $this->getWithPermissions(array('access library reports'), 'admin/reports/libraries/example_files'); $this->assertRaw('Status report for library Example files'); $this->assertRaw('The Example files library is installed correctly.'); // Check that the information in the status report is displayed. @@ -88,7 +99,7 @@ class LibrariesAdminWebTest extends LibrariesWebTestBase { * Tests the libraries report for a missing library. */ public function testLibrariesReportMissing() { - $this->getWithPermissions(array('access site reports'), 'admin/reports/libraries/example_missing'); + $this->getWithPermissions(array('access library reports'), 'admin/reports/libraries/example_missing'); $this->assertRaw('Status report for library Example missing'); $this->assertRaw('The Example missing library could not be found.'); // Check that the download link is being displayed. @@ -100,7 +111,7 @@ class LibrariesAdminWebTest extends LibrariesWebTestBase { * Tests the libraries report for a missing library. */ public function testLibrariesReportNotDetected() { - $this->getWithPermissions(array('access site reports'), 'admin/reports/libraries/example_undetected_version'); + $this->getWithPermissions(array('access library reports'), 'admin/reports/libraries/example_undetected_version'); $this->assertRaw('Status report for library Example undetected version'); $this->assertRaw('The version of the Example undetected version library could not be detected.'); } @@ -109,7 +120,7 @@ class LibrariesAdminWebTest extends LibrariesWebTestBase { * Tests the libraries report for a missing library. */ public function testLibrariesReportNotSupported() { - $this->getWithPermissions(array('access site reports'), 'admin/reports/libraries/example_unsupported_version'); + $this->getWithPermissions(array('access library reports'), 'admin/reports/libraries/example_unsupported_version'); $this->assertRaw('Status report for library Example unsupported version'); $this->assertRaw('The installed version 1 of the Example unsupported version library is not supported.'); // Check that the download link is being displayed. diff --git a/sites/all/modules/contrib/dev/libraries/tests/libraries/example_info_file.libraries.info b/sites/all/modules/contrib/dev/libraries/tests/libraries/example_info_file.libraries.info index 11152731..83ba8a83 100644 --- a/sites/all/modules/contrib/dev/libraries/tests/libraries/example_info_file.libraries.info +++ b/sites/all/modules/contrib/dev/libraries/tests/libraries/example_info_file.libraries.info @@ -2,9 +2,8 @@ name = Example info file -; Information added by Drupal.org packaging script on 2016-05-12 -version = "7.x-2.3" +; Information added by Drupal.org packaging script on 2018-10-05 +version = "7.x-2.5" core = "7.x" project = "libraries" -datestamp = "1463077450" - +datestamp = "1538770685" diff --git a/sites/all/modules/contrib/dev/libraries/tests/modules/libraries_test_module/libraries_test_module.info b/sites/all/modules/contrib/dev/libraries/tests/modules/libraries_test_module/libraries_test_module.info index 7ad319a2..756d6a8f 100644 --- a/sites/all/modules/contrib/dev/libraries/tests/modules/libraries_test_module/libraries_test_module.info +++ b/sites/all/modules/contrib/dev/libraries/tests/modules/libraries_test_module/libraries_test_module.info @@ -5,9 +5,8 @@ package = Testing dependencies[] = libraries hidden = TRUE -; Information added by Drupal.org packaging script on 2016-05-12 -version = "7.x-2.3" +; Information added by Drupal.org packaging script on 2018-10-05 +version = "7.x-2.5" core = "7.x" project = "libraries" -datestamp = "1463077450" - +datestamp = "1538770685" diff --git a/sites/all/modules/contrib/dev/libraries/tests/themes/libraries_test_theme/libraries_test_theme.info b/sites/all/modules/contrib/dev/libraries/tests/themes/libraries_test_theme/libraries_test_theme.info index 255d1040..194954e7 100644 --- a/sites/all/modules/contrib/dev/libraries/tests/themes/libraries_test_theme/libraries_test_theme.info +++ b/sites/all/modules/contrib/dev/libraries/tests/themes/libraries_test_theme/libraries_test_theme.info @@ -3,9 +3,8 @@ description = Tests that themes can provide and alter library information. core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2016-05-12 -version = "7.x-2.3" +; Information added by Drupal.org packaging script on 2018-10-05 +version = "7.x-2.5" core = "7.x" project = "libraries" -datestamp = "1463077450" - +datestamp = "1538770685" diff --git a/sites/all/modules/contrib/files/elfinder/CHANGELOG.txt b/sites/all/modules/contrib/files/elfinder/CHANGELOG.txt index 704c1e09..028506c8 100644 --- a/sites/all/modules/contrib/files/elfinder/CHANGELOG.txt +++ b/sites/all/modules/contrib/files/elfinder/CHANGELOG.txt @@ -1,6 +1,6 @@ 2.x-dev ------- - - Now requires elFinder 2.0.9+ + - Now requires elFinder 2.0.9+ or 2.1.38+ - Added multiple root directories support - Added Drupal file_managed table synchronization - Added per-role configurable profiles support @@ -8,4 +8,7 @@ - Added CKEditor and FCKeditor Upload tab support - New library search algoritm with install profiles and multiple sites support - Search support + - Inline preview support for PSD, md, html, office docs (by Google/Microsoft online tools), CAD (by sharecad.org online tools), etc (disabled by default, be careful) + - Auto fit window + - File owner available in list view diff --git a/sites/all/modules/contrib/files/elfinder/LICENSE.txt b/sites/all/modules/contrib/files/elfinder/LICENSE.txt index d159169d..85f71a5f 100644 --- a/sites/all/modules/contrib/files/elfinder/LICENSE.txt +++ b/sites/all/modules/contrib/files/elfinder/LICENSE.txt @@ -1,339 +1,14 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 +elFinder Integration - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. +Copyright (c) 2010-2018, Alexey Sukhotin. All rights reserved. - Preamble +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. +3. Neither the name of the Alexey Sukhotin nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - -'+imgHtml+'
');
- var oUrl = $("input[name=url]", oImgHtml);
- var browsebutton = $('');
-
- browsebutton.attr('value', Drupal.t('Browse Server'));
- browsebutton.attr('onclick', 'var w = window; w.open("' + Drupal.settings.elfinder.file_browser_url + '","","toolbar=no,menubar=no,width=600,height=600")');
- browsebutton.insertAfter(oUrl);
-
- if (jQuery.fn.wysiwyg.defaults) {
- jQuery.fn.wysiwyg.defaults.formImageHtml = oImgHtml.html();
+ Drupal.elfinder.editor.jwysiwyg = {
+ fn: {
+ attach: Drupal.wysiwyg.editor.attach.jwysiwyg
+ }
}
- Drupal.elfinder.editor.jwysiwyg.fn.attach.apply(this, arguments);
-}
+ Drupal.wysiwyg.editor.attach.jwysiwyg = function(context, params, settings) {
+
+ var imgHtml = null;
+
+ if (jQuery.fn.wysiwyg.defaults) {
+ imgHtml = jQuery.fn.wysiwyg.defaults.formImageHtml;
+ }
+
+ var oImgHtml = $('' + imgHtml + '
');
+ var oUrl = $("input[name=url]", oImgHtml);
+ var browsebutton = $('');
+
+ browsebutton.attr('value', Drupal.t('Browse Server'));
+ browsebutton.attr('onclick', 'var w = window; w.open("' + Drupal.settings.elfinder.file_browser_url + '","","toolbar=no,menubar=no,width=600,height=600")');
+ browsebutton.insertAfter(oUrl);
+
+ if (jQuery.fn.wysiwyg.defaults) {
+ jQuery.fn.wysiwyg.defaults.formImageHtml = oImgHtml.html();
+ }
+
+ Drupal.elfinder.editor.jwysiwyg.fn.attach.apply(this, arguments);
+ }
})(jQuery);
\ No newline at end of file
diff --git a/sites/all/modules/contrib/files/elfinder/editors/tinymce/tinymce.callback.js b/sites/all/modules/contrib/files/elfinder/editors/tinymce/tinymce.callback.js
index 716c24bb..dd173cee 100644
--- a/sites/all/modules/contrib/files/elfinder/editors/tinymce/tinymce.callback.js
+++ b/sites/all/modules/contrib/files/elfinder/editors/tinymce/tinymce.callback.js
@@ -1 +1,38 @@
-// $Id$
var elfinder_tinymce_callback = function (arg1) {
var url = arg1;
if (typeof arg1 == 'object') {
url = arg1.url;
}
/* window.tinymceFileWin.document.forms[0].elements[window.tinymceFileField].value = url;
window.tinymceFileWin.focus();
window.close();*/
//make inline popup work
var win = tinyMCEPopup.getWindowArg("window");
// insert information now
win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = url;
// are we an image browser
if (typeof (win.ImageDialog) != "undefined") {
// we are, so update image dimensions...
if (win.ImageDialog.getImageData)
win.ImageDialog.getImageData();
// ... and preview if necessary
if (win.ImageDialog.showPreviewImage)
win.ImageDialog.showPreviewImage(url);
}
// close popup window
tinyMCEPopup.close();
}
\ No newline at end of file
+/*
+ * elFinder Integration
+ *
+ * Copyright (c) 2010-2018, Alexey Sukhotin. All rights reserved.
+ */
+
+var elfinder_tinymce_callback = function(arg1) {
+ var url = arg1;
+
+ if (typeof arg1 == 'object') {
+ url = arg1.url;
+ }
+ /* window.tinymceFileWin.document.forms[0].elements[window.tinymceFileField].value = url;
+ window.tinymceFileWin.focus();
+ window.close();*/
+
+ //make inline popup work
+
+ var win = tinyMCEPopup.getWindowArg("window");
+
+ // insert information now
+ win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = url;
+
+ // are we an image browser
+ if (typeof (win.ImageDialog) != "undefined") {
+ // we are, so update image dimensions...
+ if (win.ImageDialog.getImageData)
+ win.ImageDialog.getImageData();
+
+ // ... and preview if necessary
+ if (win.ImageDialog.showPreviewImage)
+ win.ImageDialog.showPreviewImage(url);
+ }
+
+ // close popup window
+ tinyMCEPopup.close();
+
+}
diff --git a/sites/all/modules/contrib/files/elfinder/editors/tinymce/tinymce.inc b/sites/all/modules/contrib/files/elfinder/editors/tinymce/tinymce.inc
index 0e566662..e01dc041 100644
--- a/sites/all/modules/contrib/files/elfinder/editors/tinymce/tinymce.inc
+++ b/sites/all/modules/contrib/files/elfinder/editors/tinymce/tinymce.inc
@@ -1,24 +1,30 @@
array(
- 'extensions' => array('elfinder' => t('elFinder')),
- 'url' => $options['homepage_url'],
- 'options' => array(
- 'file_browser_callback' => 'elfinder_tinymce_browse_callback',
- 'file_browser_url' => $options['elfinder_url'], // non standard TinyMCE configuration variable to pass source application to elFinder
- 'inline_styles' => TRUE,
- ),
- 'load' => FALSE,
- ),
- );
+ drupal_add_js($options['plugin_url_base'] . '/tinymce.js');
+ return array(
+ 'elfinder' => array(
+ 'extensions' => array('elfinder' => t('elFinder')),
+ 'url' => $options['homepage_url'],
+ 'options' => array(
+ 'file_browser_callback' => 'elfinder_tinymce_browse_callback',
+ 'file_browser_url' => $options['elfinder_url'], // non standard TinyMCE configuration variable to pass source application to elFinder
+ 'inline_styles' => TRUE,
+ ),
+ 'load' => FALSE,
+ ),
+ );
}
diff --git a/sites/all/modules/contrib/files/elfinder/editors/tinymce/tinymce.js b/sites/all/modules/contrib/files/elfinder/editors/tinymce/tinymce.js
index f08a4b1b..8c4165b6 100644
--- a/sites/all/modules/contrib/files/elfinder/editors/tinymce/tinymce.js
+++ b/sites/all/modules/contrib/files/elfinder/editors/tinymce/tinymce.js
@@ -1,27 +1,46 @@
+/*
+ * elFinder Integration
+ *
+ * Copyright (c) 2010-2018, Alexey Sukhotin. All rights reserved.
+ */
+
+// $Id$
+
+/*function elfinder_tinymce_browse_callback(field_name, url, type, win) {
+ var w = window.open(tinymce.settings.file_browser_url, null, 'toolbar=yes,menubar=yes,width=600,height=500, inline=yes');
+ w.tinymceFileField = field_name;
+ w.tinymceFileWin = win;
+ }*/
+
+// MAKE INLINE POPUP WORK
+
function elfinder_tinymce_browse_callback(field_name, url, type, win) {
+ /*var w = window.open(tinymce.settings.file_browser_url, null, 'toolbar=yes,menubar=yes,width=600,height=500, inline=yes');
+ w.tinymceFileField = field_name;
+ w.tinymceFileWin = win;*/
- var cmsURL = tinymce.settings.file_browser_url; // script URL - use an absolute path!
- if (cmsURL.indexOf("?") < 0) {
- //add the type as the only query parameter
- cmsURL = cmsURL + "?type=" + type;
- } else {
- //add the type as an additional query parameter
- // (PHP session ID is now included if there is one at all)
- cmsURL = cmsURL + "&type=" + type;
- }
+ var cmsURL = tinymce.settings.file_browser_url; // script URL - use an absolute path!
+ if (cmsURL.indexOf("?") < 0) {
+ //add the type as the only query parameter
+ cmsURL = cmsURL + "?type=" + type;
+ } else {
+ //add the type as an additional query parameter
+ // (PHP session ID is now included if there is one at all)
+ cmsURL = cmsURL + "&type=" + type;
+ }
- tinyMCE.activeEditor.windowManager.open({
- file: cmsURL,
- title: 'File Manager',
- width: 900,
- height: 450,
- resizable: "yes",
- inline: "yes", // This parameter only has an effect if you use the inlinepopups plugin!
- popup_css: false, // Disable TinyMCE's default popup CSS
- close_previous: "no"
- }, {
- window: win,
- input: field_name
- });
- return false;
+ tinyMCE.activeEditor.windowManager.open({
+ file: cmsURL,
+ title: 'File Manager',
+ width: 900,
+ height: 450,
+ resizable: "yes",
+ inline: "yes", // This parameter only has an effect if you use the inlinepopups plugin!
+ popup_css: false, // Disable TinyMCE's default popup CSS
+ close_previous: "no"
+ }, {
+ window: win,
+ input: field_name
+ });
+ return false;
}
diff --git a/sites/all/modules/contrib/files/elfinder/editors/wymeditor/wymeditor.callback.js b/sites/all/modules/contrib/files/elfinder/editors/wymeditor/wymeditor.callback.js
index 9d7c67d6..ab520ceb 100644
--- a/sites/all/modules/contrib/files/elfinder/editors/wymeditor/wymeditor.callback.js
+++ b/sites/all/modules/contrib/files/elfinder/editors/wymeditor/wymeditor.callback.js
@@ -1,4 +1,10 @@
+/*
+ * elFinder Integration
+ *
+ * Copyright (c) 2010-2018, Alexey Sukhotin. All rights reserved.
+ */
+
function elfinder_wymeditor_callback(url) {
- window.opener.jQuery('input.wym_src').val(url);
- window.close();
+ window.opener.jQuery('input.wym_src').val(url);
+ window.close();
}
diff --git a/sites/all/modules/contrib/files/elfinder/editors/wymeditor/wymeditor.inc b/sites/all/modules/contrib/files/elfinder/editors/wymeditor/wymeditor.inc
index 8e7ddef8..555636ab 100644
--- a/sites/all/modules/contrib/files/elfinder/editors/wymeditor/wymeditor.inc
+++ b/sites/all/modules/contrib/files/elfinder/editors/wymeditor/wymeditor.inc
@@ -1,4 +1,10 @@
array('file_browser_url' => $options['elfinder_url'])), 'setting');
- return array(
- 'elfinder' => array(
- 'extensions' => array('elfinder' => t('elFinder')),
- 'url' => $options['homepage_url'],
- 'options' => array(),
- 'load' => FALSE,
- ),
- );
+ drupal_add_js($options['plugin_url_base'] . '/wymeditor.js');
+ drupal_add_js(array('elfinder' => array('file_browser_url' => $options['elfinder_url'])), 'setting');
+ return array(
+ 'elfinder' => array(
+ 'extensions' => array('elfinder' => t('elFinder')),
+ 'url' => $options['homepage_url'],
+ 'options' => array(),
+ 'load' => FALSE,
+ ),
+ );
}
diff --git a/sites/all/modules/contrib/files/elfinder/editors/wymeditor/wymeditor.js b/sites/all/modules/contrib/files/elfinder/editors/wymeditor/wymeditor.js
index 94da109f..8773d514 100644
--- a/sites/all/modules/contrib/files/elfinder/editors/wymeditor/wymeditor.js
+++ b/sites/all/modules/contrib/files/elfinder/editors/wymeditor/wymeditor.js
@@ -1,52 +1,64 @@
+/*
+ * elFinder Integration
+ *
+ * Copyright (c) 2010-2018, Alexey Sukhotin. All rights reserved.
+ */
+
// $Id: elfinder.wymeditor.js,v 1.1.2.2 2010/12/11 11:53:49 ph0enix Exp $
(function($) {
-Drupal.elfinder.editor.wymeditor = {
- fn : {
- attach: Drupal.wysiwyg.editor.attach.wymeditor
- }
-}
-
-Drupal.wysiwyg.editor.attach.wymeditor = function(context, params, settings) {
-
- Drupal.elfinder.editor.wymeditor.fn.attach.apply(this, arguments);
-
- var $field = $('#' + params.field);
- var index = $field.data(WYMeditor.WYM_INDEX);
-
- if (typeof index != 'undefined') {
- var instance = WYMeditor.INSTANCES[index];
-
- var imgHtml = instance._options.dialogImageHtml;
-
- var oImgHtml = $(''+imgHtml+'
');
-
- var oUrl = $("input.wym_src", oImgHtml);
- var browsebutton = $('');
- browsebutton.attr('value', Drupal.t('Browse Server'));
-
- /* FIXME: url parameters duplicates for some reason */
- var tmp = Drupal.settings.elfinder.file_browser_url;
- var bugpos = tmp.indexOf(",");
-
- var elfinderUrl = '';
-
- if (bugpos != -1) {
- elfinderUrl = tmp.slice(0, bugpos);
+ Drupal.elfinder.editor.wymeditor = {
+ fn: {
+ attach: Drupal.wysiwyg.editor.attach.wymeditor
+ }
+ }
+
+ Drupal.wysiwyg.editor.attach.wymeditor = function(context, params, settings) {
+
+ Drupal.elfinder.editor.wymeditor.fn.attach.apply(this, arguments);
+
+ var $field = $('#' + params.field);
+ var index = $field.data(WYMeditor.WYM_INDEX);
+
+ if (typeof index != 'undefined') {
+ var instance = WYMeditor.INSTANCES[index];
+
+ var imgHtml = instance._options.dialogImageHtml;
+
+ var oImgHtml = $('' + imgHtml + '
');
+
+
+ //$('body', oImgHtml).addClass('wym_dialog wym_dialog_image');
+ //$('body', oImgHtml).attr('omload', 'WYMeditor.INIT_DIALOG(' + index + ')');
+
+ var oUrl = $("input.wym_src", oImgHtml);
+ var browsebutton = $('');
+ browsebutton.attr('value', Drupal.t('Browse Server'));
+
+ /* FIXME: url parameters duplicates for some reason */
+ var tmp = Drupal.settings.elfinder.file_browser_url;
+ var bugpos = tmp.indexOf(",");
+
+ var elfinderUrl = '';
+
+ if (bugpos != -1) {
+ elfinderUrl = tmp.slice(0, bugpos);
+ }
+ else {
+ elfinderUrl = tmp;
+ }
+
+ /* */
+
+ browsebutton.attr('onclick', 'var w = window; w.open("' + elfinderUrl + '","","toolbar=no,menubar=no,width=600,height=600")');
+ browsebutton.insertAfter(oUrl);
+
+
+ ImgHtml = '' + oImgHtml.html() + '';
+
+ instance._options.dialogImageHtml = ImgHtml;
}
- else {
- elfinderUrl = tmp;
- }
-
- browsebutton.attr('onclick', 'var w = window; w.open("' + elfinderUrl + '","","toolbar=no,menubar=no,width=600,height=600")');
- browsebutton.insertAfter(oUrl);
-
-
- ImgHtml = '' + oImgHtml.html() + '';
-
- instance._options.dialogImageHtml = ImgHtml;
}
-}
})(jQuery);
diff --git a/sites/all/modules/contrib/files/elfinder/editors/yui/yui.callback.js b/sites/all/modules/contrib/files/elfinder/editors/yui/yui.callback.js
index 9e312ad5..5d2206fc 100644
--- a/sites/all/modules/contrib/files/elfinder/editors/yui/yui.callback.js
+++ b/sites/all/modules/contrib/files/elfinder/editors/yui/yui.callback.js
@@ -1,5 +1,11 @@
+/*
+ * elFinder Integration
+ *
+ * Copyright (c) 2010-2018, Alexey Sukhotin. All rights reserved.
+ */
+
function elfinder_yui_callback(url) {
- var editorId = window.opener.Drupal.wysiwyg.activeId;
- window.opener.jQuery('input#' + editorId + '_insertimage_url').val(url);
- window.close();
+ var editorId = window.opener.Drupal.wysiwyg.activeId;
+ window.opener.jQuery('input#' + editorId + '_insertimage_url').val(url);
+ window.close();
}
diff --git a/sites/all/modules/contrib/files/elfinder/editors/yui/yui.inc b/sites/all/modules/contrib/files/elfinder/editors/yui/yui.inc
index 5b907251..aa70c036 100644
--- a/sites/all/modules/contrib/files/elfinder/editors/yui/yui.inc
+++ b/sites/all/modules/contrib/files/elfinder/editors/yui/yui.inc
@@ -1,21 +1,29 @@
array('file_browser_url' => $options['elfinder_url'])), 'setting');
- return array(
- 'elfinder' => array(
- 'extensions' => array('elfinder' => t('elFinder')),
- 'url' => $options['homepage_url'],
- 'options' => array(),
- 'load' => FALSE,
- ),
- );
+ drupal_add_js($options['plugin_url_base'] . '/yui.js');
+ drupal_add_js(array('elfinder' => array('file_browser_url' => $options['elfinder_url'])), 'setting');
+ return array(
+ 'elfinder' => array(
+ 'extensions' => array('elfinder' => t('elFinder')),
+ 'url' => $options['homepage_url'],
+ 'options' => array(),
+ 'load' => FALSE,
+ ),
+ );
}
diff --git a/sites/all/modules/contrib/files/elfinder/editors/yui/yui.js b/sites/all/modules/contrib/files/elfinder/editors/yui/yui.js
index 49b8a54d..c4bebb94 100644
--- a/sites/all/modules/contrib/files/elfinder/editors/yui/yui.js
+++ b/sites/all/modules/contrib/files/elfinder/editors/yui/yui.js
@@ -1,33 +1,41 @@
+/*
+ * elFinder Integration
+ *
+ * Copyright (c) 2010-2018, Alexey Sukhotin. All rights reserved.
+ */
+
// $Id: elfinder.yui.js,v 1.1 2010/10/06 09:44:51 ph0enix Exp $
(function($) {
-Drupal.elfinder.editor.yui = {
- fn : {
- attach: Drupal.wysiwyg.editor.attach.yui
+ Drupal.elfinder.editor.yui = {
+ fn: {
+ attach: Drupal.wysiwyg.editor.attach.yui
+ }
}
-}
-Drupal.wysiwyg.editor.attach.yui = function(context, params, settings) {
-
- $('#' + params.field).parent().addClass('yui-skin-' + settings.theme);
- // Attach editor.
- var editor = new YAHOO.widget.Editor(params.field, settings);
-
- editor.on('windowInsertImageRender', function(e) {
-
- var dialogcode = $('#' + params.field + '-panel');
-
- var oUrl = $('input#' + params.field + '_insertimage_url');
- var browsebutton = $('');
+ Drupal.wysiwyg.editor.attach.yui = function(context, params, settings) {
- browsebutton.attr('value', Drupal.t('Browse Server'));
- browsebutton.attr('onclick', 'var w = window; w.open("' + Drupal.settings.elfinder.file_browser_url + '","","toolbar=no,menubar=no,width=600,height=600")');
- browsebutton.insertAfter(oUrl);
+ $('#' + params.field).parent().addClass('yui-skin-' + settings.theme);
+ // Attach editor.
+ var editor = new YAHOO.widget.Editor(params.field, settings);
- }, editor, true);
-
- editor.render();
-}
+ editor.on('windowInsertImageRender', function(e) {
+
+ var dialogcode = $('#' + params.field + '-panel');
+
+
+ //var oImgHtml = $(''+imgHtml+'
');
+ var oUrl = $('input#' + params.field + '_insertimage_url');
+ var browsebutton = $('');
+
+ browsebutton.attr('value', Drupal.t('Browse Server'));
+ browsebutton.attr('onclick', 'var w = window; w.open("' + Drupal.settings.elfinder.file_browser_url + '","","toolbar=no,menubar=no,width=600,height=600")');
+ browsebutton.insertAfter(oUrl);
+
+ }, editor, true);
+
+ editor.render();
+ }
})(jQuery);
\ No newline at end of file
diff --git a/sites/all/modules/contrib/files/elfinder/elfinder.info b/sites/all/modules/contrib/files/elfinder/elfinder.info
index eb97fd84..701650c5 100644
--- a/sites/all/modules/contrib/files/elfinder/elfinder.info
+++ b/sites/all/modules/contrib/files/elfinder/elfinder.info
@@ -6,8 +6,9 @@ configure = "admin/config/media/elfinder"
core = 7.x
project status url = https://drupal-elfinder.sourceforge.io/release-history.php
-; Information added by Drupal.org packaging script on 2018-12-03
+; Information added by Drupal.org packaging script on 2017-11-16
version = "7.x-2.x-dev"
core = "7.x"
project = "elfinder"
-datestamp = "1543843700"
+datestamp = "1555577224"
+
diff --git a/sites/all/modules/contrib/files/elfinder/elfinder.install b/sites/all/modules/contrib/files/elfinder/elfinder.install
index bab2cd5b..3092d042 100644
--- a/sites/all/modules/contrib/files/elfinder/elfinder.install
+++ b/sites/all/modules/contrib/files/elfinder/elfinder.install
@@ -1,4 +1,10 @@
@url and install to @libpath.', array('@url' => 'http://elfinder.org', '@libpath' => $libpath));
+ $ver = '';
+
+
+ $install_t = t('Please download it from @url and install to @libpath.', array('@url' => elfinder_download_url(), '@libpath' => $libpath));
if ($phase == 'runtime' || $phase == 'install' || $phase == 'update') {
$description = t('elFinder library was not found.') . ' ' . $install_t;
$severity = '';
$value = t('Not found');
-
- if ( (is_readable($libpath . '/connectors/php/elFinder.class.php') || is_readable($libpath . '/php/elFinder.class.php') ) && is_readable($libpath . '/js/elfinder.min.js') ) {
- $editor_file_content = file_get_contents($libpath . '/js/elfinder.min.js');
+ if ((is_readable($libpath . '/connectors/php/elFinder.class.php') || is_readable($libpath . '/php/elFinder.class.php')) && is_readable($libpath . '/js/elfinder.min.js')) {
+
+ $editor_file_content = file_get_contents($libpath . '/js/elfinder.min.js');
$value = t('Exists');
if (preg_match("/(?:this|elFinder\.prototype|\.prototype)\.version\s*=\s*[\"\']([^\"\']+)[\"\']/", $editor_file_content, $matches)) {
- $ver = $matches[1];
+ $ver = $matches[1];
$value = t('@ver', array('@ver' => $ver));
}
$description = '';
-
- if (preg_match("/^(\d+)\.(\d+|x)(\.(\d+))?/", $ver, $matches)) {
- $ver_major = (int)$matches[1];
- $ver_minor = $matches[2];
- $ver = "$ver_major.$ver_minor";
- if (count($matches) == 5) {
- $ver_release = (int)$matches[4];
- $ver = "$ver_major.$ver_minor.$ver_release";
- }
- }
-
-
-
-
- if (($ver_major < $min_major) || ($ver_major == 2 && $ver_minor == '1' && $ver_release < 38)) {
- $description = t('Not supported elFinder library. Please upgrade to @minver.', array('@ver' => $ver, '@minver' => $min_ver)) . ' ' . $install_t;
- $severity = REQUIREMENT_ERROR;
- } else {
- $severity = REQUIREMENT_OK;
- }
-
- $badpaths_check = elfinder_check_badpaths();
-
- if ($badpaths_check['result'] == FALSE) {
- $severity = REQUIREMENT_ERROR;
- $description = $badpaths_check['message'];
- }
-
- }
- else {
+
+ if (preg_match("/^(\d+)\.(\d+|x)(\.(\d+))?/", $ver, $matches)) {
+ $ver_major = (int)$matches[1];
+ $ver_minor = $matches[2];
+ $ver = "$ver_major.$ver_minor";
+ if (count($matches) == 5) {
+ $ver_release = (int)$matches[4];
+ $ver = "$ver_major.$ver_minor.$ver_release";
+ }
+ }
+
+
+ if (($ver_major < $min_major) || ($ver_major == 2 && $ver_minor == '1' && $ver_release < 38)) {
+ $description = t('Not supported elFinder library. Please upgrade to @minver.', array('@ver' => $ver, '@minver' => $min_ver)) . ' ' . $install_t;
+ $severity = REQUIREMENT_ERROR;
+ } else {
+ $severity = REQUIREMENT_OK;
+ }
+
+ $badpaths_check = elfinder_check_badpaths();
+
+ if ($badpaths_check['result'] == FALSE) {
+ $severity = REQUIREMENT_ERROR;
+ $description = $badpaths_check['message'];
+ }
+
+ } else {
$severity = REQUIREMENT_ERROR;
}
$requirements['elfinder'] = array(
- 'title' => 'elFinder',
- 'description' => $description,
- 'value' => $value,
- 'severity' => $severity
+ 'title' => 'elFinder',
+ 'description' => $description,
+ 'value' => $value,
+ 'severity' => $severity
);
}
@@ -102,47 +105,48 @@ function elfinder_schema() {
$schema['elfinder_file_extinfo'] = array(
'description' => 'Stores additional filesystem attributes',
'fields' => array(
- 'extid' => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE),
- 'fid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => FALSE),
- 'description' => array('type' => 'varchar', 'length' => 255, 'not null' => FALSE, 'default' => ''),
+ 'extid' => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE),
+ 'fid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => FALSE),
+ 'description' => array('type' => 'varchar', 'length' => 255, 'not null' => FALSE, 'default' => ''),
),
'primary key' => array('extid'),
);
-
+
$schema['elfinder_profile'] = array(
'description' => 'Stores configuration profiles',
'fields' => array(
- 'pid' => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE),
- 'name' => array('type' => 'varchar', 'length' => 255, 'not null' => FALSE, 'default' => ''),
- 'description' => array('type' => 'varchar', 'length' => 255, 'not null' => FALSE, 'default' => ''),
- 'settings' => array('type' => 'text', 'not null' => FALSE),
+ 'pid' => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE),
+ 'name' => array('type' => 'varchar', 'length' => 255, 'not null' => FALSE, 'default' => ''),
+ 'description' => array('type' => 'varchar', 'length' => 255, 'not null' => FALSE, 'default' => ''),
+ 'settings' => array('type' => 'text', 'not null' => FALSE),
),
'primary key' => array('pid'),
);
-
+
return $schema;
-
+
}
function elfinder_update_7101() {
+ // drupal_install_schema('elfinder');
}
function elfinder_update_7102() {
$ret = array();
if (db_table_exists('elfinder_profile') == FALSE) {
- drupal_install_schema('elfinder');
+ drupal_install_schema('elfinder');
}
-
+
if (!db_field_exists('elfinder_profile', 'settings')) {
- db_add_field($ret, 'elfinder_profile', 'settings', array('type' => 'text', 'not null' => FALSE));
+ db_add_field($ret, 'elfinder_profile', 'settings', array('type' => 'text', 'not null' => FALSE));
}
-
+
return $ret;
}
function elfinder_update_7103() {
- drupal_flush_all_caches();
+ drupal_flush_all_caches();
}
/**
@@ -150,13 +154,12 @@ function elfinder_update_7103() {
*/
function elfinder_update_7104() {
$results = db_query("SELECT pid, name, description, settings from {elfinder_profile}");
- foreach($results as $row) {
+ foreach ($results as $row) {
$settings = unserialize($row->settings);
if (!is_array($settings['profile_role'])) {
if (isset($settings['profile_role']) && $settings['profile_role'] > 0) {
$settings['profile_role'] = array($settings['profile_role'] => $settings['profile_role']);
- }
- else {
+ } else {
$settings['profile_role'] = array();
}
db_update('elfinder_profile')
diff --git a/sites/all/modules/contrib/files/elfinder/elfinder.module b/sites/all/modules/contrib/files/elfinder/elfinder.module
index b8ee1e67..cca3b727 100644
--- a/sites/all/modules/contrib/files/elfinder/elfinder.module
+++ b/sites/all/modules/contrib/files/elfinder/elfinder.module
@@ -1,7 +1,8 @@
implode(', ', $badpaths)));
watchdog('elfinder', $message, array(), WATCHDOG_ALERT);
drupal_set_message($message, 'error');
-
+
$ret['result'] = FALSE;
$ret['message'] = $message;
-
+
}
return $ret;
@@ -42,13 +43,13 @@ function elfinder_check_badpaths() {
function elfinder_init() {
elfinder_check_badpaths();
}
-
+
/**
* Implements hook_menu().
*/
function elfinder_menu() {
$items = array();
-
+
$access = array('use file manager');
$items['admin/content/files'] = array(
@@ -57,10 +58,10 @@ function elfinder_menu() {
'page arguments' => array('backend'),
'description' => 'Manage media files.',
'access arguments' => array('administer file manager'),
- );
+ );
$items['admin/content/files']['type'] = MENU_LOCAL_TASK;
-
+
$items['elfinder'] = array(
'title' => 'File browser',
'page callback' => 'elfinder_file_browser',
@@ -96,7 +97,7 @@ function elfinder_menu() {
$items['admin/config/elfinder'] = $items['admin/config/media/elfinder'] = $settings_page;
$items['admin/config/elfinder']['type'] = MENU_CALLBACK;
-
+
$items['admin/config/media/elfinder/profile'] = array(
'title' => 'Add Profile',
'page callback' => 'elfinder_admin_profiles',
@@ -105,7 +106,7 @@ function elfinder_menu() {
'type' => MENU_CALLBACK,
'file' => 'inc/elfinder.admin.profiles.inc',
);
-
+
$items['admin/config/media/elfinder/profile/%/delete'] = array(
'title' => 'Delete Profile',
'page callback' => 'elfinder_admin_profiles',
@@ -124,8 +125,8 @@ function elfinder_menu() {
'file' => 'inc/elfinder.admin.profiles.inc',
);
-
- $items['elfinder/ahah/dir'] = array(
+
+ $items['elfinder/ahah/dir'] = array(
'title' => 'JavaScript Volume Add Item',
'page callback' => 'elfinder_admin_form_dir_js',
'page arguments' => array('item_add'),
@@ -133,16 +134,16 @@ function elfinder_menu() {
'type' => MENU_CALLBACK,
'file' => 'inc/elfinder.admin.profiles.inc',
);
-
- $items['elfinder/ahah/rmdir/%'] = array(
+
+ $items['elfinder/ahah/rmdir/%'] = array(
'title' => 'JavaScript Volume Remove Item',
'page callback' => 'elfinder_admin_form_dir_js',
'page arguments' => array('item_remove', 3),
'access arguments' => array('administer file manager'),
'type' => MENU_CALLBACK,
'file' => 'inc/elfinder.admin.profiles.inc',
- );
-
+ );
+
$items['elfinder/upload/fckeditor'] = array(
'title' => 'FCKeditor Quick Upload',
'page callback' => 'elfinder_editor_upload_fckeditor',
@@ -150,18 +151,18 @@ function elfinder_menu() {
'type' => MENU_CALLBACK,
'file' => 'editors/fckeditor/fckeditor.upload.inc',
);
-
+
$items['elfinder/upload/ckeditor'] = array(
'title' => 'CKeditor Quick Upload',
'page callback' => 'elfinder_editor_upload_ckeditor',
'access arguments' => array('access content'),
'type' => MENU_CALLBACK,
'file' => 'editors/ckeditor/ckeditor.upload.inc',
- );
-
+ );
+
/* Getting updated menu items from hook_elfinder_menu */
$newitems = module_invoke_all('elfinder_menu', $items);
-
+
return ($newitems) ? $newitems : $items;
}
@@ -196,21 +197,34 @@ function elfinder_file_browser($browser_mode = 'default') {
$langCode = $_GET['langCode'];
}
}
-
+
/* Initial frontend settings */
$elfinder_js_settings = array(
'connectorUrl' => url('elfinder/connector'),
'moduleUrl' => url('elfinder'),
'editorApp' => $editorApp,
'langCode' => $langCode,
- 'rememberLastDir' => variable_get('elfinder_settings_misc_rememberlastdir', 'true') == 'true' ? TRUE : FALSE, // remember last opened directory
+ 'rememberLastDir' => variable_get('elfinder_settings_misc_rememberlastdir', 'true') == 'true' ? TRUE : FALSE, // remember last opened directory
'disabledCommands' => elfinder_get_disabled_commands(),
'requestType' => variable_get('elfinder_settings_misc_requesttype', 'get') == 'get' ? 'get' : 'post',
'browserMode' => $browser_mode,
'token' => drupal_get_token('elFinder'),
'soundPath' => base_path() . elfinder_lib_path() . '/sounds',
+ 'commandsOptions' => array('dummy' => array()),
);
+ if (variable_get('elfinder_settings_filesystem_external_preview', 'disabled') != 'disabled') {
+ $elfinder_js_settings['commandsOptions']['quicklook'] = array(
+ 'sharecadMimes' => array('image/vnd.dwg', 'image/vnd.dxf', 'model/vnd.dwf', 'application/vnd.hp-hpgl', 'application/plt', 'application/step', 'model/iges', 'application/vnd.ms-pki.stl', 'application/sat', 'image/cgm', 'application/x-msmetafile'),
+ 'googleDocsMimes' => array('application/pdf', 'image/tiff', 'application/vnd.ms-office', 'application/msword', 'application/vnd.ms-word', 'application/vnd.ms-excel', 'application/vnd.ms-powerpoint', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'application/vnd.openxmlformats-officedocument.presentationml.presentation', 'application/postscript', 'application/rtf'),
+ 'officeOnlineMimes' => array('application/msword', 'application/vnd.ms-word', 'application/vnd.ms-excel', 'application/vnd.ms-powerpoint', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'),
+ );
+ }
+
+ if ($browser_mode == 'backend') {
+ //$elfinder_js_settings['commandsOptions']['help'] = array('view' => array('about', 'shortcuts', 'integrations'));
+ }
+
if (($mheight = variable_get('elfinder_settings_misc_manager_height', '')) != '') {
$elfinder_js_settings['height'] = (int)$mheight;
}
@@ -219,17 +233,34 @@ function elfinder_file_browser($browser_mode = 'default') {
if ($editorApp) {
$elfinder_js_settings['editorCallback'] = 'elfinder_' . $editorApp . '_callback';
}
-
+
$options = array(
- 'group' => CSS_DEFAULT,
+ 'group' => CSS_DEFAULT,
'every_page' => FALSE,
);
- $sysjqver = variable_get('jquery_update_jquery_version', '1.10');
+ $sysjqver = '1.4.4';
+ $sysuiver = '1.8.7';
- if (!(module_exists('jquery_update') && preg_match('/1\.(8|9|10|11|12)/', $sysjqver))) {
- drupal_add_js($path . '/js/elfinder.jquery.min.js');
- drupal_add_js($path . '/js/elfinder.jquery-ui.min.js');
+ $sys_ui_lib = drupal_get_library('system','ui');
+ $sys_jq_lib = drupal_get_library('system','jquery');
+
+ if ($sys_jq_lib != false) {
+ $sysjqver = $sys_jq_lib['version'];
+ }
+
+ if ($sys_ui_lib != false) {
+ $sysuiver = $sys_ui_lib['version'];
+ }
+
+ if (preg_match('/1\.(4|5|6|8|9|10|11|12)\.?/', $sysjqver) || preg_match('/1\.(8|9|10)\.?/', $sysuiver)) {
+ if (property_exists('elFinder', 'ApiVersion')) {
+ drupal_add_js($path . '/js/elfinder.jquery.min.js');
+ drupal_add_js($path . '/js/elfinder.jquery-ui.min.js');
+ } else {
+ drupal_add_js($path . '/js/elfinder.jquery.legacy.min.js');
+ drupal_add_js($path . '/js/elfinder.jquery-ui.legacy.min.js');
+ }
} else {
drupal_add_library('system', 'ui.button');
drupal_add_library('system', 'ui.dialog');
@@ -239,10 +270,10 @@ function elfinder_file_browser($browser_mode = 'default') {
drupal_add_library('system', 'ui.selectable');
drupal_add_library('system', 'ui.slider');
}
-
- elfinder_add_css($path . '/css/ui-themes/smoothness/jquery-ui.custom.css', $options);
+
+ elfinder_add_css($path . '/css/ui-themes/smoothness/jquery-ui.min.css', $options);
elfinder_add_css($path . '/css/elfinder.common.css', $options);
-
+
if (is_readable($libpath . 'css/elfinder.min.css') && is_readable($libpath . 'js/elfinder.min.js')) {
elfinder_add_css($libpath . 'css/elfinder.min.css');
drupal_add_js($libpath . 'js/elfinder.min.js');
@@ -317,36 +348,57 @@ function elfinder_file_browser($browser_mode = 'default') {
} else {
watchdog('Failed Requirement', 'elFinder unable to load required JS and CSS files', array(), WATCHDOG_ERROR);
}
-
- $langfile = $libpath . 'js/i18n/elfinder.' . $langCode . '.js';
-
+
+ $langfile = $libpath . 'js/i18n/elfinder.' . $langCode . '.js';
+
if (is_readable($libpath . 'css/theme.css')) {
- elfinder_add_css($libpath . 'css/theme.css');
+ elfinder_add_css($libpath . 'css/theme.css');
}
-
+
+// thumbnail size hack
+/*
+ $tmbSize = (int)variable_get('elfinder_settings_thumbnail_size', '48');
+
+ $tmbSizeFinal = $tmbSize . 'px';
+
+ $tmbWrapperSize = $tmbSize + 4;
+
+ $tmbWrapperSizeFinal = $tmbWrapperSize . 'px';
+
+ drupal_add_css(".elfinder-cwd-icon { width: $tmbSizeFinal; height: $tmbSizeFinal;} .elfinder-cwd-view-icons .elfinder-cwd-file-wrapper { width: $tmbWrapperSizeFinal; height: $tmbWrapperSizeFinal; }", array('type' => 'inline'));
+*/
+
/* Adding localization */
if (is_readable($langfile)) {
drupal_add_js($langfile);
}
+ if (is_readable($libpath . 'js/extras/editors.default.min.js')) {
+ drupal_add_js($libpath . 'js/extras/editors.default.min.js');
+ }
+
+ if (is_readable($libpath . 'js/extras/quicklook.googledocs.min.js')) {
+ drupal_add_js($libpath . 'js/extras/quicklook.googledocs.min.js');
+ }
+ //drupal_add_js('http://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.5/require.min.js');
/* Getting updated frontend settings from hook_elfinder_js_settings */
$newjssettings = module_invoke_all('elfinder_js_settings', $elfinder_js_settings);
-
+
if (isset($newjssettings['all'])) {
$elfinder_js_settings = array_merge($elfinder_js_settings, (array)$newjssettings['all']);
}
-
+
if (isset($newjssettings[$editorApp])) {
$elfinder_js_settings = array_merge($elfinder_js_settings, (array)$newjssettings[$editorApp]);
}
/* Loading callbacks for returning url from file manager to caller */
- $editor_plugins = elfinder_system_listing("$editorApp\.callback\.js\$", $path . '/editors' , 'name', 0);
+ $editor_plugins = elfinder_system_listing("$editorApp\.callback\.js\$", $path . '/editors', 'name', 0);
$callback_file = '';
if (isset($editorApp)) {
-
+
if (isset($editorApp) && isset($editor_plugins[$editorApp . '.callback'])) {
$callback_file = $editor_plugins[$editorApp . '.callback']->uri;
@@ -355,40 +407,42 @@ function elfinder_file_browser($browser_mode = 'default') {
drupal_add_js($callback_file);
}
}
-
+
if (isset($elfinder_js_settings['browserscripts'])) {
foreach ((array)$elfinder_js_settings['browserscripts'] as $script) {
drupal_add_js($script, array('weight' => 999));
}
unset($elfinder_js_settings['browserscripts']);
}
-
- }
-
- if (property_exists('elFinder', 'ApiVersion')) {
- $elfinder_js_settings['api21'] = true;
- } else {
- drupal_add_js($path . '/js/info.js');
- }
- // drupal_add_js($path . '/js/mouseover.js');
- drupal_add_js($path . '/js/elfinder.callback.js');
- drupal_add_js(array('elfinder' => $elfinder_js_settings), 'setting');
-
-
- $libs = elfinder_get_libraries('tinymce');
- if (count($libs) > 0 && !empty($libs['tinymce'])) {
-
- $path = $libs['tinymce'] . '/jscripts/tiny_mce/tiny_mce_popup.js';
- $abspath = base_path() . "/$path";
- drupal_add_js($path);
- }
+ }
+
+ if (property_exists('elFinder', 'ApiVersion')) {
+ $elfinder_js_settings['api21'] = true;
+ } else {
+ drupal_add_js($path . '/js/info.js');
+ }
+ // drupal_add_js($path . '/js/mouseover.js');
+ drupal_add_js(array('elfinder' => $elfinder_js_settings), 'setting');
+ drupal_add_js($path . '/js/elfinder.callback.js');
+ //drupal_add_js(array('elfinder' => $elfinder_js_settings), 'setting');
+
+
+ $libs = elfinder_get_libraries('tinymce');
+
+ if (count($libs) > 0 && !empty($libs['tinymce'])) {
+
+ $path = $libs['tinymce'] . '/jscripts/tiny_mce/tiny_mce_popup.js';
+ $abspath = base_path() . "/$path";
+ drupal_add_js($path);
+ }
+
} else {
drupal_set_message(t('elFinder library was not found. Please download it from @url and install to @libpath.', array('@url' => elfinder_download_url(), '@libpath' => $libpath)), 'error');
}
- if ($browser_mode && $browser_mode == 'backend') {
+ if ($browser_mode && $browser_mode == 'backend') {
return theme('elfinder_page_backend');
} else {
print theme('elfinder_page');
@@ -404,7 +458,7 @@ function elfinder_get_disabled_commands() {
$disabled_commands = array();
$permissions = elfinder_permission();
-
+
$commands = elfinder_cmd_permissions();
// Disable not allowed commands
@@ -412,12 +466,12 @@ function elfinder_get_disabled_commands() {
if (array_key_exists($perm_name, $commands) && !user_access($perm_name)) {
array_push($disabled_commands, $commands[$perm_name]);
}
- }
-
-/* if (!user_access('download own uploaded files') && !user_access('download all uploaded files')) {
- $disabled_commands[] = 'getfile';
- }*/
-
+ }
+
+ /* if (!user_access('download own uploaded files') && !user_access('download all uploaded files')) {
+ $disabled_commands[] = 'getfile';
+ }*/
+
return $disabled_commands;
}
@@ -429,31 +483,42 @@ function elfinder_user_roles() {
function elfinder_get_user_profile() {
/* Get role id list sorted by weight descending */
$profiles = elfinder_admin_profile_get();
-
+
if (!is_array($profiles)) {
- $profiles = array($profiles);
+ $profiles = array($profiles);
}
-
+
$first_profile = NULL;
-
+
$rids = elfinder_user_roles();
$rids[] = 1; // anonymous user
-
+
/* Get first matching profile for higest weight user role */
foreach ($rids as $rid) {
foreach ($profiles as $profile) {
- if (isset($profile->settings['profile_role']) && in_array($rid, $profile->settings['profile_role']) ) {
- if (is_null($first_profile)) {
- $first_profile = $profile;
- } else if (isset($profile->settings['volume'])) {
- /* Adding all available to current user volumes from other profiles */
- foreach ($profile->settings['volume'] as $volume) {
+ if (isset($profile->settings['profile_role']) && in_array($rid, $profile->settings['profile_role'])) {
+ if (is_null($first_profile)) {
+ $first_profile = $profile;
+ } else if (isset($profile->settings['volume'])) {
+ /* Adding all available to current user volumes from other profiles */
+
+ $found = FALSE;
+
+ foreach ($profile->settings['volume'] as $volume) {
+ foreach ($first_profile->settings['volume'] as $fp_volume) {
+ if ($volume['path'] == $fp_volume['path'] && $volume['label'] == $fp_volume['label']) {
+ $found = TRUE;
+ }
+ }
+
+ if (!$found) {
$first_profile->settings['volume'][] = $volume;
}
}
}
+ }
}
-
+
}
return $first_profile;
@@ -464,28 +529,35 @@ function elfinder_get_user_profile() {
*/
function elfinder_filesystemconnector($mode = 'default') {
global $base_root, $user;
-
+
$p = elfinder_get_user_profile();
-
+
$path = drupal_get_path('module', 'elfinder');
-
+
include_once dirname(elfinder_connector_path()) . DIRECTORY_SEPARATOR . 'elFinderConnector.class.php';
include_once dirname(elfinder_connector_path()) . DIRECTORY_SEPARATOR . 'elFinderVolumeDriver.class.php';
include_once dirname(elfinder_connector_path()) . DIRECTORY_SEPARATOR . 'elFinderVolumeLocalFileSystem.class.php';
include_once $path . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'elfinder.drupalfs.driver.inc';
include_once $path . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'elfinder.drupalfs.acl.inc';
include_once $path . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'elfinder.admin.profiles.inc';
+ if (is_readable(dirname(elfinder_connector_path()) . DIRECTORY_SEPARATOR . 'elFinderPlugin.php')) {
+ include_once dirname(elfinder_connector_path()) . DIRECTORY_SEPARATOR . 'elFinderPlugin.php';
+ }
-
-/**
- * Emulate json_encode required by filesystem connector for old php without JSON support
- */
+ if (is_readable(dirname(elfinder_connector_path()) . DIRECTORY_SEPARATOR . 'editors' . DIRECTORY_SEPARATOR . 'editor.php')) {
+ include_once dirname(elfinder_connector_path()) . DIRECTORY_SEPARATOR . 'editors' . DIRECTORY_SEPARATOR . 'editor.php';
+ }
+
+
+ /**
+ * Emulate json_encode required by filesystem connector for old php without JSON support
+ */
if (!function_exists('json_encode')) {
function json_encode($arg) {
return drupal_json($arg);
}
}
-
+
/* Disabling incompartible devel module features */
if (module_exists('devel')) {
$devel_incompat = array('dev_timer', 'devel_query_display', 'dev_mem', 'devel_redirect_page');
@@ -504,17 +576,17 @@ function elfinder_filesystemconnector($mode = 'default') {
}
// Set absolute/relative url variable.
- if(!isset($mode) && variable_get('elfinder_settings_filesystem_fileurl', 'true') == 'false') {
+ if (!isset($mode) && variable_get('elfinder_settings_filesystem_fileurl', 'true') == 'false') {
$mode = 'relative';
}
$disabled_commands = elfinder_get_disabled_commands();
$acl = new elFinderDrupalACL();
-
+
$pubFiles = file_stream_wrapper_get_instance_by_uri('public://');
$pvtFiles = file_stream_wrapper_get_instance_by_uri('private://');
-
+
$roots = array();
if ($p) {
@@ -524,25 +596,26 @@ function elfinder_filesystemconnector($mode = 'default') {
}
$options_defs = array(
- 'disabled' => $disabled_commands, // list of not allowed commands
- 'debug' => FALSE,
- 'dirSize' => FALSE,
- 'tmbSize' => isset($profile['tmbsize']) ? $profile['tmbsize'] : variable_get('elfinder_settings_thumbnail_size', '48'), // thumbnail image size
- 'tmbPath' => variable_get('elfinder_settings_thumbnail_dirname', 'tmb'), // thumbnail images directory (tmbPath in 2.x)
- 'tmbCrop' => variable_get('elfinder_settings_thumbnail_tmbcrop', 'true') == 'true' ? TRUE : FALSE, // crop thumbnail image
- 'dateFormat' => variable_get('date_format_long', 'j M Y H:i'), // file modification date format
- 'mimeDetect' => isset($profile['mime_detect']) ? $profile['mime_detect'] : variable_get('elfinder_settings_filesystem_mimedetect', 'auto'), // file type detection method
- 'imgLib' => isset($profile['imglib']) ? $profile['imglib'] : variable_get('elfinder_settings_thumbnail_imglib', 'auto'), // image manipulation library
- 'fileMode' => isset($profile['file_perm']) ? octdec($profile['file_perm']) : octdec(variable_get('elfinder_settings_filesystem_fileperm', '0666')), // created file permissions
- 'dirMode' => isset($profile['dir_perm']) ? octdec($profile['dir_perm']) : octdec(variable_get('elfinder_settings_filesystem_dirperm', '0777')), // created directory permissions
- 'accessControlData' => array('uid' => $user->uid),
- 'acceptedName' => '/^[^\.]+/',
- 'uploadMaxSize' => parse_size(variable_get('elfinder_settings_filesystem_maxfilesize', '')),
- 'userProfile' => $p,
- 'jpgQuality' => variable_get('image_jpeg_quality', 75),
+ 'disabled' => $disabled_commands, // list of not allowed commands
+ 'debug' => FALSE,
+ 'dirSize' => FALSE,
+ 'tmbSize' => isset($profile['tmbsize']) ? (int)$profile['tmbsize'] : (int)variable_get('elfinder_settings_thumbnail_size', '48'), // thumbnail image size
+ 'tmbPath' => variable_get('elfinder_settings_thumbnail_dirname', 'tmb'), // thumbnail images directory (tmbPath in 2.x)
+ 'tmbCrop' => variable_get('elfinder_settings_thumbnail_tmbcrop', 'true') == 'true' ? TRUE : FALSE, // crop thumbnail image
+ 'dateFormat' => variable_get('date_format_long', 'j M Y H:i'), // file modification date format
+ 'mimeDetect' => isset($profile['mime_detect']) ? $profile['mime_detect'] : variable_get('elfinder_settings_filesystem_mimedetect', 'auto'), // file type detection method
+ 'imgLib' => isset($profile['imglib']) ? $profile['imglib'] : variable_get('elfinder_settings_thumbnail_imglib', 'auto'), // image manipulation library
+ 'fileMode' => isset($profile['file_perm']) ? octdec($profile['file_perm']) : octdec(variable_get('elfinder_settings_filesystem_fileperm', '0666')), // created file permissions
+ 'dirMode' => isset($profile['dir_perm']) ? octdec($profile['dir_perm']) : octdec(variable_get('elfinder_settings_filesystem_dirperm', '0777')), // created directory permissions
+ 'accessControlData' => array('uid' => $user->uid),
+ 'acceptedName' => '/^[^\.]+/',
+ 'uploadMaxSize' => parse_size(variable_get('elfinder_settings_filesystem_maxfilesize', '')),
+ 'userProfile' => $p,
+ 'jpgQuality' => variable_get('image_jpeg_quality', 75),
+ 'dispInlineRegex' => variable_get('elfinder_settings_filesystem_inlinepreviewregex', '^$'),
+ 'statCorrector' => 'elFinderVolumeDrupal::stat_corrector',
);
-
if (is_object($pubFiles) && user_access('access public files')) {
$roots[] = array_merge($options_defs, array(
'driver' => 'Drupal',
@@ -550,9 +623,9 @@ function elfinder_filesystemconnector($mode = 'default') {
'URL' => $mode == 'relative' ? base_path() . $pubFiles->getDirectoryPath() : $pubFiles->getExternalUrl(), // root directory URL
'alias' => variable_get('elfinder_settings_filesystem_public_root_label', '') != '' ? variable_get('elfinder_settings_filesystem_public_root_label', '') : t('Public Files'), // display this instead of root directory name (named 'alias' in elFinder 2.0)
'accessControl' => array($acl, 'fsAccessPublic'),
- ));
+ ));
}
-
+
if (is_object($pvtFiles) && user_access('access private files')) {
$roots[] = array_merge($options_defs, array(
'driver' => 'Drupal',
@@ -560,9 +633,9 @@ function elfinder_filesystemconnector($mode = 'default') {
'URL' => $mode == 'relative' ? base_path() . $pvtFiles->getDirectoryPath() : $pvtFiles->getExternalUrl(), // root directory URL
'alias' => variable_get('elfinder_settings_filesystem_private_root_label', '') != '' ? variable_get('elfinder_settings_filesystem_private_root_label', '') : t('Private Files'), // display this instead of root directory name (named 'alias' in elFinder 2.0)
'accessControl' => array($acl, 'fsAccessPrivate'),
- ));
+ ));
}
-
+
if (user_access('access unmanaged files')) {
$roots[] = array_merge($options_defs, array(
'driver' => 'LocalFileSystem',
@@ -570,62 +643,56 @@ function elfinder_filesystemconnector($mode = 'default') {
'URL' => elfinder_file_directory_url($mode == 'relative' ? TRUE : FALSE), // root directory URL
'alias' => variable_get('elfinder_settings_filesystem_unmanaged_root_label', '') != '' ? variable_get('elfinder_settings_filesystem_unmanaged_root_label', '') : t('Unmanaged Files'), // display this instead of root directory name (named 'alias' in elFinder 2.0)
'accessControl' => array($acl, 'fsAccessUnmanaged'),
- ));
+ ));
}
-
+
if (isset($profile['volume'])) {
foreach ($profile['volume'] as $volume) {
$root = array(
- 'alias' => $volume['label'],
+ 'alias' => $volume['label'],
);
- $is_subdir = FALSE;
-
$rootpath = '';
-
if (isset($volume['path']) && substr($volume['path'], 0, 1) != DIRECTORY_SEPARATOR) {
- $is_subdir = TRUE;
- }
- if ($is_subdir) {
-
$root['driver'] = 'Drupal';
$scheme = file_uri_scheme($volume['path']);
if ($scheme == FALSE) {
- if (is_object(file_stream_wrapper_get_instance_by_uri('private://'))) {
- $scheme = 'private';
+ if (is_object(file_stream_wrapper_get_instance_by_uri('private://'))) {
+ $scheme = 'private';
} else {
- $scheme = 'public';
- }
+ $scheme = 'public';
+ }
}
$rootpath = $volume['path'];
+ $rootpath = elfinder_parse_path_tokens($rootpath);
+ $relpath = '';
if ($pos = strpos($rootpath, '://')) {
- $rootpath = substr($rootpath, $pos + 3);
+ $relpath = substr($rootpath, $pos + 3);
+ } else {
+ $relpath = $rootpath;
}
$streamWrapper = file_stream_wrapper_get_instance_by_scheme($scheme);
+ $volpath = '';
if (is_object($streamWrapper)) {
- $volpath = $streamWrapper->realpath();
- $volurl = $mode == 'relative' ? base_path() . $streamWrapper->getDirectoryPath() : $streamWrapper->getExternalUrl();
- $url = isset($volume['url']) && $volume['url'] != '' ? elfinder_parse_path_tokens($volume['url']) : $volurl;
+ $streamWrapper->setUri($streamWrapper->getUri() . $relpath);
+ $volpath = $streamWrapper->realpath();
+ $volurl = $mode == 'relative' ? base_path() . $streamWrapper->getDirectoryPath() : $streamWrapper->getExternalUrl();
+ $url = isset($volume['url']) && $volume['url'] != '' ? elfinder_parse_path_tokens($volume['url']) : $volurl;
}
- $rootpath = elfinder_parse_path_tokens($rootpath);
- $trimmedpath = ltrim($rootpath, './');
-
- $rootpath = $volpath . DIRECTORY_SEPARATOR . $trimmedpath;
+ $rootpath = $volpath;
$url = rtrim($url, '/');
- $url .= "/$trimmedpath";
-
if (!file_prepare_directory($rootpath, FILE_CREATE_DIRECTORY)) {
drupal_set_message(t('Error. Cannot initialize directory %dir', array('%dir' => $rootpath)), 'error');
}
@@ -650,14 +717,14 @@ function elfinder_filesystemconnector($mode = 'default') {
$roots[] = $root;
}
}
-
+
$opts = array(
- 'roots' => $roots,
- 'driver_defaults' => $options_defs,
+ 'roots' => $roots,
+ 'driver_defaults' => $options_defs,
);
-
+
$newopts = module_invoke_all('elfinder_connector_config', $opts);
-
+
if ($newopts) {
$opts = $newopts;
}
@@ -666,42 +733,42 @@ function elfinder_filesystemconnector($mode = 'default') {
public function test() {
}
}
-
+
try {
- $elFinderObj = new elFinderDrupal($opts);
+ $elFinderObj = new elFinderDrupal($opts);
} catch (Exception $e) {
- module_invoke_all('exit');
- exit(drupal_json_encode(array('error' => array(t('Unable to initialize elFinder object. :msg', array(':msg' => basename($e->getFile()) .": ". $e->getMessage()))))));
+ module_invoke_all('exit');
+ exit(drupal_json_encode(array('error' => array(t('Unable to initialize elFinder object. :msg', array(':msg' => basename($e->getFile()) . ": " . $e->getMessage()))))));
}
-
+
$bindcmds = module_invoke_all('elfinder_bind');
-
+
foreach ($bindcmds as $cmd => $cmdfunc) {
$elFinderObj->bind($cmd, $cmdfunc);
}
-
+
try {
- $elFinderConnectorObj = new elFinderConnectorDrupal($elFinderObj);
+ $elFinderConnectorObj = new elFinderConnectorDrupal($elFinderObj);
} catch (Exception $e) {
- module_invoke_all('exit');
- exit(drupal_json_encode(array('error' => array(t('Unable to initialize elFinder connector object. :msg', array(':msg' => basename($e->getFile()) .": ". $e->getMessage()))))));
+ module_invoke_all('exit');
+ exit(drupal_json_encode(array('error' => array(t('Unable to initialize elFinder connector object. :msg', array(':msg' => basename($e->getFile()) . ": " . $e->getMessage()))))));
}
-
+
module_invoke_all('elfinder_connector_init', $elFinderConnectorObj);
-
- if (!drupal_valid_token($_REQUEST['token'], 'elFinder', TRUE)) {
- module_invoke_all('exit');
- exit(drupal_json_encode(array('error' => array(t('Access denied')))));
- } else {
- try {
- $elFinderConnectorObj->run();
- } catch (Exception $e) {
- module_invoke_all('exit');
- exit(drupal_json_encode(array('error' => array(t('Unable to run elFinder connector. :msg', array(':msg' => basename($e->getFile()) .": ". $e->getMessage()))))));
- }
- module_invoke_all('exit');
- exit();
- }
+
+ if (!drupal_valid_token($_REQUEST['token'], 'elFinder', TRUE)) {
+ module_invoke_all('exit');
+ exit(drupal_json_encode(array('error' => array(t('Access denied')))));
+ } else {
+ try {
+ $elFinderConnectorObj->run();
+ } catch (Exception $e) {
+ module_invoke_all('exit');
+ exit(drupal_json_encode(array('error' => array(t('Unable to run elFinder connector. :msg', array(':msg' => basename($e->getFile()) . ": " . $e->getMessage()))))));
+ }
+ module_invoke_all('exit');
+ exit();
+ }
}
function elfinder_elfinder_bind() {
@@ -724,7 +791,7 @@ function elfinder_theme() {
'arguments' => array('libPath' => '/' . elfinder_lib_path()),
'path' => drupal_get_path('module', 'elfinder') . '/tpl',
);
-
+
return $theme;
}
@@ -773,7 +840,7 @@ function elfinder_permission() {
'title' => t('Copy to clipboard'),
'description' => t('Allow users to copy files to clipboard'),
),
-
+
'cut to clipboard' => array(
'title' => t('Cut to clipboard'),
'description' => t('Allow users to cut files to clipboard'),
@@ -783,12 +850,12 @@ function elfinder_permission() {
'title' => t('View file info'),
'description' => t('Allow users to view file info'),
),
-
+
'preview files' => array(
'title' => t('Preview files'),
'description' => t('Allow users to preview files'),
),
-
+
'delete files and directories' => array(
'title' => t('Delete files and directories'),
'description' => t('Allow users to delete files and directories'),
@@ -828,12 +895,12 @@ function elfinder_permission() {
'title' => t('Download all uploaded files'),
'description' => t('Allow users to download all uploaded files'),
),
-
+
'access public files' => array(
'title' => t('Access public files'),
'description' => t('Allow users to access public files directory'),
),
-
+
'access private files' => array(
'title' => t('Access private files'),
'description' => t('Allow users to access private files directory'),
@@ -843,12 +910,12 @@ function elfinder_permission() {
'title' => t('Access unmanaged files'),
'description' => t('Allow users to access unmanaged files in custom directory'),
),
-
+
'write public files' => array(
'title' => t('Write public files'),
'description' => t('Allow users write access to public files directory'),
),
-
+
'write private files' => array(
'title' => t('Write private files'),
'description' => t('Allow users write access to private files directory'),
@@ -863,31 +930,31 @@ function elfinder_permission() {
'title' => t('View file descriptions'),
'description' => t('Allow users to view file descriptions'),
),
-
+
'edit file description' => array(
'title' => t('Edit file descriptions'),
'description' => t('Allow users to edit file descriptions'),
),
-
+
'view file owner' => array(
'title' => t('View file owner'),
'description' => t('Allow users to view file owner'),
),
-
+
'view file downloads' => array(
'title' => t('View file downloads'),
'description' => t('Allow users to view file downloads'),
),
-
+
'mount network volumes' => array(
'title' => t('Mount network volumes'),
'description' => t('Allow users to mount remote network volumes'),
),
-
+
);
-
+
$newperms = module_invoke_all('elfinder_perms', $perm);
-
+
return ($newperms) ? $newperms : $perm;
}
@@ -897,31 +964,31 @@ function elfinder_permission() {
*/
function elfinder_cmd_permissions() {
$perm = array(
- 'create new directories' => 'mkdir',
- 'create new files' => 'mkfile',
- 'rename files and directories' => 'rename',
- 'file uploads' => 'upload',
- 'copy to clipboard' => 'copy',
- 'cut to clipboard' => 'cut',
- 'paste from clipboard' => 'paste',
- 'preview files' => 'quicklook',
- 'view file info' => 'info',
- 'delete files and directories' => 'rm',
- 'duplicate files' => 'duplicate',
- 'edit files' => 'edit',
- 'add files to archive' => 'archive',
- 'extract files from archive' => 'extract',
- 'resize images' => 'resize',
- 'download own uploaded files' => 'download',
- 'view file description' => 'desc',
- 'edit file description' => 'editdesc',
- 'view file owner' => 'owner',
- 'view file downloads' => 'downloadcount',
- 'mount network volumes' => 'netmount',
+ 'create new directories' => 'mkdir',
+ 'create new files' => 'mkfile',
+ 'rename files and directories' => 'rename',
+ 'file uploads' => 'upload',
+ 'copy to clipboard' => 'copy',
+ 'cut to clipboard' => 'cut',
+ 'paste from clipboard' => 'paste',
+ 'preview files' => 'quicklook',
+ 'view file info' => 'info',
+ 'delete files and directories' => 'rm',
+ 'duplicate files' => 'duplicate',
+ 'edit files' => 'edit',
+ 'add files to archive' => 'archive',
+ 'extract files from archive' => 'extract',
+ 'resize images' => 'resize',
+ 'download own uploaded files' => 'download',
+ 'view file description' => 'desc',
+ 'edit file description' => 'editdesc',
+ 'view file owner' => 'owner',
+ 'view file downloads' => 'downloadcount',
+ 'mount network volumes' => 'netmount',
);
-
+
$newcperms = module_invoke_all('elfinder_cmd_perms', $perm);
-
+
return ($newcperms) ? $newcperms : $perm;
}
@@ -933,39 +1000,39 @@ function elfinder_wysiwyg_plugin($editor, $version) {
$path = drupal_get_path('module', 'elfinder');
drupal_add_js($path . '/js/elfinder.wysiwyg.init.js', array('group' => JS_LIBRARY));
-
+
$options = array(
- 'elfinder_url' => url('elfinder', array('query' => array('app' => $editor ))),
+ 'elfinder_url' => url('elfinder', array('query' => array('app' => $editor))),
'homepage_url' => elfinder_homepage_url(),
- 'path' => $path,
+ 'path' => $path,
);
-
+
/* bueditor hack */
if (preg_match('/^(bueditor|bue)/', $editor)) {
- $editor = 'bueditor';
+ $editor = 'bueditor';
}
-
- $editor_plugins = elfinder_system_listing("$editor\.inc\$", $path . '/editors' , 'name', 0);
-
+
+ $editor_plugins = elfinder_system_listing("$editor\.inc\$", $path . '/editors', 'name', 0);
+
/* loading editor plugin */
$plugin_file = '';
-
+
if (isset($editor_plugins[$editor])) {
-
+
$plugin_file = $editor_plugins[$editor]->uri;
-
+
if ($plugin_file) {
- $options['plugin_url_base'] = "$path/editors/$editor";
+ $options['plugin_url_base'] = "$path/editors/$editor";
require_once $plugin_file;
}
}
/* hook for adding another editor support */
//module_invoke_all('elfinder_editor_plugin');
-
+
/* wysiwyg plugin generation func for selected editor */
$pluginfunc = 'elfinder_' . $editor . '_elfinder_editor_plugin';
-
+
/* returning elFinder wysiwyg editor plugin for selected editor */
if (function_exists($pluginfunc)) {
return call_user_func_array($pluginfunc, array($options));
@@ -991,7 +1058,7 @@ function elfinder_download_url() {
* library files path
*/
function elfinder_lib_path($name = 'elfinder') {
-
+
$libraries = &drupal_static(__FUNCTION__);
if (!isset($libraries)) {
@@ -999,7 +1066,7 @@ function elfinder_lib_path($name = 'elfinder') {
}
$path = '';
-
+
if (!isset($libraries[$name])) {
return FALSE;
} else {
@@ -1064,8 +1131,8 @@ function elfinder_connector_path() {
}
/**
- * path to files directory
- */
+ * path to files directory
+ */
function elfinder_file_directory_path($absolute = FALSE) {
$path = variable_get('elfinder_settings_filesystem_root_custom', '');
$path = elfinder_parse_path_tokens($path);
@@ -1074,23 +1141,23 @@ function elfinder_file_directory_path($absolute = FALSE) {
}
/**
- * Returning site document root
- */
+ * Returning site document root
+ */
function elfinder_document_root() {
return realpath('');
}
/**
- * replace path tokens to its values (%uid, %user, etc)
- */
+ * replace path tokens to its values (%uid, %user, etc)
+ */
function elfinder_parse_path_tokens($unparsed_path) {
global $user, $language;
$path = $unparsed_path;
-
+
$uname = isset($user->name) ? preg_replace('/[[:^alnum:]]+/', '', $user->name) : '';
$langCode = isset($language->language) ? $language->language : 'en';
-
+
$path_tokens = array(
'%uid' => $user->uid,
'%name' => $uname,
@@ -1103,38 +1170,38 @@ function elfinder_parse_path_tokens($unparsed_path) {
if (function_exists('token_replace')) {
$node = null;
-
+
if (module_exists('og_context') AND isset($_SESSION['og_context']['gid'])) {
- $gid = $_SESSION['og_context']['gid'];
+ $gid = $_SESSION['og_context']['gid'];
$node = node_load($gid);
- }
-
+ }
+
$path = token_replace($path, array('node' => $node, 'user' => $user));
}
-
+
return $path;
}
/**
- * default path to files directory
- */
+ * default path to files directory
+ */
function elfinder_default_directory_path() {
$filepath = '';
$scheme = file_default_scheme();
-
+
if ($scheme == 'public') {
- $filepath = variable_get('file_public_path', conf_path() . '/files');
+ $filepath = variable_get('file_public_path', conf_path() . '/files');
} else {
$filepath = variable_get('file_private_path', conf_path());
}
-
+
return $filepath;
}
/**
- * files directory url
- */
+ * files directory url
+ */
function elfinder_file_directory_url($force_relative = FALSE) {
global $base_root;
@@ -1149,32 +1216,32 @@ function elfinder_file_directory_url($force_relative = FALSE) {
if ($force_relative) {
$fileurl = str_replace($base_root, '', $fileurl);
}
-
+
return $fileurl;
}
/**
- * prepare directory for files
- */
+ * prepare directory for files
+ */
function elfinder_prepare_directory($directory) {
$rc = file_prepare_directory($directory, FILE_CREATE_DIRECTORY);
return $rc;
}
/**
- * Add css
- */
+ * Add css
+ */
function elfinder_add_css($path, $options = array()) {
- return drupal_add_css($path, $options);
+ return drupal_add_css($path, $options);
}
/**
- * Removing unwanted css
- */
+ * Removing unwanted css
+ */
function elfinder_browser_css() {
$css = drupal_add_css();
$rms = array();
-
+
if (module_exists('admin_menu')) {
$apath = drupal_get_path('module', 'admin_menu');
@@ -1184,29 +1251,29 @@ function elfinder_browser_css() {
$rms[] = isset($atpath) ? $atpath : '';
foreach (array_keys($css) as $k) {
-
+
foreach ($rms as $rm) {
if (preg_match('|' . $rm . '|', $k) && $rm != '') {
-
+
unset($css[$k]);
}
}
}
}
-
+
return drupal_get_css($css);
}
/**
- * Removing unwanted js
- */
+ * Removing unwanted js
+ */
function elfinder_browser_js() {
$js = drupal_add_js(NULL, array('scope' => 'header'));
-
+
if (module_exists('admin_menu')) {
-
+
$apath = drupal_get_path('module', 'admin_menu');
$atpath = drupal_get_path('module', 'admin_menu_toolbar');
@@ -1227,32 +1294,32 @@ function elfinder_browser_js() {
function elfinder_system_listing($matchexpr, $path, $arg1, $arg2) {
- return drupal_system_listing("/$matchexpr/", $path, $arg1, $arg2);
+ return drupal_system_listing("/$matchexpr/", $path, $arg1, $arg2);
}
function elfinder_get_drupal_file_obj($uri) {
- global $user;
+ global $user;
- $file = NULL;
+ $file = NULL;
+
+ $fid = db_select('file_managed', 'f')
+ ->condition('uri', rawurldecode($uri))
+ ->fields('f', array('fid'))
+ ->execute()
+ ->fetchField();
+
+ if ($fid) {
+ $file = file_load($fid);
+ }
+ else {
+ $file = new StdClass;
+ $file->uid = $user->uid;
+ $file->filename = basename($uri);
+ $file->uri = $uri;
+ $file->filemime = file_get_mimetype($uri);
+ if (is_file(drupal_realpath($uri))) {
+ $file->filesize = filesize($uri);
- $fid = db_select('file_managed', 'f')
- ->condition('uri', rawurldecode($uri))
- ->fields('f', array('fid'))
- ->execute()
- ->fetchField();
-
- if ($fid) {
- $file = file_load($fid);
- }
- else {
- $file = new StdClass;
- $file->uid = $user->uid;
- $file->filename = basename($uri);
- $file->uri = $uri;
- $file->filemime = file_get_mimetype($uri);
- if (is_file(drupal_realpath($uri))) {
- $file->filesize = filesize($uri);
-
// Use the file_entity module's mimetype to entity type
// functionality if we have that method available.
if (function_exists('file_entity_file_type')) {
@@ -1276,32 +1343,32 @@ function elfinder_get_drupal_file_obj($uri) {
}
}
}
- $file->timestamp = REQUEST_TIME;
- $file->status = FILE_STATUS_PERMANENT;
- }
- return $file;
+ $file->timestamp = REQUEST_TIME;
+ $file->status = FILE_STATUS_PERMANENT;
+ }
+ return $file;
}
function elfinder_file_download($uri) {
if (variable_get('elfinder_settings_filesystem_handleprivate', 'true') == 'true') {
global $user;
-
+
$accessown = 'download own uploaded files';
$accessall = 'download all uploaded files';
-
+
$info = elfinder_get_drupal_file_obj($uri);
if (($info->uid == $user->uid && user_access($accessown)) || user_access($accessall)) {
-
- $disposition = preg_match("/^(text|image)\//", $info->filemime) ? 'inline' : 'attachment';
+
+ $disposition = preg_match("/^(text|image)\//", $info->filemime) ? 'inline' : 'attachment';
return array(
'Content-Type' => $info->filemime,
'Content-Length' => $info->filesize,
'Content-Disposition' => elFinderDrupal::GetContentDisposition($info->filename, $info->filemime, FALSE),
);
-
+
}
-
+
return NULL;
}
}
@@ -1309,25 +1376,25 @@ function elfinder_file_download($uri) {
function elfinder_admin_profile_get($name = '') {
$q = db_select('elfinder_profile', 'p')->fields('p', array('pid', 'name', 'description', 'settings'));
-
+
if ($name) {
$q->condition('p.name', $name);
}
-
+
$result = $q->execute();
-
+
$profile = array();
-
+
foreach ($result as $record) {
$row = $record;
$row->settings = unserialize($row->settings);
$profile[] = $row;
}
-
+
if (count($profile) == 1) {
$profile = $profile[0];
}
-
+
return $profile;
}
@@ -1352,13 +1419,55 @@ function elfinder_block_view() {
function elfinder_ckeditor_settings_alter(&$settings, $conf) {
$width = variable_get('elfinder_settings_misc_manager_width', '');
- if(!$width) {
+ if (!$width) {
$width = ELFINDER_POPUP_WIDTH;
}
$height = variable_get('elfinder_settings_misc_manager_height', '');
- if(!$height) {
+ if (!$height) {
$height = ELFINDER_POPUP_HEIGHT;
}
$settings['js_conf']['filebrowserWindowWidth'] = $width;
$settings['js_conf']['filebrowserWindowHeight'] = $height;
}
+
+
+function elfinder_libraries_info() {
+ $libraries['elfinder'] = array(
+ 'name' => 'elFinder File Manager',
+ 'vendor url' => elfinder_homepage_url(),
+ 'download url' => 'https://github.com/Studio-42/elFinder/archive/2.1.38.zip',
+ 'version arguments' => array(
+ 'file' => 'js/elfinder.min.js',
+ 'pattern' => '@ \* Version\s+([0-9\.]+)@',
+ 'lines' => 5,
+ ),
+ 'files' => array(
+ 'js' => array(
+ 'js/elfinder.min.js',
+ ),
+ 'css' => array(
+ 'css/elfinder.min.css',
+ )
+ ),
+ );
+ return $libraries;
+}
+
+function elfinder_get_installed_version() {
+ if (module_exists('libraries')) {
+ $library = libraries_detect('elfinder');
+ return $library['installed'] ? $library['version'] : FALSE;
+ } else {
+ $js_file = elfinder_lib_path() . '/js/elfinder.min.js';
+ $js_contents = @file_get_contents($js_file);
+ if (!$js_contents) {
+ return FALSE;
+ }
+ if (preg_match('@ \* Version\s+([0-9\.]+)@', $js_contents, $matches)) {
+ return $matches[1];
+ }
+ return 'unknown';
+ }
+}
+
+
diff --git a/sites/all/modules/contrib/files/elfinder/inc/elfinder.admin.inc b/sites/all/modules/contrib/files/elfinder/inc/elfinder.admin.inc
index fe05e395..31e45246 100644
--- a/sites/all/modules/contrib/files/elfinder/inc/elfinder.admin.inc
+++ b/sites/all/modules/contrib/files/elfinder/inc/elfinder.admin.inc
@@ -1,4 +1,9 @@
language) ? $language->language : 'en';
-
+
$form['profiles'] = array(
'#type' => 'fieldset',
'#title' => t('Profiles'),
'#collapsible' => TRUE,
'#collapsed' => FALSE,
);
-
+
$profiles = elfinder_admin_profile_get();
-
+
$roles = user_roles();
-
+
$rows = array();
-
+
if ($profiles) {
if (is_array($profiles)) {
foreach ($profiles as $profile) {
@@ -61,21 +65,21 @@ function elfinder_admin_form(&$form_state) {
$profile = $profiles;
$rows[] = array($profile->pid, $profile->name, $profile->description, implode(', ', array_intersect_key($roles, $profile->settings['profile_role'])), elfinder_admin_profile_links($profile->name));
}
-
+
}
- $profile_table = theme('table', array(
+ $profile_table = theme('table', array(
'header' => array(t('Id'), t('Name'), t('Description'), t('Role'), ''),
'rows' => $rows
));
-
+
$addprofile = l(t('Add profile'), 'admin/config/media/elfinder/profile');
-
+
$form['profiles']['profile_list'] = array(
'#type' => 'markup',
'#markup' => "$profile_table$addprofile", ); - + $form['filesystem_settings'] = array( '#type' => 'fieldset', '#title' => t('File system settings'), @@ -110,7 +114,7 @@ function elfinder_admin_form(&$form_state) { '#default_value' => variable_get('elfinder_settings_filesystem_unmanaged_root_label', ''), '#description' => t('Root directory label in directory tree'), ); - + $form['filesystem_settings']['filesystem_root_custom'] = array( '#prefix' => '
',
'#suffix' => '
',
@@ -137,7 +141,7 @@ function elfinder_admin_form(&$form_state) {
'auto' => t('Automatical detection'),
),
);
-
+
$form['filesystem_settings']['filesystem_allowed_extensions'] = array(
'#prefix' => '',
'#suffix' => '
',
@@ -147,7 +151,7 @@ function elfinder_admin_form(&$form_state) {
'#default_value' => variable_get('elfinder_settings_filesystem_allowed_extensions', ''),
'#description' => t('Separate extensions with a space or comma and do not include the leading dot.'),
);
-
+
if (function_exists('finfo_open')) {
$form['filesystem_settings']['mime_detect']['#options']['finfo'] = t('php finfo');
}
@@ -160,8 +164,41 @@ function elfinder_admin_form(&$form_state) {
$form['filesystem_settings']['mime_detect']['#options']['bsd'] = t('file -Ib (bsd)');
$form['filesystem_settings']['mime_detect']['#options']['internal'] = t('By file extension (built-in)');
$form['filesystem_settings']['mime_detect']['#options']['drupal'] = t('Drupal API');
-
-
+
+
+ $form['filesystem_settings']['filesystem_inline_preview'] = array(
+ '#type' => 'radios',
+ '#title' => t('Preview'),
+ '#default_value' => variable_get('elfinder_settings_filesystem_inline_preview', 'default'),
+ '#description' => t('File types allowed to display in preview'),
+ '#options' => array(
+ 'default' => t('Default - images, video, audio, pdf, text'),
+ 'all' => t('All supported for preview files - additional: md, psd, html, archives, swf, sharecad.org, MS Office Online, Google Docs - be careful'),
+ 'custom' => t('Custom regex'),
+ 'disabled' => t('Disabled'),
+ ),
+ );
+
+ $form['filesystem_settings']['filesystem_inline_preview_custom'] = array(
+ '#prefix' => '',
+ '#suffix' => '
',
+ '#type' => 'textfield',
+ '#title' => t('Custom preview match regex'),
+ '#default_value' => variable_get('elfinder_settings_filesystem_inlinepreviewcustom', '^(?:(?:image|video|audio)|application/(?:x-mpegURL|dash\\+xml)|(?:text/plain|application/pdf)$)'),
+ '#description' => t('Custom mime type match regex for preview'),
+ );
+
+ $form['filesystem_settings']['filesystem_external_preview'] = array(
+ '#type' => 'radios',
+ '#title' => t('External Service Preview'),
+ '#default_value' => variable_get('elfinder_settings_filesystem_external_preview', 'disabled'),
+ '#description' => t('Use Microsoft, Google and other online services to preview some office documents. Warning! By previewing document with external services YOU ARE ULOADING the document to them. Google, Microsoft and other service owners usually TRACK your activity and share it with Sales, CIA, FSB (KGB), FBI, governors, etc.'),
+ '#options' => array(
+ 'default' => t('Use Microsoft Office and Google Docs for preview'),
+ 'disabled' => t('Disabled'),
+ ),
+ );
+
$form['filesystem_settings']['file_url_type'] = array(
'#type' => 'radios',
'#title' => t('Selected file url type'),
@@ -170,7 +207,7 @@ function elfinder_admin_form(&$form_state) {
'true' => t('Absolute'),
'false' => t('Relative'),
),
- );
+ );
$form['filesystem_settings']['file_perm'] = array(
'#type' => 'textfield',
@@ -195,7 +232,7 @@ function elfinder_admin_form(&$form_state) {
'#size' => 10,
'#weight' => 5,
);
-
+
$form['filesystem_settings']['max_filecount'] = array(
'#type' => 'textfield',
'#title' => t('Maximum folder size'),
@@ -204,7 +241,7 @@ function elfinder_admin_form(&$form_state) {
'#size' => 10,
'#weight' => 5,
);
-
+
$form['filesystem_settings']['handleprivate'] = array(
'#type' => 'radios',
'#title' => t('Handle private downloads'),
@@ -222,7 +259,7 @@ function elfinder_admin_form(&$form_state) {
'#collapsible' => TRUE,
'#collapsed' => FALSE,
);
-
+
$form['thumbnail_settings']['tmbsize'] = array(
'#type' => 'textfield',
'#title' => t('Thumbnail size'),
@@ -244,7 +281,7 @@ function elfinder_admin_form(&$form_state) {
'#options' => array(
'auto' => t('Automatical detection'),
'imagick' => t('Image Magick'),
- 'gd' => t('GD'),
+ 'gd' => t('GD'),
),
);
@@ -265,7 +302,7 @@ function elfinder_admin_form(&$form_state) {
'#collapsible' => TRUE,
'#collapsed' => FALSE,
);
-
+
$form['misc_settings']['rememberlastdir'] = array(
'#type' => 'radios',
'#title' => t('Remember last opened directory'),
@@ -312,7 +349,7 @@ function elfinder_admin_form(&$form_state) {
$form['submit'] = array('#type' => 'submit', '#value' => t('Save configuration'));
$form['#submit'][] = 'elfinder_admin_submit';
-
+
return $form;
}
@@ -344,11 +381,25 @@ function elfinder_admin_submit($form, &$form_state) {
variable_set('elfinder_settings_filesystem_public_root_label', $form_state['values']['filesystem_public_root_label']);
variable_set('elfinder_settings_filesystem_private_root_label', $form_state['values']['filesystem_private_root_label']);
variable_set('elfinder_settings_filesystem_unmanaged_root_label', $form_state['values']['filesystem_unmanaged_root_label']);
- variable_set('elfinder_settings_misc_manager_width', $form_state['values']['manager_width']);
- variable_set('elfinder_settings_misc_manager_height', $form_state['values']['manager_height']);
+ variable_set('elfinder_settings_misc_manager_width', $form_state['values']['manager_width']);
+ variable_set('elfinder_settings_misc_manager_height', $form_state['values']['manager_height']);
variable_set('elfinder_settings_misc_hidden_folders', $form_state['values']['hidden_folders']);
variable_set('elfinder_settings_filesystem_allowed_extensions', $form_state['values']['filesystem_allowed_extensions']);
-
+
+ if ($form_state['values']['filesystem_inline_preview'] == 'default') {
+ variable_set('elfinder_settings_filesystem_inlinepreviewregex', '^(?:(?:image|video|audio)|application/(?:x-mpegURL|dash\\+xml)|(?:text/plain|application/pdf)$)');
+ } else if ($form_state['values']['filesystem_inline_preview'] == 'all') {
+ variable_set('elfinder_settings_filesystem_inlinepreviewregex', '.');
+ } else if ($form_state['values']['filesystem_inline_preview'] == 'custom') {
+ variable_set('elfinder_settings_filesystem_inlinepreviewregex', variable_get('elfinder_settings_filesystem_inlinepreviewcustom', '^$'));
+ } else {
+ variable_set('elfinder_settings_filesystem_inlinepreviewregex', '^$');
+ }
+
+ variable_set('elfinder_settings_filesystem_inline_preview', $form_state['values']['filesystem_inline_preview']);
+ variable_set('elfinder_settings_filesystem_inlinepreviewcustom', $form_state['values']['filesystem_inline_preview_custom']);
+ variable_set('elfinder_settings_filesystem_external_preview', $form_state['values']['filesystem_external_preview']);
+
drupal_set_message(t('Changes have been saved.'));
}
@@ -398,4 +449,4 @@ function elfinder_admin_form_validate($form, &$form_state) {
if ($tmbsize && !is_numeric($tmbsize)) {
form_set_error('tmbsize', t('Thumbnail size should be a number'));
}
-}
\ No newline at end of file
+}
diff --git a/sites/all/modules/contrib/files/elfinder/inc/elfinder.admin.profiles.inc b/sites/all/modules/contrib/files/elfinder/inc/elfinder.admin.profiles.inc
index 4aa015f0..769c3d1f 100644
--- a/sites/all/modules/contrib/files/elfinder/inc/elfinder.admin.profiles.inc
+++ b/sites/all/modules/contrib/files/elfinder/inc/elfinder.admin.profiles.inc
@@ -1,4 +1,9 @@
'textfield',
- '#title' => t('Profile Name'),
- '#default_value' => '',
- '#size' => 14,
+ '#type' => 'textfield',
+ '#title' => t('Profile Name'),
+ '#default_value' => '',
+ '#size' => 14,
);
} else {
$form['profile_name_label'] = array(
- '#title' => t('Profile Name'),
- '#markup' => $profile_name,
- '#size' => 14,
- '#type' => 'item',
+ '#title' => t('Profile Name'),
+ '#markup' => $profile_name,
+ '#size' => 14,
+ '#type' => 'item',
);
$form['profile_name'] = array(
- '#default_value' => $profile_name,
- '#type' => 'hidden',
+ '#default_value' => $profile_name,
+ '#type' => 'hidden',
);
}
$form['profile_description'] = array(
- '#type' => 'textarea',
- '#title' => t('Description'),
- '#default_value' => isset($p->description) ? $p->description : '',
+ '#type' => 'textarea',
+ '#title' => t('Description'),
+ '#default_value' => isset($p->description) ? $p->description : '',
);
$form['profile_role'] = array(
- '#type' => 'checkboxes',
- '#title' => t('Roles'),
- '#default_value' => isset($profile['profile_role']) ? array_keys($profile['profile_role']) : array(),
- '#options' => user_roles(),
- '#description' => t('Roles for which profile settings will be applied'),
+ '#type' => 'checkboxes',
+ '#title' => t('Roles'),
+ '#default_value' => isset($profile['profile_role']) ? array_keys($profile['profile_role']) : array(),
+ '#options' => user_roles(),
+ '#description' => t('Roles for which profile settings will be applied'),
);
$form['profile_action'] = array(
- '#default_value' => $action,
- '#type' => 'hidden',
+ '#default_value' => $action,
+ '#type' => 'hidden',
);
$form['filesystem_settings'] = array(
- '#type' => 'fieldset',
- '#title' => t('File system'),
- '#collapsible' => TRUE,
- '#collapsed' => TRUE,
+ '#type' => 'fieldset',
+ '#title' => t('File system'),
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
);
$form['volumes'] = array(
- '#type' => 'fieldset',
- '#title' => t('Volumes'),
- '#collapsible' => TRUE,
- '#collapsed' => FALSE,
+ '#type' => 'fieldset',
+ '#title' => t('Volumes'),
+ '#collapsible' => TRUE,
+ '#collapsed' => FALSE,
);
$form['volumes']['volumes_wrapper'] = array(
- '#weight' => -4,
- '#prefix' => '',
- '#suffix' => '
',
+ '#weight' => -4,
+ '#prefix' => '',
+ '#suffix' => '
',
);
$form['volumes']['volumes_wrapper']['volume'] = array(
- '#prefix' => '',
- '#suffix' => '
',
- '#type' => 'markup',
- '#value' => ' ',
+ '#prefix' => '',
+ '#suffix' => '
',
+ '#type' => 'markup',
+ '#value' => ' ',
);
@@ -129,35 +134,35 @@ function elfinder_admin_profile($form, &$form_state) {
foreach ($form['volumes']['volumes_wrapper']['volume'] as $volume) {
if (is_array($volume) && isset($volume['volume_settings'])) {
$ckeditor_volumes[] = t('Volume @i (@path)', array(
- '@i' => $i,
- '@path' => $volume['volume_settings']['path']['#default_value'],
- ));
+ '@i' => $i,
+ '@path' => $volume['volume_settings']['path']['#default_value'],
+ ));
$i++;
}
}
$form['volumes']['volumes_wrapper']['volume_add'] = array(
- '#type' => 'submit',
- '#value' => t('Add volume'),
- '#weight' => 1,
- '#name' => 'addfield',
- '#submit' => array('elfinder_admin_profile_change_volume'),
- '#ajax' => array(
- 'wrapper' => 'profile-volumes',
- 'callback' => 'elfinder_admin_profile_callback',
- 'method' => 'replace',
- 'effect' => 'fade',
- ),
+ '#type' => 'submit',
+ '#value' => t('Add volume'),
+ '#weight' => 1,
+ '#name' => 'addfield',
+ '#submit' => array('elfinder_admin_profile_change_volume'),
+ '#ajax' => array(
+ 'wrapper' => 'profile-volumes',
+ 'callback' => 'elfinder_admin_profile_callback',
+ 'method' => 'replace',
+ 'effect' => 'fade',
+ ),
);
$form['filesystem_settings']['mime_detect'] = array(
- '#type' => 'radios',
- '#title' => t('File type detection'),
- '#default_value' => isset($profile['mimedetect']) ? $profile['mimedetect'] : 'auto',
- '#options' => array(
- 'auto' => t('Automatical detection'),
- ),
+ '#type' => 'radios',
+ '#title' => t('File type detection'),
+ '#default_value' => isset($profile['mimedetect']) ? $profile['mimedetect'] : 'auto',
+ '#options' => array(
+ 'auto' => t('Automatical detection'),
+ ),
);
if (function_exists('finfo_open')) {
@@ -175,144 +180,144 @@ function elfinder_admin_profile($form, &$form_state) {
$form['filesystem_settings']['file_url_type'] = array(
- '#type' => 'radios',
- '#title' => t('Selected file url type'),
- '#default_value' => $profile['file_url_type'] == 'true' ? 'true' : 'false',
- '#options' => array(
- 'true' => t('Absolute'),
- 'false' => t('Relative'),
- ),
+ '#type' => 'radios',
+ '#title' => t('Selected file url type'),
+ '#default_value' => $profile['file_url_type'] == 'true' ? 'true' : 'false',
+ '#options' => array(
+ 'true' => t('Absolute'),
+ 'false' => t('Relative'),
+ ),
);
$form['filesystem_settings']['file_perm'] = array(
- '#type' => 'textfield',
- '#title' => t('Created file permissions'),
- '#default_value' => isset($profile['file_perm']) ? $profile['file_perm'] : '0666',
- '#size' => 4,
+ '#type' => 'textfield',
+ '#title' => t('Created file permissions'),
+ '#default_value' => isset($profile['file_perm']) ? $profile['file_perm'] : '0666',
+ '#size' => 4,
);
$form['filesystem_settings']['dir_perm'] = array(
- '#type' => 'textfield',
- '#title' => t('Created directory permissions'),
- '#default_value' => isset($profile['dir_perm']) ? $profile['dir_perm'] : '0777',
- '#size' => 4,
+ '#type' => 'textfield',
+ '#title' => t('Created directory permissions'),
+ '#default_value' => isset($profile['dir_perm']) ? $profile['dir_perm'] : '0777',
+ '#size' => 4,
);
$form['filesystem_settings']['max_filesize'] = array(
- '#type' => 'textfield',
- '#title' => t('Maximum upload size'),
- '#default_value' => isset($profile['max_filesize']) ? $profile['max_filesize'] : '',
- '#description' => t('Enter a value like "512" (bytes), "80 KB" (kilobytes) or "50 MB" (megabytes) in order to restrict the allowed file size. If left empty the file sizes will be limited only by PHP\'s maximum post and file upload sizes (current limit %limit).', array('%limit' => format_size(file_upload_max_size()))),
- '#size' => 10,
- '#weight' => 5,
+ '#type' => 'textfield',
+ '#title' => t('Maximum upload size'),
+ '#default_value' => isset($profile['max_filesize']) ? $profile['max_filesize'] : '',
+ '#description' => t('Enter a value like "512" (bytes), "80 KB" (kilobytes) or "50 MB" (megabytes) in order to restrict the allowed file size. If left empty the file sizes will be limited only by PHP\'s maximum post and file upload sizes (current limit %limit).', array('%limit' => format_size(file_upload_max_size()))),
+ '#size' => 10,
+ '#weight' => 5,
);
$form['filesystem_settings']['user_quota'] = array(
- '#type' => 'textfield',
- '#title' => t('User quota'),
- '#default_value' => isset($profile['user_quota']) ? $profile['user_quota'] : '',
- '#description' => t('Enter a value like "512" (bytes), "80 KB" (kilobytes) or "50 MB" (megabytes) in order to restrict the allowed file size. If left empty the file sizes will be unlimited.'),
- '#size' => 10,
- '#weight' => 5,
+ '#type' => 'textfield',
+ '#title' => t('User quota'),
+ '#default_value' => isset($profile['user_quota']) ? $profile['user_quota'] : '',
+ '#description' => t('Enter a value like "512" (bytes), "80 KB" (kilobytes) or "50 MB" (megabytes) in order to restrict the allowed file size. If left empty the file sizes will be unlimited.'),
+ '#size' => 10,
+ '#weight' => 5,
);
$form['thumbnail_settings'] = array(
- '#type' => 'fieldset',
- '#title' => t('Thumbnails'),
- '#collapsible' => TRUE,
- '#collapsed' => TRUE,
+ '#type' => 'fieldset',
+ '#title' => t('Thumbnails'),
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
);
$form['thumbnail_settings']['tmbsize'] = array(
- '#type' => 'textfield',
- '#title' => t('Thumbnail size'),
- '#default_value' => isset($profile['tmbsize']) ? $profile['tmbsize'] : '48',
- '#size' => 4,
+ '#type' => 'textfield',
+ '#title' => t('Thumbnail size'),
+ '#default_value' => isset($profile['tmbsize']) ? $profile['tmbsize'] : '48',
+ '#size' => 4,
);
$form['thumbnail_settings']['tmbdirname'] = array(
- '#type' => 'textfield',
- '#title' => t('Thumbnail directory name'),
- '#default_value' => isset($profile['tmbdirname']) ? $profile['tmbdirname'] : 'tmb',
- '#size' => 10,
+ '#type' => 'textfield',
+ '#title' => t('Thumbnail directory name'),
+ '#default_value' => isset($profile['tmbdirname']) ? $profile['tmbdirname'] : 'tmb',
+ '#size' => 10,
);
$form['thumbnail_settings']['imglib'] = array(
- '#type' => 'radios',
- '#title' => t('Image manipulation library'),
- '#default_value' => isset($profile['imglib']) ? $profile['imglib'] : 'auto',
- '#options' => array(
- 'auto' => t('Automatical detection'),
- 'imagick' => t('Image Magick'),
- 'gd' => t('GD'),
- ),
+ '#type' => 'radios',
+ '#title' => t('Image manipulation library'),
+ '#default_value' => isset($profile['imglib']) ? $profile['imglib'] : 'auto',
+ '#options' => array(
+ 'auto' => t('Automatical detection'),
+ 'imagick' => t('Image Magick'),
+ 'gd' => t('GD'),
+ ),
);
$form['thumbnail_settings']['tmbcrop'] = array(
- '#type' => 'radios',
- '#title' => t('Image crop'),
- '#default_value' => $profile['tmbcrop'] == 'true' ? 'true' : 'false',
- '#options' => array(
- 'true' => t('Yes'),
- 'false' => t('No'),
- ),
- '#description' => t('Crop image to fit thumbnail size. Yes - crop, No - scale image to fit thumbnail size.'),
+ '#type' => 'radios',
+ '#title' => t('Image crop'),
+ '#default_value' => $profile['tmbcrop'] == 'true' ? 'true' : 'false',
+ '#options' => array(
+ 'true' => t('Yes'),
+ 'false' => t('No'),
+ ),
+ '#description' => t('Crop image to fit thumbnail size. Yes - crop, No - scale image to fit thumbnail size.'),
);
$form['misc_settings'] = array(
- '#type' => 'fieldset',
- '#title' => t('Miscellaneous'),
- '#collapsible' => TRUE,
- '#collapsed' => TRUE,
+ '#type' => 'fieldset',
+ '#title' => t('Miscellaneous'),
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
);
$form['misc_settings']['rememberlastdir'] = array(
- '#type' => 'radios',
- '#title' => t('Remember last opened directory'),
- '#default_value' => $profile['rememberlastdir'] == 'true' ? 'true' : 'false',
- '#options' => array(
- 'true' => t('Yes'),
- 'false' => t('No'),
- ),
- '#description' => t('Creates a cookie. Disable if you have issues with caching.'),
+ '#type' => 'radios',
+ '#title' => t('Remember last opened directory'),
+ '#default_value' => $profile['rememberlastdir'] == 'true' ? 'true' : 'false',
+ '#options' => array(
+ 'true' => t('Yes'),
+ 'false' => t('No'),
+ ),
+ '#description' => t('Creates a cookie. Disable if you have issues with caching.'),
);
$form['misc_settings']['manager_width'] = array(
- '#type' => 'textfield',
- '#title' => t('File manager width'),
- '#default_value' => isset($profile['manager_width']) ? $profile['manager_width'] : '',
- '#size' => 4,
+ '#type' => 'textfield',
+ '#title' => t('File manager width'),
+ '#default_value' => isset($profile['manager_width']) ? $profile['manager_width'] : '',
+ '#size' => 4,
);
$form['misc_settings']['manager_height'] = array(
- '#type' => 'textfield',
- '#title' => t('File manager height'),
- '#default_value' => isset($profile['manager_height']) ? $profile['manager_height'] : '',
- '#size' => 4,
+ '#type' => 'textfield',
+ '#title' => t('File manager height'),
+ '#default_value' => isset($profile['manager_height']) ? $profile['manager_height'] : '',
+ '#size' => 4,
);
$form['misc_settings']['ckeditor_upload_settings'] = array(
- '#type' => 'fieldset',
- '#title' => t('CKEditor/FCKeditor Upload Settings'),
- '#collapsible' => TRUE,
- '#collapsed' => TRUE,
- '#description' => t('CKEditor and FCKeditor allowing to upload and insert image files directly from Insert Image dialog.'),
+ '#type' => 'fieldset',
+ '#title' => t('CKEditor/FCKeditor Upload Settings'),
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ '#description' => t('CKEditor and FCKeditor allowing to upload and insert image files directly from Insert Image dialog.'),
);
$form['misc_settings']['ckeditor_upload_settings']['ckeditor_upload_directory'] = array(
- '#type' => 'textfield',
- '#title' => t('Path'),
- '#default_value' => isset($profile['ckeditor_upload_directory']) ? $profile['ckeditor_upload_directory'] : '',
- '#size' => 40,
- '#description' => t('Image upload path. Default file uri is used if no uri prefix specified. Examples: public://ckeditor - image will be uploaded into public://ckeditor; images/ckeditor - image will be uploaded to :uriimages/ckeditor', array(':uri' => file_build_uri(''))),
+ '#type' => 'textfield',
+ '#title' => t('Path'),
+ '#default_value' => isset($profile['ckeditor_upload_directory']) ? $profile['ckeditor_upload_directory'] : '',
+ '#size' => 40,
+ '#description' => t('Image upload path. Default file uri is used if no uri prefix specified. Examples: public://ckeditor - image will be uploaded into public://ckeditor; images/ckeditor - image will be uploaded to :uriimages/ckeditor', array(':uri' => file_build_uri(''))),
);
$form['submit'] = array(
- '#type' => 'submit',
- '#name' => 'save_profile',
- '#value' => t('Save configuration')
+ '#type' => 'submit',
+ '#name' => 'save_profile',
+ '#value' => t('Save configuration')
);
$form['#submit'][] = 'elfinder_admin_submit';
@@ -343,8 +348,8 @@ function elfinder_admin_profiles($action = '', $profile_name = '') {
function elfinder_admin_profiles_delete_form($form_id, &$form_state, $action, $profile_name) {
$form = array();
$form['profile_name'] = array(
- '#type' => 'hidden',
- '#default_value' => $profile_name,
+ '#type' => 'hidden',
+ '#default_value' => $profile_name,
);
@@ -381,53 +386,53 @@ function elfinder_admin_dir_form($delta, $values = array(), $votes = 0) {
$form['volume_settings'] = array(
- '#type' => 'fieldset',
- '#title' => t('Volume @n (@p)', array('@n' => ($delta + 1), '@p' => $values['path'])),
- '#collapsible' => TRUE,
- '#collapsed' => FALSE,
+ '#type' => 'fieldset',
+ '#title' => t('Volume @n (@p)', array('@n' => ($delta + 1), '@p' => isset($values['path']) ? $values['path'] : '')),
+ '#collapsible' => TRUE,
+ '#collapsed' => FALSE,
);
$form['volume_settings']['path'] = array(
- '#type' => 'textfield',
- '#title' => t('Path'),
- '#default_value' => isset($values['path']) ? $values['path'] : '',
- '#parents' => array('volume', $delta, 'path'),
- '#prefix' => '',
- '#suffix' => '
',
- '#size' => 40,
+ '#type' => 'textfield',
+ '#title' => t('Path'),
+ '#default_value' => isset($values['path']) ? $values['path'] : '',
+ '#parents' => array('volume', $delta, 'path'),
+ '#prefix' => '',
+ '#suffix' => '
',
+ '#size' => 40,
);
$form['volume_settings']['label'] = array(
- '#type' => 'textfield',
- '#title' => t('Label'),
- '#size' => 15,
- '#default_value' => isset($values['label']) ? $values['label'] : '',
- '#description' => t('Root directory label in directory tree'),
- '#parents' => array('volume', $delta, 'label'),
+ '#type' => 'textfield',
+ '#title' => t('Label'),
+ '#size' => 15,
+ '#default_value' => isset($values['label']) ? $values['label'] : '',
+ '#description' => t('Root directory label in directory tree'),
+ '#parents' => array('volume', $delta, 'label'),
);
$form['volume_settings']['url'] = array(
- '#type' => 'textfield',
- '#title' => t('URL'),
- '#default_value' => isset($values['url']) ? $values['url'] : '',
- '#parents' => array('volume', $delta, 'url'),
- '#prefix' => '',
- '#suffix' => '
',
- '#description' => t('Custom URL prefix (default %def)', array('%def' => $defaulturl)),
- '#size' => 40,
+ '#type' => 'textfield',
+ '#title' => t('URL'),
+ '#default_value' => isset($values['url']) ? $values['url'] : '',
+ '#parents' => array('volume', $delta, 'url'),
+ '#prefix' => '',
+ '#suffix' => '
',
+ '#description' => t('Custom URL prefix (default %def)', array('%def' => $defaulturl)),
+ '#size' => 40,
);
$form['volume_settings']['delete'] = array(
- '#type' => 'submit',
- '#value' => t('Delete'),
- '#name' => 'rmfield-' . $delta,
- '#submit' => array('elfinder_admin_profile_change_volume'),
- '#ajax' => array(
- 'callback' => 'elfinder_admin_profile_callback',
- 'wrapper' => 'profile-volumes',
- 'method' => 'replace',
- 'effect' => 'fade',
- ),
+ '#type' => 'submit',
+ '#value' => t('Delete'),
+ '#name' => 'rmfield-' . $delta,
+ '#submit' => array('elfinder_admin_profile_change_volume'),
+ '#ajax' => array(
+ 'callback' => 'elfinder_admin_profile_callback',
+ 'wrapper' => 'profile-volumes',
+ 'method' => 'replace',
+ 'effect' => 'fade',
+ ),
);
return $form;
@@ -466,28 +471,28 @@ function elfinder_admin_submit($form, &$form_state) {
foreach ($settings as $setting) {
if (isset($form_state['values'][$setting])) {
-
+
/* Excluding empty volumes */
- if ($setting == 'volume') {
- for ($i = 0; $i < count($form_state['values']['volume']); $i++) {
- if (empty($form_state['values']['volume'][$i]['path'])) {
- unset($form_state['values']['volume'][$i]);
- }
- }
- }
-
+ if ($setting == 'volume') {
+ for ($i = 0; $i < count($form_state['values']['volume']); $i++) {
+ if (empty($form_state['values']['volume'][$i]['path'])) {
+ unset($form_state['values']['volume'][$i]);
+ }
+ }
+ }
+
$profile_settings[$setting] = $form_state['values'][$setting];
}
}
-
+
// Save roles.
$profile_settings['profile_role'] = array();
- foreach($form_state['values']['profile_role'] as $rid) {
+ foreach ($form_state['values']['profile_role'] as $rid) {
if ($rid != 0) {
$profile_settings['profile_role'][$rid] = $rid;
}
}
-
+
$profile_name = $form_state['values']['profile_name'];
$profile_description = $form_state['values']['profile_description'];
diff --git a/sites/all/modules/contrib/files/elfinder/inc/elfinder.drupal.inc b/sites/all/modules/contrib/files/elfinder/inc/elfinder.drupal.inc
index 6525ac56..571760b3 100644
--- a/sites/all/modules/contrib/files/elfinder/inc/elfinder.drupal.inc
+++ b/sites/all/modules/contrib/files/elfinder/inc/elfinder.drupal.inc
@@ -1,265 +1,285 @@
-version());
-
- if (isset(elFinder::$ApiVersion)) {
- $ver = elFinder::$ApiVersion;
- }
-
- if ($ver == 2.1 && is_callable(array($this, 'revision')) && $this->revision() < 37) {
- $this->connector_unsupported_error();
- }
-
- parent::__construct($opts);
-
- $this->commands['desc'] = array('target' => TRUE, 'content' => FALSE);
- $this->commands['owner'] = array('target' => TRUE, 'content' => FALSE);
- $this->commands['downloadcount'] = array('target' => TRUE);
-
- } else {
- $this->connector_unsupported_error();
- }
-
- }
-
-
- public function connector_unsupported_error() {
- $this->connector_error(t('Unsupported elFinder library version. Please upgrade.'));
- }
-
- public function connector_error($message) {
- exit(drupal_json_encode(array('error' => array(strip_tags($message)))));
- }
-
- /* Overriding search query argument name 'q' since it's already used in Drupal */
-
- public function commandArgsList($cmd) {
- $this->commands['search']['elfinder_search_q'] = TRUE;
- return $this->commandExists($cmd) ? $this->commands[$cmd] : array();
- }
-
- protected function search($args) {
- $q = trim($args['elfinder_search_q']);
- $mimes = !empty($args['mimes']) && is_array($args['mimes']) ? $args['mimes'] : array();
- $target = !empty($args['target']) ? $args['target'] : null;
- $result = array();
- $errors = array();
-
- if ($target) {
- if ($volume = $this->volume($target)) {
- $result = $volume->search($q, $mimes, $target);
- $errors = array_merge($errors, $volume->error());
- }
- } else {
- foreach ($this->volumes as $volume) {
- $result = array_merge($result, $volume->search($q, $mimes));
- $errors = array_merge($errors, $volume->error());
- }
- }
-
- // Exclude hidden folders from search results.
- $hidden_folders = variable_get('elfinder_settings_misc_hidden_folders', '');
- if($hidden_folders) {
- $hidden_folders = explode(',', $hidden_folders);
- foreach($result AS $key => $file) {
- $parts = explode('/', $file['path']);
- if(in_array($parts[1], $hidden_folders)) {
- unset($result[$key]);
- }
- }
- }
-
- $result = array('files' => $result);
- if ($errors) {
- $result['warning'] = $errors;
- }
- return $result;
- }
-
- protected function desc($args) {
- $target = $args['target'];
- $desc = $args['content'];
- $error = array(self::ERROR_UNKNOWN, '#' . $target);
-
- if (($volume = $this->volume($target)) == FALSE
- || ($file = $volume->file($target)) == FALSE) {
- return array('error' => $this->error($error, self::ERROR_FILE_NOT_FOUND));
- }
-
- $error[1] = $file['name'];
-
- if ($volume->driverId() == 'f') {
- return array('desc' => '');
- }
-
- if ($volume->commandDisabled('desc')) {
- return array('error' => $this->error($error, self::ERROR_ACCESS_DENIED));
- }
-
- if (($desc = $volume->desc($target, $desc)) == -1) {
- return array('error' => $this->error($error, $volume->error()));
- }
-
- return array('desc' => $desc);
- }
-
- protected function owner($args) {
- $target = $args['target'];
-
- $error = array(self::ERROR_UNKNOWN, '#' . $target);
-
- if (($volume = $this->volume($target)) == FALSE
- || ($file = $volume->file($target)) == FALSE) {
- return array('error' => $this->error($error, self::ERROR_FILE_NOT_FOUND));
- }
-
- $error[1] = $file['name'];
-
- if ($volume->driverId() == 'f') {
- return array('owner' => '');
- }
-
- if ($volume->commandDisabled('owner')) {
- return array('error' => $this->error($error, self::ERROR_ACCESS_DENIED));
- }
-
- if (($owner = $volume->owner($target)) == FALSE) {
- return array('error' => $this->error($error, $volume->error()));
- }
-
- return array('owner' => $owner);
- }
-
- protected function downloadcount($args) {
- $target = $args['target'];
-
- $error = array(self::ERROR_UNKNOWN, '#' . $target);
-
- if (($volume = $this->volume($target)) == FALSE
- || ($file = $volume->file($target)) == FALSE) {
- return array('error' => $this->error($error, self::ERROR_FILE_NOT_FOUND));
- }
-
- $error[1] = $file['name'];
-
- if ($volume->driverId() == 'f') {
- return array('downloadcount' => '');
- }
-
- if ($volume->commandDisabled('downloadcount')) {
- return array('error' => $this->error($error, self::ERROR_ACCESS_DENIED));
- }
-
- if (($downloadcount = $volume->downloadcount($target)) == FALSE) {
- return array('error' => $this->error($error, $volume->error()));
- }
-
- return array('downloadcount' => $downloadcount);
- }
-
- /**
- * Required to output file in browser when volume URL is not set
- * Return array contains opened file pointer, root itself and required headers
- *
- * @param array command arguments
- * @return array
- * @author Dmitry (dio) Levashov
- * */
- protected function file($args) {
- $target = $args['target'];
- $download = !empty($args['download']);
- $h403 = 'HTTP/1.x 403 Access Denied';
- $h404 = 'HTTP/1.x 404 Not Found';
-
- if (($volume = $this->volume($target)) == FALSE) {
- return array('error' => self::$errors[self::ERROR_FILE_NOT_FOUND], 'header' => $h404, 'raw' => TRUE);
- }
-
- if (($file = $volume->file($target)) == FALSE) {
- return array('error' => self::$errors[self::ERROR_FILE_NOT_FOUND], 'header' => $h404, 'raw' => TRUE);
- }
-
- if (!$file['read']) {
- return array('error' => self::$errors[self::ERROR_ACCESS_DENIED], 'header' => $h403, 'raw' => TRUE);
- }
-
- if ($volume->driverId() != 'f' && (($fp = $volume->open($target)) == FALSE)) {
- return array('error' => self::$errors[self::ERROR_FILE_NOT_FOUND], 'header' => $h404, 'raw' => TRUE);
- }
-
- $mime = ($download) ? 'application/octet-stream' : $file['mime'];
-
- $result = array(
- 'volume' => $volume,
- 'pointer' => $fp,
- 'info' => $file,
- 'header' => array(
- "Content-Type: " . $mime,
- "Content-Disposition: " . $this->GetContentDisposition($file['name'], $mime, $download),
- "Content-Location: " . $file['name'],
- 'Content-Transfer-Encoding: binary',
- "Content-Length: " . $file['size'],
- "Connection: close"
- )
- );
-
- $real_path = $this->realpath($target);
- module_invoke_all('file_download', $volume->drupalpathtouri($real_path));
-
- return $result;
- }
-
- /**
- * Generating Content-Disposition HTTP header
- *
- * @param string $file Filename
- * @param string $filemime MIME Type
- * @param bool $download Disposition type (true = download file, false = open file in browser)
- * @return string
- * @author Dmitry (dio) Levashov, Alexey Sukhotin
- * */
- public static function GetContentDisposition($file, $filemime, $download = FALSE) {
-
- $disp = '';
- $filename = $file;
- $ua = $_SERVER["HTTP_USER_AGENT"];
- $mime = $filemime;
-
- if ($download) {
- $disp = 'attachment';
- $mime = 'application/octet-stream';
- } else {
- $disp = preg_match('/^(image|text)/i', $mime)
- || $mime == 'application/x-shockwave-flash' ? 'inline' : 'attachment';
- }
-
- $disp .= '; ';
-
- if (preg_match("/MSIE ([0-9]{1,}[\.0-9]{0,})/", $ua)) {
- $filename = rawurlencode($filename);
- $filename = str_replace("+", "%20", $filename);
- //$filename = str_replace(" ", "%20", $filename);
- $disp .= "filename=" . $filename;
- } elseif (preg_match("/Firefox\/(\d+)/", $ua, $m)) {
- if ($m[1] >= 8) {
- $disp .= "filename*=?UTF-8''" . rawurlencode($filename);
- } else {
- $disp .= "filename*=\"?UTF-8''" . rawurlencode($filename) . "\";";
- }
- } else {
- $disp .= "filename=" . $filename;
- }
-
- return $disp;
- }
-
-}
\ No newline at end of file
+elFinderDrupalLibVersion = floatval($this->version());
+
+ if (isset(elFinder::$ApiVersion)) {
+ $this->elFinderDrupalLibVersion = elFinder::$ApiVersion;
+ }
+
+ if (is_callable(array($this, 'revision'))) {
+ $this->elFinderDrupalLibRevision = $this->revision();
+ }
+
+ if ($this->elFinderDrupalLibVersion == 2.1 && is_callable(array($this, 'revision')) && $this->revision() < 37) {
+ $this->connector_unsupported_error();
+ }
+
+ parent::__construct($opts);
+
+ $this->commands['desc'] = array('target' => TRUE, 'content' => FALSE);
+ $this->commands['owner'] = array('target' => TRUE, 'content' => FALSE);
+ $this->commands['downloadcount'] = array('target' => TRUE);
+
+ } else {
+ $this->connector_unsupported_error();
+ }
+
+ }
+
+ public function connector_unsupported_error() {
+ $this->connector_error(t('Unsupported elFinder library version. Please upgrade.'));
+ }
+
+ public function connector_error($message) {
+ exit(drupal_json_encode(array('error' => array(strip_tags($message)))));
+ }
+
+ /* Overriding search query argument name 'q' since it's already used in Drupal */
+
+ public function commandArgsList($cmd) {
+ $this->commands['search']['elfinder_search_q'] = TRUE;
+ return $this->commandExists($cmd) ? $this->commands[$cmd] : array();
+ }
+
+ protected function search($args) {
+ $q = trim($args['elfinder_search_q']);
+ $mimes = !empty($args['mimes']) && is_array($args['mimes']) ? $args['mimes'] : array();
+ $target = !empty($args['target']) ? $args['target'] : null;
+ $result = array();
+ $errors = array();
+
+ if ($target) {
+ if ($volume = $this->volume($target)) {
+ $result = $volume->search($q, $mimes, $target);
+ $errors = array_merge($errors, $volume->error());
+ }
+ } else {
+ foreach ($this->volumes as $volume) {
+ $result = array_merge($result, $volume->search($q, $mimes));
+ $errors = array_merge($errors, $volume->error());
+ }
+ }
+
+ // Exclude hidden folders from search results.
+ $hidden_folders = variable_get('elfinder_settings_misc_hidden_folders', '');
+ if($hidden_folders) {
+ $hidden_folders = explode(',', $hidden_folders);
+ foreach($result AS $key => $file) {
+ $parts = explode('/', $file['path']);
+ if(in_array($parts[1], $hidden_folders)) {
+ unset($result[$key]);
+ }
+ }
+ }
+
+ $result = array('files' => $result);
+ if ($errors) {
+ $result['warning'] = $errors;
+ }
+ return $result;
+ }
+
+ protected function desc($args) {
+ $target = $args['target'];
+ $desc = $args['content'];
+ $error = array(self::ERROR_UNKNOWN, '#' . $target);
+
+ if (($volume = $this->volume($target)) == FALSE
+ || ($file = $volume->file($target)) == FALSE) {
+ return array('error' => $this->error($error, self::ERROR_FILE_NOT_FOUND));
+ }
+
+ $error[1] = $file['name'];
+
+ if ($volume->driverId() == 'f') {
+ return array('desc' => '');
+ }
+
+ if ($volume->commandDisabled('desc')) {
+ return array('error' => $this->error($error, self::ERROR_ACCESS_DENIED));
+ }
+
+ if (($desc = $volume->desc($target, $desc)) == -1) {
+ return array('error' => $this->error($error, $volume->error()));
+ }
+
+ return array('desc' => $desc);
+ }
+
+ protected function owner($args) {
+ $target = $args['target'];
+
+ $error = array(self::ERROR_UNKNOWN, '#' . $target);
+
+ if (($volume = $this->volume($target)) == FALSE
+ || ($file = $volume->file($target)) == FALSE) {
+ return array('error' => $this->error($error, self::ERROR_FILE_NOT_FOUND));
+ }
+
+ $error[1] = $file['name'];
+
+ if ($volume->driverId() == 'f') {
+ return array('owner' => '');
+ }
+
+ if ($volume->commandDisabled('owner')) {
+ return array('error' => $this->error($error, self::ERROR_ACCESS_DENIED));
+ }
+
+ if (($owner = $volume->owner($target)) == FALSE) {
+ return array('error' => $this->error($error, $volume->error()));
+ }
+
+ return array('owner' => $owner);
+ }
+
+ protected function downloadcount($args) {
+ $target = $args['target'];
+
+ $error = array(self::ERROR_UNKNOWN, '#' . $target);
+
+ if (($volume = $this->volume($target)) == FALSE
+ || ($file = $volume->file($target)) == FALSE) {
+ return array('error' => $this->error($error, self::ERROR_FILE_NOT_FOUND));
+ }
+
+ $error[1] = $file['name'];
+
+ if ($volume->driverId() == 'f') {
+ return array('downloadcount' => '');
+ }
+
+ if ($volume->commandDisabled('downloadcount')) {
+ return array('error' => $this->error($error, self::ERROR_ACCESS_DENIED));
+ }
+
+ if (($downloadcount = $volume->downloadcount($target)) == FALSE) {
+ return array('error' => $this->error($error, $volume->error()));
+ }
+
+ return array('downloadcount' => $downloadcount);
+ }
+
+ /**
+ * Required to output file in browser when volume URL is not set
+ * Return array contains opened file pointer, root itself and required headers
+ *
+ * @param array command arguments
+ * @return array
+ * @author Dmitry (dio) Levashov
+ * */
+ protected function file($args) {
+
+ if ($this->elFinderDrupalLibVersion >= 2.1 && $this->elFinderDrupalLibRevision > 38) {
+ return parent::file($args);
+ }
+
+ $target = $args['target'];
+ $download = !empty($args['download']);
+ $h403 = 'HTTP/1.x 403 Access Denied';
+ $h404 = 'HTTP/1.x 404 Not Found';
+
+ if (($volume = $this->volume($target)) == FALSE) {
+ return array('error' => self::$errors[self::ERROR_FILE_NOT_FOUND], 'header' => $h404, 'raw' => TRUE);
+ }
+
+ if (($file = $volume->file($target)) == FALSE) {
+ return array('error' => self::$errors[self::ERROR_FILE_NOT_FOUND], 'header' => $h404, 'raw' => TRUE);
+ }
+
+ if (!$file['read']) {
+ return array('error' => self::$errors[self::ERROR_ACCESS_DENIED], 'header' => $h403, 'raw' => TRUE);
+ }
+
+ if ($volume->driverId() != 'f' && (($fp = $volume->open($target)) == FALSE)) {
+ return array('error' => self::$errors[self::ERROR_FILE_NOT_FOUND], 'header' => $h404, 'raw' => TRUE);
+ }
+
+ $mime = ($download) ? 'application/octet-stream' : $file['mime'];
+
+ $result = array(
+ 'volume' => $volume,
+ 'pointer' => $fp,
+ 'info' => $file,
+ 'header' => array(
+ "Content-Type: " . $mime,
+ "Content-Disposition: " . $this->GetContentDisposition($file['name'], $mime, $download),
+ "Content-Location: " . $file['name'],
+ 'Content-Transfer-Encoding: binary',
+ "Content-Length: " . $file['size'],
+ "Connection: close"
+ )
+ );
+
+ $real_path = $this->realpath($target);
+ module_invoke_all('file_download', $volume->drupalpathtouri($real_path));
+
+ return $result;
+ }
+
+ /**
+ * Generating Content-Disposition HTTP header
+ *
+ * @param string $file Filename
+ * @param string $filemime MIME Type
+ * @param bool $download Disposition type (true = download file, false = open file in browser)
+ * @return string
+ * @author Dmitry (dio) Levashov, Alexey Sukhotin
+ * */
+ public static function GetContentDisposition($file, $filemime, $download = FALSE) {
+
+ $disp = '';
+ $filename = $file;
+ $ua = $_SERVER["HTTP_USER_AGENT"];
+ $mime = $filemime;
+
+ if ($download) {
+ $disp = 'attachment';
+ $mime = 'application/octet-stream';
+ } else {
+ $disp = preg_match('/^(image|text)/i', $mime)
+ || $mime == 'application/x-shockwave-flash' ? 'inline' : 'attachment';
+ }
+
+ $disp .= '; ';
+
+ if (preg_match("/MSIE ([0-9]{1,}[\.0-9]{0,})/", $ua)) {
+ $filename = rawurlencode($filename);
+ $filename = str_replace("+", "%20", $filename);
+ //$filename = str_replace(" ", "%20", $filename);
+ $disp .= "filename=" . $filename;
+ } elseif (preg_match("/Firefox\/(\d+)/", $ua, $m)) {
+ if ($m[1] >= 8) {
+ $disp .= "filename*=?UTF-8''" . rawurlencode($filename);
+ } else {
+ $disp .= "filename*=\"?UTF-8''" . rawurlencode($filename) . "\";";
+ }
+ } elseif (preg_match("/Chrome\/(\d+)/", $ua, $m)) {
+ $disp .= "filename=\"" . $filename . "\"";
+ } else {
+ $disp .= "filename=" . $filename;
+ }
+
+ return $disp;
+ }
+
+}
+
diff --git a/sites/all/modules/contrib/files/elfinder/inc/elfinder.drupalfs.acl.inc b/sites/all/modules/contrib/files/elfinder/inc/elfinder.drupalfs.acl.inc
index 329e7a21..9e205fc6 100644
--- a/sites/all/modules/contrib/files/elfinder/inc/elfinder.drupalfs.acl.inc
+++ b/sites/all/modules/contrib/files/elfinder/inc/elfinder.drupalfs.acl.inc
@@ -1,108 +1,114 @@
-setError(strip_tags(implode(' ', $validation_errors)));
return FALSE;
}
- } else {
+ }
+ else {
watchdog('elfinder', 'File upload "' . $name . '" not found in $_FILES');
}
return TRUE;
@@ -405,6 +407,12 @@ class elFinderVolumeDrupal extends elFinderVolumeLocalFileSystem {
return FALSE;
}
+ public static function stat_corrector(&$stat, $path, $statOwner, $volumeDriveInstance) {
+ if (method_exists($volumeDriveInstance, 'owner')) {
+ $stat['owner'] = $volumeDriveInstance->owner($volumeDriveInstance->encode($path));
+ }
+ }
+
public function desc($target, $newdesc = NULL) {
$path = $this->decode($target);
diff --git a/sites/all/modules/contrib/files/elfinder/js/elfinder.callback.js b/sites/all/modules/contrib/files/elfinder/js/elfinder.callback.js
index e2d0e339..145b3049 100644
--- a/sites/all/modules/contrib/files/elfinder/js/elfinder.callback.js
+++ b/sites/all/modules/contrib/files/elfinder/js/elfinder.callback.js
@@ -1,239 +1,414 @@
+/*
+ * elFinder Integration
+ *
+ * Copyright (c) 2010-2018, Alexey Sukhotin. All rights reserved.
+ */
+
// $Id: elfinder.callback.js 106 2011-02-26 08:19:56Z ph0enix $
(function($) {
-/**
- * @class elFinder command "search"
- * Find files
- *
- * @author Dmitry (dio) Levashov
- **/
-elFinder.prototype.commands.search = function() {
- this.title = 'Find files';
- this.options = {ui : 'searchbutton'}
- this.alwaysEnabled = true;
- this.updateOnSelect = false;
-
- /**
- * Return command status.
- * Search does not support old api.
- *
- * @return Number
- **/
- this.getstate = function() {
- return 0;
- }
-
- /**
- * Send search request to backend.
- *
- * @param String search string
- * @return $.Deferred
- **/
- this.exec = function(q) {
- var fm = this.fm;
-
- if (typeof(q) == 'string' && q) {
- return fm.request({
- data : {cmd : 'search', elfinder_search_q : q},
- notify : {type : 'search', cnt : 1, hideCnt : true}
- });
- }
- fm.getUI('toolbar').find('.'+fm.res('class', 'searchbtn')+' :text').focus();
- return $.Deferred().reject();
- }
+ /**
+ * @class elFinder command "search"
+ * Find files
+ *
+ * @author Dmitry (dio) Levashov
+ **/
+ elFinder.prototype.commands.search = function() {
+ this.title = 'Find files';
+ this.options = {ui: 'searchbutton'}
+ this.alwaysEnabled = true;
+ this.updateOnSelect = false;
-}
+ /**
+ * Return command status.
+ * Search does not support old api.
+ *
+ * @return Number
+ **/
+ this.getstate = function() {
+ return 0;
+ }
-elFinder.prototype.commands.test134 = function() {
- this.title = 'Test Command';
- //this.options = {ui : 'uploadbutton'}
- this.alwaysEnabled = true;
- this.updateOnSelect = false;
- this.state = 0;
-
- this.getstate = function() {
- return 0;
- }
-
- /**
- * Send search request to backend.
- *
- * @param String search string
- * @return $.Deferred
- **/
- this.exec = function(q) {
- var fm = this.fm;
-
- alert(Drupal.t('test command. arg=') + q);
-
- return $.Deferred().reject();
- }
+ /**
+ * Send search request to backend.
+ *
+ * @param String search string
+ * @return $.Deferred
+ **/
+ this.exec = function(q) {
+ var fm = this.fm;
-}
+ if (typeof(q) == 'string' && q) {
+ return fm.request({
+ data: {cmd: 'search', elfinder_search_q: q},
+ notify: {type: 'search', cnt: 1, hideCnt: true}
+ });
+ }
+ fm.getUI('toolbar').find('.' + fm.res('class', 'searchbtn') + ' :text').focus();
+ return $.Deferred().reject();
+ }
+
+ }
+
+ elFinder.prototype.commands.test134 = function() {
+ this.title = 'Test Command';
+ //this.options = {ui : 'uploadbutton'}
+ this.alwaysEnabled = true;
+ this.updateOnSelect = false;
+ this.state = 0;
+
+ this.getstate = function() {
+ return 0;
+ }
+
+ /**
+ * Send search request to backend.
+ *
+ * @param String search string
+ * @return $.Deferred
+ **/
+ this.exec = function(q) {
+ var fm = this.fm;
+
+ alert(Drupal.t('test command. arg=') + q);
+
+ return $.Deferred().reject();
+ }
+
+ }
-$().ready(function() {
- var uiopts = elFinder.prototype._options.uiOptions.toolbar;
+ $().ready(function() {
+ var uiopts = elFinder.prototype._options.uiOptions.toolbar;
- var newOpts = new Array();
+ var newOpts = new Array();
- var disabledCommands = Drupal.settings.elfinder.disabledCommands;
-
-
- for (var i in uiopts) {
- var optsGroup = uiopts[i];
- var newOptsGroup = Array();
+ var disabledCommands = Drupal.settings.elfinder.disabledCommands;
- for (var j in optsGroup) {
+
+ for (var i in uiopts) {
+ var optsGroup = uiopts[i];
+ var newOptsGroup = Array();
+
+
+ for (var j in optsGroup) {
+ var found = false;
+ for (var k in disabledCommands) {
+ if (disabledCommands[k] == optsGroup[j]) {
+ found = true;
+ }
+ }
+
+ if (found == false) {
+ newOptsGroup.push(optsGroup[j]);
+ }
+
+ }
+
+ if (i == 0) {
+ newOptsGroup.push('up');
+ }
+
+ if (newOptsGroup.length >= 1) {
+ newOpts.push(newOptsGroup);
+ }
+ }
+
+ /*elFinder.prototype._options.contextmenu.files.push('|');
+ elFinder.prototype._options.contextmenu.files.push('rename'); */
+
+ var contextMenuCwd = elFinder.prototype._options.contextmenu.cwd;
+ var contextMenuFiles = elFinder.prototype._options.contextmenu.files;
+ var contextMenuNavbar = elFinder.prototype._options.contextmenu.navbar;
+
+ var newContextMenuCwd = Array();
+ var newContextMenuFiles = Array();
+ var newContextMenuNavbar = Array();
+
+ for (var i in contextMenuCwd) {
var found = false;
for (var k in disabledCommands) {
- if (disabledCommands[k] == optsGroup[j]) {
+ if (disabledCommands[k] == contextMenuCwd[i]) {
found = true;
}
}
-
- if (found == false) {
- newOptsGroup.push(optsGroup[j]);
- }
-
- }
-
- if (i == 0) {
- newOptsGroup.push('up');
- }
-
- if (newOptsGroup.length >= 1) {
- newOpts.push(newOptsGroup);
- }
- }
-
- var contextMenuCwd = elFinder.prototype._options.contextmenu.cwd;
- var contextMenuFiles = elFinder.prototype._options.contextmenu.files;
- var contextMenuNavbar = elFinder.prototype._options.contextmenu.navbar;
-
- var newContextMenuCwd = Array();
- var newContextMenuFiles = Array();
- var newContextMenuNavbar = Array();
-
- for (var i in contextMenuCwd) {
- var found = false;
- for (var k in disabledCommands) {
- if (disabledCommands[k] == contextMenuCwd[i]) {
- found = true;
+
+ if (found == false && contextMenuCwd[i] != '|') {
+ newContextMenuCwd.push(contextMenuCwd[i]);
}
}
-
- if (found == false && contextMenuCwd[i] != '|') {
- newContextMenuCwd.push(contextMenuCwd[i]);
- }
- }
-
- for (var i in contextMenuFiles) {
- var found = false;
- for (var k in disabledCommands) {
- if (disabledCommands[k] == contextMenuFiles[i]) {
- found = true;
+
+ for (var i in contextMenuFiles) {
+ var found = false;
+ for (var k in disabledCommands) {
+ if (disabledCommands[k] == contextMenuFiles[i]) {
+ found = true;
+ }
+ }
+
+ if (found == false && contextMenuFiles[i] != '|') {
+ newContextMenuFiles.push(contextMenuFiles[i]);
}
}
-
- if (found == false && contextMenuFiles[i] != '|') {
- newContextMenuFiles.push(contextMenuFiles[i]);
- }
- }
-
- for (var i in contextMenuNavbar) {
- var found = false;
- for (var k in disabledCommands) {
- if (disabledCommands[k] == contextMenuNavbar[i]) {
- found = true;
+
+ for (var i in contextMenuNavbar) {
+ var found = false;
+ for (var k in disabledCommands) {
+ if (disabledCommands[k] == contextMenuNavbar[i]) {
+ found = true;
+ }
+ }
+
+ if (found == false && contextMenuNavbar[i] != '|') {
+ newContextMenuNavbar.push(contextMenuNavbar[i]);
}
}
-
- if (found == false && contextMenuNavbar[i] != '|') {
- newContextMenuNavbar.push(contextMenuNavbar[i]);
- }
- }
- elFinder.prototype._options.uiOptions.toolbar = newOpts;
- elFinder.prototype._options.contextmenu.cwd = newContextMenuCwd;
- elFinder.prototype._options.contextmenu.files = newContextMenuFiles;
- elFinder.prototype._options.contextmenu.navbar = newContextMenuNavbar;
+ elFinder.prototype._options.uiOptions.toolbar = newOpts;
+ elFinder.prototype._options.contextmenu.cwd = newContextMenuCwd;
+ elFinder.prototype._options.contextmenu.files = newContextMenuFiles;
+ elFinder.prototype._options.contextmenu.navbar = newContextMenuNavbar;
-});
+ //elFinder.prototype._options.ui.push('mouseover');
+ });
+ $().ready(function() {
+ if (Drupal.settings.elfinder) {
+ var editorApp = Drupal.settings.elfinder.editorApp;
-$().ready(function() {
- if (Drupal.settings.elfinder) {
- var editorApp = Drupal.settings.elfinder.editorApp;
+ var elfinderOpts = {
+ url: Drupal.settings.elfinder.connectorUrl,
+ lang: Drupal.settings.elfinder.langCode,
+ rememberLastDir: Drupal.settings.elfinder.rememberLastDir,
+ closeOnEditorCallback: false,
+ customData: {token: Drupal.settings.elfinder.token},
+ commandsOptions_: {}
+ }
- var elfinderOpts = {
- url : Drupal.settings.elfinder.connectorUrl,
- lang : Drupal.settings.elfinder.langCode,
- rememberLastDir : Drupal.settings.elfinder.rememberLastDir,
- closeOnEditorCallback : false,
- customData : {token: Drupal.settings.elfinder.token}
- }
-
- /* Pushing all settings to elFinder */
- $.extend(elfinderOpts, Drupal.settings.elfinder);
-
- if (editorApp && typeof window[Drupal.settings.elfinder.editorCallback] == 'function') {
- elfinderOpts.editorCallback = window[Drupal.settings.elfinder.editorCallback];
- }
+ // help tab rendering issues in admin theme
+ if (Drupal.settings.elfinder.browserMode != 'default' && elFinder.prototype._options.commandsOptions.help) {
+ final_options = [];
- if (editorApp && typeof window[Drupal.settings.elfinder.editorCallback] == 'function') {
- elfinderOpts.getFileCallback = window[Drupal.settings.elfinder.editorCallback];
- }
-
- if (elfinderOpts.api21) {
- //alert('api21');
+ for (var i in elFinder.prototype._options.commandsOptions.help.view) {
+ var option = elFinder.prototype._options.commandsOptions.help.view[i];
+ if (option != 'help') {
+ final_options.push(option);
+ }
+ }
+
+ elFinder.prototype._options.commandsOptions.help['view'] = final_options;
+ }
+
+ /* Pushing all settings to elFinder */
+ $.extend(elfinderOpts, Drupal.settings.elfinder);
+
+ if (editorApp && typeof window[Drupal.settings.elfinder.editorCallback] == 'function') {
+ elfinderOpts.editorCallback = window[Drupal.settings.elfinder.editorCallback];
+ }
+
+ if (editorApp && typeof window[Drupal.settings.elfinder.editorCallback] == 'function') {
+ elfinderOpts.getFileCallback = window[Drupal.settings.elfinder.editorCallback];
+ }
+
+ if (elfinderOpts.api21) {
console.log('2.1 api');
- elfinderOpts['commandsOptions'] = {
- info: {
- // Key is the same as your command name
- desc : {
- // Field label
- label : 'Description1',
-
- // HTML Template
- tpl : '',
-
- // Action that sends the request to the server and get the description
- action : function(file, filemanager, dialog) {
- // Use the @filemanager object to issue a request
- filemanager.request({
- // Issuing the custom 'desc' command, targetting the selected file
- data : { cmd: 'desc', target: file.hash, },
- preventDefault: true,
- })
- // If the request fails, populate the field with 'Unknown'
- .fail(function() {
- dialog.find('.elfinder-info-desc').html(filemanager.i18n('unknown'));
- })
- // When the request is successful, show the description
- .done(function(data) {
- dialog.find('.elfinder-info-desc').html(data.desc);
- });
- },
- },
+ elfinderOpts['commandsOptions']['info'] = {
+ custom: {}
+
+ };
+
+/* elfinderOpts['commandsOptions']['quicklook'] = {
+ officeOnlineMimes : ['application/msword', 'application/vnd.ms-word', 'application/vnd.ms-excel', 'application/vnd.ms-powerpoint', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'],
+ }*/
+
+ var disabledCommands = Drupal.settings.elfinder.disabledCommands,
+ viewDesc = $.inArray('desc', disabledCommands) == -1 ? true : false,
+ editDesc = $.inArray('editdesc', disabledCommands) == -1 ? true : false,
+ viewOwner = $.inArray('owner', disabledCommands) == -1 ? true : false,
+ viewDownloads = $.inArray('downloadcount', disabledCommands) == -1 ? true : false;
+
+
+ if (viewDesc || editDesc) {
+
+ // Key is the same as your command name
+ elfinderOpts['commandsOptions']['info']['custom']['desc'] = {
+ // Field label
+ label: Drupal.t('Description'),
+
+ // HTML Template
+ tpl: '
',
+
+ // Action that sends the request to the server and get the description
+ action: function(file, filemanager, dialog) {
+ console.log('desc action');
+
+ console.log('fm');
+ console.log(file.mime);
+
+ // Use the @filemanager object to issue a request
+ filemanager.request({
+ // Issuing the custom 'desc' command, targetting the selected file
+ data: {cmd: 'desc', target: file.hash,},
+ preventDefault: true,
+ })
+ // If the request fails, populate the field with 'Unknown'
+ .fail(function() {
+ console.log('desc fail');
+ dialog.find('.elfinder-info-desc').html(filemanager.i18n('unknown'));
+ })
+ // When the request is successful, show the description
+ .done(function(data) {
+ console.log('desc done');
+ dialog.find('.elfinder-info-desc').html(data.desc);
+
+ if (editDesc) {
+ //filemanager.lockfiles({files : [file.hash]})
+ dialog.find('.elfinder-info-desc').html('');
+
+ $('.elfinder-info-save').append('');
+
+ var btnSave = $('#elfinder-fm-file-desc-btn-save', dialog).button();
+ console.log(btnSave);
+
+ btnSave.click(function() {
+ filemanager.lockfiles({files: [file.hash]});
+ filemanager.request({
+ data: {cmd: 'desc', target: file.hash, content: $('#elfinder-fm-file-desc').val()},
+ notify: {type: 'desc', cnt: 1}
+ })
+ .always(function() {
+ filemanager.unlockfiles({files: [file.hash]});
+ });
+ });
+
+ }
+
+
+ });
+ }
+ };
+
+ }
+
+
+ if (viewOwner) {
+ // Key is the same as your command name
+ elfinderOpts['commandsOptions']['info']['custom']['owner'] = {
+ // Field label
+ label: Drupal.t('Owner'),
+
+ // HTML Template
+ tpl: '
',
+
+ // Action that sends the request to the server and get the description
+ action: function(file, filemanager, dialog) {
+ console.log('owner action');
+
+ // Use the @filemanager object to issue a request
+ filemanager.request({
+ // Issuing the custom 'desc' command, targetting the selected file
+ data: {cmd: 'owner', target: file.hash,},
+ preventDefault: true,
+ })
+ // If the request fails, populate the field with 'Unknown'
+ .fail(function() {
+ console.log('owner fail');
+ dialog.find('.elfinder-info-owner').html(filemanager.i18n('unknown'));
+ })
+ // When the request is successful, show the description
+ .done(function(data) {
+ console.log('owner done');
+ dialog.find('.elfinder-info-owner').html(data.owner);
+ });
+ }
+ };
+
+ elFinder.prototype._options.uiOptions.cwd.listView.columns.push('owner');
+ elFinder.prototype._options.uiOptions.cwd.listView.columnsCustomName['owner'] = Drupal.t('Owner');
+
+ }
+
+ if (viewDownloads) {
+ elfinderOpts['commandsOptions']['info']['custom']['downloadcount'] = {
+ // Field label
+ label: Drupal.t('Downloads'),
+
+ // HTML Template
+ tpl: '
',
+
+ // Action that sends the request to the server and get the description
+ action: function(file, filemanager, dialog) {
+ // Use the @filemanager object to issue a request
+ filemanager.request({
+ // Issuing the custom 'desc' command, targetting the selected file
+ data: {cmd: 'downloadcount', target: file.hash,},
+ preventDefault: true,
+ })
+ // If the request fails, populate the field with 'Unknown'
+ .fail(function() {
+ dialog.find('.elfinder-info-downloadcount').html(0);
+ })
+ // When the request is successful, show the description
+ .done(function(data) {
+ dialog.find('.elfinder-info-downloadcount').html(data.desc);
+ });
+ }
+ };
+
+ }
+
+// console.log(elfinderOpts);
}
- };
- }
-
- $('#finder').elfinder(elfinderOpts);
+ var fm = $('#finder').elfinder(elfinderOpts);
+
+ var instance = fm.elfinder('instance');
+
+// console.log(typeof instance == 'object' && typeof instance.toast == 'function');
+
+ if (typeof instance == 'object' && typeof instance.toast == 'function') {
+ instance.bind('load', function(event) {
+ var messages = '#elfinder-messages .messages';
+ $(messages).each(function(index, value) {
+ var mode = 'info';
+ if ($(value).hasClass('warning')) {
+ mode = 'warning';
+ } else if ($(value).hasClass('error')) {
+ mode = 'error';
+ }
+
+ instance.toast({
+ msg: $(value).html(),
+ hideDuration: 500,
+ showDuration: 300,
+ timeOut: 1000,
+ mode: mode
+ });
+
+ });
+ });
+ } else {
+ $('#elfinder-messages').addClass('legacy');
+ }
+ //$('#finder').toast({msg: '123'});
+
+ var h;
+
+ if (elfinderOpts.browserMode != 'backend') {
+ h = ($(window).height());
+ } else {
+ h = ($('#page').height());
+ }
- if(elfinderOpts.browserMode != 'backend') {
- // If this is a popup, add an event so that elfinder fills the window.
$(window).resize(function() {
- var h = ($(window).height());
- if($('#finder').height() != h) {
+ if ($('#finder').height() != h) {
$('#finder').height(h).resize();
}
});
+
+ $(window).trigger('resize');
}
- }
-});
+ });
})(jQuery);
diff --git a/sites/all/modules/contrib/files/elfinder/js/elfinder.jquery-ui.legacy.min.js b/sites/all/modules/contrib/files/elfinder/js/elfinder.jquery-ui.legacy.min.js
new file mode 100644
index 00000000..5824d129
--- /dev/null
+++ b/sites/all/modules/contrib/files/elfinder/js/elfinder.jquery-ui.legacy.min.js
@@ -0,0 +1,13 @@
+/*! jQuery UI - v1.11.4 - 2015-03-11
+* http://jqueryui.com
+* Includes: core.js, widget.js, mouse.js, position.js, accordion.js, autocomplete.js, button.js, datepicker.js, dialog.js, draggable.js, droppable.js, effect.js, effect-blind.js, effect-bounce.js, effect-clip.js, effect-drop.js, effect-explode.js, effect-fade.js, effect-fold.js, effect-highlight.js, effect-puff.js, effect-pulsate.js, effect-scale.js, effect-shake.js, effect-size.js, effect-slide.js, effect-transfer.js, menu.js, progressbar.js, resizable.js, selectable.js, selectmenu.js, slider.js, sortable.js, spinner.js, tabs.js, tooltip.js
+* Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */
+
+(function(e){"function"==typeof define&&define.amd?define(["jquery"],e):e(jQuery)})(function(e){function t(t,s){var n,a,o,r=t.nodeName.toLowerCase();return"area"===r?(n=t.parentNode,a=n.name,t.href&&a&&"map"===n.nodeName.toLowerCase()?(o=e("img[usemap='#"+a+"']")[0],!!o&&i(o)):!1):(/^(input|select|textarea|button|object)$/.test(r)?!t.disabled:"a"===r?t.href||s:s)&&i(t)}function i(t){return e.expr.filters.visible(t)&&!e(t).parents().addBack().filter(function(){return"hidden"===e.css(this,"visibility")}).length}function s(e){for(var t,i;e.length&&e[0]!==document;){if(t=e.css("position"),("absolute"===t||"relative"===t||"fixed"===t)&&(i=parseInt(e.css("zIndex"),10),!isNaN(i)&&0!==i))return i;e=e.parent()}return 0}function n(){this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},e.extend(this._defaults,this.regional[""]),this.regional.en=e.extend(!0,{},this.regional[""]),this.regional["en-US"]=e.extend(!0,{},this.regional.en),this.dpDiv=a(e(""))}function a(t){var i="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return t.delegate(i,"mouseout",function(){e(this).removeClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&e(this).removeClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&e(this).removeClass("ui-datepicker-next-hover")}).delegate(i,"mouseover",o)}function o(){e.datepicker._isDisabledDatepicker(v.inline?v.dpDiv.parent()[0]:v.input[0])||(e(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),e(this).addClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&e(this).addClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&e(this).addClass("ui-datepicker-next-hover"))}function r(t,i){e.extend(t,i);for(var s in i)null==i[s]&&(t[s]=i[s]);return t}function h(e){return function(){var t=this.element.val();e.apply(this,arguments),this._refresh(),t!==this.element.val()&&this._trigger("change")}}e.ui=e.ui||{},e.extend(e.ui,{version:"1.11.4",keyCode:{BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38}}),e.fn.extend({scrollParent:function(t){var i=this.css("position"),s="absolute"===i,n=t?/(auto|scroll|hidden)/:/(auto|scroll)/,a=this.parents().filter(function(){var t=e(this);return s&&"static"===t.css("position")?!1:n.test(t.css("overflow")+t.css("overflow-y")+t.css("overflow-x"))}).eq(0);return"fixed"!==i&&a.length?a:e(this[0].ownerDocument||document)},uniqueId:function(){var e=0;return function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++e)})}}(),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&e(this).removeAttr("id")})}}),e.extend(e.expr[":"],{data:e.expr.createPseudo?e.expr.createPseudo(function(t){return function(i){return!!e.data(i,t)}}):function(t,i,s){return!!e.data(t,s[3])},focusable:function(i){return t(i,!isNaN(e.attr(i,"tabindex")))},tabbable:function(i){var s=e.attr(i,"tabindex"),n=isNaN(s);return(n||s>=0)&&t(i,!n)}}),e("").outerWidth(1).jquery||e.each(["Width","Height"],function(t,i){function s(t,i,s,a){return e.each(n,function(){i-=parseFloat(e.css(t,"padding"+this))||0,s&&(i-=parseFloat(e.css(t,"border"+this+"Width"))||0),a&&(i-=parseFloat(e.css(t,"margin"+this))||0)}),i}var n="Width"===i?["Left","Right"]:["Top","Bottom"],a=i.toLowerCase(),o={innerWidth:e.fn.innerWidth,innerHeight:e.fn.innerHeight,outerWidth:e.fn.outerWidth,outerHeight:e.fn.outerHeight};e.fn["inner"+i]=function(t){return void 0===t?o["inner"+i].call(this):this.each(function(){e(this).css(a,s(this,t)+"px")})},e.fn["outer"+i]=function(t,n){return"number"!=typeof t?o["outer"+i].call(this,t):this.each(function(){e(this).css(a,s(this,t,!0,n)+"px")})}}),e.fn.addBack||(e.fn.addBack=function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}),e("").data("a-b","a").removeData("a-b").data("a-b")&&(e.fn.removeData=function(t){return function(i){return arguments.length?t.call(this,e.camelCase(i)):t.call(this)}}(e.fn.removeData)),e.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase()),e.fn.extend({focus:function(t){return function(i,s){return"number"==typeof i?this.each(function(){var t=this;setTimeout(function(){e(t).focus(),s&&s.call(t)},i)}):t.apply(this,arguments)}}(e.fn.focus),disableSelection:function(){var e="onselectstart"in document.createElement("div")?"selectstart":"mousedown";return function(){return this.bind(e+".ui-disableSelection",function(e){e.preventDefault()})}}(),enableSelection:function(){return this.unbind(".ui-disableSelection")},zIndex:function(t){if(void 0!==t)return this.css("zIndex",t);if(this.length)for(var i,s,n=e(this[0]);n.length&&n[0]!==document;){if(i=n.css("position"),("absolute"===i||"relative"===i||"fixed"===i)&&(s=parseInt(n.css("zIndex"),10),!isNaN(s)&&0!==s))return s;n=n.parent()}return 0}}),e.ui.plugin={add:function(t,i,s){var n,a=e.ui[t].prototype;for(n in s)a.plugins[n]=a.plugins[n]||[],a.plugins[n].push([i,s[n]])},call:function(e,t,i,s){var n,a=e.plugins[t];if(a&&(s||e.element[0].parentNode&&11!==e.element[0].parentNode.nodeType))for(n=0;a.length>n;n++)e.options[a[n][0]]&&a[n][1].apply(e.element,i)}};var l=0,u=Array.prototype.slice;e.cleanData=function(t){return function(i){var s,n,a;for(a=0;null!=(n=i[a]);a++)try{s=e._data(n,"events"),s&&s.remove&&e(n).triggerHandler("remove")}catch(o){}t(i)}}(e.cleanData),e.widget=function(t,i,s){var n,a,o,r,h={},l=t.split(".")[0];return t=t.split(".")[1],n=l+"-"+t,s||(s=i,i=e.Widget),e.expr[":"][n.toLowerCase()]=function(t){return!!e.data(t,n)},e[l]=e[l]||{},a=e[l][t],o=e[l][t]=function(e,t){return this._createWidget?(arguments.length&&this._createWidget(e,t),void 0):new o(e,t)},e.extend(o,a,{version:s.version,_proto:e.extend({},s),_childConstructors:[]}),r=new i,r.options=e.widget.extend({},r.options),e.each(s,function(t,s){return e.isFunction(s)?(h[t]=function(){var e=function(){return i.prototype[t].apply(this,arguments)},n=function(e){return i.prototype[t].apply(this,e)};return function(){var t,i=this._super,a=this._superApply;return this._super=e,this._superApply=n,t=s.apply(this,arguments),this._super=i,this._superApply=a,t}}(),void 0):(h[t]=s,void 0)}),o.prototype=e.widget.extend(r,{widgetEventPrefix:a?r.widgetEventPrefix||t:t},h,{constructor:o,namespace:l,widgetName:t,widgetFullName:n}),a?(e.each(a._childConstructors,function(t,i){var s=i.prototype;e.widget(s.namespace+"."+s.widgetName,o,i._proto)}),delete a._childConstructors):i._childConstructors.push(o),e.widget.bridge(t,o),o},e.widget.extend=function(t){for(var i,s,n=u.call(arguments,1),a=0,o=n.length;o>a;a++)for(i in n[a])s=n[a][i],n[a].hasOwnProperty(i)&&void 0!==s&&(t[i]=e.isPlainObject(s)?e.isPlainObject(t[i])?e.widget.extend({},t[i],s):e.widget.extend({},s):s);return t},e.widget.bridge=function(t,i){var s=i.prototype.widgetFullName||t;e.fn[t]=function(n){var a="string"==typeof n,o=u.call(arguments,1),r=this;return a?this.each(function(){var i,a=e.data(this,s);return"instance"===n?(r=a,!1):a?e.isFunction(a[n])&&"_"!==n.charAt(0)?(i=a[n].apply(a,o),i!==a&&void 0!==i?(r=i&&i.jquery?r.pushStack(i.get()):i,!1):void 0):e.error("no such method '"+n+"' for "+t+" widget instance"):e.error("cannot call methods on "+t+" prior to initialization; "+"attempted to call method '"+n+"'")}):(o.length&&(n=e.widget.extend.apply(null,[n].concat(o))),this.each(function(){var t=e.data(this,s);t?(t.option(n||{}),t._init&&t._init()):e.data(this,s,new i(n,this))})),r}},e.Widget=function(){},e.Widget._childConstructors=[],e.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"
",options:{disabled:!1,create:null},_createWidget:function(t,i){i=e(i||this.defaultElement||this)[0],this.element=e(i),this.uuid=l++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=e(),this.hoverable=e(),this.focusable=e(),i!==this&&(e.data(i,this.widgetFullName,this),this._on(!0,this.element,{remove:function(e){e.target===i&&this.destroy()}}),this.document=e(i.style?i.ownerDocument:i.document||i),this.window=e(this.document[0].defaultView||this.document[0].parentWindow)),this.options=e.widget.extend({},this.options,this._getCreateOptions(),t),this._create(),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:e.noop,_getCreateEventData:e.noop,_create:e.noop,_init:e.noop,destroy:function(){this._destroy(),this.element.unbind(this.eventNamespace).removeData(this.widgetFullName).removeData(e.camelCase(this.widgetFullName)),this.widget().unbind(this.eventNamespace).removeAttr("aria-disabled").removeClass(this.widgetFullName+"-disabled "+"ui-state-disabled"),this.bindings.unbind(this.eventNamespace),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")},_destroy:e.noop,widget:function(){return this.element},option:function(t,i){var s,n,a,o=t;if(0===arguments.length)return e.widget.extend({},this.options);if("string"==typeof t)if(o={},s=t.split("."),t=s.shift(),s.length){for(n=o[t]=e.widget.extend({},this.options[t]),a=0;s.length-1>a;a++)n[s[a]]=n[s[a]]||{},n=n[s[a]];if(t=s.pop(),1===arguments.length)return void 0===n[t]?null:n[t];n[t]=i}else{if(1===arguments.length)return void 0===this.options[t]?null:this.options[t];o[t]=i}return this._setOptions(o),this},_setOptions:function(e){var t;for(t in e)this._setOption(t,e[t]);return this},_setOption:function(e,t){return this.options[e]=t,"disabled"===e&&(this.widget().toggleClass(this.widgetFullName+"-disabled",!!t),t&&(this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus"))),this},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_on:function(t,i,s){var n,a=this;"boolean"!=typeof t&&(s=i,i=t,t=!1),s?(i=n=e(i),this.bindings=this.bindings.add(i)):(s=i,i=this.element,n=this.widget()),e.each(s,function(s,o){function r(){return t||a.options.disabled!==!0&&!e(this).hasClass("ui-state-disabled")?("string"==typeof o?a[o]:o).apply(a,arguments):void 0}"string"!=typeof o&&(r.guid=o.guid=o.guid||r.guid||e.guid++);var h=s.match(/^([\w:-]*)\s*(.*)$/),l=h[1]+a.eventNamespace,u=h[2];u?n.delegate(u,l,r):i.bind(l,r)})},_off:function(t,i){i=(i||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,t.unbind(i).undelegate(i),this.bindings=e(this.bindings.not(t).get()),this.focusable=e(this.focusable.not(t).get()),this.hoverable=e(this.hoverable.not(t).get())},_delay:function(e,t){function i(){return("string"==typeof e?s[e]:e).apply(s,arguments)}var s=this;return setTimeout(i,t||0)},_hoverable:function(t){this.hoverable=this.hoverable.add(t),this._on(t,{mouseenter:function(t){e(t.currentTarget).addClass("ui-state-hover")},mouseleave:function(t){e(t.currentTarget).removeClass("ui-state-hover")}})},_focusable:function(t){this.focusable=this.focusable.add(t),this._on(t,{focusin:function(t){e(t.currentTarget).addClass("ui-state-focus")},focusout:function(t){e(t.currentTarget).removeClass("ui-state-focus")}})},_trigger:function(t,i,s){var n,a,o=this.options[t];if(s=s||{},i=e.Event(i),i.type=(t===this.widgetEventPrefix?t:this.widgetEventPrefix+t).toLowerCase(),i.target=this.element[0],a=i.originalEvent)for(n in a)n in i||(i[n]=a[n]);return this.element.trigger(i,s),!(e.isFunction(o)&&o.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},e.each({show:"fadeIn",hide:"fadeOut"},function(t,i){e.Widget.prototype["_"+t]=function(s,n,a){"string"==typeof n&&(n={effect:n});var o,r=n?n===!0||"number"==typeof n?i:n.effect||i:t;n=n||{},"number"==typeof n&&(n={duration:n}),o=!e.isEmptyObject(n),n.complete=a,n.delay&&s.delay(n.delay),o&&e.effects&&e.effects.effect[r]?s[t](n):r!==t&&s[r]?s[r](n.duration,n.easing,a):s.queue(function(i){e(this)[t](),a&&a.call(s[0]),i()})}}),e.widget;var d=!1;e(document).mouseup(function(){d=!1}),e.widget("ui.mouse",{version:"1.11.4",options:{cancel:"input,textarea,button,select,option",distance:1,delay:0},_mouseInit:function(){var t=this;this.element.bind("mousedown."+this.widgetName,function(e){return t._mouseDown(e)}).bind("click."+this.widgetName,function(i){return!0===e.data(i.target,t.widgetName+".preventClickEvent")?(e.removeData(i.target,t.widgetName+".preventClickEvent"),i.stopImmediatePropagation(),!1):void 0}),this.started=!1},_mouseDestroy:function(){this.element.unbind("."+this.widgetName),this._mouseMoveDelegate&&this.document.unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(t){if(!d){this._mouseMoved=!1,this._mouseStarted&&this._mouseUp(t),this._mouseDownEvent=t;var i=this,s=1===t.which,n="string"==typeof this.options.cancel&&t.target.nodeName?e(t.target).closest(this.options.cancel).length:!1;return s&&!n&&this._mouseCapture(t)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){i.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(t)&&this._mouseDelayMet(t)&&(this._mouseStarted=this._mouseStart(t)!==!1,!this._mouseStarted)?(t.preventDefault(),!0):(!0===e.data(t.target,this.widgetName+".preventClickEvent")&&e.removeData(t.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(e){return i._mouseMove(e)},this._mouseUpDelegate=function(e){return i._mouseUp(e)},this.document.bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate),t.preventDefault(),d=!0,!0)):!0}},_mouseMove:function(t){if(this._mouseMoved){if(e.ui.ie&&(!document.documentMode||9>document.documentMode)&&!t.button)return this._mouseUp(t);if(!t.which)return this._mouseUp(t)}return(t.which||t.button)&&(this._mouseMoved=!0),this._mouseStarted?(this._mouseDrag(t),t.preventDefault()):(this._mouseDistanceMet(t)&&this._mouseDelayMet(t)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,t)!==!1,this._mouseStarted?this._mouseDrag(t):this._mouseUp(t)),!this._mouseStarted)},_mouseUp:function(t){return this.document.unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,t.target===this._mouseDownEvent.target&&e.data(t.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(t)),d=!1,!1},_mouseDistanceMet:function(e){return Math.max(Math.abs(this._mouseDownEvent.pageX-e.pageX),Math.abs(this._mouseDownEvent.pageY-e.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}}),function(){function t(e,t,i){return[parseFloat(e[0])*(p.test(e[0])?t/100:1),parseFloat(e[1])*(p.test(e[1])?i/100:1)]}function i(t,i){return parseInt(e.css(t,i),10)||0}function s(t){var i=t[0];return 9===i.nodeType?{width:t.width(),height:t.height(),offset:{top:0,left:0}}:e.isWindow(i)?{width:t.width(),height:t.height(),offset:{top:t.scrollTop(),left:t.scrollLeft()}}:i.preventDefault?{width:0,height:0,offset:{top:i.pageY,left:i.pageX}}:{width:t.outerWidth(),height:t.outerHeight(),offset:t.offset()}}e.ui=e.ui||{};var n,a,o=Math.max,r=Math.abs,h=Math.round,l=/left|center|right/,u=/top|center|bottom/,d=/[\+\-]\d+(\.[\d]+)?%?/,c=/^\w+/,p=/%$/,f=e.fn.position;e.position={scrollbarWidth:function(){if(void 0!==n)return n;var t,i,s=e(""),a=s.children()[0];return e("body").append(s),t=a.offsetWidth,s.css("overflow","scroll"),i=a.offsetWidth,t===i&&(i=s[0].clientWidth),s.remove(),n=t-i},getScrollInfo:function(t){var i=t.isWindow||t.isDocument?"":t.element.css("overflow-x"),s=t.isWindow||t.isDocument?"":t.element.css("overflow-y"),n="scroll"===i||"auto"===i&&t.widthi?"left":t>0?"right":"center",vertical:0>a?"top":s>0?"bottom":"middle"};d>m&&m>r(t+i)&&(h.horizontal="center"),c>g&&g>r(s+a)&&(h.vertical="middle"),h.important=o(r(t),r(i))>o(r(s),r(a))?"horizontal":"vertical",n.using.call(this,e,h)}),u.offset(e.extend(M,{using:l}))})},e.ui.position={fit:{left:function(e,t){var i,s=t.within,n=s.isWindow?s.scrollLeft:s.offset.left,a=s.width,r=e.left-t.collisionPosition.marginLeft,h=n-r,l=r+t.collisionWidth-a-n;t.collisionWidth>a?h>0&&0>=l?(i=e.left+h+t.collisionWidth-a-n,e.left+=h-i):e.left=l>0&&0>=h?n:h>l?n+a-t.collisionWidth:n:h>0?e.left+=h:l>0?e.left-=l:e.left=o(e.left-r,e.left)},top:function(e,t){var i,s=t.within,n=s.isWindow?s.scrollTop:s.offset.top,a=t.within.height,r=e.top-t.collisionPosition.marginTop,h=n-r,l=r+t.collisionHeight-a-n;t.collisionHeight>a?h>0&&0>=l?(i=e.top+h+t.collisionHeight-a-n,e.top+=h-i):e.top=l>0&&0>=h?n:h>l?n+a-t.collisionHeight:n:h>0?e.top+=h:l>0?e.top-=l:e.top=o(e.top-r,e.top)}},flip:{left:function(e,t){var i,s,n=t.within,a=n.offset.left+n.scrollLeft,o=n.width,h=n.isWindow?n.scrollLeft:n.offset.left,l=e.left-t.collisionPosition.marginLeft,u=l-h,d=l+t.collisionWidth-o-h,c="left"===t.my[0]?-t.elemWidth:"right"===t.my[0]?t.elemWidth:0,p="left"===t.at[0]?t.targetWidth:"right"===t.at[0]?-t.targetWidth:0,f=-2*t.offset[0];0>u?(i=e.left+c+p+f+t.collisionWidth-o-a,(0>i||r(u)>i)&&(e.left+=c+p+f)):d>0&&(s=e.left-t.collisionPosition.marginLeft+c+p+f-h,(s>0||d>r(s))&&(e.left+=c+p+f))},top:function(e,t){var i,s,n=t.within,a=n.offset.top+n.scrollTop,o=n.height,h=n.isWindow?n.scrollTop:n.offset.top,l=e.top-t.collisionPosition.marginTop,u=l-h,d=l+t.collisionHeight-o-h,c="top"===t.my[1],p=c?-t.elemHeight:"bottom"===t.my[1]?t.elemHeight:0,f="top"===t.at[1]?t.targetHeight:"bottom"===t.at[1]?-t.targetHeight:0,m=-2*t.offset[1];0>u?(s=e.top+p+f+m+t.collisionHeight-o-a,(0>s||r(u)>s)&&(e.top+=p+f+m)):d>0&&(i=e.top-t.collisionPosition.marginTop+p+f+m-h,(i>0||d>r(i))&&(e.top+=p+f+m))}},flipfit:{left:function(){e.ui.position.flip.left.apply(this,arguments),e.ui.position.fit.left.apply(this,arguments)},top:function(){e.ui.position.flip.top.apply(this,arguments),e.ui.position.fit.top.apply(this,arguments)}}},function(){var t,i,s,n,o,r=document.getElementsByTagName("body")[0],h=document.createElement("div");t=document.createElement(r?"div":"body"),s={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},r&&e.extend(s,{position:"absolute",left:"-1000px",top:"-1000px"});for(o in s)t.style[o]=s[o];t.appendChild(h),i=r||document.documentElement,i.insertBefore(t,i.firstChild),h.style.cssText="position: absolute; left: 10.7432222px;",n=e(h).offset().left,a=n>10&&11>n,t.innerHTML="",i.removeChild(t)}()}(),e.ui.position,e.widget("ui.accordion",{version:"1.11.4",options:{active:0,animate:{},collapsible:!1,event:"click",header:"> li > :first-child,> :not(li):even",heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},hideProps:{borderTopWidth:"hide",borderBottomWidth:"hide",paddingTop:"hide",paddingBottom:"hide",height:"hide"},showProps:{borderTopWidth:"show",borderBottomWidth:"show",paddingTop:"show",paddingBottom:"show",height:"show"},_create:function(){var t=this.options;this.prevShow=this.prevHide=e(),this.element.addClass("ui-accordion ui-widget ui-helper-reset").attr("role","tablist"),t.collapsible||t.active!==!1&&null!=t.active||(t.active=0),this._processPanels(),0>t.active&&(t.active+=this.headers.length),this._refresh()},_getCreateEventData:function(){return{header:this.active,panel:this.active.length?this.active.next():e()}},_createIcons:function(){var t=this.options.icons;t&&(e("").addClass("ui-accordion-header-icon ui-icon "+t.header).prependTo(this.headers),this.active.children(".ui-accordion-header-icon").removeClass(t.header).addClass(t.activeHeader),this.headers.addClass("ui-accordion-icons"))},_destroyIcons:function(){this.headers.removeClass("ui-accordion-icons").children(".ui-accordion-header-icon").remove()},_destroy:function(){var e;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role"),this.headers.removeClass("ui-accordion-header ui-accordion-header-active ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-expanded").removeAttr("aria-selected").removeAttr("aria-controls").removeAttr("tabIndex").removeUniqueId(),this._destroyIcons(),e=this.headers.next().removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-state-disabled").css("display","").removeAttr("role").removeAttr("aria-hidden").removeAttr("aria-labelledby").removeUniqueId(),"content"!==this.options.heightStyle&&e.css("height","")},_setOption:function(e,t){return"active"===e?(this._activate(t),void 0):("event"===e&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(t)),this._super(e,t),"collapsible"!==e||t||this.options.active!==!1||this._activate(0),"icons"===e&&(this._destroyIcons(),t&&this._createIcons()),"disabled"===e&&(this.element.toggleClass("ui-state-disabled",!!t).attr("aria-disabled",t),this.headers.add(this.headers.next()).toggleClass("ui-state-disabled",!!t)),void 0)},_keydown:function(t){if(!t.altKey&&!t.ctrlKey){var i=e.ui.keyCode,s=this.headers.length,n=this.headers.index(t.target),a=!1;switch(t.keyCode){case i.RIGHT:case i.DOWN:a=this.headers[(n+1)%s];break;case i.LEFT:case i.UP:a=this.headers[(n-1+s)%s];break;case i.SPACE:case i.ENTER:this._eventHandler(t);break;case i.HOME:a=this.headers[0];break;case i.END:a=this.headers[s-1]}a&&(e(t.target).attr("tabIndex",-1),e(a).attr("tabIndex",0),a.focus(),t.preventDefault())}},_panelKeyDown:function(t){t.keyCode===e.ui.keyCode.UP&&t.ctrlKey&&e(t.currentTarget).prev().focus()},refresh:function(){var t=this.options;this._processPanels(),t.active===!1&&t.collapsible===!0||!this.headers.length?(t.active=!1,this.active=e()):t.active===!1?this._activate(0):this.active.length&&!e.contains(this.element[0],this.active[0])?this.headers.length===this.headers.find(".ui-state-disabled").length?(t.active=!1,this.active=e()):this._activate(Math.max(0,t.active-1)):t.active=this.headers.index(this.active),this._destroyIcons(),this._refresh()},_processPanels:function(){var e=this.headers,t=this.panels;this.headers=this.element.find(this.options.header).addClass("ui-accordion-header ui-state-default ui-corner-all"),this.panels=this.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom").filter(":not(.ui-accordion-content-active)").hide(),t&&(this._off(e.not(this.headers)),this._off(t.not(this.panels)))},_refresh:function(){var t,i=this.options,s=i.heightStyle,n=this.element.parent();this.active=this._findActive(i.active).addClass("ui-accordion-header-active ui-state-active ui-corner-top").removeClass("ui-corner-all"),this.active.next().addClass("ui-accordion-content-active").show(),this.headers.attr("role","tab").each(function(){var t=e(this),i=t.uniqueId().attr("id"),s=t.next(),n=s.uniqueId().attr("id");t.attr("aria-controls",n),s.attr("aria-labelledby",i)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}).next().attr({"aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}).next().attr({"aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._createIcons(),this._setupEvents(i.event),"fill"===s?(t=n.height(),this.element.siblings(":visible").each(function(){var i=e(this),s=i.css("position");"absolute"!==s&&"fixed"!==s&&(t-=i.outerHeight(!0))}),this.headers.each(function(){t-=e(this).outerHeight(!0)}),this.headers.next().each(function(){e(this).height(Math.max(0,t-e(this).innerHeight()+e(this).height()))}).css("overflow","auto")):"auto"===s&&(t=0,this.headers.next().each(function(){t=Math.max(t,e(this).css("height","").height())}).height(t))},_activate:function(t){var i=this._findActive(t)[0];i!==this.active[0]&&(i=i||this.active[0],this._eventHandler({target:i,currentTarget:i,preventDefault:e.noop}))},_findActive:function(t){return"number"==typeof t?this.headers.eq(t):e()},_setupEvents:function(t){var i={keydown:"_keydown"};t&&e.each(t.split(" "),function(e,t){i[t]="_eventHandler"}),this._off(this.headers.add(this.headers.next())),this._on(this.headers,i),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._hoverable(this.headers),this._focusable(this.headers)},_eventHandler:function(t){var i=this.options,s=this.active,n=e(t.currentTarget),a=n[0]===s[0],o=a&&i.collapsible,r=o?e():n.next(),h=s.next(),l={oldHeader:s,oldPanel:h,newHeader:o?e():n,newPanel:r};t.preventDefault(),a&&!i.collapsible||this._trigger("beforeActivate",t,l)===!1||(i.active=o?!1:this.headers.index(n),this.active=a?e():n,this._toggle(l),s.removeClass("ui-accordion-header-active ui-state-active"),i.icons&&s.children(".ui-accordion-header-icon").removeClass(i.icons.activeHeader).addClass(i.icons.header),a||(n.removeClass("ui-corner-all").addClass("ui-accordion-header-active ui-state-active ui-corner-top"),i.icons&&n.children(".ui-accordion-header-icon").removeClass(i.icons.header).addClass(i.icons.activeHeader),n.next().addClass("ui-accordion-content-active")))},_toggle:function(t){var i=t.newPanel,s=this.prevShow.length?this.prevShow:t.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=i,this.prevHide=s,this.options.animate?this._animate(i,s,t):(s.hide(),i.show(),this._toggleComplete(t)),s.attr({"aria-hidden":"true"}),s.prev().attr({"aria-selected":"false","aria-expanded":"false"}),i.length&&s.length?s.prev().attr({tabIndex:-1,"aria-expanded":"false"}):i.length&&this.headers.filter(function(){return 0===parseInt(e(this).attr("tabIndex"),10)}).attr("tabIndex",-1),i.attr("aria-hidden","false").prev().attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_animate:function(e,t,i){var s,n,a,o=this,r=0,h=e.css("box-sizing"),l=e.length&&(!t.length||e.index()",delay:300,options:{icons:{submenu:"ui-icon-carat-1-e"},items:"> *",menus:"ul",position:{my:"left-1 top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.element.uniqueId().addClass("ui-menu ui-widget ui-widget-content").toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length).attr({role:this.options.role,tabIndex:0}),this.options.disabled&&this.element.addClass("ui-state-disabled").attr("aria-disabled","true"),this._on({"mousedown .ui-menu-item":function(e){e.preventDefault()},"click .ui-menu-item":function(t){var i=e(t.target);!this.mouseHandled&&i.not(".ui-state-disabled").length&&(this.select(t),t.isPropagationStopped()||(this.mouseHandled=!0),i.has(".ui-menu").length?this.expand(t):!this.element.is(":focus")&&e(this.document[0].activeElement).closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(t){if(!this.previousFilter){var i=e(t.currentTarget);
+i.siblings(".ui-state-active").removeClass("ui-state-active"),this.focus(t,i)}},mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(e,t){var i=this.active||this.element.find(this.options.items).eq(0);t||this.focus(e,i)},blur:function(t){this._delay(function(){e.contains(this.element[0],this.document[0].activeElement)||this.collapseAll(t)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(e){this._closeOnDocumentClick(e)&&this.collapseAll(e),this.mouseHandled=!1}})},_destroy:function(){this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeClass("ui-menu ui-widget ui-widget-content ui-menu-icons ui-front").removeAttr("role").removeAttr("tabIndex").removeAttr("aria-labelledby").removeAttr("aria-expanded").removeAttr("aria-hidden").removeAttr("aria-disabled").removeUniqueId().show(),this.element.find(".ui-menu-item").removeClass("ui-menu-item").removeAttr("role").removeAttr("aria-disabled").removeUniqueId().removeClass("ui-state-hover").removeAttr("tabIndex").removeAttr("role").removeAttr("aria-haspopup").children().each(function(){var t=e(this);t.data("ui-menu-submenu-carat")&&t.remove()}),this.element.find(".ui-menu-divider").removeClass("ui-menu-divider ui-widget-content")},_keydown:function(t){var i,s,n,a,o=!0;switch(t.keyCode){case e.ui.keyCode.PAGE_UP:this.previousPage(t);break;case e.ui.keyCode.PAGE_DOWN:this.nextPage(t);break;case e.ui.keyCode.HOME:this._move("first","first",t);break;case e.ui.keyCode.END:this._move("last","last",t);break;case e.ui.keyCode.UP:this.previous(t);break;case e.ui.keyCode.DOWN:this.next(t);break;case e.ui.keyCode.LEFT:this.collapse(t);break;case e.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(t);break;case e.ui.keyCode.ENTER:case e.ui.keyCode.SPACE:this._activate(t);break;case e.ui.keyCode.ESCAPE:this.collapse(t);break;default:o=!1,s=this.previousFilter||"",n=String.fromCharCode(t.keyCode),a=!1,clearTimeout(this.filterTimer),n===s?a=!0:n=s+n,i=this._filterMenuItems(n),i=a&&-1!==i.index(this.active.next())?this.active.nextAll(".ui-menu-item"):i,i.length||(n=String.fromCharCode(t.keyCode),i=this._filterMenuItems(n)),i.length?(this.focus(t,i),this.previousFilter=n,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter}o&&t.preventDefault()},_activate:function(e){this.active.is(".ui-state-disabled")||(this.active.is("[aria-haspopup='true']")?this.expand(e):this.select(e))},refresh:function(){var t,i,s=this,n=this.options.icons.submenu,a=this.element.find(this.options.menus);this.element.toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length),a.filter(":not(.ui-menu)").addClass("ui-menu ui-widget ui-widget-content ui-front").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var t=e(this),i=t.parent(),s=e("").addClass("ui-menu-icon ui-icon "+n).data("ui-menu-submenu-carat",!0);i.attr("aria-haspopup","true").prepend(s),t.attr("aria-labelledby",i.attr("id"))}),t=a.add(this.element),i=t.find(this.options.items),i.not(".ui-menu-item").each(function(){var t=e(this);s._isDivider(t)&&t.addClass("ui-widget-content ui-menu-divider")}),i.not(".ui-menu-item, .ui-menu-divider").addClass("ui-menu-item").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),i.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!e.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(e,t){"icons"===e&&this.element.find(".ui-menu-icon").removeClass(this.options.icons.submenu).addClass(t.submenu),"disabled"===e&&this.element.toggleClass("ui-state-disabled",!!t).attr("aria-disabled",t),this._super(e,t)},focus:function(e,t){var i,s;this.blur(e,e&&"focus"===e.type),this._scrollIntoView(t),this.active=t.first(),s=this.active.addClass("ui-state-focus").removeClass("ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",s.attr("id")),this.active.parent().closest(".ui-menu-item").addClass("ui-state-active"),e&&"keydown"===e.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),i=t.children(".ui-menu"),i.length&&e&&/^mouse/.test(e.type)&&this._startOpening(i),this.activeMenu=t.parent(),this._trigger("focus",e,{item:t})},_scrollIntoView:function(t){var i,s,n,a,o,r;this._hasScroll()&&(i=parseFloat(e.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(e.css(this.activeMenu[0],"paddingTop"))||0,n=t.offset().top-this.activeMenu.offset().top-i-s,a=this.activeMenu.scrollTop(),o=this.activeMenu.height(),r=t.outerHeight(),0>n?this.activeMenu.scrollTop(a+n):n+r>o&&this.activeMenu.scrollTop(a+n-o+r))},blur:function(e,t){t||clearTimeout(this.timer),this.active&&(this.active.removeClass("ui-state-focus"),this.active=null,this._trigger("blur",e,{item:this.active}))},_startOpening:function(e){clearTimeout(this.timer),"true"===e.attr("aria-hidden")&&(this.timer=this._delay(function(){this._close(),this._open(e)},this.delay))},_open:function(t){var i=e.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(t.parents(".ui-menu")).hide().attr("aria-hidden","true"),t.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(i)},collapseAll:function(t,i){clearTimeout(this.timer),this.timer=this._delay(function(){var s=i?this.element:e(t&&t.target).closest(this.element.find(".ui-menu"));s.length||(s=this.element),this._close(s),this.blur(t),this.activeMenu=s},this.delay)},_close:function(e){e||(e=this.active?this.active.parent():this.element),e.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false").end().find(".ui-state-active").not(".ui-state-focus").removeClass("ui-state-active")},_closeOnDocumentClick:function(t){return!e(t.target).closest(".ui-menu").length},_isDivider:function(e){return!/[^\-\u2014\u2013\s]/.test(e.text())},collapse:function(e){var t=this.active&&this.active.parent().closest(".ui-menu-item",this.element);t&&t.length&&(this._close(),this.focus(e,t))},expand:function(e){var t=this.active&&this.active.children(".ui-menu ").find(this.options.items).first();t&&t.length&&(this._open(t.parent()),this._delay(function(){this.focus(e,t)}))},next:function(e){this._move("next","first",e)},previous:function(e){this._move("prev","last",e)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_move:function(e,t,i){var s;this.active&&(s="first"===e||"last"===e?this.active["first"===e?"prevAll":"nextAll"](".ui-menu-item").eq(-1):this.active[e+"All"](".ui-menu-item").eq(0)),s&&s.length&&this.active||(s=this.activeMenu.find(this.options.items)[t]()),this.focus(i,s)},nextPage:function(t){var i,s,n;return this.active?(this.isLastItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.nextAll(".ui-menu-item").each(function(){return i=e(this),0>i.offset().top-s-n}),this.focus(t,i)):this.focus(t,this.activeMenu.find(this.options.items)[this.active?"last":"first"]())),void 0):(this.next(t),void 0)},previousPage:function(t){var i,s,n;return this.active?(this.isFirstItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.prevAll(".ui-menu-item").each(function(){return i=e(this),i.offset().top-s+n>0}),this.focus(t,i)):this.focus(t,this.activeMenu.find(this.options.items).first())),void 0):(this.next(t),void 0)},_hasScroll:function(){return this.element.outerHeight()",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,_create:function(){var t,i,s,n=this.element[0].nodeName.toLowerCase(),a="textarea"===n,o="input"===n;this.isMultiLine=a?!0:o?!1:this.element.prop("isContentEditable"),this.valueMethod=this.element[a||o?"val":"text"],this.isNewMenu=!0,this.element.addClass("ui-autocomplete-input").attr("autocomplete","off"),this._on(this.element,{keydown:function(n){if(this.element.prop("readOnly"))return t=!0,s=!0,i=!0,void 0;t=!1,s=!1,i=!1;var a=e.ui.keyCode;switch(n.keyCode){case a.PAGE_UP:t=!0,this._move("previousPage",n);break;case a.PAGE_DOWN:t=!0,this._move("nextPage",n);break;case a.UP:t=!0,this._keyEvent("previous",n);break;case a.DOWN:t=!0,this._keyEvent("next",n);break;case a.ENTER:this.menu.active&&(t=!0,n.preventDefault(),this.menu.select(n));break;case a.TAB:this.menu.active&&this.menu.select(n);break;case a.ESCAPE:this.menu.element.is(":visible")&&(this.isMultiLine||this._value(this.term),this.close(n),n.preventDefault());break;default:i=!0,this._searchTimeout(n)}},keypress:function(s){if(t)return t=!1,(!this.isMultiLine||this.menu.element.is(":visible"))&&s.preventDefault(),void 0;if(!i){var n=e.ui.keyCode;switch(s.keyCode){case n.PAGE_UP:this._move("previousPage",s);break;case n.PAGE_DOWN:this._move("nextPage",s);break;case n.UP:this._keyEvent("previous",s);break;case n.DOWN:this._keyEvent("next",s)}}},input:function(e){return s?(s=!1,e.preventDefault(),void 0):(this._searchTimeout(e),void 0)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(e){return this.cancelBlur?(delete this.cancelBlur,void 0):(clearTimeout(this.searching),this.close(e),this._change(e),void 0)}}),this._initSource(),this.menu=e("
- ").addClass("ui-autocomplete ui-front").appendTo(this._appendTo()).menu({role:null}).hide().menu("instance"),this._on(this.menu.element,{mousedown:function(t){t.preventDefault(),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur});var i=this.menu.element[0];e(t.target).closest(".ui-menu-item").length||this._delay(function(){var t=this;this.document.one("mousedown",function(s){s.target===t.element[0]||s.target===i||e.contains(i,s.target)||t.close()})})},menufocus:function(t,i){var s,n;return this.isNewMenu&&(this.isNewMenu=!1,t.originalEvent&&/^mouse/.test(t.originalEvent.type))?(this.menu.blur(),this.document.one("mousemove",function(){e(t.target).trigger(t.originalEvent)}),void 0):(n=i.item.data("ui-autocomplete-item"),!1!==this._trigger("focus",t,{item:n})&&t.originalEvent&&/^key/.test(t.originalEvent.type)&&this._value(n.value),s=i.item.attr("aria-label")||n.value,s&&e.trim(s).length&&(this.liveRegion.children().hide(),e("
").text(s).appendTo(this.liveRegion)),void 0)},menuselect:function(e,t){var i=t.item.data("ui-autocomplete-item"),s=this.previous;this.element[0]!==this.document[0].activeElement&&(this.element.focus(),this.previous=s,this._delay(function(){this.previous=s,this.selectedItem=i})),!1!==this._trigger("select",e,{item:i})&&this._value(i.value),this.term=this._value(),this.close(e),this.selectedItem=i}}),this.liveRegion=e("",{role:"status","aria-live":"assertive","aria-relevant":"additions"}).addClass("ui-helper-hidden-accessible").appendTo(this.document[0].body),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(e,t){this._super(e,t),"source"===e&&this._initSource(),"appendTo"===e&&this.menu.element.appendTo(this._appendTo()),"disabled"===e&&t&&this.xhr&&this.xhr.abort()},_appendTo:function(){var t=this.options.appendTo;return t&&(t=t.jquery||t.nodeType?e(t):this.document.find(t).eq(0)),t&&t[0]||(t=this.element.closest(".ui-front")),t.length||(t=this.document[0].body),t},_initSource:function(){var t,i,s=this;e.isArray(this.options.source)?(t=this.options.source,this.source=function(i,s){s(e.ui.autocomplete.filter(t,i.term))}):"string"==typeof this.options.source?(i=this.options.source,this.source=function(t,n){s.xhr&&s.xhr.abort(),s.xhr=e.ajax({url:i,data:t,dataType:"json",success:function(e){n(e)},error:function(){n([])}})}):this.source=this.options.source},_searchTimeout:function(e){clearTimeout(this.searching),this.searching=this._delay(function(){var t=this.term===this._value(),i=this.menu.element.is(":visible"),s=e.altKey||e.ctrlKey||e.metaKey||e.shiftKey;(!t||t&&!i&&!s)&&(this.selectedItem=null,this.search(null,e))},this.options.delay)},search:function(e,t){return e=null!=e?e:this._value(),this.term=this._value(),e.length").text(i.label).appendTo(t)},_move:function(e,t){return this.menu.element.is(":visible")?this.menu.isFirstItem()&&/^previous/.test(e)||this.menu.isLastItem()&&/^next/.test(e)?(this.isMultiLine||this._value(this.term),this.menu.blur(),void 0):(this.menu[e](t),void 0):(this.search(null,t),void 0)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(e,t){(!this.isMultiLine||this.menu.element.is(":visible"))&&(this._move(e,t),t.preventDefault())}}),e.extend(e.ui.autocomplete,{escapeRegex:function(e){return e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(t,i){var s=RegExp(e.ui.autocomplete.escapeRegex(i),"i");return e.grep(t,function(e){return s.test(e.label||e.value||e)})}}),e.widget("ui.autocomplete",e.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(e){return e+(e>1?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(t){var i;this._superApply(arguments),this.options.disabled||this.cancelSearch||(i=t&&t.length?this.options.messages.results(t.length):this.options.messages.noResults,this.liveRegion.children().hide(),e("
").text(i).appendTo(this.liveRegion))}}),e.ui.autocomplete;var c,p="ui-button ui-widget ui-state-default ui-corner-all",f="ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",m=function(){var t=e(this);setTimeout(function(){t.find(":ui-button").button("refresh")},1)},g=function(t){var i=t.name,s=t.form,n=e([]);return i&&(i=i.replace(/'/g,"\\'"),n=s?e(s).find("[name='"+i+"'][type=radio]"):e("[name='"+i+"'][type=radio]",t.ownerDocument).filter(function(){return!this.form})),n};e.widget("ui.button",{version:"1.11.4",defaultElement:"