phpipam / phpipam

app/install/select_install_type.php

Spacing +3 added lines, -3 removed lines

@@ -17,7 +17,7 @@ 
 		<ol style="margin-top:20px;">
 		<!-- automatic -->
 		<li>
-			<a href="<?php print create_link("install","install_automatic",null,null,null,true); ?>" class="btn btn-sm btn-default">Automatic database installation</a>
+			<a href="<?php print create_link ("install", "install_automatic", null, null, null, true); ?>" class="btn btn-sm btn-default">Automatic database installation</a>
 			<br>
 			<div class="text-muted">phpipam installer will create database for you automatically.</div>
 			<br>
@@ -25,7 +25,7 @@ 
 		
 		<!-- Mysql inport -->
 		<li>
-			<a href="<?php print create_link("install","install_mysqlimport",null,null,null,true); ?>" class="btn btn-sm btn-default">MySQL import instructions</a>	
+			<a href="<?php print create_link ("install", "install_mysqlimport", null, null, null, true); ?>" class="btn btn-sm btn-default">MySQL import instructions</a>	
 			<br>
 			<div class="text-muted">Install DB files with mysqlimport tool.</div>
 			<br>		
@@ -33,7 +33,7 @@ 
 		
 		<!-- Manual install -->
 		<li>
-			<a href="<?php print create_link("install","install_manual",null,null,null,true); ?>" class="btn btn-sm btn-default">Manual database installation</a>	
+			<a href="<?php print create_link ("install", "install_manual", null, null, null, true); ?>" class="btn btn-sm btn-default">Manual database installation</a>	
 			<br>
 			<div class="text-muted">Install database manually with SQL queries.</div>
 			<br>		

app/install/install-execute.php

Indentation +4 added lines, -4 removed lines

@@ -18,9 +18,9 @@ 
 
 # if already installed ignore!
 if($Install->check_table ("widgets", false) && @$_POST['dropdb']!="on") {
-	# check for possible errors
-	if(sizeof($errors = $Tools->verify_database())>0) 						{ }
-	else 																	{ $Result->show("danger", _("Database already installed"), true);}
+    # check for possible errors
+    if(sizeof($errors = $Tools->verify_database())>0) 						{ }
+    else 																	{ $Result->show("danger", _("Database already installed"), true);}
 }
 
 # get possible advanced options
@@ -30,6 +30,6 @@ 
 
 # try to install new database */
 if($Install->install_database ($_POST['mysqlrootuser'], $_POST['mysqlrootpass'], $dropdb, $createdb, $creategrants)) {
- 	$Result->show("success alert-block", 'Database installed successfully! <a href="?page=install&section=install_automatic&subnetId=configure" class="btn btn-sm btn-default">Continue</a>', true);
+        $Result->show("success alert-block", 'Database installed successfully! <a href="?page=install&section=install_automatic&subnetId=configure" class="btn btn-sm btn-default">Continue</a>', true);
 }
 ?>
\ No newline at end of file

Spacing +12 added lines, -12 removed lines

@@ -5,31 +5,31 @@
  **************************************/
 
 /* functions */
-require( dirname(__FILE__) . '/../../functions/functions.php');
+require(dirname (__FILE__).'/../../functions/functions.php');
 
 # initialize user object
-$Database 	= new Database_PDO;
-$Install 	= new Install ($Database);
+$Database = new Database_PDO;
+$Install = new Install ($Database);
 $Tools	 	= new Tools ($Database);
 $Result 	= new Result ();
 
 # make sure it is properly requested
-if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest")						{ $Result->show("danger", _("Invalid request"), true); }
+if ($_SERVER['HTTP_X_REQUESTED_WITH'] != "XMLHttpRequest") { $Result->show ("danger", _ ("Invalid request"), true); }
 
 # if already installed ignore!
