[Gemstracker-svn] SF.net SVN: gemstracker:[658] trunk/library/classes/Gems/User/User.php

[<gem...@li...>]

Revision: 658
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=658&view=rev
Author:   mennodekker
Date:     2012-05-03 13:25:28 +0000 (Thu, 03 May 2012)
Log Message:
-----------
Unit test no longer fails on notice for missing $_SERVER['REMOTE_ADDR'] when run from commandline

Modified Paths:
--------------
    trunk/library/classes/Gems/User/User.php

Modified: trunk/library/classes/Gems/User/User.php
===================================================================
--- trunk/library/classes/Gems/User/User.php	2012-05-03 10:56:16 UTC (rev 657)
+++ trunk/library/classes/Gems/User/User.php	2012-05-03 13:25:28 UTC (rev 658)
@@ -421,7 +421,10 @@
      */
     protected function authorizeIp()
     {
-        if ($this->util->isAllowedIP($_SERVER['REMOTE_ADDR'], $this->getAllowedIPRanges())) {
+        //In unit test REMOTE_ADDR is not available and will return null
+        $request = Zend_Controller_Front::getInstance()->getRequest();
+        $remoteIp = $request->getServer('REMOTE_ADDR');
+        if ($this->util->isAllowedIP($remoteIp, $this->getAllowedIPRanges())) {
             return true;
         } else {
             return $this->translate->_('You are not allowed to login from this location.');

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