Show RSS feed of a selected organization #1628

Author: Fasse

adm_program/modules/announcements/rss_announcements.php

@@ -10,12 +10,12 @@
  *
  * Parameters:
  *
- * org_uuid  - Show only announcements of this organization
+ * organization_short_name : short name of the organization whose announcements should be shown
  ***********************************************************************************************
  */
 require_once(__DIR__ . '/../../system/common.php');
 
-$getOrgUuid  = admFuncVariableIsValid($_GET, 'org_uuid', 'string');
+$getOrganizationShortName  = admFuncVariableIsValid($_GET, 'organization_short_name', 'string');
 
 // Check if RSS is active...
 if (!$gSettingsManager->getBool('enable_rss')) {
@@ -33,9 +33,8 @@
 
 $announcements = new ModuleAnnouncements();
 
-if ($getOrgUuid !== '') {
-    $organization = new Organization($gDb);
-    $organization->readDataByUuid($getOrgUuid);
+if ($getOrganizationShortName !== '') {
+    $organization = new Organization($gDb, $getOrganizationShortName);
     $organizationName = $organization->getValue('org_long_name');
     $gCurrentUser->setOrganization($organization->getValue('org_id'));
 } else {

adm_program/modules/events/events_rss.php

@@ -10,12 +10,12 @@
  *
  * Parameters:
  *
- * org_uuid  - Show only announcements of this organization
+ * organization_short_name : short name of the organization whose events should be shown
  * *********************************************************************************************
  */
 require_once(__DIR__ . '/../../system/common.php');
 
-$getOrgUuid  = admFuncVariableIsValid($_GET, 'org_uuid', 'string');
+$getOrganizationShortName  = admFuncVariableIsValid($_GET, 'organization_short_name', 'string');
 
 // Check if RSS is active...
 if (!$gSettingsManager->getBool('enable_rss')) {
@@ -30,9 +30,8 @@
     // => EXIT
 }
 
-if ($getOrgUuid !== '') {
-    $organization = new Organization($gDb);
-    $organization->readDataByUuid($getOrgUuid);
+if ($getOrganizationShortName !== '') {
+    $organization = new Organization($gDb, $getOrganizationShortName);
     $organizationName = $organization->getValue('org_long_name');
     $gCurrentUser->setOrganization($organization->getValue('org_id'));
 } else {

adm_program/modules/guestbook/rss_guestbook.php

@@ -10,12 +10,12 @@
  *
  * Parameters:
  *
- * org_uuid  - Show only announcements of this organization
+ * organization_short_name : short name of the organization whose guestbook entries should be shown
  * *********************************************************************************************
  */
 require_once(__DIR__ . '/../../system/common.php');
 
-$getOrgUuid  = admFuncVariableIsValid($_GET, 'org_uuid', 'string');
+$getOrganizationShortName  = admFuncVariableIsValid($_GET, 'organization_short_name', 'string');
 
 // Check if RSS is active...
 if (!$gSettingsManager->getBool('enable_rss')) {
@@ -30,9 +30,8 @@
     // => EXIT
 }
 
-if ($getOrgUuid !== '') {
-    $organization = new Organization($gDb);
-    $organization->readDataByUuid($getOrgUuid);
+if ($getOrganizationShortName !== '') {
+    $organization = new Organization($gDb, $getOrganizationShortName);
     $organizationName = $organization->getValue('org_long_name');
     $organizationID = $organization->getValue('org_id');
 } else {

adm_program/modules/links/rss_links.php

@@ -10,12 +10,12 @@
  *
  * Parameters:
  *
- * org_uuid  - Show only announcements of this organization
+ * organization_short_name : short name of the organization whose weblinks should be shown
  * *********************************************************************************************
  */
 require_once(__DIR__ . '/../../system/common.php');
 
-$getOrgUuid  = admFuncVariableIsValid($_GET, 'org_uuid', 'string');
+$getOrganizationShortName  = admFuncVariableIsValid($_GET, 'organization_short_name', 'string');
 
 // Check if RSS is active...
 if (!$gSettingsManager->getBool('enable_rss')) {
@@ -31,9 +31,8 @@
     // => EXIT
 }
 
-if ($getOrgUuid !== '') {
-    $organization = new Organization($gDb);
-    $organization->readDataByUuid($getOrgUuid);
+if ($getOrganizationShortName !== '') {
+    $organization = new Organization($gDb, $getOrganizationShortName);
     $organizationName = $organization->getValue('org_long_name');
     $organizationID = $organization->getValue('org_id');
 } else {

adm_program/modules/photos/rss_photos.php

@@ -10,12 +10,12 @@
  *
  * Parameters:
  *
- * org_uuid  - Show only announcements of this organization
+ * organization_short_name : short name of the organization whose photos should be shown
  * *********************************************************************************************
  */
 require_once(__DIR__ . '/../../system/common.php');
 
-$getOrgUuid  = admFuncVariableIsValid($_GET, 'org_uuid', 'string');
+$getOrganizationShortName  = admFuncVariableIsValid($_GET, 'organization_short_name', 'string');
 
 // check if module is active
 if (!$gSettingsManager->getBool('enable_rss')) {
@@ -33,9 +33,8 @@
     require(__DIR__ . '/../../system/login_valid.php');
 }
 
-if ($getOrgUuid !== '') {
-    $organization = new Organization($gDb);
-    $organization->readDataByUuid($getOrgUuid);
+if ($getOrganizationShortName !== '') {
+    $organization = new Organization($gDb, $getOrganizationShortName);
     $organizationName = $organization->getValue('org_long_name');
     $organizationID = $organization->getValue('org_id');
 } else {