phpipam / phpipam

app/admin/authentication-methods/edit-Radius.php

Indentation +29 added lines, -29 removed lines

@@ -9,18 +9,18 @@ 
 
 # ID must be numeric */
 if($_POST['action']!="add") {
-	if(!is_numeric($_POST['id']))	{ $Result->show("danger", _("Invalid ID"), true, true); }
+    if(!is_numeric($_POST['id']))	{ $Result->show("danger", _("Invalid ID"), true, true); }
 
-	# feth method settings
-	$method_settings = $Admin->fetch_object ("usersAuthMethod", "id", $_POST['id']);
-	$method_settings->params = json_decode($method_settings->params);
+    # feth method settings
+    $method_settings = $Admin->fetch_object ("usersAuthMethod", "id", $_POST['id']);
+    $method_settings->params = json_decode($method_settings->params);
 }
 else {
-	$method_settings = new StdClass ();
-	# set default values
-   @$method_settings->params->hostname = "localhost";
-	$method_settings->params->port = 1812;
-	$method_settings->params->timeout = 2;
+    $method_settings = new StdClass ();
+    # set default values
+    @$method_settings->params->hostname = "localhost";
+    $method_settings->params->port = 1812;
+    $method_settings->params->timeout = 2;
 
 }
 
@@ -105,12 +105,12 @@ 
 		<td>
 			<select name="timeout" class="form-control input-w-auto">
 			<?php
-			$values = array(1,2,3,5,10);
-			foreach($values as $v) {
-				if($v==@$method_settings->params->timeout)	{ print "<option value='$v' selected=selected>$v</option>"; }
-				else										{ print "<option value='$v'					 >$v</option>"; }
-			}
-			?>
+            $values = array(1,2,3,5,10);
+            foreach($values as $v) {
+                if($v==@$method_settings->params->timeout)	{ print "<option value='$v' selected=selected>$v</option>"; }
+                else										{ print "<option value='$v'					 >$v</option>"; }
+            }
+            ?>
 			</select>
 		</td>
 		<td class="base_dn info2">
@@ -122,12 +122,12 @@ 
 	</form>
 
 	<?php
-	# check for socket support !
-	if(!in_array("sockets", get_loaded_extensions())) {
-		$Log->write( "Radius login", "php Socket extension missing!", 2 );
-		$Result->show("danger", _("php Socket extension missing!"), false);
-	}
-	?>
+    # check for socket support !
+    if(!in_array("sockets", get_loaded_extensions())) {
+        $Log->write( "Radius login", "php Socket extension missing!", 2 );
+        $Result->show("danger", _("php Socket extension missing!"), false);
+    }
+    ?>
 </div>
 
 
@@ -139,14 +139,14 @@ 
 	</div>
 
 	<?php
-	# check for mathing users
-	if($_POST['action']=="delete") {
-		$users = $Admin->fetch_multiple_objects ("users", "authMethod", @$method_settings->id);
-		if($users!==false) {
-			$Result->show("warning", sizeof($users)._(" users have this method for logging in. They will be reset to local auth!"), false);
-		}
-	}
-	?>
+    # check for mathing users
+    if($_POST['action']=="delete") {
+        $users = $Admin->fetch_multiple_objects ("users", "authMethod", @$method_settings->id);
+        if($users!==false) {
+            $Result->show("warning", sizeof($users)._(" users have this method for logging in. They will be reset to local auth!"), false);
+        }
+    }
+    ?>
 
 	<!-- Result -->
 	<div class="editAuthMethodResult"></div>

app/admin/authentication-methods/edit-LDAP.php

Indentation +21 added lines, -21 removed lines

