diff --git a/html/class/Archive_Zip.php b/html/class/Archive_Zip.php
index 75e8394c8..880b41857 100644
--- a/html/class/Archive_Zip.php
+++ b/html/class/Archive_Zip.php
@@ -134,7 +134,7 @@ class Archive_Zip
     * @param    string  $p_zipname  The name of the zip archive to create
     * @access public
     */
-    public function Archive_Zip($p_zipname)
+    public function __construct($p_zipname)
     {
 
       // ----- Check the zlib
diff --git a/html/class/class.tar.php b/html/class/class.tar.php
index 48f8faae1..4eed8704b 100644
--- a/html/class/class.tar.php
+++ b/html/class/class.tar.php
@@ -113,7 +113,7 @@ class tar
     /**
      * Class Constructor -- Does nothing...
      */
-    public function tar()
+    public function __construct()
     {
         return true;
     }
diff --git a/html/class/commentrenderer.php b/html/class/commentrenderer.php
index 30d264bf8..be30d9293 100644
--- a/html/class/commentrenderer.php
+++ b/html/class/commentrenderer.php
@@ -58,7 +58,7 @@ class XoopsCommentRenderer
      * @param   boolean $use_icons
      * @param   boolean $do_iconcheck
      **/
-    public function XoopsCommentRenderer(&$tpl, $use_icons = true, $do_iconcheck = false)
+    public function __construct(&$tpl, $use_icons = true, $do_iconcheck = false)
     {
         $this->_tpl =& $tpl;
         $this->_useIcons = $use_icons;
diff --git a/html/class/criteria.php b/html/class/criteria.php
index b9c9c4861..6951bfde6 100644
--- a/html/class/criteria.php
+++ b/html/class/criteria.php
@@ -96,7 +96,7 @@ class CriteriaElement
     /**
      * Constructor
      **/
-    public function CriteriaElement()
+    public function __construct()
     {
     }
 
@@ -330,7 +330,7 @@ class CriteriaCompo extends CriteriaElement
      * @param   object  $ele
      * @param   string  $condition
      **/
-    public function CriteriaCompo($ele=null, $condition='AND')
+    public function __construct($ele=null, $condition='AND')
     {
         if (isset($ele) && is_object($ele)) {
             $this->add($ele, $condition);
@@ -465,7 +465,7 @@ class Criteria extends CriteriaElement
      * @param   string  $value
      * @param   string  $operator
      **/
-    public function Criteria($column, $value='', $operator='=', $prefix = '', $function = '')
+    public function __construct($column, $value='', $operator='=', $prefix = '', $function = '')
     {
         $this->prefix = $prefix;
         $this->function = $function;
diff --git a/html/class/database/database.php b/html/class/database/database.php
index a359ee833..9b384c944 100644
--- a/html/class/database/database.php
+++ b/html/class/database/database.php
@@ -69,7 +69,7 @@ class XoopsDatabase
          * 
          * will always fail, because this is an abstract class!
          */
-        public function XoopsDatabase()
+        public function __construct()
         {
             // exit("Cannot instantiate this class directly");
         }
diff --git a/html/class/database/databasefactory.php b/html/class/database/databasefactory.php
index 975e47607..45d2be045 100644
--- a/html/class/database/databasefactory.php
+++ b/html/class/database/databasefactory.php
@@ -2,7 +2,7 @@
 class XoopsDatabaseFactory
 {
 
-    public function XoopsDatabaseFactory()
+    public function __construct()
     {
     }
 
diff --git a/html/class/downloader.php b/html/class/downloader.php
index 0d5764f17..2d15444b2 100644
--- a/html/class/downloader.php
+++ b/html/class/downloader.php
@@ -51,7 +51,7 @@ class XoopsDownloader
     /**
      * Constructor
      */
-    public function XoopsDownloader()
+    public function __construct()
     {
         //EMPTY
     }
diff --git a/html/class/errorhandler.php b/html/class/errorhandler.php
index 7c060481a..3fd156017 100644
--- a/html/class/errorhandler.php
+++ b/html/class/errorhandler.php
@@ -63,7 +63,7 @@ class XoopsErrorHandler
      * registering an error handler, the setting or 'error_reporting' is
      * ignored and *everything* is trapped.
      */
-    public function XoopsErrorHandler()
+    public function __construct()
     {
         set_error_handler('XoopsErrorHandler_HandleError');
         register_shutdown_function('XoopsErrorHandler_Shutdown');
diff --git a/html/class/logger.php b/html/class/logger.php
index 5d7fd7295..aad50a741 100644
--- a/html/class/logger.php
+++ b/html/class/logger.php
@@ -60,7 +60,7 @@ class XoopsLogger
      *
      * @access  private
      */
-    public function XoopsLogger()
+    public function __construct()
     {
     }
 
diff --git a/html/class/module.textsanitizer.php b/html/class/module.textsanitizer.php
index 8a44d88fa..2cd4b16f5 100644
--- a/html/class/module.textsanitizer.php
+++ b/html/class/module.textsanitizer.php
@@ -76,7 +76,7 @@ class MyTextSanitizer
     *
     * @todo Sofar, this does nuttin' ;-)
     */
-    public function MyTextSanitizer()
+    public function __construct()
     {
         $this->mMakeClickablePostFilter =new XCube_Delegate();
         $this->mMakeClickablePostFilter->register('MyTextSanitizer.MakeClickablePostFilter');
diff --git a/html/class/tardownloader.php b/html/class/tardownloader.php
index b04ee0251..027387c15 100644
--- a/html/class/tardownloader.php
+++ b/html/class/tardownloader.php
@@ -59,7 +59,7 @@ class XoopsTarDownloader extends XoopsDownloader
      * @param string $ext       file extension
      * @param string $mimyType  Mimetype
      **/
-    public function XoopsTarDownloader($ext = '.tar.gz', $mimyType = 'application/x-gzip')
+    public function __construct($ext = '.tar.gz', $mimyType = 'application/x-gzip')
     {
         $this->archiver = new tar();
         $this->ext = trim($ext);
diff --git a/html/class/token.php b/html/class/token.php
index 070cba33c..f44db9328 100644
--- a/html/class/token.php
+++ b/html/class/token.php
@@ -67,7 +67,7 @@ class XoopsToken
      * @param   $name   this token's name string.
      * @param   $timeout    effective time(if $timeout equal 0, this token will become unlimited)
      */
-    public function XoopsToken($name, $timeout = XOOPS_TOKEN_TIMEOUT)
+    public function __construct($name, $timeout = XOOPS_TOKEN_TIMEOUT)
     {
         $this->_name_ = $name;
 
diff --git a/html/class/tree.php b/html/class/tree.php
index e752c5f03..7a023c3f3 100644
--- a/html/class/tree.php
+++ b/html/class/tree.php
@@ -59,7 +59,7 @@ class XoopsObjectTree
      * @param   string     $parentId   field name of parent object ID
      * @param   string     $rootId     field name of root object ID
      **/
-    public function XoopsObjectTree(&$objectArr, $myId, $parentId, $rootId = null)
+    public function __construct(&$objectArr, $myId, $parentId, $rootId = null)
     {
         $this->_objects =& $objectArr;
         $this->_myId = $myId;
diff --git a/html/class/uploader.php b/html/class/uploader.php
index d44603591..9d0d9f373 100644
--- a/html/class/uploader.php
+++ b/html/class/uploader.php
@@ -102,7 +102,7 @@ class XoopsMediaUploader
      * @param   int     $maxHeight
      * @param   int     $cmodvalue
      **/
-    public function XoopsMediaUploader($uploadDir, $allowedMimeTypes, $maxFileSize=0, $maxWidth=null, $maxHeight=null)
+    public function __construct($uploadDir, $allowedMimeTypes, $maxFileSize=0, $maxWidth=null, $maxHeight=null)
     {
         @$this->extensionToMime = include(XOOPS_ROOT_PATH . '/class/mimetypes.inc.php');
         if (!is_array($this->extensionToMime)) {
diff --git a/html/class/xml/rpc/xmlrpcapi.php b/html/class/xml/rpc/xmlrpcapi.php
index f492dafa9..49422ef99 100644
--- a/html/class/xml/rpc/xmlrpcapi.php
+++ b/html/class/xml/rpc/xmlrpcapi.php
@@ -52,7 +52,7 @@ class XoopsXmlRpcApi
 
 
 
-    public function XoopsXmlRpcApi(&$params, &$response, &$module)
+    public function __construct(&$params, &$response, &$module)
     {
         $this->params =& $params;
         $this->response =& $response;
diff --git a/html/class/xml/rpc/xmlrpcparser.php b/html/class/xml/rpc/xmlrpcparser.php
index d7ce94955..c7896df39 100644
--- a/html/class/xml/rpc/xmlrpcparser.php
+++ b/html/class/xml/rpc/xmlrpcparser.php
@@ -143,7 +143,7 @@ class XoopsXmlRpcParser extends SaxParser
     * @author
     * @see
     */
-    public function XoopsXmlRpcParser(&$input)
+    public function __construct(&$input)
     {
         $this->SaxParser($input);
         $this->addTagHandler(new RpcMethodNameHandler());
diff --git a/html/class/xml/rpc/xmlrpctag.php b/html/class/xml/rpc/xmlrpctag.php
index ff731338b..81451e931 100644
--- a/html/class/xml/rpc/xmlrpctag.php
+++ b/html/class/xml/rpc/xmlrpctag.php
@@ -34,7 +34,7 @@ class XoopsXmlRpcDocument
 
     public $_tags = array();
 
-    public function XoopsXmlRpcDocument()
+    public function __construct()
     {
     }
 
@@ -70,7 +70,7 @@ class XoopsXmlRpcRequest extends XoopsXmlRpcDocument
 
     public $methodName;
 
-    public function XoopsXmlRpcRequest($methodName)
+    public function __construct($methodName)
     {
         $this->methodName = trim($methodName);
     }
@@ -91,7 +91,7 @@ class XoopsXmlRpcTag
 
     public $_fault = false;
 
-    public function XoopsXmlRpcTag()
+    public function __construct()
     {
     }
 
@@ -122,7 +122,7 @@ class XoopsXmlRpcFault extends XoopsXmlRpcTag
     public $_code;
     public $_extra;
 
-    public function XoopsXmlRpcFault($code, $extra = null)
+    public function __construct($code, $extra = null)
     {
         $this->setFault(true);
         $this->_code = intval($code);
@@ -179,7 +179,7 @@ class XoopsXmlRpcInt extends XoopsXmlRpcTag
 
     public $_value;
 
-    public function XoopsXmlRpcInt($value)
+    public function __construct($value)
     {
         $this->_value = intval($value);
     }
@@ -195,7 +195,7 @@ class XoopsXmlRpcDouble extends XoopsXmlRpcTag
 
     public $_value;
 
-    public function XoopsXmlRpcDouble($value)
+    public function __construct($value)
     {
         $this->_value = (float)$value;
     }
@@ -211,7 +211,7 @@ class XoopsXmlRpcBoolean extends XoopsXmlRpcTag
 
     public $_value;
 
-    public function XoopsXmlRpcBoolean($value)
+    public function __construct($value)
     {
         $this->_value = (!empty($value) && $value != false) ? 1 : 0;
     }
@@ -227,7 +227,7 @@ class XoopsXmlRpcString extends XoopsXmlRpcTag
 
     public $_value;
 
-    public function XoopsXmlRpcString($value)
+    public function __construct($value)
     {
         $this->_value = strval($value);
     }
@@ -243,7 +243,7 @@ class XoopsXmlRpcDatetime extends XoopsXmlRpcTag
 
     public $_value;
 
-    public function XoopsXmlRpcDatetime($value)
+    public function __construct($value)
     {
         if (!is_numeric($value)) {
             $this->_value = strtotime($value);
@@ -263,7 +263,7 @@ class XoopsXmlRpcBase64 extends XoopsXmlRpcTag
 
     public $_value;
 
-    public function XoopsXmlRpcBase64($value)
+    public function __construct($value)
     {
         $this->_value = base64_encode($value);
     }
@@ -279,7 +279,7 @@ class XoopsXmlRpcArray extends XoopsXmlRpcTag
 
     public $_tags = array();
 
-    public function XoopsXmlRpcArray()
+    public function __construct()
     {
     }
 
@@ -305,7 +305,7 @@ class XoopsXmlRpcStruct extends XoopsXmlRpcTag
 
     public $_tags = array();
 
-    public function XoopsXmlRpcStruct()
+    public function __construct()
     {
     }
 
diff --git a/html/class/xml/rss/xmlrss2parser.php b/html/class/xml/rss/xmlrss2parser.php
index 139dcba7c..a53d7537e 100644
--- a/html/class/xml/rss/xmlrss2parser.php
+++ b/html/class/xml/rss/xmlrss2parser.php
@@ -43,9 +43,10 @@ class XoopsXmlRss2Parser extends SaxParser
     public $_imageData = array();
     public $_items = array();
 
-    public function XoopsXmlRss2Parser(&$input)
+    public function __construct(&$input)
     {
-        $this->SaxParser($input);
+        parent::__construct($input);
+
         $this->useUtfEncoding();
         $this->addTagHandler(new RssChannelHandler());
         $this->addTagHandler(new RssTitleHandler());
@@ -144,7 +145,7 @@ public function resetTempArr()
 class RssChannelHandler extends XmlTagHandler
 {
 
-    public function RssChannelHandler()
+    public function __construct()
     {
     }
 
@@ -157,7 +158,7 @@ public function getName()
 class RssTitleHandler extends XmlTagHandler
 {
 
-    public function RssTitleHandler()
+    public function __construct()
     {
     }
 
@@ -188,7 +189,7 @@ public function handleCharacterData(&$parser, &$data)
 class RssLinkHandler extends XmlTagHandler
 {
 
-    public function RssLinkHandler()
+    public function __construct()
     {
     }
 
@@ -219,7 +220,7 @@ public function handleCharacterData(&$parser, &$data)
 class RssDescriptionHandler extends XmlTagHandler
 {
 
-    public function RssDescriptionHandler()
+    public function __construct()
     {
     }
 
@@ -250,7 +251,7 @@ public function handleCharacterData(&$parser, &$data)
 class RssGeneratorHandler extends XmlTagHandler
 {
 
-    public function RssGeneratorHandler()
+    public function __construct()
     {
     }
 
@@ -274,7 +275,7 @@ public function handleCharacterData(&$parser, &$data)
 class RssCopyrightHandler extends XmlTagHandler
 {
 
-    public function RssCopyrightHandler()
+    public function __construct()
     {
     }
 
@@ -298,7 +299,7 @@ public function handleCharacterData(&$parser, &$data)
 class RssNameHandler extends XmlTagHandler
 {
 
-    public function RssNameHandler()
+    public function __construct()
     {
     }
 
@@ -322,7 +323,7 @@ public function handleCharacterData(&$parser, &$data)
 class RssManagingEditorHandler extends XmlTagHandler
 {
 
-    public function RssManagingEditorHandler()
+    public function __construct()
     {
     }
 
@@ -346,7 +347,7 @@ public function handleCharacterData(&$parser, &$data)
 class RssLanguageHandler extends XmlTagHandler
 {
 
-    public function RssLanguageHandler()
+    public function __construct()
     {
     }
 
@@ -370,7 +371,7 @@ public function handleCharacterData(&$parser, &$data)
 class RssWebMasterHandler extends XmlTagHandler
 {
 
-    public function RssWebMasterHandler()
+    public function __construct()
     {
     }
 
@@ -394,7 +395,7 @@ public function handleCharacterData(&$parser, &$data)
 class RssDocsHandler extends XmlTagHandler
 {
 
-    public function RssDocsHandler()
+    public function __construct()
     {
     }
 
@@ -418,7 +419,7 @@ public function handleCharacterData(&$parser, &$data)
 class RssTtlHandler extends XmlTagHandler
 {
 
-    public function RssTtlHandler()
+    public function __construct()
     {
     }
 
@@ -465,7 +466,7 @@ public function handleEndElement(&$parser)
 class RssLastBuildDateHandler extends XmlTagHandler
 {
 
-    public function RssLastBuildDateHandler()
+    public function __construct()
     {
     }
 
@@ -489,7 +490,7 @@ public function handleCharacterData(&$parser, &$data)
 class RssImageHandler extends XmlTagHandler
 {
 
-    public function RssImageHandler()
+    public function __construct()
     {
     }
 
@@ -502,7 +503,7 @@ public function getName()
 class RssUrlHandler extends XmlTagHandler
 {
 
-    public function RssUrlHandler()
+    public function __construct()
     {
     }
 
@@ -522,7 +523,7 @@ public function handleCharacterData(&$parser, &$data)
 class RssWidthHandler extends XmlTagHandler
 {
 
-    public function RssWidthHandler()
+    public function __construct()
     {
     }
 
@@ -542,7 +543,7 @@ public function handleCharacterData(&$parser, &$data)
 class RssHeightHandler extends XmlTagHandler
 {
 
-    public function RssHeightHandler()
+    public function __construct()
     {
     }
 
@@ -562,7 +563,7 @@ public function handleCharacterData(&$parser, &$data)
 class RssItemHandler extends XmlTagHandler
 {
 
-    public function RssItemHandler()
+    public function __construct()
     {
     }
 
@@ -585,7 +586,7 @@ public function handleEndElement(&$parser)
 class RssCategoryHandler extends XmlTagHandler
 {
 
-    public function RssCategoryHandler()
+    public function __construct()
     {
     }
 
@@ -611,7 +612,7 @@ public function handleCharacterData(&$parser, &$data)
 class RssCommentsHandler extends XmlTagHandler
 {
 
-    public function RssCommentsHandler()
+    public function __construct()
     {
     }
 
@@ -631,7 +632,7 @@ public function handleCharacterData(&$parser, &$data)
 class RssPubDateHandler extends XmlTagHandler
 {
 
-    public function RssPubDateHandler()
+    public function __construct()
     {
     }
 
@@ -658,7 +659,7 @@ public function handleCharacterData(&$parser, &$data)
 class RssGuidHandler extends XmlTagHandler
 {
 
-    public function RssGuidHandler()
+    public function __construct()
     {
     }
 
@@ -698,7 +699,7 @@ public function handleCharacterData(&$parser, &$data)
 class RssSourceHandler extends XmlTagHandler
 {
 
-    public function RssSourceHandler()
+    public function __construct()
     {
     }
 
diff --git a/html/class/xml/themesetparser.php b/html/class/xml/themesetparser.php
index ecacb0aa7..251a13f5a 100644
--- a/html/class/xml/themesetparser.php
+++ b/html/class/xml/themesetparser.php
@@ -43,7 +43,7 @@ class XoopsThemeSetParser extends SaxParser
     public $imagesData = array();
     public $templatesData = array();
 
-    public function XoopsThemeSetParser(&$input)
+    public function __construct(&$input)
     {
         $this->SaxParser($input);
         $this->addTagHandler(new ThemeSetThemeNameHandler());
@@ -123,7 +123,7 @@ public function resetTempArr()
 class ThemeSetDateCreatedHandler extends XmlTagHandler
 {
 
-    public function ThemeSetDateCreatedHandler()
+    public function __construct()
     {
     }
 
@@ -146,7 +146,7 @@ public function handleCharacterData(&$parser, &$data)
 
 class ThemeSetAuthorHandler extends XmlTagHandler
 {
-    public function ThemeSetAuthorHandler()
+    public function __construct()
     {
     }
 
@@ -168,7 +168,7 @@ public function handleEndElement(&$parser)
 
 class ThemeSetDescriptionHandler extends XmlTagHandler
 {
-    public function ThemeSetDescriptionHandler()
+    public function __construct()
     {
     }
 
@@ -194,7 +194,7 @@ public function handleCharacterData(&$parser, &$data)
 
 class ThemeSetGeneratorHandler extends XmlTagHandler
 {
-    public function ThemeSetGeneratorHandler()
+    public function __construct()
     {
     }
 
@@ -217,7 +217,7 @@ public function handleCharacterData(&$parser, &$data)
 
 class ThemeSetNameHandler extends XmlTagHandler
 {
-    public function ThemeSetNameHandler()
+    public function __construct()
     {
     }
 
@@ -243,7 +243,7 @@ public function handleCharacterData(&$parser, &$data)
 
 class ThemeSetEmailHandler extends XmlTagHandler
 {
-    public function ThemeSetEmailHandler()
+    public function __construct()
     {
     }
 
@@ -266,7 +266,7 @@ public function handleCharacterData(&$parser, &$data)
 
 class ThemeSetLinkHandler extends XmlTagHandler
 {
-    public function ThemeSetLinkHandler()
+    public function __construct()
     {
     }
 
@@ -289,7 +289,7 @@ public function handleCharacterData(&$parser, &$data)
 
 class ThemeSetTemplateHandler extends XmlTagHandler
 {
-    public function ThemeSetTemplateHandler()
+    public function __construct()
     {
     }
 
@@ -312,7 +312,7 @@ public function handleEndElement(&$parser)
 
 class ThemeSetImageHandler extends XmlTagHandler
 {
-    public function ThemeSetImageHandler()
+    public function __construct()
     {
     }
 
@@ -335,7 +335,7 @@ public function handleEndElement(&$parser)
 
 class ThemeSetModuleHandler extends XmlTagHandler
 {
-    public function ThemeSetModuleHandler()
+    public function __construct()
     {
     }
 
@@ -359,7 +359,7 @@ public function handleCharacterData(&$parser, &$data)
 
 class ThemeSetFileTypeHandler extends XmlTagHandler
 {
-    public function ThemeSetFileTypeHandler()
+    public function __construct()
     {
     }
 
@@ -382,7 +382,7 @@ public function handleCharacterData(&$parser, &$data)
 
 class ThemeSetTagHandler extends XmlTagHandler
 {
-    public function ThemeSetTagHandler()
+    public function __construct()
     {
     }
 
diff --git a/html/class/xoopsform/grouppermform.php b/html/class/xoopsform/grouppermform.php
index 31fba876c..5f45ac1e1 100644
--- a/html/class/xoopsform/grouppermform.php
+++ b/html/class/xoopsform/grouppermform.php
@@ -72,9 +72,11 @@ class XoopsGroupPermForm extends XoopsForm
     /**
      * Constructor
      */
-    public function XoopsGroupPermForm($title, $modid, $permname, $permdesc, $url = "")
+    public function __construct($title, $modid, $permname, $permdesc, $url = "")
     {
-        $this->XoopsForm($title, 'groupperm_form', XOOPS_URL . '/modules/legacy/include/groupperm.php', 'post');
+//        $this->XoopsForm($title, 'groupperm_form', XOOPS_URL . '/modules/legacy/include/groupperm.php', 'post');
+        parent::__construct($title, 'groupperm_form', XOOPS_URL . '/modules/legacy/include/groupperm.php', 'post');
+
         $this->_modid = intval($modid);
         $this->_permName = $permname;
         $this->_permDesc = $permdesc;
@@ -200,7 +202,7 @@ class XoopsGroupFormCheckBox extends XoopsFormElement
     /**
      * Constructor
      */
-    public function XoopsGroupFormCheckBox($caption, $name, $groupId, $values = null)
+    public function __construct($caption, $name, $groupId, $values = null)
     {
         $this->setCaption($caption);
         $this->setName($name);
diff --git a/html/class/zipdownloader.php b/html/class/zipdownloader.php
index 132c1be73..593132dd0 100644
--- a/html/class/zipdownloader.php
+++ b/html/class/zipdownloader.php
@@ -36,7 +36,7 @@
 
 class XoopsZipDownloader extends XoopsDownloader
 {
-    public function XoopsZipDownloader($ext = '.zip', $mimyType = 'application/x-zip')
+    public function __construct($ext = '.zip', $mimyType = 'application/x-zip')
     {
         $this->archiver = new zipfile();
         $this->ext      = trim($ext);
diff --git a/html/core/XCube_ActionFilter.class.php b/html/core/XCube_ActionFilter.class.php
index 8c23433a5..0b180da19 100644
--- a/html/core/XCube_ActionFilter.class.php
+++ b/html/core/XCube_ActionFilter.class.php
@@ -47,7 +47,7 @@ class XCube_ActionFilter
      * @brief Constructor.
      * @param $controller XCube_Controller
      */
-    public function XCube_ActionFilter(&$controller)
+    public function __construct(&$controller)
     {
         $this->mController =& $controller;
         $this->mRoot =& $this->mController->mRoot;
diff --git a/html/core/XCube_ActionForm.class.php b/html/core/XCube_ActionForm.class.php
index d97287476..edd14b297 100644
--- a/html/core/XCube_ActionForm.class.php
+++ b/html/core/XCube_ActionForm.class.php
@@ -108,7 +108,7 @@ class XCube_ActionForm
      * @public
      * @brief Constructor.
      */
-    public function XCube_ActionForm()
+    public function __construct()
     {
         $root =& XCube_Root::getSingleton();
         $this->mContext =& $root->getContext();
@@ -500,7 +500,7 @@ class XCube_FieldProperty
      * @remarks
      *     Only sub-classes of XCube_ActionForm calles this constructor. 
      */
-    public function XCube_FieldProperty(&$form)
+    public function __construct(&$form)
     {
         $this->mForm =& $form;
     }
diff --git a/html/core/XCube_Controller.class.php b/html/core/XCube_Controller.class.php
index 50d2078ba..23ff93de0 100644
--- a/html/core/XCube_Controller.class.php
+++ b/html/core/XCube_Controller.class.php
@@ -133,7 +133,7 @@ class XCube_Controller
      */
     public $mSetupTextFilter = null;
     
-    public function XCube_Controller()
+    public function __construct()
     {
         $this->_mBlockChain = array();
         $this->_mFilterChain = array();
diff --git a/html/core/XCube_Delegate.class.php b/html/core/XCube_Delegate.class.php
index 0f75a1a9e..82688b06a 100644
--- a/html/core/XCube_Delegate.class.php
+++ b/html/core/XCube_Delegate.class.php
@@ -36,7 +36,7 @@ class XCube_Ref
      * @public Constructor.
      * @param $obj mixed
      */
-    public function XCube_Ref(&$obj)
+    public function __construct(&$obj)
     {
         $this->_mObject =& $obj;
     }
@@ -151,7 +151,7 @@ class XCube_Delegate
      *   $delegate =new XCube_Delegate("string", "string");
      * \endcode
      */
-    public function XCube_Delegate()
+    public function __construct()
     {
         if (func_num_args()) {
             $this->_setSignatures(func_get_args());
@@ -412,7 +412,7 @@ class XCube_DelegateManager
      * @public
      * @brief Constructor.
      */
-    public function XCube_DelegateManager()
+    public function __construct()
     {
     }
     
@@ -557,7 +557,7 @@ class XCube_DelegateUtils
      * @private
      * @brief Private Construct. In other words, it's possible to create an instance of this class.
      */
-    public function XCube_DelegateUtils()
+    public function __construct()
     {
     }
 
diff --git a/html/core/XCube_FormFile.class.php b/html/core/XCube_FormFile.class.php
index 3a6459f31..fa1e57957 100644
--- a/html/core/XCube_FormFile.class.php
+++ b/html/core/XCube_FormFile.class.php
@@ -35,7 +35,7 @@ class XCube_FormFile
     
     public $mUploadFileFlag=false;
     
-    public function XCube_FormFile($name = null, $key = null)
+    public function __construct($name = null, $key = null)
     {
         $this->mName = $name;
         $this->mKey = $key;
diff --git a/html/core/XCube_HttpContext.class.php b/html/core/XCube_HttpContext.class.php
index bd4f1b74c..e037c81d9 100644
--- a/html/core/XCube_HttpContext.class.php
+++ b/html/core/XCube_HttpContext.class.php
@@ -52,7 +52,7 @@ class XCube_HttpContext
      */
     public $mThemeName = null;
     
-    public function XCube_HttpContext()
+    public function __construct()
     {
     }
     
@@ -237,7 +237,7 @@ class XCube_GenericRequest extends XCube_AbstractRequest
      */
     public $mAttributes = array();
     
-    public function XCube_GenericRequest($arr = null)
+    public function __construct($arr = null)
     {
         if (is_array($arr)) {
             $this->mAttributes = $arr;
diff --git a/html/core/XCube_Identity.class.php b/html/core/XCube_Identity.class.php
index 04b2bfc75..2c8450017 100644
--- a/html/core/XCube_Identity.class.php
+++ b/html/core/XCube_Identity.class.php
@@ -25,7 +25,7 @@ class XCube_Identity
      */
     public $_mAuthenticationType = "";
     
-    public function XCube_Identity()
+    public function __construct()
     {
     }
     
@@ -91,7 +91,7 @@ class XCube_Principal
      */
     public $_mRoles = array();
     
-    public function XCube_Principal($identity, $roles = array())
+    public function __construct($identity, $roles = array())
     {
         $this->mIdentity =& $identity;
         $this->_mRoles = $roles;
diff --git a/html/core/XCube_LanguageManager.class.php b/html/core/XCube_LanguageManager.class.php
index 297d2df82..47b48eb49 100644
--- a/html/core/XCube_LanguageManager.class.php
+++ b/html/core/XCube_LanguageManager.class.php
@@ -38,7 +38,7 @@ class XCube_LanguageManager
      */
     public $mLocaleName;
     
-    public function XCube_LanguageManager()
+    public function __construct()
     {
         $this->mLanguageName = $this->getFallbackLanguage();
         $this->mLocaleName = $this->getFallbackLocale();
diff --git a/html/core/XCube_Object.class.php b/html/core/XCube_Object.class.php
index b8073966c..76a75b45f 100644
--- a/html/core/XCube_Object.class.php
+++ b/html/core/XCube_Object.class.php
@@ -42,7 +42,7 @@ public function getPropertyDefinition()
     {
     }
     
-    public function XCube_Object()
+    public function __construct()
     {
         $fileds = $this->getPropertyDefinition();
         foreach ($fileds as $t_field) {
diff --git a/html/core/XCube_Permission.class.php b/html/core/XCube_Permission.class.php
index 53d378250..55b3fbd5f 100644
--- a/html/core/XCube_Permission.class.php
+++ b/html/core/XCube_Permission.class.php
@@ -25,7 +25,7 @@ public function getRolesOfAction()
 
 class XCube_AbstractPermissionProvider
 {
-    public function XCube_AbstractPermissionProvider()
+    public function __construct()
     {
     }
     
diff --git a/html/core/XCube_Property.class.php b/html/core/XCube_Property.class.php
index 3a2932e02..a4e60cec2 100644
--- a/html/core/XCube_Property.class.php
+++ b/html/core/XCube_Property.class.php
@@ -22,7 +22,7 @@ class XCube_PropertyInterface
      * @brief Constructor.
      * @param $name string - A name of this property.
      */
-    public function XCube_PropertyInterface($name)
+    public function __construct($name)
     {
     }
 
@@ -148,9 +148,11 @@ class XCube_AbstractProperty extends XCube_PropertyInterface
      * @brief Constructor.
      * @param $name string - A name of this property.
      */
-    public function XCube_AbstractProperty($name)
+    public function __construct($name)
     {
-        parent::XCube_PropertyInterface($name);
+//        parent::XCube_PropertyInterface($name);
+        parent::__construct($name);
+
         $this->mName = $name;
     }
     
@@ -275,7 +277,7 @@ class XCube_GenericArrayProperty extends XCube_PropertyInterface
      * @param $classname string - <T>
      * @param $name string - A name of the property.
      */
-    public function XCube_GenericArrayProperty($classname, $name)
+    public function __construct($classname, $name)
     {
         $this->mPropertyClassName = $classname;
         $this->mName = $name;
@@ -440,9 +442,11 @@ public function hasFetchControl()
  */
 class XCube_AbstractArrayProperty extends XCube_GenericArrayProperty
 {
-    public function XCube_AbstractArrayProperty($name)
+    public function __construct($name)
     {
-        parent::XCube_GenericArrayProperty($this->mPropertyClassName, $name);
+//        parent::XCube_GenericArrayProperty($this->mPropertyClassName, $name);
+        parent::__construct($this->mPropertyClassName, $name);
+
     }
 }
 
@@ -465,9 +469,11 @@ public function set($value)
  */
 class XCube_BoolArrayProperty extends XCube_GenericArrayProperty
 {
-    public function XCube_BoolArrayProperty($name)
+    public function __construct($name)
     {
-        parent::XCube_GenericArrayProperty("XCube_BoolProperty", $name);
+//        parent::XCube_GenericArrayProperty("XCube_BoolProperty", $name);
+        parent::__construct("XCube_BoolProperty", $name);
+
     }
 }
 
@@ -490,9 +496,10 @@ public function set($value)
  */
 class XCube_IntArrayProperty extends XCube_GenericArrayProperty
 {
-    public function XCube_IntArrayProperty($name)
+    public function __construct($name)
     {
-        parent::XCube_GenericArrayProperty("XCube_IntProperty", $name);
+//        parent::XCube_GenericArrayProperty("XCube_IntProperty", $name);
+        parent::__construct("XCube_IntProperty", $name);
     }
 }
 
@@ -515,9 +522,10 @@ public function set($value)
  */
 class XCube_FloatArrayProperty extends XCube_GenericArrayProperty
 {
-    public function XCube_FloatArrayProperty($name)
+    public function __construct($name)
     {
-        parent::XCube_GenericArrayProperty("XCube_FloatProperty", $name);
+//        parent::XCube_GenericArrayProperty("XCube_FloatProperty", $name);
+        parent::__construct("XCube_FloatProperty", $name);
     }
 }
 
@@ -552,9 +560,10 @@ public function toNumber()
  */
 class XCube_StringArrayProperty extends XCube_GenericArrayProperty
 {
-    public function XCube_StringArrayProperty($name)
+    public function __construct($name)
     {
-        parent::XCube_GenericArrayProperty("XCube_StringProperty", $name);
+//        parent::XCube_GenericArrayProperty("XCube_StringProperty", $name);
+        parent::__construct("XCube_StringProperty", $name);
     }
 }
 
@@ -591,9 +600,10 @@ public function toNumber()
  */
 class XCube_TextArrayProperty extends XCube_GenericArrayProperty
 {
-    public function XCube_TextArrayProperty($name)
+    public function __construct($name)
     {
-        parent::XCube_GenericArrayProperty("XCube_TextProperty", $name);
+//        parent::XCube_GenericArrayProperty("XCube_TextProperty", $name);
+        parent::__construct("XCube_TextProperty", $name);
     }
 }
 
@@ -612,9 +622,10 @@ class XCube_FileProperty extends XCube_AbstractProperty
      */
     public $mIndex = null;
     
-    public function XCube_FileProperty($name)
+    public function __construct($name)
     {
-        parent::XCube_AbstractProperty($name);
+//        parent::XCube_AbstractProperty($name);
+        parent::__construct($name);
         $this->mValue = new XCube_FormFile($name);
     }
     
@@ -667,9 +678,10 @@ public function toNumber()
  */
 class XCube_FileArrayProperty extends XCube_GenericArrayProperty
 {
-    public function XCube_FileArrayProperty($name)
+    public function __construct($name)
     {
-        parent::XCube_GenericArrayProperty("XCube_FileProperty", $name);
+//        parent::XCube_GenericArrayProperty("XCube_FileProperty", $name);
+        parent::__construct("XCube_FileProperty", $name);
     }
     
     public function hasFetchControl()
@@ -698,9 +710,11 @@ public function fetch(&$form)
  */
 class XCube_ImageFileProperty extends XCube_FileProperty
 {
-    public function XCube_ImageFileProperty($name)
+    public function __construct($name)
     {
-        parent::XCube_AbstractProperty($name);
+//        parent::XCube_AbstractProperty($name);
+        parent::__construct($name);
+
         $this->mValue = new XCube_FormImageFile($name);
     }
 }
@@ -712,8 +726,9 @@ public function XCube_ImageFileProperty($name)
  */
 class XCube_ImageFileArrayProperty extends XCube_FileArrayProperty
 {
-    public function XCube_ImageFileArrayProperty($name)
+    public function __construct($name)
     {
-        parent::XCube_GenericArrayProperty("XCube_ImageFileProperty", $name);
+//        parent::XCube_GenericArrayProperty("XCube_ImageFileProperty", $name);
+        parent::__construct("XCube_ImageFileProperty", $name);
     }
 }
diff --git a/html/core/XCube_RenderCache.class.php b/html/core/XCube_RenderCache.class.php
index 71e7fa5ad..bc14806e1 100644
--- a/html/core/XCube_RenderCache.class.php
+++ b/html/core/XCube_RenderCache.class.php
@@ -13,7 +13,7 @@ class XCube_RenderCache
     public $mCacheId = null;
     public $mResourceName = null;
     
-    public function XCube_RenderCache()
+    public function __construct()
     {
     }
 
diff --git a/html/core/XCube_RenderSystem.class.php b/html/core/XCube_RenderSystem.class.php
index a2e018f6f..557cb0789 100644
--- a/html/core/XCube_RenderSystem.class.php
+++ b/html/core/XCube_RenderSystem.class.php
@@ -49,7 +49,7 @@ class XCube_RenderTarget
     
     public $mCacheTime = null;
         
-    public function XCube_RenderTarget()
+    public function __construct()
     {
     }
 
@@ -152,7 +152,7 @@ class XCube_RenderSystem
 
     public $mRenderMode = XCUBE_RENDER_MODE_NORMAL;
     
-    public function XCube_RenderSystem()
+    public function __construct()
     {
     }
     
diff --git a/html/core/XCube_Root.class.php b/html/core/XCube_Root.class.php
index 3db2817f0..ecb5d528d 100644
--- a/html/core/XCube_Root.class.php
+++ b/html/core/XCube_Root.class.php
@@ -120,7 +120,7 @@ class XCube_Root
     /**
      * @internal
      */
-    public function XCube_Root()
+    public function __construct()
     {
     }
 
diff --git a/html/core/XCube_Service.class.php b/html/core/XCube_Service.class.php
index 3d843352b..678fce13c 100644
--- a/html/core/XCube_Service.class.php
+++ b/html/core/XCube_Service.class.php
@@ -67,7 +67,7 @@ class XCube_Service
     
     public $_mFunctions = array();
     
-    public function XCube_Service()
+    public function __construct()
     {
     }
     
@@ -125,7 +125,7 @@ class XCube_AbstractServiceClient
     
     public $mUser = null;
     
-    public function XCube_AbstractServiceClient(&$service)
+    public function __construct(&$service)
     {
         $this->mService =& $service;
     }
diff --git a/html/core/XCube_ServiceManager.class.php b/html/core/XCube_ServiceManager.class.php
index a29423423..e3adff9c5 100644
--- a/html/core/XCube_ServiceManager.class.php
+++ b/html/core/XCube_ServiceManager.class.php
@@ -60,7 +60,7 @@ class XCube_ServiceManager
      */
     public $mCreateServer = null;
     
-    public function XCube_ServiceManager()
+    public function __construct()
     {
         $this->mCreateClient = new XCube_Delegate();
         $this->mCreateClient->register("XCube_ServiceManager.CreateClient");
diff --git a/html/core/XCube_Session.class.php b/html/core/XCube_Session.class.php
index 88f50d17e..a3a09243a 100644
--- a/html/core/XCube_Session.class.php
+++ b/html/core/XCube_Session.class.php
@@ -34,7 +34,7 @@ class XCube_Session
      */
     public $mGetSessionCookiePath = null;
 
-    public function XCube_Session($sessionName='', $sessionExpire=0)
+    public function __construct($sessionName='', $sessionExpire=0)
     {
         $this->setParam($sessionName, $sessionExpire);
 
diff --git a/html/core/XCube_Utils.class.php b/html/core/XCube_Utils.class.php
index 2413deee5..e30c303a3 100644
--- a/html/core/XCube_Utils.class.php
+++ b/html/core/XCube_Utils.class.php
@@ -18,7 +18,7 @@ class XCube_Utils
      * @private
      * @brief Private Constructor. In other words, it's impossible to generate an instance of this class.
      */
-    public function XCube_Utils()
+    public function __construct()
     {
     }
     
diff --git a/html/kernel/avatar.php b/html/kernel/avatar.php
index ad94d656d..29a3f3e83 100644
--- a/html/kernel/avatar.php
+++ b/html/kernel/avatar.php
@@ -37,9 +37,10 @@ class XoopsAvatar extends XoopsObject
 {
     public $_userCount;
 
-    public function XoopsAvatar()
+    public function __construct()
     {
-        $this->XoopsObject();
+//        $this->XoopsObject();
+        parent::__construct();
         $this->initVar('avatar_id', XOBJ_DTYPE_INT, null, false);
         $this->initVar('avatar_file', XOBJ_DTYPE_OTHER, null, false, 30);
         $this->initVar('avatar_name', XOBJ_DTYPE_TXTBOX, null, true, 100);
diff --git a/html/kernel/comment.php b/html/kernel/comment.php
index 1875d4fc5..dfcdd4d48 100644
--- a/html/kernel/comment.php
+++ b/html/kernel/comment.php
@@ -62,7 +62,8 @@ public function XoopsComment()
     }
     public function __construct()
     {
-        $this->XoopsObject();
+//        $this->XoopsObject();
+        parent::__construct();
         $this->initVar('com_id', XOBJ_DTYPE_INT, 0, false);
         $this->initVar('com_pid', XOBJ_DTYPE_INT, 0, false);
         $this->initVar('com_modid', XOBJ_DTYPE_INT, null, false);
diff --git a/html/kernel/config.php b/html/kernel/config.php
index 45bdb75f2..9836f237d 100644
--- a/html/kernel/config.php
+++ b/html/kernel/config.php
@@ -89,7 +89,7 @@ class XoopsConfigHandler
      * 
      * @param	object  &$db    reference to database object
      */
-    public function XoopsConfigHandler(&$db)
+    public function __construct(&$db)
     {
         $this->_cHandler =new XoopsConfigItemHandler($db);
         $this->_oHandler =new XoopsConfigOptionHandler($db);
diff --git a/html/kernel/configcategory.php b/html/kernel/configcategory.php
index 4d6e606fe..74b11f5c9 100644
--- a/html/kernel/configcategory.php
+++ b/html/kernel/configcategory.php
@@ -63,7 +63,8 @@ public function XoopsConfigCategory()
     }
     public function __construct()
     {
-        $this->XoopsObject();
+//        $this->XoopsObject();
+        parent::__construct();
         $this->initVar('confcat_id', XOBJ_DTYPE_INT, null);
         $this->initVar('confcat_name', XOBJ_DTYPE_OTHER, null);
         $this->initVar('confcat_order', XOBJ_DTYPE_INT, 0);
diff --git a/html/kernel/configitem.php b/html/kernel/configitem.php
index fa053d898..3a2265d29 100644
--- a/html/kernel/configitem.php
+++ b/html/kernel/configitem.php
@@ -71,7 +71,7 @@ class XoopsConfigItem extends XoopsObject
     /**
      * Constructor
      */
-    public function XoopsConfigItem()
+    public function __construct()
     {
         static $initVars;
         if (isset($initVars)) {
diff --git a/html/kernel/configoption.php b/html/kernel/configoption.php
index bbec5050b..2c5cd4508 100644
--- a/html/kernel/configoption.php
+++ b/html/kernel/configoption.php
@@ -55,14 +55,15 @@ class XoopsConfigOption extends XoopsObject
     /**
      * Constructor
      */
-    public function XoopsConfigOption()
+    public function __construct()
     {
         static $initVars;
         if (isset($initVars)) {
             $this->vars = $initVars;
             return;
         }
-        $this->XoopsObject();
+//        $this->XoopsObject();
+        parent::__construct();
         $this->initVar('confop_id', XOBJ_DTYPE_INT, null);
         $this->initVar('confop_name', XOBJ_DTYPE_TXTBOX, null, true, 255);
         $this->initVar('confop_value', XOBJ_DTYPE_TXTBOX, null, true, 255);
diff --git a/html/kernel/group.php b/html/kernel/group.php
index 010e7ba04..42f97f351 100644
--- a/html/kernel/group.php
+++ b/html/kernel/group.php
@@ -56,7 +56,8 @@ public function __construct()
             $this->vars = $initVars;
             return;
         }
-        $this->XoopsObject();
+//        $this->XoopsObject();
+        parent::__construct();
         $this->initVar('groupid', XOBJ_DTYPE_INT, null, false);
         $this->initVar('name', XOBJ_DTYPE_TXTBOX, null, true, 100);
         $this->initVar('description', XOBJ_DTYPE_TXTAREA, null, false);
@@ -231,7 +232,8 @@ public function XoopsMembership()
     }
     public function __construct()
     {
-        $this->XoopsObject();
+//        $this->XoopsObject();
+        parent::__construct();
         $this->initVar('linkid', XOBJ_DTYPE_INT, null, false);
         $this->initVar('groupid', XOBJ_DTYPE_INT, null, false);
         $this->initVar('uid', XOBJ_DTYPE_INT, null, false);
diff --git a/html/kernel/groupperm.php b/html/kernel/groupperm.php
index 7b2f7f2ef..e64a07701 100644
--- a/html/kernel/groupperm.php
+++ b/html/kernel/groupperm.php
@@ -74,7 +74,8 @@ public function __construct()
             $this->vars = $initVars;
             return;
         }
-        $this->XoopsObject();
+        //        $this->XoopsObject();
+        parent::__construct();
         $this->initVar('gperm_id', XOBJ_DTYPE_INT, null, false);
         $this->initVar('gperm_groupid', XOBJ_DTYPE_INT, null, false);
         $this->initVar('gperm_itemid', XOBJ_DTYPE_INT, null, false);
diff --git a/html/kernel/image.php b/html/kernel/image.php
index 494c037e0..1e36825f1 100644
--- a/html/kernel/image.php
+++ b/html/kernel/image.php
@@ -45,9 +45,10 @@ class XoopsImage extends XoopsObject
     /**
      * Constructor
      **/
-    public function XoopsImage()
+    public function __construct()
     {
-        $this->XoopsObject();
+//        $this->XoopsObject();
+        parent::__construct();
         $this->initVar('image_id', XOBJ_DTYPE_INT, null, false);
         $this->initVar('image_name', XOBJ_DTYPE_OTHER, null, false, 30);
         $this->initVar('image_nicename', XOBJ_DTYPE_TXTBOX, null, true, 100);
diff --git a/html/kernel/imagecategory.php b/html/kernel/imagecategory.php
index 0172907b4..6617054ff 100644
--- a/html/kernel/imagecategory.php
+++ b/html/kernel/imagecategory.php
@@ -37,9 +37,10 @@ class XoopsImagecategory extends XoopsObject
 {
     public $_imageCount;
 
-    public function XoopsImagecategory()
+    public function __construct()
     {
-        $this->XoopsObject();
+//        $this->XoopsObject();
+        parent::__construct();
         $this->initVar('imgcat_id', XOBJ_DTYPE_INT, null, false);
         $this->initVar('imgcat_name', XOBJ_DTYPE_TXTBOX, null, true, 100);
         $this->initVar('imgcat_display', XOBJ_DTYPE_INT, 1, false);
diff --git a/html/kernel/imageset.php b/html/kernel/imageset.php
index be48d2aed..eeb9a58aa 100644
--- a/html/kernel/imageset.php
+++ b/html/kernel/imageset.php
@@ -36,9 +36,10 @@
 class XoopsImageset extends XoopsObject
 {
 
-    public function XoopsImageset()
+    public function __construct()
     {
-        $this->XoopsObject();
+//        $this->XoopsObject();
+        parent::__construct();
         $this->initVar('imgset_id', XOBJ_DTYPE_INT, null, false);
         $this->initVar('imgset_name', XOBJ_DTYPE_TXTBOX, null, true, 50);
         $this->initVar('imgset_refid', XOBJ_DTYPE_INT, 0, false);
diff --git a/html/kernel/imagesetimg.php b/html/kernel/imagesetimg.php
index 6d83c15bd..bc240cf7c 100644
--- a/html/kernel/imagesetimg.php
+++ b/html/kernel/imagesetimg.php
@@ -35,9 +35,10 @@
 
 class XoopsImagesetimg extends XoopsObject
 {
-    public function XoopsImagesetimg()
+    public function __construct()
     {
-        $this->XoopsObject();
+//        $this->XoopsObject();
+        parent::__construct();
         $this->initVar('imgsetimg_id', XOBJ_DTYPE_INT, null, false);
         $this->initVar('imgsetimg_file', XOBJ_DTYPE_OTHER, null, false);
         $this->initVar('imgsetimg_body', XOBJ_DTYPE_SOURCE, null, false);
diff --git a/html/kernel/module.php b/html/kernel/module.php
index 1d33e27ad..943fbcad9 100644
--- a/html/kernel/module.php
+++ b/html/kernel/module.php
@@ -55,9 +55,10 @@ class XoopsModule extends XoopsObject
     /**
      * Constructor
      */
-    public function XoopsModule()
+    public function __construct()
     {
-        $this->XoopsObject();
+//        $this->XoopsObject();
+        parent::__construct();
         static $initVars;
         if (isset($initVars)) {
             $this->vars = $initVars;
diff --git a/html/kernel/notification.php b/html/kernel/notification.php
index 7e51f4511..af9543773 100644
--- a/html/kernel/notification.php
+++ b/html/kernel/notification.php
@@ -67,7 +67,8 @@ public function XoopsNotification()
     }
     public function __construct()
     {
-        $this->XoopsObject();
+        //        $this->XoopsObject();
+        parent::__construct();
         $this->initVar('not_id', XOBJ_DTYPE_INT, null, false);
         $this->initVar('not_modid', XOBJ_DTYPE_INT, null, false);
         $this->initVar('not_category', XOBJ_DTYPE_TXTBOX, null, false, 30);
diff --git a/html/kernel/object.php b/html/kernel/object.php
index 7fd127ad8..0660d482f 100644
--- a/html/kernel/object.php
+++ b/html/kernel/object.php
@@ -173,7 +173,7 @@ class XoopsObject extends AbstractXoopsObject
     * normally, this is called from child classes only
     * @access public
     */
-    public function XoopsObject()
+    public function __construct()
     {
     }
 
@@ -705,7 +705,7 @@ class XoopsObjectHandler
      * @param object $db reference to the {@link XoopsDatabase} object
      * @access protected
      */
-    public function XoopsObjectHandler(&$db)
+    public function __construct(&$db)
     {
         $this->db =& $db;
     }
diff --git a/html/kernel/privmessage.php b/html/kernel/privmessage.php
index 87e8dbb5a..cd9e87cf2 100644
--- a/html/kernel/privmessage.php
+++ b/html/kernel/privmessage.php
@@ -53,7 +53,8 @@ public function XoopsPrivmessage()
     }
     public function __construct()
     {
-        $this->XoopsObject();
+        //        $this->XoopsObject();
+        parent::__construct();
         $this->initVar('msg_id', XOBJ_DTYPE_INT, null, false);
         $this->initVar('msg_image', XOBJ_DTYPE_OTHER, 'icon1.gif', false, 100);
         $this->initVar('subject', XOBJ_DTYPE_TXTBOX, null, true, 255);
diff --git a/html/kernel/subjecticon.php b/html/kernel/subjecticon.php
index 26c963620..2046bf878 100644
--- a/html/kernel/subjecticon.php
+++ b/html/kernel/subjecticon.php
@@ -6,7 +6,7 @@
 
 class XoopsSubjecticon extends XoopsObject
 {
-    public function XoopsSubjecticon()
+    public function __construct()
     {
         $this->initVar('filename', XOBJ_DTYPE_TXTBOX, null, true, 255);
     }
@@ -16,7 +16,7 @@ class XoopsSubjecticonHandler extends XoopsObjectHandler
 {
     public $_mResult;
     
-    public function XoopsSubjecticonHandler(&$db)
+    public function __construct(&$db)
     {
         require_once XOOPS_ROOT_PATH . "/class/xoopslists.php";
         $this->_mResult =& XoopsLists::getSubjectsList();
diff --git a/html/kernel/tplfile.php b/html/kernel/tplfile.php
index 3dbdadd75..671bc0bf9 100644
--- a/html/kernel/tplfile.php
+++ b/html/kernel/tplfile.php
@@ -45,7 +45,8 @@ public function __construct()
             $this->vars = $initVars;
             return;
         }
-        $this->XoopsObject();
+//        $this->XoopsObject();
+        parent::__construct();
         $this->initVar('tpl_id', XOBJ_DTYPE_INT, null, false);
         $this->initVar('tpl_refid', XOBJ_DTYPE_INT, 0, false);
         $this->initVar('tpl_tplset', XOBJ_DTYPE_OTHER, null, false);
diff --git a/html/kernel/tplset.php b/html/kernel/tplset.php
index b792673dd..7e824ef26 100644
--- a/html/kernel/tplset.php
+++ b/html/kernel/tplset.php
@@ -45,7 +45,8 @@ public function __construct()
             $this->vars = $initVars;
             return;
         }
-        $this->XoopsObject();
+        //        $this->XoopsObject();
+        parent::__construct();
         $this->initVar('tplset_id', XOBJ_DTYPE_INT, null, false);
         $this->initVar('tplset_name', XOBJ_DTYPE_OTHER, null, false);
         $this->initVar('tplset_desc', XOBJ_DTYPE_TXTBOX, null, false, 255);
diff --git a/html/language/ja_utf8/xoopsmailerlocal.php b/html/language/ja_utf8/xoopsmailerlocal.php
index 194f6c400..6badf6e52 100644
--- a/html/language/ja_utf8/xoopsmailerlocal.php
+++ b/html/language/ja_utf8/xoopsmailerlocal.php
@@ -36,7 +36,7 @@
 class XoopsMailerLocal extends XoopsMailer
 {
 
-    public function XoopsMailerLocal()
+    public function __construct()
     {
         $this->multimailer = new XoopsMultiMailerLocal();
         $this->reset();
@@ -121,9 +121,10 @@ class XoopsMultiMailerLocal extends XoopsMultiMailer
 
     public $needs_encode;
 
-    public function XoopsMultiMailerLocal()
+    public function __construct()
     {
-        $this->XoopsMultiMailer();
+//        $this->XoopsMultiMailer();
+        parent::__construct();
 
         $this->needs_encode = true;
         if (function_exists('mb_convert_encoding')) {
diff --git a/html/language/japanese/xoopsmailerlocal.php b/html/language/japanese/xoopsmailerlocal.php
index 194f6c400..6badf6e52 100644
--- a/html/language/japanese/xoopsmailerlocal.php
+++ b/html/language/japanese/xoopsmailerlocal.php
@@ -36,7 +36,7 @@
 class XoopsMailerLocal extends XoopsMailer
 {
 
-    public function XoopsMailerLocal()
+    public function __construct()
     {
         $this->multimailer = new XoopsMultiMailerLocal();
         $this->reset();
@@ -121,9 +121,10 @@ class XoopsMultiMailerLocal extends XoopsMultiMailer
 
     public $needs_encode;
 
-    public function XoopsMultiMailerLocal()
+    public function __construct()
     {
-        $this->XoopsMultiMailer();
+//        $this->XoopsMultiMailer();
+        parent::__construct();
 
         $this->needs_encode = true;
         if (function_exists('mb_convert_encoding')) {
diff --git a/html/modules/legacy/actions/BackendAction.class.php b/html/modules/legacy/actions/BackendAction.class.php
index 6917ec503..f2cd93d21 100644
--- a/html/modules/legacy/actions/BackendAction.class.php
+++ b/html/modules/legacy/actions/BackendAction.class.php
@@ -35,9 +35,11 @@ class Legacy_BackendAction extends Legacy_Action
      */
     public $mGetRSSItems = null;
     
-    public function Legacy_BackendAction($flag)
+    public function __construct($flag)
     {
-        parent::Legacy_Action($flag);
+//        parent::Legacy_Action($flag);
+        parent::__construct($flag);
+
         
         $this->mGetRSSItems =new XCube_Delegate();
         $this->mGetRSSItems->register('Legacy_BackendAction.GetRSSItems');
diff --git a/html/modules/legacy/admin/actions/ModuleUninstallAction.class.php b/html/modules/legacy/admin/actions/ModuleUninstallAction.class.php
index a80552168..82b55be2a 100644
--- a/html/modules/legacy/admin/actions/ModuleUninstallAction.class.php
+++ b/html/modules/legacy/admin/actions/ModuleUninstallAction.class.php
@@ -90,7 +90,7 @@ class Legacy_ModuleUninstallAction extends Legacy_Action
      */
     public $mInstaller = null;
     
-    public function Legacy_ModuleUninstallAction($flag)
+    public function __construct($flag)
     {
         parent::__construct($flag);
         
diff --git a/html/modules/legacy/admin/forms/PreferenceEditForm.class.php b/html/modules/legacy/admin/forms/PreferenceEditForm.class.php
index 3b628611e..d3cebb29d 100644
--- a/html/modules/legacy/admin/forms/PreferenceEditForm.class.php
+++ b/html/modules/legacy/admin/forms/PreferenceEditForm.class.php
@@ -21,7 +21,8 @@ class Legacy_PreferenceEditForm extends XCube_ActionForm
     
     public function __construct(&$category)
     {
-        parent::XCube_ActionForm();
+//        parent::XCube_ActionForm();
+        parent::__construct();
         $this->mKeyValue = $category->get('confcat_id');
     }
     
@@ -142,7 +143,8 @@ class Legacy_ModulePreferenceEditForm extends Legacy_PreferenceEditForm
 
     public function __construct(&$module)
     {
-        parent::XCube_ActionForm();
+//        parent::XCube_ActionForm();
+        parent::__construct($module);
         $this->mKeyValue = $module->get('mid');
     }
     
diff --git a/html/modules/legacy/class/Legacy_Debugger.class.php b/html/modules/legacy/class/Legacy_Debugger.class.php
index 48e30f8da..e5723646a 100644
--- a/html/modules/legacy/class/Legacy_Debugger.class.php
+++ b/html/modules/legacy/class/Legacy_Debugger.class.php
@@ -54,7 +54,7 @@ public function createInstance(&$instance, $debug_mode)
 
 class Legacy_AbstractDebugger
 {
-    public function Legacy_AbstractDebugger()
+    public function __construct()
     {
     }
 
diff --git a/html/modules/legacy/class/block_module_link.php b/html/modules/legacy/class/block_module_link.php
index 4923ec5ff..19a941b99 100644
--- a/html/modules/legacy/class/block_module_link.php
+++ b/html/modules/legacy/class/block_module_link.php
@@ -14,7 +14,7 @@
 
 class LegacyBlock_module_linkObject extends XoopsSimpleObject
 {
-    public function LegacyBlock_module_linkObject()
+    public function __construct()
     {
         static $initVars;
         if (isset($initVars)) {
diff --git a/html/modules/legacy/class/blockctype.php b/html/modules/legacy/class/blockctype.php
index a5ed576f2..2665c4cc8 100644
--- a/html/modules/legacy/class/blockctype.php
+++ b/html/modules/legacy/class/blockctype.php
@@ -14,7 +14,7 @@
 
 class LegacyBlockctypeObject extends XoopsSimpleObject
 {
-    public function LegacyBlockctypeObject()
+    public function __construct()
     {
         $this->initVar('type', XOBJ_DTYPE_STRING, '', true);
         $this->initVar('label', XOBJ_DTYPE_STRING, '', true, 255);
@@ -25,7 +25,7 @@ class LegacyBlockctypeHandler extends XoopsObjectHandler
 {
     public $_mResults = array();
     
-    public function LegacyBlockctypeHandler(&$db)
+    public function __construct(&$db)
     {
         $t_arr = array(
                 'H' => _AD_LEGACY_LANG_CTYPE_HTML,
diff --git a/html/modules/legacy/class/comment.php b/html/modules/legacy/class/comment.php
index dfe16b1b1..64c42dfd9 100644
--- a/html/modules/legacy/class/comment.php
+++ b/html/modules/legacy/class/comment.php
@@ -18,7 +18,7 @@ class LegacyCommentObject extends XoopsSimpleObject
     public $mModule = null;
     public $mStatus = null;
     
-    public function LegacyCommentObject()
+    public function __construct()
     {
         static $initVars;
         if (isset($initVars)) {
@@ -99,10 +99,11 @@ class LegacyCommentHandler extends XoopsObjectGenericHandler
      */
     public $mDeleteSuccess;
     
-    public function LegacyCommentHandler(&$db)
+    public function __construct(&$db)
     {
-        parent::XoopsObjectGenericHandler($db);
-        
+//        parent::XoopsObjectGenericHandler($db);
+        parent::__construct($db);
+
         $this->mUpdateSuccess =new XCube_Delegate();
         $this->mDeleteSuccess =new XCube_Delegate();
     }
diff --git a/html/modules/legacy/class/commentstatus.php b/html/modules/legacy/class/commentstatus.php
index 1beff20a6..ac2bdb71d 100644
--- a/html/modules/legacy/class/commentstatus.php
+++ b/html/modules/legacy/class/commentstatus.php
@@ -16,7 +16,7 @@
 
 class LegacyCommentstatusObject extends XoopsSimpleObject
 {
-    public function LegacyCommentstatusObject()
+    public function __construct()
     {
         static $initVars;
         if (isset($initVars)) {
@@ -33,7 +33,7 @@ class LegacyCommentstatusHandler extends XoopsObjectHandler
 {
     public $_mResults = array();
     
-    public function LegacyCommentstatusHandler(&$db)
+    public function __construct(&$db)
     {
         $root =& XCube_Root::getSingleton();
         $language = $root->mContext->getXoopsConfig('language');
diff --git a/html/modules/legacy/class/image.php b/html/modules/legacy/class/image.php
index 3994d19ef..714e2ae4a 100644
--- a/html/modules/legacy/class/image.php
+++ b/html/modules/legacy/class/image.php
@@ -19,7 +19,7 @@ class LegacyImageObject extends XoopsSimpleObject
     public $mImageBody = null;
     public $_mImageBodyLoadedFlag = false;
 
-    public function LegacyImageObject()
+    public function __construct()
     {
         static $initVars;
         if (isset($initVars)) {
diff --git a/html/modules/legacy/class/imagebody.php b/html/modules/legacy/class/imagebody.php
index 3140fff94..cb5442b01 100644
--- a/html/modules/legacy/class/imagebody.php
+++ b/html/modules/legacy/class/imagebody.php
@@ -14,7 +14,7 @@
 
 class LegacyImagebodyObject extends XoopsSimpleObject
 {
-    public function LegacyImagebodyObject()
+    public function __construct()
     {
         static $initVars;
         if (isset($initVars)) {
diff --git a/html/modules/legacy/class/imagecategory.php b/html/modules/legacy/class/imagecategory.php
index e520dc854..d01ceba2d 100644
--- a/html/modules/legacy/class/imagecategory.php
+++ b/html/modules/legacy/class/imagecategory.php
@@ -30,7 +30,7 @@ class LegacyImagecategoryObject extends XoopsSimpleObject
     public $_mUploadGroupsLoadedFlag = false;
     
 
-    public function LegacyImagecategoryObject()
+    public function __construct()
     {
         static $initVars;
         if (isset($initVars)) {
diff --git a/html/modules/legacy/class/non_installation_module.php b/html/modules/legacy/class/non_installation_module.php
index 9681d6339..12c8e5240 100644
--- a/html/modules/legacy/class/non_installation_module.php
+++ b/html/modules/legacy/class/non_installation_module.php
@@ -30,9 +30,11 @@ class LegacyNon_installation_moduleHandler extends XoopsObjectHandler
      */
     public $_mExclusions = array(".", "..", "CVS");
     
-    public function LegacyNon_installation_moduleHandler(&$db)
+    public function __construct(&$db)
     {
-        parent::XoopsObjectHandler($db);
+//        parent::XoopsObjectHandler($db);
+        parent::__construct($db);
+
         $this->_setupObjects();
     }
 
diff --git a/html/modules/legacy/forms/SearchResultsForm.class.php b/html/modules/legacy/forms/SearchResultsForm.class.php
index fb4cb7ee9..641d0b7b2 100644
--- a/html/modules/legacy/forms/SearchResultsForm.class.php
+++ b/html/modules/legacy/forms/SearchResultsForm.class.php
@@ -20,9 +20,10 @@ class Legacy_SearchResultsForm extends XCube_ActionForm
     public $mQueries = array();
     public $_mKeywordMin = 0;
     
-    public function Legacy_SearchResultsForm($keywordMin)
+    public function __construct($keywordMin)
     {
-        parent::XCube_ActionForm();
+//        parent::XCube_ActionForm();
+        parent::__construct();
         $this->_mKeywordMin = intval($keywordMin);
     }
         
diff --git a/html/modules/legacy/kernel/Legacy_ActionForm.class.php b/html/modules/legacy/kernel/Legacy_ActionForm.class.php
index 03739dad5..ec969cd46 100644
--- a/html/modules/legacy/kernel/Legacy_ActionForm.class.php
+++ b/html/modules/legacy/kernel/Legacy_ActionForm.class.php
@@ -30,8 +30,9 @@ class Legacy_ActionForm extends XCube_ActionForm
      * @public
      * @brief Constructor.
      */
-    public function Legacy_ActionForm()
+    public function __construct()
     {
-        parent::XCube_ActionForm();
+//        parent::XCube_ActionForm();
+        parent::__construct();
     }
 }
diff --git a/html/modules/legacy/kernel/Legacy_AdminControllerStrategy.class.php b/html/modules/legacy/kernel/Legacy_AdminControllerStrategy.class.php
index 5c3b427d1..2186e3dfc 100644
--- a/html/modules/legacy/kernel/Legacy_AdminControllerStrategy.class.php
+++ b/html/modules/legacy/kernel/Legacy_AdminControllerStrategy.class.php
@@ -33,12 +33,13 @@ class Legacy_AdminControllerStrategy extends Legacy_AbstractControllerStrategy
      */
     public $_mSpecialActions = array("Help", "CommentList");
 
-    public function Legacy_AdminControllerStrategy(&$controller)
+    public function __construct($controller)
     {
         global $xoopsOption;
         
-        parent::Legacy_AbstractControllerStrategy($controller);
-        
+//        parent::Legacy_AbstractControllerStrategy($controller);
+        parent::__construct($controller);
+
         //
         // TODO We have to develop complated-switching-controller-mechanizm.
         //
diff --git a/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php b/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php
index 900884f1b..ea9a4df62 100644
--- a/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php
+++ b/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php
@@ -24,7 +24,7 @@ class Legacy_AbstractBlockProcedure
      */
     public $mRender = null;
     
-    public function Legacy_AbstractBlockProcedure()
+    public function __construct()
     {
     }
     
@@ -167,7 +167,7 @@ class Legacy_BlockProcedure extends Legacy_AbstractBlockProcedure
      */
     public $mRender = null;
     
-    public function Legacy_BlockProcedure(&$block)
+    public function __construct(&$block)
     {
         $this->_mBlock =& $block;
     }
diff --git a/html/modules/legacy/kernel/Legacy_CacheInformation.class.php b/html/modules/legacy/kernel/Legacy_CacheInformation.class.php
index 6c8104ffd..29bf079e7 100644
--- a/html/modules/legacy/kernel/Legacy_CacheInformation.class.php
+++ b/html/modules/legacy/kernel/Legacy_CacheInformation.class.php
@@ -56,7 +56,7 @@ class Legacy_AbstractCacheInformation
      */
     public $mAttributes = array();
     
-    public function Legacy_AbstractCacheInformation()
+    public function __construct()
     {
     }
     
@@ -127,9 +127,10 @@ class Legacy_ModuleCacheInformation extends Legacy_AbstractCacheInformation
       */
      public $mGetCacheFilePath = null;
      
-    public function Legacy_ModuleCacheInformation()
+    public function __construct()
     {
-        parent::Legacy_AbstractCacheInformation();
+//        parent::Legacy_AbstractCacheInformation();
+        parent::__construct();
         $this->mGetCacheFilePath = new XCube_Delegate();
         $this->mGetCacheFilePath->register('Legacy_ModuleCacheInformation.GetCacheFilePath');
     }
@@ -184,9 +185,10 @@ class Legacy_BlockCacheInformation extends Legacy_AbstractCacheInformation
       */
      public $mGetCacheFilePath = null;
      
-    public function Legacy_BlockCacheInformation()
+    public function __construct()
     {
-        parent::Legacy_AbstractCacheInformation();
+//        parent::Legacy_AbstractCacheInformation();
+        parent::__construct();
         $this->mGetCacheFilePath = new XCube_Delegate();
         $this->mGetCacheFilePath->register('Legacy_BlockCachInformation.getCacheFilePath');
     }
diff --git a/html/modules/legacy/kernel/Legacy_Controller.class.php b/html/modules/legacy/kernel/Legacy_Controller.class.php
index 57e4f3b7e..d8be6f932 100644
--- a/html/modules/legacy/kernel/Legacy_Controller.class.php
+++ b/html/modules/legacy/kernel/Legacy_Controller.class.php
@@ -106,9 +106,10 @@ class Legacy_Controller extends XCube_Controller
      */
     public $mLogger = null;
     
-    public function Legacy_Controller()
+    public function __construct()
     {
-        parent::XCube_Controller();
+//        parent::XCube_Controller();
+        parent::__construct();
         
         //
         // Setup member properties as member delegates.
@@ -1371,7 +1372,7 @@ class Legacy_AbstractControllerStrategy
     
     public $mStatusFlag;
     
-    public function Legacy_AbstractControllerStrategy(&$controller)
+    public function __construct(&$controller)
     {
         $this->mController =& $controller;
     }
diff --git a/html/modules/legacy/kernel/Legacy_Identity.class.php b/html/modules/legacy/kernel/Legacy_Identity.class.php
index ac7d48a44..c8f514afe 100644
--- a/html/modules/legacy/kernel/Legacy_Identity.class.php
+++ b/html/modules/legacy/kernel/Legacy_Identity.class.php
@@ -14,9 +14,10 @@
 
 class Legacy_Identity extends XCube_Identity
 {
-    public function Legacy_Identity(&$xoopsUser)
+    public function __construct(&$xoopsUser)
     {
-        parent::XCube_Identity();
+//        parent::XCube_Identity();
+        parent::__construct();
         
         if (!is_object($xoopsUser)) {
             die('Exception');
diff --git a/html/modules/legacy/kernel/Legacy_Module.class.php b/html/modules/legacy/kernel/Legacy_Module.class.php
index a00796d4c..281d72676 100644
--- a/html/modules/legacy/kernel/Legacy_Module.class.php
+++ b/html/modules/legacy/kernel/Legacy_Module.class.php
@@ -71,7 +71,7 @@ class Legacy_AbstractModule
      *     Basically, only Legacy_Controller and its utility functions should call the
      *     constructor.
      */
-    public function Legacy_AbstractModule(&$module, $loadConfig=true)
+    public function __construct(&$module, $loadConfig=true)
     {
         $this->setXoopsModule($module);
         
@@ -399,9 +399,11 @@ class Legacy_ModuleAdapter extends Legacy_AbstractModule
      */
     public $mAdminMenu = null;
     
-    public function Legacy_ModuleAdapter($module, $loadConfig=true)
+    public function __construct($module, $loadConfig=true)
     {
-        parent::Legacy_AbstractModule($module, $loadConfig);
+//        parent::Legacy_AbstractModule($module, $loadConfig);
+        parent::__construct($module, $loadConfig);
+
     }
 
     /**
diff --git a/html/modules/legacy/kernel/Legacy_PublicControllerStrategy.class.php b/html/modules/legacy/kernel/Legacy_PublicControllerStrategy.class.php
index 052f7252c..1bfb89a16 100644
--- a/html/modules/legacy/kernel/Legacy_PublicControllerStrategy.class.php
+++ b/html/modules/legacy/kernel/Legacy_PublicControllerStrategy.class.php
@@ -16,9 +16,11 @@ class Legacy_PublicControllerStrategy extends Legacy_AbstractControllerStrategy
 {
     public $mStatusFlag = LEGACY_CONTROLLER_STATE_PUBLIC;
     
-    public function Legacy_PublicControllerStrategy(&$controller)
+    public function __construct(&$controller)
     {
-        parent::Legacy_AbstractControllerStrategy($controller);
+//        parent::Legacy_AbstractControllerStrategy($controller);
+        parent::__construct($controller);
+
         
         $controller->mRoot->mContext->mBaseRenderSystemName = "Legacy_RenderSystem";
         
diff --git a/html/modules/legacy/kernel/Legacy_TextFilter.class.php b/html/modules/legacy/kernel/Legacy_TextFilter.class.php
index 87db07b58..ee436c2bf 100644
--- a/html/modules/legacy/kernel/Legacy_TextFilter.class.php
+++ b/html/modules/legacy/kernel/Legacy_TextFilter.class.php
@@ -80,7 +80,7 @@ class Legacy_TextFilter extends XCube_TextFilter
      * @todo
      *	  This method keeps a deprecated delegate.
      */
-    public function Legacy_TextFilter()
+    public function __construct()
     {
         $obj = $this->mMakeClickableConvertTable = new XCube_Delegate;
         $obj->register('Legacy_TextFilter.MakeClickableConvertTable');
diff --git a/html/modules/legacy/kernel/criteria.class.php b/html/modules/legacy/kernel/criteria.class.php
index d82abaa2b..f08bcfb61 100644
--- a/html/modules/legacy/kernel/criteria.class.php
+++ b/html/modules/legacy/kernel/criteria.class.php
@@ -68,7 +68,7 @@ class Legacy_Criteria
      */
     public $mChildlen = array();
     
-    public function Legacy_Criteria($typeInfoArr)
+    public function __construct($typeInfoArr)
     {
         $this->mTypeInfoArr = $typeInfoArr;
     }
diff --git a/html/modules/legacy/kernel/handler.php b/html/modules/legacy/kernel/handler.php
index 0c22c1416..2a4e4c5ed 100644
--- a/html/modules/legacy/kernel/handler.php
+++ b/html/modules/legacy/kernel/handler.php
@@ -28,9 +28,11 @@ class XoopsObjectGenericHandler extends XoopsObjectHandler
      */
     public $_mDummyObj = null;
 
-    public function XoopsObjectGenericHandler(&$db)
+    public function __construct(&$db)
     {
-        parent::XoopsObjectHandler($db);
+//        parent::XoopsObjectHandler($db);
+        parent::__construct($db);
+
         $tableArr = explode('_', $this->mTable);
         $this->mDirname = array_shift($tableArr);
         $this->mDataname = implode('_', $tableArr);
diff --git a/html/modules/legacy/kernel/object.php b/html/modules/legacy/kernel/object.php
index 9c6c9e925..6ed4fcabb 100644
--- a/html/modules/legacy/kernel/object.php
+++ b/html/modules/legacy/kernel/object.php
@@ -32,7 +32,7 @@ class XoopsSimpleObject extends AbstractXoopsObject
     public $mIsNew = true;
     public $mDirname = null;
     
-    public function XoopsSimpleObject()
+    public function __construct()
     {
     }
     
diff --git a/html/modules/legacy/lib/EasyLex/EasyLex_SQLScanner.class.php b/html/modules/legacy/lib/EasyLex/EasyLex_SQLScanner.class.php
index b6b7b45e2..4f31f9f03 100644
--- a/html/modules/legacy/lib/EasyLex/EasyLex_SQLScanner.class.php
+++ b/html/modules/legacy/lib/EasyLex/EasyLex_SQLScanner.class.php
@@ -24,7 +24,7 @@ class EasyLex_SQLToken
     public $mType = EASYLEX_SQL_UNKNOWN;
     public $mValue = "";
     
-    public function EasyLex_SQLToken($type, $value)
+    public function __construct($type, $value)
     {
         $this->mType = $type;
         $this->mValue = $value;
diff --git a/html/modules/legacy/lib/Mailer/Mailer.php b/html/modules/legacy/lib/Mailer/Mailer.php
index 3d8d458ac..8142ac53d 100644
--- a/html/modules/legacy/lib/Mailer/Mailer.php
+++ b/html/modules/legacy/lib/Mailer/Mailer.php
@@ -22,7 +22,7 @@ class Legacy_Mailer extends PHPMailer
      */
     public $mConvertLocal = null;
     
-    public function Legacy_Mailer()
+    public function __construct()
     {
         $this->mConvertLocal =new XCube_Delegate();
         $this->mConvertLocal->register('Legacy_Mailer.ConvertLocal');
diff --git a/html/modules/legacy/lib/ShadePlus/ServiceServer.class.php b/html/modules/legacy/lib/ShadePlus/ServiceServer.class.php
index fdb3d4e3e..78b9a0004 100644
--- a/html/modules/legacy/lib/ShadePlus/ServiceServer.class.php
+++ b/html/modules/legacy/lib/ShadePlus/ServiceServer.class.php
@@ -13,7 +13,7 @@ class ShadePlus_ServiceServer
     
     public $_mServer;
     
-    public function ShadePlus_ServiceServer(&$service)
+    public function __construct(&$service)
     {
         $this->_mService =& $service;
         $this->_mServer =new ShadeSoap_NusoapServer();
diff --git a/html/modules/legacy/lib/ShadePlus/SoapClient.class.php b/html/modules/legacy/lib/ShadePlus/SoapClient.class.php
index 1ebdcc5ab..b288d87e0 100644
--- a/html/modules/legacy/lib/ShadePlus/SoapClient.class.php
+++ b/html/modules/legacy/lib/ShadePlus/SoapClient.class.php
@@ -17,9 +17,11 @@ class ShadePlus_SoapClient extends XCube_AbstractServiceClient
 {
     public $mClient = null;
     
-    public function ShadePlus_SoapClient(&$service)
+    public function __construct(&$service)
     {
-        parent::XCube_AbstractServiceClient($service);
+//        parent::XCube_AbstractServiceClient($service);
+        parent::__construct($service);
+
         $this->mClient =new soap_client($service, true);
         $this->mClient->decodeUTF8(false);
     }
diff --git a/html/modules/legacy/lib/nusoap/nusoap.php b/html/modules/legacy/lib/nusoap/nusoap.php
index fcb6caefc..62257a970 100644
--- a/html/modules/legacy/lib/nusoap/nusoap.php
+++ b/html/modules/legacy/lib/nusoap/nusoap.php
@@ -223,7 +223,7 @@ class nusoap_base
     *
     * @access	public
     */
-    public function nusoap_base()
+    public function __construct()
     {
         $this->debugLevel = $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];
     }
@@ -1066,9 +1066,10 @@ class nusoap_fault extends nusoap_base
     * @param string $faultstring human readable error message
     * @param mixed $faultdetail detail, typically a string or array of string
     */
-    public function nusoap_fault($faultcode, $faultactor='', $faultstring='', $faultdetail='')
+    public function __construct($faultcode, $faultactor='', $faultstring='', $faultdetail='')
     {
-        parent::nusoap_base();
+//        parent::nusoap_base();
+        parent::__construct();
         $this->faultcode = $faultcode;
         $this->faultactor = $faultactor;
         $this->faultstring = $faultstring;
@@ -1163,9 +1164,10 @@ class nusoap_xmlschema extends nusoap_base
     * @param	string $namespaces namespaces defined in enclosing XML
     * @access   public
     */
-    public function nusoap_xmlschema($schema='', $xml='', $namespaces=array())
+    public function __construct($schema='', $xml='', $namespaces=array())
     {
-        parent::nusoap_base();
+//        parent::nusoap_base();
+        parent::__construct();
         $this->debug('nusoap_xmlschema class instantiated, inside constructor');
         // files
         $this->schema = $schema;
@@ -2167,9 +2169,10 @@ class soapval extends nusoap_base
     * @param	mixed $attributes associative array of attributes to add to element serialization
     * @access   public
     */
-    public function soapval($name='soapval', $type=false, $value=-1, $element_ns=false, $type_ns=false, $attributes=false)
+    public function __construct($name='soapval', $type=false, $value=-1, $element_ns=false, $type_ns=false, $attributes=false)
     {
-        parent::nusoap_base();
+//        parent::nusoap_base();
+        parent::__construct();
         $this->name = $name;
         $this->type = $type;
         $this->value = $value;
@@ -2263,9 +2266,10 @@ class soap_transport_http extends nusoap_base
     * @param boolean $use_curl Whether to try to force cURL use
     * @access public
     */
-    public function soap_transport_http($url, $curl_options = null, $use_curl = false)
+    public function __construct($url, $curl_options = null, $use_curl = false)
     {
-        parent::nusoap_base();
+//        parent::nusoap_base();
+        parent::__construct();
         $this->debug("ctor url=$url use_curl=$use_curl curl_options:");
         $this->appendDebug($this->varDump($curl_options));
         $this->setURL($url);
@@ -3711,9 +3715,10 @@ class nusoap_server extends nusoap_base
     * @param mixed $wsdl file path or URL (string), or wsdl instance (object)
     * @access   public
     */
-    public function nusoap_server($wsdl=false)
+    public function __construct($wsdl=false)
     {
-        parent::nusoap_base();
+//        parent::nusoap_base();
+        parent::__construct();
         // turn on debugging?
         global $debug;
         global $HTTP_SERVER_VARS;
@@ -4753,9 +4758,10 @@ class wsdl extends nusoap_base
      * @param boolean $use_curl try to use cURL
      * @access public 
      */
-    public function wsdl($wsdl = '', $proxyhost=false, $proxyport=false, $proxyusername=false, $proxypassword=false, $timeout=0, $response_timeout=30, $curl_options=null, $use_curl=false)
+    public function __construct($wsdl = '', $proxyhost=false, $proxyport=false, $proxyusername=false, $proxypassword=false, $timeout=0, $response_timeout=30, $curl_options=null, $use_curl=false)
     {
-        parent::nusoap_base();
+//        parent::nusoap_base();
+        parent::__construct();
         $this->debug("ctor wsdl=$wsdl timeout=$timeout response_timeout=$response_timeout");
         $this->proxyhost = $proxyhost;
         $this->proxyport = $proxyport;
@@ -6690,9 +6696,10 @@ class nusoap_parser extends nusoap_base
     * @param    string $decode_utf8 whether to decode UTF-8 to ISO-8859-1
     * @access   public
     */
-    public function nusoap_parser($xml, $encoding='UTF-8', $method='', $decode_utf8=true)
+    public function __construct($xml, $encoding='UTF-8', $method='', $decode_utf8=true)
     {
-        parent::nusoap_base();
+//        parent::nusoap_base();
+        parent::__construct();
         $this->xml = $xml;
         $this->xml_encoding = $encoding;
         $this->method = $method;
@@ -7380,9 +7387,10 @@ class nusoap_client extends nusoap_base
     * @param	string $portName optional portName in WSDL document
     * @access   public
     */
-    public function nusoap_client($endpoint, $wsdl = false, $proxyhost = false, $proxyport = false, $proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30, $portName = '')
+    public function __construct($endpoint, $wsdl = false, $proxyhost = false, $proxyport = false, $proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30, $portName = '')
     {
-        parent::nusoap_base();
+//        parent::nusoap_base();
+        parent::__construct();
         $this->endpoint = $endpoint;
         $this->proxyhost = $proxyhost;
         $this->proxyport = $proxyport;
diff --git a/html/modules/legacy/preload/Primary/SessionCallback.class.php b/html/modules/legacy/preload/Primary/SessionCallback.class.php
index cc2979c1f..d9507ea68 100644
--- a/html/modules/legacy/preload/Primary/SessionCallback.class.php
+++ b/html/modules/legacy/preload/Primary/SessionCallback.class.php
@@ -15,7 +15,10 @@
 // registration `session_write_close()` on shutdown procedure final.
 // For the environment in which the object before writing session is destroyed when PHP execution end.
 // ex. APC, memcached etc...
-ob_start(create_function('', '(session_id() && session_write_close());return false;'));
+
+//ob_start(create_function('', '(session_id() && session_write_close());return false;'));
+ob_start(       function()            {(session_id() && session_write_close());return false;});
+
 
 class Legacy_SessionCallback extends XCube_ActionFilter
 {
diff --git a/html/modules/legacyRender/admin/class/LegacyTheme.class.php b/html/modules/legacyRender/admin/class/LegacyTheme.class.php
index bb8e5b845..546314b6d 100644
--- a/html/modules/legacyRender/admin/class/LegacyTheme.class.php
+++ b/html/modules/legacyRender/admin/class/LegacyTheme.class.php
@@ -11,7 +11,7 @@ class LegacyTheme
     public $ScreenShot=null;
     public $mManifesto=null;
     
-    public function LegacyTheme($dirName, $manifesto=null)
+    public function __construct($dirName, $manifesto=null)
     {
         $this->mDirName=$dirName;
         if ($manifesto!=null) {
@@ -33,7 +33,7 @@ class LegacyThemeHandler
 {
     public $_mThemeList;
 
-    public function LegacyThemeHandler()
+    public function __construct()
     {
         $this->_mThemeList=array();
 
diff --git a/html/modules/legacyRender/class/AbstractFilterForm.class.php b/html/modules/legacyRender/class/AbstractFilterForm.class.php
index 00c4537c7..255c5d09b 100644
--- a/html/modules/legacyRender/class/AbstractFilterForm.class.php
+++ b/html/modules/legacyRender/class/AbstractFilterForm.class.php
@@ -13,7 +13,7 @@ class LegacyRender_AbstractFilterForm
     
     public $_mHandler = null;
     
-    public function LegacyRender_AbstractFilterForm(&$navi, &$handler)
+    public function __construct(&$navi, &$handler)
     {
         $this->mNavi =& $navi;
         $this->_mHandler =& $handler;
diff --git a/html/modules/legacyRender/class/ActionFrame.class.php b/html/modules/legacyRender/class/ActionFrame.class.php
index 539ebecb2..43308b9b1 100644
--- a/html/modules/legacyRender/class/ActionFrame.class.php
+++ b/html/modules/legacyRender/class/ActionFrame.class.php
@@ -27,7 +27,7 @@ class LegacyRender_ActionFrame
      */
     public $mCreateAction = null;
 
-    public function LegacyRender_ActionFrame($admin)
+    public function __construct($admin)
     {
         $this->mAdminFlag = $admin;
         $this->mCreateAction =new XCube_Delegate();
@@ -144,7 +144,7 @@ class LegacyRender_Action
      */
     public $_mAdminFlag = false;
     
-    public function LegacyRender_Action($adminFlag = false)
+    public function __construct($adminFlag = false)
     {
         $this->_mAdminFlag = $adminFlag;
     }
diff --git a/html/modules/legacyRender/class/banner.php b/html/modules/legacyRender/class/banner.php
index cd3f3fcb3..2ba9737f6 100644
--- a/html/modules/legacyRender/class/banner.php
+++ b/html/modules/legacyRender/class/banner.php
@@ -9,7 +9,7 @@ class LegacyRenderBannerObject extends XoopsSimpleObject
     public $mClient = null;
     public $_mClientLoadedFlag = false;
 
-    public function LegacyRenderBannerObject()
+    public function __construct()
     {
         static $initVars;
         if (isset($initVars)) {
diff --git a/html/modules/legacyRender/class/bannerclient.php b/html/modules/legacyRender/class/bannerclient.php
index da92bf205..95f3b3491 100644
--- a/html/modules/legacyRender/class/bannerclient.php
+++ b/html/modules/legacyRender/class/bannerclient.php
@@ -21,7 +21,7 @@ class LegacyRenderBannerclientObject extends XoopsSimpleObject
     public $mFinishBannerCount = null;
     public $_mFinishBannerCountLoadedFlag = false;
 
-    public function LegacyRenderBannerclientObject()
+    public function __construct()
     {
         static $initVars;
         if (isset($initVars)) {
diff --git a/html/modules/legacyRender/class/bannerfinish.php b/html/modules/legacyRender/class/bannerfinish.php
index a7489019e..cad72cc74 100644
--- a/html/modules/legacyRender/class/bannerfinish.php
+++ b/html/modules/legacyRender/class/bannerfinish.php
@@ -9,7 +9,7 @@ class LegacyRenderBannerfinishObject extends XoopsSimpleObject
     public $mClient = null;
     public $_mClientLoadedFlag = false;
 
-    public function LegacyRenderBannerfinishObject()
+    public function __construct()
     {
         $this->initVar('bid', XOBJ_DTYPE_INT, '', false);
         $this->initVar('cid', XOBJ_DTYPE_INT, '0', true);
diff --git a/html/modules/legacyRender/class/theme.php b/html/modules/legacyRender/class/theme.php
index 3e43191a2..810ea391a 100644
--- a/html/modules/legacyRender/class/theme.php
+++ b/html/modules/legacyRender/class/theme.php
@@ -9,7 +9,7 @@ class LegacyRenderThemeObject extends XoopsSimpleObject
     public $mPackage = array();
     public $mActiveResource = true;
     
-    public function LegacyRenderThemeObject()
+    public function __construct()
     {
         static $initVars;
         if (isset($initVars)) {
diff --git a/html/modules/legacyRender/class/tplfile.php b/html/modules/legacyRender/class/tplfile.php
index 41453f563..9859a1047 100644
--- a/html/modules/legacyRender/class/tplfile.php
+++ b/html/modules/legacyRender/class/tplfile.php
@@ -14,7 +14,7 @@ class LegacyRenderTplfileObject extends XoopsSimpleObject
     
     public $mOverride = null;
     
-    public function LegacyRenderTplfileObject()
+    public function __construct()
     {
         static $initVars;
         if (isset($initVars)) {
diff --git a/html/modules/legacyRender/class/tplset.php b/html/modules/legacyRender/class/tplset.php
index 81448e23a..8f95cec9b 100644
--- a/html/modules/legacyRender/class/tplset.php
+++ b/html/modules/legacyRender/class/tplset.php
@@ -6,7 +6,7 @@
 
 class LegacyRenderModuletplObject extends XoopsSimpleObject
 {
-    public function LegacyRenderModuletplObject()
+    public function __construct()
     {
         static $initVars;
         if (isset($initVars)) {
@@ -25,7 +25,7 @@ class LegacyRenderTplsetObject extends XoopsSimpleObject
 {
     public $mModuleTemplates = array();
     
-    public function LegacyRenderTplsetObject()
+    public function __construct()
     {
         static $initVars;
         if (isset($initVars)) {
@@ -96,7 +96,7 @@ public function insertClone($original, $clone)
         return true;    ///< TODO
     }
 
-    public function delete(&$obj, $force)
+    public function delete(&$obj, $force = false)
     {
         $handler =& xoops_getmodulehandler('tplfile', 'legacyRender');
         $handler->deleteAll(new Criteria('tpl_tplset', $obj->get('tplset_name')));
diff --git a/html/modules/legacyRender/class/tplsource.php b/html/modules/legacyRender/class/tplsource.php
index 8febeaf25..0fa4c98d6 100644
--- a/html/modules/legacyRender/class/tplsource.php
+++ b/html/modules/legacyRender/class/tplsource.php
@@ -6,7 +6,7 @@
 
 class LegacyRenderTplsourceObject extends XoopsSimpleObject
 {
-    public function LegacyRenderTplsourceObject()
+    public function __construct()
     {
         static $initVars;
         if (isset($initVars)) {
diff --git a/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php b/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php
index 74d4f773d..8a64a2a6d 100644
--- a/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php
+++ b/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php
@@ -127,7 +127,8 @@ class Legacy_RenderSystem extends XCube_RenderSystem
     
     public function __construct()
     {
-        parent::XCube_RenderSystem();
+//        parent::XCube_RenderSystem();
+        parent::__construct();
         $this->mSetupXoopsTpl =new XCube_Delegate();
         $this->mSetupXoopsTpl->register('Legacy_RenderSystem.SetupXoopsTpl');
 
diff --git a/html/modules/message/admin/class/myInstaller.class.php b/html/modules/message/admin/class/myInstaller.class.php
index abf276685..3ae727fac 100644
--- a/html/modules/message/admin/class/myInstaller.class.php
+++ b/html/modules/message/admin/class/myInstaller.class.php
@@ -11,9 +11,10 @@
 
 class Message_myInstaller extends Legacy_ModuleInstaller
 {
-    public function Message_myInstaller()
+    public function __construct()
     {
-        parent::Legacy_ModuleInstaller();
+//        parent::Legacy_ModuleInstaller();
+        parent::__construct();
     }
   
     public function executeInstall()
diff --git a/html/modules/message/admin/class/myUpdater.class.php b/html/modules/message/admin/class/myUpdater.class.php
index ce96cc70e..67e656bd3 100644
--- a/html/modules/message/admin/class/myUpdater.class.php
+++ b/html/modules/message/admin/class/myUpdater.class.php
@@ -11,7 +11,7 @@
 
 class Message_myUpdater extends Legacy_ModulePhasedUpgrader
 {
-    public function Message_myUpdater()
+    public function __construct()
     {
         parent::__construct();
         $this->_mMilestone = array(
diff --git a/html/modules/message/blocks/message_block.class.php b/html/modules/message/blocks/message_block.class.php
index 0bbee5fec..ac608893d 100644
--- a/html/modules/message/blocks/message_block.class.php
+++ b/html/modules/message/blocks/message_block.class.php
@@ -11,7 +11,9 @@ class Message_Block extends Legacy_BlockProcedure
 {
     public function __construct(&$block)
     {
-        parent::Legacy_BlockProcedure($block);
+//        parent::Legacy_BlockProcedure($block);
+        parent::__construct($block);
+
     }
   
     public function prepare()
diff --git a/html/modules/message/class/Module.class.php b/html/modules/message/class/Module.class.php
index 8d08b5c8b..ef944ff98 100644
--- a/html/modules/message/class/Module.class.php
+++ b/html/modules/message/class/Module.class.php
@@ -10,7 +10,9 @@ class Message_Module extends Legacy_ModuleAdapter
 {
     public function __construct(&$xoopsModule)
     {
-        parent::Legacy_ModuleAdapter($xoopsModule);
+//        parent::Legacy_ModuleAdapter($xoopsModule);
+        parent::__construct($xoopsModule);
+
     }
   
     public function hasAdminIndex()
diff --git a/html/modules/message/class/handler/Inbox.class.php b/html/modules/message/class/handler/Inbox.class.php
index a1e159d62..f1ff8df08 100644
--- a/html/modules/message/class/handler/Inbox.class.php
+++ b/html/modules/message/class/handler/Inbox.class.php
@@ -48,7 +48,9 @@ class MessageInboxHandler extends XoopsObjectGenericHandler
   
     public function __construct(&$db)
     {
-        parent::XoopsObjectGenericHandler($db);
+//        parent::XoopsObjectGenericHandler($db);
+        parent::__construct($db);
+
     }
   
     public function getCountUnreadByFromUid($uid)
diff --git a/html/modules/message/class/handler/Outbox.class.php b/html/modules/message/class/handler/Outbox.class.php
index 3ebe9dc9e..759596b4c 100644
--- a/html/modules/message/class/handler/Outbox.class.php
+++ b/html/modules/message/class/handler/Outbox.class.php
@@ -27,7 +27,8 @@ class MessageOutboxHandler extends XoopsObjectGenericHandler
   
     public function __construct(&$db)
     {
-        parent::XoopsObjectGenericHandler($db);
+        //        parent::XoopsObjectGenericHandler($db);
+        parent::__construct($db);
     }
   
     public function getOutboxCount($uid)
diff --git a/html/modules/message/class/handler/Settings.class.php b/html/modules/message/class/handler/Settings.class.php
index f68bc8e94..4fa6eb177 100644
--- a/html/modules/message/class/handler/Settings.class.php
+++ b/html/modules/message/class/handler/Settings.class.php
@@ -29,7 +29,8 @@ class MessageSettingsHandler extends XoopsObjectGenericHandler
 
     public function __construct(&$db)
     {
-        parent::XoopsObjectGenericHandler($db);
+        //        parent::XoopsObjectGenericHandler($db);
+        parent::__construct($db);
     }
   
     public function chkUser($uid)
diff --git a/html/modules/message/forms/MessageForm.class.php b/html/modules/message/forms/MessageForm.class.php
index cf6ac7351..7d5d19f83 100644
--- a/html/modules/message/forms/MessageForm.class.php
+++ b/html/modules/message/forms/MessageForm.class.php
@@ -15,7 +15,8 @@ class MessageForm extends XCube_ActionForm
   
     public function __construct()
     {
-        parent::XCube_ActionForm();
+//        parent::XCube_ActionForm();
+                parent::__construct();
     }
   
     public function getTokenName()
diff --git a/html/modules/message/forms/MessageSettingsForm.class.php b/html/modules/message/forms/MessageSettingsForm.class.php
index a7671b690..441122e97 100644
--- a/html/modules/message/forms/MessageSettingsForm.class.php
+++ b/html/modules/message/forms/MessageSettingsForm.class.php
@@ -13,7 +13,8 @@ class MessageSettingsForm extends XCube_ActionForm
 {
     public function __construct()
     {
-        parent::XCube_ActionForm();
+//        parent::XCube_ActionForm();
+        parent::__construct();
     }
   
     public function getTokenName()
diff --git a/html/modules/profile/admin/actions/DefinitionsListAction.class.php b/html/modules/profile/admin/actions/DefinitionsListAction.class.php
index bb2fea2b4..994d8c7cb 100644
--- a/html/modules/profile/admin/actions/DefinitionsListAction.class.php
+++ b/html/modules/profile/admin/actions/DefinitionsListAction.class.php
@@ -36,7 +36,7 @@ public function &_getFilterForm()
     /**
      * @protected
      */
-    public function _getBaseUrl()
+    public function &_getBaseUrl()
     {
         return "./index.php?action=DefinitionsList";
     }
diff --git a/html/modules/profile/class/AbstractFilterForm.class.php b/html/modules/profile/class/AbstractFilterForm.class.php
index 00e29b6d4..6229ac330 100644
--- a/html/modules/profile/class/AbstractFilterForm.class.php
+++ b/html/modules/profile/class/AbstractFilterForm.class.php
@@ -35,7 +35,7 @@ public function &_getHandler()
     /**
      * @protected
      */
-    public function Profile_AbstractFilterForm()
+    public function __construct()
     {
         $this->_mCriteria =new CriteriaCompo();
     }
diff --git a/html/modules/profile/class/ActionFrame.class.php b/html/modules/profile/class/ActionFrame.class.php
index e587f2d30..26c9508d9 100644
--- a/html/modules/profile/class/ActionFrame.class.php
+++ b/html/modules/profile/class/ActionFrame.class.php
@@ -27,7 +27,7 @@ class Profile_ActionFrame
      */
     public $mCreateAction = null;
     
-    public function Profile_ActionFrame($admin)
+    public function __construct($admin)
     {
         $this->mAdminFlag = $admin;
         $this->mCreateAction =new XCube_Delegate();
@@ -148,7 +148,7 @@ public function execute(&$controller)
 
 class Profile_Action
 {
-    public function Profile_Action()
+    public function __construct()
     {
     }
     
diff --git a/html/modules/profile/class/AssetManager.class.php b/html/modules/profile/class/AssetManager.class.php
index 7ccdb4e85..cb02db433 100644
--- a/html/modules/profile/class/AssetManager.class.php
+++ b/html/modules/profile/class/AssetManager.class.php
@@ -18,14 +18,14 @@ class Profile_AssetManager
     /**
      * @private
      */
-    public function Profile_AssetManager()
+    public function __construct()
     {
     }
 
     /**
      * @public
      */
-    public function &getSingleton()
+    public static function getSingleton()
     {
         static $instance;
     
diff --git a/html/modules/user/admin/actions/UserViewAction.class.php b/html/modules/user/admin/actions/UserViewAction.class.php
index 616a162b3..6cafb3b4e 100644
--- a/html/modules/user/admin/actions/UserViewAction.class.php
+++ b/html/modules/user/admin/actions/UserViewAction.class.php
@@ -16,9 +16,11 @@ class User_UserViewAction extends User_AbstractViewAction
      */
     public $mGetUserPosts = null;
     
-    public function User_UserViewAction()
+    public function __construct()
     {
-        parent::User_AbstractViewAction();
+//        parent::User_AbstractViewAction();
+        parent::__construct();
+
         $this->mGetUserPosts =new XCube_Delegate();
         $this->mGetUserPosts->register('User_UserViewAction.GetUserPosts');
     }
diff --git a/html/modules/user/admin/class/Permission.class.php b/html/modules/user/admin/class/Permission.class.php
index 99674e1f6..90968d7fb 100644
--- a/html/modules/user/admin/class/Permission.class.php
+++ b/html/modules/user/admin/class/Permission.class.php
@@ -19,7 +19,7 @@ class User_Permission
      */
     public $mItem;
 
-    public function User_Permission($groupId, &$item)
+    public function __construct($groupId, &$item)
     {
         $this->mGroupId = $groupId;
         $this->mItem =& $item;
@@ -142,7 +142,7 @@ class User_PermissionModuleItem extends User_PermissionItem
 {
     public $mModule;
     
-    public function User_PermissionModuleItem(&$module)
+    public function __construct(&$module)
     {
         $this->mModule =& $module;
     }
@@ -197,7 +197,7 @@ class User_PermissionBlockItem extends User_PermissionItem
 {
     public $mBlock;
     
-    public function User_PermissionBlockItem(&$block)
+    public function __construct(&$block)
     {
         $this->mBlock =& $block;
     }
@@ -249,7 +249,7 @@ class User_PermissionSystemAdminItem extends User_PermissionItem
     public $mId;
     public $mName;
     
-    public function User_PermissionSystemAdminItem($id, $name)
+    public function __construct($id, $name)
     {
         $this->mId = $id;
         $this->mName = $name;
diff --git a/html/modules/user/class/AbstractViewAction.class.php b/html/modules/user/class/AbstractViewAction.class.php
index 695934152..744048095 100644
--- a/html/modules/user/class/AbstractViewAction.class.php
+++ b/html/modules/user/class/AbstractViewAction.class.php
@@ -13,7 +13,7 @@ class User_AbstractViewAction extends User_Action
     public $mObject = null;
     public $mObjectHandler = null;
 
-    public function User_AbstractViewAction()
+    public function __construct()
     {
     }
 
diff --git a/html/modules/user/class/LostPassMailBuilder.class.php b/html/modules/user/class/LostPassMailBuilder.class.php
index 6f55f7097..8619e796b 100644
--- a/html/modules/user/class/LostPassMailBuilder.class.php
+++ b/html/modules/user/class/LostPassMailBuilder.class.php
@@ -20,7 +20,7 @@ class User_LostPassMailDirector
     public $mXoopsConfig;
     public $mExtraVars;
     
-    public function User_LostPassMailDirector(&$builder, &$user, &$xoopsConfig, $extraVars = array())
+    public function __construct(&$builder, &$user, &$xoopsConfig, $extraVars = array())
     {
         $this->mBuilder =& $builder;
         $this->mXoopsUser =& $user;
@@ -49,7 +49,7 @@ class User_LostPass1MailBuilder
 {
     public $mMailer;
     
-    public function User_LostPass1MailBuilder()
+    public function __construct()
     {
         $this->mMailer =& getMailer();
         $this->mMailer->useMail();
diff --git a/html/modules/user/class/RegistMailBuilder.class.php b/html/modules/user/class/RegistMailBuilder.class.php
index 304a23990..a72604517 100644
--- a/html/modules/user/class/RegistMailBuilder.class.php
+++ b/html/modules/user/class/RegistMailBuilder.class.php
@@ -29,7 +29,7 @@ class User_UserRegistMailDirector
     
     public $mUserConfig;
 
-    public function User_UserRegistMailDirector(&$builder, &$user, $xoopsConfig, $userConfig)
+    public function __construct(&$builder, &$user, $xoopsConfig, $userConfig)
     {
         $this->mBuilder =& $builder;
         
@@ -63,7 +63,7 @@ class User_RegistUserActivateMailBuilder
 {
     public $mMailer;
     
-    public function User_RegistUserActivateMailBuilder()
+    public function __construct()
     {
         $this->mMailer =& getMailer();
         $this->mMailer->useMail();
diff --git a/html/modules/user/class/avatar.php b/html/modules/user/class/avatar.php
index a9dce265b..1240966cc 100644
--- a/html/modules/user/class/avatar.php
+++ b/html/modules/user/class/avatar.php
@@ -6,7 +6,7 @@
 
 class UserAvatarObject extends XoopsSimpleObject
 {
-    public function UserAvatarObject()
+    public function __construct()
     {
         static $initVars;
         if (isset($initVars)) {
diff --git a/html/modules/user/class/avatar_user_link.php b/html/modules/user/class/avatar_user_link.php
index 644dc9664..512c34c2c 100644
--- a/html/modules/user/class/avatar_user_link.php
+++ b/html/modules/user/class/avatar_user_link.php
@@ -6,7 +6,7 @@
 
 class UserAvatar_user_linkObject extends XoopsSimpleObject
 {
-    public function UserAvatar_user_linkObject()
+    public function __construct()
     {
         $this->initVar('avatar_id', XOBJ_DTYPE_INT, '0', true);
         $this->initVar('user_id', XOBJ_DTYPE_INT, '0', true);
diff --git a/html/modules/user/class/groups.php b/html/modules/user/class/groups.php
index 83c887313..4f63bc92e 100644
--- a/html/modules/user/class/groups.php
+++ b/html/modules/user/class/groups.php
@@ -6,7 +6,7 @@
 
 class UserGroupsObject extends XoopsSimpleObject
 {
-    public function UserGroupsObject()
+    public function __construct()
     {
         static $initVars;
         if (isset($initVars)) {
diff --git a/html/modules/user/class/mailjob.php b/html/modules/user/class/mailjob.php
index 3a96f97cc..d5ee25fb8 100644
--- a/html/modules/user/class/mailjob.php
+++ b/html/modules/user/class/mailjob.php
@@ -26,7 +26,7 @@ class UserMailjobObject extends XoopsSimpleObject
      */
     public $mSend = null;
     
-    public function UserMailjobObject()
+    public function __construct()
     {
         static $initVars;
         if (isset($initVars)) {
diff --git a/html/modules/user/class/mailjob_link.php b/html/modules/user/class/mailjob_link.php
index 167bacec0..6b688d756 100644
--- a/html/modules/user/class/mailjob_link.php
+++ b/html/modules/user/class/mailjob_link.php
@@ -6,7 +6,7 @@
 
 class UserMailjob_linkObject extends XoopsSimpleObject
 {
-    public function UserMailjob_linkObject()
+    public function __construct()
     {
         static $initVars;
         if (isset($initVars)) {
diff --git a/html/modules/user/class/online.php b/html/modules/user/class/online.php
index 993c55dcc..cef19923e 100644
--- a/html/modules/user/class/online.php
+++ b/html/modules/user/class/online.php
@@ -8,7 +8,7 @@ class UserOnlineObject extends XoopsSimpleObject
 {
     public $mModule = null;
     
-    public function UserOnlineObject()
+    public function __construct()
     {
         static $initVars;
         if (isset($initVars)) {
diff --git a/xoops_trust_path/PEAR/Crypt/Blowfish.php b/xoops_trust_path/PEAR/Crypt/Blowfish.php
index ded50d217..031412e5a 100644
--- a/xoops_trust_path/PEAR/Crypt/Blowfish.php
+++ b/xoops_trust_path/PEAR/Crypt/Blowfish.php
@@ -136,7 +136,7 @@ class Crypt_Blowfish
      * @deprecated Since 1.1.0
      * @see Crypt_Blowfish::factory()
      */
-    public function Crypt_Blowfish($key)
+    public function __construct($key)
     {
         $this->_crypt =& Crypt_Blowfish::factory('ecb', $key);
         if (!PEAR::isError($this->_crypt)) {
diff --git a/xoops_trust_path/PEAR/Crypt/Blowfish/DefaultKey.php b/xoops_trust_path/PEAR/Crypt/Blowfish/DefaultKey.php
index d28667350..f8d99455d 100644
--- a/xoops_trust_path/PEAR/Crypt/Blowfish/DefaultKey.php
+++ b/xoops_trust_path/PEAR/Crypt/Blowfish/DefaultKey.php
@@ -36,7 +36,7 @@ class Crypt_Blowfish_DefaultKey
     
     public $S = array();
     
-    public function Crypt_Blowfish_DefaultKey()
+    public function __construct()
     {
         $this->P = array(
             0x243F6A88, 0x85A308D3, 0x13198A2E, 0x03707344,
diff --git a/xoops_trust_path/PEAR/Crypt/Blowfish/MCrypt.php b/xoops_trust_path/PEAR/Crypt/Blowfish/MCrypt.php
index 1e0995ecf..e0b921d55 100644
--- a/xoops_trust_path/PEAR/Crypt/Blowfish/MCrypt.php
+++ b/xoops_trust_path/PEAR/Crypt/Blowfish/MCrypt.php
@@ -69,7 +69,7 @@ class Crypt_Blowfish_MCrypt extends Crypt_Blowfish
      * @param string $iv initialization vector
      * @access public
      */
-    public function Crypt_Blowfish_MCrypt($key = null, $mode = 'ecb', $iv = null)
+    public function __construct($key = null, $mode = 'ecb', $iv = null)
     {
         $this->_iv = $iv . ((strlen($iv) < 8)
                             ? str_repeat(chr(0), 8 - strlen($iv)) : '');
diff --git a/xoops_trust_path/PEAR/PEAR.php b/xoops_trust_path/PEAR/PEAR.php
index 9bd804ccd..643f93558 100644
--- a/xoops_trust_path/PEAR/PEAR.php
+++ b/xoops_trust_path/PEAR/PEAR.php
@@ -152,7 +152,7 @@ class PEAR
      * @access public
      * @return void
      */
-    public function PEAR($error_class = null)
+    public function __construct($error_class = null)
     {
         $classname = strtolower(get_class($this));
         if ($this->_debug) {
@@ -863,7 +863,7 @@ class PEAR_Error
      * @access public
      *
      */
-    public function PEAR_Error($message = 'unknown error', $code = null,
+    public function __construct($message = 'unknown error', $code = null,
                         $mode = null, $options = null, $userinfo = null)
     {
         if ($mode === null) {
diff --git a/xoops_trust_path/PEAR/Text/Wiki.php b/xoops_trust_path/PEAR/Text/Wiki.php
index a7fca69e5..9121505ee 100644
--- a/xoops_trust_path/PEAR/Text/Wiki.php
+++ b/xoops_trust_path/PEAR/Text/Wiki.php
@@ -352,7 +352,7 @@ class Text_Wiki
     *     
     */
     
-    public function Text_Wiki($rules = null)
+    public function __construct($rules = null)
     {
         if (is_array($rules)) {
             $this->rules = $rules;
diff --git a/xoops_trust_path/PEAR/Text/Wiki/Parse.php b/xoops_trust_path/PEAR/Text/Wiki/Parse.php
index 60152bf61..e211c8ece 100644
--- a/xoops_trust_path/PEAR/Text/Wiki/Parse.php
+++ b/xoops_trust_path/PEAR/Text/Wiki/Parse.php
@@ -116,7 +116,7 @@ class Text_Wiki_Parse
     * 
     */
     
-    public function Text_Wiki_Parse(&$obj)
+    public function __construct(&$obj)
     {
         // set the reference to the calling Text_Wiki object;
         // this allows us access to the shared source text, token
diff --git a/xoops_trust_path/PEAR/Text/Wiki/Parse/Default/Freelink.php b/xoops_trust_path/PEAR/Text/Wiki/Parse/Default/Freelink.php
index 00fb0cada..25d21fff9 100644
--- a/xoops_trust_path/PEAR/Text/Wiki/Parse/Default/Freelink.php
+++ b/xoops_trust_path/PEAR/Text/Wiki/Parse/Default/Freelink.php
@@ -54,7 +54,7 @@ class Text_Wiki_Parse_Freelink extends Text_Wiki_Parse
     * 
     */
     
-    public function Text_Wiki_Parse_Freelink(&$obj)
+    public function __construct(&$obj)
     {
         parent::Text_Wiki_Parse($obj);
         
diff --git a/xoops_trust_path/PEAR/Text/Wiki/Parse/Default/Url.php b/xoops_trust_path/PEAR/Text/Wiki/Parse/Default/Url.php
index b29a0811d..7a64ee2aa 100644
--- a/xoops_trust_path/PEAR/Text/Wiki/Parse/Default/Url.php
+++ b/xoops_trust_path/PEAR/Text/Wiki/Parse/Default/Url.php
@@ -98,7 +98,7 @@ class Text_Wiki_Parse_Url extends Text_Wiki_Parse
     * 
     */
     
-    public function Text_Wiki_Parse_Url(&$obj)
+    public function __construct(&$obj)
     {
         parent::Text_Wiki_Parse($obj);
         
diff --git a/xoops_trust_path/PEAR/Text/Wiki/Parse/Default/Wikilink.php b/xoops_trust_path/PEAR/Text/Wiki/Parse/Default/Wikilink.php
index f3bf3dc96..578b6623c 100644
--- a/xoops_trust_path/PEAR/Text/Wiki/Parse/Default/Wikilink.php
+++ b/xoops_trust_path/PEAR/Text/Wiki/Parse/Default/Wikilink.php
@@ -62,7 +62,7 @@ class Text_Wiki_Parse_Wikilink extends Text_Wiki_Parse
     * 
     */
     
-    public function Text_Wiki_Parse_Wikilink(&$obj)
+    public function __construct(&$obj)
     {
         parent::Text_Wiki_Parse($obj);
         
diff --git a/xoops_trust_path/PEAR/Text/Wiki/Render.php b/xoops_trust_path/PEAR/Text/Wiki/Render.php
index 7cb186fba..5cfd45da2 100644
--- a/xoops_trust_path/PEAR/Text/Wiki/Render.php
+++ b/xoops_trust_path/PEAR/Text/Wiki/Render.php
@@ -98,7 +98,7 @@ class Text_Wiki_Render
     * 
     */
     
-    public function Text_Wiki_Render(&$obj)
+    public function __construct(&$obj)
     {
         // keep a reference to the calling Text_Wiki object
         $this->wiki =& $obj;
diff --git a/xoops_trust_path/libs/altsys/class/AltsysBreadcrumbs.class.php b/xoops_trust_path/libs/altsys/class/AltsysBreadcrumbs.class.php
index 5ee6b4a78..65563b4a1 100644
--- a/xoops_trust_path/libs/altsys/class/AltsysBreadcrumbs.class.php
+++ b/xoops_trust_path/libs/altsys/class/AltsysBreadcrumbs.class.php
@@ -6,7 +6,7 @@ class AltsysBreadcrumbs
 
     public $paths = array() ;
 
-    public function AltsysBreadcrumbs()
+    public function __construct()
     {
     }
 //HACK by domifara for php5.3+
diff --git a/xoops_trust_path/libs/altsys/include/Text_Diff.php b/xoops_trust_path/libs/altsys/include/Text_Diff.php
index 0d9096ad2..0a32862bb 100644
--- a/xoops_trust_path/libs/altsys/include/Text_Diff.php
+++ b/xoops_trust_path/libs/altsys/include/Text_Diff.php
@@ -222,13 +222,15 @@ class Text_MappedDiff extends Text_Diff
      * @param array $mapped_to_lines    This array should have the same number
      *                                  of elements as $to_lines.
      */
-    public function Text_MappedDiff($from_lines, $to_lines,
+    public function __construct($from_lines, $to_lines,
                              $mapped_from_lines, $mapped_to_lines)
     {
         assert(count($from_lines) == count($mapped_from_lines));
         assert(count($to_lines) == count($mapped_to_lines));
 
-        parent::Text_Diff($mapped_from_lines, $mapped_to_lines);
+//        parent::Text_Diff($mapped_from_lines, $mapped_to_lines);
+        parent::__construct($mapped_from_lines, $mapped_to_lines);
+
 
         $xi = $yi = 0;
         for ($i = 0; $i < count($this->_edits); $i++) {
@@ -768,7 +770,7 @@ public function nfinal()
 class Text_Diff_Op_copy extends Text_Diff_Op
 {
 
-    public function Text_Diff_Op_copy($orig, $final = false)
+    public function __construct($orig, $final = false)
     {
         if (!is_array($final)) {
             $final = $orig;
@@ -792,7 +794,7 @@ public function &reverse()
 class Text_Diff_Op_delete extends Text_Diff_Op
 {
 
-    public function Text_Diff_Op_delete($lines)
+    public function __construct($lines)
     {
         $this->orig = $lines;
         $this->final = false;
@@ -813,7 +815,7 @@ public function &reverse()
 class Text_Diff_Op_add extends Text_Diff_Op
 {
 
-    public function Text_Diff_Op_add($lines)
+    public function __construct($lines)
     {
         $this->final = $lines;
         $this->orig = false;
@@ -834,7 +836,7 @@ public function &reverse()
 class Text_Diff_Op_change extends Text_Diff_Op
 {
 
-    public function Text_Diff_Op_change($orig, $final)
+    public function __construct($orig, $final)
     {
         $this->orig = $orig;
         $this->final = $final;
diff --git a/xoops_trust_path/libs/altsys/include/formcheckboxgroup.php b/xoops_trust_path/libs/altsys/include/formcheckboxgroup.php
index ff163a44f..d06d17533 100644
--- a/xoops_trust_path/libs/altsys/include/formcheckboxgroup.php
+++ b/xoops_trust_path/libs/altsys/include/formcheckboxgroup.php
@@ -65,9 +65,11 @@ class AltsysFormCheckboxGroup extends XoopsFormCheckbox
      * @param	bool	$include_anon	Include group "anonymous"?
      * @param	mixed	$value	    	Pre-selected value (or array of them).
      */
-    public function AltsysFormCheckboxGroup($caption, $name, $include_anon=false, $value=null)
+    public function __construct($caption, $name, $include_anon=false, $value=null)
     {
-        $this->XoopsFormCheckbox($caption, $name, $value);
+//        $this->XoopsFormCheckbox($caption, $name, $value);
+        parent::__construct($caption, $name, $value);
+
         $member_handler =& xoops_gethandler('member');
         if (!$include_anon) {
             $options = $member_handler->getGroupList(new Criteria('groupid', XOOPS_GROUP_ANONYMOUS, '!='));
diff --git a/xoops_trust_path/libs/altsys/include/mygrouppermform.php b/xoops_trust_path/libs/altsys/include/mygrouppermform.php
index a09c9ad27..31d632da8 100644
--- a/xoops_trust_path/libs/altsys/include/mygrouppermform.php
+++ b/xoops_trust_path/libs/altsys/include/mygrouppermform.php
@@ -252,7 +252,7 @@ class MyXoopsGroupFormCheckBox extends XoopsFormElement
     /**
      * Constructor
      */
-    public function MyXoopsGroupFormCheckBox($caption, $name, $groupId, $values = null)
+    public function __construct($caption, $name, $groupId, $values = null)
     {
         $this->setCaption($caption);
         $this->setName($name);
diff --git a/xoops_trust_path/libs/qrcode/qrcode_img.php b/xoops_trust_path/libs/qrcode/qrcode_img.php
index ac759ef83..294109e74 100644
--- a/xoops_trust_path/libs/qrcode/qrcode_img.php
+++ b/xoops_trust_path/libs/qrcode/qrcode_img.php
@@ -15,9 +15,11 @@ class Qrcode_image extends Qrcode
     public $module_size;
     public $quiet_zone;
 
-    public function Qrcode_image()
+    public function __construct()
     {
         $this->Qrcode();
+        parent::__construct();
+
         $this->module_size=4;
         $this->quiet_zone=4;
     }
diff --git a/xoops_trust_path/modules/protector/class/ProtectorFilter.php b/xoops_trust_path/modules/protector/class/ProtectorFilter.php
index 8edce11a7..ddf3c5d69 100644
--- a/xoops_trust_path/modules/protector/class/ProtectorFilter.php
+++ b/xoops_trust_path/modules/protector/class/ProtectorFilter.php
@@ -5,7 +5,7 @@ class ProtectorFilterAbstract
 {
     public $protector = null ;
 
-    public function ProtectorFilterAbstract()
+    public function __construct()
     {
         $this->protector =& Protector::getInstance() ;
         $lang = empty($GLOBALS['xoopsConfig']['language']) ? @$this->protector->_conf['default_lang'] : $GLOBALS['xoopsConfig']['language'] ;
@@ -38,7 +38,7 @@ class ProtectorFilterHandler
     public $filters_base = '' ;
     public $filters_byconfig = '' ;
 
-    public function ProtectorFilterHandler()
+    public function __construct()
     {
         $this->protector =& Protector::getInstance() ;
         $this->filters_base = dirname(dirname(__FILE__)).'/filters_enabled' ;
diff --git a/xoops_trust_path/modules/protector/class/ProtectorMysqlDatabase.class.php b/xoops_trust_path/modules/protector/class/ProtectorMysqlDatabase.class.php
index 85e52a3f5..8500b9603 100644
--- a/xoops_trust_path/modules/protector/class/ProtectorMysqlDatabase.class.php
+++ b/xoops_trust_path/modules/protector/class/ProtectorMysqlDatabase.class.php
@@ -25,7 +25,7 @@ class ProtectorMySQLDatabase extends ProtectorMySQLDatabase_base
 ) ;
 
 
-    public function ProtectorMySQLDatabase()
+    public function __construct()
     {
         $protector =& Protector::getInstance() ;
         $this->doubtful_requests = $protector->getDblayertrapDoubtfuls() ;
diff --git a/xoops_trust_path/modules/protector/class/gtickets.php b/xoops_trust_path/modules/protector/class/gtickets.php
index 426168675..2345f9789 100644
--- a/xoops_trust_path/modules/protector/class/gtickets.php
+++ b/xoops_trust_path/modules/protector/class/gtickets.php
@@ -9,7 +9,7 @@ class XoopsGTicket
         public $_latest_token = '' ;
         public $messages = array() ;
 
-        public function XoopsGTicket()
+        public function __construct()
         {
             global $xoopsConfig ;
 
diff --git a/xoops_trust_path/modules/protector/patches/ImpressCMS1.1/databasefactory.php b/xoops_trust_path/modules/protector/patches/ImpressCMS1.1/databasefactory.php
index 1af949b4f..50bd640e8 100644
--- a/xoops_trust_path/modules/protector/patches/ImpressCMS1.1/databasefactory.php
+++ b/xoops_trust_path/modules/protector/patches/ImpressCMS1.1/databasefactory.php
@@ -30,7 +30,7 @@ class XoopsDatabaseFactory
      *
      * Makes nothing.
      */
-    public function XoopsDatabaseFactory()
+    public function __construct()
     {
     }
 
diff --git a/xoops_trust_path/modules/protector/patches/XCL2.1.6/databasefactory.php b/xoops_trust_path/modules/protector/patches/XCL2.1.6/databasefactory.php
index 790e3b4a2..5a906f959 100644
--- a/xoops_trust_path/modules/protector/patches/XCL2.1.6/databasefactory.php
+++ b/xoops_trust_path/modules/protector/patches/XCL2.1.6/databasefactory.php
@@ -1,7 +1,7 @@
 <?php
 class XoopsDatabaseFactory
 {
-    public function XoopsDatabaseFactory()
+    public function __construct()
     {
     }
 
diff --git a/xoops_trust_path/modules/protector/patches/XOOPS2.0.16aJP/databasefactory.php b/xoops_trust_path/modules/protector/patches/XOOPS2.0.16aJP/databasefactory.php
index 790e3b4a2..5a906f959 100644
--- a/xoops_trust_path/modules/protector/patches/XOOPS2.0.16aJP/databasefactory.php
+++ b/xoops_trust_path/modules/protector/patches/XOOPS2.0.16aJP/databasefactory.php
@@ -1,7 +1,7 @@
 <?php
 class XoopsDatabaseFactory
 {
-    public function XoopsDatabaseFactory()
+    public function __construct()
     {
     }
 
diff --git a/xoops_trust_path/modules/protector/patches/XOOPS2.3.2/databasefactory.php b/xoops_trust_path/modules/protector/patches/XOOPS2.3.2/databasefactory.php
index 0eb2f9b20..7c04c425a 100644
--- a/xoops_trust_path/modules/protector/patches/XOOPS2.3.2/databasefactory.php
+++ b/xoops_trust_path/modules/protector/patches/XOOPS2.3.2/databasefactory.php
@@ -1,7 +1,7 @@
 <?php
 class XoopsDatabaseFactory
 {
-    public function XoopsDatabaseFactory()
+    public function __construct()
     {
     }
 
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/And.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/And.php
index 4afcd64ab..ec8321577 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/And.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/And.php
@@ -56,7 +56,7 @@ class File_Archive_Predicate_And extends File_Archive_Predicate
      * Example:
      *   new File_Archive_Predicate_And($pred1, $pred2, $pred3)
      */
-    public function File_Archive_Predicate_And()
+    public function __construct()
     {
         $this->preds = func_get_args();
     }
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/Custom.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/Custom.php
index e675b63d5..74bd65bd6 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/Custom.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/Custom.php
@@ -55,7 +55,7 @@ class File_Archive_Predicate_Custom extends File_Archive_Predicate
      *        added to the begining of the expression. A ; will also be added at
      *        the end so that you don't need to write it
      */
-    public function File_Archive_Predicate_Custom($expression)
+    public function __construct($expression)
     {
         $this->expression = $expression.";";
         if (strpos($this->expression, "return") === false) {
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/Duplicate.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/Duplicate.php
index b284ec0b1..f328116e1 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/Duplicate.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/Duplicate.php
@@ -61,7 +61,7 @@ class File_Archive_Predicate_Duplicate extends File_Archive_Predicate
      *        The predicate should then be used on the same source to remove the
      *        old duplicate files
      */
-    public function File_Archive_Predicate_Duplicate(&$source)
+    public function __construct(&$source)
     {
         //Ensure we are at the begining of the file
         $source->close();
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/Ereg.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/Ereg.php
index 67acd867a..fbc0652df 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/Ereg.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/Ereg.php
@@ -43,7 +43,7 @@ class File_Archive_Predicate_Ereg extends File_Archive_Predicate
     /**
      * @param string $ereg is the regular expression
      */
-    public function File_Archive_Predicate_Ereg($ereg)
+    public function __construct($ereg)
     {
         $this->ereg = $ereg;
     }
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/Eregi.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/Eregi.php
index 250d13811..a476bbcd1 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/Eregi.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/Eregi.php
@@ -45,7 +45,7 @@ class File_Archive_Predicate_Eregi extends File_Archive_Predicate
     /**
      * @param string $ereg is the regular expression
      */
-    public function File_Archive_Predicate_Eregi($ereg)
+    public function __construct($ereg)
     {
         $this->ereg = $ereg;
     }
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/Extension.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/Extension.php
index 6a9e2a13e..c241c8cfe 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/Extension.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/Extension.php
@@ -43,7 +43,7 @@ class File_Archive_Predicate_Extension extends File_Archive_Predicate
     /**
      * @param $extensions array or comma separated string of allowed extensions
      */
-    public function File_Archive_Predicate_Extension($extensions)
+    public function __construct($extensions)
     {
         if (is_string($extensions)) {
             $this->extensions = explode(",", $extensions);
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/Index.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/Index.php
index e7ab2c6e7..f8b4a7a42 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/Index.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/Index.php
@@ -46,7 +46,7 @@ class File_Archive_Predicate_Index extends File_Archive_Predicate
     /**
      * @param $extensions array or comma separated string of allowed extensions
      */
-    public function File_Archive_Predicate_Index($indexes)
+    public function __construct($indexes)
     {
         $this->indexes = $indexes;
     }
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/MIME.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/MIME.php
index a22b3438d..328d83fc0 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/MIME.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/MIME.php
@@ -44,7 +44,7 @@ class File_Archive_Predicate_MIME extends File_Archive_Predicate
     /**
      * @param $extensions array or comma separated string of allowed extensions
      */
-    public function File_Archive_Predicate_MIME($mimes)
+    public function __construct($mimes)
     {
         if (is_string($mimes)) {
             $this->mimes = explode(",", $mimes);
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/MaxDepth.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/MaxDepth.php
index 0ec5955e2..f52f5d0b4 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/MaxDepth.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/MaxDepth.php
@@ -46,7 +46,7 @@ class File_Archive_Predicate_MaxDepth extends File_Archive_Predicate
      *        '1/2/3/4/foo.txt' will be accepted with $maxDepth == 4 and
      *        rejected with $maxDepth == 5
      */
-    public function File_Archive_Predicate_MaxDepth($maxDepth)
+    public function __construct($maxDepth)
     {
         $this->maxDepth = $maxDepth;
     }
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/MinSize.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/MinSize.php
index a7fb1ef9a..fc876492b 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/MinSize.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/MinSize.php
@@ -43,7 +43,7 @@ class File_Archive_Predicate_MinSize extends File_Archive_Predicate
     /**
      * @param int $minSize minimal size of the file (in Bytes)
      */
-    public function File_Archive_Predicate_MinSize($minSize)
+    public function __construct($minSize)
     {
         $this->minSize = $minSize;
     }
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/MinTime.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/MinTime.php
index 85f3682a6..0585a63ed 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/MinTime.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/MinTime.php
@@ -46,7 +46,7 @@ class File_Archive_Predicate_MinTime extends File_Archive_Predicate
      * @param int $minTime Unix timestamp of the minimal modification date of
      *        the files
      */
-    public function File_Archive_Predicate_MinTime($minTime)
+    public function __construct($minTime)
     {
         $this->minTime = $minTime;
     }
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/Not.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/Not.php
index 76a5650f0..02379cf3b 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/Not.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/Not.php
@@ -39,7 +39,7 @@
 class File_Archive_Predicate_Not extends File_Archive_Predicate
 {
     public $pred;
-    public function File_Archive_Predicate_Not($pred)
+    public function __construct($pred)
     {
         $this->pred = $pred;
     }
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/Preg.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/Preg.php
index 0b783e263..6275d96c6 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/Preg.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Predicate/Preg.php
@@ -43,7 +43,7 @@ class File_Archive_Predicate_Preg extends File_Archive_Predicate
     /**
      * @param string $ereg is the regular expression
      */
-    public function File_Archive_Predicate_Preg($preg)
+    public function __construct($preg)
     {
         $this->preg = $preg;
     }
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Archive.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Archive.php
index 8a7a89ddd..6ad0e5846 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Archive.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Archive.php
@@ -74,7 +74,7 @@ public function next()
     }
 
 //PUBLIC
-    public function File_Archive_Reader_Archive(&$source, $sourceOpened = false)
+    public function __construct(&$source, $sourceOpened = false)
     {
         $this->source =& $source;
         $this->sourceOpened = $this->sourceInitiallyOpened = $sourceOpened;
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Cache.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Cache.php
index a01a45054..23405af0a 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Cache.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Cache.php
@@ -50,7 +50,7 @@ class File_Archive_Reader_Cache extends File_Archive_Reader
     /**
      * $source is the reader to filter
      */
-    public function File_Archive_Reader_Cache(&$source)
+    public function __construct(&$source)
     {
         $this->source =& $source;
         $this->tmpFile = tmpfile();
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/ChangeName.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/ChangeName.php
index 69afec4e4..e55136674 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/ChangeName.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/ChangeName.php
@@ -48,9 +48,11 @@ class File_Archive_Reader_ChangeName extends File_Archive_Reader_Relay
      *
      * @param File_Archive_Reader &$source The archive reader to relay
      */
-    public function File_Archive_Reader_ChangeName(&$source)
+    public function __construct(&$source)
     {
-        parent::File_Archive_Reader_Relay($source);
+//        parent::File_Archive_Reader_Relay($source);
+        parent::__construct($source);
+
     }
 
     /**
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/ChangeName/AddDirectory.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/ChangeName/AddDirectory.php
index 2ac67dbda..2429a9ffb 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/ChangeName/AddDirectory.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/ChangeName/AddDirectory.php
@@ -45,9 +45,11 @@
 class File_Archive_Reader_ChangeName_AddDirectory extends File_Archive_Reader_ChangeName
 {
     public $baseName;
-    public function File_Archive_Reader_ChangeName_AddDirectory($baseName, &$source)
+    public function __construct($baseName, &$source)
     {
-        parent::File_Archive_Reader_ChangeName($source);
+//        parent::File_Archive_Reader_ChangeName($source);
+        parent::__construct($source);
+
         $this->baseName = $this->getStandardURL($baseName);
     }
 
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/ChangeName/Callback.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/ChangeName/Callback.php
index 2ea704b62..c59c9fdf5 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/ChangeName/Callback.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/ChangeName/Callback.php
@@ -37,9 +37,11 @@
 class File_Archive_Reader_ChangeName_Callback extends File_Archive_Reader_ChangeName
 {
     public $function;
-    public function File_Archive_Reader_ChangeName_Callback($function, &$source)
+    public function __construct($function, &$source)
     {
-        parent::File_Archive_Reader_ChangeName($source);
+//        parent::File_Archive_Reader_ChangeName($source);
+        parent::__construct($source);
+
         $this->function = $function;
     }
 
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/ChangeName/Directory.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/ChangeName/Directory.php
index b0ee19441..2c81af235 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/ChangeName/Directory.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/ChangeName/Directory.php
@@ -47,9 +47,11 @@ class File_Archive_Reader_ChangeName_Directory extends File_Archive_Reader_Chang
     public $oldBaseName;
     public $newBaseName;
 
-    public function File_Archive_Reader_ChangeName_Directory($oldBaseName, $newBaseName, &$source)
+    public function __construct($oldBaseName, $newBaseName, &$source)
     {
-        parent::File_Archive_Reader_ChangeName($source);
+//        parent::File_Archive_Reader_ChangeName($source);
+        parent::__construct($source);
+
         $this->oldBaseName = $this->getStandardURL($oldBaseName);
         if (substr($this->oldBaseName, -1) == '/') {
             $this->oldBaseName = substr($this->oldBaseName, 0, -1);
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Concat.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Concat.php
index cc0b19322..e3924247e 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Concat.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Concat.php
@@ -44,7 +44,7 @@ class File_Archive_Reader_Concat extends File_Archive_Reader
     public $opened = false;
     public $filePos = 0;
 
-    public function File_Archive_Reader_Concat(&$source, $filename,
+    public function __construct(&$source, $filename,
                                         $stat=array(), $mime=null)
     {
         $this->source =& $source;
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Directory.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Directory.php
index 90bc35d23..252a925d3 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Directory.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Directory.php
@@ -61,10 +61,12 @@ class File_Archive_Reader_Directory extends File_Archive_Reader_Relay
      * of $maxRecurs. In particular, if $maxRecurs == 0, the subdirectories
      * won't be read.
      */
-    public function File_Archive_Reader_Directory($directory, $symbolic='',
+    public function __construct($directory, $symbolic='',
                                            $maxRecurs=-1)
     {
-        parent::File_Archive_Reader_Relay($tmp = null);
+//        parent::File_Archive_Reader_Relay($tmp = null);
+        parent::__construct($tmp = null);
+
         $this->directory = empty($directory) ? '.' : $directory;
         $this->symbolic = $this->getStandardURL($symbolic);
         $this->maxRecurs = $maxRecurs;
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/File.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/File.php
index a881804f5..fd0e2dbfc 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/File.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/File.php
@@ -74,7 +74,7 @@ class File_Archive_Reader_File extends File_Archive_Reader
      * $symbolic is the name declared by the reader
      * If $symbolic is not specified, $filename is assumed
      */
-    public function File_Archive_Reader_File($filename, $symbolic = null, $mime = null)
+    public function __construct($filename, $symbolic = null, $mime = null)
     {
         $this->filename = $filename;
         $this->mime = $mime;
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Filter.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Filter.php
index 8b68394e2..216d84c2d 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Filter.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Filter.php
@@ -45,9 +45,11 @@ class File_Archive_Reader_Filter extends File_Archive_Reader_Relay
     /**
      * $source is the reader to filter
      */
-    public function File_Archive_Reader_Filter($predicate, &$source)
+    public function __construct($predicate, &$source)
     {
-        parent::File_Archive_Reader_Relay($source);
+//        parent::File_Archive_Reader_Relay($source);
+        parent::__construct($source);
+
         $this->predicate = $predicate;
     }
 
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Memory.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Memory.php
index 400e99656..a5e26221d 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Memory.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Memory.php
@@ -76,7 +76,7 @@ class File_Archive_Reader_Memory extends File_Archive_Reader
      *        recomputed from $memory
      * @param string $mime is the mime type of the file
      */
-    public function File_Archive_Reader_Memory(&$memory, $filename,
+    public function __construct(&$memory, $filename,
                                         $stat=array(), $mime=null)
     {
         $this->memory = &$memory;
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Multi.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Multi.php
index e83b5ead0..6b28837be 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Multi.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Multi.php
@@ -47,9 +47,11 @@ class File_Archive_Reader_Multi extends File_Archive_Reader_Relay
      */
     public $currentIndex = 0;
 
-    public function File_Archive_Reader_Multi()
+    public function __construct()
     {
-        parent::File_Archive_Reader_Relay($tmp = null);
+//        parent::File_Archive_Reader_Relay($tmp = null);
+        parent::__construct($tmp = null);
+
     }
 
     /**
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Relay.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Relay.php
index 737826629..7df162139 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Relay.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Relay.php
@@ -45,7 +45,7 @@ class File_Archive_Reader_Relay extends File_Archive_Reader
      */
     public $source;
 
-    public function File_Archive_Reader_Relay(&$source)
+    public function __construct(&$source)
     {
         $this->source =& $source;
     }
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Select.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Select.php
index 66aac38bd..0cae05c0e 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Select.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Select.php
@@ -45,9 +45,11 @@ class File_Archive_Reader_Select extends File_Archive_Reader_Relay
     /**
      * $source is the reader to filter
      */
-    public function File_Archive_Reader_Select($filename, &$source)
+    public function __construct($filename, &$source)
     {
-        parent::File_Archive_Reader_Relay($source);
+//        parent::File_Archive_Reader_Relay($source);
+        parent::__construct($source);
+
         $this->filename = $filename;
     }
 
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Uncompress.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Uncompress.php
index 83df3356b..9dfd20480 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Uncompress.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Reader/Uncompress.php
@@ -89,10 +89,12 @@ class File_Archive_Reader_Uncompress extends File_Archive_Reader_Relay
      */
     public $currentFileNotDisplayed = false;
 
-    public function File_Archive_Reader_Uncompress(
+    public function __construct(
                         &$innerReader, $uncompressionLevel = -1)
     {
-        parent::File_Archive_Reader_Relay($innerReader);
+//        parent::File_Archive_Reader_Relay($innerReader);
+        parent::__construct($innerReader);
+
         $this->startReader =& $innerReader;
         $this->uncompressionLevel = $uncompressionLevel;
     }
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/AddBaseName.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/AddBaseName.php
index 2f0d3f7f1..7006d0b49 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/AddBaseName.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/AddBaseName.php
@@ -39,7 +39,7 @@ class File_Archive_Writer_AddBaseName
     public $writer;
     public $baseName;
 
-    public function File_Archive_Writer_AddBaseName($baseName, &$writer)
+    public function __construct($baseName, &$writer)
     {
         if (substr($baseName, -1) == '/') {
             $this->baseName = $baseName;
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/Archive.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/Archive.php
index b5a7a5c33..9b5a2b8de 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/Archive.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/Archive.php
@@ -68,7 +68,7 @@ class File_Archive_Writer_Archive extends File_Archive_Writer
      * @param bool $autoClose Indicate if the inner writer must be closed when
      *        closing this
      */
-    public function File_Archive_Writer_Archive($filename, &$innerWriter,
+    public function __construct($filename, &$innerWriter,
                                          $stat = array(), $autoClose = true)
     {
         $this->innerWriter =& $innerWriter;
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/Bzip2.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/Bzip2.php
index 818c43dde..34ffe484e 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/Bzip2.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/Bzip2.php
@@ -63,7 +63,7 @@ class File_Archive_Writer_Bzip2 extends File_Archive_Writer
      * @param bool $autoClose Indicate if the inner writer must be closed when
      *        closing this
      */
-    public function File_Archive_Writer_Bzip2($filename, &$innerWriter,
+    public function __construct($filename, &$innerWriter,
                                        $stat = array(), $autoClose = true)
     {
         $this->innerWriter =& $innerWriter;
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/Files.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/Files.php
index 794639779..21c7a692f 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/Files.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/Files.php
@@ -45,7 +45,7 @@ class File_Archive_Writer_Files extends File_Archive_Writer
     public $stat = array();
     public $filename;
 
-    public function File_Archive_Writer_Files($base = '')
+    public function __construct($base = '')
     {
         if ($base === null || $base == '') {
             $this->basePath = '';
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/Gzip.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/Gzip.php
index f0cad5cd0..a5f09d0ff 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/Gzip.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/Gzip.php
@@ -55,7 +55,7 @@ class File_Archive_Writer_Gzip extends File_Archive_Writer
      * @param bool $autoClose Indicate if the inner writer must be closed when
      *        closing this
      */
-    public function File_Archive_Writer_Gzip($filename, &$innerWriter,
+    public function __construct($filename, &$innerWriter,
                                       $stat = array(), $autoClose = true)
     {
         $this->innerWriter =& $innerWriter;
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/Mail.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/Mail.php
index 034a84143..bd53bf974 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/Mail.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/Mail.php
@@ -88,7 +88,7 @@ class File_Archive_Writer_Mail extends File_Archive_Writer
      *        object
      * @param string $message Text body of the mail
      */
-    public function File_Archive_Writer_Mail($to, $headers, $message, &$mail)
+    public function __construct($to, $headers, $message, &$mail)
     {
         $this->mime = new Mail_mime();
         $this->mime->setTXTBody($message);
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/Memory.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/Memory.php
index 517f3f5b0..25cb99edb 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/Memory.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/Memory.php
@@ -59,7 +59,7 @@ class File_Archive_Writer_Memory extends File_Archive_Writer
      *        Any data located after $seek will be erased
      *        The default value is 0
      */
-    public function File_Archive_Writer_Memory(&$data, $seek = 0)
+    public function __construct(&$data, $seek = 0)
     {
         $this->data =& $data;
         $this->data = substr($data, 0, $seek);
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/MemoryArchive.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/MemoryArchive.php
index be892cd26..b28c1ecff 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/MemoryArchive.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/MemoryArchive.php
@@ -69,9 +69,11 @@ class File_Archive_Writer_MemoryArchive extends File_Archive_Writer_Archive
     /**
      * @see File_Archive_Writer::File_Archive_Writer()
      */
-    public function File_Archive_Writer_MemoryArchive($filename, &$t, $stat = array(), $autoClose = true)
+    public function __construct($filename, &$t, $stat = array(), $autoClose = true)
     {
-        parent::File_Archive_Writer_Archive($filename, $t, $stat, $autoClose);
+//        parent::File_Archive_Writer_Archive($filename, $t, $stat, $autoClose);
+        parent::__construct($filename, $t, $stat, $autoClose);
+
     }
 
     /**
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/Output.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/Output.php
index c5bc51cb1..3621e1fc1 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/Output.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/Output.php
@@ -51,7 +51,7 @@ class File_Archive_Writer_Output extends File_Archive_Writer
     /**
      * @param $sendHeaders see the variable
      */
-    public function File_Archive_Writer_Output($sendHeaders = true)
+    public function __construct($sendHeaders = true)
     {
         $this->sendHeaders = $sendHeaders;
     }
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/UniqueAppender.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/UniqueAppender.php
index 9ec7561a4..7383d532e 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/UniqueAppender.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/UniqueAppender.php
@@ -56,7 +56,7 @@ class File_Archive_Writer_UniqueAppender extends File_Archive_Writer
      * Construct a unique writer that will write to the specified writer
      * and remove duplicate files from the reader on close
      */
-    public function File_Archive_Writer_UniqueAppender(&$reader)
+    public function __construct(&$reader)
     {
         $reader->close();
         $pos = 0;
diff --git a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/Zip.php b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/Zip.php
index 75aa6d304..830338184 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/Zip.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/File/Archive/Writer/Zip.php
@@ -60,13 +60,13 @@ class File_Archive_Writer_Zip extends File_Archive_Writer_MemoryArchive
      */
     public $central = "";
 
-    public function File_Archive_Writer_Zip($filename, &$innerWriter,
+    public function __construct($filename, &$innerWriter,
                                      $stat=array(), $autoClose = true)
     {
         global $_File_Archive_Options;
-        parent::File_Archive_Writer_MemoryArchive(
-                    $filename, $innerWriter, $stat, $autoClose
-                );
+//        parent::File_Archive_Writer_MemoryArchive($filename, $innerWriter, $stat, $autoClose);
+        parent::__construct($filename, $innerWriter, $stat, $autoClose);
+
 
         $this->compressionLevel = File_Archive::getOption('zipCompressionLevel', 9);
     }
diff --git a/xoops_trust_path/modules/xupdate/PEAR/MIME/Type.php b/xoops_trust_path/modules/xupdate/PEAR/MIME/Type.php
index 80a74cc99..2825b6cda 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/MIME/Type.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/MIME/Type.php
@@ -115,7 +115,7 @@ class MIME_Type
      *
      * @return void
      */
-    public function MIME_Type($type = false)
+    public function __construct($type = false)
     {
         if ($type) {
             $this->parse($type);
diff --git a/xoops_trust_path/modules/xupdate/PEAR/MIME/Type/Parameter.php b/xoops_trust_path/modules/xupdate/PEAR/MIME/Type/Parameter.php
index 431de20ed..6c6574e74 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/MIME/Type/Parameter.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/MIME/Type/Parameter.php
@@ -53,7 +53,7 @@ class MIME_Type_Parameter
      *
      * @return void
      */
-    public function MIME_Type_Parameter($param = false)
+    public function __construct($param = false)
     {
         if ($param) {
             $this->parse($param);
diff --git a/xoops_trust_path/modules/xupdate/PEAR/PEAR.php b/xoops_trust_path/modules/xupdate/PEAR/PEAR.php
index 9bd804ccd..643f93558 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/PEAR.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/PEAR.php
@@ -152,7 +152,7 @@ class PEAR
      * @access public
      * @return void
      */
-    public function PEAR($error_class = null)
+    public function __construct($error_class = null)
     {
         $classname = strtolower(get_class($this));
         if ($this->_debug) {
@@ -863,7 +863,7 @@ class PEAR_Error
      * @access public
      *
      */
-    public function PEAR_Error($message = 'unknown error', $code = null,
+    public function __construct($message = 'unknown error', $code = null,
                         $mode = null, $options = null, $userinfo = null)
     {
         if ($mode === null) {
diff --git a/xoops_trust_path/modules/xupdate/PEAR/Services/JSON.php b/xoops_trust_path/modules/xupdate/PEAR/Services/JSON.php
index 4efdbde8a..d8bb9d78e 100644
--- a/xoops_trust_path/modules/xupdate/PEAR/Services/JSON.php
+++ b/xoops_trust_path/modules/xupdate/PEAR/Services/JSON.php
@@ -139,7 +139,7 @@ class Services_JSON
     *                                   strings or numbers, if you return an object, make sure it does
     *                                   not have a toJSON method, otherwise an error will occur.
     */
-    public function Services_JSON($use = 0)
+    public function __construct($use = 0)
     {
         $this->use = $use;
         $this->_mb_strlen            = function_exists('mb_strlen');
@@ -881,10 +881,12 @@ public function substr8($string, $start, $length=false)
 if (class_exists('PEAR_Error')) {
     class Services_JSON_Error extends PEAR_Error
     {
-        public function Services_JSON_Error($message = 'unknown error', $code = null,
+        public function __construct($message = 'unknown error', $code = null,
                                      $mode = null, $options = null, $userinfo = null)
         {
-            parent::PEAR_Error($message, $code, $mode, $options, $userinfo);
+//            parent::PEAR_Error($message, $code, $mode, $options, $userinfo);
+            parent::__construct($message, $code, $mode, $options, $userinfo);
+
         }
     }
 } else {
@@ -894,7 +896,7 @@ public function Services_JSON_Error($message = 'unknown error', $code = null,
      */
     class Services_JSON_Error
     {
-        public function Services_JSON_Error($message = 'unknown error', $code = null,
+        public function __construct($message = 'unknown error', $code = null,
                                      $mode = null, $options = null, $userinfo = null)
         {
         }
diff --git a/xoops_trust_path/modules/xupdate/admin/forms/ModuleStoreFilterForm.class.php b/xoops_trust_path/modules/xupdate/admin/forms/ModuleStoreFilterForm.class.php
index b69a8c43b..793c18c7c 100644
--- a/xoops_trust_path/modules/xupdate/admin/forms/ModuleStoreFilterForm.class.php
+++ b/xoops_trust_path/modules/xupdate/admin/forms/ModuleStoreFilterForm.class.php
@@ -46,7 +46,7 @@ class Xupdate_Admin_ModuleStoreFilterForm extends Xupdate_AbstractFilterForm
         MODULE_SORT_KEY_CATEGORY_ID => "category_id"
     );
 
-    public function Xupdate_Admin_ModuleStoreFilterForm()
+    public function __construct()
     {
         $this->_mCriteria =new CriteriaCompo();
     }
diff --git a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Crypt/Base.php b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Crypt/Base.php
index a66168163..24a903bb3 100644
--- a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Crypt/Base.php
+++ b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Crypt/Base.php
@@ -503,7 +503,7 @@ class Crypt_Base
      * @param int $mode
      * @access public
      */
-    function Crypt_Base($mode = CRYPT_MODE_CBC)
+    function __construct($mode = CRYPT_MODE_CBC)
     {
         // $mode dependent settings
         switch ($mode) {
diff --git a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Crypt/Hash.php b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Crypt/Hash.php
index a13d960f9..589f1a20b 100644
--- a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Crypt/Hash.php
+++ b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Crypt/Hash.php
@@ -151,7 +151,7 @@ class Crypt_Hash
      * @return Crypt_Hash
      * @access public
      */
-    function Crypt_Hash($hash = 'sha1')
+    function __construct($hash = 'sha1')
     {
         if (!defined('CRYPT_HASH_MODE')) {
             switch (true) {
diff --git a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Crypt/RC2.php b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Crypt/RC2.php
index e0932e28d..08d760ea3 100644
--- a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Crypt/RC2.php
+++ b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Crypt/RC2.php
@@ -355,9 +355,11 @@ class Crypt_RC2 extends Crypt_Base
      * @param int $mode
      * @access public
      */
-    function Crypt_RC2($mode = CRYPT_RC2_MODE_CBC)
+    function __construct($mode = CRYPT_RC2_MODE_CBC)
     {
-        parent::Crypt_Base($mode);
+//        parent::Crypt_Base($mode);
+        parent::__construct($mode);
+
     }
 
     /**
diff --git a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Crypt/RC4.php b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Crypt/RC4.php
index eccf682c1..8039274ce 100644
--- a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Crypt/RC4.php
+++ b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Crypt/RC4.php
@@ -161,9 +161,11 @@ class Crypt_RC4 extends Crypt_Base
      * @return Crypt_RC4
      * @access public
      */
-    function Crypt_RC4()
+    function __construct()
     {
-        parent::Crypt_Base(CRYPT_MODE_STREAM);
+//        parent::Crypt_Base(CRYPT_MODE_STREAM);
+        parent::__construct(CRYPT_MODE_STREAM);
+
     }
 
     /**
diff --git a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Crypt/RSA.php b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Crypt/RSA.php
index b292d0a51..19bc3bf0a 100644
--- a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Crypt/RSA.php
+++ b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Crypt/RSA.php
@@ -491,7 +491,7 @@ class Crypt_RSA
      * @return Crypt_RSA
      * @access public
      */
-    function Crypt_RSA()
+    function __construct()
     {
         if (!class_exists('Math_BigInteger')) {
             include_once 'Math/BigInteger.php';
diff --git a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Crypt/Rijndael.php b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Crypt/Rijndael.php
index b84166b51..3f6ca77de 100644
--- a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Crypt/Rijndael.php
+++ b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Crypt/Rijndael.php
@@ -264,9 +264,11 @@ class Crypt_Rijndael extends Crypt_Base
      * @param int $mode
      * @access public
      */
-    function Crypt_Rijndael($mode = CRYPT_RIJNDAEL_MODE_CBC)
+    function __construct($mode = CRYPT_RIJNDAEL_MODE_CBC)
     {
-        parent::Crypt_Base($mode);
+//        parent::Crypt_Base($mode);
+        parent::__construct($mode);
+
     }
 
     /**
diff --git a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Crypt/TripleDES.php b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Crypt/TripleDES.php
index a878918b7..77df42d97 100644
--- a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Crypt/TripleDES.php
+++ b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Crypt/TripleDES.php
@@ -196,13 +196,15 @@ class Crypt_TripleDES extends Crypt_DES
      * @param int $mode
      * @access public
      */
-    function Crypt_TripleDES($mode = CRYPT_MODE_CBC)
+    function __construct($mode = CRYPT_MODE_CBC)
     {
         switch ($mode) {
             // In case of CRYPT_DES_MODE_3CBC, we init as CRYPT_DES_MODE_CBC
             // and additional flag us internally as 3CBC
             case CRYPT_DES_MODE_3CBC:
-                parent::Crypt_Base(CRYPT_MODE_CBC);
+//                parent::Crypt_Base(CRYPT_MODE_CBC);
+                parent::__construct(CRYPT_MODE_CBC);
+
                 $this->mode_3cbc = true;
 
                 // This three $des'es will do the 3CBC work (if $key > 64bits)
@@ -219,7 +221,9 @@ function Crypt_TripleDES($mode = CRYPT_MODE_CBC)
                 break;
             // If not 3CBC, we init as usual
             default:
-                parent::Crypt_Base($mode);
+//                parent::Crypt_Base($mode);
+                parent::__construct($mode);
+
         }
     }
 
diff --git a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/File/ANSI.php b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/File/ANSI.php
index 95acf3747..af3798e32 100644
--- a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/File/ANSI.php
+++ b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/File/ANSI.php
@@ -179,7 +179,7 @@ class File_ANSI
      * @return File_ANSI
      * @access public
      */
-    function File_ANSI()
+    function __construct()
     {
         $attr_cell = new stdClass();
         $attr_cell->bold = false;
diff --git a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/File/ASN1.php b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/File/ASN1.php
index f5c3e4483..a776caf27 100644
--- a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/File/ASN1.php
+++ b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/File/ASN1.php
@@ -131,7 +131,7 @@ class File_ASN1_Element
      * @return File_ASN1_Element
      * @access public
      */
-    function File_ASN1_Element($encoded)
+    function __construct($encoded)
     {
         $this->element = $encoded;
     }
@@ -245,7 +245,7 @@ class File_ASN1
      *
      * @access public
      */
-    function File_ASN1()
+    function __construct()
     {
         static $static_init = null;
         if (!$static_init) {
diff --git a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/File/X509.php b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/File/X509.php
index 63a8a2314..dd01f5edd 100644
--- a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/File/X509.php
+++ b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/File/X509.php
@@ -317,7 +317,7 @@ class File_X509
      * @return File_X509
      * @access public
      */
-    function File_X509()
+    function __construct()
     {
         if (!class_exists('Math_BigInteger')) {
             include_once 'Math/BigInteger.php';
diff --git a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Math/BigInteger.php b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Math/BigInteger.php
index d09677ac9..2a8f03302 100644
--- a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Math/BigInteger.php
+++ b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Math/BigInteger.php
@@ -243,7 +243,7 @@ class Math_BigInteger
      * @return Math_BigInteger
      * @access public
      */
-    function Math_BigInteger($x = 0, $base = 10)
+    function __construct($x = 0, $base = 10)
     {
         if (!defined('MATH_BIGINTEGER_MODE')) {
             switch (true) {
diff --git a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Net/SCP.php b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Net/SCP.php
index 60b67f32a..fdbf091bb 100644
--- a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Net/SCP.php
+++ b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Net/SCP.php
@@ -122,7 +122,7 @@ class Net_SCP
      * @return Net_SCP
      * @access public
      */
-    function Net_SCP($ssh)
+    function __construct($ssh)
     {
         if (!is_object($ssh)) {
             return;
diff --git a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Net/SFTP.php b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Net/SFTP.php
index 4840f2692..be6343961 100644
--- a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Net/SFTP.php
+++ b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Net/SFTP.php
@@ -288,9 +288,11 @@ class Net_SFTP extends Net_SSH2
      * @return Net_SFTP
      * @access public
      */
-    function Net_SFTP($host, $port = 22, $timeout = 10)
+    function __construct($host, $port = 22, $timeout = 10)
     {
-        parent::Net_SSH2($host, $port, $timeout);
+//        parent::Net_SSH2($host, $port, $timeout);
+        parent::__construct($host, $port, $timeout);
+
 
         $this->max_sftp_packet = 1 << 15;
 
diff --git a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Net/SFTP/Stream.php b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Net/SFTP/Stream.php
index e374b9b94..a944d7f0a 100644
--- a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Net/SFTP/Stream.php
+++ b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Net/SFTP/Stream.php
@@ -146,7 +146,7 @@ static function register($protocol = 'sftp')
      *
      * @access public
      */
-    function Net_SFTP_Stream()
+    function __construct()
     {
         if (defined('NET_SFTP_STREAM_LOGGING')) {
             echo "__construct()\r\n";
diff --git a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Net/SSH1.php b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Net/SSH1.php
index d50a9931f..d07065f2f 100644
--- a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Net/SSH1.php
+++ b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Net/SSH1.php
@@ -515,7 +515,7 @@ class Net_SSH1
      * @return Net_SSH1
      * @access public
      */
-    function Net_SSH1($host, $port = 22, $timeout = 10, $cipher = NET_SSH1_CIPHER_3DES)
+    function __construct($host, $port = 22, $timeout = 10, $cipher = NET_SSH1_CIPHER_3DES)
     {
         if (!class_exists('Math_BigInteger')) {
             include_once 'Math/BigInteger.php';
diff --git a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Net/SSH2.php b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Net/SSH2.php
index 87e07525c..79e07cba5 100644
--- a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Net/SSH2.php
+++ b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/Net/SSH2.php
@@ -883,7 +883,7 @@ class Net_SSH2
      * @return Net_SSH2
      * @access public
      */
-    function Net_SSH2($host, $port = 22, $timeout = 10)
+    function __construct($host, $port = 22, $timeout = 10)
     {
         // Include Math_BigInteger
         // Used to do Diffie-Hellman key exchange and DSA/RSA signature verification.
diff --git a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/System/SSH/Agent.php b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/System/SSH/Agent.php
index 0f4874dc7..54474871f 100644
--- a/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/System/SSH/Agent.php
+++ b/xoops_trust_path/modules/xupdate/class/ftp/phpseclib/System/SSH/Agent.php
@@ -130,7 +130,7 @@ class System_SSH_Agent_Identity
      * @return System_SSH_Agent_Identity
      * @access private
      */
-    function System_SSH_Agent_Identity($fsock)
+    function __construct($fsock)
     {
         $this->fsock = $fsock;
     }
@@ -269,7 +269,7 @@ class System_SSH_Agent
      * @return System_SSH_Agent
      * @access public
      */
-    function System_SSH_Agent()
+    function __construct()
     {
         switch (true) {
             case isset($_SERVER['SSH_AUTH_SOCK']):
diff --git a/xoops_trust_path/modules/xupdate/class/handler/Store.class.php b/xoops_trust_path/modules/xupdate/class/handler/Store.class.php
index a516e2f4f..a2adfba56 100644
--- a/xoops_trust_path/modules/xupdate/class/handler/Store.class.php
+++ b/xoops_trust_path/modules/xupdate/class/handler/Store.class.php
@@ -56,7 +56,8 @@ class Xupdate_StoreHandler extends XoopsObjectGenericHandler
     public function __construct(/*** XoopsDatabase ***/ &$db, /*** string ***/ $dirname)
     {
         $this->mTable = strtr($this->mTable, array('{dirname}' => $dirname));
-        parent::XoopsObjectGenericHandler($db);
+//        parent::XoopsObjectGenericHandler($db);
+        parent::__construct($db);
         $configHandler = & xoops_gethandler('config');
         $module_config = $configHandler->getConfigsByDirname($dirname);
         $this->cacheCheckFile = XOOPS_TRUST_PATH . '/' . trim($module_config['temp_path'], '/') . '/' . rawurlencode(substr(XOOPS_URL, 7)).'_cacheCheck.ini.php';