Merge pull request #45 from mambax7/master

https
XOOPS · Mar 19, 2018 · 6b553ba · 6b553ba
2 parents 5422c11 + b9d293f
commit 6b553ba
Show file tree

Hide file tree

Showing 39 changed files with 80 additions and 76 deletions.
diff --git a/README.md b/README.md
@@ -1,8 +1,12 @@
-XMF
+XMF (XOOPS Module Framework)
 ===
 
-This is the XOOPS Module Framework for XOOPS 2.5.x
+This is the XOOPS Module Framework for XOOPS 2.5.x and XOOPS 2.6.x
 
 XOOPS Module Framework is a selection of classes and supporting files intended to help simplify
 many of the routine tasks commonly needed in module development. This simplification also gives
 you some degree of compatibility as you move your module from 2.5 to 2.6.
+
+Please visit us on https://xoops.org
+
+Current and upcoming "next generation" versions of XOOPS CMS are being crafted on GitHub at: https://github.com/XOOPS
diff --git a/_archive/include/bootstrap.php b/_archive/include/bootstrap.php
@@ -10,7 +10,7 @@
  */
 
 /**
- * @copyright       The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @copyright       XOOPS Project (https://xoops.org)
  * @license         GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
  * @package         Xmf
  * @since           0.1

diff --git a/_archive/preloads/core.php b/_archive/preloads/core.php
@@ -10,7 +10,7 @@
  */
 
 /**
- * @copyright       The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @copyright       XOOPS Project (https://xoops.org)
  * @license         GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
  * @package         Xmf
  * @since           0.1

diff --git a/_archive/src/Xmf/Loader.php b/_archive/src/Xmf/Loader.php
@@ -17,10 +17,10 @@
  * @category  Xmf\Loader
  * @package   Xmf
  * @author    trabis <[email protected]>
- * @copyright 2011-2016 XOOPS Project (http://xoops.org)
+ * @copyright 2011-2018 XOOPS Project (https://xoops.org)
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
  * @version   Release: 1.0
- * @link      http://xoops.org
+ * @link      https://xoops.org
  * @since     1.0
  */
 class Loader

diff --git a/_archive/src/Xmf/Template/AbstractTemplate.php b/_archive/src/Xmf/Template/AbstractTemplate.php
@@ -18,10 +18,10 @@
  * @package   Xmf
  * @author    trabis <[email protected]>
  * @author    The SmartFactory <www.smartfactory.ca>
