Ticket #1378: amfPhp.2.diff

SGL/Request/Amf.php

@@ +1 @@
+<?php
+
+class SGL_Request_Amf extends SGL_Request
+{
+    function init()
+    {
+        //  get config singleton
+        $c = &SGL_Config::singleton();
+        $conf = $c->getAll();
+
+        //  resolve value for $_SERVER['PHP_SELF'] based in host
+        SGL_URL::resolveServerVars($conf);
+
+        //  get current url object
+        $cache = & SGL_Cache::singleton();
+        $cacheId = md5($_SERVER['PHP_SELF']);
+
+        if ($data = $cache->get($cacheId, 'uri')) {
+            $url = unserialize($data);
+            SGL::logMessage('URI from cache', PEAR_LOG_DEBUG);
+        } else {
+            require_once SGL_CORE_DIR . '/UrlParser/SimpleStrategy.php';
+            require_once SGL_CORE_DIR . '/UrlParser/ClassicStrategy.php';
+
+            $aStrats = array(
+                new SGL_UrlParser_ClassicStrategy(),
+                new SGL_UrlParser_SefStrategy(),
+                );
+            $url = new SGL_URL($_SERVER['PHP_SELF'], true, $aStrats);
+
+            $err = $url->init();
+            if (PEAR::isError($err)) {
+                return $err;
+            }
+            $data = serialize($url);
+            $cache->save($data, $cacheId, 'uri');
+            SGL::logMessage('URI parsed ####' . $_SERVER['PHP_SELF'] . '####', PEAR_LOG_DEBUG);
+        }
+        $aQueryData = $url->getQueryData();
+
+        if (PEAR::isError($aQueryData)) {
+            return $aQueryData;
+        }
+        //  assign to registry
+        $input = &SGL_Registry::singleton();
+        $input->setCurrentUrl($url);
+
+        //  merge REQUEST AND FILES superglobal arrays
+        $this->aProps = array_merge($_GET, $aQueryData, $_POST);
+        $this->type = SGL_REQUEST_AMF;
+        return true;
+    }
+}
+?>

SGL/FrontController.php

@@ -109 +109 @@
-        if ($output->conf['site']['outputBuffering']) {
-            ob_end_flush();
-        }
+        
-        echo $output->data;
-    }
-
@@ -150 +151 @@
-            $input->setFilters($aFilters);
-            $ret = true;
-            break;
+            
+
+        case SGL_REQUEST_AMF:
+            $aFilters = array(
+                'SGL_Task_Init',
+                'SGL_Task_SetupORM',
+                'SGL_Task_CreateSession',
+                'SGL_Task_ExecuteAmfAction',
+                );
+            $input->setFilters($aFilters);
+            $ret = true;
+            break;
+            
+            
-        }
-
-        return $ret;

SGL/Task/ExecuteAjaxAction.php

@@ -29 +29 @@
-        }
-    }
-}
-
+

SGL/Task/ExecuteAmfAction.php

