From: Michael Vogel <icarus@dabo.de>
Date: Sat, 3 May 2014 10:02:25 +0000 (+0200)
Subject: APC support is removed due to problems with PHP 5.5.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2db10298300705557b80248ec7b25a06a9a12df0;p=friendica.git

APC support is removed due to problems with PHP 5.5.
---

diff --git a/include/cache.php b/include/cache.php
index 86539310af..3a18fe2a5a 100644
--- a/include/cache.php
+++ b/include/cache.php
@@ -5,17 +5,17 @@
 
 	class Cache {
 		public static function get($key) {
-			if (function_exists("apc_fetch") AND function_exists("apc_exists"))
+			/*if (function_exists("apc_fetch") AND function_exists("apc_exists"))
 				if (apc_exists($key))
-					return(apc_fetch($key));
+					return(apc_fetch($key));*/
 
 			$r = q("SELECT `v` FROM `cache` WHERE `k`='%s' limit 1",
 				dbesc($key)
 			);
 
 			if (count($r)) {
-				if (function_exists("apc_store"))
-					apc_store($key, $r[0]['v'], 600);
+				/*if (function_exists("apc_store"))
+					apc_store($key, $r[0]['v'], 600);*/
 
 				return $r[0]['v'];
 			}
@@ -29,8 +29,8 @@
 					dbesc($value),
 					dbesc(datetime_convert()));
 
-			if (function_exists("apc_store"))
-				apc_store($key, $value, 600);
+			/*if (function_exists("apc_store"))
+				apc_store($key, $value, 600);*/
 
 		}
 
