[geeklog-cvs] geeklog: phpDocumentor messes up obfuscated email addresses in a...

geeklog-cvs at lists.geeklog.net geeklog-cvs at lists.geeklog.net
Sun Mar 15 16:55:26 EDT 2009


details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/e08747bfab7c
changeset: 6842:e08747bfab7c
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 15 21:54:28 2009 +0100
description:
phpDocumentor messes up obfuscated email addresses in angle brackets, so use a different style

diffstat:

21 files changed, 75 insertions(+), 81 deletions(-)
plugins/links/language/english.php              |    6 ++--
plugins/links/language/english_utf-8.php        |    6 ++--
plugins/spamx/Header.Examine.class.php          |    4 +--
plugins/spamx/ProjectHoneyPot.Examine.class.php |    2 -
public_html/admin/group.php                     |    2 -
public_html/admin/install/configinfo.php        |    8 ++----
public_html/admin/story.php                     |    2 -
public_html/article.php                         |    4 +--
public_html/comment.php                         |   10 +++----
public_html/getimage.php                        |    8 ++----
public_html/links/index.php                     |   16 ++++++------
public_html/links/portal.php                    |   14 +++++-----
system/classes/calendar.class.php               |    2 -
system/classes/listfactory.class.php            |    2 -
system/classes/plugin.class.php                 |   12 +++------
system/classes/search.class.php                 |   30 +++++++++++------------
system/classes/story.class.php                  |    2 -
system/classes/upload.class.php                 |    6 ++--
system/lib-comment.php                          |    4 +--
system/lib-plugins.php                          |   14 +++++-----
system/lib-security.php                         |    2 -

diffs (truncated from 630 to 300 lines):

diff -r 8d868290493d -r e08747bfab7c plugins/links/language/english.php
--- a/plugins/links/language/english.php	Sun Mar 15 20:06:29 2009 +0100
+++ b/plugins/links/language/english.php	Sun Mar 15 21:54:28 2009 +0100
@@ -36,9 +36,9 @@
  * @since GL 1.4.0
  * @copyright Copyright © 2005-2007
  * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
- * @author Trinity Bays <trinity93 AT gmail DOT com>
- * @author Tony Bibbs <tony AT tonybibbs DOT com>
- * @author Tom Willett <twillett AT users DOT sourceforge DOT net>
+ * @author Trinity Bays, trinity93 AT gmail DOT com
+ * @author Tony Bibbs, tony AT tonybibbs DOT com
+ * @author Tom Willett, twillett AT users DOT sourceforge DOT net
  *
  */
 
diff -r 8d868290493d -r e08747bfab7c plugins/links/language/english_utf-8.php
--- a/plugins/links/language/english_utf-8.php	Sun Mar 15 20:06:29 2009 +0100
+++ b/plugins/links/language/english_utf-8.php	Sun Mar 15 21:54:28 2009 +0100
@@ -36,9 +36,9 @@
  * @since GL 1.4.0
  * @copyright Copyright © 2005-2007
  * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
- * @author Trinity Bays <trinity93 AT gmail DOT com>
- * @author Tony Bibbs <tony AT tonybibbs DOT com>
- * @author Tom Willett <twillett AT users DOT sourceforge DOT net>
+ * @author Trinity Bays, trinity93 AT gmail DOT com
+ * @author Tony Bibbs, tony AT tonybibbs DOT com
+ * @author Tom Willett, twillett AT users DOT sourceforge DOT net
  *
  */
 
diff -r 8d868290493d -r e08747bfab7c plugins/spamx/Header.Examine.class.php
--- a/plugins/spamx/Header.Examine.class.php	Sun Mar 15 20:06:29 2009 +0100
+++ b/plugins/spamx/Header.Examine.class.php	Sun Mar 15 21:54:28 2009 +0100
@@ -4,7 +4,7 @@
 * File: Header.Examine.class.php
 * This is the HTTP Header Examine class for the Geeklog Spam-X plugin
 *
-* Copyright (C) 2005-2006 by the following authors:
+* Copyright (C) 2005-2009 by the following authors:
 * Author    Dirk Haun <dirk AT haun-online DOT de>
 *
 * based on the works of Tom Willett <tomw AT pigstye DOT net>
@@ -27,7 +27,7 @@
 /**
 * Examines Post according to HTTP Headers
 *
-* @author Dirk Haun <dirk AT haun-online DOT de>
+* @author Dirk Haun, dirk AT haun-online DOT de
 *
 * @package Spam-X
 *
diff -r 8d868290493d -r e08747bfab7c plugins/spamx/ProjectHoneyPot.Examine.class.php
--- a/plugins/spamx/ProjectHoneyPot.Examine.class.php	Sun Mar 15 20:06:29 2009 +0100
+++ b/plugins/spamx/ProjectHoneyPot.Examine.class.php	Sun Mar 15 21:54:28 2009 +0100
@@ -100,7 +100,7 @@
 * ProjectHoneyPot.org. This involves performing a special DNS query using a
 * special Project Honey Pot access key. See this plugins config.php for use.
 *
-* @author Mike Jervis <mike AT fuckingbrit DOT com>
+* @author Mike Jervis, mike AT fuckingbrit DOT com
 * @package Spam-X
 *
 */
