From: arno Date: Mon, 27 Sep 2010 17:53:34 +0000 (+0200) Subject: revert a86eeac0ab678ea55307e1386c5f955f77d8ff73 X-Git-Tag: v0.2.1 X-Git-Url: https://dev.renevier.net/?p=syj.git;a=commitdiff_plain;h=a3870411b5c5217e7b2f063d2929fc2e14daa962;hp=dfdbbefb4b79dd3d04123ccf3128172684721371 revert a86eeac0ab678ea55307e1386c5f955f77d8ff73 --- diff --git a/application/controllers/IdxController.php b/application/controllers/IdxController.php index 3996fa0..ee1efb0 100644 --- a/application/controllers/IdxController.php +++ b/application/controllers/IdxController.php @@ -66,8 +66,7 @@ class IdxController extends Zend_Controller_Action $geomform->geom_title->setValue($path->title); } else { $geomform->setAction('path'); - $clientip = trim(end(split(',', $this->getRequest()->getClientIp(true)))); - $extent = new phptojs\JsObject('gMaxExtent', $this->_helper->syjGeoip($clientip)); + $extent = new phptojs\JsObject('gMaxExtent', $this->_helper->syjGeoip($this->getRequest()->getClientIp(true))); $this->view->headScript()->prependScript((string) $extent); $title = "Show your journey"; } diff --git a/application/controllers/PathController.php b/application/controllers/PathController.php index 48a22be..bb969e8 100644 --- a/application/controllers/PathController.php +++ b/application/controllers/PathController.php @@ -13,7 +13,7 @@ class PathController extends Zend_Controller_Action throw new Syj_Exception_Request(); } $path->creator = $user; - $path->creatorIp = trim(end(split(',', $this->getRequest()->getClientIp(true)))); + $path->creatorIp = $this->getRequest()->getClientIp(true); $this->save($path, $formData); $data = array('redirect' => "idx/" . (string)$path->id);