Changeset 3199

Timestamp:

09/01/10 16:28:19 (14 years ago)

Author:

alexandrecorreia

Message:

Ticket #764 - Correcao do valor caminho absoluto para relativo ( controller.xml ).

Location:

branches/2.2/jabberit_messenger

Files:

• controller.php (modified) (2 diffs)
• inc/Controller.class.php (modified) (5 diffs)
• inc/controller.xml (modified) (2 diffs)
• inc/jabberit_acl.inc.php (modified) (2 diffs)

branches/2.2/jabberit_messenger/controller.php

@@ -7 +7 @@
         );
 }
+
 require_once '../header.session.inc.php';
 
@@ -25 +26 @@
 }
 
-require_once dirname(__FILE__) . '/inc/Controller.class.php';
+if( file_exists(dirname(__FILE__) . "/inc/Controller.class.php") )
+{
+        require_once dirname(__FILE__) . '/inc/Controller.class.php';
 
-$controller = new Controller;
-printf("%s", $controller->exec($$request_method));
+        $controller = new Controller();
+        printf("%s", $controller->exec($$request_method, dirname(__FILE__)));
+        exit(0);
+}
 
-exit(0);
 ?>

branches/2.2/jabberit_messenger/inc/Controller.class.php

@@ -26 +26 @@
 
         private $fatalError                                                     = false;
+        private $_PATH                                                          = "";
 
         public function __construct()
@@ -89 +90 @@
                         {
                                 case 'exec' :
-                                        return $this->_exec($arguments[0]);
+                                        return $this->_exec($arguments[0], $arguments[1]);
                                 break;
                                 default : return "Method not avaible";
@@ -100 +101 @@
         }
 
-        private final function _exec(array &$pRequest)
+        private final function _exec(array &$pRequest, $pPath)
         {
                 ( $pRequest[$this->string_access] )
@@ -133 +134 @@
                         and die(__CLASS__ . ' [ ERROR #14 ] :: invalid reference "' . $ref . '"');
 
-                $path = $section_itens->item($i)->getAttribute('path')
-                        or $path = $section->getAttribute('path')
-                        or die(__CLASS__ . ' [ ERROR #15 ] :: bad path argument');
+                if( $section_itens->item($i)->getAttribute('path') )
+                        $path = $section_itens->item($i)->getAttribute('path');
+                else if ( $section->getAttribute('path') )
+                        $path = $pPath . $section->getAttribute('path');
+
+                if( !$path ) die(__CLASS__ . ' [ ERROR #15 ] :: bad path argument');
 
                 $prefix = $section_itens->item($i)->getAttribute('prefix')
@@ -188 +192 @@
 
                 $file = "{$pPath}/{$pPrefix}{$js}{$pSuffix}";
-                //$file = "../jabberit_messenger/{$pPath}/{$pPrefix}{$js}{$pSuffix}";
 
                 file_exists($file)
-                        or die(__CLASS__ . ' [ ERROR #19 ] :: the file that has the class was not opened');
+                        or die(__CLASS__ . ' [ ERROR #19 ] :: the file that has the class was not opened' . $file );
 
                 $debug = $pSectionItem->parentNode->getAttribute('debug');
                 
                 return file_get_contents($file);
-
         }
 }

branches/2.2/jabberit_messenger/inc/controller.xml

@@ -17 +17 @@
         <controller-sections>
                 <css></css>
-                <js path="/var/www/expresso/jabberit_messenger/js" suffix=".js">
+                <js path="/js" suffix=".js">
                         <item ref="connector" js="connector" />
                         <item ref="editSelect" js="editSelect" />
@@ -31 +31 @@
                         <item ref="makeW" js="makeW" />
                 </js>
-                <php path="/var/www/expresso/jabberit_messenger/inc" suffix=".class.php">
+                <php path="/inc" suffix=".class.php">
                         <item ref="contacts_im" alias="getParticipantsExternal" class="contacts_im" method="getParticipantsExternal" prefix="class." suffix=".inc.php"/>
                         <item ref="contacts_im" alias="list_contacts" class="contacts_im" method="list_contacts" prefix="class." suffix=".inc.php"/>

branches/2.2/jabberit_messenger/inc/jabberit_acl.inc.php

@@ -91 +91 @@
                                                 'j.editSelect'
                                                 );
-        
+
                         require_once dirname(__FILE__) . '/Controller.class.php';
         
@@ -99 +99 @@
                         foreach( $js as $key => $val ) 
                         {
-                                $script .= $controller->exec(array('act' => $val));
+                                $script .= $controller->exec(array('act' => $val), substr(dirname(__FILE__), 0, strlen( dirname(__FILE__) )-4));
                         }