[geeklog-hg] geeklog: Removed Microsummaries since Mozilla states that they a...
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Thu Jun 14 18:27:01 EDT 2012
changeset 8720:2a6a4fb55e1e
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/2a6a4fb55e1e
user: Tom <websitemaster at cogeco.net>
date: Thu Jun 14 18:25:52 2012 -0400
description:
Removed Microsummaries since Mozilla states that they are obsolete and not recommended for use (bug #0001451)
diffstat:
public_html/admin/install/config-install.php | 1 -
public_html/docs/english/config.html | 4 -
public_html/docs/japanese/config.html | 4 -
public_html/index.php | 66 ----------------------------
sql/updates/mssql_1.8.1_to_2.0.0.php | 5 +-
sql/updates/mysql_1.8.1_to_2.0.0.php | 3 +
sql/updates/pgsql_1.8.1_to_2.0.0.php | 3 +
7 files changed, 10 insertions(+), 76 deletions(-)
diffs (167 lines):
diff -r afdf178c6b69 -r 2a6a4fb55e1e public_html/admin/install/config-install.php
--- a/public_html/admin/install/config-install.php Sat Jun 09 18:15:51 2012 +0200
+++ b/public_html/admin/install/config-install.php Thu Jun 14 18:25:52 2012 -0400
@@ -50,7 +50,6 @@
$c->add('site_admin_url','','text',0,0,NULL,30,TRUE, $me, 0);
$c->add('site_name','','text',0,0,NULL,60,TRUE, $me, 0);
$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);
diff -r afdf178c6b69 -r 2a6a4fb55e1e public_html/docs/english/config.html
--- a/public_html/docs/english/config.html Sat Jun 09 18:15:51 2012 +0200
+++ b/public_html/docs/english/config.html Thu Jun 14 18:25:52 2012 -0400
@@ -72,10 +72,6 @@
<td valign="top">Another Nifty Geeklog Site</td>
<td valign="top">Slogan for your site. This is added to the HTML title field.</td></tr>
<tr>
- <td valign="top"><a name="desc_microsummary_short">microsummary_short</a></td>
- <td valign="top">GL:</td>
- <td valign="top">Prefix to use for a <a href="http://wiki.mozilla.org/Microsummaries">microsummary</a>.</td></tr>
-<tr>
<td valign="top"><a name="desc_site_disabled_msg">site_disabled_msg</a></td>
<td valign="top">'Geeklog Site is down. Please come back soon.'</td>
<td valign="top">This contains the message to display when a Geeklog site is
diff -r afdf178c6b69 -r 2a6a4fb55e1e public_html/docs/japanese/config.html
--- a/public_html/docs/japanese/config.html Sat Jun 09 18:15:51 2012 +0200
+++ b/public_html/docs/japanese/config.html Thu Jun 14 18:25:52 2012 -0400
@@ -65,10 +65,6 @@
<td valign="top">Another Nifty Geeklog Site</td>
<td valign="top">サイトã®ã‚¹ãƒãƒ¼ã‚¬ãƒ³ã‚’指定ã—ã¾ã™ã€‚HTMLã®<title>フィールドã«è¿½åŠ ã•ã‚Œã¾ã™ã€‚</td></tr>
<tr>
- <td valign="top"><a name="desc_microsummary_short">マイクãƒã‚µãƒžãƒªæŽ¥é å(microsummary_short)</a></td>
- <td valign="top">GL:</td>
- <td valign="top"><a href="http://wiki.mozilla.org/Microsummaries">マイクãƒã‚µãƒžãƒª(microsummary)</a>用ã®æŽ¥é åを指定ã—ã¾ã™ã€‚</td></tr>
-<tr>
<td valign="top"><a name="desc_site_disabled_msg">サイト閉鎖用メッセージ(site_disabled_msg)</a></td>
<td valign="top">'Geeklog Site is down. Please come back soon.'</td>
<td valign="top">Geeklogã®ã‚µã‚¤ãƒˆã‚’一時的ã«é–‰éŽ–ã™ã‚‹ã¨ãã«è¡¨ç¤ºã™ã‚‹ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’指定ã—ã¾ã™ã€‚メッセージãŒ"http:"ã§å§‹ã¾ã‚‹å ´åˆã€ã‚µã‚¤ãƒˆã®è¨ªå•è€
ã¯ãã®URLã¸ãƒªãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆã•ã‚Œã¾ã™ã€‚<br>
diff -r afdf178c6b69 -r 2a6a4fb55e1e public_html/index.php
--- a/public_html/index.php Sat Jun 09 18:15:51 2012 +0200
+++ b/public_html/index.php Thu Jun 14 18:25:52 2012 -0400
@@ -37,83 +37,17 @@
$newstories = false;
$displayall = false;
-$microsummary = false;
if (isset ($_GET['display'])) {
if (($_GET['display'] == 'new') && (empty ($topic))) {
$newstories = true;
} else if (($_GET['display'] == 'all') && (empty ($topic))) {
$displayall = true;
- } else if ($_GET['display'] == 'microsummary') {
- $microsummary = true;
}
}
// Retrieve the archive topic - currently only one supported
$archivetid = DB_getItem ($_TABLES['topics'], 'tid', "archive_flag=1");
-// Microsummary support:
-// see: http://wiki.mozilla.org/Microsummaries
-if( $microsummary )
-{
- $sql = " (date <= NOW()) AND (draft_flag = 0)";
-
- if (empty ($topic)) {
- $sql .= COM_getLangSQL ('tid', 'AND', 's');
- }
-
- // if a topic was provided only select those stories.
- if (!empty($topic)) {
- $sql .= " AND s.tid = '$topic' ";
- } elseif (!$newstories) {
- $sql .= " AND frontpage = 1 ";
- }
-
- if ($topic != $archivetid) {
- $sql .= " AND s.tid != '{$archivetid}' ";
- }
-
- $sql .= COM_getPermSQL ('AND', 0, 2, 's');
- $sql .= COM_getTopicSQL ('AND', 0, 's') . ' ';
- $msql = array();
- $msql['mysql']="SELECT STRAIGHT_JOIN s.title "
- . "FROM {$_TABLES['stories']} AS s, {$_TABLES['users']} AS u, "
- . "{$_TABLES['topics']} AS t WHERE (s.uid = u.uid) AND (s.tid = t.tid) AND"
- . $sql . "ORDER BY featured DESC, date DESC LIMIT 0, 1";
-
- $msql['mssql']="SELECT STRAIGHT_JOIN s.title "
- . "FROM {$_TABLES['stories']} AS s, {$_TABLES['users']} AS u, "
- . "{$_TABLES['topics']} AS t WHERE (s.uid = u.uid) AND (s.tid = t.tid) AND"
- . $sql . "ORDER BY featured DESC, date DESC LIMIT 0, 1";
-
- $msql['pgsql']="SELECT s.title "
- . "FROM {$_TABLES['stories']} AS s, {$_TABLES['users']} AS u, "
- . "{$_TABLES['topics']} AS t WHERE (s.uid = u.uid) AND (s.tid = t.tid) AND"
- . $sql . "ORDER BY featured DESC, date DESC LIMIT 1 OFFSET 0";
-
- $result = DB_query ($msql);
-
- if ( $A = DB_fetchArray( $result ) ) {
- $pagetitle = $_CONF['microsummary_short'].$A['title'];
- } else {
- if( empty( $pagetitle ))
- {
- if( empty( $topic ))
- {
- $pagetitle = $_CONF['site_slogan'];
- }
- else
- {
- $pagetitle = stripslashes( DB_getItem( $_TABLES['topics'], 'topic',
- "tid = '$topic'" ));
- }
- }
- $pagetitle = $_CONF['site_name'] . ' - ' . $pagetitle;
- }
- header('Content-Type: text/plain; charset=' . COM_getCharset());
- die($pagetitle);
-}
-
-
$page = 1;
if (isset ($_GET['page'])) {
$page = COM_applyFilter ($_GET['page'], true);
diff -r afdf178c6b69 -r 2a6a4fb55e1e sql/updates/mssql_1.8.1_to_2.0.0.php
--- a/sql/updates/mssql_1.8.1_to_2.0.0.php Sat Jun 09 18:15:51 2012 +0200
+++ b/sql/updates/mssql_1.8.1_to_2.0.0.php Thu Jun 14 18:25:52 2012 -0400
@@ -119,7 +119,10 @@
// Comments
$c->add('comment_on_same_page',0,'select',4,21,0, 1690, TRUE, $me, 21);
- $c->add('show_comments_at_replying',0,'select',4,21,0, 1691, TRUE, $me, 21);
+ $c->add('show_comments_at_replying',0,'select',4,21,0, 1691, TRUE, $me, 21);
+
+ // Microsummary
+ $c->del('microsummary_short', 'Core');
return true;
}
diff -r afdf178c6b69 -r 2a6a4fb55e1e sql/updates/mysql_1.8.1_to_2.0.0.php
--- a/sql/updates/mysql_1.8.1_to_2.0.0.php Sat Jun 09 18:15:51 2012 +0200
+++ b/sql/updates/mysql_1.8.1_to_2.0.0.php Thu Jun 14 18:25:52 2012 -0400
@@ -118,6 +118,9 @@
// Comments
$c->add('comment_on_same_page',0,'select',4,21,0, 1690, TRUE, $me, 21);
$c->add('show_comments_at_replying',0,'select',4,21,0, 1691, TRUE, $me, 21);
+
+ // Microsummary
+ $c->del('microsummary_short', 'Core');
return true;
}
diff -r afdf178c6b69 -r 2a6a4fb55e1e sql/updates/pgsql_1.8.1_to_2.0.0.php
--- a/sql/updates/pgsql_1.8.1_to_2.0.0.php Sat Jun 09 18:15:51 2012 +0200
+++ b/sql/updates/pgsql_1.8.1_to_2.0.0.php Thu Jun 14 18:25:52 2012 -0400
@@ -120,6 +120,9 @@
// Comments
$c->add('comment_on_same_page',0,'select',4,21,0, 1690, TRUE, $me, 21);
$c->add('show_comments_at_replying',0,'select',4,21,0, 1691, TRUE, $me, 21);
+
+ // Microsummary
+ $c->del('microsummary_short', 'Core');
return true;
}
More information about the geeklog-cvs
mailing list