diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-06-15 20:48:37 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-06-15 20:48:37 +0200 |
| commit | 2c8a61ae9c1437ded36ecba6eba5e1bc9d7e7948 (patch) | |
| tree | 00815e65a25a6243289902d77137f84a3433d9c2 /core/templates | |
| parent | 9f82edc157b28b501dec8bf29e63c5e7e05b01e1 (diff) | |
| parent | f06c08a63742de9adea4a146a4480b71ad254f20 (diff) | |
| download | nextcloud-server-2c8a61ae9c1437ded36ecba6eba5e1bc9d7e7948.tar.gz nextcloud-server-2c8a61ae9c1437ded36ecba6eba5e1bc9d7e7948.zip | |
Merge branch 'master' into oc_error
Diffstat (limited to 'core/templates')
| -rw-r--r-- | core/templates/404.php | 2 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 10 | ||||
| -rw-r--r-- | core/templates/login.php | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/core/templates/404.php b/core/templates/404.php index cd4f2b40bb2..13a81010343 100644 --- a/core/templates/404.php +++ b/core/templates/404.php @@ -10,6 +10,6 @@ if(!isset($_)){//also provide standalone error page <ul> <li class='error'> <?php echo $l->t( 'Cloud not found' ); ?><br/> - <p class='hint'><?php if(isset($_['file'])) echo htmlentities($_['file'])?></p> + <p class='hint'><?php if(isset($_['file'])) echo $_['file']?></p> </li> </ul> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index e04fcabf137..e271acf10ee 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -30,6 +30,16 @@ echo '/>'; ?> <?php endforeach; ?> + <script type="text/javascript"> + $(function() { + requesttoken = '<?php echo $_['requesttoken']; ?>'; + $(document).bind('ajaxSend', function(elm, xhr, s){ + if(requesttoken) { + xhr.setRequestHeader('requesttoken', requesttoken); + } + }); + }); + </script> </head> <body id="<?php echo $_['bodyid'];?>"> diff --git a/core/templates/login.php b/core/templates/login.php index 41d6ba41ef8..a40bf5c330a 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -1,7 +1,7 @@ <!--[if IE 8]><style>input[type="checkbox"]{padding:0;}</style><![endif]--> <form action="index.php" method="post"> <fieldset> - <?php if(!empty($_['redirect'])) { echo '<input type="hidden" name="redirect_url" value="'.htmlentities($_['redirect']).'" />'; } ?> + <?php if(!empty($_['redirect'])) { echo '<input type="hidden" name="redirect_url" value="'.$_['redirect'].'" />'; } ?> <?php if($_['error']): ?> <a href="./core/lostpassword/"><?php echo $l->t('Lost your password?'); ?></a> <?php endif; ?> |