phpipam / phpipam

app/admin/racks/edit.php

Spacing +56 added lines, -56 removed lines

@@ -5,38 +5,38 @@ 
  ************************/
 
 /* 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);
 $Tools	 	= new Tools ($Database);
-$Racks      = new phpipam_rack ($Database);
+$Racks = new phpipam_rack ($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", "rack");
 
 # fetch custom fields
-$custom = $Tools->fetch_custom_fields('racks');
+$custom = $Tools->fetch_custom_fields ('racks');
 
 # ID must be numeric
-if($_POST['action']!="add" && !is_numeric($_POST['rackid']))		{ $Result->show("danger", _("Invalid ID"), true, true); }
+if ($_POST['action'] != "add" && !is_numeric ($_POST['rackid'])) { $Result->show ("danger", _ ("Invalid ID"), true, true); }
 
 # fetch device details
-if( ($_POST['action'] == "edit") || ($_POST['action'] == "delete") ) {
-	$rack = $Admin->fetch_object("racks", "id", $_POST['rackid']);
+if (($_POST['action'] == "edit") || ($_POST['action'] == "delete")) {
+	$rack = $Admin->fetch_object ("racks", "id", $_POST['rackid']);
 }
 else {
     $rack = new StdClass ();
 }
 
 # set readonly flag
-$readonly = $_POST['action']=="delete" ? "readonly" : "";
+$readonly = $_POST['action'] == "delete" ? "readonly" : "";
 ?>
 
 <script type="text/javascript">
@@ -47,7 +47,7 @@ 
 
 
 <!-- header -->
-<div class="pHeader"><?php print ucwords(_("$_POST[action]")); ?> <?php print _('rack'); ?></div>
+<div class="pHeader"><?php print ucwords (_ ("$_POST[action]")); ?> <?php print _ ('rack'); ?></div>
 
 
 <!-- content -->
@@ -58,21 +58,21 @@ 
 
 	<!-- hostname  -->
 	<tr>
-		<td><?php print _('Name'); ?></td>
+		<td><?php print _ ('Name'); ?></td>
 		<td>
-			<input type="text" name="name" class="form-control input-sm" placeholder="<?php print _('Name'); ?>" value="<?php if(isset($rack->name)) print $rack->name; ?>" <?php print $readonly; ?>>
+			<input type="text" name="name" class="form-control input-sm" placeholder="<?php print _ ('Name'); ?>" value="<?php if (isset($rack->name)) print $rack->name; ?>" <?php print $readonly; ?>>
 		</td>
 	</tr>
 
 	<!-- Type -->
 	<tr>
-		<td><?php print _('Size'); ?></td>
+		<td><?php print _ ('Size'); ?></td>
 		<td>
 			<select name="size" class="form-control input-sm input-w-auto">
 			<?php
-			foreach($Racks->rack_sizes as $s) {
-				if($rack->size == $s)	{ print "<option value='$s' selected='selected'>$s U</option>"; }
-				else					{ print "<option value='$s' >$s U</option>"; }
+			foreach ($Racks->rack_sizes as $s) {
+				if ($rack->size == $s) { print "<option value='$s' selected='selected'>$s U</option>"; }
+				else { print "<option value='$s' >$s U</option>"; }
 			}
 			?>
 			</select>
@@ -81,12 +81,12 @@ 
 
 	<!-- Description -->
 	<tr>
-		<td><?php print _('Description'); ?></td>
+		<td><?php print _ ('Description'); ?></td>
 		<td>
-			<textarea name="description" class="form-control input-sm" placeholder="<?php print _('Description'); ?>" <?php print $readonly; ?>><?php if(isset($rack->description)) print $rack->description; ?></textarea>
+			<textarea name="description" class="form-control input-sm" placeholder="<?php print _ ('Description'); ?>" <?php print $readonly; ?>><?php if (isset($rack->description)) print $rack->description; ?></textarea>
 			<?php
-			if( ($_POST['action'] == "edit") || ($_POST['action'] == "delete") ) {
-				print '<input type="hidden" name="rackid" value="'. $_POST['rackid'] .'">'. "\n";
+			if (($_POST['action'] == "edit") || ($_POST['action'] == "delete")) {
+				print '<input type="hidden" name="rackid" value="'.$_POST['rackid'].'">'."\n";
 			} ?>
 			<input type="hidden" name="action" value="<?php print $_POST['action']; ?>">
 			<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
@@ -95,7 +95,7 @@ 
 
 	<!-- Custom -->
 	<?php
-	if(sizeof($custom) > 0) {
+	if (sizeof ($custom) > 0) {
 
 		print '<tr>';
 		print '	<td colspan="2"><hr></td>';
@@ -105,39 +105,39 @@ 
 		$timeP = 0;
 
 		# all my fields
-		foreach($custom as $field) {
+		foreach ($custom as $field) {
 			# replace spaces with |
-			$field['nameNew'] = str_replace(" ", "___", $field['name']);
+			$field['nameNew'] = str_replace (" ", "___", $field['name']);
 
 			# required
-			if($field['Null']=="NO")	{ $required = "*"; }
-			else						{ $required = ""; }
+			if ($field['Null'] == "NO") { $required = "*"; }
+			else { $required = ""; }
 
 			# set default value !
-			if ($_POST['action']=="add")	{ $rack->$field['name'] = $field['Default']; }
+			if ($_POST['action'] == "add") { $rack->$field['name'] = $field['Default']; }
 
-			print '<tr>'. "\n";
-			print '	<td>'. ucwords($field['name']) .' '.$required.'</td>'. "\n";
-			print '	<td>'. "\n";
+			print '<tr>'."\n";
+			print '	<td>'.ucwords ($field['name']).' '.$required.'</td>'."\n";
+			print '	<td>'."\n";
 
 			//set type
-			if(substr($field['type'], 0,3) == "set" || substr($field['type'], 0,4) == "enum") {
+			if (substr ($field['type'], 0, 3) == "set" || substr ($field['type'], 0, 4) == "enum") {
 				//parse values
-				$tmp = substr($field['type'], 0,3)=="set" ? explode(",", str_replace(array("set(", ")", "'"), "", $field['type'])) : explode(",", str_replace(array("enum(", ")", "'"), "", $field['type']));
+				$tmp = substr ($field['type'], 0, 3) == "set" ? explode (",", str_replace (array ("set(", ")", "'"), "", $field['type'])) : explode (",", str_replace (array ("enum(", ")", "'"), "", $field['type']));
 				//null
-				if($field['Null']!="NO") { array_unshift($tmp, ""); }
+				if ($field['Null'] != "NO") { array_unshift ($tmp, ""); }
 
 				print "<select name='$field[nameNew]' class='form-control input-sm input-w-auto' rel='tooltip' data-placement='right' title='$field[Comment]'>";
-				foreach($tmp as $v) {
-					if($v==$rack->$field['name'])	{ print "<option value='$v' selected='selected'>$v</option>"; }
-					else							{ print "<option value='$v'>$v</option>"; }
+				foreach ($tmp as $v) {
+					if ($v == $rack->$field['name']) { print "<option value='$v' selected='selected'>$v</option>"; }
+					else { print "<option value='$v'>$v</option>"; }
 				}
 				print "</select>";
 			}
 			//date and time picker
-			elseif($field['type'] == "date" || $field['type'] == "datetime") {
+			elseif ($field['type'] == "date" || $field['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">';
@@ -153,38 +153,38 @@ 
 				$timeP++;
 
 				//set size
-				if($field['type'] == "date")	{ $size = 10; $class='datepicker';		$format = "yyyy-MM-dd"; }
-				else							{ $size = 19; $class='datetimepicker';	$format = "yyyy-MM-dd"; }
+				if ($field['type'] == "date") { $size = 10; $class = 'datepicker'; $format = "yyyy-MM-dd"; }
+				else { $size = 19; $class = 'datetimepicker'; $format = "yyyy-MM-dd"; }
 
 				//field
-				if(!isset($rack->$field['name']))	{ print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'. $field['nameNew'] .'" maxlength="'.$size.'" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n"; }
-				else								{ print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'. $field['nameNew'] .'" maxlength="'.$size.'" value="'. $rack->$field['name']. '" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n"; }
+				if (!isset($rack->$field['name'])) { print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'.$field['nameNew'].'" maxlength="'.$size.'" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'."\n"; }
+				else { print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'.$field['nameNew'].'" maxlength="'.$size.'" value="'.$rack->$field['name'].'" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'."\n"; }
 			}
 			//boolean
-			elseif($field['type'] == "tinyint(1)") {
+			elseif ($field['type'] == "tinyint(1)") {
 				print "<select name='$field[nameNew]' class='form-control input-sm input-w-auto' rel='tooltip' data-placement='right' title='$field[Comment]'>";
-				$tmp = array(0=>"No",1=>"Yes");
+				$tmp = array (0=>"No", 1=>"Yes");
 				//null
-				if($field['Null']!="NO") { $tmp[2] = ""; }
+				if ($field['Null'] != "NO") { $tmp[2] = ""; }
 
-				foreach($tmp as $k=>$v) {
-					if(strlen($rack->$field['name'])==0 && $k==2)	{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
-					elseif($k==$rack->$field['name'])				{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
-					else											{ print "<option value='$k'>"._($v)."</option>"; }
+				foreach ($tmp as $k=>$v) {
+					if (strlen ($rack->$field['name']) == 0 && $k == 2) { print "<option value='$k' selected='selected'>"._ ($v)."</option>"; }
+					elseif ($k == $rack->$field['name']) { print "<option value='$k' selected='selected'>"._ ($v)."</option>"; }
+					else { print "<option value='$k'>"._ ($v)."</option>"; }
 				}
 				print "</select>";
 			}
 			//text
-			elseif($field['type'] == "text") {
-				print ' <textarea class="form-control input-sm" name="'. $field['nameNew'] .'" placeholder="'. $field['name'] .'" rowspan=3 rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. $rack->$field['name']. '</textarea>'. "\n";
+			elseif ($field['type'] == "text") {
+				print ' <textarea class="form-control input-sm" name="'.$field['nameNew'].'" placeholder="'.$field['name'].'" rowspan=3 rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'.$rack->$field['name'].'</textarea>'."\n";
 			}
 			//default - input field
 			else {
-				print ' <input type="text" class="ip_addr form-control input-sm" name="'. $field['nameNew'] .'" placeholder="'. $field['name'] .'" value="'. $rack->$field['name']. '" size="30" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n";
+				print ' <input type="text" class="ip_addr form-control input-sm" name="'.$field['nameNew'].'" placeholder="'.$field['name'].'" value="'.$rack->$field['name'].'" size="30" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'."\n";
 			}
 
-			print '	</td>'. "\n";
-			print '</tr>'. "\n";
+			print '	</td>'."\n";
+			print '</tr>'."\n";
 		}
 
 	}
@@ -199,8 +199,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="editRacksubmit"><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="editRacksubmit"><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 -->

app/admin/racks/edit-result.php

Spacing +28 added lines, -28 removed lines

@@ -5,57 +5,57 @@ 
  ***************************/
 
 /* 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);
 $Tools	 	= new Tools ($Database);
-$Racks      = new phpipam_rack ($Database);
+$Racks = new phpipam_rack ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # validate csrf cookie
-$User->csrf_cookie ("validate", "rack", $_POST['csrf_cookie']) === false ? $Result->show("danger", _("Invalid CSRF cookie"), true) : "";
+$User->csrf_cookie ("validate", "rack", $_POST['csrf_cookie']) === false ? $Result->show ("danger", _ ("Invalid CSRF cookie"), true) : "";
 
 # get modified details
-$rack = $Tools->strip_input_tags($_POST);
+$rack = $Tools->strip_input_tags ($_POST);
 
 # ID must be numeric
-if($_POST['action']!="add" && !is_numeric($_POST['rackid']))			{ $Result->show("danger", _("Invalid ID"), true); }
+if ($_POST['action'] != "add" && !is_numeric ($_POST['rackid'])) { $Result->show ("danger", _ ("Invalid ID"), true); }
 
 # Hostname must be present
-if($rack['name'] == "") 											    { $Result->show("danger", _('Name is mandatory').'!', true); }
+if ($rack['name'] == "") { $Result->show ("danger", _ ('Name is mandatory').'!', true); }
 
 # rack checks
 # validate position and size
-if (!is_numeric($rack['size']))                                         { $Result->show("danger", _('Invalid rack size').'!', true); }
+if (!is_numeric ($rack['size'])) { $Result->show ("danger", _ ('Invalid rack size').'!', true); }
 # validate rack
-if ($rack['action']=="edit") {
-    if (!is_numeric($rack['rackid']))                                       { $Result->show("danger", _('Invalid rack identifier').'!', true); }
+if ($rack['action'] == "edit") {
+    if (!is_numeric ($rack['rackid'])) { $Result->show ("danger", _ ('Invalid rack identifier').'!', true); }
     $rack_details = $Racks->fetch_rack_details ($rack['rackid']);
-    if ($rack_details===false)                                          { $Result->show("danger", _('Rack does not exist').'!', true); }
+    if ($rack_details === false) { $Result->show ("danger", _ ('Rack does not exist').'!', true); }
 }
-elseif($rack['action']=="delete") {
-    if (!is_numeric($rack['rackid']))                                       { $Result->show("danger", _('Invalid rack identifier').'!', true); }
+elseif ($rack['action'] == "delete") {
+    if (!is_numeric ($rack['rackid'])) { $Result->show ("danger", _ ('Invalid rack identifier').'!', true); }
 }
 
 # fetch custom fields
-$custom = $Tools->fetch_custom_fields('racks');
-if(sizeof($custom) > 0) {
-	foreach($custom as $myField) {
+$custom = $Tools->fetch_custom_fields ('racks');
+if (sizeof ($custom) > 0) {
+	foreach ($custom as $myField) {
 		//booleans can be only 0 and 1!
-		if($myField['type']=="tinyint(1)") {
-			if($rack[$myField['name']]>1) {
+		if ($myField['type'] == "tinyint(1)") {
+			if ($rack[$myField['name']] > 1) {
 				$rack[$myField['name']] = 0;
 			}
 		}
 		//not null!
-		if($myField['Null']=="NO" && strlen($rack[$myField['name']])==0) {
-																		{ $Result->show("danger", $myField['name'].'" can not be empty!', true); }
+		if ($myField['Null'] == "NO" && strlen ($rack[$myField['name']]) == 0) {
+																		{ $Result->show ("danger", $myField['name'].'" can not be empty!', true); }
 		}
 		# save to update array
 		$update[$myField['name']] = $rack[$myField['name']];
@@ -63,21 +63,21 @@ 
 }
 
 # set update values
-$values = array("id"=>@$rack['rackid'],
+$values = array ("id"=>@$rack['rackid'],
 				"name"=>@$rack['name'],
 				"size"=>@$rack['size'],
 				"description"=>@$rack['description']
 				);
 # custom fields
-if(isset($update)) {
-	$values = array_merge($values, $update);
+if (isset($update)) {
+	$values = array_merge ($values, $update);
 }
 
 # update rack
-if(!$Admin->object_modify("racks", $_POST['action'], "id", $values))	{}
-else																	{ $Result->show("success", _("Rack $rack[action] successfull").'!', false); }
+if (!$Admin->object_modify ("racks", $_POST['action'], "id", $values)) {}
+else { $Result->show ("success", _ ("Rack $rack[action] successfull").'!', false); }
 
-if($_POST['action']=="delete"){
+if ($_POST['action'] == "delete") {
 	# remove all references from subnets and ip addresses
 	$Admin->remove_object_references ("devices", "rack", $values["id"]);
 }

app/admin/racks/print-racks.php

Spacing +2 added lines, -2 removed lines

@@ -5,8 +5,8 @@
  ***************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # include tools rack
-include(dirname(__FILE__) . "/../../tools/racks/index.php");
+include(dirname (__FILE__)."/../../tools/racks/index.php");
 ?>
\ No newline at end of file

app/admin/racks/edit-rack-devices-result.php

Spacing +16 added lines, -16 removed lines

@@ -5,45 +5,45 @@
  ***************************/
 
 /* 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", "rack_devices", $_POST['csrf_cookie']) === false ? $Result->show("danger", _("Invalid CSRF cookie"), true) : "";
+$User->csrf_cookie ("validate", "rack_devices", $_POST['csrf_cookie']) === false ? $Result->show ("danger", _ ("Invalid CSRF cookie"), true) : "";
 
 # ID must be numeric
-if(!is_numeric($_POST['rackid']))			                           { $Result->show("danger", _("Invalid ID"), true); }
-if(!is_numeric($_POST['deviceid']))			                           { $Result->show("danger", _("Invalid ID"), true); }
-if(!is_numeric($_POST['rack_start']))			                       { $Result->show("danger", _("Invalid start value"), true); }
-if(!is_numeric($_POST['rack_size']))			                       { $Result->show("danger", _("Invalid size value"), true); }
+if (!is_numeric ($_POST['rackid'])) { $Result->show ("danger", _ ("Invalid ID"), true); }
+if (!is_numeric ($_POST['deviceid'])) { $Result->show ("danger", _ ("Invalid ID"), true); }
+if (!is_numeric ($_POST['rack_start'])) { $Result->show ("danger", _ ("Invalid start value"), true); }
+if (!is_numeric ($_POST['rack_size'])) { $Result->show ("danger", _ ("Invalid size value"), true); }
 
 # validate rack
-$rack = $Admin->fetch_object("racks", "id", $_POST['rackid']);
-if ($rack===false)                                                     { $Result->show("danger", _("Invalid ID"), true); }
+$rack = $Admin->fetch_object ("racks", "id", $_POST['rackid']);
+if ($rack === false) { $Result->show ("danger", _ ("Invalid ID"), true); }
 
 # check size
-if($_POST['rack_start']+($_POST['rack_size']-1)>$rack->size)            { $Result->show("danger", _("Invalid rack position (overflow)"), true); }
+if ($_POST['rack_start'] + ($_POST['rack_size'] - 1) > $rack->size) { $Result->show ("danger", _ ("Invalid rack position (overflow)"), true); }
 
 # set update values
-$values = array("id"=>@$_POST['deviceid'],
+$values = array ("id"=>@$_POST['deviceid'],
 				"rack"=>@$_POST['rackid'],
 				"rack_start"=>@$_POST['rack_start'],
 				"rack_size"=>@$_POST['rack_size'],
 				);
 
 # update rack
-if(!$Admin->object_modify("devices", "edit", "id", $values))	        { $Result->show("success", _("Failed to add device to rack").'!', false); }
-else																	{ $Result->show("success", _("Device added to rack").'!', false); }
+if (!$Admin->object_modify ("devices", "edit", "id", $values)) { $Result->show ("success", _ ("Failed to add device to rack").'!', false); }
+else { $Result->show ("success", _ ("Device added to rack").'!', false); }
 
 ?>
\ No newline at end of file

app/admin/device-types/edit.php

Spacing +18 added lines, -18 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 ();
 
 # create csrf token
 $csrf = $User->csrf_cookie ("create", "device_types");
 
 # ID must be numeric
-if($_POST['action']!="add" && !is_numeric($_POST['tid'])) { $Result->show("danger", _("Invalid ID"), true, true); }
+if ($_POST['action'] != "add" && !is_numeric ($_POST['tid'])) { $Result->show ("danger", _ ("Invalid ID"), true, true); }
 # set delete flag
-$readonly = $_POST['action']=="delete" ? "readonly" : "";
+$readonly = $_POST['action'] == "delete" ? "readonly" : "";
 
 # fetch device type details
-if( ($_POST['action'] == "edit") || ($_POST['action'] == "delete") ) {
-	$device = $Admin->fetch_object("deviceTypes", "tid", $_POST['tid']);
+if (($_POST['action'] == "edit") || ($_POST['action'] == "delete")) {
+	$device = $Admin->fetch_object ("deviceTypes", "tid", $_POST['tid']);
 	# fail if false
-	$device===false ? $Result->show("danger", _("Invalid ID"), true) : null;
+	$device === false ? $Result->show ("danger", _ ("Invalid ID"), true) : null;
 }
 ?>
 
 
 <!-- header -->
-<div class="pHeader"><?php print ucwords(_("$_POST[action]")); ?> <?php print _('device type'); ?></div>
+<div class="pHeader"><?php print ucwords (_ ("$_POST[action]")); ?> <?php print _ ('device type'); ?></div>
 
 
 <!-- content -->
@@ -45,14 +45,14 @@ 
 
 	<!-- hostname  -->
 	<tr>
-		<td><?php print _('Name'); ?></td>
+		<td><?php print _ ('Name'); ?></td>
 		<td>
-			<input type="text" name="tname" class="form-control input-sm" placeholder="<?php print _('Name'); ?>" value="<?php print @$device->tname; ?>" <?php print $readonly; ?>>
+			<input type="text" name="tname" class="form-control input-sm" placeholder="<?php print _ ('Name'); ?>" value="<?php print @$device->tname; ?>" <?php print $readonly; ?>>
 			<input type="hidden" name="action" value="<?php print $_POST['action']; ?>">
 			<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
 			<?php
-			if( ($_POST['action'] == "edit") || ($_POST['action'] == "delete") ) {
-				print '<input type="hidden" name="tid" value="'. $_POST['tid'] .'">'. "\n";
+			if (($_POST['action'] == "edit") || ($_POST['action'] == "delete")) {
+				print '<input type="hidden" name="tid" value="'.$_POST['tid'].'">'."\n";
 			}
 			?>
 		</td>
@@ -60,9 +60,9 @@ 
 
 	<!-- IP address -->
 	<tr>
-		<td><?php print _('Description'); ?></td>
+		<td><?php print _ ('Description'); ?></td>
 		<td>
-			<input type="text" name="tdescription" class="form-control input-sm" placeholder="<?php print _('Description'); ?>" value="<?php print @$device->tdescription; ?>" <?php print $readonly; ?>>
+			<input type="text" name="tdescription" class="form-control input-sm" placeholder="<?php print _ ('Description'); ?>" value="<?php print @$device->tdescription; ?>" <?php print $readonly; ?>>
 		</td>
 	</tr>
 
@@ -74,8 +74,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="editDevTypeSubmit"><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="editDevTypeSubmit"><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 -->

app/admin/device-types/edit-result.php

Spacing +11 added lines, -11 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 ();
 
 # strip input tags
-$_POST = $Admin->strip_input_tags($_POST);
+$_POST = $Admin->strip_input_tags ($_POST);
 
 # validate csrf cookie
-$User->csrf_cookie ("validate", "device_types", $_POST['csrf_cookie']) === false ? $Result->show("danger", _("Invalid CSRF cookie"), true) : "";
+$User->csrf_cookie ("validate", "device_types", $_POST['csrf_cookie']) === false ? $Result->show ("danger", _ ("Invalid CSRF cookie"), true) : "";
 
 # ID must be numeric
-if($_POST['action']!="add" && !is_numeric($_POST['tid'])) 	{ $Result->show("danger", _("Invalid ID"), true); }
+if ($_POST['action'] != "add" && !is_numeric ($_POST['tid'])) { $Result->show ("danger", _ ("Invalid ID"), true); }
 
 # name must be present! */
-if($_POST['tname'] == "") 									{ $Result->show("danger", _('Name is mandatory').'!', false); }
+if ($_POST['tname'] == "") { $Result->show ("danger", _ ('Name is mandatory').'!', false); }
 
 # create array of values for modification
-$values = array("tid"=>@$_POST['tid'],
+$values = array ("tid"=>@$_POST['tid'],
 				"tname"=>$_POST['tname'],
 				"tdescription"=>@$_POST['tdescription']);
 
 # update
-if(!$Admin->object_modify("deviceTypes", $_POST['action'], "tid", $values)) 	{ $Result->show("danger",  _("Failed to $_POST[action] device type").'!', false); }
-else 																			{ $Result->show("success", _("Device type $_POST[action] successfull").'!', false); }
+if (!$Admin->object_modify ("deviceTypes", $_POST['action'], "tid", $values)) { $Result->show ("danger", _ ("Failed to $_POST[action] device type").'!', false); }
+else { $Result->show ("success", _ ("Device type $_POST[action] successfull").'!', false); }
 
 ?>
\ No newline at end of file

app/admin/device-types/index.php

Spacing +15 added lines, -15 removed lines

@@ -5,24 +5,24 @@ 
  ***************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # fetch all devices
-$devices = $Admin->fetch_all_objects("deviceTypes", "tid");
+$devices = $Admin->fetch_all_objects ("deviceTypes", "tid");
 ?>
 
-<h4><?php print _('Device type management'); ?></h4>
+<h4><?php print _ ('Device type management'); ?></h4>
 <hr>
 
 <div class="btn-group">
-	<a href="<?php print create_link("administration", "devices"); ?>" class="btn btn-sm btn-default"><i class='fa fa-angle-left'></i> <?php print _('Manage devices'); ?></a>
-	<button class='btn btn-sm btn-default editDevType' data-action='add'   data-tid='' style='margin-bottom:10px;'><i class='fa fa-plus'></i> <?php print _('Add device type'); ?></button>
+	<a href="<?php print create_link ("administration", "devices"); ?>" class="btn btn-sm btn-default"><i class='fa fa-angle-left'></i> <?php print _ ('Manage devices'); ?></a>
+	<button class='btn btn-sm btn-default editDevType' data-action='add'   data-tid='' style='margin-bottom:10px;'><i class='fa fa-plus'></i> <?php print _ ('Add device type'); ?></button>
 </div>
 
 <?php
 /* first check if they exist! */
-if(sizeof($devices) == 0) {
-	print '	<div class="alert alert-warn alert-absolute">'._('No devices configured').'!</div>'. "\n";
+if (sizeof ($devices) == 0) {
+	print '	<div class="alert alert-warn alert-absolute">'._ ('No devices configured').'!</div>'."\n";
 }
 /* Print them out */
 else {
@@ -31,8 +31,8 @@ 
 
 	#headers
 	print '<tr>';
-	print '	<th>'._('Name').'</th>';
-	print '	<th>'._('Description').'</th>';
+	print '	<th>'._ ('Name').'</th>';
+	print '	<th>'._ ('Description').'</th>';
 	print '	<th class="actions"></th>';
 	print '</tr>';
 
@@ -41,19 +41,19 @@ 
 		$type = (array) $type;
 
 		//print details
-		print '<tr>'. "\n";
+		print '<tr>'."\n";
 
-		print '	<td>'. _($type['tname']) .'</td>'. "\n";
-		print '	<td>'. _($type['tdescription']) .'</td>'. "\n";
+		print '	<td>'._ ($type['tname']).'</td>'."\n";
+		print '	<td>'._ ($type['tdescription']).'</td>'."\n";
 
-		print '	<td class="actions">'. "\n";
+		print '	<td class="actions">'."\n";
 		print "	<div class='btn-group'>";
 		print "		<button class='btn btn-xs btn-default editDevType' data-action='edit'   data-tid='$type[tid]'><i class='fa fa-pencil'></i></button>";
 		print "		<button class='btn btn-xs btn-default editDevType' data-action='delete' data-tid='$type[tid]'><i class='fa fa-times'></i></button>";
 		print "	</div>";
-		print '	</td>'. "\n";
+		print '	</td>'."\n";
 
-		print '</tr>'. "\n";
+		print '</tr>'."\n";
 
 	}
 	print '</table>';

app/admin/ripe-import/import-subnets.php

Spacing +25 added lines, -25 removed lines

@@ -6,52 +6,52 @@ 
 
 
 /* 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);
 $Subnets	= new Subnets ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 
 //get size of subnets - $_POST/4
-$size = sizeof($_POST) / 4;
+$size = sizeof ($_POST) / 4;
 
 //get unique keys for subnets because they are not sequential if deleted!!!
-foreach($_POST as $key=>$line) {
-	if (strlen(strstr($key,"subnet"))>0) {
+foreach ($_POST as $key=>$line) {
+	if (strlen (strstr ($key, "subnet")) > 0) {
 		$allSubnets[] = $key;
 	}
 }
 
 # format and verify each record
-foreach($allSubnets as $subnet) {
+foreach ($allSubnets as $subnet) {
 	//get sequential number
-	$m = str_replace("subnet-", "", $subnet);
+	$m = str_replace ("subnet-", "", $subnet);
 
 	//reformat subnet
-	$_temp = explode("/", $_POST['subnet-' . $m]);
+	$_temp = explode ("/", $_POST['subnet-'.$m]);
 
 	//set subnet details for importing
-	$subnet_import['subnet'] 	   = $Subnets->transform_to_decimal($_temp[0]);
+	$subnet_import['subnet'] = $Subnets->transform_to_decimal ($_temp[0]);
 	$subnet_import['mask'] 	   	   = $_temp[1];
-	$subnet_import['sectionId']    = $_POST['section-' . $m];
-	$subnet_import['description']  = $_POST['description-' . $m];
-	$subnet_import['vlanId'] 	   = $_POST['vlan-' . $m];
-	$subnet_import['vrfId'] 	   = $_POST['vrf-' . $m];
-	$subnet_import['showName']	   = $_POST['showName-' . $m];
+	$subnet_import['sectionId']    = $_POST['section-'.$m];
+	$subnet_import['description']  = $_POST['description-'.$m];
+	$subnet_import['vlanId'] = $_POST['vlan-'.$m];
+	$subnet_import['vrfId'] = $_POST['vrf-'.$m];
+	$subnet_import['showName'] = $_POST['showName-'.$m];
 
 	//cidr
-	if(strlen($err=$Subnets->verify_cidr($Subnets->transform_to_dotted($subnet_import['subnet'])."/".$subnet_import['mask']))>5) {
+	if (strlen ($err = $Subnets->verify_cidr ($Subnets->transform_to_dotted ($subnet_import['subnet'])."/".$subnet_import['mask'])) > 5) {
 		$errors[] = $err;
 	}
 	//overlapping, only root !
-	else if (strlen($err=$Subnets->verify_subnet_overlapping ($subnet_import['sectionId'], $Subnets->transform_to_dotted($subnet_import['subnet'])."/".$subnet_import['mask'], $subnet_import['vrfId']))>5) {
+	else if (strlen ($err = $Subnets->verify_subnet_overlapping ($subnet_import['sectionId'], $Subnets->transform_to_dotted ($subnet_import['subnet'])."/".$subnet_import['mask'], $subnet_import['vrfId'])) > 5) {
 		$errors[] = $err;
 	}
 	//set insert
@@ -62,8 +62,8 @@ 
 
 
 # print errors if they exist or success
-if(isset($errors)) {
-	print '<div class="alert alert-danger alert-absolute">'._('Please fix the following errors before inserting').':<hr>'. "\n";
+if (isset($errors)) {
+	print '<div class="alert alert-danger alert-absolute">'._ ('Please fix the following errors before inserting').':<hr>'."\n";
 	foreach ($errors as $line) {
 		print $line.'<br>';
 	}
@@ -73,9 +73,9 @@ 
 	$errors_import_failed = 0;
 
 	//insert if all other is ok!
-	foreach($subnets_to_insert as $subnet_import) {
+	foreach ($subnets_to_insert as $subnet_import) {
 		//formulate insert query
-		$values = array("sectionId"=>$subnet_import['sectionId'],
+		$values = array ("sectionId"=>$subnet_import['sectionId'],
 						"subnet"=>$subnet_import['subnet'],
 						"mask"=>$subnet_import['mask'],
 						"description"=>$subnet_import['description'],
@@ -85,12 +85,12 @@ 
 						"showName"=>$subnet_import['showName']
 						);
 
-		if(!$Admin->object_modify("subnets", "add", "id", $values)) {
-			$Result->show("danger", _('Failed to import subnet').' '. $Subnets->transform_to_dotted($subnet_import['subnet'])."/".$subnet_import['mask'], false);
+		if (!$Admin->object_modify ("subnets", "add", "id", $values)) {
+			$Result->show ("danger", _ ('Failed to import subnet').' '.$Subnets->transform_to_dotted ($subnet_import['subnet'])."/".$subnet_import['mask'], false);
 			$errors_import_failed++;
 		}
 	}
 	//check if all is ok and print it!
-	if($errors_import_failed == 0) 	{ $Result->show("success", _("Import successfull")."!", false); }
+	if ($errors_import_failed == 0) { $Result->show ("success", _ ("Import successfull")."!", false); }
 }
 ?>
\ No newline at end of file

app/admin/ripe-import/ripe-telnet.php

Spacing +58 added lines, -58 removed lines

@@ -5,22 +5,22 @@ 
  *************************************************/
 
 /* 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);
 $Subnets	= new Subnets ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 
 //strip AS if provided, to get just the number
-if(substr($_POST['as'], 0,2)=="AS" || substr($_POST['as'], 0,2)=="as") {
-	$_POST['as'] = substr($_POST['as'], 2);
+if (substr ($_POST['as'], 0, 2) == "AS" || substr ($_POST['as'], 0, 2) == "as") {
+	$_POST['as'] = substr ($_POST['as'], 2);
 };
 
 
@@ -29,13 +29,13 @@ 
 
 # fetch all sections
 $sections = $Admin->fetch_all_objects ("sections", "id");
-$vlans	  = $Admin->fetch_all_objects ("vlans", "vlanId");
-$vrfs	  = $Admin->fetch_all_objects ("vrf", "vrfId");
+$vlans = $Admin->fetch_all_objects ("vlans", "vlanId");
+$vrfs = $Admin->fetch_all_objects ("vrf", "vrfId");
 
 //none found
-if(sizeof(@$subnet) == 0) {
+if (sizeof (@$subnet) == 0) {
 	print "<hr>";
-	$Result->show("danger alert-absolute", _('No subnets found').'!', true);
+	$Result->show ("danger alert-absolute", _ ('No subnets found').'!', true);
 }
 else {
 	//form
@@ -44,17 +44,17 @@ 
 	print '<table class="asImport table table-striped table-condensed table-top table-auto">';
 	//headers
 	print '<tr>';
-	print '	<th colspan="5">'._('I found the following routes belonging to AS').' '.$_POST['as'].':</th>';
+	print '	<th colspan="5">'._ ('I found the following routes belonging to AS').' '.$_POST['as'].':</th>';
 	print '</tr> ';
 
 	print "<tr>";
 	print "	<th></th>";
-	print "	<th>"._('Subnet')."</th>";
-	print "	<th>"._('select section')."</th>";
-	print "	<th>"._('Description')."</th>";
-	print "	<th>"._('VLAN')."</th>";
-	print "	<th>"._('VRF')."</th>";
-	print "	<th>"._('Show name')."</th>";
+	print "	<th>"._ ('Subnet')."</th>";
+	print "	<th>"._ ('select section')."</th>";
+	print "	<th>"._ ('Description')."</th>";
+	print "	<th>"._ ('VLAN')."</th>";
+	print "	<th>"._ ('VRF')."</th>";
+	print "	<th>"._ ('Show name')."</th>";
 
 	print "</tr>";
 
@@ -62,72 +62,72 @@ 
 	$m = 0;
 	foreach ($subnet as $route) {
 		# only not empty
-		if(strlen($route)>2) {
-			print '<tr>'. "\n";
+		if (strlen ($route) > 2) {
+			print '<tr>'."\n";
 
 			//delete
-			print '<td class="removeSubnet">'. "\n";
-			print '	<button class="btn btn-xs btn-default btn-danger" rel="tooltip" title="'._('Remove this subnet').'"><i class="fa fa-times"></i></button>'. "\n";
-			print '</td>'. "\n";
+			print '<td class="removeSubnet">'."\n";
+			print '	<button class="btn btn-xs btn-default btn-danger" rel="tooltip" title="'._ ('Remove this subnet').'"><i class="fa fa-times"></i></button>'."\n";
+			print '</td>'."\n";
 			//subnet
-			print '<td>'. "\n";
-			print '<input type="text" class="form-control input-sm" name="subnet-'. $m .'" value="'. $route .'">'. "\n";
-			print '</td>'. "\n";
+			print '<td>'."\n";
+			print '<input type="text" class="form-control input-sm" name="subnet-'.$m.'" value="'.$route.'">'."\n";
+			print '</td>'."\n";
 			//section
-			print '<td>'. "\n";
-			print '<select name="section-'. $m .'" class="form-control input-sm input-w-auto">'. "\n";
-			foreach($sections as $section) {
-				print '<option value="'. $section->id .'">'. $section->name .'</option>';
+			print '<td>'."\n";
+			print '<select name="section-'.$m.'" class="form-control input-sm input-w-auto">'."\n";
+			foreach ($sections as $section) {
+				print '<option value="'.$section->id.'">'.$section->name.'</option>';
 			}
-			print '</select>'. "\n";
-			print '</td>'. "\n";
+			print '</select>'."\n";
+			print '</td>'."\n";
 			//description
-			print '<td>'. "\n";
-			print '<input type="text" class="form-control input-sm input-w-250" name="description-'. $m .'">'. "\n";
-			print '</td>'. "\n";
+			print '<td>'."\n";
+			print '<input type="text" class="form-control input-sm input-w-250" name="description-'.$m.'">'."\n";
+			print '</td>'."\n";
 			//VLAN
-			print '<td>'. "\n";
-			print '<select name="vlan-'. $m .'" class="form-control input-sm input-w-auto">'. "\n";
+			print '<td>'."\n";
+			print '<select name="vlan-'.$m.'" class="form-control input-sm input-w-auto">'."\n";
 			print '<option value="0">No VLAN</option>';
-			if(sizeof(@$vlans)>0) {
-				foreach($vlans as $vlan) {
+			if (sizeof (@$vlans) > 0) {
+				foreach ($vlans as $vlan) {
 					# set description
-					$vlan_description = strlen($vlan->description)>0 ? " (".$vlan->description.")" : "";
+					$vlan_description = strlen ($vlan->description) > 0 ? " (".$vlan->description.")" : "";
 					print '<option value="'.$vlan->vlanId.'">'.$vlan->number.$vlan_description.'</option>';
 				}
 			}
 			//VRF
-			print '<td>'. "\n";
-			print '<select name="vrf-'. $m .'" class="form-control input-sm input-w-auto">'. "\n";
+			print '<td>'."\n";
+			print '<select name="vrf-'.$m.'" class="form-control input-sm input-w-auto">'."\n";
 			print '<option value="0">No VRF</option>';
-			if(sizeof(@$vrfs)>0) {
-				foreach($vrfs as $vrf) {
+			if (sizeof (@$vrfs) > 0) {
+				foreach ($vrfs as $vrf) {
 					# set description
-					$vrf_description = strlen($vrf->description)>0 ? " (".$vrf->description.")" : "";
+					$vrf_description = strlen ($vrf->description) > 0 ? " (".$vrf->description.")" : "";
 					print '<option value="'.$vrf->vrfId.'">'.$vrf->name.$vrf_description.'</option>';
 				}
 			}
 			//show name
-			print '<td>'. "\n";
-			print '<select name="showName-'. $m .'" class="form-control input-sm input-w-auto">'. "\n";
-			print '<option value="0">'._('No') .'</option>';
-			print '<option value="1">'._('Yes').'</option>';
-			print '</td>'. "\n";
+			print '<td>'."\n";
+			print '<select name="showName-'.$m.'" class="form-control input-sm input-w-auto">'."\n";
+			print '<option value="0">'._ ('No').'</option>';
+			print '<option value="1">'._ ('Yes').'</option>';
+			print '</td>'."\n";
 
-			print '</tr>'. "\n";
+			print '</tr>'."\n";
 		}
 		$m++;
 	}
 
 	//submit
-	print '<tr style="border-top:1px solid white" class="th">'. "\n";
-	print '<td colspan="7" style="text-align:right">'. "\n";
-	print '	<input type="submit" class="btn btn-sm btn-default" value="'._('Import to database').'">'. "\n";
-	print '</td>'. "\n";
-	print '</tr>'. "\n";
-
-	print '</table>'. "\n";
-	print '</form>'. "\n";
+	print '<tr style="border-top:1px solid white" class="th">'."\n";
+	print '<td colspan="7" style="text-align:right">'."\n";
+	print '	<input type="submit" class="btn btn-sm btn-default" value="'._ ('Import to database').'">'."\n";
+	print '</td>'."\n";
+	print '</tr>'."\n";
+
+	print '</table>'."\n";
+	print '</form>'."\n";
 }
 ?>
 <div class="ripeImportResult"></div>
\ No newline at end of file