Merge branch 'release/2.0.3'

svanschu · Apr 15, 2021 · 63b79e3 · 63b79e3
2 parents 3f826e1 + 2a76e7d
commit 63b79e3
Show file tree

Hide file tree

Showing 42 changed files with 232 additions and 93 deletions.
diff --git a/build/builder.xml b/build/builder.xml
@@ -14,7 +14,12 @@
      <!-- Version number of build -->
     <property name="build.version" value="0.0.0" override="true" />
     <!-- get the date for build -->
-    <tstamp prefix="build.date" />
+    <tstamp prefix="build.date">
+        <format property="DATE" pattern="%d. %B %Y" locale="en_GB"/>
+    </tstamp>
+    <tstamp prefix="build.year">
+        <format property="DATE" pattern="%Y"/>
+    </tstamp>
     <!-- Set the directory where the packages should be saved. Relative to the build dir -->
     <property name="builddir" value="./../../packages/${extension_name}" override="true" />
     <!-- Declare Project src files -->
@@ -50,12 +55,13 @@
         <!-- insert version, date into the xml files -->
         <reflexive>
             <fileset dir="${builddir}/tmp/">
-                <include name="**/mod_sw_kbirthday.xml" />
+                <include name="**" />
             </fileset>
             <filterchain>
                 <replaceregexp>
                     <regexp pattern="sw\.build\.version" replace="${build.version}" />
-                    <regexp pattern="sw\.build\.date" replace="${build.date.DSTAMP}" />
+                    <regexp pattern="sw\.build\.date" replace="${build.date.DATE}" />
+                    <regexp pattern="sw\.build\.year" replace="${build.year.DATE}" />
                 </replaceregexp>
             </filterchain>
         </reflexive>

diff --git a/src/mod_sw_kbirthday/css/calendar.css b/src/mod_sw_kbirthday/css/calendar.css
@@ -1,7 +1,7 @@
 /**
  * @package SW KBirthday Module
  *
- * @Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+ * @Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
  * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
  * @link http://www.schultschik.de
  **/

diff --git a/src/mod_sw_kbirthday/helper.php b/src/mod_sw_kbirthday/helper.php
@@ -2,7 +2,7 @@
 /**
  * @package SW KBirthday Module
  *
- * @Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+ * @Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
  * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
  * @link http://www.schultschik.de
  **/

diff --git a/src/mod_sw_kbirthday/helper/default.php b/src/mod_sw_kbirthday/helper/default.php
@@ -2,7 +2,7 @@
 /**
  * @package SW KBirthday Module
  *
- * @Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+ * @Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
  * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
  * @link http://www.schultschik.de
  **/

diff --git a/src/mod_sw_kbirthday/helper/forum.php b/src/mod_sw_kbirthday/helper/forum.php
@@ -2,7 +2,7 @@
 /**
  * @package SW KBirthday Module
  *
- * @Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+ * @Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
  * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
  * @link http://www.schultschik.de
  **/
