diff --git a/setup/createtables_mysql.inc.php b/setup/createtables_mysql.inc.php index 8edcdd581c..0de4ca6901 100644 --- a/setup/createtables_mysql.inc.php +++ b/setup/createtables_mysql.inc.php @@ -11,233 +11,199 @@ /* $Id$ */ - $sql = " - CREATE TABLE config ( - config_name varchar(25) NOT NULL, - config_value varchar(100), - UNIQUE config_name (config_name) - )"; - - $db->query($sql)"; - - $sql = " - CREATE TABLE applications ( - app_name varchar(25) NOT NULL, - app_title varchar(50), - app_enabled int, - app_order int, - app_tables varchar(255), - UNIQUE app_name (app_name) - )"; - - $db->query($sql)"; - - $sql = " - CREATE TABLE accounts ( - account_id int(11) DEFAULT '0' NOT NULL auto_increment, - account_lid varchar(25) NOT NULL, - account_pwd varchar(32) NOT NULL, - account_firstname varchar(50), - account_lastname varchar(50), - account_permissions text, - account_groups varchar(30), - account_lastlogin int(11), - account_lastloginfrom varchar(255), - account_lastpwd_change int(11), - account_status enum('A','L') DEFAULT 'A' NOT NULL, - PRIMARY KEY (account_id), - UNIQUE account_lid (account_lid) - )"; - - $db->query($sql)"; - - $sql = " - create table groups ( - group_id int NOT NULL auto_increment, - group_name varchar(255), - group_apps varchar(255), - primary key(group_id) - )"; - - $db->query($sql)"; - - $sql = " - CREATE TABLE preferences ( - preference_owner varchar(20), - preference_name varchar(50), - preference_value varchar(50), - preference_appname varchar(50) - )"; - - $db->query($sql)"; - - $sql = " - CREATE TABLE sessions ( - session_id varchar(255) NOT NULL, - session_lid varchar(20), - session_pwd varchar(255), - session_ip varchar(255), - session_logintime int(11), - session_dla int(11), - UNIQUE sessionid (session_id) - )"; - - $db->query($sql)"; - - $sql = " - CREATE TABLE app_sessions ( - sessionid varchar(255) NOT NULL, - loginid varchar(20), - app varchar(20), - content text - )"; - - $db->query($sql)"; - - $sql = " - create table access_log ( - sessionid varchar(30), - loginid varchar(30), - ip varchar(30), - li int, - lo int - )"; - - $db->query($sql)"; - - $sql = " - CREATE TABLE profiles ( - con int(11) DEFAULT '0' NOT NULL auto_increment, - owner varchar(20), - title varchar(255), - phone_number varchar(255), - comments text, - picture_format varchar(255), - picture blob, - PRIMARY KEY (con) - )"; - - $db->query($sql)"; - - $sql = " - CREATE TABLE addressbook ( - ab_id int(11) DEFAULT '0' NOT NULL auto_increment, - ab_owner varchar(25), - ab_access varchar(10), - ab_firstname varchar(255), - ab_lastname varchar(255), - ab_email varchar(255), - ab_hphone varchar(255), - ab_wphone varchar(255), - ab_fax varchar(255), - ab_pager varchar(255), - ab_mphone varchar(255), - ab_ophone varchar(255), - ab_street varchar(255), - ab_city varchar(255), - ab_state varchar(255), - ab_zip varchar(255), - ab_bday varchar(255), - ab_notes text, - ab_company varchar(255), - PRIMARY KEY (ab_id) - )"; - - $db->query($sql)"; - - $sql = " - CREATE TABLE todo ( - todo_id int(11) DEFAULT '0' NOT NULL auto_increment, - todo_owner varchar(25), - todo_access varchar(10), - todo_des text, - todo_pri int(11), - todo_status int(11), - todo_datecreated int(11), - todo_datedue int(11), - PRIMARY KEY (todo_id) - )"; - - $db->query($sql)"; - - $sql = " - CREATE TABLE webcal_entry ( - cal_id int(11) DEFAULT '0' NOT NULL auto_increment, - cal_group_id int(11), - cal_create_by varchar(25) NOT NULL, - cal_date int(11) DEFAULT '0' NOT NULL, - cal_time int(11), - cal_mod_date int(11), - cal_mod_time int(11), - cal_duration int(11) DEFAULT '0' NOT NULL, - cal_priority int(11) DEFAULT '2', - cal_type varchar(10), - cal_access char(10), - cal_name varchar(80) NOT NULL, - cal_description text, - PRIMARY KEY (cal_id) - )"; - - $db->query($sql)"; - - $sql = " - CREATE TABLE webcal_entry_repeats ( - cal_id int(11) DEFAULT '0' NOT NULL, - cal_type enum('daily','weekly','monthlyByDay','monthlyByDate','yearly') DEFAULT 'daily' NOT NULL, - cal_end int(11), - cal_frequency int(11) DEFAULT '1', - cal_days char(7) - )"; - - $db->query($sql)"; - - $sql = " - CREATE TABLE webcal_entry_user ( - cal_id int(11) DEFAULT '0' NOT NULL, - cal_login varchar(25) NOT NULL, - cal_status char(1) DEFAULT 'A', - PRIMARY KEY (cal_id, cal_login) - )"; - - $db->query($sql)"; - - $sql = " - create table webcal_entry_groups ( - cal_id int, - groups varchar(255) - )"; - - $db->query($sql)"; - - $sql = " - CREATE TABLE newsgroups ( - con int(11) NOT NULL auto_increment, - name varchar(255) NOT NULL, - messagecount int(11) NOT NULL, - lastmessage int(11) NOT NULL, - active char DEFAULT 'N' NOT NULL, - lastread int(11), - PRIMARY KEY (con), - UNIQUE name (name) - )"; - - $db->query($sql)"; - - $sql = " - CREATE TABLE users_newsgroups ( - owner int(11) NOT NULL, - newsgroup int(11) NOT NULL - )"; - - $db->query($sql)"; - - $sql = " - CREATE TABLE lang ( - message_id varchar(150) DEFAULT '' NOT NULL, - app_name varchar(100) DEFAULT 'common' NOT NULL, - lang varchar(5) DEFAULT '' NOT NULL, - content text NOT NULL, - PRIMARY KEY (message_id,app_name,lang) - )"; - $db->query($sql)"; + $sql = "CREATE TABLE config (" + ."config_name varchar(25) NOT NULL," + ."config_value varchar(100)," + ."UNIQUE config_name (config_name)" + .")"; + $db->query($sql); + + $sql = "CREATE TABLE applications (" + ."app_name varchar(25) NOT NULL," + ."app_title varchar(50)," + ."app_enabled int," + ."app_order int," + ."app_tables varchar(255)," + ."UNIQUE app_name (app_name)" + .")"; + $db->query($sql); + + $sql = "CREATE TABLE accounts (" + ."account_id int(11) DEFAULT '0' NOT NULL auto_increment," + ."account_lid varchar(25) NOT NULL," + ."account_pwd varchar(32) NOT NULL," + ."account_firstname varchar(50)," + ."account_lastname varchar(50)," + ."account_permissions text," + ."account_groups varchar(30)," + ."account_lastlogin int(11)," + ."account_lastloginfrom varchar(255)," + ."account_lastpwd_change int(11)," + ."account_status enum('A','L') DEFAULT 'A' NOT NULL," + ."PRIMARY KEY (account_id)," + ."UNIQUE account_lid (account_lid)" + .")"; + $db->query($sql); + + $sql = "create table groups (" + ."group_id int NOT NULL auto_increment," + ."group_name varchar(255)," + ."group_apps varchar(255)," + ."primary key(group_id)" + .")"; + $db->query($sql); + + $sql = "CREATE TABLE preferences (" + ."preference_owner varchar(20)," + ."preference_name varchar(50)," + ."preference_value varchar(50)," + ."preference_appname varchar(50)" + .")"; + $db->query($sql); + + $sql = "CREATE TABLE sessions (" + ."session_id varchar(255) NOT NULL," + ."session_lid varchar(20)," + ."session_pwd varchar(255)," + ."session_ip varchar(255)," + ."session_logintime int(11)," + ."session_dla int(11)," + ."UNIQUE sessionid (session_id)" + .")"; + $db->query($sql); + + $sql = "CREATE TABLE app_sessions (" + ."sessionid varchar(255) NOT NULL," + ."loginid varchar(20)," + ."app varchar(20)," + ."content text" + .")"; + $db->query($sql); + + $sql = "create table access_log (" + ."sessionid varchar(30)," + ."loginid varchar(30)," + ."ip varchar(30)," + ."li int," + ."lo int" + .")"; + $db->query($sql); + + $sql = "CREATE TABLE profiles (" + ."con int(11) DEFAULT '0' NOT NULL auto_increment," + ."owner varchar(20)," + ."title varchar(255)," + ."phone_number varchar(255)," + ."comments text," + ."picture_format varchar(255)," + ."picture blob," + ."PRIMARY KEY (con)" + .")"; + $db->query($sql); + + $sql = "CREATE TABLE addressbook (" + ."ab_id int(11) DEFAULT '0' NOT NULL auto_increment," + ."ab_owner varchar(25)," + ."ab_access varchar(10)," + ."ab_firstname varchar(255)," + ."ab_lastname varchar(255)," + ."ab_email varchar(255)," + ."ab_hphone varchar(255)," + ."ab_wphone varchar(255)," + ."ab_fax varchar(255)," + ."ab_pager varchar(255)," + ."ab_mphone varchar(255)," + ."ab_ophone varchar(255)," + ."ab_street varchar(255)," + ."ab_city varchar(255)," + ."ab_state varchar(255)," + ."ab_zip varchar(255)," + ."ab_bday varchar(255)," + ."ab_notes text," + ."ab_company varchar(255)," + ."PRIMARY KEY (ab_id)" + .")"; + $db->query($sql); + + $sql = "CREATE TABLE todo (" + ."todo_id int(11) DEFAULT '0' NOT NULL auto_increment," + ."todo_owner varchar(25)," + ."todo_access varchar(10)," + ."todo_des text," + ."todo_pri int(11)," + ."todo_status int(11)," + ."todo_datecreated int(11)," + ."todo_datedue int(11)," + ."PRIMARY KEY (todo_id)" + .")"; + $db->query($sql); + + $sql = "CREATE TABLE webcal_entry (" + ."cal_id int(11) DEFAULT '0' NOT NULL auto_increment," + ."cal_group_id int(11)," + ."cal_create_by varchar(25) NOT NULL," + ."cal_date int(11) DEFAULT '0' NOT NULL," + ."cal_time int(11)," + ."cal_mod_date int(11)," + ."cal_mod_time int(11)," + ."cal_duration int(11) DEFAULT '0' NOT NULL," + ."cal_priority int(11) DEFAULT '2'," + ."cal_type varchar(10)," + ."cal_access char(10)," + ."cal_name varchar(80) NOT NULL," + ."cal_description text," + ."PRIMARY KEY (cal_id)" + .")"; + $db->query($sql); + + $sql = "CREATE TABLE webcal_entry_repeats (" + ."cal_id int(11) DEFAULT '0' NOT NULL," + ."cal_type enum('daily','weekly','monthlyByDay','monthlyByDate','yearly') DEFAULT 'daily' NOT NULL," + ."cal_end int(11)," + ."cal_frequency int(11) DEFAULT '1'," + ."cal_days char(7)" + .")"; + $db->query($sql); + + $sql = "CREATE TABLE webcal_entry_user (" + ."cal_id int(11) DEFAULT '0' NOT NULL," + ."cal_login varchar(25) NOT NULL," + ."cal_status char(1) DEFAULT 'A'," + ."PRIMARY KEY (cal_id, cal_login)" + .")"; + $db->query($sql); + + $sql = "create table webcal_entry_groups (" + ."cal_id int," + ."groups varchar(255)" + .")"; + $db->query($sql); + + $sql = "CREATE TABLE newsgroups (" + ."con int(11) NOT NULL auto_increment," + ."name varchar(255) NOT NULL," + ."messagecount int(11) NOT NULL," + ."lastmessage int(11) NOT NULL," + ."active char DEFAULT 'N' NOT NULL," + ."lastread int(11)," + ."PRIMARY KEY (con)," + ."UNIQUE name (name)" + .")"; + $db->query($sql); + + $sql = "CREATE TABLE users_newsgroups (" + ."owner int(11) NOT NULL," + ."newsgroup int(11) NOT NULL" + .")"; + $db->query($sql); + + $sql = "CREATE TABLE lang (" + ."message_id varchar(150) DEFAULT '' NOT NULL," + ."app_name varchar(100) DEFAULT 'common' NOT NULL," + ."lang varchar(5) DEFAULT '' NOT NULL," + ."content text NOT NULL," + ."PRIMARY KEY (message_id,app_name,lang)" + .")"; + $db->query($sql); + ?> \ No newline at end of file diff --git a/setup/default_records.inc.php b/setup/default_records.inc.php index 320a2eb12a..7ee78f2880 100644 --- a/setup/default_records.inc.php +++ b/setup/default_records.inc.php @@ -11,65 +11,65 @@ /* $Id$ */ - $db->query('insert into config (config_name, config_value) values ('default_tplset', 'default'); - $db->query('insert into config (config_name, config_value) values ('temp_dir', '/path/to/tmp'); - $db->query('insert into config (config_name, config_value) values ('files_dir', '/path/to/dir/phpgroupware/files'); - $db->query('insert into config (config_name, config_value) values ('encryptkey', 'change this phrase 2 something else'); - $db->query('insert into config (config_name, config_value) values ('site_title', 'phpGroupWare'); - $db->query('insert into config (config_name, config_value) values ('hostname', 'local.machine.name'); - $db->query('insert into config (config_name, config_value) values ('webserver_url', '/phpgroupware'); - $db->query('insert into config (config_name, config_value) values ('db_host', 'localhost'); - $db->query('insert into config (config_name, config_value) values ('db_name', 'phpGroupWare_dev'); - $db->query('insert into config (config_name, config_value) values ('db_user', 'phpgroupware'); - $db->query('insert into config (config_name, config_value) values ('db_pass', 'phpgr0upwar3'); - $db->query('insert into config (config_name, config_value) values ('db_type', 'mysql'); - $db->query('insert into config (config_name, config_value) values ('auth_type', 'sql'); - $db->query('insert into config (config_name, config_value) values ('ldap_host', 'localhost'); - $db->query('insert into config (config_name, config_value) values ('ldap_context', 'o=phpGroupWare'); - $db->query('insert into config (config_name, config_value) values ('usecookies', 'True'); - $db->query('insert into config (config_name, config_value) values ('mail_server', 'localhost'); - $db->query('insert into config (config_name, config_value) values ('mail_server_type', 'imap'); - $db->query('insert into config (config_name, config_value) values ('imap_server_type', 'Cyrus'); - $db->query('insert into config (config_name, config_value) values ('mail_suffix', 'yourdomain.com'); - $db->query('insert into config (config_name, config_value) values ('mail_login_type', 'standard'); - $db->query('insert into config (config_name, config_value) values ('smtp_server', 'localhost'); - $db->query('insert into config (config_name, config_value) values ('smtp_port', '25'); - $db->query('insert into config (config_name, config_value) values ('nntp_server', 'yournewsserver.com'); - $db->query('insert into config (config_name, config_value) values ('nntp_port', '119'); - $db->query('insert into config (config_name, config_value) values ('nntp_sender', 'complaints@yourserver.com'); - $db->query('insert into config (config_name, config_value) values ('nntp_organization', 'phpGroupWare'); - $db->query('insert into config (config_name, config_value) values ('nntp_admin', 'admin@yourserver.com'); - $db->query('insert into config (config_name, config_value) values ('nntp_login_username', ''); - $db->query('insert into config (config_name, config_value) values ('nntp_login_password', ''); - $db->query('insert into config (config_name, config_value) values ('charset', 'iso-8859-1'); - $db->query('insert into config (config_name, config_value) values ('default_ftp_server', 'localhost'); - $db->query('insert into config (config_name, config_value) values ('httpproxy_server', ''); - $db->query('insert into config (config_name, config_value) values ('httpproxy_port', ''); - $db->query('insert into config (config_name, config_value) values ('showpoweredbyon', 'bottom'); - $db->query('insert into config (config_name, config_value) values ('checkfornewversion', 'False'); + $db->query("insert into config (config_name, config_value) values ('default_tplset', 'default')"); + $db->query("insert into config (config_name, config_value) values ('temp_dir', '/path/to/tmp')"); + $db->query("insert into config (config_name, config_value) values ('files_dir', '/path/to/dir/phpgroupware/files')"); + $db->query("insert into config (config_name, config_value) values ('encryptkey', 'change this phrase 2 something else')"); + $db->query("insert into config (config_name, config_value) values ('site_title', 'phpGroupWare')"); + $db->query("insert into config (config_name, config_value) values ('hostname', 'local.machine.name')"); + $db->query("insert into config (config_name, config_value) values ('webserver_url', '/phpgroupware')"); + $db->query("insert into config (config_name, config_value) values ('db_host', 'localhost')"); + $db->query("insert into config (config_name, config_value) values ('db_name', 'phpGroupWare_dev')"); + $db->query("insert into config (config_name, config_value) values ('db_user', 'phpgroupware')"); + $db->query("insert into config (config_name, config_value) values ('db_pass', 'phpgr0upwar3')"); + $db->query("insert into config (config_name, config_value) values ('db_type', 'mysql')"); + $db->query("insert into config (config_name, config_value) values ('auth_type', 'sql')"); + $db->query("insert into config (config_name, config_value) values ('ldap_host', 'localhost')"); + $db->query("insert into config (config_name, config_value) values ('ldap_context', 'o=phpGroupWare')"); + $db->query("insert into config (config_name, config_value) values ('usecookies', 'True')"); + $db->query("insert into config (config_name, config_value) values ('mail_server', 'localhost')"); + $db->query("insert into config (config_name, config_value) values ('mail_server_type', 'imap')"); + $db->query("insert into config (config_name, config_value) values ('imap_server_type', 'Cyrus')"); + $db->query("insert into config (config_name, config_value) values ('mail_suffix', 'yourdomain.com')"); + $db->query("insert into config (config_name, config_value) values ('mail_login_type', 'standard')"); + $db->query("insert into config (config_name, config_value) values ('smtp_server', 'localhost')"); + $db->query("insert into config (config_name, config_value) values ('smtp_port', '25')"); + $db->query("insert into config (config_name, config_value) values ('nntp_server', 'yournewsserver.com')"); + $db->query("insert into config (config_name, config_value) values ('nntp_port', '119')"); + $db->query("insert into config (config_name, config_value) values ('nntp_sender', 'complaints@yourserver.com')"); + $db->query("insert into config (config_name, config_value) values ('nntp_organization', 'phpGroupWare')"); + $db->query("insert into config (config_name, config_value) values ('nntp_admin', 'admin@yourserver.com')"); + $db->query("insert into config (config_name, config_value) values ('nntp_login_username', '')"); + $db->query("insert into config (config_name, config_value) values ('nntp_login_password', '')"); + $db->query("insert into config (config_name, config_value) values ('charset', 'iso-8859-1')"); + $db->query("insert into config (config_name, config_value) values ('default_ftp_server', 'localhost')"); + $db->query("insert into config (config_name, config_value) values ('httpproxy_server', '')"); + $db->query("insert into config (config_name, config_value) values ('httpproxy_port', '')"); + $db->query("insert into config (config_name, config_value) values ('showpoweredbyon', 'bottom')"); + $db->query("insert into config (config_name, config_value) values ('checkfornewversion', 'False')"); - $db->query('insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('admin', 'Administration', 1, 1, NULL); - $db->query('insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('tts', 'Trouble Ticket System', 0, 2, NULL); - $db->query('insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('inv', 'Inventory', 0, 3, NULL); - $db->query('insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('chat', 'Chat', 0, 4, NULL); - $db->query('insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('headlines', 'Headlines', 0, 5, 'news_sites,news_headlines,users_headlines'); - $db->query('insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('filemanager', 'File manager', 1, 6, NULL); - $db->query('insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('addressbook', 'Address Book', 1, 7, 'addressbook'); - $db->query('insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('todo', 'ToDo List', 1, 8, 'todo'); - $db->query('insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('calendar', 'Calendar', 1, 9, 'webcal_entry,webcal_entry_users,webcal_entry_groups,webcal_repeats'); - $db->query('insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('email', 'Email', 1, 10,NULL); - $db->query('insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('nntp', 'NNTP', 1, 11, 'newsgroups,users_newsgroups'); - $db->query('insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('cron_apps', 'cron_apps', 0, 0, NULL); + $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('admin', 'Administration', 1, 1, NULL)"); + $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('tts', 'Trouble Ticket System', 0, 2, NULL)"); + $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('inv', 'Inventory', 0, 3, NULL)"); + $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('chat', 'Chat', 0, 4, NULL)"); + $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('headlines', 'Headlines', 0, 5, 'news_sites,news_headlines,users_headlines')"); + $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('filemanager', 'File manager', 1, 6, NULL)"); + $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('addressbook', 'Address Book', 1, 7, 'addressbook')"); + $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('todo', 'ToDo List', 1, 8, 'todo')"); + $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('calendar', 'Calendar', 1, 9, 'webcal_entry,webcal_entry_users,webcal_entry_groups,webcal_repeats')"); + $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('email', 'Email', 1, 10,NULL)"); + $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('nntp', 'NNTP', 1, 11, 'newsgroups,users_newsgroups')"); + $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('cron_apps', 'cron_apps', 0, 0, NULL)"); - $db->query('insert into accounts (account_lid,account_pwd,account_firstname,account_lastname,account_permissions,account_groups,account_status) values ('demo','81dc9bdb52d04dc20036dbd8313ed055','Demo','Account',':admin:email:todo:addressbook:calendar:',',1,','A'); + $db->query("insert into accounts (account_lid,account_pwd,account_firstname,account_lastname,account_permissions,account_groups,account_status) values ('demo','81dc9bdb52d04dc20036dbd8313ed055','Demo','Account',':admin:email:todo:addressbook:calendar:',',1,','A')"); - $db->query('insert into groups (group_name) values ('Default'); + $db->query("insert into groups (group_name) values ('Default')"); - $db->query('insert into preferences (preference_owner, preference_name, preference_value, preference_appname) values ('demo','maxmatchs','10','common'); - $db->query('insert into preferences (preference_owner, preference_name, preference_value, preference_appname) values ('demo','mainscreen_showbirthdays','True','common'); - $db->query('insert into preferences (preference_owner, preference_name, preference_value, preference_appname) values ('demo','mainscreen_showevents','True','common'); - $db->query('insert into preferences (preference_owner, preference_name, preference_value, preference_appname) values ('demo','timeformat','12','common'); - $db->query('insert into preferences (preference_owner, preference_name, preference_value, preference_appname) values ('demo','dateformat','m/d/Y','common'); - $db->query('insert into preferences (preference_owner, preference_name, preference_value, preference_appname) values ('demo','theme','default','common'); - $db->query('insert into preferences (preference_owner, preference_name, preference_value, preference_appname) values ('demo','tz_offset','0','common'); + $db->query("insert into preferences (preference_owner, preference_name, preference_value, preference_appname) values ('demo','maxmatchs','10','common')"); + $db->query("insert into preferences (preference_owner, preference_name, preference_value, preference_appname) values ('demo','mainscreen_showbirthdays','True','common')"); + $db->query("insert into preferences (preference_owner, preference_name, preference_value, preference_appname) values ('demo','mainscreen_showevents','True','common')"); + $db->query("insert into preferences (preference_owner, preference_name, preference_value, preference_appname) values ('demo','timeformat','12','common')"); + $db->query("insert into preferences (preference_owner, preference_name, preference_value, preference_appname) values ('demo','dateformat','m/d/Y','common')"); + $db->query("insert into preferences (preference_owner, preference_name, preference_value, preference_appname) values ('demo','theme','default','common')"); + $db->query("insert into preferences (preference_owner, preference_name, preference_value, preference_appname) values ('demo','tz_offset','0','common')"); ?> \ No newline at end of file diff --git a/setup/index.php b/setup/index.php index 424acfc312..994ad8af67 100644 --- a/setup/index.php +++ b/setup/index.php @@ -34,23 +34,43 @@ $db->Database = $phpgw_info["server"]["db_name"]; $db->User = $phpgw_info["server"]["db_user"]; $db->Password = $phpgw_info["server"]["db_pass"]; + $db->Halt_On_Error = "report"; + echo "You appear to be running a new install of phpGroupWare, so the tables will be created for you.
\n"; + include ("droptables_".$phpgw_info["server"]["db_type"].".inc.php"); + include ("createtables_".$phpgw_info["server"]["db_type"].".inc.php"); + include ("default_records.inc.php"); + include ("lang_records.inc.php"); + echo "If you did not recieve any errors, your tables have been created.
\n"; + echo "Click here to configure the environment.
\n"; + +/* $db->query("select * from config"); if ($db->num_rows() == 0){ $db->query("select * from accounts"); if ($db->num_rows() == 0){ echo "You appear to be running a new install of phpGroupWare, so the tables will be created for you.
\n"; - include ("createtables_"$phpgw_info["server"]["db_type"].".inc.php"); + include ("droptables_".$phpgw_info["server"]["db_type"].".inc.php"); + include ("createtables_".$phpgw_info["server"]["db_type"].".inc.php"); include ("default_records.inc.php"); + include ("lang_records.inc.php"); echo "If you did not recieve any errors, your tables have been created.
\n"; - echo "Click here to configure the environment.
\n"; + echo "Click here to configure the environment.
\n"; }else{ echo "You appear to be running a pre-beta version of phpGroupWare
\n"; - echo "We are not providing an upgrade path at this time, please backup your tables and drop them, so that this script can recreate them.
\n"; + //echo "We are not providing an upgrade path at this time, please backup your tables and drop them, so that this script can recreate them.
\n"; + + echo "This script is going to take the evil action of dropping your existing table and re-creating them in the new format.
\n"; + include ("droptables_".$phpgw_info["server"]["db_type"].".inc.php"); + include ("createtables_".$phpgw_info["server"]["db_type"].".inc.php"); + include ("default_records.inc.php"); + include ("lang_records.inc.php"); + echo "If you did not recieve any errors, your tables have been created.
\n"; + echo "Click here to configure the environment.
\n"; } }else{ echo "Your database seems to be current.
\n"; - echo "Click here to configure the environment.
\n"; + echo "Click here to configure the environment.
\n"; } - +*/ ?> \ No newline at end of file