diff -r 8d868290493d -r e08747bfab7c public_html/admin/group.php
--- a/public_html/admin/group.php	Sun Mar 15 20:06:29 2009 +0100
+++ b/public_html/admin/group.php	Sun Mar 15 21:54:28 2009 +0100
@@ -35,7 +35,7 @@
 /**
 * This file is the Geeklog Group administration page
 *
-* @author   Tony Bibbs  <tony AT tonybibbs DOT com>
+* @author   Tony Bibbs, tony AT tonybibbs DOT com
 *
 */
 
diff -r 8d868290493d -r e08747bfab7c public_html/admin/install/configinfo.php
--- a/public_html/admin/install/configinfo.php	Sun Mar 15 20:06:29 2009 +0100
+++ b/public_html/admin/install/configinfo.php	Sun Mar 15 21:54:28 2009 +0100
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.5                                                               |
+// | Geeklog 1.6                                                               |
 // +---------------------------------------------------------------------------+
 // | configinfo.php                                                            |
 // |                                                                           |
 // | Display current configuration settings                                    |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2002-2008 by the following authors:                         |
+// | Copyright (C) 2002-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Jeffrey Schoolcraft  - dream AT dr3amscap3 DOT com               |
 // |          Dirk Haun            - dirk AT haun-online DOT de                |
@@ -29,15 +29,13 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: configinfo.php,v 1.7 2008/05/11 07:25:08 dhaun Exp $
 
 /**
 * This script will display file and permission information based on settings in
 * the configuration.  This is meant to be used as a support tool when asked
 * questions in #geeklog.
 *
-* @author   Jeffrey Schoolcraft <dream AT dr3amscap3 DOT com>
+* @author   Jeffrey Schoolcraft, dream AT dr3amscap3 DOT com
 *
 */
 
diff -r 8d868290493d -r e08747bfab7c public_html/admin/story.php
--- a/public_html/admin/story.php	Sun Mar 15 20:06:29 2009 +0100
+++ b/public_html/admin/story.php	Sun Mar 15 21:54:28 2009 +0100
@@ -36,7 +36,7 @@
 * This is the Geeklog story administration page.
 *
 * @author   Jason Whittenburg
-* @author   Tony Bibbs <tony AT tonybibbs DOT com>
+* @author   Tony Bibbs, tony AT tonybibbs DOT com
 *
 */
 
diff -r 8d868290493d -r e08747bfab7c public_html/article.php
--- a/public_html/article.php	Sun Mar 15 20:06:29 2009 +0100
+++ b/public_html/article.php	Sun Mar 15 21:54:28 2009 +0100
@@ -37,8 +37,8 @@
 * may, or may not, include the comments attached
 *
 * @author   Jason Whittenburg
-* @author   Tony Bibbbs <tony AT tonybibbs DOT com>
-* @author   Vincent Furia <vinny01 AT users DOT sourceforge DOT net>
+* @author   Tony Bibbbs, tony AT tonybibbs DOT com
+* @author   Vincent Furia, vinny01 AT users DOT sourceforge DOT net
 */
 
 /**
diff -r 8d868290493d -r e08747bfab7c public_html/comment.php
--- a/public_html/comment.php	Sun Mar 15 20:06:29 2009 +0100
+++ b/public_html/comment.php	Sun Mar 15 21:54:28 2009 +0100
@@ -38,8 +38,8 @@
 * comments to the DB.  All comment display stuff is in lib-common.php
 *
 * @author   Jason Whittenburg
-* @author   Tony Bibbs    <tonyAT tonybibbs DOT com>
-* @author   Vincent Furia <vinny01 AT users DOT sourceforge DOT net>
+* @author   Tony Bibbs, tonyAT tonybibbs DOT com
+* @author   Vincent Furia, vinny01 AT users DOT sourceforge DOT net
 *
 */
 
@@ -62,7 +62,7 @@
  * Handles a comment submission
  *
  * @copyright Vincent Furia 2005
- * @author Vincent Furia <vinny01 AT users DOT sourceforge DOT net>
+ * @author Vincent Furia, vinny01 AT users DOT sourceforge DOT net
  * @return string HTML (possibly a refresh)
  */
 function handleSubmit()
@@ -117,7 +117,7 @@
  * Handles a comment submission
  *
  * @copyright Vincent Furia 2005
- * @author Vincent Furia <vinny01 AT users DOT sourceforge DOT net>
+ * @author Vincent Furia, vinny01 AT users DOT sourceforge DOT net
  * @return string HTML (possibly a refresh)
  */
 function handleDelete()
@@ -166,7 +166,7 @@
  * Handles a comment view request
  *
  * @copyright Vincent Furia 2005
- * @author Vincent Furia <vinny01 AT users DOT sourceforge DOT net>
+ * @author Vincent Furia, vinny01 AT users DOT sourceforge DOT net
  * @param boolean $view View or display (true for view)
  * @return string HTML (possibly a refresh)
  */
