Remove extra spaces before closing parentheses in src/
This commit is contained in:
parent
146646c4d4
commit
5dcf6bfc58
11 changed files with 24 additions and 24 deletions
|
@ -339,10 +339,10 @@ class BaseURL
|
||||||
* Not all of those $_SERVER properties can be present, so we do by inverse priority order
|
* Not all of those $_SERVER properties can be present, so we do by inverse priority order
|
||||||
*/
|
*/
|
||||||
$relative_script_path =
|
$relative_script_path =
|
||||||
($this->server['REDIRECT_URL'] ?? '' ) ?:
|
($this->server['REDIRECT_URL'] ?? '') ?:
|
||||||
($this->server['REDIRECT_URI'] ?? '' ) ?:
|
($this->server['REDIRECT_URI'] ?? '') ?:
|
||||||
($this->server['REDIRECT_SCRIPT_URL'] ?? '' ) ?:
|
($this->server['REDIRECT_SCRIPT_URL'] ?? '') ?:
|
||||||
($this->server['SCRIPT_URL'] ?? '' ) ?:
|
($this->server['SCRIPT_URL'] ?? '') ?:
|
||||||
$this->server['REQUEST_URI'] ?? '';
|
$this->server['REQUEST_URI'] ?? '';
|
||||||
|
|
||||||
/* $relative_script_path gives /relative/path/to/friendica/module/parameter
|
/* $relative_script_path gives /relative/path/to/friendica/module/parameter
|
||||||
|
|
|
@ -60,7 +60,7 @@ class BaseObject
|
||||||
throw new InternalServerErrorException('DICE isn\'t initialized.');
|
throw new InternalServerErrorException('DICE isn\'t initialized.');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (class_exists($name) || interface_exists($name )) {
|
if (class_exists($name) || interface_exists($name)) {
|
||||||
return self::$dice->create($name);
|
return self::$dice->create($name);
|
||||||
} else {
|
} else {
|
||||||
throw new InternalServerErrorException('Class \'' . $name . '\' isn\'t valid.');
|
throw new InternalServerErrorException('Class \'' . $name . '\' isn\'t valid.');
|
||||||
|
|
|
@ -7,8 +7,8 @@ use Friendica\Model;
|
||||||
/**
|
/**
|
||||||
* This class is responsible for all system-wide configuration values in Friendica
|
* This class is responsible for all system-wide configuration values in Friendica
|
||||||
* There are two types of storage
|
* There are two types of storage
|
||||||
* - The Config-Files (loaded into the FileCache @see Cache\ConfigCache )
|
* - The Config-Files (loaded into the FileCache @see Cache\ConfigCache)
|
||||||
* - The Config-DB-Table (per Config-DB-model @see Model\Config\Config )
|
* - The Config-DB-Table (per Config-DB-model @see Model\Config\Config)
|
||||||
*/
|
*/
|
||||||
abstract class Configuration
|
abstract class Configuration
|
||||||
{
|
{
|
||||||
|
@ -59,7 +59,7 @@ abstract class Configuration
|
||||||
*
|
*
|
||||||
* Get a particular config value from the given category ($cat)
|
* Get a particular config value from the given category ($cat)
|
||||||
* and the $key from a cached storage either from the $this->configAdapter
|
* and the $key from a cached storage either from the $this->configAdapter
|
||||||
* (@see IConfigAdapter ) or from the $this->configCache (@see ConfigCache ).
|
* (@see IConfigAdapter) or from the $this->configCache (@see ConfigCache).
|
||||||
*
|
*
|
||||||
* @param string $cat The category of the configuration value
|
* @param string $cat The category of the configuration value
|
||||||
* @param string $key The configuration key to query
|
* @param string $key The configuration key to query
|
||||||
|
@ -89,7 +89,7 @@ abstract class Configuration
|
||||||
* @brief Deletes the given key from the system configuration.
|
* @brief Deletes the given key from the system configuration.
|
||||||
*
|
*
|
||||||
* Removes the configured value from the stored cache in $this->configCache
|
* Removes the configured value from the stored cache in $this->configCache
|
||||||
* (@see ConfigCache ) and removes it from the database (@see IConfigAdapter ).
|
* (@see ConfigCache) and removes it from the database (@see IConfigAdapter).
|
||||||
*
|
*
|
||||||
* @param string $cat The category of the configuration value
|
* @param string $cat The category of the configuration value
|
||||||
* @param string $key The configuration key to delete
|
* @param string $key The configuration key to delete
|
||||||
|
|
|
@ -8,7 +8,7 @@ use Friendica\Model;
|
||||||
* This class is responsible for the user-specific configuration values in Friendica
|
* This class is responsible for the user-specific configuration values in Friendica
|
||||||
* The values are set through the Config-DB-Table (per Config-DB-model @see Model\Config\PConfig)
|
* The values are set through the Config-DB-Table (per Config-DB-model @see Model\Config\PConfig)
|
||||||
*
|
*
|
||||||
* The configuration cache (@see Cache\PConfigCache ) is used for temporary caching of database calls. This will
|
* The configuration cache (@see Cache\PConfigCache) is used for temporary caching of database calls. This will
|
||||||
* increase the performance.
|
* increase the performance.
|
||||||
*/
|
*/
|
||||||
abstract class PConfiguration
|
abstract class PConfiguration
|
||||||
|
@ -52,7 +52,7 @@ abstract class PConfiguration
|
||||||
* @param string $cat The category of the configuration value
|
* @param string $cat The category of the configuration value
|
||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
* @see PConfigCache )
|
* @see PConfigCache
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
abstract public function load(int $uid, string $cat = 'config');
|
abstract public function load(int $uid, string $cat = 'config');
|
||||||
|
@ -63,7 +63,7 @@ abstract class PConfiguration
|
||||||
*
|
*
|
||||||
* Get a particular user's config value from the given category ($cat)
|
* Get a particular user's config value from the given category ($cat)
|
||||||
* and the $key with the $uid from a cached storage either from the $this->configAdapter
|
* and the $key with the $uid from a cached storage either from the $this->configAdapter
|
||||||
* (@see IConfigAdapter ) or from the $this->configCache (@see PConfigCache ).
|
* (@see IConfigAdapter) or from the $this->configCache (@see PConfigCache).
|
||||||
*
|
*
|
||||||
* @param int $uid The user_id
|
* @param int $uid The user_id
|
||||||
* @param string $cat The category of the configuration value
|
* @param string $cat The category of the configuration value
|
||||||
|
@ -96,7 +96,7 @@ abstract class PConfiguration
|
||||||
* Deletes the given key from the users's configuration.
|
* Deletes the given key from the users's configuration.
|
||||||
*
|
*
|
||||||
* Removes the configured value from the stored cache in $this->configCache
|
* Removes the configured value from the stored cache in $this->configCache
|
||||||
* (@see ConfigCache ) and removes it from the database (@see IConfigAdapter )
|
* (@see ConfigCache) and removes it from the database (@see IConfigAdapter)
|
||||||
* with the given $uid.
|
* with the given $uid.
|
||||||
*
|
*
|
||||||
* @param int $uid The user_id
|
* @param int $uid The user_id
|
||||||
|
|
|
@ -717,8 +717,8 @@ class DBStructure
|
||||||
* @todo You cannot rename a primary key if "auto increment" is set
|
* @todo You cannot rename a primary key if "auto increment" is set
|
||||||
*
|
*
|
||||||
* @param string $table Table name
|
* @param string $table Table name
|
||||||
* @param array $columns Columns Syntax for Rename: [ $old1 => [ $new1, $type1 ], $old2 => [ $new2, $type2 ], ... ] )
|
* @param array $columns Columns Syntax for Rename: [ $old1 => [ $new1, $type1 ], $old2 => [ $new2, $type2 ], ... ]
|
||||||
* Syntax for Primary Key: [ $col1, $col2, ...] )
|
* Syntax for Primary Key: [ $col1, $col2, ...]
|
||||||
* @param int $type The type of renaming (Default is Column)
|
* @param int $type The type of renaming (Default is Column)
|
||||||
*
|
*
|
||||||
* @return boolean Was the renaming successful?
|
* @return boolean Was the renaming successful?
|
||||||
|
|
|
@ -255,7 +255,7 @@ class GContact
|
||||||
WHERE `glink`.`cid` = %d AND `glink`.`uid` = %d AND
|
WHERE `glink`.`cid` = %d AND `glink`.`uid` = %d AND
|
||||||
((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR
|
((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR
|
||||||
(`gcontact`.`updated` >= `gcontact`.`last_failure`))
|
(`gcontact`.`updated` >= `gcontact`.`last_failure`))
|
||||||
AND `gcontact`.`nurl` IN (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 and id != %d ) ",
|
AND `gcontact`.`nurl` IN (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 and id != %d) ",
|
||||||
intval($cid),
|
intval($cid),
|
||||||
intval($uid),
|
intval($uid),
|
||||||
intval($uid),
|
intval($uid),
|
||||||
|
@ -281,7 +281,7 @@ class GContact
|
||||||
"SELECT count(*) as `total`
|
"SELECT count(*) as `total`
|
||||||
FROM `glink` INNER JOIN `gcontact` on `glink`.`gcid` = `gcontact`.`id`
|
FROM `glink` INNER JOIN `gcontact` on `glink`.`gcid` = `gcontact`.`id`
|
||||||
where `glink`.`zcid` = %d
|
where `glink`.`zcid` = %d
|
||||||
and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 ) ",
|
and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0) ",
|
||||||
intval($zcid),
|
intval($zcid),
|
||||||
intval($uid)
|
intval($uid)
|
||||||
);
|
);
|
||||||
|
@ -353,7 +353,7 @@ class GContact
|
||||||
"SELECT `gcontact`.*
|
"SELECT `gcontact`.*
|
||||||
FROM `glink` INNER JOIN `gcontact` on `glink`.`gcid` = `gcontact`.`id`
|
FROM `glink` INNER JOIN `gcontact` on `glink`.`gcid` = `gcontact`.`id`
|
||||||
where `glink`.`zcid` = %d
|
where `glink`.`zcid` = %d
|
||||||
and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 )
|
and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0)
|
||||||
$sql_extra limit %d, %d",
|
$sql_extra limit %d, %d",
|
||||||
intval($zcid),
|
intval($zcid),
|
||||||
intval($uid),
|
intval($uid),
|
||||||
|
|
|
@ -460,7 +460,7 @@ class Profile
|
||||||
$diaspora = [
|
$diaspora = [
|
||||||
'guid' => $profile['guid'],
|
'guid' => $profile['guid'],
|
||||||
'podloc' => System::baseUrl(),
|
'podloc' => System::baseUrl(),
|
||||||
'searchable' => (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' ),
|
'searchable' => (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false'),
|
||||||
'nickname' => $profile['nickname'],
|
'nickname' => $profile['nickname'],
|
||||||
'fullname' => $profile['name'],
|
'fullname' => $profile['name'],
|
||||||
'firstname' => $firstname,
|
'firstname' => $firstname,
|
||||||
|
|
|
@ -893,7 +893,7 @@ class Processor
|
||||||
|
|
||||||
// Extract one prepended mention at a time from the body
|
// Extract one prepended mention at a time from the body
|
||||||
while(preg_match('#^(@\[url=([^\]]+)].*?\[\/url]\s)(.*)#is', $body, $matches)) {
|
while(preg_match('#^(@\[url=([^\]]+)].*?\[\/url]\s)(.*)#is', $body, $matches)) {
|
||||||
if (!in_array($matches[2], $potential_mentions) ) {
|
if (!in_array($matches[2], $potential_mentions)) {
|
||||||
$kept_mentions[] = $matches[1];
|
$kept_mentions[] = $matches[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -111,7 +111,7 @@ class SyslogLogger extends AbstractLogger
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Maps the LogLevel (@see LogLevel ) to a SysLog priority (@see http://php.net/manual/en/function.syslog.php#refsect1-function.syslog-parameters )
|
* Maps the LogLevel (@see LogLevel) to a SysLog priority (@see http://php.net/manual/en/function.syslog.php#refsect1-function.syslog-parameters)
|
||||||
*
|
*
|
||||||
* @param string $level A LogLevel
|
* @param string $level A LogLevel
|
||||||
*
|
*
|
||||||
|
|
|
@ -380,7 +380,7 @@ class Network
|
||||||
/// @TODO Really suppress function outcomes? Why not find them + debug them?
|
/// @TODO Really suppress function outcomes? Why not find them + debug them?
|
||||||
$h = @parse_url($url);
|
$h = @parse_url($url);
|
||||||
|
|
||||||
if (!empty($h['host']) && (@dns_get_record($h['host'], DNS_A + DNS_CNAME) || filter_var($h['host'], FILTER_VALIDATE_IP) )) {
|
if (!empty($h['host']) && (@dns_get_record($h['host'], DNS_A + DNS_CNAME) || filter_var($h['host'], FILTER_VALIDATE_IP))) {
|
||||||
return $url;
|
return $url;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -406,7 +406,7 @@ class Network
|
||||||
$h = substr($addr, strpos($addr, '@') + 1);
|
$h = substr($addr, strpos($addr, '@') + 1);
|
||||||
|
|
||||||
// Concerning the @ see here: https://stackoverflow.com/questions/36280957/dns-get-record-a-temporary-server-error-occurred
|
// Concerning the @ see here: https://stackoverflow.com/questions/36280957/dns-get-record-a-temporary-server-error-occurred
|
||||||
if ($h && (@dns_get_record($h, DNS_A + DNS_MX) || filter_var($h, FILTER_VALIDATE_IP) )) {
|
if ($h && (@dns_get_record($h, DNS_A + DNS_MX) || filter_var($h, FILTER_VALIDATE_IP))) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if ($h && @dns_get_record($h, DNS_CNAME + DNS_MX)) {
|
if ($h && @dns_get_record($h, DNS_CNAME + DNS_MX)) {
|
||||||
|
|
|
@ -13,7 +13,7 @@ use Psr\Log\LoggerInterface;
|
||||||
* A class to store profiling data
|
* A class to store profiling data
|
||||||
* It can handle different logging data for specific functions or global performance measures
|
* It can handle different logging data for specific functions or global performance measures
|
||||||
*
|
*
|
||||||
* It stores the data as log entries (@see LoggerInterface )
|
* It stores the data as log entries (@see LoggerInterface)
|
||||||
*/
|
*/
|
||||||
class Profiler implements ContainerInterface
|
class Profiler implements ContainerInterface
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue