Changeset 425 for trunk

Timestamp:

Oct 28, 2009, 11:00:33 AM (15 years ago)

Author:

toemon

Message:

最新の記事内容ブロックに、日付による抽出オプション追加 Fixes #240

Location:

trunk

Files:

• extras/for_wordpressme2011/ja_EUC/language/japanese/blocks.php (modified) (1 diff)
• extras/for_wordpressme2011/ja_UTF/language/ja_utf8/blocks.php (modified) (1 diff)
• extras/xpress_i18n/german/xpressme_modules_root/language/german/blocks.php (modified) (1 diff)
• extras/xpress_i18n/persian/xpressme_modules_root/language/persian/blocks.php (modified) (1 diff)
• extras/xpress_i18n/portuguese-br/xpressme_modules_root/language/pt-br_utf8/blocks.php (modified) (1 diff)
• extras/xpress_i18n/template/xpressme_modules_root/language/english/blocks.php (modified) (1 diff)
• xpressme_integration_kit/blocks/recent_posts_content_block.php (modified) (2 diffs)
• xpressme_integration_kit/language/english/blocks.php (modified) (1 diff)
• xpressme_integration_kit/language/ja_utf8/blocks.php (modified) (1 diff)
• xpressme_integration_kit/wp-content/themes/xpress_default/blocks/recent_posts_content_block_theme.php (modified) (3 diffs)
• xpressme_integration_kit/xoops_version.php (modified) (2 diffs)

trunk/extras/for_wordpressme2011/ja_EUC/language/japanese/blocks.php

@@ -40 +40 @@
         define("_MB_XP2_CATS_SELECT","ÂоݤΥ«¥Æ¥´¥ê¡¼ÁªÂò");
         define("_MB_XP2_TAGS_SELECT","ÂоݤΥ¿¥°ÁªÂò(Ê£¿ô¤¢¤ë¾ì¹ç¤Ï¥«¥ó¥Þ¶èÀÚ¤ê¤ÇÆþÎÏ");
+        define("_MB_XP2_DAY_SELECT","ÆüÉդˤè¤ëÃê½Ð");
+        define("_MB_XP2_NONE","¤Ê¤·");
+        define("_MB_XP2_TODAY","ËÜÆü¤ÎÅê¹Æ");
+        define("_MB_XP2_LASTES","ºÇ¿·¤ÎÅê¹Æ");
+        define("_MB_XP2_DAY_BETWEEN","");
+        define("_MB_XP2_DAYS_AND","¤«¤é");
+        define("_MB_XP2_DAYS_AGO","ÆüÁ°¤Þ¤Ç¤Î´Ö");
         
 // recent posts list    

trunk/extras/for_wordpressme2011/ja_UTF/language/ja_utf8/blocks.php

@@ -40 +40 @@
         define("_MB_XP2_CATS_SELECT","対象のカテゴリー選択");
         define("_MB_XP2_TAGS_SELECT","対象のタグ選択(複数ある場合はカンマ区切りで入力");
+        define("_MB_XP2_DAY_SELECT","日付による抽出");
+        define("_MB_XP2_NONE","なし");
+        define("_MB_XP2_TODAY","本日の投稿");
+        define("_MB_XP2_LASTES","最新の投稿");
+        define("_MB_XP2_DAY_BETWEEN","");
+        define("_MB_XP2_DAYS_AND","から");
+        define("_MB_XP2_DAYS_AGO","日前までの間");
         
 // recent posts list    

trunk/extras/xpress_i18n/german/xpressme_modules_root/language/german/blocks.php

@@ -40 +40 @@
         define("_MB_XP2_CATS_SELECT","Select categorie");
         define("_MB_XP2_TAGS_SELECT","Tags Select(Comma separated list of tags)");
+        define("_MB_XP2_DAY_SELECT","Select Post Date");
+        define("_MB_XP2_NONE","None");
+        define("_MB_XP2_TODAY","Heute");
+        define("_MB_XP2_LASTES","Lastes");
+        define("_MB_XP2_DAY_BETWEEN","Zwischen");
+        define("_MB_XP2_DAYS_AND","und vor");
+        define("_MB_XP2_DAYS_AGO","Tagen");
         
 // recent posts list    

