summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-07-01 13:56:11 -0400
committerEvan Prodromou <evan@prodromou.name>2008-07-01 13:56:11 -0400
commitf767a8b63b59c2d1128245fe25219e7a6716a8d3 (patch)
treef40437484836823b2c2e8db637f9d00ff39ee4dd
parent27b2da990299b64489e80368bc6c9cb8a45ee284 (diff)
add more contact information
darcs-hash:20080701175611-84dde-59873964e036f3c9bc225ea8272e840535ea7643.gz
-rw-r--r--config.php.sample5
-rw-r--r--doc/contact24
-rw-r--r--htaccess.sample1
-rw-r--r--lib/common.php5
-rw-r--r--lib/util.php22
5 files changed, 48 insertions, 9 deletions
diff --git a/config.php.sample b/config.php.sample
index 82c1c44ea..add56b839 100644
--- a/config.php.sample
+++ b/config.php.sample
@@ -18,6 +18,11 @@ $config['site']['server'] = 'localhost';
$config['site']['path'] = 'laconica';
#$config['site']['fancy'] = false;
#$config['site']['theme'] = 'default';
+#For contact email, defaults to $_SERVER["SERVER_ADMIN"]
+#$config['site']['email'] = 'admin@example.net';
+#Brought by...
+#$config['site']['broughtby'] = 'Individual or Company';
+#$config['site']['broughtbyurl'] = 'http://example.net/';
# This is a PEAR DB DSN, see http://pear.php.net/manual/en/package.database.db.intro-dsn.php
# Set it to match your actual database
diff --git a/doc/contact b/doc/contact
new file mode 100644
index 000000000..a8efc456a
--- /dev/null
+++ b/doc/contact
@@ -0,0 +1,24 @@
+There are a number of options for getting in contact with responsible
+people for %%site.name%%.
+
+Post a notice
+-------------
+
+If you have a question about how to do something, just post a notice
+with your question. People here like to answer messages. Watch the
+[public timeline](%%action.public%%) for answers; they'll usually start
+with "@" plus your user name.
+
+Bugs
+----
+
+If you think you've found a bug in the [Laconica](http://laconi.ca/) software,
+or if there's a new feature you'd like to see, add it into the [Laconica bug database](http://laconi.ca/PITS/HomePage). Don't forget to check the list of
+existing bugs to make sure it hasn't already been reported!
+
+Email
+-----
+
+You can reach the responsible party for this server at [%%site.email%%](mailto:%%site.email%%).
+
+
diff --git a/htaccess.sample b/htaccess.sample
index 985a97eed..992cecb37 100644
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -5,6 +5,7 @@ RewriteRule ^rss$ index.php?action=publicrss [L,QSA]
RewriteRule ^xrds$ index.php?action=publicxrds [L,QSA]
RewriteRule ^doc/about$ index.php?action=doc&title=about [L,QSA]
+RewriteRule ^doc/contact$ index.php?action=doc&title=contact [L,QSA]
RewriteRule ^doc/faq$ index.php?action=doc&title=faq [L,QSA]
RewriteRule ^doc/help$ index.php?action=doc&title=help [L,QSA]
RewriteRule ^doc/im$ index.php?action=doc&title=im [L,QSA]
diff --git a/lib/common.php b/lib/common.php
index e16d8d078..fbbcce5c3 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -40,7 +40,10 @@ $config =
'server' => 'localhost',
'theme' => 'default',
'path' => '/',
- 'fancy' => false),
+ 'fancy' => false,
+ 'email' => $_SERVER['SERVER_ADMIN'],
+ 'broughtby' => NULL,
+ 'broughtbyurl' => NULL),
'syslog' =>
array('appname' => 'laconica', # for syslog
'priority' => 'debug'), # XXX: currently ignored
diff --git a/lib/util.php b/lib/util.php
index 8bd99c816..f9abb6d90 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -218,14 +218,18 @@ function common_show_footer() {
common_foot_menu();
common_element_start('div', array('id' => 'footer'));
common_element_start('p', 'laconica');
- common_text(_t('This site is running the '));
- common_element('a', array('class' => 'software',
- href => 'http://laconi.ca/'),
- 'Laconica');
- common_text(_t('microblogging tool, version ' . LACONICA_VERSION . ', available under the '));
- common_element('a', array(href => 'http://www.fsf.org/licensing/licenses/agpl-3.0.html'),
- 'GNU Affero General Public License');
- common_text(_t('.'));
+ if (common_config('site', 'broughtby')) {
+ $instr = _t('**%%site.name%%** is a microblogging service brought to you by [%%site.broughtby%%](%%site.broughtbyurl%%). ');
+ } else {
+ $instr = _t('**%%site.name%%** is a microblogging service. ');
+ }
+ $instr .= _t('It runs the [Laconica](http://laconi.ca/) ' .
+ 'microblogging software, version ' . LACONICA_VERSION . ', ' .
+ 'available under the ' .
+ '[GNU Affero General Public License]' .
+ '(http://www.fsf.org/licensing/licenses/agpl-3.0.html).');
+ $output = common_markup_to_html($instr);
+ common_raw($output);
common_element_end('p');
common_element('img', array('id' => 'cc',
'src' => $config['license']['image'],
@@ -288,6 +292,8 @@ function common_foot_menu() {
_t('Privacy'));
common_menu_item(common_local_url('doc', array('title' => 'source')),
_t('Source'));
+ common_menu_item(common_local_url('doc', array('title' => 'contact')),
+ _t('Contact'));
common_element_end('ul');
}