Misc. changes

malwaremanu · Aug 13, 2019 · 0a21dd2 · 0a21dd2
1 parent 5ef1cfc
commit 0a21dd2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/couch/auth/auth.php b/couch/auth/auth.php
@@ -62,7 +62,7 @@ function __construct( $required_access_level=0, $prompt=1 ){
             $this->hasher = new PasswordHash(8, TRUE);
 
             $cookie_path = '/';
-            if( ($pos = strpos(K_SITE_URL, $_SERVER['HTTP_HOST'])) !==false ){
+            if( !empty($_SERVER['HTTP_HOST']) && (($pos = strpos(K_SITE_URL, $_SERVER['HTTP_HOST'])) !==false) ){
                 $given_site_dir = substr( K_SITE_URL, $pos + strlen($_SERVER['HTTP_HOST']) );
                 if( substr(K_SITE_DIR, -(strlen($given_site_dir))) == $given_site_dir ){
                     $cookie_path = $given_site_dir;

diff --git a/couch/folder.php b/couch/folder.php
@@ -1412,7 +1412,7 @@ function __construct( $row, &$root ){
                 if( !is_array($this->route['params']) )$this->route['params'] = array();
 
                 if( strlen($this->route['masterpage']) && strlen($this->route['name']) ){
-                    $this->href = $FUNCS->generate_route( $this->route['masterpage'], $this->route['name'], $this->route['params'] );
+                    $this->href = $FUNCS->generate_route( $this->route['masterpage'], $this->route['name'], $this->route['params'], $this->route['qs'] );
                     $this->is_internal_link = 1;
                 }
             }

diff --git a/couch/functions.php b/couch/functions.php
@@ -4037,7 +4037,7 @@ function process_route( $masterpage, $path ){
 
         }
 
-        function generate_route( $masterpage, $name, $values=array() ){
+        function generate_route( $masterpage, $name, $values=array(), $qs='' ){
             $masterpage = trim( $masterpage );
             $name = trim( $name );
 
@@ -4052,6 +4052,7 @@ function generate_route( $masterpage, $name, $values=array() ){
             $q = $route->generate( $values );
             $link = K_ADMIN_URL . K_ADMIN_PAGE . "?o=".urlencode($masterpage);
             if( strlen($q) ){ $link .= '&q=' . $q; }
+            if( strlen($qs) ){ $link .= '&' . $qs; }
 
             return $link;
         }