phpipam / phpipam

app/admin/api/generate-key.php

Spacing +1 added lines, -1 removed lines

@@ -1,3 +1,3 @@
 <?php
-print str_shuffle(md5(microtime()));
+print str_shuffle (md5 (microtime ()));
 ?>
\ No newline at end of file

app/admin/api/edit-result.php

Indentation +22 added lines, -22 removed lines

@@ -26,34 +26,34 @@
 $error = array();
 
 if($_POST['action']!="delete") {
-	# code must be exactly 32 chars long and alfanumeric if app_security = crypt
-	if($_POST['app_security']=="crypt") {
-	if(strlen($_POST['app_code'])!=32 || !ctype_alnum($_POST['app_code']))									{ $error[] = "Invalid application code"; }
-	}
-	# name must be more than 2 and alphanumberic
-	if(strlen($_POST['app_id'])<3 || strlen($_POST['app_id'])>12 || !ctype_alnum($_POST['app_id']))			{ $error[] = "Invalid application id"; }
-	# permissions must be 0,1,2
-	if($_POST['app_security']!="user") {
-	if(!($_POST['app_permissions']==0 || $_POST['app_permissions']==1 || $_POST['app_permissions'] ==2 || $_POST['app_permissions'] ==3 ))	{ $error[] = "Invalid permissions"; }
-	}
+    # code must be exactly 32 chars long and alfanumeric if app_security = crypt
+    if($_POST['app_security']=="crypt") {
+    if(strlen($_POST['app_code'])!=32 || !ctype_alnum($_POST['app_code']))									{ $error[] = "Invalid application code"; }
+    }
+    # name must be more than 2 and alphanumberic
+    if(strlen($_POST['app_id'])<3 || strlen($_POST['app_id'])>12 || !ctype_alnum($_POST['app_id']))			{ $error[] = "Invalid application id"; }
+    # permissions must be 0,1,2
+    if($_POST['app_security']!="user") {
+    if(!($_POST['app_permissions']==0 || $_POST['app_permissions']==1 || $_POST['app_permissions'] ==2 || $_POST['app_permissions'] ==3 ))	{ $error[] = "Invalid permissions"; }
+    }
 }
 
 # die if errors
 if(sizeof($error) > 0) {
-	$Result->show("danger", $error, true);
+    $Result->show("danger", $error, true);
 }
 else {
-	# create array of values for modification
-	$values = array("id"=>@$_POST['id'],
-					"app_id"=>$_POST['app_id'],
-					"app_code"=>@$_POST['app_code'],
-					"app_permissions"=>@$_POST['app_permissions'],
-					"app_security"=>@$_POST['app_security'],
-					"app_comment"=>@$_POST['app_comment']);
-
-	# execute
-	if(!$Admin->object_modify("api", $_POST['action'], "id", $values)) 	{ $Result->show("danger",  _("API $_POST[action] error"), true); }
-	else 																{ $Result->show("success", _("API $_POST[action] success"), true); }
+    # create array of values for modification
+    $values = array("id"=>@$_POST['id'],
+                    "app_id"=>$_POST['app_id'],
+                    "app_code"=>@$_POST['app_code'],
+                    "app_permissions"=>@$_POST['app_permissions'],
+                    "app_security"=>@$_POST['app_security'],
+                    "app_comment"=>@$_POST['app_comment']);
+
+    # execute
+    if(!$Admin->object_modify("api", $_POST['action'], "id", $values)) 	{ $Result->show("danger",  _("API $_POST[action] error"), true); }
+    else 																{ $Result->show("success", _("API $_POST[action] success"), true); }
 }
 
 ?>
\ No newline at end of file

Spacing +18 added lines, -18 removed lines

@@ -5,46 +5,46 @@ 
  *************************************/
 
 /* 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", "apiedit", $_POST['csrf_cookie']) === false ? $Result->show("danger", _("Invalid CSRF cookie"), true) : "";
+$User->csrf_cookie ("validate", "apiedit", $_POST['csrf_cookie']) === false ? $Result->show ("danger", _ ("Invalid CSRF cookie"), true) : "";
 
 /* checks */
-$error = array();
+$error = array ();
 
