@@ -464,7 +464,10 @@ |
||
| 464 | 464 | <blockquote> |
| 465 | 465 | <pre> |
| 466 | 466 | <b>UserName</b>;LastName;FirstName;Email;NewUserName;Password;AuthSource;OfficialCode;PhoneNumber;Status;ExpiryDate;Active;Language;Courses;ClassId; |
| 467 | - xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;user/teacher/drh;YYYY-MM-DD 00:00:00;0/1;xxx;<span style="color:red;"><?php if (count($list_reponse) > 0) echo implode(';', $list_reponse).';'; ?></span>xxx1|xxx2|xxx3;1;<br /> |
|
| 467 | + xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;user/teacher/drh;YYYY-MM-DD 00:00:00;0/1;xxx;<span style="color:red;"><?php if (count($list_reponse) > 0) { |
|
| 468 | + echo implode(';', $list_reponse).';'; |
|
| 469 | +} |
|
| 470 | +?></span>xxx1|xxx2|xxx3;1;<br /> |
|
| 468 | 471 | </pre> |
| 469 | 472 | </blockquote> |
| 470 | 473 | <p><?php |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | global $current_tag; |
| 262 | 262 | switch ($data) { |
| 263 | 263 | case 'Contact': |
| 264 | - $user = array (); |
|
| 264 | + $user = array(); |
|
| 265 | 265 | break; |
| 266 | 266 | default: |
| 267 | 267 | $current_tag = $data; |
@@ -356,7 +356,7 @@ discard block |
||
| 356 | 356 | |
| 357 | 357 | if (in_array($ext_import_file, $allowed_file_mimetype)) { |
| 358 | 358 | if (strcmp($file_type, 'csv') === 0 && $ext_import_file == $allowed_file_mimetype[0]) { |
| 359 | - $users = parse_csv_data($_FILES['import_file']['tmp_name']); |
|
| 359 | + $users = parse_csv_data($_FILES['import_file']['tmp_name']); |
|
| 360 | 360 | $errors = validate_data($users); |
| 361 | 361 | $error_kind_file = false; |
| 362 | 362 | } elseif (strcmp($file_type, 'xml') === 0 && $ext_import_file == $allowed_file_mimetype[1]) { |
@@ -38,16 +38,16 @@ discard block |
||
| 38 | 38 | set_error_handler('elFinder::phpErrorHandler', $errLevel); |
| 39 | 39 | |
| 40 | 40 | // convert PATH_INFO to GET query |
| 41 | - if (! empty($_SERVER['PATH_INFO'])) { |
|
| 41 | + if (!empty($_SERVER['PATH_INFO'])) { |
|
| 42 | 42 | $_ps = explode('/', trim($_SERVER['PATH_INFO'], '/')); |
| 43 | - if (! isset($_GET['cmd'])) { |
|
| 43 | + if (!isset($_GET['cmd'])) { |
|
| 44 | 44 | $_cmd = $_ps[0]; |
| 45 | 45 | if (isset($this->commands[$_cmd])) { |
| 46 | 46 | $_GET['cmd'] = $_cmd; |
| 47 | 47 | $_i = 1; |
| 48 | - foreach(array_keys($this->commands[$_cmd]) as $_k) { |
|
| 48 | + foreach (array_keys($this->commands[$_cmd]) as $_k) { |
|
| 49 | 49 | if (isset($_ps[$_i])) { |
| 50 | - if (! isset($_GET[$_k])) { |
|
| 50 | + if (!isset($_GET[$_k])) { |
|
| 51 | 51 | $_GET[$_k] = $_ps[$_i]; |
| 52 | 52 | } |
| 53 | 53 | } else { |
@@ -64,11 +64,11 @@ discard block |
||
| 64 | 64 | // setup debug mode |
| 65 | 65 | $this->debug = (isset($opts['debug']) && $opts['debug'] ? true : false); |
| 66 | 66 | if ($this->debug) { |
| 67 | - error_reporting(defined('ELFINDER_DEBUG_ERRORLEVEL')? ELFINDER_DEBUG_ERRORLEVEL : -1); |
|
| 67 | + error_reporting(defined('ELFINDER_DEBUG_ERRORLEVEL') ? ELFINDER_DEBUG_ERRORLEVEL : -1); |
|
| 68 | 68 | ini_set('diaplay_errors', '1'); |
| 69 | 69 | } |
| 70 | 70 | |
| 71 | - if (! interface_exists('elFinderSessionInterface')) { |
|
| 71 | + if (!interface_exists('elFinderSessionInterface')) { |
|
| 72 | 72 | include_once dirname(__FILE__).'/elFinderSessionInterface.php'; |
| 73 | 73 | } |
| 74 | 74 | |
@@ -80,11 +80,11 @@ discard block |
||
| 80 | 80 | 'base64encode' => !empty($opts['base64encodeSessionData']), |
| 81 | 81 | 'keys' => array( |
| 82 | 82 | 'default' => !empty($opts['sessionCacheKey']) ? $opts['sessionCacheKey'] : 'elFinderCaches', |
| 83 | - 'netvolume' => !empty($opts['netVolumesSessionKey'])? $opts['netVolumesSessionKey'] : 'elFinderNetVolumes' |
|
| 83 | + 'netvolume' => !empty($opts['netVolumesSessionKey']) ? $opts['netVolumesSessionKey'] : 'elFinderNetVolumes' |
|
| 84 | 84 | ) |
| 85 | 85 | ); |
| 86 | - if (! class_exists('elFinderSession')) { |
|
| 87 | - include_once dirname(__FILE__) . '/elFinderSession.php'; |
|
| 86 | + if (!class_exists('elFinderSession')) { |
|
| 87 | + include_once dirname(__FILE__).'/elFinderSession.php'; |
|
| 88 | 88 | } |
| 89 | 89 | $this->session = new elFinderSession($sessionOpts); |
| 90 | 90 | } |
@@ -101,8 +101,8 @@ discard block |
||
| 101 | 101 | self::$volumesCnt = $volumesCntStart; |
| 102 | 102 | } |
| 103 | 103 | |
| 104 | - $this->time = $this->utime(); |
|
| 105 | - $this->sessionCloseEarlier = isset($opts['sessionCloseEarlier'])? (bool)$opts['sessionCloseEarlier'] : true; |
|
| 104 | + $this->time = $this->utime(); |
|
| 105 | + $this->sessionCloseEarlier = isset($opts['sessionCloseEarlier']) ? (bool) $opts['sessionCloseEarlier'] : true; |
|
| 106 | 106 | $this->sessionUseCmds = array_flip($sessionUseCmds); |
| 107 | 107 | $this->timeout = (isset($opts['timeout']) ? $opts['timeout'] : 0); |
| 108 | 108 | $this->uploadTempPath = (isset($opts['uploadTempPath']) ? $opts['uploadTempPath'] : ''); |
@@ -115,14 +115,14 @@ discard block |
||
| 115 | 115 | elFinder::$commonTempPath = ''; |
| 116 | 116 | } |
| 117 | 117 | } |
| 118 | - $this->maxArcFilesSize = isset($opts['maxArcFilesSize'])? intval($opts['maxArcFilesSize']) : 0; |
|
| 119 | - $this->optionsNetVolumes = (isset($opts['optionsNetVolumes']) && is_array($opts['optionsNetVolumes']))? $opts['optionsNetVolumes'] : array(); |
|
| 118 | + $this->maxArcFilesSize = isset($opts['maxArcFilesSize']) ? intval($opts['maxArcFilesSize']) : 0; |
|
| 119 | + $this->optionsNetVolumes = (isset($opts['optionsNetVolumes']) && is_array($opts['optionsNetVolumes'])) ? $opts['optionsNetVolumes'] : array(); |
|
| 120 | 120 | if (isset($opts['itemLockExpire'])) { |
| 121 | 121 | $this->itemLockExpire = intval($opts['itemLockExpire']); |
| 122 | 122 | } |
| 123 | 123 | |
| 124 | 124 | // deprecated settings |
| 125 | - $this->netVolumesSessionKey = !empty($opts['netVolumesSessionKey'])? $opts['netVolumesSessionKey'] : 'elFinderNetVolumes'; |
|
| 125 | + $this->netVolumesSessionKey = !empty($opts['netVolumesSessionKey']) ? $opts['netVolumesSessionKey'] : 'elFinderNetVolumes'; |
|
| 126 | 126 | self::$sessionCacheKey = !empty($opts['sessionCacheKey']) ? $opts['sessionCacheKey'] : 'elFinderCaches'; |
| 127 | 127 | |
| 128 | 128 | // check session cache |
@@ -146,25 +146,25 @@ discard block |
||
| 146 | 146 | $_reqCmd = isset($_req['cmd']) ? $_req['cmd'] : ''; |
| 147 | 147 | foreach ($opts['bind'] as $cmd => $handlers) { |
| 148 | 148 | $doRegist = (strpos($cmd, '*') !== false); |
| 149 | - if (! $doRegist) { |
|
| 149 | + if (!$doRegist) { |
|
| 150 | 150 | $_getcmd = create_function('$cmd', 'list($ret) = explode(\'.\', $cmd);return trim($ret);'); |
| 151 | 151 | $doRegist = ($_reqCmd && in_array($_reqCmd, array_map($_getcmd, explode(' ', $cmd)))); |
| 152 | 152 | } |
| 153 | 153 | if ($doRegist) { |
| 154 | 154 | // for backward compatibility |
| 155 | - if (! is_array($handlers)) { |
|
| 155 | + if (!is_array($handlers)) { |
|
| 156 | 156 | $handlers = array($handlers); |
| 157 | 157 | } else { |
| 158 | 158 | if (count($handlers) === 2 && is_object($handlers[0])) { |
| 159 | 159 | $handlers = array($handlers); |
| 160 | 160 | } |
| 161 | 161 | } |
| 162 | - foreach($handlers as $handler) { |
|
| 162 | + foreach ($handlers as $handler) { |
|
| 163 | 163 | if ($handler) { |
| 164 | 164 | if (is_string($handler) && strpos($handler, '.')) { |
| 165 | 165 | list($_domain, $_name, $_method) = array_pad(explode('.', $handler), 3, ''); |
| 166 | 166 | if (strcasecmp($_domain, 'plugin') === 0) { |
| 167 | - if ($plugin = $this->getPluginInstance($_name, isset($opts['plugin'][$_name])? $opts['plugin'][$_name] : array()) |
|
| 167 | + if ($plugin = $this->getPluginInstance($_name, isset($opts['plugin'][$_name]) ? $opts['plugin'][$_name] : array()) |
|
| 168 | 168 | and method_exists($plugin, $_method)) { |
| 169 | 169 | $this->bind($cmd, array($plugin, $_method)); |
| 170 | 170 | } |
@@ -185,9 +185,9 @@ discard block |
||
| 185 | 185 | // check for net volumes stored in session |
| 186 | 186 | $netVolumes = $this->getNetVolumes(); |
| 187 | 187 | foreach ($netVolumes as $key => $root) { |
| 188 | - if (! isset($root['id'])) { |
|
| 188 | + if (!isset($root['id'])) { |
|
| 189 | 189 | // given fixed unique id |
| 190 | - if (! $root['id'] = $this->getNetVolumeUniqueId($netVolumes)) { |
|
| 190 | + if (!$root['id'] = $this->getNetVolumeUniqueId($netVolumes)) { |
|
| 191 | 191 | $this->mountErrors[] = 'Netmount Driver "'.$root['driver'].'" : Could\'t given volume id.'; |
| 192 | 192 | continue; |
| 193 | 193 | } |