From 0d25e953c9e4c5ad27cd6a138cbdc5e2ce8111a2 Mon Sep 17 00:00:00 2001
From: "Philip M. Hofer (Frumph)" <frumph_dragon@yahoo.com>
Date: Thu, 31 Dec 2009 14:57:50 -0800
Subject: [PATCH] Part 2 of the configoptions.php addition and revamp removal
 of the comicpress-config.php

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
---
 comicpress-options.php    |  22 ++++++-
 functions.php             |  21 +++----
 options/configoptions.php | 123 ++++++++++++++++++++++++++++++++++++--
 3 files changed, 151 insertions(+), 15 deletions(-)

diff --git a/comicpress-options.php b/comicpress-options.php
index 6b18846..e97e2d5 100644
--- a/comicpress-options.php
+++ b/comicpress-options.php
@@ -179,6 +179,26 @@ function comicpress_admin() {
 			$tab = 'buyprint';
 			update_option('comicpress_options',$comicpress_options);
 		}
+
+		if ($_REQUEST['action'] == 'comicpress_save_config') {
+			
+			foreach (array(
+				'comiccat',
+				'blogcat',
+				'comic_folder',
+				'rss_comic_folder',
+				'archive_comic_folder',
+				'mini_comic_folder',
+				'archive_comic_width',
+				'rss_comic_width',
+				'mini_comic_width',
+				'blog_postcount'
+						) as $key) {
+				$comicpress_options['comicpress_config'][$key] = wp_filter_nohtml_kses($_REQUEST[$key]);
+			}
+			$tab = 'config';
+			update_option('comicpress_options',$comicpress_options);
+		}
 		
 		if ($tab) {
 			?>
@@ -186,7 +206,7 @@ function comicpress_admin() {
 			<script>function hidemessage() { document.getElementById('message').style.display = 'none'; }</script>
 		<?php }  
 		}
