Skip to content

Commit

Permalink
update/fix some expFile image functions and elFinder and expCSS comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@dleffler
dleffler committed Dec 13, 2016
1 parent d6b9a2d commit 4aae8d0
Show file tree
Hide file tree
Showing 4 changed files with 187 additions and 151 deletions.
7 changes: 5 additions & 2 deletions framework/core/subsystems/expCSS.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,15 +245,18 @@ public static function parseCSSFiles() {
public static function themeCSS() {
global $css_theme, $head_config, $less_vars;

// // code for testing scss compiler
// if (!isset($less_vars['menu_width']))
// $less_vars['menu_width'] = 769;
// $less_vars['menu_width'] = 769; // compiler will crash without expected variables assigned
// if (!isset($less_vars['swatch']))
// $less_vars['swatch'] = '';
// $less_vars['swatch'] = ''; // compiler will crash without expected variables assigned
// self::auto_compile_scss('external/bootstrap3/scss/test_2.scss', 'tmp/css/test.css', $less_vars); //FIXME test
// self::auto_compile_scss('external/bootstrap3/scss/bootstrap.scss', 'tmp/css/testbs3.css', $less_vars); //FIXME test
// self::auto_compile_scss('external/bootstrap3/scss/newui.scss', 'tmp/css/testbs3_newui.css', $less_vars); //FIXME test
// self::auto_compile_scss('external/bootstrap3/scss/newui_1.scss', 'tmp/css/testbs3_newui_1.css', $less_vars); //FIXME test
// self::auto_compile_scss('external/font-awesome4/scss/font-awesome.scss', 'tmp/css/testfa4.css', $less_vars); //FIXME test
// if (($less_vars['swatch'] == 'custom'))
// $less_vars['swatch'] = ''; // there is no 'custom' swatch for bootstrap 4 (yet?)
// self::auto_compile_scss('external/bootstrap4/scss/bootstrap.scss', 'tmp/css/testbs4.css', $less_vars); //FIXME test
// self::auto_compile_scss('external/bootstrap4/scss/newui.scss', 'tmp/css/testbs4_newui.css', $less_vars); //FIXME test
// self::auto_compile_scss('external/bootstrap4/scss/newui_1.scss', 'tmp/css/testbs4_newui_1.css', $less_vars); //FIXME test
Expand Down
268 changes: 134 additions & 134 deletions framework/modules/file/connector/elFinderVolumeExponent.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -465,146 +465,146 @@ protected function _save($fp, $dir, $name, $stat)
*
* @return void
**/
protected function _checkArchivers() {
$this->archivers = $this->getArchivers();
return;
}
// protected function _checkArchivers() {
// $this->archivers = $this->getArchivers();
// return;
// }

/**
* Get server side available archivers NOTE: only inserted to fix 7za command line switches
*
* @param bool $use_cache
* @return array
*/
protected function getArchivers($use_cache = true) {

$arcs = array(
'create' => array(),
'extract' => array()
);

if (!function_exists('proc_open')) {
return $arcs;
}

if ($use_cache && isset($_SESSION['ELFINDER_ARCHIVERS_CACHE']) && is_array($_SESSION['ELFINDER_ARCHIVERS_CACHE'])) {
return $_SESSION['ELFINDER_ARCHIVERS_CACHE'];
}

$this->procExec('tar --version', $o, $ctar);

if ($ctar == 0) {
$arcs['create']['application/x-tar'] = array('cmd' => 'tar', 'argc' => '-cf', 'ext' => 'tar');
$arcs['extract']['application/x-tar'] = array('cmd' => 'tar', 'argc' => '-xf', 'ext' => 'tar');
unset($o);
$test = $this->procExec('gzip --version', $o, $c);

if ($c == 0) {
$arcs['create']['application/x-gzip'] = array('cmd' => 'tar', 'argc' => '-czf', 'ext' => 'tgz');
$arcs['extract']['application/x-gzip'] = array('cmd' => 'tar', 'argc' => '-xzf', 'ext' => 'tgz');
}
unset($o);
$test = $this->procExec('bzip2 --version', $o, $c);
if ($c == 0) {
$arcs['create']['application/x-bzip2'] = array('cmd' => 'tar', 'argc' => '-cjf', 'ext' => 'tbz');
$arcs['extract']['application/x-bzip2'] = array('cmd' => 'tar', 'argc' => '-xjf', 'ext' => 'tbz');
}
}
unset($o);
$this->procExec('zip -v', $o, $c);
if ($c == 0) {
$arcs['create']['application/zip'] = array('cmd' => 'zip', 'argc' => '-r9', 'ext' => 'zip');
}
unset($o);
$this->procExec('unzip --help', $o, $c);
if ($c == 0) {
$arcs['extract']['application/zip'] = array('cmd' => 'unzip', 'argc' => '', 'ext' => 'zip');
}
unset($o);
$this->procExec('rar --version', $o, $c);
if ($c == 0 || $c == 7) {
$arcs['create']['application/x-rar'] = array('cmd' => 'rar', 'argc' => 'a -inul', 'ext' => 'rar');
$arcs['extract']['application/x-rar'] = array('cmd' => 'rar', 'argc' => 'x -y', 'ext' => 'rar');
} else {
unset($o);
$test = $this->procExec('unrar', $o, $c);
if ($c==0 || $c == 7) {
$arcs['extract']['application/x-rar'] = array('cmd' => 'unrar', 'argc' => 'x -y', 'ext' => 'rar');
}
}
unset($o);
$this->procExec('7za --help', $o, $c);
if ($c == 0) {
$arcs['create']['application/x-7z-compressed'] = array('cmd' => '7za', 'argc' => 'a', 'ext' => '7z');
$arcs['extract']['application/x-7z-compressed'] = array('cmd' => '7za', 'argc' => 'e -y', 'ext' => '7z');

if (empty($arcs['create']['application/x-gzip'])) {
$arcs['create']['application/x-gzip'] = array('cmd' => '7za', 'argc' => 'a -tgzip', 'ext' => 'tar.gz');
}
if (empty($arcs['extract']['application/x-gzip'])) {
$arcs['extract']['application/x-gzip'] = array('cmd' => '7za', 'argc' => 'e -tgzip -y', 'ext' => 'tar.gz');
}
if (empty($arcs['create']['application/x-bzip2'])) {
$arcs['create']['application/x-bzip2'] = array('cmd' => '7za', 'argc' => 'a -tbzip2', 'ext' => 'tar.bz');
}
if (empty($arcs['extract']['application/x-bzip2'])) {
$arcs['extract']['application/x-bzip2'] = array('cmd' => '7za', 'argc' => 'a -tbzip2 -y', 'ext' => 'tar.bz');
}
if (empty($arcs['create']['application/zip'])) {
$arcs['create']['application/zip'] = array('cmd' => '7za', 'argc' => 'a -tzip', 'ext' => 'zip');
}
if (empty($arcs['extract']['application/zip'])) {
$arcs['extract']['application/zip'] = array('cmd' => '7za', 'argc' => 'e -tzip -y', 'ext' => 'zip');
}
if (empty($arcs['create']['application/x-tar'])) {
$arcs['create']['application/x-tar'] = array('cmd' => '7za', 'argc' => 'a -ttar', 'ext' => 'tar');
}
if (empty($arcs['extract']['application/x-tar'])) {
$arcs['extract']['application/x-tar'] = array('cmd' => '7za', 'argc' => 'e -ttar -y', 'ext' => 'tar');
}
} else if (substr(PHP_OS,0,3) === 'WIN') {
// check `7z` for Windows server.
unset($o);
$this->procExec('7z', $o, $c);
if ($c == 0) {
$arcs['create']['application/x-7z-compressed'] = array('cmd' => '7z', 'argc' => 'a -mx0', 'ext' => '7z');
$arcs['extract']['application/x-7z-compressed'] = array('cmd' => '7z', 'argc' => 'x -y', 'ext' => '7z');

if (empty($arcs['create']['application/x-gzip'])) {
$arcs['create']['application/x-gzip'] = array('cmd' => '7z', 'argc' => 'a -tgzip -mx0', 'ext' => 'tar.gz');
}
if (empty($arcs['extract']['application/x-gzip'])) {
$arcs['extract']['application/x-gzip'] = array('cmd' => '7z', 'argc' => 'x -tgzip -y', 'ext' => 'tar.gz');
}
if (empty($arcs['create']['application/x-bzip2'])) {
$arcs['create']['application/x-bzip2'] = array('cmd' => '7z', 'argc' => 'a -tbzip2 -mx0', 'ext' => 'tar.bz');
}
if (empty($arcs['extract']['application/x-bzip2'])) {
$arcs['extract']['application/x-bzip2'] = array('cmd' => '7z', 'argc' => 'x -tbzip2 -y', 'ext' => 'tar.bz');
}
if (empty($arcs['create']['application/zip'])) {
$arcs['create']['application/zip'] = array('cmd' => '7z', 'argc' => 'a -tzip -mx0', 'ext' => 'zip');
}
if (empty($arcs['extract']['application/zip'])) {
$arcs['extract']['application/zip'] = array('cmd' => '7z', 'argc' => 'x -tzip -y', 'ext' => 'zip');
}
if (empty($arcs['create']['application/x-tar'])) {
$arcs['create']['application/x-tar'] = array('cmd' => '7z', 'argc' => 'a -ttar -mx0', 'ext' => 'tar');
}
if (empty($arcs['extract']['application/x-tar'])) {
$arcs['extract']['application/x-tar'] = array('cmd' => '7z', 'argc' => 'x -ttar -y', 'ext' => 'tar');
}
if (empty($arcs['create']['application/x-rar'])) {
$arcs['create']['application/x-rar'] = array('cmd' => '7z', 'argc' => 'a -trar -mx0', 'ext' => 'rar');
}
if (empty($arcs['extract']['application/x-rar'])) {
$arcs['extract']['application/x-rar'] = array('cmd' => '7z', 'argc' => 'x -trar -y', 'ext' => 'rar');
}
}
}

$_SESSION['ELFINDER_ARCHIVERS_CACHE'] = $arcs;
return $arcs;
}
// protected function getArchivers($use_cache = true) {
//
// $arcs = array(
// 'create' => array(),
// 'extract' => array()
// );
//
// if (!function_exists('proc_open')) {
// return $arcs;
// }
//
// if ($use_cache && isset($_SESSION['ELFINDER_ARCHIVERS_CACHE']) && is_array($_SESSION['ELFINDER_ARCHIVERS_CACHE'])) {
// return $_SESSION['ELFINDER_ARCHIVERS_CACHE'];
// }
//
// $this->procExec('tar --version', $o, $ctar);
//
// if ($ctar == 0) {
// $arcs['create']['application/x-tar'] = array('cmd' => 'tar', 'argc' => '-cf', 'ext' => 'tar');
// $arcs['extract']['application/x-tar'] = array('cmd' => 'tar', 'argc' => '-xf', 'ext' => 'tar');
// unset($o);
// $test = $this->procExec('gzip --version', $o, $c);
//
// if ($c == 0) {
// $arcs['create']['application/x-gzip'] = array('cmd' => 'tar', 'argc' => '-czf', 'ext' => 'tgz');
// $arcs['extract']['application/x-gzip'] = array('cmd' => 'tar', 'argc' => '-xzf', 'ext' => 'tgz');
// }
// unset($o);
// $test = $this->procExec('bzip2 --version', $o, $c);
// if ($c == 0) {
// $arcs['create']['application/x-bzip2'] = array('cmd' => 'tar', 'argc' => '-cjf', 'ext' => 'tbz');
// $arcs['extract']['application/x-bzip2'] = array('cmd' => 'tar', 'argc' => '-xjf', 'ext' => 'tbz');
// }
// }
// unset($o);
// $this->procExec('zip -v', $o, $c);
// if ($c == 0) {
// $arcs['create']['application/zip'] = array('cmd' => 'zip', 'argc' => '-r9', 'ext' => 'zip');
// }
// unset($o);
// $this->procExec('unzip --help', $o, $c);
// if ($c == 0) {
// $arcs['extract']['application/zip'] = array('cmd' => 'unzip', 'argc' => '', 'ext' => 'zip');
// }
// unset($o);
// $this->procExec('rar --version', $o, $c);
// if ($c == 0 || $c == 7) {
// $arcs['create']['application/x-rar'] = array('cmd' => 'rar', 'argc' => 'a -inul', 'ext' => 'rar');
// $arcs['extract']['application/x-rar'] = array('cmd' => 'rar', 'argc' => 'x -y', 'ext' => 'rar');
// } else {
// unset($o);
// $test = $this->procExec('unrar', $o, $c);
// if ($c==0 || $c == 7) {
// $arcs['extract']['application/x-rar'] = array('cmd' => 'unrar', 'argc' => 'x -y', 'ext' => 'rar');
// }
// }
// unset($o);
// $this->procExec('7za --help', $o, $c);
// if ($c == 0) {
// $arcs['create']['application/x-7z-compressed'] = array('cmd' => '7za', 'argc' => 'a', 'ext' => '7z');
// $arcs['extract']['application/x-7z-compressed'] = array('cmd' => '7za', 'argc' => 'e -y', 'ext' => '7z');
//
// if (empty($arcs['create']['application/x-gzip'])) {
// $arcs['create']['application/x-gzip'] = array('cmd' => '7za', 'argc' => 'a -tgzip', 'ext' => 'tar.gz');
// }
// if (empty($arcs['extract']['application/x-gzip'])) {
// $arcs['extract']['application/x-gzip'] = array('cmd' => '7za', 'argc' => 'e -tgzip -y', 'ext' => 'tar.gz');
// }
// if (empty($arcs['create']['application/x-bzip2'])) {
// $arcs['create']['application/x-bzip2'] = array('cmd' => '7za', 'argc' => 'a -tbzip2', 'ext' => 'tar.bz');
// }
// if (empty($arcs['extract']['application/x-bzip2'])) {
// $arcs['extract']['application/x-bzip2'] = array('cmd' => '7za', 'argc' => 'a -tbzip2 -y', 'ext' => 'tar.bz');
// }
// if (empty($arcs['create']['application/zip'])) {
// $arcs['create']['application/zip'] = array('cmd' => '7za', 'argc' => 'a -tzip', 'ext' => 'zip');
// }
// if (empty($arcs['extract']['application/zip'])) {
// $arcs['extract']['application/zip'] = array('cmd' => '7za', 'argc' => 'e -tzip -y', 'ext' => 'zip');
// }
// if (empty($arcs['create']['application/x-tar'])) {
// $arcs['create']['application/x-tar'] = array('cmd' => '7za', 'argc' => 'a -ttar', 'ext' => 'tar');
// }
// if (empty($arcs['extract']['application/x-tar'])) {
// $arcs['extract']['application/x-tar'] = array('cmd' => '7za', 'argc' => 'e -ttar -y', 'ext' => 'tar');
// }
// } else if (substr(PHP_OS,0,3) === 'WIN') {
// // check `7z` for Windows server.
// unset($o);
// $this->procExec('7z', $o, $c);
// if ($c == 0) {
// $arcs['create']['application/x-7z-compressed'] = array('cmd' => '7z', 'argc' => 'a -mx0', 'ext' => '7z');
// $arcs['extract']['application/x-7z-compressed'] = array('cmd' => '7z', 'argc' => 'x -y', 'ext' => '7z');
//
// if (empty($arcs['create']['application/x-gzip'])) {
// $arcs['create']['application/x-gzip'] = array('cmd' => '7z', 'argc' => 'a -tgzip -mx0', 'ext' => 'tar.gz');
// }
// if (empty($arcs['extract']['application/x-gzip'])) {
// $arcs['extract']['application/x-gzip'] = array('cmd' => '7z', 'argc' => 'x -tgzip -y', 'ext' => 'tar.gz');
// }
// if (empty($arcs['create']['application/x-bzip2'])) {
// $arcs['create']['application/x-bzip2'] = array('cmd' => '7z', 'argc' => 'a -tbzip2 -mx0', 'ext' => 'tar.bz');
// }
// if (empty($arcs['extract']['application/x-bzip2'])) {
// $arcs['extract']['application/x-bzip2'] = array('cmd' => '7z', 'argc' => 'x -tbzip2 -y', 'ext' => 'tar.bz');
// }
// if (empty($arcs['create']['application/zip'])) {
// $arcs['create']['application/zip'] = array('cmd' => '7z', 'argc' => 'a -tzip -mx0', 'ext' => 'zip');
// }
// if (empty($arcs['extract']['application/zip'])) {
// $arcs['extract']['application/zip'] = array('cmd' => '7z', 'argc' => 'x -tzip -y', 'ext' => 'zip');
// }
// if (empty($arcs['create']['application/x-tar'])) {
// $arcs['create']['application/x-tar'] = array('cmd' => '7z', 'argc' => 'a -ttar -mx0', 'ext' => 'tar');
// }
// if (empty($arcs['extract']['application/x-tar'])) {
// $arcs['extract']['application/x-tar'] = array('cmd' => '7z', 'argc' => 'x -ttar -y', 'ext' => 'tar');
// }
// if (empty($arcs['create']['application/x-rar'])) {
// $arcs['create']['application/x-rar'] = array('cmd' => '7z', 'argc' => 'a -trar -mx0', 'ext' => 'rar');
// }
// if (empty($arcs['extract']['application/x-rar'])) {
// $arcs['extract']['application/x-rar'] = array('cmd' => '7z', 'argc' => 'x -trar -y', 'ext' => 'rar');
// }
// }
// }
//
// $_SESSION['ELFINDER_ARCHIVERS_CACHE'] = $arcs;
// return $arcs;
// }

}
4 changes: 2 additions & 2 deletions framework/modules/file/connector/elfinder.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,8 @@ function validName($name)
'locale' => LOCALE . '.' . LANG_CHARSET,
'bind' => array(
// '*' => 'logger',
'mkdir mkfile rename duplicate upload rm paste' => 'logger',
// 'mkdir mkfile rename duplicate upload rm paste' => array($logger, 'log'),
'mkdir mkfile rename duplicate upload rm paste' => 'logger', // use function style logger
// 'mkdir mkfile rename duplicate upload rm paste' => array($logger, 'log'), // use class style logger
// 'upload.pre mkdir.pre mkfile.pre rename.pre archive.pre ls.pre' => array(
// 'Plugin.Normalizer.cmdPreprocess',
// 'Plugin.Sanitizer.cmdPreprocess',
Expand Down

0 comments on commit 4aae8d0

Please sign in to comment.