Merge pull request #7 from ali-ichk/Feed

Feed: Replaced the deprecated getRoleCategory() method

Author: SKuipers

Feed/CHANGEDB.php

@@ -73,4 +73,9 @@
 //v1.2.02
 ++$count;
 $sql[$count][0] = '1.2.02';
+$sql[$count][1] = "";
+
+//v1.3.00
+++$count;
+$sql[$count][0] = '1.3.00';
 $sql[$count][1] = "";

Feed/CHANGELOG.txt

@@ -1,5 +1,9 @@
 CHANGELOG
 =========
+v1.3.00
+-------
+Replaced the deprecated getRoleCategory() method
+
 v1.2.02
 -------
 Fixed JS bug introduced in ownership transfer

Feed/feed_view_ajax.php

@@ -29,9 +29,7 @@
 require_once './src/Library/RollingCurl/Request.php';
 
 $output = '';
-
-$category = getRoleCategory($session->get('gibbonRoleIDCurrent'), $connection2);
-
+$category = $session->get('gibbonRoleIDCurrentCategory');
 $gibbonPersonID = $_GET['gibbonPersonID'] ?? null;
 
 if (is_null($gibbonPersonID) or $gibbonPersonID=='') {

Feed/hook_dashboard_feedView.php

@@ -22,19 +22,10 @@
 $returnInt = null;
 
 //Only include module include if it is not already included (which it may be been on the index page)
-$included = false;
-$includes = get_included_files();
-foreach ($includes as $include) {
-    if ($include == $session->get('absolutePath').'/modules/Feed/moduleFunctions.php') {
-        $included = true;
-    }
-}
-if ($included == false) {
-    include './modules/Feed/moduleFunctions.php';
-}
+require_once $session->get('absolutePath').'/modules/Feed/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Feed/feed_view.php') == false) {
-    //Acess denied
+    // Access denied
     $returnInt .= "<div class='error'>";
     $returnInt .= 'You do not have access to this action.';
     $returnInt .= '</div>';

Feed/manifest.php

@@ -27,7 +27,7 @@
 $entryURL = 'feed_view.php';
 $type = 'Additional';
 $category = 'Other';
-$version = '1.2.02';
+$version = '1.3.00';
 $author = "Gibbon Foundation";
 $url = "https://gibbonedu.org";
 

Feed/moduleFunctions.php

@@ -24,8 +24,8 @@ function getFeed($connection2, $guid, $gibbonPersonID)
     global $session;
 
     $output = '';
-
-    $category = getRoleCategory($session->get('gibbonRoleIDCurrent'), $connection2);
+    
+    $category = $session->get('gibbonRoleIDCurrentCategory');
     $output .= '<p>';
         if ($category == "Staff") {
             $output .= __('Shown below is a list of the most recent 20 posts, drawn from your own website, and that of class and student websites for your form groups.') ;

Feed/version.php

@@ -22,5 +22,5 @@
 /**
  * Sets version information.
  */
-$moduleVersion = '1.2.02';
+$moduleVersion = '1.3.00';
 $coreVersion = '22.0.00';