[geeklog-cvs] geeklog: Changed "var" to "private" in some classes (cf. feature...

geeklog-cvs at lists.geeklog.net geeklog-cvs at lists.geeklog.net
Sat Mar 19 11:58:06 EDT 2011


changeset 8182:f6704f0d53f3
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/f6704f0d53f3
user: Dirk Haun <dirk at haun-online.de>
date: Sat Mar 19 16:54:29 2011 +0100
description:
Changed "var" to "private" in some classes (cf. feature request #0001217)

diffstat:

 system/classes/listfactory.class.php |  28 ++++++++++++++--------------
 system/classes/navbar.class.php      |  26 +++++++++++++-------------
 system/classes/search.class.php      |  30 +++++++++++++++---------------
 system/classes/timer.class.php       |  12 ++++++------
 system/classes/url.class.php         |   8 ++++----
 5 files changed, 52 insertions(+), 52 deletions(-)

diffs (246 lines):

diff -r a8c2b0900c8a -r f6704f0d53f3 system/classes/listfactory.class.php
--- a/system/classes/listfactory.class.php	Sat Mar 19 16:53:28 2011 +0100
+++ b/system/classes/listfactory.class.php	Sat Mar 19 16:54:29 2011 +0100
@@ -2,7 +2,7 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.7                                                               |
+// | Geeklog 1.8                                                               |
 // +---------------------------------------------------------------------------+
 // | listfactory.class.php                                                     |
 // |                                                                           |
@@ -10,7 +10,7 @@
 // | from arrays or SQL statements. It will also supports the sorting and      |
 // | paging of results.                                                        |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2010 by the following authors:                         |
+// | Copyright (C) 2008-2011 by the following authors:                         |
 // |                                                                           |
 // | Authors: Sami Barakat     - sami AT sbarakat DOT co DOT uk                |
 // +---------------------------------------------------------------------------+
@@ -131,18 +131,18 @@
 class ListFactory {
 
     // PRIVATE VARIABLES
-    var $_fields = array();
-    var $_sources_arr = array();
-    var $_total_rank = 0;
-    var $_sort_arr = array();
-    var $_def_sort_arr = array();
-    var $_page = 1;
-    var $_per_page = 0;
-    var $_page_limits = array();
-    var $_function = '';
-    var $_preset_rows = array();
-    var $_page_url = '';
-    var $_style = 'table';
+    private $_fields = array();
+    private $_sources_arr = array();
+    private $_total_rank = 0;
+    private $_sort_arr = array();
+    private $_def_sort_arr = array();
+    private $_page = 1;
+    private $_per_page = 0;
+    private $_page_limits = array();
+    private $_function = '';
+    private $_preset_rows = array();
+    private $_page_url = '';
+    private $_style = 'table';
 
     /**
     * Constructor
diff -r a8c2b0900c8a -r f6704f0d53f3 system/classes/navbar.class.php
--- a/system/classes/navbar.class.php	Sat Mar 19 16:53:28 2011 +0100
+++ b/system/classes/navbar.class.php	Sat Mar 19 16:54:29 2011 +0100
@@ -1,16 +1,17 @@
 <?php
+
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +-------------------------------------------------------------------------+
-// | Geeklog 1.3                                                             |
+// | Geeklog 1.8                                                             |
 // +-------------------------------------------------------------------------+
 // | navbar.class.php                                                        |
 // |                                                                         |
 // | class to create and display a CSS based Navbar for site navigation      |
 // +-------------------------------------------------------------------------+
-// | Copyright (C) 2004 by Consult4Hire Inc.                                 |
+// | Copyright (C) 2004-2011 by Consult4Hire Inc.                            |
 // |                                                                         |
 // | Author:                                                                 |
-// | Blaine Lang                 -    blaine at portalparts.com                 |
+// | Blaine Lang                 -    blaine AT portalparts DOT com          |
 // +-------------------------------------------------------------------------+
 // |                                                                         |
 // | This program is free software; you can redistribute it and/or           |
@@ -28,7 +29,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.         |
 // |                                                                         |
 // +-------------------------------------------------------------------------+
-//
 
 /**
 * This class will allow you to setup and generate a CSS Tab Menu and breadcrumb link trail
@@ -86,23 +86,23 @@
     /**
     * @access private
     */
-    var $_menuitems;      // Array
+    private $_menuitems;        // Array
     /**
     * @access private
     */
-    var $_selected = '';      // string
+    private $_selected = '';    // string
     /**
     * @access private
     */
-    var $_parms = '';      // string
+    private $_parms = '';       // string
     /**
     * @access private
     */
-    var $_onclick;      // Array
-    
-    var $_bctemplate = NULL;     // Template to use for Breadcrumbs
-    
-    var $_numbreadcrumbs = 0;   // Number of Breadcrumb links added
+    private $_onclick;          // Array
+
+    private $_bctemplate = NULL;    // Template to use for Breadcrumbs
+
+    private $_numbreadcrumbs = 0;   // Number of Breadcrumb links added
 
     /**
     * Constructor
@@ -221,4 +221,4 @@
 
 }
 
-?>
\ No newline at end of file
+?>
diff -r a8c2b0900c8a -r f6704f0d53f3 system/classes/search.class.php
--- a/system/classes/search.class.php	Sat Mar 19 16:53:28 2011 +0100
+++ b/system/classes/search.class.php	Sat Mar 19 16:54:29 2011 +0100
@@ -8,7 +8,7 @@
 // |                                                                           |
 // | Geeklog search class.                                                     |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2010 by the following authors:                         |
+// | Copyright (C) 2000-2011 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs       - tony AT geeklog DOT net                       |
 // |          Dirk Haun        - dirk AT haun-online DOT de                    |
@@ -49,20 +49,20 @@
 class Search {
 
     // PRIVATE VARIABLES
-    var $_query = '';
-    var $_topic = '';
-    var $_dateStart = null;
-    var $_dateEnd = null;
-    var $_author = '';
-    var $_type = '';
-    var $_keyType = '';
-    var $_names = array();
-    var $_url_rewrite = array();
-    var $_append_query = array();
-    var $_searchURL = '';
-    var $_wordlength;
-    var $_verbose = false; // verbose logging
-    var $_titlesOnly = false;
+    private $_query = '';
+    private $_topic = '';
+    private $_dateStart = null;
+    private $_dateEnd = null;
+    private $_author = '';
+    private $_type = '';
+    private $_keyType = '';
+    private $_names = array();
+    private $_url_rewrite = array();
+    private $_append_query = array();
+    private $_searchURL = '';
+    private $_wordlength;
+    private $_verbose = false; // verbose logging
+    private $_titlesOnly = false;
 
     /**
     * Constructor
diff -r a8c2b0900c8a -r f6704f0d53f3 system/classes/timer.class.php
--- a/system/classes/timer.class.php	Sat Mar 19 16:53:28 2011 +0100
+++ b/system/classes/timer.class.php	Sat Mar 19 16:54:29 2011 +0100
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.6                                                               |
+// | Geeklog 1.8                                                               |
 // +---------------------------------------------------------------------------+
 // | timer.class.php                                                           |
 // |                                                                           |
 // | Geeklog timer class.  Use this to do performance testing.                 |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2009 by the following authors:                         |
+// | Copyright (C) 2000-2011 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs, tony AT tonybibbs DOT com                            |
 // +---------------------------------------------------------------------------+
@@ -60,19 +60,19 @@
     /**
     * @access private
     */
-    var $_starttime = '';
+    private $_starttime = '';
     /**
     * @access private
     */
-    var $_endtime = '';
+    private $_endtime = '';
     /**
     * @access private
     */
-    var $_elapsedtime = '';
+    private $_elapsedtime = '';
     /**
     * @access private
     */
-    var $_precision = 2;
+    private $_precision = 2;
 
     // PUBLIC METHODS
 
diff -r a8c2b0900c8a -r f6704f0d53f3 system/classes/url.class.php
--- a/system/classes/url.class.php	Sat Mar 19 16:53:28 2011 +0100
+++ b/system/classes/url.class.php	Sat Mar 19 16:54:29 2011 +0100
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.6                                                               |
+// | Geeklog 1.8                                                               |
 // +---------------------------------------------------------------------------+
 // | url.class.php                                                             |
 // |                                                                           |
 // | class to allow for spider friendly URL's                                  |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2002-2009 by the following authors:                         |
+// | Copyright (C) 2002-2011 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs       - tony AT tonybibbs DOT com                     |
 // +---------------------------------------------------------------------------+
@@ -45,11 +45,11 @@
     /**
     * @access private
     */
-    var $_arguments = array();		// Array of argument names
+    private $_arguments = array();  // Array of argument names
     /**
     * @access private
     */
-    var $_enabled = true;
+    private $_enabled = true;
     
     /**
     * Constructor



More information about the geeklog-cvs mailing list