Index: trunk/admin/install.php =================================================================== diff -u -r7635 -r7867 --- trunk/admin/install.php (.../install.php) (revision 7635) +++ trunk/admin/install.php (.../install.php) (revision 7867) @@ -1213,11 +1213,11 @@ $installed = TableExists($ado,"ConfigurationAdmin,Category,Permissions"); if(!$installed) { - // run core install script + // run core install script K4_RunSQL('/core/install/install_schema.sql'); K4_RunSQL('/core/install/install_data.sql'); K4_SetModuleVersion('Core'); - + // run in-portal install script $filename = $pathtoroot.$admin."/install/inportal_schema.sql"; RunSchemaFile($ado,$filename); @@ -2025,7 +2025,7 @@ - Powered by In-portal © 1997-2006, Intechnic Corporation. All rights reserved. + Powered by In-portal © 1997-2007, Intechnic Corporation. All rights reserved.
Index: trunk/kernel/admin_templates/stylesheets/stylesheets_edit.tpl =================================================================== diff -u -r7391 -r7867 --- trunk/kernel/admin_templates/stylesheets/stylesheets_edit.tpl (.../stylesheets_edit.tpl) (revision 7391) +++ trunk/kernel/admin_templates/stylesheets/stylesheets_edit.tpl (.../stylesheets_edit.tpl) (revision 7867) @@ -2,7 +2,7 @@ - + Index: trunk/kernel/admin_templates/users/users_edit_tabs.tpl =================================================================== diff -u --- trunk/kernel/admin_templates/users/users_edit_tabs.tpl (revision 0) +++ trunk/kernel/admin_templates/users/users_edit_tabs.tpl (revision 7867) @@ -0,0 +1,13 @@ + + + + +
+ + + + + + +
+
\ No newline at end of file Index: trunk/themes/default/register/register_form.tpl =================================================================== diff -u -r4358 -r7867 --- trunk/themes/default/register/register_form.tpl (.../register_form.tpl) (revision 4358) +++ trunk/themes/default/register/register_form.tpl (.../register_form.tpl) (revision 7867) @@ -167,6 +167,8 @@ + +
" class="button"> " class="button"> Fisheye: Tag 7867 refers to a dead (removed) revision in file `trunk/admin/install/upgrades/inportal_upgrade_4_0_1.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: trunk/core/units/visits/visits_config.php =================================================================== diff -u -r7391 -r7867 --- trunk/core/units/visits/visits_config.php (.../visits_config.php) (revision 7391) +++ trunk/core/units/visits/visits_config.php (.../visits_config.php) (revision 7867) @@ -92,7 +92,7 @@ ), 'Fields' => Array( - 'VisitId' => Array('type' => 'int'), + 'VisitId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'VisitDate' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'custom_filter' => 'date_range', 'not_null' => '1','default' => '0'), 'Referer' => Array('type' => 'string','not_null' => '1','default' => ''), 'IPAddress' => Array('type' => 'string','not_null' => '1','default' => ''), Index: trunk/core/units/images/images_config.php =================================================================== diff -u -r5320 -r7867 --- trunk/core/units/images/images_config.php (.../images_config.php) (revision 5320) +++ trunk/core/units/images/images_config.php (.../images_config.php) (revision 7867) @@ -77,7 +77,7 @@ ) ), 'Fields' => Array( - 'ImageId' => Array('type'=>'int'), + 'ImageId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'ResourceId' => Array('type'=>'int', 'not_null'=>1, 'default' => 0), 'Url' => Array('max_len'=>255, 'default' => '', 'not_null'=>1), 'Name' => Array('max_len'=>255, 'required'=>1, 'not_null'=>1, 'default' => ''), Index: trunk/admin/users/adduser.php =================================================================== diff -u -r7391 -r7867 --- trunk/admin/users/adduser.php (.../adduser.php) (revision 7391) +++ trunk/admin/users/adduser.php (.../adduser.php) (revision 7867) @@ -157,7 +157,7 @@ > - + @@ -369,6 +369,29 @@ - + Index: trunk/kernel/include/adodb/adodb.inc.php =================================================================== diff -u -r6093 -r7867 --- trunk/kernel/include/adodb/adodb.inc.php (.../adodb.inc.php) (revision 6093) +++ trunk/kernel/include/adodb/adodb.inc.php (.../adodb.inc.php) (revision 7867) @@ -767,7 +767,6 @@ $m = $this->ErrorMsg(); $errorLevel = constOn('DBG_SQL_FAILURE') && !constOn('IS_INSTALL') ? E_USER_ERROR : E_USER_WARNING; - $debugger->dumpVars($_REQUEST); $debugger->appendTrace(); $error_msg = ''.$m.' ('.$e.')
SQL: '.$debugger->formatSQL($sql); Index: trunk/core/units/reviews/reviews_config.php =================================================================== diff -u -r7635 -r7867 --- trunk/core/units/reviews/reviews_config.php (.../reviews_config.php) (revision 7635) +++ trunk/core/units/reviews/reviews_config.php (.../reviews_config.php) (revision 7867) @@ -95,7 +95,7 @@ ), 'Fields' => Array( - 'ReviewId' => Array('type'=>'int'), + 'ReviewId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'CreatedOn' => Array('formatter'=>'kDateFormatter','not_null'=>1,'default'=>'#NOW#'), 'ReviewText' => Array('type'=>'string','required'=>1,'not_null'=>1,'default'=>''), 'IPAddress' => Array('type'=>'string','max_value_inc'=>15,'not_null'=>1,'default'=>''), Index: trunk/admin/install/inportal_schema.sql =================================================================== diff -u -r7391 -r7867 --- trunk/admin/install/inportal_schema.sql (.../inportal_schema.sql) (revision 7391) +++ trunk/admin/install/inportal_schema.sql (.../inportal_schema.sql) (revision 7867) @@ -52,8 +52,8 @@ 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', + LocalThumb tinyint(4) NOT NULL default '1', + SameImages tinyint(4) NOT NULL default '1', PRIMARY KEY (ImageId), KEY ResourceId (ResourceId) ) @@ -77,10 +77,10 @@ ReviewText longtext NOT NULL, IPAddress varchar(255) NOT NULL default '', ItemId int(11) NOT NULL default '0', - CreatedById int(11) NOT NULL default '0', + CreatedById int(11) NOT NULL default '-1', ItemType tinyint(4) NOT NULL default '0', Priority int(11) NOT NULL default '0', - Status tinyint(4) NOT NULL default '0', + Status tinyint(4) NOT NULL default '2', TextFormat int(11) NOT NULL default '0', Module varchar(255) NOT NULL default '', PRIMARY KEY (ReviewId) @@ -127,8 +127,8 @@ 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', + SimpleSearch tinyint(4) NOT NULL default '1', + AdvancedSearch tinyint(4) NOT NULL default '1', Description varchar(255) default NULL, DisplayName varchar(80) default NULL, ModuleName varchar(20) default NULL, @@ -271,7 +271,7 @@ Referer varchar(255) NOT NULL default '', IPAddress varchar(15) NOT NULL default '', AffiliateId int(10) unsigned NOT NULL default '0', - PortalUserId int(11) NOT NULL default '0', + PortalUserId int(11) NOT NULL default '-2', PRIMARY KEY (VisitId), KEY PortalUserId (PortalUserId), KEY AffiliateId (AffiliateId) @@ -290,12 +290,3 @@ ) # -------------------------------------------------------- - -CREATE TABLE CategoryCustomData ( - CustomDataId int(11) NOT NULL auto_increment, - ResourceId int(10) unsigned NOT NULL default '0', - KEY ResourceId (ResourceId), - PRIMARY KEY (CustomDataId) -) - -# -------------------------------------------------------- Index: trunk/kernel/admin_templates/stylesheets/stylesheets_list.tpl =================================================================== diff -u -r7391 -r7867 --- trunk/kernel/admin_templates/stylesheets/stylesheets_list.tpl (.../stylesheets_list.tpl) (revision 7391) +++ trunk/kernel/admin_templates/stylesheets/stylesheets_list.tpl (.../stylesheets_list.tpl) (revision 7867) @@ -2,7 +2,7 @@ - + Index: trunk/tools/debug_sample.php =================================================================== diff -u -r7391 -r7867 --- trunk/tools/debug_sample.php (.../debug_sample.php) (revision 7391) +++ trunk/tools/debug_sample.php (.../debug_sample.php) (revision 7867) @@ -31,6 +31,11 @@ // 'DBG_VALIDATE_CONFIGS' => 1, // Check that config fields match ones from database // 'DBG_SHOW_TAGS' => 1, // Show tags beeing processed +// 'DBG_PRE_PARSE' => 1, // Show new compiled functions in debugger +// 'DBG_SHOW_TREE_PRIORITY'=> 1, // Show tree node priority +// 'DBG_SKIP_AJAX' => 1, // Don't debug AJAX requests +// 'DBG_PAYMENT_GW' => 1, // All requests to payment gateways goes in TEST MODE +// 'DBG_IMAGE_RECOVERY' => 1, // Don't replace missing images with noimage.gif ); Index: trunk/kernel/include/permissions.php =================================================================== diff -u -r674 -r7867 --- trunk/kernel/include/permissions.php (.../permissions.php) (revision 674) +++ trunk/kernel/include/permissions.php (.../permissions.php) (revision 7867) @@ -368,27 +368,27 @@ return $p; } - function &AddPermCache($CatId,$PermId,$Acl,$Dacl) + function &AddPermCache($CatId,$PermId,$Acl) { - if(strlen($Acl)>0 || strlen($Dacl)>0) + if(strlen($Acl)>0) { $p = new $this->classname; - $p->Set(array("CategoryId","PermId","ACL","DACL"),array($CatId,$PermId,$Acl,$Dacl)); + $p->Set(array("CategoryId","PermId","ACL"),array($CatId,$PermId,$Acl)); $p->Create(); return $p; } else return FALSE; } - function EditPermCache($PermCacheId,$CatId,$PermId,$Acl,$Dacl) + function EditPermCache($PermCacheId,$CatId,$PermId,$Acl) { if($PermCacheId) { $p = $this->GetItem($PermCacheId); if(is_object($p)) { - $p->Set(array("CategoryId","PermId","ACL","DACL"),array($CatId,$PermId,$Acl,$Dacl)); + $p->Set(array("CategoryId","PermId","ACL"),array($CatId,$PermId,$Acl)); $p->Update(); } } Index: trunk/kernel/include/tag-class.php =================================================================== diff -u -r3330 -r7867 --- trunk/kernel/include/tag-class.php (.../tag-class.php) (revision 3330) +++ trunk/kernel/include/tag-class.php (.../tag-class.php) (revision 7867) @@ -102,7 +102,7 @@ $a->Set("AttrType",$Type); $a->Set("DefValue",$default); $a->Set("Description",$desc); - $a->Set("Required",$required); + $a->Set("Required", (int)$required); $a->Create(); } else @@ -115,7 +115,7 @@ $a->Set("AttrType",$Type); $a->Set("DefValue",$default); $a->Set("Description",$desc); - $a->Set("Required",$required); + $a->Set("Required", (int)$required); $a->Create(); } else @@ -125,7 +125,7 @@ $a->Set("AttrType",$Type); $a->Set("DefValue",$default); $a->Set("Description",$desc); - $a->Set("Required",$required); + $a->Set("Required", (int)$required); $a->Update(); } } Fisheye: Tag 7867 refers to a dead (removed) revision in file `trunk/kernel/images/.cvs'. Fisheye: No comparison available. Pass `N' to diff? Index: trunk/kernel/include/adodb/drivers/adodb-mysql.inc.php =================================================================== diff -u -r3815 -r7867 --- trunk/kernel/include/adodb/drivers/adodb-mysql.inc.php (.../adodb-mysql.inc.php) (revision 3815) +++ trunk/kernel/include/adodb/drivers/adodb-mysql.inc.php (.../adodb-mysql.inc.php) (revision 7867) @@ -240,6 +240,11 @@ $this->_connectionID = @mysql_connect($argHostname,$argUsername,$argPassword); if ($this->_connectionID === false) return false; + + if (defined('DBG_SQL_MODE')) { + $this->Execute('SET sql_mode = \''.DBG_SQL_MODE.'\''); + } + if ($argDatabasename) return $this->SelectDB($argDatabasename); return true; } Index: trunk/kernel/units/config_search/config_search_config.php =================================================================== diff -u -r6093 -r7867 --- trunk/kernel/units/config_search/config_search_config.php (.../config_search_config.php) (revision 6093) +++ trunk/kernel/units/config_search/config_search_config.php (.../config_search_config.php) (revision 7867) @@ -77,7 +77,7 @@ 'ModuleName' => Array('type' => 'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>''), 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Modules WHERE Loaded = 1 ORDER BY LoadOrder', 'option_key_field'=>'Name', 'option_title_field'=>'Name', 'not_null' => '1','default' => 'In-Portal'), 'ConfigHeader' => Array('type' => 'string', 'required' => 1, 'default' => ''), 'DisplayOrder' => Array('type' => 'int','not_null' => '1','default' => '0'), - 'SearchConfigId' => Array('type' => 'int','not_null' => '1','default' => ''), + 'SearchConfigId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'Priority' => Array('type' => 'int','not_null' => '1','default' => '0'), 'FieldType' => Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('text' => 'text', 'range' => 'range', 'boolean' => 'boolean', 'date' => 'date'), 'not_null' => '1', 'required' => 1, 'default' => 'text'), 'ForeignField' => Array('type' => 'string','default' => null), Index: trunk/core/admin_templates/stylesheets/stylesheets_edit.tpl =================================================================== diff -u -r7391 -r7867 --- trunk/core/admin_templates/stylesheets/stylesheets_edit.tpl (.../stylesheets_edit.tpl) (revision 7391) +++ trunk/core/admin_templates/stylesheets/stylesheets_edit.tpl (.../stylesheets_edit.tpl) (revision 7867) @@ -2,7 +2,7 @@ - + Index: trunk/kernel/admin_templates/incs/inp_fckconfig.js =================================================================== diff -u --- trunk/kernel/admin_templates/incs/inp_fckconfig.js (revision 0) +++ trunk/kernel/admin_templates/incs/inp_fckconfig.js (revision 7867) @@ -0,0 +1,155 @@ +/* + * Edited by Kostja + * FCKeditor - The text editor for internet + * Copyright (C) 2003-2004 Frederico Caldeira Knabben + * + * Licensed under the terms of the GNU Lesser General Public License: + * http://www.opensource.org/licenses/lgpl-license.php + * + * For further information visit: + * http://www.fckeditor.net/ + * + * File Name: fckconfig.js + * Editor configuration settings. + * See the documentation for more info. + * + * Version: 2.0 RC3 + * Modified: 2005-02-27 21:31:48 + * + * File Authors: + * Frederico Caldeira Knabben (fredck@fckeditor.net) +*/ + +FCKConfig.CustomConfigurationsPath = '' ; + +FCKConfig.EditorAreaCSS = FCKConfig.BasePath + 'css/fck_editorarea.css' ; + +FCKConfig.BaseHref = '' ; + +FCKConfig.FullPage = false ; + +FCKConfig.Debug = false; + +FCKConfig.SkinPath = FCKConfig.BasePath + 'skins/default/' ; + +FCKConfig.PluginsPath = FCKConfig.BasePath + 'plugins/' ; + +// FCKConfig.Plugins.Add( 'placeholder', 'en,it' ) ; + +FCKConfig.AutoDetectLanguage = false ; +FCKConfig.DefaultLanguage = 'en' ; +FCKConfig.ContentLangDirection = 'ltr' ; + +FCKConfig.EnableXHTML = false ; +FCKConfig.EnableSourceXHTML = false ; + +FCKConfig.FillEmptyBlocks = true ; + +FCKConfig.FormatSource = true ; +FCKConfig.FormatOutput = true ; +FCKConfig.FormatIndentator = ' ' ; + +FCKConfig.GeckoUseSPAN = true; +FCKConfig.StartupFocus = false; +FCKConfig.ForcePasteAsPlainText = true ; +FCKConfig.ForceSimpleAmpersand = false ; +FCKConfig.TabSpaces = 0; + +FCKConfig.ShowBorders = true; +FCKConfig.ShowTableBorders = true; + +FCKConfig.UseBROnCarriageReturn = false ; +FCKConfig.ToolbarStartExpanded = true ; +FCKConfig.ToolbarCanCollapse = true ; +//FCKConfig.ProjectPath = FCKConfig.BasePath.replace(/\/cmseditor\/editor\/$/,''); +FCKConfig.IconImagesUrl = FCKConfig.ProjectPath+'/kernel/user_files/icons'; + + +FCKConfig.ToolbarSets["Default"] = [ + ['Cut','Copy','Paste','PasteText','PasteWord','NewPage','SelectAll','-','Link','Unlink','Anchor','-','Image','SpecialChar','-','Find','Replace','-','Rule'], + ['Source'], + '/', + ['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull','-','OrderedList','UnorderedList','Outdent','Indent'], + '/', + ['Style','RemoveFormat'] +] ; + +FCKConfig.ToolbarSets["Advanced"] = [ + ['Cut','Copy','Paste','PasteText','PasteWord','-','NewPage','SelectAll','-','Find','Replace','-','Print','Preview','-','Link','Unlink','Anchor','Rule','-','Image','Document','Table','SpecialChar'], + '/', + ['Bold','Italic','Underline','StrikeThrough','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull','-','OrderedList','UnorderedList','Outdent','Indent','-','Subscript','Superscript','-','TextColor','BGColor','-','Undo','Redo'], + '/', + ['Style','FontName','FontSize','RemoveFormat','-','SpellCheck','100%','|','Source'] +] ; + +FCKConfig.ToolbarSets["Advanced2"] = [ + ['Cut','Copy','Paste','PasteText','PasteWord','-','NewPage','SelectAll','-','Find','Replace','-','Print','Preview','-','Link','Unlink','Anchor','Rule','-','Image','Document','Table','SpecialChar'], + '/', + ['Bold','Italic','Underline','StrikeThrough','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull','-','OrderedList','UnorderedList','Outdent','Indent','-','Subscript','Superscript','-','TextColor','BGColor','-','Undo','Redo'], + '/', + ['FontName','FontSize','RemoveFormat','-','SpellCheck','100%','|','Source'] +] ; + + + +FCKConfig.ToolbarSets["FAQ"] = [ + ['Cut','Copy','Paste','PasteText','PasteWord','-','NewPage','SelectAll','-','Find','Replace','-','Print','-','Link','Unlink','Anchor','Rule','-','Image','Document','Table','SpecialChar'], + '/', + ['Bold','Italic','Underline','StrikeThrough','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull','-','OrderedList','UnorderedList','Outdent','Indent','-','Subscript','Superscript','-','TextColor','BGColor','-','Undo','Redo'], + '/', + ['Style','FontName','FontSize','RemoveFormat','-','SpellCheck','100%','|','Source'] +] ; + +FCKConfig.ToolbarSets["Esse"] = [ + ['Cut','Copy','Paste','PasteText','PasteWord','-','NewPage','SelectAll','-','Find','Replace'], + '/', + ['Bold','Italic','Underline','StrikeThrough','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull','-','OrderedList','UnorderedList','Outdent','Indent','-','Subscript','Superscript','-','TextColor','BGColor','-','Undo','Redo'], + '/', + ['Style','FontName','FontSize','RemoveFormat','-','SpellCheck','100%'] +] ; + +FCKConfig.ToolbarSets["Basic"] = [ + ['Bold','Italic','-','OrderedList','UnorderedList','-','Link','Unlink','-','About'] +] ; + +FCKConfig.ContextMenu = ['Generic','Link','Anchor','Image','Select','Document','Textarea','Checkbox','Radio','TextField','HiddenField','ImageButton','Button','BulletedList','NumberedList','TableCell','Table','Form'] ; + +FCKConfig.FontColors = '000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,808080,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF' ; + +FCKConfig.FontNames = 'Arial Narrow;Arial;Sans-Serif;Serif;Comic Sans MS;Courier New;Tahoma;Times New Roman;Verdana' ; +FCKConfig.FontSizes = '1/xx-small;2/x-small;3/small;4/medium;5/large;6/x-large;7/xx-large' ; +FCKConfig.FontFormats = 'p;div;pre;address;h1;h2;h3;h4;h5;h6' ; + +FCKConfig.StylesXmlPath = '../fckstyles.xml' ; + +FCKConfig.SpellChecker = 'ieSpell' ; // 'ieSpell' | 'SpellerPages' +FCKConfig.IeSpellDownloadUrl = 'http://www.iespell.com/rel/ieSpellSetup211325.exe' ; + +FCKConfig.LinkBrowser = true ; +FCKConfig.LinkBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Connector=connectors/php/connector.php&ServerPath='+FCKConfig.ProjectPath+'/kernel/user_files/' ; +FCKConfig.LinkBrowserWindowWidth = screen.width * 0.7 ; // 70% +FCKConfig.LinkBrowserWindowHeight = screen.height * 0.7 ; // 70% + +FCKConfig.ImageBrowser = true ; +FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Images&Connector=connectors/php/connector.php&ServerPath='+FCKConfig.ProjectPath+'/kernel/user_files/' ; +FCKConfig.ImageBrowserWindowWidth = screen.width * 0.7 ; // 70% ; +FCKConfig.ImageBrowserWindowHeight = screen.height * 0.7 ; // 70% ; + +FCKConfig.DocumentBrowser = true ; +FCKConfig.DocumentBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Documents&Connector=connectors/php/connector.php&ServerPath='+FCKConfig.ProjectPath+'/kernel/user_files/' ; +FCKConfig.ImageBrowserWindowWidth = screen.width * 0.7 ; // 70% ; +FCKConfig.ImageBrowserWindowHeight = screen.height * 0.7 ; // 70% ; +FCKConfig.DocumentsServerPath = FCKConfig.ProjectPath+'/kernel/user_files/Documents' + +FCKConfig.StructureBrowser = true ; +FCKConfig.StructureBrowserURL = FCKConfig.ProjectPath+'/admin/index.php?t=structure/tree' ; +FCKConfig.StructureBrowserWindowWidth = screen.width * 0.5 ; // 50% +FCKConfig.StructureBrowserWindowHeight = screen.height * 0.7 ; // 70% + +FCKConfig.FilesBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Files&Connector=connectors/php/connector.php&ServerPath='+FCKConfig.ProjectPath+'/kernel/user_files/' ; + +FCKConfig.SmileyPath = FCKConfig.BasePath + 'images/smiley/msn/' ; +FCKConfig.SmileyImages = ['regular_smile.gif','sad_smile.gif','wink_smile.gif','teeth_smile.gif','confused_smile.gif','tounge_smile.gif','embaressed_smile.gif','omg_smile.gif','whatchutalkingabout_smile.gif','angry_smile.gif','angel_smile.gif','shades_smile.gif','devil_smile.gif','cry_smile.gif','lightbulb.gif','thumbs_down.gif','thumbs_up.gif','heart.gif','broken_heart.gif','kiss.gif','envelope.gif'] ; +FCKConfig.SmileyColumns = 8 ; +FCKConfig.SmileyWindowWidth = 320 ; +FCKConfig.SmileyWindowHeight = 240 ; \ No newline at end of file Index: trunk/kernel/include/parseditem.php =================================================================== diff -u -r6093 -r7867 --- trunk/kernel/include/parseditem.php (.../parseditem.php) (revision 6093) +++ trunk/kernel/include/parseditem.php (.../parseditem.php) (revision 7867) @@ -606,42 +606,24 @@ return $html; } + /** + * Sends EmailEvent to user + * + * @param string $EventName email event name + * @param mixed $ToUserId recipient's user_id or email address + * @param int $LangId language_id (not in use) + * @param string $RecptName recipient's name (only when ID not passed) + * @return kEvent + */ function SendUserEventMail($EventName,$ToUserId,$LangId=NULL,$RecptName=NULL) { - global $objMessageList,$FrontEnd; - - $Event =& $objMessageList->GetEmailEventObject($EventName,0,$LangId); - - if(is_object($Event)) - { - if($Event->Get("Enabled")=="1" || ($Event->Get("Enabled")==2 && $FrontEnd)) - { - $Event->Item = $this; - if(is_numeric($ToUserId)) - { - return $Event->SendToUser($ToUserId); - } - else - return $Event->SendToAddress($ToUserId,$RecptName); - } - } + $send_params = is_numeric($ToUserId) ? Array() : Array ('to_email' => $ToUserId, 'to_name' => $RecptName); + return $this->Application->EmailEventUser($EventName, $ToUserId, $send_params); } function SendAdminEventMail($EventName,$LangId=NULL) { - global $objMessageList,$FrontEnd; - - //echo "Firing Admin Event $EventName
\n"; - $Event =& $objMessageList->GetEmailEventObject($EventName,1,$LangId); - if(is_object($Event)) - { - if($Event->Get("Enabled")=="1" || ($Event->Get("Enabled")==2 && $FrontEnd)) - { - $Event->Item = $this; - //echo "Admin Event $EventName Enabled
\n"; - return $Event->SendAdmin($ToUserId); - } - } + return $this->Application->EmailEventAdmin($EventName); } function parse_template($t) Index: trunk/kernel/units/relationship/relationship_config.php =================================================================== diff -u -r6093 -r7867 --- trunk/kernel/units/relationship/relationship_config.php (.../relationship_config.php) (revision 6093) +++ trunk/kernel/units/relationship/relationship_config.php (.../relationship_config.php) (revision 7867) @@ -77,7 +77,7 @@ 'ItemSQLs' => Array( '' => 'SELECT %1$s.* %2$s FROM %1$s #ITEM_JOIN#',), 'Fields' => Array( - 'RelationshipId' => Array(), + 'RelationshipId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'SourceId' => Array('type'=>'int', 'required' => 1, 'default' => 0), 'TargetId' => Array('type'=>'int', 'required' => 1, 'default' => ''), 'SourceType' => Array('type'=>'int','not_null'=>1,'default'=>0), Index: trunk/kernel/admin_templates/stylesheets/block_style_edit.tpl =================================================================== diff -u -r7391 -r7867 --- trunk/kernel/admin_templates/stylesheets/block_style_edit.tpl (.../block_style_edit.tpl) (revision 7391) +++ trunk/kernel/admin_templates/stylesheets/block_style_edit.tpl (.../block_style_edit.tpl) (revision 7867) @@ -2,7 +2,7 @@ - + Index: trunk/core/admin_templates/stylesheets/base_style_edit.tpl =================================================================== diff -u -r7391 -r7867 --- trunk/core/admin_templates/stylesheets/base_style_edit.tpl (.../base_style_edit.tpl) (revision 7391) +++ trunk/core/admin_templates/stylesheets/base_style_edit.tpl (.../base_style_edit.tpl) (revision 7867) @@ -2,7 +2,7 @@ - + Index: trunk/admin/install/upgrades/changelog_4_0_1.txt =================================================================== diff -u --- trunk/admin/install/upgrades/changelog_4_0_1.txt (revision 0) +++ trunk/admin/install/upgrades/changelog_4_0_1.txt (revision 7867) @@ -0,0 +1,156 @@ +File in-portal/admin/install.php changed +File in-portal/admin/editor/inp_fckconfig.js changed +File in-portal/admin/email/do_send.php changed +File in-portal/admin/install/inportal_data.sql changed +File in-portal/admin/install/inportal_schema.sql changed +File in-portal/admin/install/langpacks/english.lang changed +File in-portal/admin/install/upgrades/changelog_1_4_0.txt changed +File in-portal/admin/install/upgrades/changelog_4_0_1.txt is new; release_4_0_1 revision 1.1.2.4 +File in-portal/admin/install/upgrades/inportal_upgrade_v4.0.1.sql is new; release_4_0_1 revision 1.1.2.5 +File in-portal/admin/install/upgrades/inportal_upgrade_v4.0.2.sql is new; release_4_0_1 revision 1.1.2.2 +File in-portal/admin/users/adduser.php changed +File in-portal/kernel/frontaction.php changed +File in-portal/kernel/parser.php changed +File in-portal/kernel/admin/include/toolbar/sendmail.php changed +File in-portal/kernel/admin_templates/incs/catalog.js changed +File in-portal/kernel/admin_templates/incs/inp_fckconfig.js is new; release_4_0_1 revision 1.1.2.1 +File in-portal/kernel/admin_templates/stylesheets/base_style_edit.tpl changed +File in-portal/kernel/admin_templates/stylesheets/block_style_edit.tpl changed +File in-portal/kernel/admin_templates/stylesheets/stylesheets_edit.tpl changed +File in-portal/kernel/admin_templates/stylesheets/stylesheets_edit_base.tpl changed +File in-portal/kernel/admin_templates/stylesheets/stylesheets_edit_block.tpl changed +File in-portal/kernel/admin_templates/stylesheets/stylesheets_list.tpl changed +File in-portal/kernel/cache/.cvsignore changed +File in-portal/kernel/images/.cvs is removed; release_1_4_0 revision 1.1 +File in-portal/kernel/include/emailmessage.php changed +File in-portal/kernel/include/image.php changed +File in-portal/kernel/include/parseditem.php changed +File in-portal/kernel/include/theme.php changed +File in-portal/kernel/include/usersession.php changed +File in-portal/kernel/include/compat/array_change_key_case.php changed +File in-portal/kernel/include/compat/array_chunk.php changed +File in-portal/kernel/include/compat/array_combine.php changed +File in-portal/kernel/include/compat/array_diff_assoc.php changed +File in-portal/kernel/include/compat/array_key_exists.php changed +File in-portal/kernel/include/compat/array_search.php changed +File in-portal/kernel/include/compat/array_udiff.php changed +File in-portal/kernel/include/compat/array_udiff_assoc.php changed +File in-portal/kernel/include/compat/call_user_func_array.php changed +File in-portal/kernel/include/compat/constant.php changed +File in-portal/kernel/include/compat/file_get_contents.php changed +File in-portal/kernel/include/compat/file_put_contents.php changed +File in-portal/kernel/include/compat/fprintf.php changed +File in-portal/kernel/include/compat/html_entity_decode.php changed +File in-portal/kernel/include/compat/http_build_query.php changed +File in-portal/kernel/include/compat/image_type_to_mime_type.php changed +File in-portal/kernel/include/compat/is_a.php changed +File in-portal/kernel/include/compat/ob_clean.php changed +File in-portal/kernel/include/compat/ob_flush.php changed +File in-portal/kernel/include/compat/ob_get_clean.php changed +File in-portal/kernel/include/compat/ob_get_flush.php changed +File in-portal/kernel/include/compat/scandir.php changed +File in-portal/kernel/include/compat/str_ireplace.php changed +File in-portal/kernel/include/compat/str_split.php changed +File in-portal/kernel/include/compat/stripos.php changed +File in-portal/kernel/include/compat/strripos.php changed +File in-portal/kernel/include/compat/var_export.php changed +File in-portal/kernel/include/compat/version_compare.php changed +File in-portal/kernel/include/compat/vprintf.php changed +File in-portal/kernel/include/compat/vsprintf.php changed +File in-portal/kernel/units/images/image_tag_processor.php changed +File in-portal/themes/default/register/register_form.tpl changed +File kernel4_dev/kernel4/application.php changed +File kernel4_dev/kernel4/constants.php changed +File kernel4_dev/kernel4/event_manager.php changed +File kernel4_dev/kernel4/startup.php changed +File kernel4_dev/kernel4/db/db_connection.php changed +File kernel4_dev/kernel4/db/db_event_handler.php changed +File kernel4_dev/kernel4/db/db_tag_processor.php changed +File kernel4_dev/kernel4/db/dbitem.php changed +File kernel4_dev/kernel4/db/dblist.php changed +File kernel4_dev/kernel4/processors/main_processor.php changed +File kernel4_dev/kernel4/processors/tag_processor.php changed +File kernel4_dev/kernel4/session/session.php changed +File kernel4_dev/kernel4/utility/debugger.php changed +File kernel4_dev/kernel4/utility/email.php is removed; release_1_4_0 revision 1.16 +File kernel4_dev/kernel4/utility/email_send.php is new; release_4_0_1 revision 1.1.4.2 +File kernel4_dev/kernel4/utility/event.php changed +File kernel4_dev/kernel4/utility/smtp_client.php is removed; release_1_4_0 revision 1.3 +File kernel4_dev/kernel4/utility/socket.php is new; release_4_0_1 revision 1.1.4.1 +File kernel4_dev/kernel4/utility/unit_config_reader.php changed +File kernel4_dev/kernel4/utility/debugger/debugger.css changed +File kernel4_dev/kernel4/utility/debugger/debugger.js changed +File kernel4_dev/kernel4/utility/formatters/multilang_formatter.php changed +File kernel.X/core/admin_templates/sections_list.tpl changed +File kernel.X/core/admin_templates/config/config_email.tpl changed +File kernel.X/core/admin_templates/config/config_general.tpl changed +File kernel.X/core/admin_templates/config/config_search.tpl changed +File kernel.X/core/admin_templates/config/config_search_edit.tpl changed +File kernel.X/core/admin_templates/config/config_universal.tpl changed +File kernel.X/core/admin_templates/custom_fields/custom_fields_list.tpl changed +File kernel.X/core/admin_templates/img/icons/icon24_link_user.gif is new; release_4_0_1 revision 1.1.2.1 +File kernel.X/core/admin_templates/incs/footer.tpl changed +File kernel.X/core/admin_templates/incs/form_blocks.tpl changed +File kernel.X/core/admin_templates/incs/grid_blocks.tpl changed +File kernel.X/core/admin_templates/incs/header.tpl changed +File kernel.X/core/admin_templates/js/forms.js is new; release_4_0_1 revision 1.1.2.3 +File kernel.X/core/admin_templates/js/grid.js changed +File kernel.X/core/admin_templates/js/grid_scroller.js changed +File kernel.X/core/admin_templates/js/script.js changed +File kernel.X/core/admin_templates/js/toolbar.js changed +File kernel.X/core/admin_templates/js/tree.js changed +File kernel.X/core/admin_templates/js/calendar/calendar-setup.js changed +File kernel.X/core/admin_templates/js/calendar/calendar.js changed +File kernel.X/core/admin_templates/modules/modules_list.tpl changed +File kernel.X/core/admin_templates/regional/languages_list.tpl changed +File kernel.X/core/admin_templates/regional/phrases_edit.tpl changed +File kernel.X/core/units/admin/admin_config.php changed +File kernel.X/core/units/admin/admin_events_handler.php changed +File kernel.X/core/units/admin/admin_tag_processor.php changed +File kernel.X/core/units/categories/cache_updater.php changed +File kernel.X/core/units/categories/categories_config.php changed +File kernel.X/core/units/categories/categories_event_handler.php changed +File kernel.X/core/units/categories/categories_item.php changed +File kernel.X/core/units/categories/categories_tag_processor.php changed +File kernel.X/core/units/custom_fields/custom_fields_config.php changed +File kernel.X/core/units/email_events/email_events_event_handler.php changed +File kernel.X/core/units/email_messages/email_messages_config.php changed +File kernel.X/core/units/general/cat_dbitem_export.php changed +File kernel.X/core/units/general/cat_event_handler.php changed +File kernel.X/core/units/general/cat_tag_processor.php changed +File kernel.X/core/units/general/inp1_parser.php changed +File kernel.X/core/units/general/xml_helper.php changed +File kernel.X/core/units/general/helpers/helpers_config.php changed +File kernel.X/core/units/general/helpers/modules.php changed +File kernel.X/core/units/general/helpers/priority_helper.php is new; release_4_0_1 revision 1.1.2.1 +File kernel.X/core/units/general/helpers/recursive_helper.php changed +File kernel.X/core/units/general/helpers/search_helper.php changed +File kernel.X/core/units/general/helpers/themes_helper.php changed +File kernel.X/core/units/groups/groups_config.php changed +File kernel.X/core/units/languages/import_xml.php changed +File kernel.X/core/units/languages/languages_config.php changed +File kernel.X/core/units/languages/languages_event_handler.php changed +File kernel.X/core/units/modules/modules_config.php changed +File kernel.X/core/units/phrases/phrases_config.php changed +File kernel.X/core/units/translator/translator_config.php changed +File kernel.X/core/units/translator/translator_event_handler.php changed +File kernel.X/core/units/user_groups/user_groups_dbitem.php changed +File kernel.X/core/units/users/users_config.php changed +File kernel.X/core/units/users/users_event_handler.php changed +File kernel.X/core/units/users/users_tag_processor.php changed +File kernel.X/core/install/english.lang changed +File kernel.X/core/install/install_data.sql changed +File kernel.X/core/install/install_schema.sql changed +File kernel.X/core/install/upgrades.php is new; release_4_0_1 revision 1.1.2.1 +File kernel.X/core/install/upgrades.sql changed +File cmseditor/fckconfig.js changed +File cmseditor/editor/dialog/fck_docprops.html changed +File cmseditor/editor/dialog/fck_link/fck_link.js changed +File cmseditor/editor/filemanager/browser/default/connectors/php/commands.php changed + + +Changes in phrases and events: + + +! m/d/Yg:i:s Am/d/Yg:i:s A,.iso-8859-12 +! m/d/Yg:i:s Am/d/Yg:i:s A.,iso-8859-12 Index: trunk/core/admin_templates/stylesheets/stylesheets_list.tpl =================================================================== diff -u -r7391 -r7867 --- trunk/core/admin_templates/stylesheets/stylesheets_list.tpl (.../stylesheets_list.tpl) (revision 7391) +++ trunk/core/admin_templates/stylesheets/stylesheets_list.tpl (.../stylesheets_list.tpl) (revision 7867) @@ -2,7 +2,7 @@ - + Index: trunk/core/units/config_search/config_search_config.php =================================================================== diff -u -r6093 -r7867 --- trunk/core/units/config_search/config_search_config.php (.../config_search_config.php) (revision 6093) +++ trunk/core/units/config_search/config_search_config.php (.../config_search_config.php) (revision 7867) @@ -77,7 +77,7 @@ 'ModuleName' => Array('type' => 'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>''), 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Modules WHERE Loaded = 1 ORDER BY LoadOrder', 'option_key_field'=>'Name', 'option_title_field'=>'Name', 'not_null' => '1','default' => 'In-Portal'), 'ConfigHeader' => Array('type' => 'string', 'required' => 1, 'default' => ''), 'DisplayOrder' => Array('type' => 'int','not_null' => '1','default' => '0'), - 'SearchConfigId' => Array('type' => 'int','not_null' => '1','default' => ''), + 'SearchConfigId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'Priority' => Array('type' => 'int','not_null' => '1','default' => '0'), 'FieldType' => Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('text' => 'text', 'range' => 'range', 'boolean' => 'boolean', 'date' => 'date'), 'not_null' => '1', 'required' => 1, 'default' => 'text'), 'ForeignField' => Array('type' => 'string','default' => null), Index: trunk/kernel/admin_templates/users/users_edit.tpl =================================================================== diff -u --- trunk/kernel/admin_templates/users/users_edit.tpl (revision 0) +++ trunk/kernel/admin_templates/users/users_edit.tpl (revision 7867) @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + Index: trunk/kernel/units/selectors/selectors_config.php =================================================================== diff -u -r3105 -r7867 --- trunk/kernel/units/selectors/selectors_config.php (.../selectors_config.php) (revision 3105) +++ trunk/kernel/units/selectors/selectors_config.php (.../selectors_config.php) (revision 7867) @@ -87,7 +87,7 @@ ) ), 'Fields' => Array( - 'SelectorId' => Array(), + 'SelectorId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'StylesheetId' => Array('type' => 'int', 'unique'=>Array('SelectorName'), 'current_table_only' => 1, 'not_null' => '1','default' => '0'), 'Name' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1), 'SelectorName' => Array('type' => 'string', 'unique'=>Array('StylesheetId'), 'current_table_only' => 1, 'not_null' => '1','default' => '','required'=>1), Index: trunk/core/admin_templates/stylesheets/block_style_edit.tpl =================================================================== diff -u -r7391 -r7867 --- trunk/core/admin_templates/stylesheets/block_style_edit.tpl (.../block_style_edit.tpl) (revision 7391) +++ trunk/core/admin_templates/stylesheets/block_style_edit.tpl (.../block_style_edit.tpl) (revision 7867) @@ -2,7 +2,7 @@ - + Index: trunk/core/units/relationship/relationship_config.php =================================================================== diff -u -r6093 -r7867 --- trunk/core/units/relationship/relationship_config.php (.../relationship_config.php) (revision 6093) +++ trunk/core/units/relationship/relationship_config.php (.../relationship_config.php) (revision 7867) @@ -77,7 +77,7 @@ 'ItemSQLs' => Array( '' => 'SELECT %1$s.* %2$s FROM %1$s #ITEM_JOIN#',), 'Fields' => Array( - 'RelationshipId' => Array(), + 'RelationshipId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'SourceId' => Array('type'=>'int', 'required' => 1, 'default' => 0), 'TargetId' => Array('type'=>'int', 'required' => 1, 'default' => ''), 'SourceType' => Array('type'=>'int','not_null'=>1,'default'=>0), Index: trunk/admin/install/langpacks/english.lang =================================================================== diff -u -r7635 -r7867 --- trunk/admin/install/langpacks/english.lang (.../english.lang) (revision 7635) +++ trunk/admin/install/langpacks/english.lang (.../english.lang) (revision 7867) @@ -1,5 +1,5 @@ - m/d/Yg:i:s Am/d/Yg:i:s A,.iso-8859-12 + m/d/Yg:i:s Am/d/Yg:i:s A.,iso-8859-12 WW91ciBwYXNzd29yZCBoYXMgYmVlbiByZXNldC4gWW91IHdpbGwgcmVjZWl2ZSB5b3VyIG5ldyBwYXNzd29yZCBpbiB0aGUgZW1haWwgc2hvcnRseS4= QmxvY2sgU2hpcHBpbmcgQWRkcmVzcyBFZGl0aW5n Index: trunk/kernel/units/statistics/statistics_config.php =================================================================== diff -u -r4524 -r7867 --- trunk/kernel/units/statistics/statistics_config.php (.../statistics_config.php) (revision 4524) +++ trunk/kernel/units/statistics/statistics_config.php (.../statistics_config.php) (revision 7867) @@ -36,7 +36,7 @@ ), 'Fields' => Array( - 'StatItemId' => Array(), + 'StatItemId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'Module' => Array('type' => 'string','not_null' => '1','default' => ''), 'ValueSQL' => Array('type' => 'string','default' => ''), 'ResetSQL' => Array('type' => 'string','default' => ''), Index: trunk/kernel/units/images/image_tag_processor.php =================================================================== diff -u -r6093 -r7867 --- trunk/kernel/units/images/image_tag_processor.php (.../image_tag_processor.php) (revision 6093) +++ trunk/kernel/units/images/image_tag_processor.php (.../image_tag_processor.php) (revision 7867) @@ -108,7 +108,7 @@ { // return local image or url $ret = $object->GetDBField('LocalThumb') ? PROTOCOL.SERVER_NAME.BASE_PATH.'/'.$object->GetDBField('ThumbPath') : $object->GetDBField('ThumbUrl'); - if ( $object->GetDBField('LocalThumb') && !file_exists(FULL_PATH.'/'.$object->GetDBField('ThumbPath')) ) $ret = ''; + if ( $object->GetDBField('LocalThumb') && !file_exists(FULL_PATH.'/'.$object->GetDBField('ThumbPath')) && !constOn('DBG_IMAGE_RECOVERY')) $ret = ''; } else { // if we need full which is not the same as thumb $ret = $object->GetDBField('LocalImage') ? PROTOCOL.SERVER_NAME.BASE_PATH.'/'.$object->GetDBField('LocalPath') : $object->GetDBField('Url'); Index: trunk/kernel/include/itemdb.php =================================================================== diff -u -r4077 -r7867 --- trunk/kernel/include/itemdb.php (.../itemdb.php) (revision 4077) +++ trunk/kernel/include/itemdb.php (.../itemdb.php) (revision 7867) @@ -371,7 +371,7 @@ { global $Errors; - $sql = "INSERT IGNORE INTO ".$this->tablename." ("; + $sql = "INSERT INTO ".$this->tablename." ("; $first = 1; foreach ($this->Data as $key => $value) { @@ -654,18 +654,28 @@ function TableExists($table = null) { - // checks if table specified in item exists in db - $db =& GetADODBConnection(); - $sql = "SHOW TABLES LIKE '%s'"; - if($table == null) $table = $this->tablename; - $rs = $db->Execute( sprintf($sql, $table) ); + static $tables_found = Array (); - if( $rs->RecordCount() == 1 ) // table exists in normal case - return 1; - else // check if table exists in lowercase - $rs = $db->Execute( sprintf($sql, strtolower($table) ) ); + if ($table == null) $table = $this->tablename; - return ($rs->RecordCount() == 1) ? 1 : 0; + if (!isset($tables_found[$table])) { + // checks if table specified in item exists in db + $db =& GetADODBConnection(); + $sql = "SHOW TABLES LIKE '%s'"; + + $rs = $db->Execute( sprintf($sql, $table) ); + if ($rs->RecordCount() == 1) { + // table exists in normal case + $tables_found[$table] = 1; + } + else { + // check if table exists in lowercase + $rs = $db->Execute( sprintf($sql, strtolower($table) ) ); + $tables_found[$table] = $rs->RecordCount() == 1 ? 1 : 0; + } + } + + return $tables_found[$table]; } function raiseEvent($name, $id = null) Index: trunk/kernel/admin_templates/users/users_list.tpl =================================================================== diff -u --- trunk/kernel/admin_templates/users/users_list.tpl (revision 0) +++ trunk/kernel/admin_templates/users/users_list.tpl (revision 7867) @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + +
+ +
+ + + + \ No newline at end of file Index: trunk/kernel/admin/include/toolbar/sendmail.php =================================================================== diff -u -r13 -r7867 --- trunk/kernel/admin/include/toolbar/sendmail.php (.../sendmail.php) (revision 13) +++ trunk/kernel/admin/include/toolbar/sendmail.php (.../sendmail.php) (revision 7867) @@ -6,44 +6,45 @@ $addrs = array(); $id_count=0; -switch($_POST["idtype"]) -{ - case "user": - $recip_ids = $_POST["idlist"]; - $idlist = explode(",",$recip_ids); - foreach($idlist as $id) - { - $u = $objUsers->GetItemByField("ResourceId",$id); - $r .= $u->Get("FirstName")." ".$u->Get("LastName"); - $r .="<".$u->Get("Email").">"; - $addr_list[] = $u->Get("Email"); - $reciplist[] = $r; - $r = ""; - } - $recip_ids = implode(",",$idlist); - break; - - case "group": - $recip_ids = $_POST["idlist"]; - $idlist = explode(",",$recip_ids); - foreach($idlist as $id) - { - $g = $objGroups->GetItem($id); - if(is_object($g)) - { - $reciplist[] .= "<".$g->Get("Name").">"; - $ulist = $g->GetUserList(); - foreach($ulist as $uid) - { - $u = $objUsers->GetItem($uid); - $addr_list[] = $u->Get("Email"); - } - } - } - $recip_ids = implode(",",$idlist); - break; +if (isset($_POST['idtype'])) { + switch ($_POST['idtype']) { + case "user": + $recip_ids = $_POST["idlist"]; + $idlist = explode(",",$recip_ids); + $r = ''; + foreach($idlist as $id) + { + $u = $objUsers->GetItemByField("ResourceId",$id); + $r .= $u->Get("FirstName")." ".$u->Get("LastName"); + $r .="<".$u->Get("Email").">"; + $addr_list[] = $u->Get("Email"); + $reciplist[] = $r; + $r = ""; + } + $recip_ids = implode(",",$idlist); + break; + + case "group": + $recip_ids = $_POST["idlist"]; + $idlist = explode(",",$recip_ids); + foreach($idlist as $id) + { + $g = $objGroups->GetItem($id); + if(is_object($g)) + { + $reciplist[] .= "<".$g->Get("Name").">"; + $ulist = $g->GetUserList(); + foreach($ulist as $uid) + { + $u = $objUsers->GetItem($uid); + $addr_list[] = $u->Get("Email"); + } + } + } + $recip_ids = implode(",",$idlist); + break; + } } - print << Index: trunk/kernel/admin_templates/stylesheets/stylesheets_edit_block.tpl =================================================================== diff -u -r7391 -r7867 --- trunk/kernel/admin_templates/stylesheets/stylesheets_edit_block.tpl (.../stylesheets_edit_block.tpl) (revision 7391) +++ trunk/kernel/admin_templates/stylesheets/stylesheets_edit_block.tpl (.../stylesheets_edit_block.tpl) (revision 7867) @@ -2,7 +2,7 @@ - + Index: trunk/kernel/admin_templates/stylesheets/stylesheets_edit_base.tpl =================================================================== diff -u -r7391 -r7867 --- trunk/kernel/admin_templates/stylesheets/stylesheets_edit_base.tpl (.../stylesheets_edit_base.tpl) (revision 7391) +++ trunk/kernel/admin_templates/stylesheets/stylesheets_edit_base.tpl (.../stylesheets_edit_base.tpl) (revision 7867) @@ -2,7 +2,7 @@ - + Index: trunk/admin/install/upgrades/inportal_upgrade_v4.0.1.sql =================================================================== diff -u -r7704 -r7867 --- trunk/admin/install/upgrades/inportal_upgrade_v4.0.1.sql (.../inportal_upgrade_v4.0.1.sql) (revision 7704) +++ trunk/admin/install/upgrades/inportal_upgrade_v4.0.1.sql (.../inportal_upgrade_v4.0.1.sql) (revision 7867) @@ -1,4 +1,11 @@ INSERT INTO ConfigurationValues VALUES (NULL, 'RegistrationCaptcha', '0', 'In-Portal:Users', 'in-portal:configure_users'); INSERT INTO ConfigurationAdmin VALUES ('RegistrationCaptcha', 'la_Text_General', 'la_registration_captcha', 'checkbox', NULL, NULL, 10.025, 0, 0); -ALTER TABLE EmailMessage ADD `Subject` TINYTEXT NULL ; \ No newline at end of file +ALTER TABLE EmailMessage ADD `Subject` TINYTEXT NULL ; + +ALTER TABLE EmailLog ADD EventParams TEXT NOT NULL; + +INSERT INTO ConfigurationAdmin VALUES ('MailFunctionHeaderSeparator', 'la_Text_smtp_server', 'la_config_MailFunctionHeaderSeparator', 'radio', NULL, '1=la_Linux,2=la_Windows', 30.08, 0, 0); +INSERT INTO ConfigurationValues VALUES (0, 'MailFunctionHeaderSeparator', 1, 'In-Portal', 'in-portal:configure_general'); + +UPDATE Modules SET Version = '4.0.1' WHERE Name = 'In-Portal'; \ No newline at end of file Index: trunk/kernel/parser.php =================================================================== diff -u -r7391 -r7867 --- trunk/kernel/parser.php (.../parser.php) (revision 7391) +++ trunk/kernel/parser.php (.../parser.php) (revision 7867) @@ -19,6 +19,7 @@ $m_var_list["lang"] = $pieces[2]; $m_var_list["theme"] = $pieces[3]; $m_var_list['opener']=$pieces[4]; + $m_var_list['wid']=$pieces[5]; } else { @@ -27,13 +28,14 @@ $m_var_list["lang"] = $objLanguages->GetPrimary(); $m_var_list["theme"]= $objThemes->GetPrimaryTheme(); $m_var_list['opener']='s'; + $m_var_list['wid']=''; } } function m_BuildEnv() { global $m_var_list, $m_var_list_update; - $module_vars = Array('cat','p','lang','theme','opener'); + $module_vars = Array('cat','p','lang','theme','opener','wid'); $ret = GenerateModuleEnv('m', $module_vars); if( isset($GLOBALS['m_var_list_update']['cat']) ) unset($GLOBALS['m_var_list_update']['cat']); return $ret; @@ -43,7 +45,7 @@ { global $m_var_list, $m_var_list_update; $module_vars = Array( 'cat' => 'm_cat_id', 'p' => 'm_cat_page', 'lang' => 'm_lang', - 'theme' => 'm_theme', 'opener' => 'm_opener'); + 'theme' => 'm_theme', 'opener' => 'm_opener','wid' => 'm_wid'); $pass_cat = 0; if (isset($m_var_list_update['cat'])) { $pass_cat = 1; @@ -2795,7 +2797,7 @@ /* @description: lists items related to a category @attrib:CatId:int: Category ID of category, or current category if not set - @attrib:_ListItem: Comma-separated list of item types (ie: Link, Topic, Category, News) The items are listed in the order this list provides, then by priority. + @attrib:_ListItem:string: Comma-separated list of item types (ie: Link, Topic, Category, News) The items are listed in the order this list provides, then by priority. Each item should have its own template passed in as an attribute (_{ItemType}Template) */ function m_related_items($attribs) Index: trunk/admin/install/upgrades/inportal_upgrade_v4.0.2.sql =================================================================== diff -u --- trunk/admin/install/upgrades/inportal_upgrade_v4.0.2.sql (revision 0) +++ trunk/admin/install/upgrades/inportal_upgrade_v4.0.2.sql (revision 7867) @@ -0,0 +1,26 @@ +ALTER TABLE EmailMessage ADD ReplacementTags TEXT AFTER Template; + +ALTER TABLE Phrase CHANGE Translation Translation TEXT NOT NULL; +ALTER TABLE Category CHANGE Description Description TEXT, CHANGE l1_Description l1_Description TEXT, CHANGE l2_Description l2_Description TEXT, CHANGE l3_Description l3_Description TEXT, CHANGE l4_Description l4_Description TEXT, CHANGE l5_Description l5_Description TEXT, CHANGE CachedNavbar CachedNavbar text, CHANGE l1_CachedNavbar l1_CachedNavbar text, CHANGE l2_CachedNavbar l1_CachedNavbar text, CHANGE l3_CachedNavbar l1_CachedNavbar text, CHANGE l4_CachedNavbar l1_CachedNavbar text, CHANGE l5_CachedNavbar l1_CachedNavbar text; + +ALTER TABLE ConfigurationAdmin CHANGE ValueList ValueList TEXT; + +ALTER TABLE EmailQueue CHANGE `Subject` `Subject` TEXT, CHANGE toaddr toaddr TEXT, CHANGE fromaddr fromaddr TEXT; +ALTER TABLE Category DROP Pop; + +ALTER TABLE PortalUser CHANGE CreatedOn CreatedOn INT NOT NULL DEFAULT '0', CHANGE dob dob INT(11) NULL DEFAULT NULL, CHANGE PassResetTime PassResetTime INT(11) UNSIGNED NULL DEFAULT NULL, CHANGE PwRequestTime PwRequestTime INT(11) UNSIGNED NULL DEFAULT NULL; + +ALTER TABLE Modules CHANGE BuildDate BuildDate INT UNSIGNED NULL DEFAULT NULL, CHANGE Version Version VARCHAR(10) NOT NULL DEFAULT '0.0.0'; +ALTER TABLE Language CHANGE Enabled Enabled INT(11) NOT NULL DEFAULT '1', CHANGE InputDateFormat InputDateFormat VARCHAR(50) NOT NULL DEFAULT 'm/d/Y', CHANGE InputTimeFormat InputTimeFormat VARCHAR(50) NOT NULL DEFAULT 'g:i:s A', CHANGE DecimalPoint DecimalPoint CHAR(2) NOT NULL DEFAULT ''; +ALTER TABLE Events CHANGE FromUserId FromUserId INT(11) NOT NULL DEFAULT '-1'; + +ALTER TABLE StdDestinations CHANGE DestAbbr2 DestAbbr2 CHAR(2) NULL DEFAULT NULL; + +ALTER TABLE PermCache DROP DACL; + +ALTER TABLE Images CHANGE LocalThumb LocalThumb TINYINT(4) NOT NULL DEFAULT '1', CHANGE SameImages SameImages TINYINT(4) NOT NULL DEFAULT '1'; +ALTER TABLE SearchConfig CHANGE SimpleSearch SimpleSearch TINYINT(4) NOT NULL DEFAULT '1', CHANGE AdvancedSearch AdvancedSearch TINYINT(4) NOT NULL DEFAULT '1'; +ALTER TABLE ItemReview CHANGE CreatedById CreatedById INT(11) NOT NULL DEFAULT '-1', CHANGE Status Status TINYINT(4) NOT NULL DEFAULT '2'; +ALTER TABLE Visits CHANGE PortalUserId PortalUserId INT(11) NOT NULL DEFAULT '-2'; + +UPDATE Modules SET Version = '4.0.2' WHERE Name = 'In-Portal'; \ No newline at end of file Index: trunk/kernel/include/language.php =================================================================== diff -u -r3534 -r7867 --- trunk/kernel/include/language.php (.../language.php) (revision 3534) +++ trunk/kernel/include/language.php (.../language.php) (revision 7867) @@ -689,7 +689,7 @@ } else { - $sql = "INSERT IGNORE INTO ".GetTablePrefix()."PhraseCache (Template,PhraseList,CacheDate,ThemeId) VALUES ('"; + $sql = "INSERT INTO ".GetTablePrefix()."PhraseCache (Template,PhraseList,CacheDate,ThemeId) VALUES ('"; $sql .= $this->TemplateName."','$value',".adodb_date("U").",".$this->ThemeId.")"; } $this->adodbConnection->Execute($sql); Index: trunk/kernel/admin_templates/users/users_edit_groups.tpl =================================================================== diff -u --- trunk/kernel/admin_templates/users/users_edit_groups.tpl (revision 0) +++ trunk/kernel/admin_templates/users/users_edit_groups.tpl (revision 7867) @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + +
+ + +
+ + + "> + + + + + + + + + + + \ No newline at end of file Index: trunk/core/units/selectors/selectors_config.php =================================================================== diff -u -r3105 -r7867 --- trunk/core/units/selectors/selectors_config.php (.../selectors_config.php) (revision 3105) +++ trunk/core/units/selectors/selectors_config.php (.../selectors_config.php) (revision 7867) @@ -87,7 +87,7 @@ ) ), 'Fields' => Array( - 'SelectorId' => Array(), + 'SelectorId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'StylesheetId' => Array('type' => 'int', 'unique'=>Array('SelectorName'), 'current_table_only' => 1, 'not_null' => '1','default' => '0'), 'Name' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1), 'SelectorName' => Array('type' => 'string', 'unique'=>Array('StylesheetId'), 'current_table_only' => 1, 'not_null' => '1','default' => '','required'=>1), Index: trunk/kernel/units/stylesheets/stylesheets_config.php =================================================================== diff -u -r7391 -r7867 --- trunk/kernel/units/stylesheets/stylesheets_config.php (.../stylesheets_config.php) (revision 7391) +++ trunk/kernel/units/stylesheets/stylesheets_config.php (.../stylesheets_config.php) (revision 7867) @@ -102,7 +102,7 @@ ) ), 'Fields' => Array( - 'StylesheetId' => Array(), + 'StylesheetId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'Name' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1), 'Description' => Array('type' => 'string','not_null' => '1','default' => ''), 'AdvancedCSS' => Array('type' => 'string','not_null' => '1','default' => ''), Index: trunk/admin/install/inportal_data.sql =================================================================== diff -u -r7391 -r7867 --- trunk/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 7391) +++ trunk/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 7867) @@ -1,170 +1,169 @@ INSERT INTO ItemTypes VALUES (1, 'In-Portal', 'c', 'Category', 'Name', 'CreatedById', NULL, NULL, 'la_ItemTab_Categories', 1, 'admin/category/addcategory.php', 'clsCategory', 'Category'); INSERT INTO ItemTypes VALUES (6, 'In-Portal', 'u', 'PortalUser', 'Login', 'PortalUserId', NULL, NULL, '', 0, '', 'clsPortalUser', 'User'); -INSERT INTO PermissionConfig (PermissionName, Description, ErrorMessage, ModuleId) VALUES ('CATEGORY.ADD', 'lu_PermName_Category.Add_desc', 'lu_PermName_Category.Add_error', 'In-Portal'); -INSERT INTO PermissionConfig (PermissionName, Description, ErrorMessage, ModuleId) VALUES ('CATEGORY.DELETE', 'lu_PermName_Category.Delete_desc', 'lu_PermName_Category.Delete_error', 'In-Portal'); -INSERT INTO PermissionConfig (PermissionName, Description, ErrorMessage, ModuleId) VALUES ('CATEGORY.ADD.PENDING', 'lu_PermName_Category.AddPending_desc', 'lu_PermName_Category.AddPending_error', 'In-Portal'); -INSERT INTO PermissionConfig (PermissionName, Description, ErrorMessage, ModuleId) VALUES ('CATEGORY.MODIFY', 'lu_PermName_Category.Modify_desc', 'lu_PermName_Category.Modify_error', 'In-Portal'); -INSERT INTO PermissionConfig (PermissionName, Description, ErrorMessage, ModuleId) VALUES ('ADMIN', 'lu_PermName_Admin_desc', 'lu_PermName_Admin_error', 'Admin'); -INSERT INTO PermissionConfig (PermissionName, Description, ErrorMessage, ModuleId) VALUES ('LOGIN', 'lu_PermName_Login_desc', 'lu_PermName_Admin_error', 'Front'); -INSERT INTO PermissionConfig (PermissionName, Description, ErrorMessage, ModuleId) VALUES ('DEBUG.ITEM', 'lu_PermName_Debug.Item_desc', '', 'Admin'); -INSERT INTO PermissionConfig (PermissionName, Description, ErrorMessage, ModuleId) VALUES ('DEBUG.LIST', 'lu_PermName_Debug.List_desc', '', 'Admin'); -INSERT INTO PermissionConfig (PermissionName, Description, ErrorMessage, ModuleId) VALUES ('DEBUG.INFO', 'lu_PermName_Debug.Info_desc', '', 'Admin'); -INSERT INTO PermissionConfig (PermissionName, Description, ErrorMessage, ModuleId) VALUES ('PROFILE.MODIFY', 'lu_PermName_Profile.Modify_desc', '', 'Admin'); -INSERT INTO PermissionConfig (PermissionName, Description, ErrorMessage, ModuleId) VALUES ('SHOWLANG', 'lu_PermName_ShowLang_desc', '', 'Admin'); -INSERT INTO PermissionConfig (PermissionName, Description, ErrorMessage, ModuleId) VALUES ('FAVORITES', 'lu_PermName_favorites_desc', 'lu_PermName_favorites_error', 'In-Portal'); -INSERT INTO PermissionConfig (PermissionName, Description, ErrorMessage, ModuleId) VALUES ('SYSTEM_ACCESS.READONLY', 'la_PermName_SystemAccess.ReadOnly_desc', 'la_PermName_SystemAccess.ReadOnly_error', 'Admin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.ADD', 'lu_PermName_Category.Add_desc', 'lu_PermName_Category.Add_error', 'In-Portal'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.DELETE', 'lu_PermName_Category.Delete_desc', 'lu_PermName_Category.Delete_error', 'In-Portal'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.ADD.PENDING', 'lu_PermName_Category.AddPending_desc', 'lu_PermName_Category.AddPending_error', 'In-Portal'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.MODIFY', 'lu_PermName_Category.Modify_desc', 'lu_PermName_Category.Modify_error', 'In-Portal'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'ADMIN', 'lu_PermName_Admin_desc', 'lu_PermName_Admin_error', 'Admin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'LOGIN', 'lu_PermName_Login_desc', 'lu_PermName_Admin_error', 'Front'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'DEBUG.ITEM', 'lu_PermName_Debug.Item_desc', '', 'Admin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'DEBUG.LIST', 'lu_PermName_Debug.List_desc', '', 'Admin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'DEBUG.INFO', 'lu_PermName_Debug.Info_desc', '', 'Admin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'PROFILE.MODIFY', 'lu_PermName_Profile.Modify_desc', '', 'Admin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'SHOWLANG', 'lu_PermName_ShowLang_desc', '', 'Admin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'FAVORITES', 'lu_PermName_favorites_desc', 'lu_PermName_favorites_error', 'In-Portal'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'SYSTEM_ACCESS.READONLY', 'la_PermName_SystemAccess.ReadOnly_desc', 'la_PermName_SystemAccess.ReadOnly_error', 'Admin'); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('LOGIN', 12, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('CATEGORY.VIEW', 11, 1, 0, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'LOGIN', 12, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:site.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:browse.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:advanced_view.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:reviews.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_categories.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_categories.edit', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configuration_search.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configuration_search.edit', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configuration_email.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configuration_email.edit', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configuration_custom.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configuration_custom.add', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configuration_custom.edit', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configuration_custom.delete', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:users.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:site.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:browse.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:advanced_view.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:reviews.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configure_categories.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configure_categories.edit', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configuration_search.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configuration_search.edit', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configuration_email.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configuration_email.edit', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configuration_custom.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configuration_custom.add', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configuration_custom.edit', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configuration_custom.delete', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:users.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_list.advanced:ban', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_list.advanced:send_email', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_groups.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_groups.add', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_groups.edit', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_groups.delete', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_groups.advanced:send_email', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_groups.advanced:manage_permissions', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_users.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_users.edit', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_email.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_email.edit', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_custom.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_custom.add', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_custom.edit', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_custom.delete', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_banlist.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_banlist.add', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_banlist.edit', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_banlist.delete', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:reports.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:log_summary.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:searchlog.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:searchlog.delete', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:sessionlog.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:sessionlog.delete', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:emaillog.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:emaillog.delete', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:visits.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:visits.delete', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:user_list.advanced:ban', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:user_list.advanced:send_email', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:user_groups.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:user_groups.add', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:user_groups.edit', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:user_groups.delete', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:user_groups.advanced:send_email', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:user_groups.advanced:manage_permissions', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configure_users.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configure_users.edit', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:user_email.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:user_email.edit', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:user_custom.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:user_custom.add', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:user_custom.edit', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:user_custom.delete', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:user_banlist.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:user_banlist.add', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:user_banlist.edit', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:user_banlist.delete', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:reports.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:log_summary.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:searchlog.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:searchlog.delete', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:sessionlog.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:sessionlog.delete', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:emaillog.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:emaillog.delete', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:visits.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:visits.delete', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_general.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_general.edit', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:modules.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:mod_status.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:mod_status.edit', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:mod_status.advanced:approve', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:mod_status.advanced:decline', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:addmodule.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:addmodule.add', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:addmodule.edit', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:tag_library.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_themes.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_themes.add', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_themes.edit', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_themes.delete', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_styles.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_styles.add', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_styles.edit', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_styles.delete', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configure_general.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configure_general.edit', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:modules.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:mod_status.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:mod_status.edit', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:mod_status.advanced:approve', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:mod_status.advanced:decline', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:addmodule.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:addmodule.add', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:addmodule.edit', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:tag_library.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configure_themes.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configure_themes.add', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configure_themes.edit', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configure_themes.delete', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configure_styles.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configure_styles.add', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configure_styles.edit', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configure_styles.delete', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_lang.advanced:set_primary', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_lang.advanced:import', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_lang.advanced:export', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:tools.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:backup.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:restore.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:export.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:main_import.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:sql_query.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:sql_query.edit', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:server_info.view', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:help.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configure_lang.advanced:set_primary', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configure_lang.advanced:import', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configure_lang.advanced:export', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:tools.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:backup.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:restore.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:export.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:main_import.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:sql_query.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:sql_query.edit', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:server_info.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:help.view', 11, 1, 1, 0); -INSERT INTO SearchConfig VALUES ('Category', 'NewItem', 0, 1, 'lu_fielddesc_category_newitem', 'lu_field_newitem', 'In-Portal', 'la_text_category', 18, 80, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('Category', 'PopItem', 0, 1, 'lu_fielddesc_category_popitem', 'lu_field_popitem', 'In-Portal', 'la_text_category', 19, 81, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('Category', 'HotItem', 0, 1, 'lu_fielddesc_category_hotitem', 'lu_field_hotitem', 'In-Portal', 'la_text_category', 17, 79, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('Category', 'MetaDescription', 0, 1, 'lu_fielddesc_category_metadescription', 'lu_field_metadescription', 'In-Portal', 'la_text_category', 16, 78, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('Category', 'ParentPath', 0, 1, 'lu_fielddesc_category_parentpath', 'lu_field_parentpath', 'In-Portal', 'la_text_category', 15, 77, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('Category', 'ResourceId', 0, 1, 'lu_fielddesc_category_resourceid', 'lu_field_resourceid', 'In-Portal', 'la_text_category', 14, 76, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('Category', 'CreatedById', 0, 1, 'lu_fielddesc_category_createdbyid', 'lu_field_createdbyid', 'In-Portal', 'la_text_category', 13, 75, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('Category', 'CachedNavbar', 0, 1, 'lu_fielddesc_category_cachednavbar', 'lu_field_cachednavbar', 'In-Portal', 'la_text_category', 12, 74, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('Category', 'CachedDescendantCatsQty', 0, 1, 'lu_fielddesc_category_cacheddescendantcatsqty', 'lu_field_cacheddescendantcatsqty', 'In-Portal', 'la_text_category', 11, 73, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('Category', 'MetaKeywords', 0, 1, 'lu_fielddesc_category_metakeywords', 'lu_field_metakeywords', 'In-Portal', 'la_text_category', 10, 72, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('Category', 'Priority', 0, 1, 'lu_fielddesc_category_priority', 'lu_field_priority', 'In-Portal', 'la_text_category', 9, 71, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('Category', 'Status', 0, 1, 'lu_fielddesc_category_status', 'lu_field_status', 'In-Portal', 'la_text_category', 7, 69, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('Category', 'EditorsPick', 0, 1, 'lu_fielddesc_category_editorspick', 'lu_field_editorspick', 'In-Portal', 'la_text_category', 6, 68, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('Category', 'CreatedOn', 0, 1, 'lu_fielddesc_category_createdon', 'lu_field_createdon', 'In-Portal', 'la_text_category', 5, 67, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('Category', 'Description', 1, 1, 'lu_fielddesc_category_description', 'lu_field_description', 'In-Portal', 'la_text_category', 4, 66, 2, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('Category', 'Name', 1, 1, 'lu_fielddesc_category_name', 'lu_field_name', 'In-Portal', 'la_text_category', 3, 65, 2, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('Category', 'ParentId', 0, 1, 'lu_fielddesc_category_parentid', 'lu_field_parentid', 'In-Portal', 'la_text_category', 2, 64, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('Category', 'CategoryId', 0, 1, 'lu_fielddesc_category_categoryid', 'lu_field_categoryid', 'In-Portal', 'la_text_category', 0, 62, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('Category', 'Modified', 0, 1, 'lu_fielddesc_category_modified', 'lu_field_modified', 'In-Portal', 'la_text_category', 20, 82, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('Category', 'ModifiedById', 0, 1, 'lu_fielddesc_category_modifiedbyid', 'lu_field_modifiedbyid', 'In-Portal', 'la_text_category', 21, 83, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('Category', 'NewItem', 0, 1, 'lu_fielddesc_category_newitem', 'lu_field_newitem', 'In-Portal', 'la_text_category', 18, DEFAULT, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('Category', 'PopItem', 0, 1, 'lu_fielddesc_category_popitem', 'lu_field_popitem', 'In-Portal', 'la_text_category', 19, DEFAULT, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('Category', 'HotItem', 0, 1, 'lu_fielddesc_category_hotitem', 'lu_field_hotitem', 'In-Portal', 'la_text_category', 17, DEFAULT, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('Category', 'MetaDescription', 0, 1, 'lu_fielddesc_category_metadescription', 'lu_field_metadescription', 'In-Portal', 'la_text_category', 16, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('Category', 'ParentPath', 0, 1, 'lu_fielddesc_category_parentpath', 'lu_field_parentpath', 'In-Portal', 'la_text_category', 15, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('Category', 'ResourceId', 0, 1, 'lu_fielddesc_category_resourceid', 'lu_field_resourceid', 'In-Portal', 'la_text_category', 14, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('Category', 'CreatedById', 0, 1, 'lu_fielddesc_category_createdbyid', 'lu_field_createdbyid', 'In-Portal', 'la_text_category', 13, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('Category', 'CachedNavbar', 0, 1, 'lu_fielddesc_category_cachednavbar', 'lu_field_cachednavbar', 'In-Portal', 'la_text_category', 12, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('Category', 'CachedDescendantCatsQty', 0, 1, 'lu_fielddesc_category_cacheddescendantcatsqty', 'lu_field_cacheddescendantcatsqty', 'In-Portal', 'la_text_category', 11, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('Category', 'MetaKeywords', 0, 1, 'lu_fielddesc_category_metakeywords', 'lu_field_metakeywords', 'In-Portal', 'la_text_category', 10, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('Category', 'Priority', 0, 1, 'lu_fielddesc_category_priority', 'lu_field_priority', 'In-Portal', 'la_text_category', 9, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('Category', 'Status', 0, 1, 'lu_fielddesc_category_status', 'lu_field_status', 'In-Portal', 'la_text_category', 7, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('Category', 'EditorsPick', 0, 1, 'lu_fielddesc_category_editorspick', 'lu_field_editorspick', 'In-Portal', 'la_text_category', 6, DEFAULT, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('Category', 'CreatedOn', 0, 1, 'lu_fielddesc_category_createdon', 'lu_field_createdon', 'In-Portal', 'la_text_category', 5, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('Category', 'Description', 1, 1, 'lu_fielddesc_category_description', 'lu_field_description', 'In-Portal', 'la_text_category', 4, DEFAULT, 2, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('Category', 'Name', 1, 1, 'lu_fielddesc_category_name', 'lu_field_name', 'In-Portal', 'la_text_category', 3, DEFAULT, 2, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('Category', 'ParentId', 0, 1, 'lu_fielddesc_category_parentid', 'lu_field_parentid', 'In-Portal', 'la_text_category', 2, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('Category', 'CategoryId', 0, 1, 'lu_fielddesc_category_categoryid', 'lu_field_categoryid', 'In-Portal', 'la_text_category', 0, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('Category', 'Modified', 0, 1, 'lu_fielddesc_category_modified', 'lu_field_modified', 'In-Portal', 'la_text_category', 20, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('Category', 'ModifiedById', 0, 1, 'lu_fielddesc_category_modifiedbyid', 'lu_field_modifiedbyid', 'In-Portal', 'la_text_category', 21, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('PortalUser', 'PortalUserId', -1, 0, 'lu_fielddesc_user_portaluserid', 'lu_field_portaluserid', 'In-Portal', 'la_text_user', 0, 173, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('PortalUser', 'Login', -1, 0, 'lu_fielddesc_user_login', 'lu_field_login', 'In-Portal', 'la_text_user', 1, 174, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('PortalUser', 'Password', -1, 0, 'lu_fielddesc_user_password', 'lu_field_password', 'In-Portal', 'la_text_user', 2, 175, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('PortalUser', 'tz', -1, 0, 'lu_fielddesc_user_tz', 'lu_field_tz', 'In-Portal', 'la_text_user', 17, 190, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('PortalUser', 'dob', -1, 0, 'lu_fielddesc_user_dob', 'lu_field_dob', 'In-Portal', 'la_text_user', 16, 189, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('PortalUser', 'Modified', -1, 0, 'lu_fielddesc_user_modified', 'lu_field_modified', 'In-Portal', 'la_text_user', 15, 188, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('PortalUser', 'Status', -1, 0, 'lu_fielddesc_user_status', 'lu_field_status', 'In-Portal', 'la_text_user', 14, 187, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('PortalUser', 'ResourceId', -1, 0, 'lu_fielddesc_user_resourceid', 'lu_field_resourceid', 'In-Portal', 'la_text_user', 13, 186, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('PortalUser', 'Country', -1, 0, 'lu_fielddesc_user_country', 'lu_field_country', 'In-Portal', 'la_text_user', 12, 185, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('PortalUser', 'Zip', -1, 0, 'lu_fielddesc_user_zip', 'lu_field_zip', 'In-Portal', 'la_text_user', 11, 184, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('PortalUser', 'State', -1, 0, 'lu_fielddesc_user_state', 'lu_field_state', 'In-Portal', 'la_text_user', 10, 183, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('PortalUser', 'City', -1, 0, 'lu_fielddesc_user_city', 'lu_field_city', 'In-Portal', 'la_text_user', 9, 182, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('PortalUser', 'Street', -1, 0, 'lu_fielddesc_user_street', 'lu_field_street', 'In-Portal', 'la_text_user', 8, 181, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('PortalUser', 'Phone', -1, 0, 'lu_fielddesc_user_phone', 'lu_field_phone', 'In-Portal', 'la_text_user', 7, 180, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('PortalUser', 'CreatedOn', -1, 0, 'lu_fielddesc_user_createdon', 'lu_field_createdon', 'In-Portal', 'la_text_user', 6, 179, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('PortalUser', 'Email', -1, 0, 'lu_fielddesc_user_email', 'lu_field_email', 'In-Portal', 'la_text_user', 5, 178, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('PortalUser', 'LastName', -1, 0, 'lu_fielddesc_user_lastname', 'lu_field_lastname', 'In-Portal', 'la_text_user', 4, 177, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO SearchConfig VALUES ('PortalUser', 'FirstName', -1, 0, 'lu_fielddesc_user_firstname', 'lu_field_firstname', 'In-Portal', 'la_text_user', 3, 176, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('PortalUser', 'PortalUserId', -1, 0, 'lu_fielddesc_user_portaluserid', 'lu_field_portaluserid', 'In-Portal', 'la_text_user', 0, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('PortalUser', 'Login', -1, 0, 'lu_fielddesc_user_login', 'lu_field_login', 'In-Portal', 'la_text_user', 1, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('PortalUser', 'Password', -1, 0, 'lu_fielddesc_user_password', 'lu_field_password', 'In-Portal', 'la_text_user', 2, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('PortalUser', 'tz', -1, 0, 'lu_fielddesc_user_tz', 'lu_field_tz', 'In-Portal', 'la_text_user', 17, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('PortalUser', 'dob', -1, 0, 'lu_fielddesc_user_dob', 'lu_field_dob', 'In-Portal', 'la_text_user', 16, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('PortalUser', 'Modified', -1, 0, 'lu_fielddesc_user_modified', 'lu_field_modified', 'In-Portal', 'la_text_user', 15, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('PortalUser', 'Status', -1, 0, 'lu_fielddesc_user_status', 'lu_field_status', 'In-Portal', 'la_text_user', 14, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('PortalUser', 'ResourceId', -1, 0, 'lu_fielddesc_user_resourceid', 'lu_field_resourceid', 'In-Portal', 'la_text_user', 13, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('PortalUser', 'Country', -1, 0, 'lu_fielddesc_user_country', 'lu_field_country', 'In-Portal', 'la_text_user', 12, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('PortalUser', 'Zip', -1, 0, 'lu_fielddesc_user_zip', 'lu_field_zip', 'In-Portal', 'la_text_user', 11, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('PortalUser', 'State', -1, 0, 'lu_fielddesc_user_state', 'lu_field_state', 'In-Portal', 'la_text_user', 10, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('PortalUser', 'City', -1, 0, 'lu_fielddesc_user_city', 'lu_field_city', 'In-Portal', 'la_text_user', 9, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('PortalUser', 'Street', -1, 0, 'lu_fielddesc_user_street', 'lu_field_street', 'In-Portal', 'la_text_user', 8, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('PortalUser', 'Phone', -1, 0, 'lu_fielddesc_user_phone', 'lu_field_phone', 'In-Portal', 'la_text_user', 7, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('PortalUser', 'CreatedOn', -1, 0, 'lu_fielddesc_user_createdon', 'lu_field_createdon', 'In-Portal', 'la_text_user', 6, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('PortalUser', 'Email', -1, 0, 'lu_fielddesc_user_email', 'lu_field_email', 'In-Portal', 'la_text_user', 5, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('PortalUser', 'LastName', -1, 0, 'lu_fielddesc_user_lastname', 'lu_field_lastname', 'In-Portal', 'la_text_user', 4, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO SearchConfig VALUES ('PortalUser', 'FirstName', -1, 0, 'lu_fielddesc_user_firstname', 'lu_field_firstname', 'In-Portal', 'la_text_user', 3, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT count(*) FROM <%prefix%>Category WHERE Status=1 ', NULL, 'la_prompt_ActiveCategories', '0', '1'); -INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT count(*) FROM <%prefix%>PortalUser WHERE Status=1 ', NULL, 'la_prompt_ActiveUsers', '0', '1'); -INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT count(*) FROM <%prefix%>UserSession', NULL, 'la_prompt_CurrentSessions', '0', '1'); -INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT(*) as CategoryCount FROM <%prefix%>Category', NULL, 'la_prompt_TotalCategories', 0, 2); -INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT(*) AS ActiveCategories FROM <%prefix%>Category WHERE Status = 1', NULL, 'la_prompt_ActiveCategories', 0, 2); -INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT(*) AS PendingCategories FROM <%prefix%>Category WHERE Status = 2', NULL, 'la_prompt_PendingCategories', 0, 2); -INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT(*) AS DisabledCategories FROM <%prefix%>Category WHERE Status = 0', NULL, 'la_prompt_DisabledCategories', 0, 2); -INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT(*) AS NewCategories FROM <%prefix%>Category WHERE (NewItem = 1) OR ( (UNIX_TIMESTAMP() - CreatedOn) <= <%m:config name="Category_DaysNew"%>*86400 AND (NewItem = 2) )', NULL, 'la_prompt_NewCategories', 0, 2); -INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT(*) FROM <%prefix%>Category WHERE EditorsPick = 1', NULL, 'la_prompt_CategoryEditorsPick', 0, 2); -INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT <%m:post_format field="MAX(CreatedOn)" type="date"%> FROM <%prefix%>Category', NULL, 'la_prompt_NewestCategoryDate', 0, 2); -INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT <%m:post_format field="MAX(Modified)" type="date"%> FROM <%prefix%>Category', NULL, 'la_prompt_LastCategoryUpdate', 0, 2); -INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT(*) AS TotalUsers FROM <%prefix%>PortalUser', NULL, 'la_prompt_TopicsUsers', 0, 2); -INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT(*) AS ActiveUsers FROM <%prefix%>PortalUser WHERE Status = 1', NULL, 'la_prompt_UsersActive', 0, 2); -INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT(*) AS PendingUsers FROM <%prefix%>PortalUser WHERE Status = 2', NULL, 'la_prompt_UsersPending', 0, 2); -INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT(*) AS DisabledUsers FROM <%prefix%>PortalUser WHERE Status = 0', NULL, 'la_prompt_UsersDisabled', 0, 2); -INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT <%m:post_format field="MAX(CreatedOn)" type="date"%> FROM <%prefix%>PortalUser', NULL, 'la_prompt_NewestUserDate', 0, 2); -INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT( DISTINCT LOWER( Country ) ) FROM <%prefix%>PortalUser WHERE LENGTH(Country) > 0', NULL, 'la_prompt_UsersUniqueCountries', 0, 2); -INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT( DISTINCT LOWER( State ) ) FROM <%prefix%>PortalUser WHERE LENGTH(State) > 0', NULL, 'la_prompt_UsersUniqueStates', 0, 2); -INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT(*) AS TotalUserGroups FROM <%prefix%>PortalGroup', NULL, 'la_prompt_TotalUserGroups', 0, 2); -INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT(*) AS BannedUsers FROM <%prefix%>PortalUser WHERE IsBanned = 1', NULL, 'la_prompt_BannedUsers', 0, 2); -INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT(*) AS NonExipedSessions FROM <%prefix%>UserSession WHERE Status = 1', NULL, 'la_prompt_NonExpiredSessions', 0, 2); -INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT(*) AS ThemeCount FROM <%prefix%>Theme', NULL, 'la_prompt_ThemeCount', 0, 2); -INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT(*) AS RegionsCount FROM <%prefix%>Language', NULL, 'la_prompt_RegionsCount', 0, 2); -INSERT INTO StatItem VALUES (0, 'In-Portal', '<%m:sql_action sql="SHOW+TABLES" action="COUNT" field="*"%>', NULL, 'la_prompt_TablesCount', 0, 2); -INSERT INTO StatItem VALUES (0, 'In-Portal', '<%m:sql_action sql="SHOW+TABLE+STATUS" action="SUM" field="Rows"%>', NULL, 'la_prompt_RecordsCount', 0, 2); -INSERT INTO StatItem VALUES (0, 'In-Portal', '<%m:custom_action sql="empty" action="SysFileSize"%>', NULL, 'la_prompt_SystemFileSize', 0, 2); -INSERT INTO StatItem VALUES (0, 'In-Portal', '<%m:sql_action sql="SHOW+TABLE+STATUS" action="SUM" format_as="file" field="Data_length"%>', NULL, 'la_prompt_DataSize', 0, 2); +INSERT INTO StatItem VALUES (DEFAULT, 'In-Portal', 'SELECT count(*) FROM <%prefix%>Category WHERE Status=1 ', NULL, 'la_prompt_ActiveCategories', '0', '1'); +INSERT INTO StatItem VALUES (DEFAULT, 'In-Portal', 'SELECT count(*) FROM <%prefix%>PortalUser WHERE Status=1 ', NULL, 'la_prompt_ActiveUsers', '0', '1'); +INSERT INTO StatItem VALUES (DEFAULT, 'In-Portal', 'SELECT count(*) FROM <%prefix%>UserSession', NULL, 'la_prompt_CurrentSessions', '0', '1'); +INSERT INTO StatItem VALUES (DEFAULT, 'In-Portal', 'SELECT COUNT(*) as CategoryCount FROM <%prefix%>Category', NULL, 'la_prompt_TotalCategories', 0, 2); +INSERT INTO StatItem VALUES (DEFAULT, 'In-Portal', 'SELECT COUNT(*) AS ActiveCategories FROM <%prefix%>Category WHERE Status = 1', NULL, 'la_prompt_ActiveCategories', 0, 2); +INSERT INTO StatItem VALUES (DEFAULT, 'In-Portal', 'SELECT COUNT(*) AS PendingCategories FROM <%prefix%>Category WHERE Status = 2', NULL, 'la_prompt_PendingCategories', 0, 2); +INSERT INTO StatItem VALUES (DEFAULT, 'In-Portal', 'SELECT COUNT(*) AS DisabledCategories FROM <%prefix%>Category WHERE Status = 0', NULL, 'la_prompt_DisabledCategories', 0, 2); +INSERT INTO StatItem VALUES (DEFAULT, 'In-Portal', 'SELECT COUNT(*) AS NewCategories FROM <%prefix%>Category WHERE (NewItem = 1) OR ( (UNIX_TIMESTAMP() - CreatedOn) <= <%m:config name="Category_DaysNew"%>*86400 AND (NewItem = 2) )', NULL, 'la_prompt_NewCategories', 0, 2); +INSERT INTO StatItem VALUES (DEFAULT, 'In-Portal', 'SELECT COUNT(*) FROM <%prefix%>Category WHERE EditorsPick = 1', NULL, 'la_prompt_CategoryEditorsPick', 0, 2); +INSERT INTO StatItem VALUES (DEFAULT, 'In-Portal', 'SELECT <%m:post_format field="MAX(CreatedOn)" type="date"%> FROM <%prefix%>Category', NULL, 'la_prompt_NewestCategoryDate', 0, 2); +INSERT INTO StatItem VALUES (DEFAULT, 'In-Portal', 'SELECT <%m:post_format field="MAX(Modified)" type="date"%> FROM <%prefix%>Category', NULL, 'la_prompt_LastCategoryUpdate', 0, 2); +INSERT INTO StatItem VALUES (DEFAULT, 'In-Portal', 'SELECT COUNT(*) AS TotalUsers FROM <%prefix%>PortalUser', NULL, 'la_prompt_TopicsUsers', 0, 2); +INSERT INTO StatItem VALUES (DEFAULT, 'In-Portal', 'SELECT COUNT(*) AS ActiveUsers FROM <%prefix%>PortalUser WHERE Status = 1', NULL, 'la_prompt_UsersActive', 0, 2); +INSERT INTO StatItem VALUES (DEFAULT, 'In-Portal', 'SELECT COUNT(*) AS PendingUsers FROM <%prefix%>PortalUser WHERE Status = 2', NULL, 'la_prompt_UsersPending', 0, 2); +INSERT INTO StatItem VALUES (DEFAULT, 'In-Portal', 'SELECT COUNT(*) AS DisabledUsers FROM <%prefix%>PortalUser WHERE Status = 0', NULL, 'la_prompt_UsersDisabled', 0, 2); +INSERT INTO StatItem VALUES (DEFAULT, 'In-Portal', 'SELECT <%m:post_format field="MAX(CreatedOn)" type="date"%> FROM <%prefix%>PortalUser', NULL, 'la_prompt_NewestUserDate', 0, 2); +INSERT INTO StatItem VALUES (DEFAULT, 'In-Portal', 'SELECT COUNT( DISTINCT LOWER( Country ) ) FROM <%prefix%>PortalUser WHERE LENGTH(Country) > 0', NULL, 'la_prompt_UsersUniqueCountries', 0, 2); +INSERT INTO StatItem VALUES (DEFAULT, 'In-Portal', 'SELECT COUNT( DISTINCT LOWER( State ) ) FROM <%prefix%>PortalUser WHERE LENGTH(State) > 0', NULL, 'la_prompt_UsersUniqueStates', 0, 2); +INSERT INTO StatItem VALUES (DEFAULT, 'In-Portal', 'SELECT COUNT(*) AS TotalUserGroups FROM <%prefix%>PortalGroup', NULL, 'la_prompt_TotalUserGroups', 0, 2); +INSERT INTO StatItem VALUES (DEFAULT, 'In-Portal', 'SELECT COUNT(*) AS BannedUsers FROM <%prefix%>PortalUser WHERE IsBanned = 1', NULL, 'la_prompt_BannedUsers', 0, 2); +INSERT INTO StatItem VALUES (DEFAULT, 'In-Portal', 'SELECT COUNT(*) AS NonExipedSessions FROM <%prefix%>UserSession WHERE Status = 1', NULL, 'la_prompt_NonExpiredSessions', 0, 2); +INSERT INTO StatItem VALUES (DEFAULT, 'In-Portal', 'SELECT COUNT(*) AS ThemeCount FROM <%prefix%>Theme', NULL, 'la_prompt_ThemeCount', 0, 2); +INSERT INTO StatItem VALUES (DEFAULT, 'In-Portal', 'SELECT COUNT(*) AS RegionsCount FROM <%prefix%>Language', NULL, 'la_prompt_RegionsCount', 0, 2); +INSERT INTO StatItem VALUES (DEFAULT, 'In-Portal', '<%m:sql_action sql="SHOW+TABLES" action="COUNT" field="*"%>', NULL, 'la_prompt_TablesCount', 0, 2); +INSERT INTO StatItem VALUES (DEFAULT, 'In-Portal', '<%m:sql_action sql="SHOW+TABLE+STATUS" action="SUM" field="Rows"%>', NULL, 'la_prompt_RecordsCount', 0, 2); +INSERT INTO StatItem VALUES (DEFAULT, 'In-Portal', '<%m:custom_action sql="empty" action="SysFileSize"%>', NULL, 'la_prompt_SystemFileSize', 0, 2); +INSERT INTO StatItem VALUES (DEFAULT, 'In-Portal', '<%m:sql_action sql="SHOW+TABLE+STATUS" action="SUM" format_as="file" field="Data_length"%>', NULL, 'la_prompt_DataSize', 0, 2); INSERT INTO StylesheetSelectors VALUES (169, 8, 'Calendar''s selected days', '.calendar tbody .selected', 'a:0:{}', '', 1, 'font-weight: bold;\r\nbackground-color: #9ED7ED;\r\nborder: 1px solid #83B2C5;', 0); INSERT INTO StylesheetSelectors VALUES (118, 8, 'Data grid row', 'td.block-data-row', 'a:0:{}', '', 2, 'border-bottom: 1px solid #cccccc;', 48); @@ -226,4 +225,4 @@ INSERT INTO Stylesheets VALUES (8, 'Default', 'In-Portal Default Theme', '', 1124952555, 1); -INSERT INTO Modules (Name, Path, Var, Version, Loaded, LoadOrder, TemplatePath, RootCat, BuildDate) VALUES ('In-Portal', 'kernel/', 'm', '1.4.0', 1, 0, '', 0, '1054738405'); \ No newline at end of file +INSERT INTO Modules VALUES ('In-Portal', 'kernel/', 'm', '4.0.2', 1, 0, '', 0, '1054738405'); \ No newline at end of file Index: trunk/core/units/statistics/statistics_config.php =================================================================== diff -u -r4524 -r7867 --- trunk/core/units/statistics/statistics_config.php (.../statistics_config.php) (revision 4524) +++ trunk/core/units/statistics/statistics_config.php (.../statistics_config.php) (revision 7867) @@ -36,7 +36,7 @@ ), 'Fields' => Array( - 'StatItemId' => Array(), + 'StatItemId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'Module' => Array('type' => 'string','not_null' => '1','default' => ''), 'ValueSQL' => Array('type' => 'string','default' => ''), 'ResetSQL' => Array('type' => 'string','default' => ''), Index: trunk/core/units/images/image_tag_processor.php =================================================================== diff -u -r6093 -r7867 --- trunk/core/units/images/image_tag_processor.php (.../image_tag_processor.php) (revision 6093) +++ trunk/core/units/images/image_tag_processor.php (.../image_tag_processor.php) (revision 7867) @@ -108,7 +108,7 @@ { // return local image or url $ret = $object->GetDBField('LocalThumb') ? PROTOCOL.SERVER_NAME.BASE_PATH.'/'.$object->GetDBField('ThumbPath') : $object->GetDBField('ThumbUrl'); - if ( $object->GetDBField('LocalThumb') && !file_exists(FULL_PATH.'/'.$object->GetDBField('ThumbPath')) ) $ret = ''; + if ( $object->GetDBField('LocalThumb') && !file_exists(FULL_PATH.'/'.$object->GetDBField('ThumbPath')) && !constOn('DBG_IMAGE_RECOVERY')) $ret = ''; } else { // if we need full which is not the same as thumb $ret = $object->GetDBField('LocalImage') ? PROTOCOL.SERVER_NAME.BASE_PATH.'/'.$object->GetDBField('LocalPath') : $object->GetDBField('Url'); Index: trunk/kernel/units/visits/visits_config.php =================================================================== diff -u -r7391 -r7867 --- trunk/kernel/units/visits/visits_config.php (.../visits_config.php) (revision 7391) +++ trunk/kernel/units/visits/visits_config.php (.../visits_config.php) (revision 7867) @@ -92,7 +92,7 @@ ), 'Fields' => Array( - 'VisitId' => Array('type' => 'int'), + 'VisitId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'VisitDate' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'custom_filter' => 'date_range', 'not_null' => '1','default' => '0'), 'Referer' => Array('type' => 'string','not_null' => '1','default' => ''), 'IPAddress' => Array('type' => 'string','not_null' => '1','default' => ''), Index: trunk/kernel/units/images/images_config.php =================================================================== diff -u -r5320 -r7867 --- trunk/kernel/units/images/images_config.php (.../images_config.php) (revision 5320) +++ trunk/kernel/units/images/images_config.php (.../images_config.php) (revision 7867) @@ -77,7 +77,7 @@ ) ), 'Fields' => Array( - 'ImageId' => Array('type'=>'int'), + 'ImageId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'ResourceId' => Array('type'=>'int', 'not_null'=>1, 'default' => 0), 'Url' => Array('max_len'=>255, 'default' => '', 'not_null'=>1), 'Name' => Array('max_len'=>255, 'required'=>1, 'not_null'=>1, 'default' => ''), Index: trunk/kernel/include/emailmessage.php =================================================================== diff -u -r6428 -r7867 --- trunk/kernel/include/emailmessage.php (.../emailmessage.php) (revision 6428) +++ trunk/kernel/include/emailmessage.php (.../emailmessage.php) (revision 7867) @@ -119,6 +119,8 @@ { global $objUsers, $objTemplate; + $this->Application->InitParser(); + $res = $this->ParseTemplateText($text); /* parse email class tags */ @@ -901,107 +903,49 @@ function SendMail($From, $FromName, $ToAddr, $ToName, $Subject, $Text, $Html, $charset, $SendEvent,$FileName="",$FileLoc="",$QueueOnly=0,$extra_headers = array()) { - $charset = GetRegionalOption('Charset'); - - $HasFile = FALSE; - $HasFile = (strlen($FileName)>0); - $OB="----=_OuterBoundary_000".md5( uniqid (rand())); - $boundary = "-----=".md5( uniqid (rand())); - $f = "\"$FromName\" <".$From.">"; - $headers = "From: $f"."\n"; - $headers .= "MIME-Version: 1.0"."\n"; - - $conn = &GetADODBConnection(); - $time = adodb_mktime(); - - $sendTo = $ToName; - - if (strlen($sendTo) > 0) { - $sendTo .= "($ToAddr)"; - } - else { - $sendTo = $ToAddr; - } - $sendTo=addslashes($sendTo); - $sql = "INSERT INTO ".GetTablePrefix()."EmailLog VALUES ('', ".$conn->qstr($FromName).", ".$conn->qstr($sendTo).", ".$conn->qstr( str_replace("Subject:", "", $Subject) ).", $time, '$SendEvent')"; - $conn->Execute($sql); - - if(is_array($extra_headers)) - { - foreach ($extra_headers as $h) - { - $headers .= $h."\n"; + // $QueueOnly - {true = put in queue, false = nd now} + + $application =& kApplication::Instance(); + + $esender =& $application->recallObject('EmailSender'); + /* @var $esender kEmailSendingHelper */ + + $esender->SetFrom($From, $FromName); + $esender->AddTo($ToAddr, $ToName); + $esender->SetSubject($Subject); + $esender->SetBody(stripslashes($Html), $Text); + + // set additional headers + if (is_array($extra_headers)) { + foreach ($extra_headers as $header) { + $header = explode(':', $header, 2); + $esender->SetEncodedHeader(trim($header[0]), trim($header[1])); } } - - $msg .="This is a multi-part message in MIME format."."\n"."\n"; - if($HasFile) - { - //Messages start with text/html alternatives in OB - $headers.="Content-Type: multipart/mixed;"."\n"."\tboundary=\"".$OB."\""."\n"."\n"; - $msg.="--".$OB."\n"; - $msg.="Content-Type: multipart/alternative; boundary=\"$boundary\""."\n"."\n"."\n"; - } - else { - $headers .= "Content-Type: multipart/alternative; boundary=\"$boundary\""."\n"; - } - - $application =& kApplication::Instance(); - $db =& $application->GetADODBConnection(); - - if (!$Text) { - $Text = strip_tags($Html); - } - else { - $Text = strip_tags($Text); - } - - $msg .= "--" . $boundary . "\n"; - $msg .= "Content-Type: text/plain; charset=\"$charset\""."\n"; - $msg .= "Content-Transfer-Encoding: 8bit"."\n"."\n"; - $msg .= stripslashes($Text); - $msg .= "\n"."\n"; - - if(strlen($Html)>0) - { - $msg .= "--" . $boundary . "\n"; - $msg .= "Content-Type: text/html; charset=\"".$charset."\""."\n"; - $msg .= "Content-Transfer-Encoding: 8bit"."\n"."\n"; - $msg .= stripslashes($Html); - $msg .= "\n"."\n"; - } - $msg .= "--" . $boundary . "--"."\n"; - if($HasFile) - { - if(!strlen($FileLoc)) { + + // add attachment if any + if (strlen($FileName) > 0) { + if(!strlen($FileLoc)) { $FileLoc = $FileName; } - $FileName = basename($FileName); - $msg .= "\n"."--".$OB."\n"; - $msg.="Content-Type: application/octetstream;"."\n"."\tname=\"".$FileName."\""."\n"; - $msg.="Content-Transfer-Encoding: base64"."\n"; - $msg.="Content-Disposition: attachment;"."\n"."\tfilename=\"".$FileName."\""."\n"."\n"; + $esender->AddAttachment($FileLoc, basename($FileName)); + } - //file goes here - $fd=fopen ($FileLoc, "r"); - if($fd) - { - $FileContent=fread($fd,filesize($FileLoc)); - fclose ($fd); - } - $FileContent=chunk_split(base64_encode($FileContent)); - $msg .= $FileContent."\n"; - $msg .= "--".$OB."--"."\n"; - } - - if($this->MessagesSent>$this->MessagesAtOnce || $QueueOnly==1) - { - $this->EnqueueMail($ToAddr,$From,$Subject,$msg,$headers); - } - else - { - $this->DeliverMail($ToAddr,$From,$Subject,$msg,$headers); - } + $status = $esender->Deliver(); + + if ($status) { + // write to log + $fields_hash = Array ( + 'fromuser' => $FromName, + 'addressto' => $ToName ? $ToName.' ('.$ToAddr.')' : $ToAddr, + 'subject' => str_replace('Subject:', '', $Subject), + 'timestamp' => adodb_mktime(), + 'event' => $SendEvent, + ); + + $db =& $application->GetADODBConnection(); + $db->doInsert($fields_hash, TABLE_PREFIX.'EmailLog'); + } } } Index: trunk/admin/email/do_send.php =================================================================== diff -u -r6093 -r7867 --- trunk/admin/email/do_send.php (.../do_send.php) (revision 6093) +++ trunk/admin/email/do_send.php (.../do_send.php) (revision 7867) @@ -69,15 +69,16 @@ $footer_body =& $footer[$is_html ? 'html' : 'plain']; if (is_null($footer_body)) { $application =& kApplication::Instance(); - $email_object =& $application->recallObject('kEmailMessage'); - $email_object->Clear(); + + $esender =& $application->recallObject('EmailSender'); + /* @var $esender kEmailSendingHelper */ $sql = 'SELECT em.Template FROM '.TABLE_PREFIX.'EmailMessage em LEFT JOIN '.TABLE_PREFIX.'Events e ON e.EventId = em.EventId WHERE em.LanguageId = '.$application->GetVar('m_lang').' AND e.Event = "COMMON.FOOTER"'; $footer_body = explode("\n\n", $application->Conn->GetOne($sql)); - $footer_body = "\r\n".($is_html ? '
'.$footer_body[1] : $email_object->convertHTMLtoPlain($footer_body[1])); + $footer_body = "\r\n".($is_html ? '
'.$footer_body[1] : $esender->ConvertToText($footer_body[1])); } return $footer_body; } Index: trunk/core/admin_templates/stylesheets/stylesheets_edit_block.tpl =================================================================== diff -u -r7391 -r7867 --- trunk/core/admin_templates/stylesheets/stylesheets_edit_block.tpl (.../stylesheets_edit_block.tpl) (revision 7391) +++ trunk/core/admin_templates/stylesheets/stylesheets_edit_block.tpl (.../stylesheets_edit_block.tpl) (revision 7867) @@ -2,7 +2,7 @@ - + Index: trunk/kernel/units/reviews/reviews_config.php =================================================================== diff -u -r7635 -r7867 --- trunk/kernel/units/reviews/reviews_config.php (.../reviews_config.php) (revision 7635) +++ trunk/kernel/units/reviews/reviews_config.php (.../reviews_config.php) (revision 7867) @@ -95,7 +95,7 @@ ), 'Fields' => Array( - 'ReviewId' => Array('type'=>'int'), + 'ReviewId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'CreatedOn' => Array('formatter'=>'kDateFormatter','not_null'=>1,'default'=>'#NOW#'), 'ReviewText' => Array('type'=>'string','required'=>1,'not_null'=>1,'default'=>''), 'IPAddress' => Array('type'=>'string','max_value_inc'=>15,'not_null'=>1,'default'=>''), Index: trunk/kernel/include/image.php =================================================================== diff -u -r6428 -r7867 --- trunk/kernel/include/image.php (.../image.php) (revision 6428) +++ trunk/kernel/include/image.php (.../image.php) (revision 7867) @@ -482,77 +482,40 @@ return $this->ThumbURL(); } - if(strlen($this->Get("Url"))) - return $this->Get("Url"); - if($this->Get("LocalImage")=="1") - { - $url = $this->Get("LocalPath"); - //$url = $this->GetImageDir().$this->GetFileName(); - if(file_exists($pathtoroot.$url)) - { - if(strlen($url)) - { - $url = $rootURL.$url; - return $url; - } - else - { - if(strlen($Default)) - $url = $rootURL.$Default; - return $url; - } - } - else - { - if(strlen($Default)) - { - return $rootURL.$Default; - } - else - return ""; - } + if(strlen($this->Get('Url'))) { + return $this->Get('Url'); } - else - { - if(strlen($Default)) - { - return $rootURL.$Default; + + if ($this->Get('LocalImage') == 1) { + $url = $this->Get('LocalPath'); + $file_found = file_exists($pathtoroot.$url) ? true : constOn('DBG_IMAGE_RECOVERY'); + + if ($url && $file_found) { + return $rootURL.$url; } - else - return ""; } + + return $rootURL.$Default; } function ThumbURL() { - global $rootURL, $pathtoroot, $objConfig; + global $rootURL, $pathtoroot; - if(strlen($this->Get("ThumbUrl"))) - { - return $this->Get("ThumbUrl"); + if (strlen($this->Get('ThumbUrl'))) { + // image on external site + return $this->Get('ThumbUrl'); } - - if($this->Get("LocalThumb")=="1") - { - $url = $this->Get("ThumbPath"); - //$url = $this->GetImageDir().$this->GetFileName(); - if(file_exists($pathtoroot.$url)) - { - if(strlen($url)) - { - $url = $rootURL.$url; - } - else - $url = $rootURL."kernel/images/noimage.gif"; - return $url; + + if ($this->Get('LocalThumb') == 1) { + $url = $this->Get('ThumbPath'); + $file_found = file_exists($pathtoroot.$url) ? true : constOn('DBG_IMAGE_RECOVERY'); + if ($url && $file_found) { + return $rootURL.$url; } - else - return $rootURL."kernel/images/noimage.gif"; } - else - { - return $rootURL."kernel/images/noimage.gif"; - } + + return $rootURL.'kernel/images/noimage.gif'; } function ParseObject($element) Index: trunk/core/admin_templates/stylesheets/stylesheets_edit_base.tpl =================================================================== diff -u -r7391 -r7867 --- trunk/core/admin_templates/stylesheets/stylesheets_edit_base.tpl (.../stylesheets_edit_base.tpl) (revision 7391) +++ trunk/core/admin_templates/stylesheets/stylesheets_edit_base.tpl (.../stylesheets_edit_base.tpl) (revision 7867) @@ -2,7 +2,7 @@ - + Index: trunk/kernel/admin_templates/users/users_edit_custom.tpl =================================================================== diff -u --- trunk/kernel/admin_templates/users/users_edit_custom.tpl (revision 0) +++ trunk/kernel/admin_templates/users/users_edit_custom.tpl (revision 7867) @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + Index: trunk/admin/editor/inp_fckconfig.js =================================================================== diff -u -r5558 -r7867 --- trunk/admin/editor/inp_fckconfig.js (.../inp_fckconfig.js) (revision 5558) +++ trunk/admin/editor/inp_fckconfig.js (.../inp_fckconfig.js) (revision 7867) @@ -20,44 +20,49 @@ * Frederico Caldeira Knabben (fredck@fckeditor.net) */ -//FCKConfig.CustomConfigurationsPath = '' ; +FCKConfig.CustomConfigurationsPath = '' ; -//FCKConfig.EditorAreaCSS = FCKConfig.ProjectPath + 'themes/inportal_site/inc/inportal.css' ; +FCKConfig.EditorAreaCSS = FCKConfig.BasePath + 'css/fck_editorarea.css' ; FCKConfig.BaseHref = '' ; FCKConfig.FullPage = false ; -FCKConfig.Debug = false ; +FCKConfig.Debug = false; FCKConfig.SkinPath = FCKConfig.BasePath + 'skins/default/' ; FCKConfig.PluginsPath = FCKConfig.BasePath + 'plugins/' ; // FCKConfig.Plugins.Add( 'placeholder', 'en,it' ) ; -FCKConfig.AutoDetectLanguage = true ; +FCKConfig.AutoDetectLanguage = false ; FCKConfig.DefaultLanguage = 'en' ; FCKConfig.ContentLangDirection = 'ltr' ; -FCKConfig.EnableXHTML = true ; -FCKConfig.EnableSourceXHTML = true ; +FCKConfig.EnableXHTML = false ; +FCKConfig.EnableSourceXHTML = false ; + FCKConfig.FillEmptyBlocks = true ; + FCKConfig.FormatSource = true ; FCKConfig.FormatOutput = true ; FCKConfig.FormatIndentator = ' ' ; -FCKConfig.GeckoUseSPAN = true ; -FCKConfig.StartupFocus = false ; + +FCKConfig.GeckoUseSPAN = true; +FCKConfig.StartupFocus = false; FCKConfig.ForcePasteAsPlainText = true ; FCKConfig.ForceSimpleAmpersand = false ; FCKConfig.TabSpaces = 0; + FCKConfig.ShowBorders = true; FCKConfig.ShowTableBorders = true; + FCKConfig.UseBROnCarriageReturn = false ; FCKConfig.ToolbarStartExpanded = true ; FCKConfig.ToolbarCanCollapse = true ; //FCKConfig.ProjectPath = FCKConfig.BasePath.replace(/\/cmseditor\/editor\/$/,''); -FCKConfig.IconImagesUrl = FCKConfig.ProjectPath+'kernel/user_files/icons'; +FCKConfig.IconImagesUrl = FCKConfig.ProjectPath+'/kernel/user_files/icons'; FCKConfig.ToolbarSets["Default"] = [ @@ -68,47 +73,83 @@ '/', ['Style','RemoveFormat'] ] ; + FCKConfig.ToolbarSets["Advanced"] = [ + ['Cut','Copy','Paste','PasteText','PasteWord','-','NewPage','SelectAll','-','Find','Replace','-','Print','Preview','-','Link','Unlink','Anchor','Rule','-','Image','Document','Table','SpecialChar'], + '/', + ['Bold','Italic','Underline','StrikeThrough','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull','-','OrderedList','UnorderedList','Outdent','Indent','-','Subscript','Superscript','-','TextColor','BGColor','-','Undo','Redo'], + '/', + ['Style','FontName','FontSize','RemoveFormat','-','SpellCheck','100%','|','Source'] +] ; + +FCKConfig.ToolbarSets["Advanced2"] = [ + ['Cut','Copy','Paste','PasteText','PasteWord','-','NewPage','SelectAll','-','Find','Replace','-','Print','Preview','-','Link','Unlink','Anchor','Rule','-','Image','Document','Table','SpecialChar'], + '/', + ['Bold','Italic','Underline','StrikeThrough','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull','-','OrderedList','UnorderedList','Outdent','Indent','-','Subscript','Superscript','-','TextColor','BGColor','-','Undo','Redo'], + '/', + ['FontName','FontSize','RemoveFormat','-','SpellCheck','100%','|','Source'] +] ; + + + +FCKConfig.ToolbarSets["FAQ"] = [ ['Cut','Copy','Paste','PasteText','PasteWord','-','NewPage','SelectAll','-','Find','Replace','-','Print','-','Link','Unlink','Anchor','Rule','-','Image','Document','Table','SpecialChar'], '/', ['Bold','Italic','Underline','StrikeThrough','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull','-','OrderedList','UnorderedList','Outdent','Indent','-','Subscript','Superscript','-','TextColor','BGColor','-','Undo','Redo'], '/', ['Style','FontName','FontSize','RemoveFormat','-','SpellCheck','100%','|','Source'] ] ; +FCKConfig.ToolbarSets["Esse"] = [ + ['Cut','Copy','Paste','PasteText','PasteWord','-','NewPage','SelectAll','-','Find','Replace'], + '/', + ['Bold','Italic','Underline','StrikeThrough','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull','-','OrderedList','UnorderedList','Outdent','Indent','-','Subscript','Superscript','-','TextColor','BGColor','-','Undo','Redo'], + '/', + ['Style','FontName','FontSize','RemoveFormat','-','SpellCheck','100%'] +] ; + FCKConfig.ToolbarSets["Basic"] = [ ['Bold','Italic','-','OrderedList','UnorderedList','-','Link','Unlink','-','About'] ] ; + FCKConfig.ContextMenu = ['Generic','Link','Anchor','Image','Select','Document','Textarea','Checkbox','Radio','TextField','HiddenField','ImageButton','Button','BulletedList','NumberedList','TableCell','Table','Form'] ; + FCKConfig.FontColors = '000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,808080,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF' ; -FCKConfig.FontNames = 'Arial;Comic Sans MS;Courier New;Tahoma;Times New Roman;Verdana' ; + +FCKConfig.FontNames = 'Arial Narrow;Arial;Sans-Serif;Serif;Comic Sans MS;Courier New;Tahoma;Times New Roman;Verdana' ; FCKConfig.FontSizes = '1/xx-small;2/x-small;3/small;4/medium;5/large;6/x-large;7/xx-large' ; FCKConfig.FontFormats = 'p;div;pre;address;h1;h2;h3;h4;h5;h6' ; -FCKConfig.StylesXmlPath = '../../inp_styles.xml' ; + +FCKConfig.StylesXmlPath = '../fckstyles.xml' ; + FCKConfig.SpellChecker = 'ieSpell' ; // 'ieSpell' | 'SpellerPages' FCKConfig.IeSpellDownloadUrl = 'http://www.iespell.com/rel/ieSpellSetup211325.exe' ; + FCKConfig.LinkBrowser = true ; -FCKConfig.LinkBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Connector=connectors/php/connector.php&ServerPath='+FCKConfig.ProjectPath+'kernel/user_files' ; +FCKConfig.LinkBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Connector=connectors/php/connector.php&ServerPath='+FCKConfig.ProjectPath+'/kernel/user_files/' ; FCKConfig.LinkBrowserWindowWidth = screen.width * 0.7 ; // 70% FCKConfig.LinkBrowserWindowHeight = screen.height * 0.7 ; // 70% + FCKConfig.ImageBrowser = true ; -FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Images&Connector=connectors/php/connector.php&ServerPath='+FCKConfig.ProjectPath+'kernel/user_files' ; +FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Images&Connector=connectors/php/connector.php&ServerPath='+FCKConfig.ProjectPath+'/kernel/user_files/' ; FCKConfig.ImageBrowserWindowWidth = screen.width * 0.7 ; // 70% ; FCKConfig.ImageBrowserWindowHeight = screen.height * 0.7 ; // 70% ; + FCKConfig.DocumentBrowser = true ; -FCKConfig.DocumentBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Documents&Connector=connectors/php/connector.php&ServerPath='+FCKConfig.ProjectPath+'kernel/user_files' ; +FCKConfig.DocumentBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Documents&Connector=connectors/php/connector.php&ServerPath='+FCKConfig.ProjectPath+'/kernel/user_files/' ; FCKConfig.ImageBrowserWindowWidth = screen.width * 0.7 ; // 70% ; FCKConfig.ImageBrowserWindowHeight = screen.height * 0.7 ; // 70% ; -FCKConfig.DocumentsServerPath = FCKConfig.ProjectPath+'kernel/user_files/Documents' +FCKConfig.DocumentsServerPath = FCKConfig.ProjectPath+'/kernel/user_files/Documents' + FCKConfig.StructureBrowser = true ; FCKConfig.StructureBrowserURL = FCKConfig.ProjectPath+'/admin/index.php?t=structure/tree' ; FCKConfig.StructureBrowserWindowWidth = screen.width * 0.5 ; // 50% FCKConfig.StructureBrowserWindowHeight = screen.height * 0.7 ; // 70% -FCKConfig.FilesBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Files&Connector=connectors/php/connector.php&ServerPath='+FCKConfig.ProjectPath+'kernel/user_files/' ; + +FCKConfig.FilesBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Files&Connector=connectors/php/connector.php&ServerPath='+FCKConfig.ProjectPath+'/kernel/user_files/' ; + FCKConfig.SmileyPath = FCKConfig.BasePath + 'images/smiley/msn/' ; FCKConfig.SmileyImages = ['regular_smile.gif','sad_smile.gif','wink_smile.gif','teeth_smile.gif','confused_smile.gif','tounge_smile.gif','embaressed_smile.gif','omg_smile.gif','whatchutalkingabout_smile.gif','angry_smile.gif','angel_smile.gif','shades_smile.gif','devil_smile.gif','cry_smile.gif','lightbulb.gif','thumbs_down.gif','thumbs_up.gif','heart.gif','broken_heart.gif','kiss.gif','envelope.gif'] ; FCKConfig.SmileyColumns = 8 ; FCKConfig.SmileyWindowWidth = 320 ; -FCKConfig.SmileyWindowHeight = 240 ; - -FCKConfig.K4Mode = 1; \ No newline at end of file +FCKConfig.SmileyWindowHeight = 240 ; \ No newline at end of file Index: trunk/core/units/stylesheets/stylesheets_config.php =================================================================== diff -u -r7391 -r7867 --- trunk/core/units/stylesheets/stylesheets_config.php (.../stylesheets_config.php) (revision 7391) +++ trunk/core/units/stylesheets/stylesheets_config.php (.../stylesheets_config.php) (revision 7867) @@ -102,7 +102,7 @@ ) ), 'Fields' => Array( - 'StylesheetId' => Array(), + 'StylesheetId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'Name' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1), 'Description' => Array('type' => 'string','not_null' => '1','default' => ''), 'AdvancedCSS' => Array('type' => 'string','not_null' => '1','default' => ''), Index: trunk/kernel/include/category.php =================================================================== diff -u -r7635 -r7867 --- trunk/kernel/include/category.php (.../category.php) (revision 7635) +++ trunk/kernel/include/category.php (.../category.php) (revision 7867) @@ -631,47 +631,28 @@ function SetViewPerms($PermName,$acl,$allgroups) { - global $objPermCache; + global $objPermCache; - $dacl = array(); - if(!is_array($allgroups)) - { - global $objGroups; - $allgroups = $objGroups->GetAllGroupList(); - } + if (!is_array($allgroups)) { + global $objGroups; + $allgroups = $objGroups->GetAllGroupList(); + } - for($i=0;$iPermissions->GetPermId($PermName); - $pc = $objPermCache->GetPerm($this->Get("CategoryId"),$PermId); - if(is_object($pc)) - { - $pc->Set("ACL",$aval); - $pc->Set("DACL",$dval); - $pc->Update(); - } - else - $objPermCache->AddPermCache($this->Get("CategoryId"),$PermId,$aval,$dval); + $aval = implode(",",$acl); - //$this->Update(); + if (strlen($aval)==0) { + $aval = implode(",",$allgroups); + } + $PermId = $this->Permissions->GetPermId($PermName); + $pc = $objPermCache->GetPerm($this->Get("CategoryId"),$PermId); + if (is_object($pc)) { + $pc->Set("ACL",$aval); + $pc->Update(); + } + else { + $objPermCache->AddPermCache($this->Get("CategoryId"),$PermId,$aval); + } + //$this->Update(); } function GetACL($PermName) @@ -691,8 +672,8 @@ function UpdateACL() { - $q = 'INSERT INTO '.TABLE_PREFIX.'PermCache (CategoryId, PermId, ACL, DACL) - SELECT '.$this->UniqueId().', PermId, ACL, DACL + $q = 'INSERT INTO '.TABLE_PREFIX.'PermCache (CategoryId, PermId, ACL) + SELECT '.$this->UniqueId().', PermId, ACL FROM '.TABLE_PREFIX.'PermCache WHERE CategoryId = '.$this->Get('ParentId'); $this->Conn->Query($q);