Index: trunk/globals.php =================================================================== diff -u -N -r817 -r858 --- trunk/globals.php (.../globals.php) (revision 817) +++ trunk/globals.php (.../globals.php) (revision 858) @@ -277,6 +277,7 @@ function GetIndexUrl($secure=0) { global $indexURL, $rootURL, $secureURL; + switch($secure) { case 0: Index: trunk/themes/default/forgotpw_reset_result.tpl =================================================================== diff -u -N --- trunk/themes/default/forgotpw_reset_result.tpl (revision 0) +++ trunk/themes/default/forgotpw_reset_result.tpl (revision 858) @@ -0,0 +1,118 @@ + + + + + + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + +

+ + + + + + +

+ + + + + + + +

" width="18" height="12" alt="" />

+ +

+ + + + + + + + + +

+ + "> + + + + + + + + + + + + + + + + + + + + + +



	+ + +

	+ + "> + " class="button"> + +

+ + +

+ + + Index: trunk/kernel/parser.php =================================================================== diff -u -N -r845 -r858 --- trunk/kernel/parser.php (.../parser.php) (revision 845) +++ trunk/kernel/parser.php (.../parser.php) (revision 858) @@ -1202,7 +1202,7 @@ { global $objConfig,$objSession; - $theme_url = "http://".ThisDomain().$objConfig->Get("Site_Path")."index.php?env=".BuildEnv(); + $theme_url = "http://".$objConfig->Get("Site_Path")."index.php?env=".BuildEnv(); return $theme_url; } @@ -2184,6 +2184,29 @@ return $o; } +function m_confirm_password_link($attribs = array()) +{ + global $var_list, $var_list_update, $m_var_list_update, $objSession, $objConfig; + + $template = "forgotpw_reset_result"; + $user = $objSession->Get("tmp_user_id").";".$objSession->Get("tmp_email"); + + $query = "&user_key=".base64_encode($user)."&Action=m_resetpw"; + + $var_list["t"] = $template; + + if($attribs["_secure"]) + { + $ret = "https://".ThisDomain().$objConfig->Get("Site_Path")."index.php?env=".BuildEnv().$query; + } + else + { + $ret = "http://".ThisDomain().$objConfig->Get("Site_Path")."index.php?env=".BuildEnv().$query; + } + + return $ret; +} + /* @description: Create a link to a template. @attrib: _Template:tpl: Template to link to (ex: "inbulletin/post_list") Index: trunk/admin/install/inportal_schema.sql =================================================================== diff -u -N -r811 -r858 --- trunk/admin/install/inportal_schema.sql (.../inportal_schema.sql) (revision 811) +++ trunk/admin/install/inportal_schema.sql (.../inportal_schema.sql) (revision 858) @@ -1,523 +1,611 @@ -CREATE TABLE BanRules ( - RuleId int(11) NOT NULL auto_increment, - RuleType tinyint(4) NOT NULL default '0', - ItemField varchar(255) default NULL, - ItemVerb tinyint(4) NOT NULL default '0', - ItemValue varchar(255) NOT NULL default '', - ItemType int(11) NOT NULL default '0', - Priority int(11) NOT NULL default '0', - Status tinyint(4) NOT NULL default '1', - ErrorTag varchar(255) default NULL, - PRIMARY KEY (RuleId) -) -# -------------------------------------------------------- -CREATE TABLE Category ( - CategoryId int(11) NOT NULL auto_increment, - Type int(11) NOT NULL default '0', - ParentId int(11) NOT NULL default '0', - Name varchar(255) NOT NULL default '', - Description text NOT NULL, - CreatedOn double NOT NULL default '0', - EditorsPick tinyint(4) default NULL, - Status tinyint(4) NOT NULL default '0', - Pop tinyint(4) default NULL, - Priority int(11) default NULL, - MetaKeywords varchar(255) default NULL, - CachedDescendantCatsQty int(11) default NULL, - CachedNavbar text NOT NULL, - CreatedById int(11) NOT NULL default '0', - ResourceId int(11) default NULL, - ParentPath text NOT NULL, - MetaDescription varchar(255) default NULL, - HotItem int(11) NOT NULL default '2', - NewItem int(11) NOT NULL default '2', - PopItem int(11) NOT NULL default '2', - Modified double NOT NULL default '0', - ModifiedById int(11) NOT NULL default '0', - PRIMARY KEY (CategoryId), - KEY ParentId (ParentId), - UNIQUE KEY ResourceId (ResourceId), - KEY Modified (Modified), - KEY Priority (Priority), - KEY sorting (Name,Priority) -) -# -------------------------------------------------------- -CREATE TABLE CategoryItems ( - CategoryId int(11) NOT NULL default '0', - ItemResourceId int(11) NOT NULL default '0', - PrimaryCat tinyint(4) NOT NULL default '0', - PRIMARY KEY (CategoryId,ItemResourceId), - KEY ItemResourceId (ItemResourceId), - KEY PrimaryCat (PrimaryCat) -) -# -------------------------------------------------------- -CREATE TABLE ConfigurationAdmin ( - VariableName varchar(80) NOT NULL default '', - heading varchar(255) default NULL, - prompt varchar(255) default NULL, - element_type varchar(20) NOT NULL default '', - validation varchar(255) default NULL, - ValueList text default NULL, - DisplayOrder int(11) NOT NULL default '0', - Install int(11) NOT NULL default '1', - PRIMARY KEY (VariableName) -) -# -------------------------------------------------------- -CREATE TABLE ConfigurationValues ( - VariableName varchar(255) NOT NULL default '', - VariableValue varchar(255) default NULL, - ModuleOwner varchar(20) default 'In-Portal', - Section varchar(255) NOT NULL default '', - PRIMARY KEY (VariableName) -) -# -------------------------------------------------------- -CREATE TABLE CountCache ( - ListType int(11) NOT NULL default '0', - ItemType int(11) NOT NULL default '-1', - Value int(11) NOT NULL default '0', - CountCacheId int(11) NOT NULL auto_increment, - LastUpdate int(11) NOT NULL default '0', - ExtraId varchar(50) default NULL, - TodayOnly tinyint(4) NOT NULL default '0', - PRIMARY KEY (CountCacheId) -) -# -------------------------------------------------------- -CREATE TABLE CustomField ( - CustomFieldId int(11) NOT NULL auto_increment, - Type int(11) NOT NULL default '0', - FieldName varchar(255) NOT NULL default '', - FieldLabel varchar(40) default NULL, - Heading varchar(60) default NULL, - Prompt varchar(60) default NULL, - ElementType varchar(50) NOT NULL default '', - ValueList varchar(255) default NULL, - DisplayOrder int(11) NOT NULL default '0', - OnGeneralTab tinyint(4) NOT NULL default '0', - PRIMARY KEY (CustomFieldId), - KEY Type (Type) -) -# -------------------------------------------------------- -CREATE TABLE CustomMetaData ( - CustomDataId int(11) NOT NULL auto_increment, - ResourceId int(11) NOT NULL default '0', - CustomFieldId int(11) NOT NULL default '0', - Value text NOT NULL, - PRIMARY KEY (CustomDataId) -) -# -------------------------------------------------------- -CREATE TABLE EmailMessage ( - EmailMessageId int(10) NOT NULL auto_increment, - Template longtext, - MessageType enum('html','text') NOT NULL default 'text', - LanguageId int(11) NOT NULL default '0', - EventId int(11) NOT NULL default '0', - PRIMARY KEY (EmailMessageId) -) -# -------------------------------------------------------- -CREATE TABLE EmailQueue ( - Subject text NOT NULL, - toaddr text NOT NULL, - fromaddr text NOT NULL, - message blob, - headers blob, - queued timestamp NOT NULL -) -# -------------------------------------------------------- -CREATE TABLE EmailSubscribers ( - EmailMessageId int(11) NOT NULL default '0', - PortalUserId int(11) NOT NULL default '0' -) -# -------------------------------------------------------- -CREATE TABLE Events ( - EventId int(11) NOT NULL auto_increment, - Event varchar(40) NOT NULL default '', - Enabled int(11) NOT NULL default '1', - FromUserId int(11) NOT NULL default '0', - Module varchar(40) NOT NULL default '', - Description varchar(255) NOT NULL default '', - Type int(11) NOT NULL default '0', - PRIMARY KEY (EventId) -) -# -------------------------------------------------------- -CREATE TABLE Favorites ( - FavoriteId int(11) NOT NULL auto_increment, - PortalUserId int(11) NOT NULL default '0', - ResourceId int(11) NOT NULL default '0', - ItemTypeId int(11) NOT NULL default '0', - Modified int(11) NOT NULL default '0', - PRIMARY KEY (FavoriteId), - UNIQUE KEY main (PortalUserId,ResourceId) -) -# -------------------------------------------------------- -CREATE TABLE IdGenerator ( - lastid int(11) default NULL -) -# -------------------------------------------------------- -CREATE TABLE Images ( - ImageId int(11) NOT NULL auto_increment, - ResourceId int(11) NOT NULL default '0', - Url varchar(255) NOT NULL default '', - Name varchar(255) NOT NULL default '', - AltName varchar(255) default NULL, - ImageIndex int(11) NOT NULL default '0', - LocalImage tinyint(4) NOT NULL default '1', - LocalPath varchar(240) NOT NULL default '', - Enabled int(11) NOT NULL default '1', - DefaultImg int(11) NOT NULL default '0', - ThumbUrl varchar(255) default NULL, - Priority int(11) NOT NULL default '0', - ThumbPath varchar(255) default NULL, - LocalThumb tinyint(4) NOT NULL default '0', - SameImages tinyint(4) NOT NULL default '0', - PRIMARY KEY (ImageId), - KEY ResourceId (ResourceId) -) -# -------------------------------------------------------- -CREATE TABLE ItemRating ( - RatingId int(11) NOT NULL auto_increment, - IPAddress varchar(255) NOT NULL default '', - CreatedOn double NOT NULL default '0', - RatingValue int(11) NOT NULL default '0', - ItemId int(11) NOT NULL default '0', - PRIMARY KEY (RatingId) -) -# -------------------------------------------------------- -CREATE TABLE ItemReview ( - ReviewId int(11) NOT NULL auto_increment, - CreatedOn double NOT NULL default '0', - ReviewText longtext NOT NULL, - IPAddress varchar(255) NOT NULL default '', - ItemId int(11) NOT NULL default '0', - CreatedById int(11) NOT NULL default '0', - ItemType tinyint(4) NOT NULL default '0', - Priority int(11) NOT NULL default '0', - Status tinyint(4) NOT NULL default '0', - TextFormat int(11) NOT NULL default '0', - Module varchar(255) NOT NULL default '', - PRIMARY KEY (ReviewId) -) -# -------------------------------------------------------- -CREATE TABLE ItemTypes ( - ItemType int(11) NOT NULL default '0', - Module varchar(50) NOT NULL default '', - SourceTable varchar(100) NOT NULL default '', - TitleField varchar(50) default NULL, - CreatorField varchar(255) NOT NULL default '', - PopField varchar(255) default NULL, - RateField varchar(255) default NULL, - LangVar varchar(255) NOT NULL default '', - PrimaryItem int(11) NOT NULL default '0', - EditUrl varchar(255) NOT NULL default '', - ClassName varchar(40) NOT NULL default '', - ItemName varchar(50) NOT NULL default '', - PRIMARY KEY (ItemType), - KEY Module (Module) -) -# -------------------------------------------------------- -CREATE TABLE Language ( - LanguageId int(11) NOT NULL auto_increment, - PackName varchar(40) NOT NULL default '', - LocalName varchar(40) NOT NULL default '', - Enabled int(11) NOT NULL default '0', - PrimaryLang int(11) NOT NULL default '0', - IconURL varchar(255) default NULL, - DateFormat varchar(50) NOT NULL default '', - TimeFormat varchar(50) NOT NULL default '', - DecimalPoint char(2) NOT NULL default '.', - ThousandSep char(1) NOT NULL default ',', - PRIMARY KEY (LanguageId) -) -# -------------------------------------------------------- -CREATE TABLE Modules ( - Name varchar(255) NOT NULL default '', - Path varchar(255) NOT NULL default '', - Var varchar(10) NOT NULL default '', - Version varchar(10) NOT NULL default '', - Loaded tinyint(4) NOT NULL default '1', - LoadOrder tinyint(4) NOT NULL default '0', - TemplatePath varchar(255) NOT NULL default '', - RootCat int(11) NOT NULL default '0', - BuildDate double NOT NULL default '0', - PRIMARY KEY (Name) -) -# -------------------------------------------------------- -CREATE TABLE PermCache ( - PermCacheId int(11) NOT NULL auto_increment, - CategoryId int(11) NOT NULL default '0', - PermId int(11) NOT NULL default '0', - ACL varchar(255) NOT NULL default '', - DACL varchar(255) NOT NULL default '', - PRIMARY KEY (PermCacheId), - KEY CategoryId (CategoryId), - KEY PermId (PermId) -) -# -------------------------------------------------------- -CREATE TABLE PermissionConfig ( - PermissionConfigId int(11) NOT NULL auto_increment, - PermissionName varchar(30) NOT NULL default '', - Description varchar(255) NOT NULL default '', - ErrorMessage varchar(255) NOT NULL default '', - ModuleId varchar(20) NOT NULL default '0', - PRIMARY KEY (PermissionConfigId), - KEY PermissionName (PermissionName) -) -# -------------------------------------------------------- -CREATE TABLE Permissions ( - PermissionId int(11) NOT NULL auto_increment, - Permission varchar(30) NOT NULL default '', - GroupId int(11) default '0', - PermissionValue int(11) NOT NULL default '0', - Type tinyint(4) NOT NULL default '0', - CatId int(11) NOT NULL default '0', - PRIMARY KEY (PermissionId) -) -# -------------------------------------------------------- -CREATE TABLE PersistantSessionData ( - PortalUserId int(11) NOT NULL default '0', - VariableName varchar(255) NOT NULL default '', - VariableValue text NOT NULL, - KEY UserId (PortalUserId), - KEY VariableName (VariableName) -) -# -------------------------------------------------------- -CREATE TABLE Phrase ( - Phrase varchar(255) NOT NULL default '', - Translation varchar(255) NOT NULL default '', - PhraseType int(11) NOT NULL default '0', - PhraseId int(11) NOT NULL auto_increment, - LanguageId int(11) NOT NULL default '0', - PRIMARY KEY (PhraseId), - INDEX Phrase_Index (Phrase) -) -# -------------------------------------------------------- -CREATE TABLE PhraseCache ( - Template varchar(40) NOT NULL default '', - PhraseList text NOT NULL, - CacheDate int(11) NOT NULL default '0', - ThemeId int(11) NOT NULL default '0', - PRIMARY KEY (Template) -) -# -------------------------------------------------------- -CREATE TABLE PortalGroup ( - GroupId int(11) NOT NULL auto_increment, - Name varchar(255) NOT NULL default '', - Description varchar(255) default NULL, - CreatedOn double NOT NULL default '0', - System tinyint(4) NOT NULL default '0', - Personal tinyint(4) NOT NULL default '0', - Enabled tinyint(4) NOT NULL default '1', - ResourceId int(11) NOT NULL default '0', - PRIMARY KEY (GroupId), - UNIQUE KEY Name (Name), - UNIQUE KEY ResourceId (ResourceId), - KEY Personal (Personal), - KEY Enabled (Enabled) -) -# -------------------------------------------------------- -CREATE TABLE PortalUser ( - PortalUserId int(11) NOT NULL auto_increment, - Login varchar(255) default NULL, - Password varchar(255) default NULL, - FirstName varchar(255) default NULL, - LastName varchar(255) default NULL, - Email varchar(255) NOT NULL default '', - CreatedOn double NOT NULL default '0', - Phone varchar(20) default NULL, - Street varchar(255) default NULL, - City varchar(20) default NULL, - State varchar(20) default NULL, - Zip varchar(20) default NULL, - Country varchar(20) NOT NULL default '', - ResourceId int(11) NOT NULL default '0', - Status tinyint(4) NOT NULL default '2', - Modified int(11) NOT NULL default '0', - dob double NOT NULL default '0', - tz int(11) default NULL, - ip varchar(20) default NULL, - IsBanned tinyint(1) NOT NULL default '0', - PRIMARY KEY (PortalUserId), - UNIQUE KEY Login (Login), - UNIQUE KEY ResourceId (ResourceId), - KEY CreatedOn (CreatedOn) -) -# -------------------------------------------------------- -CREATE TABLE Relationship ( - RelationshipId int(11) NOT NULL auto_increment, - SourceId int(11) default NULL, - TargetId int(11) default NULL, - SourceType tinyint(4) NOT NULL default '0', - TargetType tinyint(4) NOT NULL default '0', - Type int(11) NOT NULL default '0', - Enabled int(11) NOT NULL default '1', - Priority int(11) NOT NULL default '0', - PRIMARY KEY (RelationshipId), - KEY RelSource (SourceId), - KEY RelTarget (TargetId) -) -# -------------------------------------------------------- -CREATE TABLE SearchConfig ( - TableName varchar(40) NOT NULL default '', - FieldName varchar(40) NOT NULL default '', - SimpleSearch tinyint(4) NOT NULL default '0', - AdvancedSearch tinyint(4) NOT NULL default '0', - Description varchar(255) default NULL, - DisplayName varchar(80) default NULL, - ModuleName varchar(20) default NULL, - ConfigHeader varchar(255) default NULL, - DisplayOrder int(11) NOT NULL default '0', - 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, - IsWhere text, - IsNotWhere text, - ContainsWhere text, - NotContainsWhere text, - CustomFieldId int(11) NOT NULL default '0', - PRIMARY KEY (SearchConfigId) -) -# -------------------------------------------------------- -CREATE TABLE SearchLog ( - SearchLogId int(11) NOT NULL auto_increment, - Keyword varchar(255) NOT NULL default '', - Indices bigint(20) NOT NULL default '0', - SearchType int(11) NOT NULL default '0', - PRIMARY KEY (SearchLogId) -) -# -------------------------------------------------------- -CREATE TABLE SessionData ( - SessionKey varchar(50) NOT NULL default '', - VariableName varchar(255) NOT NULL default '', - VariableValue text NOT NULL, - KEY SessionKey (SessionKey), - KEY VariableName (VariableName) -) -# -------------------------------------------------------- -CREATE TABLE SpamControl ( - ItemResourceId int(11) NOT NULL default '0', - IPaddress varchar(20) NOT NULL default '', - Expire double NOT NULL default '0', - PortalUserId int(11) NOT NULL default '0', - DataType varchar(20) default NULL -) -# -------------------------------------------------------- -CREATE TABLE StatItem ( - StatItemId int(11) NOT NULL auto_increment, - Module varchar(20) NOT NULL default '', - ValueSQL varchar(255) default NULL, - ResetSQL varchar(255) default NULL, - ListLabel varchar(255) NOT NULL default '', - Priority int(11) NOT NULL default '0', - AdminSummary int(11) NOT NULL default '0', - PRIMARY KEY (StatItemId) -) -# -------------------------------------------------------- -CREATE TABLE Theme ( - ThemeId int(11) NOT NULL auto_increment, - Name varchar(40) NOT NULL default '', - Enabled int(11) NOT NULL default '1', - Description varchar(255) default NULL, - PrimaryTheme int(11) NOT NULL default '0', - CacheTimeout int(11) NOT NULL default '0', - PRIMARY KEY (ThemeId) -) -# -------------------------------------------------------- -CREATE TABLE ThemeFiles ( - FileId int(11) NOT NULL auto_increment, - ThemeId int(11) NOT NULL default '0', - FileName varchar(255) NOT NULL default '', - FilePath varchar(255) NOT NULL default '', - Description varchar(255) default NULL, - FileType int(11) NOT NULL default '0', - PRIMARY KEY (FileId), - KEY theme (ThemeId) -) -# -------------------------------------------------------- -CREATE TABLE UserGroup ( - PortalUserId int(11) NOT NULL default '0', - GroupId int(11) NOT NULL default '0', - PrimaryGroup tinyint(4) NOT NULL default '1', - PRIMARY KEY (PortalUserId,GroupId), - KEY GroupId (GroupId), - KEY PrimaryGroup (PrimaryGroup) -) -# -------------------------------------------------------- - -CREATE TABLE UserSession ( - SessionKey varchar(50) NOT NULL default '', - CurrentTempKey varchar(50) default NULL, - PrevTempKey varchar(50) default NULL, - LastAccessed double NOT NULL default '0', - PortalUserId varchar(255) NOT NULL default '', - Language varchar(255) NOT NULL default '', - Theme varchar(255) NOT NULL default '', - GroupId int(11) NOT NULL default '0', - IpAddress varchar(20) NOT NULL default '0.0.0.0', - Status int(11) NOT NULL default '1', - GroupList varchar(255) default NULL, - tz int(11) default NULL, - PRIMARY KEY (SessionKey), - KEY UserId (PortalUserId), - KEY LastAccessed (LastAccessed) -) -# -------------------------------------------------------- -CREATE TABLE SuggestMail ( - email varchar(255) NOT NULL default '', - sent double, - PRIMARY KEY (email) -) -# -------------------------------------------------------- -CREATE TABLE SysCache ( - SysCacheId int(11) NOT NULL auto_increment, - Name varchar(255) NOT NULL default '', - Value mediumtext, - Expire double NOT NULL default '0', - Module varchar(20) default NULL, - Context varchar(255) default NULL, - GroupList varchar(255) NOT NULL default '', - PRIMARY KEY (SysCacheId), - KEY Name (Name) -) -# -------------------------------------------------------- -CREATE TABLE TagLibrary ( - TagId int(11) NOT NULL auto_increment, - name varchar(255) NOT NULL default '', - description text, - example text, - scope varchar(20) NOT NULL default 'global', - PRIMARY KEY (TagId) -) -# -------------------------------------------------------- -CREATE TABLE TagAttributes ( - AttrId int(11) NOT NULL auto_increment, - TagId int(11) NOT NULL default '0', - Name varchar(255) NOT NULL default '', - AttrType varchar(20) default NULL, - DefValue varchar(255) default NULL, - Description TEXT, - Required int(11) NOT NULL default '0', - PRIMARY KEY (AttrId) -) -# -------------------------------------------------------- -CREATE TABLE EmailLog ( - EmailLogId int(11) NOT NULL auto_increment, - fromuser varchar(200) default NULL, - addressto varchar(255) default NULL, - subject varchar(255) default NULL, - timestamp bigint(20) default '0', - event varchar(100) default NULL, - PRIMARY KEY (EmailLogId) -) -# -------------------------------------------------------- -CREATE TABLE ImportScripts ( - is_id smallint(5) unsigned NOT NULL auto_increment, - is_Module varchar(50) NOT NULL default '', - is_string_id varchar(10) NOT NULL default '', - is_script varchar(100) NOT NULL default '', - is_label varchar(255) NOT NULL default '', - is_field_prefix varchar(50) NOT NULL default '', - is_requred_fields varchar(255) NOT NULL default '', - is_enabled tinyint(1) unsigned NOT NULL default '0', - PRIMARY KEY (is_id) +CREATE TABLE BanRules ( + RuleId int(11) NOT NULL auto_increment, + RuleType tinyint(4) NOT NULL default '0', + ItemField varchar(255) default NULL, + ItemVerb tinyint(4) NOT NULL default '0', + ItemValue varchar(255) NOT NULL default '', + ItemType int(11) NOT NULL default '0', + Priority int(11) NOT NULL default '0', + Status tinyint(4) NOT NULL default '1', + ErrorTag varchar(255) default NULL, + PRIMARY KEY (RuleId) +) + +# -------------------------------------------------------- + +CREATE TABLE Category ( + CategoryId int(11) NOT NULL auto_increment, + Type int(11) NOT NULL default '0', + ParentId int(11) NOT NULL default '0', + Name varchar(255) NOT NULL default '', + Description text NOT NULL, + CreatedOn double NOT NULL default '0', + EditorsPick tinyint(4) default NULL, + Status tinyint(4) NOT NULL default '0', + Pop tinyint(4) default NULL, + Priority int(11) default NULL, + MetaKeywords varchar(255) default NULL, + CachedDescendantCatsQty int(11) default NULL, + CachedNavbar text NOT NULL, + CreatedById int(11) NOT NULL default '0', + ResourceId int(11) default NULL, + ParentPath text NOT NULL, + MetaDescription varchar(255) default NULL, + HotItem int(11) NOT NULL default '2', + NewItem int(11) NOT NULL default '2', + PopItem int(11) NOT NULL default '2', + Modified double NOT NULL default '0', + ModifiedById int(11) NOT NULL default '0', + PRIMARY KEY (CategoryId), + KEY ParentId (ParentId), + UNIQUE KEY ResourceId (ResourceId), + KEY Modified (Modified), + KEY Priority (Priority), + KEY sorting (Name,Priority) +) + +# -------------------------------------------------------- + +CREATE TABLE CategoryItems ( + CategoryId int(11) NOT NULL default '0', + ItemResourceId int(11) NOT NULL default '0', + PrimaryCat tinyint(4) NOT NULL default '0', + PRIMARY KEY (CategoryId,ItemResourceId), + KEY ItemResourceId (ItemResourceId), + KEY PrimaryCat (PrimaryCat) +) + +# -------------------------------------------------------- + +CREATE TABLE ConfigurationAdmin ( + VariableName varchar(80) NOT NULL default '', + heading varchar(255) default NULL, + prompt varchar(255) default NULL, + element_type varchar(20) NOT NULL default '', + validation varchar(255) default NULL, + ValueList text default NULL, + DisplayOrder int(11) NOT NULL default '0', + Install int(11) NOT NULL default '1', + PRIMARY KEY (VariableName) +) + +# -------------------------------------------------------- + +CREATE TABLE ConfigurationValues ( + VariableName varchar(255) NOT NULL default '', + VariableValue varchar(255) default NULL, + ModuleOwner varchar(20) default 'In-Portal', + Section varchar(255) NOT NULL default '', + PRIMARY KEY (VariableName) +) + +# -------------------------------------------------------- + +CREATE TABLE CountCache ( + ListType int(11) NOT NULL default '0', + ItemType int(11) NOT NULL default '-1', + Value int(11) NOT NULL default '0', + CountCacheId int(11) NOT NULL auto_increment, + LastUpdate int(11) NOT NULL default '0', + ExtraId varchar(50) default NULL, + TodayOnly tinyint(4) NOT NULL default '0', + PRIMARY KEY (CountCacheId) +) + +# -------------------------------------------------------- + +CREATE TABLE CustomField ( + CustomFieldId int(11) NOT NULL auto_increment, + Type int(11) NOT NULL default '0', + FieldName varchar(255) NOT NULL default '', + FieldLabel varchar(40) default NULL, + Heading varchar(60) default NULL, + Prompt varchar(60) default NULL, + ElementType varchar(50) NOT NULL default '', + ValueList varchar(255) default NULL, + DisplayOrder int(11) NOT NULL default '0', + OnGeneralTab tinyint(4) NOT NULL default '0', + PRIMARY KEY (CustomFieldId), + KEY Type (Type) +) + +# -------------------------------------------------------- + +CREATE TABLE CustomMetaData ( + CustomDataId int(11) NOT NULL auto_increment, + ResourceId int(11) NOT NULL default '0', + CustomFieldId int(11) NOT NULL default '0', + Value text NOT NULL, + PRIMARY KEY (CustomDataId) +) + +# -------------------------------------------------------- + +CREATE TABLE EmailMessage ( + EmailMessageId int(10) NOT NULL auto_increment, + Template longtext, + MessageType enum('html','text') NOT NULL default 'text', + LanguageId int(11) NOT NULL default '0', + EventId int(11) NOT NULL default '0', + PRIMARY KEY (EmailMessageId) +) + +# -------------------------------------------------------- + +CREATE TABLE EmailQueue ( + Subject text NOT NULL, + toaddr text NOT NULL, + fromaddr text NOT NULL, + message blob, + headers blob, + queued timestamp NOT NULL +) + +# -------------------------------------------------------- + +CREATE TABLE EmailSubscribers ( + EmailMessageId int(11) NOT NULL default '0', + PortalUserId int(11) NOT NULL default '0' +) + +# -------------------------------------------------------- + +CREATE TABLE Events ( + EventId int(11) NOT NULL auto_increment, + Event varchar(40) NOT NULL default '', + Enabled int(11) NOT NULL default '1', + FromUserId int(11) NOT NULL default '0', + Module varchar(40) NOT NULL default '', + Description varchar(255) NOT NULL default '', + Type int(11) NOT NULL default '0', + PRIMARY KEY (EventId) +) + +# -------------------------------------------------------- + +CREATE TABLE Favorites ( + FavoriteId int(11) NOT NULL auto_increment, + PortalUserId int(11) NOT NULL default '0', + ResourceId int(11) NOT NULL default '0', + ItemTypeId int(11) NOT NULL default '0', + Modified int(11) NOT NULL default '0', + PRIMARY KEY (FavoriteId), + UNIQUE KEY main (PortalUserId,ResourceId) +) + +# -------------------------------------------------------- + +CREATE TABLE IdGenerator ( + lastid int(11) default NULL +) + +# -------------------------------------------------------- + +CREATE TABLE Images ( + ImageId int(11) NOT NULL auto_increment, + ResourceId int(11) NOT NULL default '0', + Url varchar(255) NOT NULL default '', + Name varchar(255) NOT NULL default '', + AltName varchar(255) default NULL, + ImageIndex int(11) NOT NULL default '0', + LocalImage tinyint(4) NOT NULL default '1', + LocalPath varchar(240) NOT NULL default '', + Enabled int(11) NOT NULL default '1', + DefaultImg int(11) NOT NULL default '0', + ThumbUrl varchar(255) default NULL, + Priority int(11) NOT NULL default '0', + ThumbPath varchar(255) default NULL, + LocalThumb tinyint(4) NOT NULL default '0', + SameImages tinyint(4) NOT NULL default '0', + PRIMARY KEY (ImageId), + KEY ResourceId (ResourceId) +) + +# -------------------------------------------------------- + +CREATE TABLE ItemRating ( + RatingId int(11) NOT NULL auto_increment, + IPAddress varchar(255) NOT NULL default '', + CreatedOn double NOT NULL default '0', + RatingValue int(11) NOT NULL default '0', + ItemId int(11) NOT NULL default '0', + PRIMARY KEY (RatingId) +) + +# -------------------------------------------------------- + +CREATE TABLE ItemReview ( + ReviewId int(11) NOT NULL auto_increment, + CreatedOn double NOT NULL default '0', + ReviewText longtext NOT NULL, + IPAddress varchar(255) NOT NULL default '', + ItemId int(11) NOT NULL default '0', + CreatedById int(11) NOT NULL default '0', + ItemType tinyint(4) NOT NULL default '0', + Priority int(11) NOT NULL default '0', + Status tinyint(4) NOT NULL default '0', + TextFormat int(11) NOT NULL default '0', + Module varchar(255) NOT NULL default '', + PRIMARY KEY (ReviewId) +) + +# -------------------------------------------------------- + +CREATE TABLE ItemTypes ( + ItemType int(11) NOT NULL default '0', + Module varchar(50) NOT NULL default '', + SourceTable varchar(100) NOT NULL default '', + TitleField varchar(50) default NULL, + CreatorField varchar(255) NOT NULL default '', + PopField varchar(255) default NULL, + RateField varchar(255) default NULL, + LangVar varchar(255) NOT NULL default '', + PrimaryItem int(11) NOT NULL default '0', + EditUrl varchar(255) NOT NULL default '', + ClassName varchar(40) NOT NULL default '', + ItemName varchar(50) NOT NULL default '', + PRIMARY KEY (ItemType), + KEY Module (Module) +) + +# -------------------------------------------------------- + +CREATE TABLE Language ( + LanguageId int(11) NOT NULL auto_increment, + PackName varchar(40) NOT NULL default '', + LocalName varchar(40) NOT NULL default '', + Enabled int(11) NOT NULL default '0', + PrimaryLang int(11) NOT NULL default '0', + IconURL varchar(255) default NULL, + DateFormat varchar(50) NOT NULL default '', + TimeFormat varchar(50) NOT NULL default '', + DecimalPoint char(2) NOT NULL default '.', + ThousandSep char(1) NOT NULL default ',', + PRIMARY KEY (LanguageId) +) + +# -------------------------------------------------------- + +CREATE TABLE Modules ( + Name varchar(255) NOT NULL default '', + Path varchar(255) NOT NULL default '', + Var varchar(10) NOT NULL default '', + Version varchar(10) NOT NULL default '', + Loaded tinyint(4) NOT NULL default '1', + LoadOrder tinyint(4) NOT NULL default '0', + TemplatePath varchar(255) NOT NULL default '', + RootCat int(11) NOT NULL default '0', + BuildDate double NOT NULL default '0', + PRIMARY KEY (Name) +) + +# -------------------------------------------------------- + +CREATE TABLE PermCache ( + PermCacheId int(11) NOT NULL auto_increment, + CategoryId int(11) NOT NULL default '0', + PermId int(11) NOT NULL default '0', + ACL varchar(255) NOT NULL default '', + DACL varchar(255) NOT NULL default '', + PRIMARY KEY (PermCacheId), + KEY CategoryId (CategoryId), + KEY PermId (PermId) +) + +# -------------------------------------------------------- + +CREATE TABLE PermissionConfig ( + PermissionConfigId int(11) NOT NULL auto_increment, + PermissionName varchar(30) NOT NULL default '', + Description varchar(255) NOT NULL default '', + ErrorMessage varchar(255) NOT NULL default '', + ModuleId varchar(20) NOT NULL default '0', + PRIMARY KEY (PermissionConfigId), + KEY PermissionName (PermissionName) +) + +# -------------------------------------------------------- + +CREATE TABLE Permissions ( + PermissionId int(11) NOT NULL auto_increment, + Permission varchar(30) NOT NULL default '', + GroupId int(11) default '0', + PermissionValue int(11) NOT NULL default '0', + Type tinyint(4) NOT NULL default '0', + CatId int(11) NOT NULL default '0', + PRIMARY KEY (PermissionId) +) + +# -------------------------------------------------------- + +CREATE TABLE PersistantSessionData ( + PortalUserId int(11) NOT NULL default '0', + VariableName varchar(255) NOT NULL default '', + VariableValue text NOT NULL, + KEY UserId (PortalUserId), + KEY VariableName (VariableName) +) + +# -------------------------------------------------------- + +CREATE TABLE Phrase ( + Phrase varchar(255) NOT NULL default '', + Translation varchar(255) NOT NULL default '', + PhraseType int(11) NOT NULL default '0', + PhraseId int(11) NOT NULL auto_increment, + LanguageId int(11) NOT NULL default '0', + PRIMARY KEY (PhraseId), + INDEX Phrase_Index (Phrase) +) + +# -------------------------------------------------------- + +CREATE TABLE PhraseCache ( + Template varchar(40) NOT NULL default '', + PhraseList text NOT NULL, + CacheDate int(11) NOT NULL default '0', + ThemeId int(11) NOT NULL default '0', + PRIMARY KEY (Template) +) + +# -------------------------------------------------------- + +CREATE TABLE PortalGroup ( + GroupId int(11) NOT NULL auto_increment, + Name varchar(255) NOT NULL default '', + Description varchar(255) default NULL, + CreatedOn double NOT NULL default '0', + System tinyint(4) NOT NULL default '0', + Personal tinyint(4) NOT NULL default '0', + Enabled tinyint(4) NOT NULL default '1', + ResourceId int(11) NOT NULL default '0', + PRIMARY KEY (GroupId), + UNIQUE KEY Name (Name), + UNIQUE KEY ResourceId (ResourceId), + KEY Personal (Personal), + KEY Enabled (Enabled) +) + +# -------------------------------------------------------- + +CREATE TABLE PortalUser ( + PortalUserId int(11) NOT NULL auto_increment, + Login varchar(255) default NULL, + Password varchar(255) default NULL, + FirstName varchar(255) default NULL, + LastName varchar(255) default NULL, + Email varchar(255) NOT NULL default '', + CreatedOn double NOT NULL default '0', + Phone varchar(20) default NULL, + Street varchar(255) default NULL, + City varchar(20) default NULL, + State varchar(20) default NULL, + Zip varchar(20) default NULL, + Country varchar(20) NOT NULL default '', + ResourceId int(11) NOT NULL default '0', + Status tinyint(4) NOT NULL default '2', + Modified int(11) NOT NULL default '0', + dob double NOT NULL default '0', + tz int(11) default NULL, + ip varchar(20) default NULL, + IsBanned tinyint(1) NOT NULL default '0', + PassResetTime bigint(20), + PRIMARY KEY (PortalUserId), + UNIQUE KEY Login (Login), + UNIQUE KEY ResourceId (ResourceId), + KEY CreatedOn (CreatedOn) +) + +# -------------------------------------------------------- + +CREATE TABLE Relationship ( + RelationshipId int(11) NOT NULL auto_increment, + SourceId int(11) default NULL, + TargetId int(11) default NULL, + SourceType tinyint(4) NOT NULL default '0', + TargetType tinyint(4) NOT NULL default '0', + Type int(11) NOT NULL default '0', + Enabled int(11) NOT NULL default '1', + Priority int(11) NOT NULL default '0', + PRIMARY KEY (RelationshipId), + KEY RelSource (SourceId), + KEY RelTarget (TargetId) +) + +# -------------------------------------------------------- + +CREATE TABLE SearchConfig ( + TableName varchar(40) NOT NULL default '', + FieldName varchar(40) NOT NULL default '', + SimpleSearch tinyint(4) NOT NULL default '0', + AdvancedSearch tinyint(4) NOT NULL default '0', + Description varchar(255) default NULL, + DisplayName varchar(80) default NULL, + ModuleName varchar(20) default NULL, + ConfigHeader varchar(255) default NULL, + DisplayOrder int(11) NOT NULL default '0', + 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, + IsWhere text, + IsNotWhere text, + ContainsWhere text, + NotContainsWhere text, + CustomFieldId int(11) NOT NULL default '0', + PRIMARY KEY (SearchConfigId) +) + +# -------------------------------------------------------- + +CREATE TABLE SearchLog ( + SearchLogId int(11) NOT NULL auto_increment, + Keyword varchar(255) NOT NULL default '', + Indices bigint(20) NOT NULL default '0', + SearchType int(11) NOT NULL default '0', + PRIMARY KEY (SearchLogId) +) + +# -------------------------------------------------------- + +CREATE TABLE SessionData ( + SessionKey varchar(50) NOT NULL default '', + VariableName varchar(255) NOT NULL default '', + VariableValue text NOT NULL, + KEY SessionKey (SessionKey), + KEY VariableName (VariableName) +) + +# -------------------------------------------------------- + +CREATE TABLE SpamControl ( + ItemResourceId int(11) NOT NULL default '0', + IPaddress varchar(20) NOT NULL default '', + Expire double NOT NULL default '0', + PortalUserId int(11) NOT NULL default '0', + DataType varchar(20) default NULL +) + +# -------------------------------------------------------- + +CREATE TABLE StatItem ( + StatItemId int(11) NOT NULL auto_increment, + Module varchar(20) NOT NULL default '', + ValueSQL varchar(255) default NULL, + ResetSQL varchar(255) default NULL, + ListLabel varchar(255) NOT NULL default '', + Priority int(11) NOT NULL default '0', + AdminSummary int(11) NOT NULL default '0', + PRIMARY KEY (StatItemId) +) + +# -------------------------------------------------------- + +CREATE TABLE Theme ( + ThemeId int(11) NOT NULL auto_increment, + Name varchar(40) NOT NULL default '', + Enabled int(11) NOT NULL default '1', + Description varchar(255) default NULL, + PrimaryTheme int(11) NOT NULL default '0', + CacheTimeout int(11) NOT NULL default '0', + PRIMARY KEY (ThemeId) +) + +# -------------------------------------------------------- + +CREATE TABLE ThemeFiles ( + FileId int(11) NOT NULL auto_increment, + ThemeId int(11) NOT NULL default '0', + FileName varchar(255) NOT NULL default '', + FilePath varchar(255) NOT NULL default '', + Description varchar(255) default NULL, + FileType int(11) NOT NULL default '0', + PRIMARY KEY (FileId), + KEY theme (ThemeId) +) + +# -------------------------------------------------------- + +CREATE TABLE UserGroup ( + PortalUserId int(11) NOT NULL default '0', + GroupId int(11) NOT NULL default '0', + PrimaryGroup tinyint(4) NOT NULL default '1', + PRIMARY KEY (PortalUserId,GroupId), + KEY GroupId (GroupId), + KEY PrimaryGroup (PrimaryGroup) +) + +# -------------------------------------------------------- + + + +CREATE TABLE UserSession ( + SessionKey varchar(50) NOT NULL default '', + CurrentTempKey varchar(50) default NULL, + PrevTempKey varchar(50) default NULL, + LastAccessed double NOT NULL default '0', + PortalUserId varchar(255) NOT NULL default '', + Language varchar(255) NOT NULL default '', + Theme varchar(255) NOT NULL default '', + GroupId int(11) NOT NULL default '0', + IpAddress varchar(20) NOT NULL default '0.0.0.0', + Status int(11) NOT NULL default '1', + GroupList varchar(255) default NULL, + tz int(11) default NULL, + PRIMARY KEY (SessionKey), + KEY UserId (PortalUserId), + KEY LastAccessed (LastAccessed) +) + +# -------------------------------------------------------- + +CREATE TABLE SuggestMail ( + email varchar(255) NOT NULL default '', + sent double, + PRIMARY KEY (email) +) + +# -------------------------------------------------------- + +CREATE TABLE SysCache ( + SysCacheId int(11) NOT NULL auto_increment, + Name varchar(255) NOT NULL default '', + Value mediumtext, + Expire double NOT NULL default '0', + Module varchar(20) default NULL, + Context varchar(255) default NULL, + GroupList varchar(255) NOT NULL default '', + PRIMARY KEY (SysCacheId), + KEY Name (Name) +) + +# -------------------------------------------------------- + +CREATE TABLE TagLibrary ( + TagId int(11) NOT NULL auto_increment, + name varchar(255) NOT NULL default '', + description text, + example text, + scope varchar(20) NOT NULL default 'global', + PRIMARY KEY (TagId) +) + +# -------------------------------------------------------- + +CREATE TABLE TagAttributes ( + AttrId int(11) NOT NULL auto_increment, + TagId int(11) NOT NULL default '0', + Name varchar(255) NOT NULL default '', + AttrType varchar(20) default NULL, + DefValue varchar(255) default NULL, + Description TEXT, + Required int(11) NOT NULL default '0', + PRIMARY KEY (AttrId) +) + +# -------------------------------------------------------- + +CREATE TABLE EmailLog ( + EmailLogId int(11) NOT NULL auto_increment, + fromuser varchar(200) default NULL, + addressto varchar(255) default NULL, + subject varchar(255) default NULL, + timestamp bigint(20) default '0', + event varchar(100) default NULL, + PRIMARY KEY (EmailLogId) +) + +# -------------------------------------------------------- + +CREATE TABLE ImportScripts ( + is_id smallint(5) unsigned NOT NULL auto_increment, + is_Module varchar(50) NOT NULL default '', + is_string_id varchar(10) NOT NULL default '', + is_script varchar(100) NOT NULL default '', + is_label varchar(255) NOT NULL default '', + is_field_prefix varchar(50) NOT NULL default '', + is_requred_fields varchar(255) NOT NULL default '', + is_enabled tinyint(1) unsigned NOT NULL default '0', + PRIMARY KEY (is_id) ) \ No newline at end of file Index: trunk/kernel/include/emailmessage.php =================================================================== diff -u -N -r748 -r858 --- trunk/kernel/include/emailmessage.php (.../emailmessage.php) (revision 748) +++ trunk/kernel/include/emailmessage.php (.../emailmessage.php) (revision 858) @@ -397,7 +397,7 @@ else { $output = $this->ParseObject($tag); } - //echo $output."
"; + if(substr($output,0,9)=="Undefined") { $output = $tag->Execute(); Index: trunk/themes/default/forgotpw_confirm.tpl =================================================================== diff -u -N -r13 -r858 --- trunk/themes/default/forgotpw_confirm.tpl (.../forgotpw_confirm.tpl) (revision 13) +++ trunk/themes/default/forgotpw_confirm.tpl (.../forgotpw_confirm.tpl) (revision 858) @@ -66,8 +66,8 @@
-

-

+

+

Index: trunk/kernel/frontaction.php =================================================================== diff -u -N -r842 -r858 --- trunk/kernel/frontaction.php (.../frontaction.php) (revision 842) +++ trunk/kernel/frontaction.php (.../frontaction.php) (revision 858) @@ -91,9 +91,35 @@ } } break; - + + case "m_resetpw": + $passed_arr = explode(';', base64_decode($_GET['user_key'])); + $found = false; + + $u = $objUsers->GetItemByField("Email", $passed_arr[1]); + if(is_object($u)) { + $found = ($u->Get("PortalUserId")==$passed_arr[0] && $u->Get("Status")==1) && strlen($u->Get("Password")); + } + + if($found) + { + $newpw = makepassword(); + $objSession->Set('password', $newpw); + $u->Set("Password",$newpw); + $u->Set("PassResetTime", time()); + $u->Update(); + $u->SendUserEventMail("USER.PSWD",$u->Get("PortalUserId")); + $u->SendAdminEventMail("USER.PSWD"); + $u->Set("Password",md5($newpw)); + $u->Update(); + $u->Clean(); + } + break; + case "m_forgotpw": $MissingCount = SetMissingDataErrors("forgotpw"); + $pass_reset_add = $objConfig->Get("Users_AllowReset"); + if($MissingCount==0) { $username = $_POST["username"]; @@ -111,16 +137,21 @@ if(is_object($u)) $found = ($u->Get("Email")==$email && $u->Get("Status")==1) && strlen($u->Get("Password")); } - if($found) + + $allow_reset = $u->Get("PassResetTime") + $pass_reset_add; + + if($found && $allow_reset <= time()) { - $newpw = makepassword(); - $objSession->Set('password', $newpw); - $u->Set("Password",$newpw); - $u->Update(); - $u->SendUserEventMail("USER.PSWD",$u->Get("PortalUserId")); - $u->SendAdminEventMail("USER.PSWD"); - $u->Set("Password",md5($newpw)); - $u->Update(); + //$newpw = makepassword(); + //$objSession->Set('password', $newpw); + $objSession->Set('tmp_user_id', $u->Get("PortalUserId")); + $objSession->Set('tmp_email', $u->Get("Email")); + //$u->Set("Password",$newpw); + //$u->Update(); + $u->SendUserEventMail("USER.PSWDC",$u->Get("PortalUserId")); + //$u->SendAdminEventMail("USER.PSWDC"); + //$u->Set("Password",md5($newpw)); + //$u->Update(); $u->Clean(); } else @@ -136,6 +167,10 @@ $FormError["forgotpw"]["username"] = language("lu_ferror_unknown_username"); if(strlen($email)) $FormError["forgotpw"]["email"] = language("lu_ferror_unknown_email"); + if ($allow_reset > time()) { + $FormError["forgotpw"]["username"] = language("lu_ferror_reset_denied"); + //$FormError["forgotpw"] = language("lu_ferror_reset_denied"); + } $MissingCount++; } if(strlen($_GET["error"])) @@ -837,6 +872,7 @@ case 1: /* category */ //echo "Searching for categories
"; $objAdvSearch = new clsAdvancedSearchResults("Category","clsCategory"); + foreach($objSearchConfig->Items as $field) { $fld = $field->Get("FieldName"); @@ -865,7 +901,7 @@ default: $Conjuction = ""; break; - } + } if(strlen($Verb)>0 && $Verb!="any") { //echo "Adding CAT SearchField: [".$field->Get("TableName")."]; [".$field->Get("FieldName")."]; [$Verb]; [$Value]; [$Conjuction]
"; Index: trunk/admin/install/upgrades/inportal_upgrade_v1.0.10.sql =================================================================== diff -u -N -r836 -r858 --- trunk/admin/install/upgrades/inportal_upgrade_v1.0.10.sql (.../inportal_upgrade_v1.0.10.sql) (revision 836) +++ trunk/admin/install/upgrades/inportal_upgrade_v1.0.10.sql (.../inportal_upgrade_v1.0.10.sql) (revision 858) @@ -2,6 +2,13 @@ ALTER TABLE PortalGroup DROP INDEX ResourceId, ADD UNIQUE ResourceId (ResourceId); ALTER TABLE PortalUser DROP INDEX ResourceId, ADD UNIQUE ResourceId (ResourceId); +ALTER TABLE PortalUser ADD PassResetTime BIGINT(20); + +INSERT INTO Events VALUES (67, 'USER.PSWDC', '1', '0', 'In-Portal:Users', 'la_event_user.pswd_confirm', '0'); + +INSERT INTO ConfigurationAdmin VALUES ('Users_AllowReset', 'la_Text_General', 'la_prompt_allow_reset', 'text', NULL, NULL, 3, 0); + +INSERT INTO ConfigurationValues VALUES ('Users_AllowReset', '180', 'In-Portal:Users', 'in-portal:configure_users'); INSERT INTO ConfigurationValues VALUES ('Search_MinKeyword_Length', '3', 'In-Portal', ''); Index: trunk/admin/install/inportal_data.sql =================================================================== diff -u -N -r836 -r858 --- trunk/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 836) +++ trunk/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 858) @@ -15,6 +15,7 @@ INSERT INTO ConfigurationAdmin VALUES ('User_GuestGroup', 'la_Text_General', 'la_users_guest_group', 'select', NULL, '0=lu_none,SELECT GroupId as OptionName, Name as OptionValue FROM PortalGroup WHERE Enabled=1 AND Personal=0', 4, 1); INSERT INTO ConfigurationAdmin VALUES ('RootPass', 'la_Text_General', 'la_prompt_root_pass', 'password', NULL, NULL, 11, 0); INSERT INTO ConfigurationAdmin VALUES ('RootPassVerify', 'la_Text_General', 'la_prompt_root_pass_verify', 'password', NULL, NULL, 11, 0); +INSERT INTO ConfigurationAdmin VALUES ('Users_AllowReset', 'la_Text_General', 'la_prompt_allow_reset', 'text', NULL, NULL, 3, 0); INSERT INTO ConfigurationAdmin VALUES ('User_Allow_New', 'la_Text_General', 'la_users_allow_new', 'radio', '', '1=la_User_Instant,2=la_User_Not_Allowed,3=la_User_Upon_Approval', 1, 1); INSERT INTO ConfigurationAdmin VALUES ('User_Password_Auto', 'la_Text_General', 'la_users_password_auto', 'checkbox', '', '', 10, 1); INSERT INTO ConfigurationAdmin VALUES ('User_Votes_Deny', 'la_Text_Restrictions', 'la_users_votes_deny', 'text', '', '', 4, 1); @@ -152,6 +153,7 @@ INSERT INTO ConfigurationValues VALUES ('Perpage_EmailsL', '20', 'In-Portal', ''); INSERT INTO ConfigurationValues VALUES ('Perpage_CustomData', '20', 'In-Portal', ''); INSERT INTO ConfigurationValues VALUES ('Search_MinKeyword_Length', '3', 'In-Portal', ''); +INSERT INTO ConfigurationValues VALUES ('Users_AllowReset', '180', 'In-Portal:Users', 'in-portal:configure_users'); INSERT INTO Events VALUES (30, 'USER.ADD', 1, 0, 'In-Portal:Users', 'la_event_user.add', 0) INSERT INTO Events VALUES (32, 'USER.ADD', 2, 0, 'In-Portal:Users', 'la_event_user.add', 1) @@ -180,8 +182,9 @@ INSERT INTO Events VALUES (61, 'USER.SUBSCRIBE', 2, 0, 'In-Portal:Users', 'la_event_user.subscribe', 1); INSERT INTO Events VALUES (62, 'USER.UNSUBSCRIBE', 1, 0, 'In-Portal:Users', 'la_event_user.unsubscribe', 0); INSERT INTO Events VALUES (63, 'USER.UNSUBSCRIBE', 2, 0, 'In-Portal:Users', 'la_event_user.unsubscribe', 1); -INSERT INTO Events VALUES (64,'USER.SUGGEST', '1', '0', 'In-Portal:Users', 'la_event_user.suggest', '0'); -INSERT INTO Events VALUES (65,'USER.SUGGEST', '2', '0', 'In-Portal:Users', 'la_event_user.suggest', '1'); +INSERT INTO Events VALUES (64, 'USER.SUGGEST', '1', '0', 'In-Portal:Users', 'la_event_user.suggest', '0'); +INSERT INTO Events VALUES (65, 'USER.SUGGEST', '2', '0', 'In-Portal:Users', 'la_event_user.suggest', '1'); +INSERT INTO Events VALUES (67, 'USER.PSWDC', '1', '0', 'In-Portal:Users', 'la_event_user.pswd_confirm', '0'); INSERT INTO IdGenerator VALUES ('100');