phpipam / phpipam

app/admin/vrfs/edit-result.php

Indentation +15 added lines, -15 removed lines

@@ -32,11 +32,11 @@ 
 
 // set sections
 foreach($_POST as $key=>$line) {
-	if (strlen(strstr($key,"section-"))>0) {
-		$key2 = str_replace("section-", "", $key);
-		$temp[] = $key2;
-		unset($_POST[$key]);
-	}
+    if (strlen(strstr($key,"section-"))>0) {
+        $key2 = str_replace("section-", "", $key);
+        $temp[] = $key2;
+        unset($_POST[$key]);
+    }
 }
 # glue sections together
 $_POST['sections'] = sizeof($temp)>0 ? implode(";", $temp) : null;
@@ -45,18 +45,18 @@ 
 
 # set update array
 $values = array("vrfId"=>@$_POST['vrfId'],
-				"name"=>$_POST['name'],
-				"rd"=>$_POST['rd'],
-				"sections"=>$_POST['sections'],
-				"description"=>$_POST['description']
-				);
+                "name"=>$_POST['name'],
+                "rd"=>$_POST['rd'],
+                "sections"=>$_POST['sections'],
+                "description"=>$_POST['description']
+                );
 # append custom
 if(sizeof($custom) > 0) {
-	foreach($custom as $myField) {
-		# replace possible ___ back to spaces!
-		$myField['nameTest']      = str_replace(" ", "___", $myField['name']);
-		if(isset($_POST[$myField['nameTest']])) { $values[$myField['name']] = @$_POST[$myField['nameTest']];}
-	}
+    foreach($custom as $myField) {
+        # replace possible ___ back to spaces!
+        $myField['nameTest']      = str_replace(" ", "___", $myField['name']);
+        if(isset($_POST[$myField['nameTest']])) { $values[$myField['name']] = @$_POST[$myField['nameTest']];}
+    }
 }
 
 # update

Spacing +20 added lines, -20 removed lines

