Changeset 52 for trunk

Timestamp:

31/01/11 02:50:11 (16 months ago)

Author:

bombadil

Message:

correcciones de rutas para inclusion de un directorio 'public'

Location:

trunk/src/Oak

Files:

• Action.php (modified) (2 diffs)
• Action/Login.php (modified) (1 diff)
• Components/Form.php (modified) (1 diff)
• Components/Table.php (modified) (2 diffs)
• Menu.php (modified) (1 diff)

trunk/src/Oak/Action.php

@@ -45 +45 @@
         $access =& $this->session->get("access");
         $realname = '';
-        if ($access instanceof Oak_Access or is_subclass_of($access, 'Oak_Access')) {
+        if (is_subclass_of($access, 'Oak_Access')) {
             $user = $access->get("user");
             if (!is_scalar($user)) {
@@ -110 +110 @@
                     return $rt;
                 }
+                                if (!$rt) {
+                                        return true;
+                                }
             }
         }

trunk/src/Oak/Action/Login.php

@@ -84 +84 @@
             $this->alert = $e->getMessage();
         }
-        return false;
+        return true;
     }
 

trunk/src/Oak/Components/Form.php

@@ -52 +52 @@
      *  @param name nombre del formulario.
      */
-    function addForm( $fieldsets, $id = "", $name = "" ) {
+    function addForm( $fieldsets = null, $id = "", $name = "" ) {
         $i = $this->cf_index++;
         $this->template->put("main/forms/form[$i]", array (
             "@id" => $id,
-            "@name" => $name,
-            "fieldset" => $fieldsets
+            "@name" => $name
         ));
+                if ($fieldsets) {
+            $this->template->put("main/forms/form[$i]/fieldset", $fieldsets);
+                }
     }
 

trunk/src/Oak/Components/Table.php

@@ -117 +117 @@
      */
     function thead( $name, $type ) {
-        $types = array ( "id", "center", "string", "text", "number", "currency", "date", "link" );
+        $types = array ( "id", "center", "string", "text", "number", "currency", "date", "link", "check" );
         if (in_array($type, $types)) {
             return array (
@@ -124 +124 @@
             );
         }
-        return new PEAR_Error(sprintf(_("Tipo %s no válido."), $type));
+        throw new Exception(sprintf(_("Tipo %s no válido."), $type));
     }
 

trunk/src/Oak/Menu.php

@@ -26 +26 @@
      */
     function __construct( &$access ) {
-                if (($access instanceof Oak_Access) and file_exists("conf/menu.yml")) {
+                if (($access instanceof Oak_Access) and file_exists("../conf/menu.yml")) {
                         $this->cut = array();
                         $this->logout = array();
                         $this->opt = array();
-                        $this->menu = Horde_Yaml::loadFile("conf/menu.yml");
+                        $this->menu = Horde_Yaml::loadFile("../conf/menu.yml");
                         $this->checkMenu($access);
                 }