diff --git a/include/config.php b/include/config.php
index e9da8e7b3d..05bcea6212 100644
--- a/include/config.php
+++ b/include/config.php
@@ -19,8 +19,6 @@ if(! function_exists('load_config')) {
 function load_config($family) {
 	global $a;
 
-	// To-Do: How to integrate APC here?
-
 	$r = q("SELECT * FROM `config` WHERE `cat` = '%s'", dbesc($family));
 	if(count($r)) {
 		foreach($r as $rr) {
@@ -67,7 +65,7 @@ function get_config($family, $key, $instore = false) {
 	}
 
 	// If APC is enabled then fetch the data from there, else try XCache
-	if (function_exists("apc_fetch") AND function_exists("apc_exists"))
+	/*if (function_exists("apc_fetch") AND function_exists("apc_exists"))
 		if (apc_exists($family."|".$key)) {
 			$val = apc_fetch($family."|".$key);
 			$a->config[$family][$key] = $val;
@@ -87,6 +85,7 @@ function get_config($family, $key, $instore = false) {
 			else
 				return $val;
 		}
+	*/
 
 	$ret = q("SELECT `v` FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
 		dbesc($family),
@@ -98,10 +97,10 @@ function get_config($family, $key, $instore = false) {
 		$a->config[$family][$key] = $val;
 
 		// If APC is enabled then store the data there, else try XCache
-		if (function_exists("apc_store"))
+		/*if (function_exists("apc_store"))
 			apc_store($family."|".$key, $val, 600);
 		elseif (function_exists("xcache_set"))
-			xcache_set($family."|".$key, $val, 600);
+			xcache_set($family."|".$key, $val, 600);*/
 
 		return $val;
 	}
@@ -109,10 +108,10 @@ function get_config($family, $key, $instore = false) {
 		$a->config[$family][$key] = '!<unset>!';
 
 		// If APC is enabled then store the data there, else try XCache
-		if (function_exists("apc_store"))
+		/*if (function_exists("apc_store"))
 			apc_store($family."|".$key, '!<unset>!', 600);
 		elseif (function_exists("xcache_set"))
-			xcache_set($family."|".$key, '!<unset>!', 600);
+			xcache_set($family."|".$key, '!<unset>!', 600);*/
 	}
 	return false;
 }}
@@ -157,10 +156,10 @@ function set_config($family,$key,$value) {
 	$a->config[$family][$key] = $value;
 
 	// If APC is enabled then store the data there, else try XCache
-	if (function_exists("apc_store"))
+	/*if (function_exists("apc_store"))
 		apc_store($family."|".$key, $value, 600);
 	elseif (function_exists("xcache_set"))
-		xcache_set($family."|".$key, $value, 600);
+		xcache_set($family."|".$key, $value, 600);*/
 
 	if($ret)
 		return $value;
@@ -210,7 +209,7 @@ function get_pconfig($uid,$family, $key, $instore = false) {
 	}
 
 	// If APC is enabled then fetch the data from there, else try XCache
-	if (function_exists("apc_fetch") AND function_exists("apc_exists"))
+	/*if (function_exists("apc_fetch") AND function_exists("apc_exists"))
 		if (apc_exists($uid."|".$family."|".$key)) {
 			$val = apc_fetch($uid."|".$family."|".$key);
 			$a->config[$uid][$family][$key] = $val;
@@ -229,7 +228,7 @@ function get_pconfig($uid,$family, $key, $instore = false) {
 				return false;
 			else
 				return $val;
-		}
+		}*/
 
 
 	$ret = q("SELECT `v` FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
@@ -243,10 +242,10 @@ function get_pconfig($uid,$family, $key, $instore = false) {
 		$a->config[$uid][$family][$key] = $val;
 
 		// If APC is enabled then store the data there, else try XCache
-		if (function_exists("apc_store"))
+		/*if (function_exists("apc_store"))
 			apc_store($uid."|".$family."|".$key, $val, 600);
 		elseif (function_exists("xcache_set"))
-			xcache_set($uid."|".$family."|".$key, $val, 600);
+			xcache_set($uid."|".$family."|".$key, $val, 600);*/
 
 		return $val;
 	}
@@ -254,10 +253,10 @@ function get_pconfig($uid,$family, $key, $instore = false) {
 		$a->config[$uid][$family][$key] = '!<unset>!';
 
 		// If APC is enabled then store the data there, else try XCache
-		if (function_exists("apc_store"))
+		/*if (function_exists("apc_store"))
 			apc_store($uid."|".$family."|".$key, '!<unset>!', 600);
 		elseif (function_exists("xcache_set"))
-			xcache_set($uid."|".$family."|".$key, '!<unset>!', 600);
+			xcache_set($uid."|".$family."|".$key, '!<unset>!', 600);*/
 	}
 	return false;
 }}
@@ -273,10 +272,10 @@ function del_config($family,$key) {
 		dbesc($key)
 	);
 	// If APC is enabled then delete the data from there, else try XCache
-	if (function_exists("apc_delete"))
+	/*if (function_exists("apc_delete"))
 		apc_delete($family."|".$key);
 	elseif (function_exists("xcache_unset"))
-		xcache_unset($family."|".$key);
+		xcache_unset($family."|".$key);*/
 
 	return $ret;
 }}
@@ -316,10 +315,10 @@ function set_pconfig($uid,$family,$key,$value) {
 	$a->config[$uid][$family][$key] = $value;
 
 	// If APC is enabled then store the data there, else try XCache
-	if (function_exists("apc_store"))
+	/*if (function_exists("apc_store"))
 		apc_store($uid."|".$family."|".$key, $value, 600);
 	elseif (function_exists("xcache_set"))
-		xcache_set($uid."|".$family."|".$key, $value, 600);
+		xcache_set($uid."|".$family."|".$key, $value, 600);*/
 
 
 	if($ret)
diff --git a/mod/admin.php b/mod/admin.php
index 2d46184a07..7cc5694e5f 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -87,10 +87,11 @@ function admin_content(&$a) {
 	if(x($_SESSION,'submanage') && intval($_SESSION['submanage']))
 		return "";
 
-	if (function_exists("apc_delete")) {
-		$toDelete = new APCIterator('user', APC_ITER_VALUE);
-		apc_delete($toDelete);
-	}
+	// APC deactivated, since there are problems with PHP 5.5
+	//if (function_exists("apc_delete")) {
+	//	$toDelete = new APCIterator('user', APC_ITER_VALUE);
+	//	apc_delete($toDelete);
+	//}
 
 	/**
 	 * Side bar links
diff --git a/mod/settings.php b/mod/settings.php
index 2519928b6d..4edd62f679 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -16,10 +16,11 @@ function get_theme_config_file($theme){
 
 function settings_init(&$a) {
 
-	if (function_exists("apc_delete")) {
-		$toDelete = new APCIterator('user', APC_ITER_VALUE);
-		apc_delete($toDelete);
-	}
+	// APC deactivated, since there are problems with PHP 5.5
+	//if (function_exists("apc_delete")) {
+	//	$toDelete = new APCIterator('user', APC_ITER_VALUE);
+	//	apc_delete($toDelete);
+	//}
 
 	// These lines provide the javascript needed by the acl selector
 
@@ -956,6 +957,8 @@ function settings_content(&$a) {
 
 	$pageset_tpl = get_markup_template('pagetypes.tpl');
 	$pagetype = replace_macros($pageset_tpl, array(
+		'$user' 	=> t("User Types"),
+		'$community' 	=> t("Community Types"),
 		'$page_normal' 	=> array('page-flags', t('Normal Account Page'), PAGE_NORMAL,
 									t('This account is a normal personal profile'),
 									($a->user['page-flags'] == PAGE_NORMAL)),