diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2013-01-21 20:24:18 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2013-01-21 20:24:18 +0100 |
| commit | 8ca78fcf3f06c17707349f047d220eda43c63294 (patch) | |
| tree | cb0b5c20818b8125c53b570ada469f39643aa3f0 /core/js | |
| parent | 5fff57339f5fa6ca6206f41a36e291e9662fe6ef (diff) | |
| download | nextcloud-server-8ca78fcf3f06c17707349f047d220eda43c63294.tar.gz nextcloud-server-8ca78fcf3f06c17707349f047d220eda43c63294.zip | |
Move requesttoken to oc-requesttoken.js
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/config.php | 9 | ||||
| -rw-r--r-- | core/js/oc-requesttoken.js | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/core/js/config.php b/core/js/config.php index bab9e6fd7e6..e838fb1cd04 100644 --- a/core/js/config.php +++ b/core/js/config.php @@ -23,7 +23,7 @@ $array = array( "oc_webroot" => "\"".OC::$WEBROOT."\"", "oc_appswebroots" => "\"".$_['apps_paths']. "\"", "oc_current_user" => "\"".OC_User::getUser(). "\"", - "oc_requesttoken" => "\"".$_['requesttoken']. "\"", + "oc_requesttoken" => "\"".OC_Util::callRegister(). "\"", "datepickerFormatDate" => json_encode($l->l('jsdate', 'jsdate')), "dayNames" => json_encode(array((string)$l->t('Sunday'), (string)$l->t('Monday'), (string)$l->t('Tuesday'), (string)$l->t('Wednesday'), (string)$l->t('Thursday'), (string)$l->t('Friday'), (string)$l->t('Saturday'))), "monthNames" => json_encode(array((string)$l->t('January'), (string)$l->t('February'), (string)$l->t('March'), (string)$l->t('April'), (string)$l->t('May'), (string)$l->t('June'), (string)$l->t('July'), (string)$l->t('August'), (string)$l->t('September'), (string)$l->t('October'), (string)$l->t('November'), (string)$l->t('December'))), @@ -34,9 +34,4 @@ $array = array( foreach ($array as $setting => $value) { echo("var ". $setting ."=".$value.";\n"); } -?> -requesttoken = '<?php echo $_['requesttoken']; ?>'; -OC.EventSource.requesttoken=requesttoken; -$(document).bind('ajaxSend', function(elm, xhr, s) { - xhr.setRequestHeader('requesttoken', requesttoken); -});
\ No newline at end of file +?>
\ No newline at end of file diff --git a/core/js/oc-requesttoken.js b/core/js/oc-requesttoken.js new file mode 100644 index 00000000000..f4cf286b8aa --- /dev/null +++ b/core/js/oc-requesttoken.js @@ -0,0 +1,3 @@ +$(document).bind('ajaxSend', function(elm, xhr, s) { + xhr.setRequestHeader('requesttoken', oc_requesttoken); +});
\ No newline at end of file |