Fix some non-utf8-friendly htmlentities (resulting in wrong display of utf8-encoded...

diff --git a/apps/bookmarks/templates/list.php b/apps/bookmarks/templates/list.php
index ced6154c1986533749e215f02d9190cfcd45071c..d28909e195960f0716f0669a6a7564549c6859c7 100644 (file)
--- a/apps/bookmarks/templates/list.php
+++ b/apps/bookmarks/templates/list.php
@@ -7,7 +7,7 @@
  * See the COPYING-README file.
  */
 ?>
-<input type="hidden" id="bookmarkFilterTag" value="<?php if(isset($_GET['tag'])) echo htmlentities($_GET['tag']); ?>" />
+<input type="hidden" id="bookmarkFilterTag" value="<?php if(isset($_GET['tag'])) echo htmlentities($_GET['tag'],ENT_COMPAT | ENT_HTML401,'utf-8'); ?>" />
 <div id="controls">
        <input type="hidden" id="bookmark_add_id" value="0" />
        <input type="text" id="bookmark_add_url" placeholder="<?php echo $l->t('Address'); ?>" class="bookmarks_input" />

diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 72e45d5327561a9a7c0579b4a8e2be6a6664cb7a..f8c1b1bdf516eef8a1eb4ce3d31f3a3ebea33f92 100755 (executable)
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -15,7 +15,7 @@
                                <form data-upload-id='1' class="file_upload_form" action="<?php echo OCP\Util::linkTo('files', 'ajax/upload.php'); ?>" method="post" enctype="multipart/form-data" target="file_upload_target_1">
                                        <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
                                        <input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
-                                       <input type="hidden" name="dir" value="<?php echo htmlentities($_['dir']) ?>" id="dir">
+                                       <input type="hidden" name="dir" value="<?php echo htmlentities($_['dir'],ENT_COMPAT | ENT_HTML401,'utf-8') ?>" id="dir">
                                        <button class="file_upload_filename">&nbsp;<img class='svg action' alt="Upload" src="<?php echo OCP\image_path("core", "actions/upload.svg"); ?>" /></button>
                                        <input class="file_upload_start" type="file" name='files[]'/>
                                                <a href="#" class="file_upload_button_wrapper" onclick="return false;" title="<?php echo $l->t('Upload'); echo  ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a>

diff --git a/apps/files/templates/part.breadcrumb.php b/apps/files/templates/part.breadcrumb.php
index 41d2c5c8e765a6d62348235d88d4614a90e5e108..f45600543b7a7db00462a06c25654800126a087a 100755 (executable)
--- a/apps/files/templates/part.breadcrumb.php
+++ b/apps/files/templates/part.breadcrumb.php
@@ -1,6 +1,6 @@
        <?php for($i=0; $i<count($_["breadcrumb"]); $i++):
         $crumb = $_["breadcrumb"][$i]; ?>
                <div class="crumb <?php if($i == count($_["breadcrumb"])-1) echo 'last';?> svg" data-dir='<?php echo $crumb["dir"];?>' style='background-image:url("<?php echo OCP\image_path('core','breadcrumb.png');?>")'>
-               <a href="<?php echo $_['baseURL'].$crumb["dir"]; ?>"><?php echo htmlentities($crumb["name"]); ?></a>
+               <a href="<?php echo $_['baseURL'].$crumb["dir"]; ?>"><?php echo htmlentities($crumb["name"],ENT_COMPAT | ENT_HTML401,'utf-8'); ?></a>
                </div>
-       <?php endfor;?>
\ No newline at end of file
+       <?php endfor;?>

diff --git a/core/templates/login.php b/core/templates/login.php
index 4035dfe8a5af4204e8c5280d66c2e2680938c065..f693033b0e50dad62e056a20e820a7b7ca732621 100644 (file)
--- 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']).'"':'" autofocus'; ?> autocomplete="off" required />
+                       <input type="text" name="user" id="user" value="<?php echo !empty($_POST['user'])?htmlentities($_POST['user'],ENT_COMPAT | ENT_HTML401,'utf-8').'"':'" autofocus'; ?> autocomplete="off" required />
                </p>
                <p class="infield">
                        <label for="password" class="infield"><?php echo $l->t( 'Password' ); ?></label>