phpipam / phpipam

app/admin/requests/edit.php

Spacing +91 added lines, -91 removed lines

@@ -5,44 +5,44 @@ 
  ***********************************************/
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
 $Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$User = new User ($Database);
 $Admin	 	= new Admin ($Database, false);
 $Addresses	= new Addresses ($Database);
 $Subnets	= new Subnets ($Database);
-$Tools		= new Tools ($Database);
+$Tools = new Tools ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # create csrf token
 $csrf = $User->csrf_cookie ("create", "requests");
 
 # fetch request
-$request = $Admin->fetch_object("requests", "id", $_POST['requestId']);
+$request = $Admin->fetch_object ("requests", "id", $_POST['requestId']);
 
 //fail
-if($request===false) { $Result->show("danger", _("Request does not exist"), true, true); }
-else				 { $request = (array) $request; }
+if ($request === false) { $Result->show ("danger", _ ("Request does not exist"), true, true); }
+else { $request = (array) $request; }
 
 # verify permissions
-if($Subnets->check_permission($User->user, $request['subnetId']) != 3)	{ $Result->show("danger", _('You do not have permissions to process this request')."!", true, true); }
+if ($Subnets->check_permission ($User->user, $request['subnetId']) != 3) { $Result->show ("danger", _ ('You do not have permissions to process this request')."!", true, true); }
 
 
 # set IP address
 # if provided (requested from logged in user) check if already in use, if it is warn and set next free
 # else get next free
