Changeset 7324 for sandbox

Timestamp:

09/28/12 11:28:02 (12 years ago)

Author:

alexandrecorreia

Message:

Ticket #3093 - Criando o resource AvailableServers?( Servidores disponíveis com o recurso REST).

Location:

sandbox/2.4.3-expresso-rest/prototype

Files:

• adapters/ExpressoAdapter.php (modified) (1 diff)
• config/Tonic.srv (modified) (1 diff)
• config/rest_servers.conf (deleted)
• rest/availableServers/AvailableServersResource.php (modified) (1 diff)
• rest/dispatch.php (modified) (1 diff)

sandbox/2.4.3-expresso-rest/prototype/adapters/ExpressoAdapter.php

@@ -129 +129 @@
                 if($this->getParam('auth') != null) {
                         list($sessionid, $kp3) = explode(":", $this->getParam('auth'));
-                        if($GLOBALS['phpgw']->session->verify($sessionid, $kp3)){                                                                       
+                        if(!$GLOBALS['phpgw']->session->verify() && $GLOBALS['phpgw']->session->verify($sessionid, $kp3)){                                                                      
                                 return $sessionid;
                         }

sandbox/2.4.3-expresso-rest/prototype/config/Tonic.srv

@@ +1 @@
+[/AvailableServers]
+AvailableServersResource = /availableServers/AvailableServersResource.php
+
 [/Catalog/Contacts]
 ContactsResource = /catalog/ContactsResource.php

sandbox/2.4.3-expresso-rest/prototype/rest/availableServers/AvailableServersResource.php

@@ -11 +11 @@
         function get($request){
                 $error = null;          
-                parse_str($request->data, &$data);              
-                $handle = fopen('../config/rest_servers.conf', "r");
-                $servers= array();      
-                if($handle) {
-                        while (!feof ($handle)) {
-                                $line = fgets($handle,1024);
-                                if($line == null)
-                                        continue;
-                                list($id, $name, $description, $url, $context, $status) = explode(";",$line);
-                                $servers[] = array(
-                                                'serverID' => $id,
-                                                'serverName' => $name,
-                                                'serverDescription' => utf8_encode($description),
-                                                'serverUrl' => $url,
-                                                'serverContext' => $context,
-                                                'serverStatus' => ($status ? "1" : "0")
-                                );
+                parse_str($request->data, &$data);
+                                
+                if( file_exists(__DIR__ . '/../../config/REST.ini') )
+                {
+                        $restServers = parse_ini_file( __DIR__ . '/../../config/REST.ini', true );
+                        
+                        foreach( $restServers as $key => $value)
+                        {
+                                if(substr( $key, 0, 11 ) == "ServersRest")
+                                {
+                                        $servers[] = $value;
+                                }
                         }
-                        fclose($handle);
                 }
                 else{

sandbox/2.4.3-expresso-rest/prototype/rest/dispatch.php

@@ -11 +11 @@
 require_once(__DIR__."/../adapters/CatalogAdapter.php");
 require_once(__DIR__."/../adapters/CalendarAdapter.php");
-//require_once(__DIR__."/../adapters/testeAdapter.php");
 
 //Retrieveing the mapping of the URIs and his respectives classNames and classPath