@@ -9,19 +9,19 @@ 
 
 # ID must be numeric */
 if($_POST['action']!="add") {
-	if(!is_numeric($_POST['id']))	{ $Result->show("danger", _("Invalid ID"), true, true); }
+    if(!is_numeric($_POST['id']))	{ $Result->show("danger", _("Invalid ID"), true, true); }
 
-	# feth method settings
-	$method_settings = $Admin->fetch_object ("usersAuthMethod", "id", $_POST['id']);
-	$method_settings->params = json_decode($method_settings->params);
+    # feth method settings
+    $method_settings = $Admin->fetch_object ("usersAuthMethod", "id", $_POST['id']);
+    $method_settings->params = json_decode($method_settings->params);
 }
 else {
-	$method_settings = new StdClass ();
-	# set default values
-   @$method_settings->params->domain_controllers = "ldap1.domain.local;ldap2.domain.local";
-	$method_settings->params->base_dn = "CN=Users,CN=Company,DC=domain,DC=local";
-	$method_settings->params->account_suffix = "";
-	$method_settings->params->ad_port = 389;
+    $method_settings = new StdClass ();
+    # set default values
+    @$method_settings->params->domain_controllers = "ldap1.domain.local;ldap2.domain.local";
+    $method_settings->params->base_dn = "CN=Users,CN=Company,DC=domain,DC=local";
+    $method_settings->params->account_suffix = "";
+    $method_settings->params->ad_port = 389;
 }
 
 # set delete flag
@@ -45,9 +45,9 @@ 
 <div class="pContent">
 
 	<?php
-	# make sure LDAP is supported !
-	if (!in_array("ldap", get_loaded_extensions())) 	{ $Result->show("danger", _("ldap extension not enabled in php")."!<hr>", false); }
-	?>
+    # make sure LDAP is supported !
+    if (!in_array("ldap", get_loaded_extensions())) 	{ $Result->show("danger", _("ldap extension not enabled in php")."!<hr>", false); }
+    ?>
 
 	<form id="editAuthMethod" name="editAuthMethod">
 	<table class="editAuthMethod table table-noborder table-condensed">
@@ -178,14 +178,14 @@ 
 	</div>
 
 	<?php
-	if($_POST['action']=="delete") {
-		# check for mathing users
-		$users = $Admin->fetch_multiple_objects ("users", "authMethod", @$method_settings->id);
-		if($users!==false) {
-			$Result->show("warning", sizeof($users)._(" users have this method for logging in. They will be reset to local auth!"), false);
-		}
-	}
-	?>
+    if($_POST['action']=="delete") {
+        # check for mathing users
+        $users = $Admin->fetch_multiple_objects ("users", "authMethod", @$method_settings->id);
+        if($users!==false) {
+            $Result->show("warning", sizeof($users)._(" users have this method for logging in. They will be reset to local auth!"), false);
+        }
+    }
+    ?>
 
 	<!-- Result -->
 	<div class="editAuthMethodResult"></div>

app/admin/authentication-methods/edit.php

Indentation +2 added lines, -2 removed lines

@@ -18,8 +18,8 @@
 
 # if edit check if protected?
 if($_POST['action']!="add") {
-	$auth_method = $Admin->fetch_object("usersAuthMethod", "id", $_POST['id']);
-	if($auth_method->protected=="Yes")								{ $Result->show("danger", _("Method cannot be change as it is protected"), true, true); }
+    $auth_method = $Admin->fetch_object("usersAuthMethod", "id", $_POST['id']);
+    if($auth_method->protected=="Yes")								{ $Result->show("danger", _("Method cannot be change as it is protected"), true, true); }
 }
 
 # route to proper auth method editing

app/admin/settings/settings-save.php

Indentation +39 added lines, -39 removed lines

