Skip to content

Component #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Mar 21, 2015
Merged

Component #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a37b12e
component support
helios-ag Mar 4, 2015
238087c
removed xml config
helios-ag Mar 4, 2015
2351018
configuration modification
helios-ag Mar 20, 2015
fe2ed9c
optional path prefix
helios-ag Mar 21, 2015
14401b4
readme tweak
helios-ag Mar 21, 2015
77d7bf3
fixed merge conflict
helios-ag Mar 21, 2015
5c9214b
changelog
helios-ag Mar 21, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.idea
composer.lock
Tests/cache
Tests/log

9 changes: 9 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@ php:
- 5.5
- 5.6
- hhvm
- 7.0

matrix:
allow_failures:
- php:
- 5.6
- hhvm
- 7.0
fast_finish: true

before_script:
- travis_retry composer self-update
Expand Down
417 changes: 417 additions & 0 deletions CHANGELOG.md
View file
Open in desktop

Large diffs are not rendered by default.

90 changes: 63 additions & 27 deletions Configuration/ElFinderConfigurationReader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ public function getConfiguration($instance)
$options = array();
$options['corsSupport'] = $parameters['cors_support'];
$options['debug'] = $parameters['connector']['debug'];
$options['bind'] = $parameters['connector']['bind'];
$options['plugin'] = $parameters['connector']['plugin'];
$options['bind'] = $parameters['connector']['binds'];
$options['plugins'] = $parameters['connector']['plugins'];
$options['roots'] = array();

