clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Enforce coding standards in Config.php and PConfig.php

This commit is contained in:
Hypolite Petovan 2016-10-17 16:53:37 -04:00
parent b50769b6d0
commit c168d7d4ca
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/Core/Config.php
View File

@ -70,7 +70,7 @@ class Config {
* If true the config is loaded from the db and not from the cache (default: false) * If true the config is loaded from the db and not from the cache (default: false)
* @return mixed Stored value or null if it does not exist * @return mixed Stored value or null if it does not exist
*/ */
public static function get($family, $key, $default_value=null, $refresh = false) { public static function get($family, $key, $default_value = null, $refresh = false) {
global $a; global $a;
@ -123,14 +123,14 @@ class Config {
* The value to store * The value to store
* @return mixed Stored $value or false if the database update failed * @return mixed Stored $value or false if the database update failed
*/ */
public static function set($family,$key,$value) { public static function set($family, $key, $value) {
global $a; global $a;
$a->config[$family][$key] = $value; $a->config[$family][$key] = $value;
// manage array value // manage array value
$dbvalue = (is_array($value)?serialize($value):$value); $dbvalue = is_array($value) ? serialize($value) : $value;
$dbvalue = (is_bool($dbvalue) ? intval($dbvalue) : $dbvalue); $dbvalue = is_bool($dbvalue) ? intval($dbvalue) : $dbvalue;
$ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) $ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' )
ON DUPLICATE KEY UPDATE `v` = '%s'", ON DUPLICATE KEY UPDATE `v` = '%s'",
@ -139,8 +139,9 @@ ON DUPLICATE KEY UPDATE `v` = '%s'",
dbesc($dbvalue), dbesc($dbvalue),
dbesc($dbvalue) dbesc($dbvalue)
); );
if($ret) if ($ret) {
return $value; return $value;
}
return $ret; return $ret;
} }

5
include/Core/PConfig.php
View File

@ -119,7 +119,7 @@ class PConfig {
* The value to store * The value to store
* @return mixed Stored $value or false * @return mixed Stored $value or false
*/ */
public static function set($uid,$family,$key,$value) { public static function set($uid, $family, $key, $value) {
global $a; global $a;
@ -136,8 +136,9 @@ ON DUPLICATE KEY UPDATE `v` = '%s'",
dbesc($dbvalue), dbesc($dbvalue),
dbesc($dbvalue) dbesc($dbvalue)
); );
if($ret) if ($ret) {
return $value; return $value;
}
return $ret; return $ret;
} }