diff -r 8d868290493d -r e08747bfab7c public_html/getimage.php
--- a/public_html/getimage.php	Sun Mar 15 20:06:29 2009 +0100
+++ b/public_html/getimage.php	Sun Mar 15 21:54:28 2009 +0100
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.5                                                               |
+// | Geeklog 1.6                                                               |
 // +---------------------------------------------------------------------------+
 // | getimage.php                                                              |
 // |                                                                           |
 // | Shows images outside of the webtree                                       |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2004-2008 by the following authors:                         |
+// | Copyright (C) 2004-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
 // |          Dirk Haun         - dirk AT haun-online DOT de                   |
@@ -29,15 +29,13 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: getimage.php,v 1.8 2007/11/25 06:55:07 ospiess Exp $
 
 /**
 * For really strict webhosts, this file an be used to show images in pages that
 * serve the images from outside of the webtree to a place that the webserver
 * user can actually write too
 *
-* @author   Tony Bibbs <tony AT tonybibbs DOT com>
+* @author   Tony Bibbs, tony AT tonybibbs DOT com
 *
 */
 
diff -r 8d868290493d -r e08747bfab7c public_html/links/index.php
--- a/public_html/links/index.php	Sun Mar 15 20:06:29 2009 +0100
+++ b/public_html/links/index.php	Sun Mar 15 21:54:28 2009 +0100
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Links Plugin 2.0                                                          |
+// | Links Plugin 2.1                                                          |
 // +---------------------------------------------------------------------------+
 // | index.php                                                                 |
 // |                                                                           |
 // | This is the main page for the Geeklog Links Plugin                        |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following authors:                         |
+// | Copyright (C) 2000-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
 // |          Mark Limburg      - mlimburg AT users DOT sourceforge DOT net    |
@@ -44,12 +44,12 @@
  * @since GL 1.4.0
  * @copyright Copyright © 2005-2008
  * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
- * @author Tony Bibbs <tony AT tonybibbs DOT com>
- * @author Mark Limburg <mlimburg AT users DOT sourceforge DOT net>
- * @author Jason Whittenburg <jwhitten AT securitygeeks DOT com>
- * @author Tom Willett <tomw AT pigstye DOT net>
- * @author Trinity Bays <trinity93 AT gmail DOT com>
- * @author Dirk Haun <dirk AT haun-online DOT de>
+ * @author Tony Bibbs, tony AT tonybibbs DOT com
+ * @author Mark Limburg, mlimburg AT users DOT sourceforge DOT net
+ * @author Jason Whittenburg, jwhitten AT securitygeeks DOT com
+ * @author Tom Willett, tomw AT pigstye DOT net
+ * @author Trinity Bays, trinity93 AT gmail DOT com
+ * @author Dirk Haun, dirk AT haun-online DOT de
  *
  */
 
diff -r 8d868290493d -r e08747bfab7c public_html/links/portal.php
--- a/public_html/links/portal.php	Sun Mar 15 20:06:29 2009 +0100
+++ b/public_html/links/portal.php	Sun Mar 15 21:54:28 2009 +0100
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.5                                                               |
+// | Geeklog 1.6                                                               |
 // +---------------------------------------------------------------------------+
 // | portal.php                                                                |
 // |                                                                           |
 // | Geeklog portal page that tracks link click throughs.                      |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following authors:                         |
+// | Copyright (C) 2000-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
 // |          Mark Limburg      - mlimburg AT users.sourceforge DOT net        |
@@ -42,11 +42,11 @@
  * @since GL 1.4.0
  * @copyright Copyright © 2005-2008
  * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
- * @author Trinity Bays <trinity93 AT gmail.com>
- * @author Tony Bibbs <tony AT tonybibbs DOT com>
- * @author Tom Willett <twillett AT users DOT sourceforge DOT net>
- * @author Blaine Lang <langmail AT sympatico DOT ca>
- * @author Dirk Haun <dirk AT haun-online DOT de>
+ * @author Trinity Bays, trinity93 AT gmail.com
+ * @author Tony Bibbs, tony AT tonybibbs DOT com
+ * @author Tom Willett, twillett AT users DOT sourceforge DOT net
+ * @author Blaine Lang, langmail AT sympatico DOT ca
+ * @author Dirk Haun, dirk AT haun-online DOT de
  * 
  */
 
diff -r 8d868290493d -r e08747bfab7c system/classes/calendar.class.php
--- a/system/classes/calendar.class.php	Sun Mar 15 20:06:29 2009 +0100
+++ b/system/classes/calendar.class.php	Sun Mar 15 21:54:28 2009 +0100
@@ -39,7 +39,7 @@
 * Those files along with this class need to be reworked to be easier 
 * to maintain and support rich calendaring features
 *
-* @author   Tony Bibbs  <tony AT tonybibbs DOT com>
+* @author   Tony Bibbs, tony AT tonybibbs DOT com
 */



More information about the geeklog-cvs mailing list