Index: trunk/kernel/units/reviews/reviews_config.php =================================================================== diff -u -N -r8481 -r8879 --- trunk/kernel/units/reviews/reviews_config.php (.../reviews_config.php) (revision 8481) +++ trunk/kernel/units/reviews/reviews_config.php (.../reviews_config.php) (revision 8879) @@ -149,7 +149,7 @@ 'Rating' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'lu_None', 1 => 'lu_Rating_1', 2 => 'lu_Rating_2', 3 => 'lu_Rating_3', 4 => 'lu_Rating_4', 5 => 'lu_Rating_5'), 'use_phrases' => 1, 'min_value_inc' => 0, 'max_value_inc' => 5, 'default' => 0), 'IPAddress' => Array('type'=>'string','max_value_inc'=>15,'not_null'=>1,'default'=>''), 'ItemId' => Array('type'=>'int','not_null'=>1,'default'=>0), - 'CreatedById' => Array('type' => 'int', 'formatter'=>'kLEFTFormatter','options'=>Array(-1=>'root',-2=>'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'','left_key_field'=>'PortalUserId','left_title_field'=>'Login','required'=>1,'not_null'=>1,'default'=>-1), + 'CreatedById' => Array('type' => 'int', 'formatter'=>'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(-1 => 'root', -2 => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'','left_key_field'=>'PortalUserId','left_title_field'=>'Login','required'=>1,'not_null'=>1,'default'=>-1), 'ItemType' => Array('type'=>'int','not_null'=>1,'default'=>0), 'Priority' => Array('type'=>'int','not_null'=>1,'default'=>0), 'Status' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options'=>Array(1=>'la_Active',2=>'la_Pending',0=>'la_Disabled'),'not_null'=>1,'default'=>2 ), Index: trunk/core/kernel/db/dbitem.php =================================================================== diff -u -N -r8872 -r8879 --- trunk/core/kernel/db/dbitem.php (.../dbitem.php) (revision 8872) +++ trunk/core/kernel/db/dbitem.php (.../dbitem.php) (revision 8879) @@ -445,10 +445,12 @@ function Validate() { $this->UpdateFormattersMasterFields(); //order is critical - should be called BEFORE checking errors + $global_res = true; foreach ($this->Fields as $field => $params) { $error_field = isset($params['error_field']) ? $params['error_field'] : $field; $res = !isset($this->FieldErrors[$error_field]['pseudo']) || !$this->FieldErrors[$error_field]['pseudo']; + $res = $res && $this->ValidateType($field, $params); $res = $res && $this->ValidateRange($field, $params); $res = $res && $this->ValidateUnique($field, $params); Index: trunk/core/units/email_events/email_events_config.php =================================================================== diff -u -N -r8397 -r8879 --- trunk/core/units/email_events/email_events_config.php (.../email_events_config.php) (revision 8397) +++ trunk/core/units/email_events/email_events_config.php (.../email_events_config.php) (revision 8879) @@ -22,7 +22,7 @@ 'TitlePresets' => Array( 'email_settings_list' => Array('prefixes' => Array('emailevents.module_List'), 'format' => '!la_title_EmailSettings! (#emailevents.module_recordcount#)'), - + 'email_send' => Array('prefixes' => Array(), 'format' => '!la_title_PleaseWait!'), 'email_send_complete' => Array('prefixes' => Array(), 'format' => '!la_title_SendMailComplete!'), ), @@ -64,7 +64,7 @@ 'Event' => Array('type' => 'string','not_null' => '1','default' => ''), 'ReplacementTags' => Array ('type' => 'string', 'default' => NULL), 'Enabled' => Array('type'=>'int', 'formatter'=>'kOptionsFormatter', 'options' => Array(1 => 'la_Enabled', 0 => 'la_Disabled', 2 => 'la_Text_FrontOnly'), 'use_phrases' => 1, 'default' => 1, 'not_null' => 1), - 'FromUserId' => Array('type' => 'int', 'formatter' => 'kLEFTFormatter','options' => Array(-1=>'root'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'required'=>1, 'not_null' => 1, 'default' => -1), + 'FromUserId' => Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(-1=>'root'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'required'=>1, 'not_null' => 1, 'default' => -1), 'Module' => Array('type' => 'string','not_null' => '1','default' => ''), 'Description' => Array('type' => 'string','not_null' => '1','default' => ''), 'Type' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options' => Array (1 => 'la_Text_Admin', 0 => 'la_Text_User'), 'use_phrases' => 1, 'default' => 0, 'not_null' => 1), Index: trunk/core/units/categories/categories_config.php =================================================================== diff -u -N -r8586 -r8879 --- trunk/core/units/categories/categories_config.php (.../categories_config.php) (revision 8586) +++ trunk/core/units/categories/categories_config.php (.../categories_config.php) (revision 8879) @@ -248,7 +248,7 @@ 'MetaKeywords' => Array('type' => 'string', 'default' => null), 'CachedDescendantCatsQty' => Array('type' => 'int', 'default' => 0), 'CachedNavbar' => Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'default' => null), - 'CreatedById' => Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'options' => Array(-1 => 'root', -2 => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'not_null' => 1,'default' => 0), + 'CreatedById' => Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(-1 => 'root', -2 => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'not_null' => 1,'default' => 0), 'ResourceId' => Array('type' => 'int', 'default' => null), 'ParentPath' => Array('type' => 'string', 'default' => null), 'TreeLeft' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), @@ -259,7 +259,7 @@ 'NewItem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2), 'PopItem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2), 'Modified' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1,'default' => '#NOW#'), - 'ModifiedById' => Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'options' => Array(-1 => 'root', -2 => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'not_null' => 1,'default' => 0), + 'ModifiedById' => Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(-1 => 'root', -2 => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'not_null' => 1,'default' => 0), 'CategoryTemplate' => Array('type' => 'string', 'not_null' => 1, 'default' => ''), 'CachedCategoryTemplate' => Array('type' => 'string', 'not_null' => 1, 'default' => ''), ), Index: trunk/core/units/visits/visits_config.php =================================================================== diff -u -N -r8402 -r8879 --- trunk/core/units/visits/visits_config.php (.../visits_config.php) (revision 8402) +++ trunk/core/units/visits/visits_config.php (.../visits_config.php) (revision 8879) @@ -26,7 +26,7 @@ 'DoSpecial' => '', 'DoEvent' => 'OnRegisterVisit', ), - + Array( 'Mode' => hAFTER, 'Conditional' => false, @@ -41,9 +41,9 @@ 'IDField' => 'VisitId', 'TableName' => TABLE_PREFIX.'Visits', - + 'PermSection' => Array('main' => 'in-portal:visits'), - + 'TitlePresets' => Array( 'default' => Array(), 'visits_list' => Array('prefixes' => Array('visits_List'), 'format' => "!la_title_Visits! (#visits_recordcount#)"), @@ -99,7 +99,7 @@ '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' => ''), - 'AffiliateId' => Array('type'=>'int','formatter'=>'kLEFTFormatter','options'=>Array(0=>'lu_none'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = af.PortalUserId WHERE `%s` = \'%s\'','left_key_field'=>'AffiliateId','left_title_field'=>'Login','not_null'=>1,'default'=>0), + 'AffiliateId' => Array('type'=>'int','formatter'=>'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(0 => 'lu_None'), 'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = af.PortalUserId WHERE `%s` = \'%s\'','left_key_field'=>'AffiliateId','left_title_field'=>'Login','not_null'=>1,'default'=>0), 'PortalUserId' => Array('type' => 'int','not_null' => '1','default' => -2), ), Index: trunk/themes/default2007/platform/designs/content_boxes.tpl =================================================================== diff -u -N -r8860 -r8879 --- trunk/themes/default2007/platform/designs/content_boxes.tpl (.../content_boxes.tpl) (revision 8860) +++ trunk/themes/default2007/platform/designs/content_boxes.tpl (.../content_boxes.tpl) (revision 8879) @@ -78,7 +78,7 @@ img/s.gif" width="1" height="20" alt=""/>
- +
img/s.gif" width="13" height="1" alt=""/>
Index: trunk/themes/default2007/platform/inc/script.js =================================================================== diff -u -N -r8586 -r8879 --- trunk/themes/default2007/platform/inc/script.js (.../script.js) (revision 8586) +++ trunk/themes/default2007/platform/inc/script.js (.../script.js) (revision 8879) @@ -4,4 +4,9 @@ function redirect($url) { window.location.href = $url; +} + +function open_window($url, $window_name, $width, $height) { + window.open($url, $window_name, 'width='+$width+',height='+$height+',resizable=yes'); + return false; } \ No newline at end of file Index: trunk/core/kernel/utility/formatters/left_formatter.php =================================================================== diff -u -N -r8842 -r8879 --- trunk/core/kernel/utility/formatters/left_formatter.php (.../left_formatter.php) (revision 8842) +++ trunk/core/kernel/utility/formatters/left_formatter.php (.../left_formatter.php) (revision 8879) @@ -41,7 +41,7 @@ if ($value == '') return NULL; $options = $object->GetFieldOptions($field_name); - $found = isset($options['options']) && array_search($value, $options['options']); + $found = isset($options['options']) ? array_search($value, $options['options']) : false; if ($found !== false) { // requested option found among field options return $found; Index: trunk/kernel/units/visits/visits_config.php =================================================================== diff -u -N -r8402 -r8879 --- trunk/kernel/units/visits/visits_config.php (.../visits_config.php) (revision 8402) +++ trunk/kernel/units/visits/visits_config.php (.../visits_config.php) (revision 8879) @@ -26,7 +26,7 @@ 'DoSpecial' => '', 'DoEvent' => 'OnRegisterVisit', ), - + Array( 'Mode' => hAFTER, 'Conditional' => false, @@ -41,9 +41,9 @@ 'IDField' => 'VisitId', 'TableName' => TABLE_PREFIX.'Visits', - + 'PermSection' => Array('main' => 'in-portal:visits'), - + 'TitlePresets' => Array( 'default' => Array(), 'visits_list' => Array('prefixes' => Array('visits_List'), 'format' => "!la_title_Visits! (#visits_recordcount#)"), @@ -99,7 +99,7 @@ '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' => ''), - 'AffiliateId' => Array('type'=>'int','formatter'=>'kLEFTFormatter','options'=>Array(0=>'lu_none'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = af.PortalUserId WHERE `%s` = \'%s\'','left_key_field'=>'AffiliateId','left_title_field'=>'Login','not_null'=>1,'default'=>0), + 'AffiliateId' => Array('type'=>'int','formatter'=>'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(0 => 'lu_None'), 'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = af.PortalUserId WHERE `%s` = \'%s\'','left_key_field'=>'AffiliateId','left_title_field'=>'Login','not_null'=>1,'default'=>0), 'PortalUserId' => Array('type' => 'int','not_null' => '1','default' => -2), ), Index: trunk/themes/default2007/platform/inc/styles.css =================================================================== diff -u -N -r8845 -r8879 --- trunk/themes/default2007/platform/inc/styles.css (.../styles.css) (revision 8845) +++ trunk/themes/default2007/platform/inc/styles.css (.../styles.css) (revision 8879) @@ -274,20 +274,20 @@ padding:5px 10px; border: 1px solid #94c0de; } - + .inactive-tab { background-color: #eff4fa; } - + .active-tab { background-color: #FFFFFF; border-bottom-color: #FFFFFF; -} +} .tab-bottom-line { background: url(../img/pixel_blue.gif) bottom repeat-x; } - + .tab-left-padding { padding-left: 40px; } @@ -329,6 +329,10 @@ font-size: 12px; } +.listing-row td { + padding: 5px 8px; +} + /* --- Pagination Bar Styles --- */ .current-page { background: #5B97CB; Index: trunk/core/kernel/parser/template.php =================================================================== diff -u -N -r8860 -r8879 --- trunk/core/kernel/parser/template.php (.../template.php) (revision 8860) +++ trunk/core/kernel/parser/template.php (.../template.php) (revision 8879) @@ -101,7 +101,7 @@ // allows to use non-replaced version of replaced template $filename = preg_replace('/^original:(.*)/', '\\1', $filename); - + if (preg_match('#^[\/]{0,1}([^\/]*)\/(.*)#', $filename, $regs)) { $module_filename = $regs[2]; $first_dir = $regs[1]; @@ -210,7 +210,9 @@ $fname = str_replace(FULL_PATH, defined('WRITEABLE') ? WRITEABLE.'/cache' : FULL_PATH.'/kernel/cache', $fname); $tname = $real_name.'.tpl'; - if (!file_exists($tname)) return false; + if (!file_exists($tname)) { + return false; + } if (defined('SAFE_MODE') && SAFE_MODE) { $conn =& $this->Application->GetADODBConnection(); Index: trunk/core/units/reviews/reviews_config.php =================================================================== diff -u -N -r8481 -r8879 --- trunk/core/units/reviews/reviews_config.php (.../reviews_config.php) (revision 8481) +++ trunk/core/units/reviews/reviews_config.php (.../reviews_config.php) (revision 8879) @@ -149,7 +149,7 @@ 'Rating' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'lu_None', 1 => 'lu_Rating_1', 2 => 'lu_Rating_2', 3 => 'lu_Rating_3', 4 => 'lu_Rating_4', 5 => 'lu_Rating_5'), 'use_phrases' => 1, 'min_value_inc' => 0, 'max_value_inc' => 5, 'default' => 0), 'IPAddress' => Array('type'=>'string','max_value_inc'=>15,'not_null'=>1,'default'=>''), 'ItemId' => Array('type'=>'int','not_null'=>1,'default'=>0), - 'CreatedById' => Array('type' => 'int', 'formatter'=>'kLEFTFormatter','options'=>Array(-1=>'root',-2=>'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'','left_key_field'=>'PortalUserId','left_title_field'=>'Login','required'=>1,'not_null'=>1,'default'=>-1), + 'CreatedById' => Array('type' => 'int', 'formatter'=>'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(-1 => 'root', -2 => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'','left_key_field'=>'PortalUserId','left_title_field'=>'Login','required'=>1,'not_null'=>1,'default'=>-1), 'ItemType' => Array('type'=>'int','not_null'=>1,'default'=>0), 'Priority' => Array('type'=>'int','not_null'=>1,'default'=>0), 'Status' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options'=>Array(1=>'la_Active',2=>'la_Pending',0=>'la_Disabled'),'not_null'=>1,'default'=>2 ),