prevent php errors for potentially uninitialised var

Conflicts: tpl_functions.php
selfthinker · Nov 18, 2013 · 7ce7c37 · 7ce7c37
1 parent 5a8e6af
commit 7ce7c37
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/main.php b/main.php
@@ -11,7 +11,7 @@
 @require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */
 header('X-UA-Compatible: IE=edge,chrome=1');
 
-$showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER['REMOTE_USER'] );
+$showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && !empty($_SERVER['REMOTE_USER']) );
 $showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show');
 ?><!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang'] ?>"
@@ -65,7 +65,7 @@
                         <ul>
                             <?php /* the optional second parameter of tpl_action() switches between a link and a button,
                                      e.g. a button inside a <li> would be: tpl_action('edit', 0, 'li') */
-                                if ($_SERVER['REMOTE_USER']) {
+                                if (!empty($_SERVER['REMOTE_USER'])) {
                                     echo '<li class="user">';
                                     tpl_userinfo(); /* 'Logged in as ...' */
                                     echo '</li>';

diff --git a/tpl_functions.php b/tpl_functions.php
@@ -47,7 +47,7 @@ function _tpl_discussion($discussionPage, $title, $backTitle, $link=0, $wrapper=
  * @author Anika Henke <anika@selfthinker.org>
  */
 function _tpl_userpage($userPage, $title, $link=0, $wrapper=0) {
-    if (!$_SERVER['REMOTE_USER']) return;
+    if (empty($_SERVER['REMOTE_USER'])) return;
 
     global $conf;
     $userPage = str_replace('@USER@', $_SERVER['REMOTE_USER'], $userPage);
@@ -93,7 +93,7 @@ function tpl_classes() {
             'dokuwiki',
             'mode_'.$ACT,
             'tpl_'.$conf['template'],
-            $_SERVER['REMOTE_USER'] ? 'loggedIn' : '',
+            !empty($_SERVER['REMOTE_USER']) ? 'loggedIn' : '',
             $INFO['exists'] ? '' : 'notFound',
             ($ID == $conf['start']) ? 'home' : '',
         );