phpipam / phpipam

app/tools/subnet-masks/index.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  */
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 // set popup
 $popup = false;

app/tools/powerDNS/domains.php

Spacing +4 added lines, -4 removed lines

@@ -1,7 +1,7 @@
 <?php
 # print all domains or show records
-if (@$_GET['sPage']=="page")		{ include("domains-print.php"); }
-elseif (@$_GET['sPage']=="search")	{ include("domains-print.php"); }
-elseif (isset($_GET['sPage']))		{ include("domain-records.php"); }
-else								{ include("domains-print.php"); }
+if (@$_GET['sPage'] == "page") { include("domains-print.php"); }
+elseif (@$_GET['sPage'] == "search") { include("domains-print.php"); }
+elseif (isset($_GET['sPage'])) { include("domain-records.php"); }
+else { include("domains-print.php"); }
 ?>
\ No newline at end of file

app/tools/racks/index.php

Spacing +6 added lines, -6 removed lines

@@ -5,21 +5,21 @@
  ***************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # fetch custom fields
-$custom = $Tools->fetch_custom_fields('racks');
+$custom = $Tools->fetch_custom_fields ('racks');
 
 # get hidden fields
-$hidden_custom_fields = json_decode($User->settings->hiddenCustomFields, true);
-$hidden_custom_fields = is_array(@$hidden_custom_fields['racks']) ? $hidden_custom_fields['racks'] : array();
+$hidden_custom_fields = json_decode ($User->settings->hiddenCustomFields, true);
+$hidden_custom_fields = is_array (@$hidden_custom_fields['racks']) ? $hidden_custom_fields['racks'] : array ();
 
 # create csrf token
 $csrf = $User->create_csrf_cookie ();
 
 
 # all racks or one ?
-if (isset($_GET['subnetId']))   { include("print-single-rack.php"); }
-else                            { include("print-racks.php"); }
+if (isset($_GET['subnetId'])) { include("print-single-rack.php"); }
+else { include("print-racks.php"); }
 
 ?>
\ No newline at end of file

app/tools/pass-change/form.php

Spacing +6 added lines, -6 removed lines

@@ -4,38 +4,38 @@
 ?>
 
 <div class="col-xs-12 col-md-6 col-md-offset-3" style="margin-top:50px;">
-	<h4><?php print _("Password change required"); ?></h4>
+	<h4><?php print _ ("Password change required"); ?></h4>
 	<hr>
 
 	<div class="text-muted">
-	<?php print _("You are required to change your password before you can access phpipam."); ?>
+	<?php print _ ("You are required to change your password before you can access phpipam."); ?>
 	</div>
 </div>
 <div class="clearfix"></div>
 
 <div class="widget-dash col-xs-12 col-md-6 col-md-offset-3" style="margin-top:20px;">
 <div class="inner" style="min-height:auto;">
-	<h4><?php print _("Password change"); ?></h4>
+	<h4><?php print _ ("Password change"); ?></h4>
 	<div class="hContent">
 
 		<form name="changePassRequired" id="changePassRequiredForm" class="form-inline" method="post">
 		<div class="row" style="margin-top:30px;">
 
 			<!-- new password -->
-			<div class="col-xs-12 col-md-4"><strong><?php print _('Password'); ?></strong></div>
+			<div class="col-xs-12 col-md-4"><strong><?php print _ ('Password'); ?></strong></div>
 			<div class="col-xs-12 col-md-8">
 				<input type="password" style="width:100%;" id="ipampassword1" name="ipampassword1" class="form-control" autofocus="autofocus" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"></input>
 			</div>
 
 			<!-- new password repeat -->
-			<div class="col-xs-12 col-md-4" style="margin-top:10px;"><strong><?php print _('Password repeat'); ?></strong></div>
+			<div class="col-xs-12 col-md-4" style="margin-top:10px;"><strong><?php print _ ('Password repeat'); ?></strong></div>
 			<div class="col-xs-12 col-md-8" style="margin-top:10px;">
 				<input type="password" style="width:100%;" id="ipampassword2" name="ipampassword2" class="form-control" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"></input>
 			</div>
 
 			<!-- submit -->
 			<div class="col-xs-12" style="margin-top:10px;">
-				<input type="submit" value="<?php print _('Save password'); ?>" class="btn btn-sm btn-default pull-right"></input>
+				<input type="submit" value="<?php print _ ('Save password'); ?>" class="btn btn-sm btn-default pull-right"></input>
 			</div>
 
 		</div>

app/tools/pass-change/result.php

Spacing +5 added lines, -5 removed lines