foreach ($parameters['connector']['roots'] as $parameter) {
Expand All @@ -88,22 +88,42 @@ public function getConfiguration($instance)
$driver = $this->container->has($parameter['driver']) ? $this->container->get($parameter['driver']) : null;

$driverOptions = array(
'driver' => $parameter['driver'],
'service' => $driver,
'glideURL' => $parameter['glide_url'],
'glideKey' => $parameter['glide_key'],
'disabled' => $parameter['disabled_commands'],
'plugin' => $parameter['plugin'],
'alias' => $parameter['alias'],
'path' => $path . $homeFolder, //removed slash for Flysystem compatibility
'URL' => isset($parameter['url']) && $parameter['url']
? strpos($parameter['url'], 'http') === 0
? $parameter['url']
: sprintf('%s://%s%s/%s/%s', $request->getScheme(), $request->getHttpHost(), $request->getBasePath(), $parameter['url'], $homeFolder)
: sprintf('%s://%s%s/%s/%s', $request->getScheme(), $request->getHttpHost(), $request->getBasePath(), $path, $homeFolder),
'uploadAllow' => $parameter['upload_allow'],
'uploadDeny' => $parameter['upload_deny'],
'uploadMaxSize' => $parameter['upload_max_size']
'driver' => $parameter['driver'],
'service' => $driver,
'glideURL' => $parameter['glide_url'],
'glideKey' => $parameter['glide_key'],
'plugin' => $parameter['plugins'],
'path' => $path . $homeFolder, //removed slash for Flysystem compatibility
'startPath' => $parameter['start_path'],
'URL' => $this->getURL($parameter, $request, $homeFolder, $path),
'alias' => $parameter['alias'],
'mimeDetect' => $parameter['mime_detect'],
'mimefile' => $parameter['mimefile'],
'imgLib' => $parameter['img_lib'],
'tmbPath' => $parameter['tmb_path'],
'tmbPathMode' => $parameter['tmb_path_mode'],
'tmbUrl' => $parameter['tmb_url'],
'tmbSize' => $parameter['tmb_size'],
'tmbCrop' => $parameter['tmb_crop'],
'tmbBgColor' => $parameter['tmb_bg_color'],
'copyOverwrite' => $parameter['copy_overwrite'],
'copyJoin' => $parameter['copy_join'],
'copyFrom' => $parameter['copy_from'],
'copyTo' => $parameter['copy_to'],
'uploadOverwrite' => $parameter['upload_overwrite'],
'uploadAllow' => $parameter['upload_allow'],
'uploadDeny' => $parameter['upload_deny'],
'uploadMaxSize' => $parameter['upload_max_size'],
'defaults' => $parameter['defaults'],
'attributes' => $parameter['attributes'],
'acceptedName' => $parameter['accepted_name'],
'disabled' => $parameter['disabled_commands'],
'treeDeep' => $parameter['tree_deep'],
'checkSubfolders' => $parameter['check_subfolders'],
'separator' => $parameter['separator'],
'timeFormat' => $parameter['time_format'],
'archiveMimes' => $parameter['archive_mimes'],
'archivers' => $parameter['archivers']
);
if(!$parameter['show_hidden']) {
$driverOptions['accessControl'] = array($this, 'access');
Expand All @@ -118,6 +138,22 @@ public function getConfiguration($instance)
return $options;
}

/**
* @param $parameter
* @param $request
* @param $homeFolder
* @param $path
* @return string
*/
private function getURL($parameter, $request, $homeFolder, $path)
{
return isset($parameter['url']) && $parameter['url']
? strpos($parameter['url'], 'http') === 0
? $parameter['url']
: sprintf('%s://%s%s/%s/%s', $request->getScheme(), $request->getHttpHost(), $request->getBasePath(), $parameter['url'], $homeFolder)
: sprintf('%s://%s%s/%s/%s', $request->getScheme(), $request->getHttpHost(), $request->getBasePath(), $path, $homeFolder);
}

/**
* @param $opt
* @param $adapter
Expand Down Expand Up @@ -207,18 +243,18 @@ private function configureDriver(array $parameter)
$settings['path'] = $parameter['ftp_settings']['path'];
break;
case "dropbox":
$settings['consumerKey'] = $parameter['dropbox_settings']['consumerKey'];
$settings['consumerSecret'] = $parameter['dropbox_settings']['consumerSecret'];
$settings['accessToken'] = $parameter['dropbox_settings']['accessToken'];
$settings['accessTokenSecret'] = $parameter['dropbox_settings']['accessTokenSecret'];
$settings['dropboxUid'] = $parameter['dropbox_settings']['dropboxUid'];
$settings['metaCachePath'] = $parameter['dropbox_settings']['metaCachePath'];
$settings['consumerKey'] = $parameter['dropbox_settings']['consumer_key'];
$settings['consumerSecret'] = $parameter['dropbox_settings']['consumer_secret'];
$settings['accessToken'] = $parameter['dropbox_settings']['access_token'];
$settings['accessTokenSecret'] = $parameter['dropbox_settings']['access_token_secret'];
$settings['dropboxUid'] = $parameter['dropbox_settings']['dropbox_uid'];
$settings['metaCachePath'] = $parameter['dropbox_settings']['meta_cache_path'];
break;
case "s3":
$settings['accesskey'] = $parameter['s3_settings']['accesskey'];
$settings['secretkey'] = $parameter['s3_settings']['secretkey'];
$settings['accesskey'] = $parameter['s3_settings']['access_key'];
$settings['secretkey'] = $parameter['s3_settings']['secret_key'];
$settings['bucket'] = $parameter['s3_settings']['bucket'];
$settings['tmpPath'] = $parameter['s3_settings']['tmpPath'];
$settings['tmpPath'] = $parameter['s3_settings']['tmp_path'];
break;
default:
break;
Expand Down
57 changes: 38 additions & 19 deletions Controller/ElFinderController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace FM\ElfinderBundle\Controller;

use Exception;
Expand All @@ -11,7 +12,7 @@
* Loader service for Elfinder backend
* displays Elfinder
* @author Al Ganiev <[email protected]>
* @copyright 2012-2014 Al Ganiev
* @copyright 2012-2015 Al Ganiev
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
class ElFinderController extends Controller
Expand All @@ -28,7 +29,8 @@ public function showAction(Request $request, $instance, $homeFolder)
{
$efParameters = $this->container->getParameter('fm_elfinder');
$parameters = $efParameters['instances'][$instance];
$result = $this->selectEditor($parameters, $instance, $homeFolder, $request->get("id"));
$assetsPath = $efParameters['assets_path'];
$result = $this->selectEditor($parameters, $instance, $homeFolder, $assetsPath, $request->get("id"));

return $this->render($result['template'], $result['params']);
}
Expand All @@ -37,18 +39,21 @@ public function showAction(Request $request, $instance, $homeFolder)
* @param array $parameters
* @param string $instance
* @param string $homeFolder
* @param $assetsPath
* @param null $formTypeId
* @return array
* @throws Exception
*/
private function selectEditor($parameters, $instance, $homeFolder, $formTypeId = null)
private function selectEditor($parameters, $instance, $homeFolder, $assetsPath, $formTypeId = null)
{
$editor = $parameters['editor'];
$locale = $parameters['locale'] ?: $this->container->getParameter('locale');
$fullscreen = $parameters['fullscreen'];
$relativePath = $parameters['relative_path'];
$includeAssets = $parameters['include_assets'];
$result = array();
$editor = $parameters['editor'];
$locale = $parameters['locale'] ?: $this->container->getParameter('locale');
$fullScreen = $parameters['fullscreen'];
$relativePath = $parameters['relative_path'];
$pathPrefix = $parameters['path_prefix'];
$includeAssets = $parameters['include_assets'];
$theme = $parameters['theme'];
$result = array();

switch ($editor) {
case 'custom':
Expand All @@ -59,22 +64,27 @@ private function selectEditor($parameters, $instance, $homeFolder, $formTypeId =
$result['template'] = $parameters['editor_template'];
$result['params'] = array(
'locale' => $locale,
'fullscreen' => $fullscreen,
'fullscreen' => $fullScreen,
'includeAssets' => $includeAssets,
'instance' => $instance,
'homeFolder' => $homeFolder,
'relative_path' => $relativePath
'relative_path' => $relativePath,
'prefix' => $assetsPath,
'theme' => $theme
);
return $result;
case 'ckeditor':
$result['template'] = 'FMElfinderBundle:Elfinder:ckeditor.html.twig';
$result['params'] = array(
'locale' => $locale,
'fullscreen' => $fullscreen,
'fullscreen' => $fullScreen,
'includeAssets' => $includeAssets,
'instance' => $instance,
'homeFolder' => $homeFolder,
'relative_path' => $relativePath
'relative_path' => $relativePath,
'prefix' => $assetsPath,
'theme' => $theme,
'pathPrefix' => $pathPrefix
);
return $result;
case 'tinymce':
Expand All @@ -84,7 +94,10 @@ private function selectEditor($parameters, $instance, $homeFolder, $formTypeId =
'tinymce_popup_path' => $this->getAssetsUrl($parameters['tinymce_popup_path']),
'includeAssets' => $includeAssets,
'instance' => $instance,
'homeFolder' => $homeFolder
'homeFolder' => $homeFolder,
'prefix' => $assetsPath,
'theme' => $theme,
'pathPrefix' => $pathPrefix
);
return $result;
case 'tinymce4':
Expand All @@ -94,29 +107,35 @@ private function selectEditor($parameters, $instance, $homeFolder, $formTypeId =
'includeAssets' => $includeAssets,
'instance' => $instance,
'homeFolder' => $homeFolder,
'relative_path' => $relativePath
'relative_path' => $relativePath,
'prefix' => $assetsPath,
'theme' => $theme,
'pathPrefix' => $pathPrefix
);
return $result;
case 'form':
$result['template'] = 'FMElfinderBundle:Elfinder:elfinder_type.html.twig';
$result['params'] = array(
'locale' => $locale,
'fullscreen' => $fullscreen,
'fullscreen' => $fullScreen,
'includeAssets' => $includeAssets,
'instance' => $instance,
'homeFolder' => $homeFolder,
'id' => $formTypeId,
'relative_path' => $relativePath
'relative_path' => $relativePath,
'prefix' => $assetsPath,
'theme' => $theme
);
return $result;
default:
$result['template'] = 'FMElfinderBundle:Elfinder:simple.html.twig';
$result['params'] = array(
'locale' => $locale,
'fullscreen' => $fullscreen,
'fullscreen' => $fullScreen,
'includeAssets' => $includeAssets,
'instance' => $instance,
'homeFolder' => $homeFolder
'homeFolder' => $homeFolder,
'prefix' => $assetsPath
);
return $result;
}
Expand Down
Loading