trunk/extras/xpress_i18n/persian/xpressme_modules_root/language/persian/blocks.php

@@ -40 +40 @@
         define("_MB_XP2_CATS_SELECT","Select categorie");
         define("_MB_XP2_TAGS_SELECT","Tags Select(Comma separated list of tags)");
+        define("_MB_XP2_DAY_SELECT","Select Post Date");
+        define("_MB_XP2_NONE","None");
+        define("_MB_XP2_TODAY","Today");
+        define("_MB_XP2_LASTES","Lastes");
+        define("_MB_XP2_DAY_BETWEEN","Between");
+        define("_MB_XP2_DAYS_AND","and");
+        define("_MB_XP2_DAYS_AGO","days ago");
         
 // recent posts list    

trunk/extras/xpress_i18n/portuguese-br/xpressme_modules_root/language/pt-br_utf8/blocks.php

@@ -40 +40 @@
         define("_MB_XP2_CATS_SELECT","Selecionar a(s) categoria(s)");
         define("_MB_XP2_TAGS_SELECT","Selecionar a(s) tag(s) (separadas por ,)");
+        define("_MB_XP2_DAY_SELECT","Select Post Date");
+        define("_MB_XP2_NONE","None");
+        define("_MB_XP2_TODAY","Hoje");
+        define("_MB_XP2_LASTES","Lastes");
+        define("_MB_XP2_DAY_BETWEEN","Entre");
+        define("_MB_XP2_DAYS_AND","e");
+        define("_MB_XP2_DAYS_AGO","dias atrás");
         
 // recent posts list    

trunk/extras/xpress_i18n/template/xpressme_modules_root/language/english/blocks.php

@@ -40 +40 @@
         define("_MB_XP2_CATS_SELECT","Select categorie");
         define("_MB_XP2_TAGS_SELECT","Tags Select(Comma separated list of tags)");
+        define("_MB_XP2_DAY_SELECT","Select Post Date");
+        define("_MB_XP2_NONE","None");
+        define("_MB_XP2_TODAY","Today");
+        define("_MB_XP2_LASTES","Lastes");
+        define("_MB_XP2_DAY_BETWEEN","Between");
+        define("_MB_XP2_DAYS_AND","and");
+        define("_MB_XP2_DAYS_AGO","days ago");
         
 // recent posts list    

trunk/xpressme_integration_kit/blocks/recent_posts_content_block.php

@@ -19 +19 @@
                 $mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
                 $this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_recent_posts_content_block.html' : trim( $options[1] );
-                $disp_count =  ($options[2])?intval($options[2]):10;
-                $excerpt = empty( $options[3] ) ? false : true ;
-                $excerpt_size =  ($options[4])?intval($options[4]):100;
-                $date_format = empty( $options[5] ) ? '' : $options[5] ;
-                $time_format = empty( $options[6] ) ? '' : $options[6] ;
-                $tag_select = $options[7] ;
-            $selected = array_slice($options,8); // get allowed cats
+                $day_select = ($options[2])?intval($options[2]):0;
+                $day_size = ($options[3])?intval($options[3]):0;
+                $disp_count =  ($options[4])?intval($options[4]):10;
+                $excerpt = empty( $options[5] ) ? false : true ;
+                $excerpt_size =  ($options[6])?intval($options[6]):100;
+                $date_format = empty( $options[7] ) ? '' : $options[7] ;
+                $time_format = empty( $options[8] ) ? '' : $options[8] ;
+                $tag_select = $options[9] ;
+            $selected = array_slice($options,10); // get allowed cats
 
                 $mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
@@ -34 +36 @@
             $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
                 $form .= "<br />";
-                $form .= _MB_XP2_COUNT .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />\n";
-                $form .= yes_no_radio_option('options[3]', _MB_XP2_P_EXCERPT , $excerpt) . "<br />\n";
-                $form .= _MB_XP2_P_EXCERPT_SIZE .": <input type='text' name='options[4]' value='" . $excerpt_size . "' /><br />\n";
-                $form .= _MB_XP2_DATE_FORMAT .": <input type='text' name='options[5]' value='" . $date_format . "' /><br />\n";
-                $form .= _MB_XP2_TIME_FORMAT .": <input type='text' name='options[6]' value='" . $time_format . "' /><br />\n";
+                $form .= _MB_XP2_DAY_SELECT . ':' . _MB_XP2_DAY_BETWEEN . '<select name="options[2]">';
+                switch ($day_select){
+                case 1:
+                        $form .= '<option value="0">' . _MB_XP2_NONE . '</option>';
+                        $form .= '<option value="1" selected>'. _MB_XP2_TODAY . '</option>';
+                        $form .= '<option value="2">' . _MB_XP2_LASTES . '</option>';
+                        break;
+                case 2:
+                        $form .= '<option value="0">' . _MB_XP2_NONE . '</option>';
+                        $form .= '<option value="1">'. _MB_XP2_TODAY . '</option>';
+                        $form .= '<option value="2" selected>' . _MB_XP2_LASTES . '</option>';
+                        break;
+                default :
+                        $form .= '<option value="0" selected>' . _MB_XP2_NONE . '</option>';
+                        $form .= '<option value="1">'. _MB_XP2_TODAY . '</option>';
+                        $form .= '<option value="2">' . _MB_XP2_LASTES . '</option>';
+                }
+                $form .= '</select>';
+                
+                $form .= ' ' . _MB_XP2_DAYS_AND . " <input type='text' size='2' name='options[3]' value='" . $day_size . "' />" . _MB_XP2_DAYS_AGO . "<br />\n";
+
+                $form .= _MB_XP2_COUNT .": <input type='text' name='options[4]' value='" . $disp_count . "' /><br />\n";
+                $form .= yes_no_radio_option('options[5]', _MB_XP2_P_EXCERPT , $excerpt) . "<br />\n";
+                $form .= _MB_XP2_P_EXCERPT_SIZE .": <input type='text' name='options[6]' value='" . $excerpt_size . "' /><br />\n";
+                $form .= _MB_XP2_DATE_FORMAT .": <input type='text' name='options[7]' value='" . $date_format . "' /><br />\n";
+                $form .= _MB_XP2_TIME_FORMAT .": <input type='text' name='options[8]' value='" . $time_format . "' /><br />\n";
                 
                 include $mydirpath .'/wp-includes/version.php' ;
                 if (wp_version_compare($wp_version, '>=','2.3')){
                         $form .= "<br />\n";
-                        $form .= _MB_XP2_TAGS_SELECT .": <input type='text' name='options[7]' value='" . $tag_select . "' /><br />\n";
+                        $form .= _MB_XP2_TAGS_SELECT .": <input type='text' name='options[9]' value='" . $tag_select . "' /><br />\n";
                 } else {
-                        $form .= "<input type='hidden' name='options[7]' value='' /><br />\n";
+                        $form .= "<input type='hidden' name='options[9]' value='' /><br />\n";
                 }
                 

trunk/xpressme_integration_kit/language/english/blocks.php

@@ -40 +40 @@
         define("_MB_XP2_CATS_SELECT","Select categorie");
         define("_MB_XP2_TAGS_SELECT","Tags Select(Comma separated list of tags)");
+        define("_MB_XP2_DAY_SELECT","Select Post Date");
+        define("_MB_XP2_NONE","None");
+        define("_MB_XP2_TODAY","Today");
+        define("_MB_XP2_LASTES","Lastes");
+        define("_MB_XP2_DAY_BETWEEN","Between");
+        define("_MB_XP2_DAYS_AND","and");
+        define("_MB_XP2_DAYS_AGO","days ago");
         
 // recent posts list    

trunk/xpressme_integration_kit/language/ja_utf8/blocks.php

@@ -40 +40 @@
         define("_MB_XP2_CATS_SELECT","対象のカテゴリー選択");
         define("_MB_XP2_TAGS_SELECT","対象のタグ選択(複数ある場合はカンマ区切りで入力");
