Merge pull request mugoweb#39 from benkmugo/master

Adds support for eZ Find configurations using eZ Find's basicAuth
ezpublishlegacy · Feb 7, 2019 · 1be0eed22711e02f9b09ff7e5d176af89e054499 · 1be0eed
2 parents f7ab221 + c5dad94
commit 1be0eed22711e02f9b09ff7e5d176af89e054499
Unified Split

Showing with 16 additions and 0 deletions.

+16 −0 modules/ezfind/index.php
diff --git a/modules/ezfind/index.php b/modules/ezfind/index.php
@@ -354,6 +354,22 @@ private function getSolrBaseURL()
    {
        $ini = eZINI::instance( 'solr.ini' );
        $url = $ini->variable( 'SolrBase', 'SearchServerURI' );
+  
+
+  
+        $authentication = $ini->variable( 'SolrBase', 'SearchServerAuthentication' );
+  
+        $userPass       = $ini->variable( 'SolrBase', 'SearchServerUserPass' );
+  
+
+  
+        if( $authentication === 'enabled' )
+  
+        {
+  
+            if( $userPass )
+  
+            {
+  
+                $url = str_replace( '://', '://' . $userPass . '@', $url );
+  
+            }
+  
+            else
+  
+            {
+  
+                echo "SearchServerAuthentication is enabled, but SearchServerUserPass is not set\n";
+  
+            }
+  
+        }
+  
+
        if( "/" != substr( $url, strlen($url)-1 ) )
        {
            $url .= "/";