Index: branches/5.1.x/core/units/visits/visits_config.php =================================================================== diff -u -N -r12127 -r12657 --- branches/5.1.x/core/units/visits/visits_config.php (.../visits_config.php) (revision 12127) +++ branches/5.1.x/core/units/visits/visits_config.php (.../visits_config.php) (revision 12657) @@ -1,6 +1,6 @@ 'visits', - 'ItemClass' => Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'), - 'ListClass' => Array('class'=>'VisitsList','file'=>'visits_list.php','build_event'=>'OnListBuild'), - 'EventHandlerClass' => Array('class'=>'VisitsEventHandler','file'=>'visits_event_handler.php','build_event'=>'OnBuild'), - 'TagProcessorClass' => Array('class'=>'VisitsTagProcessor','file'=>'visits_tag_processor.php','build_event'=>'OnBuild'), + 'ItemClass' => Array ('class' => 'kDBItem','file' => '','build_event' => 'OnItemBuild'), + 'ListClass' => Array ('class' => 'VisitsList','file' => 'visits_list.php','build_event' => 'OnListBuild'), + 'EventHandlerClass' => Array ('class' => 'VisitsEventHandler','file' => 'visits_event_handler.php','build_event' => 'OnBuild'), + 'TagProcessorClass' => Array ('class' => 'VisitsTagProcessor','file' => 'visits_tag_processor.php','build_event' => 'OnBuild'), 'AutoLoad' => true, - 'QueryString' => Array( + 'QueryString' => Array ( 1 => 'id', 2 => 'Page', 3 => 'event', 4 => 'mode', ), - 'Hooks' => Array( - Array( + 'Hooks' => Array ( + Array ( 'Mode' => hBEFORE, 'Conditional' => false, 'HookToPrefix' => 'adm', 'HookToSpecial' => '', - 'HookToEvent' => Array( 'OnStartup' ), + 'HookToEvent' => Array ( 'OnStartup' ), 'DoPrefix' => '', 'DoSpecial' => '', 'DoEvent' => 'OnRegisterVisit', ), - Array( + Array ( 'Mode' => hAFTER, 'Conditional' => false, 'HookToPrefix' => 'u', 'HookToSpecial' => '*', - 'HookToEvent' => Array( 'OnLogin' ), + 'HookToEvent' => Array ( 'OnLogin' ), 'DoPrefix' => '', 'DoSpecial' => '', 'DoEvent' => 'OnUserLogin', @@ -54,33 +56,33 @@ 'IDField' => 'VisitId', 'TableName' => TABLE_PREFIX.'Visits', - 'PermSection' => Array('main' => 'in-portal:visits'), + 'PermSection' => Array ('main' => 'in-portal:visits'), 'Sections' => Array ( 'in-portal:visits' => Array ( 'parent' => 'in-portal:reports', 'icon' => 'visits', - 'label' => 'la_tab_Visits', + 'label' => 'la_tab_VisitorLog', 'url' => Array ('t' => 'logs/visits/visits_list', 'pass' => 'm'), 'permissions' => Array ('view', 'delete'), 'priority' => 6, 'type' => stTREE, ), ), - 'TitlePresets' => Array( - 'visits_list' => Array( - 'prefixes' => Array('visits_List'), 'format' => "!la_title_Visits!", - 'toolbar_buttons' => Array ('search', 'search_reset', 'refresh', 'reset', 'export', 'view'), + 'TitlePresets' => Array ( + 'visits_list' => Array ( + 'prefixes' => Array ('visits_List'), 'format' => "!la_title_Visits!", + 'toolbar_buttons' => Array ('search', 'search_reset', 'refresh', 'delete', 'export', 'view'), ), - 'visits.incommerce_list' => Array( - 'prefixes' => Array('visits.incommerce_List'), 'format' => "!la_title_Visits!", - 'toolbar_buttons' => Array ('search', 'search_reset', 'refresh', 'reset', 'export', 'view'), + 'visits.incommerce_list' => Array ( + 'prefixes' => Array ('visits.incommerce_List'), 'format' => "!la_title_Visits!", + 'toolbar_buttons' => Array ('search', 'search_reset', 'refresh', 'delete', 'export', 'view'), ), ), - 'CalculatedFields' => Array( + 'CalculatedFields' => Array ( '' => Array ( 'UserName' => 'IF( ISNULL(u.Login), IF (%1$s.PortalUserId = -1, \'root\', IF (%1$s.PortalUserId = -2, \'Guest\', \'n/a\')), u.Login)', ), @@ -95,10 +97,10 @@ ), ), - 'ListSQLs' => Array( ''=>' SELECT %1$s.* %2$s + 'ListSQLs' => Array ( '' => ' SELECT %1$s.* %2$s FROM %1$s LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.PortalUserId', - 'incommerce'=>' + 'incommerce' => ' SELECT %1$s.* %2$s FROM %1$s LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.PortalUserId @@ -108,67 +110,67 @@ ), - 'ItemSQLs' => Array( ''=>' SELECT %1$s.* %2$s + 'ItemSQLs' => Array ( '' => ' SELECT %1$s.* %2$s FROM %1$s LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.PortalUserId', - 'incommerce'=>' SELECT %1$s.* %2$s + 'incommerce' => ' SELECT %1$s.* %2$s FROM %1$s LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.PortalUserId LEFT JOIN '.TABLE_PREFIX.'Affiliates af ON %1$s.AffiliateId = af.AffiliateId LEFT JOIN '.TABLE_PREFIX.'PortalUser au ON af.PortalUserId = au.PortalUserId LEFT JOIN '.TABLE_PREFIX.'Orders ord ON %1$s.VisitId = ord.VisitId', ), - 'ListSortings' => Array( - '' => Array( - 'Sorting' => Array('VisitDate' => 'desc'), + 'ListSortings' => Array ( + '' => Array ( + 'Sorting' => Array ('VisitDate' => 'desc'), ) ), - 'Fields' => Array( - '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' => ''), - '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), + 'Fields' => Array ( + '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' => ''), + '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), ), - 'VirtualFields' => Array( - 'UserName' => Array('type'=>'string'), - 'AffiliateUser' => Array('type'=>'string'), - 'AffiliatePortalUserId' => Array('type'=>'int'), - 'OrderTotalAmount' => Array('type' => 'float', 'formatter'=>'kFormatter', 'format'=>'%01.2f', 'not_null' => '1','default' => '0.00', 'totals' => 'SUM'), - 'OrderTotalAmountSum' => Array('type' => 'float', 'formatter'=>'kFormatter', 'format'=>'%01.2f', 'not_null' => '1','default' => '0.00'), - 'OrderAffiliateCommission' => Array('type' => 'double', 'formatter'=>'kFormatter','format'=>'%.02f', 'not_null' => '1','default' => '0.0000', 'totals' => 'SUM'), - 'OrderAffiliateCommissionSum' => Array('type' => 'double', 'formatter'=>'kFormatter','format'=>'%.02f', 'not_null' => '1','default' => '0.0000'), - 'OrderId' => Array('type' => 'int', 'default' => '0'), + 'VirtualFields' => Array ( + 'UserName' => Array ('type' => 'string'), + 'AffiliateUser' => Array ('type' => 'string'), + 'AffiliatePortalUserId' => Array ('type' => 'int'), + 'OrderTotalAmount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => '1','default' => '0.00', 'totals' => 'SUM'), + 'OrderTotalAmountSum' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => '1','default' => '0.00'), + 'OrderAffiliateCommission' => Array ('type' => 'double', 'formatter' => 'kFormatter','format' => '%.02f', 'not_null' => '1','default' => '0.0000', 'totals' => 'SUM'), + 'OrderAffiliateCommissionSum' => Array ('type' => 'double', 'formatter' => 'kFormatter','format' => '%.02f', 'not_null' => '1','default' => '0.0000'), + 'OrderId' => Array ('type' => 'int', 'default' => '0'), ), - 'Grids' => Array( - 'Default' => Array( - 'Icons' => Array('default'=>'icon16_custom.gif'), // icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used - 'Fields' => Array( - 'VisitDate' => Array( 'title'=>'la_col_VisitDate', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_date_range_filter'), - 'IPAddress' => Array( 'title'=>'la_col_IP', 'filter_block' => 'grid_like_filter' ), - 'Referer' => Array( 'title'=>'la_col_Referer', 'data_block' => 'grid_referer_td', 'filter_block' => 'grid_like_filter' ), - 'UserName' => Array('title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter'), - ), - ), - 'visitsincommerce' => Array( - 'Icons' => Array('default'=>'icon16_custom.gif'), // icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used - 'Fields' => Array( - 'VisitDate' => Array( 'title'=>'la_col_VisitDate', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_date_range_filter' ), - 'IPAddress' => Array( 'title'=>'la_col_IP', 'filter_block' => 'grid_like_filter' ), - 'Referer' => Array( 'title'=>'la_col_Referer', 'data_block' => 'grid_referer_td', 'filter_block' => 'grid_like_filter' ), - 'UserName' => Array('title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter'), - 'AffiliateUser' => Array( 'title' => 'la_col_AffiliateUser', 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_like_filter'), - 'OrderTotalAmountSum' => Array( 'title' => 'la_col_OrderTotal', 'filter_block' => 'grid_range_filter'), - 'OrderAffiliateCommissionSum' => Array( 'title' => 'la_col_Commission', 'filter_block' => 'grid_range_filter'), - ), - ), - ), + 'Grids' => Array ( - ); + 'Default' => Array ( + 'Icons' => Array ('default' => 'icon16_item.png'), + 'Fields' => Array ( + 'VisitDate' => Array ( 'title' => 'la_col_VisitDate', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ), + 'IPAddress' => Array ( 'title' => 'la_col_IP', 'filter_block' => 'grid_like_filter', 'width' => 130, ), + 'Referer' => Array ( 'title' => 'la_col_Referer', 'data_block' => 'grid_referer_td', 'filter_block' => 'grid_like_filter', 'width' => 250, ), + 'UserName' => Array ('title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 100, ), + ), + ), -?> \ No newline at end of file + 'visitsincommerce' => Array ( + 'Icons' => Array ('default' => 'icon16_item.png'), + 'Fields' => Array ( + 'VisitDate' => Array ( 'title' => 'la_col_VisitDate', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ), + 'IPAddress' => Array ( 'title' => 'la_col_IP', 'filter_block' => 'grid_like_filter', 'width' => 130, ), + 'Referer' => Array ( 'title' => 'la_col_Referer', 'data_block' => 'grid_referer_td', 'filter_block' => 'grid_like_filter', 'width' => 250, ), + 'UserName' => Array ( 'title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 100, ), + 'AffiliateUser' => Array ( 'title' => 'la_col_AffiliateUser', 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 105, ), + 'OrderTotalAmountSum' => Array ( 'title' => 'la_col_OrderTotal', 'filter_block' => 'grid_range_filter', 'width' => 95, ), + 'OrderAffiliateCommissionSum' => Array ( 'title' => 'la_col_Commission', 'filter_block' => 'grid_range_filter', 'width' => 160, ), + ), + ), + ), + + ); \ No newline at end of file