Adjusted the Licensing to GPL 3.0

Also, minor bug fixes.
michieal · Feb 10, 2022 · 16ab6eb · 16ab6eb
1 parent a12ec41
commit 16ab6eb
Show file tree

Hide file tree

Showing 9 changed files with 743 additions and 20 deletions.
diff --git a/MarkNotification/LICENSE.txt b/MarkNotification/LICENSE.txt
diff --git a/MarkNotification/actions/delnotif.php b/MarkNotification/actions/delnotif.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Open Source Social Network
+ * @link      https://www.opensource-socialnetwork.org/
+ * @package   MarkNotification
+ * @author    Michieal O'Sullivan
+ * @copyright (C) Apophis Software
+ * @license   GNU General Public License https://www.gnu.org/licenses/gpl-3.0.en.html
+ */
 require_once(__MARKNOTIFICATION__ . "libraries/marknotif.php");
 
 	 $guid = filter_var($_GET['guid'], FILTER_VALIDATE_INT);

diff --git a/MarkNotification/actions/marknotif.php b/MarkNotification/actions/marknotif.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Open Source Social Network
+ * @link      https://www.opensource-socialnetwork.org/
+ * @package   MarkNotification
+ * @author    Michieal O'Sullivan
+ * @copyright (C) Apophis Software
+ * @license   GNU General Public License https://www.gnu.org/licenses/gpl-3.0.en.html
+ */
 require_once(__MARKNOTIFICATION__ . "libraries/marknotif.php");
 
 $guid = filter_var($_GET['guid'], FILTER_VALIDATE_INT);

diff --git a/MarkNotification/actions/markunread.php b/MarkNotification/actions/markunread.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Open Source Social Network
+ * @link      https://www.opensource-socialnetwork.org/
+ * @package   MarkNotification
+ * @author    Michieal O'Sullivan
+ * @copyright (C) Apophis Software
+ * @license   GNU General Public License https://www.gnu.org/licenses/gpl-3.0.en.html
+ */
 require_once(__MARKNOTIFICATION__ . "libraries/marknotif.php");
 
 $guid = filter_var($_GET['guid'], FILTER_VALIDATE_INT);

