wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ws changes for phpcs

Browse Source
This commit is contained in:
Evan Prodromou 2010-01-12 23:56:21 -08:00
parent e34ece8b06
commit cc25d3baf0
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/statusnet.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* /**
* StatusNet - the distributed open-source microblogging tool * StatusNet - the distributed open-source microblogging tool
* Copyright (C) 2009, StatusNet, Inc. * Copyright (C) 2009-2010 StatusNet, Inc.
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by * it under the terms of the GNU Affero General Public License as published by
@ -15,9 +15,12 @@
* *
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/ */
if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1);
}
global $config, $_server, $_path; global $config, $_server, $_path;
@ -227,19 +230,19 @@ class StatusNet
protected function loadConfigFile($conffile=null) protected function loadConfigFile($conffile=null)
{ {
global $_server, $_path, $config; global $_server, $_path, $config;
// From most general to most specific: // From most general to most specific:
// server-wide, then vhost-wide, then for a path, // server-wide, then vhost-wide, then for a path,
// finally for a dir (usually only need one of the last two). // finally for a dir (usually only need one of the last two).
if (isset($conffile)) { if (isset($conffile)) {
$config_files = array($conffile); $config_files = array($conffile);
} else { } else {
$config_files = array('/etc/statusnet/statusnet.php', $config_files = array('/etc/statusnet/statusnet.php',
'/etc/statusnet/laconica.php', '/etc/statusnet/laconica.php',
'/etc/laconica/laconica.php', '/etc/laconica/laconica.php',
'/etc/statusnet/'.$_server.'.php', '/etc/statusnet/'.$_server.'.php',
'/etc/laconica/'.$_server.'.php'); '/etc/laconica/'.$_server.'.php');
if (strlen($_path) > 0) { if (strlen($_path) > 0) {
$config_files[] = '/etc/statusnet/'.$_server.'_'.$_path.'.php'; $config_files[] = '/etc/statusnet/'.$_server.'_'.$_path.'.php';
@ -260,7 +263,7 @@ class StatusNet
if (!self::$have_config) { if (!self::$have_config) {
throw new NoConfigException("No configuration file found.", throw new NoConfigException("No configuration file found.",
$config_files); $config_files);
} }
// Fixup for statusnet.ini // Fixup for statusnet.ini