update calls to get_entities_from_metadata_*

diff --git a/openid_server_include.php b/openid_server_include.php
index be91ef2f63775af4a569d39b39f939487f829eb8..7ac44c469dfe4e616e29a56dda080aeaebe33388 100755 (executable)
--- a/openid_server_include.php
+++ b/openid_server_include.php
@@ -62,9 +62,9 @@ class OpenIDServer_ElggStore extends Auth_OpenID_OpenIDStore {
                         'server_url'    => $server_url,\r
                         'handle'        => $handle\r
             );\r
-            $assocs = get_entities_from_metadata_multi($meta_array, 'object', 'openid_client::association');\r
+           $assocs = elgg_get_entities_from_metadata(array('metadata_name_value_pairs' => $meta_array), 'types' => 'object', 'subtypes' => 'openid_client::association', 'metadata_name_value_pairs_operator' => 'and');\r
         } else {\r
-            $assocs = get_entities_from_metadata('server_url', $server_url, 'object','openid_client::association');\r
+           $assocs = elgg_get_entities_from_metadata(array('metadata_names' => 'server_url', 'metadata_values' => $server_url, 'types' => 'object', 'subtypes' => 'openid_client::association', 'metadata_case_sensitive' => FALSE));\r
         }\r
         \r
         if (!$assocs || (count($assocs) == 0)) {\r
@@ -113,9 +113,9 @@ class OpenIDServer_ElggStore extends Auth_OpenID_OpenIDStore {
                         'server_url'    => $server_url,\r
                         'handle'        => $handle\r
             );\r
-            $entities = get_entities_from_metadata_multi($meta_array, 'object', 'openid_client::association');\r
+           $entities = elgg_get_entities_from_metadata(array('metadata_name_value_pairs' => $meta_array), 'types' => 'object', 'subtypes' => 'openid_client::association', 'metadata_name_value_pairs_operator' => 'and');\r
         } else {\r
-            $entities = get_entities_from_metadata('server_url', $server_url, 'object','openid_client::association');\r
+           $entities = elgg_get_entities_from_metadata(array('metadata_names' => 'server_url', 'metadata_values' => $server_url, 'types' => 'object', 'subtypes' => 'openid_client::association', 'metadata_case_sensitive' => FALSE));\r
         }\r
         if ($entities) {\r
             foreach ($entities as $entity) {\r
@@ -169,7 +169,7 @@ class OpenIDServer_ElggStore extends Auth_OpenID_OpenIDStore {
                         'salt'          => $salt\r
         );\r
         \r
-        $entities = get_entities_from_metadata_multi($meta_array, 'object', 'openid_client::nonce');\r
+       $entities = elgg_get_entities_from_metadata(array('metadata_name_value_pairs' => $meta_array), 'types' => 'object', 'subtypes' => 'openid_client::nonce', 'metadata_name_value_pairs_operator' => 'and');\r
         \r
         if ($entities) {\r
             // bad - this nonce is already in use\r
@@ -195,8 +195,7 @@ class OpenIDServer_ElggStore extends Auth_OpenID_OpenIDStore {
        \r
        function getTrustedSites() {\r
        \r
-               error_log("GET TRUSTED");\r
-       $results = get_entities_from_metadata('openid_url', getLoggedInUser(), 'object','openid_server::trust_root');\r
+               $results = elgg_get_entities_from_metadata(array('metadata_names' => 'openid_url', 'metadata_values' => getLoggedInUser(), 'types' => 'object', 'subtypes' => 'openid_server::trust_root', 'metadata_case_sensitive' => FALSE));\r
                \r
                $sites = array();\r
                if ($results) {\r
@@ -214,7 +213,7 @@ class OpenIDServer_ElggStore extends Auth_OpenID_OpenIDStore {
        \r
        function getAutoLoginSites() {\r
                \r
-               $default_trusted_sites = get_entities_from_metadata('openid_url', '', 'object','openid_server::trust_root');\r
+               $default_trusted_sites = elgg_get_entities_from_metadata(array('metadata_names' => 'openid_url', 'metadata_values' => '', 'types' => 'object', 'subtypes' => 'openid_server::trust_root', 'metadata_case_sensitive' => FALSE));\r
                \r
                $sites = array();\r
                if ($default_trusted_sites) {\r
@@ -233,7 +232,7 @@ class OpenIDServer_ElggStore extends Auth_OpenID_OpenIDStore {
        \r
        function getAutoLogoutSites() {\r
                \r
-               $default_trusted_sites = get_entities_from_metadata('openid_url', '', 'object','openid_server::trust_root');\r
+               $default_trusted_sites = elgg_get_entities_from_metadata(array('metadata_names' => 'openid_url', 'metadata_values' => '', 'types' => 'object', 'subtypes' => 'openid_server::trust_root', 'metadata_case_sensitive' => FALSE));\r
                \r
                $sites = array();\r
                if ($default_trusted_sites) {\r
@@ -275,7 +274,7 @@ class OpenIDServer_ElggStore extends Auth_OpenID_OpenIDStore {
                $openid_url = getLoggedInUser();\r
                \r
                if ($openid_url != null) {\r
-               $results = get_entities_from_metadata('openid_url', $openid_url, 'object','openid_server::trust_root');\r
+                       $results = elgg_get_entities_from_metadata(array('metadata_names' => 'openid_url', 'metadata_values' => $openid_url, 'types' => 'object', 'subtypes' => 'openid_server::trust_root', 'metadata_case_sensitive' => FALSE));\r
                \r
                        if ($results) {\r
                                foreach($results as $trust_root) {\r
@@ -296,7 +295,7 @@ class OpenIDServer_ElggStore extends Auth_OpenID_OpenIDStore {
                         'trust_root'    => $trust_root\r
             );\r
         \r
-            $results = get_entities_from_metadata_multi($meta_array, 'object', 'openid_server::trust_root');\r
+           $results = elgg_get_entities_from_metadata(array('metadata_name_value_pairs' => $meta_array), 'types' => 'object', 'subtypes' => 'openid_server::trust_root', 'metadata_name_value_pairs_operator' => 'and');\r
                \r
                        if ($results) {\r
                                foreach($results as $trust_root) {\r