@@ -35,8 +35,7 @@ public function getUserLink(& $user)
         $integration = $this->params->get('integration');
         if ( !($integration == 'jomsocial' || $integration == 'comprofiler' || $fail )) {
             $username = KunenaFactory::getUser($user['userid'])->getName();
-            //DEBUG
-            //print_r($user['birthdate']->format('Y-m-d').': '.$user['birthdate']->format('z') .'+'. $user['correction'] .' == '. ($this->time_now->format('z')) .'<br />');
+
             if (($user['birthdate']->format('z') + $user['correction']) == $this->time_now->format('z')) {
                 $db = JFactory::getDBO();
                 $query = $db->getQuery(true);
@@ -47,10 +46,10 @@ public function getUserLink(& $user)
                 $db->setQuery($query, 0, 1);
                 $post = $db->loadAssoc();
                 $catid = $this->params->get('bcatid');
-                $postyear = new JDate($post['year'], $this->soffset);
-                //DEBUG
-                //print_r($postyear->format('Y', true) .' '. $this->time_now->format('Y', true));
-                //print_r('Empty Post = ' . empty($post) . '-->' . $post);
+
+                if (!empty($post))
+                    $postyear = new JDate($post['year'], $this->soffset);
+
                 if (empty($post) && !empty($catid) ||
                     !empty($post) && !empty($catid) && $postyear->format('Y', true) < $this->time_now->format('Y', true)
                 ) {

diff --git a/src/mod_sw_kbirthday/helper/integration/comprofiler.php b/src/mod_sw_kbirthday/helper/integration/comprofiler.php
@@ -2,7 +2,7 @@
 /**
  * @package SW KBirthday Module
  *
- * @Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+ * @Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
  * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
  * @link http://www.schultschik.de
  **/

diff --git a/src/mod_sw_kbirthday/helper/integration/integration.php b/src/mod_sw_kbirthday/helper/integration/integration.php
@@ -2,7 +2,7 @@
 /**
  * @package SW KBirthday Module
  *
- * @Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+ * @Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
  * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
  * @link http://www.schultschik.de
  **/

diff --git a/src/mod_sw_kbirthday/helper/integration/jomsocial.php b/src/mod_sw_kbirthday/helper/integration/jomsocial.php
@@ -2,7 +2,7 @@
 /**
  * @package SW KBirthday Module
  *
- * @Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+ * @Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
  * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
  * @link http://www.schultschik.de
  **/

diff --git a/src/mod_sw_kbirthday/helper/integration/kunena.php b/src/mod_sw_kbirthday/helper/integration/kunena.php
@@ -2,7 +2,7 @@
 /**
  * @package SW KBirthday Module
  *
- * @Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+ * @Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
  * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
  * @link http://www.schultschik.de
  **/

diff --git a/src/mod_sw_kbirthday/helper/mail.php b/src/mod_sw_kbirthday/helper/mail.php
@@ -2,7 +2,7 @@
 /**
  * @package SW KBirthday Module
  *
- * @Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+ * @Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
  * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
  * @link http://www.schultschik.de
  **/

diff --git a/src/mod_sw_kbirthday/helper/profil.php b/src/mod_sw_kbirthday/helper/profil.php
@@ -2,7 +2,7 @@
 /**
  * @package SW KBirthday Module
  *
- * @Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+ * @Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
  * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
  * @link http://www.schultschik.de
  **/

diff --git a/src/mod_sw_kbirthday/img/birthday.png b/src/mod_sw_kbirthday/img/birthday.png
diff --git a/src/mod_sw_kbirthday/install.script.php b/src/mod_sw_kbirthday/install.script.php
@@ -2,7 +2,7 @@
 /**
  * @package SW KBirthday Module
  *
- * @Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+ * @Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
  * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
  * @link http://www.schultschik.de
  **/

diff --git a/src/mod_sw_kbirthday/language/da-DK/da-DK.mod_sw_kbirthday.ini b/src/mod_sw_kbirthday/language/da-DK/da-DK.mod_sw_kbirthday.ini
@@ -1,6 +1,6 @@
 ; package SW KBirthday Module
 ;
-; Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+; Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
 ; license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 ; link http://www.schultschik.de
 ; Note: All language files have to be saved as UTF-8

diff --git a/src/mod_sw_kbirthday/language/da-DK/da-DK.mod_sw_kbirthday.sys.ini b/src/mod_sw_kbirthday/language/da-DK/da-DK.mod_sw_kbirthday.sys.ini
@@ -1,6 +1,6 @@
 ; SW KBirthday Module
 ;
-; Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+; Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
 ; license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 ; link http://www.schultschik.de
 ; Note: All language files have to saved as UTF-8

diff --git a/src/mod_sw_kbirthday/language/de-DE/de-DE.mod_sw_kbirthday.ini b/src/mod_sw_kbirthday/language/de-DE/de-DE.mod_sw_kbirthday.ini
@@ -1,6 +1,6 @@
 ; package SW KBirthday Module
 ;
-; Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+; Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
 ; license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 ; link http://www.schultschik.de
 ; Note: All language files have to be saved as UTF-8

diff --git a/src/mod_sw_kbirthday/language/de-DE/de-DE.mod_sw_kbirthday.sys.ini b/src/mod_sw_kbirthday/language/de-DE/de-DE.mod_sw_kbirthday.sys.ini
@@ -1,6 +1,6 @@
 ; SW KBirthday Module
 ;
-; Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+; Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
 ; license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 ; link http://www.schultschik.de
 ; Note: All language files have to saved as UTF-8

diff --git a/src/mod_sw_kbirthday/language/el-GR/el-GR.mod_sw_kbirthday.ini b/src/mod_sw_kbirthday/language/el-GR/el-GR.mod_sw_kbirthday.ini
@@ -1,6 +1,6 @@
 ; package SW KBirthday Module
 ;
-; Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+; Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
 ; license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 ; link http://www.schultschik.de
 ; Note: All language files have to be saved as UTF-8

diff --git a/src/mod_sw_kbirthday/language/el-GR/el-GR.mod_sw_kbirthday.sys.ini b/src/mod_sw_kbirthday/language/el-GR/el-GR.mod_sw_kbirthday.sys.ini
@@ -1,6 +1,6 @@
 ; SW KBirthday Module
 ;
-; Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+; Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
 ; license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 ; link http://www.schultschik.de
 ; Note: All language files have to saved as UTF-8

diff --git a/src/mod_sw_kbirthday/language/en-GB/en-GB.mod_sw_kbirthday.ini b/src/mod_sw_kbirthday/language/en-GB/en-GB.mod_sw_kbirthday.ini
@@ -1,6 +1,6 @@
 ; package SW KBirthday Module
 ;
-; Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+; Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
 ; license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 ; link http://www.schultschik.de
 ; Note: All language files have to be saved as UTF-8

diff --git a/src/mod_sw_kbirthday/language/en-GB/en-GB.mod_sw_kbirthday.sys.ini b/src/mod_sw_kbirthday/language/en-GB/en-GB.mod_sw_kbirthday.sys.ini
@@ -1,6 +1,6 @@
 ; SW KBirthday Module
 ;
-; Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+; Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
 ; license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 ; link http://www.schultschik.de
 ; Note: All language files have to saved as UTF-8

diff --git a/src/mod_sw_kbirthday/language/es-ES/es-ES.mod_sw_kbirthday.ini b/src/mod_sw_kbirthday/language/es-ES/es-ES.mod_sw_kbirthday.ini
@@ -1,6 +1,6 @@
 ; package SW KBirthday Module
 ;
-; Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+; Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
 ; license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 ; link http://www.schultschik.de
 ; Note: All language files have to be saved as UTF-8

diff --git a/src/mod_sw_kbirthday/language/es-ES/es-ES.mod_sw_kbirthday.sys.ini b/src/mod_sw_kbirthday/language/es-ES/es-ES.mod_sw_kbirthday.sys.ini
@@ -1,6 +1,6 @@
 ; SW KBirthday Module
 ;
-; Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+; Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
 ; license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 ; link http://www.schultschik.de
 ; Note: All language files have to saved as UTF-8

diff --git a/src/mod_sw_kbirthday/language/fi-FI/fi-FI.mod_sw_kbirthday.ini b/src/mod_sw_kbirthday/language/fi-FI/fi-FI.mod_sw_kbirthday.ini
@@ -1,6 +1,6 @@
 ; package SW KBirthday Module
 ;
-; Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+; Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
 ; license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 ; link http://www.schultschik.de
 ; Note: All language files have to be saved as UTF-8

diff --git a/src/mod_sw_kbirthday/language/fi-FI/fi-FI.mod_sw_kbirthday.sys.ini b/src/mod_sw_kbirthday/language/fi-FI/fi-FI.mod_sw_kbirthday.sys.ini
@@ -1,6 +1,6 @@
 ; SW KBirthday Module
 ;
-; Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+; Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
 ; license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 ; link http://www.schultschik.de
 ; Note: All language files have to saved as UTF-8

diff --git a/src/mod_sw_kbirthday/language/nl-NL/nl-NL.mod_sw_kbirthday.ini b/src/mod_sw_kbirthday/language/nl-NL/nl-NL.mod_sw_kbirthday.ini
@@ -1,6 +1,6 @@
 ; package SW KBirthday Module
 ;
-; Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+; Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
 ; license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 ; link http://www.schultschik.de
 ; Note: All language files have to be saved as UTF-8

diff --git a/src/mod_sw_kbirthday/language/nl-NL/nl-NL.mod_sw_kbirthday.sys.ini b/src/mod_sw_kbirthday/language/nl-NL/nl-NL.mod_sw_kbirthday.sys.ini
@@ -1,6 +1,6 @@
 ; SW KBirthday Module
 ;
-; Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+; Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
 ; license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 ; link http://www.schultschik.de
 ; Note: All language files have to saved as UTF-8

diff --git a/src/mod_sw_kbirthday/language/pl_PL/pl_PL.mod_sw_kbirthday.ini b/src/mod_sw_kbirthday/language/pl_PL/pl_PL.mod_sw_kbirthday.ini
@@ -1,6 +1,6 @@
 ; package SW KBirthday Module
 ;
-; Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+; Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
 ; license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 ; link http://www.schultschik.de
 ; Note: All language files have to be saved as UTF-8

diff --git a/src/mod_sw_kbirthday/language/pl_PL/pl_PL.mod_sw_kbirthday.sys.ini b/src/mod_sw_kbirthday/language/pl_PL/pl_PL.mod_sw_kbirthday.sys.ini
@@ -1,6 +1,6 @@
 ; SW KBirthday Module
 ;
-; Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+; Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
 ; license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 ; link http://www.schultschik.de
 ; Note: All language files have to saved as UTF-8

diff --git a/src/mod_sw_kbirthday/language/pt-PT/pt-PT.mod_sw_kbirthday.ini b/src/mod_sw_kbirthday/language/pt-PT/pt-PT.mod_sw_kbirthday.ini
@@ -1,6 +1,6 @@
 ; package SW KBirthday Module
 ;
-; Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+; Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
 ; license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 ; link http://www.schultschik.de
 ; Note: All language files have to be saved as UTF-8

diff --git a/src/mod_sw_kbirthday/language/pt-PT/pt-PT.mod_sw_kbirthday.sys.ini b/src/mod_sw_kbirthday/language/pt-PT/pt-PT.mod_sw_kbirthday.sys.ini
@@ -1,6 +1,6 @@
 ; SW KBirthday Module
 ;
-; Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+; Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
 ; license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 ; link http://www.schultschik.de
 ; Note: All language files have to saved as UTF-8

diff --git a/src/mod_sw_kbirthday/language/ru-RU/ru-RU.mod_sw_kbirthday.ini b/src/mod_sw_kbirthday/language/ru-RU/ru-RU.mod_sw_kbirthday.ini
@@ -1,6 +1,6 @@
 ; package SW KBirthday Module
 ;
-; Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+; Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
 ; license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 ; link http://www.schultschik.de
 ; Note: All language files have to be saved as UTF-8

diff --git a/src/mod_sw_kbirthday/language/ru-RU/ru-RU.mod_sw_kbirthday.sys.ini b/src/mod_sw_kbirthday/language/ru-RU/ru-RU.mod_sw_kbirthday.sys.ini
@@ -1,6 +1,6 @@
 ; SW KBirthday Module
 ;
-; Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+; Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
 ; license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 ; link http://www.schultschik.de
 ; Note: All language files have to saved as UTF-8

diff --git a/src/mod_sw_kbirthday/language/sv-SE/sv-SE.mod_sw_kbirthday.ini b/src/mod_sw_kbirthday/language/sv-SE/sv-SE.mod_sw_kbirthday.ini
@@ -1,6 +1,6 @@
 ; package SW KBirthday Module
 ;
-; Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+; Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
 ; license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 ; link http://www.schultschik.de
 ; Note: All language files have to be saved as UTF-8

diff --git a/src/mod_sw_kbirthday/language/sv-SE/sv-SE.mod_sw_kbirthday.sys.ini b/src/mod_sw_kbirthday/language/sv-SE/sv-SE.mod_sw_kbirthday.sys.ini
@@ -1,6 +1,6 @@
 ; SW KBirthday Module
 ;
-; Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+; Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
 ; license http://www.gnu.org/copyleft/gpl.html GNU/GPL
 ; link http://www.schultschik.de
 ; Note: All language files have to saved as UTF-8

diff --git a/src/mod_sw_kbirthday/mod_sw_kbirthday.php b/src/mod_sw_kbirthday/mod_sw_kbirthday.php
@@ -2,7 +2,7 @@
 /**
  * @package SW KBirthday Module
  *
- * @Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+ * @Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
  * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
  * @link http://www.schultschik.de
  **/

diff --git a/src/mod_sw_kbirthday/mod_sw_kbirthday.xml b/src/mod_sw_kbirthday/mod_sw_kbirthday.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<extension type="module" version="1.6.0" client="site" method="upgrade">
+<extension type="module" version="3.9" client="site" method="upgrade">
     <name>mod_sw_kbirthday</name>
     <creationDate>sw.build.date</creationDate>
     <author>Sven Schultschik</author>
@@ -21,7 +21,6 @@
         <folder>tmpl</folder>
     </files>
     <media destination="mod_sw_kbirthday">
-        <filename>img/birthday.png</filename>
         <filename>img/birthday16x16.png</filename>
     </media>
     <languages folder="language">
@@ -223,7 +222,6 @@
         </fields>
     </config>
     <updateservers>
-        <!-- Note: No spaces or linebreaks allowed between the server tags -->
         <server type="extension" priority="1" name="SchuWeb Birthday Module">https://raw.githubusercontent.com/svanschu/KBirthday/master/update/update.xml</server>
     </updateservers>
 </extension>
diff --git a/src/mod_sw_kbirthday/tmpl/default.php b/src/mod_sw_kbirthday/tmpl/default.php
@@ -2,7 +2,7 @@
 /**
  * @package SW KBirthday Module
  *
- * @Copyright (C) 2010-2013 Schultschik Websolution All rights reserved
+ * @Copyright (C) 2010-2021 Sven Schultschik. All rights reserved
  * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
  * @link http://www.schultschik.de
  **/