-if(strlen($request['ip_addr'])>0) {
+if (strlen ($request['ip_addr']) > 0) {
 	// check if it exists
-	if ( $Addresses->address_exists ($request['ip_addr'], $request['subnetId'])) {
+	if ($Addresses->address_exists ($request['ip_addr'], $request['subnetId'])) {
 		$errmsg = "Requested IP address ($request[ip_addr]) already used. First available address automatically provided.";
 		$errmsg_class = "warning";
 		//fetch first free
-		$ip_address = $Addresses->transform_to_dotted($Addresses->get_first_available_address ($request['subnetId'], $Subnets));
+		$ip_address = $Addresses->transform_to_dotted ($Addresses->get_first_available_address ($request['subnetId'], $Subnets));
 	}
 	else {
 		$ip_address = $request['ip_addr'];
@@ -50,11 +50,11 @@ 
 
 } else {
 	// fetch first free
-	$ip_address = $Addresses->transform_to_dotted($Addresses->get_first_available_address ($request['subnetId'], $Subnets));
+	$ip_address = $Addresses->transform_to_dotted ($Addresses->get_first_available_address ($request['subnetId'], $Subnets));
 }
 
 // false
-if ($ip_address===false) {
+if ($ip_address === false) {
 	$ip_address = "";
 	$errmsg = "No IP addresses available in requested subnet";
 	$errmsg_class = "danger";
@@ -62,13 +62,13 @@ 
 
 
 # set selected address fields array
-$selected_ip_fields = explode(";", $User->settings->IPfilter);
+$selected_ip_fields = explode (";", $User->settings->IPfilter);
 # fetch custom fields
-$custom_fields = $Tools->fetch_custom_fields('ipaddresses');
+$custom_fields = $Tools->fetch_custom_fields ('ipaddresses');
 ?>
 
 <!-- header -->
-<div class="pHeader"><?php print _('Manage IP address request'); ?></div>
+<div class="pHeader"><?php print _ ('Manage IP address request'); ?></div>
 
 <!-- content -->
 <div class="pContent">
@@ -76,11 +76,11 @@ 
 	<?php
 	// if error / warning message provided
 	if (isset($errmsg)) {
-		$Result->show($errmsg_class, $errmsg, false, false);
+		$Result->show ($errmsg_class, $errmsg, false, false);
 		print "<hr>";
 	}
 	// error check
-	if (@$errmsg_class!="danger") {
+	if (@$errmsg_class != "danger") {
 	?>
 
 	<!-- IP address request form -->
@@ -95,17 +95,17 @@ 
 
 	<!-- Subnet -->
 	<tr>
-		<th><?php print _('Requested subnet'); ?></th>
+		<th><?php print _ ('Requested subnet'); ?></th>
 		<td>
 			<select name="subnetId" id="subnetId" class="form-control input-sm input-w-auto">
 			<?php
-			$request_subnets = $Admin->fetch_multiple_objects("subnets", "allowRequests", 1);
+			$request_subnets = $Admin->fetch_multiple_objects ("subnets", "allowRequests", 1);
 
-			foreach($request_subnets as $subnet) {
+			foreach ($request_subnets as $subnet) {
 				$subnet = (array) $subnet;
 				# print
-				if($request['subnetId']==$subnet['id'])	{ print '<option value="'. $subnet['id'] .'" selected>' . $Addresses->transform_to_dotted($subnet['subnet']) .'/'. $subnet['mask'] .' ['. $subnet['description'] .']</option>'; }
-				else 									{ print '<option value="'. $subnet['id'] .'">' 			. $Addresses->transform_to_dotted($subnet['subnet']) .'/'. $subnet['mask'] .' ['. $subnet['description'] .']</option>'; }
+				if ($request['subnetId'] == $subnet['id']) { print '<option value="'.$subnet['id'].'" selected>'.$Addresses->transform_to_dotted ($subnet['subnet']).'/'.$subnet['mask'].' ['.$subnet['description'].']</option>'; }
+				else { print '<option value="'.$subnet['id'].'">'.$Addresses->transform_to_dotted ($subnet['subnet']).'/'.$subnet['mask'].' ['.$subnet['description'].']</option>'; }
 			}
 			?>
 			</select>
@@ -113,7 +113,7 @@ 
 	</tr>
 	<!-- IP address -->
 	<tr>
-		<th><?php print _('IP address'); ?></th>
+		<th><?php print _ ('IP address'); ?></th>
 		<td>
 			<input type="text" name="ip_addr" class="ip_addr form-control input-sm" value="<?php print $ip_address; ?>" size="30">
 			<input type="hidden" name="requestId" value="<?php print $request['id']; ?>">
@@ -123,32 +123,32 @@ 
 	</tr>
 	<!-- description -->
 	<tr>
-		<th><?php print _('Description'); ?></th>
+		<th><?php print _ ('Description'); ?></th>
 		<td>
-			<input type="text" name="description" class="form-control input-sm" value="<?php print @$request['description']; ?>" size="30" placeholder="<?php print _('Enter IP description'); ?>">
+			<input type="text" name="description" class="form-control input-sm" value="<?php print @$request['description']; ?>" size="30" placeholder="<?php print _ ('Enter IP description'); ?>">
 		</td>
 	</tr>
 	<!-- DNS name -->
 	<tr>
-		<th><?php print _('Hostname'); ?></th>
+		<th><?php print _ ('Hostname'); ?></th>
 		<td>
-			<input type="text" name="dns_name" class="form-control input-sm" value="<?php print @$request['dns_name']; ?>" size="30" placeholder="<?php print _('Enter hostname'); ?>">
+			<input type="text" name="dns_name" class="form-control input-sm" value="<?php print @$request['dns_name']; ?>" size="30" placeholder="<?php print _ ('Enter hostname'); ?>">
 		</td>
 	</tr>
 
-	<?php if(in_array('state', $selected_ip_fields)) { ?>
+	<?php if (in_array ('state', $selected_ip_fields)) { ?>
 	<!-- state -->
 	<tr>
-		<th><?php print _('State'); ?></th>
+		<th><?php print _ ('State'); ?></th>
 		<td>
 			<select name="state" class="form-control input-sm input-w-auto">
 			<?php
 			$states = $Addresses->addresses_types_fetch ();
 			# default tag
-			if (!isset($request['state']))	{ $request['state'] = "2"; }
-			foreach($states as $s) {
-				if ($request['state']==$s['id'])	{ print "<option value='$s[id]' selected='selected'>$s[type]</option>"; }
-				else								{ print "<option value='$s[id]'>$s[type]</option>"; }
+			if (!isset($request['state'])) { $request['state'] = "2"; }
+			foreach ($states as $s) {
+				if ($request['state'] == $s['id']) { print "<option value='$s[id]' selected='selected'>$s[type]</option>"; }
+				else { print "<option value='$s[id]'>$s[type]</option>"; }
 			}
 			?>
 			</select>
@@ -156,41 +156,41 @@ 
 	</tr>
 	<?php } ?>
 
-	<?php if(in_array('owner', $selected_ip_fields)) { ?>
+	<?php if (in_array ('owner', $selected_ip_fields)) { ?>
 	<!-- owner -->
 	<tr>
-		<th><?php print _('Owner'); ?></th>
+		<th><?php print _ ('Owner'); ?></th>
 		<td>
-			<input type="text" name="owner" class="form-control input-sm" id="owner" value="<?php print @$request['owner']; ?>" size="30" placeholder="<?php print _('Enter IP owner'); ?>">
+			<input type="text" name="owner" class="form-control input-sm" id="owner" value="<?php print @$request['owner']; ?>" size="30" placeholder="<?php print _ ('Enter IP owner'); ?>">
 		</td>
 	</tr>
 	<?php } ?>
 
-	<?php if(in_array('switch', $selected_ip_fields)) { ?>
+	<?php if (in_array ('switch', $selected_ip_fields)) { ?>
 	<!-- switch / port -->
 	<tr>
-		<th><?php print _('Device'); ?> / <?php print _('port'); ?></th>
+		<th><?php print _ ('Device'); ?> / <?php print _ ('port'); ?></th>
 		<td>
 			<select name="switch" class="form-control input-sm input-w-100">
-				<option disabled><?php print _('Select device'); ?>:</option>
-				<option value="" selected><?php print _('None'); ?></option>
+				<option disabled><?php print _ ('Select device'); ?>:</option>
+				<option value="" selected><?php print _ ('None'); ?></option>
 				<?php
-				$devices = $Tools->fetch_all_objects("devices", "hostname");
+				$devices = $Tools->fetch_all_objects ("devices", "hostname");
 				//loop
-				if ($devices!==false) {
-    				foreach($devices as $device) {
+				if ($devices !== false) {
+    				foreach ($devices as $device) {
     					//cast
     					$device = (array) $device;
 
-    					if($device['id'] == @$request['switch']) { print '<option value="'. $device['id'] .'" selected>'. $device['hostname'] .'</option>'. "\n"; }
-    					else 									 { print '<option value="'. $device['id'] .'">'. 		 $device['hostname'] .'</option>'. "\n"; }
+    					if ($device['id'] == @$request['switch']) { print '<option value="'.$device['id'].'" selected>'.$device['hostname'].'</option>'."\n"; }
+    					else { print '<option value="'.$device['id'].'">'.$device['hostname'].'</option>'."\n"; }
     				}
 				}
 				?>
 			</select>
-			<?php if(in_array('port', $selected_ip_fields)) { ?>
+			<?php if (in_array ('port', $selected_ip_fields)) { ?>
 			/
-			<input type="text" name="port" class="form-control input-sm input-w-100" value="<?php print @$request['port']; ?>"  placeholder="<?php print _('Port'); ?>">
+			<input type="text" name="port" class="form-control input-sm input-w-100" value="<?php print @$request['port']; ?>"  placeholder="<?php print _ ('Port'); ?>">
 		</td>
 	</tr>
 	<?php } ?>
@@ -198,53 +198,53 @@ 
 	</tr>
 	<?php } ?>
 
-	<?php if(in_array('note', $selected_ip_fields)) { ?>
+	<?php if (in_array ('note', $selected_ip_fields)) { ?>
 	<!-- note -->
 	<tr>
-		<th><?php print _('Note'); ?></th>
+		<th><?php print _ ('Note'); ?></th>
 		<td>
-			<input type="text" name="note" class="form-control input-sm" id="note" placeholder="<?php print _('Write note'); ?>" size="30">
+			<input type="text" name="note" class="form-control input-sm" id="note" placeholder="<?php print _ ('Write note'); ?>" size="30">
 		</td>
 	</tr>
 	<?php } ?>
 
 	<!-- Custom fields -->
 	<?php
-	if(sizeof(@$custom_fields) > 0) {
+	if (sizeof (@$custom_fields) > 0) {
 	    # count datepickers
 	    $timeP = 0;
 
 	    # all my fields
-	    foreach($custom_fields as $myField) {
+	    foreach ($custom_fields as $myField) {
 	        # replace spaces with |
-	        $myField['nameNew'] = str_replace(" ", "___", $myField['name']);
+	        $myField['nameNew'] = str_replace (" ", "___", $myField['name']);
 
 	        # required
-	        if($myField['Null']=="NO")  { $required = "*"; }
-	        else                        { $required = ""; }
+	        if ($myField['Null'] == "NO") { $required = "*"; }
+	        else { $required = ""; }
 
-	        print '<tr>'. "\n";
-	        print ' <td>'. $myField['name'] .' '.$required.'</td>'. "\n";
-	        print ' <td>'. "\n";
+	        print '<tr>'."\n";
+	        print ' <td>'.$myField['name'].' '.$required.'</td>'."\n";
+	        print ' <td>'."\n";
 
 	        //set type
-		    if(substr($myField['type'], 0,3) == "set" || substr($myField['type'], 0,4) == "enum") {
+		    if (substr ($myField['type'], 0, 3) == "set" || substr ($myField['type'], 0, 4) == "enum") {
 				//parse values
-				$tmp = substr($myField['type'], 0,3)=="set" ? explode(",", str_replace(array("set(", ")", "'"), "", $myField['type'])) : explode(",", str_replace(array("enum(", ")", "'"), "", $myField['type']));
+				$tmp = substr ($myField['type'], 0, 3) == "set" ? explode (",", str_replace (array ("set(", ")", "'"), "", $myField['type'])) : explode (",", str_replace (array ("enum(", ")", "'"), "", $myField['type']));
 	            //null
-	            if($myField['Null']!="NO") { array_unshift($tmp, ""); }
+	            if ($myField['Null'] != "NO") { array_unshift ($tmp, ""); }
 
 	            print "<select name='$myField[nameNew]' class='form-control input-sm input-w-auto' rel='tooltip' data-placement='right' title='$myField[Comment]'>";
-	            foreach($tmp as $v) {
-	                if($v==@$details[$myField['name']])  { print "<option value='$v' selected='selected'>$v</option>"; }
-	                else                                 { print "<option value='$v'>$v</option>"; }
+	            foreach ($tmp as $v) {
+	                if ($v == @$details[$myField['name']]) { print "<option value='$v' selected='selected'>$v</option>"; }
+	                else { print "<option value='$v'>$v</option>"; }
 	            }
 	            print "</select>";
 	        }
 	        //date and time picker
-	        elseif($myField['type'] == "date" || $myField['type'] == "datetime") {
+	        elseif ($myField['type'] == "date" || $myField['type'] == "datetime") {
 	            // just for first
-	            if($timeP==0) {
+	            if ($timeP == 0) {
 	                print '<link rel="stylesheet" type="text/css" href="css/1.2/bootstrap/bootstrap-datetimepicker.min.css">';
 	                print '<script type="text/javascript" src="js/1.2/bootstrap-datetimepicker.min.js"></script>';
 	                print '<script type="text/javascript">';
@@ -260,38 +260,38 @@ 
 	            $timeP++;
 
 	            //set size
-	            if($myField['type'] == "date")  { $size = 10; $class='datepicker';      $format = "yyyy-MM-dd"; }
-	            else                            { $size = 19; $class='datetimepicker';  $format = "yyyy-MM-dd"; }
+	            if ($myField['type'] == "date") { $size = 10; $class = 'datepicker'; $format = "yyyy-MM-dd"; }
+	            else { $size = 19; $class = 'datetimepicker'; $format = "yyyy-MM-dd"; }
 
 	            //field
-	            if(!isset($details[$myField['name']]))  { print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'. $myField['nameNew'] .'" maxlength="'.$size.'" rel="tooltip" data-placement="right" title="'.$myField['Comment'].'">'. "\n"; }
-	            else                                    { print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'. $myField['nameNew'] .'" maxlength="'.$size.'" value="'. @$details[$myField['name']]. '" rel="tooltip" data-placement="right" title="'.$myField['Comment'].'">'. "\n"; }
+	            if (!isset($details[$myField['name']])) { print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'.$myField['nameNew'].'" maxlength="'.$size.'" rel="tooltip" data-placement="right" title="'.$myField['Comment'].'">'."\n"; }
+	            else { print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'.$myField['nameNew'].'" maxlength="'.$size.'" value="'.@$details[$myField['name']].'" rel="tooltip" data-placement="right" title="'.$myField['Comment'].'">'."\n"; }
 	        }
 	        //boolean
-	        elseif($myField['type'] == "tinyint(1)") {
+	        elseif ($myField['type'] == "tinyint(1)") {
 	            print "<select name='$myField[nameNew]' class='form-control input-sm input-w-auto' rel='tooltip' data-placement='right' title='$myField[Comment]'>";
-	            $tmp = array(0=>"No",1=>"Yes");
+	            $tmp = array (0=>"No", 1=>"Yes");
 	            //null
-	            if($myField['Null']!="NO") { $tmp[2] = ""; }
+	            if ($myField['Null'] != "NO") { $tmp[2] = ""; }
 
-	            foreach($tmp as $k=>$v) {
-	                if(strlen(@$details[$myField['name']])==0 && $k==2)  { print "<option value='$k' selected='selected'>"._($v)."</option>"; }
-	                elseif($k==@$details[$myField['name']])              { print "<option value='$k' selected='selected'>"._($v)."</option>"; }
-	                else                                                 { print "<option value='$k'>"._($v)."</option>"; }
+	            foreach ($tmp as $k=>$v) {
+	                if (strlen (@$details[$myField['name']]) == 0 && $k == 2) { print "<option value='$k' selected='selected'>"._ ($v)."</option>"; }
+	                elseif ($k == @$details[$myField['name']]) { print "<option value='$k' selected='selected'>"._ ($v)."</option>"; }
+	                else { print "<option value='$k'>"._ ($v)."</option>"; }
 	            }
 	            print "</select>";
 	        }
 	        //text
-	        elseif($myField['type'] == "text") {
-	            print ' <textarea class="form-control input-sm" name="'. $myField['nameNew'] .'" placeholder="'. $myField['name'] .'" rowspan=3 rel="tooltip" data-placement="right" title="'.$myField['Comment'].'">'. $details[$myField['name']]. '</textarea>'. "\n";
+	        elseif ($myField['type'] == "text") {
+	            print ' <textarea class="form-control input-sm" name="'.$myField['nameNew'].'" placeholder="'.$myField['name'].'" rowspan=3 rel="tooltip" data-placement="right" title="'.$myField['Comment'].'">'.$details[$myField['name']].'</textarea>'."\n";
 	        }
 	        //default - input field
 	        else {
-	            print ' <input type="text" class="ip_addr form-control input-sm" name="'. $myField['nameNew'] .'" placeholder="'. $myField['name'] .'" value="'. @$details[$myField['name']]. '" size="30" rel="tooltip" data-placement="right" title="'.$myField['Comment'].'">'. "\n";
+	            print ' <input type="text" class="ip_addr form-control input-sm" name="'.$myField['nameNew'].'" placeholder="'.$myField['name'].'" value="'.@$details[$myField['name']].'" size="30" rel="tooltip" data-placement="right" title="'.$myField['Comment'].'">'."\n";
 	        }
 
-	        print ' </td>'. "\n";
-	        print '</tr>'. "\n";
+	        print ' </td>'."\n";
+	        print '</tr>'."\n";
 	    }
 	}
 	?>
@@ -303,23 +303,23 @@ 
 
 	<!-- requested by -->
 	<tr>
-		<th><?php print _('Requester email'); ?></th>
+		<th><?php print _ ('Requester email'); ?></th>
 		<td>
 			<input type="text" disabled="disabled" class="form-control" value="<?php print @$request['requester']; ?>">
 		</td>
 	</tr>
 	<!-- comment -->
 	<tr>
-		<th><?php print _('Requester comment'); ?></th>
+		<th><?php print _ ('Requester comment'); ?></th>
 		<td>
 			<input type="text" disabled="disabled" class="form-control" value="<?php print @$request['comment']; ?>">
 			<?php print "<input type='hidden' name='comment' value='".@$request['comment']."'>"; ?></i></td>
 	</tr>
 	<!-- Admin comment -->
 	<tr>
-		<th><?php print _('Comment approval/reject'); ?>:</th>
+		<th><?php print _ ('Comment approval/reject'); ?>:</th>
 		<td>
-			<textarea name="adminComment" rows="3" cols="30" class="form-control input-sm" placeholder="<?php print _('Enter reason for reject/approval to be sent to requester'); ?>"></textarea>
+			<textarea name="adminComment" rows="3" cols="30" class="form-control input-sm" placeholder="<?php print _ ('Enter reason for reject/approval to be sent to requester'); ?>"></textarea>
 		</td>
 	</tr>
 
@@ -331,10 +331,10 @@ 
 <!-- footer -->
 <div class="pFooter">
 	<div class="btn-group">
-		<button class="btn btn-sm btn-default hidePopups"><?php print _('Cancel'); ?></button>
-		<?php if (@$errmsg_class!="danger") { ?>
-		<button class="btn btn-sm btn-default btn-danger manageRequest" data-action='reject'><i class="fa fa-times"></i> <?php print _('Reject'); ?></button>
-		<button class="btn btn-sm btn-default btn-success manageRequest" data-action='accept'><i class="fa fa-check"></i> <?php print _('Accept'); ?></button>
+		<button class="btn btn-sm btn-default hidePopups"><?php print _ ('Cancel'); ?></button>
+		<?php if (@$errmsg_class != "danger") { ?>
+		<button class="btn btn-sm btn-default btn-danger manageRequest" data-action='reject'><i class="fa fa-times"></i> <?php print _ ('Reject'); ?></button>
+		<button class="btn btn-sm btn-default btn-success manageRequest" data-action='accept'><i class="fa fa-check"></i> <?php print _ ('Accept'); ?></button>
 		<?php } ?>
 	</div>
 

app/admin/requests/edit-result.php

Spacing +29 added lines, -29 removed lines

@@ -5,50 +5,50 @@ 
  ***********************************************/
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
 $Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$User = new User ($Database);
 $Admin	 	= new Admin ($Database, false);
 $Addresses	= new Addresses ($Database);
 $Subnets	= new Subnets ($Database);
-$Tools		= new Tools ($Database);
+$Tools = new Tools ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # strip input tags
-$_POST = $Admin->strip_input_tags($_POST);
+$_POST = $Admin->strip_input_tags ($_POST);
 
 # validate csrf cookie
-$User->csrf_cookie ("validate", "requests", $_POST['csrf_cookie']) === false ? $Result->show("danger", _("Invalid CSRF cookie"), true) : "";
+$User->csrf_cookie ("validate", "requests", $_POST['csrf_cookie']) === false ? $Result->show ("danger", _ ("Invalid CSRF cookie"), true) : "";
 
 # verify permissions
-if($Subnets->check_permission($User->user, $_POST['subnetId']) != 3)	{ $Result->show("danger", _('You do not have permissions to process this request')."!", true); }
+if ($Subnets->check_permission ($User->user, $_POST['subnetId']) != 3) { $Result->show ("danger", _ ('You do not have permissions to process this request')."!", true); }
 
 # fetch custom fields
-$custom = $Tools->fetch_custom_fields('ipaddresses');
-if(sizeof($custom) > 0) {
-	foreach($custom as $myField) {
-		if(isset($_POST[$myField['name']])) { $_POST[$myField['name']] = $_POST[$myField['name']];}
+$custom = $Tools->fetch_custom_fields ('ipaddresses');
+if (sizeof ($custom) > 0) {
+	foreach ($custom as $myField) {
+		if (isset($_POST[$myField['name']])) { $_POST[$myField['name']] = $_POST[$myField['name']]; }
 	}
 }
 
 # fetch subnet
-$subnet = (array) $Admin->fetch_object("subnets", "id", $_POST['subnetId']);
+$subnet = (array) $Admin->fetch_object ("subnets", "id", $_POST['subnetId']);
 
 /* if action is reject set processed and accepted to 1 and 0 */
-if($_POST['action'] == "reject") {
+if ($_POST['action'] == "reject") {
 	//set reject values
-	$values = array("id"=>$_POST['requestId'],
+	$values = array ("id"=>$_POST['requestId'],
 					"processed"=>1,
 					"accepted"=>0,
 					"adminComment"=>@$_POST['adminComment']
 					);
-	if(!$Admin->object_modify("requests", "edit", "id", $values))		{ $Result->show("danger",  _("Failed to reject IP request"), true); }
-	else																{ $Result->show("success", _("Request has beed rejected"), false); }
+	if (!$Admin->object_modify ("requests", "edit", "id", $values)) { $Result->show ("danger", _ ("Failed to reject IP request"), true); }
+	else { $Result->show ("success", _ ("Request has beed rejected"), false); }
 
 	# send mail
 	$Tools->ip_request_send_mail ("reject", $_POST);
@@ -59,14 +59,14 @@ 
 	$subnet_temp = $Addresses->transform_to_dotted ($subnet['subnet'])."/".$subnet['mask'];
 
 	//verify IP and subnet
-	$Addresses->verify_address( $Addresses->transform_address($_POST['ip_addr'], "dotted"), $subnet_temp, false, true);
+	$Addresses->verify_address ($Addresses->transform_address ($_POST['ip_addr'], "dotted"), $subnet_temp, false, true);
 
 	//check if already existing and die
-	if ($Addresses->address_exists($Addresses->transform_address($_POST['ip_addr'], "decimal"), $subnet['id'])) { $Result->show("danger", _('IP address already exists'), true); }
+	if ($Addresses->address_exists ($Addresses->transform_address ($_POST['ip_addr'], "decimal"), $subnet['id'])) { $Result->show ("danger", _ ('IP address already exists'), true); }
 
 	//insert to ipaddresses table
-	$values = array("action"=>"add",
-					"ip_addr"=>$Addresses->transform_address($_POST['ip_addr'],"decimal"),
+	$values = array ("action"=>"add",
+					"ip_addr"=>$Addresses->transform_address ($_POST['ip_addr'], "decimal"),
 					"subnetId"=>$_POST['subnetId'],
 					"description"=>@$_POST['description'],
 					"dns_name"=>@$_POST['dns_name'],
@@ -77,16 +77,16 @@ 
 					"port"=>@$_POST['port'],
 					"note"=>@$_POST['note']
 					);
-	if(!$Addresses->modify_address($values))	{ $Result->show("danger",  _("Failed to create IP address"), true); }
+	if (!$Addresses->modify_address ($values)) { $Result->show ("danger", _ ("Failed to create IP address"), true); }
 
 	//accept message
-	$values2 = array("id"=>$_POST['requestId'],
+	$values2 = array ("id"=>$_POST['requestId'],
 					"processed"=>1,
 					"accepted"=>1,
 					"adminComment"=>$comment
 					);
-	if(!$Admin->object_modify("requests", "edit", "id", $values2))		{ $Result->show("danger",  _("Cannot confirm IP address"), true); }
-	else																{ $Result->show("success", _("IP request accepted/rejected"), false); }
+	if (!$Admin->object_modify ("requests", "edit", "id", $values2)) { $Result->show ("danger", _ ("Cannot confirm IP address"), true); }
+	else { $Result->show ("success", _ ("IP request accepted/rejected"), false); }
 
 
 	# send mail
@@ -95,16 +95,16 @@ 
 	$tmp['subnetId'] = $_POST['subnetId'];
 	unset($_POST['subnetId']);
 	// gateway
-	$gateway=$Subnets->find_gateway ($tmp['subnetId']);
-	if($gateway !== false) { $tmp['gateway'] = $Subnets->transform_address($gateway->ip_addr,"dotted"); }
+	$gateway = $Subnets->find_gateway ($tmp['subnetId']);
+	if ($gateway !== false) { $tmp['gateway'] = $Subnets->transform_address ($gateway->ip_addr, "dotted"); }
 	//set vlan
 	$vlan = $Tools->fetch_object ("vlans", "vlanId", $subnet['vlanId']);
-	$tmp['vlan'] = $vlan==false ? "" : $vlan->number." - ".$vlan->description;
+	$tmp['vlan'] = $vlan == false ? "" : $vlan->number." - ".$vlan->description;
 	//set dns
 	$dns = $Tools->fetch_object ("nameservers", "id", $subnet['nameserverId']);
-	$tmp['dns'] = $dns==false ? "" : $dns->description." <br> ".str_replace(";", ", ", $dns->namesrv1);
+	$tmp['dns'] = $dns == false ? "" : $dns->description." <br> ".str_replace (";", ", ", $dns->namesrv1);
 
-	$_POST = array_merge($tmp, $_POST);
+	$_POST = array_merge ($tmp, $_POST);
 
 	$Tools->ip_request_send_mail ("accept", $_POST);
 }

app/admin/requests/index.php

Spacing +43 added lines, -43 removed lines

@@ -5,19 +5,19 @@ 
  ****************************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # fetch all Active requests
 $active_requests   = $Admin->fetch_multiple_objects ("requests", "processed", 0, "id", false);
 $inactive_requests = $Admin->fetch_multiple_objects ("requests", "processed", 1, "id", false);
 ?>
 
-<h4><?php print _('List of all active IP addresses requests'); ?></h4>
+<h4><?php print _ ('List of all active IP addresses requests'); ?></h4>
 <hr><br>
 
 <?php
 # none
-if($active_requests===false) { print "<div class='alert alert-info'>"._('No IP address requests available')."!</div>"; }
+if ($active_requests === false) { print "<div class='alert alert-info'>"._ ('No IP address requests available')."!</div>"; }
 else {
 ?>
 <table id="requestedIPaddresses" class="table sorted table-striped table-condensed table-hover table-top">
@@ -26,19 +26,19 @@ 
 <thead>
 <tr>
 	<th style="width:50px;"></th>
-	<th><?php print _('IP'); ?></th>
-	<th><?php print _('Subnet'); ?></th>
-	<th><?php print _('Hostname'); ?></th>
-	<th><?php print _('Description'); ?></th>
-	<th><?php print _('Requested by'); ?></th>
-	<th><?php print _('Comment'); ?></th>
+	<th><?php print _ ('IP'); ?></th>
+	<th><?php print _ ('Subnet'); ?></th>
+	<th><?php print _ ('Hostname'); ?></th>
+	<th><?php print _ ('Description'); ?></th>
+	<th><?php print _ ('Requested by'); ?></th>
+	<th><?php print _ ('Comment'); ?></th>
 </tr>
 </thead>
 
 <tbody>
 <?php
 	# print requests
-	foreach($active_requests as $k=>$request) {
+	foreach ($active_requests as $k=>$request) {
 		//cast
 		$request = (array) $request;
 
@@ -46,22 +46,22 @@ 
 		$subnet = (array) $Subnets->fetch_subnet (null, $request['subnetId']);
 
 		//valid
-		if(sizeof($subnet)==0 || @$subnet[0]===false) {
+		if (sizeof ($subnet) == 0 || @$subnet[0] === false) {
 			unset($active_requests[$k]);
 		}
 		else {
 			// ip not provided
-			$request['ip_addr'] = strlen($request['ip_addr'])>0 ? $request['ip_addr'] : _("Automatic");
-
-			print '<tr>'. "\n";
-			print "	<td><button class='btn btn-sm btn-default' data-requestid='$request[id]'><i class='fa fa-pencil'></i> "._('Process')."</button></td>";
-			print '	<td>'. $request['ip_addr'] .'</td>'. "\n";
-			print '	<td>'. $Subnets->transform_to_dotted($subnet['subnet']) .'/'. $subnet['mask'] .' ('. $subnet['description'] .')</td>'. "\n";
-			print '	<td>'. $request['dns_name'] .'</td>'. "\n";
-			print '	<td>'. $request['description'] .'</td>'. "\n";
-			print '	<td>'. $request['requester'] .'</td>'. "\n";
-			print '	<td>'. $request['comment'] .'</td>'. "\n";
-			print '</tr>'. "\n";
+			$request['ip_addr'] = strlen ($request['ip_addr']) > 0 ? $request['ip_addr'] : _ ("Automatic");
+
+			print '<tr>'."\n";
+			print "	<td><button class='btn btn-sm btn-default' data-requestid='$request[id]'><i class='fa fa-pencil'></i> "._ ('Process')."</button></td>";
+			print '	<td>'.$request['ip_addr'].'</td>'."\n";
+			print '	<td>'.$Subnets->transform_to_dotted ($subnet['subnet']).'/'.$subnet['mask'].' ('.$subnet['description'].')</td>'."\n";
+			print '	<td>'.$request['dns_name'].'</td>'."\n";
+			print '	<td>'.$request['description'].'</td>'."\n";
+			print '	<td>'.$request['requester'].'</td>'."\n";
+			print '	<td>'.$request['comment'].'</td>'."\n";
+			print '</tr>'."\n";
 		}
 	}
 ?>
@@ -70,9 +70,9 @@ 
 <?php
 }
 # print resolved if present
-if($inactive_requests!==false) { ?>
+if ($inactive_requests !== false) { ?>
 
-<h4 style="margin-top:50px;"><?php print _('List of all processes IP addresses requests'); ?></h4>
+<h4 style="margin-top:50px;"><?php print _ ('List of all processes IP addresses requests'); ?></h4>
 <hr><br>
 
 <table id="requestedIPaddresses" class="table sorted table-striped table-condensed table-hover table-top table-auto1">
@@ -80,20 +80,20 @@ 
 <!-- headers -->
 <thead>
 <tr>
-	<th><?php print _('Subnet'); ?></th>
-	<th><?php print _('Hostname'); ?></th>
-	<th><?php print _('Description'); ?></th>
-	<th><?php print _('Requested by'); ?></th>
-	<th><?php print _('Comment'); ?></th>
-	<th><?php print _('Admin comment'); ?></th>
-	<th><?php print _('Accepted'); ?></th>
+	<th><?php print _ ('Subnet'); ?></th>
+	<th><?php print _ ('Hostname'); ?></th>
+	<th><?php print _ ('Description'); ?></th>
+	<th><?php print _ ('Requested by'); ?></th>
+	<th><?php print _ ('Comment'); ?></th>
+	<th><?php print _ ('Admin comment'); ?></th>
+	<th><?php print _ ('Accepted'); ?></th>
 </tr>
 </thead>
 
 <tbody>
 <?php
 	# print requests
-	foreach($inactive_requests as $k=>$request) {
+	foreach ($inactive_requests as $k=>$request) {
 		//cast
 		$request = (array) $request;
 
@@ -101,21 +101,21 @@ 
 		$subnet = (array) $Subnets->fetch_subnet (null, $request['subnetId']);
 
 		//valid
-		if(sizeof($subnet)==0 || @$subnet[0]===false) {
+		if (sizeof ($subnet) == 0 || @$subnet[0] === false) {
 			unset($inactive_requests[$k]);
 		}
 		else {
-			print '<tr>'. "\n";
-			print '	<td>'. $Subnets->transform_to_dotted($subnet['subnet']) .'/'. $subnet['mask'] .' ('. $subnet['description'] .')</td>'. "\n";
-			print '	<td>'. $request['dns_name'] .'</td>'. "\n";
-			print '	<td>'. $request['description'] .'</td>'. "\n";
-			print '	<td>'. $request['requester'] .'</td>'. "\n";
-			print '	<td>'. $request['comment'] .'</td>'. "\n";
-			print '	<td>'. $request['adminComment'] .'</td>'. "\n";
+			print '<tr>'."\n";
+			print '	<td>'.$Subnets->transform_to_dotted ($subnet['subnet']).'/'.$subnet['mask'].' ('.$subnet['description'].')</td>'."\n";
+			print '	<td>'.$request['dns_name'].'</td>'."\n";
+			print '	<td>'.$request['description'].'</td>'."\n";
+			print '	<td>'.$request['requester'].'</td>'."\n";
+			print '	<td>'.$request['comment'].'</td>'."\n";
+			print '	<td>'.$request['adminComment'].'</td>'."\n";
 			print '	<td>';
-			print $request['accepted']==1 ? "Yes" : "No";
-			print '</td>'. "\n";
-			print '</tr>'. "\n";
+			print $request['accepted'] == 1 ? "Yes" : "No";
+			print '</td>'."\n";
+			print '</tr>'."\n";
 		}
 	}
 ?>

app/admin/index.php

Spacing +5 added lines, -5 removed lines

@@ -5,19 +5,19 @@
 
 <?php
 # print
-foreach($admin_menu as $k=>$menu) {
+foreach ($admin_menu as $k=>$menu) {
 
 	# headers
-	print "<h4>"._($k)."</h4>";
+	print "<h4>"._ ($k)."</h4>";
 	print "<hr>";
 
 	# items
-	foreach($menu as $t) {
+	foreach ($menu as $t) {
 		print "	<div class='col-xs-12 col-md-6 col-lg-6 widget-dash'>";
 		print "	<div class='inner thumbnail'>";
 		print "		<div class='hContent'>";
-		print "			<div class='icon'><a href='".create_link("administration",$t['href'])."'><i class='fa $t[icon]'></i></a></div>";
-		print "			<div class='text'><a href='".create_link("administration",$t['href'])."'>"._($t['name'])."</a><hr><span class='text-muted'>"._($t['description'])."</span></div>";
+		print "			<div class='icon'><a href='".create_link ("administration", $t['href'])."'><i class='fa $t[icon]'></i></a></div>";
+		print "			<div class='text'><a href='".create_link ("administration", $t['href'])."'>"._ ($t['name'])."</a><hr><span class='text-muted'>"._ ($t['description'])."</span></div>";
 		print "		</div>";
 		print "	</div>";
 		print "	</div>";

app/admin/scan-agents/edit.php

Spacing +31 added lines, -31 removed lines

@@ -5,42 +5,42 @@ 
  *************************************************/
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
-$Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Admin	 	= new Admin ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # create csrf token
 $csrf = $User->csrf_cookie ("create", "agent");
 
 # ID must be numeric
-if($_POST['action']!="add" && !is_numeric($_POST['id'])) { $Result->show("danger", _("Invalid ID"), true, true); }
+if ($_POST['action'] != "add" && !is_numeric ($_POST['id'])) { $Result->show ("danger", _ ("Invalid ID"), true, true); }
 
 # fetch api for edit / add
-if($_POST['action']!="add") {
+if ($_POST['action'] != "add") {
 	# fetch api details
 	$agent = $Admin->fetch_object ("scanAgents", "id", $_POST['id']);
 	# null ?
-	$agent===false ? $Result->show("danger", _("Invalid ID"), true) : null;
+	$agent === false ? $Result->show ("danger", _ ("Invalid ID"), true) : null;
 	# title
-	$title =  ucwords($_POST['action']) .' '._('agent').' '.$agent->name;
+	$title = ucwords ($_POST['action']).' '._ ('agent').' '.$agent->name;
 } else {
 	# generate new code
 	$agent = new StdClass;
-	$agent->code = str_shuffle(md5(microtime()));
+	$agent->code = str_shuffle (md5 (microtime ()));
 	# title
-	$title = _('Create new scan agent');
+	$title = _ ('Create new scan agent');
 }
 
 # die if direct and delete
-if (@$agent->type=="direct" && $_POST['action']=="delete") {
-	$Result->show("danger", _("Cannot remove localhost scan agent"),true, true);
+if (@$agent->type == "direct" && $_POST['action'] == "delete") {
+	$Result->show ("danger", _ ("Cannot remove localhost scan agent"), true, true);
 }
 ?>
 
@@ -56,47 +56,47 @@ 
 
 	<!-- name -->
 	<tr>
-	    <td><?php print _('Name'); ?></td>
+	    <td><?php print _ ('Name'); ?></td>
 	    <td>
-	    	<input type="text" name="name" class="form-control input-sm" value="<?php print @$agent->name; ?>" <?php if($_POST['action'] == "delete") print "readonly"; ?>>
+	    	<input type="text" name="name" class="form-control input-sm" value="<?php print @$agent->name; ?>" <?php if ($_POST['action'] == "delete") print "readonly"; ?>>
 	        <input type="hidden" name="id" value="<?php print $agent->id; ?>">
     		<input type="hidden" name="action" value="<?php print $_POST['action']; ?>">
     		<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
 	    </td>
-       	<td class="info2"><?php print _('Enter scan agent name'); ?></td>
+       	<td class="info2"><?php print _ ('Enter scan agent name'); ?></td>
     </tr>
 
 	<!-- description -->
 	<tr>
-	    <td><?php print _('Description'); ?></td>
-	    <td><input type="text" id="description" name="description" class="form-control input-sm"  value="<?php print @$agent->description; ?>"  <?php if($_POST['action'] == "delete") print "readonly"; ?>></td>
-       	<td class="info2"><?php print _('Agent description'); ?></td>
+	    <td><?php print _ ('Description'); ?></td>
+	    <td><input type="text" id="description" name="description" class="form-control input-sm"  value="<?php print @$agent->description; ?>"  <?php if ($_POST['action'] == "delete") print "readonly"; ?>></td>
+       	<td class="info2"><?php print _ ('Agent description'); ?></td>
     </tr>
 
-	<?php if(@$agent->type!=="direct") { ?>
+	<?php if (@$agent->type !== "direct") { ?>
 	<!-- code -->
 	<tr>
-	    <td><?php print _('Code'); ?></td>
-	    <td><input type="text" id="code" name="code" class="form-control input-sm"  value="<?php print @$agent->code; ?>"  maxlength='32' <?php if(@$agent->type=="direct"||$_POST['action'] == "delete") print "readonly"; ?>></td>
-       	<td class="info2"><?php print _('Agent code'); ?><?php if(@$agent->type!="direct") { ?> <button class="btn btn-xs btn-default" id="regAgentKey"><i class="fa fa-random"></i> <?php print _('Regenerate'); ?></button><?php } ?></td>
+	    <td><?php print _ ('Code'); ?></td>
+	    <td><input type="text" id="code" name="code" class="form-control input-sm"  value="<?php print @$agent->code; ?>"  maxlength='32' <?php if (@$agent->type == "direct" || $_POST['action'] == "delete") print "readonly"; ?>></td>
+       	<td class="info2"><?php print _ ('Agent code'); ?><?php if (@$agent->type != "direct") { ?> <button class="btn btn-xs btn-default" id="regAgentKey"><i class="fa fa-random"></i> <?php print _ ('Regenerate'); ?></button><?php } ?></td>
     </tr>
 
 	<!-- type -->
 	<tr>
-	    <td><?php print _('Agent type'); ?></td>
+	    <td><?php print _ ('Agent type'); ?></td>
 	    <td>
-	    	<select name="type" class="form-control input-sm input-w-auto" <?php if(@$agent->type=="direct"||$_POST['action'] == "delete") print "readonly"; ?>>
+	    	<select name="type" class="form-control input-sm input-w-auto" <?php if (@$agent->type == "direct" || $_POST['action'] == "delete") print "readonly"; ?>>
 	    	<?php
 	    	//$types = array("mysql"=>"MySQL", "api"=>"Api");
-	    	$types = array("mysql"=>"MySQL");
+	    	$types = array ("mysql"=>"MySQL");
 
-	    	foreach($types as $k=>$p) {
-		    	if($k==$agent->type)	{ print "<option value='$k' selected='selected'>"._($p)."</option>"; }
-		    	else					{ print "<option value='$k' 				   >"._($p)."</option>"; }
+	    	foreach ($types as $k=>$p) {
+		    	if ($k == $agent->type) { print "<option value='$k' selected='selected'>"._ ($p)."</option>"; }
+		    	else { print "<option value='$k' 				   >"._ ($p)."</option>"; }
 	    	}
 	    	?>
 	    	</select>
-       	<td class="info2"><?php print _('Agent type'); ?></td>
+       	<td class="info2"><?php print _ ('Agent type'); ?></td>
     </tr>
     <?php } ?>
 
@@ -109,8 +109,8 @@ 
 <!-- footer -->
 <div class="pFooter">
 	<div class="btn-group">
-		<button class="btn btn-sm btn-default hidePopups"><?php print _('Cancel'); ?></button>
-		<button class="btn btn-sm btn-default <?php if($_POST['action']=="delete") { print "btn-danger"; } else { print "btn-success"; } ?>" id="agentEditSubmit"><i class="fa <?php if($_POST['action']=="add") { print "fa-plus"; } else if ($_POST['action']=="delete") { print "fa-trash-o"; } else { print "fa-check"; } ?>"></i> <?php print ucwords(_($_POST['action'])); ?></button>
+		<button class="btn btn-sm btn-default hidePopups"><?php print _ ('Cancel'); ?></button>
+		<button class="btn btn-sm btn-default <?php if ($_POST['action'] == "delete") { print "btn-danger"; } else { print "btn-success"; } ?>" id="agentEditSubmit"><i class="fa <?php if ($_POST['action'] == "add") { print "fa-plus"; } else if ($_POST['action'] == "delete") { print "fa-trash-o"; } else { print "fa-check"; } ?>"></i> <?php print ucwords (_ ($_POST['action'])); ?></button>
 	</div>
 	<!-- Result -->
 	<div class="agentEditResult"></div>

app/admin/scan-agents/edit-result.php

Spacing +25 added lines, -25 removed lines

@@ -5,60 +5,60 @@ 
  *************************************/
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
-$Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Admin	 	= new Admin ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # strip input tags
-$_POST = $Admin->strip_input_tags($_POST);
+$_POST = $Admin->strip_input_tags ($_POST);
 
 # validate csrf cookie
-$User->csrf_cookie ("validate", "agent", $_POST['csrf_cookie']) === false ? $Result->show("danger", _("Invalid CSRF cookie"), true) : "";
+$User->csrf_cookie ("validate", "agent", $_POST['csrf_cookie']) === false ? $Result->show ("danger", _ ("Invalid CSRF cookie"), true) : "";
 
 /* checks */
-$error = array();
+$error = array ();
 
 # for edit check old details
-if ($_POST['action']=="edit" || $_POST['action']=="delete") {
+if ($_POST['action'] == "edit" || $_POST['action'] == "delete") {
 	# old
 	$agent_old = $Admin->fetch_object ("scanAgents", "id", $_POST['id']);
 	// invalid id
-	if($agent_old===false)	{ $error[] = "Invalid agent Id"; }
+	if ($agent_old === false) { $error[] = "Invalid agent Id"; }
 	// remove type and code if direct
-	if (@$agent_old->type=="direct") {
+	if (@$agent_old->type == "direct") {
 		unset($_POST['type'], $_POST['code']);
 	}
 }
 
 # die if direct and delete
-if (@$agent_old->type=="direct" && $_POST['action']=="delete") {
-	$Result->show("danger", _("Cannot remove localhost scan agent"),true);
+if (@$agent_old->type == "direct" && $_POST['action'] == "delete") {
+	$Result->show ("danger", _ ("Cannot remove localhost scan agent"), true);
 }
 
 # checks for edit / add
-if($_POST['action']!="delete") {
+if ($_POST['action'] != "delete") {
 	# code must be exactly 32 chars long and alfanumeric if app_security = crypt
-	if(@$agent_old->type!="direct") {
-	if(strlen($_POST['code'])!=32 || !ctype_alnum($_POST['code']))		{ $error[] = "Invalid agent code"; }
+	if (@$agent_old->type != "direct") {
+	if (strlen ($_POST['code']) != 32 || !ctype_alnum ($_POST['code'])) { $error[] = "Invalid agent code"; }
 	}
 	# name must be more than 2 and alphanumberic
-	if(strlen($_POST['name'])==0)										{ $error[] = "Invalid agent name"; }
+	if (strlen ($_POST['name']) == 0) { $error[] = "Invalid agent name"; }
 }
 
 # die if errors
-if(sizeof($error) > 0) {
-	$Result->show("danger", $error, true);
+if (sizeof ($error) > 0) {
+	$Result->show ("danger", $error, true);
 }
 else {
 	# create array of values for modification
-	$values = array("id"=>@$_POST['id'],
+	$values = array ("id"=>@$_POST['id'],
 					"name"=>$_POST['name'],
 					"description"=>@$_POST['description'],
 					"code"=>@$_POST['code'],
@@ -68,20 +68,20 @@ 
 	$values = $Admin->remove_empty_array_fields ($values);
 
 	# execute
-	if(!$Admin->object_modify("scanAgents", $_POST['action'], "id", $values)) 	{ $Result->show("danger",  _("Agent $_POST[action] error"), true); }
-	else 																		{ $Result->show("success", _("Agent $_POST[action] success"), false); }
+	if (!$Admin->object_modify ("scanAgents", $_POST['action'], "id", $values)) { $Result->show ("danger", _ ("Agent $_POST[action] error"), true); }
+	else { $Result->show ("success", _ ("Agent $_POST[action] success"), false); }
 
 	# delete - unset scanning in all subnets
-	if ($_POST['action']=="delete") {
+	if ($_POST['action'] == "delete") {
 		$query = "update `subnets` set `scanAgent`=0, `pingSubnet`=0, `discoverSubnet`=0 where `scanAgent` = ?;";
 
-		try { $Database->runQuery($query, array($_POST['id'])); }
+		try { $Database->runQuery ($query, array ($_POST['id'])); }
 		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage());
+			$this->Result->show ("danger", _ ("Error: ").$e->getMessage ());
 			return false;
 		}
 		// references removed
-		$this->Result->show("info", _("Scan agent references removed"));
+		$this->Result->show ("info", _ ("Scan agent references removed"));
 	}
 }
 

app/admin/scan-agents/index.php

Spacing +25 added lines, -25 removed lines

@@ -5,33 +5,33 @@ 
  *************************************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # fetch all APIs
-$all_agents = $Admin->fetch_all_objects("scanAgents");
+$all_agents = $Admin->fetch_all_objects ("scanAgents");
 ?>
 
 <!-- display existing groups -->
-<h4><?php print _('phpipam Scan agents'); ?></h4>
+<h4><?php print _ ('phpipam Scan agents'); ?></h4>
 <hr><br>
 
 <!-- Add new -->
-<button class='btn btn-sm btn-default editAgent' style="margin-bottom:10px;" data-action='add'><i class='fa fa-plus'></i> <?php print _('Create new agent'); ?></button>
+<button class='btn btn-sm btn-default editAgent' style="margin-bottom:10px;" data-action='add'><i class='fa fa-plus'></i> <?php print _ ('Create new agent'); ?></button>
 
 
 <?php
 /* print existing APIs */
-if($all_agents!==false) {
+if ($all_agents !== false) {
 
 	print '<table id="userPrint" class="table table-striped table-top table-auto">';
 	# headers
 	print '<tr>';
-    print "<th>"._('Agent id').'</th>';
-	print "<th>"._('Name').'</th>';
-    print "<th>"._('Description').'</th>';
-    print "<th>"._('Type').'</th>';
-    print "<th>"._('Code').'</th>';
-    print "<th>"._('Last access').'</th>';
+    print "<th>"._ ('Agent id').'</th>';
+	print "<th>"._ ('Name').'</th>';
+    print "<th>"._ ('Description').'</th>';
+    print "<th>"._ ('Type').'</th>';
+    print "<th>"._ ('Code').'</th>';
+    print "<th>"._ ('Last access').'</th>';
     print '<th></th>';
 	print '</tr>';
 
@@ -41,35 +41,35 @@ 
 		$a = (array) $a;
 
 		// fixes
-		$a['code'] = strlen($a['code'])===0 ? "/" : $a['code'];
-		$a['last_access'] = strlen($a['last_access'])===0 ? "<span class='text-muted'>Never</span>" : $a['last_access'];
+		$a['code'] = strlen ($a['code']) === 0 ? "/" : $a['code'];
+		$a['last_access'] = strlen ($a['last_access']) === 0 ? "<span class='text-muted'>Never</span>" : $a['last_access'];
 
 		// print
-		print '<tr>' . "\n";
-		print '	<td>' . $a['id'] . '</td>'. "\n";
-		print '	<td>' . $a['name'] . '</td>'. "\n";
-		print '	<td>' . $a['description'] . '</td>'. "\n";
-		print '	<td>' . $a['type'] . '</td>'. "\n";
-		print '	<td>' . $a['code'] . '</td>'. "\n";
-		print '	<td>' . $a['last_access'] . '</td>'. "\n";
+		print '<tr>'."\n";
+		print '	<td>'.$a['id'].'</td>'."\n";
+		print '	<td>'.$a['name'].'</td>'."\n";
+		print '	<td>'.$a['description'].'</td>'."\n";
+		print '	<td>'.$a['type'].'</td>'."\n";
+		print '	<td>'.$a['code'].'</td>'."\n";
+		print '	<td>'.$a['last_access'].'</td>'."\n";
 
 		// add/remove agents
 		print "	<td class='actions'>";
 		print "	<div class='btn-group'>";
-		print "		<button class='btn btn-xs btn-default editAgent'  data-container='body' data-id='$a[id]' data-action='edit'   rel='tooltip' title='"._('edit agent details')."'>	<i class='fa fa-pencil'></i></button>";
-		print "		<button class='btn btn-xs btn-default editAgent'  data-container='body' data-id='$a[id]' data-action='delete' rel='tooltip' title='"._('remove agent')."'>		<i class='fa fa-times'></i></button>";
+		print "		<button class='btn btn-xs btn-default editAgent'  data-container='body' data-id='$a[id]' data-action='edit'   rel='tooltip' title='"._ ('edit agent details')."'>	<i class='fa fa-pencil'></i></button>";
+		print "		<button class='btn btn-xs btn-default editAgent'  data-container='body' data-id='$a[id]' data-action='delete' rel='tooltip' title='"._ ('remove agent')."'>		<i class='fa fa-times'></i></button>";
 		print "	</div>";
 		print "</td>";
 
-		print '</tr>' . "\n";
+		print '</tr>'."\n";
 	}
 	print "</table>";
 }
 else {
-	$Result->show("info alert-nomargin", _("No agents available")."!", false);
+	$Result->show ("info alert-nomargin", _ ("No agents available")."!", false);
 }
 ?>
 <hr>
 
-<h4><?php print _('phpipam-agent documentation'); ?></h4>
+<h4><?php print _ ('phpipam-agent documentation'); ?></h4>
 <a href="https://github.com/phpipam/phpipam-agent">https://github.com/phpipam/phpipam-agent</a>

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

Spacing +17 added lines, -17 removed lines

@@ -5,55 +5,55 @@
  *************************************/
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
-$Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Admin	 	= new Admin ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 
 # id must be numeric
-if(!is_numeric($_POST['gid']))		{ $Result->show("danger", _("Invalid ID"), true); }
+if (!is_numeric ($_POST['gid'])) { $Result->show ("danger", _ ("Invalid ID"), true); }
 
 # parse result
-foreach($_POST as $k=>$p) {
-	if(substr($k, 0,4) == "user") {
-		$users[substr($k, 4)] = substr($k, 4);
+foreach ($_POST as $k=>$p) {
+	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)) {
+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);
+			$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)) {
+if (isset($errors)) {
 	print "<div class='alert alert alert-danger'>";
-	print _("Failed to remove users").":<hr>";
+	print _ ("Failed to remove users").":<hr>";
 	print "<ul>";
-	foreach($errors as $e) {
+	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/add-users.php

Spacing +15 added lines, -15 removed lines

@@ -5,36 +5,36 @@ 
  *************************************************/
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
-$Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Admin	 	= new Admin ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 
 # id must be numeric
-if(!is_numeric($_POST['g_id']))		{ $Result->show("danger", _("Invalid ID"), true, true); }
+if (!is_numeric ($_POST['g_id'])) { $Result->show ("danger", _ ("Invalid ID"), true, true); }
 
 # get group details
-$group   = $Admin->fetch_object("userGroups", "g_id", $_POST['g_id']);
+$group   = $Admin->fetch_object ("userGroups", "g_id", $_POST['g_id']);
 # not in group - array of ids
 $missing = $Admin->group_fetch_missing_users ($_POST['g_id']);
 ?>
 
 
 <!-- header -->
-<div class="pHeader"><?php print _('Add users to group'); ?> <?php print $group->g_name; ?></div>
+<div class="pHeader"><?php print _ ('Add users to group'); ?> <?php print $group->g_name; ?></div>
 
 
 <!-- content -->
 <div class="pContent">
 
-	<?php if(sizeof($missing) > 0) { ?>
+	<?php if (sizeof ($missing) > 0) { ?>
 
 	<form id="groupAddUsers" name="groupAddUsers">
 	<table class="groupEdit table table-condensed table-hover table-top">
@@ -43,16 +43,16 @@ 
 		<th>
 			<input type="hidden" name="gid" value="<?php print $_POST['g_id']; ?>">
 		</th>
-		<th><?php print _('Name'); ?></th>
-		<th><?php print _('Username'); ?></th>
-		<th><?php print _('Email'); ?></th>
+		<th><?php print _ ('Name'); ?></th>
+		<th><?php print _ ('Username'); ?></th>
+		<th><?php print _ ('Email'); ?></th>
 	</tr>
 
 	<?php
 	# show missing
-	foreach($missing as $k=>$m) {
+	foreach ($missing as $k=>$m) {
 		# get user details
-		$u = (array) $Admin->fetch_object("users", "id", $m);
+		$u = (array) $Admin->fetch_object ("users", "id", $m);
 
 		print "<tr>";
 
@@ -71,7 +71,7 @@ 
     </table>
     </form>
 
-    <?php } else { $Result->show("info", _('No available users to add to group'), false); } ?>
+    <?php } else { $Result->show ("info", _ ('No available users to add to group'), false); } ?>
 </div>
 
 
@@ -79,7 +79,7 @@ 
 <div class="pFooter">
 	<div class="btn-group">
 		<button class="btn btn-sm btn-default hidePopups">Cancel</button>
-		<?php if(sizeof($missing) > 0) { ?>
+		<?php if (sizeof ($missing) > 0) { ?>
 		<button class="btn btn-sm btn-default btn-success" id="groupAddUsersSubmit"><i class="fa fa-plus"></i> Add selected users</button>
 		<?php } ?>
 	</div>