Added more options.

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@165 7be80a69-a1ef-0310-a953-fb0f7c49ff36

2 files changed, 56 insertions, 26 deletions

diff --git a/wp-inst/wp-admin/wpmu-edit.php b/wp-inst/wp-admin/wpmu-edit.php
index e0ec07f..5824e40 100644
--- a/wp-inst/wp-admin/wpmu-edit.php
+++ b/wp-inst/wp-admin/wpmu-edit.php
@@ -12,10 +12,18 @@ switch( $_GET[ 'action' ] ) {
 	case "siteoptions":
 		update_site_option( "WPLANG", $_POST[ 'WPLANG' ] );
 		update_site_option( "illegal_names", split( ' ', $wpdb->escape( $_POST[ 'illegal_names' ] ) ) );
-		update_site_option( "limited_email_domains", split( ' ', $wpdb->escape( $_POST[ 'limited_email_domains' ] ) ) );
+		if( $_POST[ 'limited_email_domains' ] != '' ) {
+			update_site_option( "limited_email_domains", split( ' ', $wpdb->escape( $_POST[ 'limited_email_domains' ] ) ) );
+		} else {
+			update_site_option( "limited_email_domains", '' );
+		}
 		update_site_option( "menu_items", $_POST[ 'menu_items' ] );
 		update_site_option( "blog_upload_space", $_POST[ 'blog_upload_space' ] );
 		update_site_option( "upload_filetypes", $_POST[ 'upload_filetypes' ] );
+		update_site_option( "site_name", $_POST[ 'site_name' ] );
+		update_site_option( "first_post", $_POST[ 'first_post' ] );
+		update_site_option( "welcome_email", $_POST[ 'welcome_email' ] );
+		update_site_option( "fileupload_maxk", $_POST[ 'fileupload_maxk' ] );
 		header( "Location: wpmu-options.php?updated=true" );
 		exit;
 	break;
diff --git a/wp-inst/wp-admin/wpmu-options.php b/wp-inst/wp-admin/wpmu-options.php
index a98e69b..74a07a1 100644
--- a/wp-inst/wp-admin/wpmu-options.php
+++ b/wp-inst/wp-admin/wpmu-options.php
@@ -18,6 +18,53 @@ if (isset($_GET['updated'])) {
 	<h2><?php _e('Site Options') ?></h2> 
 	<form name="form1" method="post" action="wpmu-edit.php?action=siteoptions"> 
 	<fieldset class="options">
+		<legend><?php _e('Operational Settings <em>(These settings cannot be modified by blog owners)</em>') ?></legend> 
+		<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
+		<tr valign="top"> 
+		<th scope="row"><?php _e('Site Name:') ?></th> 
+		<td><input name="site_name" type="text" id="site_name" style="width: 95%" value="<?php echo $current_site->site_name ?>" size="45" />
+		<br />
+		<?php _e('What you would like to call this website.') ?></td> 
+		</tr> 
+		<tr valign="top"> 
+		<th scope="row"><?php _e('Welcome Email:') ?></th> 
+		<td><textarea name="welcome_email" id="welcome_email" rows='5' cols='45' style="width: 95%"><?php echo stripslashes( get_site_option('welcome_email') ) ?></textarea>
+		<br />
+		<?php _e('The welcome email sent to new blog owners.') ?></td> 
+		</tr> 
+		<tr valign="top"> 
+		<th scope="row"><?php _e('First Post:') ?></th> 
+		<td><textarea name="first_post" id="first_post" rows='5' cols='45' style="width: 95%"><?php echo stripslashes( get_site_option('first_post') ) ?></textarea>
+		<br />
+		<?php _e('First post on a new blog.') ?></td> 
+		</tr> 
+		<tr valign="top"> 
+		<th scope="row"><?php _e('Banned Names:') ?></th> 
+		<td><input name="illegal_names" type="text" id="illegal_names" style="width: 95%" value="<?php echo implode( " ", get_site_option('illegal_names') ); ?>" size="45" />
+		<br />
+		<?php _e('Users are not allowed to register these blogs. Separate names by spaces.') ?></td> 
+		</tr> 
+		<tr valign="top"> 
+		<th scope="row"><?php _e('Limited Email Registrations:') ?></th> 
+		<td><input name="limited_email_domains" type="text" id="limited_email_domains" style="width: 95%" value="<?php echo get_site_option('limited_email_domains') == '' ? '' : @implode( " ", get_site_option('limited_email_domains') ); ?>" size="45" />
+		<br />
+		<?php _e('If you want to limit blog registrations to certain domains. Separate domains by spaces.') ?></td> 
+		</tr> 
+		<tr valign="top"> 
+		<th scope="row"><?php _e('Blog upload space:') ?></th> 
+		<td><input name="blog_upload_space" type="text" id="blog_upload_space" value="<?php echo get_site_option('blog_upload_space', 10) ?>" size="3" /> MB
+		</tr> 
+		<tr valign="top"> 
+		<th scope="row"><?php _e('Upload File Types:') ?></th> 
+		<td><input name="upload_filetypes" type="text" id="upload_filetypes" value="<?php echo get_site_option('upload_filetypes', 'jpg jpeg png gif') ?>" size="45" />
+		</tr> 
+		<tr valign="top"> 
+		<th scope="row"><?php _e('Max upload file size:') ?></th> 
+		<td><input name="fileupload_maxk" type="text" id="fileupload_maxk" value="<?php echo get_site_option('fileupload_maxk', 300) ?>" size="5" /> KB
+		</tr> 
+		</table>
+	</fieldset>
+	<fieldset class="options">
 		<legend><?php _e('Site Wide Settings <em>(These settings may be overridden by blog owners)</em>') ?></legend> 
 		<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
 		<?php
@@ -45,31 +92,6 @@ if (isset($_GET['updated'])) {
 		</table>
 	</fieldset>
 	<fieldset class="options">
-		<legend><?php _e('Operational Settings <em>(These settings cannot be modified by blog owners)</em>') ?></legend> 
-		<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
-		<tr valign="top"> 
-		<th scope="row"><?php _e('Banned Names:') ?></th> 
-		<td><input name="illegal_names" type="text" id="illegal_names" style="width: 95%" value="<?php echo implode( " ", get_site_option('illegal_names') ); ?>" size="45" />
-		<br />
-		<?php _e('Users are not allowed to register these blogs. Separate names by spaces.') ?></td> 
-		</tr> 
-		<tr valign="top"> 
-		<th scope="row"><?php _e('Limited Email Registrations:') ?></th> 
-		<td><input name="limited_email_domains" type="text" id="limited_email_domains" style="width: 95%" value="<?php echo implode( " ", get_site_option('limited_email_domains') ); ?>" size="45" />
-		<br />
-		<?php _e('If you want to limit blog registrations to certain domains. Separate domains by spaces.') ?></td> 
-		</tr> 
-		<tr valign="top"> 
-		<th scope="row"><?php _e('Blog upload space:') ?></th> 
-		<td><input name="blog_upload_space" type="text" id="blog_upload_space" value="<?php echo get_site_option('blog_upload_space') == false ? 10 : get_site_option('blog_upload_space') ; ?>" size="3" /> MB
-		</tr> 
-		<tr valign="top"> 
-		<th scope="row"><?php _e('Upload File Types:') ?></th> 
-		<td><input name="upload_filetypes" type="text" id="upload_filetypes" value="<?php echo get_site_option('upload_filetypes') == false ? 'jpg jpeg png gif' : get_site_option('upload_filetypes') ; ?>" size="45" />
-		</tr> 
-		</table>
-	</fieldset>
-	<fieldset class="options">
 		<legend><?php _e('Menus <em>(Enable or disable WP Backend Menus)</em>') ?></legend> 
 		<table cellspacing="2" cellpadding="5" class="editform"> 
 		<tr><th scope='row'>Menu</th><th scope='row'>Enabled</th></tr>