From 1ebd86cfbdbe9092b01ccc32bd801d333d0ead78 Mon Sep 17 00:00:00 2001
From: real_nowhereman <real_nowhereman@aa359531-4221-0410-9edc-b0b45c38dadb>
Date: Tue, 6 Nov 2007 18:57:10 +0000
Subject: [PATCH] fixed bugs in plugin config and asymmetry for
 plugin_getoptions(); fixed akismet consequently

---
 fp-includes/core/core.config.php                 |  3 +--
 fp-includes/core/core.plugins.php                | 15 ++++++++++++---
 fp-plugins/akismet/plugin.akismet.php            |  5 ++++-
 fp-plugins/akismet/tpls/admin.plugin.akismet.tpl |  2 +-
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/fp-includes/core/core.config.php b/fp-includes/core/core.config.php
index e34bdc3..a077b9f 100755
--- a/fp-includes/core/core.config.php
+++ b/fp-includes/core/core.config.php
@@ -44,8 +44,7 @@
 			global $fp_config;
 			$conf_arr=$fp_config;
 		}
-		//print_r($conf_arr);
-		
+	
 		$arr = array('fp_config' => $conf_arr);
 		return system_save($conffile, $arr);
 	}
diff --git a/fp-includes/core/core.plugins.php b/fp-includes/core/core.plugins.php
index d6ca3ef..4f6926c 100644
--- a/fp-includes/core/core.plugins.php
+++ b/fp-includes/core/core.plugins.php
@@ -169,14 +169,23 @@
 	 *
 	 */
 	
-	function plugin_getoption($plugin, $key) {
+	function plugin_getoptions($plugin, $key=null) {
 		global $fp_config;
-		return $fp_config['plugins'][ $plugin ][ $key ];
+		
+		if ($key)
+			return @$fp_config['plugins'][ $plugin ][ $key ];
+		
+		return @$fp_config['plugins'][ $plugin ];
 	}
 	
 	function plugin_addoption($plugin, $key, $val) {
 		global $fp_config;
-		return $fp_config['plugins'][ $plugin ][ $key ][ $val ];
+		if (!isset($fp_config['plugins']))
+			$fp_config['plugins'] = array();
+		if (!isset($fp_config['plugins'][$plugin]))
+			$fp_config['plugins'][$plugin] = array();
+		
+		return $fp_config['plugins'][ $plugin ][ $key ] = $val ;
 	}
 	
 	function plugin_saveoptions($null=null) {
diff --git a/fp-plugins/akismet/plugin.akismet.php b/fp-plugins/akismet/plugin.akismet.php
index af26a06..1f7ca2f 100644
--- a/fp-plugins/akismet/plugin.akismet.php
+++ b/fp-plugins/akismet/plugin.akismet.php
@@ -57,7 +57,10 @@ if (class_exists('AdminPanelAction')){
 			$this->smarty->assign('admin_resource', "plugin:akismet/admin.plugin.akismet");
 		}
 		
-		
+		function main() {
+			$akismetconf = plugin_getoptions('akismet');
+			$this->smarty->assign('akismetconf', $akismetconf);
+		}
 		
 		function onsubmit() {
 			global $fp_config;
diff --git a/fp-plugins/akismet/tpls/admin.plugin.akismet.tpl b/fp-plugins/akismet/tpls/admin.plugin.akismet.tpl
index 19a3fd0..e79dc33 100644
--- a/fp-plugins/akismet/tpls/admin.plugin.akismet.tpl
+++ b/fp-plugins/akismet/tpls/admin.plugin.akismet.tpl
@@ -8,7 +8,7 @@
 {html_form}
 	
 	<h4><label for="wp-apikey">{$plang.apikey}</label></h4>
-	<p><input id="wp-apikey" type="text" name="wp-apikey" value="{$fp_config.plugins.akismet.apikey}" /> 
+	<p><input id="wp-apikey" type="text" name="wp-apikey" value="{$akismetconf.apikey}" /> 
 	<input type="submit" value="{$plang.submit}"/> </p>
 	<p> {$plang.whatis} </p>