strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

APC support is removed due to problems with PHP 5.5.

Browse source
This commit is contained in:
Michael Vogel 2014-05-03 12:02:25 +02:00
parent a6b03b6263
commit 2db1029830
4 changed files with 36 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/cache.php
View file

@ -5,17 +5,17 @@
class Cache { class Cache {
public static function get($key) { 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)) if (apc_exists($key))
return(apc_fetch($key)); return(apc_fetch($key));*/
$r = q("SELECT `v` FROM `cache` WHERE `k`='%s' limit 1", $r = q("SELECT `v` FROM `cache` WHERE `k`='%s' limit 1",
dbesc($key) dbesc($key)
); );
if (count($r)) { if (count($r)) {
if (function_exists("apc_store")) /*if (function_exists("apc_store"))
apc_store($key, $r[0]['v'], 600); apc_store($key, $r[0]['v'], 600);*/
return $r[0]['v']; return $r[0]['v'];
} }
@ -29,8 +29,8 @@
dbesc($value), dbesc($value),
dbesc(datetime_convert())); dbesc(datetime_convert()));
if (function_exists("apc_store")) /*if (function_exists("apc_store"))
apc_store($key, $value, 600); apc_store($key, $value, 600);*/
} }

37
include/config.php
View file

@ -19,8 +19,6 @@ if(! function_exists('load_config')) {
function load_config($family) { function load_config($family) {
global $a; global $a;
// To-Do: How to integrate APC here?
$r = q("SELECT * FROM `config` WHERE `cat` = '%s'", dbesc($family)); $r = q("SELECT * FROM `config` WHERE `cat` = '%s'", dbesc($family));
if(count($r)) { if(count($r)) {
foreach($r as $rr) { 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 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)) { if (apc_exists($family."|".$key)) {
$val = apc_fetch($family."|".$key); $val = apc_fetch($family."|".$key);
$a->config[$family][$key] = $val; $a->config[$family][$key] = $val;
@ -87,6 +85,7 @@ function get_config($family, $key, $instore = false) {
else else
return $val; return $val;
} }
*/
$ret = q("SELECT `v` FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1", $ret = q("SELECT `v` FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
dbesc($family), dbesc($family),
@ -98,10 +97,10 @@ function get_config($family, $key, $instore = false) {
$a->config[$family][$key] = $val; $a->config[$family][$key] = $val;
// If APC is enabled then store the data there, else try XCache // 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); apc_store($family."|".$key, $val, 600);
elseif (function_exists("xcache_set")) elseif (function_exists("xcache_set"))
xcache_set($family."|".$key, $val, 600); xcache_set($family."|".$key, $val, 600);*/
return $val; return $val;
} }
@ -109,10 +108,10 @@ function get_config($family, $key, $instore = false) {
$a->config[$family][$key] = '!<unset>!'; $a->config[$family][$key] = '!<unset>!';
// If APC is enabled then store the data there, else try XCache // 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); apc_store($family."|".$key, '!<unset>!', 600);
elseif (function_exists("xcache_set")) elseif (function_exists("xcache_set"))
xcache_set($family."|".$key, '!<unset>!', 600); xcache_set($family."|".$key, '!<unset>!', 600);*/
} }
return false; return false;
}} }}
@ -157,10 +156,10 @@ function set_config($family,$key,$value) {
$a->config[$family][$key] = $value; $a->config[$family][$key] = $value;
// If APC is enabled then store the data there, else try XCache // 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); apc_store($family."|".$key, $value, 600);
elseif (function_exists("xcache_set")) elseif (function_exists("xcache_set"))
xcache_set($family."|".$key, $value, 600); xcache_set($family."|".$key, $value, 600);*/
if($ret) if($ret)
return $value; 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 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)) { if (apc_exists($uid."|".$family."|".$key)) {
$val = apc_fetch($uid."|".$family."|".$key); $val = apc_fetch($uid."|".$family."|".$key);
$a->config[$uid][$family][$key] = $val; $a->config[$uid][$family][$key] = $val;
@ -229,7 +228,7 @@ function get_pconfig($uid,$family, $key, $instore = false) {
return false; return false;
else else
return $val; return $val;
} }*/
$ret = q("SELECT `v` FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1", $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; $a->config[$uid][$family][$key] = $val;
// If APC is enabled then store the data there, else try XCache // 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); apc_store($uid."|".$family."|".$key, $val, 600);
elseif (function_exists("xcache_set")) elseif (function_exists("xcache_set"))
xcache_set($uid."|".$family."|".$key, $val, 600); xcache_set($uid."|".$family."|".$key, $val, 600);*/
return $val; return $val;
} }
@ -254,10 +253,10 @@ function get_pconfig($uid,$family, $key, $instore = false) {
$a->config[$uid][$family][$key] = '!<unset>!'; $a->config[$uid][$family][$key] = '!<unset>!';
// If APC is enabled then store the data there, else try XCache // 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); apc_store($uid."|".$family."|".$key, '!<unset>!', 600);
elseif (function_exists("xcache_set")) elseif (function_exists("xcache_set"))
xcache_set($uid."|".$family."|".$key, '!<unset>!', 600); xcache_set($uid."|".$family."|".$key, '!<unset>!', 600);*/
} }
return false; return false;
}} }}
@ -273,10 +272,10 @@ function del_config($family,$key) {
dbesc($key) dbesc($key)
); );
// If APC is enabled then delete the data from there, else try XCache // 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); apc_delete($family."|".$key);
elseif (function_exists("xcache_unset")) elseif (function_exists("xcache_unset"))
xcache_unset($family."|".$key); xcache_unset($family."|".$key);*/
return $ret; return $ret;
}} }}
@ -316,10 +315,10 @@ function set_pconfig($uid,$family,$key,$value) {
$a->config[$uid][$family][$key] = $value; $a->config[$uid][$family][$key] = $value;
// If APC is enabled then store the data there, else try XCache // 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); apc_store($uid."|".$family."|".$key, $value, 600);
elseif (function_exists("xcache_set")) elseif (function_exists("xcache_set"))
xcache_set($uid."|".$family."|".$key, $value, 600); xcache_set($uid."|".$family."|".$key, $value, 600);*/
if($ret) if($ret)

9
mod/admin.php
View file

@ -87,10 +87,11 @@ function admin_content(&$a) {
if(x($_SESSION,'submanage') && intval($_SESSION['submanage'])) if(x($_SESSION,'submanage') && intval($_SESSION['submanage']))
return ""; return "";
if (function_exists("apc_delete")) { // APC deactivated, since there are problems with PHP 5.5
$toDelete = new APCIterator('user', APC_ITER_VALUE); //if (function_exists("apc_delete")) {
apc_delete($toDelete); // $toDelete = new APCIterator('user', APC_ITER_VALUE);
} // apc_delete($toDelete);
//}
/** /**
* Side bar links * Side bar links

11
mod/settings.php
View file

@ -16,10 +16,11 @@ function get_theme_config_file($theme){
function settings_init(&$a) { function settings_init(&$a) {
if (function_exists("apc_delete")) { // APC deactivated, since there are problems with PHP 5.5
$toDelete = new APCIterator('user', APC_ITER_VALUE); //if (function_exists("apc_delete")) {
apc_delete($toDelete); // $toDelete = new APCIterator('user', APC_ITER_VALUE);
} // apc_delete($toDelete);
//}
// These lines provide the javascript needed by the acl selector // 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'); $pageset_tpl = get_markup_template('pagetypes.tpl');
$pagetype = replace_macros($pageset_tpl, array( $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, '$page_normal' => array('page-flags', t('Normal Account Page'), PAGE_NORMAL,
t('This account is a normal personal profile'), t('This account is a normal personal profile'),
($a->user['page-flags'] == PAGE_NORMAL)), ($a->user['page-flags'] == PAGE_NORMAL)),