@@ -4,17 +4,17 @@
 require_once('../../../functions/functions.php');
 
 # Classes
-$Database 	= new Database_PDO;
-$User 	= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Result = new Result;
 
 # user must be authenticated
 $User->check_user_session ();
 
 # checks
-if(strlen($_POST['ipampassword1'])<8)					{ $Result->show("danger", _("Invalid password"), true); }
-if($_POST['ipampassword1']!=$_POST['ipampassword2'])	{ $Result->show("danger", _("Passwords do not match"), true); }
+if (strlen ($_POST['ipampassword1']) < 8) { $Result->show ("danger", _ ("Invalid password"), true); }
+if ($_POST['ipampassword1'] != $_POST['ipampassword2']) { $Result->show ("danger", _ ("Passwords do not match"), true); }
 
 # update pass
-$User->update_user_pass($_POST['ipampassword1']);
+$User->update_user_pass ($_POST['ipampassword1']);
 ?>
\ No newline at end of file

app/tools/vlan/index.php

Spacing +8 added lines, -8 removed lines

@@ -5,23 +5,23 @@
  */
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # fetch all l2 domains
-$vlan_domains = $Tools->fetch_all_objects("vlanDomains", "id");
+$vlan_domains = $Tools->fetch_all_objects ("vlanDomains", "id");
 
 # set default domain
-if(sizeof($vlan_domains)==1) { $_GET['subnetId'] = 1; }
+if (sizeof ($vlan_domains) == 1) { $_GET['subnetId'] = 1; }
 
 # search vlan requested
-if(@$_GET['subnetId']=="all")									{ include("domain-vlans-all.php"); }
+if (@$_GET['subnetId'] == "all") { include("domain-vlans-all.php"); }
 # vlan requested
-elseif(isset($_GET['sPage']))									{ include("vlan-details.php"); }
+elseif (isset($_GET['sPage'])) { include("vlan-details.php"); }
 # print all domains
-elseif(@$_GET['subnetId']=="all") 								{ include("domain-vlans-all.php"); }
+elseif (@$_GET['subnetId'] == "all") { include("domain-vlans-all.php"); }
 # we have more domains
-elseif(sizeof($vlan_domains)>1 && !isset($_GET['subnetId'])) 	{ include("domains.php"); }
+elseif (sizeof ($vlan_domains) > 1 && !isset($_GET['subnetId'])) { include("domains.php"); }
 # only 1 domain, print vlans
-else 															{ include("domain-vlans.php"); }
+else { include("domain-vlans.php"); }
 
 ?>
\ No newline at end of file

app/tools/ip-calculator/index.php

Spacing +6 added lines, -6 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 ?>
 
-<h4><?php print _('IPv4v6 calculator');?></h4>
+<h4><?php print _ ('IPv4v6 calculator'); ?></h4>
 <hr>
 
 <!-- ipCalc form -->
@@ -12,12 +12,12 @@ 
 
     <!-- IP address input -->
     <tr>
-        <td><?php print _('IP address');?> / <?php print _('mask');?></td>
+        <td><?php print _ ('IP address'); ?> / <?php print _ ('mask'); ?></td>
         <td>
             <input type="text" class="form-control" name="cidr" size="40" autofocus="autofocus">
         </td>
         <td>
-            <div class="info2" style="margin-bottom:0px;"><?php print _('Please enter IP address and mask in CIDR format');?></div>
+            <div class="info2" style="margin-bottom:0px;"><?php print _ ('Please enter IP address and mask in CIDR format'); ?></div>
         </td>
     </tr>
 
@@ -26,8 +26,8 @@ 
         <td></td>
         <td>
         	<div class="btn-group">
-            	<button type="submit" class="btn btn-sm btn-default"><i class="fa fa-check"></i> <?php print _('Calculate');?></button>
-				<input type="button" class="btn btn-sm btn-default reset" value="<?php print _('Reset');?>">
+            	<button type="submit" class="btn btn-sm btn-default"><i class="fa fa-check"></i> <?php print _ ('Calculate'); ?></button>
+				<input type="button" class="btn btn-sm btn-default reset" value="<?php print _ ('Reset'); ?>">
         	</div>
         </td>
         <td></td>

app/tools/tools-menu-config.php

Spacing +30 added lines, -30 removed lines

@@ -6,42 +6,42 @@
  */
 
 # icons
-$tools_menu_icons['Tools'] 		= "fa-wrench";
-$tools_menu_icons['Subnets'] 	= "fa-sitemap";
-$tools_menu_icons['User Menu'] 	= "fa-user";
+$tools_menu_icons['Tools'] = "fa-wrench";
+$tools_menu_icons['Subnets'] = "fa-sitemap";
+$tools_menu_icons['User Menu'] = "fa-user";
 
 # Tools
