source code/html output cleanup

Lennie · Aug 1, 2011 · 3ebbeb0 · 3ebbeb0
1 parent 18f8585
commit 3ebbeb0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 26 deletions.
diff --git a/edit.php b/edit.php
@@ -227,7 +227,7 @@
 			echo "     <input type=\"submit\" class=\"button\" name=\"commit\" value=\"" . _('Commit changes') . "\">\n";
 			echo "     <input type=\"reset\" class=\"button\" name=\"reset\" value=\"" . _('Reset changes') . "\">\n"; 
 			echo "     <input type=\"submit\" class=\"button\" name=\"save_as\" value=\"" . _('Save as template') . "\">\n";
-			echo "    </form>";
+			echo "    </form>\n";
 		}
 
 		if ( $perm_content_edit == "all" || $perm_content_edit == "own" && $user_is_zone_owner == "1" ) {
@@ -250,29 +250,20 @@
 	            echo "        <td class=\"n\">\n";
 	            echo "         <select name=\"type\">\n";
 	            foreach (get_record_types() as $record_type) {
-	            	if (isset($type) && $type) {
-	                	if ($type == $record_type) {
-	                    	$add = " SELECTED";
-	                    }
-						else
-						{
-	                    	$add = "";
-	                    }
-	                }
-					else
-					{
-	                	if (preg_match('/in-addr.arpa/i', $zone_name) && strtoupper($record_type) == 'PTR')
-						{
-	                    	$add = " SELECTED";
-	                    }
-						else if (strtoupper($record_type) == 'A')
-						{
-	                    	$add = " SELECTED";
-	                    }
-						else
-						{
-	                    	$add = "";
+			if (isset($type) && $type) {
+	               		if ($type == $record_type) {
+					$add = " SELECTED";
+				} else {
+					$add = "";
 	                    }
+	                } else {
+				if (preg_match('/in-addr.arpa/i', $zone_name) && strtoupper($record_type) == 'PTR')
+	                    		$add = " SELECTED";
+				} else if (strtoupper($record_type) == 'A') {
+					$add = " SELECTED";
+				} else {
+					$add = "";
+				}
 	                 }
 	                 echo "          <option" . $add . " value=\"" . $record_type . "\">" . $record_type . "</option>\n";
 				}
@@ -283,7 +274,6 @@
 	            echo "        <td class=\"n\"><input type=\"text\" name=\"ttl\" class=\"sinput\" value=\"\"></td>\n";
 	            echo "       </tr>\n";
 	            echo "      </table>\n";
-	            echo "      <br>\n";
 	            echo "      <input type=\"submit\" name=\"commit\" value=\"" .  _('Add record') . "\" class=\"button\">\n";
 	            echo "     </form>\n";
 			}

diff --git a/edit_record.php b/edit_record.php
@@ -105,10 +105,8 @@
 		echo "      </tr>\n";
 	}
 	echo "      </table>\n";
-	echo "      <p>\n";
 	echo "       <input type=\"submit\" name=\"commit\" value=\"" . _('Commit changes') . "\" class=\"button\">&nbsp;&nbsp;\n";
         echo "       <input type=\"reset\" name=\"reset\" value=\"" . _('Reset changes') . "\" class=\"button\">&nbsp;&nbsp;\n";
-	echo "      </p>\n";
 	echo "     </form>\n";
 }