@@ -69,6 +69,9 @@ discard block |
||
| 69 | 69 | return strstr(self::getBackUrl(), '/admin/'); |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | + /** |
|
| 73 | + * @return string |
|
| 74 | + */ |
|
| 72 | 75 | public static function getBackUrl() { |
| 73 | 76 | if(isset($_REQUEST['BackURL'])) { |
| 74 | 77 | return $_REQUEST['BackURL']; |
@@ -84,6 +87,7 @@ discard block |
||
| 84 | 87 | /** |
| 85 | 88 | * @see Security::getPasswordResetLink() |
| 86 | 89 | * We overload this, so we can add the BackURL to the password resetlink |
| 90 | + * @param DataObject $member |
|
| 87 | 91 | */ |
| 88 | 92 | public static function getPasswordResetLink($member, $autologinToken) { |
| 89 | 93 | $autologinToken = urldecode($autologinToken); |
@@ -72,7 +72,7 @@ |
||
| 72 | 72 | public static function getBackUrl() { |
| 73 | 73 | if(isset($_REQUEST['BackURL'])) { |
| 74 | 74 | return $_REQUEST['BackURL']; |
| 75 | - }elseif(isset($_SESSION['BackURL'])) { |
|
| 75 | + } elseif(isset($_SESSION['BackURL'])) { |
|
| 76 | 76 | return $_SESSION['BackURL']; |
| 77 | 77 | } |
| 78 | 78 | } |
@@ -29,13 +29,13 @@ |
||
| 29 | 29 | public function hasAccess() { |
| 30 | 30 | if(!$this->allowedIps) { |
| 31 | 31 | return 'allowed'; |
| 32 | - }elseif($match = $this->matchExact()){ |
|
| 32 | + } elseif($match = $this->matchExact()){ |
|
| 33 | 33 | return $match; |
| 34 | - }elseif($match = $this->matchRange()){ |
|
| 34 | + } elseif($match = $this->matchRange()){ |
|
| 35 | 35 | return $match; |
| 36 | - }elseif($match = $this->matchCIDR()){ |
|
| 36 | + } elseif($match = $this->matchCIDR()){ |
|
| 37 | 37 | return $match; |
| 38 | - }elseif($match = $this->matchWildCard()){ |
|
| 38 | + } elseif($match = $this->matchWildCard()){ |
|
| 39 | 39 | return $match; |
| 40 | 40 | } |
| 41 | 41 | } |