-if($Install->check_table ("widgets", false) && @$_POST['dropdb']!="on") {
+if ($Install->check_table ("widgets", false) && @$_POST['dropdb'] != "on") {
 	# check for possible errors
-	if(sizeof($errors = $Tools->verify_database())>0) 						{ }
-	else 																	{ $Result->show("danger", _("Database already installed"), true);}
+	if (sizeof ($errors = $Tools->verify_database ()) > 0) { }
+	else { $Result->show ("danger", _ ("Database already installed"), true); }
 }
 
 # get possible advanced options
-$dropdb 		= @$_POST['dropdb']=="on" ? true : false;
-$createdb 		= @$_POST['createdb']=="on" ? true : false;
-$creategrants 	= @$_POST['creategrants']=="on" ? true : false;
+$dropdb = @$_POST['dropdb'] == "on" ? true : false;
+$createdb = @$_POST['createdb'] == "on" ? true : false;
+$creategrants = @$_POST['creategrants'] == "on" ? true : false;
 
 # try to install new database */
-if($Install->install_database ($_POST['mysqlrootuser'], $_POST['mysqlrootpass'], $dropdb, $createdb, $creategrants)) {
- 	$Result->show("success alert-block", 'Database installed successfully! <a href="?page=install&section=install_automatic&subnetId=configure" class="btn btn-sm btn-default">Continue</a>', true);
+if ($Install->install_database ($_POST['mysqlrootuser'], $_POST['mysqlrootpass'], $dropdb, $createdb, $creategrants)) {
+ 	$Result->show ("success alert-block", 'Database installed successfully! <a href="?page=install&section=install_automatic&subnetId=configure" class="btn btn-sm btn-default">Continue</a>', true);
 }
 ?>
\ No newline at end of file

app/admin/nameservers/index.php

Indentation +56 added lines, -56 removed lines

@@ -22,69 +22,69 @@
 # first check if they exist!
 if($all_nameservers===false) { $Result->show("danger", _("No nameserver sets defined")."!", true);}
 else {
-	print '<table id="nameserverManagement" class="table sorted table-striped table-top table-hover table-td-top">'. "\n";
+    print '<table id="nameserverManagement" class="table sorted table-striped table-top table-hover table-td-top">'. "\n";
 
-	# headers
-	print "<thead>";
-	print '<tr>'. "\n";
-	print '	<th>'._('Nameserver set').'</th>'. "\n";
-	print '	<th>'._('Nameservers').'</th>'. "\n";
-	print '	<th>'._('Sections').'</th>'. "\n";
-	print '	<th>'._('Description').'</th>'. "\n";
-	print '	<th></th>'. "\n";
-	print '</tr>'. "\n";
-	print "</thead>";
+    # headers
+    print "<thead>";
+    print '<tr>'. "\n";
+    print '	<th>'._('Nameserver set').'</th>'. "\n";
+    print '	<th>'._('Nameservers').'</th>'. "\n";
+    print '	<th>'._('Sections').'</th>'. "\n";
+    print '	<th>'._('Description').'</th>'. "\n";
+    print '	<th></th>'. "\n";
+    print '</tr>'. "\n";
+    print "</thead>";
 
     print "<tbody>";
-	# loop
-	foreach ($all_nameservers as $nameservers) {
-		//cast
-		$nameservers = (array) $nameservers;
+    # loop
+    foreach ($all_nameservers as $nameservers) {
+        //cast
+        $nameservers = (array) $nameservers;
 
-		unset($permitted_sections);
-		$permitted_sections = array();
+        unset($permitted_sections);
+        $permitted_sections = array();
 
-		// sections
-		if (!is_null($nameservers['permissions'])) {
-			$sections = array_filter(explode(";", $nameservers['permissions']));
-			// some
-			if (sizeof($sections)>0) {
-				foreach($sections as $id) {
-					$sect = $Admin->fetch_object ("sections", "id", $id);
-					// exists
-					if ($sect!==false) {
-						$permitted_sections[] = "<span class='badge badge1 badge5'>".$sect->name."</span>";
-					}
-				}
-			}
-			else {
-				$permitted_sections[] = "/";
-			}
-		}
-		// none
-		else {
-			$permitted_sections[] = "/";
-		}
+        // sections
+        if (!is_null($nameservers['permissions'])) {
+            $sections = array_filter(explode(";", $nameservers['permissions']));
+            // some
+            if (sizeof($sections)>0) {
+                foreach($sections as $id) {
+                    $sect = $Admin->fetch_object ("sections", "id", $id);
+                    // exists
+                    if ($sect!==false) {
+                        $permitted_sections[] = "<span class='badge badge1 badge5'>".$sect->name."</span>";
+                    }
+                }
+            }
+            else {
+                $permitted_sections[] = "/";
+            }
+        }
+        // none
+        else {
+            $permitted_sections[] = "/";
+        }
 
-		// merge all nmeservers
-		$all_nameservers = explode(";", $nameservers['namesrv1']);
+        // merge all nmeservers
+        $all_nameservers = explode(";", $nameservers['namesrv1']);
 
-		//print details
-		print '<tr>'. "\n";
-		print '	<td class="name"><strong>'. $nameservers['name'] .'</strong></td>'. "\n";
-		print '	<td class="namesrv1">'. implode("<br>", $all_nameservers) .'</td>'. "\n";
-		print '	<td class="sections">'. implode("<br>", $permitted_sections).'</td>'. "\n";
-		print '	<td class="description">'. $nameservers['description'] .'</td>'. "\n";
-		print "	<td class='actions'>";
-		print "	<div class='btn-group'>";
-		print "		<button class='btn btn-xs btn-default nameserverManagement' data-action='edit'   data-nameserverid='$nameservers[id]'><i class='fa fa-pencil'></i></button>";
-		print "		<button class='btn btn-xs btn-default nameserverManagement' data-action='delete' data-nameserverid='$nameservers[id]'><i class='fa fa-times'></i></button>";
-		print "	</div>";
-		print "	</td>";
-		print '</tr>'. "\n";
-	}
-	print "</tbody>";
-	print '</table>'. "\n";
+        //print details
+        print '<tr>'. "\n";
+        print '	<td class="name"><strong>'. $nameservers['name'] .'</strong></td>'. "\n";
+        print '	<td class="namesrv1">'. implode("<br>", $all_nameservers) .'</td>'. "\n";
+        print '	<td class="sections">'. implode("<br>", $permitted_sections).'</td>'. "\n";
+        print '	<td class="description">'. $nameservers['description'] .'</td>'. "\n";
+        print "	<td class='actions'>";
+        print "	<div class='btn-group'>";
+        print "		<button class='btn btn-xs btn-default nameserverManagement' data-action='edit'   data-nameserverid='$nameservers[id]'><i class='fa fa-pencil'></i></button>";
+        print "		<button class='btn btn-xs btn-default nameserverManagement' data-action='delete' data-nameserverid='$nameservers[id]'><i class='fa fa-times'></i></button>";
+        print "	</div>";
+        print "	</td>";
+        print '</tr>'. "\n";
+    }
+    print "</tbody>";
+    print '</table>'. "\n";
 }
 ?>
 

Spacing +27 added lines, -27 removed lines

@@ -5,34 +5,34 @@ 
  ************************************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # fetch all vrfs
-$all_nameservers = $Admin->fetch_all_objects("nameservers", "id");
+$all_nameservers = $Admin->fetch_all_objects ("nameservers", "id");
 ?>
 
-<h4><?php print _('Manage Nameserver sets'); ?></h4>
+<h4><?php print _ ('Manage Nameserver sets'); ?></h4>
 <hr><br>
 
-<button class='btn btn-sm btn-default nameserverManagement' data-action='add' data-nameserverid='' style='margin-bottom:10px;'><i class='fa fa-plus'></i> <?php print _('Add nameserver set'); ?></button>
+<button class='btn btn-sm btn-default nameserverManagement' data-action='add' data-nameserverid='' style='margin-bottom:10px;'><i class='fa fa-plus'></i> <?php print _ ('Add nameserver set'); ?></button>
 
 <!-- nameserver sets -->
 <?php
 
 # first check if they exist!
-if($all_nameservers===false) { $Result->show("danger", _("No nameserver sets defined")."!", true);}
+if ($all_nameservers === false) { $Result->show ("danger", _ ("No nameserver sets defined")."!", true); }
 else {
-	print '<table id="nameserverManagement" class="table sorted table-striped table-top table-hover table-td-top">'. "\n";
+	print '<table id="nameserverManagement" class="table sorted table-striped table-top table-hover table-td-top">'."\n";
 
 	# headers
 	print "<thead>";
-	print '<tr>'. "\n";
-	print '	<th>'._('Nameserver set').'</th>'. "\n";
-	print '	<th>'._('Nameservers').'</th>'. "\n";
-	print '	<th>'._('Sections').'</th>'. "\n";
-	print '	<th>'._('Description').'</th>'. "\n";
-	print '	<th></th>'. "\n";
-	print '</tr>'. "\n";
+	print '<tr>'."\n";
+	print '	<th>'._ ('Nameserver set').'</th>'."\n";
+	print '	<th>'._ ('Nameservers').'</th>'."\n";
+	print '	<th>'._ ('Sections').'</th>'."\n";
+	print '	<th>'._ ('Description').'</th>'."\n";
+	print '	<th></th>'."\n";
+	print '</tr>'."\n";
 	print "</thead>";
 
     print "<tbody>";
@@ -42,17 +42,17 @@ 
 		$nameservers = (array) $nameservers;
 
 		unset($permitted_sections);
-		$permitted_sections = array();
+		$permitted_sections = array ();
 
 		// sections
-		if (!is_null($nameservers['permissions'])) {
-			$sections = array_filter(explode(";", $nameservers['permissions']));
+		if (!is_null ($nameservers['permissions'])) {
+			$sections = array_filter (explode (";", $nameservers['permissions']));
 			// some
-			if (sizeof($sections)>0) {
-				foreach($sections as $id) {
+			if (sizeof ($sections) > 0) {
+				foreach ($sections as $id) {
 					$sect = $Admin->fetch_object ("sections", "id", $id);
 					// exists
-					if ($sect!==false) {
+					if ($sect !== false) {
 						$permitted_sections[] = "<span class='badge badge1 badge5'>".$sect->name."</span>";
 					}
 				}
@@ -67,24 +67,24 @@ 
 		}
 
 		// merge all nmeservers
-		$all_nameservers = explode(";", $nameservers['namesrv1']);
+		$all_nameservers = explode (";", $nameservers['namesrv1']);
 
 		//print details
-		print '<tr>'. "\n";
-		print '	<td class="name"><strong>'. $nameservers['name'] .'</strong></td>'. "\n";
-		print '	<td class="namesrv1">'. implode("<br>", $all_nameservers) .'</td>'. "\n";
-		print '	<td class="sections">'. implode("<br>", $permitted_sections).'</td>'. "\n";
-		print '	<td class="description">'. $nameservers['description'] .'</td>'. "\n";
+		print '<tr>'."\n";
+		print '	<td class="name"><strong>'.$nameservers['name'].'</strong></td>'."\n";
+		print '	<td class="namesrv1">'.implode ("<br>", $all_nameservers).'</td>'."\n";
+		print '	<td class="sections">'.implode ("<br>", $permitted_sections).'</td>'."\n";
+		print '	<td class="description">'.$nameservers['description'].'</td>'."\n";
 		print "	<td class='actions'>";
 		print "	<div class='btn-group'>";
 		print "		<button class='btn btn-xs btn-default nameserverManagement' data-action='edit'   data-nameserverid='$nameservers[id]'><i class='fa fa-pencil'></i></button>";
 		print "		<button class='btn btn-xs btn-default nameserverManagement' data-action='delete' data-nameserverid='$nameservers[id]'><i class='fa fa-times'></i></button>";
 		print "	</div>";
 		print "	</td>";
-		print '</tr>'. "\n";
+		print '</tr>'."\n";
 	}
 	print "</tbody>";
-	print '</table>'. "\n";
+	print '</table>'."\n";
 }
 ?>
 

app/admin/nameservers/edit-result.php

Indentation +17 added lines, -17 removed lines

@@ -25,38 +25,38 @@
 
 # Name and primary nameserver must be present!
 if ($_POST['action']!="delete") {
-	if($_POST['name'] == "") 				{ $Result->show("danger", _("Name is mandatory"), true); }
-	if(trim($_POST['namesrv-1']) == "") 	{ $Result->show("danger", _("Primary nameserver is mandatory"), true); }
+    if($_POST['name'] == "") 				{ $Result->show("danger", _("Name is mandatory"), true); }
+    if(trim($_POST['namesrv-1']) == "") 	{ $Result->show("danger", _("Primary nameserver is mandatory"), true); }
 }
 
 // merge nameservers
 foreach($_POST as $key=>$line) {
-	if (strlen(strstr($key,"namesrv-"))>0) {
-		if (strlen($line)>0) {
-			$all_nameservers[] = trim($line);
-		}
-	}
+    if (strlen(strstr($key,"namesrv-"))>0) {
+        if (strlen($line)>0) {
+            $all_nameservers[] = trim($line);
+        }
+    }
 }
 $_POST['namesrv1'] = isset($all_nameservers) ? implode(";", $all_nameservers) : "";
 
 // set sections
 foreach($_POST as $key=>$line) {
-	if (strlen(strstr($key,"section-"))>0) {
-		$key2 = str_replace("section-", "", $key);
-		$temp[] = $key2;
-		unset($_POST[$key]);
-	}
+    if (strlen(strstr($key,"section-"))>0) {
+        $key2 = str_replace("section-", "", $key);
+        $temp[] = $key2;
+        unset($_POST[$key]);
+    }
 }
 # glue sections together
 $_POST['permissions'] = sizeof($temp)>0 ? implode(";", $temp) : null;
 
 # set update array
 $values = array("id"=>@$_POST['nameserverId'],
-				"name"=>$_POST['name'],
-				"permissions"=>$_POST['permissions'],
-				"namesrv1"=>$_POST['namesrv1'],
-				"description"=>$_POST['description']
-				);
+                "name"=>$_POST['name'],
+                "permissions"=>$_POST['permissions'],
+                "namesrv1"=>$_POST['namesrv1'],
+                "description"=>$_POST['description']
+                );
 # update
 if(!$Admin->object_modify("nameservers", $_POST['action'], "id", $values))	{ $Result->show("danger",  _("Failed to $_POST[action] nameserver set").'!', true); }
 else																		{ $Result->show("success", _("Nameserver set $_POST[action] successfull").'!', false); }

Spacing +22 added lines, -22 removed lines

@@ -5,63 +5,63 @@
  ***************************/
 
 /* 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", "ns", $_POST['csrf_cookie']) === false ? $Result->show("danger", _("Invalid CSRF cookie"), true) : "";
+$User->csrf_cookie ("validate", "ns", $_POST['csrf_cookie']) === false ? $Result->show ("danger", _ ("Invalid CSRF cookie"), true) : "";
 
 
 # Name and primary nameserver must be present!
-if ($_POST['action']!="delete") {
-	if($_POST['name'] == "") 				{ $Result->show("danger", _("Name is mandatory"), true); }
-	if(trim($_POST['namesrv-1']) == "") 	{ $Result->show("danger", _("Primary nameserver is mandatory"), true); }
+if ($_POST['action'] != "delete") {
+	if ($_POST['name'] == "") { $Result->show ("danger", _ ("Name is mandatory"), true); }
+	if (trim ($_POST['namesrv-1']) == "") { $Result->show ("danger", _ ("Primary nameserver is mandatory"), true); }
 }
 
 // merge nameservers
-foreach($_POST as $key=>$line) {
-	if (strlen(strstr($key,"namesrv-"))>0) {
-		if (strlen($line)>0) {
-			$all_nameservers[] = trim($line);
+foreach ($_POST as $key=>$line) {
+	if (strlen (strstr ($key, "namesrv-")) > 0) {
+		if (strlen ($line) > 0) {
+			$all_nameservers[] = trim ($line);
 		}
 	}
 }
-$_POST['namesrv1'] = isset($all_nameservers) ? implode(";", $all_nameservers) : "";
+$_POST['namesrv1'] = isset($all_nameservers) ? implode (";", $all_nameservers) : "";
 
 // set sections
-foreach($_POST as $key=>$line) {
-	if (strlen(strstr($key,"section-"))>0) {
-		$key2 = str_replace("section-", "", $key);
+foreach ($_POST as $key=>$line) {
+	if (strlen (strstr ($key, "section-")) > 0) {
+		$key2 = str_replace ("section-", "", $key);
 		$temp[] = $key2;
 		unset($_POST[$key]);
 	}
 }
 # glue sections together
-$_POST['permissions'] = sizeof($temp)>0 ? implode(";", $temp) : null;
+$_POST['permissions'] = sizeof ($temp) > 0 ? implode (";", $temp) : null;
 
 # set update array
-$values = array("id"=>@$_POST['nameserverId'],
+$values = array ("id"=>@$_POST['nameserverId'],
 				"name"=>$_POST['name'],
 				"permissions"=>$_POST['permissions'],
 				"namesrv1"=>$_POST['namesrv1'],
 				"description"=>$_POST['description']
 				);
 # update
-if(!$Admin->object_modify("nameservers", $_POST['action'], "id", $values))	{ $Result->show("danger",  _("Failed to $_POST[action] nameserver set").'!', true); }
-else																		{ $Result->show("success", _("Nameserver set $_POST[action] successfull").'!', false); }
+if (!$Admin->object_modify ("nameservers", $_POST['action'], "id", $values)) { $Result->show ("danger", _ ("Failed to $_POST[action] nameserver set").'!', true); }
+else { $Result->show ("success", _ ("Nameserver set $_POST[action] successfull").'!', false); }
 
 
 # remove all references if delete
-if($_POST['action']=="delete") { $Admin->remove_object_references ("nameservers", "id", $_POST['nameserverId']); }
+if ($_POST['action'] == "delete") { $Admin->remove_object_references ("nameservers", "id", $_POST['nameserverId']); }
 ?>

app/admin/nameservers/edit.php

Indentation +35 added lines, -35 removed lines

@@ -23,9 +23,9 @@ 
 
 # get Nameserver sets
 if($_POST['action']!="add") {
-	$nameservers = $Admin->fetch_object ("nameservers", "id", $_POST['nameserverId']);
-	$nameservers!==false ? : $Result->show("danger", _("Invalid ID"), true, true);
-	$nameservers = (array) $nameservers;
+    $nameservers = $Admin->fetch_object ("nameservers", "id", $_POST['nameserverId']);
+    $nameservers!==false ? : $Result->show("danger", _("Invalid ID"), true, true);
+    $nameservers = (array) $nameservers;
 }
 
 # disable edit on delete
@@ -59,20 +59,20 @@ 
 	<tbody id="nameservers">
 	<!-- Nameservers -->
 	<?php
-	//loop
-	$m=1;
-	foreach ($nameservers['namesrv1'] as $ns) {
-		print "<tr id='namesrv-$m'>";
-		print "	<td>"._("Nameserver")." $m</td>";
-		print "	<td>";
-		print "	<input type='text' class='rd form-control input-sm' name='namesrv-$m' value='$ns' $readonly>";
-		print "	</td>";
-		print "	<td><button class='btn btn-sm btn-default' id='remove_nameserver' data-id='namesrv-".$m."'><i class='fa fa-trash-o'></i></button></td>";
-		print "</tr>";
-		//next
-		$m++;
-	}
-	?>
+    //loop
+    $m=1;
+    foreach ($nameservers['namesrv1'] as $ns) {
+        print "<tr id='namesrv-$m'>";
+        print "	<td>"._("Nameserver")." $m</td>";
+        print "	<td>";
+        print "	<input type='text' class='rd form-control input-sm' name='namesrv-$m' value='$ns' $readonly>";
+        print "	</td>";
+        print "	<td><button class='btn btn-sm btn-default' id='remove_nameserver' data-id='namesrv-".$m."'><i class='fa fa-trash-o'></i></button></td>";
+        print "</tr>";
+        //next
+        $m++;
+    }
+    ?>
 	</tbody>
 
 	<tbody>
@@ -90,8 +90,8 @@ 
 		<td><?php print _('Description'); ?></td>
 		<td>
 			<?php
-			if( ($_POST['action'] == "edit") || ($_POST['action'] == "delete") ) { print '<input type="hidden" name="nameserverId" value="'. $_POST['nameserverId'] .'">'. "\n";}
-			?>
+            if( ($_POST['action'] == "edit") || ($_POST['action'] == "delete") ) { print '<input type="hidden" name="nameserverId" value="'. $_POST['nameserverId'] .'">'. "\n";}
+            ?>
 			<input type="hidden" name="action" value="<?php print $_POST['action']; ?>">
 			<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
 			<input type="text" class="description form-control input-sm" name="description" placeholder="<?php print _('Description'); ?>" value="<?php print @$nameservers['description']; ?>" <?php print $readonly; ?>>
@@ -104,19 +104,19 @@ 
 		<td style="vertical-align: top !important"><?php print _('Sections to display nameserver set in'); ?>:</td>
 		<td>
 		<?php
-		# select sections
-		$sections = $Sections->fetch_all_sections();
-		# reformat domains sections to array
-		$nameservers_sections = explode(";", @$nameservers['permissions']);
-		$nameservers_sections = is_array($nameservers_sections) ? $nameservers_sections : array();
-		// loop
-		if ($sections !== false) {
-			foreach($sections as $section) {
-				if(in_array($section->id, @$nameservers_sections)) 	{ print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="section-'. $section->id .'" value="on" checked> '. $section->name .'</div>'. "\n"; }
-				else 												{ print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="section-'. $section->id .'" value="on">'. $section->name .'</span></div>'. "\n"; }
-			}
-		}
-		?>
+        # select sections
+        $sections = $Sections->fetch_all_sections();
+        # reformat domains sections to array
+        $nameservers_sections = explode(";", @$nameservers['permissions']);
+        $nameservers_sections = is_array($nameservers_sections) ? $nameservers_sections : array();
+        // loop
+        if ($sections !== false) {
+            foreach($sections as $section) {
+                if(in_array($section->id, @$nameservers_sections)) 	{ print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="section-'. $section->id .'" value="on" checked> '. $section->name .'</div>'. "\n"; }
+                else 												{ print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="section-'. $section->id .'" value="on">'. $section->name .'</span></div>'. "\n"; }
+            }
+        }
+        ?>
 		</td>
 		<td></td>
 	</tr>
@@ -126,9 +126,9 @@ 
 	</form>
 
 	<?php
-	//print delete warning
-	if($_POST['action'] == "delete")	{ $Result->show("warning", "<strong>"._('Warning').":</strong> "._("removing nameserver set will also remove all references from belonging subnets!"), false);}
-	?>
+    //print delete warning
+    if($_POST['action'] == "delete")	{ $Result->show("warning", "<strong>"._('Warning').":</strong> "._("removing nameserver set will also remove all references from belonging subnets!"), false);}
+    ?>
 </div>
 
 

Braces +4 added lines, -1 removed lines

@@ -136,7 +136,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="editNameservers"><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="editNameservers"><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="nameserverManagementEditResult"></div>

Spacing +28 added lines, -28 removed lines

@@ -5,39 +5,39 @@ 
  ************************************************/
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
-$Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Admin	 	= new Admin ($Database);
 $Tools	 	= new Tools ($Database);
-$Sections	= new Sections ($Database);
+$Sections = new Sections ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # create csrf token
 $csrf = $User->csrf_cookie ("create", "ns");
 
 # get Nameserver sets
-if($_POST['action']!="add") {
+if ($_POST['action'] != "add") {
 	$nameservers = $Admin->fetch_object ("nameservers", "id", $_POST['nameserverId']);
-	$nameservers!==false ? : $Result->show("danger", _("Invalid ID"), true, true);
+	$nameservers !== false ? : $Result->show ("danger", _ ("Invalid ID"), true, true);
 	$nameservers = (array) $nameservers;
 }
 
 # disable edit on delete
-$readonly = $_POST['action']=="delete" ? "readonly" : "";
+$readonly = $_POST['action'] == "delete" ? "readonly" : "";
 
 # set nameservers
-$nameservers['namesrv1'] = !isset($nameservers) ? array(" ") : explode(";", $nameservers['namesrv1']);
+$nameservers['namesrv1'] = !isset($nameservers) ? array (" ") : explode (";", $nameservers['namesrv1']);
 ?>
 
 
 <!-- header -->
-<div class="pHeader"><?php print ucwords(_("$_POST[action]")); ?> <?php print _('Nameserver set'); ?></div>
+<div class="pHeader"><?php print ucwords (_ ("$_POST[action]")); ?> <?php print _ ('Nameserver set'); ?></div>
 
 <!-- content -->
 <div class="pContent">
@@ -48,9 +48,9 @@ 
 	<tbody>
 	<!-- name  -->
 	<tr>
-		<td style="width: 200px;"><?php print _('Name'); ?></td>
+		<td style="width: 200px;"><?php print _ ('Name'); ?></td>
 		<td>
-			<input type="text" class="name form-control input-sm" name="name" placeholder="<?php print _('Nameserver set'); ?>" value="<?php print @$nameservers['name']; ?>" <?php print $readonly; ?>>
+			<input type="text" class="name form-control input-sm" name="name" placeholder="<?php print _ ('Nameserver set'); ?>" value="<?php print @$nameservers['name']; ?>" <?php print $readonly; ?>>
 		</td>
 		<td></td>
 	</tr>
@@ -60,10 +60,10 @@ 
 	<!-- Nameservers -->
 	<?php
 	//loop
-	$m=1;
+	$m = 1;
 	foreach ($nameservers['namesrv1'] as $ns) {
 		print "<tr id='namesrv-$m'>";
-		print "	<td>"._("Nameserver")." $m</td>";
+		print "	<td>"._ ("Nameserver")." $m</td>";
 		print "	<td>";
 		print "	<input type='text' class='rd form-control input-sm' name='namesrv-$m' value='$ns' $readonly>";
 		print "	</td>";
@@ -80,40 +80,40 @@ 
 	<tr>
 		<td></td>
 		<td>
-			<button class="btn btn-sm btn-default" id="add_nameserver" data-id='<?php print $m; ?>' <?php print $readonly; ?>><i class="fa fa-plus"></i> <?php print _('Add nameserver'); ?></button>
+			<button class="btn btn-sm btn-default" id="add_nameserver" data-id='<?php print $m; ?>' <?php print $readonly; ?>><i class="fa fa-plus"></i> <?php print _ ('Add nameserver'); ?></button>
 		</td>
 		<td></td>
 	</tr>
 
 	<!-- Description -->
 	<tr>
-		<td><?php print _('Description'); ?></td>
+		<td><?php print _ ('Description'); ?></td>
 		<td>
 			<?php
-			if( ($_POST['action'] == "edit") || ($_POST['action'] == "delete") ) { print '<input type="hidden" name="nameserverId" value="'. $_POST['nameserverId'] .'">'. "\n";}
+			if (($_POST['action'] == "edit") || ($_POST['action'] == "delete")) { print '<input type="hidden" name="nameserverId" value="'.$_POST['nameserverId'].'">'."\n"; }
 			?>
 			<input type="hidden" name="action" value="<?php print $_POST['action']; ?>">
 			<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
-			<input type="text" class="description form-control input-sm" name="description" placeholder="<?php print _('Description'); ?>" value="<?php print @$nameservers['description']; ?>" <?php print $readonly; ?>>
+			<input type="text" class="description form-control input-sm" name="description" placeholder="<?php print _ ('Description'); ?>" value="<?php print @$nameservers['description']; ?>" <?php print $readonly; ?>>
 		</td>
 		<td></td>
 	</tr>
 
 	<!-- sections -->
 	<tr>
-		<td style="vertical-align: top !important"><?php print _('Sections to display nameserver set in'); ?>:</td>
+		<td style="vertical-align: top !important"><?php print _ ('Sections to display nameserver set in'); ?>:</td>
 		<td>
 		<?php
 		# select sections
-		$sections = $Sections->fetch_all_sections();
+		$sections = $Sections->fetch_all_sections ();
 		# reformat domains sections to array
-		$nameservers_sections = explode(";", @$nameservers['permissions']);
-		$nameservers_sections = is_array($nameservers_sections) ? $nameservers_sections : array();
+		$nameservers_sections = explode (";", @$nameservers['permissions']);
+		$nameservers_sections = is_array ($nameservers_sections) ? $nameservers_sections : array ();
 		// loop
 		if ($sections !== false) {
-			foreach($sections as $section) {
-				if(in_array($section->id, @$nameservers_sections)) 	{ print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="section-'. $section->id .'" value="on" checked> '. $section->name .'</div>'. "\n"; }
-				else 												{ print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="section-'. $section->id .'" value="on">'. $section->name .'</span></div>'. "\n"; }
+			foreach ($sections as $section) {
+				if (in_array ($section->id, @$nameservers_sections)) { print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="section-'.$section->id.'" value="on" checked> '.$section->name.'</div>'."\n"; }
+				else { print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="section-'.$section->id.'" value="on">'.$section->name.'</span></div>'."\n"; }
 			}
 		}
 		?>
@@ -127,7 +127,7 @@ 
 
 	<?php
 	//print delete warning
-	if($_POST['action'] == "delete")	{ $Result->show("warning", "<strong>"._('Warning').":</strong> "._("removing nameserver set will also remove all references from belonging subnets!"), false);}
+	if ($_POST['action'] == "delete") { $Result->show ("warning", "<strong>"._ ('Warning').":</strong> "._ ("removing nameserver set will also remove all references from belonging subnets!"), false); }
 	?>
 </div>
 
@@ -135,8 +135,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="editNameservers"><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="editNameservers"><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="nameserverManagementEditResult"></div>

app/admin/widgets/index.php

Indentation +42 added lines, -42 removed lines

@@ -27,57 +27,57 @@
 
 	<!-- Language list -->
 	<?php
-	/* no results */
-	if($widgets===false) { ?>
+    /* no results */
+    if($widgets===false) { ?>
 		<tr>
 			<td colspan="4"><div class="alert alert-info alert-nomargin"><?php print _('No widgets created yet'); ?></div></td>
 		</tr>
 	<?php } else {
-		# headers
-		print "<thead>";
-		print "<tr>";
-		print "	<th>"._('Title')."</th>";
-		print "	<th>"._('Description')."</th>";
-		print "	<th>"._('File')."</th>";
-		print "	<th>"._('Admin')."</th>";
-		print "	<th>"._('Active')."</th>";
-		print "	<th>"._('Parameters')."</th>";
-		print "	<th>"._('Validity')."</th>";
-		print "	<th></th>";
-		print "</tr>";
-		print "</thead>";
+        # headers
+        print "<thead>";
+        print "<tr>";
+        print "	<th>"._('Title')."</th>";
+        print "	<th>"._('Description')."</th>";
+        print "	<th>"._('File')."</th>";
+        print "	<th>"._('Admin')."</th>";
+        print "	<th>"._('Active')."</th>";
+        print "	<th>"._('Parameters')."</th>";
+        print "	<th>"._('Validity')."</th>";
+        print "	<th></th>";
+        print "</tr>";
+        print "</thead>";
 
         print "<tbody>";
-		# print
-		foreach($widgets as $w) {
-			# cast
-			$w = (array) $w;
+        # print
+        foreach($widgets as $w) {
+            # cast
+            $w = (array) $w;
 
-			# verify validity
-			$valid = $Tools->verify_widget($w['wfile']);
+            # verify validity
+            $valid = $Tools->verify_widget($w['wfile']);
 
-			if($valid)  { $vPrint = "<span class='alert alert-success'>"._('Valid')."</span>"; }
-			else		{ $vPrint = "<span class='alert alert-danger'>"._('Invalid')."</span>"; }
+            if($valid)  { $vPrint = "<span class='alert alert-success'>"._('Valid')."</span>"; }
+            else		{ $vPrint = "<span class='alert alert-danger'>"._('Invalid')."</span>"; }
 
-			print "<tr>";
-			print "	<td>"._($w['wtitle'])."</td>";
-			print "	<td>"._($w['wdescription'])."</td>";
-			print "	<td>$w[wfile].php</td>";
-			print "	<td>"._($w['wadminonly'])."</td>";
-			print "	<td>"._($w['wactive'])."</td>";
-			print "	<td>"._($w['wparams'])."</td>";
-			print "	<td>$vPrint</td>";
-			print "	<td>";
-			print "	<div class='btn-group'>";
-			print "		<button class='btn btn-xs btn-default wedit' data-action='edit' data-wid='$w[wid]'><i class='fa fa-pencil'></i></button>";
-			print "		<button class='btn btn-xs btn-default wedit' data-action='delete' data-wid='$w[wid]'><i class='fa fa-times'></i></button>";
-			print "	</div>";
-			print "	</td>";
-			print "</tr>";
-		}
-		print "</tbody>";
-	}
-	?>
+            print "<tr>";
+            print "	<td>"._($w['wtitle'])."</td>";
+            print "	<td>"._($w['wdescription'])."</td>";
+            print "	<td>$w[wfile].php</td>";
+            print "	<td>"._($w['wadminonly'])."</td>";
+            print "	<td>"._($w['wactive'])."</td>";
+            print "	<td>"._($w['wparams'])."</td>";
+            print "	<td>$vPrint</td>";
+            print "	<td>";
+            print "	<div class='btn-group'>";
+            print "		<button class='btn btn-xs btn-default wedit' data-action='edit' data-wid='$w[wid]'><i class='fa fa-pencil'></i></button>";
+            print "		<button class='btn btn-xs btn-default wedit' data-action='delete' data-wid='$w[wid]'><i class='fa fa-times'></i></button>";
+            print "	</div>";
+            print "	</td>";
+            print "</tr>";
+        }
+        print "</tbody>";
+    }
+    ?>
 
 
 </table>

Braces +2 added lines, -1 removed lines

@@ -27,7 +27,8 @@
 		<tr>
 			<td colspan="4"><div class="alert alert-info alert-nomargin"><?php print _('No languages present created yet'); ?></div></td>
 		</tr>
-	<?php } else {
+	<?php }
+else {
 		# headers
 		print "<tr>";
 		print "	<th>"._('Language code')."</th>";

Spacing +24 added lines, -24 removed lines

@@ -5,67 +5,67 @@ 
  ****************************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # fetch all widgets
-$widgets = $Admin->fetch_all_objects("widgets", "wid");
+$widgets = $Admin->fetch_all_objects ("widgets", "wid");
 ?>
 
 
-<h4><?php print _('Widgets'); ?></h4>
+<h4><?php print _ ('Widgets'); ?></h4>
 <hr>
 <?php
 print "<p class='muted'>";
-print _('You can manage widgets here').".<br>";
+print _ ('You can manage widgets here').".<br>";
 print "</p>";
 ?>
 
 <!-- Add new -->
-<button class="btn btn-sm btn-default wedit" data-action='add' style="margin-bottom:10px;"><i class="fa fa-plus"></i> <?php print _("Create new widget"); ?></button>
+<button class="btn btn-sm btn-default wedit" data-action='add' style="margin-bottom:10px;"><i class="fa fa-plus"></i> <?php print _ ("Create new widget"); ?></button>
 
 <table class="table sorted table-striped table-top" style="min-width:400px;">
 
 	<!-- Language list -->
 	<?php
 	/* no results */
-	if($widgets===false) { ?>
+	if ($widgets === false) { ?>
 		<tr>
-			<td colspan="4"><div class="alert alert-info alert-nomargin"><?php print _('No widgets created yet'); ?></div></td>
+			<td colspan="4"><div class="alert alert-info alert-nomargin"><?php print _ ('No widgets created yet'); ?></div></td>
 		</tr>
 	<?php } else {
 		# headers
 		print "<thead>";
 		print "<tr>";
-		print "	<th>"._('Title')."</th>";
-		print "	<th>"._('Description')."</th>";
-		print "	<th>"._('File')."</th>";
-		print "	<th>"._('Admin')."</th>";
-		print "	<th>"._('Active')."</th>";
-		print "	<th>"._('Parameters')."</th>";
-		print "	<th>"._('Validity')."</th>";
+		print "	<th>"._ ('Title')."</th>";
+		print "	<th>"._ ('Description')."</th>";
+		print "	<th>"._ ('File')."</th>";
+		print "	<th>"._ ('Admin')."</th>";
+		print "	<th>"._ ('Active')."</th>";
+		print "	<th>"._ ('Parameters')."</th>";
+		print "	<th>"._ ('Validity')."</th>";
 		print "	<th></th>";
 		print "</tr>";
 		print "</thead>";
 
         print "<tbody>";
 		# print
-		foreach($widgets as $w) {
+		foreach ($widgets as $w) {
 			# cast
 			$w = (array) $w;
 
 			# verify validity
-			$valid = $Tools->verify_widget($w['wfile']);
+			$valid = $Tools->verify_widget ($w['wfile']);
 
-			if($valid)  { $vPrint = "<span class='alert alert-success'>"._('Valid')."</span>"; }
-			else		{ $vPrint = "<span class='alert alert-danger'>"._('Invalid')."</span>"; }
+			if ($valid) { $vPrint = "<span class='alert alert-success'>"._ ('Valid')."</span>"; }
+			else { $vPrint = "<span class='alert alert-danger'>"._ ('Invalid')."</span>"; }
 
 			print "<tr>";
-			print "	<td>"._($w['wtitle'])."</td>";
-			print "	<td>"._($w['wdescription'])."</td>";
+			print "	<td>"._ ($w['wtitle'])."</td>";
+			print "	<td>"._ ($w['wdescription'])."</td>";
 			print "	<td>$w[wfile].php</td>";
-			print "	<td>"._($w['wadminonly'])."</td>";
-			print "	<td>"._($w['wactive'])."</td>";
-			print "	<td>"._($w['wparams'])."</td>";
+			print "	<td>"._ ($w['wadminonly'])."</td>";
+			print "	<td>"._ ($w['wactive'])."</td>";
+			print "	<td>"._ ($w['wparams'])."</td>";
 			print "	<td>$vPrint</td>";
 			print "	<td>";
 			print "	<div class='btn-group'>";
@@ -84,5 +84,5 @@ 
 
 <hr>
 <div class="alert alert-info alert-block alert-auto alert-absolute">
-	<?php print _('Instructions')." : "._('Create widget file in directory app/dashboard/widgets/')."."; ?>
+	<?php print _ ('Instructions')." : "._ ('Create widget file in directory app/dashboard/widgets/')."."; ?>
 </div>

app/admin/widgets/edit-result.php

Indentation +10 added lines, -10 removed lines

@@ -25,7 +25,7 @@ 
 
 # ID must be numeric */
 if($_POST['action']!="add") {
-	if(!is_numeric($_POST['wid']))								{ $Result->show("danger", _("Invalid ID"), true); }
+    if(!is_numeric($_POST['wid']))								{ $Result->show("danger", _("Invalid ID"), true); }
 }
 # Title and path must be present!
 if($_POST['action']!="delete") {
@@ -37,15 +37,15 @@ 
 
 # set update values
 $values = array("wid"=>@$_POST['wid'],
-				"wtitle"=>$_POST['wtitle'],
-				"wdescription"=>@$_POST['wdescription'],
-				"wfile"=>$_POST['wfile'],
-				"wadminonly"=>$_POST['wadminonly'],
-				"wactive"=>$_POST['wactive'],
-				"wparams"=>$_POST['wparams'],
-				"whref"=>$_POST['whref'],
-				"wsize"=>$_POST['wsize']
-				);
+                "wtitle"=>$_POST['wtitle'],
+                "wdescription"=>@$_POST['wdescription'],
+                "wfile"=>$_POST['wfile'],
+                "wadminonly"=>$_POST['wadminonly'],
+                "wactive"=>$_POST['wactive'],
+                "wparams"=>$_POST['wparams'],
+                "whref"=>$_POST['whref'],
+                "wsize"=>$_POST['wsize']
+                );
 # update
 if(!$Admin->object_modify("widgets", $_POST['action'], "wid", $values))	{ $Result->show("danger",  _("Widget $_POST[action] error")."!", true); }
 else																	{ $Result->show("success", _("Widget $_POST[action] success")."!", true); }

Spacing +14 added lines, -14 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);
 $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", "widget", $_POST['csrf_cookie']) === false ? $Result->show("danger", _("Invalid CSRF cookie"), true) : "";
+$User->csrf_cookie ("validate", "widget", $_POST['csrf_cookie']) === false ? $Result->show ("danger", _ ("Invalid CSRF cookie"), true) : "";
 
 
 # ID must be numeric */
-if($_POST['action']!="add") {
-	if(!is_numeric($_POST['wid']))								{ $Result->show("danger", _("Invalid ID"), true); }
+if ($_POST['action'] != "add") {
+	if (!is_numeric ($_POST['wid'])) { $Result->show ("danger", _ ("Invalid ID"), true); }
 }
 # Title and path must be present!
-if($_POST['action']!="delete") {
-if(strlen($_POST['wtitle'])==0 || strlen($_POST['wfile'])==0) 	{ $Result->show("danger", _("Filename and title are mandatory")."!", true); }
+if ($_POST['action'] != "delete") {
+if (strlen ($_POST['wtitle']) == 0 || strlen ($_POST['wfile']) == 0) { $Result->show ("danger", _ ("Filename and title are mandatory")."!", true); }
 }
 
 # Remove .php form wfile if it is present
-$_POST['wfile'] = str_replace(".php","",trim(@$_POST['wfile']));
+$_POST['wfile'] = str_replace (".php", "", trim (@$_POST['wfile']));
 
 # set update values
-$values = array("wid"=>@$_POST['wid'],
+$values = array ("wid"=>@$_POST['wid'],
 				"wtitle"=>$_POST['wtitle'],
 				"wdescription"=>@$_POST['wdescription'],
 				"wfile"=>$_POST['wfile'],
@@ -47,6 +47,6 @@ 
 				"wsize"=>$_POST['wsize']
 				);
 # update
-if(!$Admin->object_modify("widgets", $_POST['action'], "wid", $values))	{ $Result->show("danger",  _("Widget $_POST[action] error")."!", true); }
-else																	{ $Result->show("success", _("Widget $_POST[action] success")."!", true); }
+if (!$Admin->object_modify ("widgets", $_POST['action'], "wid", $values)) { $Result->show ("danger", _ ("Widget $_POST[action] error")."!", true); }
+else { $Result->show ("success", _ ("Widget $_POST[action] success")."!", true); }
 ?>
\ No newline at end of file

app/admin/widgets/edit.php

Indentation +3 added lines, -3 removed lines

@@ -22,9 +22,9 @@
 
 # fetch widget
 if($_POST['action']!="add") {
-	$w = $Admin->fetch_object ("widgets", "wid", $_POST['wid']);
-	$w!==false ? : $Result->show("danger", _("Invalid ID"), true, true);
-	$w = (array) $w;
+    $w = $Admin->fetch_object ("widgets", "wid", $_POST['wid']);
+    $w!==false ? : $Result->show("danger", _("Invalid ID"), true, true);
+    $w = (array) $w;
 }
 ?>
 

Braces +60 added lines, -15 removed lines

@@ -40,14 +40,20 @@ 
 	<!-- name -->
 	<tr>
 	    <td><?php print _('Title'); ?></td>
-	    <td><input class="form-control input-sm input-w-250" type="text" name="wtitle" value="<?php print @$w['wtitle']; ?>" <?php if($_POST['action'] == "delete") print "readonly"; ?>></td>
+	    <td><input class="form-control input-sm input-w-250" type="text" name="wtitle" value="<?php print @$w['wtitle']; ?>" <?php if($_POST['action'] == "delete") {
+    print "readonly";
+}
+?>></td>
     </tr>
 
     <!-- description -->
     <tr>
     	<td><?php print _('Description'); ?></td>
     	<td>
-    		<input class="form-control input-sm input-w-250" type="text" name="wdescription" value="<?php print @$w['wdescription']; ?>" <?php if($_POST['action'] == "delete") print "readonly"; ?>>
+    		<input class="form-control input-sm input-w-250" type="text" name="wdescription" value="<?php print @$w['wdescription']; ?>" <?php if($_POST['action'] == "delete") {
+    print "readonly";
+}
+?>>
 
     		<input type="hidden" name="wid" value="<?php print $_POST['wid']; ?>">
     		<input type="hidden" name="action" value="<?php print $_POST['action']; ?>">
@@ -58,13 +64,19 @@ 
 	<!-- File -->
 	<tr>
 	    <td><?php print _('File'); ?></td>
-	    <td><input class="form-control input-sm input-w-250" type="text" name="wfile" value="<?php print @$w['wfile']; ?>.php" <?php if($_POST['action'] == "delete") print "readonly"; ?>></td>
+	    <td><input class="form-control input-sm input-w-250" type="text" name="wfile" value="<?php print @$w['wfile']; ?>.php" <?php if($_POST['action'] == "delete") {
+    print "readonly";
+}
+?>></td>
     </tr>
 
 	<!-- params -->
 	<tr>
 	    <td><?php print _('Parameters'); ?></td>
-	    <td><input class="form-control input-sm input-w-250" type="text" name="wparams" value="<?php print @$w['wparams']; ?>" <?php if($_POST['action'] == "delete") print "readonly"; ?>></td>
+	    <td><input class="form-control input-sm input-w-250" type="text" name="wparams" value="<?php print @$w['wparams']; ?>" <?php if($_POST['action'] == "delete") {
+    print "readonly";
+}
+?>></td>
     </tr>
 
 	<!-- Admin -->
@@ -72,8 +84,14 @@ 
 	    <td><?php print _('Admin only'); ?></td>
 	    <td>
 	    	<select name="wadminonly" class="form-control input-sm input-w-auto">
-	    		<option value="no"  <?php if(@$w['wadminonly']=='no')  print "selected='selected'"; ?>><?php print _('No'); ?></option>
-	    		<option value="yes" <?php if(@$w['wadminonly']=='yes') print "selected='selected'"; ?>><?php print _('Yes'); ?></option>
+	    		<option value="no"  <?php if(@$w['wadminonly']=='no') {
+    print "selected='selected'";
+}
+?>><?php print _('No'); ?></option>
+	    		<option value="yes" <?php if(@$w['wadminonly']=='yes') {
+    print "selected='selected'";
+}
+?>><?php print _('Yes'); ?></option>
 
 	    	</select>
 	    </td>
@@ -84,8 +102,14 @@ 
 	    <td><?php print _('Active'); ?></td>
 	    <td>
 	    	<select name="wactive" class="form-control input-sm input-w-auto">
-	    		<option value="no"  <?php if(@$w['wactive']=='no')  print "selected='selected'"; ?>><?php print _('No'); ?></option>
-	    		<option value="yes" <?php if(@$w['wactive']=='yes') print "selected='selected'"; ?>><?php print _('Yes'); ?></option>
+	    		<option value="no"  <?php if(@$w['wactive']=='no') {
+    print "selected='selected'";
+}
+?>><?php print _('No'); ?></option>
+	    		<option value="yes" <?php if(@$w['wactive']=='yes') {
+    print "selected='selected'";
+}
+?>><?php print _('Yes'); ?></option>
 
 	    	</select>
 	    </td>
@@ -96,8 +120,14 @@ 
 	    <td><?php print _('Link to page'); ?></td>
 	    <td>
 	    	<select name="whref" class="form-control input-sm input-w-auto">
-	    		<option value="no"  <?php if(@$w['whref']=='no')  print "selected='selected'"; ?>><?php print _('No'); ?></option>
-	    		<option value="yes" <?php if(@$w['whref']=='yes') print "selected='selected'"; ?>><?php print _('Yes'); ?></option>
+	    		<option value="no"  <?php if(@$w['whref']=='no') {
+    print "selected='selected'";
+}
+?>><?php print _('No'); ?></option>
+	    		<option value="yes" <?php if(@$w['whref']=='yes') {
+    print "selected='selected'";
+}
+?>><?php print _('Yes'); ?></option>
 
 	    	</select>
 	    </td>
@@ -108,10 +138,22 @@ 
 	    <td><?php print _('Widget size'); ?></td>
 	    <td>
 	    	<select name="wsize" class="form-control input-sm input-w-auto">
-	    		<option value="4"  <?php if(@$w['wsize']=='4')  print "selected='selected'"; ?>>25%</option>
-	    		<option value="6"  <?php if(@$w['wsize']=='6')  print "selected='selected'"; ?>>50%</option>
-	    		<option value="8"  <?php if(@$w['wsize']=='8')  print "selected='selected'"; ?>>75%</option>
-	    		<option value="12" <?php if(@$w['wsize']=='12') print "selected='selected'"; ?>>100%</option>
+	    		<option value="4"  <?php if(@$w['wsize']=='4') {
+    print "selected='selected'";
+}
+?>>25%</option>
+	    		<option value="6"  <?php if(@$w['wsize']=='6') {
+    print "selected='selected'";
+}
+?>>50%</option>
+	    		<option value="8"  <?php if(@$w['wsize']=='8') {
+    print "selected='selected'";
+}
+?>>75%</option>
+	    		<option value="12" <?php if(@$w['wsize']=='12') {
+    print "selected='selected'";
+}
+?>>100%</option>
 	    	</select>
 	    </td>
     </tr>
@@ -126,7 +168,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="widgetEditSubmit"><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="widgetEditSubmit"><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 +31 added lines, -31 removed lines

@@ -5,31 +5,31 @@ 
  *************************************************/
 
 /* 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", "widget");
 
 # fetch widget
-if($_POST['action']!="add") {
+if ($_POST['action'] != "add") {
 	$w = $Admin->fetch_object ("widgets", "wid", $_POST['wid']);
-	$w!==false ? : $Result->show("danger", _("Invalid ID"), true, true);
+	$w !== false ? : $Result->show ("danger", _ ("Invalid ID"), true, true);
 	$w = (array) $w;
 }
 ?>
 
 <!-- header -->
-<div class="pHeader"><?php print ucwords($_POST['action'])." widget"; ?></div>
+<div class="pHeader"><?php print ucwords ($_POST['action'])." widget"; ?></div>
 
 <!-- content -->
 <div class="pContent">
@@ -39,15 +39,15 @@ 
 
 	<!-- name -->
 	<tr>
-	    <td><?php print _('Title'); ?></td>
-	    <td><input class="form-control input-sm input-w-250" type="text" name="wtitle" value="<?php print @$w['wtitle']; ?>" <?php if($_POST['action'] == "delete") print "readonly"; ?>></td>
+	    <td><?php print _ ('Title'); ?></td>
+	    <td><input class="form-control input-sm input-w-250" type="text" name="wtitle" value="<?php print @$w['wtitle']; ?>" <?php if ($_POST['action'] == "delete") print "readonly"; ?>></td>
     </tr>
 
     <!-- description -->
     <tr>
-    	<td><?php print _('Description'); ?></td>
+    	<td><?php print _ ('Description'); ?></td>
     	<td>
-    		<input class="form-control input-sm input-w-250" type="text" name="wdescription" value="<?php print @$w['wdescription']; ?>" <?php if($_POST['action'] == "delete") print "readonly"; ?>>
+    		<input class="form-control input-sm input-w-250" type="text" name="wdescription" value="<?php print @$w['wdescription']; ?>" <?php if ($_POST['action'] == "delete") print "readonly"; ?>>
 
     		<input type="hidden" name="wid" value="<?php print $_POST['wid']; ?>">
     		<input type="hidden" name="action" value="<?php print $_POST['action']; ?>">
@@ -57,23 +57,23 @@ 
 
 	<!-- File -->
 	<tr>
-	    <td><?php print _('File'); ?></td>
-	    <td><input class="form-control input-sm input-w-250" type="text" name="wfile" value="<?php print @$w['wfile']; ?>.php" <?php if($_POST['action'] == "delete") print "readonly"; ?>></td>
+	    <td><?php print _ ('File'); ?></td>
+	    <td><input class="form-control input-sm input-w-250" type="text" name="wfile" value="<?php print @$w['wfile']; ?>.php" <?php if ($_POST['action'] == "delete") print "readonly"; ?>></td>
     </tr>
 
 	<!-- params -->
 	<tr>
-	    <td><?php print _('Parameters'); ?></td>
-	    <td><input class="form-control input-sm input-w-250" type="text" name="wparams" value="<?php print @$w['wparams']; ?>" <?php if($_POST['action'] == "delete") print "readonly"; ?>></td>
+	    <td><?php print _ ('Parameters'); ?></td>
+	    <td><input class="form-control input-sm input-w-250" type="text" name="wparams" value="<?php print @$w['wparams']; ?>" <?php if ($_POST['action'] == "delete") print "readonly"; ?>></td>
     </tr>
 
 	<!-- Admin -->
 	<tr>
-	    <td><?php print _('Admin only'); ?></td>
+	    <td><?php print _ ('Admin only'); ?></td>
 	    <td>
 	    	<select name="wadminonly" class="form-control input-sm input-w-auto">
-	    		<option value="no"  <?php if(@$w['wadminonly']=='no')  print "selected='selected'"; ?>><?php print _('No'); ?></option>
-	    		<option value="yes" <?php if(@$w['wadminonly']=='yes') print "selected='selected'"; ?>><?php print _('Yes'); ?></option>
+	    		<option value="no"  <?php if (@$w['wadminonly'] == 'no')  print "selected='selected'"; ?>><?php print _ ('No'); ?></option>
+	    		<option value="yes" <?php if (@$w['wadminonly'] == 'yes') print "selected='selected'"; ?>><?php print _ ('Yes'); ?></option>
 
 	    	</select>
 	    </td>
@@ -81,11 +81,11 @@ 
 
 	<!-- Active -->
 	<tr>
-	    <td><?php print _('Active'); ?></td>
+	    <td><?php print _ ('Active'); ?></td>
 	    <td>
 	    	<select name="wactive" class="form-control input-sm input-w-auto">
-	    		<option value="no"  <?php if(@$w['wactive']=='no')  print "selected='selected'"; ?>><?php print _('No'); ?></option>
-	    		<option value="yes" <?php if(@$w['wactive']=='yes') print "selected='selected'"; ?>><?php print _('Yes'); ?></option>
+	    		<option value="no"  <?php if (@$w['wactive'] == 'no')  print "selected='selected'"; ?>><?php print _ ('No'); ?></option>
+	    		<option value="yes" <?php if (@$w['wactive'] == 'yes') print "selected='selected'"; ?>><?php print _ ('Yes'); ?></option>
 
 	    	</select>
 	    </td>
@@ -93,11 +93,11 @@ 
 
 	<!-- Link to file -->
 	<tr>
-	    <td><?php print _('Link to page'); ?></td>
+	    <td><?php print _ ('Link to page'); ?></td>
 	    <td>
 	    	<select name="whref" class="form-control input-sm input-w-auto">
-	    		<option value="no"  <?php if(@$w['whref']=='no')  print "selected='selected'"; ?>><?php print _('No'); ?></option>
-	    		<option value="yes" <?php if(@$w['whref']=='yes') print "selected='selected'"; ?>><?php print _('Yes'); ?></option>
+	    		<option value="no"  <?php if (@$w['whref'] == 'no')  print "selected='selected'"; ?>><?php print _ ('No'); ?></option>
+	    		<option value="yes" <?php if (@$w['whref'] == 'yes') print "selected='selected'"; ?>><?php print _ ('Yes'); ?></option>
 
 	    	</select>
 	    </td>
@@ -105,13 +105,13 @@ 
 
 	<!-- Size -->
 	<tr>
-	    <td><?php print _('Widget size'); ?></td>
+	    <td><?php print _ ('Widget size'); ?></td>
 	    <td>
 	    	<select name="wsize" class="form-control input-sm input-w-auto">
-	    		<option value="4"  <?php if(@$w['wsize']=='4')  print "selected='selected'"; ?>>25%</option>
-	    		<option value="6"  <?php if(@$w['wsize']=='6')  print "selected='selected'"; ?>>50%</option>
-	    		<option value="8"  <?php if(@$w['wsize']=='8')  print "selected='selected'"; ?>>75%</option>
-	    		<option value="12" <?php if(@$w['wsize']=='12') print "selected='selected'"; ?>>100%</option>
+	    		<option value="4"  <?php if (@$w['wsize'] == '4')  print "selected='selected'"; ?>>25%</option>
+	    		<option value="6"  <?php if (@$w['wsize'] == '6')  print "selected='selected'"; ?>>50%</option>
+	    		<option value="8"  <?php if (@$w['wsize'] == '8')  print "selected='selected'"; ?>>75%</option>
+	    		<option value="12" <?php if (@$w['wsize'] == '12') print "selected='selected'"; ?>>100%</option>
 	    	</select>
 	    </td>
     </tr>
@@ -125,8 +125,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="widgetEditSubmit"><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="widgetEditSubmit"><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/ripe-import/import-subnets.php

Indentation +57 added lines, -57 removed lines

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

Spacing +25 added lines, -25 removed lines

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