-		if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'comicpress_reset') {
+		if ($_REQUEST['action'] == 'comicpress_reset') {
 			delete_option('comicpress_options');
 			$comicpress_options = comicpress_load_options();
 		?>
diff --git a/functions.php b/functions.php
index a53e4e3..fbe4c1b 100644
--- a/functions.php
+++ b/functions.php
@@ -43,20 +43,12 @@ function __comicpress_widgets_init() {
 }
 
 function __comicpress_init() {
-	global $comicpress_options, $__comicpress_handlable_classes, $comiccat, $blogcat,
-	$comic_folder, $rss_comic_folder, $archive_comic_folder, $mini_comic_folder, $archive_comic_width,
-	$rss_comic_width, $blog_postcount;
+	global $comicpress_options, $__comicpress_handlable_classes;
 
 	$comicpress_options = array();
 	
 	// Check if the $comicpress_options exist, if not set defaults
 	$comicpress_options = comicpress_load_options();
-
-	if (file_exists(get_template_directory() . '/comicpress-config.php')) {
-		include(get_template_directory() . '/comicpress-config.php');
-	} else {
-		extract($comicpress_options['comicpress_config']);
-	}
 	
 	// xili-language plugin check
 	if (class_exists('xili_language')) {
@@ -106,7 +98,9 @@ add_action('widgets_init', '__comicpress_widgets_init');
 add_action('init', '__comicpress_init');
 
 function comicpress_load_options() {
-	global $comicpress_options;
+	global $comicpress_options, $comiccat, $blogcat, $comic_folder, $rss_comic_folder, 
+	$archive_comic_folder, $mini_comic_folder, $archive_comic_width,
+	$rss_comic_width, $blog_postcount;
 	
 	$comicpress_options = get_option('comicpress_options');
 	if (empty($comicpress_options)) {
@@ -216,6 +210,13 @@ function comicpress_load_options() {
 		// update_option('comicpress_options', $comicpress_options);
 	}
 	$comicpress_options['comicpress_version'] = '2.9.0.9';
+	
+//	if (file_exists(get_template_directory() . '/comicpress-config.php')) {
+//		include(get_template_directory() . '/comicpress-config.php');
+//	} else {
+		extract($comicpress_options['comicpress_config']);
+//	}	
+	
 	update_option('comicpress_options', $comicpress_options);
 	return $comicpress_options;
 }
diff --git a/options/configoptions.php b/options/configoptions.php
index 1bcc80c..07f45b9 100644
--- a/options/configoptions.php
+++ b/options/configoptions.php
@@ -6,17 +6,19 @@
 		<div id="comicpress-options">
 
 			<table class="widefat">
+			
 				<thead>
 					<tr>
-						<th colspan="2"><?php _e('Configuration','comicpress'); ?></th>
+						<th colspan="5"><?php _e('Configuration','comicpress'); ?></th>
 					</tr>
 				</thead>
+				
 				<tr class="alternate">
 					<th scope="row">
 						<label for="comiccat"><?php _e('Comic Category','comicpress'); ?></label>
 						<?php 
-							global $comiccat;
-							$select = wp_dropdown_categories('show_option_none=Select category&show_count=0&orderby=name&echo=0&selected='.$comiccat); 
+							$comiccat = $comicpress_options['comicpress_config']['comiccat'];
+							$select = wp_dropdown_categories('show_option_all=Select category&hide_empty=0&show_count=0&orderby=name&echo=0&selected='.$comiccat); 
 							$select = preg_replace('#<select([^>]*)>#', '<select name="comiccat" id="comicccat">', $select);
 							echo $select;
 						?>
@@ -25,6 +27,119 @@
 						<?php _e('The category that is designated for the primary comic category.','comicpress'); ?>
 					</td>
 				</tr>
+			
+				<tr>
+					<th scope="row">
+						<label for="comiccat"><?php _e('Blog Category','comicpress'); ?></label>
+						<?php 
+							$blogcat = $comicpress_options['comicpress_config']['blogcat'];
+							$select = wp_dropdown_categories('show_option_all=Select category&hide_empty=0&show_count=0&orderby=name&echo=0&selected='.$blogcat); 
+							$select = preg_replace('#<select([^>]*)>#', '<select name="blogcat" id="blogcat">', $select);
+							echo $select;
+						?>
+					</th>
+					<td>
+						<?php _e('The primary blog category.','comicpress'); ?>
+					</td>
+				</tr>
+				
+				<?php 
+					$dirs_to_search = array_unique(array(ABSPATH));
+					$directories = array();
+					foreach ($dirs_to_search as $dir) { $directories = array_merge($directories,glob("${dir}/*")); }
+					
+					$current_directory = $comicpress_options['comicpress_config']['comic_folder'];
+				?>	
+				<tr class="alternate">
+					<th scope="row"><label for="comic_folder"><?php _e('Comic Folder','comicpress'); ?></label>	
+						
+							<select name="comic_folder" id="comic_folder">
+								<?php
+									foreach ($directories as $dirs) {
+										if (is_dir($dirs)) { 
+											$dir_name = basename($dirs); ?>
+											<option class="level-0" value="<?php echo $dir_name; ?>" <?php if ($current_directory == $dir_name) { ?>selected="selected"<?php } ?>><?php echo $dir_name; ?></option>
+									<?php }
+									}
+								?>
+							</select>
+						
+					</th>
+					<td>
+						<?php _e('Choose a directory to get the original sized comics from.','comicpress'); ?>
+					</td>
+				</tr>
+				
+				<?php 
+					$current_directory = $comicpress_options['comicpress_config']['rss_comic_folder'];
+				?>	
+				<tr>
+					<th scope="row"><label for="rss_comic_folder"><?php _e('RSS Thumbnail Folder','comicpress'); ?></label>	
+						
+							<select name="rss_comic_folder" id="rss_comic_folder">
+								<?php
+									foreach ($directories as $dirs) {
+										if (is_dir($dirs)) { 
+											$dir_name = basename($dirs); ?>
+											<option class="level-0" value="<?php echo $dir_name; ?>" <?php if ($current_directory == $dir_name) { ?>selected="selected"<?php } ?>><?php echo $dir_name; ?></option>
+									<?php }
+									}
+								?>
+							</select>
+						
+					</th>
+					<td>
+						<?php _e('Choose a directory to get the RSS thumbnails from.','comicpress'); ?>
+					</td>
+				</tr>				
+
+				<?php 
+					$current_directory = $comicpress_options['comicpress_config']['archive_comic_folder'];
+				?>	
+				<tr class="alternate">
+					<th scope="row"><label for="archive_comic_folder"><?php _e('Archive Thumbnail Folder','comicpress'); ?></label>	
+						
+							<select name="archive_comic_folder" id="archive_comic_folder">
+								<?php
+									foreach ($directories as $dirs) {
+										if (is_dir($dirs)) { 
+											$dir_name = basename($dirs); ?>
+											<option class="level-0" value="<?php echo $dir_name; ?>" <?php if ($current_directory == $dir_name) { ?>selected="selected"<?php } ?>><?php echo $dir_name; ?></option>
+									<?php }
+									}
+								?>
+							</select>
+						
+					</th>
+					<td>
+						<?php _e('Choose a directory to get the ARCHIVE/SEARCH thumbnails from.','comicpress'); ?>
+					</td>
+				</tr>
+				
+				<?php 
+					$current_directory = $comicpress_options['comicpress_config']['mini_comic_folder'];
+				?>	
+				<tr>
+					<th scope="row"><label for="mini_comic_folder"><?php _e('Mini Thumbnail Folder','comicpress'); ?></label>	
+						
+							<select name="mini_comic_folder" id="mini_comic_folder">
+								<?php
+									foreach ($directories as $dirs) {
+										if (is_dir($dirs)) { 
+											$dir_name = basename($dirs); ?>
+											<option class="level-0" value="<?php echo $dir_name; ?>" <?php if ($current_directory == $dir_name) { ?>selected="selected"<?php } ?>><?php echo $dir_name; ?></option>
+									<?php }
+									}
+								?>
+							</select>
+						
+					</th>
+					<td>
+						<?php _e('Choose a directory to get the MINI thumbnails from. (for archive-comic-list, etc.)','comicpress'); ?>
+					</td>
+				</tr>
+
+				
 			</table>
 
 		</div>
@@ -33,7 +148,7 @@
 			<div id="major-publishing-actions">
 				<div id="publishing-action">
 					<input name="comicpress_save_config" type="submit" class="button-primary" value="Save Settings" />
-					<input type="hidden" name="action" value="comicpress_save_members" />
+					<input type="hidden" name="action" value="comicpress_save_config" />
 				</div>
 				<div class="clear"></div>
 			</div>