-if($_POST['action']!="delete") {
+if ($_POST['action'] != "delete") {
 	# code must be exactly 32 chars long and alfanumeric if app_security = crypt
-	if($_POST['app_security']=="crypt") {
-	if(strlen($_POST['app_code'])!=32 || !ctype_alnum($_POST['app_code']))									{ $error[] = "Invalid application code"; }
+	if ($_POST['app_security'] == "crypt") {
+	if (strlen ($_POST['app_code']) != 32 || !ctype_alnum ($_POST['app_code'])) { $error[] = "Invalid application code"; }
 	}
 	# name must be more than 2 and alphanumberic
-	if(strlen($_POST['app_id'])<3 || strlen($_POST['app_id'])>12 || !ctype_alnum($_POST['app_id']))			{ $error[] = "Invalid application id"; }
+	if (strlen ($_POST['app_id']) < 3 || strlen ($_POST['app_id']) > 12 || !ctype_alnum ($_POST['app_id'])) { $error[] = "Invalid application id"; }
 	# permissions must be 0,1,2
-	if($_POST['app_security']!="user") {
-	if(!($_POST['app_permissions']==0 || $_POST['app_permissions']==1 || $_POST['app_permissions'] ==2 || $_POST['app_permissions'] ==3 ))	{ $error[] = "Invalid permissions"; }
+	if ($_POST['app_security'] != "user") {
+	if (!($_POST['app_permissions'] == 0 || $_POST['app_permissions'] == 1 || $_POST['app_permissions'] == 2 || $_POST['app_permissions'] == 3)) { $error[] = "Invalid permissions"; }
 	}
 }
 
 # die if errors
-if(sizeof($error) > 0) {
-	$Result->show("danger", $error, true);
+if (sizeof ($error) > 0) {
+	$Result->show ("danger", $error, true);
 }
 else {
 	# create array of values for modification
-	$values = array("id"=>@$_POST['id'],
+	$values = array ("id"=>@$_POST['id'],
 					"app_id"=>$_POST['app_id'],
 					"app_code"=>@$_POST['app_code'],
 					"app_permissions"=>@$_POST['app_permissions'],
@@ -52,8 +52,8 @@ 
 					"app_comment"=>@$_POST['app_comment']);
 
 	# execute
-	if(!$Admin->object_modify("api", $_POST['action'], "id", $values)) 	{ $Result->show("danger",  _("API $_POST[action] error"), true); }
-	else 																{ $Result->show("success", _("API $_POST[action] success"), true); }
+	if (!$Admin->object_modify ("api", $_POST['action'], "id", $values)) { $Result->show ("danger", _ ("API $_POST[action] error"), true); }
+	else { $Result->show ("success", _ ("API $_POST[action] success"), true); }
 }
 
 ?>
\ No newline at end of file

app/admin/api/edit.php

Indentation +25 added lines, -25 removed lines

@@ -24,18 +24,18 @@ 
 
 # fetch api for edit / add
 if($_POST['action']!="add") {
-	# fetch api details
-	$api = $Admin->fetch_object ("api", "id", $_POST['appid']);
-	# null ?
-	$api===false ? $Result->show("danger", _("Invalid ID"), true) : null;
-	# title
-	$title =  ucwords($_POST['action']) .' '._('api').' '.$api->app_id;
+    # fetch api details
+    $api = $Admin->fetch_object ("api", "id", $_POST['appid']);
+    # null ?
+    $api===false ? $Result->show("danger", _("Invalid ID"), true) : null;
+    # title
+    $title =  ucwords($_POST['action']) .' '._('api').' '.$api->app_id;
 } else {
-	# generate new code
-	$api = new StdClass;
-	$api->app_code = str_shuffle(md5(microtime()));
-	# title
-	$title = _('Add new api key');
+    # generate new code
+    $api = new StdClass;
+    $api->app_code = str_shuffle(md5(microtime()));
+    # title
+    $title = _('Add new api key');
 }
 ?>
 
@@ -74,12 +74,12 @@ 
 	    <td>
 	    	<select name="app_permissions" class="form-control input-sm input-w-auto">
 	    	<?php
-	    	$perms = array(0=>"Disabled",1=>"Read",2=>"Read / Write",3=>"Read / Write / Admin");
-	    	foreach($perms as $k=>$p) {
-		    	if($k==$api->app_permissions)	{ print "<option value='$k' selected='selected'>"._($p)."</option>"; }
-		    	else							{ print "<option value='$k' 				   >"._($p)."</option>"; }
-	    	}
-	    	?>
+            $perms = array(0=>"Disabled",1=>"Read",2=>"Read / Write",3=>"Read / Write / Admin");
+            foreach($perms as $k=>$p) {
+                if($k==$api->app_permissions)	{ print "<option value='$k' selected='selected'>"._($p)."</option>"; }
+                else							{ print "<option value='$k' 				   >"._($p)."</option>"; }
+            }
+            ?>
 	    	</select>
        	<td class="info2"><?php print _('Application permissions'); ?></td>
     </tr>
@@ -90,16 +90,16 @@ 
 	    <td>
 	    	<select name="app_security" class="form-control input-sm input-w-auto">
 	    	<?php
-	    	$perms = array(0=>"crypt",1=>"ssl",2=>"none",3=>"user");
+            $perms = array(0=>"crypt",1=>"ssl",2=>"none",3=>"user");
 
-	    	// user not yet supported
-	    	unset($perms[3]);
+            // user not yet supported
+            unset($perms[3]);
 
-	    	foreach($perms as $k=>$p) {
-		    	if($p==$api->app_security)		{ print "<option value='$p' selected='selected'>"._($p)."</option>"; }
-		    	else							{ print "<option value='$p' 				   >"._($p)."</option>"; }
-	    	}
-	    	?>
+            foreach($perms as $k=>$p) {
+                if($p==$api->app_security)		{ print "<option value='$p' selected='selected'>"._($p)."</option>"; }
+                else							{ print "<option value='$p' 				   >"._($p)."</option>"; }
+            }
+            ?>
 	    	</select>
        	<td class="info2"><?php print _('Application security'); ?></td>
     </tr>

Braces +18 added lines, -5 removed lines

@@ -30,7 +30,8 @@ 
 	$api===false ? $Result->show("danger", _("Invalid ID"), true) : null;
 	# title
 	$title =  ucwords($_POST['action']) .' '._('api').' '.$api->app_id;
-} else {
+}
+else {
 	# generate new code
 	$api = new StdClass;
 	$api->app_code = str_shuffle(md5(microtime()));
@@ -53,7 +54,10 @@ 
 	<tr>
 	    <td><?php print _('App id'); ?></td>
 	    <td>
-	    	<input type="text" name="app_id" class="form-control input-sm" value="<?php print @$api->app_id; ?>" <?php if($_POST['action'] == "delete") print "readonly"; ?>>
+	    	<input type="text" name="app_id" class="form-control input-sm" value="<?php print @$api->app_id; ?>" <?php if($_POST['action'] == "delete") {
+    print "readonly";
+}
+?>>
 	        <input type="hidden" name="id" value="<?php print $api->id; ?>">
     		<input type="hidden" name="action" value="<?php print $_POST['action']; ?>">
     		<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
@@ -64,7 +68,10 @@ 
 	<!-- code -->
 	<tr>
 	    <td><?php print _('App code'); ?></td>
-	    <td><input type="text" id="appcode" name="app_code" class="form-control input-sm"  value="<?php print @$api->app_code; ?>"  maxlength='32' <?php if($_POST['action'] == "delete") print "readonly"; ?>></td>
+	    <td><input type="text" id="appcode" name="app_code" class="form-control input-sm"  value="<?php print @$api->app_code; ?>"  maxlength='32' <?php if($_POST['action'] == "delete") {
+    print "readonly";
+}
+?>></td>
        	<td class="info2"><?php print _('Application code'); ?> <button class="btn btn-xs btn-default" id="regApiKey"><i class="fa fa-random"></i> <?php print _('Regenerate'); ?></button></td>
     </tr>
 
@@ -108,7 +115,10 @@ 
     <tr>
     	<td><?php print _('Description'); ?></td>
     	<td>
-    		<input type="text" name="app_comment" class="form-control input-sm" value="<?php print @$api->app_comment; ?>" <?php if($_POST['action'] == "delete") print "readonly"; ?>>
+    		<input type="text" name="app_comment" class="form-control input-sm" value="<?php print @$api->app_comment; ?>" <?php if($_POST['action'] == "delete") {
+    print "readonly";
+}
+?>>
     	</td>
     	<td class="info2"><?php print _('Enter description'); ?></td>
     </tr>
@@ -125,7 +135,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="apiEditSubmit"><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="apiEditSubmit"><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="apiEditResult"></div>

Spacing +33 added lines, -33 removed lines

@@ -5,37 +5,37 @@ 
  *************************************************/
 
 /* 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", "apiedit");
 
 # ID must be numeric
-if($_POST['action']!="add" && !is_numeric($_POST['appid'])) { $Result->show("danger", _("Invalid ID"), true, true); }
+if ($_POST['action'] != "add" && !is_numeric ($_POST['appid'])) { $Result->show ("danger", _ ("Invalid ID"), true, true); }
 
 # fetch api for edit / add
-if($_POST['action']!="add") {
+if ($_POST['action'] != "add") {
 	# fetch api details
 	$api = $Admin->fetch_object ("api", "id", $_POST['appid']);
 	# null ?
-	$api===false ? $Result->show("danger", _("Invalid ID"), true) : null;
+	$api === false ? $Result->show ("danger", _ ("Invalid ID"), true) : null;
 	# title
-	$title =  ucwords($_POST['action']) .' '._('api').' '.$api->app_id;
+	$title = ucwords ($_POST['action']).' '._ ('api').' '.$api->app_id;
 } else {
 	# generate new code
 	$api = new StdClass;
-	$api->app_code = str_shuffle(md5(microtime()));
+	$api->app_code = str_shuffle (md5 (microtime ()));
 	# title
-	$title = _('Add new api key');
+	$title = _ ('Add new api key');
 }
 ?>
 
@@ -51,66 +51,66 @@ 
 
 	<!-- id -->
 	<tr>
-	    <td><?php print _('App id'); ?></td>
+	    <td><?php print _ ('App id'); ?></td>
 	    <td>
-	    	<input type="text" name="app_id" class="form-control input-sm" value="<?php print @$api->app_id; ?>" <?php if($_POST['action'] == "delete") print "readonly"; ?>>
+	    	<input type="text" name="app_id" class="form-control input-sm" value="<?php print @$api->app_id; ?>" <?php if ($_POST['action'] == "delete") print "readonly"; ?>>
 	        <input type="hidden" name="id" value="<?php print $api->id; ?>">
     		<input type="hidden" name="action" value="<?php print $_POST['action']; ?>">
     		<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
 	    </td>
-       	<td class="info2"><?php print _('Enter application identifier'); ?></td>
+       	<td class="info2"><?php print _ ('Enter application identifier'); ?></td>
     </tr>
 
 	<!-- code -->
 	<tr>
-	    <td><?php print _('App code'); ?></td>
-	    <td><input type="text" id="appcode" name="app_code" class="form-control input-sm"  value="<?php print @$api->app_code; ?>"  maxlength='32' <?php if($_POST['action'] == "delete") print "readonly"; ?>></td>
-       	<td class="info2"><?php print _('Application code'); ?> <button class="btn btn-xs btn-default" id="regApiKey"><i class="fa fa-random"></i> <?php print _('Regenerate'); ?></button></td>
+	    <td><?php print _ ('App code'); ?></td>
+	    <td><input type="text" id="appcode" name="app_code" class="form-control input-sm"  value="<?php print @$api->app_code; ?>"  maxlength='32' <?php if ($_POST['action'] == "delete") print "readonly"; ?>></td>
+       	<td class="info2"><?php print _ ('Application code'); ?> <button class="btn btn-xs btn-default" id="regApiKey"><i class="fa fa-random"></i> <?php print _ ('Regenerate'); ?></button></td>
     </tr>
 
 	<!-- permissions -->
 	<tr>
-	    <td><?php print _('App permissions'); ?></td>
+	    <td><?php print _ ('App permissions'); ?></td>
 	    <td>
 	    	<select name="app_permissions" class="form-control input-sm input-w-auto">
 	    	<?php
-	    	$perms = array(0=>"Disabled",1=>"Read",2=>"Read / Write",3=>"Read / Write / Admin");
-	    	foreach($perms as $k=>$p) {
-		    	if($k==$api->app_permissions)	{ print "<option value='$k' selected='selected'>"._($p)."</option>"; }
-		    	else							{ print "<option value='$k' 				   >"._($p)."</option>"; }
+	    	$perms = array (0=>"Disabled", 1=>"Read", 2=>"Read / Write", 3=>"Read / Write / Admin");
+	    	foreach ($perms as $k=>$p) {
+		    	if ($k == $api->app_permissions) { print "<option value='$k' selected='selected'>"._ ($p)."</option>"; }
+		    	else { print "<option value='$k' 				   >"._ ($p)."</option>"; }
 	    	}
 	    	?>
 	    	</select>
-       	<td class="info2"><?php print _('Application permissions'); ?></td>
+       	<td class="info2"><?php print _ ('Application permissions'); ?></td>
     </tr>
 
 	<!-- Security -->
 	<tr>
-	    <td><?php print _('App security'); ?></td>
+	    <td><?php print _ ('App security'); ?></td>
 	    <td>
 	    	<select name="app_security" class="form-control input-sm input-w-auto">
 	    	<?php
-	    	$perms = array(0=>"crypt",1=>"ssl",2=>"none",3=>"user");
+	    	$perms = array (0=>"crypt", 1=>"ssl", 2=>"none", 3=>"user");
 
 	    	// user not yet supported
 	    	unset($perms[3]);
 
-	    	foreach($perms as $k=>$p) {
-		    	if($p==$api->app_security)		{ print "<option value='$p' selected='selected'>"._($p)."</option>"; }
-		    	else							{ print "<option value='$p' 				   >"._($p)."</option>"; }
+	    	foreach ($perms as $k=>$p) {
+		    	if ($p == $api->app_security) { print "<option value='$p' selected='selected'>"._ ($p)."</option>"; }
+		    	else { print "<option value='$p' 				   >"._ ($p)."</option>"; }
 	    	}
 	    	?>
 	    	</select>
-       	<td class="info2"><?php print _('Application security'); ?></td>
+       	<td class="info2"><?php print _ ('Application security'); ?></td>
     </tr>
 
     <!-- description -->
     <tr>
-    	<td><?php print _('Description'); ?></td>
+    	<td><?php print _ ('Description'); ?></td>
     	<td>
-    		<input type="text" name="app_comment" class="form-control input-sm" value="<?php print @$api->app_comment; ?>" <?php if($_POST['action'] == "delete") print "readonly"; ?>>
+    		<input type="text" name="app_comment" class="form-control input-sm" value="<?php print @$api->app_comment; ?>" <?php if ($_POST['action'] == "delete") print "readonly"; ?>>
     	</td>
-    	<td class="info2"><?php print _('Enter description'); ?></td>
+    	<td class="info2"><?php print _ ('Enter description'); ?></td>
     </tr>
 
 </table>
@@ -124,8 +124,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="apiEditSubmit"><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="apiEditSubmit"><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="apiEditResult"></div>

app/admin/vlans/vlans-scan-result.php

Indentation +31 added lines, -31 removed lines

@@ -34,22 +34,22 @@ 
 
 # ok, lets get results form post array!
 foreach($_POST as $key=>$line) {
-	// IP address
-	if(substr($key, 0,4)=="name") 			    { $res[substr($key, 4)]['name']  	    = $line; }
-	// mac
-	elseif(substr($key, 0,6)=="number") 		{ $res[substr($key, 6)]['number']  	    = $line; }
-	// device
-	elseif(substr($key, 0,8)=="domainId") 	    { $res[substr($key, 8)]['domainId']     = $line; }
-	// description
-	elseif(substr($key, 0,11)=="description") 	{ $res[substr($key, 11)]['description'] = $line; }
-	// custom fields
-	elseif (isset($required_fields)) {
-    	foreach ($required_fields as $k=>$f) {
-        	if((strpos($key, $f['name'])) !== false) {
+    // IP address
+    if(substr($key, 0,4)=="name") 			    { $res[substr($key, 4)]['name']  	    = $line; }
+    // mac
+    elseif(substr($key, 0,6)=="number") 		{ $res[substr($key, 6)]['number']  	    = $line; }
+    // device
+    elseif(substr($key, 0,8)=="domainId") 	    { $res[substr($key, 8)]['domainId']     = $line; }
+    // description
+    elseif(substr($key, 0,11)=="description") 	{ $res[substr($key, 11)]['description'] = $line; }
+    // custom fields
+    elseif (isset($required_fields)) {
+        foreach ($required_fields as $k=>$f) {
+            if((strpos($key, $f['name'])) !== false) {
                                                 { $res[substr($key, strlen($f['name']))][$f['name']] = $line; }
-        	}
-    	}
-	}
+            }
+        }
+    }
 }
 
 /*
@@ -60,26 +60,26 @@ 
 
 # insert entries
 if(sizeof($res)>0) {
-	$errors = 0;
-	foreach($res as $r) {
-		# set insert values
-		$values = array("number"=>$r['number'],
-						"name"=>$r['name'],
-						"domainId"=>$r['domainId'],
-						"description"=>$r['description']
-						);
+    $errors = 0;
+    foreach($res as $r) {
+        # set insert values
+        $values = array("number"=>$r['number'],
+                        "name"=>$r['name'],
+                        "domainId"=>$r['domainId'],
+                        "description"=>$r['description']
+                        );
         # custom fields
-		if (isset($required_fields)) {
-			foreach ($required_fields as $k=>$f) {
-				$values[$f['name']] = $r[$f['name']];
-			}
-		}
+        if (isset($required_fields)) {
+            foreach ($required_fields as $k=>$f) {
+                $values[$f['name']] = $r[$f['name']];
+            }
+        }
         # insert vlans
         if(!$Admin->object_modify("vlans", "add", "vlanId", $values))	{ $Result->show("danger", _("Failed to import entry")." ".$r['number']." ".$r['name'], false); $errors++; }
-	}
+    }
 
-	# success if no errors
-	if($errors==0) {  $Result->show("success", _("Scan results added to database")."!", true); }
+    # success if no errors
+    if($errors==0) {  $Result->show("success", _("Scan results added to database")."!", true); }
 }
 # error
 else { $Result->show("danger", _("No entries available"), true); }

Spacing +23 added lines, -23 removed lines

@@ -4,49 +4,49 @@ 
  *******************************/
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
-$Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Admin	 	= new Admin ($Database);
 $Subnets	= new Subnets ($Database);
-$Addresses	= new Addresses ($Database);
-$Tools      = new Tools ($Database);
+$Addresses = new Addresses ($Database);
+$Tools = new Tools ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # check for number of input values
-$max = ini_get("max_input_vars");
-if(sizeof($_POST)>=ini_get("max_input_vars")) 							{ $Result->show("danger", _("Number of discovered hosts exceed maximum possible defined by php.ini - set to ")." $max <hr>"._("Please adjust your php.ini settings for value `max_input_vars`"), true); }
+$max = ini_get ("max_input_vars");
+if (sizeof ($_POST) >= ini_get ("max_input_vars")) { $Result->show ("danger", _ ("Number of discovered hosts exceed maximum possible defined by php.ini - set to ")." $max <hr>"._ ("Please adjust your php.ini settings for value `max_input_vars`"), true); }
 
 // fetch custom fields and check for required
 $required_fields = $Tools->fetch_custom_fields ('vlans');
-if($required_fields!==false) {
+if ($required_fields !== false) {
     foreach ($required_fields as $k=>$f) {
-        if ($f['Null']!="NO") {
+        if ($f['Null'] != "NO") {
             unset($required_fields[$k]);
         }
     }
 }
 
 # ok, lets get results form post array!
-foreach($_POST as $key=>$line) {
+foreach ($_POST as $key=>$line) {
 	// IP address
-	if(substr($key, 0,4)=="name") 			    { $res[substr($key, 4)]['name']  	    = $line; }
+	if (substr ($key, 0, 4) == "name") { $res[substr ($key, 4)]['name'] = $line; }
 	// mac
-	elseif(substr($key, 0,6)=="number") 		{ $res[substr($key, 6)]['number']  	    = $line; }
+	elseif (substr ($key, 0, 6) == "number") { $res[substr ($key, 6)]['number'] = $line; }
 	// device
-	elseif(substr($key, 0,8)=="domainId") 	    { $res[substr($key, 8)]['domainId']     = $line; }
+	elseif (substr ($key, 0, 8) == "domainId") { $res[substr ($key, 8)]['domainId']     = $line; }
 	// description
-	elseif(substr($key, 0,11)=="description") 	{ $res[substr($key, 11)]['description'] = $line; }
+	elseif (substr ($key, 0, 11) == "description") { $res[substr ($key, 11)]['description'] = $line; }
 	// custom fields
 	elseif (isset($required_fields)) {
     	foreach ($required_fields as $k=>$f) {
-        	if((strpos($key, $f['name'])) !== false) {
-                                                { $res[substr($key, strlen($f['name']))][$f['name']] = $line; }
+        	if ((strpos ($key, $f['name'])) !== false) {
+                                                { $res[substr ($key, strlen ($f['name']))][$f['name']] = $line; }
         	}
     	}
 	}
@@ -59,11 +59,11 @@ 
 */
 
 # insert entries
-if(sizeof($res)>0) {
+if (sizeof ($res) > 0) {
 	$errors = 0;
-	foreach($res as $r) {
+	foreach ($res as $r) {
 		# set insert values
-		$values = array("number"=>$r['number'],
+		$values = array ("number"=>$r['number'],
 						"name"=>$r['name'],
 						"domainId"=>$r['domainId'],
 						"description"=>$r['description']
@@ -75,12 +75,12 @@ 
 			}
 		}
         # insert vlans
-        if(!$Admin->object_modify("vlans", "add", "vlanId", $values))	{ $Result->show("danger", _("Failed to import entry")." ".$r['number']." ".$r['name'], false); $errors++; }
+        if (!$Admin->object_modify ("vlans", "add", "vlanId", $values)) { $Result->show ("danger", _ ("Failed to import entry")." ".$r['number']." ".$r['name'], false); $errors++; }
 	}
 
 	# success if no errors
-	if($errors==0) {  $Result->show("success", _("Scan results added to database")."!", true); }
+	if ($errors == 0) {  $Result->show ("success", _ ("Scan results added to database")."!", true); }
 }
 # error
-else { $Result->show("danger", _("No entries available"), true); }
+else { $Result->show ("danger", _ ("No entries available"), true); }
 ?>
\ No newline at end of file

app/admin/vlans/edit-domain.php

Braces +4 added lines, -1 removed lines

@@ -100,7 +100,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"; } ?> editVLANdomainsubmit" id="editVLANdomainsubmit"><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"; } ?> editVLANdomainsubmit" id="editVLANdomainsubmit"><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 -->

Indentation +16 added lines, -16 removed lines

@@ -70,19 +70,19 @@ 
 		<td style="vertical-align: top !important"><?php print _('Sections to display domain in'); ?>:</td>
 		<td>
 		<?php
-		# select sections
-		$sections = $Sections->fetch_all_sections();
-		# reformat domains sections to array
-		$domain_sections = explode(";", @$l2_domain['permissions']);
-		$domain_sections = is_array($domain_sections) ? $domain_sections : array();
-		// loop
-		if($sections!==false) {
-			foreach($sections as $section) {
-				if(in_array($section->id, @$domain_sections) || @$l2_domain['id']=="1") 	{ 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
+        $domain_sections = explode(";", @$l2_domain['permissions']);
+        $domain_sections = is_array($domain_sections) ? $domain_sections : array();
+        // loop
+        if($sections!==false) {
+            foreach($sections as $section) {
+                if(in_array($section->id, @$domain_sections) || @$l2_domain['id']=="1") 	{ 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>
 
@@ -90,9 +90,9 @@ 
 	</form>
 
 	<?php
-	//print delete warning
-	if($_POST['action'] == "delete")	{ $Result->show("warning", _('Warning').':</strong> '._('removing vlan domain will move all belonging vlans to default domain')."!", false);  }
-	?>
+    //print delete warning
+    if($_POST['action'] == "delete")	{ $Result->show("warning", _('Warning').':</strong> '._('removing vlan domain will move all belonging vlans to default domain')."!", false);  }
+    ?>
 </div>
 
 

Spacing +23 added lines, -23 removed lines

@@ -5,28 +5,28 @@ 
  ************************************************/
 
 /* 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", "vlan_domain");
 
 # fetch vlan details
 $l2_domain = $Admin->fetch_object ("vlanDomains", "id", @$_POST['id']);
-$l2_domain = $l2_domain!==false ? (array) $l2_domain : array();
+$l2_domain = $l2_domain !== false ? (array) $l2_domain : array ();
 
 # set readonly flag
-$readonly = $_POST['action']=="delete" ? "readonly" : "";
+$readonly = $_POST['action'] == "delete" ? "readonly" : "";
 
 ?>
 
@@ -38,7 +38,7 @@ 
 
 
 <!-- header -->
-<div class="pHeader"><?php print ucwords(_("$_POST[action]")); ?> <?php print _('l2 domain'); ?></div>
+<div class="pHeader"><?php print ucwords (_ ("$_POST[action]")); ?> <?php print _ ('l2 domain'); ?></div>
 
 <!-- content -->
 <div class="pContent">
@@ -47,16 +47,16 @@ 
 	<table class="table table-noborder table-condensed">
 	<!-- number -->
 	<tr>
-		<td><?php print _('Name'); ?></td>
+		<td><?php print _ ('Name'); ?></td>
 		<td>
-			<input type="text" class="number form-control input-sm" name="name" placeholder="<?php print _('domain name'); ?>" value="<?php print @$l2_domain['name']; ?>" <?php print $readonly; ?>>
+			<input type="text" class="number form-control input-sm" name="name" placeholder="<?php print _ ('domain name'); ?>" value="<?php print @$l2_domain['name']; ?>" <?php print $readonly; ?>>
 		</td>
 	</tr>
 	<!-- Description -->
 	<tr>
-		<td><?php print _('Description'); ?></td>
+		<td><?php print _ ('Description'); ?></td>
 		<td>
-			<input type="text" class="description form-control input-sm" name="description" placeholder="<?php print _('Description'); ?>" value="<?php print @$l2_domain['description']; ?>" <?php print $readonly; ?>>
+			<input type="text" class="description form-control input-sm" name="description" placeholder="<?php print _ ('Description'); ?>" value="<?php print @$l2_domain['description']; ?>" <?php print $readonly; ?>>
 			<input type="hidden" name="id" value="<?php print @$_POST['id']; ?>">
 			<input type="hidden" name="action" value="<?php print $_POST['action']; ?>">
 			<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
@@ -67,19 +67,19 @@ 
 	</tr>
 	<!-- sections -->
 	<tr>
-		<td style="vertical-align: top !important"><?php print _('Sections to display domain in'); ?>:</td>
+		<td style="vertical-align: top !important"><?php print _ ('Sections to display domain in'); ?>:</td>
 		<td>
 		<?php
 		# select sections
-		$sections = $Sections->fetch_all_sections();
+		$sections = $Sections->fetch_all_sections ();
 		# reformat domains sections to array
-		$domain_sections = explode(";", @$l2_domain['permissions']);
-		$domain_sections = is_array($domain_sections) ? $domain_sections : array();
+		$domain_sections = explode (";", @$l2_domain['permissions']);
+		$domain_sections = is_array ($domain_sections) ? $domain_sections : array ();
 		// loop
-		if($sections!==false) {
-			foreach($sections as $section) {
-				if(in_array($section->id, @$domain_sections) || @$l2_domain['id']=="1") 	{ 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, @$domain_sections) || @$l2_domain['id'] == "1") { 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"; }
 			}
 		}
 		?>
@@ -91,7 +91,7 @@ 
 
 	<?php
 	//print delete warning
-	if($_POST['action'] == "delete")	{ $Result->show("warning", _('Warning').':</strong> '._('removing vlan domain will move all belonging vlans to default domain')."!", false);  }
+	if ($_POST['action'] == "delete") { $Result->show ("warning", _ ('Warning').':</strong> '._ ('removing vlan domain will move all belonging vlans to default domain')."!", false); }
 	?>
 </div>
 
@@ -99,8 +99,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"; } ?> editVLANdomainsubmit" id="editVLANdomainsubmit"><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"; } ?> editVLANdomainsubmit" id="editVLANdomainsubmit"><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/vlans/edit-domain-result.php

Indentation +15 added lines, -15 removed lines

@@ -33,26 +33,26 @@ 
 
 // set sections
 if(@$_POST['id']!=1) {
-	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['permissions'] = sizeof($temp)>0 ? implode(";", $temp) : null;
+    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['permissions'] = sizeof($temp)>0 ? implode(";", $temp) : null;
 }
 else {
-	$_POST['permissions'] = "";
+    $_POST['permissions'] = "";
 }
 
 # set update values
 $values = array("id"=>@$_POST['id'],
-				"name"=>@$_POST['name'],
-				"description"=>@$_POST['description'],
-				"permissions"=>@$_POST['permissions']
-				);
+                "name"=>@$_POST['name'],
+                "description"=>@$_POST['description'],
+                "permissions"=>@$_POST['permissions']
+                );
 
 # update domain
 if(!$Admin->object_modify("vlanDomains", $_POST['action'], "id", $values))	{}
@@ -60,7 +60,7 @@ 
 
 # if delete move all vlans to default domain!
 if($_POST['action']=="delete") {
-	$Admin->update_object_references ("vlans", "domainId", $_POST['id'], 1);
+    $Admin->update_object_references ("vlans", "domainId", $_POST['id'], 1);
 }
 
 ?>
\ No newline at end of file

Spacing +18 added lines, -18 removed lines

@@ -5,61 +5,61 @@
  ***************************/
 
 /* 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", "vlan_domain", $_POST['csrf_cookie']) === false ? $Result->show("danger", _("Invalid CSRF cookie"), true) : "";
+$User->csrf_cookie ("validate", "vlan_domain", $_POST['csrf_cookie']) === false ? $Result->show ("danger", _ ("Invalid CSRF cookie"), true) : "";
 
 # we cannot delete default domain
-if(@$_POST['id']==1 && $_POST['action']=="delete")						{ $Result->show("danger", _("Default domain cannot be deleted"), true); }
+if (@$_POST['id'] == 1 && $_POST['action'] == "delete") { $Result->show ("danger", _ ("Default domain cannot be deleted"), true); }
 // ID must be numeric
-if($_POST['action']!="add" && !is_numeric($_POST['id']))				{ $Result->show("danger", _("Invalid ID"), true); }
+if ($_POST['action'] != "add" && !is_numeric ($_POST['id'])) { $Result->show ("danger", _ ("Invalid ID"), true); }
 // 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
-if(@$_POST['id']!=1) {
-	foreach($_POST as $key=>$line) {
-		if (strlen(strstr($key,"section-"))>0) {
-			$key2 = str_replace("section-", "", $key);
+if (@$_POST['id'] != 1) {
+	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['permissions'] = sizeof($temp)>0 ? implode(";", $temp) : null;
+	$_POST['permissions'] = sizeof ($temp) > 0 ? implode (";", $temp) : null;
 }
 else {
 	$_POST['permissions'] = "";
 }
 
 # set update values
-$values = array("id"=>@$_POST['id'],
+$values = array ("id"=>@$_POST['id'],
 				"name"=>@$_POST['name'],
 				"description"=>@$_POST['description'],
 				"permissions"=>@$_POST['permissions']
 				);
 
 # update domain
-if(!$Admin->object_modify("vlanDomains", $_POST['action'], "id", $values))	{}
-else																		{ $Result->show("success", _("Domain $_POST[action] successfull").'!', false); }
+if (!$Admin->object_modify ("vlanDomains", $_POST['action'], "id", $values)) {}
+else { $Result->show ("success", _ ("Domain $_POST[action] successfull").'!', false); }
 
 # if delete move all vlans to default domain!
-if($_POST['action']=="delete") {
+if ($_POST['action'] == "delete") {
 	$Admin->update_object_references ("vlans", "domainId", $_POST['id'], 1);
 }
 

app/admin/vlans/move-vlan.php

Indentation +8 added lines, -8 removed lines

@@ -59,14 +59,14 @@
 		<input type="hidden" name="vlanId" value="<?php print $vlan->vlanId; ?>">
 		<select name="newDomainId" class="form-control input-w-auto input-sm">
 		<?php
-		$m=0;
-		foreach($vlan_domains as $d) {
-			if($d->id!=$vlan_domain->id) {
-				print "<option value='$d->id'>$d->name ($d->description)</option>";
-				$m++;
-			}
-		}
-		?>
+        $m=0;
+        foreach($vlan_domains as $d) {
+            if($d->id!=$vlan_domain->id) {
+                print "<option value='$d->id'>$d->name ($d->description)</option>";
+                $m++;
+            }
+        }
+        ?>
 		</select>
 		</td>
 	</tr>

Braces +4 added lines, -1 removed lines

@@ -74,7 +74,10 @@
 	</table>
 	</form>
 
-	<?php if($m==0)	$Result->show("warning", _("No domains available!"), false); ?>
+	<?php if($m==0) {
+    $Result->show("warning", _("No domains available!"), false);
+}
+?>
 
 </div>
 

Spacing +17 added lines, -17 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);
 $Tools	 	= new Tools ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 
 # fetch vlan details
 $vlan = $Admin->fetch_object ("vlans", "vlanId", @$_POST['vlanId']);
-if($vlan===false)					{ $Result->show("danger", _("Invalid ID"), true, true); }
+if ($vlan === false) { $Result->show ("danger", _ ("Invalid ID"), true, true); }
 
 # fetch current domain
-$vlan_domain = $Admin->fetch_object("vlanDomains", "id", $vlan->domainId);
-if($vlan_domain===false)			{ $Result->show("danger", _("Invalid ID"), true, true); }
+$vlan_domain = $Admin->fetch_object ("vlanDomains", "id", $vlan->domainId);
+if ($vlan_domain === false) { $Result->show ("danger", _ ("Invalid ID"), true, true); }
 
 # fetch all l2 domains
-$vlan_domains = $Admin->fetch_all_objects("vlanDomains", "id");
+$vlan_domains = $Admin->fetch_all_objects ("vlanDomains", "id");
 ?>
 
 <script type="text/javascript">
@@ -37,7 +37,7 @@ 
 </script>
 
 <!-- header -->
-<div class="pHeader"><?php print ucwords("Move VLAN to new domain"); ?></div>
+<div class="pHeader"><?php print ucwords ("Move VLAN to new domain"); ?></div>
 
 <!-- content -->
 <div class="pContent">
@@ -46,7 +46,7 @@ 
 	<table class="table table-noborder table-condensed">
 	<!-- domain -->
 	<tr>
-		<td><?php print _('Current l2 domain'); ?></td>
+		<td><?php print _ ('Current l2 domain'); ?></td>
 		<th><?php print $vlan_domain->name." (".$vlan_domain->description.")"; ?></th>
 	</tr>
 	<tr>
@@ -54,14 +54,14 @@ 
 	</tr>
 	<!-- new domain -->
 	<tr>
-		<td><?php print _('New domain'); ?></td>
+		<td><?php print _ ('New domain'); ?></td>
 		<td>
 		<input type="hidden" name="vlanId" value="<?php print $vlan->vlanId; ?>">
 		<select name="newDomainId" class="form-control input-w-auto input-sm">
 		<?php
-		$m=0;
-		foreach($vlan_domains as $d) {
-			if($d->id!=$vlan_domain->id) {
+		$m = 0;
+		foreach ($vlan_domains as $d) {
+			if ($d->id != $vlan_domain->id) {
 				print "<option value='$d->id'>$d->name ($d->description)</option>";
 				$m++;
 			}
@@ -74,15 +74,15 @@ 
 	</table>
 	</form>
 
-	<?php if($m==0)	$Result->show("warning", _("No domains available!"), false); ?>
+	<?php if ($m == 0)	$Result->show ("warning", _ ("No domains available!"), false); ?>
 
 </div>
 
 <!-- footer -->
 <div class="pFooter">
 	<div class="btn-group">
-		<button class="btn btn-sm btn-default hidePopups"><?php print _('Cancel'); ?></button>
-		<?php if($m>0) { ?>
+		<button class="btn btn-sm btn-default hidePopups"><?php print _ ('Cancel'); ?></button>
+		<?php if ($m > 0) { ?>
 		<button class="btn btn-sm btn-default btn-success" id="moveVLANsubmit"><?php print ("Move"); ?></button>
 		<?php } ?>
 	</div>

app/admin/vlans/edit-result.php

Indentation +23 added lines, -23 removed lines

@@ -28,46 +28,46 @@
 
 //if it already exist die
 if($User->settings->vlanDuplicate==0 && $_POST['action']=="add") {
-	$check_vlan = $Admin->fetch_multiple_objects ("vlans", "domainId", $_POST['domainId'], "vlanId");
-	if($check_vlan!==false) {
-		foreach($check_vlan as $v) {
-			if($v->number == $_POST['number']) {
-																			{ $Result->show("danger", _("VLAN already exists"), true); }
-			}
-		}
-	}
+    $check_vlan = $Admin->fetch_multiple_objects ("vlans", "domainId", $_POST['domainId'], "vlanId");
+    if($check_vlan!==false) {
+        foreach($check_vlan as $v) {
+            if($v->number == $_POST['number']) {
+                                                                            { $Result->show("danger", _("VLAN already exists"), true); }
+            }
+        }
+    }
 }
 
 // if unique required
 if (isset($_POST['unique'])) {
-	if ($_POST['unique']=="on") {
-		if ($Tools->fetch_object ("vlans", "number", $_POST['number'])!==false) { $Result->show("danger", _("VLAN already exists in another domain!"), true); }
-	}
+    if ($_POST['unique']=="on") {
+        if ($Tools->fetch_object ("vlans", "number", $_POST['number'])!==false) { $Result->show("danger", _("VLAN already exists in another domain!"), true); }
+    }
 }
 
 //if number too high
 if($_POST['number']>$User->settings->vlanMax && $_POST['action']!="delete")	{ $Result->show("danger", _('Highest possible VLAN number is ').$settings['vlanMax'].'!', true); }
 if($_POST['action']=="add") {
-	if($_POST['number']<0)													{ $Result->show("danger", _('VLAN number cannot be negative').'!', true); }
-	elseif(!is_numeric($_POST['number']))									{ $Result->show("danger", _('Not number').'!', true); }
+    if($_POST['number']<0)													{ $Result->show("danger", _('VLAN number cannot be negative').'!', true); }
+    elseif(!is_numeric($_POST['number']))									{ $Result->show("danger", _('Not number').'!', true); }
 }
 if(strlen($_POST['name'])==0)												{ $Result->show("danger", _('Name is required').'!', true); }
 
 
 # formulate update query
 $values = array("vlanId"=>@$_POST['vlanId'],
-				"number"=>$_POST['number'],
-				"name"=>$_POST['name'],
-				"description"=>@$_POST['description'],
-				"domainId"=>$_POST['domainId']
-				);
+                "number"=>$_POST['number'],
+                "name"=>$_POST['name'],
+                "description"=>@$_POST['description'],
+                "domainId"=>$_POST['domainId']
+                );
 # 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']];}
+    }
 }
 
 

Spacing +28 added lines, -28 removed lines

@@ -5,34 +5,34 @@ 
  *******************************/
 
 /* 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", "vlan", $_POST['csrf_cookie']) === false ? $Result->show("danger", _("Invalid CSRF cookie"), true) : "";
+$User->csrf_cookie ("validate", "vlan", $_POST['csrf_cookie']) === false ? $Result->show ("danger", _ ("Invalid CSRF cookie"), true) : "";
 
 # fetch custom fields
-$custom = $Tools->fetch_custom_fields('vlans');
+$custom = $Tools->fetch_custom_fields ('vlans');
 
 //if it already exist die
-if($User->settings->vlanDuplicate==0 && $_POST['action']=="add") {
+if ($User->settings->vlanDuplicate == 0 && $_POST['action'] == "add") {
 	$check_vlan = $Admin->fetch_multiple_objects ("vlans", "domainId", $_POST['domainId'], "vlanId");
-	if($check_vlan!==false) {
-		foreach($check_vlan as $v) {
-			if($v->number == $_POST['number']) {
-																			{ $Result->show("danger", _("VLAN already exists"), true); }
+	if ($check_vlan !== false) {
+		foreach ($check_vlan as $v) {
+			if ($v->number == $_POST['number']) {
+																			{ $Result->show ("danger", _ ("VLAN already exists"), true); }
 			}
 		}
 	}
@@ -40,45 +40,45 @@ 
 
 // if unique required
 if (isset($_POST['unique'])) {
-	if ($_POST['unique']=="on") {
-		if ($Tools->fetch_object ("vlans", "number", $_POST['number'])!==false) { $Result->show("danger", _("VLAN already exists in another domain!"), true); }
+	if ($_POST['unique'] == "on") {
+		if ($Tools->fetch_object ("vlans", "number", $_POST['number']) !== false) { $Result->show ("danger", _ ("VLAN already exists in another domain!"), true); }
 	}
 }
 
 //if number too high
-if($_POST['number']>$User->settings->vlanMax && $_POST['action']!="delete")	{ $Result->show("danger", _('Highest possible VLAN number is ').$settings['vlanMax'].'!', true); }
-if($_POST['action']=="add") {
-	if($_POST['number']<0)													{ $Result->show("danger", _('VLAN number cannot be negative').'!', true); }
-	elseif(!is_numeric($_POST['number']))									{ $Result->show("danger", _('Not number').'!', true); }
+if ($_POST['number'] > $User->settings->vlanMax && $_POST['action'] != "delete") { $Result->show ("danger", _ ('Highest possible VLAN number is ').$settings['vlanMax'].'!', true); }
+if ($_POST['action'] == "add") {
+	if ($_POST['number'] < 0) { $Result->show ("danger", _ ('VLAN number cannot be negative').'!', true); }
+	elseif (!is_numeric ($_POST['number'])) { $Result->show ("danger", _ ('Not number').'!', true); }
 }
-if(strlen($_POST['name'])==0)												{ $Result->show("danger", _('Name is required').'!', true); }
+if (strlen ($_POST['name']) == 0) { $Result->show ("danger", _ ('Name is required').'!', true); }
 
 
 # formulate update query
-$values = array("vlanId"=>@$_POST['vlanId'],
+$values = array ("vlanId"=>@$_POST['vlanId'],
 				"number"=>$_POST['number'],
 				"name"=>$_POST['name'],
 				"description"=>@$_POST['description'],
 				"domainId"=>$_POST['domainId']
 				);
 # 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("vlans", $_POST['action'], "vlanId", $values))	{ $Result->show("danger",  _("Failed to $_POST[action] VLAN").'!', true); }
-else																		{ $Result->show("success", _("VLAN $_POST[action] successfull").'!', false); }
+if (!$Admin->object_modify ("vlans", $_POST['action'], "vlanId", $values)) { $Result->show ("danger", _ ("Failed to $_POST[action] VLAN").'!', true); }
+else { $Result->show ("success", _ ("VLAN $_POST[action] successfull").'!', false); }
 
 # remove all references if delete
-if($_POST['action']=="delete") { $Admin->remove_object_references ("subnets", "vlanId", $_POST['vlanId']); }
+if ($_POST['action'] == "delete") { $Admin->remove_object_references ("subnets", "vlanId", $_POST['vlanId']); }
 
 # print value for on the fly
-if($_POST['action']=="add")	   { print '<p id="vlanidforonthefly"    style="display:none">'.$Admin->lastId.'</p>'; }
+if ($_POST['action'] == "add") { print '<p id="vlanidforonthefly"    style="display:none">'.$Admin->lastId.'</p>'; }
 
 ?>
\ No newline at end of file

app/admin/vlans/edit.php

Indentation +112 added lines, -112 removed lines

@@ -39,14 +39,14 @@ 
 
 # fetch l2 domain
 if($_POST['action']=="add") {
-	# all
-	if (@$_POST['domain']=="all") {
-		$vlan_domains = $Admin->fetch_all_objects("vlanDomains");
-	} else {
-		$vlan_domain = $Admin->fetch_object("vlanDomains", "id", $_POST['domain']);
-	}
+    # all
+    if (@$_POST['domain']=="all") {
+        $vlan_domains = $Admin->fetch_all_objects("vlanDomains");
+    } else {
+        $vlan_domain = $Admin->fetch_object("vlanDomains", "id", $_POST['domain']);
+    }
 } else {
-		$vlan_domain = $Admin->fetch_object("vlanDomains", "id", $vlan['domainId']);
+        $vlan_domain = $Admin->fetch_object("vlanDomains", "id", $vlan['domainId']);
 }
 if($vlan_domain===false)			{ $Result->show("danger", _("Invalid ID"), true, true); }
 ?>
@@ -71,17 +71,17 @@ 
 		<td><?php print _('l2 domain'); ?></td>
 		<th>
 		<?php
-		# not all
-		if (@$_POST['domain']!="all") {
-			print $vlan_domain->name." (".$vlan_domain->description.")";
-		} else {
-			print "<select name='domainId' class='form-control input-sm'>";
-			foreach ($vlan_domains as $d) {
-				print "<option value='$d->id'>$d->name</option>";
-			}
-			print "</select>";
-		}
-		?>
+        # not all
+        if (@$_POST['domain']!="all") {
+            print $vlan_domain->name." (".$vlan_domain->description.")";
+        } else {
+            print "<select name='domainId' class='form-control input-sm'>";
+            foreach ($vlan_domains as $d) {
+                print "<option value='$d->id'>$d->name</option>";
+            }
+            print "</select>";
+        }
+        ?>
 		</th>
 	</tr>
 	<tr>
@@ -133,105 +133,105 @@ 
 
 	<!-- 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")	{ $vlan[$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==$vlan[$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($vlan[$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="'. $vlan[$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($vlan[$field['name']])==0 && $k==2)	{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
-					elseif($k==$vlan[$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'].'">'. $vlan[$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="'. @$vlan[$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")	{ $vlan[$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==$vlan[$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($vlan[$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="'. $vlan[$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($vlan[$field['name']])==0 && $k==2)	{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
+                    elseif($k==$vlan[$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'].'">'. $vlan[$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="'. @$vlan[$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", _('Warning').':</strong> '._('removing VLAN will also remove VLAN reference from belonging subnets')."!", false);  }
-	?>
+    //print delete warning
+    if($_POST['action'] == "delete")	{ $Result->show("warning", _('Warning').':</strong> '._('removing VLAN will also remove VLAN reference from belonging subnets')."!", false);  }
+    ?>
 </div>
 
 

Braces +12 added lines, -5 removed lines

@@ -42,10 +42,12 @@ 
 	# all
 	if (@$_POST['domain']=="all") {
 		$vlan_domains = $Admin->fetch_all_objects("vlanDomains");
-	} else {
+	}
+	else {
 		$vlan_domain = $Admin->fetch_object("vlanDomains", "id", $_POST['domain']);
 	}
-} else {
+}
+else {
 		$vlan_domain = $Admin->fetch_object("vlanDomains", "id", $vlan['domainId']);
 }
 if($vlan_domain===false)			{ $Result->show("danger", _("Invalid ID"), true, true); }
@@ -74,7 +76,8 @@ 
 		# not all
 		if (@$_POST['domain']!="all") {
 			print $vlan_domain->name." (".$vlan_domain->description.")";
-		} else {
+		}
+		else {
 			print "<select name='domainId' class='form-control input-sm'>";
 			foreach ($vlan_domains as $d) {
 				print "<option value='$d->id'>$d->name</option>";
@@ -238,8 +241,12 @@ 
 <!-- footer -->
 <div class="pFooter">
 	<div class="btn-group">
-		<button class="btn btn-sm btn-default <?php if(isset($_POST['fromSubnet'])) { print "hidePopup2"; } else { print "hidePopups"; } ?>"><?php print _('Cancel'); ?></button>
-		<button class="btn btn-sm btn-default <?php if($_POST['action']=="delete") { print "btn-danger"; } else { print "btn-success"; } ?> vlanManagementEditFromSubnetButton" id="editVLANsubmit"><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(isset($_POST['fromSubnet'])) { print "hidePopup2"; }
+else { print "hidePopups"; } ?>"><?php print _('Cancel'); ?></button>
+		<button class="btn btn-sm btn-default <?php if($_POST['action']=="delete") { print "btn-danger"; }
+else { print "btn-success"; } ?> vlanManagementEditFromSubnetButton" id="editVLANsubmit"><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 +65 added lines, -65 removed lines

@@ -5,49 +5,49 @@ 
  ************************************************/
 
 /* 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", "vlan");
 
 # fetch vlan details
 $vlan = $Admin->fetch_object ("vlans", "vlanId", @$_POST['vlanId']);
-$vlan = $vlan!==false ? (array) $vlan : array();
+$vlan = $vlan !== false ? (array) $vlan : array ();
 # fetch custom fields
-$custom = $Tools->fetch_custom_fields('vlans');
+$custom = $Tools->fetch_custom_fields ('vlans');
 
 # set readonly flag
-$readonly = $_POST['action']=="delete" ? "readonly" : "";
+$readonly = $_POST['action'] == "delete" ? "readonly" : "";
 
 # set form name!
-if(isset($_POST['fromSubnet'])) { $formId = "vlanManagementEditFromSubnet"; }
-else 							{ $formId = "vlanManagementEdit"; }
+if (isset($_POST['fromSubnet'])) { $formId = "vlanManagementEditFromSubnet"; }
+else { $formId = "vlanManagementEdit"; }
 
 # domain
-if(!isset($_POST['domain'])) 	{ $_POST['domain']=1; }
+if (!isset($_POST['domain'])) { $_POST['domain'] = 1; }
 
 # fetch l2 domain
-if($_POST['action']=="add") {
+if ($_POST['action'] == "add") {
 	# all
-	if (@$_POST['domain']=="all") {
-		$vlan_domains = $Admin->fetch_all_objects("vlanDomains");
+	if (@$_POST['domain'] == "all") {
+		$vlan_domains = $Admin->fetch_all_objects ("vlanDomains");
 	} else {
-		$vlan_domain = $Admin->fetch_object("vlanDomains", "id", $_POST['domain']);
+		$vlan_domain = $Admin->fetch_object ("vlanDomains", "id", $_POST['domain']);
 	}
 } else {
-		$vlan_domain = $Admin->fetch_object("vlanDomains", "id", $vlan['domainId']);
+		$vlan_domain = $Admin->fetch_object ("vlanDomains", "id", $vlan['domainId']);
 }
-if($vlan_domain===false)			{ $Result->show("danger", _("Invalid ID"), true, true); }
+if ($vlan_domain === false) { $Result->show ("danger", _ ("Invalid ID"), true, true); }
 ?>
 
 <script type="text/javascript">
@@ -58,7 +58,7 @@ 
 
 
 <!-- header -->
-<div class="pHeader"><?php print ucwords(_("$_POST[action]")); ?> <?php print _('VLAN'); ?></div>
+<div class="pHeader"><?php print ucwords (_ ("$_POST[action]")); ?> <?php print _ ('VLAN'); ?></div>
 
 <!-- content -->
 <div class="pContent">
@@ -67,11 +67,11 @@ 
 	<table id="vlanManagementEdit2" class="table table-noborder table-condensed">
 	<!-- domain -->
 	<tr>
-		<td><?php print _('l2 domain'); ?></td>
+		<td><?php print _ ('l2 domain'); ?></td>
 		<th>
 		<?php
 		# not all
-		if (@$_POST['domain']!="all") {
+		if (@$_POST['domain'] != "all") {
 			print $vlan_domain->name." (".$vlan_domain->description.")";
 		} else {
 			print "<select name='domainId' class='form-control input-sm'>";
@@ -88,27 +88,27 @@ 
 	</tr>
 	<!-- number -->
 	<tr>
-		<td><?php print _('Number'); ?></td>
+		<td><?php print _ ('Number'); ?></td>
 		<td>
-			<input type="text" class="number form-control input-sm" name="number" placeholder="<?php print _('VLAN number'); ?>" value="<?php print @$vlan['number']; ?><?php print @$_POST['vlanNum']; ?>" <?php print $readonly; ?>>
+			<input type="text" class="number form-control input-sm" name="number" placeholder="<?php print _ ('VLAN number'); ?>" value="<?php print @$vlan['number']; ?><?php print @$_POST['vlanNum']; ?>" <?php print $readonly; ?>>
 		</td>
 	</tr>
 
 	<!-- hostname  -->
 	<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 _('VLAN name'); ?>" value="<?php print @$vlan['name']; ?>" <?php print $readonly; ?>>
+			<input type="text" class="name form-control input-sm" name="name" placeholder="<?php print _ ('VLAN name'); ?>" value="<?php print @$vlan['name']; ?>" <?php print $readonly; ?>>
 		</td>
 	</tr>
 
 	<!-- Description -->
 	<tr>
-		<td><?php print _('Description'); ?></td>
+		<td><?php print _ ('Description'); ?></td>
 		<td>
-			<input type="text" class="description form-control input-sm" name="description" placeholder="<?php print _('Description'); ?>" value="<?php print @$vlan['description']; ?>" <?php print $readonly; ?>>
+			<input type="text" class="description form-control input-sm" name="description" placeholder="<?php print _ ('Description'); ?>" value="<?php print @$vlan['description']; ?>" <?php print $readonly; ?>>
 			<input type="hidden" name="vlanId" value="<?php print @$_POST['vlanId']; ?>">
-			<?php if(@$_POST['domain']!=="all") { ?>
+			<?php if (@$_POST['domain'] !== "all") { ?>
 			<input type="hidden" name="domainId" value="<?php print $vlan_domain->id; ?>">
 			<?php } ?>
 			<input type="hidden" name="action" value="<?php print $_POST['action']; ?>">
@@ -116,63 +116,63 @@ 
 		</td>
 	</tr>
 
-	<?php if($_POST['action']=="add" || $_POST['action']=="edit") { ?>
+	<?php if ($_POST['action'] == "add" || $_POST['action'] == "edit") { ?>
     <!-- require unique -->
     <tr>
 	    <td colspan="2"><hr></td>
     </tr>
     <tr>
-    	<td><?php print _('Unique VLAN'); ?></td>
+    	<td><?php print _ ('Unique VLAN'); ?></td>
     	<td>
 	    	<input type="checkbox" name="unique" value="on">
-	    	<span class="text-muted"><?php print _('Require unique vlan accross domains'); ?></span>
+	    	<span class="text-muted"><?php print _ ('Require unique vlan accross domains'); ?></span>
 	    </td>
     </tr>
 	<?php } ?>
 
 	<!-- 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")	{ $vlan[$field['name']] = $field['Default']; }
+			if ($_POST['action'] == "add") { $vlan[$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==$vlan[$field['name']])	{ print "<option value='$v' selected='selected'>$v</option>"; }
-					else								{ print "<option value='$v'>$v</option>"; }
+				foreach ($tmp as $v) {
+					if ($v == $vlan[$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">';
@@ -188,38 +188,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($vlan[$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="'. $vlan[$field['name']]. '" '.$readonly.' rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n"; }
+				if (!isset($vlan[$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="'.$vlan[$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($vlan[$field['name']])==0 && $k==2)	{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
-					elseif($k==$vlan[$field['name']])				{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
-					else												{ print "<option value='$k'>"._($v)."</option>"; }
+				foreach ($tmp as $k=>$v) {
+					if (strlen ($vlan[$field['name']]) == 0 && $k == 2) { print "<option value='$k' selected='selected'>"._ ($v)."</option>"; }
+					elseif ($k == $vlan[$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'].'">'. $vlan[$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'].'">'.$vlan[$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="'. @$vlan[$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="'.@$vlan[$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";
 		}
 	}
 	?>
@@ -229,7 +229,7 @@ 
 
 	<?php
 	//print delete warning
-	if($_POST['action'] == "delete")	{ $Result->show("warning", _('Warning').':</strong> '._('removing VLAN will also remove VLAN reference from belonging subnets')."!", false);  }
+	if ($_POST['action'] == "delete") { $Result->show ("warning", _ ('Warning').':</strong> '._ ('removing VLAN will also remove VLAN reference from belonging subnets')."!", false); }
 	?>
 </div>
 
@@ -237,8 +237,8 @@ 
 <!-- footer -->
 <div class="pFooter">
 	<div class="btn-group">
-		<button class="btn btn-sm btn-default <?php if(isset($_POST['fromSubnet'])) { print "hidePopup2"; } else { print "hidePopups"; } ?>"><?php print _('Cancel'); ?></button>
-		<button class="btn btn-sm btn-default <?php if($_POST['action']=="delete") { print "btn-danger"; } else { print "btn-success"; } ?> vlanManagementEditFromSubnetButton" id="editVLANsubmit"><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 (isset($_POST['fromSubnet'])) { print "hidePopup2"; } else { print "hidePopups"; } ?>"><?php print _ ('Cancel'); ?></button>
+		<button class="btn btn-sm btn-default <?php if ($_POST['action'] == "delete") { print "btn-danger"; } else { print "btn-success"; } ?> vlanManagementEditFromSubnetButton" id="editVLANsubmit"><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 -->