@@ -48,45 +48,45 @@
 
 # set update values
 $values = array("id"=>1,
-				//site settings
-				"siteTitle"=>@$_POST['siteTitle'],
-				"siteDomain"=>@$_POST['siteDomain'],
-				"siteURL"=>@$_POST['siteURL'],
-				"siteLoginText"=>@$_POST['siteLoginText'],
-				"prettyLinks"=>@$_POST['prettyLinks'],
-				"defaultLang"=>@$_POST['defaultLang'],
-				"inactivityTimeout"=>@$_POST['inactivityTimeout'],
-				//admin
-				"siteAdminName"=>@$_POST['siteAdminName'],
-				"siteAdminMail"=>@$_POST['siteAdminMail'],
-				//features
-				"api"=>$Admin->verify_checkbox(@$_POST['api']),
-				"enableIPrequests"=>$Admin->verify_checkbox(@$_POST['enableIPrequests']),
-				"enableMulticast"=>$Admin->verify_checkbox(@$_POST['enableMulticast']),
-				"enableRACK"=>$Admin->verify_checkbox(@$_POST['enableRACK']),
-				"enableSNMP"=>$Admin->verify_checkbox(@$_POST['enableSNMP']),
-				"enableThreshold"=>$Admin->verify_checkbox(@$_POST['enableThreshold']),
-				"enableVRF"=>$Admin->verify_checkbox(@$_POST['enableVRF']),
-				"enableDNSresolving"=>$Admin->verify_checkbox(@$_POST['enableDNSresolving']),
-				"vlanDuplicate"=>$Admin->verify_checkbox(@$_POST['vlanDuplicate']),
-				"vlanMax"=>@$_POST['vlanMax'],
-				"enableChangelog"=>$Admin->verify_checkbox(@$_POST['enableChangelog']),
-				"tempShare"=>$Admin->verify_checkbox(@$_POST['tempShare']),
-				"enablePowerDNS"=>$Admin->verify_checkbox(@$_POST['enablePowerDNS']),
-				"enableFirewallZones"=>$Admin->verify_checkbox(@$_POST['enableFirewallZones']),
-				"log"=>@$_POST['log'],
-				//display
-				"donate"=>$Admin->verify_checkbox(@$_POST['donate']),
-				"visualLimit"=>@$_POST['visualLimit'],
-				"subnetOrdering"=>@$_POST['subnetOrdering'],
-				"subnetView"=>@$_POST['subnetView'],
-				//ping
-				"scanPingType"=>@$_POST['scanPingType'],
-				"pingStatus"=>@$_POST['pingStatus'],
-				"scanPingPath"=>@$_POST['scanPingPath'],
-				"scanFPingPath"=>@$_POST['scanFPingPath'],
-				"scanMaxThreads"=>@$_POST['scanMaxThreads']
-				);
+                //site settings
+                "siteTitle"=>@$_POST['siteTitle'],
+                "siteDomain"=>@$_POST['siteDomain'],
+                "siteURL"=>@$_POST['siteURL'],
+                "siteLoginText"=>@$_POST['siteLoginText'],
+                "prettyLinks"=>@$_POST['prettyLinks'],
+                "defaultLang"=>@$_POST['defaultLang'],
+                "inactivityTimeout"=>@$_POST['inactivityTimeout'],
+                //admin
+                "siteAdminName"=>@$_POST['siteAdminName'],
+                "siteAdminMail"=>@$_POST['siteAdminMail'],
+                //features
+                "api"=>$Admin->verify_checkbox(@$_POST['api']),
+                "enableIPrequests"=>$Admin->verify_checkbox(@$_POST['enableIPrequests']),
+                "enableMulticast"=>$Admin->verify_checkbox(@$_POST['enableMulticast']),
+                "enableRACK"=>$Admin->verify_checkbox(@$_POST['enableRACK']),
+                "enableSNMP"=>$Admin->verify_checkbox(@$_POST['enableSNMP']),
+                "enableThreshold"=>$Admin->verify_checkbox(@$_POST['enableThreshold']),
+                "enableVRF"=>$Admin->verify_checkbox(@$_POST['enableVRF']),
+                "enableDNSresolving"=>$Admin->verify_checkbox(@$_POST['enableDNSresolving']),
+                "vlanDuplicate"=>$Admin->verify_checkbox(@$_POST['vlanDuplicate']),
+                "vlanMax"=>@$_POST['vlanMax'],
+                "enableChangelog"=>$Admin->verify_checkbox(@$_POST['enableChangelog']),
+                "tempShare"=>$Admin->verify_checkbox(@$_POST['tempShare']),
+                "enablePowerDNS"=>$Admin->verify_checkbox(@$_POST['enablePowerDNS']),
+                "enableFirewallZones"=>$Admin->verify_checkbox(@$_POST['enableFirewallZones']),
+                "log"=>@$_POST['log'],
+                //display
+                "donate"=>$Admin->verify_checkbox(@$_POST['donate']),
+                "visualLimit"=>@$_POST['visualLimit'],
+                "subnetOrdering"=>@$_POST['subnetOrdering'],
+                "subnetView"=>@$_POST['subnetView'],
+                //ping
+                "scanPingType"=>@$_POST['scanPingType'],
+                "pingStatus"=>@$_POST['pingStatus'],
+                "scanPingPath"=>@$_POST['scanPingPath'],
+                "scanFPingPath"=>@$_POST['scanFPingPath'],
+                "scanMaxThreads"=>@$_POST['scanMaxThreads']
+                );
 if(!$Admin->object_modify("settings", "edit", "id", $values))	{ $Result->show("danger",  _("Cannot update settings"), true); }
 else															{ $Result->show("success", _("Settings updated successfully"), true); }
 ?>

app/admin/settings/index.php

Indentation +81 added lines, -81 removed lines

@@ -82,10 +82,10 @@ 
 	<td>
 		<select name="prettyLinks" class="form-control input-sm input-w-auto">
 		<?php
-			print "<option value='No'>"._('No')."</option>";
-			if($settings['prettyLinks']=="Yes") { print "<option value='Yes' selected='selected'>"._('Yes')."</option>"; }
-			else								{ print "<option value='Yes'>"._('Yes')."</option>"; }
-		?>
+            print "<option value='No'>"._('No')."</option>";
+            if($settings['prettyLinks']=="Yes") { print "<option value='Yes' selected='selected'>"._('Yes')."</option>"; }
+            else								{ print "<option value='Yes'>"._('Yes')."</option>"; }
+        ?>
 		</select>
 	</td>
 	<td class="info2">
@@ -104,15 +104,15 @@ 
 	<td>
 		<select name="defaultLang" class="form-control input-sm input-w-auto">
 		<?php
-		if(sizeof($languages)>0) {
-			//default
-			print "<option value='0'>Default</option>";
-			foreach($languages as $lang) {
-				if($lang->l_id==$settings['defaultLang']) 	{ print "<option value='$lang->l_id' selected='selected'>$lang->l_name ($lang->l_code)</option>"; }
-				else										{ print "<option value='$lang->l_id' 					>$lang->l_name ($lang->l_code)</option>"; }
-			}
-		}
-		?>
+        if(sizeof($languages)>0) {
+            //default
+            print "<option value='0'>Default</option>";
+            foreach($languages as $lang) {
+                if($lang->l_id==$settings['defaultLang']) 	{ print "<option value='$lang->l_id' selected='selected'>$lang->l_name ($lang->l_code)</option>"; }
+                else										{ print "<option value='$lang->l_id' 					>$lang->l_name ($lang->l_code)</option>"; }
+            }
+        }
+        ?>
 		</select>
 	</td>
 	<td class="info2"><?php print _('Select default language'); ?></td>
@@ -124,13 +124,13 @@ 
 	<td>
 		<select name="inactivityTimeout" class="form-control input-sm input-w-auto">
 		<?php
-		$durations = array("900"=>"15 minutes","1800"=>"30 minutes", "3600"=>"1 hour", "7200"=>"2 hours", "21600"=>"6 hours", "43200"=>"12 hours", "86400"=>"24 hours");
-		//default
-		foreach($durations as $k=>$d) {
-			if($k==$settings['inactivityTimeout']) 	{ print "<option value='$k' selected='selected'>$d</option>"; }
-			else									{ print "<option value='$k' 				   >$d</option>"; }
-		}
-		?>
+        $durations = array("900"=>"15 minutes","1800"=>"30 minutes", "3600"=>"1 hour", "7200"=>"2 hours", "21600"=>"6 hours", "43200"=>"12 hours", "86400"=>"24 hours");
+        //default
+        foreach($durations as $k=>$d) {
+            if($k==$settings['inactivityTimeout']) 	{ print "<option value='$k' selected='selected'>$d</option>"; }
+            else									{ print "<option value='$k' 				   >$d</option>"; }
+        }
+        ?>
 		</select>
 	</td>
 	<td class="info2"><?php print _('Select inactive timeout for user sessions. Please note that if default php session settings in php.ini are lower they will override this'); ?></td>
@@ -320,13 +320,13 @@ 
 	<td>
 		<select name="log" class="form-control input-sm input-w-auto">
 		<?php
-		$types = array("Database"=>"Database", "syslog"=>"Syslog", "both"=>"Syslog and local Database");
-		//default
-		foreach($types as $k=>$d) {
-			if($k==$settings['log']) 	{ print "<option value='$k' selected='selected'>$d</option>"; }
-			else						{ print "<option value='$k' 				   >$d</option>"; }
-		}
-		?>
+        $types = array("Database"=>"Database", "syslog"=>"Syslog", "both"=>"Syslog and local Database");
+        //default
+        foreach($types as $k=>$d) {
+            if($k==$settings['log']) 	{ print "<option value='$k' selected='selected'>$d</option>"; }
+            else						{ print "<option value='$k' 				   >$d</option>"; }
+        }
+        ?>
 		</select>
 
 	</td>
@@ -348,13 +348,13 @@ 
 	<td>
 		<select name="scanPingType" class="form-control input-sm input-w-auto">
 		<?php
-		$types = array("ping"=>"ping", "pear"=>"pear ping", "fping"=>"fping");
-		//default
-		foreach($types as $k=>$d) {
-			if($k==$settings['scanPingType']) 	{ print "<option value='$k' selected='selected'>$d</option>"; }
-			else								{ print "<option value='$k' 				   >$d</option>"; }
-		}
-		?>
+        $types = array("ping"=>"ping", "pear"=>"pear ping", "fping"=>"fping");
+        //default
+        foreach($types as $k=>$d) {
+            if($k==$settings['scanPingType']) 	{ print "<option value='$k' selected='selected'>$d</option>"; }
+            else								{ print "<option value='$k' 				   >$d</option>"; }
+        }
+        ?>
 		</select>
 	</td>
 	<td class="info2"><?php print _('Select which utility to use for status checks.'); ?></td>
@@ -365,10 +365,10 @@ 
 <tr>
 	<td class="title"><?php print _('Ping path'); ?></td>
 	<?php
-	//verify that ping file exists!
-	if(!file_exists($settings['scanPingPath'])&&$settings['scanFPingType']=="ping")		{ $class="danger"; }
-	else																				{ $class=""; }
-	?>
+    //verify that ping file exists!
+    if(!file_exists($settings['scanPingPath'])&&$settings['scanFPingType']=="ping")		{ $class="danger"; }
+    else																				{ $class=""; }
+    ?>
 	<td class="<?php print $class; ?>">
 		<input type="text" class="form-control input-sm" name="scanPingPath" value="<?php print $settings['scanPingPath']; ?>">
 	</td>
@@ -381,10 +381,10 @@ 
 <tr>
 	<td class="title"><?php print _('FPing path'); ?></td>
 	<?php
-	//verify that ping file exists!
-	if(!file_exists($settings['scanFPingPath'])&&$settings['scanFPingType']=="fping")	{ $class="danger"; }
-	else																				{ $class=""; }
-	?>
+    //verify that ping file exists!
+    if(!file_exists($settings['scanFPingPath'])&&$settings['scanFPingType']=="fping")	{ $class="danger"; }
+    else																				{ $class=""; }
+    ?>
 	<td class="<?php print $class; ?>">
 		<input type="text" class="form-control input-sm" name="scanFPingPath" value="<?php print $settings['scanFPingPath']; ?>">
 	</td>
@@ -441,22 +441,22 @@ 
 	<td>
 		<select name="visualLimit" class="form-control input-sm input-w-auto">
 			<?php
-			$opts = array(
-				"0"=>_("Don't show visual display"),
-				"19"=>"/19 (8190)",
-				"20"=>"/20 (4094)",
-				"21"=>"/21 (2046)",
-				"22"=>"/22 (1024)",
-				"23"=>"/23 (512)",
-				"24"=>"/24 (256)"
-			);
-
-			foreach($opts as $key=>$line) {
-				if($settings['visualLimit'] == $key) { print "<option value='$key' selected>$line</option>"; }
-				else 								{ print "<option value='$key'>$line</option>"; }
-			}
-
-			?>
+            $opts = array(
+                "0"=>_("Don't show visual display"),
+                "19"=>"/19 (8190)",
+                "20"=>"/20 (4094)",
+                "21"=>"/21 (2046)",
+                "22"=>"/22 (1024)",
+                "23"=>"/23 (512)",
+                "24"=>"/24 (256)"
+            );
+
+            foreach($opts as $key=>$line) {
+                if($settings['visualLimit'] == $key) { print "<option value='$key' selected>$line</option>"; }
+                else 								{ print "<option value='$key'>$line</option>"; }
+            }
+
+            ?>
 		</select>
 	</td>
 	<td class="info2">
@@ -470,19 +470,19 @@ 
 	<td>
 		<select name="subnetOrdering" class="form-control input-sm input-w-auto">
 			<?php
-			$opts = array(
-				"subnet,asc"		=> _("Subnet, ascending"),
-				"subnet,desc"		=> _("Subnet, descending"),
-				"description,asc"	=> _("Description, ascending"),
-				"description,desc"	=> _("Description, descending"),
-			);
-
-			foreach($opts as $key=>$line) {
-				if($settings['subnetOrdering'] == $key) { print "<option value='$key' selected>$line</option>"; }
-				else 									{ print "<option value='$key'>$line</option>"; }
-			}
-
-			?>
+            $opts = array(
+                "subnet,asc"		=> _("Subnet, ascending"),
+                "subnet,desc"		=> _("Subnet, descending"),
+                "description,asc"	=> _("Description, ascending"),
+                "description,desc"	=> _("Description, descending"),
+            );
+
+            foreach($opts as $key=>$line) {
+                if($settings['subnetOrdering'] == $key) { print "<option value='$key' selected>$line</option>"; }
+                else 									{ print "<option value='$key'>$line</option>"; }
+            }
+
+            ?>
 		</select>
 	</td>
 	<td class="info2">
@@ -496,16 +496,16 @@ 
 	<td>
 		<select name="subnetView" class="form-control input-sm input-w-auto">
 			<?php
-			$opts = array(
-				"0"=>_("Subnet Network Only"),
-				"1"=>"Description Only",
-				"2"=>"Subnet Network and Description"
-			);
-			foreach($opts as $key=>$line) {
-				if($settings['subnetView'] == $key) { print "<option value='$key' selected>$line</option>"; }
-				else 								{ print "<option value='$key'>$line</option>"; }
-			}
-			?>
+            $opts = array(
+                "0"=>_("Subnet Network Only"),
+                "1"=>"Description Only",
+                "2"=>"Subnet Network and Description"
+            );
+            foreach($opts as $key=>$line) {
+                if($settings['subnetView'] == $key) { print "<option value='$key' selected>$line</option>"; }
+                else 								{ print "<option value='$key'>$line</option>"; }
+            }
+            ?>
 		</select>
 	</td>
 	<td class="info2">

app/admin/groups/ad-search-group-form.php

Indentation +7 added lines, -7 removed lines

@@ -19,9 +19,9 @@ 
 # fetch all available LDAP servers
 $servers = $Admin->fetch_all_objects ("usersAuthMethod");
 foreach($servers as $k=>$s) {
-	if($s->type!="AD" && $s->type!="LDAP" && $s->type!="NetIQ") {
-		unset($servers[$k]);
-	}
+    if($s->type!="AD" && $s->type!="LDAP" && $s->type!="NetIQ") {
+        unset($servers[$k]);
+    }
 }
 
 # die if no servers
@@ -42,10 +42,10 @@ 
 		<td>
 			<select name="server" id="adserver" class="form-control input-w-auto">
 			<?php
-			foreach($servers as $s) {
-				print "<option value='$s->id'>$s->description</option>";
-			}
-			?>
+            foreach($servers as $s) {
+                print "<option value='$s->id'>$s->description</option>";
+            }
+            ?>
 			</select>
 		</td>
 	</tr>

app/admin/groups/remove-users-result.php

Indentation +20 added lines, -20 removed lines

@@ -22,38 +22,38 @@
 
 # parse result
 foreach($_POST as $k=>$p) {
-	if(substr($k, 0,4) == "user") {
-		$users[substr($k, 4)] = substr($k, 4);
-	}
+    if(substr($k, 0,4) == "user") {
+        $users[substr($k, 4)] = substr($k, 4);
+    }
 }
 
 # remove each user from group
 if(sizeof($users)>0) {
-	foreach($users as $key=>$u) {
-		if(!$Admin->remove_group_from_user($_POST['gid'], $u)) {
-			# get user details
-			$user = $Admin->fetch_object("users", "id", $u);
-			$errors[] = $user->real_name;
-		}
-	}
+    foreach($users as $key=>$u) {
+        if(!$Admin->remove_group_from_user($_POST['gid'], $u)) {
+            # get user details
+            $user = $Admin->fetch_object("users", "id", $u);
+            $errors[] = $user->real_name;
+        }
+    }
 }
 else {
-	$errors[] = _("Please select user(s) to remove from group!");
+    $errors[] = _("Please select user(s) to remove from group!");
 }
 
 # print result
 if(isset($errors)) {
-	print "<div class='alert alert alert-danger'>";
-	print _("Failed to remove users").":<hr>";
-	print "<ul>";
-	foreach($errors as $e) {
-		print "<li>$e</li>";
-	}
-	print "</ul>";
-	print "</div>";
+    print "<div class='alert alert alert-danger'>";
+    print _("Failed to remove users").":<hr>";
+    print "<ul>";
+    foreach($errors as $e) {
+        print "<li>$e</li>";
+    }
+    print "</ul>";
+    print "</div>";
 }
 else {
-	$Result->show("success", _('Users removed from group'), true);
+    $Result->show("success", _('Users removed from group'), true);
 }
 
 ?>
\ No newline at end of file

app/admin/groups/remove-users.php

Indentation +14 added lines, -14 removed lines

@@ -49,24 +49,24 @@
 	</tr>
 
 	<?php
-	# show existing
-	foreach($existing as $m) {
-		# get user details
-		$u = (array) $Admin->fetch_object("users", "id", $m);
+    # show existing
+    foreach($existing as $m) {
+        # get user details
+        $u = (array) $Admin->fetch_object("users", "id", $m);
 
-		print "<tr>";
+        print "<tr>";
 
-		print "	<td>";
-		print "	<input type='checkbox' name='user$u[id]'>";
-		print "	</td>";
+        print "	<td>";
+        print "	<input type='checkbox' name='user$u[id]'>";
+        print "	</td>";
 
-		print "	<td>$u[real_name]</td>";
-		print "	<td>$u[username]</td>";
-		print "	<td>$u[email]</td>";
+        print "	<td>$u[real_name]</td>";
+        print "	<td>$u[username]</td>";
+        print "	<td>$u[email]</td>";
 
-		print "</tr>";
-	}
-	?>
+        print "</tr>";
+    }
+    ?>
 
     </table>
     </form>

app/admin/groups/edit-group-result.php

Indentation +18 added lines, -18 removed lines

@@ -26,11 +26,11 @@ 
 
 # remove users from this group if delete and remove group from sections
 if($_POST['action'] == "delete") {
-	$Admin->remove_group_from_users($_POST['g_id']);
-	$Admin->remove_group_from_sections($_POST['g_id']);
+    $Admin->remove_group_from_users($_POST['g_id']);
+    $Admin->remove_group_from_sections($_POST['g_id']);
 }
 else {
-	if(strlen($_POST['g_name']) < 2)										{ $Result->show("danger", _('Name must be at least 2 characters long')."!", true); }
+    if(strlen($_POST['g_name']) < 2)										{ $Result->show("danger", _('Name must be at least 2 characters long')."!", true); }
 }
 
 # unique name
@@ -40,8 +40,8 @@ 
 
 # create array of values for modification
 $values = array("g_id"=>@$_POST['g_id'],
-				"g_name"=>$_POST['g_name'],
-				"g_desc"=>@$_POST['g_desc']);
+                "g_name"=>$_POST['g_name'],
+                "g_desc"=>@$_POST['g_desc']);
 
 /* try to execute */
 if(!$Admin->object_modify("userGroups", $_POST['action'], "g_id", $values)) { $Result->show("danger",  _("Group $_POST[action] error")."!", false); }
@@ -49,19 +49,19 @@ 
 
 # from list of usernames provided from AD result if some user matches add him to group
 if (strlen($_POST['gmembers'])>0) {
-	// save id
-	$gid = $Admin->lastId;
-	// to array
-	$gmembers = explode(";", $_POST['gmembers']);
-	// check
-	foreach ($gmembers as $gm) {
-		// check if user exists
-		$user=$Admin->fetch_object("users","username",$gm);
-		if ($user!==false) {
-			// add to group
-			$Admin->add_group_to_user ($gid, $user->id);
-		}
-	}
+    // save id
+    $gid = $Admin->lastId;
+    // to array
+    $gmembers = explode(";", $_POST['gmembers']);
+    // check
+    foreach ($gmembers as $gm) {
+        // check if user exists
+        $user=$Admin->fetch_object("users","username",$gm);
+        if ($user!==false) {
+            // add to group
+            $Admin->add_group_to_user ($gid, $user->id);
+        }
+    }
 }
 
 ?>
\ No newline at end of file