[geeklog-cvs] geeklog: Merged with Dirk's changes
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Tue Mar 16 15:20:28 EDT 2010
changeset 7803:50b0f02da1d8
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/50b0f02da1d8
user: Tom <websitemaster at cogeco.net>
date: Tue Mar 16 15:03:00 2010 -0400
description:
Merged with Dirk's changes
diffstat:
language/english_utf-8.php | 6 +-
plugins/calendar/functions.inc | 1 +
plugins/calendar/templates/submitevent.thtml | 1 +
plugins/links/functions.inc | 1 +
plugins/links/templates/submitlink.thtml | 1 +
plugins/polls/language/english_utf-8.php | 6 +-
public_html/admin/install/config-install.php | 4 +-
public_html/admin/install/index.php | 4 +-
public_html/admin/install/language/english.php | 4 +-
public_html/admin/install/language/hebrew_utf-8.php | 4 +-
public_html/admin/install/language/japanese_utf-8.php | 4 +-
public_html/admin/install/language/polish.php | 4 +-
public_html/admin/user.php | 53 +++++---
public_html/docs/english/index.html | 6 +-
public_html/docs/english/theme.html | 4 +
public_html/docs/history | 4 +
public_html/index.php | 17 +-
public_html/layout/professional/admin/story/storyeditor_advanced.thtml | 2 +-
public_html/lib-common.php | 23 ++-
system/lib-database.php | 1 -
20 files changed, 92 insertions(+), 58 deletions(-)
diffs (truncated from 432 to 300 lines):
diff -r 3c4711488555 -r 50b0f02da1d8 language/english_utf-8.php
--- a/language/english_utf-8.php Tue Mar 16 14:57:23 2010 -0400
+++ b/language/english_utf-8.php Tue Mar 16 15:03:00 2010 -0400
@@ -1905,7 +1905,8 @@
'search_show_sort' => "Allow User to Sort Results?",
'search_show_limit' => "Show Page Limits?",
'search_separator' => "Group Separator",
- 'search_def_keytype' => "Default Search Method"
+ 'search_def_keytype' => "Default Search Method",
+ 'search_def_sort' => "Default Sort Order"
);
$LANG_configsubgroups['Core'] = array(
@@ -1997,7 +1998,8 @@
23 => array('Disabled' => 0, 'Enabled' => 1, 'Enabled (Default for Homepage only)' => 2),
24 => array('Contribute' => 'contribute', 'Home' => 'home', 'Advanced Search' => 'search', 'Directory' => 'directory', 'My Account' => 'prefs', 'Plugin Entries' => 'plugins', 'Custom Entries' => 'custom', 'Site Statistics' => 'stats'),
25 => array('New Stories' => 'story', 'New Comments' => 'comment', 'New Trackbacks' => 'trackback', 'New Pingbacks' => 'pingback', 'New Users' => 'user'),
- 26 => array('G (General Audiences)' => 'G', 'PG (Parental Guidance)' => 'PG', 'R (Restricted)' => 'R', 'X (Explicit)' => 'X')
+ 26 => array('G (General Audiences)' => 'G', 'PG (Parental Guidance)' => 'PG', 'R (Restricted)' => 'R', 'X (Explicit)' => 'X'),
+ 27 => array('Hits (asc)' => 'hits|asc', 'Hits (desc)' => 'hits|desc', 'Date (asc)' => 'date|asc', 'Date (desc)' => 'date|desc', 'Title (asc)' => 'title|asc', 'Title (desc)' => 'title|desc', 'Author (asc)' => 'uid|asc', 'Author (desc)' => 'uid|desc')
);
?>
diff -r 3c4711488555 -r 50b0f02da1d8 plugins/calendar/functions.inc
--- a/plugins/calendar/functions.inc Tue Mar 16 14:57:23 2010 -0400
+++ b/plugins/calendar/functions.inc Tue Mar 16 15:03:00 2010 -0400
@@ -818,6 +818,7 @@
$eventform->set_var('lang_location', $LANG_CAL_1[39]);
$eventform->set_var('lang_description', $LANG_CAL_1[5]);
$eventform->set_var('lang_htmnotallowed', $LANG_CAL_1[44]);
+ PLG_templateSetVars('calendar', $eventform);
$eventform->set_var('lang_submit', $LANG12[8]);
$eventform->set_var('mode', $mode);
if ($mode == 'personal') {
diff -r 3c4711488555 -r 50b0f02da1d8 plugins/calendar/templates/submitevent.thtml
--- a/plugins/calendar/templates/submitevent.thtml Tue Mar 16 14:57:23 2010 -0400
+++ b/plugins/calendar/templates/submitevent.thtml Tue Mar 16 15:03:00 2010 -0400
@@ -91,6 +91,7 @@
<div class="form-field"><textarea name="description" style="width:100%" cols="45" rows="8"></textarea></div>
<div class="clear-left"></div>
<div class="form-field">{lang_htmnotallowed}</div>
+ {captcha}
<div class="form-field">
<input type="hidden" name="mode" value="{lang_submit}"{xhtml}>
<input type="hidden" name="type" value="calendar"{xhtml}>
diff -r 3c4711488555 -r 50b0f02da1d8 plugins/links/functions.inc
--- a/plugins/links/functions.inc Tue Mar 16 14:57:23 2010 -0400
+++ b/plugins/links/functions.inc Tue Mar 16 15:03:00 2010 -0400
@@ -904,6 +904,7 @@
$linkform->set_var('link_category_options', links_select_box(2, $category));
$linkform->set_var('lang_description', $LANG12[15]);
$linkform->set_var('lang_htmlnotallowed', $LANG12[35]);
+ PLG_templateSetVars('links', $linkform);
$linkform->set_var('lang_submit', $LANG12[8]);
$linkform->set_var('max_url_length', 255);
$linkform->parse('theform', 'linkform');
diff -r 3c4711488555 -r 50b0f02da1d8 plugins/links/templates/submitlink.thtml
--- a/plugins/links/templates/submitlink.thtml Tue Mar 16 14:57:23 2010 -0400
+++ b/plugins/links/templates/submitlink.thtml Tue Mar 16 15:03:00 2010 -0400
@@ -23,6 +23,7 @@
<tr>
<td align="center" colspan="2">{lang_htmlnotallowed}</td>
</tr>
+ {captcha}
<tr>
<td align="center" colspan="2">
<input type="hidden" name="mode" value="{lang_submit}"{xhtml}>
diff -r 3c4711488555 -r 50b0f02da1d8 plugins/polls/language/english_utf-8.php
--- a/plugins/polls/language/english_utf-8.php Tue Mar 16 14:57:23 2010 -0400
+++ b/plugins/polls/language/english_utf-8.php Tue Mar 16 15:03:00 2010 -0400
@@ -100,7 +100,7 @@
37 => 'Hide results while poll is open',
38 => 'While the poll is open, only the owner & root can see the results',
39 => 'The topic will be only displayed if there are more than 1 questions.',
- 40 => 'See all answers to this poll',
+ 40 => 'See all answers to this poll'
);
$PLG_polls_MESSAGE15 = 'Your comment has been submitted for review and will be published when approved by a moderator.';
@@ -131,7 +131,7 @@
'default_permissions' => 'Poll Default Permissions',
'newpollsinterval' => 'New Polls Interval',
'hidenewpolls' => 'New Polls',
- 'title_trim_length' => 'Title Trim Length',
+ 'title_trim_length' => 'Title Trim Length',
'meta_tags' => 'Enable Meta Tags'
);
@@ -141,7 +141,7 @@
$LANG_fs['polls'] = array(
'fs_main' => 'General Polls Settings',
- 'fs_whatsnew' => 'What\'s New Block',
+ 'fs_whatsnew' => 'What\'s New Block',
'fs_permissions' => 'Default Permissions'
);
diff -r 3c4711488555 -r 50b0f02da1d8 public_html/admin/install/config-install.php
--- a/public_html/admin/install/config-install.php Tue Mar 16 14:57:23 2010 -0400
+++ b/public_html/admin/install/config-install.php Tue Mar 16 15:03:00 2010 -0400
@@ -52,8 +52,8 @@
$c->add('copyrightyear',date('Y'),'text',0,0,NULL,1440,FALSE);
$c->add('url_rewrite',FALSE,'select',0,0,1,1800,TRUE);
$c->add('meta_tags',0,'select',0,0,23,2000,TRUE);
- $c->add('meta_description','Geeklog, the open source content management system designed with security in mind.','textarea',0,0,NULL,2010,TRUE);
- $c->add('meta_keywords','Geeklog, Blog, Content Management System, CMS, Open Source, Security','textarea',0,0,NULL,2020,TRUE);
+ $c->add('meta_description','Geeklog - The secure Content Management System.','textarea',0,0,NULL,2010,TRUE);
+ $c->add('meta_keywords','Geeklog, Content Management System, CMS, Open Source, Secure, Security, Blog, Weblog','textarea',0,0,NULL,2020,TRUE);
$c->add('fs_mail', NULL, 'fieldset', 0, 1, NULL, 0, TRUE);
$c->add('site_mail','','text',0,1,NULL,40,TRUE);
diff -r 3c4711488555 -r 50b0f02da1d8 public_html/admin/install/index.php
--- a/public_html/admin/install/index.php Tue Mar 16 14:57:23 2010 -0400
+++ b/public_html/admin/install/index.php Tue Mar 16 15:03:00 2010 -0400
@@ -87,7 +87,7 @@
$db_selected = 'mssql';
break;
case 'pgsql':
- $pgsql_selected = 'pgsql';
+ $db_selected = 'pgsql';
break;
default:
$db_selected = 'mysql';
@@ -99,7 +99,7 @@
$db_selected = 'mssql';
break;
case 'pgsql':
- $pgsql_selected = 'pgsql';
+ $db_selected = 'pgsql';
break;
default:
$db_selected = 'mysql';
diff -r 3c4711488555 -r 50b0f02da1d8 public_html/admin/install/language/english.php
--- a/public_html/admin/install/language/english.php Tue Mar 16 14:57:23 2010 -0400
+++ b/public_html/admin/install/language/english.php Tue Mar 16 15:03:00 2010 -0400
@@ -49,9 +49,9 @@
// install.php
$LANG_INSTALL = array(
- 0 => 'Geeklog - The Ultimate Weblog System',
+ 0 => 'Geeklog - The secure CMS.',
1 => 'Installation Support',
- 2 => 'The Ultimate Weblog System',
+ 2 => 'The secure Content Management System.',
3 => 'Geeklog Installation',
4 => 'PHP %s required',
5 => 'Sorry, but Geeklog requires at least PHP %s to run (you have version ',
diff -r 3c4711488555 -r 50b0f02da1d8 public_html/admin/install/language/hebrew_utf-8.php
--- a/public_html/admin/install/language/hebrew_utf-8.php Tue Mar 16 14:57:23 2010 -0400
+++ b/public_html/admin/install/language/hebrew_utf-8.php Tue Mar 16 15:03:00 2010 -0400
@@ -45,9 +45,9 @@
// install.php
$LANG_INSTALL = array(
- 0 => 'Geeklog - The Ultimate Weblog System',
+ 0 => 'Geeklog - The secure CMS.',
1 => 'תמיכת ×”×ª×§× ×”',
- 2 => 'The Ultimate Weblog System',
+ 2 => '<span dir="ltr">The secure Content Management System.</span>',
3 => '×”×ª×§× ×ª Geeklog',
4 => 'דרוש PHP %s',
5 => 'מצטערי×, ×בל Geeklog דורש לפחות PHP %s בשביל לרוץ (×œ×›× ×™×© גירסה ',
diff -r 3c4711488555 -r 50b0f02da1d8 public_html/admin/install/language/japanese_utf-8.php
--- a/public_html/admin/install/language/japanese_utf-8.php Tue Mar 16 14:57:23 2010 -0400
+++ b/public_html/admin/install/language/japanese_utf-8.php Tue Mar 16 15:03:00 2010 -0400
@@ -51,9 +51,9 @@
// install.php
$LANG_INSTALL = array(
- 0 => 'Geeklog - The Ultimate Weblog System',
+ 0 => 'Geeklog - The secure CMS.',
1 => 'インストールã§å›°ã£ãŸã‚‰ã€ã“ã¡ã‚‰ã®ã‚µã‚¤ãƒˆã¸',
- 2 => 'The Ultimate Weblog System',
+ 2 => 'The secure Content Management System.',
3 => 'Geeklogをインストールã™ã‚‹',
4 => 'PHP %s以上ãŒå¿
è¦ã§ã™',
5 => '残念ãªãŒã‚‰Geeklogをインストールã™ã‚‹ã«ã¯æœ€ä½Žã§ã‚‚PHP %sãŒå¿
è¦ã§ã™(ç¾åœ¨ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯ ',
diff -r 3c4711488555 -r 50b0f02da1d8 public_html/admin/install/language/polish.php
--- a/public_html/admin/install/language/polish.php Tue Mar 16 14:57:23 2010 -0400
+++ b/public_html/admin/install/language/polish.php Tue Mar 16 15:03:00 2010 -0400
@@ -49,9 +49,9 @@
// install.php
$LANG_INSTALL = array(
- 0 => 'Geeklog - The Ultimate Weblog System',
+ 0 => 'Geeklog - The secure CMS.',
1 => 'Instalacja Pomoc',
- 2 => 'The Ultimate Weblog System',
+ 2 => 'The secure Content Management System.',
3 => 'Geeklog - Instalacja',
4 => 'Wymagane PHP %s',
5 => 'Sorry, ale Geeklog wymaga do uruchomienia co najmniej PHP %s (wersja zainstalowana to ',
diff -r 3c4711488555 -r 50b0f02da1d8 public_html/admin/user.php
--- a/public_html/admin/user.php Tue Mar 16 14:57:23 2010 -0400
+++ b/public_html/admin/user.php Tue Mar 16 15:03:00 2010 -0400
@@ -462,8 +462,10 @@
$retval = '';
$userChanged = false;
- if ($_USER_VERBOSE) COM_errorLog("**** entering saveusers****",1);
- if ($_USER_VERBOSE) COM_errorLog("group size at beginning = " . count($groups),1);
+ if ($_USER_VERBOSE) {
+ COM_errorLog("**** entering saveusers****", 1);
+ COM_errorLog("group size at beginning = " . count($groups), 1);
+ }
if ($passwd != $passwd_conf) { // passwords don't match
return edituser($uid, 67);
@@ -695,7 +697,9 @@
exit;
}
- if ($_USER_VERBOSE) COM_errorLog("***************leaving saveusers*****************",1);
+ if ($_USER_VERBOSE) {
+ COM_errorLog("***************leaving saveusers*****************", 1);
+ }
return $retval;
}
@@ -1251,6 +1255,7 @@
} else {
COM_accessLog("User {$_USER['username']} tried to illegally delete user $uid and failed CSRF checks.");
echo COM_refresh($_CONF['site_admin_url'] . '/index.php');
+ exit;
}
} elseif (($mode == $LANG_ADMIN['save']) && !empty($LANG_ADMIN['save']) && SEC_checkToken()) { // save
$delphoto = '';
@@ -1263,29 +1268,39 @@
if (!isset ($_POST['userstatus'])) {
$_POST['userstatus'] = USER_ACCOUNT_ACTIVE;
}
- $display = saveusers (COM_applyFilter ($_POST['uid'], true),
- $_POST['username'], $_POST['fullname'],
- $_POST['passwd'], $_POST['passwd_conf'], $_POST['email'],
- $_POST['regdate'], $_POST['homepage'], $_POST['groups'],
- $delphoto, $_POST['userstatus'], $_POST['oldstatus']);
- if (!empty($display)) {
- $tmp = COM_siteHeader('menu', $LANG28[22]);
- $tmp .= $display;
- $tmp .= COM_siteFooter();
- $display = $tmp;
+ $uid = COM_applyFilter($_POST['uid'], true);
+ if ($uid == 1) {
+ echo COM_refresh($_CONF['site_admin_url'] . '/index.php');
+ exit;
+ } else {
+ $display = saveusers($uid, $_POST['username'], $_POST['fullname'],
+ $_POST['passwd'], $_POST['passwd_conf'], $_POST['email'],
+ $_POST['regdate'], $_POST['homepage'], $_POST['groups'],
+ $delphoto, $_POST['userstatus'], $_POST['oldstatus']);
+ if (!empty($display)) {
+ $tmp = COM_siteHeader('menu', $LANG28[22]);
+ $tmp .= $display;
+ $tmp .= COM_siteFooter();
+ $display = $tmp;
+ }
}
} elseif ($mode == 'edit') {
$display .= COM_siteHeader('menu', $LANG28[1]);
$msg = '';
- if (isset ($_GET['msg'])) {
- $msg = COM_applyFilter ($_GET['msg'], true);
+ if (isset($_GET['msg'])) {
+ $msg = COM_applyFilter($_GET['msg'], true);
}
$uid = '';
- if (isset ($_GET['uid'])) {
- $uid = COM_applyFilter ($_GET['uid'], true);
+ if (isset($_GET['uid'])) {
+ $uid = COM_applyFilter($_GET['uid'], true);
}
- $display .= edituser ($uid, $msg);
- $display .= COM_siteFooter();
+ if ($uid == 1) {
+ echo COM_refresh($_CONF['site_admin_url'] . '/index.php');
+ exit;
+ } else {
+ $display .= edituser($uid, $msg);
+ $display .= COM_siteFooter();
+ }
} elseif (($mode == 'import') && SEC_checkToken()) {
$display .= importusers();
} elseif ($mode == 'importform') {
diff -r 3c4711488555 -r 50b0f02da1d8 public_html/docs/english/index.html
--- a/public_html/docs/english/index.html Tue Mar 16 14:57:23 2010 -0400
+++ b/public_html/docs/english/index.html Tue Mar 16 15:03:00 2010 -0400
@@ -108,7 +108,7 @@
<li>A fully configurable block system, with php-in-block support.</li>
<li>Well organized codebase, use of PHP's Object-Oriented features.</li>
<li>Thin database abstraction layer allowing Geeklog to be ported to DBMS's
- other than the defaults (MySQL and MSSQL supported directly).</li>
+ other than the defaults (MySQL and MS SQL supported directly).</li>
</ul>
<h2><a name="introduction">Introduction</a></h2>
@@ -116,8 +116,8 @@
<p>Geeklog was originally developed for the Security Geeks web site and was
originally authored by Jason Whittenburg. In early 2001, Jason decided it
was time to devote his time to other things and handed the project over to
-Tony Bibbs. Tony is now focusing on getting <a href="http://www.aptitudecms.org/">AptitudeCMS</a> (formerly Geeklog 2), a next generation CMS, off
More information about the geeklog-cvs
mailing list