Some minor improvements

[core.git] / inc / classes / main / helper / web / links / class_WebLinkHelper.php

diff --git a/inc/classes/main/helper/web/links/class_WebLinkHelper.php b/inc/classes/main/helper/web/links/class_WebLinkHelper.php
index c09de55ec0fb456253bbea09ba6473901ebf8982..4ea1819b1b40d7a425690948a2566fca79a9d2ff 100644 (file)
--- a/inc/classes/main/helper/web/links/class_WebLinkHelper.php
+++ b/inc/classes/main/helper/web/links/class_WebLinkHelper.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -35,12 +35,12 @@ class WebLinkHelper extends BaseWebHelper implements HelpableTemplate {
        /**
         * First parameter seperator
         */
-       private $firstParameter = '?';
+       const FIRST_PARAMETER_SEPERATOR = '?';
 
        /**
         * Seperator for more paraemters
         */
-       private $parameterSeperator = '&amp;';
+       const EXTRA_PARAMETER_SEPERATOR = '&amp;';
 
        /**
         * Protected constructor
@@ -61,7 +61,7 @@ class WebLinkHelper extends BaseWebHelper implements HelpableTemplate {
         * @return      $helperInstance         A prepared instance of this helper
         * @throws      NoConfigEntryException  A deprecated exception at this point
         */
-       public final static function createWebLinkHelper (CompileableTemplate $templateInstance, $linkName, $linkBase = null) {
+       public static final function createWebLinkHelper (CompileableTemplate $templateInstance, $linkName, $linkBase = NULL) {
                // Get new instance
                $helperInstance = new WebLinkHelper();
 
@@ -92,7 +92,7 @@ class WebLinkHelper extends BaseWebHelper implements HelpableTemplate {
                // Is the deprecated parameter set?
                if (!is_null($linkBase)) {
                        // Then output a deprecation message
-                       $helperInstance->deprecationWarning(__METHOD__ . ': linkBase is deprecated. Please remove it from your templates and add a config entry ' . $configEntry . ' in your config.php file.');
+                       $helperInstance->deprecationWarning('[' . __METHOD__ . ':' . __LINE__ . ']:  linkBase is deprecated. Please remove it from your templates and add a config entry ' . $configEntry . ' in your config.php file.');
                } // END - if
 
                // Determine link base from config now and 'page' request
@@ -277,13 +277,13 @@ class WebLinkHelper extends BaseWebHelper implements HelpableTemplate {
                } // END - if
 
                // Default parameter seperator is &amp;
-               $seperator = $this->parameterSeperator;
+               $seperator = self::EXTRA_PARAMETER_SEPERATOR;
 
                // Is there a question mark in?
-               $linkArray = explode($this->firstParameter, $this->getLinkBase());
+               $linkArray = explode(self::FIRST_PARAMETER_SEPERATOR, $this->getLinkBase());
                if (count($linkArray) == 0) {
                        // No question mark
-                       $seperator = $this->firstParameter;
+                       $seperator = self::FIRST_PARAMETER_SEPERATOR;
                } // END - if
 
                // Prepare action