@@ +1 @@
+<?php
+include SGL_LIB_DIR . "/amf-core/app/Gateway.php";
+//You can set this constant appropriately to disable traces and debugging headers
+//You will also have the constant available in your classes, for changing
+//the mysql server info for example
+define("PRODUCTION_SERVER", false);
+class SGL_Task_ExecuteAmfAction extends SGL_ProcessRequest
+{
+    function process(&$input, &$output)
+    {
+                SGL::logMessage(null, PEAR_LOG_DEBUG);
+        $req = $input->getRequest();
+        $moduleName = $req->getModuleName();
+        $method = $req->getActionName();
+
+                $gateway = new SGL_Gateway();
+        
+                //Set where the services classes are loaded from, *with trailing slash*
+                $gateway->setBaseClassPath(SGL_MOD_DIR . '/' .($moduleName) . '/classes/amfservices/');
+                
+                //Loose mode means echo'ing or whitespace in your file won't make AMFPHP choke
+                $gateway->setLooseMode(true);
+                
+                //Read above large note for explanation of charset handling
+                //The main contributor (Patrick Mineault) is French, 
+                //so don't be afraid if he forgot to turn off iconv by default!
+                //$gateway->setCharsetHandler("utf8_decode", "ISO-8859-1", "ISO-8859-1");
+                
+                //Error types that will be rooted to the NetConnection debugger
+                $gateway->setErrorHandling(E_ALL ^ E_NOTICE);
+                
+                //choices are php5 (SoapClient), nusoap and pear
+                //If you don't plan on using web services with AMFPHP, 
+                //you can safely let this setting alone
+                //Note that for nusoap to work you MUST place the library under /amf-core/lib/nusoap.php
+                $gateway->setWebServiceHandler('php5');
+                
+                //Adding an adapter mapping will make returns of the mapped typed be intercepted
+                //and mapped in adapters/%adapterName%Adapter.php. This works by using get_class
+                //So for example, if you return a PEAR resultset object, it is an instance of DB_result
+                //And we want this to be processed as a recordset in adapters/peardbAdapter.php,
+                //hence the following line:
+                $gateway->addAdapterMapping('db_result', 'peardb');
+                //For PDO (PHP 5.1 specific)
+                $gateway->addAdapterMapping('pdostatement', 'pdo');
+                //For oo-style MySQLi
+                $gateway->addAdapterMapping('mysqli_result', 'mysqli');
+                //For filtered array 
+                //And for filtered typed array (see adapters/lib/Arrayf.php and Arrayft.php)
+                $gateway->addAdapterMapping('arrayf', 'arrayf');
+                $gateway->addAdapterMapping('arrayft', 'arrayft');
+                //And you can add your own after this point... (note lowercase for both args!)
+                
+                if(PRODUCTION_SERVER)
+                {
+                        //Disable trace actions
+                        $gateway->disableTrace();
+                        
+                        //Disable debugging headers
+                        $gateway->disableDebug();
+                        
+                        //Disable Service description
+                        $gateway->disableServiceDescription();
+                }
+                
+//              include_once('advancedsettings.php');
+                
+                //Service now
+                $output->data = $gateway->service();
+                
+    }
+    
+}
+
+class SGL_Gateway extends Gateway {
+
+        /**
+         * The service method runs the gateway application.  It turns the gateway 'on'.  You
+         * have to call the service method as the last line of the gateway script after all of the
+         * gateway configuration properties have been set.
+         * 
+         * Right now the service method also includes a very primitive debugging mode that
+         * just dumps the raw amf input and output to files.  This may change in later versions.
+         * The debugging implementation is NOT thread safe so be aware of file corruptions that
+         * may occur in concurrent environments.
+         */
+
+        function service() {
+                
+                //Set the parameters for the charset handler
+                CharsetHandler::setMethod($this->_charsetMethod);
+                CharsetHandler::setPhpCharset($this->_charsetPhp);
+                CharsetHandler::setSqlCharset($this->_charsetSql);
+                
+                //Attempt to call charset handler to catch any uninstalled extensions
+                $ch = new CharsetHandler('flashtophp');
+                $ch->transliterate('?');
+                
+                $ch2 = new CharsetHandler('sqltophp');
+                $ch2->transliterate('?');
+                
+                $GLOBALS['amfphp']['actions'] = $this->actions;
+                
+                NetDebug::initialize();
+                
+//              error_reporting($GLOBALS['amfphp']['errorLevel']);
+                
+                //Enable loose mode if requested
+                if($this->_looseMode)
+                {
+                        ob_start();
+                }
+                
+                $amf = new AMFObject($GLOBALS["HTTP_RAW_POST_DATA"]);   // create the amf object
+                
+                if($this->incomingMessagesFolder != NULL)
+                {
+                        $mt = microtime();
+                        $pieces = explode(' ', $mt);
+                        file_put_contents($this->incomingMessagesFolder . 
+                                'in.' . $pieces[1] . '.' . substr($pieces[0], 2) . ".amf", 
+                                $GLOBALS["HTTP_RAW_POST_DATA"]);
+                }
+ 
+                foreach($this->filters as $key => $filter)
+                {
+                        $filter($amf); //   invoke the first filter in the chain
+                }
+                
+                $output = $amf->outputStream; // grab the output stream
+                
+                //Clear the current output buffer if requested
+                if($this->_looseMode)
+                {
+                        if($this->_obLogging !== FALSE)
+                        {
+                                $this->_appendRawDataToFile($this->_obLogging, ob_get_clean());
+                        }
+                        else
+                        {
+                                ob_end_clean();
+                        }
+                }
+                
+                //Send content length header
+                //Thanks to Alec Horley for pointing out the necessity
+                //of this for FlashComm support
+                header(AMFPHP_CONTENT_TYPE); // define the proper header
+                header("Content-length: " . strlen($output));
+                
+                //Send expire header, apparently helps for SSL
+                //Thanks to Gary Rogers for that
+                //And also to Lucas Filippi from openAMF list
+                //And to Robert Reinhardt who appears to be the first who 
+                //documented the bug
+                //Finally to Gary who appears to have find a solution which works even more reliably
+                if($this->useSslFirstMethod)
+                {
+                        $dateStr = date("D, j M Y ") . date("H:i:s", strtotime("-2 days"));
+                        header("Expires: $dateStr GMT");
+                        header("Pragma: no-store");
+                        header("Cache-Control: no-store");
+                }
+                //else don't send any special headers at all
+
+                if($this->outgoingMessagesFolder != NULL)
+                {
+                        $mt = microtime();
+                        $pieces = explode(' ', $mt);
+                        file_put_contents($this->outgoingMessagesFolder . 
+                                'out.' . $pieces[1] . '.' . substr($pieces[0], 2) . ".amf", $output);
+                }           
+
+                return $output; // flush the binary data        
+        }
+        
+}
+?>

SGL/Request.php

@@ -42 +42 @@
-define('SGL_REQUEST_CLI',       2);
-define('SGL_REQUEST_AJAX',      3);
-define('SGL_REQUEST_XMLRPC',    4);
+define('SGL_REQUEST_AMF',       5);
-
-/**
- * Loads Request driver, provides a number of filtering methods.
@@ -60 +61 @@
-            $type = $this->getRequestType();
-            $typeName = $this->constantToString($type);
-
+
+        SGL::logMessage($typeName, PEAR_LOG_DEBUG);
+            
-            $file = SGL_CORE_DIR . '/Request/' . $typeName . '.php';
-            if (!is_file($file)) {
-              return PEAR::raiseError('Request driver could not be located',
@@ -94 +98 @@
-        case SGL_REQUEST_AJAX:
-            $ret = 'Ajax';
-            break;
+            
+        case SGL_REQUEST_AMF:
+            $ret = 'Amf';
+            break;
-        }
-        return $ret;
-    }
@@ -107 +115 @@
-                        $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest') {
-            return SGL_REQUEST_AJAX;
-
-
+
+
+
+
+
+
+
-            return SGL_REQUEST_BROWSER;
-        }
-    }