Changeset 737

Timestamp:

07/23/08 10:17:04 (1 month ago)

Author:

starkraving2002

Message:

code debugging

Location:

phpframework/branches/dev

Files:

• fusebox5.php (modified) (2 diffs)
• fuseboxApplication.php (modified) (9 diffs)
• fuseboxCircuit.php (modified) (5 diffs)
• fuseboxDoFuseaction.php (modified) (1 diff)
• fuseboxFactory.php (modified) (3 diffs)
• fuseboxLexiconCompiler.php (modified) (1 diff)

phpframework/branches/dev/fusebox5.php

@@ -36 +36 @@
         }
 }
+
+function isPHP5() { return true; }
 
 /* FB5: allow "" default - FB41 required this variable: */
@@ -163 +165 @@
                         /* can't be conditional: we don't know the state of the debug flag yet */
                         $myFusebox->trace("Fusebox","Creating Fusebox application object");
-                        require_once(fuseboxApplication.php);
+                        require_once("fuseboxApplication.php");
                         $_fba = new FuseboxApplication();
                         $application["FUSEBOX_APPLICATION_KEY"] = $_fba->init($FUSEBOX_APPLICATION_KEY,$FUSEBOX_APPLICATION_PATH,$FUSEBOX_APPLICATION_NAME,$myFusebox,$FUSEBOX_CALLER_PATH,$FUSEBOX_PARAMETERS);

phpframework/branches/dev/fuseboxApplication.php

@@ -451 +451 @@
                 }
                 
-                $circuit = substr($circuitFuseaction,0,0-strlen($fuseaction));
+                $circuit = substr($circuitFuseaction,0,0-strlen($fuseaction)-1);
 
                 /* set up myFusebox values for this request: */
@@ -595 +595 @@
                         $result['parsedFile'] = $parsedFile;
                 } else {
-                        $result['parsedFile'] = $this->getCoreToAppRootPath() . $parsedFile;
+                        $result['parsedFile'] = $result['parsedFile'] = $this->getWebRootPathToappRoot().$parsedFile;
                 }
                 $result['lockName'] = $fullParsedFile;
@@ -733 +733 @@
                         $result['parsedFile'] = $parsedFile;
                 } else {
-                        $result['parsedFile'] = $this->getCoreToAppRootPath() . $parsedFile;
+                        $result['parsedFile'] = $this->getWebRootPathToappRoot().$parsedFile;
                 }
                 $result['lockName'] = $fullParsedFile;
@@ -746 +746 @@
                         $circuit, //I am the circuit name. I am required but it's faster to specify that I am not required.
                         $fuseaction, //I am the fuseaction name, within the specified circuit.
