[GT-184] Update code with line limit

GOCDB · Aug 24, 2023 · 8afb986 · 8afb986
1 parent 72afa09
commit 8afb986
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 13 deletions.
diff --git a/htdocs/web_portal/views/site/view_site.php b/htdocs/web_portal/views/site/view_site.php
@@ -608,7 +608,7 @@ class="header"
                         <th>Identifier</th>
                         <th>User</th>
                         <th style="text-align:center;white-space: nowrap">
-                            <p>Last Renewed<p>
+                            Last Renewed
                         </th>
                         <th style="text-align:center;white-space: nowrap">Last Used</th>
                         <th style="text-align:center">Write</th>
@@ -688,13 +688,17 @@ class="header"
                             />
                         </td>
                         <td style="width: 8%; text-align: center;">
-                            <?php if (!$portalIsReadOnly) :?>
+                            <?php if (!$portalIsReadOnly) :
+                                $actionURL = "index.php" .
+                                    "?Page_Type=Edit_API_Authentication_Entity"
+                                    . "&amp;" .
+                                    "authentityid=" . $APIAuthEnt->getId()
+                                    . "&amp;"
+                                    . "isRenewalRequest=true"
+                                ?>
                                 <form
-                                    action="index.php
-                                     ?Page_Type=Edit_API_Authentication_Entity&amp;
-                                     authentityid=<?= $APIAuthEnt->getId();?>&amp;
-                                     isRenewalRequest=true"
-                                    method="post"
+                                    action= <?= $actionURL ?>
+                                     method="post"
                                 >
                                     <button type="submit">Renew</button>
                                 </form>

diff --git a/lib/Gocdb_Services/APIAuthenticationService.php b/lib/Gocdb_Services/APIAuthenticationService.php
@@ -274,7 +274,8 @@ private function validate($data, $identifier, $type)
         if (
             $type == 'OIDC Subject' &&
             !preg_match(
-                "/^([a-f0-9]{8}\-[a-f0-9]{4}\-[a-f0-9]{4}\-[a-f0-9]{4}\-[a-f0-9]{12})$/",
+                "/^([a-f0-9]{8}\-[a-f0-9]{4}\-[a-f0-9]{4}" .
+                "\-[a-f0-9]{4}\-[a-f0-9]{12})$/",
                 $identifier
             )
         ) {

diff --git a/lib/Gocdb_Services/Site.php b/lib/Gocdb_Services/Site.php
@@ -1496,7 +1496,8 @@ private function validIdentifier(
         if (
             $type == 'OIDC Subject' &&
             !preg_match(
-                "/^([a-z0-9]{8}\-[a-z0-9]{4}\-[a-z0-9]{4}\-[a-z0-9]{4}\-[a-z0-9]{12})$/",
+                "/^([a-z0-9]{8}\-[a-z0-9]{4}\-[a-z0-9]{4}" .
+                "\-[a-z0-9]{4}\-[a-z0-9]{12})$/",
                 $identifier
             )
         ) {

diff --git a/resources/ManageAPICredentials/ManageAPICredentialsActions.php b/resources/ManageAPICredentials/ManageAPICredentialsActions.php
@@ -128,8 +128,9 @@ public function deleteCreds($creds, $deleteThreshold, $isRenewalRequest)
      * @param bool          $isRenewalRequest   Flag indicating the presence
      *                                          or absence of the `r`
      *                                          command-line argument.
-     * @return array        []                  An Array of credentials identifed
-     *                                          for sending warning emails.
+     * @return array        []                  An Array of credentials
+     *                                          identifed for
+     *                                          sending warning emails.
      */
     public function warnUsers(
         $creds,

diff --git a/resources/ManageAPICredentials/ManageUnusedAPICredentialsOptions.php b/resources/ManageAPICredentials/ManageUnusedAPICredentialsOptions.php
@@ -206,7 +206,11 @@ public function getThreshold()
      */
     private function tryToObtainDatetime($given)
     {
-        $this->isRenewalRequest = $this->getBoolOption($given, 'renewals', 'r');
+        $this->isRenewalRequest = $this->getBoolOption(
+            $given,
+            'renewals',
+            'r'
+        );
 
         if (!$this->isRenewalRequest) {
             $this->isInactiveRequest = $this->getBoolOption(
@@ -216,7 +220,10 @@ private function tryToObtainDatetime($given)
             );
         }
 
-        $optionProvided = ($this->isRenewalRequest || $this->isInactiveRequest);
+        $optionProvided = (
+            $this->isRenewalRequest ||
+            $this->isInactiveRequest
+        );
 
         if (!$optionProvided) {
             throw new InvalidArgumentException(