Changeset 20798

Timestamp:

2009-10-08T18:32:03+13:00 (15 years ago)

Author:

ak19

Message:

Cosmetic adjustments to the code (use of curly brackets on single-line if and else statements).

File:

• gsdl/trunk/runtime-src/src/recpt/authenaction.cpp (modified) (5 diffs)

gsdl/trunk/runtime-src/src/recpt/authenaction.cpp

@@ -154 +154 @@
   // no need to go further unless authentication is
   // required by this page
-  if (args["uan"].empty()) return true;
+  if (args["uan"].empty()) {
+    return true;
+  }
 
   // failure means we have to redirect to this action to get authentication
@@ -169 +171 @@
   // do any authentication
   args_ua.clear(); // default = false;
-  if (args_un.empty() || args_pw.empty()) args_us = "invalid";
-  else args_us = "failed";
+  if (args_un.empty() || args_pw.empty()) {
+    args_us = "invalid";
+  }
+  else {
+    args_us = "failed";
+  }
 
   // make sure we have a username                                                                                                 
@@ -177 +183 @@
     if (!args_pw.empty()) {
       // we are authenticating using a password
-      if (user_database->check_passwd (thisuser.username, args_pw) == ERRNO_SUCCEED) args_ua = "1"; // succeeded
+      if (user_database->check_passwd (thisuser.username, args_pw) == ERRNO_SUCCEED) {
+    args_ua = "1"; // succeeded
+      }
       
     } else if (!args_ky.empty()) {
       // we are authenticating using a key
-      if (key_database->check_key(thisuser, args_ky, args_ug, keydecay)) args_ua = "1";
-      else args_us = "stalekey";
+      if (key_database->check_key(thisuser, args_ky, args_ug, keydecay)) {
+    args_ua = "1";
+      }
+      else {
+    args_us = "stalekey";
+      }
     }
   }
@@ -197 +209 @@
       if (!args_ug.empty()) {
 
-     // Since we recieve a comma seperated list
+     // Since we receive a comma separated list
      // of groups like mygroup,yourgroup,ourgroup
      // we want to split them into individual groups
@@ -261 +273 @@
     // need to save the current arguments in "er"
     text_t &arg_er = args["er"];
-    if (!compress_save_args(argsinfo, saveconf, args, arg_er, outconvert, logout))
+    if (!compress_save_args(argsinfo, saveconf, args, arg_er, outconvert, logout)) {
       arg_er.clear();
+    }
     
     // needs to be decoded for use within forms