v1.3.00

Author: SKuipers

Feed/feed_view.php

@@ -19,23 +19,21 @@
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
+use Gibbon\Services\Format;
+
 //Module includes
 include './modules/'.$session->get('module').'/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Feed/feed_view.php') == false) {
     //Acess denied
-    echo "<div class='error'>";
-    echo __('You do not have access to this action.');
-    echo '</div>';
+    $page->addError(__('You do not have access to this action.'));
 } else {
     //Proceed!
     $page->breadcrumbs->add(__('View Feed'));
 
     //Get action with highest precendence
     $highestAction = getHighestGroupedAction($guid, $_GET['q'], $connection2);
-    if ($highestAction == false) { echo "<div class='error'>";
-        echo __('The highest grouped action cannot be determined.');
-        echo '</div>';
+    if ($highestAction == false) { echo Format::alert(__('The highest grouped action cannot be determined.'), 'error');
     } else {
         echo '<h2>';
         echo __('Feed');

Feed/feed_view_ajax.php

@@ -33,9 +33,7 @@
 $gibbonPersonID = $_GET['gibbonPersonID'] ?? null;
 
 if (is_null($gibbonPersonID) or $gibbonPersonID=='') {
-    echo "<div class='error'>";
-    echo __('You have not specified one or more required parameters.');
-    echo '</div>';
+    echo Format::alert(__('You have not specified one or more required parameters.'), 'error');
 }
 else {
     $feeds = array();
@@ -147,9 +145,7 @@
     }
 
     if ($feedCount==0) {
-        echo "<div class='error'>";
-        echo __('There are no records to display.');
-        echo '</div>';
+        echo Format::alert(__('There are no records to display.'), 'error');
     }
     else {
         $entries = array();
@@ -186,9 +182,7 @@
         $entries=array_slice($entries, 0, 20) ;
 
         if (count($entries)<1) {
-            echo "<div class='error'>";
-            echo __('There are no records to display.');
-            echo '</div>';
+            echo Format::alert(__('There are no records to display.'), 'error');
         }
         else {
         $count = 0;

Feed/hook_dashboard_feedView.php

@@ -19,16 +19,16 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+use Gibbon\Services\Format;
+
 $returnInt = null;
 
 //Only include module include if it is not already included (which it may be been on the index page)
 require_once $session->get('absolutePath').'/modules/Feed/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Feed/feed_view.php') == false) {
     // Access denied
-    $returnInt .= "<div class='error'>";
-    $returnInt .= 'You do not have access to this action.';
-    $returnInt .= '</div>';
+    $returnInt .= Format::alert('You do not have access to this action.', 'error');
 } else {
     $returnInt .= getFeed($connection2, $guid, $gibbonPersonID);
 }

Feed/moduleFunctions.php

@@ -37,8 +37,14 @@ function getFeed($connection2, $guid, $gibbonPersonID)
     $output .= '</p>';
 
     $output .= '<script type=\'text/javascript\'>
-        $(document).ready(function(){
-            $(\'#feedOuter-' . $gibbonPersonID . '\').load(\'' . $session->get('absoluteURL') . '/modules/Feed/feed_view_ajax.php?gibbonPersonID=' .  $gibbonPersonID . '\')});
+        document.addEventListener("DOMContentLoaded", function(){
+            var el = document.getElementById("feedOuter-' . $gibbonPersonID . '");
+            if (el) {
+                fetch("' . $session->get('absoluteURL') . '/modules/Feed/feed_view_ajax.php?gibbonPersonID=' .  $gibbonPersonID . '")
+                    .then(function(r){ return r.text(); })
+                    .then(function(html){ el.innerHTML = html; });
+            }
+        });
     </script>' ;
 
     $output .= '<div id=\'feedOuter-' . $gibbonPersonID . '\' style=\'width: 100%\'>' ;