@@ -5,65 +5,65 @@
  ***************************/
 
 /* 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);
 $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", "vrf", $_POST['csrf_cookie']) === false ? $Result->show("danger", _("Invalid CSRF cookie"), true) : "";
+$User->csrf_cookie ("validate", "vrf", $_POST['csrf_cookie']) === false ? $Result->show ("danger", _ ("Invalid CSRF cookie"), true) : "";
 
 # fetch custom fields
-$custom = $Tools->fetch_custom_fields('vrf');
+$custom = $Tools->fetch_custom_fields ('vrf');
 
 
 # Hostname must be present!
-if($_POST['name'] == "") { $Result->show("danger", _("Name is mandatory"), true); }
+if ($_POST['name'] == "") { $Result->show ("danger", _ ("Name is mandatory"), true); }
 
 // set sections
-foreach($_POST as $key=>$line) {
-	if (strlen(strstr($key,"section-"))>0) {
-		$key2 = str_replace("section-", "", $key);
+foreach ($_POST as $key=>$line) {
+	if (strlen (strstr ($key, "section-")) > 0) {
+		$key2 = str_replace ("section-", "", $key);
 		$temp[] = $key2;
 		unset($_POST[$key]);
 	}
 }
 # glue sections together
-$_POST['sections'] = sizeof($temp)>0 ? implode(";", $temp) : null;
+$_POST['sections'] = sizeof ($temp) > 0 ? implode (";", $temp) : null;
 
 
 
 # set update array
-$values = array("vrfId"=>@$_POST['vrfId'],
+$values = array ("vrfId"=>@$_POST['vrfId'],
 				"name"=>$_POST['name'],
 				"rd"=>$_POST['rd'],
 				"sections"=>$_POST['sections'],
 				"description"=>$_POST['description']
 				);
 # append custom
-if(sizeof($custom) > 0) {
-	foreach($custom as $myField) {
+if (sizeof ($custom) > 0) {
+	foreach ($custom as $myField) {
 		# replace possible ___ back to spaces!
-		$myField['nameTest']      = str_replace(" ", "___", $myField['name']);
-		if(isset($_POST[$myField['nameTest']])) { $values[$myField['name']] = @$_POST[$myField['nameTest']];}
+		$myField['nameTest'] = str_replace (" ", "___", $myField['name']);
+		if (isset($_POST[$myField['nameTest']])) { $values[$myField['name']] = @$_POST[$myField['nameTest']]; }
 	}
 }
 
 # update
-if(!$Admin->object_modify("vrf", $_POST['action'], "vrfId", $values))	{ $Result->show("danger",  _("Failed to $_POST[action] VRF").'!', true); }
-else																	{ $Result->show("success", _("VRF $_POST[action] successfull").'!', false); }
+if (!$Admin->object_modify ("vrf", $_POST['action'], "vrfId", $values)) { $Result->show ("danger", _ ("Failed to $_POST[action] VRF").'!', true); }
+else { $Result->show ("success", _ ("VRF $_POST[action] successfull").'!', false); }
 
 
 # remove all references if delete
-if($_POST['action']=="delete") { $Admin->remove_object_references ("subnets", "vrfId", $_POST['vrfId']); }
+if ($_POST['action'] == "delete") { $Admin->remove_object_references ("subnets", "vrfId", $_POST['vrfId']); }
 ?>

app/admin/vrfs/edit.php

Braces +4 added lines, -1 removed lines

@@ -203,7 +203,10 @@
 <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="editVRF"><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 <?php if($_POST['action']=="delete") { print "btn-danger"; }
+else { print "btn-success"; } ?>" id="editVRF"><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="vrfManagementEditResult"></div>

Indentation +111 added lines, -111 removed lines

@@ -23,9 +23,9 @@ 
 
 # get VRF
 if($_POST['action']!="add") {
-	$vrf = $Admin->fetch_object ("vrf", "vrfId", $_POST['vrfId']);
-	$vrf!==false ? : $Result->show("danger", _("Invalid ID"), true, true);
-	$vrf = (array) $vrf;
+    $vrf = $Admin->fetch_object ("vrf", "vrfId", $_POST['vrfId']);
+    $vrf!==false ? : $Result->show("danger", _("Invalid ID"), true, true);
+    $vrf = (array) $vrf;
 }
 
 # disable edit on delete
@@ -64,8 +64,8 @@ 
 		<td><?php print _('Description'); ?></td>
 		<td>
 			<?php
-			if( ($_POST['action'] == "edit") || ($_POST['action'] == "delete") ) { print '<input type="hidden" name="vrfId" value="'. $_POST['vrfId'] .'">'. "\n";}
-			?>
+            if( ($_POST['action'] == "edit") || ($_POST['action'] == "delete") ) { print '<input type="hidden" name="vrfId" value="'. $_POST['vrfId'] .'">'. "\n";}
+            ?>
 			<input type="hidden" name="action" value="<?php print $_POST['action']; ?>">
 			<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
 			<input type="text" class="description form-control input-sm" name="description" placeholder="<?php print _('Description'); ?>" value="<?php print @$vrf['description']; ?>" <?php print $readonly; ?>>
@@ -79,123 +79,123 @@ 
 		<td style="vertical-align: top !important"><?php print _('Sections'); ?>:</td>
 		<td>
 		<?php
-		# select sections
-		$sections = $Sections->fetch_all_sections();
-		# reformat domains sections to array
-		$vrf_sections = explode(";", @$vrf['sections']);
-		$vrf_sections = is_array($vrf_sections) ? $vrf_sections : array();
-		// loop
-		if($sections!==false) {
-			foreach($sections as $section) {
-				if(in_array($section->id, @$vrf_sections)) 	{ print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="section-'. $section->id .'" value="on" checked> '. $section->name .'</div>'. "\n"; }
-				else 										{ print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="section-'. $section->id .'" value="on">'. $section->name .'</span></div>'. "\n"; }
-			}
-		}
-		?>
+        # select sections
+        $sections = $Sections->fetch_all_sections();
+        # reformat domains sections to array
+        $vrf_sections = explode(";", @$vrf['sections']);
+        $vrf_sections = is_array($vrf_sections) ? $vrf_sections : array();
+        // loop
+        if($sections!==false) {
+            foreach($sections as $section) {
+                if(in_array($section->id, @$vrf_sections)) 	{ print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="section-'. $section->id .'" value="on" checked> '. $section->name .'</div>'. "\n"; }
+                else 										{ print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="section-'. $section->id .'" value="on">'. $section->name .'</span></div>'. "\n"; }
+            }
+        }
+        ?>
 		</td>
 	</tr>
 
 	<!-- Custom -->
 	<?php
-	if(sizeof($custom) > 0) {
-
-		print '<tr>';
-		print '	<td colspan="2"><hr></td>';
-		print '</tr>';
-
-		foreach($custom as $field) {
-
-			# replace spaces
-		    $field['nameNew'] = str_replace(" ", "___", $field['name']);
-
-			# required
-			if($field['Null']=="NO")	{ $required = "*"; }
-			else						{ $required = ""; }
-
-			# set default value !
-			if ($_POST['action']=="add")	{ $vrf[$field['name']] = $field['Default']; }
-
-			print '<tr>'. "\n";
-			print '	<td>'. $field['name'] .' '.$required.'</td>'. "\n";
-			print '	<td>'. "\n";
-
-			//set type
-			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']));
-				//null
-				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==$vrf[$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") {
-				// just for first
-				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">';
-					print '$(document).ready(function() {';
-					//date only
-					print '	$(".datepicker").datetimepicker( {pickDate: true, pickTime: false, pickSeconds: false });';
-					//date + time
-					print '	$(".datetimepicker").datetimepicker( { pickDate: true, pickTime: true } );';
-
-					print '})';
-					print '</script>';
-				}
-				$timeP++;
-
-				//set size
-				if($field['type'] == "date")	{ $size = 10; $class='datepicker';		$format = "yyyy-MM-dd"; }
-				else							{ $size = 19; $class='datetimepicker';	$format = "yyyy-MM-dd"; }
-
-				//field
-				if(!isset($vrf[$field['name']]))	{ print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'. $field['nameNew'] .'" maxlength="'.$size.'" '.$readonly.' 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="'. $vrf[$field['name']]. '" '.$readonly.' rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n"; }
-			}
-			//boolean
-			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");
-				//null
-				if($field['Null']!="NO") { $tmp[2] = ""; }
-
-				foreach($tmp as $k=>$v) {
-					if(strlen($vrf[$field['name']])==0 && $k==2)	{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
-					elseif($k==$vrf[$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'] .'" '.$readonly.' rowspan=3 rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. $vrf[$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="'. @$vrf[$field['name']]. '" size="30" '.$readonly.' rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n";
-			}
-
-			print '	</td>'. "\n";
-			print '</tr>'. "\n";
-		}
-	}
-	?>
+    if(sizeof($custom) > 0) {
+
+        print '<tr>';
+        print '	<td colspan="2"><hr></td>';
+        print '</tr>';
+
+        foreach($custom as $field) {
+
+            # replace spaces
+            $field['nameNew'] = str_replace(" ", "___", $field['name']);
+
+            # required
+            if($field['Null']=="NO")	{ $required = "*"; }
+            else						{ $required = ""; }
+
+            # set default value !
+            if ($_POST['action']=="add")	{ $vrf[$field['name']] = $field['Default']; }
+
+            print '<tr>'. "\n";
+            print '	<td>'. $field['name'] .' '.$required.'</td>'. "\n";
+            print '	<td>'. "\n";
+
+            //set type
+            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']));
+                //null
+                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==$vrf[$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") {
+                // just for first
+                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">';
+                    print '$(document).ready(function() {';
+                    //date only
+                    print '	$(".datepicker").datetimepicker( {pickDate: true, pickTime: false, pickSeconds: false });';
+                    //date + time
+                    print '	$(".datetimepicker").datetimepicker( { pickDate: true, pickTime: true } );';
+
+                    print '})';
+                    print '</script>';
+                }
+                $timeP++;
+
+                //set size
+                if($field['type'] == "date")	{ $size = 10; $class='datepicker';		$format = "yyyy-MM-dd"; }
+                else							{ $size = 19; $class='datetimepicker';	$format = "yyyy-MM-dd"; }
+
+                //field
+                if(!isset($vrf[$field['name']]))	{ print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'. $field['nameNew'] .'" maxlength="'.$size.'" '.$readonly.' 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="'. $vrf[$field['name']]. '" '.$readonly.' rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n"; }
+            }
+            //boolean
+            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");
+                //null
+                if($field['Null']!="NO") { $tmp[2] = ""; }
+
+                foreach($tmp as $k=>$v) {
+                    if(strlen($vrf[$field['name']])==0 && $k==2)	{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
+                    elseif($k==$vrf[$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'] .'" '.$readonly.' rowspan=3 rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. $vrf[$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="'. @$vrf[$field['name']]. '" size="30" '.$readonly.' rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n";
+            }
+
+            print '	</td>'. "\n";
+            print '</tr>'. "\n";
+        }
+    }
+    ?>
 
 
 	</table>
 	</form>
 
 	<?php
-	//print delete warning
-	if($_POST['action'] == "delete")	{ $Result->show("warning", "<strong>"._('Warning').":</strong> "._("removing VRF will also remove VRF reference from belonging subnets!"), false);}
-	?>
+    //print delete warning
+    if($_POST['action'] == "delete")	{ $Result->show("warning", "<strong>"._('Warning').":</strong> "._("removing VRF will also remove VRF reference from belonging subnets!"), false);}
+    ?>
 </div>
 
 

Spacing +61 added lines, -61 removed lines

@@ -5,39 +5,39 @@ 
  ************************************************/
 
 /* 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);
-$Sections	= new Sections ($Database);
+$Sections = new Sections ($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", "vrf");
 
 # get VRF
-if($_POST['action']!="add") {
+if ($_POST['action'] != "add") {
 	$vrf = $Admin->fetch_object ("vrf", "vrfId", $_POST['vrfId']);
-	$vrf!==false ? : $Result->show("danger", _("Invalid ID"), true, true);
+	$vrf !== false ? : $Result->show ("danger", _ ("Invalid ID"), true, true);
 	$vrf = (array) $vrf;
 }
 
 # disable edit on delete
-$readonly = $_POST['action']=="delete" ? "readonly" : "";
+$readonly = $_POST['action'] == "delete" ? "readonly" : "";
 
 # fetch custom fields
-$custom = $Tools->fetch_custom_fields('vrf');
+$custom = $Tools->fetch_custom_fields ('vrf');
 ?>
 
 
 <!-- header -->
-<div class="pHeader"><?php print ucwords(_("$_POST[action]")); ?> <?php print _('VRF'); ?></div>
+<div class="pHeader"><?php print ucwords (_ ("$_POST[action]")); ?> <?php print _ ('VRF'); ?></div>
 
 <!-- content -->
 <div class="pContent">
@@ -47,28 +47,28 @@ 
 
 	<!-- name  -->
 	<tr>
-		<td><?php print _('Name'); ?></td>
+		<td><?php print _ ('Name'); ?></td>
 		<td>
-			<input type="text" class="name form-control input-sm" name="name" placeholder="<?php print _('VRF name'); ?>" value="<?php print @$vrf['name']; ?>" <?php print $readonly; ?>>
+			<input type="text" class="name form-control input-sm" name="name" placeholder="<?php print _ ('VRF name'); ?>" value="<?php print @$vrf['name']; ?>" <?php print $readonly; ?>>
 		</td>
 	</tr>
 	<!-- RD -->
 	<tr>
-		<td><?php print _('RD'); ?></td>
+		<td><?php print _ ('RD'); ?></td>
 		<td>
-			<input type="text" class="rd form-control input-sm" name="rd" placeholder="<?php print _('Route distinguisher'); ?>" value="<?php print @$vrf['rd']; ?>" <?php print $readonly; ?>>
+			<input type="text" class="rd form-control input-sm" name="rd" placeholder="<?php print _ ('Route distinguisher'); ?>" value="<?php print @$vrf['rd']; ?>" <?php print $readonly; ?>>
 		</td>
 	</tr>
 	<!-- Description -->
 	<tr>
-		<td><?php print _('Description'); ?></td>
+		<td><?php print _ ('Description'); ?></td>
 		<td>
 			<?php
-			if( ($_POST['action'] == "edit") || ($_POST['action'] == "delete") ) { print '<input type="hidden" name="vrfId" value="'. $_POST['vrfId'] .'">'. "\n";}
+			if (($_POST['action'] == "edit") || ($_POST['action'] == "delete")) { print '<input type="hidden" name="vrfId" value="'.$_POST['vrfId'].'">'."\n"; }
 			?>
 			<input type="hidden" name="action" value="<?php print $_POST['action']; ?>">
 			<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
-			<input type="text" class="description form-control input-sm" name="description" placeholder="<?php print _('Description'); ?>" value="<?php print @$vrf['description']; ?>" <?php print $readonly; ?>>
+			<input type="text" class="description form-control input-sm" name="description" placeholder="<?php print _ ('Description'); ?>" value="<?php print @$vrf['description']; ?>" <?php print $readonly; ?>>
 		</td>
 	</tr>
 	<tr>
@@ -76,19 +76,19 @@ 
 	</tr>
 	<!-- sections -->
 	<tr>
-		<td style="vertical-align: top !important"><?php print _('Sections'); ?>:</td>
+		<td style="vertical-align: top !important"><?php print _ ('Sections'); ?>:</td>
 		<td>
 		<?php
 		# select sections
-		$sections = $Sections->fetch_all_sections();
+		$sections = $Sections->fetch_all_sections ();
 		# reformat domains sections to array
-		$vrf_sections = explode(";", @$vrf['sections']);
-		$vrf_sections = is_array($vrf_sections) ? $vrf_sections : array();
+		$vrf_sections = explode (";", @$vrf['sections']);
+		$vrf_sections = is_array ($vrf_sections) ? $vrf_sections : array ();
 		// loop
-		if($sections!==false) {
-			foreach($sections as $section) {
-				if(in_array($section->id, @$vrf_sections)) 	{ print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="section-'. $section->id .'" value="on" checked> '. $section->name .'</div>'. "\n"; }
-				else 										{ print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="section-'. $section->id .'" value="on">'. $section->name .'</span></div>'. "\n"; }
+		if ($sections !== false) {
+			foreach ($sections as $section) {
+				if (in_array ($section->id, @$vrf_sections)) { print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="section-'.$section->id.'" value="on" checked> '.$section->name.'</div>'."\n"; }
+				else { print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="section-'.$section->id.'" value="on">'.$section->name.'</span></div>'."\n"; }
 			}
 		}
 		?>
@@ -97,46 +97,46 @@ 
 
 	<!-- Custom -->
 	<?php
-	if(sizeof($custom) > 0) {
+	if (sizeof ($custom) > 0) {
 
 		print '<tr>';
 		print '	<td colspan="2"><hr></td>';
 		print '</tr>';
 
-		foreach($custom as $field) {
+		foreach ($custom as $field) {
 
 			# replace spaces
-		    $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")	{ $vrf[$field['name']] = $field['Default']; }
+			if ($_POST['action'] == "add") { $vrf[$field['name']] = $field['Default']; }
 
-			print '<tr>'. "\n";
-			print '	<td>'. $field['name'] .' '.$required.'</td>'. "\n";
-			print '	<td>'. "\n";
+			print '<tr>'."\n";
+			print '	<td>'.$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==$vrf[$field['name']])	{ print "<option value='$v' selected='selected'>$v</option>"; }
-					else								{ print "<option value='$v'>$v</option>"; }
+				foreach ($tmp as $v) {
+					if ($v == $vrf[$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">';
@@ -152,38 +152,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($vrf[$field['name']]))	{ print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'. $field['nameNew'] .'" maxlength="'.$size.'" '.$readonly.' 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="'. $vrf[$field['name']]. '" '.$readonly.' rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n"; }
+				if (!isset($vrf[$field['name']])) { print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'.$field['nameNew'].'" maxlength="'.$size.'" '.$readonly.' 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="'.$vrf[$field['name']].'" '.$readonly.' 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($vrf[$field['name']])==0 && $k==2)	{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
-					elseif($k==$vrf[$field['name']])				{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
-					else												{ print "<option value='$k'>"._($v)."</option>"; }
+				foreach ($tmp as $k=>$v) {
+					if (strlen ($vrf[$field['name']]) == 0 && $k == 2) { print "<option value='$k' selected='selected'>"._ ($v)."</option>"; }
+					elseif ($k == $vrf[$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'] .'" '.$readonly.' rowspan=3 rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. $vrf[$field['name']]. '</textarea>'. "\n";
+			elseif ($field['type'] == "text") {
+				print ' <textarea class="form-control input-sm" name="'.$field['nameNew'].'" placeholder="'.$field['name'].'" '.$readonly.' rowspan=3 rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'.$vrf[$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="'. @$vrf[$field['name']]. '" size="30" '.$readonly.' 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="'.@$vrf[$field['name']].'" size="30" '.$readonly.' rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'."\n";
 			}
 
-			print '	</td>'. "\n";
-			print '</tr>'. "\n";
+			print '	</td>'."\n";
+			print '</tr>'."\n";
 		}
 	}
 	?>
@@ -194,7 +194,7 @@ 
 
 	<?php
 	//print delete warning
-	if($_POST['action'] == "delete")	{ $Result->show("warning", "<strong>"._('Warning').":</strong> "._("removing VRF will also remove VRF reference from belonging subnets!"), false);}
+	if ($_POST['action'] == "delete") { $Result->show ("warning", "<strong>"._ ('Warning').":</strong> "._ ("removing VRF will also remove VRF reference from belonging subnets!"), false); }
 	?>
 </div>
 
@@ -202,8 +202,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="editVRF"><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="editVRF"><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="vrfManagementEditResult"></div>

app/admin/tags/index.php

Indentation +24 added lines, -24 removed lines

@@ -33,33 +33,33 @@
 
 # loop
 if ($all_types!==false) {
-	// cast
-	$all_types = (array) $all_types;
-	// loop
-	foreach ($all_types as $type) {
-		//cast
-		$type = (array) $type;
+    // cast
+    $all_types = (array) $all_types;
+    // loop
+    foreach ($all_types as $type) {
+        //cast
+        $type = (array) $type;
 
-		//format type
-		$showtag = $type['showtag']==1 ? "Yes" : "No";
+        //format type
+        $showtag = $type['showtag']==1 ? "Yes" : "No";
 
-		//print details
-		print '<tr>'. "\n";
-		print '	<td>'. $type['type'] .'</td>'. "\n";
-		print '	<td>'.$showtag.'</td>'. "\n";
-		print '	<td style="background-color:'.$type['bgcolor'].'">'. $type['bgcolor'] .'</td>'. "\n";
-		print '	<td style="background-color:'.$type['fgcolor'].'">'. $type['fgcolor'] .'</td>'. "\n";
-		print '	<td>'. $type['compress'] .'</td>'. "\n";
-		print '	<td>'. $type['locked'] .'</td>'. "\n";
+        //print details
+        print '<tr>'. "\n";
+        print '	<td>'. $type['type'] .'</td>'. "\n";
+        print '	<td>'.$showtag.'</td>'. "\n";
+        print '	<td style="background-color:'.$type['bgcolor'].'">'. $type['bgcolor'] .'</td>'. "\n";
+        print '	<td style="background-color:'.$type['fgcolor'].'">'. $type['fgcolor'] .'</td>'. "\n";
+        print '	<td>'. $type['compress'] .'</td>'. "\n";
+        print '	<td>'. $type['locked'] .'</td>'. "\n";
 
-		print "	<td class='actions'>";
-		print "	<div class='btn-group'>";
-		print "		<button class='btn btn-xs btn-default editType' data-action='edit'   data-id='$type[id]'><i class='fa fa-pencil'></i></button>";
-		print "		<button class='btn btn-xs btn-default editType' data-action='delete' data-id='$type[id]'><i class='fa fa-times'></i></button>";
-		print "	</div>";
-		print "	</td>";
-		print '</tr>'. "\n";
-	}
+        print "	<td class='actions'>";
+        print "	<div class='btn-group'>";
+        print "		<button class='btn btn-xs btn-default editType' data-action='edit'   data-id='$type[id]'><i class='fa fa-pencil'></i></button>";
+        print "		<button class='btn btn-xs btn-default editType' data-action='delete' data-id='$type[id]'><i class='fa fa-times'></i></button>";
+        print "	</div>";
+        print "	</td>";
+        print '</tr>'. "\n";
+    }
 }
 print '</table>'. "\n";
 ?>

Spacing +25 added lines, -25 removed lines

@@ -5,34 +5,34 @@ 
  ************************************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # fetch all vrfs
-$all_types = $Admin->fetch_all_objects("ipTags");
+$all_types = $Admin->fetch_all_objects ("ipTags");
 ?>
 
-<h4><?php print _('Manage Address Tags'); ?></h4>
+<h4><?php print _ ('Manage Address Tags'); ?></h4>
 <hr><br>
 
-<button class='btn btn-sm btn-default editType' data-action='add' data-vrfid='' style='margin-bottom:10px;'><i class='fa fa-plus'></i> <?php print _('Add Tag'); ?></button>
+<button class='btn btn-sm btn-default editType' data-action='add' data-vrfid='' style='margin-bottom:10px;'><i class='fa fa-plus'></i> <?php print _ ('Add Tag'); ?></button>
 
 <!-- vrfs -->
 <?php
-print '<table class="table table-striped table-top table-auto">'. "\n";
+print '<table class="table table-striped table-top table-auto">'."\n";
 
 # headers
-print '<tr>'. "\n";
-print '	<th>'._('type').'</th>'. "\n";
-print '	<th>'._('Show Tag').'</th>'. "\n";
-print '	<th>'._('BG color').'</th>'. "\n";
-print '	<th>'._('FG color').'</th>'. "\n";
-print '	<th>'._('Compress range').'</th>'. "\n";
-print '	<th>'._('Locked').'</th>'. "\n";
-print '	<th></th>'. "\n";
-print '</tr>'. "\n";
+print '<tr>'."\n";
+print '	<th>'._ ('type').'</th>'."\n";
+print '	<th>'._ ('Show Tag').'</th>'."\n";
+print '	<th>'._ ('BG color').'</th>'."\n";
+print '	<th>'._ ('FG color').'</th>'."\n";
+print '	<th>'._ ('Compress range').'</th>'."\n";
+print '	<th>'._ ('Locked').'</th>'."\n";
+print '	<th></th>'."\n";
+print '</tr>'."\n";
 
 # loop
-if ($all_types!==false) {
+if ($all_types !== false) {
 	// cast
 	$all_types = (array) $all_types;
 	// loop
@@ -41,16 +41,16 @@ 
 		$type = (array) $type;
 
 		//format type
-		$showtag = $type['showtag']==1 ? "Yes" : "No";
+		$showtag = $type['showtag'] == 1 ? "Yes" : "No";
 
 		//print details
-		print '<tr>'. "\n";
-		print '	<td>'. $type['type'] .'</td>'. "\n";
-		print '	<td>'.$showtag.'</td>'. "\n";
-		print '	<td style="background-color:'.$type['bgcolor'].'">'. $type['bgcolor'] .'</td>'. "\n";
-		print '	<td style="background-color:'.$type['fgcolor'].'">'. $type['fgcolor'] .'</td>'. "\n";
-		print '	<td>'. $type['compress'] .'</td>'. "\n";
-		print '	<td>'. $type['locked'] .'</td>'. "\n";
+		print '<tr>'."\n";
+		print '	<td>'.$type['type'].'</td>'."\n";
+		print '	<td>'.$showtag.'</td>'."\n";
+		print '	<td style="background-color:'.$type['bgcolor'].'">'.$type['bgcolor'].'</td>'."\n";
+		print '	<td style="background-color:'.$type['fgcolor'].'">'.$type['fgcolor'].'</td>'."\n";
+		print '	<td>'.$type['compress'].'</td>'."\n";
+		print '	<td>'.$type['locked'].'</td>'."\n";
 
 		print "	<td class='actions'>";
 		print "	<div class='btn-group'>";
@@ -58,10 +58,10 @@ 
 		print "		<button class='btn btn-xs btn-default editType' data-action='delete' data-id='$type[id]'><i class='fa fa-times'></i></button>";
 		print "	</div>";
 		print "	</td>";
-		print '</tr>'. "\n";
+		print '</tr>'."\n";
 	}
 }
-print '</table>'. "\n";
+print '</table>'."\n";
 ?>
 
 <!-- edit result holder -->

app/admin/tags/edit-result.php

Indentation +12 added lines, -12 removed lines

@@ -24,28 +24,28 @@ 
 
 # fetch old values
 if($_POST['action']=="delete") {
-	$old_tag = $Admin->fetch_object ("ipTags", "id", $_POST['id']);
+    $old_tag = $Admin->fetch_object ("ipTags", "id", $_POST['id']);
 }
 else {
-	$old_tag = new StdClass ();
+    $old_tag = new StdClass ();
 }
 
 /* checks */
 if($_POST['action']=="delete" && $old_tag->locked!="No")				{ $Result->show("danger", _("Cannot delete locked tag"), true); }
 if($_POST['action']!="delete") {
-	if(strlen($_POST['type'])<3)										{ $Result->show("danger", _("Invalid tag name"), true); }
-	if(strlen($_POST['bgcolor'])<4)										{ $Result->show("danger", _("Invalid bg color"), true); }
-	if(strlen($_POST['fgcolor'])<4)										{ $Result->show("danger", _("Invalid fg color"), true); }
+    if(strlen($_POST['type'])<3)										{ $Result->show("danger", _("Invalid tag name"), true); }
+    if(strlen($_POST['bgcolor'])<4)										{ $Result->show("danger", _("Invalid bg color"), true); }
+    if(strlen($_POST['fgcolor'])<4)										{ $Result->show("danger", _("Invalid fg color"), true); }
 }
 
 # create array of values for modification
 $values = array("id"=>@$_POST['id'],
-				"type"=>$_POST['type'],
-				"bgcolor"=>@$_POST['bgcolor'],
-				"fgcolor"=>@$_POST['fgcolor'],
-				"showtag"=>@$_POST['showtag'],
-				"compress"=>@$_POST['compress']
-				);
+                "type"=>$_POST['type'],
+                "bgcolor"=>@$_POST['bgcolor'],
+                "fgcolor"=>@$_POST['fgcolor'],
+                "showtag"=>@$_POST['showtag'],
+                "compress"=>@$_POST['compress']
+                );
 
 # execute
 if(!$Admin->object_modify("ipTags", $_POST['action'], "id", $values)) 	{ $Result->show("danger",  _("Tag $_POST[action] error"), true); }
