Changeset 3626

Timestamp:

12/23/10 12:19:38 (13 years ago)

Author:

amuller

Message:

Ticket #427 - Resolvendo problemas de instalação sem o dump

Location:

branches/2.2

Files:

• phpgwapi/inc/class.setup.inc.php (modified) (2 diffs)
• setup/index.php (modified) (1 diff)

branches/2.2/phpgwapi/inc/class.setup.inc.php

@@ -863 +863 @@
                                 }
                                 /* Load up some configured values */
-                                $this->db->query("SELECT config_name,config_value,config_app FROM phpgw_config " 
-                                        . "WHERE config_app = 'phpgwapi' AND (config_name LIKE 'ldap%' OR config_name LIKE 'account_%' OR config_name LIKE '%encryption%')",__LINE__,__FILE__); 
+                                $this->db->query("SELECT config_name,config_value,config_app FROM phpgw_config "
+                                        . "WHERE config_app = 'phpgwapi' AND (config_name LIKE 'ldap%' OR config_name LIKE 'account_%' OR config_name LIKE '%encryption%')",__LINE__,__FILE__);
                                 while($this->db->next_record())
                                 {
@@ -956 +956 @@
                                 if ($rights)
                                 {
-                                        $this->db->query("INSERT INTO phpgw_acl(acl_appname,acl_location,acl_account,acl_rights) VALUES('$app','$location',$account,$rights)");
-                                }
+                                        $this->db->query("INSERT INTO phpgw_acl(acl_appname,acl_location,acl_account,acl_rights) VALUES('$app','$location',$account,$rights);");
+                                }
+                        }
+                        $this->db->query("END TRANSACTION; COMMIT;");
+                        if ($this->db->Error){
+                                echo "Error in acl update";
+                                exit;
                         }
                 }

branches/2.2/setup/index.php

@@ -281 +281 @@
                         $db_filled_block = $db_filled_block . $setup_tpl->get_var('V_db_stage_6_post');
                         $setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+                        /* Hack to fix database inconsistency */
+                        $GLOBALS['phpgw_setup']->db->query("ALTER TABLE phpgw_access_log ADD COLUMN browser varchar(200);");
+                        $GLOBALS['phpgw_setup']->db->query("CREATE TABLE phpgw_async (
+                                id character varying(255) NOT NULL,
+                                next integer NOT NULL,
+                                times character varying(255) NOT NULL,
+                                method character varying(80) NOT NULL,
+                                data text NOT NULL,
+                                account_id integer DEFAULT 0 NOT NULL);");      
+
                         break;
                 case 10: