From 10eb79a629278e11a0ed56193adef9895ff73638 Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Sun, 19 Jun 2011 15:10:31 +0200
Subject: add array support to set_config and get_config

---
 boot.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'boot.php')

diff --git a/boot.php b/boot.php
index 5165dc990..3f69fd084 100644
--- a/boot.php
+++ b/boot.php
@@ -1243,8 +1243,10 @@ function get_config($family, $key, $instore = false) {
 		dbesc($key)
 	);
 	if(count($ret)) {
-		$a->config[$family][$key] = $ret[0]['v'];
-		return $ret[0]['v'];
+		// manage array value
+		$val = (preg_match("|^a:[0-9]+:{.*}$|", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']);
+		$a->config[$family][$key] = $val;
+		return $val;
 	}
 	else {
 		$a->config[$family][$key] = '!<unset>!';
@@ -1258,22 +1260,25 @@ function get_config($family, $key, $instore = false) {
 
 if(! function_exists('set_config')) {
 function set_config($family,$key,$value) {
-
 	global $a;
+	
+	// manage array value
+	$dbvalue = (is_array($value)?serialize($value):$value);
 
 	if(get_config($family,$key,true) === false) {
 		$a->config[$family][$key] = $value;
 		$ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ",
 			dbesc($family),
 			dbesc($key),
-			dbesc($value)
+			dbesc($dbvalue)
 		);
 		if($ret) 
 			return $value;
 		return $ret;
 	}
+	
 	$ret = q("UPDATE `config` SET `v` = '%s' WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
-		dbesc($value),
+		dbesc($dbvalue),
 		dbesc($family),
 		dbesc($key)
 	);
-- 
cgit v1.2.3


From b650183cd4b82325dcaf74a42386882ef1802750 Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Sun, 19 Jun 2011 15:42:06 +0200
Subject: Save in db if addon define "$addon_plugin_admin" function. Add
 "plugin_admin" column to "addon" table

---
 boot.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'boot.php')

diff --git a/boot.php b/boot.php
index 3f69fd084..555d2405c 100644
--- a/boot.php
+++ b/boot.php
@@ -6,7 +6,7 @@ ini_set('pcre.backtrack_limit', 250000);
 
 define ( 'FRIENDIKA_VERSION',      '2.2.1015' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
-define ( 'DB_UPDATE_VERSION',      1063      );
+define ( 'DB_UPDATE_VERSION',      1064      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -477,9 +477,13 @@ function install_plugin($plugin){
 	if(function_exists($plugin . '_install')) {
 		$func = $plugin . '_install';
 		$func();
-		$r = q("INSERT INTO `addon` (`name`, `installed`, `timestamp`) VALUES ( '%s', 1, %d ) ",
+		
+		$plugin_admin = (function_exists($plugin."_plugin_admin")?1:0);
+		
+		$r = q("INSERT INTO `addon` (`name`, `installed`, `timestamp`, `plugin_admin`) VALUES ( '%s', 1, %d , %d ) ",
 			dbesc($plugin),
-			intval($t)
+			intval($t),
+			$plugin_admin
 		);
 	}
 }}
-- 
cgit v1.2.3