- * @copyright 2011-2016 XOOPS Project (http://xoops.org)
+ * @copyright 2011-2018 XOOPS Project (https://xoops.org)
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
  * @version   Release: 1.0
- * @link      http://xoops.org
+ * @link      https://xoops.org
  * @since     1.0
  */
 abstract class AbstractTemplate

diff --git a/_archive/src/Xmf/Template/Breadcrumb.php b/_archive/src/Xmf/Template/Breadcrumb.php
@@ -18,10 +18,10 @@
  * @package   Xmf
  * @author    trabis <[email protected]>
  * @author    The SmartFactory <www.smartfactory.ca>
- * @copyright 2011-2016 XOOPS Project (http://xoops.org)
+ * @copyright 2011-2018 XOOPS Project (https://xoops.org)
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
  * @version   Release: 1.0
- * @link      http://xoops.org
+ * @link      https://xoops.org
  * @since     1.0
  */
 class Breadcrumb extends AbstractTemplate

diff --git a/_archive/src/Xmf/Template/Buttonbox.php b/_archive/src/Xmf/Template/Buttonbox.php
@@ -18,10 +18,10 @@
  * @package   Xmf
  * @author    Grégory Mage (Aka Mage)
  * @author    trabis <[email protected]>
- * @copyright 2011-2016 The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @copyright 2011-2016 XOOPS Project (https://xoops.org)
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
  * @version   Release: 1.0
- * @link      http://xoops.org
+ * @link      https://xoops.org
  * @since     1.0
  */
 class Buttonbox extends AbstractTemplate

diff --git a/_archive/src/Xmf/Template/Feed.php b/_archive/src/Xmf/Template/Feed.php
@@ -18,10 +18,10 @@
  * @package   Xmf
  * @author    trabis <[email protected]>
  * @author    The SmartFactory <www.smartfactory.ca>
- * @copyright 2011-2016 XOOPS Project (http://xoops.org)
+ * @copyright 2011-2018 XOOPS Project (https://xoops.org)
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
  * @version   Release: 1.0
- * @link      http://xoops.org
+ * @link      https://xoops.org
  * @since     1.0
  */
 class Feed extends AbstractTemplate

diff --git a/_archive/src/Xmf/Template/PrintContent.php b/_archive/src/Xmf/Template/PrintContent.php
@@ -18,10 +18,10 @@
  * @package   Xmf
  * @author    trabis <[email protected]>
  * @author    The SmartFactory <www.smartfactory.ca>
- * @copyright 2011-2016 XOOPS Project (http://xoops.org)
+ * @copyright 2011-2018 XOOPS Project (https://xoops.org)
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
  * @version   Release: 1.0
- * @link      http://xoops.org
+ * @link      https://xoops.org
  * @since     1.0
  */
 class PrintContent extends AbstractTemplate

diff --git a/_archive/src/Xmf/Utilities.php b/_archive/src/Xmf/Utilities.php
@@ -17,10 +17,10 @@
  * @category  Xmf\Utilities
  * @package   Xmf
  * @author    trabis <[email protected]>
- * @copyright 2011-2016 XOOPS Project (http://xoops.org)
+ * @copyright 2011-2018 XOOPS Project (https://xoops.org)
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
  * @version   Release: 1.0
- * @link      http://xoops.org
+ * @link      https://xoops.org
  * @since     1.0
  */
 class Utilities

diff --git a/_archive/xoops_version.php b/_archive/xoops_version.php
@@ -12,7 +12,7 @@
 /**
  * XOOPS version
  *
- * @copyright       The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @copyright       XOOPS Project (https://xoops.org)
  * @license         GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
  * @package         xmf
  * @since           0.1
@@ -48,7 +48,7 @@
 $modversion['release_date'] = "02/01/2016";
 
 $modversion['developer_lead'] = "geekwright";
-$modversion['developer_website_url'] = "http://xoops.org";
+$modversion['developer_website_url'] = "https://xoops.org";
 $modversion['developer_website_name'] = "Xoops";
 $modversion['developer_email'] = "[email protected]";
 

diff --git a/docs/license.md b/docs/license.md
@@ -1,7 +1,7 @@
 xmf - XOOPS Module Framework
 ============================
 
-**XMF is Copyright © 2011-2016 XOOPS Project**
+**XMF is Copyright © 2011-2018 XOOPS Project**
 
 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version.
 
@@ -11,4 +11,4 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 
 You should have received a copy of the GNU General Public License, and the GNU Lesser General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-You may contact the copyright holder through XOOPS Project: <http://xoops.org>
+You may contact the copyright holder through XOOPS Project: <https://xoops.org>
diff --git a/src/Assert.php b/src/Assert.php
@@ -19,9 +19,9 @@
  * @category  Xmf\Assert
  * @package   Xmf
  * @author    Richard Griffith <[email protected]>
- * @copyright 2017 XOOPS Project (http://xoops.org)
+ * @copyright 2017 XOOPS Project (https://xoops.org)
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @link      http://xoops.org
+ * @link      https://xoops.org
  */
 class Assert extends BaseAssertion
 {

diff --git a/src/Database/Migrate.php b/src/Database/Migrate.php
@@ -27,9 +27,9 @@
  * @category  Xmf\Database\Migrate
  * @package   Xmf
  * @author    Richard Griffith <[email protected]>
- * @copyright 2016 XOOPS Project (http://xoops.org)
+ * @copyright 2018 XOOPS Project (https://xoops.org)
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @link      http://xoops.org
+ * @link      https://xoops.org
  */
 class Migrate
 {

diff --git a/src/Database/TableLoad.php b/src/Database/TableLoad.php
@@ -21,9 +21,9 @@
  * @category  Xmf\Database\TableLoad
  * @package   Xmf
  * @author    Richard Griffith <[email protected]>
- * @copyright 2013-2016 XOOPS Project (http://xoops.org)
+ * @copyright 2013-2018 XOOPS Project (https://xoops.org)
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @link      http://xoops.org
+ * @link      https://xoops.org
  */
 class TableLoad
 {

diff --git a/src/Database/Tables.php b/src/Database/Tables.php
@@ -27,9 +27,9 @@
  * @category  Xmf\Database\Tables
  * @package   Xmf
  * @author    Richard Griffith <[email protected]>
- * @copyright 2011-2016 XOOPS Project (http://xoops.org)
+ * @copyright 2011-2018 XOOPS Project (https://xoops.org)
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @link      http://xoops.org
+ * @link      https://xoops.org
  */
 class Tables
 {

diff --git a/src/Debug.php b/src/Debug.php
@@ -18,9 +18,9 @@
  * @package   Xmf
  * @author    trabis <[email protected]>
  * @author    Richard Griffith <[email protected]>
- * @copyright 2011-2016 XOOPS Project (http://xoops.org)
+ * @copyright 2011-2018 XOOPS Project (https://xoops.org)
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @link      http://xoops.org
+ * @link      https://xoops.org
  */
 class Debug extends \Kint
 {

diff --git a/src/FilterInput.php b/src/FilterInput.php
@@ -28,9 +28,9 @@
  * @author    Richard Griffith <[email protected]>
  * @copyright 2005 Daniel Morris
  * @copyright 2005 - 2013 Open Source Matters, Inc. All rights reserved.
- * @copyright 2011-2016 XOOPS Project (http://xoops.org)
+ * @copyright 2011-2018 XOOPS Project (https://xoops.org)
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @link      http://xoops.org
+ * @link      https://xoops.org
  */
 class FilterInput
 {

diff --git a/src/Highlighter.php b/src/Highlighter.php
@@ -17,9 +17,9 @@
  * @category  Xmf\Highlighter
  * @package   Xmf
  * @author    Richard Griffith <[email protected]>
- * @copyright 2011-2016 XOOPS Project (http://xoops.org)
+ * @copyright 2011-2018 XOOPS Project (https://xoops.org)
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @link      http://xoops.org
+ * @link      https://xoops.org
  */
 class Highlighter
 {

diff --git a/src/IPAddress.php b/src/IPAddress.php
@@ -17,9 +17,9 @@
  * @category  Xmf\IPAddress
  * @package   Xmf
  * @author    trabis <[email protected]>
- * @copyright 2016 XOOPS Project (http://xoops.org)
+ * @copyright 2018 XOOPS Project (https://xoops.org)
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @link      http://xoops.org
+ * @link      https://xoops.org
  */
 class IPAddress
 {

diff --git a/src/Jwt/JsonWebToken.php b/src/Jwt/JsonWebToken.php
@@ -20,9 +20,9 @@
  * @category  Xmf\Jwt\JsonWebToken
  * @package   Xmf
  * @author    Richard Griffith <[email protected]>
- * @copyright 2016 XOOPS Project (http://xoops.org)
+ * @copyright 2018 XOOPS Project (https://xoops.org)
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @link      http://xoops.org
+ * @link      https://xoops.org
  */
 class JsonWebToken
 {

diff --git a/src/Key/ArrayStorage.php b/src/Key/ArrayStorage.php
@@ -19,9 +19,9 @@
  * @category  Xmf\Key\StorageInterface
  * @package   Xmf
  * @author    Richard Griffith <[email protected]>
- * @copyright 2016 XOOPS Project (http://xoops.org)
+ * @copyright 2018 XOOPS Project (https://xoops.org)
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @link      http://xoops.org
+ * @link      https://xoops.org
  */
 class ArrayStorage extends \ArrayObject implements StorageInterface
 {

diff --git a/src/Key/Basic.php b/src/Key/Basic.php
@@ -21,9 +21,9 @@
  * @category  Xmf\Key\Basic
  * @package   Xmf
  * @author    Richard Griffith <[email protected]>
- * @copyright 2016 XOOPS Project (http://xoops.org)
+ * @copyright 2018 XOOPS Project (https://xoops.org)
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @link      http://xoops.org
+ * @link      https://xoops.org
  */
 class Basic extends KeyAbstract
 {

diff --git a/src/Key/KeyAbstract.php b/src/Key/KeyAbstract.php
@@ -19,9 +19,9 @@
  * @category  Xmf\Key\KeyAbstract
  * @package   Xmf
  * @author    Richard Griffith <[email protected]>
- * @copyright 2016 XOOPS Project (http://xoops.org)
+ * @copyright 2018 XOOPS Project (https://xoops.org)
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @link      http://xoops.org
+ * @link      https://xoops.org
  */
 abstract class KeyAbstract
 {

diff --git a/src/Key/StorageInterface.php b/src/Key/StorageInterface.php
@@ -19,9 +19,9 @@
  * @category  Xmf\Key\StorageInterface
  * @package   Xmf
  * @author    Richard Griffith <[email protected]>
- * @copyright 2016 XOOPS Project (http://xoops.org)
+ * @copyright 2018 XOOPS Project (https://xoops.org)
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @link      http://xoops.org
+ * @link      https://xoops.org
  */
 interface StorageInterface
 {

diff --git a/src/Language.php b/src/Language.php
@@ -17,9 +17,9 @@
  * @category  Xmf\Language
  * @package   Xmf
  * @author    trabis <[email protected]>
- * @copyright 2011-2016 XOOPS Project (http://xoops.org)
+ * @copyright 2011-2018 XOOPS Project (https://xoops.org)
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @link      http://xoops.org
+ * @link      https://xoops.org
  */
 class Language
 {

diff --git a/src/Metagen.php b/src/Metagen.php
@@ -18,9 +18,9 @@
  * @package   Xmf
  * @author    Richard Griffith <[email protected]>
  * @author    trabis <[email protected]>
- * @copyright 2011-2016 XOOPS Project (http://xoops.org)
+ * @copyright 2011-2018 XOOPS Project (https://xoops.org)
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @link      http://xoops.org
+ * @link      https://xoops.org
  */
 class Metagen
 {

diff --git a/src/Module/Admin.php b/src/Module/Admin.php
@@ -23,9 +23,9 @@
  * @category  Xmf\Module\Admin
  * @package   Xmf
  * @author    Richard Griffith <[email protected]>
- * @copyright 2011-2016 XOOPS Project (http://xoops.org)
+ * @copyright 2011-2018 XOOPS Project (https://xoops.org)
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @link      http://xoops.org
+ * @link      https://xoops.org
  */
 class Admin
 {

diff --git a/src/Module/Helper.php b/src/Module/Helper.php
@@ -23,9 +23,9 @@
  * @package   Xmf
  * @author    trabis <[email protected]>
  * @author    Richard Griffith <[email protected]>
- * @copyright 2011-2016 XOOPS Project (http://xoops.org)
+ * @copyright 2011-2018 XOOPS Project (https://xoops.org)
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @link      http://xoops.org
+ * @link      https://xoops.org
  */
 class Helper extends GenericHelper
 {

diff --git a/src/Module/Helper/AbstractHelper.php b/src/Module/Helper/AbstractHelper.php
@@ -19,9 +19,9 @@
  * @package   Xmf
  * @author    trabis <[email protected]>
  * @author    Richard Griffith <[email protected]>
- * @copyright 2011-2018 XOOPS Project (http://xoops.org)
+ * @copyright 2016-2018 XOOPS Project (https://xoops.org)
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @link      http://xoops.org
+ * @link      https://xoops.org
  */
 abstract class AbstractHelper
 {

diff --git a/src/Module/Helper/Cache.php b/src/Module/Helper/Cache.php
@@ -21,9 +21,9 @@
  * @package   Xmf
  * @author    trabis <[email protected]>
  * @author    Richard Griffith <[email protected]>
- * @copyright 2011-2016 XOOPS Project (http://xoops.org)
+ * @copyright 2011-2018 XOOPS Project (https://xoops.org)
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @link      http://xoops.org
+ * @link      https://xoops.org
  */
 class Cache extends AbstractHelper
 {

diff --git a/src/Module/Helper/GenericHelper.php b/src/Module/Helper/GenericHelper.php
@@ -24,9 +24,9 @@
  * @package   Xmf
  * @author    trabis <[email protected]>
  * @author    Richard Griffith <[email protected]>
- * @copyright 2011-2018 XOOPS Project (http://xoops.org)
+ * @copyright 2016-2018 XOOPS Project (https://xoops.org)
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @link      http://xoops.org
+ * @link      https://xoops.org
  */
 abstract class GenericHelper extends AbstractHelper
 {