-                        $topLevel //I specify whether or not this is a top-level (public) request.
+                        $topLevel = false //I specify whether or not this is a top-level (public) request.
                 ) {
                 if ( isset($GLOBALS['attributes']['fusebox.debug']) && $GLOBALS['attributes']['fusebox.debug'] == 'true' ) echo '<ul><li>Starting $'.__CLASS__.'->'.__FUNCTION__.'()';
                 // if ( array_key_exists('home',$GLOBALS['application']['fusebox']->circuits) ) echo "<br />".get_class($this).'.compile start: '.$GLOBALS['_fba']->circuits['home']->alias;
                 $c = "";
-                if ( !array_key_exists($circuit,$writer->fuseboxApplication->circuits) ) {
+                if ( !array_key_exists($circuit,$this->circuits) ) {
                         if ( $this->allowImplicitCircuits ) {
                                 /* FB55: attempt to create an implicit circuit */
@@ -780 +780 @@
         
                 $c = $writer->setCircuit($circuit);
-                $writer->fuseboxApplication->circuits[$circuit]->compile($writer,$fuseaction,$topLevel);
+                $this->circuits[$circuit]->compile($writer,$fuseaction,$topLevel);
                 $writer->setCircuit($c);
                 // if ( array_key_exists('home',$GLOBALS['application']['fusebox']->circuits) ) echo "<br />".get_class($this).'.compile end: '.$GLOBALS['_fba']->circuits['home']->alias;
@@ -1409 +1409 @@
                 $trailingSlash = ( substr($resolvedPath,-1,1) == "/" );
                 $segment = "";
-                $j = 1;
+                $j = 0;
                 $n = 0;
                 $pathParts = array();
                 $delimiter = "";
-                if ( substr($resolvedPath,-1,1) == '/' ) { $resolvedPath = substr($resolvedPath,-1); }
                 $arResolvedPath = explode('/',$resolvedPath);
 
                 /* remove pairs of directory/../ */             
-                for ( $s = 0 ; $s < count($arResolvedPath) ; $s++ ) {
+                foreach ( array_keys($arResolvedPath) as $s ) {
                         $segment = $arResolvedPath[$s];
-                        if ( $segment == "." ) {
+                        if ( $segment == "." || $segment == "" ) {
                                 /* just ignore this */
                         } else if ( $segment == ".." ) {
-                                if ( $j > 1 && $pathParts[$j-1] != ".." ) {
+                                if ( $j > 0 && $pathParts[$j-1] != ".." ) {
                                         $j = $j - 1;
                                 } else {
@@ -1433 +1432 @@
                         }
                 }
-                
                 /* rebuild the path */
                 if ( leadingSlash ) {
@@ -1439 +1437 @@
                 }
                 $resolvedPath = "";
+                /* // this block of code isn't working properly
                 $n = $j - 1;
                 for ( $j = 0 ; $j < $n ; $j++ ) {
@@ -1444 +1443 @@
                         $delimiter = "/";
                 }
+                // using the next line instead for now
+                */
+                $resolvedPath = $delimiter . implode("/",$pathParts);
                 if ( $trailingSlash ) {
                         $resolvedPath .= "/";

phpframework/branches/dev/fuseboxCircuit.php

@@ -68 +68 @@
                 } else {
                         if ( $this->relative ) {
-                                $this->fullPath = $this->appPath & $this->relativePath;
+                                $this->fullPath = $this->appPath . $this->relativePath;
                         } else {
                                 __cfthrow(array('type'=>"fusebox.badGrammar.illegalPath"
@@ -77 +77 @@
                 
                 $this->fullPath = $this->fuseboxApplication->getCanonicalPath($this->fullPath);
-
+                
                 /*
                         this was not correctly normalized prior to ticket 139 but it didn't really matter
@@ -445 +445 @@
                                         ));
                                 }
-                                $attributes[attr] = $this->fuseboxApplication->normalizePartialPath($attributes[$attr]);
+                                $attributes[$attr] = $this->fuseboxApplication->normalizePartialPath($attributes[$attr]);
                                 if ( substr($attributes[$attr],0,1) == "/" ) {
                                         /* assume mapped / root-relative path */
@@ -481 +481 @@
                                 __cfthrow(array( 'type'=>"fusebox.badGrammar.unexpectedAttributes",
                                         'message'=>"Unexpected attributes",
-                                        'detail'=>"Unexpected attributes were found in the 'circuit' tag of the '".$this->getAlias()."' circuit.xml file."
+                                        'detail'=>"Unexpected attribute '".$attr."' were found in the 'circuit' tag of the '".$this->getAlias()."' circuit.xml file."
                                 ));
                         }
@@ -638 +638 @@
                         }
                         require_once("fuseboxAction.php");
-                        if ( !isPHP5() ) { eval('$this->fuseactions[$attribs["name"]] =& new FuseboxAction($this,$attribs["name"],$access,$children[$i]["xmlChildren"],false,$customAttribs);'); } else { $this->fuseactions[$attribs['name']] = new FuseboxAction($this,$attribs['name'],$access,$children[$i]['xmlChildren'],false,$customAttribs); }
+                        $this->fuseactions[$attribs['name']] = new FuseboxAction($this,$attribs['name'],$access,$children[$i]['xmlChildren'],false,$customAttribs);
                         /* FB41 security plugin compatibility: */
                         $this->fuseactions[$attribs['name']]->permissions = $permissions;

phpframework/branches/dev/fuseboxDoFuseaction.php

@@ -148 +148 @@
                 $n = 0;
                 $myFB =& $writer->getMyFusebox();
-                $app =& $writer->fuseboxApplication;
+                $app =& $this->action->getCircuit()->getApplication();
                 $plugins =& $app->pluginPhases;
                 $c = "";

phpframework/branches/dev/fuseboxFactory.php

@@ -77 +77 @@
                         /* must be namespace.verb or namespace:verb */
                         require_once("fuseboxVerb.php");
-                        if ( !isPHP5() ) { eval('$verbObject =& new FuseboxVerb($action, $verb, $attributes, $children);'); } else { $verbObject = new FuseboxVerb($action, $verb, $attributes, $children); }
+                        $verbObject = new FuseboxVerb($action, $verb, $attributes, $children);
                 } elseif ( in_array($verb,array("do","fuseaction")) ) {
                         /* built-in verbs that cannot be implemented as a lexicon */
@@ -85 +85 @@
                         /* builtin verb implemented as a lexicon */
                         require_once("fuseboxVerb.php");
-                        if ( !isPHP5() ) { 
-                                eval('$verbObject =& new FuseboxVerb($action, $this->fuseboxLexicon["namespace"] . ":" . $verb,$attributes, $children);'); 
-                        } else { 
-                                $verbObject = new FuseboxVerb($action, $this->fuseboxLexicon['namespace'] . ":" . $verb,
+                        $verbObject = new FuseboxVerb($action, $this->fuseboxLexicon['namespace'] . ":" . $verb,
                                                         $attributes, $children); 
-                        }
                 }
                 if ( isset($GLOBALS['attributes']['fusebox.debug']) && $GLOBALS['attributes']['fusebox.debug'] == 'true' ) echo '</li><li>Ending $'.__CLASS__.'->'.__FUNCTION__.'()</li></ul>';
@@ -101 +97 @@
                 if ( !is_object($this->lexCompPool) ) {
                         require_once("fuseboxLexiconCompiler.php");
-                        if ( !isPHP5() ) { eval('$obj =& new FuseboxLexiconCompiler();'); } else { $obj = new FuseboxLexiconCompiler(); }
+                        $obj = new FuseboxLexiconCompiler();
                 } else {
                         $obj =& $this->lexCompPool;

phpframework/branches/dev/fuseboxLexiconCompiler.php

@@ -64 +64 @@
                 }
                 if ( $this->fb_['verbInfo']['executionMode'] == "end" ) {
-                        if ( !$this->compiled && (
-                                        array_key_exists('fuseactionException',$this->fb_writer->fuseboxApplication->pluginPhases) ||
-                                        array_key_exists('processError',$this->fb_writer->fuseboxApplication->pluginPhases) 
-                                        ) &&
-                                        $this->fb_writer->fuseboxApplication->scriptVersion{0} != '5' ) {
-                                $this->fb_writer->rawPrintln("if ( \$php_errormsg ) break;");
-                        }
                         $this->compiled = true;
                 }