From 63d51980e17b34c16fdff2cb5bc6f9924a8f1d61 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Sat, 11 May 2013 21:07:05 +0200
Subject: [PATCH] Get config from template
---
core/js/config.php | 6 +++---
core/templates/layout.user.php | 2 +-
lib/templatelayout.php | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/core/js/config.php b/core/js/config.php
index 0aaa448228..8a377c2da1 100644
--- a/core/js/config.php
+++ b/core/js/config.php
@@ -26,8 +26,8 @@ $array = array(
"oc_debug" => (defined('DEBUG') && DEBUG) ? 'true' : 'false',
"oc_webroot" => "\"".OC::$WEBROOT."\"",
"oc_appswebroots" => str_replace('\\/', '/', json_encode($apps_paths)), // Ugly unescape slashes waiting for better solution
- "oc_current_user" => "\"".OC_User::getUser(). "\"",
- "oc_requesttoken" => "\"".OC_Util::callRegister(). "\"",
+ "oc_current_user" => "document.head.getAttribute('data-user');",
+ "oc_requesttoken" => "document.head.getAttribute('data-requesttoken');",
"datepickerFormatDate" => json_encode($l->l('jsdate', 'jsdate')),
"dayNames" => json_encode(
array(
@@ -62,4 +62,4 @@ $array = array(
// Echo it
foreach ($array as $setting => $value) {
echo("var ". $setting ."=".$value.";\n");
-}
+}
\ No newline at end of file
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 4dc4a2c759..6e49149b0a 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -5,7 +5,7 @@
<!--[if IE 9]><html class="ng-csp ie ie9 lte9"><![endif]-->
<!--[if gt IE 9]><html class="ng-csp ie"><![endif]-->
<!--[if !IE]><!--><html class="ng-csp"><!--<![endif]-->
- <head>
+ <head data-user="<?php p($_['user_uid']); ?>" data-requesttoken="<?php p($_['requesttoken']); ?>">
<title><?php p(!empty($_['application'])?$_['application'].' | ':'') ?>ownCloud
<?php p(trim($_['user_displayname']) != '' ?' ('.$_['user_displayname'].') ':'') ?></title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
diff --git a/lib/templatelayout.php b/lib/templatelayout.php
index d385bb7f19..7115b8f030 100644
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -56,7 +56,7 @@ class OC_TemplateLayout extends OC_Template {
$jsfiles = self::findJavascriptFiles(OC_Util::$scripts);
$this->assign('jsfiles', array(), false);
if (OC_Config::getValue('installed', false) && $renderas!='error') {
- $this->append( 'jsfiles', OC_Helper::linkToRoute('js_config'));
+ $this->append( 'jsfiles', OC_Helper::linkToRoute('js_config') . $versionParameter);
}
if (!empty(OC_Util::$core_scripts)) {
$this->append( 'jsfiles', OC_Helper::linkToRemoteBase('core.js', false) . $versionParameter);
--
GitLab