Index: branches/5.2.x/install/install_schema.sql =================================================================== diff -u -r13842 -r14090 --- branches/5.2.x/install/install_schema.sql (.../install_schema.sql) (revision 13842) +++ branches/5.2.x/install/install_schema.sql (.../install_schema.sql) (revision 14090) @@ -1,45 +1,45 @@ CREATE TABLE Link ( - LinkId int(11) NOT NULL auto_increment, - Name varchar(255) NOT NULL default '', - l1_Name varchar(255) NOT NULL default '', - l2_Name varchar(255) NOT NULL default '', - l3_Name varchar(255) NOT NULL default '', - l4_Name varchar(255) NOT NULL default '', - l5_Name varchar(255) NOT NULL default '', - AutomaticFilename tinyint(3) unsigned NOT NULL default '1', + LinkId int(11) NOT NULL AUTO_INCREMENT, + `Name` varchar(255) NOT NULL DEFAULT '', + l1_Name varchar(255) NOT NULL DEFAULT '', + l2_Name varchar(255) NOT NULL DEFAULT '', + l3_Name varchar(255) NOT NULL DEFAULT '', + l4_Name varchar(255) NOT NULL DEFAULT '', + l5_Name varchar(255) NOT NULL DEFAULT '', + AutomaticFilename tinyint(3) unsigned NOT NULL DEFAULT '1', Description text, l1_Description text, l2_Description text, l3_Description text, l4_Description text, l5_Description text, - MetaKeywords varchar(255) default NULL, + MetaKeywords varchar(255) DEFAULT NULL, MetaDescription text, - Url varchar(255) NOT NULL default '', - CreatedOn int(10) unsigned default NULL, - Modified int(10) unsigned default NULL, - Expire int(10) unsigned default NULL, - Hits double(20,6) NOT NULL default '0.000000', - CachedRating varchar(10) NOT NULL default '0', - CachedVotesQty int(11) NOT NULL default '0', - CachedReviewsQty int(11) NOT NULL default '0', - CreatedById int(11) NOT NULL default '-1', - ModifiedById int(11) NOT NULL default '-1', - Priority int(11) NOT NULL default '0', - `Status` tinyint(4) NOT NULL default '2', - EditorsPick tinyint(4) NOT NULL default '0', - ResourceId int(11) default NULL, - HotItem tinyint(4) NOT NULL default '2', - PopItem tinyint(4) NOT NULL default '2', - NewItem tinyint(4) NOT NULL default '2', - OrgId int(11) default NULL, - CustomTemplate varchar(255) NOT NULL default '', - ReciprocalLinkFound tinyint(3) unsigned NOT NULL default '0', - PRIMARY KEY (LinkId), + Url varchar(255) NOT NULL DEFAULT '', + CreatedOn int(10) unsigned DEFAULT NULL, + Modified int(10) unsigned DEFAULT NULL, + Expire int(10) unsigned DEFAULT NULL, + Hits double(20,6) NOT NULL DEFAULT '0.000000', + CachedRating varchar(10) NOT NULL DEFAULT '0', + CachedVotesQty int(11) NOT NULL DEFAULT '0', + CachedReviewsQty int(11) NOT NULL DEFAULT '0', + CreatedById int(11) DEFAULT NULL, + ModifiedById int(11) DEFAULT NULL, + Priority int(11) NOT NULL DEFAULT '0', + `Status` tinyint(4) NOT NULL DEFAULT '2', + EditorsPick tinyint(4) NOT NULL DEFAULT '0', + ResourceId int(11) DEFAULT NULL, + HotItem tinyint(4) NOT NULL DEFAULT '2', + PopItem tinyint(4) NOT NULL DEFAULT '2', + NewItem tinyint(4) NOT NULL DEFAULT '2', + OrgId int(11) DEFAULT NULL, + CustomTemplate varchar(255) NOT NULL DEFAULT '', + ReciprocalLinkFound tinyint(3) unsigned NOT NULL DEFAULT '0', + PRIMARY KEY (LinkId), UNIQUE KEY ResourceId (ResourceId), - KEY sorting (Priority,Name), + KEY sorting (Priority,`Name`), KEY Hits (Hits), - KEY Name (Name), + KEY `Name` (`Name`), KEY l1_Name (l1_Name), KEY l2_Name (l2_Name), KEY l3_Name (l3_Name), Index: branches/5.2.x/admin_templates/paid_listings/paid_listing_edit.tpl =================================================================== diff -u -r13842 -r14090 --- branches/5.2.x/admin_templates/paid_listings/paid_listing_edit.tpl (.../paid_listing_edit.tpl) (revision 13842) +++ branches/5.2.x/admin_templates/paid_listings/paid_listing_edit.tpl (.../paid_listing_edit.tpl) (revision 14090) @@ -61,16 +61,12 @@ - - - - - - - - - - + + + + + + Index: branches/5.2.x/admin_templates/links/links_images.tpl =================================================================== diff -u -r13842 -r14090 --- branches/5.2.x/admin_templates/links/links_images.tpl (.../links_images.tpl) (revision 13842) +++ branches/5.2.x/admin_templates/links/links_images.tpl (.../links_images.tpl) (revision 14090) @@ -99,7 +99,7 @@ - + Index: branches/5.2.x/units/listings/listings_config.php =================================================================== diff -u -r13842 -r14090 --- branches/5.2.x/units/listings/listings_config.php (.../listings_config.php) (revision 13842) +++ branches/5.2.x/units/listings/listings_config.php (.../listings_config.php) (revision 14090) @@ -1,6 +1,6 @@ Array ( - 'LinkName' => Array ('type' => 'string'), - 'LinkOwner' => Array ('type' => 'string'), + 'LinkName' => Array ('type' => 'string', 'default' => ''), + 'LinkOwner' => Array ('type' => 'string', 'default' => ''), ), - 'FilterMenu' => Array ( - 'Groups' => Array ( - Array ('mode' => 'AND', 'filters' => Array (0,1,2), 'type' => WHERE_FILTER), - Array ('mode' => 'AND', 'filters' => Array (3), 'type' => WHERE_FILTER), - ), - - 'Filters' => Array ( - 0 => Array ('label' => 'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ), - 1 => Array ('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ), - 2 => Array ('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => '%1$s.Status != 2' ), - 3 => Array ('label' => 'la_PendingRenewal', 'on_sql' => '', 'off_sql' => '%1$s.PendingRenewal != 1' ), - ) - ), - 'Grids' => Array ( 'Default' => Array ( 'Icons' => Array ( @@ -181,6 +167,7 @@ 'PendingRenewal' => Array ( 'title' => 'la_col_PendingRenewal', 'filter_block' => 'grid_options_filter', 'width' => 143, ), 'PurchasedOn' => Array ( 'title' => 'la_col_PurchasedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ), 'ExpiresOn' => Array ( 'title' => 'la_col_ExpiresOn', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ), + 'Status' => Array ( 'title' => 'la_col_Status' , 'filter_block' => 'grid_options_filter'), ), ), ), Index: branches/5.2.x/admin_templates/export.tpl =================================================================== diff -u -r13842 -r14090 --- branches/5.2.x/admin_templates/export.tpl (.../export.tpl) (revision 13842) +++ branches/5.2.x/admin_templates/export.tpl (.../export.tpl) (revision 14090) @@ -33,7 +33,7 @@
- + @@ -43,8 +43,7 @@ - - + - - + - - + - - + Index: branches/5.2.x/units/link_validation/link_validation_config.php =================================================================== diff -u -r13842 -r14090 --- branches/5.2.x/units/link_validation/link_validation_config.php (.../link_validation_config.php) (revision 13842) +++ branches/5.2.x/units/link_validation/link_validation_config.php (.../link_validation_config.php) (revision 14090) @@ -1,6 +1,6 @@ Array ( - 'Groups' => Array( - Array('mode' => 'AND', 'filters' => Array('show_valid', 'show_invalid', 'show_not_validated'), 'type' => WHERE_FILTER), - ), - - 'Filters' => Array ( - 'show_valid' => Array ('label' =>'la_Text_Valid', 'on_sql' => '', 'off_sql' => '%1$s.ValidationStatus != ' . LINK_VALIDATION_VALID . ' OR %1$s.ValidationStatus IS NULL'), - 'show_invalid' => Array ('label' => 'la_Text_Invalid', 'on_sql' => '', 'off_sql' => '%1$s.ValidationStatus != ' . LINK_VALIDATION_INVALID . ' OR %1$s.ValidationStatus IS NULL'), - 'show_not_validated' => Array ('label' => 'la_Text_Not_Validated', 'on_sql' => '', 'off_sql' => '%1$s.ValidationStatus != ' . LINK_VALIDATION_NOT_VALIDATED . ' OR %1$s.ValidationStatus IS NOT NULL'), - ) - ), - 'ListSQLs' => Array ( '' => ' SELECT %1$s.* %2$s FROM ' . TABLE_PREFIX . 'Link l @@ -129,15 +117,15 @@ ), 'VirtualFields' => Array ( - 'ForeignLinkId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), - 'LinkName' => Array('type' => 'string', /*'formatter' => 'kMultiLanguage',*/ 'not_null' => 1, 'max_len' => 255, 'default' => ''), - 'LinkUrl' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'ForeignLinkId' => Array ('type' => 'int', 'default' => 0), + 'LinkName' => Array('type' => 'string', /*'formatter' => 'kMultiLanguage',*/ 'max_len' => 255, 'default' => ''), + 'LinkUrl' => Array ('type' => 'string', 'default' => ''), 'LinkCreatedOn' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), - 'LinkStatus' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2), + 'LinkStatus' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled'), 'use_phrases' => 1, 'default' => 2), 'LinkValidationStatus' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_Text_Not_Validated', 1 => 'la_Text_Valid', 2 => 'la_Text_Invalid'), 'use_phrases' => 1, - 'not_null' => 1, 'default' => 0 + 'default' => 0 ), // for category path drawing Index: branches/5.2.x/units/listing_types/listing_types_config.php =================================================================== diff -u -r13842 -r14090 --- branches/5.2.x/units/listing_types/listing_types_config.php (.../listing_types_config.php) (revision 13842) +++ branches/5.2.x/units/listing_types/listing_types_config.php (.../listing_types_config.php) (revision 14090) @@ -1,6 +1,6 @@ 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_No', 1 => 'la_Yes',), 'use_phrases' => 1, - 'default' => 1, 'not_null' => 1, + 'default' => 0, 'not_null' => 1, ), 'ShopCartName' => Array ('type' => 'string', 'default' => null), 'Price' => Array ('type' => 'double', 'default' => ''), Index: branches/5.2.x/admin_templates/links/links_categories.tpl =================================================================== diff -u -r13842 -r14090 --- branches/5.2.x/admin_templates/links/links_categories.tpl (.../links_categories.tpl) (revision 13842) +++ branches/5.2.x/admin_templates/links/links_categories.tpl (.../links_categories.tpl) (revision 14090) @@ -73,7 +73,7 @@
@@ -76,11 +75,9 @@
@@ -111,8 +108,7 @@
- + Index: branches/5.2.x/install/english.lang =================================================================== diff -u -r13842 -r14090 --- branches/5.2.x/install/english.lang (.../english.lang) (revision 13842) +++ branches/5.2.x/install/english.lang (.../english.lang) (revision 14090) @@ -98,6 +98,7 @@ TGlzdGluZyBUeXBlcw== UGFpZCBMaXN0aW5ncw== U2hvcHBpbmcgQ2FydCBFbnRyeQ== + VmFsaWRhdGluZyBMaW5rcw== TGlua3M= UGFpZCBMaXN0aW5n TGlzdGluZyBUeXBl @@ -132,7 +133,7 @@ U3ViamVjdDogTmV3IExpbmsgIjxpbnAyOmxfRmllbGQgbmFtZT0iTmFtZSIvPiIgLSBBZGRlZAoKVGhhbmsgeW91IGZvciBzdWJtaXR0aW5nIHlvdXIgbGluayB0byBvdXIgd2Vic2l0ZSE8YnIgLz4NCjxiciAvPg0KTGluayBkZXRhaWwgYXJlIGxpc3RlZCBiZWxvdzo8YnIgLz4NCjxiciAvPg0KTGluayBOYW1lOiA8aW5wMjpsX0ZpZWxkIG5hbWU9Ik5hbWUiLz4gPGJyIC8+DQo8aW5wMjptX2lmIGNoZWNrPSJsX0ZpZWxkIiBuYW1lPSJVcmwiPiBMaW5rIFdlYnNpdGU6IDxpbnAyOmxfRmllbGQgbmFtZT0iVXJsIi8+PGJyIC8+DQo8L2lucDI6bV9pZj4gPGlucDI6bV9pZiBjaGVjaz0ibF9GaWVsZCIgbmFtZT0iRGVzY3JpcHRpb24iPiBEZXNjcmlwdGlvbjogPGlucDI6bF9GaWVsZCBuYW1lPSJEZXNjcmlwdGlvbiIvPjxiciAvPg0KPC9pbnAyOm1faWY+IDxiciAvPg0KPGJyIC8+DQpZb3UgY2FuIHZpZXcgeW91ciBsaW5rIGhlcmUgPGEgaHJlZj0iPGlucDI6bF9MaW5rTGluayB0ZW1wbGF0ZT0iX19kZWZhdWx0X18iLz4iPjxpbnAyOmxfRmllbGQgbmFtZT0iTmFtZSIvPjwvYT4= U3ViamVjdDogTmV3IExpbmsgaGFzIGJlZW4gU3VibWl0dGVkCgpBIG5ldyBMaW5rIGhhcyBiZWVuIHN1Ym1pdHRlZCB0byB0aGUgd2Vic2l0ZSBieSA8aW5wMjpsX0ZpZWxkIG5hbWU9IlVzZXJOYW1lIi8+LjxiciAvPg0KPGJyIC8+DQpMaW5rIE5hbWU6IDxpbnAyOmxfRmllbGQgbmFtZT0iTmFtZSIvPjxiciAvPg0KPGlucDI6bV9pZiBjaGVjaz0ibF9GaWVsZCIgbmFtZT0iVXJsIj4gTGluayBXZWJzaXRlOiA8aW5wMjpsX0ZpZWxkIG5hbWU9IlVybCIvPjxiciAvPg0KPC9pbnAyOm1faWY+IDxpbnAyOm1faWYgY2hlY2s9ImxfRmllbGQiIG5hbWU9IkRlc2NyaXB0aW9uIj4gRGVzY3JpcHRpb246IDxpbnAyOmxfRmllbGQgbmFtZT0iRGVzY3JpcHRpb24iLz48YnIgLz4NCjwvaW5wMjptX2lmPiA8YnIgLz4NCjxiciAvPg0KWW91IGNhbiB2aWV3IGl0IGhlcmUgPGEgaHJlZj0iPGlucDI6bF9MaW5rTGluayB0ZW1wbGF0ZT0iX19kZWZhdWx0X18iLz4iPjxpbnAyOmxfRmllbGQgbmFtZT0iTmFtZSIvPjwvYT4= U3ViamVjdDogWW91ciBMaW5rICI8aW5wMjpsX0ZpZWxkIG5hbWU9Ik5hbWUiLz4iIGlzIFBlbmRpbmcKClRoYW5rIHlvdSBmb3Igc3VibWl0dGluZyB5b3VyIExpbmsuPGJyLz48YnIvPg0KDQpDdXJyZW50bHkgaXQncyBwZW5kaW5nIGZvciBhZG1pbmlzdHJhdGl2ZSBhcHByb3ZhbC48YnIvPjxici8+DQoNCllvdSdsbCBiZSBjb250YWN0ZWQgZGlyZWN0bHkgYnkgZW1haWwuPGJyLz48YnIvPg0KDQpMaW5rIE5hbWU6IDxpbnAyOmxfRmllbGQgbmFtZT0iTmFtZSIvPjxici8+DQo8aW5wMjptX2lmIGNoZWNrPSJsX0ZpZWxkIiBuYW1lPSJVcmwiPg0KTGluayBXZWJzaXRlOiA8aW5wMjpsX0ZpZWxkIG5hbWU9IlVybCIvPjxici8+DQo8L2lucDI6bV9pZj4NCjxpbnAyOm1faWYgY2hlY2s9ImxfRmllbGQiIG5hbWU9IkRlc2NyaXB0aW9uIj4NCkRlc2NyaXB0aW9uOiA8aW5wMjpsX0ZpZWxkIG5hbWU9IkRlc2NyaXB0aW9uIi8+PGJyLz4NCjwvaW5wMjptX2lmPg0KPGJyLz48YnIvPg0KDQo= - U3ViamVjdDogTmV3IExpbmsgIGhhcyBiZWVuIFN1Ym1pdHRlZCBhbmQgUGVuZGluZyEKCk5ldyBsaW5rIGhhcyBiZWVuIHN1Ym1pdHRlZCBhbmQgaXMgcGVuZGluZyBmb3IgYWRtaW5pc3RyYXRpdmUgYXBwcm92YWwuPGJyLz48YnIvPg0KDQpMaW5rIE5hbWU6IDxpbnAyOjxpbnAyOmxfRmllbGQgbmFtZT0iTmFtZSIvPjxici8+DQo8aW5wMjptX2lmIGNoZWNrPSJsX0ZpZWxkIiBuYW1lPSJVcmwiPg0KTGluayBXZWJzaXRlOiA8aW5wMjpsX0ZpZWxkIG5hbWU9IlVybCIvPjxici8+DQo8L2lucDI6bV9pZj4NCjxpbnAyOm1faWYgY2hlY2s9ImxfRmllbGQiIG5hbWU9IkRlc2NyaXB0aW9uIj4NCkRlc2NyaXB0aW9uOiA8aW5wMjpsX0ZpZWxkIG5hbWU9IkRlc2NyaXB0aW9uIi8+PGJyLz4NCjwvaW5wMjptX2lmPg0KPGJyLz48YnIvPg0KDQpQbGVhc2UgcHJvY2VlZCB0byB0aGUgQWRtaW5pc3RyYXRpdmUgQ29uc29sZSB0byBhcHByb3ZlIG9yIGRlbnkgdGhpcyBsaW5rPGJyLz48L2JyPg== + U3ViamVjdDogTmV3IExpbmsgIGhhcyBiZWVuIFN1Ym1pdHRlZCBhbmQgUGVuZGluZyEKCk5ldyBsaW5rIGhhcyBiZWVuIHN1Ym1pdHRlZCBhbmQgaXMgcGVuZGluZyBmb3IgYWRtaW5pc3RyYXRpdmUgYXBwcm92YWwuPGJyLz48YnIvPg0KDQpMaW5rIE5hbWU6IDxpbnAyOmxfRmllbGQgbmFtZT0iTmFtZSIvPjxici8+DQo8aW5wMjptX2lmIGNoZWNrPSJsX0ZpZWxkIiBuYW1lPSJVcmwiPg0KTGluayBXZWJzaXRlOiA8aW5wMjpsX0ZpZWxkIG5hbWU9IlVybCIvPjxici8+DQo8L2lucDI6bV9pZj4NCjxpbnAyOm1faWYgY2hlY2s9ImxfRmllbGQiIG5hbWU9IkRlc2NyaXB0aW9uIj4NCkRlc2NyaXB0aW9uOiA8aW5wMjpsX0ZpZWxkIG5hbWU9IkRlc2NyaXB0aW9uIi8+PGJyLz4NCjwvaW5wMjptX2lmPg0KPGJyLz48YnIvPg0KDQpQbGVhc2UgcHJvY2VlZCB0byB0aGUgQWRtaW5pc3RyYXRpdmUgQ29uc29sZSB0byBhcHByb3ZlIG9yIGRlbnkgdGhpcyBsaW5rPGJyLz48L2JyPg== U3ViamVjdDogWW91ciBMaW5rICI8aW5wMjpsX0ZpZWxkIG5hbWU9Ik5hbWUiLz4iIC0gQXBwcm92ZWQhCgpZb3VyIExpbmsgaGFzIGJlZW4gQXBwcm92ZWQhPGJyIC8+DQo8YnIgLz4NCkxpbmsgTmFtZTogPGlucDI6bF9GaWVsZCBuYW1lPSJOYW1lIi8+PGJyIC8+DQo8YnIgLz4NCllvdSBjYW4gdmlldyBpdCBoZXJlIDxhIGhyZWY9IjxpbnAyOmxfTGlua0xpbmsgdGVtcGxhdGU9Il9fZGVmYXVsdF9fIi8+Ij48aW5wMjpsX0ZpZWxkIG5hbWU9Ik5hbWUiLz48L2E+ U3ViamVjdDogIlJlcXVlc3QgSW5mb3JtYXRpb24iIGZvcm0gc3VibWl0dGVkCgpEZWFyIEJ1c2luZXNzIE93bmVyLDxiciAvPg0KPGJyIC8+DQomcXVvdDtSZXF1ZXN0IEluZm9ybWF0aW9uJnF1b3Q7IGZvcm0gaGFzIGJlZW4gc3VibWl0dGVkIGZvciA8aW5wMjptX3BhcmFtIG5hbWU9InRvX2xpbmtuYW1lIi8+PGJyIC8+DQo8YnIgLz4NCjxociBub3NoYWRlPSIiIHdpZHRoPSIxMDAlIiAvPg0KPGJyIC8+DQo8dGFibGU+DQogICAgPHRib2R5Pg0KICAgICAgICA8dHI+DQogICAgICAgICAgICA8dGQ+RnVsbCBuYW1lOjwvdGQ+DQogICAgICAgICAgICA8dGQ+PGlucDI6bV9wYXJhbSBuYW1lPSJmcm9tX25hbWUiIC8+PC90ZD4NCiAgICAgICAgPC90cj4NCiAgICAgICAgPHRyPg0KICAgICAgICAgICAgPHRkPkUtbWFpbDo8L3RkPg0KICAgICAgICAgICAgPHRkPjxhIGhyZWY9Im1haWx0bzo8aW5wMjptX3BhcmFtIG5hbWU9ImZyb21fZW1haWwiIC8+Ij48aW5wMjptX3BhcmFtIG5hbWU9ImZyb21fZW1haWwiIC8+PC9hPjwvdGQ+DQogICAgICAgIDwvdHI+DQogICAgICAgIDx0cj4NCiAgICAgICAgICAgIDx0ZD5TdWJqZWN0OjwvdGQ+DQogICAgICAgICAgICA8dGQ+PGlucDI6bV9wYXJhbSBuYW1lPSJmcm9tX3N1YmplY3QiIC8+PC90ZD4NCiAgICAgICAgPC90cj4NCiAgICAgICAgPHRyPg0KICAgICAgICAgICAgPHRkPlF1ZXN0aW9uczo8L3RkPg0KICAgICAgICAgICAgPHRkPjxpbnAyOm1fcGFyYW0gbmFtZT0ibWVzc2FnZSIvPiA8L3RkPg0KICAgICAgICA8L3RyPg0KICAgIDwvdGJvZHk+DQo8L3RhYmxlPg0KPGJyIC8+DQo8aHIgbm9zaGFkZT0iIiB3aWR0aD0iMTAwJSIgLz4NCjxiciAvPg== U3ViamVjdDogSW5mb3JtYXRpb24gUmVxdWVzdCBmb3IgIjxpbnAyOm1fcGFyYW0gbmFtZT0idG9fbGlua25hbWUiIC8+IiBzdWJtaXR0ZWQKCkRlYXIgQWRtaW5pc3RyYXRvciw8YnIvPjxici8+DQoNCiJSZXF1ZXN0IEluZm9ybWF0aW9uIiBmb3JtIGhhcyBiZWVuIHN1Ym1pdHRlZCBmb3IgIjxpbnAyOm1fcGFyYW0gbmFtZT0idG9fbGlua25hbWUiIC8+Ijxici8+PGJyLz4NCg0KPGhyIHdpZHRoPSIxMDAlIiBub3NoYWRlPjxici8+DQoNCjx0YWJsZT4NCjx0cj4NCjx0ZD5GdWxsIG5hbWU6PC90ZD4NCjx0ZD48aW5wMjptX3BhcmFtIG5hbWU9ImZyb21fbmFtZSIgLz48L3RkPg0KPC90cj4NCg0KPHRyPg0KPHRkPkUtbWFpbDo8L3RkPg0KPHRkPjxpbnAyOm1fcGFyYW0gbmFtZT0iZnJvbV9lbWFpbCIgLz48L3RkPg0KPC90cj4NCg0KPHRyPg0KPHRkPlN1YmplY3Q6PC90ZD4NCjx0ZD48aW5wMjptX3BhcmFtIG5hbWU9ImZyb21fc3ViamVjdCIgLz48L3RkPg0KPC90cj4NCg0KPHRyPg0KPHRkPlF1ZXN0aW9uczo8L3RkPg0KPHRkPg0KPGJsb2NrcXVvdGU+DQo8aW5wMjptX3BhcmFtIG5hbWU9Im1lc3NhZ2UiLz4NCjwvYmxvY2txdW90ZT4NCjwvdGQ+DQo8L3RyPg0KPC90YWJsZT4NCjxicj48aHIgd2lkdGg9IjEwMCUiIG5vc2hhZGU+PGJyPg0K Index: branches/5.2.x/admin_templates/links/file_edit.tpl =================================================================== diff -u -r13842 -r14090 --- branches/5.2.x/admin_templates/links/file_edit.tpl (.../file_edit.tpl) (revision 13842) +++ branches/5.2.x/admin_templates/links/file_edit.tpl (.../file_edit.tpl) (revision 14090) @@ -29,7 +29,7 @@
- + Index: branches/5.2.x/units/links/links_config.php =================================================================== diff -u -r13842 -r14090 --- branches/5.2.x/units/links/links_config.php (.../links_config.php) (revision 13842) +++ branches/5.2.x/units/links/links_config.php (.../links_config.php) (revision 14090) @@ -1,6 +1,6 @@ Array ( - 'Groups' => Array ( - Array ('mode' => 'AND', 'filters' => Array ('show_active', 'show_pending', 'show_disabled'), 'type' => WHERE_FILTER), - Array ('mode' => 'AND', 'filters' => Array ('show_new'), 'type' => HAVING_FILTER), - Array ('mode' => 'AND', 'filters' => Array ('show_hot'), 'type' => HAVING_FILTER), - Array ('mode' => 'AND', 'filters' => Array ('show_pop'), 'type' => HAVING_FILTER), - Array ('mode' => 'AND', 'filters' => Array ('show_pick'), 'type' => WHERE_FILTER), - ), - 'Filters' => Array ( - 'show_active' => Array ('label' => 'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ), - 'show_pending' => Array ('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => '%1$s.Status != 2' ), - 'show_disabled' => Array ('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ), - 's1' => Array (), - 'show_new' => Array ('label' => 'la_Text_New', 'on_sql' => '', 'off_sql' => '`IsNew` != 1' ), - 'show_hot' => Array ('label' => 'la_Text_Hot', 'on_sql' => '', 'off_sql' => '`IsHot` != 1' ), - 'show_pop' => Array ('label' => 'la_Text_Pop', 'on_sql' => '', 'off_sql' => '`IsPop` != 1' ), - 'show_pick' => Array ('label' => 'la_prompt_EditorsPick', 'on_sql' => '', 'off_sql' => '%1$s.`EditorsPick` != 1' ), - ) - ), + 'Groups' => Array ( + Array ('mode' => 'AND', 'filters' => Array ('show_new'), 'type' => HAVING_FILTER), + Array ('mode' => 'AND', 'filters' => Array ('show_hot'), 'type' => HAVING_FILTER), + Array ('mode' => 'AND', 'filters' => Array ('show_pop'), 'type' => HAVING_FILTER), + Array ('mode' => 'AND', 'filters' => Array ('show_pick'), 'type' => WHERE_FILTER), + ), + 'Filters' => Array ( + 'show_new' => Array ('label' => 'la_Text_New', 'on_sql' => '', 'off_sql' => '`IsNew` != 1' ), + 'show_hot' => Array ('label' => 'la_Text_Hot', 'on_sql' => '', 'off_sql' => '`IsHot` != 1' ), + 'show_pop' => Array ('label' => 'la_Text_Pop', 'on_sql' => '', 'off_sql' => '`IsPop` != 1' ), + 'show_pick' => Array ('label' => 'la_prompt_EditorsPick', 'on_sql' => '', 'off_sql' => '%1$s.`EditorsPick` != 1' ), + ), + ), 'TableName' => TABLE_PREFIX.'Link', @@ -468,8 +463,8 @@ 'CachedRating' => Array ('type' => 'string', 'not_null' => 1, 'formatter' => 'kFormatter', 'default' => 0), 'CachedVotesQty' => Array ('type' => 'int', 'formatter' => 'kFormatter', 'not_null' => 1, 'default' => 0), 'CachedReviewsQty' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), - 'CreatedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'not_null' => 1, 'default' => USER_ROOT), - 'ModifiedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'not_null' => 1, 'default' => USER_ROOT), + 'CreatedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'required' => 1, 'default' => NULL), + 'ModifiedById' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'default' => NULL), 'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'Status' => Array ( 'type' => 'int', @@ -518,24 +513,24 @@ 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), - 'use_phrases' => 1, 'not_null' => 1, 'default' => 1, + 'use_phrases' => 1, 'default' => 1, ), - 'ExportColumns' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array ()), - 'AvailableColumns' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array ()), + 'ExportColumns' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => ''), + 'AvailableColumns' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => ''), 'CategoryFormat' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_MixedCategoryPath', 2 => 'la_SeparatedCategoryPath'), 'use_phrases' => 1, 'default' => 1), 'CategorySeparator' => Array ('type' => 'string', 'error_field' => 'CategoryFormat', 'default' => ':'), 'IsBaseCategory' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), - 'use_phrases' => 1, 'not_null' => 1, 'default' => 0, + 'use_phrases' => 1, 'default' => 0, ), // export related fields: end // import related fields: begin 'FieldTitles' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Automatic', 2 => 'la_Manual'), 'use_phrases' => 1, 'default' => 1), 'ImportSource' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Upload', 2 => 'la_Local'), 'use_phrases' => 1, 'default' => 2), - 'ImportFilename' => Array ('type' => 'string', 'formatter' => 'kUploadFormatter', 'max_size' => MAX_UPLOAD_SIZE, 'upload_dir' => EXPORT_BASE_PATH . '/'), + 'ImportFilename' => Array ('type' => 'string', 'formatter' => 'kUploadFormatter', 'max_size' => MAX_UPLOAD_SIZE, 'upload_dir' => EXPORT_BASE_PATH . '/', 'default' => ''), 'ImportLocalFilename' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'default' => ''), 'CheckDuplicatesMethod' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_IDField', 2 => 'la_OtherFields'), 'use_phrases' => 1, 'default' => 1), 'ReplaceDuplicates' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'default' => 0), @@ -547,7 +542,9 @@ 'FullImage' => Array ('type' => 'string', 'default' => ''), 'ImageAlt' => Array ('type' => 'string', 'default' => ''), - 'Filename' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'Filename' => Array ('type' => 'string', 'default' => ''), + 'CategoryFilename' => Array ('type' => 'string', 'default' => ''), + 'PrimaryCat' => Array ('type' => 'int', 'default' => 0), 'CachedNavbar' => Array ('type' => 'string', 'default' => ''), 'ParentPath' => Array ('type' => 'string', 'default' => ''), Index: branches/5.2.x/admin_templates/links/review_edit.tpl =================================================================== diff -u -r13842 -r14090 --- branches/5.2.x/admin_templates/links/review_edit.tpl (.../review_edit.tpl) (revision 13842) +++ branches/5.2.x/admin_templates/links/review_edit.tpl (.../review_edit.tpl) (revision 14090) @@ -42,17 +42,17 @@
- + - - - + + + - - - - + + + +
Index: branches/5.2.x/admin_templates/links/images_edit.tpl =================================================================== diff -u -r13842 -r14090 --- branches/5.2.x/admin_templates/links/images_edit.tpl (.../images_edit.tpl) (revision 13842) +++ branches/5.2.x/admin_templates/links/images_edit.tpl (.../images_edit.tpl) (revision 14090) @@ -31,22 +31,22 @@
- + - + - - + + - - - + + + - + - - + +
Index: branches/5.2.x/admin_templates/links/links_relations.tpl =================================================================== diff -u -r13842 -r14090 --- branches/5.2.x/admin_templates/links/links_relations.tpl (.../links_relations.tpl) (revision 13842) +++ branches/5.2.x/admin_templates/links/links_relations.tpl (.../links_relations.tpl) (revision 14090) @@ -92,7 +92,7 @@ - + Index: branches/5.2.x/admin_templates/links/links_files.tpl =================================================================== diff -u -r13842 -r14090 --- branches/5.2.x/admin_templates/links/links_files.tpl (.../links_files.tpl) (revision 13842) +++ branches/5.2.x/admin_templates/links/links_files.tpl (.../links_files.tpl) (revision 14090) @@ -78,7 +78,7 @@ - + Index: branches/5.2.x/install/upgrades.sql =================================================================== diff -u -r13842 -r14090 --- branches/5.2.x/install/upgrades.sql (.../upgrades.sql) (revision 13842) +++ branches/5.2.x/install/upgrades.sql (.../upgrades.sql) (revision 14090) @@ -101,4 +101,18 @@ # ===== v 5.1.0-RC1 ===== -# ===== v 5.1.0 ===== \ No newline at end of file +# ===== v 5.1.0 ===== + +# ===== v 5.1.1-B1 ===== +ALTER TABLE Link + CHANGE CreatedById CreatedById INT(11) NULL DEFAULT NULL , + CHANGE ModifiedById ModifiedById INT(11) NULL DEFAULT NULL; + +# ===== v 5.1.1-B2 ===== +UPDATE Events +SET l<%PRIMARY_LANGUAGE%>_Body = REPLACE(l<%PRIMARY_LANGUAGE%>_Body, ' - + Index: branches/5.2.x/admin_templates/links/links_reviews.tpl =================================================================== diff -u -r13842 -r14090 --- branches/5.2.x/admin_templates/links/links_reviews.tpl (.../links_reviews.tpl) (revision 13842) +++ branches/5.2.x/admin_templates/links/links_reviews.tpl (.../links_reviews.tpl) (revision 14090) @@ -106,7 +106,7 @@ - + Index: branches/5.2.x/admin_templates/import.tpl =================================================================== diff -u -r13842 -r14090 --- branches/5.2.x/admin_templates/import.tpl (.../import.tpl) (revision 13842) +++ branches/5.2.x/admin_templates/import.tpl (.../import.tpl) (revision 14090) @@ -89,9 +89,8 @@
- - - + + - - + - - + - - + @@ -176,22 +172,19 @@ - - + - - + - - + - - + +
@@ -122,17 +121,15 @@
@@ -164,8 +161,7 @@
', 'ImportCategory', null, 'OnSaveSettings');">
@@ -216,8 +209,8 @@
Index: branches/5.2.x/admin_templates/links/links_edit.tpl =================================================================== diff -u -r13842 -r14090 --- branches/5.2.x/admin_templates/links/links_edit.tpl (.../links_edit.tpl) (revision 13842) +++ branches/5.2.x/admin_templates/links/links_edit.tpl (.../links_edit.tpl) (revision 14090) @@ -61,48 +61,42 @@
- - - - + + + + - + - - - - - - - + + + - + - - - - - - - - - + + + + + + + + + - - - + + + Index: branches/5.2.x/admin_templates/links/relations_edit.tpl =================================================================== diff -u -r13842 -r14090 --- branches/5.2.x/admin_templates/links/relations_edit.tpl (.../relations_edit.tpl) (revision 13842) +++ branches/5.2.x/admin_templates/links/relations_edit.tpl (.../relations_edit.tpl) (revision 14090) @@ -31,17 +31,17 @@
- - -   -
+ +
- + - - - - - + + + + +
Index: branches/5.2.x/admin_templates/paid_listings/paid_listings_list.tpl =================================================================== diff -u -r13842 -r14090 --- branches/5.2.x/admin_templates/paid_listings/paid_listings_list.tpl (.../paid_listings_list.tpl) (revision 13842) +++ branches/5.2.x/admin_templates/paid_listings/paid_listings_list.tpl (.../paid_listings_list.tpl) (revision 14090) @@ -67,7 +67,7 @@ "> - + Index: branches/5.2.x/install/upgrades.php =================================================================== diff -u -r13842 -r14090 --- branches/5.2.x/install/upgrades.php (.../upgrades.php) (revision 13842) +++ branches/5.2.x/install/upgrades.php (.../upgrades.php) (revision 14090) @@ -1,6 +1,6 @@ Array ('Core' => '5.1.0-B1'), '5.1.0-RC1' => Array ('Core' => '5.1.0-RC1'), '5.1.0' => Array ('Core' => '5.1.0'), + '5.1.1-B1' => Array ('Core' => '5.1.1-B1'), + '5.1.1-B2' => Array ('Core' => '5.1.1-B2'), + '5.1.1-RC1' => Array ('Core' => '5.1.1-RC1'), + '5.1.1' => Array ('Core' => '5.1.1'), ); } Index: branches/5.2.x/admin_templates/paid_listings/paid_listing_type_edit.tpl =================================================================== diff -u -r13842 -r14090 --- branches/5.2.x/admin_templates/paid_listings/paid_listing_type_edit.tpl (.../paid_listing_type_edit.tpl) (revision 13842) +++ branches/5.2.x/admin_templates/paid_listings/paid_listing_type_edit.tpl (.../paid_listing_type_edit.tpl) (revision 14090) @@ -62,29 +62,21 @@ - - - - - " id="" value="" tabindex="" size="5"> - - - - - + + + " id="" value="" tabindex="" size="5"> + + + - - - - - " id="" value="" tabindex="" size="5"> - - - - - + + + " id="" value="" tabindex="" size="5"> + + + Index: branches/5.2.x/admin_templates/link_validation/link_validation_list.tpl =================================================================== diff -u -r13842 -r14090 --- branches/5.2.x/admin_templates/link_validation/link_validation_list.tpl (.../link_validation_list.tpl) (revision 13842) +++ branches/5.2.x/admin_templates/link_validation/link_validation_list.tpl (.../link_validation_list.tpl) (revision 14090) @@ -127,7 +127,7 @@ - +