[geeklog-cvs] geeklog: Added in config option for owner name. If set, this is ...
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Tue Mar 8 13:10:30 EST 2011
changeset 8147:e2a5c8d3613e
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/e2a5c8d3613e
user: Tom <websitemaster at cogeco.net>
date: Tue Mar 08 13:09:48 2011 -0500
description:
Added in config option for owner name. If set, this is used in the copyright notice instead of the site name.
diffstat:
language/english.php | 1 +
public_html/admin/configuration_validation.php | 1 +
public_html/admin/install/config-install.php | 1 +
public_html/docs/english/config.html | 4 ++++
public_html/lib-common.php | 10 +++++++---
sql/updates/mssql_1.7.1_to_1.8.0.php | 3 +++
sql/updates/mysql_1.7.1_to_1.8.0.php | 3 +++
sql/updates/pgsql_1.7.1_to_1.8.0.php | 5 ++++-
8 files changed, 24 insertions(+), 4 deletions(-)
diffs (111 lines):
diff -r 72865743beb7 -r e2a5c8d3613e language/english.php
--- a/language/english.php Mon Mar 07 09:59:51 2011 -0500
+++ b/language/english.php Tue Mar 08 13:09:48 2011 -0500
@@ -1759,6 +1759,7 @@
'noreply_mail' => "No-Reply E-Mail",
'site_name' => "Site Name",
'site_slogan' => "Slogan",
+ 'owner_name' => "Owner Name",
'microsummary_short' => "Microsummary",
'path_log' => "Log",
'path_language' => "Language",
diff -r 72865743beb7 -r e2a5c8d3613e public_html/admin/configuration_validation.php
--- a/public_html/admin/configuration_validation.php Mon Mar 07 09:59:51 2011 -0500
+++ b/public_html/admin/configuration_validation.php Tue Mar 08 13:09:48 2011 -0500
@@ -35,6 +35,7 @@
$_CONF_VALIDATE['Core']['site_admin_url'] = array('rule' => 'url');
$_CONF_VALIDATE['Core']['site_name'] = array('rule' => 'notEmpty');
$_CONF_VALIDATE['Core']['site_slogan'] = array('rule' => 'stringOrEmpty');
+$_CONF_VALIDATE['Core']['owner_name'] = array('rule' => 'stringOrEmpty');
$_CONF_VALIDATE['Core']['microsummary_short'] = array('rule' => 'stringOrEmpty');
$_CONF_VALIDATE['Core']['site_disabled_msg'] = array('rule' => 'stringOrEmpty');
$_CONF_VALIDATE['Core']['copyrightyear'] = array(
diff -r 72865743beb7 -r e2a5c8d3613e public_html/admin/install/config-install.php
--- a/public_html/admin/install/config-install.php Mon Mar 07 09:59:51 2011 -0500
+++ b/public_html/admin/install/config-install.php Tue Mar 08 13:09:48 2011 -0500
@@ -52,6 +52,7 @@
$c->add('site_slogan','','text',0,0,NULL,70,TRUE, $me, 0);
$c->add('microsummary_short','GL: ','text',0,0,NULL,80,TRUE, $me, 0);
$c->add('site_disabled_msg','Geeklog Site is down. Please come back soon.','textarea',0,0,NULL,510,TRUE, $me, 0);
+ $c->add('owner_name','','text',0,0,NULL,1000,TRUE, $me, 0);
$c->add('copyrightyear',date('Y'),'text',0,0,NULL,1440,FALSE, $me, 0);
$c->add('url_rewrite',FALSE,'select',0,0,1,1800,TRUE, $me, 0);
$c->add('cdn_hosted',FALSE,'select',0,0,1,1900,TRUE, $me, 0);
diff -r 72865743beb7 -r e2a5c8d3613e public_html/docs/english/config.html
--- a/public_html/docs/english/config.html Mon Mar 07 09:59:51 2011 -0500
+++ b/public_html/docs/english/config.html Tue Mar 08 13:09:48 2011 -0500
@@ -84,6 +84,10 @@
<strong>Note:</strong> The option actually disable the site can be found
in the <tt>siteconfig.php</tt> file.</td></tr>
<tr>
+ <td valign="top"><a name="desc_owner_name">owner_name</a></td>
+ <td valign="top"></td>
+ <td valign="top">The name of the owner of the site. This is used in the copyright notice if set, else the site name is used.</td></tr>
+<tr>
<td valign="top"><a name="desc_copyrightyear">copyrightyear</a></td>
<td valign="top"><i>(disabled)</i></td>
<td valign="top">Set this to the year you want to appear in the copyright notice of your
diff -r 72865743beb7 -r e2a5c8d3613e public_html/lib-common.php
--- a/public_html/lib-common.php Mon Mar 07 09:59:51 2011 -0500
+++ b/public_html/lib-common.php Tue Mar 08 13:09:48 2011 -0500
@@ -1370,12 +1370,16 @@
$year = date( 'Y' );
$copyrightyear = $year;
- if( !empty( $_CONF['copyrightyear'] ))
- {
+ if(!empty($_CONF['copyrightyear'])) {
$copyrightyear = $_CONF['copyrightyear'];
}
+ if(!empty($_CONF['owner_name'])) {
+ $copyrightname = $_CONF['owner_name'];
+ } else {
+ $copyrightname = $_CONF['site_name'];
+ }
$footer->set_var( 'copyright_notice', ' ' . $LANG01[93] . ' © '
- . $copyrightyear . ' ' . $_CONF['site_name'] . '<br' . XHTML . '> '
+ . $copyrightyear . ' ' . $copyrightname . '<br' . XHTML . '> '
. $LANG01[94] );
$footer->set_var( 'copyright_msg', $LANG01[93] . ' © '
. $copyrightyear . ' ' . $_CONF['site_name'] );
diff -r 72865743beb7 -r e2a5c8d3613e sql/updates/mssql_1.7.1_to_1.8.0.php
--- a/sql/updates/mssql_1.7.1_to_1.8.0.php Mon Mar 07 09:59:51 2011 -0500
+++ b/sql/updates/mssql_1.7.1_to_1.8.0.php Tue Mar 08 13:09:48 2011 -0500
@@ -169,6 +169,9 @@
// JavaScript use Google CDN for jQuery
$c->add('cdn_hosted',FALSE,'select',0,0,1,1900,TRUE, $me, 0);
+ // Owner Name Configuration
+ $c->add('owner_name','','text',0,0,NULL,1000,TRUE, $me, 0);
+
// Add in all the New Tabs
$c->add('tab_site', NULL, 'tab', 0, 0, NULL, 0, TRUE, $me, 0);
$c->add('tab_mail', NULL, 'tab', 0, 1, NULL, 0, TRUE, $me, 1);
diff -r 72865743beb7 -r e2a5c8d3613e sql/updates/mysql_1.7.1_to_1.8.0.php
--- a/sql/updates/mysql_1.7.1_to_1.8.0.php Mon Mar 07 09:59:51 2011 -0500
+++ b/sql/updates/mysql_1.7.1_to_1.8.0.php Tue Mar 08 13:09:48 2011 -0500
@@ -169,6 +169,9 @@
// JavaScript use Google CDN for jQuery
$c->add('cdn_hosted',FALSE,'select',0,0,1,1900,TRUE, $me, 0);
+ // Owner Name Configuration
+ $c->add('owner_name','','text',0,0,NULL,1000,TRUE, $me, 0);
+
// Add in all the New Tabs
$c->add('tab_site', NULL, 'tab', 0, 0, NULL, 0, TRUE, $me, 0);
$c->add('tab_mail', NULL, 'tab', 0, 1, NULL, 0, TRUE, $me, 1);
diff -r 72865743beb7 -r e2a5c8d3613e sql/updates/pgsql_1.7.1_to_1.8.0.php
--- a/sql/updates/pgsql_1.7.1_to_1.8.0.php Mon Mar 07 09:59:51 2011 -0500
+++ b/sql/updates/pgsql_1.7.1_to_1.8.0.php Tue Mar 08 13:09:48 2011 -0500
@@ -168,7 +168,10 @@
$c->add('autotag_permissions_user', array(2, 2, 2, 2), '@select', 7, 41, 28, 1880, TRUE, $me, 37);
// JavaScript use Google CDN for jQuery
- $c->add('cdn_hosted',FALSE,'select',0,0,1,1900,TRUE, $me, 0);
+ $c->add('cdn_hosted',FALSE,'select',0,0,1,1900,TRUE, $me, 0);
+
+ // Owner Name Configuration
+ $c->add('owner_name','','text',0,0,NULL,1000,TRUE, $me, 0);
// Add in all the New Tabs
$c->add('tab_site', NULL, 'tab', 0, 0, NULL, 0, TRUE, $me, 0);
More information about the geeklog-cvs
mailing list