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

Whitespace updates.

Browse Source 
Translator documentation.
This commit is contained in:
Siebrand Mazeland 2011-04-29 12:30:30 +02:00
parent cb6b5b2cc6
commit 1ec1f9378a
5 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php
View File

@ -4,7 +4,7 @@
* Copyright (C) 2011, StatusNet, Inc. * Copyright (C) 2011, StatusNet, Inc.
* *
* One status_network per email domain * One status_network per email domain
* *
* PHP version 5 * PHP version 5
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
@ -50,7 +50,6 @@ require_once $_dir . '/extlib/regDomain.inc.php';
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/ * @link http://status.net/
*/ */
class DomainStatusNetworkPlugin extends Plugin class DomainStatusNetworkPlugin extends Plugin
{ {
static $_thetree = null; static $_thetree = null;
@ -60,7 +59,7 @@ class DomainStatusNetworkPlugin extends Plugin
// For various reasons this gets squished // For various reasons this gets squished
global $tldTree; global $tldTree;
if (empty($tldTree)) { if (empty($tldTree)) {
if (!empty(self::$_thetree)) { if (!empty(self::$_thetree)) {
$tldTree = self::$_thetree; $tldTree = self::$_thetree;
@ -191,6 +190,7 @@ class DomainStatusNetworkPlugin extends Plugin
'author' => 'Evan Prodromou', 'author' => 'Evan Prodromou',
'homepage' => 'http://status.net/wiki/Plugin:DomainStatusNetwork', 'homepage' => 'http://status.net/wiki/Plugin:DomainStatusNetwork',
'rawdescription' => 'rawdescription' =>
// TRANS: Plugin description.
_m('A plugin that maps a single status_network to an email domain.')); _m('A plugin that maps a single status_network to an email domain.'));
return true; return true;
} }

15
plugins/DomainStatusNetwork/domainstatusnetworkinstaller.php
View File

@ -4,7 +4,7 @@
* Copyright (C) 2011, StatusNet, Inc. * Copyright (C) 2011, StatusNet, Inc.
* *
* Installer class for domain-based multi-homing systems * Installer class for domain-based multi-homing systems
* *
* PHP version 5 * PHP version 5
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
@ -44,7 +44,6 @@ if (!defined('STATUSNET')) {
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/ * @link http://status.net/
*/ */
class DomainStatusNetworkInstaller extends Installer class DomainStatusNetworkInstaller extends Installer
{ {
protected $domain = null; protected $domain = null;
@ -175,7 +174,7 @@ class DomainStatusNetworkInstaller extends Installer
$result = $sn->insert(); $result = $sn->insert();
if (!$result) { if (!$result) {
throw new ServerException("Couldn't create status_network: " . print_r($sn, true)); throw new ServerException("Could not create status_network: " . print_r($sn, true));
} }
$sn->setTags(array('domain='.$this->domain)); $sn->setTags(array('domain='.$this->domain));
@ -183,7 +182,7 @@ class DomainStatusNetworkInstaller extends Installer
$this->sn = $sn; $this->sn = $sn;
} }
function checkSchema() function checkSchema()
{ {
$config = $this->getConfig(); $config = $this->getConfig();
@ -215,7 +214,7 @@ class DomainStatusNetworkInstaller extends Installer
// Create the New DB // Create the New DB
$res = mysql_connect($this->host, $this->rootname, $this->rootpass); $res = mysql_connect($this->host, $this->rootname, $this->rootpass);
if (!$res) { if (!$res) {
throw new ServerException("Can't connect to {$this->host} as {$this->rootname}"); throw new ServerException("Cannot connect to {$this->host} as {$this->rootname}.");
} }
mysql_query("CREATE DATABASE ". mysql_real_escape_string($this->database), $res); mysql_query("CREATE DATABASE ". mysql_real_escape_string($this->database), $res);
@ -223,11 +222,11 @@ class DomainStatusNetworkInstaller extends Installer
$return = mysql_select_db($this->database, $res); $return = mysql_select_db($this->database, $res);
if (!$return) { if (!$return) {
throw new ServerException("Unable to connect to {$this->database} on {$this->host}"); throw new ServerException("Unable to connect to {$this->database} on {$this->host}.");
} }
foreach (array('localhost', '%') as $src) { foreach (array('localhost', '%') as $src) {
mysql_query("GRANT ALL ON " . mysql_query("GRANT ALL ON " .
mysql_real_escape_string($this->database).".* TO '" . mysql_real_escape_string($this->database).".* TO '" .
$this->username . "'@'".$src."' ". $this->username . "'@'".$src."' ".
"IDENTIFIED BY '".$this->password."'", $res); "IDENTIFIED BY '".$this->password."'", $res);
@ -239,7 +238,7 @@ class DomainStatusNetworkInstaller extends Installer
function getConfig() function getConfig()
{ {
static $config; static $config;
$cfg_file = "/etc/statusnet/setup.cfg"; $cfg_file = "/etc/statusnet/setup.cfg";
if (empty($config)) { if (empty($config)) {

2
plugins/DomainStatusNetwork/scripts/installforemail.php
View File

@ -42,7 +42,7 @@ if (empty($sn)) {
// Do the thing // Do the thing
$installer->main(); $installer->main();
$sn = $installer->getStatusNetwork(); $sn = $installer->getStatusNetwork();
$config = $installer->getConfig(); $config = $installer->getConfig();

2
plugins/DomainStatusNetwork/scripts/proposesite.php
View File

@ -35,7 +35,7 @@ $domain = DomainStatusNetworkPlugin::toDomain($args[0]);
$nickname = DomainStatusNetworkPlugin::nicknameForDomain($domain); $nickname = DomainStatusNetworkPlugin::nicknameForDomain($domain);
if (empty($nickname)) { if (empty($nickname)) {
throw new ClientException("No candidate found."); throw new ClientException('No candidate found.');
} else { } else {
print $nickname; print $nickname;
print "\n"; print "\n";

1
plugins/DomainStatusNetwork/scripts/sitefordomain.php
View File

@ -40,4 +40,3 @@ if (empty($sn)) {
print $sn->nickname."\n"; print $sn->nickname."\n";
exit(0); exit(0);