Index: trunk/wp-content/plugins/xpressme/xpressme_class.php
===================================================================
--- trunk/wp-content/plugins/xpressme/xpressme_class.php	(revision 20)
+++ trunk/wp-content/plugins/xpressme/xpressme_class.php	(revision 21)
@@ -62,4 +62,27 @@
 		$this->is_use_xoops_upload_path = stripslashes(trim($_POST['ch_is_use_xoops_upload_path']));
 	}
+	
+	function yes_no_radio_option($option_name,$option_desc,$yes = '',$no= ''){
+	if (empty( $yes ))  $yes = __('YES','xpressme') ;
+	if (empty( $no ))  $no = __('NO','xpressme') ;
+	$value = $this->{$option_name};
+	$ans_name = 'ch_' . $option_name;
+	
+	$form  =  "<tr>\n";
+	$form .=  '<th><label for="images_to_link">' . $option_desc . "</label></th>\n";
+	$form .=  "<td>\n";
+	if ($value){
+		$form .= "<label><input type='radio' name='". $ans_name . "' value='1' checked='checked' />" . $yes ."</label><br />\n";
+		$form .= "<label><input type='radio' name='". $ans_name . "' value='0' />". $no . "</label>\n";
+	}else{
+		$form .= "<label><input type='radio' name='". $ans_name . "' value='1' />" . $yes . "</label><br />\n";
+		$form .= "<label><input type='radio' name='". $ans_name . "' value='0' checked='checked' />". $no ."</label>\n";
+	}
+	$form .=  "</td>\n";
+	$form .=  "</tr><tr>\n";
+		
+    return $form;
+	
+}
 		
 	function option_page()
@@ -74,41 +97,26 @@
 
 		
-		echo	'<div class="wrap">';
-		echo		'<div id="icon-options-general" class="icon32"><br /></div>';
-		echo		'<h2>' . __('XPressME Configuration Page', 'xpressme') . '</h2> ';
+		echo	'<div class="wrap">'."\n";
+		echo		'<div id="icon-options-general" class="icon32"><br /></div>'."\n";
+		echo		'<h2>' . __('XPressME Configuration Page', 'xpressme') . "</h2>\n";
+		echo		'<form method="post" action="' . $_SERVER["REQUEST_URI"] . '">'."\n" ;
+		echo			'<table class="form-table">'."\n";
+		echo				$this->yes_no_radio_option('is_use_xoops_upload_path',
+												__('Media Upload Base Path','xpressme'),
+												__('Use XOOPS UPLOAD PATH','xpressme'),
+												__('USE WordPress BASE_PATH')
+												);
+			
+//		$this->is_use_xoops_upload_path_html();
+		echo			"</table>\n";
+		
+		echo		'<p class="submit">'."\n";
+		echo		'<input type="submit" value= "' . __('Update Config', 'xpressme') . '" name="submit_update" />' ."\n";
+		echo		'<input type="submit" value= "' . __('Preset Config', 'xpressme') . '" name="submit_reset" />' ."\n";
+		echo		"</p>\n";
 
-		echo		'<form method="post" action="' . $_SERVER["REQUEST_URI"] . '">' ;
-		echo			'<table class="form-table">';
-							$this->is_use_xoops_upload_path_html();
-		echo			'</table>';
-		
-		echo		'<p class="submit">';
-		echo		'<input type="submit" value= "' . __('Update Config', 'xpressme') . '" name="submit_update" />';
-		echo		'<input type="submit" value= "' . __('Preset Config', 'xpressme') . '" name="submit_reset" />';
-		echo		'</p>';
-
-		echo		'</form>' ;
-		echo	'</div>';
+		echo		"</form>\n" ;
+		echo	"</div>\n";
 	}
-
-	function is_use_xoops_upload_path_html()
-	{
-		
-		echo '<tr>';
-		echo '<th><label for="images_to_link">' . __('Media Upload Base Path','xpressme') . '</label></th>';
-		echo '<td>';
-
-		if ($this->is_use_xoops_upload_path == true){
-  			echo '<label><input type="radio" name="ch_is_use_xoops_upload_path"  value="1" checked="checked" /> ' . __('Use XOOPS UPLOAD PATH','xpressme') .'</label><br />';
-  			echo '<label><input type="radio" name="ch_is_use_xoops_upload_path" value="0" />' . __('USE WordPress BASE_PATH','xpressme') . '</label>';
-		} else {
-  			echo '<label><input type="radio" name="ch_is_use_xoops_upload_path"  value="1" /> ' . __('Use XOOPS UPLOAD PATH','xpressme') .'</label><br />';
-  			echo '<label><input type="radio" name="ch_is_use_xoops_upload_path" value="0" checked="checked" />' . __('USE WordPress BASE_PATH','xpressme') . '</label>';
-		}
-		echo '</td>';
-		echo '</tr><tr>';
-		
-	}
-
 	
 	function xpress_upload_filter($uploads)