Changeset 120 for trunk/blocks

Timestamp:

Mar 18, 2009, 10:59:02 PM (16 years ago)

Author:

toemon

Message:

ブロックオプションの$selected = array_slice()部分が最後になるようにするため、ブロックオプションの$this_templateの位置を最後尾から2番目に変更
Ver 0.09 bump

Location:

trunk/blocks

Files:

• archives_block.php (modified) (2 diffs)
• authors_block.php (modified) (1 diff)
• calender_block.php (modified) (1 diff)
• popular_posts_block.php (modified) (2 diffs)
• recent_comments_block.php (modified) (2 diffs)
• recent_posts_content_block.php (modified) (2 diffs)
• recent_posts_list_block.php (modified) (2 diffs)
• search_block.php (modified) (1 diff)

trunk/blocks/archives_block.php

@@ -19 +19 @@
         {
                 $mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
-                $type = empty( $options[1] ) ? false : true ;
-                $limit = empty( $options[2] ) ? '10' : $options[2] ;
-                $show_post_count = empty( $options[3] ) ? false : true ;                
-                $drop_down = empty( $options[4] ) ? false : true ;
-                $this_template = empty( $options[5] ) ? 'db:'.$mydirname.'_block_category.html' : trim( $options[3] );
+                $this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_block_category.html' : trim( $options[1] );
+                $type = empty( $options[2] ) ? false : true ;
+                $limit = empty( $options[3] ) ? '10' : $options[3] ;
+                $show_post_count = empty( $options[4] ) ? false : true ;                
+                $drop_down = empty( $options[5] ) ? false : true ;
                 
                 require_once(XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/blocks/block_common.php');
@@ -32 +32 @@
 
                 $form .= "<br />" . yes_no_radio_option('options[1]', _MB_XPRESS_ARC_TYPE , $type,$a_month,$a_week);
-                $form .= "<br />" . _MB_XPRESS_COUNT . "  <input type='text' name='options[2]' value='" . $limit . "' />";
-                $form .= "<br />" . yes_no_radio_option('options[3]', _MB_XPRESS_SHOW_NUM_OF_POST , $show_post_count);
-                $form .= "<br />" . yes_no_radio_option('options[4]', _MB_XPRESS_SHOW_DROP_DOWN , $drop_down);
+                $form .= "<br />" . _MB_XPRESS_COUNT . "  <input type='text' name='options[3]' value='" . $limit . "' />";
+                $form .= "<br />" . yes_no_radio_option('options[4]', _MB_XPRESS_SHOW_NUM_OF_POST , $show_post_count);
+                $form .= "<br />" . yes_no_radio_option('options[5]', _MB_XPRESS_SHOW_DROP_DOWN , $drop_down);
 //          $form .="<br /><input type='text' size='60' name='options[5]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' />";
             

trunk/blocks/authors_block.php

@@ -19 +19 @@
         {
                 $mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
-                $optioncount = empty( $options[1] ) ? false : true ;
-                $exclude_admin = empty( $options[2] ) ? false : true ;
-                $show_fullname = empty( $options[3] ) ? false : true ;
-                $hide_empty = empty( $options[4] ) ? false : true ;
-                $this_template = empty( $options[5] ) ? 'db:'.$mydirname.'_block_authors.html' : trim( $options[5] );
+                $this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_block_authors.html' : trim( $options[1] );
+                $optioncount = empty( $options[2] ) ? false : true ;
+                $exclude_admin = empty( $options[3] ) ? false : true ;
+                $show_fullname = empty( $options[4] ) ? false : true ;
+                $hide_empty = empty( $options[5] ) ? false : true ;
                 
                 require_once(XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/blocks/block_common.php');
                         
                 $form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />";
-                $form .= yes_no_radio_option('options[1]', _MB_XPRESS_SHOW_NUM_OF_POST , $optioncount);
-                $form .= "<br />" . yes_no_radio_option('options[2]', _MB_XPRESS_EXCLUEDEADMIN , $exclude_admin);
-                $form .= "<br />" . yes_no_radio_option('options[3]', _MB_XPRESS_SHOW_FULLNAME , $show_fullname);
-                                $form .= "<br />" . yes_no_radio_option('options[4]', _MB_XPRESS_HIDE_EMPTY , $hide_empty);
+                $form .= yes_no_radio_option('options[2]', _MB_XPRESS_SHOW_NUM_OF_POST , $optioncount);
+                $form .= "<br />" . yes_no_radio_option('options[3]', _MB_XPRESS_EXCLUEDEADMIN , $exclude_admin);
+                $form .= "<br />" . yes_no_radio_option('options[4]', _MB_XPRESS_SHOW_FULLNAME , $show_fullname);
+                                $form .= "<br />" . yes_no_radio_option('options[5]', _MB_XPRESS_HIDE_EMPTY , $hide_empty);
 //          $form .="<br /><input type='text' size='60' name='options[4]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' />";
             

trunk/blocks/calender_block.php

@@ -18 +18 @@
         {
                 $mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
-                $sun_color = empty( $options[1] ) ? '#DB0000' : $options[1] ;
-                $sat_color = empty( $options[2] ) ? '#004D99' : $options[2] ;
-                $this_template = empty( $options[3] ) ? 'db:'.$mydirname.'_calender_block.html' : trim( $options[3] );
+                $this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_calender_block.html' : trim( $options[1] );
+                $sun_color = empty( $options[2] ) ? '#DB0000' : $options[2] ;
+                $sat_color = empty( $options[3] ) ? '#004D99' : $options[3] ;
                 $mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
                 

trunk/blocks/popular_posts_block.php

@@ -17 +17 @@
         {
                 $mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
-                $disp_count = empty( $options[1] ) ? '10' : $options[1] ;
-                $show_month_range = empty( $options[2] ) ? '0' : $options[2] ;
-                $tag_select = $options[3] ;
-                $selected = array_slice($options, 4); // get allowed cats
-                $this_template = empty( $options[5] ) ? 'db:'.$mydirname.'_block_popular.html' : trim( $options[5] );
+                $this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_block_popular.html' : trim( $options[1] );
+                $disp_count = empty( $options[2] ) ? '10' : $options[2] ;
+                $show_month_range = empty( $options[3] ) ? '0' : $options[3] ;
+                $tag_select = $options[4] ;
+                $selected = array_slice($options, 5); // get allowed cats
                 $mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
                 
@@ -27 +27 @@
 
                 $form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />\n";
-                $form .= _MB_XPRESS_COUNT .": <input type='text' name='options[1]' value='" . $disp_count . "' /><br />\n";
-                $form .= _MB_MONTH_RANGE .": <input type='text' name='options[2]' value='" . $show_month_range . "' /><br />\n";
+                $form .= _MB_XPRESS_COUNT .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />\n";
+                $form .= _MB_MONTH_RANGE .": <input type='text' name='options[3]' value='" . $show_month_range . "' /><br />\n";
                 $form .= "<br />\n";
 
-                $form .= _MB_XPRESS_TAGS_SELECT .": <input type='text' name='options[3]' value='" . $tag_select . "' /><br />\n";       
+                $form .= _MB_XPRESS_TAGS_SELECT .": <input type='text' name='options[4]' value='" . $tag_select . "' /><br />\n";       
             $form .= _MB_XPRESS_CATS_SELECT ."<br />\n";
             $isAll = (count($selected)==0||empty($selected[0]))?true:false;

trunk/blocks/recent_comments_block.php

@@ -18 +18 @@
         {
                 $mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
-                $disp_count = empty( $options[1] ) ? '10' : $options[1] ;
-                $disp_length = empty( $options[2] ) ? '30' : $options[2] ;
-            $selected = array_slice($options,3); // get allowed cats
-                $this_template = empty( $options[4] ) ? 'db:'.$mydirname.'_recent_comments_block.html' : trim( $options[4] );
+                $this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_recent_comments_block.html' : trim( $options[1] );
+                $disp_count = empty( $options[2] ) ? '10' : $options[2] ;
+                $disp_length = empty( $options[3] ) ? '30' : $options[3] ;
+            $selected = array_slice($options,4); // get allowed cats
                 $mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
 
@@ -27 +27 @@
                 
                 $form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />";
-                $form .= _MB_XPRESS_COUNT .": <input type='text' name='options[1]' value='" . $disp_count . "' /><br />";
-                $form .= _MB_XPRESS_LENGTH .": <input type='text' name='options[2]' value='" . $disp_length . "' />";
+                $form .= _MB_XPRESS_COUNT .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />";
+                $form .= _MB_XPRESS_LENGTH .": <input type='text' name='options[3]' value='" . $disp_length . "' />";
             $form .= "<br /><br />" . _MB_XPRESS_COM_TYPE ;
             $isAll = (count($selected)==0||empty($selected[0]))?true:false;

trunk/blocks/recent_posts_content_block.php

@@ -18 +18 @@
         {
                 $mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
-                $disp_count =  ($options[1])?intval($options[1]):10;
-                $except = empty( $options[2] ) ? false : true ;
-                $except_size =  ($options[3])?intval($options[3]):100;
-                $tag_select = $options[4] ;
-            $selected = array_slice($options,5); // get allowed cats
-                $this_template = empty( $options[6] ) ? 'db:'.$mydirname.'_recent_posts_content_block.html' : trim( $options[5] );
+                $this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_recent_posts_content_block.html' : trim( $options[1] );
+                $disp_count =  ($options[2])?intval($options[2]):10;
+                $except = empty( $options[3] ) ? false : true ;
+                $except_size =  ($options[4])?intval($options[4]):100;
+                $tag_select = $options[5] ;
+            $selected = array_slice($options,6); // get allowed cats
 
                 $mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
@@ -30 +30 @@
                 
                 $form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />\n";
-                $form .= _MB_XPRESS_COUNT .": <input type='text' name='options[1]' value='" . $disp_count . "' /><br />\n";
-                $form .= yes_no_radio_option('options[2]', _MB_XPRESS_P_EXCEPT , $except) . "<br />\n";
-                $form .= _MB_XPRESS_P_EXCEPT_SIZE .": <input type='text' name='options[3]' value='" . $except_size . "' /><br />\n";
+                $form .= _MB_XPRESS_COUNT .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />\n";
+                $form .= yes_no_radio_option('options[3]', _MB_XPRESS_P_EXCEPT , $except) . "<br />\n";
+                $form .= _MB_XPRESS_P_EXCEPT_SIZE .": <input type='text' name='options[4]' value='" . $except_size . "' /><br />\n";
                 
                 $form .= "<br />\n";
-                $form .= _MB_XPRESS_TAGS_SELECT .": <input type='text' name='options[4]' value='" . $tag_select . "' /><br />\n";
+                $form .= _MB_XPRESS_TAGS_SELECT .": <input type='text' name='options[5]' value='" . $tag_select . "' /><br />\n";
             $form .= _MB_XPRESS_CATS_SELECT ."<br />\n";
             $isAll = (count($selected)==0||empty($selected[0]))?true:false;

trunk/blocks/recent_posts_list_block.php

@@ -17 +17 @@
         {
                 $mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
-                $disp_count = empty( $options[1] ) ? '10' : $options[1] ;
-                $disp_red = empty( $options[2] ) ? '1' : $options[2] ;
-                $disp_green = empty( $options[3] ) ? '7' : $options[3] ;
-                $tag_select = $options[4] ;
-                $selected = array_slice($options,5); // get allowed cats
-                $this_template = empty( $options[6] ) ? 'db:'.$mydirname.'_recent_posts_list_block.html' : trim( $options[6] );
+                $this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_recent_posts_list_block.html' : trim( $options[1] );
+                $disp_count = empty( $options[2] ) ? '10' : $options[2] ;
+                $disp_red = empty( $options[3] ) ? '1' : $options[3] ;
+                $disp_green = empty( $options[4] ) ? '7' : $options[4] ;
+                $tag_select = $options[5] ;
+                $selected = array_slice($options,6); // get allowed cats
                 $mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
                 
@@ -28 +28 @@
 
                 $form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />\n";
-                $form .= _MB_XPRESS_COUNT .": <input type='text' name='options[1]' value='" . $disp_count . "' /><br />\n";
-                $form .= _MB_XPRESS_REDNEW_DAYS .": <input type='text' name='options[2]' value='" . $disp_red . "' /><br />\n";
-                $form .= _MB_XPRESS_GREENNEW_DAYS .": <input type='text' name='options[3]' value='" . $disp_green . "' /><br />\n";
+                $form .= _MB_XPRESS_COUNT .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />\n";
+                $form .= _MB_XPRESS_REDNEW_DAYS .": <input type='text' name='options[3]' value='" . $disp_red . "' /><br />\n";
+                $form .= _MB_XPRESS_GREENNEW_DAYS .": <input type='text' name='options[4]' value='" . $disp_green . "' /><br />\n";
                 
             $form .= "<br />\n";
-                $form .= _MB_XPRESS_TAGS_SELECT .": <input type='text' name='options[4]' value='" . $tag_select . "' /><br />\n";
+                $form .= _MB_XPRESS_TAGS_SELECT .": <input type='text' name='options[5]' value='" . $tag_select . "' /><br />\n";
             $form .= _MB_XPRESS_CATS_SELECT ."<br />\n";
             $isAll = (count($selected)==0||empty($selected[0]))?true:false;

trunk/blocks/search_block.php

@@ -18 +18 @@
         {
                 $mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
-                $this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_block_search.html' : trim( $options[1] );
+                $this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_search_block.html' : trim( $options[1] );
                 $disp_count = empty( $options[2] ) ? '18' : $options[2] ;
                 $mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname ;