style fixes

(cherry picked from commit 34b75c5e)

src/www/diag_authentication.php

 <?php
 
 /*
-	Copyright (C) 2014 Deciso B.V.
-	Copyright (C) 2010 Ermal Luçi
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are met:
-
-	1. Redistributions of source code must retain the above copyright notice,
-	this list of conditions and the following disclaimer.
-
-	2. Redistributions in binary form must reproduce the above copyright
-	notice, this list of conditions and the following disclaimer in the
-	documentation and/or other materials provided with the distribution.
-
-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-	POSSIBILITY OF SUCH DAMAGE.
+    Copyright (C) 2014-2016 Deciso B.V.
+    Copyright (C) 2010 Ermal Luçi
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
 */
 
 require_once("guiconfig.inc");
@@ -33,50 +33,50 @@ require_once("interfaces.inc");
 
 function getUserGroups($username, $authcfg)
 {
-	global $config;
-
-	$member_groups = array();
-
-	$user = getUserEntry($username);
-	if ($user !== false) {
-		$allowed_groups = local_user_get_groups($user, true);
-		if (isset($config['system']['group'])) {
-			foreach ($config['system']['group'] as $group) {
-				if (in_array($group['name'], $allowed_groups)) {
-					$member_groups[] = $group['name'];
-				}
-			}
-		}
-	}
-	return $member_groups;
+    global $config;
+    $member_groups = array();
+    $user = getUserEntry($username);
+    if ($user !== false) {
+        $allowed_groups = local_user_get_groups($user, true);
+        if (isset($config['system']['group'])) {
+            foreach ($config['system']['group'] as $group) {
+                if (in_array($group['name'], $allowed_groups)) {
+                    $member_groups[] = $group['name'];
+                }
+            }
+        }
+    }
+    return $member_groups;
 }
 
 
-
 $input_errors = array();
