Index: trunk/admin/install/upgrades/inportal_upgrade_v1.1.0.sql =================================================================== diff -u -r1566 -r1588 --- trunk/admin/install/upgrades/inportal_upgrade_v1.1.0.sql (.../inportal_upgrade_v1.1.0.sql) (revision 1566) +++ trunk/admin/install/upgrades/inportal_upgrade_v1.1.0.sql (.../inportal_upgrade_v1.1.0.sql) (revision 1588) @@ -1,7 +1,20 @@ -ALTER TABLE Category CHANGE CreatedOn CreatedOn INT(11) DEFAULT '0' NOT NULL , CHANGE Modified Modified INT(11) DEFAULT '0' NOT NULL; -ALTER TABLE CategoryItems DROP PRIMARY KEY; -ALTER TABLE CategoryItems ADD INDEX (CategoryId); -ALTER TABLE SessionData ADD PRIMARY KEY (SessionKey, VariableName); -ALTER TABLE SearchConfig CHANGE JoinClause JoinClause TEXT DEFAULT NULL , CHANGE ForeignField ForeignField TEXT DEFAULT NULL; -ALTER TABLE Theme ADD StylesheetId INT UNSIGNED NOT NULL ; +ALTER TABLE SysCache DROP INDEX Expire; +ALTER TABLE Category MODIFY COLUMN Priority INTEGER(11) DEFAULT NULL; +ALTER TABLE CustomField ADD COLUMN Multilingual TINYINT(4) NOT NULL DEFAULT '0'; +ALTER TABLE Phrase ADD COLUMN LastChanged INTEGER(10) UNSIGNED NOT NULL DEFAULT '0'; +ALTER TABLE Phrase ADD COLUMN LastChangeIP VARCHAR(15) NOT NULL; +ALTER TABLE Phrase ADD COLUMN Module VARCHAR(30) NOT NULL; +ALTER TABLE PortalUser MODIFY COLUMN State VARCHAR(20) NOT NULL; +ALTER TABLE SearchConfig MODIFY COLUMN ForeignField TEXT; +ALTER TABLE SearchConfig MODIFY COLUMN JoinClause TEXT; +ALTER TABLE Theme ADD COLUMN StylesheetId INTEGER(10) UNSIGNED NOT NULL DEFAULT '0'; +ALTER TABLE Phrase ADD KEY LanguageId (LanguageId); + +CREATE TABLE Cache (VarName varchar(255) NOT NULL default '', Data longtext, Cached int(11) default NULL, PRIMARY KEY (VarName), KEY Cached (Cached) ); +CREATE TABLE StylesheetSelectors (SelectorId int(11) NOT NULL auto_increment, StylesheetId int(11) NOT NULL default '0', Name varchar(255) NOT NULL default '', SelectorName varchar(255) NOT NULL default '', SelectorData text NOT NULL, Description text NOT NULL, Type tinyint(4) NOT NULL default '0', AdvancedCSS text NOT NULL, ParentId int(11) NOT NULL default '0', PRIMARY KEY (SelectorId) ); +CREATE TABLE Stylesheets ( StylesheetId int(11) NOT NULL auto_increment, Name varchar(255) NOT NULL default '', Description varchar(255) NOT NULL default '', AdvancedCSS text NOT NULL, LastCompiled int(10) unsigned NOT NULL default '0', Enabled int(11) NOT NULL default '0', PRIMARY KEY (StylesheetId) ); + +INSERT INTO ConfigurationAdmin VALUES ('Email_As_Login', 'la_Text_General', 'la_use_emails_as_login', 'checkbox', NULL, NULL, 1, 0); +INSERT INTO ConfigurationValues VALUES ('Email_As_Login', '1', 'In-Portal:Users', 'in-portal:configure_users'); + UPDATE Modules SET Version = '1.1.0' WHERE Name = 'In-Portal'; \ No newline at end of file Index: trunk/admin/install/inportal_schema.sql =================================================================== diff -u -r1566 -r1588 --- trunk/admin/install/inportal_schema.sql (.../inportal_schema.sql) (revision 1566) +++ trunk/admin/install/inportal_schema.sql (.../inportal_schema.sql) (revision 1588) @@ -105,6 +105,7 @@ ValueList varchar(255) default NULL, DisplayOrder int(11) NOT NULL default '0', OnGeneralTab tinyint(4) NOT NULL default '0', + Multilingual TINYINT(4) NOT NULL DEFAULT '0', PRIMARY KEY (CustomFieldId), KEY Type (Type) ) @@ -341,6 +342,7 @@ LastChangeIP varchar(15) NOT NULL default '', Module varchar(30) NOT NULL default '', PRIMARY KEY (PhraseId), + KEY LanguageId (LanguageId), INDEX Phrase_Index (Phrase) ) @@ -386,7 +388,7 @@ Phone varchar(20) default NULL, Street varchar(255) default NULL, City varchar(20) default NULL, - State varchar(20) NOT NULL default '', + State VARCHAR(20) NOT NULL, Zip varchar(20) default NULL, Country varchar(20) NOT NULL default '', ResourceId int(11) NOT NULL default '0', @@ -437,8 +439,8 @@ SearchConfigId int(11) NOT NULL auto_increment, Priority int(11) NOT NULL default '0', FieldType varchar(20) NOT NULL default 'text', - ForeignField varchar(255) default NULL, - JoinClause varchar(255) default NULL, + ForeignField TEXT, + JoinClause TEXT, IsWhere text, IsNotWhere text, ContainsWhere text, @@ -500,6 +502,7 @@ Description varchar(255) default NULL, PrimaryTheme int(11) NOT NULL default '0', CacheTimeout int(11) NOT NULL default '0', + StylesheetId INTEGER(10) UNSIGNED NOT NULL DEFAULT '0', PRIMARY KEY (ThemeId) ) @@ -568,9 +571,8 @@ Context varchar(255) default NULL, GroupList varchar(255) NOT NULL default '', PRIMARY KEY (SysCacheId), - KEY Name (Name), - KEY Expire (Expire) -) + KEY Name (Name) +) # -------------------------------------------------------- @@ -624,6 +626,14 @@ # -------------------------------------------------------- +CREATE TABLE Cache ( + VarName varchar(255) NOT NULL default '', + Data longtext, + Cached int(11) default NULL, + PRIMARY KEY (VarName), + KEY Cached (Cached) +) +# -------------------------------------------------------- CREATE TABLE StylesheetSelectors ( SelectorId int(11) NOT NULL auto_increment, StylesheetId int(11) NOT NULL default '0', @@ -636,9 +646,7 @@ ParentId int(11) NOT NULL default '0', PRIMARY KEY (SelectorId) ) - # -------------------------------------------------------- - CREATE TABLE Stylesheets ( StylesheetId int(11) NOT NULL auto_increment, Name varchar(255) NOT NULL default '', @@ -647,4 +655,5 @@ LastCompiled int(10) unsigned NOT NULL default '0', Enabled int(11) NOT NULL default '0', PRIMARY KEY (StylesheetId) -) \ No newline at end of file +) +# -------------------------------------------------------- \ No newline at end of file Index: trunk/kernel/user_files/dummy =================================================================== diff -u --- trunk/kernel/user_files/dummy (revision 0) +++ trunk/kernel/user_files/dummy (revision 1588) @@ -0,0 +1 @@ \ No newline at end of file