@@ -14,6 +14,9 @@ discard block |
||
| 14 | 14 | class Session implements \ArrayAccess |
| 15 | 15 | { |
| 16 | 16 | |
| 17 | + /** |
|
| 18 | + * @param string $variable |
|
| 19 | + */ |
|
| 17 | 20 | static function read($variable, $default = null) |
| 18 | 21 | { |
| 19 | 22 | return isset($_SESSION[$variable]) ? $_SESSION[$variable] : $default; |
@@ -39,7 +42,7 @@ discard block |
||
| 39 | 42 | * Returns true if session has variable set up, false otherwise. |
| 40 | 43 | * |
| 41 | 44 | * @param string $variable |
| 42 | - * @return mixed value |
|
| 45 | + * @return boolean value |
|
| 43 | 46 | */ |
| 44 | 47 | static function has($variable) |
| 45 | 48 | { |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | $renderer->setHeaderTemplate('<legend>{header}</legend>'); |
| 102 | 102 | |
| 103 | 103 | //Set required field template |
| 104 | - $this->setRequiredNote('<span class="form_required">*</span> <small>' . get_lang('ThisFieldIsRequired') . '</small>'); |
|
| 104 | + $this->setRequiredNote('<span class="form_required">*</span> <small>'.get_lang('ThisFieldIsRequired').'</small>'); |
|
| 105 | 105 | $noteTemplate = <<<EOT |
| 106 | 106 | <div class="form-group"> |
| 107 | 107 | <div class="col-sm-offset-2 col-sm-10">{requiredNote}</div> |
@@ -853,9 +853,9 @@ discard block |
||
| 853 | 853 | $label = get_lang('PleaseStandBy'); |
| 854 | 854 | } |
| 855 | 855 | $this->with_progress_bar = true; |
| 856 | - $this->updateAttributes("onsubmit=\"javascript: myUpload.start('dynamic_div','".Display::returnIconPath('progress_bar.gif')."','" . $label . "','" . $this->getAttribute('id') . "')\""); |
|
| 857 | - $this->addElement('html', '<script language="javascript" src="' . api_get_path(WEB_LIBRARY_PATH) . 'javascript/upload.js" type="text/javascript"></script>'); |
|
| 858 | - $this->addElement('html', '<script type="text/javascript">var myUpload = new upload(' . (abs(intval($delay)) * 1000) . ');</script>'); |
|
| 856 | + $this->updateAttributes("onsubmit=\"javascript: myUpload.start('dynamic_div','".Display::returnIconPath('progress_bar.gif')."','".$label."','".$this->getAttribute('id')."')\""); |
|
| 857 | + $this->addElement('html', '<script language="javascript" src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/upload.js" type="text/javascript"></script>'); |
|
| 858 | + $this->addElement('html', '<script type="text/javascript">var myUpload = new upload('.(abs(intval($delay)) * 1000).');</script>'); |
|
| 859 | 859 | } |
| 860 | 860 | |
| 861 | 861 | /** |
@@ -872,11 +872,11 @@ discard block |
||
| 872 | 872 | return; |
| 873 | 873 | } |
| 874 | 874 | |
| 875 | - $xajax_upload = new xajax(api_get_path(WEB_LIBRARY_PATH) . 'upload.xajax.php'); |
|
| 875 | + $xajax_upload = new xajax(api_get_path(WEB_LIBRARY_PATH).'upload.xajax.php'); |
|
| 876 | 876 | |
| 877 | 877 | $xajax_upload->registerFunction('updateProgress'); |
| 878 | 878 | // IMPORTANT : must be the first element of the form |
| 879 | - $el = $this->insertElementBefore(FormValidator::createElement('html', '<input type="hidden" name="UPLOAD_IDENTIFIER" value="' . $upload_id . '" />'), $element_after); |
|
| 879 | + $el = $this->insertElementBefore(FormValidator::createElement('html', '<input type="hidden" name="UPLOAD_IDENTIFIER" value="'.$upload_id.'" />'), $element_after); |
|
| 880 | 880 | |
| 881 | 881 | $this->addElement('html', '<br />'); |
| 882 | 882 | |
@@ -884,7 +884,7 @@ discard block |
||
| 884 | 884 | $this->addElement( |
| 885 | 885 | 'html', |
| 886 | 886 | '<div id="dynamic_div_container" style="display:none"> |
| 887 | - <div id="dynamic_div_label">' . get_lang('UploadFile') . '</div> |
|
| 887 | + <div id="dynamic_div_label">' . get_lang('UploadFile').'</div> |
|
| 888 | 888 | <div id="dynamic_div_frame" style="width:214px; height:12px; border:1px solid grey; background-image:url(' . Display::returnIconPath('real_upload_frame.gif').');"> |
| 889 | 889 | <div id="dynamic_div_filled" style="width:0%;height:100%;background-image:url(' . Display::returnIconPath('real_upload_step.gif').');background-repeat:repeat-x;background-position:center;"></div> |
| 890 | 890 | </div> |
@@ -895,7 +895,7 @@ discard block |
||
| 895 | 895 | $this->addElement('html', ' |
| 896 | 896 | <div id="dynamic_div_waiter_container" style="display:none"> |
| 897 | 897 | <div id="dynamic_div_waiter_label"> |
| 898 | - ' . get_lang('SlideshowConversion') . ' |
|
| 898 | + ' . get_lang('SlideshowConversion').' |
|
| 899 | 899 | </div> |
| 900 | 900 | <div id="dynamic_div_waiter_frame"> |
| 901 | 901 | '.Display::return_icon('real_upload_frame.gif').' |
@@ -905,18 +905,18 @@ discard block |
||
| 905 | 905 | } |
| 906 | 906 | |
| 907 | 907 | // Get the xajax code |
| 908 | - $this->addElement('html', $xajax_upload->getJavascript(api_get_path(WEB_LIBRARY_PATH) . 'xajax')); |
|
| 908 | + $this->addElement('html', $xajax_upload->getJavascript(api_get_path(WEB_LIBRARY_PATH).'xajax')); |
|
| 909 | 909 | |
| 910 | 910 | // Get the upload code |
| 911 | - $this->addElement('html', '<script language="javascript" src="' . api_get_path(WEB_LIBRARY_PATH) . 'javascript/upload.js" type="text/javascript"></script>'); |
|
| 912 | - $this->addElement('html', '<script type="text/javascript">var myUpload = new upload(' . (abs(intval($delay)) * 1000) . ');</script>'); |
|
| 911 | + $this->addElement('html', '<script language="javascript" src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/upload.js" type="text/javascript"></script>'); |
|
| 912 | + $this->addElement('html', '<script type="text/javascript">var myUpload = new upload('.(abs(intval($delay)) * 1000).');</script>'); |
|
| 913 | 913 | |
| 914 | 914 | if (!$wait_after_upload) { |
| 915 | 915 | $wait_after_upload = 0; |
| 916 | 916 | } |
| 917 | 917 | |
| 918 | 918 | // Add the upload event |
| 919 | - $this->updateAttributes("onsubmit=\"javascript: myUpload.startRealUpload('dynamic_div','" . $upload_id . "','" . $this->getAttribute('id') . "'," . $wait_after_upload . ")\""); |
|
| 919 | + $this->updateAttributes("onsubmit=\"javascript: myUpload.startRealUpload('dynamic_div','".$upload_id."','".$this->getAttribute('id')."',".$wait_after_upload.")\""); |
|
| 920 | 920 | } |
| 921 | 921 | |
| 922 | 922 | /** |
@@ -1421,7 +1421,7 @@ discard block |
||
| 1421 | 1421 | }); |
| 1422 | 1422 | }).on('fileuploadfail', function (e, data) { |
| 1423 | 1423 | $.each(data.files, function (index) { |
| 1424 | - var failedMessage = '" . get_lang('UplUploadFailed') . "'; |
|
| 1424 | + var failedMessage = '" . get_lang('UplUploadFailed')."'; |
|
| 1425 | 1425 | var error = $('<span class=\"text-danger\"/>').text(failedMessage); |
| 1426 | 1426 | $(data.context.children()[index]) |
| 1427 | 1427 | .append('<br>') |