phpipam / phpipam

app/admin/api/index.php

Spacing +39 added lines, -39 removed lines

@@ -5,34 +5,34 @@ 
  *************************************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # fetch all APIs
-$all_apis = $Admin->fetch_all_objects("api");
+$all_apis = $Admin->fetch_all_objects ("api");
 ?>
 
 <!-- display existing groups -->
-<h4><?php print _('API management'); ?></h4>
+<h4><?php print _ ('API management'); ?></h4>
 <hr><br>
 
 <!-- only IF aPI enabled -->
-<?php if($User->settings->api==1) { ?>
+<?php if ($User->settings->api == 1) { ?>
 	<!-- Add new -->
-	<button class='btn btn-sm btn-default editAPI' style="margin-bottom:10px;" data-action='add'><i class='fa fa-plus'></i> <?php print _('Create API key'); ?></button>
+	<button class='btn btn-sm btn-default editAPI' style="margin-bottom:10px;" data-action='add'><i class='fa fa-plus'></i> <?php print _ ('Create API key'); ?></button>
 
 
 	<?php
 	/* print existing APIs */
-	if($all_apis!==false) {
+	if ($all_apis !== false) {
 
 		print '<table id="userPrint" class="table table-striped table-top table-auto">';
 		# headers
 		print '<tr>';
-	    print "<th>"._('App id').'</th>';
-		print "<th>"._('App code').'</th>';
-	    print "<th>"._('App permissions').'</th>';
-	    print "<th>"._('App security').'</th>';
-	    print "<th>"._('Comment').'</th>';
+	    print "<th>"._ ('App id').'</th>';
+		print "<th>"._ ('App code').'</th>';
+	    print "<th>"._ ('App permissions').'</th>';
+	    print "<th>"._ ('App security').'</th>';
+	    print "<th>"._ ('Comment').'</th>';
 	    print '<th></th>';
 		print '</tr>';
 
@@ -42,74 +42,74 @@ 
 			$a = (array) $a;
 
 			# hide key if not crpt
-			if($a['app_security']!="crypt")	{ $a['app_code']="<span class='text-muted'>"._('Not used')."</span>"; }
-			if($a['app_security']=="ssl")	{ $a['app_security'] = "SSL"; }
+			if ($a['app_security'] != "crypt") { $a['app_code'] = "<span class='text-muted'>"._ ('Not used')."</span>"; }
+			if ($a['app_security'] == "ssl") { $a['app_security'] = "SSL"; }
 
-			print '<tr>' . "\n";
+			print '<tr>'."\n";
 
-			print '	<td>' . $a['app_id'] . '</td>'. "\n";
-			print '	<td>' . $a['app_code'] . '</td>'. "\n";
+			print '	<td>'.$a['app_id'].'</td>'."\n";
+			print '	<td>'.$a['app_code'].'</td>'."\n";
 
 			# reformat permissions
-			if($a['app_permissions']==0)		{ $a['app_permissions'] = _("Disabled"); }
-			elseif($a['app_permissions']==1)	{ $a['app_permissions'] = _("Read"); }
-			elseif($a['app_permissions']==2)	{ $a['app_permissions'] = _("Read / Write"); }
-			elseif($a['app_permissions']==3)	{ $a['app_permissions'] = _("Read / Write / Admin"); }
+			if ($a['app_permissions'] == 0) { $a['app_permissions'] = _ ("Disabled"); }
+			elseif ($a['app_permissions'] == 1) { $a['app_permissions'] = _ ("Read"); }
+			elseif ($a['app_permissions'] == 2) { $a['app_permissions'] = _ ("Read / Write"); }
+			elseif ($a['app_permissions'] == 3) { $a['app_permissions'] = _ ("Read / Write / Admin"); }
 
 			# override permissions if user
-			if($a['app_security']=="user")	{ $a['app_permissions']="<span class='text-muted'>"._('Per user')."</span>"; }
+			if ($a['app_security'] == "user") { $a['app_permissions'] = "<span class='text-muted'>"._ ('Per user')."</span>"; }
 
-			print '	<td>' . $a['app_permissions'] . '</td>'. "\n";
-			print '	<td>' . ucwords($a['app_security']) . '</td>'. "\n";
-			print '	<td>' . $a['app_comment'] . '</td>'. "\n";
+			print '	<td>'.$a['app_permissions'].'</td>'."\n";
+			print '	<td>'.ucwords ($a['app_security']).'</td>'."\n";
+			print '	<td>'.$a['app_comment'].'</td>'."\n";
 
 			# add/remove APIs
 			print "	<td class='actions'>";
 			print "	<div class='btn-group'>";
-			print "		<button class='btn btn-xs btn-default editAPI'  data-container='body' data-appid='$a[id]' data-action='edit'   rel='tooltip' title='"._('edit app details')."'>	<i class='fa fa-pencil'></i></button>";
-			print "		<button class='btn btn-xs btn-default editAPI'  data-container='body' data-appid='$a[id]' data-action='delete' rel='tooltip' title='"._('remove app')."'>		<i class='fa fa-times'></i></button>";
+			print "		<button class='btn btn-xs btn-default editAPI'  data-container='body' data-appid='$a[id]' data-action='edit'   rel='tooltip' title='"._ ('edit app details')."'>	<i class='fa fa-pencil'></i></button>";
+			print "		<button class='btn btn-xs btn-default editAPI'  data-container='body' data-appid='$a[id]' data-action='delete' rel='tooltip' title='"._ ('remove app')."'>		<i class='fa fa-times'></i></button>";
 			print "	</div>";
 			print "</td>";
 
-			print '</tr>' . "\n";
+			print '</tr>'."\n";
 		}
 		print "</table>";
 	}
 	else {
-		$Result->show("info alert-nomargin", _("No Apps available")."!", false);
+		$Result->show ("info alert-nomargin", _ ("No Apps available")."!", false);
 	}
 	?>
 
 	<?php
 	# print error if extensions are not available on server!
-	$requiredExt  = array("mcrypt", "curl");
-	$availableExt = get_loaded_extensions();
+	$requiredExt  = array ("mcrypt", "curl");
+	$availableExt = get_loaded_extensions ();
 	# check for missing ext
-	$missingExt = array();
+	$missingExt = array ();
 	foreach ($requiredExt as $extension) {
-	    if (!in_array($extension, $availableExt)) {
+	    if (!in_array ($extension, $availableExt)) {
 	        $missingExt[] = $extension;
 	    }
 	}
 	# print warning if missing
-	if (sizeof($missingExt) > 0) {
-	    print "<div class='alert alert alert-danger'><strong>"._('The following PHP extensions for API server are missing').":</strong><br><hr>";
-	    print '<ul>' . "\n";
+	if (sizeof ($missingExt) > 0) {
+	    print "<div class='alert alert alert-danger'><strong>"._ ('The following PHP extensions for API server are missing').":</strong><br><hr>";
+	    print '<ul>'."\n";
 	    foreach ($missingExt as $missing) {
-	        print '<li>'. $missing .'</li>' . "\n";
+	        print '<li>'.$missing.'</li>'."\n";
 	    }
 	    print '</ul>';
-	    print _('Please recompile PHP to include missing extensions for API server') . "\n";
+	    print _ ('Please recompile PHP to include missing extensions for API server')."\n";
 	    print "</div>";
 	}
 	?>
 	<hr>
 
-	<h4><?php print _('API documentation'); ?></h4>
+	<h4><?php print _ ('API documentation'); ?></h4>
 	<a href="http://phpipam.net/api-documentation/">http://phpipam.net/api-documentation/</a>
 
 <?php
 } else {
-	$Result->show("info", _('Please enable API module under server management'), false);
+	$Result->show ("info", _ ('Please enable API module under server management'), false);
 }
 ?>
\ No newline at end of file

app/admin/devices/edit.php

Spacing +80 added lines, -80 removed lines

@@ -5,40 +5,40 @@ 
  ************************/
 
 /* 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 ();
 
 # create csrf token
 $csrf = $User->csrf_cookie ("create", "device");
 
 # fetch custom fields
-$custom = $Tools->fetch_custom_fields('devices');
+$custom = $Tools->fetch_custom_fields ('devices');
 
 # ID must be numeric
-if($_POST['action']!="add" && !is_numeric($_POST['switchId']))		{ $Result->show("danger", _("Invalid ID"), true, true); }
+if ($_POST['action'] != "add" && !is_numeric ($_POST['switchId'])) { $Result->show ("danger", _ ("Invalid ID"), true, true); }
 
 # fetch device details
-if( ($_POST['action'] == "edit") || ($_POST['action'] == "delete") ) {
-	$device = (array) $Admin->fetch_object("devices", "id", $_POST['switchId']);
+if (($_POST['action'] == "edit") || ($_POST['action'] == "delete")) {
+	$device = (array) $Admin->fetch_object ("devices", "id", $_POST['switchId']);
 	// false
-	if ($device===false)                                            { $Result->show("danger", _("Invalid ID"), true, true);  }
+	if ($device === false) { $Result->show ("danger", _ ("Invalid ID"), true, true); }
 }
 
 # set readonly flag
-$readonly = $_POST['action']=="delete" ? "readonly" : "";
+$readonly = $_POST['action'] == "delete" ? "readonly" : "";
 
 // set show for rack
-if (is_null($device['rack']))   { $display='display:none'; }
-else                            { $display=''; }
+if (is_null ($device['rack'])) { $display = 'display:none'; }
+else { $display = ''; }
 ?>
 
 <script type="text/javascript">
@@ -57,7 +57,7 @@ 
 
 
 <!-- header -->
-<div class="pHeader"><?php print ucwords(_("$_POST[action]")); ?> <?php print _('device'); ?></div>
+<div class="pHeader"><?php print ucwords (_ ("$_POST[action]")); ?> <?php print _ ('device'); ?></div>
 
 
 <!-- content -->
@@ -68,30 +68,30 @@ 
 
 	<!-- hostname  -->
 	<tr>
-		<td><?php print _('Name'); ?></td>
+		<td><?php print _ ('Name'); ?></td>
 		<td>
-			<input type="text" name="hostname" class="form-control input-sm" placeholder="<?php print _('Hostname'); ?>" value="<?php if(isset($device['hostname'])) print $device['hostname']; ?>" <?php print $readonly; ?>>
+			<input type="text" name="hostname" class="form-control input-sm" placeholder="<?php print _ ('Hostname'); ?>" value="<?php if (isset($device['hostname'])) print $device['hostname']; ?>" <?php print $readonly; ?>>
 		</td>
 	</tr>
 
 	<!-- IP address -->
 	<tr>
-		<td><?php print _('IP address'); ?></td>
+		<td><?php print _ ('IP address'); ?></td>
 		<td>
-			<input type="text" name="ip_addr" class="form-control input-sm" placeholder="<?php print _('IP address'); ?>" value="<?php if(isset($device['ip_addr'])) print $device['ip_addr']; ?>" <?php print $readonly; ?>>
+			<input type="text" name="ip_addr" class="form-control input-sm" placeholder="<?php print _ ('IP address'); ?>" value="<?php if (isset($device['ip_addr'])) print $device['ip_addr']; ?>" <?php print $readonly; ?>>
 		</td>
 	</tr>
 
 	<!-- Type -->
 	<tr>
-		<td><?php print _('Device type'); ?></td>
+		<td><?php print _ ('Device type'); ?></td>
 		<td>
 			<select name="type" class="form-control input-sm input-w-auto">
 			<?php
-			$types = $Admin->fetch_all_objects("deviceTypes", "tid");
-			foreach($types as $name) {
-				if($device['type'] == $name->tid)	{ print "<option value='$name->tid' selected='selected'>$name->tname</option>"; }
-				else								{ print "<option value='$name->tid' >$name->tname</option>"; }
+			$types = $Admin->fetch_all_objects ("deviceTypes", "tid");
+			foreach ($types as $name) {
+				if ($device['type'] == $name->tid) { print "<option value='$name->tid' selected='selected'>$name->tname</option>"; }
+				else { print "<option value='$name->tid' >$name->tname</option>"; }
 			}
 			?>
 			</select>
@@ -99,23 +99,23 @@ 
 	</tr>
 
     <!-- Rack -->
-    <?php if($User->settings->enableRACK=="1") { ?>
+    <?php if ($User->settings->enableRACK == "1") { ?>
 	<tr>
 	   	<td colspan="2"><hr></td>
     </tr>
     <tr>
         <?php
         $Racks = new phpipam_rack ($Database);
-        $Racks->fetch_all_racks();
+        $Racks->fetch_all_racks ();
         ?>
-        <td><?php print _('Rack'); ?></td>
+        <td><?php print _ ('Rack'); ?></td>
         <td>
             <select name="rack" class="form-control">
-                <option value=""><?php print _("None"); ?></option>
+                <option value=""><?php print _ ("None"); ?></option>
                 <?php
                 foreach ($Racks->all_racks as $r) {
-     				if($device['rack'] == $r->id)	{ print "<option value='$r->id' selected='selected'>$r->name</option>"; }
-    				else							{ print "<option value='$r->id' >$r->name</option>"; }
+     				if ($device['rack'] == $r->id) { print "<option value='$r->id' selected='selected'>$r->name</option>"; }
+    				else { print "<option value='$r->id' >$r->name</option>"; }
                 }
                 ?>
             </select>
@@ -124,16 +124,16 @@ 
 
     <tbody id="rack" style="<?php print $display; ?>">
     <tr>
-        <td><?php print _('Start position'); ?></td>
+        <td><?php print _ ('Start position'); ?></td>
         <td>
             <div class="input-group" style="width:100px;">
                 <input type="text" name="rack_start" size="2" class="form-control input-w-auto input-sm" placeholder="1" value="<?php print @$device['rack_start']; ?>">
-                <a href="" class="input-group-addon showRackPopup" rel='tooltip' data-placement='right' data-rackid="<?php print @$device['rack']; ?>" data-deviceid='<?php print @$device['id']; ?>' title='<?php print _("Show rack"); ?>'><i class='fa fa-server'></i></a>
+                <a href="" class="input-group-addon showRackPopup" rel='tooltip' data-placement='right' data-rackid="<?php print @$device['rack']; ?>" data-deviceid='<?php print @$device['id']; ?>' title='<?php print _ ("Show rack"); ?>'><i class='fa fa-server'></i></a>
             </div>
         </td>
     </tr>
     <tr>
-        <td><?php print _('Size'); ?> (U)</td>
+        <td><?php print _ ('Size'); ?> (U)</td>
         <td>
             <input type="text" name="rack_size" size="2" class="form-control input-w-auto input-sm" style="width:100px;" placeholder="1" value="<?php print @$device['rack_size']; ?>">
         </td>
@@ -146,20 +146,20 @@ 
 
 	<!-- Version -->
 	<tr>
-		<td><?php print _('SW version'); ?></td>
+		<td><?php print _ ('SW version'); ?></td>
 		<td>
-			<input type="text" name="version" class="form-control input-sm" placeholder="<?php print _('Software version'); ?>" value="<?php if(isset($device['version'])) print $device['version']; ?>" <?php print $readonly; ?>>
+			<input type="text" name="version" class="form-control input-sm" placeholder="<?php print _ ('Software version'); ?>" value="<?php if (isset($device['version'])) print $device['version']; ?>" <?php print $readonly; ?>>
 		</td>
 	</tr>
 
 	<!-- 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($device['description'])) print $device['description']; ?></textarea>
+			<textarea name="description" class="form-control input-sm" placeholder="<?php print _ ('Description'); ?>" <?php print $readonly; ?>><?php if (isset($device['description'])) print $device['description']; ?></textarea>
 			<?php
-			if( ($_POST['action'] == "edit") || ($_POST['action'] == "delete") ) {
-				print '<input type="hidden" name="switchId" value="'. $_POST['switchId'] .'">'. "\n";
+			if (($_POST['action'] == "edit") || ($_POST['action'] == "delete")) {
+				print '<input type="hidden" name="switchId" value="'.$_POST['switchId'].'">'."\n";
 			} ?>
 			<input type="hidden" name="action" value="<?php print $_POST['action']; ?>">
 			<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
@@ -168,7 +168,7 @@ 
 
 	<!-- Custom -->
 	<?php
-	if(sizeof($custom) > 0) {
+	if (sizeof ($custom) > 0) {
 
 		print '<tr>';
 		print '	<td colspan="2"><hr></td>';
@@ -178,39 +178,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")	{ $device[$field['name']] = $field['Default']; }
+			if ($_POST['action'] == "add") { $device[$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==$device[$field['name']])	{ print "<option value='$v' selected='selected'>$v</option>"; }
-					else							{ print "<option value='$v'>$v</option>"; }
+				foreach ($tmp as $v) {
+					if ($v == $device[$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">';
@@ -226,38 +226,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($device[$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="'. $device[$field['name']]. '" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n"; }
+				if (!isset($device[$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="'.$device[$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($device[$field['name']])==0 && $k==2)	{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
-					elseif($k==$device[$field['name']])				{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
-					else											{ print "<option value='$k'>"._($v)."</option>"; }
+				foreach ($tmp as $k=>$v) {
+					if (strlen ($device[$field['name']]) == 0 && $k == 2) { print "<option value='$k' selected='selected'>"._ ($v)."</option>"; }
+					elseif ($k == $device[$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'].'">'. $device[$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'].'">'.$device[$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="'. $device[$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="'.$device[$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";
 		}
 
 	}
@@ -271,7 +271,7 @@ 
 		</td>
 	</tr>
 	<tr>
-		<td colspan="2"><?php print _('Sections to display device in'); ?>:</td>
+		<td colspan="2"><?php print _ ('Sections to display device in'); ?>:</td>
 	</tr>
 	<tr>
 		<td></td>
@@ -279,16 +279,16 @@ 
 		<?php
 		# select sections
 		$Sections = new Sections ($Database);
-		$sections = $Sections->fetch_all_sections();
+		$sections = $Sections->fetch_all_sections ();
 
 		# reformat device sections to array
-		$deviceSections = explode(";", $device['sections']);
-		$deviceSections = is_array($deviceSections) ? $deviceSections : array();
+		$deviceSections = explode (";", $device['sections']);
+		$deviceSections = is_array ($deviceSections) ? $deviceSections : array ();
 
-		if ($sections!==false) {
-			foreach($sections as $section) {
-				if(in_array($section->id, $deviceSections)) 	{ 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, $deviceSections)) { 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"; }
 			}
 		}
 		?>
@@ -302,8 +302,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="editSwitchsubmit"><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="editSwitchsubmit"><i class="fa <?php if ($_POST['action'] == "add") { print "fa-plus"; } else if ($_POST['action'] == "delete") { print "fa-trash-o"; } else { print "fa-check"; } ?>"></i> <?php print ucwords (_ ($_POST['action'])); ?></button>
 	</div>
 
 	<!-- result -->

app/admin/devices/edit-result.php

Spacing +33 added lines, -33 removed lines

@@ -5,72 +5,72 @@ 
  ***************************/
 
 /* 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", "device", $_POST['csrf_cookie']) === false ? $Result->show("danger", _("Invalid CSRF cookie"), true) : "";
+$User->csrf_cookie ("validate", "device", $_POST['csrf_cookie']) === false ? $Result->show ("danger", _ ("Invalid CSRF cookie"), true) : "";
 
 # get modified details
-$device = $Admin->strip_input_tags($_POST);
+$device = $Admin->strip_input_tags ($_POST);
 
 # ID must be numeric
-if($_POST['action']!="add" && !is_numeric($_POST['switchId']))			{ $Result->show("danger", _("Invalid ID"), true); }
+if ($_POST['action'] != "add" && !is_numeric ($_POST['switchId'])) { $Result->show ("danger", _ ("Invalid ID"), true); }
 
 # available devices set
-foreach($device as $key=>$line) {
-	if (strlen(strstr($key,"section-"))>0) {
-		$key2 = str_replace("section-", "", $key);
+foreach ($device as $key=>$line) {
+	if (strlen (strstr ($key, "section-")) > 0) {
+		$key2 = str_replace ("section-", "", $key);
 		$temp[] = $key2;
 
 		unset($device[$key]);
 	}
 }
 # glue sections together
-$device['sections'] = sizeof($temp)>0 ? implode(";", $temp) : null;
+$device['sections'] = sizeof ($temp) > 0 ? implode (";", $temp) : null;
 
 # Hostname must be present
-if($device['hostname'] == "") 											{ $Result->show("danger", _('Hostname is mandatory').'!', true); }
+if ($device['hostname'] == "") { $Result->show ("danger", _ ('Hostname is mandatory').'!', true); }
 
 # rack checks
-if (strlen(@$device['rack']>0)) {
-    if ($User->settings->enableRACK!="1") {
+if (strlen (@$device['rack'] > 0)) {
+    if ($User->settings->enableRACK != "1") {
         unset($device['rack']);
     }
     else {
         # validate position and size
-        if (!is_numeric($device['rack']))                               { $Result->show("danger", _('Invalid rack identifier').'!', true); }
-        if (!is_numeric($device['rack_start']))                         { $Result->show("danger", _('Invalid rack start position').'!', true); }
-        if (!is_numeric($device['rack_size']))                          { $Result->show("danger", _('Invalid rack size').'!', true); }
+        if (!is_numeric ($device['rack'])) { $Result->show ("danger", _ ('Invalid rack identifier').'!', true); }
+        if (!is_numeric ($device['rack_start'])) { $Result->show ("danger", _ ('Invalid rack start position').'!', true); }
+        if (!is_numeric ($device['rack_size'])) { $Result->show ("danger", _ ('Invalid rack size').'!', true); }
         # validate rack
         $rack = $Racks->fetch_rack_details ($device['rack']);
-        if ($rack===false)                                              { $Result->show("danger", _('Rack does not exist').'!', true); }
+        if ($rack === false) { $Result->show ("danger", _ ('Rack does not exist').'!', true); }
     }
 }
 
 # fetch custom fields
-$custom = $Tools->fetch_custom_fields('devices');
-if(sizeof($custom) > 0) {
-	foreach($custom as $myField) {
+$custom = $Tools->fetch_custom_fields ('devices');
+if (sizeof ($custom) > 0) {
+	foreach ($custom as $myField) {
 		//booleans can be only 0 and 1!
-		if($myField['type']=="tinyint(1)") {
-			if($device[$myField['name']]>1) {
+		if ($myField['type'] == "tinyint(1)") {
+			if ($device[$myField['name']] > 1) {
 				$device[$myField['name']] = 0;
 			}
 		}
 		//not null!
-		if($myField['Null']=="NO" && strlen($device[$myField['name']])==0) {
-																		{ $Result->show("danger", $myField['name'].'" can not be empty!', true); }
+		if ($myField['Null'] == "NO" && strlen ($device[$myField['name']]) == 0) {
+																		{ $Result->show ("danger", $myField['name'].'" can not be empty!', true); }
 		}
 		# save to update array
 		$update[$myField['name']] = $device[$myField['name']];
@@ -78,7 +78,7 @@ 
 }
 
 # set update values
-$values = array("id"=>@$device['switchId'],
+$values = array ("id"=>@$device['switchId'],
 				"hostname"=>@$device['hostname'],
 				"ip_addr"=>@$device['ip_addr'],
 				"type"=>@$device['type'],
@@ -86,11 +86,11 @@ 
 				"sections"=>@$device['sections']
 				);
 # custom fields
-if(isset($update)) {
-	$values = array_merge($values, $update);
+if (isset($update)) {
+	$values = array_merge ($values, $update);
 }
 # rack
-if (strlen(@$device['rack']>0)) {
+if (strlen (@$device['rack'] > 0)) {
     $values['rack'] = $device['rack'];
     $values['rack_start'] = $device['rack_start'];
     $values['rack_size']  = $device['rack_size'];
@@ -98,10 +98,10 @@ 
 }
 
 # update device
-if(!$Admin->object_modify("devices", $_POST['action'], "id", $values))	{}
-else																	{ $Result->show("success", _("Device $device[action] successfull").'!', false); }
+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"]);

app/admin/devices/index.php

Spacing +58 added lines, -58 removed lines

@@ -5,16 +5,16 @@ 
  ***************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # rack object
-$Racks      = new phpipam_rack ($Database);
+$Racks = new phpipam_rack ($Database);
 
 # fetch all Devices
-$devices = $Admin->fetch_all_objects("devices", "hostname");
+$devices = $Admin->fetch_all_objects ("devices", "hostname");
 
 # fetch all Device types and reindex
-$device_types = $Admin->fetch_all_objects("deviceTypes", "tid");
+$device_types = $Admin->fetch_all_objects ("deviceTypes", "tid");
 if ($device_types !== false) {
 	foreach ($device_types as $dt) {
 		$device_types_i[$dt->tid] = $dt;
@@ -22,24 +22,24 @@ 
 }
 
 # fetch custom fields
-$custom = $Tools->fetch_custom_fields('devices');
+$custom = $Tools->fetch_custom_fields ('devices');
 
 # get hidden fields
-$hidden_custom_fields = json_decode($User->settings->hiddenCustomFields, true);
-$hidden_custom_fields = is_array(@$hidden_custom_fields['devices']) ? $hidden_custom_fields['devices'] : array();
+$hidden_custom_fields = json_decode ($User->settings->hiddenCustomFields, true);
+$hidden_custom_fields = is_array (@$hidden_custom_fields['devices']) ? $hidden_custom_fields['devices'] : array ();
 ?>
 
-<h4><?php print _('Device management'); ?></h4>
+<h4><?php print _ ('Device management'); ?></h4>
 <hr>
 <div class="btn-group">
-	<button class='btn btn-sm btn-default editSwitch' data-action='add'   data-switchid='' style='margin-bottom:10px;'><i class='fa fa-plus'></i> <?php print _('Add device'); ?></button>
-	<a href="<?php print create_link("administration", "device-types"); ?>" class="btn btn-sm btn-default"><i class="fa fa-tablet"></i> <?php print _('Manage device types'); ?></a>
+	<button class='btn btn-sm btn-default editSwitch' data-action='add'   data-switchid='' style='margin-bottom:10px;'><i class='fa fa-plus'></i> <?php print _ ('Add device'); ?></button>
+	<a href="<?php print create_link ("administration", "device-types"); ?>" class="btn btn-sm btn-default"><i class="fa fa-tablet"></i> <?php print _ ('Manage device types'); ?></a>
 </div>
 
 <?php
 /* first check if they exist! */
-if($devices===false) {
-	$Result->show("warn alert-absolute", _('No devices configured').'!', false);
+if ($devices === false) {
+	$Result->show ("warn alert-absolute", _ ('No devices configured').'!', false);
 }
 /* Print them out */
 else {
@@ -49,18 +49,18 @@ 
 	# headers
 	print "<thead>";
 	print '<tr>';
-	print '	<th>'._('Name').'</th>';
-	print '	<th>'._('IP address').'</th>';
-	print '	<th>'._('Type').'</th>';
-	print '	<th>'._('Description').'</th>';
-    if($User->settings->enableSNMP=="1")
-	print '	<th>'._('SNMP').'</th>';
-    if($User->settings->enableRACK=="1")
-	print '	<th>'._('Rack').'</th>';
-	print '	<th><i class="icon-gray icon-info-sign" rel="tooltip" title="'._('Shows in which sections device will be visible for selection').'"></i> '._('Sections').'</th>';
-	if(sizeof($custom) > 0) {
-		foreach($custom as $field) {
-			if(!in_array($field['name'], $hidden_custom_fields)) {
+	print '	<th>'._ ('Name').'</th>';
+	print '	<th>'._ ('IP address').'</th>';
+	print '	<th>'._ ('Type').'</th>';
+	print '	<th>'._ ('Description').'</th>';
+    if ($User->settings->enableSNMP == "1")
+	print '	<th>'._ ('SNMP').'</th>';
+    if ($User->settings->enableRACK == "1")
+	print '	<th>'._ ('Rack').'</th>';
+	print '	<th><i class="icon-gray icon-info-sign" rel="tooltip" title="'._ ('Shows in which sections device will be visible for selection').'"></i> '._ ('Sections').'</th>';
+	if (sizeof ($custom) > 0) {
+		foreach ($custom as $field) {
+			if (!in_array ($field['name'], $hidden_custom_fields)) {
 				print "<th class='hidden-xs hidden-sm hidden-md'>$field[name]</th>";
 			}
 		}
@@ -76,71 +76,71 @@ 
 		$device = (array) $device;
 
 		//print details
-		print '<tr>'. "\n";
+		print '<tr>'."\n";
 
-		print '	<td><a href="'.create_link("tools","devices","hosts",$device['id']).'">'. $device['hostname'] .'</a></td>'. "\n";
-		print '	<td>'. $device['ip_addr'] .'</td>'. "\n";
-		print '	<td>'. @$device_types_i[$device['type']]->tname .'</td>'. "\n";
-		print '	<td class="description">'. $device['description'] .'</td>'. "\n";
+		print '	<td><a href="'.create_link ("tools", "devices", "hosts", $device['id']).'">'.$device['hostname'].'</a></td>'."\n";
+		print '	<td>'.$device['ip_addr'].'</td>'."\n";
+		print '	<td>'.@$device_types_i[$device['type']]->tname.'</td>'."\n";
+		print '	<td class="description">'.$device['description'].'</td>'."\n";
 
 		// SNMP
-		if($User->settings->enableSNMP=="1") {
+		if ($User->settings->enableSNMP == "1") {
     		print "<td>";
     		// not set
-    		if ($device['snmp_version']==0 || strlen($device['snmp_version'])==0) {
-        		print "<span class='text-muted'>"._("Disabled")."</span>";
+    		if ($device['snmp_version'] == 0 || strlen ($device['snmp_version']) == 0) {
+        		print "<span class='text-muted'>"._ ("Disabled")."</span>";
     		}
     		else {
-                print _("Version").": $device[snmp_version]<br>";
-                print _("Community").": $device[snmp_community]<br>";
+                print _ ("Version").": $device[snmp_version]<br>";
+                print _ ("Community").": $device[snmp_community]<br>";
     		}
     		print "</td>";
 		}
 
 		// rack
-        if($User->settings->enableRACK=="1") {
+        if ($User->settings->enableRACK == "1") {
             print "<td>";
             # rack
             $rack = $Racks->fetch_rack_details ($device['rack']);
-            if ($rack!==false) {
-                print "<a href='".create_link("administration", "racks", $rack->id)."'>".$rack->name."</a><br>";
-                print "<span class='badge badge1 badge5'>"._('Position').": $device[rack_start], "._("Size").": $device[rack_size] U</span>";
+            if ($rack !== false) {
+                print "<a href='".create_link ("administration", "racks", $rack->id)."'>".$rack->name."</a><br>";
+                print "<span class='badge badge1 badge5'>"._ ('Position').": $device[rack_start], "._ ("Size").": $device[rack_size] U</span>";
             }
             print "</td>";
         }
 
 		//sections
 		print '	<td class="sections">';
-			$temp = explode(";",$device['sections']);
-			if( (sizeof($temp) > 0) && (!empty($temp[0])) ) {
-			foreach($temp as $line) {
-				$section = $Sections->fetch_section(null, $line);
-				if(!empty($section)) {
-				print '<div class="switchSections text-muted">'. $section->name .'</div>'. "\n";
+			$temp = explode (";", $device['sections']);
+			if ((sizeof ($temp) > 0) && (!empty($temp[0]))) {
+			foreach ($temp as $line) {
+				$section = $Sections->fetch_section (null, $line);
+				if (!empty($section)) {
+				print '<div class="switchSections text-muted">'.$section->name.'</div>'."\n";
 				}
 			}
 			}
 
-		print '	</td>'. "\n";
+		print '	</td>'."\n";
 
 		//custom
-		if(sizeof($custom) > 0) {
-			foreach($custom as $field) {
-				if(!in_array($field['name'], $hidden_custom_fields)) {
+		if (sizeof ($custom) > 0) {
+			foreach ($custom as $field) {
+				if (!in_array ($field['name'], $hidden_custom_fields)) {
 					print "<td class='hidden-xs hidden-sm hidden-md'>";
 
 					// create links
 					$device[$field['name']] = $Result->create_links ($device[$field['name']], $field['type']);
 
 					//booleans
-					if($field['type']=="tinyint(1)")	{
-						if($device[$field['name']] == "0")		{ print _("No"); }
-						elseif($device[$field['name']] == "1")	{ print _("Yes"); }
+					if ($field['type'] == "tinyint(1)") {
+						if ($device[$field['name']] == "0") { print _ ("No"); }
+						elseif ($device[$field['name']] == "1") { print _ ("Yes"); }
 					}
 					//text
-					elseif($field['type']=="text") {
-						if(strlen($device[$field['name']])>0)	{ print "<i class='fa fa-gray fa-comment' rel='tooltip' data-container='body' data-html='true' title='".str_replace("\n", "<br>", $device[$field['name']])."'>"; }
-						else											{ print ""; }
+					elseif ($field['type'] == "text") {
+						if (strlen ($device[$field['name']]) > 0) { print "<i class='fa fa-gray fa-comment' rel='tooltip' data-container='body' data-html='true' title='".str_replace ("\n", "<br>", $device[$field['name']])."'>"; }
+						else { print ""; }
 					}
 					else {
 						print $device[$field['name']];
@@ -151,16 +151,16 @@ 
 			}
 		}
 
-		print '	<td class="actions">'. "\n";
+		print '	<td class="actions">'."\n";
 		print "	<div class='btn-group'>";
 		print "		<button class='btn btn-xs btn-default editSwitch' data-action='edit'   data-switchid='$device[id]'><i class='fa fa-pencil'></i></button>";
-		if($User->settings->enableSNMP=="1")
+		if ($User->settings->enableSNMP == "1")
 		print "		<button class='btn btn-xs btn-default editSwitchSNMP' data-action='edit' data-switchid='$device[id]'><i class='fa fa-cogs'></i></button>";
 		print "		<button class='btn btn-xs btn-default editSwitch' data-action='delete' data-switchid='$device[id]'><i class='fa fa-times'></i></button>";
 		print "	</div>";
-		print '	</td>'. "\n";
+		print '	</td>'."\n";
 
-		print '</tr>'. "\n";
+		print '</tr>'."\n";
 
 	}
 	print "</tbody>";

app/admin/devices/edit-snmp-result.php

Spacing +21 added lines, -21 removed lines

@@ -5,54 +5,54 @@ 
  ***************************/
 
 /* 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 ();
 
 # validate csrf cookie
-$User->csrf_cookie ("validate", "device_snmp", $_POST['csrf_cookie']) === false ? $Result->show("danger", _("Invalid CSRF cookie"), true) : "";
+$User->csrf_cookie ("validate", "device_snmp", $_POST['csrf_cookie']) === false ? $Result->show ("danger", _ ("Invalid CSRF cookie"), true) : "";
 
 # get modified details
-$device = $Admin->strip_input_tags($_POST);
+$device = $Admin->strip_input_tags ($_POST);
 
 # ID, port snd community must be numeric
-if(!is_numeric($_POST['device_id']))			              { $Result->show("danger", _("Invalid ID"), true); }
-if(!is_numeric($_POST['snmp_version']))			              { $Result->show("danger", _("Invalid version"), true); }
-if($_POST['snmp_version']!=0) {
-if(!is_numeric($_POST['snmp_port']))			              { $Result->show("danger", _("Invalid port"), true); }
-if(!is_numeric($_POST['snmp_timeout']))			              { $Result->show("danger", _("Invalid timeout"), true); }
+if (!is_numeric ($_POST['device_id'])) { $Result->show ("danger", _ ("Invalid ID"), true); }
+if (!is_numeric ($_POST['snmp_version'])) { $Result->show ("danger", _ ("Invalid version"), true); }
+if ($_POST['snmp_version'] != 0) {
+if (!is_numeric ($_POST['snmp_port'])) { $Result->show ("danger", _ ("Invalid port"), true); }
+if (!is_numeric ($_POST['snmp_timeout'])) { $Result->show ("danger", _ ("Invalid timeout"), true); }
 }
 
 # version can be 0, 1 or 2
-if ($_POST['snmp_version']<0 || $_POST['snmp_version']>3)     { $Result->show("danger", _("Invalid version"), true); }
+if ($_POST['snmp_version'] < 0 || $_POST['snmp_version'] > 3) { $Result->show ("danger", _ ("Invalid version"), true); }
 
 # validate device
 $device = $Admin->fetch_object ("devices", "id", $_POST['device_id']);
-if($device===false) { $Result->show("danger", _("Invalid device"), true); }
+if ($device === false) { $Result->show ("danger", _ ("Invalid device"), true); }
 
 # validate device ip
-if ($Admin->validate_ip($device->ip_addr)===false)            { $Result->show("danger", _("Invalid device IP address"), true); }
+if ($Admin->validate_ip ($device->ip_addr) === false) { $Result->show ("danger", _ ("Invalid device IP address"), true); }
 
 # set snmp queries
-foreach($_POST as $key=>$line) {
-	if (strlen(strstr($key,"query-"))>0) {
-		$key2 = str_replace("query-", "", $key);
+foreach ($_POST as $key=>$line) {
+	if (strlen (strstr ($key, "query-")) > 0) {
+		$key2 = str_replace ("query-", "", $key);
 		$temp[] = $key2;
 		unset($_POST[$key]);
 	}
 }
 # glue sections together
-$_POST['snmp_queries'] = sizeof($temp)>0 ? implode(";", $temp) : null;
+$_POST['snmp_queries'] = sizeof ($temp) > 0 ? implode (";", $temp) : null;
 
 # set update values
-$values = array("id"=>$_POST['device_id'],
+$values = array ("id"=>$_POST['device_id'],
 				"snmp_version"=>$_POST['snmp_version'],
 				"snmp_community"=>$_POST['snmp_community'],
 				"snmp_port"=>$_POST['snmp_port'],
@@ -61,7 +61,7 @@ 
 				);
 
 # update device
-if(!$Admin->object_modify("devices", "edit", "id", $values))    { $Result->show("danger",  _("SNMP edit failed").'!', false); }
-else														    { $Result->show("success", _("SNMP edit successfull").'!', false); }
+if (!$Admin->object_modify ("devices", "edit", "id", $values)) { $Result->show ("danger", _ ("SNMP edit failed").'!', false); }
+else { $Result->show ("success", _ ("SNMP edit successfull").'!', false); }
 
 ?>

app/admin/devices/edit-snmp.php

Spacing +31 added lines, -31 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);
-$Snmp       = new phpipamSNMP ();
+$Snmp = new phpipamSNMP ();
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # create csrf token
 $csrf = $User->csrf_cookie ("create", "device_snmp");
 
 # fetch custom fields
-$custom = $Tools->fetch_custom_fields('devices');
+$custom = $Tools->fetch_custom_fields ('devices');
 
 # ID must be numeric
-if(!is_numeric($_POST['switchId']))		     { $Result->show("danger", _("Invalid ID"), true, true); }
+if (!is_numeric ($_POST['switchId'])) { $Result->show ("danger", _ ("Invalid ID"), true, true); }
 
 # fetch device details
-$device = $Admin->fetch_object("devices", "id", $_POST['switchId']);
-if ($device===false)                         { $Result->show("danger", _("Invalid ID"), true, true);  }
+$device = $Admin->fetch_object ("devices", "id", $_POST['switchId']);
+if ($device === false) { $Result->show ("danger", _ ("Invalid ID"), true, true); }
 
 // set show
-if ($device->snmp_version=="1" || $device->snmp_version=="2")   { $display=''; }
-else                                                            { $display='display:none'; }
+if ($device->snmp_version == "1" || $device->snmp_version == "2") { $display = ''; }
+else { $display = 'display:none'; }
 
 // default values
-if (strlen($device->snmp_timeout)==0)   { $device->snmp_timeout = 1000000; }
+if (strlen ($device->snmp_timeout) == 0) { $device->snmp_timeout = 1000000; }
 ?>
 
 <script type="text/javascript">
@@ -52,7 +52,7 @@ 
 
 
 <!-- header -->
-<div class="pHeader"><?php print _("Edit"); ?> <?php print _('device'); ?> SNMP</div>
+<div class="pHeader"><?php print _ ("Edit"); ?> <?php print _ ('device'); ?> SNMP</div>
 
 
 <!-- content -->
@@ -72,13 +72,13 @@ 
 
 	<!-- version -->
 	<tr>
-		<td><?php print _('Version'); ?></td>
+		<td><?php print _ ('Version'); ?></td>
 		<td>
     		<select class="form-control" name="snmp_version">
-        		<option value="0"><?php print _("Not used"); ?></option>
-        		<option value="1" <?php if($device->snmp_version=="1") print "selected"; ?>>SNMP v1</option>
-        		<option value="2" <?php if($device->snmp_version=="2") print "selected"; ?>>SNMP v2c</option>
-        		<option value="3" <?php if($device->snmp_version=="3") print "selected"; ?>>SNMP v3</option>
+        		<option value="0"><?php print _ ("Not used"); ?></option>
+        		<option value="1" <?php if ($device->snmp_version == "1") print "selected"; ?>>SNMP v1</option>
+        		<option value="2" <?php if ($device->snmp_version == "2") print "selected"; ?>>SNMP v2c</option>
+        		<option value="3" <?php if ($device->snmp_version == "3") print "selected"; ?>>SNMP v3</option>
     		</select>
     		<input type="hidden" name="device_id" value="<?php print $device->id; ?>">
     		<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
@@ -90,15 +90,15 @@ 
     <tbody id="details" style="<?php print $display; ?>">
 	<!-- version -->
 	<tr>
-		<td><?php print _('Community'); ?></td>
+		<td><?php print _ ('Community'); ?></td>
 		<td>
-    		<input name="snmp_community" class="form-control" placeholder="SNMP <?php print _('Community'); ?>" value='<?php print $device->snmp_community; ?>'>
+    		<input name="snmp_community" class="form-control" placeholder="SNMP <?php print _ ('Community'); ?>" value='<?php print $device->snmp_community; ?>'>
 		</td>
 	</tr>
 
 	<!-- port -->
 	<tr>
-		<td><?php print _('Port'); ?></td>
+		<td><?php print _ ('Port'); ?></td>
 		<td>
     		<input type="number" name="snmp_port" class="form-control" placeholder="161" value='<?php print $device->snmp_port; ?>'>
 		</td>
@@ -106,7 +106,7 @@ 
 
 	<!-- timeout -->
 	<tr>
-		<td><?php print _('Timeout'); ?> [ms]</td>
+		<td><?php print _ ('Timeout'); ?> [ms]</td>
 		<td>
     		<input type="number" name="snmp_timeout" class="form-control" placeholder="500000" value='<?php print $device->snmp_timeout; ?>'>
 		</td>
@@ -119,16 +119,16 @@ 
     	</td>
 	</tr>
   	<tr>
-		<td><?php print _('Queries'); ?></td>
+		<td><?php print _ ('Queries'); ?></td>
 		<td style="text-align:top">
 		<?php
 		# select queries
-		$queries = explode(";", $device->snmp_queries);
-		$queries = is_array($queries) ? $queries : array();
+		$queries = explode (";", $device->snmp_queries);
+		$queries = is_array ($queries) ? $queries : array ();
         // loop
-		foreach($Snmp->snmp_queries as $k=>$m) {
-			if(in_array($k, $queries)) 	{ print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="query-'. $k .'" value="on" checked> '. $k .'</div>'. "\n"; }
-			else 							{ print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="query-'. $k .'" value="on">'. $k .'</span></div>'. "\n"; }
+		foreach ($Snmp->snmp_queries as $k=>$m) {
+			if (in_array ($k, $queries)) { print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="query-'.$k.'" value="on" checked> '.$k.'</div>'."\n"; }
+			else { print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="query-'.$k.'" value="on">'.$k.'</span></div>'."\n"; }
 		}
 		?>
 		</td>
@@ -143,7 +143,7 @@ 
     <tr>
         <td></td>
         <td class="text-right">
-            <a href="#" id="test-snmp" class="btn btn-sm btn-info"><?php print _("Test"); ?></a>
+            <a href="#" id="test-snmp" class="btn btn-sm btn-info"><?php print _ ("Test"); ?></a>
         </td>
     </tr>
 
@@ -158,8 +158,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 btn-success" id="editSwitchSNMPsubmit"><i class="fa fa-check"></i> <?php print _("Edit"); ?></button>
+		<button class="btn btn-sm btn-default hidePopups"><?php print _ ('Cancel'); ?></button>
+		<button class="btn btn-sm btn-default btn-success" id="editSwitchSNMPsubmit"><i class="fa fa-check"></i> <?php print _ ("Edit"); ?></button>
 	</div>
 
 	<!-- result -->

app/admin/replace-fields/index.php

Spacing +18 added lines, -18 removed lines

@@ -5,35 +5,35 @@ 
  ***********************************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # create csrf token
 $csrf = $User->csrf_cookie ("create", "replace_fields");
 ?>
 
-<h4><?php print _('Search and replace fields in IP address list'); ?></h4>
+<h4><?php print _ ('Search and replace fields in IP address list'); ?></h4>
 <hr><br>
 
 <form id="searchReplace">
 <table class="table" style="width:auto">
 
 	<tr>
-		<td><?php print _('Select field to replace'); ?>:</td>
+		<td><?php print _ ('Select field to replace'); ?>:</td>
 		<td>
 		<select name="field" class="form-control input-sm input-w-auto">
-			<option value="description"><?php print _('Description'); ?></option>
-			<option value="dns_name"><?php print _('Hostname'); ?></option>
-			<option value="owner"><?php print _('Owner'); ?></option>
-			<option value="mac"><?php print _('MAC address'); ?></option>
-			<option value="switch"><?php print _('Device'); ?></option>
-			<option value="port"><?php print _('Port'); ?></option>
+			<option value="description"><?php print _ ('Description'); ?></option>
+			<option value="dns_name"><?php print _ ('Hostname'); ?></option>
+			<option value="owner"><?php print _ ('Owner'); ?></option>
+			<option value="mac"><?php print _ ('MAC address'); ?></option>
+			<option value="switch"><?php print _ ('Device'); ?></option>
+			<option value="port"><?php print _ ('Port'); ?></option>
 			<?php
 			# fetch custom fields
-			$custom = $Tools->fetch_custom_fields('ipaddresses');
+			$custom = $Tools->fetch_custom_fields ('ipaddresses');
 
-			if(sizeof($custom) > 0) {
-				foreach($custom as $myField) {
-					print '<option value="'. $myField['name'] .'"> '. $myField['name'] .'</option>';
+			if (sizeof ($custom) > 0) {
+				foreach ($custom as $myField) {
+					print '<option value="'.$myField['name'].'"> '.$myField['name'].'</option>';
 				}
 			}
 			?>
@@ -42,24 +42,24 @@ 
 	</tr>
 
 	<tr>
-		<td><?php print _('Select search string'); ?></td>
+		<td><?php print _ ('Select search string'); ?></td>
 		<td>
-			<input type="text" name="search" class="form-control input-sm" placeholder="<?php print _('search string'); ?>">
+			<input type="text" name="search" class="form-control input-sm" placeholder="<?php print _ ('search string'); ?>">
 			<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
 		</td>
 	</tr>
 
 	<tr>
-		<td><?php print _('Select replace string'); ?></td>
+		<td><?php print _ ('Select replace string'); ?></td>
 		<td>
-			<input type="text" name="replace" class="form-control input-sm" placeholder="<?php print _('replace string'); ?>">
+			<input type="text" name="replace" class="form-control input-sm" placeholder="<?php print _ ('replace string'); ?>">
 		</td>
 	</tr>
 
 	<tr class="th">
 		<td></td>
 		<td>
-			<button class="btn btn-sm btn-default" id="searchReplaceSave"><i class="fa fa-check"></i> <?php print _('Replace'); ?></button>
+			<button class="btn btn-sm btn-default" id="searchReplaceSave"><i class="fa fa-check"></i> <?php print _ ('Replace'); ?></button>
 		</td>
 	</tr>
 

app/admin/replace-fields/result.php

Spacing +9 added lines, -9 removed lines

@@ -5,27 +5,27 @@
  ***********************************************/
 
 /* 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 ();
 
 # validate csrf cookie
-$User->csrf_cookie ("validate", "replace_fields", $_POST['csrf_cookie']) === false ? $Result->show("danger", _("Invalid CSRF cookie"), true) : "";
+$User->csrf_cookie ("validate", "replace_fields", $_POST['csrf_cookie']) === false ? $Result->show ("danger", _ ("Invalid CSRF cookie"), true) : "";
 
 
 //verify post
-if(empty($_POST['search'])) { $Result->show("danger", _('Please enter something in search field').'!', true); }
+if (empty($_POST['search'])) { $Result->show ("danger", _ ('Please enter something in search field').'!', true); }
 //if device verify that it exists
-if($_POST['field'] == "switch") {
-	if(!$device1 = $Admin->fetch_object("devices", "hostname", $_POST['search']))	{ $Result->show("danger  alert-absolute", _('Switch').' "<i>'. $_POST['search']  .'</i>" '._('does not exist, first create switch under admin menu').'!', true); }
-	if(!$device2 = $Admin->fetch_object("devices", "hostname", $_POST['replace']))	{ $Result->show("danger  alert-absolute", _('Switch').' "<i>'. $_POST['search']  .'</i>" '._('does not exist, first create switch under admin menu').'!', true); }
+if ($_POST['field'] == "switch") {
+	if (!$device1 = $Admin->fetch_object ("devices", "hostname", $_POST['search'])) { $Result->show ("danger  alert-absolute", _ ('Switch').' "<i>'.$_POST['search'].'</i>" '._ ('does not exist, first create switch under admin menu').'!', true); }
+	if (!$device2 = $Admin->fetch_object ("devices", "hostname", $_POST['replace'])) { $Result->show ("danger  alert-absolute", _ ('Switch').' "<i>'.$_POST['search'].'</i>" '._ ('does not exist, first create switch under admin menu').'!', true); }
 
 	//replace posts
 	$_POST['search']  = $device1->id;

app/admin/tags/edit.php

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>