From: Evan Prodromou Date: Wed, 13 Jan 2010 07:56:21 +0000 (-0800) Subject: ws changes for phpcs X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cc25d3baf0d503f469f9621c53513370453ad8ee;p=quix0rs-gnu-social.git ws changes for phpcs --- diff --git a/lib/statusnet.php b/lib/statusnet.php index 0c5807d7b9..29e9030267 100644 --- a/lib/statusnet.php +++ b/lib/statusnet.php @@ -1,7 +1,7 @@ . + * */ -if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} global $config, $_server, $_path; @@ -227,19 +230,19 @@ class StatusNet protected function loadConfigFile($conffile=null) { global $_server, $_path, $config; - + // From most general to most specific: // server-wide, then vhost-wide, then for a path, // finally for a dir (usually only need one of the last two). - + if (isset($conffile)) { $config_files = array($conffile); } else { $config_files = array('/etc/statusnet/statusnet.php', - '/etc/statusnet/laconica.php', - '/etc/laconica/laconica.php', - '/etc/statusnet/'.$_server.'.php', - '/etc/laconica/'.$_server.'.php'); + '/etc/statusnet/laconica.php', + '/etc/laconica/laconica.php', + '/etc/statusnet/'.$_server.'.php', + '/etc/laconica/'.$_server.'.php'); if (strlen($_path) > 0) { $config_files[] = '/etc/statusnet/'.$_server.'_'.$_path.'.php'; @@ -260,7 +263,7 @@ class StatusNet if (!self::$have_config) { throw new NoConfigException("No configuration file found.", - $config_files); + $config_files); } // Fixup for statusnet.ini