diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-06-22 21:37:03 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-06-22 21:37:03 +0200 |
| commit | 243f910ae4c1125566703ee53d5b4e31f13ea95b (patch) | |
| tree | 5eec0c402a069bbca9433190e2dcd7e6d9d5928d /core/templates | |
| parent | 4d312f78497d0134ad2315863db69747be5dd108 (diff) | |
| parent | f4b937c6fe325b1ad8bceb7ceba69a9a8a068bcd (diff) | |
| download | nextcloud-server-243f910ae4c1125566703ee53d5b4e31f13ea95b.tar.gz nextcloud-server-243f910ae4c1125566703ee53d5b4e31f13ea95b.zip | |
Merge branch 'master' into oc_error
Diffstat (limited to 'core/templates')
| -rw-r--r-- | core/templates/layout.guest.php | 2 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 4 | ||||
| -rw-r--r-- | core/templates/login.php | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 55cc8008d9a..4cdbfd16e52 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -12,7 +12,7 @@ <?php endforeach; ?> <script type="text/javascript"> var oc_webroot = '<?php echo OC::$WEBROOT; ?>'; - var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>'; + var oc_appswebroots = <?php echo $_['apps_paths'] ?>; </script> <?php if (!empty(OC_Util::$core_scripts)): ?> <script type="text/javascript" src="<?php echo OC_Helper::linkToRemote('core.js', false) ?>"></script> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 500ac9beda3..d6911fd1e18 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -12,7 +12,7 @@ <?php endforeach; ?> <script type="text/javascript"> var oc_webroot = '<?php echo OC::$WEBROOT; ?>'; - var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>'; + var oc_appswebroots = <?php echo $_['apps_paths'] ?>; var oc_current_user = '<?php echo OC_User::getUser() ?>'; </script> <?php if (!empty(OC_Util::$core_scripts)): ?> @@ -47,7 +47,7 @@ <a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg" src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a> <a class="header-right header-action" id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true"><img class="svg" alt="<?php echo $l->t('Log out');?>" title="<?php echo $l->t('Log out');?>" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a> <form class="searchbox header-right" action="#" method="post"> - <input id="searchbox" class="svg" type="search" name="query" value="<?php if(isset($_POST['query'])){echo htmlentities($_POST['query']);};?>" autocomplete="off" /> + <input id="searchbox" class="svg" type="search" name="query" value="<?php if(isset($_POST['query'])){echo OC_Util::sanitizeHTML($_POST['query']);};?>" autocomplete="off" /> </form> </div></header> diff --git a/core/templates/login.php b/core/templates/login.php index a40bf5c330a..985cf90c2a2 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -7,7 +7,7 @@ <?php endif; ?> <p class="infield"> <label for="user" class="infield"><?php echo $l->t( 'Username' ); ?></label> - <input type="text" name="user" id="user" value="<?php echo !empty($_POST['user'])?htmlentities($_POST['user'],ENT_COMPAT,'utf-8').'"':'" autofocus'; ?> autocomplete="off" required /> + <input type="text" name="user" id="user" value="<?php echo !empty($_POST['user'])?OC_Util::sanitizeHTML($_POST['user'],ENT_COMPAT,'utf-8').'"':'" autofocus'; ?> autocomplete="off" required /> </p> <p class="infield"> <label for="password" class="infield"><?php echo $l->t( 'Password' ); ?></label> |