Fixed some typos. Thanks Tim!

diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index 349438719a2fe05f928c3e1f51cd46b34f44c953..d5cbecebfb26df4d26411a5b73aab43326db5ae4 100644 (file)
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -1635,26 +1635,26 @@ function main_upgrade($oldversion=0) {
 
          modify_database('', "CREATE TABLE prefix_role_assignments (
                                   id SERIAL PRIMARY KEY,
-                                  roleid interger NOT NULL default 0,
-                                  contextid interger NOT NULL default 0,
-                                  userid interger NOT NULL default 0,
-                                  hidden interger NOT NULL default 0,
-                                  timestart interger NOT NULL default 0,
-                                  timeend interger NOT NULL default 0,
-                                  timemodified interger NOT NULL default 0,
-                                  modifierid interger NOT NULL default 0,
+                                  roleid integer NOT NULL default 0,
+                                  contextid integer NOT NULL default 0,
+                                  userid integer NOT NULL default 0,
+                                  hidden integer NOT NULL default 0,
+                                  timestart integer NOT NULL default 0,
+                                  timeend integer NOT NULL default 0,
+                                  timemodified integer NOT NULL default 0,
+                                  modifierid integer NOT NULL default 0,
                                   enrol varchar(20) NOT NULL default '',
-                                                                 sortorder integer NOT NULL default '0'
+                                  sortorder integer NOT NULL default '0'
                                 );");
 
         modify_database('', "CREATE TABLE prefix_role_capabilities (
                                   id SERIAL PRIMARY KEY,
-                                  contextid interger NOT NULL default 0,
-                                  roleid interger NOT NULL default 0,
+                                  contextid integer NOT NULL default 0,
+                                  roleid integer NOT NULL default 0,
                                   capability varchar(255) NOT NULL default '',
                                   permission integer NOT NULL default 0,
-                                  timemodified interger NOT NULL default 0,
-                                  modifierid interger NOT NULL default 0
+                                  timemodified integer NOT NULL default 0,
+                                  modifierid integer NOT NULL default 0
                                 );");
 
         modify_database('', "CREATE TABLE prefix_role_deny_grant (
@@ -1664,19 +1664,19 @@ function main_upgrade($oldversion=0) {
                                 );");
                                 
         modify_database('', "CREATE TABLE prefix_capabilities ( 
-                                                         id SERIAL PRIMARY KEY,
-                                                         name varchar(150) NOT NULL default '', 
-                                                         captype varchar(50) NOT NULL default '', 
-                                                         contextlevel integer NOT NULL default 0, 
-                                                         component varchar(100) NOT NULL default ''
+                              id SERIAL PRIMARY KEY,
+                              name varchar(150) NOT NULL default '', 
+                              captype varchar(50) NOT NULL default '', 
+                              contextlevel integer NOT NULL default 0, 
+                              component varchar(100) NOT NULL default ''
                                 );"); 
-                                                               
-               modify_database('', "CREATE TABLE prefix_role_names ( 
-                                                         id SERIAL PRIMARY KEY,
-                                                         roleid integer NOT NULL default 0,
-                                                         contextid integer NOT NULL default 0, 
-                                                         text text NOT NULL default ''
-                                                               );");                                
+                                
+        modify_database('', "CREATE TABLE prefix_role_names ( 
+                              id SERIAL PRIMARY KEY,
+                              roleid integer NOT NULL default 0,
+                              contextid integer NOT NULL default 0, 
+                              text text NOT NULL default ''
+                                );");                                
                                                                                      
     }
     return $result;

diff --git a/lib/db/postgres7.sql b/lib/db/postgres7.sql
index ac2c75fcad477d03633287e878eb4cc85b67344f..89fbab8bb6fabf8845d1d32690a3a587c5ccc63c 100644 (file)
--- a/lib/db/postgres7.sql
+++ b/lib/db/postgres7.sql
@@ -670,63 +670,63 @@ CREATE TABLE prefix_blog_tag_instance (
 CREATE INDEX prefix_bti_entryid_idx ON prefix_blog_tag_instance (entryid);
 CREATE INDEX prefix_bti_tagid_idx ON prefix_blog_tag_instance (tagid);
 
-# Roles tables          
-CREATE TABLE prefix_role (      
-  id SERIAL PRIMARY KEY,        
-  name varchar(255) NOT NULL default '',        
-  description text NOT NULL default '',         
-  sortorder integer NOT NULL default '0'        
-);      
-                
-CREATE TABLE prefix_context (   
-  id SERIAL PRIMARY KEY,        
-  level integer NOT NULL default 0,     
-  instanceid integer NOT NULL default 0         
-);      
-                
-CREATE TABLE prefix_role_assignments (          
-  id SERIAL PRIMARY KEY,        
-  roleid interger NOT NULL default 0,   
-  contextid interger NOT NULL default 0,        
-  userid interger NOT NULL default 0,   
-  hidden interger NOT NULL default 0,   
-  timestart interger NOT NULL default 0,        
-  timeend interger NOT NULL default 0,          
-  timemodified interger NOT NULL default 0,     
-  modifierid interger NOT NULL default 0,       
-  enrol varchar(20) NOT NULL default '',        
-  sortorder integer NOT NULL default '0'        
-);      
-                
-CREATE TABLE prefix_role_capabilities (         
-  id SERIAL PRIMARY KEY,        
-  contextid interger NOT NULL default 0,        
-  roleid interger NOT NULL default 0,   
-  capability varchar(255) NOT NULL default '',          
-  permission integer NOT NULL default 0,        
-  timemodified interger NOT NULL default 0,     
-  modifierid interger NOT NULL default 0        
-);      
-                
-CREATE TABLE prefix_role_deny_grant (   
-  id SERIAL PRIMARY KEY,        
-  roleid integer NOT NULL default '0',          
-  unviewableroleid integer NOT NULL default '0'         
-);      
-                
-CREATE TABLE prefix_capabilities (      
-  id SERIAL PRIMARY KEY,        
-  name varchar(150) NOT NULL default '',        
-  captype varchar(50) NOT NULL default '',      
-  contextlevel integer NOT NULL default 0,      
-  component varchar(100) NOT NULL default ''    
-);      
-                
-CREATE TABLE prefix_role_names (        
-  id SERIAL PRIMARY KEY,        
-  roleid integer NOT NULL default 0,    
-  contextid integer NOT NULL default 0,         
-  text text NOT NULL default ''         
+# Roles tables   
+CREATE TABLE prefix_role (   
+  id SERIAL PRIMARY KEY,     
+  name varchar(255) NOT NULL default '',     
+  description text NOT NULL default '',      
+  sortorder integer NOT NULL default '0'     
+);   
+         
+CREATE TABLE prefix_context (    
+  id SERIAL PRIMARY KEY,     
+  level integer NOT NULL default 0,      
+  instanceid integer NOT NULL default 0      
+);   
+         
+CREATE TABLE prefix_role_assignments (   
+  id SERIAL PRIMARY KEY,     
+  roleid integer NOT NULL default 0,     
+  contextid integer NOT NULL default 0,      
+  userid integer NOT NULL default 0,     
+  hidden integer NOT NULL default 0,     
+  timestart integer NOT NULL default 0,      
+  timeend integer NOT NULL default 0,    
+  timemodified integer NOT NULL default 0,   
+  modifierid integer NOT NULL default 0,     
+  enrol varchar(20) NOT NULL default '',     
+  sortorder integer NOT NULL default '0'     
+);   
+         
+CREATE TABLE prefix_role_capabilities (      
+  id SERIAL PRIMARY KEY,     
+  contextid integer NOT NULL default 0,      
+  roleid integer NOT NULL default 0,     
+  capability varchar(255) NOT NULL default '',   
+  permission integer NOT NULL default 0,     
+  timemodified integer NOT NULL default 0,   
+  modifierid integer NOT NULL default 0      
+);   
+         
+CREATE TABLE prefix_role_deny_grant (    
+  id SERIAL PRIMARY KEY,     
+  roleid integer NOT NULL default '0',   
+  unviewableroleid integer NOT NULL default '0'      
+);   
+         
+CREATE TABLE prefix_capabilities (   
+  id SERIAL PRIMARY KEY,     
+  name varchar(150) NOT NULL default '',     
+  captype varchar(50) NOT NULL default '',   
+  contextlevel integer NOT NULL default 0,   
+  component varchar(100) NOT NULL default ''     
+);   
+         
+CREATE TABLE prefix_role_names (     
+  id SERIAL PRIMARY KEY,     
+  roleid integer NOT NULL default 0,     
+  contextid integer NOT NULL default 0,      
+  text text NOT NULL default ''      
 );
 
 INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('user', 'view', 'user', 'firstname||\' \'||lastname');