Index: branches/unlabeled/unlabeled-1.4.4/core/units/reviews/reviews_config.php =================================================================== diff -u -N -r5539 -r5728 --- branches/unlabeled/unlabeled-1.4.4/core/units/reviews/reviews_config.php (.../reviews_config.php) (revision 5539) +++ branches/unlabeled/unlabeled-1.4.4/core/units/reviews/reviews_config.php (.../reviews_config.php) (revision 5728) @@ -1,48 +1,43 @@ 'rev', - + 'Clones' => Array( - 'l-rev' => Array( - 'ParentPrefix' => 'l', - ), - 'n-rev' => Array( - 'ParentPrefix' => 'n', - ), - 'bb-rev'=> Array( - 'ParentPrefix' => 'bb', - ), + + 'l-rev' => Array('ParentPrefix' => 'l'), + 'n-rev' => Array('ParentPrefix' => 'n'), + 'bb-rev'=> Array('ParentPrefix' => 'bb'), /*'p-rev' => Array('ParentPrefix' => 'p'),*/ ), - + 'ItemClass' => Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'), 'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'), 'EventHandlerClass' => Array('class'=>'ReviewsEventHandler','file'=>'reviews_event_handler.php','build_event'=>'OnBuild'), 'TagProcessorClass' => Array('class'=>'ReviewsTagProcessor','file'=>'reviews_tag_processor.php','build_event'=>'OnBuild'), 'AutoLoad' => true, - + 'QueryString' => Array( 1 => 'id', 2 => 'page', 3 => 'event', ), - - + + 'ParentPrefix' => 'p', // replace all usage of rev to "p-rev" and then remove this param from here and Prefix too - + 'IDField' => 'ReviewId', 'StatusField' => Array('Status'), // field, that is affected by Approve/Decline events 'TableName' => TABLE_PREFIX.'ItemReview', 'ParentTableKey' => 'ResourceId', // linked field in master table 'ForeignKey' => 'ItemId', // linked field in subtable - + 'AutoDelete' => true, 'AutoClone' => true, - + 'TitlePresets' => Array( 'reviews_edit' => Array('format' => "!la_title_Editing_Review!"), - ), + ), 'FilterMenu' => Array( 'Groups' => Array( Array('mode' => 'AND', 'filters' => Array('show_active','show_pending','show_disabled'), 'type' => WHERE_FILTER), @@ -53,7 +48,7 @@ 'show_disabled' => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ), ) ), - + 'CalculatedFields' => Array( '' => Array( 'ReviewedBy' => 'IF( ISNULL(pu.Login), IF (%1$s.CreatedById = -1, \'root\', IF (%1$s.CreatedById = -2, \'Guest\', \'n/a\')), pu.Login )', @@ -68,31 +63,31 @@ 'ItemName' => 'pr.l1_Name', 'ProductId' => 'pr.ProductId', ), - + ), - - // key - special, value - list select sql + + // key - special, value - list select sql 'ListSQLs' => Array( ''=>'SELECT %1$s.* %2$s FROM %1$s LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = %1$s.CreatedById', - + 'products' => ' SELECT %1$s.* %2$s FROM %1$s, '.TABLE_PREFIX.'Products pr LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = %1$s.CreatedById', - + 'product' => ' SELECT %1$s.* %2$s FROM %1$s, '.TABLE_PREFIX.'Products pr LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = %1$s.CreatedById', ), 'ItemSQLs' => Array( ''=> 'SELECT * FROM %s'), - - 'ListSortings' => Array( + + 'ListSortings' => Array( '' => Array( 'ForcedSorting' => Array('Priority' => 'desc'), 'Sorting' => Array('CreatedOn' => 'desc'), ) - ), - + ), + 'Fields' => Array( 'ReviewId' => Array('type'=>'int'), 'CreatedOn' => Array('formatter'=>'kDateFormatter','not_null'=>1,'default'=>'#NOW#'), @@ -102,14 +97,14 @@ 'CreatedById' => Array('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), 'ItemType' => Array('type'=>'int','not_null'=>1,'default'=>0), 'Priority' => Array('type'=>'int','not_null'=>1,'default'=>0), - 'Status' => Array('formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options'=>Array(1=>'la_Active',2=>'la_Pending',0=>'la_Disabled'),'not_null'=>1,'default'=>2 ), + 'Status' => Array('formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options'=>Array(1=>'la_Active',2=>'la_Pending',0=>'la_Disabled'),'not_null'=>1,'default'=>0 ), 'TextFormat' => Array('type'=>'int','not_null'=>1,'default'=>0), 'Module' => Array('type'=>'string','not_null'=>1,'default'=>''), ), 'VirtualFields' => Array( 'ReviewedBy' => Array(), ), - + 'Grids' => Array( 'Default' => Array( 'Icons' => Array('default'=>'icon16_custom.gif',1=>'icon16_review.gif',2=>'icon16_review_pending.gif',0=>'icon16_review_disabled.gif'), 'Fields' => Array( @@ -118,17 +113,17 @@ 'CreatedOn_formatted' => Array( 'title'=>'la_col_CreatedOn', 'sort_field' => 'CreatedOn' ), 'Status' => Array( 'title'=>'la_col_Status' ), ), - + ), - + 'ReviewsSection' => Array( 'Icons' => Array('default'=>'icon16_custom.gif',1=>'icon16_review.gif',2=>'icon16_review_pending.gif',0=>'icon16_review_disabled.gif'), 'Fields' => Array( 'ReviewText' => Array( 'title'=>'la_col_ReviewText', 'data_block' => 'grid_checkbox_namelink_td'), 'ReviewedBy' => Array( 'title'=>'la_col_ReviewedBy' ), 'CreatedOn_formatted' => Array( 'title'=>'la_col_CreatedOn', 'sort_field' => 'CreatedOn' ), 'Status' => Array( 'title'=>'la_col_Status' ), ), - + ), ), ); Index: branches/unlabeled/unlabeled-1.4.4/core/admin_templates/categories/xml/tree_categories.tpl =================================================================== diff -u -N -r5539 -r5728 --- branches/unlabeled/unlabeled-1.4.4/core/admin_templates/categories/xml/tree_categories.tpl (.../tree_categories.tpl) (revision 5539) +++ branches/unlabeled/unlabeled-1.4.4/core/admin_templates/categories/xml/tree_categories.tpl (.../tree_categories.tpl) (revision 5728) @@ -1,6 +1,6 @@ - " icon="img/icons/icon24_catalog.gif" href="" onclick="checkCatalog()" load_url=""> + " icon="img/icons/icon24_catalog.gif" href="" onclick="checkEditMode()" load_url=""> Index: branches/unlabeled/unlabeled-1.9.4/core/admin_templates/groups/permissions_selector.tpl =================================================================== diff -u -N -r5451 -r5728 --- branches/unlabeled/unlabeled-1.9.4/core/admin_templates/groups/permissions_selector.tpl (.../permissions_selector.tpl) (revision 5451) +++ branches/unlabeled/unlabeled-1.9.4/core/admin_templates/groups/permissions_selector.tpl (.../permissions_selector.tpl) (revision 5728) @@ -16,7 +16,7 @@ a_toolbar = new ToolBar(); a_toolbar.AddButton( new ToolBarButton('select', '', function() { set_hidden_field('advanced_save', 1); - submit_event('g-perm','OnGroupSavePermissions'); + submit_event('g-perm','OnSavePermissions'); } ) ); a_toolbar.AddButton( new ToolBarButton('cancel', '', function() { Index: branches/unlabeled/unlabeled-1.3.4/core/units/images/image_tag_processor.php =================================================================== diff -u -N -r5441 -r5728 --- branches/unlabeled/unlabeled-1.3.4/core/units/images/image_tag_processor.php (.../image_tag_processor.php) (revision 5441) +++ branches/unlabeled/unlabeled-1.3.4/core/units/images/image_tag_processor.php (.../image_tag_processor.php) (revision 5728) @@ -5,7 +5,6 @@ function Image($params) { $params['img_path'] = $this->ImageSrc($params); - if ($params['img_path'] === false) return ; $params['img_size'] = $this->ImageSize($params); if (!$params['img_size']){ $params['img_size'] = ' width="'.getArrayValue($params, 'DefaultWidth').'"'; @@ -115,8 +114,7 @@ if ( $object->GetDBField('LocalImage') && !file_exists(FULL_PATH.'/'.$object->GetDBField('LocalPath')) ) $ret = ''; } - $default_image = $this->SelectParam($params, 'default_image,DefaultImage'); - return ($ret && $ret != PROTOCOL.SERVER_NAME.BASE_PATH && $ret != PROTOCOL.SERVER_NAME.BASE_PATH.'/') ? $ret : ($default_image ? PROTOCOL.SERVER_NAME.BASE_PATH.THEMES_PATH.'/'.$default_image : false); + return ($ret && $ret != PROTOCOL.SERVER_NAME.BASE_PATH && $ret != PROTOCOL.SERVER_NAME.BASE_PATH.'/') ? $ret : PROTOCOL.SERVER_NAME.BASE_PATH.THEMES_PATH.'/'.$this->SelectParam($params, 'default_image,DefaultImage'); } function GetFullPath($path) Index: branches/unlabeled/unlabeled-1.4.4/core/units/images/images_config.php =================================================================== diff -u -N -r5539 -r5728 --- branches/unlabeled/unlabeled-1.4.4/core/units/images/images_config.php (.../images_config.php) (revision 5539) +++ branches/unlabeled/unlabeled-1.4.4/core/units/images/images_config.php (.../images_config.php) (revision 5728) @@ -7,7 +7,7 @@ 'n-img' => Array('ParentPrefix' => 'n'), 'bb-img'=> Array('ParentPrefix' => 'bb'), /*'p-img' => Array('ParentPrefix' => 'p'),*/ - 'c-img' => Array('ParentPrefix' => 'c'), + 'catimg' => Array('ParentPrefix' => 'c'), ), 'ItemClass' => Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'), Index: branches/unlabeled/unlabeled-1.4.4/core/units/relationship/relationship_config.php =================================================================== diff -u -N -r5539 -r5728 --- branches/unlabeled/unlabeled-1.4.4/core/units/relationship/relationship_config.php (.../relationship_config.php) (revision 5539) +++ branches/unlabeled/unlabeled-1.4.4/core/units/relationship/relationship_config.php (.../relationship_config.php) (revision 5728) @@ -1,23 +1,23 @@ 'rel', - + 'Clones' => Array( - 'c-rel' => Array('ParentPrefix' => 'c'), + 'l-rel' => Array('ParentPrefix' => 'l'), 'n-rel' => Array('ParentPrefix' => 'n'), 'bb-rel'=> Array('ParentPrefix' => 'bb'), - /*'p-rel' => Array('ParentPrefix' => 'p'),*/ 'cms-rel'=> Array('ParentPrefix' => 'cms'), + /*'p-rel' => Array('ParentPrefix' => 'p'),*/ ), - + 'ItemClass' => Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'), 'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'), 'EventHandlerClass' => Array('class'=>'RelationshipEventHandler','file'=>'relationship_event_handler.php','build_event'=>'OnBuild'), 'TagProcessorClass' => Array('class'=>'kDBTagProcessor','file'=>'','build_event'=>'OnBuild'), 'AutoLoad' => true, - 'Hooks' => Array( + 'Hooks' => Array( Array( 'Mode' => hAFTER, 'Conditional' => false, @@ -42,7 +42,7 @@ 'ParentPrefix' => 'p', 'AutoDelete' => true, 'AutoClone' => true, - + 'FilterMenu' => Array( 'Groups' => Array( Array('mode' => 'AND', 'filters' => Array('show_active','show_disabled'), 'type' => WHERE_FILTER), @@ -56,26 +56,26 @@ 'show_oneway' => Array('label' => 'la_OneWay', 'on_sql' => '', 'off_sql' => '%1$s.Type != 2' ), ) ), - + 'CalculatedFields' => Array( '' => Array( 'ItemName' => 'TRIM(CONCAT(#ITEM_NAMES#))', 'ItemType' => '#ITEM_TYPES#', ), ), - + 'ListSQLs' => Array( ''=> 'SELECT %1$s.RelationshipId, %1$s.Priority, %1$s.Type, %1$s.Enabled %2$s FROM %1$s #ITEM_JOIN#', ), // key - special, value - list select sql - - 'ListSortings' => Array( + + 'ListSortings' => Array( '' => Array( 'ForcedSorting' => Array('Priority' => 'desc'), 'Sorting' => Array('ItemName' => 'asc', 'ItemType' => 'asc'), ) - ), + ), 'ItemSQLs' => Array( '' => 'SELECT %1$s.* %2$s FROM %1$s #ITEM_JOIN#',), - + 'Fields' => Array( 'RelationshipId' => Array(), 'SourceId' => Array('type'=>'int'), @@ -89,7 +89,7 @@ 'VirtualFields' => Array( 'ItemName' => Array(), 'ItemType' => Array(), ), - + 'Grids' => Array( 'Default' => Array( 'Icons' => Array('default'=>'icon16_custom.gif','1_0'=>'icon16_relation_one-way.gif','0_0'=>'icon16_relation_one-way_disabled.gif','1_1'=>'icon16_relation_reciprocal.gif','0_1'=>'icon16_relation_reciprocal_disabled.gif'), // icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used @@ -99,7 +99,7 @@ 'Type' => Array( 'title'=>'la_col_RelationshipType' ), 'Enabled' => Array( 'title'=>'la_col_Status' ), ), - + ), ), ); Index: branches/unlabeled/unlabeled-1.4.4/core/units/reviews/reviews_tag_processor.php =================================================================== diff -u -N -r5539 -r5728 --- branches/unlabeled/unlabeled-1.4.4/core/units/reviews/reviews_tag_processor.php (.../reviews_tag_processor.php) (revision 5539) +++ branches/unlabeled/unlabeled-1.4.4/core/units/reviews/reviews_tag_processor.php (.../reviews_tag_processor.php) (revision 5728) @@ -2,6 +2,8 @@ class ReviewsTagProcessor extends kDBTagProcessor { + + /** * Returns a link for editing product *