+        define("_MB_XP2_DAY_SELECT","日付による抽出");
+        define("_MB_XP2_NONE","なし");
+        define("_MB_XP2_TODAY","本日の投稿");
+        define("_MB_XP2_LASTES","最新の投稿");
+        define("_MB_XP2_DAY_BETWEEN","");
+        define("_MB_XP2_DAYS_AND","から");
+        define("_MB_XP2_DAYS_AGO","日前までの間");
         
 // recent posts list    

trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/recent_posts_content_block_theme.php

@@ -6 +6 @@
         $mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
         $this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_recent_posts_content_block.html' : trim( $options[1] );
-        $disp_count =  ($options[2])?intval($options[2]):10;
-        $excerpt = empty( $options[3] ) ? false : true ;
-        $excerpt_size =  ($options[4])?intval($options[4]):100;
-        $date_format = empty( $options[5] ) ? '' : $options[5] ;
-        $time_format = empty( $options[6] ) ? '' : $options[6] ;
-        $tag_select = $options[7] ;
-    $selected = array_slice($options,8); // get allowed cats
+        $day_select = ($options[2])?intval($options[2]):0;
+        $day_size = ($options[3])?intval($options[3]):0;
+        $disp_count =  ($options[4])?intval($options[4]):10;
+        $excerpt = empty( $options[5] ) ? false : true ;
+        $excerpt_size =  ($options[6])?intval($options[6]):100;
+        $date_format = empty( $options[7] ) ? '' : $options[7] ;
+        $time_format = empty( $options[8] ) ? '' : $options[8] ;
+        $tag_select = $options[9] ;
+    $selected = array_slice($options,10); // get allowed cats
 
         $mydirpath = get_xpress_dir_path();
@@ -26 +28 @@
                 $author_where = '';
         }
+        
+        $date_today = mktime (0, 0, 0, date("m"), date("d"), date("Y"));
+        $between_days = $day_size * 60 * 60 * 24;
+        
         global $wpdb,$wp_query;
         $block = array();
@@ -33 +39 @@
                 if (array_search(0,$selected)===0) {
                         $r = new WP_Query($author_where . $tag_where ."showposts=$disp_count&what_to_show=posts&nopaging=0&post_status=publish");
-
                 } else {
                         $cat_id = implode(',',$selected);
-                        $r = new WP_Query($author_where . $tag_where . "cat=$cat_id&showposts=$disp_count&what_to_show=posts&nopaging=0&post_status=publish");
+                        $r = new WP_Query($author_where . $tag_where ."cat=$cat_id&showposts=$disp_count&what_to_show=posts&nopaging=0&post_status=publish");
                 }
                 while($r->have_posts()){                        
                         $r->the_post();
+                        if ($day_select == 1){
+                                $post_date = mktime (0, 0, 0, get_the_time("m"), get_the_time("d"), get_the_time("Y"));
+                                $base_date = $date_today - $between_days;
+                                if ($post_date < $base_date) continue;
+                        }
+                        if ($day_select == 2){
+                                $post_date = mktime (0, 0, 0, get_the_time("m"), get_the_time("d"), get_the_time("Y"));
+                                if (empty($lastes_date)) $lastes_date = $post_date;
+                                $base_date = $lastes_date - $between_days;
+                                if ($post_date < $base_date) continue;
+                        }
+                        
                         ob_start();
                                 the_ID();

trunk/xpressme_integration_kit/xoops_version.php

@@ -47 +47 @@
 
 // status
-$modversion['codename'] = "Bata2(r424)";
+$modversion['codename'] = "Bata2(r425)";
 
 // onInstall, onUpdate, onUninstall
@@ -144 +144 @@
         'edit_func'     => "b_". $mydirname . "_content_edit" ,
         'template'              => '' ,
-        'options'               => $mydirname. '||10|0|100||||0' ,
+        'options'               => $mydirname. '||0|0|10|0|100||||0' ,
         'can_clone'             => true ,
         'func_num'              => $b_no,