-if ($_SERVER['REQUEST_METHOD'] === 'POST') {
-	$pconfig = $_POST;
-
-	$authcfg = auth_get_authserver($_POST['authmode']);
-	if (!$authcfg) {
-		$input_errors[] = $_POST['authmode'] . " " . gettext("is not a valid authentication server");
-	}
-
-	if (empty($_POST['username']) || empty($_POST['password'])) {
-		$input_errors[] = gettext("A username and password must be specified.");
-	}
-
-	if (count($input_errors) == 0) {
-		if (authenticate_user($_POST['username'], $_POST['password'], $authcfg)) {
-			$savemsg = gettext("User") . ": " . $_POST['username'] . " " . gettext("authenticated successfully.");
-			$groups = getUserGroups($_POST['username'], $authcfg);
-			$savemsg .= "<br />" . gettext("This user is a member of these groups") . ": <br />";
-			foreach ($groups as $group)
-				$savemsg .= "{$group} ";
-		} else {
-			$input_errors[] = gettext("Authentication failed.");
-		}
-	}
+if ($_SERVER['REQUEST_METHOD'] === 'GET') {
+    $pconfig = array("authmode" => "", "username" => "", "password" => "");
+} elseif ($_SERVER['REQUEST_METHOD'] === 'POST') {
+    $pconfig = $_POST;
+
+    $authcfg = auth_get_authserver($_POST['authmode']);
+    if (!$authcfg) {
+        $input_errors[] = $_POST['authmode'] . " " . gettext("is not a valid authentication server");
+    }
+
+    if (empty($_POST['username']) || empty($_POST['password'])) {
+        $input_errors[] = gettext("A username and password must be specified.");
+    }
+
+    if (count($input_errors) == 0) {
+        if (authenticate_user($_POST['username'], $_POST['password'], $authcfg)) {
+            $savemsg = gettext("User") . ": " . $_POST['username'] . " " . gettext("authenticated successfully.");
+            $groups = getUserGroups($_POST['username'], $authcfg);
+            $savemsg .= "<br />" . gettext("This user is a member of these groups") . ": <br />";
+            foreach ($groups as $group) {
+                $savemsg .= "{$group} ";
+            }
+        } else {
+            $input_errors[] = gettext("Authentication failed.");
+        }
+    }
 }
 
 include("head.inc");
@@ -86,68 +86,55 @@ include("head.inc");
 <body>
 
 <?php include("fbegin.inc"); ?>
-
-<?php if (isset($savemsg)) print_info_box($savemsg);?>
-
-<form id="iform" name="iform" action="<?php echo $_SERVER['REQUEST_URI'];?>" method="post">
-<section class="page-content-main">
-	<div class="container-fluid">
-		<div class="row">
-
-			<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors);?>
-
-			<section class="col-xs-12">
-                <div class="content-box">
-
-					<header class="content-box-head container-fluid">
-				   <h3><?= gettext('Test a server') ?></h3>
-				</header>
-
-				    <div class="content-box-main">
-				    <div class="table-responsive">
-			        <table class="table table-striped __nomb">
-				        <tbody>
-					        <tr>
-					          <td><?=gettext("Authentication Server"); ?></td>
-					          <td><select name="authmode" id="authmode" class="form-control" >
-									<?php
-										$auth_servers = auth_get_authserver_list();
-										foreach ($auth_servers as $auth_server_id => $auth_server):
-											$selected = "";
-											if ($auth_server['name'] == $pconfig['authmode'])
-												$selected = "selected=\"selected\"";
-									?>
-									<option value="<?=$auth_server_id;?>" <?=$selected;?>><?=$auth_server['name'];?></option>
-									<?php   endforeach; ?>
-									</select>
-								</td>
-					        </tr>
-					        <tr>
-					          <td><?=gettext("Username"); ?></td>
-					          <td><input type="text" class="form-control formfld unknown" size="20" id="username" name="username" value="<?=htmlspecialchars($pconfig['username']);?>"></td>
-					        </tr>
-					        <tr>
-					          <td><?=gettext("Password"); ?></td>
-					          <td><input type="password" class="form-control formfld pwd" size="20" id="password" name="password" value="<?=htmlspecialchars($pconfig['password']);?>"></td>
-					        </tr>
-					        <tr>
-					          <td>&nbsp;</td>
-					          <td><input id="save" name="save" type="submit" class="btn btn-primary" value="<?=gettext("Test");?>" /></td>
-					        </tr>
-				        </tbody>
-				    </table>
-
-
-				    </div>
-				    </div>
-
-				</div>
-			</section>
-
-		</div>
-
-	</div>
-</section>
+<form id="iform" name="iform"  method="post">
+  <section class="page-content-main">
+    <div class="container-fluid">
+      <div class="row">
+        <?php if (isset($savemsg)) print_info_box($savemsg);?>
+        <?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors);?>
+        <section class="col-xs-12">
+          <div class="content-box">
+            <header class="content-box-head container-fluid">
+               <h3><?= gettext('Test a server') ?></h3>
+            </header>
+            <div class="content-box-main">
+              <div class="table-responsive">
+                <table class="table table-striped __nomb">
+                  <tbody>
+                    <tr>
+                      <td><?=gettext("Authentication Server"); ?></td>
+                      <td>
+                        <select name="authmode" id="authmode" class="form-control" >
+<?php
+                        foreach (auth_get_authserver_list() as $auth_server_id => $auth_server):?>
+                          <option value="<?=$auth_server_id;?>" <?=$auth_server['name'] == $pconfig['authmode'] ? "selected=\"selected\"" : "";?>>
+                            <?=htmlspecialchars($auth_server['name']);?>
+                          </option>
+<?php
+                        endforeach; ?>
+                      </select>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td><?=gettext("Username"); ?></td>
+                      <td><input type="text" name="username" value="<?=htmlspecialchars($pconfig['username']);?>"></td>
+                    </tr>
+                    <tr>
+                      <td><?=gettext("Password"); ?></td>
+                      <td><input type="password" name="password" value="<?=htmlspecialchars($pconfig['password']);?>"></td>
+                    </tr>
+                    <tr>
+                      <td>&nbsp;</td>
+                      <td><input id="save" name="save" type="submit" class="btn btn-primary" value="<?=gettext("Test");?>" /></td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+            </div>
+          </div>
+        </section>
+      </div>
+    </div>
+  </section>
 </form>
-
 <?php include('foot.inc');?>