| Filename | file size | Relative path | Full name | md5sum | Specific parameters |
|---|
"; - } else { - // First line. We must add a new 'official' list separator. - $flist .= $this->classparams['http_flist_file_between']; - $addBR = true; - } - $flist .= "$key => $value"; - } - } - $flist .= $this->classparams['http_flist_file_after']; - } - $flist .= $this->classparams['http_flist_end']; - - return $flist; -} - -/** - * Generation of the applet tag, and necessary things around (js content). Insertion of this into the content of the - * page. - * See the tag_jscript and tag_applet class parameters. - */ -private function generateAppletTag($str) { - $this->logDebug('generateAppletTag', 'Entering function'); - $str = preg_replace('/'.$this->classparams['tag_jscript'].'/', $this->str_jsinit(), $str); - return preg_replace('/'.$this->classparams['tag_applet'].'/', $this->str_applet(), $str); -} - -/** - * This function is called when constructing the page, when we're not reveiving uploaded files. It 'just' construct - * the applet tag, by calling the relevant function. - * - * This *must* be public, because it is called from PHP's output buffering - */ -public function interceptBeforeUpload($str) { - $this->logDebug('interceptBeforeUpload', 'Entering function'); - return $this->generateAppletTag($str); -} - -/** - * This function displays the uploaded files description in the current page (see tag_flist class parameter) - * - * This *must* be public, because it is called from PHP's output buffering. - */ -public function interceptAfterUpload($str) { - $this->logDebug('interceptAfterUpload', 'Entering function'); - $this->logPHPDebug('interceptAfterUpload', $this->files); - - if (count($this->files) > 0) { - if (isset($this->classparams['callbackAfterUploadManagement'])) { - $this->logDebug('interceptAfterUpload', 'Before call of ' .$this->classparams['callbackAfterUploadManagement']); - $strForFListContent = call_user_func($this->classparams['callbackAfterUploadManagement'], $this, $this->files); - } else { - $strForFListContent = $this->defaultAfterUploadManagement(); - } - $str = preg_replace('/'.$this->classparams['tag_flist'].'/', $strForFListContent, $str); - } - return $this->generateAppletTag($str); -} - -/** - * This method manages the receiving of the debug log, when an error occurs. - */ -private function receive_debug_log() { - // handle error report - if (isset($_POST['description']) && isset($_POST['log'])) { - $msg = $_POST['log']; - mail($this->classparams['errormail'], $_POST['description'], $msg); - } else { - if (isset($_SERVER['SERVER_ADMIN'])) - mail($_SERVER['SERVER_ADMIN'], 'Empty jupload error log', - 'An empty log has just been posted.'); - $this->logPHPDebug('receive_debug_log', 'Empty error log received'); - } - exit; -} - -/** - * This method is the heart of the system. It manage the files sent by the applet, check the incoming parameters (md5sum) and - * reconstruct the files sent in chunk mode. - * - * The result is stored in the $files array, and can then be managed by the function given in the callbackAfterUploadManagement - * class parameter, or within the page whose URL is given in the afterUploadURL applet parameter. - * Or you can Extend the class and redeclare defaultAfterUploadManagement() to your needs. - */ -private function receive_uploaded_files() { - $this->logDebug('receive_uploaded_files', 'Entering POST management'); - - if (session_id() == '') { - session_start(); - } - // we check for the session *after* handling possible error log - // because an error could have happened because the session-id is missing. - if (!isset($_SESSION['RF'][$this->classparams['var_prefix'].'size'])) { - $this->abort('Invalid session (in afterupload, POST, check of size)'); - } - if (!isset($_SESSION['RF'][$this->classparams['var_prefix'].'files'])) { - $this->abort('Invalid session (in afterupload, POST, check of files)'); - } - $this->files = $_SESSION['RF'][$this->classparams['var_prefix'].'files']; - if (!is_array($this->files)) { - $this->abort('Invalid session (in afterupload, POST, is_array(files))'); - } - if ($this->appletparams['sendMD5Sum'] == 'true' && !isset($_POST['md5sum'])) { - $this->abort('Required POST variable md5sum is missing'); - } - $cnt = 0; - foreach ($_FILES as $key => $value) { - //Let's read the $_FILES data - if (isset($files_data)) { - unset($files_data); - } - $jupart = (isset($_POST['jupart'])) ? (int)$_POST['jupart'] : 0; - $jufinal = (isset($_POST['jufinal'])) ? (int)$_POST['jufinal'] : 1; - $relpaths = (isset($_POST['relpathinfo'])) ? $_POST['relpathinfo'] : null; - $md5sums = (isset($_POST['md5sum'])) ? $_POST['md5sum'] : null; - $mimetypes = (isset($_POST['mimetype'])) ? $_POST['mimetype'] : null; - //$relpaths = (isset($_POST["relpathinfo$cnt"])) ? $_POST["relpathinfo$cnt"] : null; - //$md5sums = (isset($_POST["md5sum$cnt"])) ? $_POST["md5sum$cnt"] : null; - - if (gettype($relpaths) == 'string') { - $relpaths = array($relpaths); - } - if (gettype($md5sums) == 'string') { - $md5sums = array($md5sums); - } - if ($this->appletparams['sendMD5Sum'] == 'true' && !is_array($md5sums)) { - $this->abort('Expecting an array of MD5 checksums'); - } - if (!is_array($relpaths)) { - $this->abort('Expecting an array of relative paths'); - } - if (!is_array($mimetypes)) { - $this->abort('Expecting an array of MIME types'); - } - // Check the MIME type (note: this is easily forged!) - if (isset($this->classparams['allowed_mime_types']) && is_array($this->classparams['allowed_mime_types'])) { - if (!in_array($mimetypes[$cnt], $this->classparams['allowed_mime_types'])) { - $this->abort('MIME type '.$mimetypes[$cnt].' not allowed'); - } - } - if (isset($this->classparams['allowed_file_extensions']) && is_array($this->classparams['allowed_file_extensions'])) { - $fileExtension = substr(strrchr($value['name'][$cnt], "."), 1); - if (!in_array($fileExtension, $this->classparams['allowed_file_extensions'])) { - $this->abort('File extension '.$fileExtension.' not allowed'); - } - } - - $dstdir = $this->classparams['destdir']; - $dstname = $dstdir.'/'.$this->classparams['tmp_prefix'].session_id(); - $tmpname = $dstdir.'/'.$this->classparams['tmp_prefix'].'tmp'.session_id(); - - // Controls are now done. Let's store the current uploaded files properties in an array, for future use. - $files_data['name'] = $value['name'][$cnt]; - $files_data['size'] = 'not calculated yet'; - $files_data['tmp_name'] = $value['tmp_name'][$cnt]; - $files_data['error'] = $value['error'][$cnt]; - $files_data['relativePath'] = $relpaths[$cnt]; - $files_data['md5sum'] = $md5sums[$cnt]; - $files_data['mimetype'] = $mimetypes[$cnt]; - - if (!move_uploaded_file($files_data['tmp_name'], $tmpname)) { - if ($classparams['verbose_errors']) { - $this->abort("Unable to move uploaded file (from ${files_data['tmp_name']} to $tmpname)"); - } else { - trigger_error("Unable to move uploaded file (from ${files_data['tmp_name']} to $tmpname)",E_USER_WARNING); - $this->abort("Unable to move uploaded file"); - } -} - -// In demo mode, no file storing is done. We just delete the newly uploaded file. -if ($this->classparams['demo_mode']) { - if ($jufinal || (!$jupart)) { - if ($jupart) { - $files_data['size'] = ($jupart-1) * $this->appletparams['maxChunkSize'] + filesize($tmpname); - } else { - $files_data['size'] = filesize($tmpname); - } - $files_data['fullName'] = 'Demo mode
No file storing'; - array_push($this->files, $files_data); - } - unlink($tmpname); - $cnt++; - continue; -} -//If we get here, the upload is a real one (no demo) -if ($jupart) { - // got a chunk of a multi-part upload - $len = filesize($tmpname); - $_SESSION['RF'][$this->classparams['var_prefix'].'size'] += $len; - if ($len > 0) { - $src = fopen($tmpname, 'rb'); - $dst = fopen($dstname, ($jupart == 1) ? 'wb' : 'ab'); - while ($len > 0) { - $rlen = ($len > 8192) ? 8192 : $len; - $buf = fread($src, $rlen); - if (!$buf) { - fclose($src); - fclose($dst); - unlink($dstname); - $this->abort('read IO error'); - } - if (!fwrite($dst, $buf, $rlen)) { - fclose($src); - fclose($dst); - unlink($dstname); - $this->abort('write IO error'); - } - $len -= $rlen; - } - fclose($src); - fclose($dst); - unlink($tmpname); - } - if ($jufinal) { - // This is the last chunk. Check total lenght and - // rename it to it's final name. - $dlen = filesize($dstname); - if ($dlen != $_SESSION['RF'][$this->classparams['var_prefix'].'size']) - $this->abort('file size mismatch'); - if ($this->appletparams['sendMD5Sum'] == 'true' ) { - if ($md5sums[$cnt] != md5_file($dstname)) - $this->abort('MD5 checksum mismatch'); - } - // remove zero sized files - if (($dlen > 0) || $this->classparams['allow_zerosized']) { - $dstfinal = $this->dstfinal($files_data['name'],$files_data['relativePath']); - if (!rename($dstname, $dstfinal)) - $this->abort('rename IO error'); - $_umask = umask(0); // override the system mask - if (!chmod($dstfinal, $this->classparams['fileperm'])) - $this->abort('chmod IO error'); - umask($_umask); - $files_data['size'] = filesize($dstfinal); - $files_data['fullName'] = $dstfinal; - $files_data['path'] = fix_dirname($dstfinal); - array_push($this->files, $files_data); - } else { - unlink($dstname); - } - // reset session var - $_SESSION['RF'][$this->classparams['var_prefix'].'size'] = 0; - } -} else { - // Got a single file upload. Trivial. - if ($this->appletparams['sendMD5Sum'] == 'true' ) { - if ($md5sums[$cnt] != md5_file($tmpname)) - $this->abort('MD5 checksum mismatch'); - } - $dstfinal = $this->dstfinal($files_data['name'],$files_data['relativePath']); - if (!rename($tmpname, $dstfinal)) - $this->abort('rename IO error'); - $_umask = umask(0); // override the system mask - if (!chmod($dstfinal, $this->classparams['fileperm'])) - $this->abort('chmod IO error'); - umask($_umask); - $files_data['size'] = filesize($dstfinal); - $files_data['fullName'] = $dstfinal; - $files_data['path'] = fix_dirname($dstfinal); - array_push($this->files, $files_data); -} -$cnt++; -} - -echo $this->appletparams['stringUploadSuccess']."\n"; -$_SESSION['RF'][$this->classparams['var_prefix'].'files'] = $this->files; -session_write_close(); -exit; -} - -/** - * - * - */ -private function page_start() { - $this->logDebug('page_start', 'Entering function'); - - // If the applet checks for the serverProtocol, it issues a HEAD request - // -> Simply return an empty doc. - if ($_SERVER['REQUEST_METHOD'] == 'HEAD') { - // Nothing to do - - } else if ($_SERVER['REQUEST_METHOD'] == 'GET') { - // A GET request means: return upload page - $this->logDebug('page_start', 'Entering GET management'); - - if (session_id() == '') { - session_start(); - } - if (isset($_GET['afterupload'])) { - $this->logDebug('page_start', 'afterupload is set'); - if (!isset($_SESSION['RF'][$this->classparams['var_prefix'].'files'])) { - $this->abort('Invalid session (in afterupload, GET, check of $_SESSION["RF"]): files array is not set'); - } - $this->files = $_SESSION['RF'][$this->classparams['var_prefix'].'files']; - if (!is_array($this->files)) { - $this->abort('Invalid session (in afterupload, GET, check of is_array(files)): files is not an array'); - } - // clear session data ready for new upload - $_SESSION['RF'][$this->classparams['var_prefix'].'files'] = array(); - - // start intercepting the content of the calling page, to display the upload result. - ob_start(array(& $this, 'interceptAfterUpload')); - - } else { - $this->logDebug('page_start', 'afterupload is not set'); - if ($this->classparams['session_regenerate']) { - session_regenerate_id(true); - } - $this->files = array(); - $_SESSION['RF'][$this->classparams['var_prefix'].'size'] = 0; - $_SESSION['RF'][$this->classparams['var_prefix'].'files'] = $this->files; - // start intercepting the content of the calling page, to display the applet tag. - ob_start(array(& $this, 'interceptBeforeUpload')); - } - - } else if ($_SERVER['REQUEST_METHOD'] == 'POST') { - // If we got a POST request, this is the real work. - if (isset($_GET['errormail'])) { - //Hum, an error occurs on server side. Let's manage the debug log, that we just received. - $this->receive_debug_log(); - } else { - $this->receive_uploaded_files(); - } - } -} -} - -// PHP end tag omitted intentionally!! +$value. + * The available keys are: + * - name: the filename, as it is now stored on the system. + * - size: the file size + * - path: the absolute path, where the file has been stored. + * - fullName: the canonical file name (i.e. including the absolute path) + * - md5sum: the md5sum of the file, if further control is needed. + * - mimetype: the calculated mime type of the file + * - If the formData applet parameter is used: all attributes (key and value) uploaded by the applet, are put here, + * repeated for each file. + * + * Note: if you are using a callback function (i.e. callbackAfterUploadManagement) and you do not see a global 'object' you + * are expecting then it might have been destroyed by PHP - c.f. http://bugs.php.net/bug.php?id=39693 + * + */ + +class JUpload { + + var $appletparams; + var $classparams; + var $files; + + public function JUpload($appletparams = array(), $classparams = array()) { + if (gettype($classparams) != 'array') + $this->abort('Invalid type of parameter classparams: Expecting an array'); + if (gettype($appletparams) != 'array') + $this->abort('Invalid type of parameter appletparams: Expecting an array'); + + // set some defaults for the applet params + if (!isset($appletparams['afterUploadURL'])) + $appletparams['afterUploadURL'] = $_SERVER['PHP_SELF'] . '?afterupload=1'; + if (!isset($appletparams['name'])) + $appletparams['name'] = 'JUpload'; + if (!isset($appletparams['archive'])) + $appletparams['archive'] = 'wjhk.jupload.jar'; + if (!isset($appletparams['code'])) + $appletparams['code'] = 'wjhk.jupload2.JUploadApplet'; + if (!isset($appletparams['debugLevel'])) + $appletparams['debugLevel'] = 0; + if (!isset($appletparams['httpUploadParameterType'])) + $appletparams['httpUploadParameterType'] = 'array'; + if (!isset($appletparams['showLogWindow'])) + $appletparams['showLogWindow'] = ($appletparams['debugLevel'] > 0) ? 'true' : 'false'; + if (!isset($appletparams['width'])) + $appletparams['width'] = 640; + if (!isset($appletparams['height'])) + $appletparams['height'] = ($appletparams['showLogWindow'] == 'true') ? 500 : 300; + if (!isset($appletparams['mayscript'])) + $appletparams['mayscript'] = 'true'; + if (!isset($appletparams['scriptable'])) + $appletparams['scriptable'] = 'false'; + //if (!isset($appletparams['stringUploadSuccess'])) + $appletparams['stringUploadSuccess'] = 'SUCCESS'; + //if (!isset($appletparams['stringUploadError'])) + $appletparams['stringUploadError'] = 'ERROR: (.*)'; + $maxpost = $this->tobytes(ini_get('post_max_size')); + $maxmem = $this->tobytes(ini_get('memory_limit')); + $maxfs = $this->tobytes(ini_get('upload_max_filesize')); + $obd = ini_get('open_basedir'); + if (!isset($appletparams['maxChunkSize'])) { + $maxchunk = ($maxpost < $maxmem) ? $maxpost : $maxmem; + $maxchunk = ($maxchunk < $maxfs) ? $maxchunk : $maxfs; + $maxchunk /= 4; + $optchunk = (500000 > $maxchunk) ? $maxchunk : 500000; + $appletparams['maxChunkSize'] = $optchunk; + } + $appletparams['maxChunkSize'] = $this->tobytes($appletparams['maxChunkSize']); + if (!isset($appletparams['maxFileSize'])) + $appletparams['maxFileSize'] = $maxfs; + $appletparams['maxFileSize'] = $this->tobytes($appletparams['maxFileSize']); + if (isset($classparams['errormail'])) { + $appletparams['urlToSendErrorTo'] = $_SERVER["PHP_SELF"] . '?errormail'; + } + + // Same for class parameters + if (!isset($classparams['demo_mode'])) + $classparams['demo_mode'] = false; + if ($classparams['demo_mode']) { + $classparams['create_destdir'] = false; + $classparams['allow_subdirs'] = true; + $classparams['allow_zerosized'] = true; + $classparams['duplicate'] = 'overwrite'; + } + if (!isset($classparams['debug_php'])) // set true to log some messages in PHP log + $classparams['debug_php'] = false; + if (!isset($this->classparams['allowed_mime_types'])) // array of allowed MIME type + $classparams['allowed_mime_types'] = 'all'; + if (!isset($this->classparams['allowed_file_extensions'])) // array of allowed file extensions + $classparams['allowed_file_extensions'] = 'all'; + if (!isset($classparams['verbose_errors'])) // shouldn't display server info on a production site! + $classparams['verbose_errors'] = true; + if (!isset($classparams['session_regenerate'])) + $classparams['session_regenerate'] = false; + if (!isset($classparams['create_destdir'])) + $classparams['create_destdir'] = true; + if (!isset($classparams['allow_subdirs'])) + $classparams['allow_subdirs'] = false; + if (!isset($classparams['spaces_in_subdirs'])) + $classparams['spaces_in_subdirs'] = false; + if (!isset($classparams['convert_spaces'])) // set to true to convert spaces in filenames to _ + $classparams['convert_spaces'] = false; + if (!isset($classparams['allow_zerosized'])) + $classparams['allow_zerosized'] = false; + if (!isset($classparams['duplicate'])) + $classparams['duplicate'] = 'rename'; + if (!isset($classparams['dirperm'])) + $classparams['dirperm'] = 0755; + if (!isset($classparams['fileperm'])) + $classparams['fileperm'] = 0644; + if (!isset($classparams['destdir'])) { + if ($obd != '') + $classparams['destdir'] = $obd; + else + $classparams['destdir'] = '/var/tmp/jupload_test'; + }else{ + $classparams['destdir']=str_replace('~',' ',$classparams['destdir']); + } + if ($classparams['create_destdir']) { + $_umask = umask(0); // override the system mask + @mkdir($classparams['destdir'], $classparams['dirperm']); + umask($_umask); + } + if (!is_dir($classparams['destdir']) && is_writable($classparams['destdir'])) + $this->abort('Destination dir not accessible'); + if (!isset($classparams['tmp_prefix'])) + $classparams['tmp_prefix'] = 'jutmp.'; + if (!isset($classparams['var_prefix'])) + $classparams['var_prefix'] = 'juvar.'; + if (!isset($classparams['jscript_wrapper'])) + $classparams['jscript_wrapper'] = 'JUploadSetProperty'; + if (!isset($classparams['tag_jscript'])) + $classparams['tag_jscript'] = ''; + if (!isset($classparams['tag_applet'])) + $classparams['tag_applet'] = ''; + if (!isset($classparams['tag_flist'])) + $classparams['tag_flist'] = ''; + if (!isset($classparams['http_flist_start'])) + $classparams['http_flist_start'] = + "
| Filename | file size | Relative path | Full name | md5sum | Specific parameters |
|---|
"; + } else { + // First line. We must add a new 'official' list separator. + $flist .= $this->classparams['http_flist_file_between']; + $addBR = true; + } + $flist .= "$key => $value"; + } + } + $flist .= $this->classparams['http_flist_file_after']; + } + $flist .= $this->classparams['http_flist_end']; + + return $flist; +} + +/** + * Generation of the applet tag, and necessary things around (js content). Insertion of this into the content of the + * page. + * See the tag_jscript and tag_applet class parameters. + */ +private function generateAppletTag($str) { + $this->logDebug('generateAppletTag', 'Entering function'); + $str = preg_replace('/'.$this->classparams['tag_jscript'].'/', $this->str_jsinit(), $str); + return preg_replace('/'.$this->classparams['tag_applet'].'/', $this->str_applet(), $str); +} + +/** + * This function is called when constructing the page, when we're not reveiving uploaded files. It 'just' construct + * the applet tag, by calling the relevant function. + * + * This *must* be public, because it is called from PHP's output buffering + */ +public function interceptBeforeUpload($str) { + $this->logDebug('interceptBeforeUpload', 'Entering function'); + return $this->generateAppletTag($str); +} + +/** + * This function displays the uploaded files description in the current page (see tag_flist class parameter) + * + * This *must* be public, because it is called from PHP's output buffering. + */ +public function interceptAfterUpload($str) { + $this->logDebug('interceptAfterUpload', 'Entering function'); + $this->logPHPDebug('interceptAfterUpload', $this->files); + + if (count($this->files) > 0) { + if (isset($this->classparams['callbackAfterUploadManagement'])) { + $this->logDebug('interceptAfterUpload', 'Before call of ' .$this->classparams['callbackAfterUploadManagement']); + $strForFListContent = call_user_func($this->classparams['callbackAfterUploadManagement'], $this, $this->files); + } else { + $strForFListContent = $this->defaultAfterUploadManagement(); + } + $str = preg_replace('/'.$this->classparams['tag_flist'].'/', $strForFListContent, $str); + } + return $this->generateAppletTag($str); +} + +/** + * This method manages the receiving of the debug log, when an error occurs. + */ +private function receive_debug_log() { + // handle error report + if (isset($_POST['description']) && isset($_POST['log'])) { + $msg = $_POST['log']; + mail($this->classparams['errormail'], $_POST['description'], $msg); + } else { + if (isset($_SERVER['SERVER_ADMIN'])) + mail($_SERVER['SERVER_ADMIN'], 'Empty jupload error log', + 'An empty log has just been posted.'); + $this->logPHPDebug('receive_debug_log', 'Empty error log received'); + } + exit; +} + +/** + * This method is the heart of the system. It manage the files sent by the applet, check the incoming parameters (md5sum) and + * reconstruct the files sent in chunk mode. + * + * The result is stored in the $files array, and can then be managed by the function given in the callbackAfterUploadManagement + * class parameter, or within the page whose URL is given in the afterUploadURL applet parameter. + * Or you can Extend the class and redeclare defaultAfterUploadManagement() to your needs. + */ +private function receive_uploaded_files() { + $this->logDebug('receive_uploaded_files', 'Entering POST management'); + + if (session_id() == '') { + session_start(); + } + // we check for the session *after* handling possible error log + // because an error could have happened because the session-id is missing. + if (!isset($_SESSION['RF'][$this->classparams['var_prefix'].'size'])) { + $this->abort('Invalid session (in afterupload, POST, check of size)'); + } + if (!isset($_SESSION['RF'][$this->classparams['var_prefix'].'files'])) { + $this->abort('Invalid session (in afterupload, POST, check of files)'); + } + $this->files = $_SESSION['RF'][$this->classparams['var_prefix'].'files']; + if (!is_array($this->files)) { + $this->abort('Invalid session (in afterupload, POST, is_array(files))'); + } + if ($this->appletparams['sendMD5Sum'] == 'true' && !isset($_POST['md5sum'])) { + $this->abort('Required POST variable md5sum is missing'); + } + $cnt = 0; + foreach ($_FILES as $key => $value) { + //Let's read the $_FILES data + if (isset($files_data)) { + unset($files_data); + } + $jupart = (isset($_POST['jupart'])) ? (int)$_POST['jupart'] : 0; + $jufinal = (isset($_POST['jufinal'])) ? (int)$_POST['jufinal'] : 1; + $relpaths = (isset($_POST['relpathinfo'])) ? $_POST['relpathinfo'] : null; + $md5sums = (isset($_POST['md5sum'])) ? $_POST['md5sum'] : null; + $mimetypes = (isset($_POST['mimetype'])) ? $_POST['mimetype'] : null; + //$relpaths = (isset($_POST["relpathinfo$cnt"])) ? $_POST["relpathinfo$cnt"] : null; + //$md5sums = (isset($_POST["md5sum$cnt"])) ? $_POST["md5sum$cnt"] : null; + + if (gettype($relpaths) == 'string') { + $relpaths = array($relpaths); + } + if (gettype($md5sums) == 'string') { + $md5sums = array($md5sums); + } + if ($this->appletparams['sendMD5Sum'] == 'true' && !is_array($md5sums)) { + $this->abort('Expecting an array of MD5 checksums'); + } + if (!is_array($relpaths)) { + $this->abort('Expecting an array of relative paths'); + } + if (!is_array($mimetypes)) { + $this->abort('Expecting an array of MIME types'); + } + // Check the MIME type (note: this is easily forged!) + if (isset($this->classparams['allowed_mime_types']) && is_array($this->classparams['allowed_mime_types'])) { + if (!in_array($mimetypes[$cnt], $this->classparams['allowed_mime_types'])) { + $this->abort('MIME type '.$mimetypes[$cnt].' not allowed'); + } + } + if (isset($this->classparams['allowed_file_extensions']) && is_array($this->classparams['allowed_file_extensions'])) { + $fileExtension = substr(strrchr($value['name'][$cnt], "."), 1); + if (!in_array($fileExtension, $this->classparams['allowed_file_extensions'])) { + $this->abort('File extension '.$fileExtension.' not allowed'); + } + } + + $dstdir = $this->classparams['destdir']; + $dstname = $dstdir.'/'.$this->classparams['tmp_prefix'].session_id(); + $tmpname = $dstdir.'/'.$this->classparams['tmp_prefix'].'tmp'.session_id(); + + // Controls are now done. Let's store the current uploaded files properties in an array, for future use. + $files_data['name'] = $value['name'][$cnt]; + $files_data['size'] = 'not calculated yet'; + $files_data['tmp_name'] = $value['tmp_name'][$cnt]; + $files_data['error'] = $value['error'][$cnt]; + $files_data['relativePath'] = $relpaths[$cnt]; + $files_data['md5sum'] = $md5sums[$cnt]; + $files_data['mimetype'] = $mimetypes[$cnt]; + + if (!move_uploaded_file($files_data['tmp_name'], $tmpname)) { + if ($classparams['verbose_errors']) { + $this->abort("Unable to move uploaded file (from ${files_data['tmp_name']} to $tmpname)"); + } else { + trigger_error("Unable to move uploaded file (from ${files_data['tmp_name']} to $tmpname)",E_USER_WARNING); + $this->abort("Unable to move uploaded file"); + } +} + +// In demo mode, no file storing is done. We just delete the newly uploaded file. +if ($this->classparams['demo_mode']) { + if ($jufinal || (!$jupart)) { + if ($jupart) { + $files_data['size'] = ($jupart-1) * $this->appletparams['maxChunkSize'] + filesize($tmpname); + } else { + $files_data['size'] = filesize($tmpname); + } + $files_data['fullName'] = 'Demo mode
No file storing'; + array_push($this->files, $files_data); + } + unlink($tmpname); + $cnt++; + continue; +} +//If we get here, the upload is a real one (no demo) +if ($jupart) { + // got a chunk of a multi-part upload + $len = filesize($tmpname); + $_SESSION['RF'][$this->classparams['var_prefix'].'size'] += $len; + if ($len > 0) { + $src = fopen($tmpname, 'rb'); + $dst = fopen($dstname, ($jupart == 1) ? 'wb' : 'ab'); + while ($len > 0) { + $rlen = ($len > 8192) ? 8192 : $len; + $buf = fread($src, $rlen); + if (!$buf) { + fclose($src); + fclose($dst); + unlink($dstname); + $this->abort('read IO error'); + } + if (!fwrite($dst, $buf, $rlen)) { + fclose($src); + fclose($dst); + unlink($dstname); + $this->abort('write IO error'); + } + $len -= $rlen; + } + fclose($src); + fclose($dst); + unlink($tmpname); + } + if ($jufinal) { + // This is the last chunk. Check total lenght and + // rename it to it's final name. + $dlen = filesize($dstname); + if ($dlen != $_SESSION['RF'][$this->classparams['var_prefix'].'size']) + $this->abort('file size mismatch'); + if ($this->appletparams['sendMD5Sum'] == 'true' ) { + if ($md5sums[$cnt] != md5_file($dstname)) + $this->abort('MD5 checksum mismatch'); + } + // remove zero sized files + if (($dlen > 0) || $this->classparams['allow_zerosized']) { + $dstfinal = $this->dstfinal($files_data['name'],$files_data['relativePath']); + if (!rename($dstname, $dstfinal)) + $this->abort('rename IO error'); + $_umask = umask(0); // override the system mask + if (!chmod($dstfinal, $this->classparams['fileperm'])) + $this->abort('chmod IO error'); + umask($_umask); + $files_data['size'] = filesize($dstfinal); + $files_data['fullName'] = $dstfinal; + $files_data['path'] = fix_dirname($dstfinal); + array_push($this->files, $files_data); + } else { + unlink($dstname); + } + // reset session var + $_SESSION['RF'][$this->classparams['var_prefix'].'size'] = 0; + } +} else { + // Got a single file upload. Trivial. + if ($this->appletparams['sendMD5Sum'] == 'true' ) { + if ($md5sums[$cnt] != md5_file($tmpname)) + $this->abort('MD5 checksum mismatch'); + } + $dstfinal = $this->dstfinal($files_data['name'],$files_data['relativePath']); + if (!rename($tmpname, $dstfinal)) + $this->abort('rename IO error'); + $_umask = umask(0); // override the system mask + if (!chmod($dstfinal, $this->classparams['fileperm'])) + $this->abort('chmod IO error'); + umask($_umask); + $files_data['size'] = filesize($dstfinal); + $files_data['fullName'] = $dstfinal; + $files_data['path'] = fix_dirname($dstfinal); + array_push($this->files, $files_data); +} +$cnt++; +} + +echo $this->appletparams['stringUploadSuccess']."\n"; +$_SESSION['RF'][$this->classparams['var_prefix'].'files'] = $this->files; +session_write_close(); +exit; +} + +/** + * + * + */ +private function page_start() { + $this->logDebug('page_start', 'Entering function'); + + // If the applet checks for the serverProtocol, it issues a HEAD request + // -> Simply return an empty doc. + if ($_SERVER['REQUEST_METHOD'] == 'HEAD') { + // Nothing to do + + } else if ($_SERVER['REQUEST_METHOD'] == 'GET') { + // A GET request means: return upload page + $this->logDebug('page_start', 'Entering GET management'); + + if (session_id() == '') { + session_start(); + } + if (isset($_GET['afterupload'])) { + $this->logDebug('page_start', 'afterupload is set'); + if (!isset($_SESSION['RF'][$this->classparams['var_prefix'].'files'])) { + $this->abort('Invalid session (in afterupload, GET, check of $_SESSION["RF"]): files array is not set'); + } + $this->files = $_SESSION['RF'][$this->classparams['var_prefix'].'files']; + if (!is_array($this->files)) { + $this->abort('Invalid session (in afterupload, GET, check of is_array(files)): files is not an array'); + } + // clear session data ready for new upload + $_SESSION['RF'][$this->classparams['var_prefix'].'files'] = array(); + + // start intercepting the content of the calling page, to display the upload result. + ob_start(array(& $this, 'interceptAfterUpload')); + + } else { + $this->logDebug('page_start', 'afterupload is not set'); + if ($this->classparams['session_regenerate']) { + session_regenerate_id(true); + } + $this->files = array(); + $_SESSION['RF'][$this->classparams['var_prefix'].'size'] = 0; + $_SESSION['RF'][$this->classparams['var_prefix'].'files'] = $this->files; + // start intercepting the content of the calling page, to display the applet tag. + ob_start(array(& $this, 'interceptBeforeUpload')); + } + + } else if ($_SERVER['REQUEST_METHOD'] == 'POST') { + // If we got a POST request, this is the real work. + if (isset($_GET['errormail'])) { + //Hum, an error occurs on server side. Let's manage the debug log, that we just received. + $this->receive_debug_log(); + } else { + $this->receive_uploaded_files(); + } + } +} +} + +// PHP end tag omitted intentionally!! diff --git a/local/modules/Tinymce/Resources/js/tinymce/filemanager/uploader/success.php b/local/modules/Tinymce/Resources/js/tinymce/filemanager/uploader/success.php index 65d04331..d327653b 100755 --- a/local/modules/Tinymce/Resources/js/tinymce/filemanager/uploader/success.php +++ b/local/modules/Tinymce/Resources/js/tinymce/filemanager/uploader/success.php @@ -1,19 +1,19 @@ - - - -
-
-+
+
diff --git a/local/session/.gitkeep b/local/session/.gitkeep
new file mode 100755
index 00000000..e69de29b
diff --git a/local/session/sess_dcejcpi07k2hfj328kc4ucau9h b/local/session/sess_dcejcpi07k2hfj328kc4ucau9h
new file mode 100644
index 00000000..f27d2a28
Binary files /dev/null and b/local/session/sess_dcejcpi07k2hfj328kc4ucau9h differ
diff --git a/local/session/sess_dtg3carrrrbjt61hkb7h56sh29 b/local/session/sess_dtg3carrrrbjt61hkb7h56sh29
new file mode 100644
index 00000000..8adcb935
Binary files /dev/null and b/local/session/sess_dtg3carrrrbjt61hkb7h56sh29 differ
diff --git a/local/session/sess_g4pff7fq2360h2gp15v6hdvm00 b/local/session/sess_g4pff7fq2360h2gp15v6hdvm00
new file mode 100644
index 00000000..a2a78baf
Binary files /dev/null and b/local/session/sess_g4pff7fq2360h2gp15v6hdvm00 differ
diff --git a/local/session/sess_j0fl8ngs404vqtlsq5jf1g0324 b/local/session/sess_j0fl8ngs404vqtlsq5jf1g0324
new file mode 100644
index 00000000..682afdc8
Binary files /dev/null and b/local/session/sess_j0fl8ngs404vqtlsq5jf1g0324 differ
diff --git a/local/session/sess_ma2oto2q18iicqqidbudml3c4u b/local/session/sess_ma2oto2q18iicqqidbudml3c4u
new file mode 100644
index 00000000..2e2a14c8
Binary files /dev/null and b/local/session/sess_ma2oto2q18iicqqidbudml3c4u differ
diff --git a/local/session/sess_r59hd4euiabrjq95t0ig3ipq7c b/local/session/sess_r59hd4euiabrjq95t0ig3ipq7c
new file mode 100644
index 00000000..3661df36
Binary files /dev/null and b/local/session/sess_r59hd4euiabrjq95t0ig3ipq7c differ
diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.BezierCurveRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.BezierCurveRenderer.min.js
index fb360573..94c6fc5e 100644
--- a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.BezierCurveRenderer.min.js
+++ b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.BezierCurveRenderer.min.js
@@ -1,3 +1,3 @@
-/* jqPlot 1.0.8r1250 | (c) 2009-2013 Chris Leonello | jplot.com
- jsDate | (c) 2010-2013 Chris Leonello
+/* jqPlot 1.0.8r1250 | (c) 2009-2013 Chris Leonello | jplot.com
+ jsDate | (c) 2010-2013 Chris Leonello
*/(function(b){b.jqplot.BezierCurveRenderer=function(){b.jqplot.LineRenderer.call(this)};b.jqplot.BezierCurveRenderer.prototype=new b.jqplot.LineRenderer();b.jqplot.BezierCurveRenderer.prototype.constructor=b.jqplot.BezierCurveRenderer;b.jqplot.BezierCurveRenderer.prototype.setGridData=function(h){var e=this._xaxis.series_u2p;var g=this._yaxis.series_u2p;var f=this.data;this.gridData=[];this._prevGridData=[];var d=this.index;if(f.length==2){if(d==0){this.gridData=[[e.call(this._xaxis,f[0][0]),g.call(this._yaxis,f[0][1])],[e.call(this._xaxis,f[1][0]),g.call(this._yaxis,f[1][1]),e.call(this._xaxis,f[1][2]),g.call(this._yaxis,f[1][3]),e.call(this._xaxis,f[1][4]),g.call(this._yaxis,f[1][5])],[e.call(this._xaxis,f[1][4]),g.call(this._yaxis,this._yaxis.min)],[e.call(this._xaxis,f[0][0]),g.call(this._yaxis,this._yaxis.min)]]}else{var c=h.series[d-1].data;this.gridData=[[e.call(this._xaxis,f[0][0]),g.call(this._yaxis,f[0][1])],[e.call(this._xaxis,f[1][0]),g.call(this._yaxis,f[1][1]),e.call(this._xaxis,f[1][2]),g.call(this._yaxis,f[1][3]),e.call(this._xaxis,f[1][4]),g.call(this._yaxis,f[1][5])],[e.call(this._xaxis,c[1][4]),g.call(this._yaxis,c[1][5])],[e.call(this._xaxis,c[1][2]),g.call(this._yaxis,c[1][3]),e.call(this._xaxis,c[1][0]),g.call(this._yaxis,c[1][1]),e.call(this._xaxis,c[0][0]),g.call(this._yaxis,c[0][1])]]}}else{if(d==0){this.gridData=[[e.call(this._xaxis,f[0][0]),g.call(this._yaxis,f[0][1])],[e.call(this._xaxis,f[1][0]),g.call(this._yaxis,f[1][1]),e.call(this._xaxis,f[2][0]),g.call(this._yaxis,f[2][1]),e.call(this._xaxis,f[3][0]),g.call(this._yaxis,f[3][1])],[e.call(this._xaxis,f[3][1]),g.call(this._yaxis,this._yaxis.min)],[e.call(this._xaxis,f[0][0]),g.call(this._yaxis,this._yaxis.min)]]}else{var c=h.series[d-1].data;this.gridData=[[e.call(this._xaxis,f[0][0]),g.call(this._yaxis,f[0][1])],[e.call(this._xaxis,f[1][0]),g.call(this._yaxis,f[1][1]),e.call(this._xaxis,f[2][0]),g.call(this._yaxis,f[2][1]),e.call(this._xaxis,f[3][0]),g.call(this._yaxis,f[3][1])],[e.call(this._xaxis,c[3][0]),g.call(this._yaxis,c[3][1])],[e.call(this._xaxis,c[2][0]),g.call(this._yaxis,c[2][1]),e.call(this._xaxis,c[1][0]),g.call(this._yaxis,c[1][1]),e.call(this._xaxis,c[0][0]),g.call(this._yaxis,c[0][1])]]}}};b.jqplot.BezierCurveRenderer.prototype.makeGridData=function(g,i){var f=this._xaxis.series_u2p;var h=this._yaxis.series_u2p;var e=[];var j=[];var d=this.index;if(g.length==2){if(d==0){e=[[f.call(this._xaxis,g[0][0]),h.call(this._yaxis,g[0][1])],[f.call(this._xaxis,g[1][0]),h.call(this._yaxis,g[1][1]),f.call(this._xaxis,g[1][2]),h.call(this._yaxis,g[1][3]),f.call(this._xaxis,g[1][4]),h.call(this._yaxis,g[1][5])],[f.call(this._xaxis,g[1][4]),h.call(this._yaxis,this._yaxis.min)],[f.call(this._xaxis,g[0][0]),h.call(this._yaxis,this._yaxis.min)]]}else{var c=i.series[d-1].data;e=[[f.call(this._xaxis,g[0][0]),h.call(this._yaxis,g[0][1])],[f.call(this._xaxis,g[1][0]),h.call(this._yaxis,g[1][1]),f.call(this._xaxis,g[1][2]),h.call(this._yaxis,g[1][3]),f.call(this._xaxis,g[1][4]),h.call(this._yaxis,g[1][5])],[f.call(this._xaxis,c[1][4]),h.call(this._yaxis,c[1][5])],[f.call(this._xaxis,c[1][2]),h.call(this._yaxis,c[1][3]),f.call(this._xaxis,c[1][0]),h.call(this._yaxis,c[1][1]),f.call(this._xaxis,c[0][0]),h.call(this._yaxis,c[0][1])]]}}else{if(d==0){e=[[f.call(this._xaxis,g[0][0]),h.call(this._yaxis,g[0][1])],[f.call(this._xaxis,g[1][0]),h.call(this._yaxis,g[1][1]),f.call(this._xaxis,g[2][0]),h.call(this._yaxis,g[2][1]),f.call(this._xaxis,g[3][0]),h.call(this._yaxis,g[3][1])],[f.call(this._xaxis,g[3][1]),h.call(this._yaxis,this._yaxis.min)],[f.call(this._xaxis,g[0][0]),h.call(this._yaxis,this._yaxis.min)]]}else{var c=i.series[d-1].data;e=[[f.call(this._xaxis,g[0][0]),h.call(this._yaxis,g[0][1])],[f.call(this._xaxis,g[1][0]),h.call(this._yaxis,g[1][1]),f.call(this._xaxis,g[2][0]),h.call(this._yaxis,g[2][1]),f.call(this._xaxis,g[3][0]),h.call(this._yaxis,g[3][1])],[f.call(this._xaxis,c[3][0]),h.call(this._yaxis,c[3][1])],[f.call(this._xaxis,c[2][0]),h.call(this._yaxis,c[2][1]),f.call(this._xaxis,c[1][0]),h.call(this._yaxis,c[1][1]),f.call(this._xaxis,c[0][0]),h.call(this._yaxis,c[0][1])]]}}return e};b.jqplot.BezierCurveRenderer.prototype.draw=function(c,g,d){var e;c.save();if(g.length){if(this.showLine){c.save();var f=(d!=null)?d:{};c.fillStyle=f.fillStyle||this.color;c.beginPath();c.moveTo(g[0][0],g[0][1]);c.bezierCurveTo(g[1][0],g[1][1],g[1][2],g[1][3],g[1][4],g[1][5]);c.lineTo(g[2][0],g[2][1]);if(g[3].length==2){c.lineTo(g[3][0],g[3][1])}else{c.bezierCurveTo(g[3][0],g[3][1],g[3][2],g[3][3],g[3][4],g[3][5])}c.closePath();c.fill();c.restore()}}c.restore()};b.jqplot.BezierCurveRenderer.prototype.drawShadow=function(c,e,d){};b.jqplot.BezierAxisRenderer=function(){b.jqplot.LinearAxisRenderer.call(this)};b.jqplot.BezierAxisRenderer.prototype=new b.jqplot.LinearAxisRenderer();b.jqplot.BezierAxisRenderer.prototype.constructor=b.jqplot.BezierAxisRenderer;b.jqplot.BezierAxisRenderer.prototype.init=function(f){b.extend(true,this,f);var c=this._dataBounds;for(var g=0;gc.max||c.max==null){c.max=k[e][0]}}else{if(k[e][1]c.max||c.max==null){c.max=k[e][1]}}}}else{if(this.name=="xaxis"||this.name=="x2axis"){if(k[0][0]c.max||c.max==null){c.max=k[0][0]}for(var e=0;e<5;e+=2){if(k[1][e]c.max||c.max==null){c.max=k[1][e]}}}else{if(k[0][1]c.max||c.max==null){c.max=k[0][1]}for(var e=1;e<6;e+=2){if(k[1][e]c.max||c.max==null){c.max=k[1][e]}}}}}};function a(g,f,d){d=d||{};d.axesDefaults=b.extend(true,{pad:0},d.axesDefaults);d.seriesDefaults=d.seriesDefaults||{};d.legend=b.extend(true,{placement:"outside"},d.legend);var c=false;if(d.seriesDefaults.renderer==b.jqplot.BezierCurveRenderer){c=true}else{if(d.series){for(var e=0;e0){this.data[q][u]+=this.data[q-1][u]}}this.data[this.data.length]=(u==1)?[this.data.length+1,s]:[s,this.data.length+1];this._data[this._data.length]=(u==1)?[this._data.length+1,s]:[s,this._data.length+1]}if(this.rendererOptions.groups>1){this.breakOnNull=true;var n=this.data.length;var v=parseInt(n/this.rendererOptions.groups,10);var r=0;for(var q=v;q570)?n[p]*0.8:n[p]+0.3*(255-n[p]);n[p]=parseInt(n[p],10)}q.push("rgb("+n[0]+","+n[1]+","+n[2]+")")}return q}function i(v,u,s,t,o){var q=v,w=v-1,n,p,r=(o==="x")?0:1;if(q>0){p=t.series[w]._plotData[u][r];if((s*p)<0){n=i(w,u,s,t,o)}else{n=t.series[w].gridData[u][r]}}else{n=(r===0)?t.series[q]._xaxis.series_u2p(0):t.series[q]._yaxis.series_u2p(0)}return n}d.jqplot.BarRenderer.prototype.draw=function(E,L,q,G){var I;var A=d.extend({},q);var w=(A.shadow!=undefined)?A.shadow:this.shadow;var O=(A.showLine!=undefined)?A.showLine:this.showLine;var F=(A.fill!=undefined)?A.fill:this.fill;var p=this.xaxis;var J=this.yaxis;var y=this._xaxis.series_u2p;var K=this._yaxis.series_u2p;var D,C;this._dataColors=[];this._barPoints=[];if(this.barWidth==null){this.renderer.setBarWidth.call(this)}var N=this._plotSeriesInfo=this.renderer.calcSeriesNumbers.call(this);var x=N[0];var v=N[1];var s=N[2];var H=[];if(this._stack){this._barNudge=0}else{this._barNudge=(-Math.abs(v/2-0.5)+s)*(this.barWidth+this.barPadding)}if(O){var u=new d.jqplot.ColorGenerator(this.negativeSeriesColors);var B=new d.jqplot.ColorGenerator(this.seriesColors);var M=u.get(this.index);if(!this.useNegativeColors){M=A.fillStyle}var t=A.fillStyle;var r;var P;var o;if(this.barDirection=="vertical"){for(var I=0;I0&&I=0){o=this._yaxis.series_u2p(0)}else{if(this._yaxis.min>0){o=E.canvas.height}else{o=0}}}else{if(this.waterfall&&I==this.gridData.length-1){if(this._yaxis.min<=0&&this._yaxis.max>=0){o=this._yaxis.series_u2p(0)}else{if(this._yaxis.min>0){o=E.canvas.height}else{o=0}}}else{o=E.canvas.height}}}}}if((this.fillToZero&&this._plotData[I][1]<0)||(this.waterfall&&this._data[I][1]<0)){if(this.varyBarColor&&!this._stack){if(this.useNegativeColors){A.fillStyle=u.next()}else{A.fillStyle=B.next()}}else{A.fillStyle=M}}else{if(this.varyBarColor&&!this._stack){A.fillStyle=B.next()}else{A.fillStyle=t}}if(!this.fillToZero||this._plotData[I][1]>=0){H.push([r-this.barWidth/2,o]);H.push([r-this.barWidth/2,L[I][1]]);H.push([r+this.barWidth/2,L[I][1]]);H.push([r+this.barWidth/2,o])}else{H.push([r-this.barWidth/2,L[I][1]]);H.push([r-this.barWidth/2,o]);H.push([r+this.barWidth/2,o]);H.push([r+this.barWidth/2,L[I][1]])}this._barPoints.push(H);if(w&&!this._stack){var z=d.extend(true,{},A);delete z.fillStyle;this.renderer.shadowRenderer.draw(E,H,z)}var n=A.fillStyle||this.color;this._dataColors.push(n);this.renderer.shapeRenderer.draw(E,H,A)}}else{if(this.barDirection=="horizontal"){for(var I=0;I0&&I=0){P=this._xaxis.series_u2p(0)}else{if(this._xaxis.min>0){P=0}else{P=0}}}else{if(this.waterfall&&I==this.gridData.length-1){if(this._xaxis.min<=0&&this._xaxis.max>=0){P=this._xaxis.series_u2p(0)}else{if(this._xaxis.min>0){P=0}else{P=E.canvas.width}}}else{P=0}}}}}if((this.fillToZero&&this._plotData[I][0]<0)||(this.waterfall&&this._data[I][0]<0)){if(this.varyBarColor&&!this._stack){if(this.useNegativeColors){A.fillStyle=u.next()}else{A.fillStyle=B.next()}}else{A.fillStyle=M}}else{if(this.varyBarColor&&!this._stack){A.fillStyle=B.next()}else{A.fillStyle=t}}if(!this.fillToZero||this._plotData[I][0]>=0){H.push([P,r+this.barWidth/2]);H.push([P,r-this.barWidth/2]);H.push([L[I][0],r-this.barWidth/2]);H.push([L[I][0],r+this.barWidth/2])}else{H.push([L[I][0],r+this.barWidth/2]);H.push([L[I][0],r-this.barWidth/2]);H.push([P,r-this.barWidth/2]);H.push([P,r+this.barWidth/2])}this._barPoints.push(H);if(w&&!this._stack){var z=d.extend(true,{},A);delete z.fillStyle;this.renderer.shadowRenderer.draw(E,H,z)}var n=A.fillStyle||this.color;this._dataColors.push(n);this.renderer.shapeRenderer.draw(E,H,A)}}}}if(this.highlightColors.length==0){this.highlightColors=d.jqplot.computeHighlightColors(this._dataColors)}else{if(typeof(this.highlightColors)=="string"){var N=this.highlightColors;this.highlightColors=[];for(var I=0;I570)?u[q]*0.8:u[q]+0.3*(255-u[q]);u[q]=parseInt(u[q],10)}this.highlightColors.push("rgba("+u[0]+","+u[1]+","+u[2]+", "+this.highlightAlpha+")")}}this.highlightColorGenerator=new f.jqplot.ColorGenerator(this.highlightColors);var m={fill:true,isarc:true,angle:this.shadowAngle,alpha:this.shadowAlpha,closePath:true};this.renderer.shadowRenderer.init(m);this.canvas=new f.jqplot.DivCanvas();this.canvas._plotDimensions=this._plotDimensions;t.eventListenerHooks.addOnce("jqplotMouseMove",a);t.eventListenerHooks.addOnce("jqplotMouseDown",b);t.eventListenerHooks.addOnce("jqplotMouseUp",k);t.eventListenerHooks.addOnce("jqplotClick",g);t.eventListenerHooks.addOnce("jqplotRightClick",l);t.postDrawHooks.addOnce(h)};f.jqplot.BubbleRenderer.prototype.setGridData=function(w){var q=this._xaxis.series_u2p;var m=this._yaxis.series_u2p;var t=this._plotData;this.gridData=[];var s=[];this.radii=[];var v=Math.min(w._height,w._width);for(var u=0;u
');if(this.escapeHtml){p.text(z)}else{p.html(z)}this.canvas._elem.append(p);var H=f(p).outerHeight();var v=f(p).outerWidth();var B=J[1]-0.5*H;var o=J[0]-0.5*v;p.css({top:B,left:o});this.labels[C]=f(p)}}};f.jqplot.DivCanvas=function(){f.jqplot.ElemContainer.call(this);this._ctx};f.jqplot.DivCanvas.prototype=new f.jqplot.ElemContainer();f.jqplot.DivCanvas.prototype.constructor=f.jqplot.DivCanvas;f.jqplot.DivCanvas.prototype.createElement=function(s,p,n){this._offsets=s;var m="jqplot-DivCanvas";if(p!=undefined){m=p}var r;if(this._elem){r=this._elem.get(0)}else{r=document.createElement("div")}if(n!=undefined){this._plotDimensions=n}var o=this._plotDimensions.width-this._offsets.left-this._offsets.right+"px";var q=this._plotDimensions.height-this._offsets.top-this._offsets.bottom+"px";this._elem=f(r);this._elem.css({position:"absolute",width:o,height:q,left:this._offsets.left,top:this._offsets.top});this._elem.addClass(m);return this._elem};f.jqplot.DivCanvas.prototype.setContext=function(){this._ctx={canvas:{width:0,height:0},clearRect:function(){return null}};return this._ctx};f.jqplot.BubbleCanvas=function(){f.jqplot.ElemContainer.call(this);this._ctx};f.jqplot.BubbleCanvas.prototype=new f.jqplot.ElemContainer();f.jqplot.BubbleCanvas.prototype.constructor=f.jqplot.BubbleCanvas;f.jqplot.BubbleCanvas.prototype.createElement=function(n,u,s){var m="jqplot-bubble-point";var q;if(this._elem){q=this._elem.get(0)}else{q=document.createElement("canvas")}q.width=(s!=null)?2*s:q.width;q.height=(s!=null)?2*s:q.height;this._elem=f(q);var o=(n!=null&&s!=null)?n-s:this._elem.css("left");var p=(u!=null&&s!=null)?u-s:this._elem.css("top");this._elem.css({position:"absolute",left:o,top:p});this._elem.addClass(m);if(f.jqplot.use_excanvas){window.G_vmlCanvasManager.init_(document);q=window.G_vmlCanvasManager.initElement(q)}return this._elem};f.jqplot.BubbleCanvas.prototype.draw=function(m,s,v,p){var D=this._ctx;var B=D.canvas.width/2;var z=D.canvas.height/2;D.save();if(v&&!f.jqplot.use_excanvas){m=m*1.04;var o=f.jqplot.getColorComponents(s);var u="rgba("+Math.round(o[0]+0.8*(255-o[0]))+", "+Math.round(o[1]+0.8*(255-o[1]))+", "+Math.round(o[2]+0.8*(255-o[2]))+", "+o[3]+")";var t="rgba("+o[0]+", "+o[1]+", "+o[2]+", 0)";var C=0.35*m;var A=B-Math.cos(p)*0.33*m;var n=z-Math.sin(p)*0.33*m;var w=D.createRadialGradient(A,n,C,B,z,m);w.addColorStop(0,u);w.addColorStop(0.93,s);w.addColorStop(0.96,t);w.addColorStop(1,t);D.fillStyle=w;D.fillRect(0,0,D.canvas.width,D.canvas.height)}else{D.fillStyle=s;D.strokeStyle=s;D.lineWidth=1;D.beginPath();var q=2*Math.PI;D.arc(B,z,m,0,q,0);D.closePath();D.fill()}D.restore()};f.jqplot.BubbleCanvas.prototype.setContext=function(){this._ctx=this._elem.get(0).getContext("2d");return this._ctx};f.jqplot.BubbleAxisRenderer=function(){f.jqplot.LinearAxisRenderer.call(this)};f.jqplot.BubbleAxisRenderer.prototype=new f.jqplot.LinearAxisRenderer();f.jqplot.BubbleAxisRenderer.prototype.constructor=f.jqplot.BubbleAxisRenderer;f.jqplot.BubbleAxisRenderer.prototype.init=function(n){f.extend(true,this,n);var I=this._dataBounds;var H=0,v=0,m=0,y=0,q=0,r=0,D=0,t=0,F=0,z=0;for(var E=0;E'+this.label+"
");this.canvas._elem.after(this._labelElem)}var m=(aM.shadow!=undefined)?aM.shadow:this.shadow;var N=(aM.showLine!=undefined)?aM.showLine:this.showLine;var I=(aM.fill!=undefined)?aM.fill:this.fill;var K=X.canvas.width;var S=X.canvas.height;if(this.padding==null){this.padding=Math.round(Math.min(K,S)/30)}var Q=K-ai-2*this.padding;var ab=S-ah-2*this.padding;if(this.labelPosition=="bottom"&&this.label){ab-=this._labelElem.outerHeight(true)}var L=Math.min(Q,ab);var ad=L;if(!this.diameter){if(this.semiCircular){if(Q>=2*ab){if(!this.ringWidth){this.ringWidth=2*ab/35}this.needleThickness=this.needleThickness||2+Math.pow(this.ringWidth,0.8);this.innerPad=this.ringWidth/2+this.needleThickness/2+this.needlePad;this.diameter=2*(ab-2*this.innerPad)}else{if(!this.ringWidth){this.ringWidth=Q/35}this.needleThickness=this.needleThickness||2+Math.pow(this.ringWidth,0.8);this.innerPad=this.ringWidth/2+this.needleThickness/2+this.needlePad;this.diameter=Q-2*this.innerPad-this.ringWidth-this.padding}this._center=[(K-at*ai)/2+at*ai,(S+at*ah-this.padding-this.ringWidth-this.innerPad)]}else{if(!this.ringWidth){this.ringWidth=ad/35}this.needleThickness=this.needleThickness||2+Math.pow(this.ringWidth,0.8);this.innerPad=0;this.diameter=ad-this.ringWidth;this._center=[(K-at*ai)/2+at*ai,(S-at*ah)/2+at*ah]}if(this._labelElem&&this.labelPosition=="bottom"){this._center[1]-=this._labelElem.outerHeight(true)}}this._radius=this.diameter/2;this.tickSpacing=6000/this.diameter;if(!this.hubRadius){this.hubRadius=this.diameter/18}this.shadowOffset=0.5+this.ringWidth/9;this.shadowWidth=this.ringWidth*1;this.tickPadding=3+Math.pow(this.diameter/20,0.7);this.tickOuterRadius=this._radius-this.ringWidth/2-this.tickPadding;this.tickLength=(this.showTicks)?this._radius/13:0;if(this.ticks.length==0){var A=this.max,aL=this.min,q=this.setmax,aG=this.setmin,au=(A-aL)*this.tickSpacing/this.span;var aw=Math.floor(parseFloat((Math.log(au)/Math.log(10)).toFixed(11)));var an=(au/Math.pow(10,aw));(an>2&&an<=2.5)?an=2.5:an=Math.ceil(an);var T=this.tickPositions;var aA,ak;for(aa=0;aa| date: | %s |
| open: | %s |
| hi: | %s |
| low: | %s |
| close: | %s |
'+T+"
").insertBefore(o.eventCanvas._elem);if(this.dataLabelCenterOn){P-=u.width()/2;O-=u.height()/2}else{P-=u.width()*Math.sin(U/2);O-=u.height()/2}P=Math.round(P);O=Math.round(O);u.css({left:P,top:O})}}};e.jqplot.PieAxisRenderer=function(){e.jqplot.LinearAxisRenderer.call(this)};e.jqplot.PieAxisRenderer.prototype=new e.jqplot.LinearAxisRenderer();e.jqplot.PieAxisRenderer.prototype.constructor=e.jqplot.PieAxisRenderer;e.jqplot.PieAxisRenderer.prototype.init=function(o){this.tickRenderer=e.jqplot.PieTickRenderer;e.extend(true,this,o);this._dataBounds={min:0,max:100};this.min=0;this.max=100;this.showTicks=false;this.ticks=[];this.showMark=false;this.show=false};e.jqplot.PieLegendRenderer=function(){e.jqplot.TableLegendRenderer.call(this)};e.jqplot.PieLegendRenderer.prototype=new e.jqplot.TableLegendRenderer();e.jqplot.PieLegendRenderer.prototype.constructor=e.jqplot.PieLegendRenderer;e.jqplot.PieLegendRenderer.prototype.init=function(o){this.numberRows=null;this.numberColumns=null;e.extend(true,this,o)};e.jqplot.PieLegendRenderer.prototype.draw=function(){var r=this;if(this.show){var B=this._series;this._elem=e(document.createElement("table"));this._elem.addClass("jqplot-table-legend");var E={position:"absolute"};if(this.background){E.background=this.background}if(this.border){E.border=this.border}if(this.fontSize){E.fontSize=this.fontSize}if(this.fontFamily){E.fontFamily=this.fontFamily}if(this.textColor){E.textColor=this.textColor}if(this.marginTop!=null){E.marginTop=this.marginTop}if(this.marginBottom!=null){E.marginBottom=this.marginBottom}if(this.marginLeft!=null){E.marginLeft=this.marginLeft}if(this.marginRight!=null){E.marginRight=this.marginRight}this._elem.css(E);var I=false,A=false,o,y;var C=B[0];var p=new e.jqplot.ColorGenerator(C.seriesColors);if(C.show){var J=C.data;if(this.numberRows){o=this.numberRows;if(!this.numberColumns){y=Math.ceil(J.length/o)}else{y=this.numberColumns}}else{if(this.numberColumns){y=this.numberColumns;o=Math.ceil(J.length/this.numberColumns)}else{o=J.length;y=1}}var H,G;var q,w,v;var x,z,F;var D=0;var u,t;for(H=0;H
-
-
-
- {hook name="configuration.top" location="configuration_top" }
-
-
-
-{/block}
-
-{block name="javascript-last-call"}
- {hook name="configuration.js" location="configuration-js" }
+{extends file="admin-layout.tpl"}
+
+{block name="no-return-functions"}
+ {$admin_current_location = 'configuration'}
+{/block}
+
+{block name="page-title"}{intl l='Configuration'}{/block}
+
+{block name="check-resource"}admin.configuration{/block}
+{block name="check-access"}view{/block}
+
+{block name="main-content"}
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {hook name="configuration.bottom" location="configuration_bottom" }
-
+
+
+{/block}
+
+{block name="javascript-last-call"}
+ {hook name="configuration.js" location="configuration-js" }
{/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/includes/module-tab-content.html b/templates/backOffice/default/includes/module-tab-content.html
index 88e2e08a..bc943b40 100644
--- a/templates/backOffice/default/includes/module-tab-content.html
+++ b/templates/backOffice/default/includes/module-tab-content.html
@@ -1,19 +1,19 @@
-{capture name="module_include"}
- {if $location}
- {hook name="$hook" location="$location" id="$id" view="$view" countvar="module_count"}
- {else}
- {hook name="$hook" id="$id" view="$view" countvar="module_count"}
- {/if}
-{/capture}
-
-{if trim($smarty.capture.module_include) == ''}
-
+
+
+
+ {hook name="configuration.top" location="configuration_top" }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {hook name="configuration.bottom" location="configuration_bottom" }
+ - -
-
-
-{else}
- {$smarty.capture.module_include nofilter}
-{/if}
+{capture name="module_include"}
+ {if $location}
+ {hook name="$hook" location="$location" id="$id" view="$view" countvar="module_count"}
+ {else}
+ {hook name="$hook" id="$id" view="$view" countvar="module_count"}
+ {/if}
+{/capture}
+
+{if trim($smarty.capture.module_include) == ''}
+ -
{intl l="There is currently no active module here."}
-+ +
+
+
+{else}
+ {$smarty.capture.module_include nofilter}
+{/if}
diff --git a/templates/frontOffice/aomc/I18n/en_US.php b/templates/frontOffice/aomc/I18n/en_US.php
index 76d17dee..1f6ca7ac 100755
--- a/templates/frontOffice/aomc/I18n/en_US.php
+++ b/templates/frontOffice/aomc/I18n/en_US.php
@@ -168,10 +168,10 @@ return array(
'Price descending' => 'Price descending',
'Proceed checkout' => 'Proceed checkout',
'Product Empty Button' => 'Add my first product',
- 'Product Empty Message' => 'It\'s really quick to add a product.
- +
{intl l="There is currently no active module here."}
+-
-
- Check NEW under the details tab if you want to see your product in the latest product section. -
- Check SALE under the details tab if you want to see your product in the offer product section. + 'Product Empty Message' => 'It\'s really quick to add a product. +
- Check NEW under the details tab if you want to see your product in the latest product section. +
- Check SALE under the details tab if you want to see your product in the offer product section.
- Check NEW under the details tab if you want to see your product in the latest product section. -
- Check SALE under the details tab if you want to see your product in the offer product section. + 'Product Empty Message' => 'It\'s really quick to add a product. +
- Check NEW under the details tab if you want to see your product in the latest product section. +
- Check SALE under the details tab if you want to see your product in the offer product section.
-
+
-
-
-
+