[geeklog-cvs] geeklog: Reverted changes that shouldn't be in this branch
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Sun Dec 14 15:41:34 EST 2008
details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/37b794db151d
changeset: 6566:37b794db151d
user: Dirk Haun <dirk at haun-online.de>
date: Sun Dec 14 21:36:53 2008 +0100
description:
Reverted changes that shouldn't be in this branch
diffstat:
51 files changed, 1177 insertions(+), 3438 deletions(-)
plugins/links/install_defaults.php | 8
plugins/polls/sql/mssql_install.php | 8
plugins/polls/sql/mysql_install.php | 14
plugins/polls/templates/admin/polleditor.thtml | 9
plugins/staticpages/services.inc.php | 5
public_html/admin/block.php | 39
public_html/admin/database.php | 35
public_html/admin/group.php | 21
public_html/admin/install/bigdump.php | 395 -----
public_html/admin/install/config-install.php | 1
public_html/admin/install/install-plugins.php | 527 -------
public_html/admin/install/language/english.php | 137 -
public_html/admin/install/language/german.php | 8
public_html/admin/install/layout/style.css | 296 +---
public_html/admin/install/lib-install.php | 760 -----------
public_html/admin/install/migrate.php | 637 ---------
public_html/admin/install/success.php | 20
public_html/admin/mail.php | 20
public_html/admin/plugins.php | 357 -----
public_html/admin/plugins/calendar/index.php | 18
public_html/admin/plugins/calendar/install.php | 4
public_html/admin/plugins/links/category.php | 11
public_html/admin/plugins/links/index.php | 4
public_html/admin/plugins/polls/index.php | 4
public_html/admin/plugins/spamx/index.php | 17
public_html/admin/plugins/spamx/install.php | 4
public_html/admin/plugins/staticpages/index.php | 23
public_html/admin/plugins/staticpages/install.php | 4
public_html/admin/sectest.php | 16
public_html/admin/story.php | 54
public_html/admin/syndication.php | 25
public_html/admin/topic.php | 29
public_html/admin/trackback.php | 28
public_html/admin/user.php | 2
public_html/docs/config.html | 13
public_html/docs/links.html | 7
public_html/docs/theme.html | 25
public_html/getimage.php | 66
public_html/layout/professional/article/printable.thtml | 4
public_html/layout/professional/preferences/userphoto.thtml | 2
public_html/layout/professional/print.css | 11
public_html/links/index.php | 70 -
public_html/staticpages/index.php | 4
public_html/submit.php | 18
public_html/usersettings.php | 12
sql/mssql_tableanddata.php | 394 +++++
sql/mysql_tableanddata.php | 353 ++++-
sql/updates/mssql_1.5.1_to_1.5.2.php | 42
sql/updates/mysql_1.5.1_to_1.5.2.php | 43
system/classes/config.class.php | 2
system/lib-story.php | 9
diffs (truncated from 5906 to 300 lines):
diff -r 834541cdcbc8 -r 37b794db151d plugins/links/install_defaults.php
--- a/plugins/links/install_defaults.php Sun Dec 14 17:58:21 2008 +0100
+++ b/plugins/links/install_defaults.php Sun Dec 14 21:36:53 2008 +0100
@@ -134,12 +134,6 @@
$_LI_DEFAULT['show_category_descriptions'] = true;
/**
- * open links in new window
- * Whether to open external links in a new window or not.
- */
-$_LI_DEFAULT['new_window'] = false;
-
-/**
* Links root category id
*/
$_LI_DEFAULT['root'] = 'site';
@@ -188,8 +182,6 @@
$c->add('show_top10', $_LI_DEFAULT['show_top10'], 'select',
0, 0, 1, 40, true, 'links');
$c->add('show_category_descriptions', $_LI_DEFAULT['show_category_descriptions'], 'select', 0, 0, 1, 50, true, 'links');
- $c->add('new_window', $_LI_DEFAULT['new_window'], 'select',
- 0, 0, 1, 55, true, 'links');
$c->add('fs_admin', NULL, 'fieldset', 0, 1, NULL, 0, true, 'links');
$c->add('hidenewlinks', $_LI_DEFAULT['hidenewlinks'], 'select',
diff -r 834541cdcbc8 -r 37b794db151d plugins/polls/sql/mssql_install.php
--- a/plugins/polls/sql/mssql_install.php Sun Dec 14 17:58:21 2008 +0100
+++ b/plugins/polls/sql/mssql_install.php Sun Dec 14 21:36:53 2008 +0100
@@ -35,7 +35,7 @@
$_SQL[] = "
CREATE TABLE [dbo].[{$_TABLES['pollanswers']}] (
- [pid] [varchar] (40) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
+ [pid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
[qid] [int] NOT NULL ,
[aid] [tinyint] NOT NULL ,
[answer] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
@@ -47,14 +47,14 @@
$_SQL[] = "
CREATE TABLE [dbo].[{$_TABLES['pollquestions']}] (
[qid] [int] NOT NULL ,
- [pid] [varchar] (40) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
+ [pid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
[question] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
) ON [PRIMARY]
";
$_SQL[] = "
CREATE TABLE [dbo].[{$_TABLES['polltopics']}] (
- [pid] [varchar] (40) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
+ [pid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
[topic] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
[voters] [numeric](8, 0) NULL ,
[questions] [int] NOT NULL ,
@@ -76,7 +76,7 @@
$_SQL[] = "
CREATE TABLE [dbo].[{$_TABLES['pollvoters']}] (
[id] [numeric](10, 0) IDENTITY (1, 1) NOT NULL ,
- [pid] [varchar] (40) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
+ [pid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
[ipaddress] [varchar] (15) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
[date] [numeric](10, 0) NULL
) ON [PRIMARY]
diff -r 834541cdcbc8 -r 37b794db151d plugins/polls/sql/mysql_install.php
--- a/plugins/polls/sql/mysql_install.php Sun Dec 14 17:58:21 2008 +0100
+++ b/plugins/polls/sql/mysql_install.php Sun Dec 14 21:36:53 2008 +0100
@@ -34,7 +34,7 @@
$_SQL[] = "
CREATE TABLE {$_TABLES['pollanswers']} (
- pid varchar(40) NOT NULL default '',
+ pid varchar(20) NOT NULL default '',
qid mediumint(9) NOT NULL default 0,
aid tinyint(3) unsigned NOT NULL default '0',
answer varchar(255) default NULL,
@@ -46,16 +46,16 @@
$_SQL[] = "
CREATE TABLE {$_TABLES['pollquestions']} (
- qid mediumint(9) NOT NULL DEFAULT '0',
- pid varchar(40) NOT NULL default '',
- question varchar(255) NOT NULL,
- PRIMARY KEY (qid, pid)
+ qid mediumint(9) NOT NULL DEFAULT '0',
+ pid varchar(20) NOT NULL,
+ question varchar(255) NOT NULL,
+ PRIMARY KEY (qid, pid)
) TYPE=MyISAM
";
$_SQL[] = "
CREATE TABLE {$_TABLES['polltopics']} (
- pid varchar(40) NOT NULL default '',
+ pid varchar(20) NOT NULL,
topic varchar(255) default NULL,
voters mediumint(8) unsigned default NULL,
questions int(11) NOT NULL default '0',
@@ -83,7 +83,7 @@
$_SQL[] = "
CREATE TABLE {$_TABLES['pollvoters']} (
id int(10) unsigned NOT NULL auto_increment,
- pid varchar(20) NOT NULL,
+ pid varchar(20) NOT NULL default '',
ipaddress varchar(15) NOT NULL default '',
date int(10) unsigned default NULL,
PRIMARY KEY (id)
diff -r 834541cdcbc8 -r 37b794db151d plugins/polls/templates/admin/polleditor.thtml
--- a/plugins/polls/templates/admin/polleditor.thtml Sun Dec 14 17:58:21 2008 +0100
+++ b/plugins/polls/templates/admin/polleditor.thtml Sun Dec 14 21:36:53 2008 +0100
@@ -4,7 +4,7 @@
<table cellspacing="0" cellpadding="2" width="100%">
<tr>
<td align="right">{lang_pollid}:</td>
- <td><input type="text" dir="ltr" name="pid" value="{poll_id}" size="40" maxlength="40"{xhtml}> {lang_donotusespaces}</td>
+ <td><input type="text" dir="ltr" name="pid" value="{poll_id}" size="20"{xhtml}> {lang_donotusespaces}</td>
</tr>
<tr>
<td align="right">{lang_topic}:</td>
@@ -42,10 +42,5 @@
<p>{lang_permissionskey}</p>
<div>{permissions_editor}</div>
<p>{lang_permissions_msg}</p>
- <p>
- <input type="submit" name="mode" value="{lang_save}"{xhtml}>
- <input type="submit" name="mode" value="{lang_cancel}"{xhtml}>{delete_option}
- <input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}>
- <input type="hidden" value="{poll_id}" name="old_pid"{xhtml}>
- </p>
+ <p><input type="submit" name="mode" value="{lang_save}"{xhtml}><input type="submit" name="mode" value="{lang_cancel}"{xhtml}>{delete_option}<input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}></p>
</form>
diff -r 834541cdcbc8 -r 37b794db151d plugins/staticpages/services.inc.php
--- a/plugins/staticpages/services.inc.php Sun Dec 14 17:58:21 2008 +0100
+++ b/plugins/staticpages/services.inc.php Sun Dec 14 21:36:53 2008 +0100
@@ -377,7 +377,7 @@
$url = COM_buildURL($_CONF['site_url'] . '/staticpages/index.php?page='
. $sp_id);
$output .= PLG_afterSaveSwitch($_SP_CONF['aftersave'], $url,
- 'staticpages', 19);
+ 'staticpages');
$svc_msg['id'] = $sp_id;
return PLG_RET_OK;
@@ -405,8 +405,7 @@
global $_CONF, $_TABLES, $_USER, $LANG_ACCESS, $LANG12, $LANG_STATIC,
$LANG_LOGIN;
- $output = COM_refresh($_CONF['site_admin_url']
- . '/plugins/staticpages/index.php?msg=20');
+ $output = COM_refresh($_CONF['site_admin_url'] . '/plugins/staticpages/index.php');
if (empty($args['sp_id']) && !empty($args['id']))
$args['sp_id'] = $args['id'];
diff -r 834541cdcbc8 -r 37b794db151d public_html/admin/block.php
--- a/public_html/admin/block.php Sun Dec 14 17:58:21 2008 +0100
+++ b/public_html/admin/block.php Sun Dec 14 21:36:53 2008 +0100
@@ -37,19 +37,21 @@
require_once '../lib-common.php';
require_once 'auth.inc.php';
+require_once $_CONF['path_system'] . 'lib-security.php';
// Uncomment the line below if you need to debug the HTTP variables being passed
// to the script. This will sometimes cause errors but it will allow you to see
// the data being passed in a POST operation
// echo COM_debug($_POST);
-$display = '';
-
-if (!SEC_hasRights('block.edit')) {
- $display .= COM_siteHeader('menu', $MESSAGE[30])
- . COM_showMessageText($MESSAGE[29], $MESSAGE[30])
- . COM_siteFooter();
- COM_accessLog("User {$_USER['username']} tried to illegally access the block administration screen");
+if (!SEC_hasRights ('block.edit')) {
+ $display .= COM_siteHeader ('menu', $MESSAGE[30])
+ . COM_startBlock ($MESSAGE[30], '',
+ COM_getBlockTemplate ('_msg_block', 'header'))
+ . $MESSAGE[33]
+ . COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'))
+ . COM_siteFooter ();
+ COM_accessLog ("User {$_USER['username']} tried to illegally access the block administration screen");
echo $display;
exit;
}
@@ -511,10 +513,13 @@
$access = SEC_hasAccess ($owner_id, $group_id, $perm_owner, $perm_group,
$perm_members, $perm_anon);
}
- if (($access < 3) || !hasBlockTopicAccess($tid) || !SEC_inGroup($group_id)) {
- $retval .= COM_siteHeader('menu', $MESSAGE[30])
- . COM_showMessageText($MESSAGE[29], $MESSAGE[30])
- . COM_siteFooter();
+ if (($access < 3) || !hasBlockTopicAccess ($tid) || !SEC_inGroup ($group_id)) {
+ $retval .= COM_siteHeader('menu', $MESSAGE[30]);
+ $retval .= COM_startBlock ($MESSAGE[30], '',
+ COM_getBlockTemplate ('_msg_block', 'header'));
+ $retval .= $MESSAGE[33];
+ $retval .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
+ $retval .= COM_siteFooter();
COM_accessLog("User {$_USER['username']} tried to illegally create or edit block $bid.");
return $retval;
@@ -842,8 +847,16 @@
$display .= listblocks();
$display .= COM_siteFooter();
} else { // 'cancel' or no mode at all
- $display .= COM_siteHeader('menu', $LANG21[19]);
- $display .= COM_showMessageFromParameter();
+ $display .= COM_siteHeader ('menu', $LANG21[19]);
+ $msg = 0;
+ if (isset ($_POST['msg'])) {
+ $msg = COM_applyFilter ($_POST['msg'], true);
+ } else if (isset ($_GET['msg'])) {
+ $msg = COM_applyFilter ($_GET['msg'], true);
+ }
+ if ($msg > 0) {
+ $display .= COM_showMessage ($msg);
+ }
$display .= listblocks();
$display .= COM_siteFooter();
diff -r 834541cdcbc8 -r 37b794db151d public_html/admin/database.php
--- a/public_html/admin/database.php Sun Dec 14 17:58:21 2008 +0100
+++ b/public_html/admin/database.php Sun Dec 14 21:36:53 2008 +0100
@@ -36,23 +36,13 @@
require_once '../lib-common.php';
require_once 'auth.inc.php';
-
-$display = '';
-
-// If user isn't a Root user or if the backup feature is disabled, bail.
-if (!SEC_inGroup('Root') OR ($_CONF['allow_mysqldump'] == 0)) {
- $display .= COM_siteHeader('menu', $LANG_DB_BACKUP['last_ten_backups'])
- . COM_showMessageText($MESSAGE[29], $MESSAGE[30])
- . COM_siteFooter();
- COM_accessLog("User {$_USER['username']} tried to illegally access the database backup screen.");
- echo $display;
- exit;
-}
+require_once $_CONF['path_system'] . 'lib-security.php';
/**
-* This page allows all Root admins to create a database backup. It's pretty
-* simple actually. The admin clicks a button, we do a mysqldump to a file in
-* the following format: geeklog_db_backup_YYYY_MM_DD_hh_mm_ss.sql That's it.
+* This page allows all Root admins to create a database backup. This will not
+* allow the removal of past backups. It's pretty simple actually. The admin
+* clicks a button, we do a mysqldump to a file in the following format:
+* geeklog_db_backup_YYYY_MM_DD.sql That's it.
*/
/**
@@ -263,6 +253,19 @@
// MAIN
$display = '';
+// If user isn't a root user or if the backup feature is disabled, bail.
+if (!SEC_inGroup('Root') OR $_CONF['allow_mysqldump'] == 0) {
+ $display .= COM_siteHeader('menu', $LANG_DB_BACKUP['last_ten_backups']);
+ $display .= COM_startBlock($MESSAGE[30], '',
+ COM_getBlockTemplate('_msg_block', 'header'));
+ $display .= $MESSAGE[46];
+ $display .= COM_endBlock(COM_getBlockTemplate('_msg_block', 'footer'));
+ $display .= COM_siteFooter();
+ COM_accessLog("User {$_USER['username']} tried to illegally access the database backup screen.");
+ echo $display;
+ exit;
+}
+
$mode = '';
if (isset($_GET['mode'])) {
if ($_GET['mode'] == 'backup') {
@@ -308,8 +311,6 @@
}
}
}
-} else {
- $display .= COM_showMessageFromParameter();
}
// Show all backups
diff -r 834541cdcbc8 -r 37b794db151d public_html/admin/group.php
--- a/public_html/admin/group.php Sun Dec 14 17:58:21 2008 +0100
+++ b/public_html/admin/group.php Sun Dec 14 21:36:53 2008 +0100
@@ -37,7 +37,7 @@
/**
* This file is the Geeklog Group administration page
*
-* @author Tony Bibbs <tony AT tonybibbs DOT com>
+* @author Tony Bibbs <tony at tonybibbs.com>
*
*/
@@ -59,11 +59,14 @@
$display = '';
// Make sure user has rights to access this page
-if (!SEC_hasRights('group.edit')) {
- $display .= COM_siteHeader('menu', $MESSAGE[30])
More information about the geeklog-cvs
mailing list