Cleaning Up

.travis.yml

@@ -22,7 +22,6 @@ before_script:
   - mysql -e 'create database xoops_test;'
   - php console/console.php ci-bootstrap
   - php console/console.php ci-install
-  - php console/console.php install-module xmf
   - php console/console.php install-module avatars
   - php console/console.php install-module userrank
   - php console/console.php install-module page

htdocs/class/pagenav.php

@@ -165,10 +165,11 @@ public function renderNav($offset = 4, $size = "", $align = "right", $prev_text
                 $size = '';
         }
         $xoops->tpl()->assign('size', $size);
+
         $xoops->tpl()->assign('align', ' pagination-' . $align);
         $xoops->tpl()->assign('pagination_nav', true);
         $ret = $xoops->tpl()->fetch('module:system/system_pagenav.tpl');
-        $xoops->tpl()->clearAssign('xo_nav');
+        $xoops->tpl()->assign('xo_nav');
         return $ret;
     }
 
@@ -208,7 +209,7 @@ public function renderSelect($align = "right", $showbutton = false)
         $xoops->tpl()->assign('showbutton', $showbutton);
         $xoops->tpl()->assign('align', ' pagination-' . $align);
         $ret = $xoops->tpl()->fetch('module:system/system_pagenav.tpl');
-        $xoops->tpl()->clearAssign('xo_select');
+        $xoops->tpl()->assign('xo_select');
         return $ret;
     }
 

htdocs/class/xoopsmultimailer.php

@@ -29,11 +29,10 @@
  * @author    Author: Jochen Bünnagel <job@buennagel.com>
  * @copyright 2013 XOOPS Project (http://xoops.org)
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @version   $Id$
  * @link      http://xoops.org
  * @since     2.6.0
  */
-class XoopsMultiMailer extends PHPMailer
+class XoopsMultiMailer extends PHPMailer // for 6.0 \PHPMailer\PHPMailer\PHPMailer
 {
     /**
      * 'from' address
@@ -114,6 +113,7 @@ class XoopsMultiMailer extends PHPMailer
      */
     public function __construct()
     {
+        parent::__construct();
         $xoops = Xoops::getInstance();
         $this->From = $xoops->getConfig('from');
         if ($this->From == '') {

htdocs/install/include/config.php

@@ -182,7 +182,6 @@
     'smilies',
     'thumbs',
     'userrank',
-//    'xmf',
 );
 
 // xoops_lib, xoops_data directories

htdocs/install/page_siteinit.php

@@ -64,7 +64,6 @@ function exception_handler($exception)
     $_SESSION['error'] = $system_module->error;
     //$sql = $xoops->db()->getConfiguration()->getSQLLogger()->queries;
 }
-$system_module->install('xmf');
 $pageHasForm = true;
 $pageHasHelp = false;
 

htdocs/language/english/xmf.php

@@ -0,0 +1,8 @@
+<?php
+
+define('_AM_XMF_MODULE_NOTFOUND','Please install or reactivate %1$s module. Minimum version required: %2$s');
+define('_AM_XMF_MODULE_VERSION','Minimum %1$s module version required: %2$s (your version is %3$s)');
+define('_AM_XMF_MODULE_INSTALLED', 'The module \'%s\' is installed!');
+define('_AM_XMF_MODULE_NOT_INSTALLED', 'The module \'%s\' is not installed!');
+
+define('_DB_XMF_TABLE_IS_NOT_DEFINED','Table is not defined');

htdocs/modules/avatars/class/AvatarsProvider.php

@@ -123,7 +123,7 @@ public function getAvatarEditUrl($response, XoopsUser $userinfo)
     {
         $noInfo = true;
         if ($userinfo instanceof XoopsUser) {
-            $link = $this->xoops_url . '/modules/avatars/editavatar.php';
+            $link = $this->xoops_url . '/modules/avatars/include/editavatar.php';
             $response->setValue($link);
             $noInfo = false;
         }

htdocs/modules/avatars/editavatar.php → htdocs/modules/avatars/include/editavatar.php

@@ -22,10 +22,11 @@
  * @version         $Id$
  */
 
-include dirname(dirname(__DIR__)) . '/mainfile.php';
+include dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
 
 $xoops = Xoops::getInstance();
-$helper = Avatars::getInstance();
+$helper = $xoops->getModuleHelper('avatars');
+$helper->loadLocale();
 
 // Get Action type
 $op = Request::getCmd('op', 'list');
@@ -60,22 +61,21 @@
 }
 
 switch ($op) {
-
     case 'list':
     default:
         $xoops->tpl()->assign('uid', $xoops->user->getVar("uid"));
         $xoops->tpl()->assign('info_msg', $xoops->alert('info', $info_msg, XoopsLocale::INFORMATION_FOR_UPLOADS));
         $oldavatar = $xoops->user->getVar('user_avatar');
         if (!empty($oldavatar) && $oldavatar !== 'blank.gif') {
             $warning_msg = '<p>' . AvatarsLocale::ALERT_WARNING_OLD .'</p>';
-			$xoops_upload_url = \XoopsBaseConfig::get('uploads-url');
+            $xoops_upload_url = \XoopsBaseConfig::get('uploads-url');
             $warning_msg .= "<img src='" . $xoops_upload_url . '/' . $oldavatar ."' alt='&nbsp;' />";
             $xoops->tpl()->assign('warning_msg', $xoops->alert('warning', $warning_msg, XoopsLocale::WARNING));
         }
 
         // Create form
         $obj = $avatar_Handler->create();
-        $form = $xoops->getModuleForm($obj, 'avatar_user');
+        $form = $xoops->getModuleForm($obj, 'avatar_user', 'avatars');
         // Assign form
         $xoops->tpl()->assign('form', $form->render());
         break;
@@ -117,7 +117,7 @@
                         $avatars = $avatar_Handler->getObjects($criteria);
                         if (! empty($avatars) && count($avatars) == 1 && is_object($avatars[0])) {
                             $avatar_Handler->delete($avatars[0]);
-							$xoops_upload_path = \XoopsBaseConfig::get('uploads-path');
+                            $xoops_upload_path = \XoopsBaseConfig::get('uploads-path');
                             $oldavatar_path = realpath($xoops_upload_path . '/' . $oldavatar);
                             if (0 === strpos($oldavatar_path, realpath($xoops_upload_path))
                                 && is_file($oldavatar_path)
@@ -156,7 +156,7 @@
             $avatars = $avatar_Handler->getObjects($criteria);
             if (!empty($avatars) && count($avatars) == 1 && is_object($avatars[0])) {
                 $avatar_Handler->delete($avatars[0]);
-				$xoops_upload_path = \XoopsBaseConfig::get('uploads-path');
+                $xoops_upload_path = \XoopsBaseConfig::get('uploads-path');
                 $oldavatar_path = realpath($xoops_upload_path . '/' . $oldavatar);
                 if (0 === strpos($oldavatar_path, realpath($xoops_upload_path)) && is_file($oldavatar_path)) {
                     unlink($oldavatar_path);