-$tools_menu['Tools'][] = array("show"=>true,	"icon"=>"fa-search", 		"name"=>"Search", 		 		"href"=>"search", 		"description"=>"Search database Addresses, subnets and VLANs");
-$tools_menu['Tools'][] = array("show"=>true,	"icon"=>"fa-calculator",	"name"=>"IP calculator", 		"href"=>"ip-calculator","description"=>"IPv4v6 calculator for subnet calculations");
-if($User->settings->enableChangelog == 1)
-$tools_menu['Tools'][] = array("show"=>true,	"icon"=>"fa-clock-o", 		"name"=>"Changelog", 	 		"href"=>"changelog", 	"description"=>"Show changelog for all network objects");
-$tools_menu['Tools'][] = array("show"=>true,	"icon"=>"fa-list", 			"name"=>"Log files", 			"href"=>"logs",		 	"description"=>"Browse phpipam log files");
-if($User->settings->enableIPrequests==1) {
-$tools_menu['Tools'][] = array("show"=>true,	"icon"=>"fa-plus", 			"name"=>"IP requests", 			"href"=>"requests", 	"description"=>"Manage IP requests");
+$tools_menu['Tools'][] = array ("show"=>true, "icon"=>"fa-search", "name"=>"Search", "href"=>"search", "description"=>"Search database Addresses, subnets and VLANs");
+$tools_menu['Tools'][] = array ("show"=>true, "icon"=>"fa-calculator", "name"=>"IP calculator", "href"=>"ip-calculator", "description"=>"IPv4v6 calculator for subnet calculations");
+if ($User->settings->enableChangelog == 1)
+$tools_menu['Tools'][] = array ("show"=>true, "icon"=>"fa-clock-o", "name"=>"Changelog", "href"=>"changelog", "description"=>"Show changelog for all network objects");
+$tools_menu['Tools'][] = array ("show"=>true, "icon"=>"fa-list", "name"=>"Log files", "href"=>"logs", "description"=>"Browse phpipam log files");
+if ($User->settings->enableIPrequests == 1) {
+$tools_menu['Tools'][] = array ("show"=>true, "icon"=>"fa-plus", "name"=>"IP requests", "href"=>"requests", "description"=>"Manage IP requests");
 }
-$tools_menu['Tools'][] = array("show"=>true,	"icon"=>"fa-info", 	  		"name"=>"Instructions",  		"href"=>"instructions", "description"=>"Instructions for managing IP addresses");
-if($User->settings->enablePowerDNS==1)
-$tools_menu['Tools'][] = array("show"=>true,	"icon"=>"fa-database", 	  		"name"=>"PowerDNS",  		"href"=>"powerDNS", "description"=>"PowerDNS settings");
+$tools_menu['Tools'][] = array ("show"=>true, "icon"=>"fa-info", "name"=>"Instructions", "href"=>"instructions", "description"=>"Instructions for managing IP addresses");
+if ($User->settings->enablePowerDNS == 1)
+$tools_menu['Tools'][] = array ("show"=>true, "icon"=>"fa-database", "name"=>"PowerDNS", "href"=>"powerDNS", "description"=>"PowerDNS settings");
 
 # Subnets
-$tools_menu['Subnets'][] 	= array("show"=>true,	"icon"=>"fa-star", 	  	"name"=>"Favourite networks",  	"href"=>"favourites", 	"description"=>"Show favourite networks");
-$tools_menu['Subnets'][] 	= array("show"=>true,	"icon"=>"fa-sitemap", 	"name"=>"Subnets",  		   	"href"=>"subnets", 		"description"=>"Show all subnets");
-$tools_menu['Subnets'][] 	= array("show"=>true,	"icon"=>"fa-cloud", 	"name"=>"VLAN",  				"href"=>"vlan", 		"description"=>"Show VLANs and belonging subnets");
-if($User->settings->enableVRF == 1)
-$tools_menu['Subnets'][] 	= array("show"=>true,	"icon"=>"fa-cloud", 	 "name"=>"VRF",  				"href"=>"vrf", 			"description"=>"Show VRFs and belonging networks");
-if($User->settings->enableRACK == 1)
-$tools_menu['Subnets'][] 	= array("show"=>true,	"icon"=>"fa-bars", 	     "name"=>"Racks",  				"href"=>"racks", 		"description"=>"Show racks");
-$tools_menu['Subnets'][] 	= array("show"=>true,	"icon"=>"fa-desktop", 	 "name"=>"Devices",  			"href"=>"devices", 		"description"=>"Show all configured devices");
-if($User->settings->enableMulticast == 1)
-$tools_menu['Subnets'][] 	= array("show"=>true,	"icon"=>"fa-map-o",		"name"=>"Multicast networks", 	"href"=>"multicast-networks", "description"=>"Show multicast subnets and mapping");
-if($User->settings->enableFirewallZones == 1)
-$tools_menu['Subnets'][] 	= array("show"=>true,	"icon"=>"fa-fire",		"name"=>"Firewall Zones", 		"href"=>"firewall-zones", "description"=>"Display firewall zone to device mappings");
-$tools_menu['Subnets'][] 	= array("show"=>true,	"icon"=>"fa-eye", 		 "name"=>"Scanned networks", 	"href"=>"scanned-networks",	"description"=>"List of subnets to be scanned for online hosts and detect new hosts");
-$tools_menu['Subnets'][] 	= array("show"=>true,	"icon"=>"fa-th-large", 	 "name"=>"Subnet masks", 		"href"=>"subnet-masks",	"description"=>"Table of all subnet masks with different representations");
+$tools_menu['Subnets'][] 	= array ("show"=>true, "icon"=>"fa-star", "name"=>"Favourite networks", "href"=>"favourites", "description"=>"Show favourite networks");
+$tools_menu['Subnets'][] 	= array ("show"=>true, "icon"=>"fa-sitemap", "name"=>"Subnets", "href"=>"subnets", "description"=>"Show all subnets");
+$tools_menu['Subnets'][] 	= array ("show"=>true, "icon"=>"fa-cloud", "name"=>"VLAN", "href"=>"vlan", "description"=>"Show VLANs and belonging subnets");
+if ($User->settings->enableVRF == 1)
+$tools_menu['Subnets'][] 	= array ("show"=>true, "icon"=>"fa-cloud", "name"=>"VRF", "href"=>"vrf", "description"=>"Show VRFs and belonging networks");
+if ($User->settings->enableRACK == 1)
+$tools_menu['Subnets'][] 	= array ("show"=>true, "icon"=>"fa-bars", "name"=>"Racks", "href"=>"racks", "description"=>"Show racks");
+$tools_menu['Subnets'][] 	= array ("show"=>true, "icon"=>"fa-desktop", "name"=>"Devices", "href"=>"devices", "description"=>"Show all configured devices");
+if ($User->settings->enableMulticast == 1)
+$tools_menu['Subnets'][] 	= array ("show"=>true, "icon"=>"fa-map-o", "name"=>"Multicast networks", "href"=>"multicast-networks", "description"=>"Show multicast subnets and mapping");
+if ($User->settings->enableFirewallZones == 1)
+$tools_menu['Subnets'][] 	= array ("show"=>true, "icon"=>"fa-fire", "name"=>"Firewall Zones", "href"=>"firewall-zones", "description"=>"Display firewall zone to device mappings");
+$tools_menu['Subnets'][] 	= array ("show"=>true, "icon"=>"fa-eye", "name"=>"Scanned networks", "href"=>"scanned-networks", "description"=>"List of subnets to be scanned for online hosts and detect new hosts");
+$tools_menu['Subnets'][] 	= array ("show"=>true, "icon"=>"fa-th-large", "name"=>"Subnet masks", "href"=>"subnet-masks", "description"=>"Table of all subnet masks with different representations");
 // temp shares
-if($User->settings->tempShare==1)
-$tools_menu['Subnets'][] 	= array("show"=>true,	"icon"=>"fa-share-alt",  "name"=>"Temporary shares", 	"href"=>"temp-shares",	"description"=>"List of temporary shared objects");
+if ($User->settings->tempShare == 1)
+$tools_menu['Subnets'][] 	= array ("show"=>true, "icon"=>"fa-share-alt", "name"=>"Temporary shares", "href"=>"temp-shares", "description"=>"List of temporary shared objects");
 
 # user menu
-$tools_menu['User Menu'][] = array("show"=>true,	"icon"=>"fa-user", 		"name"=>"My account",  			"href"=>"user-menu", 	"description"=>"Manage your account");
+$tools_menu['User Menu'][] = array ("show"=>true, "icon"=>"fa-user", "name"=>"My account", "href"=>"user-menu", "description"=>"Manage your account");
 ?>
\ No newline at end of file

app/login/captcha/captchashow.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@
 <?php
 include 'captcha.php';
-$img = new securimage();
+$img = new securimage ();
 //show image
-$img->show();
+$img->show ();
 ?>