php-blog-cvs Mailing List for Serendipity PHP Weblog System (Page 404)
A reliable, secure & extensible PHP blog | Not mainstream since 2002
Brought to you by:
garvinhicking,
jhermanns
You can subscribe to this list here.
2003 |
Jan
|
Feb
|
Mar
(179) |
Apr
(56) |
May
(53) |
Jun
(65) |
Jul
(70) |
Aug
(89) |
Sep
(50) |
Oct
(38) |
Nov
(12) |
Dec
(12) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2004 |
Jan
(57) |
Feb
(226) |
Mar
(172) |
Apr
(194) |
May
(120) |
Jun
(162) |
Jul
(297) |
Aug
(156) |
Sep
(312) |
Oct
(180) |
Nov
(358) |
Dec
(362) |
2005 |
Jan
(275) |
Feb
(224) |
Mar
(202) |
Apr
(157) |
May
(133) |
Jun
(115) |
Jul
(211) |
Aug
(257) |
Sep
(135) |
Oct
(116) |
Nov
(106) |
Dec
(81) |
2006 |
Jan
(74) |
Feb
(94) |
Mar
(59) |
Apr
(125) |
May
(50) |
Jun
(71) |
Jul
(45) |
Aug
(80) |
Sep
(3) |
Oct
(44) |
Nov
(50) |
Dec
(38) |
2007 |
Jan
(46) |
Feb
(33) |
Mar
(24) |
Apr
(28) |
May
(19) |
Jun
(37) |
Jul
(66) |
Aug
(73) |
Sep
(87) |
Oct
(33) |
Nov
(39) |
Dec
(37) |
2008 |
Jan
(20) |
Feb
(54) |
Mar
(47) |
Apr
(68) |
May
(10) |
Jun
(13) |
Jul
(13) |
Aug
(25) |
Sep
(11) |
Oct
(22) |
Nov
(22) |
Dec
(34) |
2009 |
Jan
(34) |
Feb
(35) |
Mar
(11) |
Apr
(10) |
May
(15) |
Jun
(18) |
Jul
(28) |
Aug
(22) |
Sep
(9) |
Oct
(12) |
Nov
(6) |
Dec
(32) |
2010 |
Jan
(11) |
Feb
(7) |
Mar
(9) |
Apr
(3) |
May
(16) |
Jun
(1) |
Jul
(2) |
Aug
(25) |
Sep
(9) |
Oct
(8) |
Nov
(4) |
Dec
(8) |
2011 |
Jan
(17) |
Feb
(1) |
Mar
(6) |
Apr
(7) |
May
(5) |
Jun
(2) |
Jul
(12) |
Aug
(3) |
Sep
(18) |
Oct
(3) |
Nov
(2) |
Dec
|
2012 |
Jan
(92) |
Feb
(74) |
Mar
(64) |
Apr
(55) |
May
(44) |
Jun
(91) |
Jul
(35) |
Aug
(42) |
Sep
(32) |
Oct
(56) |
Nov
(42) |
Dec
(81) |
2013 |
Jan
(117) |
Feb
(130) |
Mar
(33) |
Apr
(36) |
May
(155) |
Jun
(241) |
Jul
(113) |
Aug
(70) |
Sep
(50) |
Oct
(55) |
Nov
(34) |
Dec
(36) |
2014 |
Jan
(94) |
Feb
(67) |
Mar
(177) |
Apr
(67) |
May
(147) |
Jun
(137) |
Jul
(58) |
Aug
(56) |
Sep
(62) |
Oct
(35) |
Nov
(118) |
Dec
(53) |
2015 |
Jan
(204) |
Feb
(165) |
Mar
(275) |
Apr
(42) |
May
(58) |
Jun
(91) |
Jul
(81) |
Aug
(62) |
Sep
(23) |
Oct
(63) |
Nov
(29) |
Dec
(110) |
2016 |
Jan
(82) |
Feb
(55) |
Mar
(48) |
Apr
(92) |
May
(77) |
Jun
(41) |
Jul
(27) |
Aug
(41) |
Sep
(101) |
Oct
(84) |
Nov
(12) |
Dec
(18) |
2017 |
Jan
(44) |
Feb
(40) |
Mar
(23) |
Apr
(79) |
May
(27) |
Jun
(12) |
Jul
(20) |
Aug
(14) |
Sep
(3) |
Oct
(9) |
Nov
(4) |
Dec
(9) |
2018 |
Jan
(5) |
Feb
(23) |
Mar
(150) |
Apr
(114) |
May
(63) |
Jun
(25) |
Jul
(23) |
Aug
(54) |
Sep
(43) |
Oct
(10) |
Nov
(9) |
Dec
(1) |
2019 |
Jan
(1) |
Feb
(27) |
Mar
(27) |
Apr
(64) |
May
(21) |
Jun
(17) |
Jul
(12) |
Aug
(81) |
Sep
(15) |
Oct
(25) |
Nov
(15) |
Dec
(13) |
2020 |
Jan
(5) |
Feb
(4) |
Mar
(95) |
Apr
(59) |
May
(53) |
Jun
(22) |
Jul
(3) |
Aug
(13) |
Sep
(10) |
Oct
(4) |
Nov
(3) |
Dec
(1) |
2021 |
Jan
(20) |
Feb
(32) |
Mar
(34) |
Apr
(22) |
May
(58) |
Jun
(43) |
Jul
(35) |
Aug
(2) |
Sep
(14) |
Oct
(1) |
Nov
(2) |
Dec
|
2022 |
Jan
(2) |
Feb
(6) |
Mar
(4) |
Apr
|
May
(5) |
Jun
(4) |
Jul
(3) |
Aug
(5) |
Sep
(6) |
Oct
(3) |
Nov
(38) |
Dec
(15) |
2023 |
Jan
(26) |
Feb
(12) |
Mar
(3) |
Apr
(9) |
May
(2) |
Jun
(5) |
Jul
(8) |
Aug
|
Sep
(39) |
Oct
(11) |
Nov
(3) |
Dec
(3) |
2024 |
Jan
(19) |
Feb
(20) |
Mar
(15) |
Apr
(12) |
May
(2) |
Jun
(12) |
Jul
(4) |
Aug
(9) |
Sep
|
Oct
|
Nov
|
Dec
|
From: Garvin H. <gar...@us...> - 2005-01-19 11:09:01
|
Update of /cvsroot/php-blog/serendipity/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27222 Modified Files: serendipity_lang_ja.inc.php Log Message: updated japanese lang by tadashi jokagi Index: serendipity_lang_ja.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_ja.inc.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- serendipity_lang_ja.inc.php 10 Jan 2005 16:01:51 -0000 1.8 +++ serendipity_lang_ja.inc.php 19 Jan 2005 11:08:48 -0000 1.9 @@ -56,7 +56,7 @@ @define('WELCOME_BACK', 'Welcome back,'); @define('RUNNING', 'å®è¡ãã¦ãã Serendipity ã®ãã¼ã¸ã§ã³:'); @define('ADD_PLUGIN', 'ãã©ã°ã¤ã³è¿½å '); -@define('TITLE', 'ã¿ã¤ãã«'); +@define('TITLE', 'é¡å'); @define('DESCRIPTION', '説æ'); @define('PLACEMENT', 'é ç½®'); @define('DELETE', 'åé¤'); @@ -86,7 +86,7 @@ @define('NO_COMMENTS', 'ã³ã¡ã³ããããã¾ãã'); @define('POSTED_BY', 'æ稿è '); @define('ON', 'on'); -@define('A_NEW_COMMENT_BLAHBLAH', 'ããã° "s" ã®é¡å "%s" ã¨ããã¨ã³ããªã«æ°ããã³ã¡ã³ããæ稿ããã¾ããã'); +@define('A_NEW_COMMENT_BLAHBLAH', "ã¨ã³ããªã«æ°ããã³ã¡ã³ããæ稿ããã¾ããã\n\nããã°å:%s\nã¨ã³ããªå:\n%s"); @define('A_NEW_TRACKBACK_BLAHBLAH', 'é¡å "%s" ã«æ°ãããã©ãã¯ããã¯ãä½æããã¾ããã'); @define('NO_CATEGORY', 'ã«ãã´ãªãããã¾ãã'); @define('ENTRY_BODY', 'ã¨ã³ããªæ¬æ'); @@ -245,7 +245,8 @@ @define('SUBSCRIBE_TO_THIS_ENTRY', 'ãã®ã¨ã³ããªãè³¼èªãã'); @define('UNSUBSCRIBE_OK', "%s ã¯ä»ããã®ã¨ã³ããªã®è³¼èªãåãæ¶ãã¾ããã"); @define('NEW_COMMENT_TO_SUBSCRIBED_ENTRY', 'è³¼èªæ¸ã¿ã¨ã³ã㪠"%s" ã«æ°è¦ã³ã¡ã³ãã§ã'); -@define('SUBSCRIPTION_MAIL', "Hello %s,\n\nA new comment was made to the entry you are monitoring on \"%s\", entitled \"%s\"\nThe name of the poster is: %s\n\nYou can find the entry here: %s\n\nYou can unsubscribe by clicking on this link: %s\n"); +@define('SUBSCRIPTION_MAIL', " +ããã«ã¡ã¯ %s ããã\nç£è¦ä¸ã®ã¨ã³ããªã«æ°ããã³ã¡ã³ããä½æããã¾ããã\n\nããã°å:\n%s\nã¨ã³ããªå:\n%s\n\nä¸è¨ã§ã¨ã³ããªãè¦ã¤ãããã¨ãã§ãã¾ã:\n%s\n\nä¸è¨ã®ãªã³ã¯ãã¯ãªãã¯ããã¨è³¼èªè§£é¤ãããã¨ãã§ãã¾ã:\n%s\n"); @define('SUBSCRIPTION_TRACKBACK_MAIL', "Hello %s,\n\nA new trackback was added to the entry you are monitoring on \"%s\", entitled \"%s\"\nThe name of the poster is: %s\n\nYou can find the entry here: %s\n\nYou can unsubscribe by clicking on this link: %s\n"); @define('SIGNATURE', "\n-- \n%s is powered by Serendipity.\nThe best blog around, you can use it too.\nCheck out <http://s9y.org> to find out how."); @define('DATABASE_ALREADY_INSTALLED', 'é£ã°ãã¾ã: ãã¼ã¿ãã¼ã¹ã¯æ¢ã«ã¤ã³ã¹ãã¼ã«æ¸ã¿ã§ãã'); @@ -482,7 +483,7 @@ @define('PLUGIN_ITEM_DISPLAY_OVERVIEW', 'æ¦è¦ãã¼ã¸ã®ã¿è¡¨ç¤º'); @define('PLUGIN_ITEM_DISPLAY_BOTH', '常ã«è¡¨ç¤º'); @define('RSS_IMPORT_DESC', 'The RSS import will fetch an RSS feed and insert all the entries contained there inside your article base. You can choose if you want to import the items in DRAFT or PUBLISHED state. Categories in the foreign feed need to contain the exact same name like you entered the names in Serendipity. Via the other input box you can choose the category you want to have entries associated which do not match the imported feed.'); -@define('RSS_IMPORT_CATEGORY', 'Use this category for non-matching imported entries'); +@define('RSS_IMPORT_CATEGORY', 'ä¸è´ããªãã£ãã¤ã³ãã¼ãããã¨ã³ããªã¯ãã®ã«ãã´ãªã使ç¨ãã'); @define('COMMENTS_WILL_BE_MODERATED', 'Submitted comments will be subject to moderation before being displayed.'); @define('YOU_HAVE_THESE_OPTIONS', '次ã®ãªãã·ã§ã³ãå©ç¨å¯è½ã§ã:'); @@ -562,7 +563,7 @@ @define('COMMENTS_FILTER_ALL', 'ãã¹ã¦'); @define('COMMENTS_FILTER_APPROVED_ONLY', 'æ¿èªæ¸ã¿ã®ã¿'); @define('COMMENTS_FILTER_NEED_APPROVAL', 'æ¿èªå¾ ã¡'); -@define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); +@define('RSS_IMPORT_BODYONLY', 'ãã¹ã¦ã®ã¨ã³ããªã¯ãæ¬æãã»ã¯ã·ã§ã³ã«ç½®ããæ¡å¼µã¨ã³ããªã»ã¯ã·ã§ã³ã«åå²ããªã'); @define('SYNDICATION_PLUGIN_FULLFEED', 'RSS ãã£ã¼åä¸ã§æ¡å¼µæ¬æã¨ãã¹ã¦ã®è¨äºã表示ãã'); @define('WEEK', 'é±'); @define('WEEKS', 'é±'); @@ -584,7 +585,7 @@ @define('SELECT_A_PLUGIN_TO_ADD', 'ã¤ã³ã¹ãã¼ã«ããããã©ã°ã¤ã³ãé¸æãã'); @define('INSTALL_OFFSET', 'ãµã¼ãã¼æéå·®'); @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); -@define('STICKY_POSTINGS', 'Sticky Postings'); +@define('STICKY_POSTINGS', 'ã¹ãã£ããæ稿'); @define('INSTALL_FETCHLIMIT', 'ããã³ããã¼ã¸ã«ã¨ã³ããªã表示'); @define('INSTALL_FETCHLIMIT_DESC', 'åãã¼ã¸ã§ããã³ãã¨ã³ãã«è¡¨ç¤ºããã¨ã³ããªã®æ°'); @define('IMPORT_ENTRIES', 'ã¤ã³ãã¼ããã¼ã¿'); @@ -614,7 +615,7 @@ @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); @define('INSTALL_DBPERSISTENT', 'ç¶ç¶çæ¥ç¶ã使ç¨ãã'); @define('INSTALL_DBPERSISTENT_DESC', 'ç¶ç¶çãã¼ã¿ãã¼ã¹æ¥ç¶ã®ä½¿ç¨æ³ãæå¹ã«ãã¾ãã詳ãããã¨ã¯<a href="http://php.net/manual/features.persistent-connections.php" target="_blank">ãã</a>ãåç §ãã¦ãã ãããããã¯é常æ¨å¥¨ãã¾ããã'); -@define('NO_IMAGES_FOUND', 'ç»åãè¦ã¤ããã¾ãã'); +@define('NO_IMAGES_FOUND', 'ç»åãè¦ã¤ããã¾ããã'); @define('PERSONAL_SETTINGS', 'å人è¨å®'); @define('REFERER', 'ãªãã¡ã©ã¼'); @define('NOT_FOUND', 'è¦ã¤ããã¾ãã'); @@ -667,8 +668,8 @@ @define('NEXT', '次ã¸'); @define('APPROVE', 'æ¿èª'); @define('CATEGORY_ALREADY_EXIST', '"%s" ã¨ããååã®ã«ãã´ãªã¯æ¢ã«åå¨ãã¾ãã'); -@define('IMPORT_NOTES', 'Note:'); // Translate -@define('ERROR_FILE_FORBIDDEN', 'You are not allowed to upload files with active content'); // Translate +@define('IMPORT_NOTES', '注:'); +@define('ERROR_FILE_FORBIDDEN', 'ã¢ã¯ãã£ãã³ã³ãã³ãã®ãã¡ã¤ã«ãã¢ãããã¼ããããã¨ãèªãããã¦ãã¾ããã'); /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file |
From: Garvin H. <gar...@us...> - 2005-01-19 11:00:16
|
Update of /cvsroot/php-blog/serendipity/include/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25104/include/admin Modified Files: images.inc.php Log Message: resolve some conflicts with bundled vs. pre-installed pears Index: images.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/admin/images.inc.php,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- images.inc.php 10 Jan 2005 16:01:47 -0000 1.10 +++ images.inc.php 19 Jan 2005 11:00:03 -0000 1.11 @@ -130,7 +130,7 @@ if (file_exists($target)) { echo '(' . $target . ') ' . ERROR_FILE_EXISTS_ALREADY; } else { - require_once "HTTP/Request.php"; + require_once S9Y_INCLUDE_PATH . 'bundled-libs/HTTP/Request.php'; $req = &new HTTP_Request($serendipity['POST']['imageurl']); // Try to get the URL |
From: Garvin H. <gar...@us...> - 2005-01-19 11:00:16
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_spartacus In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25104/plugins/serendipity_event_spartacus Modified Files: serendipity_event_spartacus.php Log Message: resolve some conflicts with bundled vs. pre-installed pears Index: serendipity_event_spartacus.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spartacus/serendipity_event_spartacus.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- serendipity_event_spartacus.php 18 Jan 2005 11:49:30 -0000 1.3 +++ serendipity_event_spartacus.php 19 Jan 2005 11:00:03 -0000 1.4 @@ -93,7 +93,7 @@ if (file_exists($target) && filesize($target) > 0 && filemtime($target) >= (time()-$cacheTimeout)) { $data = file_get_contents($target); } else { - require_once "HTTP/Request.php"; + require_once S9Y_INCLUDE_PATH . 'bundled-libs/HTTP/Request.php'; $req = &new HTTP_Request($url); if (PEAR::isError($req->sendRequest()) || $req->getResponseCode() != '200') { |
From: Garvin H. <gar...@us...> - 2005-01-19 10:22:24
|
Update of /cvsroot/php-blog/serendipity/include/db In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15298/include/db Modified Files: db.inc.php mysql.inc.php mysqli.inc.php postgres.inc.php sqlite.inc.php Log Message: PLEASE TEST, THIS IS IMPORTANT! * Fix CSS not visible in upgrader (there must be a cleaner way to do this, I admit I feel bad with this solution) * Fix SQL index key creation, the parse_sql regexp didn't catch many lines. Create those missing SQL keys for alpha10 upgrade * Upgrader didn't emit SQL error messages * serendipity_db_query is now able to expect errors (like for this alpha10 upgrade) PLEASE TEST, THIS IS IMPORTANT! Index: db.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/db/db.inc.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- db.inc.php 19 Nov 2004 11:05:34 -0000 1.2 +++ db.inc.php 19 Jan 2005 10:22:13 -0000 1.3 @@ -1,9 +1,11 @@ <?php # $Id$ # Copyright (c) 2003-2004, Jannis Hermanns # All rights reserved. See LICENSE file for licensing details -@define('S9Y_DB_INCLUDED', TRUE); -include_once(S9Y_INCLUDE_PATH . "include/db/{$serendipity['dbType']}.inc.php"); + +if (@include_once(S9Y_INCLUDE_PATH . "include/db/{$serendipity['dbType']}.inc.php")) { + @define('S9Y_DB_INCLUDED', TRUE); +} function serendipity_db_update($table, $keys, $values) { Index: mysqli.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/db/mysqli.inc.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- mysqli.inc.php 9 Jan 2005 10:32:36 -0000 1.8 +++ mysqli.inc.php 19 Jan 2005 10:22:13 -0000 1.9 @@ -19,18 +19,22 @@ * array of field values if it returned a single row and $single is true * array of array of field values if it returned row(s) */ -function &serendipity_db_query($sql, $single = false, $result_type = "both", $reportErr=false, $assocKey=false, $assocVal=false) { +function &serendipity_db_query($sql, $single = false, $result_type = "both", $reportErr = false, $assocKey = false, $assocVal = false, $expectError = false) { global $serendipity; $type_map = array('assoc' => MYSQLI_ASSOC, 'num' => MYSQLI_NUM, 'both' => MYSQLI_BOTH); - $c = mysqli_query($serendipity['dbConn'], $sql); + if ($expectError) { + $c = @mysqli_query($serendipity['dbConn'], $sql); + } else { + $c = mysqli_query($serendipity['dbConn'], $sql); + } - if ( mysqli_error($serendipity['dbConn']) != '' ) { + if (!$expectError && mysqli_error($serendipity['dbConn']) != '') { return mysqli_error($serendipity['dbConn']); } if (!$c) { - if (!$serendipity['production']) { + if (!$expectError && !$serendipity['production']) { print mysqli_error($serendipity['dbConn']); if (function_exists('debug_backtrace') && $reportErr == true) { highlight_string(var_export(debug_backtrace(), 1)); @@ -39,6 +43,7 @@ return false; } + if ($c === true) { return true; } @@ -146,7 +151,13 @@ static $replace = array('int(11) not null auto_increment', 'primary key', 'unsigned' , 'FULLTEXT', 'FULLTEXT', 'enum (\'true\', \'false\') NOT NULL default \'true\''); - return serendipity_db_query(str_replace($search, $replace, $query)); + $query = trim(str_replace($search, $replace, $query)); + if ($query{0} == '@') { + // Errors are expected to happen (like duplicate index creation) + return serendipity_db_query(substr($query, 1), false, 'both', false, false, false, true); + } else { + return serendipity_db_query($query); + } } /* probes the usability of the DB during installation */ Index: mysql.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/db/mysql.inc.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- mysql.inc.php 9 Jan 2005 10:32:36 -0000 1.8 +++ mysql.inc.php 19 Jan 2005 10:22:13 -0000 1.9 @@ -19,7 +19,7 @@ * array of field values if it returned a single row and $single is true * array of array of field values if it returned row(s) */ -function &serendipity_db_query($sql, $single = false, $result_type = "both", $reportErr=false, $assocKey=false, $assocVal=false) { +function &serendipity_db_query($sql, $single = false, $result_type = "both", $reportErr = false, $assocKey = false, $assocVal = false, $expectError = false) { global $serendipity; static $type_map = array( 'assoc' => MYSQL_ASSOC, @@ -29,13 +29,18 @@ // highlight_string(var_export($sql, 1)); - $c = mysql_query($sql, $serendipity['dbConn']); + if ($expectError) { + $c = @mysql_query($sql, $serendipity['dbConn']); + } else { + $c = mysql_query($sql, $serendipity['dbConn']); + } - if (mysql_error($serendipity['dbConn']) != '') { + if (!$expectError && mysql_error($serendipity['dbConn']) != '') { return '<pre>' . $sql . '</pre> / ' . mysql_error($serendipity['dbConn']); } + if (!$c) { - if (!$serendipity['production']) { + if (!$expectError && !$serendipity['production']) { print '<pre>' . $sql . '</pre> / ' . mysql_error($serendipity['dbConn']); if (function_exists('debug_backtrace') && $reportErr == true) { highlight_string(var_export(debug_backtrace(), 1)); @@ -97,7 +102,7 @@ "/^[^0-9]+([0-9]+)[^0-9]+([0-9]+)[^0-9]+([0-9]+)/", mysql_info(), $arr); - // mysql_affected_rows returns 0 if rows were matched but not changed. + // mysql_affected_rows returns 0 if rows were matched but not changed. // mysql_info returns rows matched AND rows changed return $arr[2]; } @@ -109,7 +114,7 @@ "/^[^0-9]+([0-9]+)[^0-9]+([0-9]+)[^0-9]+([0-9]+)/", mysql_info(), $arr); - // mysql_affected_rows returns 0 if rows were matched but not changed. + // mysql_affected_rows returns 0 if rows were matched but not changed. // mysql_info returns rows matched AND rows changed return $arr[1]; } @@ -150,7 +155,13 @@ static $replace = array('int(11) not null auto_increment', 'primary key', 'unsigned' , 'FULLTEXT', 'FULLTEXT', 'enum (\'true\', \'false\') NOT NULL default \'true\''); - return serendipity_db_query(str_replace($search, $replace, $query)); + $query = trim(str_replace($search, $replace, $query)); + if ($query{0} == '@') { + // Errors are expected to happen (like duplicate index creation) + return serendipity_db_query(substr($query, 1), false, 'both', false, false, false, true); + } else { + return serendipity_db_query($query); + } } /* probes the usability of the DB during installation */ Index: postgres.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/db/postgres.inc.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- postgres.inc.php 9 Jan 2005 10:32:36 -0000 1.8 +++ postgres.inc.php 19 Jan 2005 10:22:13 -0000 1.9 @@ -59,14 +59,14 @@ function serendipity_db_updated_rows() { global $serendipity; - // it is unknown whether pg_affected_rows returns number of rows + // it is unknown whether pg_affected_rows returns number of rows // UPDATED or MATCHED on an UPDATE statement. return pg_affected_rows($serendipity['dbLastResult']); } function serendipity_db_matched_rows() { global $serendipity; - // it is unknown whether pg_affected_rows returns number of rows + // it is unknown whether pg_affected_rows returns number of rows // UPDATED or MATCHED on an UPDATE statement. return pg_affected_rows($serendipity['dbLastResult']); } @@ -88,7 +88,7 @@ } } -function &serendipity_db_query($sql, $single = false, $result_type = "both", $reportErr=false, $assocKey=false, $assocVal=false) { +function &serendipity_db_query($sql, $single = false, $result_type = "both", $reportErr = false, $assocKey = false, $assocVal = false, $expectError = false) { global $serendipity; static $type_map = array( 'assoc' => PGSQL_ASSOC, @@ -96,14 +96,14 @@ 'both' => PGSQL_BOTH ); - if ($reportErr || !$serendipity['production']) { + if (!$expectError && ($reportErr || !$serendipity['production'])) { $serendipity['dbLastResult'] = pg_query($serendipity['dbConn'], $sql); } else { $serendipity['dbLastResult'] = @pg_query($serendipity['dbConn'], $sql); } if (!$serendipity['dbLastResult']) { - if (!$serendipity['production']) { + if (!$expectError && !$serendipity['production']) { print "Error in $sql<br/>\n"; print pg_last_error($serendipity['dbConn']) . "<BR/>\n"; if (function_exists('debug_backtrace')) { @@ -157,7 +157,13 @@ return true; } - return serendipity_db_query(str_replace($search, $replace, $query)); + $query = trim(str_replace($search, $replace, $query)); + if ($query{0} == '@') { + // Errors are expected to happen (like duplicate index creation) + return serendipity_db_query(substr($query, 1), false, 'both', false, false, false, true); + } else { + return serendipity_db_query($query); + } } function serendipity_db_probe($hash, &$errs) { Index: sqlite.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/db/sqlite.inc.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- sqlite.inc.php 9 Jan 2005 10:32:36 -0000 1.8 +++ sqlite.inc.php 19 Jan 2005 10:22:13 -0000 1.9 @@ -58,7 +58,7 @@ // It is unknown whether sqllite returns rows MATCHED or rows UPDATED return sqlite_changes($serendipity['dbConn']); } - + function serendipity_db_matched_rows() { global $serendipity; @@ -97,7 +97,7 @@ return $row; } -function &serendipity_db_query($sql, $single = false, $result_type = "both", $reportErr=true, $assocKey=false, $assocVal=false) +function &serendipity_db_query($sql, $single = false, $result_type = "both", $reportErr = true, $assocKey = false, $assocVal = false, $expectError = false) { global $serendipity; static $type_map = array( @@ -110,14 +110,14 @@ if ($debug) $fp = @fopen('sqlite.log', 'a'); - if ($reportErr) { + if ($reportErr && !$expectError) { $res = sqlite_query($sql, $serendipity['dbConn']); } else { $res = @sqlite_query($sql, $serendipity['dbConn']); } if (!$res) { - if (!$serendipity['production']) { + if (!$expectError && !$serendipity['production']) { var_dump($res); var_dump($sql); return "problem with query"; @@ -191,7 +191,13 @@ return true; } - return serendipity_db_query(str_replace($search, $replace, $query)); + $query = trim(str_replace($search, $replace, $query)); + if ($query{0} == '@') { + // Errors are expected to happen (like duplicate index creation) + return serendipity_db_query(substr($query, 1), false, 'both', false, false, false, true); + } else { + return serendipity_db_query($query); + } } function serendipity_db_limit($start, $offset) { |
From: Garvin H. <gar...@us...> - 2005-01-19 10:22:22
|
Update of /cvsroot/php-blog/serendipity/include/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15298/include/admin Modified Files: upgrader.inc.php Log Message: PLEASE TEST, THIS IS IMPORTANT! * Fix CSS not visible in upgrader (there must be a cleaner way to do this, I admit I feel bad with this solution) * Fix SQL index key creation, the parse_sql regexp didn't catch many lines. Create those missing SQL keys for alpha10 upgrade * Upgrader didn't emit SQL error messages * serendipity_db_query is now able to expect errors (like for this alpha10 upgrade) PLEASE TEST, THIS IS IMPORTANT! Index: upgrader.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/admin/upgrader.inc.php,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- upgrader.inc.php 22 Dec 2004 17:44:53 -0000 1.9 +++ upgrader.inc.php 19 Jan 2005 10:22:12 -0000 1.10 @@ -118,6 +118,11 @@ 'function' => 'serendipity_installFiles', 'title' => 'Update of .htaccess file', 'desc' => 'In order to implement author views, changes were made to the .htaccess file, you need to regenerate it'), + + array('version' => '0.8-alpha10', + 'function' => 'serendipity_installFiles', + 'title' => 'Update of .htaccess file', + 'desc' => 'In order to implement URL rewrite improvement, changes were made to the .htaccess file, you need to regenerate it'), ); /* Fetch SQL files which needs to be run */ @@ -150,6 +155,8 @@ } elseif ($serendipity['GET']['action'] == 'upgrade') { + $errors = array(); + /* Install SQL files */ foreach ($sqlfiles as $sqlfile) { $sql = file_get_contents(S9Y_INCLUDE_PATH .'sql/'. $sqlfile); @@ -158,14 +165,12 @@ foreach ($res[0] as $sql) { $r = serendipity_db_schema_import($sql); if (is_string($r)) { - $errors[] = $r; + $errors[] = trim($r); } } } - /* Call functions */ - $errors = array(); foreach ($tasks as $task) { if (version_compare(serendipity_version($serendipity['versionInstalled']), $task['version'], '<') ) { if (is_callable($task['function'])) { |
From: Garvin H. <gar...@us...> - 2005-01-19 10:22:21
|
Update of /cvsroot/php-blog/serendipity/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15298/include Modified Files: functions_installer.inc.php Log Message: PLEASE TEST, THIS IS IMPORTANT! * Fix CSS not visible in upgrader (there must be a cleaner way to do this, I admit I feel bad with this solution) * Fix SQL index key creation, the parse_sql regexp didn't catch many lines. Create those missing SQL keys for alpha10 upgrade * Upgrader didn't emit SQL error messages * serendipity_db_query is now able to expect errors (like for this alpha10 upgrade) PLEASE TEST, THIS IS IMPORTANT! Index: functions_installer.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- functions_installer.inc.php 17 Jan 2005 19:07:21 -0000 1.28 +++ functions_installer.inc.php 19 Jan 2005 10:22:11 -0000 1.29 @@ -429,7 +429,7 @@ $def = $line; } - if (preg_match('#^create\s*(\{fulltext\}|unique)\s*index#i', $line)) { + if (preg_match('#^create\s*(\{fulltext\}|unique|\{fulltext_mysql\})?\s*index#i', $line)) { array_push($queries, $line); } } |
From: Garvin H. <gar...@us...> - 2005-01-19 10:22:20
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15298 Modified Files: serendipity_config.inc.php Log Message: PLEASE TEST, THIS IS IMPORTANT! * Fix CSS not visible in upgrader (there must be a cleaner way to do this, I admit I feel bad with this solution) * Fix SQL index key creation, the parse_sql regexp didn't catch many lines. Create those missing SQL keys for alpha10 upgrade * Upgrader didn't emit SQL error messages * serendipity_db_query is now able to expect errors (like for this alpha10 upgrade) PLEASE TEST, THIS IS IMPORTANT! Index: serendipity_config.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v retrieving revision 1.133 retrieving revision 1.134 diff -u -d -r1.133 -r1.134 --- serendipity_config.inc.php 13 Jan 2005 18:09:38 -0000 1.133 +++ serendipity_config.inc.php 19 Jan 2005 10:22:10 -0000 1.134 @@ -16,7 +16,7 @@ include_once(S9Y_INCLUDE_PATH . 'include/compat.inc.php'); // The version string -$serendipity['version'] = '0.8-alpha9'; +$serendipity['version'] = '0.8-alpha10'; // Name of folder for the default theme $serendipity['defaultTemplate'] = 'default'; @@ -248,6 +248,11 @@ */ if (IS_up2date === false && !defined('IN_upgrader')) { + if (preg_match(PAT_CSS, $_SERVER['REQUEST_URI'], $matches)) { + $css_mode = 'serendipity_admin.css'; + return 1; + } + die(sprintf(SERENDIPITY_NEEDS_UPGRADE, $serendipity['versionInstalled'], $serendipity['version'], $serendipity['serendipityHTTPPath'] . 'serendipity_admin.php')); } |
From: Garvin H. <gar...@us...> - 2005-01-19 10:09:58
|
Update of /cvsroot/php-blog/serendipity/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12232 Modified Files: serendipity_lang_ko.inc.php Log Message: fix double breaks Index: serendipity_lang_ko.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_ko.inc.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- serendipity_lang_ko.inc.php 10 Jan 2005 16:01:52 -0000 1.3 +++ serendipity_lang_ko.inc.php 19 Jan 2005 10:09:46 -0000 1.4 @@ -1,1331 +1,669 @@ <?php # $Id$ - - ########################################################################## - # serendipity - another blogger... # - ########################################################################## - # # [...1300 lines suppressed...] - @define('RESET_DATE_DESC', 'Click here to reset the date to the current time'); - @define('PROBLEM_PERMISSIONS_HOWTO', 'Permissions can be set by running shell command: `<em>%s</em>` on the failed directory, or by setting this using an FTP program'); - @define('WARNING_TEMPLATE_DEPRECATED', 'Warning: Your current template is using a deprecated template method, you are advised to update if possible'); - @define('ENTRY_PUBLISHED_FUTURE', 'This entry is not yet published.'); - @define('ENTRIES_BY', 'Entries by %s'); - @define('PREVIOUS', 'Previous'); - @define('NEXT', 'Next'); - @define('APPROVE', 'Approve'); - @define('CATEGORY_ALREADY_EXIST', 'A category with the name "%s" already exist'); @define('IMPORT_NOTES', 'Note:'); // Translate @define('ERROR_FILE_FORBIDDEN', 'You are not allowed to upload files with active content'); // Translate |
From: Sebastian N. <no...@us...> - 2005-01-18 11:49:51
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_spartacus In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11952/plugins/serendipity_event_spartacus Modified Files: serendipity_event_spartacus.php Log Message: Added german translation Index: serendipity_event_spartacus.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spartacus/serendipity_event_spartacus.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- serendipity_event_spartacus.php 2 Jan 2005 15:27:22 -0000 1.2 +++ serendipity_event_spartacus.php 18 Jan 2005 11:49:30 -0000 1.3 @@ -10,6 +10,13 @@ ***********/ switch ($serendipity['lang']) { + case 'de': + @define('PLUGIN_EVENT_SPARTACUS_NAME', 'Spartacus'); + @define('PLUGIN_EVENT_SPARTACUS_DESC', '[S]erendipity [P]lugin [A]ccess [R]epository [T]ool [A]nd [C]ustomization/[U]nification [S]ystem - Installiert Plugins direkt aus dem Netz.'); + @define('PLUGIN_EVENT_SPARTACUS_FETCH', 'Hier klicken um ein neues %s aus dem Netz zu installieren.'); + @define('PLUGIN_EVENT_SPARTACUS_FETCHERROR', 'Die URL %s konnte nicht geöffnet werden. Möglicherweise existieren Server- oder Netzwerkprobleme.'); + @define('PLUGIN_EVENT_SPARTACUS_FETCHING', 'Versuche URL %s zu öffnen...'); + break; case 'en': default: @define('PLUGIN_EVENT_SPARTACUS_NAME', 'Spartacus'); |
From: Garvin H. <gar...@us...> - 2005-01-17 19:53:31
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_remoterss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28501/plugins/serendipity_plugin_remoterss Modified Files: serendipity_plugin_remoterss.php Log Message: * Fix "i.e." usage wher "e.g." is better * Plugin fixes to display special owned plugins despite of frontend user capabilites (thanks to Jannis for spotting this!) Index: serendipity_plugin_remoterss.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_remoterss/serendipity_plugin_remoterss.php,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- serendipity_plugin_remoterss.php 2 Jan 2005 15:44:38 -0000 1.12 +++ serendipity_plugin_remoterss.php 17 Jan 2005 19:52:31 -0000 1.13 @@ -31,7 +31,7 @@ case 'es': default: @define('PLUGIN_REMOTERSS_TITLE', 'Remote RSS/OPML-Blogroll Feed'); - @define('PLUGIN_REMOTERSS_BLAHBLAH', 'Show items of a remote RSS/OPML feed (i.e. Blogroll)'); + @define('PLUGIN_REMOTERSS_BLAHBLAH', 'Show items of a remote RSS/OPML feed (e.g. Blogroll)'); @define('PLUGIN_REMOTERSS_NUMBER', 'Number of entries'); @define('PLUGIN_REMOTERSS_NUMBER_BLAHBLAH', 'How many entries should be displayed? (Default: every entry of the feed)'); @define('PLUGIN_REMOTERSS_SIDEBARTITLE', 'Feed-Title'); |
From: Garvin H. <gar...@us...> - 2005-01-17 19:53:12
|
Update of /cvsroot/php-blog/serendipity/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28501/lang Modified Files: serendipity_lang_en.inc.php Log Message: * Fix "i.e." usage wher "e.g." is better * Plugin fixes to display special owned plugins despite of frontend user capabilites (thanks to Jannis for spotting this!) Index: serendipity_lang_en.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v retrieving revision 1.117 retrieving revision 1.118 diff -u -d -r1.117 -r1.118 --- serendipity_lang_en.inc.php 10 Jan 2005 16:01:50 -0000 1.117 +++ serendipity_lang_en.inc.php 17 Jan 2005 19:52:19 -0000 1.118 @@ -210,7 +210,7 @@ @define('FILE_WRITE_ERROR', 'Can\'t write to file %s.'); @define('FILE_CREATE_YOURSELF', 'Please create the file yourself or check permissions'); @define('COPY_CODE_BELOW', '<br />* Just copy the code below and place it in %s in your %s folder:<b><pre>%s</pre></b>' . "\n"); -@define('WWW_USER', 'Change www to the user apache runs as (i.e. nobody).'); +@define('WWW_USER', 'Change www to the user apache runs as (e.g. nobody).'); @define('BROWSER_RELOAD', 'Once you\'ve done this, hit your browser\'s "reload" button.'); @define('DIAGNOSTIC_ERROR', 'We detected some errors while running some diagnostics on your entered information:'); @define('SERENDIPITY_NOT_INSTALLED', 'Serendipity is not yet installed. Please <a href="%s">install</a> it now.'); @@ -379,7 +379,7 @@ @define('INSTALL_DBNAME', 'Database name'); @define('INSTALL_DBNAME_DESC', 'The name of your database'); @define('INSTALL_DBPREFIX', 'Database table prefix'); -@define('INSTALL_DBPREFIX_DESC', 'Prefix for the table names, i.e. serendipity_'); +@define('INSTALL_DBPREFIX_DESC', 'Prefix for the table names, e.g. serendipity_'); /* PATHS */ @define('INSTALL_CAT_PATHS', 'Paths'); @@ -666,4 +666,4 @@ @define('ERROR_FILE_FORBIDDEN', 'You are not allowed to upload files with active content'); /* vim: set sts=4 ts=4 expandtab : */ -?> \ No newline at end of file +?> |
From: Garvin H. <gar...@us...> - 2005-01-17 19:53:04
|
Update of /cvsroot/php-blog/serendipity/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28501/include Modified Files: functions_config.inc.php plugin_api.inc.php Log Message: * Fix "i.e." usage wher "e.g." is better * Plugin fixes to display special owned plugins despite of frontend user capabilites (thanks to Jannis for spotting this!) Index: functions_config.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/functions_config.inc.php,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- functions_config.inc.php 17 Jan 2005 19:07:17 -0000 1.13 +++ functions_config.inc.php 17 Jan 2005 19:52:14 -0000 1.14 @@ -33,7 +33,12 @@ function serendipity_get_user_config_var($name, $authorid, $default = '') { global $serendipity; - $r = serendipity_db_query("SELECT value FROM {$serendipity['dbPrefix']}config WHERE authorid = " . (int)$authorid . " AND name = '" . $name . "' LIMIT 1", true); + $author_sql = ''; + if (!empty($authorid)) { + $author_sql = "authorid = " . (int)$authorid . " AND "; + } + + $r = serendipity_db_query("SELECT value FROM {$serendipity['dbPrefix']}config WHERE $author_sql name = '" . $name . "' LIMIT 1", true); if (is_array($r)) { return $r[0]; Index: plugin_api.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/plugin_api.inc.php,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- plugin_api.inc.php 10 Jan 2005 16:25:09 -0000 1.14 +++ plugin_api.inc.php 17 Jan 2005 19:52:17 -0000 1.15 @@ -671,6 +671,13 @@ $_res = serendipity_get_config_var($this->instance . '/' . $name, $defaultvalue, $empty); if (is_null($_res)) { + // A protected plugin by a specific owner may not have its values stored in $serendipity + // because of the special authorid. To display such contents, we need to fetch it + // seperately from the DB. + $_res = serendipity_get_user_config_var($this->instance . '/' . $name, null, $defaultvalue); + } + + if (is_null($_res)) { $cbag = new serendipity_property_bag; $this->introspect_config_item($name, $cbag); $_res = $cbag->get('default'); |
From: Garvin H. <gar...@us...> - 2005-01-17 19:17:20
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21894 Modified Files: serendipity_xmlrpc.php Log Message: create possibly non-existant directories. thanks to Heinz Stampfli! Index: serendipity_xmlrpc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_xmlrpc.php,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- serendipity_xmlrpc.php 19 Nov 2004 11:05:20 -0000 1.20 +++ serendipity_xmlrpc.php 17 Jan 2005 19:16:54 -0000 1.21 @@ -451,7 +451,13 @@ return new XML_RPC_Response('', 4, 'Authentication Failed'); } - $fp = fopen($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $struct['name'], 'w'); + $full = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $struct['name']; + + if (!is_dir(dirname($full))) { + @mkdir(dirname($full)); + } + + $fp = fopen($full, 'w'); fwrite($fp, $struct['bits']); fclose($fp); $path = $serendipity['baseURL'] . $serendipity['uploadPath'] . $struct['name']; |
From: Tom S. <tom...@us...> - 2005-01-17 19:08:28
|
Update of /cvsroot/php-blog/serendipity/include/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20063/admin Modified Files: installer.inc.php Log Message: - Here be dragons and NO application logic! - Add "probeDefault" flag, which will run $item['var'] through serendipity_probeInstallation() and set the returned value as $item['default'] Index: installer.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/admin/installer.inc.php,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- installer.inc.php 29 Dec 2004 19:07:06 -0000 1.16 +++ installer.inc.php 17 Jan 2005 19:07:24 -0000 1.17 @@ -111,21 +111,7 @@ <td>Database extensions</td> <td width="200"><?php - $_res = array(); - if ( extension_loaded('mysql') ) { - $_res[] = 'MySQL'; - } - if ( extension_loaded('mysqli') ) { - $_res[] = 'MySQLi'; - } - if ( extension_loaded('pgsql') ) { - $_res[] = 'PostgreSQL'; - } - if ( extension_loaded('sqlite') ) { - $_res[] = 'SQLite'; - } - - if ( sizeof($_res) == 0 ) { + if ( sizeof(($_res = serendipity_probeInstallation('dbType')) == 0 ) { echo serendipity_installerResultDiagnose(S9Y_I_ERROR, NONE); } else { echo serendipity_installerResultDiagnose(S9Y_I_SUCCESS, implode(', ', $_res)); |
From: Tom S. <tom...@us...> - 2005-01-17 19:08:26
|
Update of /cvsroot/php-blog/serendipity/include/tpl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20063/tpl Modified Files: config_local.inc.php Log Message: - Here be dragons and NO application logic! - Add "probeDefault" flag, which will run $item['var'] through serendipity_probeInstallation() and set the returned value as $item['default'] Index: config_local.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/tpl/config_local.inc.php,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- config_local.inc.php 17 Jan 2005 17:00:18 -0000 1.7 +++ config_local.inc.php 17 Jan 2005 19:07:34 -0000 1.8 @@ -1,32 +1,6 @@ <?php # $Id$ - /* I really don't know, where else to implement this and honestly - * I don't care. The code quality can't be reduced anymore. Even - * more honestly, I think, this is the right place for THIS - * application logic. - */ - - // Determine installed database extensions and offer only these - $config_local_tmp_databases = array(); - - if (extension_loaded('mysql')) { - $config_local_tmp_databases['mysql'] = 'MySQL'; - } - if (extension_loaded('postgres')) { - $config_local_tmp_databases['postgres'] = 'PostgreSQL'; - } - if (extension_loaded('mysqli')) { - $config_local_tmp_databases['mysqli'] = 'MySQLi'; - } - if (extension_loaded('sqlite')) { - $config_local_tmp_databases['sqlite'] = 'SQLite'; - } - - // Determine available rewrite methods - $config_local_tmp_apache_modules = array('none' => 'Disable URL Rewriting', - 'errordocs' => 'Use Apache errorhandling'); - if(in_array('mod_rewrite', apache_get_modules())) - $config_local_tmp_apache_modules['rewrite'] = 'Use Apache mod_rewrite'; + // Here be dragons and NO application logic! $res = array(); $res['database'] = @@ -36,8 +10,8 @@ 'title' => INSTALL_DBTYPE, 'description' => INSTALL_DBTYPE_DESC, 'type' => 'list', - 'default' => $config_local_tmp_databases, - 'flags' => array('nosave', 'simpleInstall')), + 'default' => array(), + 'flags' => array('nosave', 'simpleInstall', 'probeDefault')), array('var' => 'dbHost', 'title' => INSTALL_DBHOST, @@ -253,7 +227,8 @@ 'title' => INSTALL_REWRITE, 'description' => INSTALL_REWRITE_DESC, 'type' => 'list', - 'default' => $config_local_tmp_apache_modules), + 'default' => array(), + 'flags' => array('probeDefault')), array('var' => 'serverOffsetHours', 'title' => INSTALL_OFFSET, |
From: Tom S. <tom...@us...> - 2005-01-17 19:08:23
|
Update of /cvsroot/php-blog/serendipity/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20063 Modified Files: functions_config.inc.php functions_installer.inc.php Log Message: - Here be dragons and NO application logic! - Add "probeDefault" flag, which will run $item['var'] through serendipity_probeInstallation() and set the returned value as $item['default'] Index: functions_config.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/functions_config.inc.php,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- functions_config.inc.php 6 Jan 2005 10:12:24 -0000 1.12 +++ functions_config.inc.php 17 Jan 2005 19:07:17 -0000 1.13 @@ -369,5 +369,39 @@ . '</iframe><br /><br />'; } +function serendipity_probeInstallation($item) { + global $serendipity; + $res = NULL; + + switch ( $item ) { + case 'dbType' : + $res = array(); + if (extension_loaded('mysql')) { + $res['mysql'] = 'MySQL'; + } + if (extension_loaded('postgres')) { + $res['postgres'] = 'PostgreSQL'; + } + if (extension_loaded('mysqli')) { + $res['mysqli'] = 'MySQLi'; + } + if (extension_loaded('sqlite')) { + $res['sqlite'] = 'SQLite'; + } + break; + + case 'rewrite' : + $res = array(); + $res['none'] = 'Disable URL Rewriting'; + $res['errordocs'] = 'Use Apache errorhandling'; + if( in_array('mod_rewrite', apache_get_modules()) ) { + $res['rewrite'] = 'Use Apache mod_rewrite'; + } + break; + } + + return $res; +} + /* vim: set sts=4 ts=4 expandtab : */ ?> Index: functions_installer.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- functions_installer.inc.php 11 Jan 2005 13:00:44 -0000 1.27 +++ functions_installer.inc.php 17 Jan 2005 19:07:21 -0000 1.28 @@ -366,6 +366,11 @@ if (in_array('parseDescription', $item['flags'])) { $item['description'] = serendipity_replaceEmbeddedConfigVars($item['description']); } + + if (in_array('probeDefault', $item['flags'])) { + $item['default'] = serendipity_probeInstallation($item['var']); + } + ?> <tr> <td style="border-bottom: 1px #000000 solid" align="left" valign="top" width="75%"> |
From: Sebastian N. <no...@us...> - 2005-01-17 17:01:00
|
Update of /cvsroot/php-blog/serendipity/include/tpl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28283/include/tpl Modified Files: config_local.inc.php Log Message: enhancing usability Index: config_local.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/tpl/config_local.inc.php,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- config_local.inc.php 11 Dec 2004 15:24:42 -0000 1.6 +++ config_local.inc.php 17 Jan 2005 17:00:18 -0000 1.7 @@ -1,6 +1,32 @@ <?php # $Id$ -// Here be dragons and NO application logic! + /* I really don't know, where else to implement this and honestly + * I don't care. The code quality can't be reduced anymore. Even + * more honestly, I think, this is the right place for THIS + * application logic. + */ + + // Determine installed database extensions and offer only these + $config_local_tmp_databases = array(); + + if (extension_loaded('mysql')) { + $config_local_tmp_databases['mysql'] = 'MySQL'; + } + if (extension_loaded('postgres')) { + $config_local_tmp_databases['postgres'] = 'PostgreSQL'; + } + if (extension_loaded('mysqli')) { + $config_local_tmp_databases['mysqli'] = 'MySQLi'; + } + if (extension_loaded('sqlite')) { + $config_local_tmp_databases['sqlite'] = 'SQLite'; + } + + // Determine available rewrite methods + $config_local_tmp_apache_modules = array('none' => 'Disable URL Rewriting', + 'errordocs' => 'Use Apache errorhandling'); + if(in_array('mod_rewrite', apache_get_modules())) + $config_local_tmp_apache_modules['rewrite'] = 'Use Apache mod_rewrite'; $res = array(); $res['database'] = @@ -10,10 +36,7 @@ 'title' => INSTALL_DBTYPE, 'description' => INSTALL_DBTYPE_DESC, 'type' => 'list', - 'default' => array('mysql' => 'MySQL', - 'postgres' => 'PostgreSQL', - 'mysqli' => 'MySQLi', - 'sqlite' => 'SQLite'), + 'default' => $config_local_tmp_databases, 'flags' => array('nosave', 'simpleInstall')), array('var' => 'dbHost', @@ -230,9 +253,7 @@ 'title' => INSTALL_REWRITE, 'description' => INSTALL_REWRITE_DESC, 'type' => 'list', - 'default' => array('none' => 'Disable URL Rewriting', - 'errordocs' => 'Use Apache errorhandling', - 'rewrite' => 'Use Apache mod_rewrite')), + 'default' => $config_local_tmp_apache_modules), array('var' => 'serverOffsetHours', 'title' => INSTALL_OFFSET, |
From: Garvin H. <gar...@us...> - 2005-01-17 15:23:09
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_browsercompatibility In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8789 Modified Files: serendipity_event_browsercompatibility.php Log Message: why does my komodo suck so bad... Index: serendipity_event_browsercompatibility.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_browsercompatibility/serendipity_event_browsercompatibility.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- serendipity_event_browsercompatibility.php 5 Jan 2005 11:49:19 -0000 1.2 +++ serendipity_event_browsercompatibility.php 17 Jan 2005 15:22:57 -0000 1.3 @@ -1,78 +1,78 @@ -<?php # $Id$ - -switch ($serendipity['lang']) { - case 'de': - @define('PLUGIN_EVENT_BROWSERCOMPATIBILITY_TITLE', 'Browser-Kompatibilität'); - @define('PLUGIN_EVENT_BROWSERCOMPATIBILITY_DESC', 'Wendet verschiedene (CSS) Methoden an, um maximale Browserkompatibilität zu erreichen'); - break; - - case 'en': - case 'es': - default: - @define('PLUGIN_EVENT_BROWSERCOMPATIBILITY_TITLE', 'Browser Compatibility'); - @define('PLUGIN_EVENT_BROWSERCOMPATIBILITY_DESC', 'Uses different (CSS) methods to enforce maximum browser compatibility'); - break; -} - -class serendipity_event_browsercompatibility extends serendipity_event -{ - var $title = PLUGIN_EVENT_BROWSERCOMPATIBILITY_TITLE; - - function introspect(&$propbag) - { - global $serendipity; - - $propbag->add('name', PLUGIN_EVENT_BROWSERCOMPATIBILITY_TITLE); - $propbag->add('description', PLUGIN_EVENT_BROWSERCOMPATIBILITY_DESC); - $propbag->add('stackable', false); - $propbag->add('author', 'Garvin Hicking'); - $propbag->add('version', '1.0'); - $propbag->add('event_hooks', array( - 'css' => true, - 'css_backend' => true, - 'external_plugin' => true, - )); - } - - function generate_content(&$title) { - $title = PLUGIN_EVENT_BROWSERCOMPATIBILITY_TITLE; - } - - function event_hook($event, &$bag, &$eventData) { - global $serendipity; - - $hooks = &$bag->get('event_hooks'); - if (isset($hooks[$event])) { - switch($event) { - case 'css_backend': - case 'css': -?> -img { - behavior: url("<?php echo $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : ''); ?>plugin/pngbehavior.htc"); -} -<?php - return true; - break; - - case 'external_plugin': - switch($eventData) { - case 'pngbehavior.htc': - header('Content-Type: text/x-component'); - echo str_replace('{blanksrc}', serendipity_getTemplateFile('img/blank.gif'), file_get_contents(dirname(__FILE__) . '/pngbehavior.htc')); - return true; - } - return true; - break; - - default: - return false; - break; - } - } else { - return false; - } - } -} - -/* vim: set sts=4 ts=4 expandtab : */ -?> +<?php # $Id$ + +switch ($serendipity['lang']) { + case 'de': + @define('PLUGIN_EVENT_BROWSERCOMPATIBILITY_TITLE', 'Browser-Kompatibilität'); + @define('PLUGIN_EVENT_BROWSERCOMPATIBILITY_DESC', 'Wendet verschiedene (CSS) Methoden an, um maximale Browserkompatibilität zu erreichen'); + break; + + case 'en': + case 'es': + default: + @define('PLUGIN_EVENT_BROWSERCOMPATIBILITY_TITLE', 'Browser Compatibility'); + @define('PLUGIN_EVENT_BROWSERCOMPATIBILITY_DESC', 'Uses different (CSS) methods to enforce maximum browser compatibility'); + break; +} + +class serendipity_event_browsercompatibility extends serendipity_event +{ + var $title = PLUGIN_EVENT_BROWSERCOMPATIBILITY_TITLE; + + function introspect(&$propbag) + { + global $serendipity; + + $propbag->add('name', PLUGIN_EVENT_BROWSERCOMPATIBILITY_TITLE); + $propbag->add('description', PLUGIN_EVENT_BROWSERCOMPATIBILITY_DESC); + $propbag->add('stackable', false); + $propbag->add('author', 'Garvin Hicking'); + $propbag->add('version', '1.0'); + $propbag->add('event_hooks', array( + 'css' => true, + 'css_backend' => true, + 'external_plugin' => true, + )); + } + + function generate_content(&$title) { + $title = PLUGIN_EVENT_BROWSERCOMPATIBILITY_TITLE; + } + + function event_hook($event, &$bag, &$eventData) { + global $serendipity; + + $hooks = &$bag->get('event_hooks'); + if (isset($hooks[$event])) { + switch($event) { + case 'css_backend': + case 'css': +?> +img { + behavior: url("<?php echo $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : ''); ?>plugin/pngbehavior.htc"); +} +<?php + return true; + break; + + case 'external_plugin': + switch($eventData) { + case 'pngbehavior.htc': + header('Content-Type: text/x-component'); + echo str_replace('{blanksrc}', serendipity_getTemplateFile('img/blank.gif'), file_get_contents(dirname(__FILE__) . '/pngbehavior.htc')); + return true; + } + return true; + break; + + default: + return false; + break; + } + } else { + return false; + } + } +} + +/* vim: set sts=4 ts=4 expandtab : */ +?> \ No newline at end of file |
From: Garvin H. <gar...@us...> - 2005-01-17 13:56:08
|
Update of /cvsroot/php-blog/serendipity/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23604/include Modified Files: functions_comments.inc.php functions_entries.inc.php Log Message: no need to use strtolower Index: functions_comments.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/functions_comments.inc.php,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- functions_comments.inc.php 15 Jan 2005 16:46:48 -0000 1.11 +++ functions_comments.inc.php 17 Jan 2005 13:55:56 -0000 1.12 @@ -84,7 +84,7 @@ $and .= ' AND co.status = \'approved\''; } - if (strtolower($serendipity['dbType']) == 'postgres') { + if ($serendipity['dbType'] == 'postgres') { $group = ''; $distinct = 'DISTINCT'; } else { @@ -367,7 +367,7 @@ $pgsql_insert = ''; $mysql_insert = ''; - if (strtolower($serendipity['dbType']) == 'postgres') { + if ($serendipity['dbType'] == 'postgres') { $pgsql_insert = 'DISTINCT ON (email)'; } else { $mysql_insert = 'GROUP BY email'; Index: functions_entries.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- functions_entries.inc.php 17 Jan 2005 13:27:26 -0000 1.45 +++ functions_entries.inc.php 17 Jan 2005 13:55:56 -0000 1.46 @@ -197,7 +197,7 @@ serendipity_plugin_api::hook_event('frontend_fetchentries', $cond, array('noCache' => $noCache, 'noSticky' => $noSticky)); - if (strtolower($serendipity['dbType']) == 'postgres') { + if ($serendipity['dbType'] == 'postgres') { $group = ''; $distinct = 'DISTINCT'; } else { @@ -421,7 +421,7 @@ $limit = serendipity_db_limit_sql($limit); $term = serendipity_db_escape_string($term); - if (strtolower($serendipity['dbType']) == 'postgres') { + if ($serendipity['dbType'] == 'postgres') { $group = ''; $distinct = 'DISTINCT'; $find_part = "(title~'$term' OR body~'$term' OR extended~'$term')"; @@ -502,7 +502,7 @@ global $serendipity; // The unique query condition was built previously in serendipity_fetchEntries() - if (strtolower($serendipity['dbType']) == 'sqlite') { + if ($serendipity['dbType'] == 'sqlite') { $querystring = "SELECT count(e.id) {$serendipity['fullCountQuery']} GROUP BY e.id"; } else { $querystring = "SELECT count(distinct e.id) {$serendipity['fullCountQuery']}"; @@ -511,7 +511,7 @@ $query = serendipity_db_query($querystring); if (is_array($query) && isset($query[0])) { - if (strtolower($serendipity['dbType']) == 'sqlite') { + if ($serendipity['dbType'] == 'sqlite') { return count($query); } else { return $query[0][0]; |
From: Garvin H. <gar...@us...> - 2005-01-17 13:56:06
|
Update of /cvsroot/php-blog/serendipity/include/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23604/include/admin Modified Files: category.inc.php Log Message: no need to use strtolower Index: category.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/admin/category.inc.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- category.inc.php 3 Jan 2005 19:36:44 -0000 1.8 +++ category.inc.php 17 Jan 2005 13:55:54 -0000 1.9 @@ -78,7 +78,7 @@ if ($serendipity['GET']['cid'] != 0) { $remaining_cat = (int)$serendipity['POST']['cat']['remaining_catid']; $category_range = implode(' AND ', serendipity_fetchCategoryRange((int)$serendipity['GET']['cid'])); - if (strtolower($serendipity['dbType']) == 'postgres') { + if ($serendipity['dbType'] == 'postgres' || $serendipity['dbType'] == 'sqlite') { $query = "UPDATE {$serendipity['dbPrefix']}entrycat SET categoryid={$remaining_cat} WHERE entryid IN ( |
From: Garvin H. <gar...@us...> - 2005-01-17 13:27:50
|
Update of /cvsroot/php-blog/serendipity/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18882/include Modified Files: functions_entries.inc.php Log Message: fix loosing associated categories after POSTing Index: functions_entries.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- functions_entries.inc.php 14 Jan 2005 12:28:17 -0000 1.44 +++ functions_entries.inc.php 17 Jan 2005 13:27:26 -0000 1.45 @@ -898,7 +898,7 @@ $entry['last_modified'] = time(); } - /* WYSIWYG-editor inserts empty '<br />' for extended body; this is reversed here */ + /* WYSIWYG-editor inserts empty ' ' for extended body; this is reversed here */ if (isset($entry['extended']) && trim($entry['extended']) == '') { $entry['extended'] = ''; } @@ -1131,6 +1131,15 @@ $allow_comments = ''; } + // Fix category list. If the entryForm is displayed after a POST request, the additional category information is lost. + if (is_array($entry['categories']) && !is_array($entry['categories'][0])) { + $categories = (array)$entry['categories']; + $entry['categories'] = array(); + foreach ($categories as $catid) { + $entry['categories'][] = serendipity_fetchCategoryInfo($catid); + } + } + $n = "\n"; $cat_list = '<select id="categoryselector" name="serendipity[categories][]" style="vertical-align: middle;" multiple="multiple">' . $n; $cat_list .= ' <option value="0">[' . NO_CATEGORY . ']</option>' . $n; |
From: Garvin H. <gar...@us...> - 2005-01-17 11:43:35
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_statistics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31070 Modified Files: serendipity_event_statistics.php Log Message: fix division by zero on empty article base Index: serendipity_event_statistics.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_statistics/serendipity_event_statistics.php,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- serendipity_event_statistics.php 8 Jan 2005 12:25:12 -0000 1.18 +++ serendipity_event_statistics.php 17 Jan 2005 11:43:25 -0000 1.19 @@ -424,11 +424,11 @@ <br /> <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_COMMENTS_PER_ARTICLE; ?></strong></dt> - <dd><?php echo round($comment_count[0] / $publish_count[0], 2); ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_COMMENTS_PER_ARTICLE;2 ?></dd> + <dd><?php echo round($comment_count[0] / max($publish_count[0], 1), 2); ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_COMMENTS_PER_ARTICLE;2 ?></dd> <br /> <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS_PER_ARTICLE; ?></strong></dt> - <dd><?php echo round($tb_count[0] / $publish_count[0], 2); ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS_PER_ARTICLE2; ?></dd> + <dd><?php echo round($tb_count[0] / max($publish_count[0], 1), 2); ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS_PER_ARTICLE2; ?></dd> <br /> <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_DAY; ?></strong></dt> @@ -450,7 +450,7 @@ <br /> <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_CHARS_PER_ARTICLE; ?></strong></dt> - <dd><?php echo round($length[0] / $publish_count[0], 2); ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_CHARS_PER_ARTICLE2; ?></dd> + <dd><?php echo round($length[0] / max($publish_count[0], 1), 2); ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_CHARS_PER_ARTICLE2; ?></dd> <br /> <dt><strong><?php printf(PLUGIN_EVENT_STATISTICS_OUT_LONGEST_ARTICLES, $max_items); ?></strong></dt> |
From: Sebastian N. <no...@us...> - 2005-01-16 10:09:44
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32630/plugins/serendipity_event_spamblock Modified Files: serendipity_event_spamblock.php Log Message: Make the order of spamblock events cost-based: 1. Checks that don't require any database or network access 2. Checks that require databases access, but no network access 3. Checks that require network access Index: serendipity_event_spamblock.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- serendipity_event_spamblock.php 4 Jan 2005 10:06:37 -0000 1.41 +++ serendipity_event_spamblock.php 16 Jan 2005 10:09:20 -0000 1.42 @@ -374,6 +374,43 @@ return false; } + // Check for forced moderation + if ($forcemoderation > 0 && $eventData['timestamp'] < (time() - ($forcemoderation * 60 * 60 * 24))) { + $this->log($logfile, $eventData['id'], 'MODERATE', PLUGIN_EVENT_SPAMBLOCK_REASON_FORCEMODERATION, $addData); + $eventData['moderate_comments'] = true; + $serendipity['csuccess'] = 'moderate'; + $serendipity['moderate_reason'] = PLUGIN_EVENT_SPAMBLOCK_REASON_FORCEMODERATION; + return false; + } + + // Check for maximum number of links before rejecting + $link_count = substr_count(strtolower($addData['comment']), 'http://'); + if ($links_reject > 0 && $link_count > $links_reject) { + $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_REASON_LINKS_REJECT, $addData); + $eventData = array('allow_comments' => false); + $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY; + return false; + } + + // Check for maximum number of links before forcing moderation + if ($links_moderate > 0 && $link_count > $links_moderate) { + $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_REASON_LINKS_MODERATE, $addData); + $eventData['moderate_comments'] = true; + $serendipity['csuccess'] = 'moderate'; + $serendipity['moderate_reason'] = PLUGIN_EVENT_SPAMBLOCK_REASON_LINKS_MODERATE; + return false; + } + + // Captcha checking + if ($show_captcha && $addData['type'] == 'NORMAL') { + if (!isset($_SESSION['spamblock']['captcha']) || !isset($serendipity['POST']['captcha']) || strtolower($serendipity['POST']['captcha']) != strtolower($_SESSION['spamblock']['captcha'])) { + $this->log($logfile, $eventData['id'], 'REJECTED', sprintf(PLUGIN_EVENT_SPAMBLOCK_REASON_CAPTCHAS, $serendipity['POST']['captcha'], $_SESSION['spamblock']['captcha']), $addData); + $eventData = array('allow_comments' => false); + $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_CAPTCHAS; + return false; + } + } + // Check for identical comments. We allow to bypass trackbacks from our server to our own blog. if ( $this->get_config('bodyclone', true) === true && $_SERVER['REMOTE_ADDR'] != $_SERVER['SERVER_ADDR']) { $query = "SELECT count(id) AS counter FROM {$serendipity['dbPrefix']}comments WHERE body = '" . serendipity_db_escape_string($addData['comment']) . "'"; @@ -453,41 +490,6 @@ } } } - - // Captcha checking - if ($show_captcha && $addData['type'] == 'NORMAL') { - if (!isset($_SESSION['spamblock']['captcha']) || !isset($serendipity['POST']['captcha']) || strtolower($serendipity['POST']['captcha']) != strtolower($_SESSION['spamblock']['captcha'])) { - $this->log($logfile, $eventData['id'], 'REJECTED', sprintf(PLUGIN_EVENT_SPAMBLOCK_REASON_CAPTCHAS, $serendipity['POST']['captcha'], $_SESSION['spamblock']['captcha']), $addData); - $eventData = array('allow_comments' => false); - $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_CAPTCHAS; - return false; - } - } - - // Check for forced moderation - if ($forcemoderation > 0 && $eventData['timestamp'] < (time() - ($forcemoderation * 60 * 60 * 24))) { - $this->log($logfile, $eventData['id'], 'MODERATE', PLUGIN_EVENT_SPAMBLOCK_REASON_FORCEMODERATION, $addData); - $eventData['moderate_comments'] = true; - $serendipity['csuccess'] = 'moderate'; - $serendipity['moderate_reason'] = PLUGIN_EVENT_SPAMBLOCK_REASON_FORCEMODERATION; - return false; - } - - $link_count = substr_count(strtolower($addData['comment']), 'http://'); - if ($links_reject > 0 && $link_count > $links_reject) { - $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_REASON_LINKS_REJECT, $addData); - $eventData = array('allow_comments' => false); - $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY; - return false; - } - - if ($links_moderate > 0 && $link_count > $links_moderate) { - $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_REASON_LINKS_MODERATE, $addData); - $eventData['moderate_comments'] = true; - $serendipity['csuccess'] = 'moderate'; - $serendipity['moderate_reason'] = PLUGIN_EVENT_SPAMBLOCK_REASON_LINKS_MODERATE; - return false; - } } return true; break; |
From: Tom S. <tom...@us...> - 2005-01-15 19:29:22
|
Update of /cvsroot/php-blog/serendipity/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28241 Modified Files: serendipity_lang_da.inc.php Log Message: - Add danish FreeBSD locale Index: serendipity_lang_da.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v retrieving revision 1.115 retrieving revision 1.116 diff -u -d -r1.115 -r1.116 --- serendipity_lang_da.inc.php 10 Jan 2005 16:01:49 -0000 1.115 +++ serendipity_lang_da.inc.php 15 Jan 2005 19:29:12 -0000 1.116 @@ -9,7 +9,7 @@ @define('LANG_CHARSET', 'ISO-8859-1'); -@define('DATE_LOCALES', 'danish, da, da_DK'); +@define('DATE_LOCALES', 'danish, da, da_DK, da_DK.ISO8859-1'); @define('DATE_FORMAT_ENTRY', '%A d. %e. %B %Y'); @define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M'); @define('WYSIWYG_LANG', 'da'); @@ -665,4 +665,4 @@ @define('ERROR_FILE_FORBIDDEN', 'You are not allowed to upload files with active content'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> \ No newline at end of file +?> |
From: Garvin H. <gar...@us...> - 2005-01-15 16:47:00
|
Update of /cvsroot/php-blog/serendipity/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23288/include Modified Files: functions_comments.inc.php Log Message: When previewing an unsaved entry, the $id variable is empty and would generate a list of all comments available (and probably timeout with many comments). Fix that situation by using an empty array for those. Index: functions_comments.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/functions_comments.inc.php,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- functions_comments.inc.php 28 Dec 2004 17:49:44 -0000 1.10 +++ functions_comments.inc.php 15 Jan 2005 16:46:48 -0000 1.11 @@ -125,8 +125,12 @@ function serendipity_generateCommentList($id, $comments = NULL, $selected = 0, $parent = 0, $level = 0, $indent = '') { global $serendipity; - if ( !is_array($comments) ) { - $comments = serendipity_fetchComments($id); + if (!is_array($comments)) { + if (empty($id)) { + $comments = array(); + } else { + $comments = serendipity_fetchComments($id); + } } $retval = $parent ? '' : '<select id="serendipity_replyTo" name="serendipity[replyTo]"><option value="0">[ ' . TOP_LEVEL . ' ]</option>'; |