Changeset 1866 for branches/release-34/lib/MT/App/CMS.pm
- Timestamp:
- 04/11/08 19:19:30 (20 months ago)
- Files:
-
- 1 modified
-
branches/release-34/lib/MT/App/CMS.pm (modified) (17 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/release-34/lib/MT/App/CMS.pm
r1858 r1866 755 755 { 756 756 created_on => [ $ts, undef ], 757 junk_status => [ 0, 1 ]757 junk_status => MT::Comment::NOT_JUNK(), 758 758 }, 759 759 { range_incl => { created_on => 1 }, unique => 1 } … … 821 821 handler => sub { 822 822 my ( $terms, $args ) = @_; 823 $terms->{junk_status} = [ 0, 1 ]; 823 require MT::TBPing; 824 $terms->{junk_status} = MT::TBPing::NOT_JUNK(); 824 825 }, 825 826 }, … … 831 832 require MT::Entry; 832 833 my $app = MT->instance; 833 $terms->{junk_status} = [ 0, 1 ];834 require MT::TBPing; 834 835 require MT::Trackback; 836 $terms->{junk_status} = MT::TBPing::NOT_JUNK(); 835 837 $args->{join} = MT::Trackback->join_on( 836 838 undef, … … 863 865 handler => sub { 864 866 my ( $terms, $args ) = @_; 865 $terms->{junk_status} = [ 0, 1 ]; 867 require MT::TBPing; 868 $terms->{junk_status} = MT::TBPing::NOT_JUNK(); 866 869 $terms->{visible} = 0; 867 870 }, … … 872 875 handler => sub { 873 876 my ( $terms, $args ) = @_; 874 $terms->{junk_status} = -1; 877 require MT::TBPing; 878 $terms->{junk_status} = MT::TBPing::NOT_JUNK(); 875 879 }, 876 880 }, … … 884 888 $terms->{created_on} = [ $ts, undef ]; 885 889 $args->{range_incl}{created_on} = 1; 886 $terms->{junk_status} = [ 0, 1 ];890 $terms->{junk_status} = MT::TBPing::NOT_JUNK(); 887 891 }, 888 892 }, … … 894 898 handler => sub { 895 899 my ( $terms, $args ) = @_; 896 $terms->{junk_status} = [ 0, 1 ]; 900 require MT::Comment; 901 $terms->{junk_status} = MT::Comment::NOT_JUNK(); 897 902 }, 898 903 }, … … 903 908 my ( $terms, $args ) = @_; 904 909 require MT::Entry; 910 require MT::Comment; 905 911 my $app = MT->instance; 906 $terms->{junk_status} = [ 0, 1 ];912 $terms->{junk_status} = MT::Comment::NOT_JUNK(); 907 913 # This join syntax employs a hack that allows us 908 914 # to do joins on abitrary columns. Typically, … … 932 938 handler => sub { 933 939 my ( $terms, $args ) = @_; 934 $terms->{junk_status} = [ 0, 1 ]; 940 require MT::Comment; 941 $terms->{junk_status} = MT::Comment::NOT_JUNK(); 935 942 $terms->{visible} = 0; 936 943 }, … … 941 948 handler => sub { 942 949 my ( $terms, $args ) = @_; 943 $terms->{junk_status} = -1; 950 require MT::Comment; 951 $terms->{junk_status} = MT::Comment::JUNK(); 944 952 }, 945 953 }, … … 952 960 }, 953 961 }, 954 # my_comments => {955 # label => 'My comments',956 # order => 600,957 # handler => sub {958 # my ( $terms, $args ) = @_;959 # $terms->{commenter_id} = $app->user->id;960 # },961 # },962 962 last_7_days => { 963 963 label => 'Comments in the last 7 days', … … 965 965 handler => sub { 966 966 my ( $terms, $args ) = @_; 967 require MT::Comment; 967 968 my $ts = time - 7 * 24 * 60 * 60; 968 969 $ts = epoch2ts( MT->app->blog, $ts ); 969 970 $terms->{created_on} = [ $ts, undef ]; 970 971 $args->{range_incl}{created_on} = 1; 971 $terms->{junk_status} = [ 0, 1 ]; 972 }, 973 }, 974 # last_24_hours => { 975 # label => 'All comments in the last 24 hours', 976 # order => 800, 977 # handler => sub { 978 # my ( $terms, $args ) = @_; 979 # my $ts = time - 24 * 60 * 60; 980 # $ts = epoch2ts( MT->app->blog, $ts ); 981 # $terms->{created_on} = [ $ts, undef ]; 982 # $args->{range_incl}{created_on} = 1; 983 # $terms->{junk_status} = [ 0, 1 ]; 984 # }, 985 # }, 972 $terms->{junk_status} = MT::Comment::NOT_JUNK(); 973 }, 974 }, 986 975 _comments_by_user => { 987 976 label => sub { … … 1019 1008 handler => sub { 1020 1009 my ( $terms, $args ) = @_; 1010 require MT::Comment; 1021 1011 my $entry_id = int( MT->app->param('filter_val') ); 1022 1012 $terms->{entry_id} = $entry_id; 1023 $terms->{junk_status} = [ 0, 1 ];1013 $terms->{junk_status} = MT::Comment::NOT_JUNK(); 1024 1014 }, 1025 1015 }, … … 1057 1047 handler => sub { 1058 1048 my ( $terms, $args ) = @_; 1049 require MT::Comment; 1059 1050 my $val = $app->param('filter_val'); 1060 1051 my ( $from, $to ) = split /-/, $val; … … 1063 1054 $to = undef unless $to =~ m/^\d{8}$/; 1064 1055 $to .= '235959'; 1065 $terms->{junk_status} = [ 0, 1 ];1056 $terms->{junk_status} = MT::Comment::NOT_JUNK(); 1066 1057 $terms->{created_on} = 1067 1058 [ MT::Object::ts2db($from), MT::Object::ts2db($to) ]; … … 3309 3300 my $tb_count_iter = 3310 3301 MT::TBPing->count_group_by( 3311 { blog_id => $blog_id, junk_status => [ 0, 1 ]},3302 { blog_id => $blog_id, junk_status => MT::TBPing::NOT_JUNK() }, 3312 3303 { group => ['tb_id'] } ); 3313 3304 while ( my ( $count, $tb_id ) = $tb_count_iter->() ) { … … 3390 3381 { 3391 3382 tb_id => $tb->id, 3392 junk_status => [ 0, 1 ]3383 junk_status => MT::TBPing::NOT_JUNK(), 3393 3384 } 3394 3385 );
