<a> tags).---
' . nl2br ($sig);
} else {
--- 151,155 ----
$newcomment = $comment;
if (!empty ($sig)) {
! if (($postmode == 'html') || ($fakepostmode == 'html')) {
$newcomment .= '
---
' . nl2br ($sig);
} else {
***************
*** 310,313 ****
--- 316,324 ----
} else {
$comment = htmlspecialchars (COM_checkWords (COM_stripslashes ($comment)));
+ $newcomment = COM_makeClickableLinks ($comment);
+ if (strcmp ($comment, $newcomment) != 0) {
+ $comment = nl2br ($newcomment);
+ $postmode = 'html';
+ }
}
***************
*** 903,905 ****
echo $display;
! ?>
\ No newline at end of file
--- 914,916 ----
echo $display;
! ?>
Index: lib-common.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.397
retrieving revision 1.398
diff -C2 -d -r1.397 -r1.398
*** lib-common.php 13 Nov 2004 17:44:14 -0000 1.397
--- lib-common.php 13 Nov 2004 21:41:59 -0000 1.398
***************
*** 2917,2921 ****
if( preg_match( '/<.*>/', $A['comment'] ) == 0 )
{
! $A['comment'] = nl2br( COM_makeClickableLinks( $A['comment'] ));
}
--- 2917,2921 ----
if( preg_match( '/<.*>/', $A['comment'] ) == 0 )
{
! $A['comment'] = nl2br( $A['comment'] );
}
From dhaun at iowaoutdoors.org Sun Nov 14 09:06:14 2004
From: dhaun at iowaoutdoors.org (dhaun at iowaoutdoors.org)
Date: Sun, 14 Nov 2004 14:06:14 +0000
Subject: [geeklog-cvs] geeklog-1.3/system lib-story.php,1.10,1.11
Message-ID: <20041114140614.DEB5C529BF@iowaoutdoors>
Update of /var/cvs/geeklog-1.3/system
In directory www:/tmp/cvs-serv11840/system
Modified Files:
lib-story.php
Log Message:
Make links in plain text stories "clickable" when the story is saved. Also fixes bug #308 (messing up image URLs).
Index: lib-story.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/system/lib-story.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** lib-story.php 8 Sep 2004 02:30:45 -0000 1.10
--- lib-story.php 14 Nov 2004 14:06:12 -0000 1.11
***************
*** 64,69 ****
if( $A['postmode'] == 'plaintext' )
{
! $A['introtext'] = nl2br( COM_makeClickableLinks( $A['introtext'] ));
! $A['bodytext'] = nl2br( COM_makeClickableLinks( $A['bodytext'] ));
}
--- 64,69 ----
if( $A['postmode'] == 'plaintext' )
{
! $A['introtext'] = nl2br( $A['introtext'] );
! $A['bodytext'] = nl2br( $A['bodytext'] );
}
From dhaun at iowaoutdoors.org Sun Nov 14 09:06:15 2004
From: dhaun at iowaoutdoors.org (dhaun at iowaoutdoors.org)
Date: Sun, 14 Nov 2004 14:06:15 +0000
Subject: [geeklog-cvs] geeklog-1.3/public_html lib-common.php,1.398,1.399 submit.php,1.76,1.77
Message-ID: <20041114140615.9658B60F77@iowaoutdoors>
Update of /var/cvs/geeklog-1.3/public_html
In directory www:/tmp/cvs-serv11840/public_html
Modified Files:
lib-common.php submit.php
Log Message:
Make links in plain text stories "clickable" when the story is saved. Also fixes bug #308 (messing up image URLs).
Index: submit.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/submit.php,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** submit.php 30 Oct 2004 17:13:23 -0000 1.76
--- submit.php 14 Nov 2004 14:06:13 -0000 1.77
***************
*** 214,218 ****
$retval .= $eventform->finish($eventform->get_var('theform'));
$retval .= COM_endBlock();
!
return $retval;
}
--- 214,218 ----
$retval .= $eventform->finish($eventform->get_var('theform'));
$retval .= COM_endBlock();
!
return $retval;
}
***************
*** 231,235 ****
$linkform->set_file('linkform', 'submitlink.thtml');
$linkform->set_var('site_url', $_CONF['site_url']);
! $linkform->set_var('lang_title', $LANG12[10]);
$linkform->set_var('lang_link', $LANG12[11]);
$linkform->set_var('lang_category', $LANG12[17]);
--- 231,235 ----
$linkform->set_file('linkform', 'submitlink.thtml');
$linkform->set_var('site_url', $_CONF['site_url']);
! $linkform->set_var('lang_title', $LANG12[10]);
$linkform->set_var('lang_link', $LANG12[11]);
$linkform->set_var('lang_category', $LANG12[17]);
***************
*** 300,310 ****
$A['show_topic_icon'] = 1;
$A['hits'] = 0;
! $res = DB_query("SELECT username, fullname, photo FROM {$_TABLES['users']} WHERE uid = {$A['uid']}");
! $A += DB_fetchArray($res);
! $res = DB_query("SELECT topic, imageurl FROM {$_TABLES['topics']} WHERE tid = '{$A['tid']}'");
! $A += DB_fetchArray($res);
$retval .= COM_startBlock($LANG12[32])
! . STORY_renderArticle ($A, 'n')
! . COM_endBlock();
}
--- 300,313 ----
$A['show_topic_icon'] = 1;
$A['hits'] = 0;
! $res = DB_query("SELECT username, fullname, photo FROM {$_TABLES['users']} WHERE uid = {$A['uid']}");
! $A += DB_fetchArray($res);
! $res = DB_query("SELECT topic, imageurl FROM {$_TABLES['topics']} WHERE tid = '{$A['tid']}'");
! $A += DB_fetchArray($res);
! if ($A['postmode'] == 'plaintext') {
! $A['introtext'] = COM_makeClickableLinks ($A['introtext']);
! }
$retval .= COM_startBlock($LANG12[32])
! . STORY_renderArticle ($A, 'n')
! . COM_endBlock();
}
***************
*** 333,337 ****
$storyform->set_var('lang_title', $LANG12[10]);
! $storyform->set_var('story_title', htmlspecialchars ($title));
$storyform->set_var('lang_topic', $LANG12[28]);
if (empty ($A['tid']) && !empty ($topic)) {
--- 336,340 ----
$storyform->set_var('lang_title', $LANG12[10]);
! $storyform->set_var('story_title', htmlspecialchars ($title));
$storyform->set_var('lang_topic', $LANG12[28]);
if (empty ($A['tid']) && !empty ($topic)) {
***************
*** 662,666 ****
if (!PLG_saveSubmission($type, $A)) {
COM_errorLog("Could not save your submission. Bad type: $type");
! }
// plugin should include its own redirect - but in case handle
// it here and redirect to the main page
--- 665,669 ----
if (!PLG_saveSubmission($type, $A)) {
COM_errorLog("Could not save your submission. Bad type: $type");
! }
// plugin should include its own redirect - but in case handle
// it here and redirect to the main page
***************
*** 675,679 ****
$A['introtext'] = addslashes(COM_checkHTML(COM_checkWords($A['introtext'])));
} else {
! $A['introtext'] = addslashes(htmlspecialchars(COM_checkWords($A['introtext'])));
}
$A['sid'] = COM_makeSid();
--- 678,682 ----
$A['introtext'] = addslashes(COM_checkHTML(COM_checkWords($A['introtext'])));
} else {
! $A['introtext'] = addslashes (COM_makeClickableLinks (htmlspecialchars (COM_checkWords ($A['introtext']))));
}
$A['sid'] = COM_makeSid();
***************
*** 682,686 ****
} else {
$A['uid'] = 1;
! }
COM_updateSpeedlimit ('submit');
if (($_CONF['storysubmission'] == 1) && !SEC_hasRights('story.submit')) {
--- 685,689 ----
} else {
$A['uid'] = 1;
! }
COM_updateSpeedlimit ('submit');
if (($_CONF['storysubmission'] == 1) && !SEC_hasRights('story.submit')) {
Index: lib-common.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.398
retrieving revision 1.399
diff -C2 -d -r1.398 -r1.399
*** lib-common.php 13 Nov 2004 21:41:59 -0000 1.398
--- lib-common.php 14 Nov 2004 14:06:13 -0000 1.399
***************
*** 5731,5734 ****
--- 5731,5749 ----
/**
+ * Undo the conversion of URLs to clickable links (in plain text posts),
+ * e.g. so that we can present the user with the post as they entered them.
+ *
+ * @param string $txt story text
+ * @param string story text without links
+ *
+ */
+ function COM_undoClickableLinks( $text )
+ {
+ $text = preg_replace( '/([^<]*)<\/a>/', '\1', $text );
+
+ return $text;
+ }
+
+ /**
* Highlight the words from a search query in a given text string.
*
From dhaun at iowaoutdoors.org Sun Nov 14 09:06:15 2004
From: dhaun at iowaoutdoors.org (dhaun at iowaoutdoors.org)
Date: Sun, 14 Nov 2004 14:06:15 +0000
Subject: [geeklog-cvs] geeklog-1.3/public_html/admin story.php,1.136,1.137
Message-ID: <20041114140615.CFC7B6B147@iowaoutdoors>
Update of /var/cvs/geeklog-1.3/public_html/admin
In directory www:/tmp/cvs-serv11840/public_html/admin
Modified Files:
story.php
Log Message:
Make links in plain text stories "clickable" when the story is saved. Also fixes bug #308 (messing up image URLs).
Index: story.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/story.php,v
retrieving revision 1.136
retrieving revision 1.137
diff -C2 -d -r1.136 -r1.137
*** story.php 29 Sep 2004 17:43:43 -0000 1.136
--- story.php 14 Nov 2004 14:06:13 -0000 1.137
***************
*** 146,149 ****
--- 146,153 ----
}
$A['old_sid'] = $A['sid'];
+ if ($A['postmode'] == 'plaintext') {
+ $A['introtext'] = COM_undoClickableLinks ($A['introtext']);
+ $A['bodytext'] = COM_undoClickableLinks ($A['bodytext']);
+ }
} elseif (!empty($sid) && $mode == 'editsubmission') {
$result = DB_query ("SELECT STRAIGHT_JOIN s.*, UNIX_TIMESTAMP(s.date) as unixdate, "
***************
*** 162,165 ****
--- 166,173 ----
$A['title'] = htmlspecialchars ($A['title']);
$A['old_sid'] = $A['sid'];
+ if ($A['postmode'] == 'plaintext') {
+ $A['introtext'] = COM_undoClickableLinks ($A['introtext']);
+ $A['bodytext'] = COM_undoClickableLinks ($A['bodytext']);
+ }
} else {
// that submission doesn't seem to be there any more (may have been
***************
*** 216,221 ****
$A['title'] = COM_checkHTML(htmlspecialchars(COM_checkWords($A['title'])));
} else {
! $A['introtext'] = htmlspecialchars(COM_checkWords($A['introtext']));
! $A['bodytext'] = htmlspecialchars(COM_checkWords($A['bodytext']));
$A['title'] = htmlspecialchars(COM_checkWords($A['title']));
}
--- 224,229 ----
$A['title'] = COM_checkHTML(htmlspecialchars(COM_checkWords($A['title'])));
} else {
! $A['introtext'] = COM_undoClickableLinks (htmlspecialchars(COM_checkWords($A['introtext'])));
! $A['bodytext'] = COM_undoClickableLinks (htmlspecialchars(COM_checkWords($A['bodytext'])));
$A['title'] = htmlspecialchars(COM_checkWords($A['title']));
}
***************
*** 243,248 ****
$publish_hour += 12;
}
! $A['unixdate'] = strtotime($A['publish_year'] . '-' . $A['publish_month'] . '-' . $A['publish_day']
! . ' ' . $publish_hour . ':' . $A['publish_minute'] . ':00');
}
--- 251,257 ----
$publish_hour += 12;
}
! $A['unixdate'] = strtotime ($A['publish_year'] . '-'
! . $A['publish_month'] . '-' . $A['publish_day'] . ' '
! . $publish_hour . ':' . $A['publish_minute'] . ':00');
}
***************
*** 254,258 ****
$A['hits'] = 0;
}
! $display .= STORY_renderArticle ($A, 'n');
$display .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
}
--- 263,274 ----
$A['hits'] = 0;
}
! if ($A['postmode'] == 'plaintext') {
! $B = $A;
! $B['introtext'] = COM_makeClickableLinks ($B['introtext']);
! $B['bodytext'] = COM_makeClickableLinks ($B['bodytext']);
! $display .= STORY_renderArticle ($B, 'n');
! } else {
! $display .= STORY_renderArticle ($A, 'n');
! }
$display .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
}
***************
*** 348,352 ****
$story_templates->set_var('story_unixstamp', $A['unixdate']);
! /* Auto Story Arhive or Delete Feature */
if ($A['expiredate'] == 0 or date('Y', $A['expiredate']) < 2000) {
$A['expiredate'] = time();
--- 364,368 ----
$story_templates->set_var('story_unixstamp', $A['unixdate']);
! /* Auto Story Archive or Delete Feature */
if ($A['expiredate'] == 0 or date('Y', $A['expiredate']) < 2000) {
$A['expiredate'] = time();
***************
*** 429,433 ****
$story_templates->set_var('frontpage_options', COM_optionList($_TABLES['frontpagecodes'],'code,name',$A['frontpage']));
list($newintro, $newbody) = replace_images($A['sid'], stripslashes($A['introtext']), stripslashes($A['bodytext']));
!
$story_templates->set_var('lang_introtext', $LANG24[16]);
if ($A['postmode'] == 'plaintext') {
--- 445,454 ----
$story_templates->set_var('frontpage_options', COM_optionList($_TABLES['frontpagecodes'],'code,name',$A['frontpage']));
list($newintro, $newbody) = replace_images($A['sid'], stripslashes($A['introtext']), stripslashes($A['bodytext']));
!
! if ($A['postmode'] == 'plaintext') {
! $newintro = COM_undoClickableLinks ($newintro);
! $newbody = COM_undoClickableLinks ($newbody);
! }
!
$story_templates->set_var('lang_introtext', $LANG24[16]);
if ($A['postmode'] == 'plaintext') {
***************
*** 1081,1084 ****
--- 1102,1110 ----
}
+ if ($postmode == 'plaintext') {
+ $introtext = COM_makeClickableLinks ($introtext);
+ $bodytext = COM_makeClickableLinks ($bodytext);
+ }
+
if ($_CONF['maximagesperarticle'] > 0) {
if ($delete_old_story) {
From dhaun at iowaoutdoors.org Sun Nov 14 15:55:16 2004
From: dhaun at iowaoutdoors.org (dhaun at iowaoutdoors.org)
Date: Sun, 14 Nov 2004 20:55:16 +0000
Subject: [geeklog-cvs] geeklog-1.3/public_html usersettings.php,1.107,1.108
Message-ID: <20041114205516.A170965AC@iowaoutdoors>
Update of /var/cvs/geeklog-1.3/public_html
In directory www:/tmp/cvs-serv27315
Modified Files:
usersettings.php
Log Message:
Rename userphoto when changing a username (bug #321)
Index: usersettings.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/usersettings.php,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** usersettings.php 9 Oct 2004 20:44:41 -0000 1.107
--- usersettings.php 14 Nov 2004 20:55:14 -0000 1.108
***************
*** 798,801 ****
--- 798,819 ----
$A['new_username'] = addslashes ($A['new_username']);
if (DB_count ($_TABLES['users'], 'username', $A['new_username']) == 0) {
+ if ($_CONF['allow_user_photo'] == 1) {
+ $photo = DB_getItem ($_TABLES['users'], 'photo',
+ "uid = {$_USER['uid']}");
+ $newphoto = preg_replace ('/' . $_USER['username'] . '/',
+ $A['new_username'], $photo, 1);
+ $imgpath = $_CONF['path_images'] . 'userphotos/';
+ if (rename ($imgpath . $photo,
+ $imgpath . $newphoto) === false) {
+ $display = COM_siteHeader ('menu');
+ $display .= COM_errorLog ('Could not rename userphoto "'
+ . $photo . '" to "' . $newphoto . '".');
+ $display .= COM_siteFooter ();
+ return $display;
+ }
+ DB_change ($_TABLES['users'], 'photo',
+ addslashes ($newphoto), "uid", $_USER['uid']);
+ }
+
DB_change ($_TABLES['users'], 'username', $A['new_username'],
"uid", $_USER['uid']);
From dhaun at iowaoutdoors.org Sun Nov 14 15:55:16 2004
From: dhaun at iowaoutdoors.org (dhaun at iowaoutdoors.org)
Date: Sun, 14 Nov 2004 20:55:16 +0000
Subject: [geeklog-cvs] geeklog-1.3/public_html/admin user.php,1.86,1.87
Message-ID: <20041114205516.BC8ED1B195@iowaoutdoors>
Update of /var/cvs/geeklog-1.3/public_html/admin
In directory www:/tmp/cvs-serv27315/admin
Modified Files:
user.php
Log Message:
Rename userphoto when changing a username (bug #321)
Index: user.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/user.php,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** user.php 7 Oct 2004 21:10:23 -0000 1.86
--- user.php 14 Nov 2004 20:55:14 -0000 1.87
***************
*** 331,334 ****
--- 331,356 ----
$curphoto = '';
}
+
+ if (($_CONF['allow_user_photo'] == 1) && !empty ($curphoto)) {
+ $curusername = DB_getItem ($_TABLES['users'], 'username',
+ "uid = $uid");
+ if ($curusername != $username) {
+ // user has been renamed - rename the photo, too
+ $newphoto = preg_replace ('/' . $curusername . '/',
+ $username, $curphoto, 1);
+ $imgpath = $_CONF['path_images'] . 'userphotos/';
+ if (rename ($imgpath . $curphoto,
+ $imgpath . $newphoto) === false) {
+ $display = COM_siteHeader ('menu');
+ $display .= COM_errorLog ('Could not rename userphoto "'
+ . $photo . '" to "' . $newphoto . '".');
+ $display .= COM_siteFooter ();
+ return $display;
+ }
+ $curphoto = $newphoto;
+ }
+ }
+
+ $curphoto = addslashes ($curphoto);
DB_query("UPDATE {$_TABLES['users']} SET username = '$username', fullname = '$fullname', passwd = '$passwd', email = '$email', homepage = '$homepage', photo = '$curphoto' WHERE uid = $uid");
if ($_CONF['custom_registration'] AND (function_exists('custom_usersave'))) {
From dhaun at iowaoutdoors.org Sun Nov 14 15:58:25 2004
From: dhaun at iowaoutdoors.org (dhaun at iowaoutdoors.org)
Date: Sun, 14 Nov 2004 20:58:25 +0000
Subject: [geeklog-cvs] geeklog-1.3/public_html/docs history,1.253,1.254
Message-ID: <20041114205825.5E8B64AA35@iowaoutdoors>
Update of /var/cvs/geeklog-1.3/public_html/docs
In directory www:/tmp/cvs-serv27432/public_html/docs
Modified Files:
history
Log Message:
Updated list of changes
Index: history
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/docs/history,v
retrieving revision 1.253
retrieving revision 1.254
diff -C2 -d -r1.253 -r1.254
*** history 30 Oct 2004 17:45:04 -0000 1.253
--- history 14 Nov 2004 20:58:22 -0000 1.254
***************
*** 4,7 ****
--- 4,14 ----
------------
+ - When changing a username, make sure to change the name of the user's photo,
+ too (bug #321) [Dirk]
+ - Links in "plain text" stories and comments are now made clickable (i.e.
+ enclosed in tags) when the post is saved instead of when it's displayed,
+ as in the previous release candidates. This also fixes bug #308. [Dirk]
+ - Added $_CONF['disable_autolinks'] config option to disable autolinks [Dirk]
+ - Removed ViewBlacklist.Admin.class.php from the SpamX plugin [Tom Willet]
- Overhauled handling of personal events [Dirk]:
+ Fixed deleting personal events (again).
***************
*** 14,18 ****
- When deleting a story (automatically), make sure we're only deleting comments
belonging to that story (i.e. added a check for type = 'article') [Dirk]
! - Added {event_type}, {lang_event_type}, and {edit_icon} in all the theme's
calendar/eventdetails.thtml template file [Dirk]
- Fixed some URLs in the calendar (missing slash) [Dirk]
--- 21,25 ----
- When deleting a story (automatically), make sure we're only deleting comments
belonging to that story (i.e. added a check for type = 'article') [Dirk]
! - Added {event_type}, {lang_event_type}, and {edit_icon} in all the themes'
calendar/eventdetails.thtml template file [Dirk]
- Fixed some URLs in the calendar (missing slash) [Dirk]
From dhaun at iowaoutdoors.org Sat Nov 20 07:16:14 2004
From: dhaun at iowaoutdoors.org (dhaun at iowaoutdoors.org)
Date: Sat, 20 Nov 2004 12:16:14 +0000
Subject: [geeklog-cvs] geeklog-1.3/public_html/admin user.php,1.87,1.88
Message-ID: <20041120121614.B308549031@iowaoutdoors>
Update of /var/cvs/geeklog-1.3/public_html/admin
In directory www:/tmp/cvs-serv15500
Modified Files:
user.php
Log Message:
Display a message when using the "changepw" button.
Index: user.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/user.php,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** user.php 14 Nov 2004 20:55:14 -0000 1.87
--- user.php 20 Nov 2004 12:16:11 -0000 1.88
***************
*** 226,229 ****
--- 226,230 ----
* @param int $uid ID of user to change password for
* @param string $passwd New password
+ * @return string HTML redirect or error message
*
*/
***************
*** 237,248 ****
$passwd = md5 ($passwd);
$result = DB_change ($_TABLES['users'], 'passwd', "$passwd",
! 'uid', $uid, $_CONF['site_admin_url'] . '/user.php?mode=none');
} else {
$retval .= COM_siteHeader ('menu');
$retval .= COM_errorLog ('CHANGEPW ERROR: There was nothing to do!', 3);
$retval .= COM_siteFooter ();
- echo $retval;
- exit;
}
}
--- 238,251 ----
$passwd = md5 ($passwd);
$result = DB_change ($_TABLES['users'], 'passwd', "$passwd",
! 'uid', $uid);
!
! $retval .= COM_refresh ($_CONF['site_admin_url'] . '/user.php?msg=5');
} else {
$retval .= COM_siteHeader ('menu');
$retval .= COM_errorLog ('CHANGEPW ERROR: There was nothing to do!', 3);
$retval .= COM_siteFooter ();
}
+
+ return $retval;
}
***************
*** 716,721 ****
}
} else if (($mode == $LANG28[17]) && !empty ($LANG28[17])) { // change password
! changepw (COM_applyFilter ($HTTP_POST_VARS['uid'], true),
! $HTTP_POST_VARS['passwd']);
} else if ($mode == 'edit') {
$display .= COM_siteHeader('menu', $LANG28[1]);
--- 719,724 ----
}
} else if (($mode == $LANG28[17]) && !empty ($LANG28[17])) { // change password
! $display .= changepw (COM_applyFilter ($HTTP_POST_VARS['uid'], true),
! $HTTP_POST_VARS['passwd']);
} else if ($mode == 'edit') {
$display .= COM_siteHeader('menu', $LANG28[1]);
From dhaun at iowaoutdoors.org Sat Nov 20 07:18:39 2004
From: dhaun at iowaoutdoors.org (dhaun at iowaoutdoors.org)
Date: Sat, 20 Nov 2004 12:18:39 +0000
Subject: [geeklog-cvs] geeklog-1.3 config.php,1.144,1.145
Message-ID: <20041120121839.6F6E449031@iowaoutdoors>
Update of /var/cvs/geeklog-1.3
In directory www:/tmp/cvs-serv15572
Modified Files:
config.php
Log Message:
Grouped the allow_... options together and rephrased the comments for mogrify.
Index: config.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/config.php,v
retrieving revision 1.144
retrieving revision 1.145
diff -C2 -d -r1.144 -r1.145
*** config.php 13 Nov 2004 18:08:17 -0000 1.144
--- config.php 20 Nov 2004 12:18:37 -0000 1.145
***************
*** 221,224 ****
--- 221,230 ----
$_CONF['allow_user_photo'] = 1; // allow users to upload self-photo
+ // Allow users to change their username (if set to 1).
+ $_CONF['allow_username_change'] = 0;
+
+ // Allow users to delete their account (if set to 1).
+ $_CONF['allow_account_delete'] = 0;
+
// hides the list of authors from the preferences
$_CONF['hide_author_exclusion'] = 0;
***************
*** 407,416 ****
$_CONF['skip_preview'] = 0; // If = 1, allow user to submit comments and stories without previewing
- // Allow users to change their username (if set to 1).
- $_CONF['allow_username_change'] = 0;
-
- // Allow users to delete their account (if set to 1).
- $_CONF['allow_account_delete'] = 0;
-
// Topic Settings
--- 413,416 ----
***************
*** 552,561 ****
$_CONF['image_lib'] = ''; // can be one of 'netpbm', 'imagemagick', 'gdlib'
! // If you set image_lib to imagemagick give this path otherwise comment it out
! // NOTE: you will need a fairly recent version of ImageMagick for this to work.
! // ImageMagick version 5.4.9 (or newer) is recommended.
//$_CONF['path_to_mogrify'] = '/path/to/mogrify';
! // If you set image_lib to netpbm give the path to the netpbm directory, you
// need the trailing slash here.
// NOTE: if you use NETPBM, use the latest package from the Gallery package for
--- 552,561 ----
$_CONF['image_lib'] = ''; // can be one of 'netpbm', 'imagemagick', 'gdlib'
! // If you set image_lib to 'imagemagick' give the complete path to mogrify
! // here (i.e. including the name of the executable), otherwise comment it out
! // NOTE: requires ImageMagick version 5.4.9 (or newer)
//$_CONF['path_to_mogrify'] = '/path/to/mogrify';
! // If you set image_lib to 'netpbm' give the path to the netpbm directory, you
// need the trailing slash here.
// NOTE: if you use NETPBM, use the latest package from the Gallery package for
From dhaun at iowaoutdoors.org Sat Nov 20 09:22:08 2004
From: dhaun at iowaoutdoors.org (dhaun at iowaoutdoors.org)
Date: Sat, 20 Nov 2004 14:22:08 +0000
Subject: [geeklog-cvs] geeklog-1.3/language spanish.php,1.11,1.12
Message-ID: <20041120142208.C59231B99F@iowaoutdoors>
Update of /var/cvs/geeklog-1.3/language
In directory www:/tmp/cvs-serv18354
Modified Files:
spanish.php
Log Message:
Updated Spanish language file, provided by Angel Romero
Index: spanish.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/language/spanish.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** spanish.php 16 Oct 2004 12:35:15 -0000 1.11
--- spanish.php 20 Nov 2004 14:22:06 -0000 1.12
***************
*** 2,6 ****
###############################################################################
! # This is the spanish language page for GeekLog!
#
# Copyright (C) 2000 Jason Whittenburg
--- 2,6 ----
###############################################################################
! # This is the Spanish language page for GeekLog!
#
[...1103 lines suppressed...]
--- 1250,1267 ----
$LANG_PDF = array(
! 1 => 'La funci?n PDF est? inhabilitada',
! 2 => 'El document facilitado no se ha reproducido. Se ha recibidido el documento pero no se ha procesado. Por favor, aseg?rate que s?lo se env?en documentos formateados en html con el estandar xHTML. Por favor, toma nota que los documentos muy complejos en html es posible que no se reproduzcan correctamente o que no aparezcan. El documento resultante de tu intento tiene 0 bytes de extensi?n, y ha sido borrado. Si no estas seguro(a) que tu documento se reproduzca bien, por favor, vuelve a enviarlo.',
! 3 => 'Error desconocido durante la generaci?n de PDF',
! 4 => "No has dado datos de la p?gina o quieres utilizar la herramienta de generaci?n ad-hoc de PDF. Si crees que estas recibiendo esta p?gina\n por error entonces por favor contacta con el administrador del sistema. De otro modo, puedes utilizar el formulario que hay abajo para generar PDFs.",
! 5 => 'Cargando tu documento.',
! 6 => 'Por favor, espera mientras se carga tu documento.',
! 7 => 'Puedes pulsar a la derecha el bot?n de abajo y elegir \'save target...\' o \'save link location...\' para guardar una copia de tu documento.',
! 8 => "La ruta dada por el archivo de configuraci?n al HTMLDoc binario no es v?lida o este sistema no lo puede ejecutar. Por favor contacta con el administrador del sistema si este problema\n contin?a.",
! 9 => 'Creador de PDF',
! 10 => "Esta es la herramienta ad-hoc de creaci?n de PDF. Intentar? convertir cualquier URL que le d?s en un PDF. Por favor, toma nota que algunas p?ginas de la red (Web) no se generar?n correctamente con esta funci?n. Este\n is a limitation of the HTMLDoc PDF generation tool and such errors should not be reported to the administrators of this site",
11 => 'URL',
! 12 => '?Crea un PDF!',
! 13 => 'La configuraci?n PHP en este servidor no permite que los URL se utilicen con la instrucci?n fopen. El administrador del sistema tiene que editar el archivo php.ini y que est? conectado allow_url_fopen',
! 14 => 'El PDF que has solicitado o no existe o has intentado acceder a un archivo ilegalmente.'
);
From dhaun at iowaoutdoors.org Sat Nov 20 09:27:00 2004
From: dhaun at iowaoutdoors.org (dhaun at iowaoutdoors.org)
Date: Sat, 20 Nov 2004 14:27:00 +0000
Subject: [geeklog-cvs] geeklog-1.3/language japanese.php,1.21,1.22 japanese_utf-8.php,1.4,1.5
Message-ID: <20041120142701.4A5B91B9A0@iowaoutdoors>
Update of /var/cvs/geeklog-1.3/language
In directory www:/tmp/cvs-serv18434
Modified Files:
japanese.php japanese_utf-8.php
Log Message:
Updated Japanese language files, provided by Yusuke Sakata
Index: japanese_utf-8.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/language/japanese_utf-8.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** japanese_utf-8.php 25 Oct 2004 08:17:48 -0000 1.4
--- japanese_utf-8.php 20 Nov 2004 14:26:58 -0000 1.5
***************
*** 208,213 ****
24 => '??????????????????',
25 => '???????????????????????????????????????????????????????????????????????????',
! 26 => '%s reported the following abusive comment post:',
! 27 => 'Abuse report'
);
--- 208,213 ----
24 => '??????????????????',
25 => '???????????????????????????????????????????????????????????????????????????',
! 26 => '%s ??????????????????????????????????????????????????????????????????????????????',
! 27 => '?????????????????????????????????'
);
***************
*** 660,664 ****
8 => '???????????????',
9 => '(http://??????????????????????????????)',
! 10 => '??????????????????????????????????????????????????????',
11 => '????????????',
12 => '????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????C???????????????????????????????????????',
--- 660,664 ----
8 => '???????????????',
9 => '(http://??????????????????????????????)',
! 10 => '????????????????????????????????????????????????????????????????????????????????????',
11 => '????????????',
12 => '????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????C???????????????????????????????????????',
***************
*** 701,705 ****
18 => '???????????????',
19 => '????????????',
! 20 => '?????????????????????????????????',
21 => '??????',
22 => '??????',
--- 701,705 ----
18 => '???????????????',
19 => '????????????',
! 20 => '????????????',
21 => '??????',
22 => '??????',
***************
*** 747,753 ****
35 => '??????',
36 => '?????????',
! 37 => 'More by',
! 38 => 'More from',
! 39 => '????????????????????????',
40 => '???????????????????????????????????????',
41 => "????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????",
--- 747,753 ----
35 => '??????',
36 => '?????????',
! 37 => '?????????????????????????????????',
! 38 => '?????????????????????',
! 39 => '?????????????????????',
40 => '???????????????????????????????????????',
41 => "????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????",
***************
*** 875,879 ****
31 => '??????????????????',
32 => '??????????????????????????????%d ?????????????????????????????????%d ????????????????????????????????????',
! 33 => '??????',
34 => '???????????????????????????????????????????????????????????????',
35 => '???????????????????????????',
--- 875,879 ----
31 => '??????????????????',
32 => '??????????????????????????????%d ?????????????????????????????????%d ????????????????????????????????????',
! 33 => '??????',
34 => '???????????????????????????????????????????????????????????????',
35 => '???????????????????????????',
***************
*** 1000,1004 ****
9 => '???????????????????????????????????????????????????GeekLog??????????????????Geeklog????????????????????????????????????????????????????????????????????????????????????????????????????????????',
10 => '
?????????????????????????????????????????????????????????
',
! 11 => '??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Web???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????',
12 => 'plugineditor()???????????????????????????????????????????????????',
13 => '????????????????????????',
--- 1000,1004 ----
9 => '???????????????????????????????????????????????????GeekLog??????????????????Geeklog????????????????????????????????????????????????????????????????????????????????????????????????????????????',
10 => '
?????????????????????????????????????????????????????????
',
! 11 => '??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????',
12 => 'plugineditor()???????????????????????????????????????????????????',
13 => '????????????????????????',
***************
*** 1016,1026 ****
25 => '??????',
26 => '??????????????????',
! 27 => '????????????????????????????????????',
! 28 => '?????????????????????????????????',
! 29 => 'Geeklog??????????????????',
30 => '???????????????????????????????????????',
31 => '????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????',
32 => '
AutoLing?????????????????????????????????????????????????????????
', ! 33 => 'Code Version', 34 => 'Update' ); --- 1016,1026 ---- 25 => '??????', 26 => '??????????????????', ! 27 => '??????????????????Web?????????', ! 28 => '???????????????????????????????????????', ! 29 => '??????????????????????????????', 30 => '???????????????????????????????????????', 31 => '????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????', 32 => 'AutoLing?????????????????????????????????????????????????????????
', ! 33 => '????????????????????????', 34 => 'Update' ); Index: japanese.php =================================================================== RCS file: /var/cvs/geeklog-1.3/language/japanese.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** japanese.php 25 Oct 2004 08:17:48 -0000 1.21 --- japanese.php 20 Nov 2004 14:26:58 -0000 1.22 *************** *** 208,213 **** 24 => '????????????', 25 => '??????????????????????????????????????????????????', ! 26 => '%s reported the following abusive comment post:', ! 27 => 'Abuse report' ); --- 208,213 ---- 24 => '????????????', 25 => '??????????????????????????????????????????????????', ! 26 => '%s ????????????????????????????????????????????????????', ! 27 => '??????????????????????' ); *************** *** 660,664 **** 8 => '??????????', 9 => '(http://????????????????????)', ! 10 => '????????????????????????????????????', 11 => '????????', 12 => '????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????C??????????????????????????', --- 660,664 ---- 8 => '??????????', 9 => '(http://????????????????????)', ! 10 => '????????????????????????????????????????????????????????', 11 => '????????', 12 => '????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????C??????????????????????????', *************** *** 701,705 **** 18 => '??????????', 19 => '????????', ! 20 => '??????????????????????', 21 => '????', 22 => '????', --- 701,705 ---- 18 => '??????????', 19 => '????????', ! 20 => '????????', 21 => '????', 22 => '????', *************** *** 747,753 **** 35 => '????', 36 => '??????', ! 37 => 'More by', ! 38 => 'More from', ! 39 => '????????????????', 40 => '??????????????????????????', 41 => "????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????", --- 747,753 ---- 35 => '????', 36 => '??????', ! 37 => '??????????????????????', ! 38 => '??????????????', ! 39 => '??????????????', 40 => '??????????????????????????', 41 => "????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????", *************** *** 875,879 **** 31 => '????????????', 32 => '????????????????????%d ??????????????????????%d ????????????????????????', ! 33 => '????', 34 => '??????????????????????????????????????????', 35 => '??????????????????', --- 875,879 ---- 31 => '????????????', 32 => '????????????????????%d ??????????????????????%d ????????????????????????', ! 33 => '????', 34 => '??????????????????????????????????????????', 35 => '??????????????????', *************** *** 1000,1004 **** 9 => '??????????????????????????????????GeekLog????????????Geeklog????????????????????????????????????????????????????????????????????????', 10 => 'AutoLing??????????????????????????????????????
', ! 33 => 'Code Version', 34 => 'Update' ); --- 1016,1026 ---- 25 => '????', 26 => '????????????', ! 27 => '????????????Web??????', ! 28 => '??????????????????????????', ! 29 => '????????????????????', 30 => '??????????????????????????', 31 => '????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????', 32 => 'AutoLing??????????????????????????????????????
', ! 33 => '????????????????', 34 => 'Update' ); From dhaun at iowaoutdoors.org Sat Nov 20 09:31:52 2004 From: dhaun at iowaoutdoors.org (dhaun at iowaoutdoors.org) Date: Sat, 20 Nov 2004 14:31:52 +0000 Subject: [geeklog-cvs] geeklog-1.3/language swedish.php,1.10,1.11 Message-ID: <20041120143152.297EB1B98B@iowaoutdoors> Update of /var/cvs/geeklog-1.3/language In directory www:/tmp/cvs-serv18521 Modified Files: swedish.php Log Message: Updated Swedish language file, provided by Markus Berg Index: swedish.php =================================================================== RCS file: /var/cvs/geeklog-1.3/language/swedish.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** swedish.php 16 Oct 2004 12:35:15 -0000 1.10 --- swedish.php 20 Nov 2004 14:31:49 -0000 1.11 *************** *** 85,89 **** 38 => 'Content Syndication', 39 => 'Uppdatera', ! 40 => 'You have register_globals = Off in your php.ini. However, Geeklog requires register_globals to be on. Before you continue, please set it to on and restart your web server.', 41 => 'G?ster', 42 => 'Skrivet av:', --- 85,89 ---- 38 => 'Content Syndication', 39 => 'Uppdatera', ! 40 => 'Du har register_globals = Off i din php.ini. Geeklog kr?ver att register_globals ?r p?slaget. Innan du forts?tter s? m?ste du s?tta det till on och starta om din webbserver.', 41 => 'G?ster', 42 => 'Skrivet av:', *************** *** 91,104 **** 44 => 'Upp', 45 => 'MySQL Error Number', ! 46 => 'MySQL Error Message', 47 => 'Anv?ndarfunktioner', 48 => 'Kontoinformation', 49 => 'Inst?llningar', ! 50 => 'Error with SQL statement', 51 => 'hj?lp', 52 => 'Ny', 53 => 'Administrat?rsmeny', 54 => 'Kunde inte ?ppna filen.', ! 55 => 'Error at', 56 => 'R?sta', 57 => 'L?senord', --- 91,104 ---- 44 => 'Upp', 45 => 'MySQL Error Number', ! 46 => 'MySQL felmeddelande', 47 => 'Anv?ndarfunktioner', 48 => 'Kontoinformation', 49 => 'Inst?llningar', ! 50 => 'Fel i SQL-f?rfr?gan', 51 => 'hj?lp', 52 => 'Ny', 53 => 'Administrat?rsmeny', 54 => 'Kunde inte ?ppna filen.', ! 55 => 'Fel vid', 56 => 'R?sta', 57 => 'L?senord', *************** *** 210,216 **** 23 => 'Din epostadress kommer INTE att vara publik.', 24 => 'Anonym anv?ndare', ! 25 => 'Are you sure you want to report this post to the site admin?', ! 26 => '%s reported the following abusive comment post:', ! 27 => 'Abuse report' ); --- 210,216 ---- 23 => 'Din epostadress kommer INTE att vara publik.', 24 => 'Anonym anv?ndare', ! 25 => '?r du s?ker p? att du vill rapportera detta inl?gg till sajtadministrat?ren?', ! 26 => '%s har rapporterat f?ljande inl?gg:', ! 27 => 'Anm?l missbruk' ); *************** *** 324,329 **** 104 => 'Visa online-status', 105 => 'Jag vill synas i \'Vem ?r h?r\'-blocket', ! 106 => 'Location', ! 107 => 'Shown in your public profile' ); --- 324,329 ---- 104 => 'Visa online-status', 105 => 'Jag vill synas i \'Vem ?r h?r\'-blocket', ! 106 => 'Plats', ! 107 => 'Visas i din publika profil' ); *************** *** 338,343 **** 5 => 'N?sta', 6 => 'F?reg?ende', ! 7 => 'First', ! 8 => 'Last' ); --- 338,343 ---- 5 => 'N?sta', 6 => 'F?reg?ende', ! 7 => 'F?rsta', ! 8 => 'Sista' ); *************** *** 471,498 **** $LANG10 = array( ! 1 => 'Site Statistics', ! 2 => 'Total Hits to the System', ! 3 => 'Stories(Comments) in the System', ! 4 => 'Polls(Answers) in the System', ! 5 => 'Links(Clicks) in the System', ! 6 => 'Events in the System', ! 7 => 'Top Ten Viewed Stories', ! 8 => 'Story Title', ! 9 => 'Views', ! 10 => 'It appears that there are no stories on this site or no one has ever viewed them.', ! 11 => 'Top Ten Commented Stories', ! 12 => 'Comments', ! 13 => 'It appears that there are no stories on this site or no one has ever posted a comment on them.', ! 14 => 'Top Ten Polls', ! 15 => 'Poll Question', ! 16 => 'Votes', ! 17 => 'It appears that there are no polls on this site or no one has ever voted.', ! 18 => 'Top Ten Links', ! 19 => 'Links', ! 20 => 'Hits', ! 21 => 'It appears that there are no links on this site or no one has ever clicked on one.', ! 22 => 'Top Ten Emailed Stories', ! 23 => 'Emails', ! 24 => 'It appears that no one has emailed a story on this site' ); --- 471,498 ---- $LANG10 = array( ! 1 => 'Sajtstatistik', ! 2 => 'Totalt antal tr?ffar p? sajten', ! 3 => 'Artiklar(kommentarer) p? sajten', ! 4 => 'Omr?stningar(svar) p? sajten', ! 5 => 'L?nkar(tr?ffar) p? sajten', ! 6 => 'Aktiviteter i sajtkalendern', ! 7 => 'De tio mest l?sta artiklarna', ! 8 => 'Artikeltitel', ! 9 => 'Visningar', ! 10 => 'Det verkar inte finnas n?gra artiklar p? den h?r sajten, eller s? har ingen av dom blivit l?sta.', ! 11 => 'De tio mest kommenterade artiklarna', ! 12 => 'Kommentarer', ! 13 => 'Det verkar inte finnas n?gra artiklar p? den h?r sajten, eller s? har ingen av dom blivit kommenterade.', ! 14 => 'De tio st?rsta omr?stningarna', ! 15 => 'Omr?stningsfr?ga', ! 16 => 'R?ster', ! 17 => 'Det verkar inte finnas n?gra omr?stningar p? den h?r sajten, eller s? har ingen r?stat.', ! 18 => 'Tio popul?raste l?nkarna', ! 19 => 'L?nkar', ! 20 => 'Tr?ffar', ! 21 => 'Det verkar inte finnas n?gra l?nkar p? sajten, eller s? har ingen av dom blivit klickade.', ! 22 => 'De tio mest epostade artiklarna', ! 23 => 'g?nger', ! 24 => 'Det verkar inte som om n?gon har epostat n?gon artikel fr?n den h?r sajten' ); *************** *** 505,509 **** 3 => 'Skriv ut artikel', 4 => 'Artikelalternativ', ! 5 => 'PDF Story Format' ); --- 505,509 ---- 3 => 'Skriv ut artikel', 4 => 'Artikelalternativ', ! 5 => 'Artikel i PDF-format' ); *************** *** 575,584 **** $LANG20 = array( ! 1 => 'Authenticering kr?vs', 2 => 'Felaktig inloggningsinformation', 3 => 'Felaktigt l?senord f?r anv?ndare', 4 => 'Anv?ndarnamn:', 5 => 'L?senord:', ! 6 => 'All tillg?ng till administrativa delar av denna webbsajt loggas och kontrolleras.Error AutoLink tag not correct format
', ! 33 => 'Code Version', ! 34 => 'Update' ); --- 1020,1030 ---- 26 => 'Namn p? insticksmodul', 27 => 'Insticksmodulens hemsida', ! 28 => 'Installerad version', 29 => 'Geeklog-version', 30 => 'Radera insticksmodul?', 31 => '?r du s?ker p? att du vill radera denna insticksmodu? Om du g?r det s? kommer du att radera alla filer, data, och datastrukturer som denna insticksmodul anv?nder. Om du ?r s?ker, klicka "radera" igen nedan.', ! 32 => 'Error AutoLink m?rkord har inte korrekt format
', ! 33 => 'Kodversion', ! 34 => 'Uppdatera' ); *************** *** 1033,1073 **** $LANG33 = array( ! 1 => 'create feed', ! 2 => 'save', ! 3 => 'delete', ! 4 => 'cancel', ! 10 => 'Content Syndication', ! 11 => 'New Feed', ! 12 => 'Admin Home', ! 13 => 'To modify or delete a feed, click on the feed\'s title below. To create a new feed, click on New Feed above.', ! 14 => 'Title', ! 15 => 'Type', ! 16 => 'Filename', 17 => 'Format', ! 18 => 'last updated', ! 19 => 'Enabled', ! 20 => 'Yes', ! 21 => 'No', ! 22 => '(no feeds)', ! 23 => 'all Stories', ! 24 => 'Feed Editor', ! 25 => 'Feed Title', ! 26 => 'Limit', ! 27 => 'Length of entries', ! 28 => '(0 = no text, 1 = full text, other = limit to that number of chars.)', ! 29 => 'Description', ! 30 => 'Last Update', ! 31 => 'Character Set', ! 32 => 'Language', ! 33 => 'Contents', ! 34 => 'Entries', ! 35 => 'Hours', ! 36 => 'Select type of feed', ! 37 => 'You have at least one plugin installed that supports content syndication. Below you will need to select whether you want to create a Geeklog feed or a feed from one of the plugins.', ! 38 => 'Error: Missing Fields', ! 39 => 'Please fill in the Feed Title, Description, and Filename.', ! 40 => 'Please enter a number of entries or number of hours.', ! 41 => 'Links', ! 42 => 'Events' ); --- 1033,1073 ---- $LANG33 = array( ! 1 => 'skapa kanal', ! 2 => 'spara', ! 3 => 'radera', ! 4 => 'avbryt', ! 10 => 'Inneh?llsprenumeration', ! 11 => 'Ny kanal', ! 12 => 'Administrat?rsmeny', ! 13 => 'F?r att ?ndra eller radera en kanal m?ste du klicka p? dess l?nk nedan. F?r att skapa en ny kanal s? m?ste du klicka p? "Ny kanal" ovan.', ! 14 => 'Titel', ! 15 => 'Typ', ! 16 => 'Filnamn', 17 => 'Format', ! 18 => 'senast uppdaterad', ! 19 => 'Aktiverad', ! 20 => 'Ja', ! 21 => 'Nej', ! 22 => '(inga kanaler)', ! 23 => 'alla artiklar', ! 24 => 'Redigerar kanaler', ! 25 => 'Kanaltitel', ! 26 => 'Gr?ns', ! 27 => 'Storlek p? inl?gg', ! 28 => '(0 = ingen text, 1 = hela texten, annat = begr?nsat till angivet antal tecken.)', ! 29 => 'Beskrivning', ! 30 => 'Senaste uppdatering', ! 31 => 'Teckenupps?ttning', ! 32 => 'Spr?k', ! 33 => 'Inneh?ll', ! 34 => 'Inl?gg', ! 35 => 'Timmar', ! 36 => 'Kanaltyp', ! 37 => 'Du har ?tminstone en insticksmodul som st?der inneh?llskanaler. Nedan m?ste du v?lja om du vill skapa en Geeklog-kanal eller en kanal fr?n en av insticksmodulerna.', ! 38 => 'Error: F?lt saknas', ! 39 => 'Fyll i Kanaltitel, beskrivning och filnamn.', ! 40 => 'Fyll antingen i antal inl?gg eller ett antal timmar.', ! 41 => 'L?nkar', ! 42 => 'Aktiviteter' ); *************** *** 1133,1140 **** 56 => 'Epostadressen du angivit anv?nds redan av ett annat konto.', 57 => 'Ditt konto har raderats.', ! 58 => 'Your feed has been successfully saved.', ! 59 => 'The feed has been successfully deleted.', ! 60 => 'The plugin was successfully updated', ! 61 => 'Plugin %s: Unknown message placeholder' ); --- 1133,1140 ---- 56 => 'Epostadressen du angivit anv?nds redan av ett annat konto.', 57 => 'Ditt konto har raderats.', ! 58 => 'Din kanal har lagrats.', ! 59 => 'Kanalen har raderats.', ! 60 => 'Insticksmodulen har uppdaterats', ! 61 => 'Insticksmodul %s: Ok?nt meddelande' ); *************** *** 1191,1200 **** 'usersingroup' => 'Anv?ndare i grupp %s', 'usergroupadmin' => 'User Group Administration', ! 'add' => 'Add', ! 'remove' => 'Remove', ! 'availmembers' => 'Available Members', ! 'groupmembers' => 'Group Members', ! 'canteditgroup' => 'To edit this group, you have to be a member of the group. Please contact the system administrator if you feel this is an error.', ! 'cantlistgroup' => 'To see the members of this group, you have to be a member yourself. Please contact the system administrator if you feel this is an error.' ); --- 1191,1200 ---- 'usersingroup' => 'Anv?ndare i grupp %s', 'usergroupadmin' => 'User Group Administration', ! 'add' => 'L?gg till', ! 'remove' => 'Radera', ! 'availmembers' => 'Tillg?ngliga medlemmar', ! 'groupmembers' => 'Gruppmedlemmar', ! 'canteditgroup' => 'Du m?ste vara medlem i denna grupp f?r att f? redigera den. Kontakta din systemadministrat?r om du anser att detta meddelande ?r felaktigt.', ! 'cantlistgroup' => 'Du m?ste vara medlem i denna grupp f?r att f? se dess medlemmar. Kontakta din systemadministrat?r om du anser att detta meddelande ?r felaktigt.' ); *************** *** 1256,1274 **** $LANG_PDF = array( ! 1 => 'The PDF feature has been disabled', ! 2 => 'The document provided was not rendered. The document was received but could not be processed. Please make sure to submit only html formatted documents that have been written to the xHTML standard. Please note that overly complex html documents may not render correctly or at all.The document resulting from your attempt was 0 bytes in length, and has been deleted. If you\'re sure that your document should render fine, please re-submit it.', ! 3 => 'Unknown error during PDF generation', ! 4 => "No page data was given or you want to use the ad-hoc PDF generation tool below. If you think you are getting this page\n in error then please contact the system administrator. Otherwise, you may use the form below to generate PDF's in an ad-hoc fashion.", ! 5 => 'Loading your document.', ! 6 => 'Please wait while your document is loaded.', ! 7 => 'You may right click the button below and choose \'save target...\' or \'save link location...\' to save a copy of your document.', ! 8 => "The path given in the configuration file to the HTMLDoc binary is invalid or this system cannot execute it. Please contact the site administrator if this problem\n persists.", ! 9 => 'PDF Generator', ! 10 => "This is the Ad-hoc PDF Generation tool. It will attempt to convert any URL you give into a PDF. Please note that some web pages will not render properly with this feature. This\n is a limitation of the HTMLDoc PDF generation tool and such errors should not be reported to the administrators of this site", 11 => 'URL', ! 12 => 'Generate PDF!', ! 13 => 'The PHP configuration on this server does not allow URLs to be used with the fopen() command. The system administrator must edit the php.ini file and set allow_url_fopen to On', ! 14 => 'The PDF you requested either does not exist or you tried to illegally access a file.' ); ! ?> \ No newline at end of file --- 1256,1274 ---- $LANG_PDF = array( ! 1 => 'PDF-funktionen ?r avst?ngd', ! 2 => 'Dokumentet kunde inte renderas. Dokumentet kunde h?mtas, men kunde inte renderas. Var noga med att bara skicka in html-formatterade dokument som ?r skrivna enligt xHTML. Notera att komplexa dokument kanske inte kan renderas korrekt, eller ?ver huvud taget. Ditt renderade dokumentet var 0 byte stort och har raderats. Om du ?r ?vertygad om att ditt dokument borde kunna renderas, s? b?r du skicka in det igen.', ! 3 => 'Ok?nt fel vid PDF-generering', ! 4 => "Inget siddata gavs, eller s? vill du anv?nda ad-hoc PDF-genereringsverktyget nedan. Om du anser att du inte borde f? detta felmeddelande s? b?r du kontakta systemadministrat?ren. Annars kan du prova att anv?nda formul?ret nedan f?r att generera PDF-filer med mer handp?l?ggning.", ! 5 => 'Laddar ditt dokument.', ! 6 => 'V?nta medan ditt dokument laddas.', ! 7 => 'Du kan h?gerklicka p? knappen nedan och v?lja \'spara m?l...\' eller \'spara l?nk...\' f?r att spara en kopia av ditt dokument.', ! 8 => "Den angivna s?kv?gen till HTMLDoc-bin?ren ?r felaktig, eller s? kan det h?r systemet inte exekvera den. Kontakta systemadministrat?ren om detta fel kvarst?r.", ! 9 => 'PDF-generator', ! 10 => "Detta ?r Ad-hoc PDF-generering. Verktyget kommer att f?rs?ka konvertera valfri URL till en PDF. T?nk p? att vissa sidor inte renderas ordentligt med den h?r funktionen, men detta ?r en begr?nsning av HTMLDoc PDF-genereringsverktyget, och dessa felmeddelanden b?r inte rapporteras till systemadministrat?rerna p? denna sajt", 11 => 'URL', ! 12 => 'Generera PDF!', ! 13 => 'PHP-konfigurationen p? den h?r servern till?ter inte ?ppning av URL:er med fopen()-kommandot. Systemadministrat?ren m?ste redigera php.ini-filen och aktivera allow_url_fopen', ! 14 => 'PDF-filen du beg?rde existerar inte, eller s? f?rs?kte du h?mta en fil som du inte har tillg?ng till.' ); ! ?> From dhaun at iowaoutdoors.org Sat Nov 20 12:55:09 2004 From: dhaun at iowaoutdoors.org (dhaun at iowaoutdoors.org) Date: Sat, 20 Nov 2004 17:55:09 +0000 Subject: [geeklog-cvs] geeklog-1.3/system lib-database.php,1.32,1.33 Message-ID: <20041120175509.959E03B1A@iowaoutdoors> Update of /var/cvs/geeklog-1.3/system In directory www:/tmp/cvs-serv23838 Modified Files: lib-database.php Log Message: Fixed comments for the DB_result() and dbResult() functions (bug #320) Index: lib-database.php =================================================================== RCS file: /var/cvs/geeklog-1.3/system/lib-database.php,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** lib-database.php 3 Sep 2004 19:59:56 -0000 1.32 --- lib-database.php 20 Nov 2004 17:55:07 -0000 1.33 *************** *** 317,328 **** /** ! * Retrieves the number of rows in a recordset * ! * This returns the number of rows in a recordset...is this even used? * ! * @param object $recordset The recordset to operate one * @param int $row row to get data from * @param string $field field to return ! * @return int Returns number of rows in a recordset * */ --- 317,328 ---- /** ! * Retrieves the contents of a field * ! * This returns the contents of a field from a result set * ! * @param object $recordset The recordset to operate on * @param int $row row to get data from * @param string $field field to return ! * @return (depends on the contents of the field) * */ From dhaun at iowaoutdoors.org Sat Nov 20 12:55:09 2004 From: dhaun at iowaoutdoors.org (dhaun at iowaoutdoors.org) Date: Sat, 20 Nov 2004 17:55:09 +0000 Subject: [geeklog-cvs] geeklog-1.3/system/databases mysql.class.php,1.18,1.19 Message-ID: <20041120175509.AD1E160E3F@iowaoutdoors> Update of /var/cvs/geeklog-1.3/system/databases In directory www:/tmp/cvs-serv23838/databases Modified Files: mysql.class.php Log Message: Fixed comments for the DB_result() and dbResult() functions (bug #320) Index: mysql.class.php =================================================================== RCS file: /var/cvs/geeklog-1.3/system/databases/mysql.class.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** mysql.class.php 13 Jul 2004 19:00:03 -0000 1.18 --- mysql.class.php 20 Nov 2004 17:55:07 -0000 1.19 *************** *** 548,559 **** /** ! * Retrieves the number of rows in a recordset ! * ! * This returns the number of rows in a recordset * ! * @param object $recordset The recordset to operate one * @param int $row row to get data from * @param string $field field to return ! * @return int * */ --- 548,557 ---- /** ! * Returns the contents of one cell from a MySQL result set * ! * @param object $recordset The recordset to operate on * @param int $row row to get data from * @param string $field field to return ! * @return (depends on field content) * */ From dhaun at iowaoutdoors.org Sat Nov 20 13:01:32 2004 From: dhaun at iowaoutdoors.org (dhaun at iowaoutdoors.org) Date: Sat, 20 Nov 2004 18:01:32 +0000 Subject: [geeklog-cvs] geeklog-1.3/public_html/docs config.html,1.41,1.42 history,1.254,1.255 Message-ID: <20041120180132.CAA841B989@iowaoutdoors> Update of /var/cvs/geeklog-1.3/public_html/docs In directory www:/tmp/cvs-serv23999 Modified Files: config.html history Log Message: Updated documentation Index: config.html =================================================================== RCS file: /var/cvs/geeklog-1.3/public_html/docs/config.html,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** config.html 13 Nov 2004 18:08:17 -0000 1.41 --- config.html 20 Nov 2004 18:01:30 -0000 1.42 *************** *** 772,776 ****tar -zxvf geeklog-1.3.10rc2.tar.gztar -zxvf geeklog-1.3.10rc3.tar.gztar -zxvf geeklog-1.3.10rc3.tar.gztar -zxvf geeklog-1.3.10.tar.gz[story:email-bug About the email bug] would be
translated into <a href="http://example.com/article.php/email-bug">About the email bug</a>[story:] to link to stories and
[event:] to link to events. Plugins can define their own
Index: history
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/docs/history,v
retrieving revision 1.256
retrieving revision 1.257
diff -C2 -d -r1.256 -r1.257
*** history 21 Nov 2004 10:15:28 -0000 1.256
--- history 28 Nov 2004 09:56:20 -0000 1.257
***************
*** 1,4 ****
--- 1,15 ----
GeekLog History/Changes:
+ Nov 28, 2004 (1.3.10)
+ ------------
+
+ - Allow omission of the link text for the [story:], [event:], and [staticpage:]
+ autotags. Geeklog will then use the title (of the story / event / static page)
+ as the link text [Dirk]
+ (affected files: system/lib-plugins.php, plugins/staticpages/functions.inc)
+
+ - Updated Chinese language files (all 4 of them), provided by Samuel M. Stone
+
+
Nov 21, 2004 (1.3.10rc3)
------------