move chars_encode to display library

git-svn-id: svn://presbrey.mit.edu/sql/mitsql@103 a142d4bd-2cfb-0310-9673-cb33a7e74f58

diff --git a/lib/display.lib.php b/lib/display.lib.php
index 4dfb81c00b8a19a0868a265738e043d323f24500..1b890044774a4e2606677e61ac1222c43753b723 100644 (file)
--- a/lib/display.lib.php
+++ b/lib/display.lib.php
@@ -60,4 +60,14 @@ function printBar($percent, $txt1 = '', $txt2 = '') {
                                </table>';
 }
 
+function chars_encode($string) {
+   $chars = array();
+   $ent = null;
+   $chars = preg_split('//', $string, -1, PREG_SPLIT_NO_EMPTY);
+   for ($i = 0; $i < count($chars); $i++)
+               $ent[$i] = '&#' . ord($chars[$i]) . ';';
+   if (sizeof($ent) < 1) return '';
+   return implode('',$ent);
+}
+
 ?>

diff --git a/tpl/head.php b/tpl/head.php
index 8b17dae7293c88f7385ba6cd8c8bc18a2fdb33ed..bf2ea39bb77a00d73382da8d7623b1bf2e536c73 100644 (file)
--- a/tpl/head.php
+++ b/tpl/head.php
@@ -1,16 +1,5 @@
 <?php\r
 \r
-function chars_encode($string) {\r
-   $chars = array();\r
-   $ent = null;\r
-   $chars = preg_split("//", $string, -1, PREG_SPLIT_NO_EMPTY);\r
-   for ($i = 0; $i < count($chars); $i++)\r
-               $ent[$i] = "&#" . ord($chars[$i]) . ";";\r
-   if (sizeof($ent) < 1)\r
-     return "";\r
-   return implode("",$ent);\r
-}\r
-\r
 if (isOffline()) {\r
        switch(THIS_PAGE) {\r
                case 'do/contact':\r

diff --git a/tpl/menu.php b/tpl/menu.php
index 7de4ac47bc371fe10f637effaafca6ff92e528ce..ea2347c63b92140c3359595bef29f981528b7575 100644 (file)
--- a/tpl/menu.php
+++ b/tpl/menu.php
@@ -1,7 +1,7 @@
                                <div id="hnav">
                                        <ul id="navlist">
 <?php if (isLoggedIn()): ?>
-<div style="float:left">
+<div style="float:left;">
 <li><a href="do/main?refresh">Databases</a></li>
 <li><a href="do/setup">Account</a></li>
 <?php if (isAdmin()) { ?>
@@ -25,7 +25,7 @@ Logged in: <em><?=$loggedInText?>@<?=DBHOST?></em>&nbsp;
 <li><a href="do/index">Home</a></li>
 </div>
 <div style="text-align: right;">
-Login via <li><a href="do/login?ssl=0">SQL Password</a><li><a href="do/login?ssl=1">MIT Certificate</a></li>
+Login via: <li><a href="do/login?ssl=0">SQL Password</a></li><li><a href="do/login?ssl=1">MIT Certificate</a></li>
 </div>
 <?php endif; ?>
                                        </ul>