@@ -53,6 +53,6 @@ 
 
 # reset if delete to online
 if($_POST['action']=="delete") {
-	$Admin->update_object_references ("ipaddresses", "state", $old_tag->id, 0);
+    $Admin->update_object_references ("ipaddresses", "state", $old_tag->id, 0);
 }
 ?>
\ No newline at end of file

Spacing +16 added lines, -16 removed lines

@@ -5,25 +5,25 @@ 
  *************************************/
 
 /* 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", "tags", $_POST['csrf_cookie']) === false ? $Result->show("danger", _("Invalid CSRF cookie"), true) : "";
+$User->csrf_cookie ("validate", "tags", $_POST['csrf_cookie']) === false ? $Result->show ("danger", _ ("Invalid CSRF cookie"), true) : "";
 
 # fetch old values
-if($_POST['action']=="delete") {
+if ($_POST['action'] == "delete") {
 	$old_tag = $Admin->fetch_object ("ipTags", "id", $_POST['id']);
 }
 else {
@@ -31,15 +31,15 @@ 
 }
 
 /* checks */
-if($_POST['action']=="delete" && $old_tag->locked!="No")				{ $Result->show("danger", _("Cannot delete locked tag"), true); }
-if($_POST['action']!="delete") {
-	if(strlen($_POST['type'])<3)										{ $Result->show("danger", _("Invalid tag name"), true); }
-	if(strlen($_POST['bgcolor'])<4)										{ $Result->show("danger", _("Invalid bg color"), true); }
-	if(strlen($_POST['fgcolor'])<4)										{ $Result->show("danger", _("Invalid fg color"), true); }
+if ($_POST['action'] == "delete" && $old_tag->locked != "No") { $Result->show ("danger", _ ("Cannot delete locked tag"), true); }
+if ($_POST['action'] != "delete") {
+	if (strlen ($_POST['type']) < 3) { $Result->show ("danger", _ ("Invalid tag name"), true); }
+	if (strlen ($_POST['bgcolor']) < 4) { $Result->show ("danger", _ ("Invalid bg color"), true); }
+	if (strlen ($_POST['fgcolor']) < 4) { $Result->show ("danger", _ ("Invalid fg color"), true); }
 }
 
 # create array of values for modification
-$values = array("id"=>@$_POST['id'],
+$values = array ("id"=>@$_POST['id'],
 				"type"=>$_POST['type'],
 				"bgcolor"=>@$_POST['bgcolor'],
 				"fgcolor"=>@$_POST['fgcolor'],
@@ -48,11 +48,11 @@ 
 				);
 
 # execute
-if(!$Admin->object_modify("ipTags", $_POST['action'], "id", $values)) 	{ $Result->show("danger",  _("Tag $_POST[action] error"), true); }
-else 																	{ $Result->show("success", _("Tag $_POST[action] success"), false); }
+if (!$Admin->object_modify ("ipTags", $_POST['action'], "id", $values)) { $Result->show ("danger", _ ("Tag $_POST[action] error"), true); }
+else { $Result->show ("success", _ ("Tag $_POST[action] success"), false); }
 
 # reset if delete to online
-if($_POST['action']=="delete") {
+if ($_POST['action'] == "delete") {
 	$Admin->update_object_references ("ipaddresses", "state", $old_tag->id, 0);
 }
 ?>
\ No newline at end of file

app/admin/tags/edit.php

Indentation +4 added lines, -4 removed lines

@@ -24,10 +24,10 @@
 
 # fetch api for edit / add
 if($_POST['action']!="add") {
-	# fetch api details
-	$tag = $Admin->fetch_object ("ipTags", "id", $_POST['id']);
-	# null ?
-	$tag===false ? $Result->show("danger", _("Invalid ID"), true, true) : null;
+    # fetch api details
+    $tag = $Admin->fetch_object ("ipTags", "id", $_POST['id']);
+    # null ?
+    $tag===false ? $Result->show("danger", _("Invalid ID"), true, true) : null;
 }
 ?>
 

Braces +16 added lines, -4 removed lines

@@ -57,7 +57,10 @@ 
 	<tr>
 	    <td style="width:120px;"><?php print _('Type'); ?></td>
 	    <td>
-		    <input type="text" name="type" class="form-control input-sm"  value="<?php print @$tag->type; ?>"  maxlength='32' <?php if($_POST['action'] == "delete") print "readonly"; ?>>
+		    <input type="text" name="type" class="form-control input-sm"  value="<?php print @$tag->type; ?>"  maxlength='32' <?php if($_POST['action'] == "delete") {
+    print "readonly";
+}
+?>>
 			<input type="hidden" name="id" value="<?php print @$tag->id; ?>">
 			<input type="hidden" name="action" value="<?php print $_POST['action']; ?>">
 			<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
@@ -80,7 +83,10 @@ 
 	    <td><?php print _('Bg color'); ?></td>
 	    <td>
 		    <div class="input-group select-bgcolor">
-				<input type="text" name="bgcolor" class="form-control input-xs"  value="<?php print @$tag->bgcolor; ?>"  maxlength='32' <?php if($_POST['action'] == "delete") print "readonly"; ?>><span class="input-group-addon"><i></i></span>
+				<input type="text" name="bgcolor" class="form-control input-xs"  value="<?php print @$tag->bgcolor; ?>"  maxlength='32' <?php if($_POST['action'] == "delete") {
+    print "readonly";
+}
+?>><span class="input-group-addon"><i></i></span>
 		    </div>
 		</td>
     </tr>
@@ -90,7 +96,10 @@ 
 	    <td><?php print _('Fg color'); ?></td>
 	    <td>
 		    <div class="input-group select-fgcolor">
-			    <input type="text" name="fgcolor" class="form-control input-sm"  value="<?php print @$tag->fgcolor; ?>"  maxlength='32' <?php if($_POST['action'] == "delete") print "readonly"; ?>><span class="input-group-addon"><i></i></span>
+			    <input type="text" name="fgcolor" class="form-control input-sm"  value="<?php print @$tag->fgcolor; ?>"  maxlength='32' <?php if($_POST['action'] == "delete") {
+    print "readonly";
+}
+?>><span class="input-group-addon"><i></i></span>
 		    </div>
 		</td>
     </tr>
@@ -115,7 +124,10 @@ 
 <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="editTypesubmit"><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 <?php if($_POST['action']=="delete") { print "btn-danger"; }
+else { print "btn-success"; } ?>" id="editTypesubmit"><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="editTypeResult"></div>

Spacing +22 added lines, -22 removed lines

@@ -5,29 +5,29 @@ 
  *************************************************/
 
 /* 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", "tags");
 
 # 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
 	$tag = $Admin->fetch_object ("ipTags", "id", $_POST['id']);
 	# null ?
-	$tag===false ? $Result->show("danger", _("Invalid ID"), true, true) : null;
+	$tag === false ? $Result->show ("danger", _ ("Invalid ID"), true, true) : null;
 }
 ?>
 
@@ -45,7 +45,7 @@ 
 
 
 <!-- header -->
-<div class="pHeader"><?php print ucwords($_POST['action']) .' '._('tag'); ?></div>
+<div class="pHeader"><?php print ucwords ($_POST['action']).' '._ ('tag'); ?></div>
 
 <!-- content -->
 <div class="pContent">
@@ -55,9 +55,9 @@ 
 
 	<!-- type -->
 	<tr>
-	    <td style="width:120px;"><?php print _('Type'); ?></td>
+	    <td style="width:120px;"><?php print _ ('Type'); ?></td>
 	    <td>
-		    <input type="text" name="type" class="form-control input-sm"  value="<?php print @$tag->type; ?>"  maxlength='32' <?php if($_POST['action'] == "delete") print "readonly"; ?>>
+		    <input type="text" name="type" class="form-control input-sm"  value="<?php print @$tag->type; ?>"  maxlength='32' <?php if ($_POST['action'] == "delete") print "readonly"; ?>>
 			<input type="hidden" name="id" value="<?php print @$tag->id; ?>">
 			<input type="hidden" name="action" value="<?php print $_POST['action']; ?>">
 			<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
@@ -66,42 +66,42 @@ 
 
 	<!-- show tag -->
 	<tr>
-	    <td style="white-space: nowrap;"><?php print _('Show tag'); ?></td>
+	    <td style="white-space: nowrap;"><?php print _ ('Show tag'); ?></td>
 	    <td>
 		    <select name="showtag" class="form-control input-w-auto">
-			    <option value="0"><?php print _("No"); ?></option>
-			    <option value="1" <?php if(@$tag->showtag==1) { print "selected='selected'"; } ?>><?php print _("Yes"); ?></option>
+			    <option value="0"><?php print _ ("No"); ?></option>
+			    <option value="1" <?php if (@$tag->showtag == 1) { print "selected='selected'"; } ?>><?php print _ ("Yes"); ?></option>
 		    </select>
 		</td>
     </tr>
 
 	<!-- bg color -->
 	<tr>
-	    <td><?php print _('Bg color'); ?></td>
+	    <td><?php print _ ('Bg color'); ?></td>
 	    <td>
 		    <div class="input-group select-bgcolor">
-				<input type="text" name="bgcolor" class="form-control input-xs"  value="<?php print @$tag->bgcolor; ?>"  maxlength='32' <?php if($_POST['action'] == "delete") print "readonly"; ?>><span class="input-group-addon"><i></i></span>
+				<input type="text" name="bgcolor" class="form-control input-xs"  value="<?php print @$tag->bgcolor; ?>"  maxlength='32' <?php if ($_POST['action'] == "delete") print "readonly"; ?>><span class="input-group-addon"><i></i></span>
 		    </div>
 		</td>
     </tr>
 
 	<!-- fg color -->
 	<tr>
-	    <td><?php print _('Fg color'); ?></td>
+	    <td><?php print _ ('Fg color'); ?></td>
 	    <td>
 		    <div class="input-group select-fgcolor">
-			    <input type="text" name="fgcolor" class="form-control input-sm"  value="<?php print @$tag->fgcolor; ?>"  maxlength='32' <?php if($_POST['action'] == "delete") print "readonly"; ?>><span class="input-group-addon"><i></i></span>
+			    <input type="text" name="fgcolor" class="form-control input-sm"  value="<?php print @$tag->fgcolor; ?>"  maxlength='32' <?php if ($_POST['action'] == "delete") print "readonly"; ?>><span class="input-group-addon"><i></i></span>
 		    </div>
 		</td>
     </tr>
 
 	<!-- Compress -->
 	<tr>
-	    <td><?php print _('Compress range'); ?></td>
+	    <td><?php print _ ('Compress range'); ?></td>
 	    <td>
 		    <select name="compress" class="form-control input-w-auto">
-			    <option value="No"><?php print _("No"); ?></option>
-			    <option value="Yes" <?php if(@$tag->compress=="Yes") { print "selected='selected'"; } ?>><?php print _("Yes"); ?></option>
+			    <option value="No"><?php print _ ("No"); ?></option>
+			    <option value="Yes" <?php if (@$tag->compress == "Yes") { print "selected='selected'"; } ?>><?php print _ ("Yes"); ?></option>
 		    </select>
 		</td>
     </tr>
@@ -114,8 +114,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="editTypesubmit"><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="editTypesubmit"><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="editTypeResult"></div>

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

Indentation +4 added lines, -4 removed lines

@@ -37,10 +37,10 @@
 
 # set update values
 $values = array("id"=>@$_POST['deviceid'],
-				"rack"=>@$_POST['rackid'],
-				"rack_start"=>@$_POST['rack_start'],
-				"rack_size"=>@$_POST['rack_size'],
-				);
+                "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); }

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/racks/edit-rack-devices.php

Indentation +10 added lines, -10 removed lines

@@ -65,14 +65,14 @@ 
 
 
     # all devices
-	$devices = $Admin->fetch_all_objects("devices", "id");
-	if ($devices!==false) {
-		foreach($devices as $k=>$d) {
-			if (strlen($d->rack)!=0) {
-				unset($devices[$k]);
-			}
-		}
-	}
+    $devices = $Admin->fetch_all_objects("devices", "id");
+    if ($devices!==false) {
+        foreach($devices as $k=>$d) {
+            if (strlen($d->rack)!=0) {
+                unset($devices[$k]);
+            }
+        }
+    }
 ?>
 
 <script type="text/javascript">
@@ -103,10 +103,10 @@ 
         		<td>
         			<select name="deviceid" class="form-control input-sm input-w-auto">
         			<?php
-            			foreach($devices as $d) {
+                        foreach($devices as $d) {
                             print "<option value='$d->id' >$d->hostname</option>";
                         }
-        			?>
+                    ?>
         			</select>
         		</td>
         	</tr>

Spacing +35 added lines, -35 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 ();
 
 # strip input tags
-$_POST = $Admin->strip_input_tags($_POST);
+$_POST = $Admin->strip_input_tags ($_POST);
 
 # 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); }
 
 # remove or add ?
-if ($_POST['action']=="remove") {
+if ($_POST['action'] == "remove") {
     # validate csrf cookie
-    $User->csrf_cookie ("validate", "rack_devices", $_POST['csrf_cookie']) === false ? $Result->show("danger", _("Invalid CSRF cookie"), true, true) : "";
+    $User->csrf_cookie ("validate", "rack_devices", $_POST['csrf_cookie']) === false ? $Result->show ("danger", _ ("Invalid CSRF cookie"), true, true) : "";
     # set values
-    $values = array("id"=>$_POST['deviceid'],
+    $values = array ("id"=>$_POST['deviceid'],
                     "rack"=>"",
                     "rack_start"=>"",
                     "rack_size"=>""
                     );
     # update
-    if(!$Admin->object_modify("devices", "edit", "id", $values))	{ $Result->show("success", _("Failed to remove device from rack").'!', true, true); }
-    else															{ $Result->show("success", _("Device removed from rack").'!', false, true); }
+    if (!$Admin->object_modify ("devices", "edit", "id", $values)) { $Result->show ("success", _ ("Failed to remove device from rack").'!', true, true); }
+    else { $Result->show ("success", _ ("Device removed from rack").'!', false, true); }
 
     # js
     ?>
@@ -57,18 +57,18 @@ 
     # create csrf token
     $csrf = $User->csrf_cookie ("create", "rack_devices");
     # fetch rack details
-    $rack = $Admin->fetch_object("racks", "id", $_POST['rackid']);
+    $rack = $Admin->fetch_object ("racks", "id", $_POST['rackid']);
     # check
-    if ($rack===false)                                              { $Result->show("danger", _("Invalid ID"), true, true); }
+    if ($rack === false) { $Result->show ("danger", _ ("Invalid ID"), true, true); }
     # fetch existing devices
-    $rack_devices = $Racks->fetch_rack_devices($rack->id);
+    $rack_devices = $Racks->fetch_rack_devices ($rack->id);
 
 
     # all devices
-	$devices = $Admin->fetch_all_objects("devices", "id");
-	if ($devices!==false) {
-		foreach($devices as $k=>$d) {
-			if (strlen($d->rack)!=0) {
+	$devices = $Admin->fetch_all_objects ("devices", "id");
+	if ($devices !== false) {
+		foreach ($devices as $k=>$d) {
+			if (strlen ($d->rack) != 0) {
 				unset($devices[$k]);
 			}
 		}
@@ -82,14 +82,14 @@ 
 </script>
 
 <!-- header -->
-<div class="pHeader"><?php print ucwords(_("$_POST[action]")); ?> <?php print _('device to rack'); ?></div>
+<div class="pHeader"><?php print ucwords (_ ("$_POST[action]")); ?> <?php print _ ('device to rack'); ?></div>
 
 <!-- content -->
 <div class="pContent">
     <?php
     // no devides
-    if (!isset($devices)||sizeof($devices)==0) {
-        $Result->show("info", _("No devices available"), false);
+    if (!isset($devices) || sizeof ($devices) == 0) {
+        $Result->show ("info", _ ("No devices available"), false);
     }
     else {
     ?>
@@ -99,11 +99,11 @@ 
 
         	<!-- Select device  -->
         	<tr>
-        		<td><?php print _('Device'); ?></td>
+        		<td><?php print _ ('Device'); ?></td>
         		<td>
         			<select name="deviceid" class="form-control input-sm input-w-auto">
         			<?php
-            			foreach($devices as $d) {
+            			foreach ($devices as $d) {
                             print "<option value='$d->id' >$d->hostname</option>";
                         }
         			?>
@@ -113,20 +113,20 @@ 
 
         	<!-- set start -->
         	<tr>
-        		<td><?php print _('Start position'); ?></td>
+        		<td><?php print _ ('Start position'); ?></td>
         		<td>
                     <select name="rack_start" class="form-control input-sm input-w-auto">
             		<?php
                     // available spaces
-                    $available = array();
-                    for($m=1; $m<=$rack->size; $m++) {
+                    $available = array ();
+                    for ($m = 1; $m <= $rack->size; $m++) {
                         $available[] = $m;
                     }
 
-                    if($rack_devices!==false) {
+                    if ($rack_devices !== false) {
                         foreach ($rack_devices as $d) {
-                            for($m=$d->rack_start; $m<=($d->rack_start+($d->rack_size-1)); $m++) {
-                                $pos = array_search($m, $available);
+                            for ($m = $d->rack_start; $m <= ($d->rack_start + ($d->rack_size - 1)); $m++) {
+                                $pos = array_search ($m, $available);
                                 unset($available[$pos]);
                             }
                         }
@@ -142,9 +142,9 @@ 
 
         	<!-- Set size -->
         	<tr>
-        		<td><?php print _('Size'); ?></td>
+        		<td><?php print _ ('Size'); ?></td>
         		<td>
-        			<input type="text" name="rack_size" class="form-control input-sm" placeholder="<?php print _('Rack size in U'); ?>">
+        			<input type="text" name="rack_size" class="form-control input-sm" placeholder="<?php print _ ('Rack size in U'); ?>">
         			<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
         			<input type="hidden" name="rackid" value="<?php print $_POST['rackid']; ?>">
         		</td>
@@ -159,9 +159,9 @@ 
 <!-- footer -->
 <div class="pFooter">
 	<div class="btn-group">
-		<button class="btn btn-sm btn-default hidePopups"><?php print _('Cancel'); ?></button>
-		<?php if (sizeof($devices)>0) { ?>
-		<button class="btn btn-sm btn-default btn-success" id="editRackDevicesubmit"><i class="fa fa-plus"></i> <?php print ucwords(_($_POST['action'])); ?></button>
+		<button class="btn btn-sm btn-default hidePopups"><?php print _ ('Cancel'); ?></button>
+		<?php if (sizeof ($devices) > 0) { ?>
+		<button class="btn btn-sm btn-default btn-success" id="editRackDevicesubmit"><i class="fa fa-plus"></i> <?php print ucwords (_ ($_POST['action'])); ?></button>
         <?php } ?>
 	</div>
 

app/admin/racks/edit-result.php

Indentation +21 added lines, -21 removed lines

@@ -46,31 +46,31 @@ 
 # fetch custom fields
 $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) {
-				$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); }
-		}
-		# save to update array
-		$update[$myField['name']] = $rack[$myField['name']];
-	}
+    foreach($custom as $myField) {
+        //booleans can be only 0 and 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); }
+        }
+        # save to update array
+        $update[$myField['name']] = $rack[$myField['name']];
+    }
 }
 
 # set update values
 $values = array("id"=>@$rack['rackid'],
-				"name"=>@$rack['name'],
-				"size"=>@$rack['size'],
-				"description"=>@$rack['description']
-				);
+                "name"=>@$rack['name'],
+                "size"=>@$rack['size'],
+                "description"=>@$rack['description']
+                );
 # custom fields
 if(isset($update)) {
-	$values = array_merge($values, $update);
+    $values = array_merge($values, $update);
 }
 
 # update rack
@@ -78,8 +78,8 @@ 
 else																	{ $Result->show("success", _("Rack $rack[action] successfull").'!', false); }
 
 if($_POST['action']=="delete"){
-	# remove all references from subnets and ip addresses
-	$Admin->remove_object_references ("devices", "rack", $values["id"]);
+    # remove all references from subnets and ip addresses
+    $Admin->remove_object_references ("devices", "rack", $values["id"]);
 }
 
 ?>

Braces +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
 if(!$Admin->object_modify("devices", $_POST['action'], "id", $values))	{}
 else																	{ $Result->show("success", _("Device $device[action] successfull").'!', false); }
 
-if($_POST['action']=="delete"){
+if($_POST['action']=="delete") {
 	# remove all references from subnets and ip addresses
 	$Admin->remove_object_references ("subnets", "device", $values["id"]);
 	$Admin->remove_object_references ("ipaddresses", "switch", $values["id"]);

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/edit.php

Indentation +104 added lines, -104 removed lines

@@ -29,7 +29,7 @@ 
 
 # fetch device details
 if( ($_POST['action'] == "edit") || ($_POST['action'] == "delete") ) {
-	$rack = $Admin->fetch_object("racks", "id", $_POST['rackid']);
+    $rack = $Admin->fetch_object("racks", "id", $_POST['rackid']);
 }
 else {
     $rack = new StdClass ();
@@ -70,11 +70,11 @@ 
 		<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>
 		</td>
 	</tr>
@@ -85,9 +85,9 @@ 
 		<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>
 			<?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; ?>">
 		</td>
@@ -95,101 +95,101 @@ 
 
 	<!-- Custom -->
 	<?php
-	if(sizeof($custom) > 0) {
-
-		print '<tr>';
-		print '	<td colspan="2"><hr></td>';
-		print '</tr>';
-
-		# count datepickers
-		$timeP = 0;
-
-		# all my fields
-		foreach($custom as $field) {
-			# replace spaces with |
-			$field['nameNew'] = str_replace(" ", "___", $field['name']);
-
-			# required
-			if($field['Null']=="NO")	{ $required = "*"; }
-			else						{ $required = ""; }
-
-			# set default value !
-			if ($_POST['action']=="add")	{ $rack->$field['name'] = $field['Default']; }
-
-			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") {
-				//parse values
-				$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, ""); }
-
-				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>"; }
-				}
-				print "</select>";
-			}
-			//date and time picker
-			elseif($field['type'] == "date" || $field['type'] == "datetime") {
-				// just for first
-				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">';
-					print '$(document).ready(function() {';
-					//date only
-					print '	$(".datepicker").datetimepicker( {pickDate: true, pickTime: false, pickSeconds: false });';
-					//date + time
-					print '	$(".datetimepicker").datetimepicker( { pickDate: true, pickTime: true } );';
-
-					print '})';
-					print '</script>';
-				}
-				$timeP++;
-
-				//set size
-				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"; }
-			}
-			//boolean
-			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");
-				//null
-				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>"; }
-				}
-				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";
-			}
-			//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 '	</td>'. "\n";
-			print '</tr>'. "\n";
-		}
-
-	}
-
-	?>
+    if(sizeof($custom) > 0) {
+
+        print '<tr>';
+        print '	<td colspan="2"><hr></td>';
+        print '</tr>';
+
+        # count datepickers
+        $timeP = 0;
+
+        # all my fields
+        foreach($custom as $field) {
+            # replace spaces with |
+            $field['nameNew'] = str_replace(" ", "___", $field['name']);
+
+            # required
+            if($field['Null']=="NO")	{ $required = "*"; }
+            else						{ $required = ""; }
+
+            # set default value !
+            if ($_POST['action']=="add")	{ $rack->$field['name'] = $field['Default']; }
+
+            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") {
+                //parse values
+                $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, ""); }
+
+                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>"; }
+                }
+                print "</select>";
+            }
+            //date and time picker
+            elseif($field['type'] == "date" || $field['type'] == "datetime") {
+                // just for first
+                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">';
+                    print '$(document).ready(function() {';
+                    //date only
+                    print '	$(".datepicker").datetimepicker( {pickDate: true, pickTime: false, pickSeconds: false });';
+                    //date + time
+                    print '	$(".datetimepicker").datetimepicker( { pickDate: true, pickTime: true } );';
+
+                    print '})';
+                    print '</script>';
+                }
+                $timeP++;
+
+                //set size
+                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"; }
+            }
+            //boolean
+            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");
+                //null
+                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>"; }
+                }
+                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";
+            }
+            //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 '	</td>'. "\n";
+            print '</tr>'. "\n";
+        }
+
+    }
+
+    ?>
 
 	</table>
 	</form>

Braces +12 added lines, -3 removed lines

@@ -60,7 +60,10 @@ 
 	<tr>
 		<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>
 
@@ -83,7 +86,10 @@ 
 	<tr>
 		<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";
@@ -200,7 +206,10 @@ 
 <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 <?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 -->

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 -->