[phpwiki-checkins] SF.net SVN: phpwiki:[9323] trunk/lib/WikiGroup.php

[<var...@us...>]

Revision: 9323
          http://sourceforge.net/p/phpwiki/code/9323
Author:   vargenau
Date:     2014-11-17 15:59:00 +0000 (Mon, 17 Nov 2014)
Log Message:
-----------
Add return

Modified Paths:
--------------
    trunk/lib/WikiGroup.php

Modified: trunk/lib/WikiGroup.php
===================================================================
--- trunk/lib/WikiGroup.php	2014-11-17 15:34:21 UTC (rev 9322)
+++ trunk/lib/WikiGroup.php	2014-11-17 15:59:00 UTC (rev 9323)
@@ -136,6 +136,7 @@
                 trigger_error(_("No or unsupported GROUP_METHOD defined"), E_USER_WARNING);
                 return new WikiGroup($not_current);
         }
+        return null;
     }
 
     /** ACL PagePermissions will need those special groups based on the User status only.
@@ -370,8 +371,8 @@
                 // this could get complex so just return an empty array
                 return false;
             default:
-                trigger_error(__sprintf("Unknown special group “%s”", $group),
-                    E_USER_WARNING);
+                trigger_error(__sprintf("Unknown special group “%s”", $group), E_USER_WARNING);
+                return false;
         }
     }
 
@@ -558,7 +559,6 @@
         }
 
         global $request;
-        $dbh = &$request->_dbi;
         $master_page = $request->getPage(CATEGORY_GROUP_PAGE);
         $master_list = $master_page->getLinks(true);
         while ($group_page = $master_list->next()) {
@@ -611,13 +611,13 @@
  */
 class GroupDb extends WikiGroup
 {
-
     public $_is_member, $_group_members, $_user_groups;
 
     function __construct()
     {
-        global $DBAuthParams, $DBParams;
-        //$this->request = &$GLOBALS['request'];
+        global $DBAuthParams;
+        global $request;
+
         $this->username = $this->_getUserName();
         $this->membership = array();
 
@@ -627,7 +627,7 @@
         ) {
             trigger_error(_("No or not enough GROUP_DB SQL statements defined"),
                 E_USER_WARNING);
-            return new GroupNone();
+            return;
         }
         if (empty($this->user)) {
             // use _PassUser::prepare instead
@@ -848,14 +848,12 @@
         $this->membership = array();
 
         if (!defined('AUTH_GROUP_FILE')) {
-            trigger_error(sprintf(_("%s: not defined"), "AUTH_GROUP_FILE"),
-                E_USER_WARNING);
-            return false;
+            trigger_error(sprintf(_("%s: not defined"), "AUTH_GROUP_FILE"), E_USER_WARNING);
+            return;
         }
         if (!file_exists(AUTH_GROUP_FILE)) {
-            trigger_error(sprintf(_("Cannot open AUTH_GROUP_FILE %s"), AUTH_GROUP_FILE),
-                E_USER_WARNING);
-            return false;
+            trigger_error(sprintf(_("Cannot open AUTH_GROUP_FILE %s"), AUTH_GROUP_FILE), E_USER_WARNING);
+            return;
         }
         require_once 'lib/pear/File_Passwd.php';
         $this->_file = new File_Passwd(AUTH_GROUP_FILE, false, AUTH_GROUP_FILE . ".lock");
@@ -998,6 +996,7 @@
             return true;
         if ($this->specialGroup($group))
             return $this->isSpecialMember($group);
+        return false;
     }
 
     /**

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.