diff --git a/MarkNotification/libraries/marknotif.php b/MarkNotification/libraries/marknotif.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Open Source Social Network
+ * @link      https://www.opensource-socialnetwork.org/
+ * @package   MarkNotification
+ * @author    Michieal O'Sullivan
+ * @copyright (C) Apophis Software
+ * @license   GNU General Public License https://www.gnu.org/licenses/gpl-3.0.en.html
+ */
 
 /**
  * Mark the singular Notification as read.
@@ -12,12 +20,12 @@ function marknotif_read($guid) {
         return false;
     }
     $Notification = new OssnNotifications;
-    error_log("Notification marked read.");
-    $Notification->statement("UPDATE ossn_notifications SET viewed='' WHERE(owner_guid='{ossn_loggedin_user()->getGUID()}' and guid='{$guid}');");
+    $ownerGuid = ossn_loggedin_user()->getGUID();
+    $Notification->statement("UPDATE ossn_notifications SET viewed='' WHERE(owner_guid='{$ownerGuid}' and guid='{$guid}');");
     if($Notification->execute()) {
         return true;
     }
-    error_log("Notification failed to mark read.");
+    error_log("Notification failed to mark read.",0);
     return false;
 
 }
@@ -38,12 +46,12 @@ function marknotif_unread($guid) {
     // if the value is not null it's read.
     $nix = NULL;
     $Notification = new OssnNotifications;
-    error_log("Notification marked unread.");
-    $Notification->statement("UPDATE ossn_notifications SET viewed={$nix} WHERE(owner_guid='{ossn_loggedin_user()->getGUID()}' and guid='{$guid}');");
+    $ownerGuid = ossn_loggedin_user()->getGUID();
+    $Notification->statement("UPDATE ossn_notifications SET viewed={$nix} WHERE(owner_guid='{$ownerGuid}' and guid='{$guid}');");
     if($Notification->execute()) {
         return true;
     }
-    error_log("Notification failed to mark unread.");
+    error_log("Notification failed to mark unread.",0);
     return false;
 }
 
@@ -59,15 +67,14 @@ function marknotif_delete($guid) {
     if (empty($guid)) {
         return false;
     } else {
-        ;
+        $ownerGuid = ossn_loggedin_user()->getGUID();
         $Notification->statement("DELETE FROM ossn_notifications WHERE(
-				owner_guid='{ossn_loggedin_user()->getGUID()}' and guid='{$guid}');");
+				owner_guid='{$ownerGuid}' and guid='{$guid}');");
         if ($Notification->execute()) {
-            error_log("Notification Deleted Successfully.");
             return true;
         }
     }
-    error_log("Notification Deletion Failed.");
+    error_log("Notification Deletion Failed.",0);
     return false;
 }
 
diff --git a/MarkNotification/locale/ossn.en.php b/MarkNotification/locale/ossn.en.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Open Source Social Network
+ * @link      https://www.opensource-socialnetwork.org/
+ * @package   MarkNotification
+ * @author    Michieal O'Sullivan
+ * @copyright (C) Apophis Software
+ * @license   GNU General Public License https://www.gnu.org/licenses/gpl-3.0.en.html
+ */
 ossn_register_languages('en', array(
 	 'mark:notification:read' => 'Mark Read ✔️',
 	 'mark:notification:read:title' => 'Mark Notification as read.',

diff --git a/MarkNotification/ossn_com.php b/MarkNotification/ossn_com.php
@@ -1,4 +1,15 @@
 <?php
+
+/**
+ * Apophis Software Component for OSSN v. 5.6 - 6.1.
+ *
+ * @package   Apophis Software MarkNotification
+ * @author    Apophis Software
+ * @copyright (C) Apophis Software
+ * @license   Open Source Social Network License (OSSN LICENSE)  http://www.opensource-socialnetwork.org/licence
+ * @link      https://www.apophissoftware.com/
+ */
+
 define('__MARKNOTIFICATION__', ossn_route()->com . 'MarkNotification/');
 
 function ossn_mark_notifications_init() {

diff --git a/MarkNotification/ossn_com.xml b/MarkNotification/ossn_com.xml
@@ -2,15 +2,15 @@
 <component xmlns="http://www.opensource-socialnetwork.org/v/3.0">
     <name>Mark Notification</name>
     <id>MarkNotification</id>
-    <author>Michieal O'Sullivan</author>
     <description>Allows Users to mark a notification as read, without being taken to the notification's topic item.</description>
-    <license>Open Source Social Network License (OSSN LICENSE)</license>
-    <author_url>http://www.apophissoftware.com</author_url>
-    <license_url>http://www.opensource-socialnetwork.org/licence/</license_url>
+	<author>Michieal O'Sullivan</author>
+	<author_url>https://www.apophissoftware.com/</author_url>
+	<license>GNU General Public License v3</license>
+	<license_url>https://www.gnu.org/licenses/gpl-3.0.en.html</license_url>
     <version>6.1</version>
 	<requires>
 		<type>ossn_version</type>
-		<version>6.1</version>
+		<version>6.1.0.1</version>
 	</requires>
 	<requires>
 		<type>ossn_component</type>

diff --git a/MarkNotification/plugins/default/marknotif/pages/all.php b/MarkNotification/plugins/default/marknotif/pages/all.php
@@ -1,12 +1,11 @@
 <?php
 /**
  * Open Source Social Network
- *
- * @package   (softlab24.com).ossn
- * @author    OSSN Core Team <[email protected]>
- * @copyright (C) SOFTLAB24 LIMITED
- * @license   Open Source Social Network License (OSSN LICENSE)  http://www.opensource-socialnetwork.org/licence
  * @link      https://www.opensource-socialnetwork.org/
+ * @package   MarkNotification
+ * @author    Michieal O'Sullivan
+ * @copyright (C) Apophis Software
+ * @license   GNU General Public License https://www.gnu.org/licenses/gpl-3.0.en.html
  */
 
 $get = new OssnNotifications;