Change spelling of EXPIRED

The clearinghouse fixed a bug with the spelling of EXPIRED. Use
the new keywords to be compatible with the latest clearinghouse code.

CHANGES.md

@@ -4,7 +4,8 @@
 
 ## Changes
 
-* None
+* Change spelling of EXPIRED
+  ([#1809](https://github.com/GENI-NSF/geni-portal/issues/1809))
 
 ## Installation Notes
 

lib/php/pa_client.php

@@ -397,7 +397,7 @@ function get_project_info_for_member($sa_url, $signer, $member_id,
 
   $result = array();
   foreach($rows as $row) {
-    $expired = $row['EXPIRED'];
+    $expired = $row['PROJECT_EXPIRED'];
     if ($expired && (!$include_expired)) continue;
     //    error_log("ROW = " . print_r($row, true));
     $new_row = project_details_chapi2portal($row);
@@ -436,7 +436,7 @@ function get_projects_for_member($sa_url, $signer, $member_id, $is_member)
   // if not a member
   $current = array();
   foreach ($rows as $row) {
-    if ($row['EXPIRED'] == false) {
+    if ($row['PROJECT_EXPIRED'] == false) {
       $current[] = $row;
     }
   }

lib/php/sa_client.php

@@ -519,8 +519,8 @@ function get_slices_for_member($sa_url, $signer, $member_id, $is_member, $role=n
   $converted_results = array();
   foreach($results as $row) {
     $converted_row = array(SA_SLICE_MEMBER_TABLE_FIELDNAME::SLICE_ID => $row['SLICE_UID'],
-			   SA_SLICE_MEMBER_TABLE_FIELDNAME::ROLE => $row['SLICE_ROLE'],
-			   SA_SLICE_TABLE_FIELDNAME::EXPIRED => $row['EXPIRED']);
+                           SA_SLICE_MEMBER_TABLE_FIELDNAME::ROLE => $row['SLICE_ROLE'],
+                           SA_SLICE_TABLE_FIELDNAME::EXPIRED => $row['SLICE_EXPIRED']);
     $converted_row = convert_role($converted_row);
     $converted_results[] = $converted_row;
   }