phpipam / phpipam

app/admin/widgets/edit-result.php

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

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

Spacing +29 added lines, -29 removed lines

@@ -14,32 +14,32 @@ 
 
 
 /* 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", "custom_field");
 
 
 /* reset field name for add! */
-if($_POST['action'] == "add") 	{ $_POST['fieldName'] = ""; }
-else 							{ $_POST['oldname'] = $_POST['fieldName'];}
+if ($_POST['action'] == "add") { $_POST['fieldName'] = ""; }
+else { $_POST['oldname'] = $_POST['fieldName']; }
 
 # fetch old field definition
-$fieldval = (array) $Tools->fetch_full_field_definition($_POST['table'], $_POST['fieldName']);
+$fieldval = (array) $Tools->fetch_full_field_definition ($_POST['table'], $_POST['fieldName']);
 ?>
 
 
-<div class="pHeader"><?php print ucwords(_("$_POST[action]")); ?> <?php print _('custom field'); ?></div>
+<div class="pHeader"><?php print ucwords (_ ("$_POST[action]")); ?> <?php print _ ('custom field'); ?></div>
 
 
 <div class="pContent">
@@ -49,9 +49,9 @@ 
 
 	<!-- name -->
 	<tr>
-		<td><?php print _('Name'); ?></td>
+		<td><?php print _ ('Name'); ?></td>
 		<td>
-			<input type="text" name="name" class="form-control input-sm" value="<?php print $_POST['fieldName']; ?>" placeholder="<?php print _('Select field name'); ?>" <?php if($_POST['action'] == "delete") { print 'readonly'; } ?>>
+			<input type="text" name="name" class="form-control input-sm" value="<?php print $_POST['fieldName']; ?>" placeholder="<?php print _ ('Select field name'); ?>" <?php if ($_POST['action'] == "delete") { print 'readonly'; } ?>>
 
 			<input type="hidden" name="oldname" value="<?php print $_POST['oldname']; ?>">
 			<input type="hidden" name="action" value="<?php print $_POST['action']; ?>">
@@ -62,32 +62,32 @@ 
 
 	<!-- Description -->
 	<tr>
-		<td><?php print _('Description'); ?></td>
+		<td><?php print _ ('Description'); ?></td>
 		<td>
-			<input type="text" name="Comment" class="form-control input-sm" value="<?php print @$fieldval['Comment']; ?>" placeholder="<?php print _('Enter comment for users'); ?>" <?php if($_POST['action'] == "delete") { print 'readonly'; } ?>>
+			<input type="text" name="Comment" class="form-control input-sm" value="<?php print @$fieldval['Comment']; ?>" placeholder="<?php print _ ('Enter comment for users'); ?>" <?php if ($_POST['action'] == "delete") { print 'readonly'; } ?>>
 		</td>
 	</tr>
 
 	<!-- type -->
 	<tr>
-		<td><?php print _('Type'); ?></td>
+		<td><?php print _ ('Type'); ?></td>
 		<?php
 		// define supported types
-		$mTypes = array("varchar"=>"varchar", "integer"=>"int", "boolean"=>"bool", "text"=>"text", "date"=>"date", "datetime"=>"datetime", "set"=>"set", "enum"=>"enum");
+		$mTypes = array ("varchar"=>"varchar", "integer"=>"int", "boolean"=>"bool", "text"=>"text", "date"=>"date", "datetime"=>"datetime", "set"=>"set", "enum"=>"enum");
 		//reformat old type
-		$oldMType = strstr(@$fieldval['Type'], "(", true);
-		$oldMSize = str_replace(array("(",")"), "",strstr(@$fieldval['Type'], "(", false));
+		$oldMType = strstr (@$fieldval['Type'], "(", true);
+		$oldMSize = str_replace (array ("(", ")"), "", strstr (@$fieldval['Type'], "(", false));
 
 		//exceptions
-		if(@$fieldval['Type']=="text" || @$fieldval['Type']=="date" || @$fieldval['Type']=="datetime" || @$fieldval['Type']=="set" || @$fieldval['Type']=="enum")	{ $oldMType = @$fieldval['Type']; }
+		if (@$fieldval['Type'] == "text" || @$fieldval['Type'] == "date" || @$fieldval['Type'] == "datetime" || @$fieldval['Type'] == "set" || @$fieldval['Type'] == "enum") { $oldMType = @$fieldval['Type']; }
 		?>
 		<td>
 			<select name="fieldType" class="input-sm input-w-auto form-control">
 			<?php
-			foreach($mTypes as $name=>$type) {
-				if($type==$oldMType)							{ print "<option value='$type' selected='selected'>$name</option>"; }
-				elseif($type=="bool" && $oldMType=="tinyint")	{ print "<option value='$type' selected='selected'>$name</option>"; }
-				else											{ print "<option value='$type'>$name</option>"; }
+			foreach ($mTypes as $name=>$type) {
+				if ($type == $oldMType) { print "<option value='$type' selected='selected'>$name</option>"; }
+				elseif ($type == "bool" && $oldMType == "tinyint") { print "<option value='$type' selected='selected'>$name</option>"; }
+				else { print "<option value='$type'>$name</option>"; }
 			}
 			?>
 			</select>
@@ -96,25 +96,25 @@ 
 
 	<!-- size -->
 	<tr>
-		<td><?php print _('Size / Length'); ?></td>
+		<td><?php print _ ('Size / Length'); ?></td>
 		<td>
-			<input type="text" name="fieldSize" class="form-control input-sm input-w-100" value="<?php print @$oldMSize; ?>" placeholder="<?php print _('Enter field length'); ?>" <?php if($_POST['action'] == "delete") { print 'readonly'; } ?>>
+			<input type="text" name="fieldSize" class="form-control input-sm input-w-100" value="<?php print @$oldMSize; ?>" placeholder="<?php print _ ('Enter field length'); ?>" <?php if ($_POST['action'] == "delete") { print 'readonly'; } ?>>
 		</td>
 	</tr>
 
 	<!-- Default -->
 	<tr>
-		<td><?php print _('Default value'); ?></td>
+		<td><?php print _ ('Default value'); ?></td>
 		<td>
-			<input type="text" name="fieldDefault" class="form-control input-sm" value="<?php print @$fieldval['Default']; ?>" placeholder="<?php print _('Enter default value'); ?>" <?php if($_POST['action'] == "delete") { print 'readonly'; } ?>>
+			<input type="text" name="fieldDefault" class="form-control input-sm" value="<?php print @$fieldval['Default']; ?>" placeholder="<?php print _ ('Enter default value'); ?>" <?php if ($_POST['action'] == "delete") { print 'readonly'; } ?>>
 		</td>
 	</tr>
 
 	<!-- required -->
 	<tr>
-		<td><?php print _('Required field'); ?></td>
+		<td><?php print _ ('Required field'); ?></td>
 		<td>
-			<input name="NULL" type="checkbox" value="NO" <?php if(@$fieldval['Null']=="NO") print "checked"; ?>>
+			<input name="NULL" type="checkbox" value="NO" <?php if (@$fieldval['Null'] == "NO") print "checked"; ?>>
 		</td>
 	</tr>
 
@@ -126,8 +126,8 @@ 
 <!-- footer -->
 <div class="pFooter">
 	<div class="btn-group">
-		<button class="btn btn-sm btn-default hidePopups"><?php print _('Close'); ?></button>
-		<button class="btn btn-sm btn-default <?php if($_POST['action']=="delete") { print "btn-danger"; } else { print "btn-success";} ?>" id="editcustomSubmit"><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 _ ('Close'); ?></button>
+		<button class="btn btn-sm btn-default <?php if ($_POST['action'] == "delete") { print "btn-danger"; } else { print "btn-success"; } ?>" id="editcustomSubmit"><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="customEditResult"></div>

app/admin/custom-fields/edit-result.php

Spacing +29 added lines, -29 removed lines

@@ -5,77 +5,77 @@
  ************************/
 
 /* 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", "custom_field", $_POST['csrf_cookie']) === false ? $Result->show("danger", _("Invalid CSRF cookie"), true) : "";
+$User->csrf_cookie ("validate", "custom_field", $_POST['csrf_cookie']) === false ? $Result->show ("danger", _ ("Invalid CSRF cookie"), true) : "";
 
 
 /* checks */
-if($_POST['action'] == "delete") {
+if ($_POST['action'] == "delete") {
 	# no cecks
 }
 else {
 	# remove spaces
-	$_POST['name'] = trim($_POST['name']);
+	$_POST['name'] = trim ($_POST['name']);
 
 	# length > 4 and < 12
-	if( (strlen($_POST['name']) < 2) || (strlen($_POST['name']) > 24) ) 	{ $errors[] = _('Name must be between 4 and 24 characters'); }
+	if ((strlen ($_POST['name']) < 2) || (strlen ($_POST['name']) > 24)) { $errors[] = _ ('Name must be between 4 and 24 characters'); }
 
 	/* validate HTML */
 
 	# must not start with number
-	if(is_numeric(substr($_POST['name'], 0, 1))) 							{ $errors[] = _('Name must not start with number'); }
+	if (is_numeric (substr ($_POST['name'], 0, 1))) { $errors[] = _ ('Name must not start with number'); }
 
 	# only alphanumeric and _ are allowed
-	if(!preg_match('/^[a-zA-Z0-9 \_]+$/i', $_POST['name'])) 				{ $errors[] = _('Only alphanumeric, spaces and underscore characters are allowed'); }
+	if (!preg_match ('/^[a-zA-Z0-9 \_]+$/i', $_POST['name'])) { $errors[] = _ ('Only alphanumeric, spaces and underscore characters are allowed'); }
 
 	# required must have default value
-	if($_POST['NULL']=="NO" && strlen($_POST['fieldDefault'])==0)			{ $errors[] = _('Required fields must have default values'); }
+	if ($_POST['NULL'] == "NO" && strlen ($_POST['fieldDefault']) == 0) { $errors[] = _ ('Required fields must have default values'); }
 
 	# db type validations
 
 	//boolean
-	if($_POST['fieldType']=="bool")	{
-		if($_POST['fieldSize']!=0 && $_POST['fieldSize']!=1)				{ $errors[] = _('Boolean values can only be 0 or 1'); }
-		if($_POST['fieldDefault']!=0 && $_POST['fieldDefault']!=1)			{ $errors[] = _('Default boolean values can only be 0 or 1'); }
+	if ($_POST['fieldType'] == "bool") {
+		if ($_POST['fieldSize'] != 0 && $_POST['fieldSize'] != 1) { $errors[] = _ ('Boolean values can only be 0 or 1'); }
+		if ($_POST['fieldDefault'] != 0 && $_POST['fieldDefault'] != 1) { $errors[] = _ ('Default boolean values can only be 0 or 1'); }
 	}
 	//varchar
-	elseif($_POST['fieldType']=="varchar") {
-		if(!is_numeric($_POST['fieldSize']))								{ $errors[] = _('Fieldsize must be numeric'); }
-		if($_POST['fieldSize']>256)											{ $errors[] = _('Varchar size limit is 256 characters'); }
+	elseif ($_POST['fieldType'] == "varchar") {
+		if (!is_numeric ($_POST['fieldSize'])) { $errors[] = _ ('Fieldsize must be numeric'); }
+		if ($_POST['fieldSize'] > 256) { $errors[] = _ ('Varchar size limit is 256 characters'); }
 	}
 	//number
-	elseif($_POST['fieldType']=="int") {
-		if(!is_numeric($_POST['fieldSize']))								{ $errors[] = _('Integer values must be numeric'); }
+	elseif ($_POST['fieldType'] == "int") {
+		if (!is_numeric ($_POST['fieldSize'])) { $errors[] = _ ('Integer values must be numeric'); }
 
 	}
 }
 
 /* die if errors otherwise execute */
-if(sizeof($errors) != 0) {
-	print '<div class="alert alert alert-danger">'._('Please correct the following errors').':'. "\n";
-	print '<ul>'. "\n";
-	foreach($errors as $error) {
-		print '<li style="text-align:left">'. $error .'</li>'. "\n";
+if (sizeof ($errors) != 0) {
+	print '<div class="alert alert alert-danger">'._ ('Please correct the following errors').':'."\n";
+	print '<ul>'."\n";
+	foreach ($errors as $error) {
+		print '<li style="text-align:left">'.$error.'</li>'."\n";
 	}
-	print '</ul>'. "\n";
-	print '</div>'. "\n";
+	print '</ul>'."\n";
+	print '</div>'."\n";
 }
 else {
-	if(!$Admin->update_custom_field_definition($_POST)) { $Result->show("danger",  _("Failed to $_POST[action] field"), true); }
-	else 												{ $Result->show("success", _("Field $_POST[action] success"), true); }
+	if (!$Admin->update_custom_field_definition ($_POST)) { $Result->show ("danger", _ ("Failed to $_POST[action] field"), true); }
+	else { $Result->show ("success", _ ("Field $_POST[action] success"), true); }
 }
 ?>

app/admin/custom-fields/index.php

Spacing +34 added lines, -34 removed lines

@@ -5,11 +5,11 @@ 
  ****************************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 
 /* fetch all custom fields */
-$custom_tables = array( "ipaddresses"=>"IP address",
+$custom_tables = array ("ipaddresses"=>"IP address",
 						"subnets"=>"subnet",
 						"vlans"=>"VLAN",
 						"vrf"=>"VRF",
@@ -18,18 +18,18 @@ 
 						"racks"=>"Rack");
 
 # create array
-foreach($custom_tables as $k=>$f) {
-	$custom_fields[$k]				= $Tools->fetch_custom_fields($k);
-	$custom_fields_numeric[$k]		= $Tools->fetch_custom_fields_numeric($k);
-	$custom_fields[$k]['title'] 	= "Custom $f fields";
-	$custom_fields[$k]['tooltip']	= "Add new custom $f field";
+foreach ($custom_tables as $k=>$f) {
+	$custom_fields[$k] = $Tools->fetch_custom_fields ($k);
+	$custom_fields_numeric[$k] = $Tools->fetch_custom_fields_numeric ($k);
+	$custom_fields[$k]['title'] = "Custom $f fields";
+	$custom_fields[$k]['tooltip'] = "Add new custom $f field";
 }
 ?>
 
-<h4><?php print _('Custom fields'); ?></h4>
+<h4><?php print _ ('Custom fields'); ?></h4>
 <hr>
 
-<div class="alert alert-info alert-absolute"><?php print _('You can add additional custom fields to IP addresses and subnets (like CustomerId, location, ...)'); ?>.</div>
+<div class="alert alert-info alert-absolute"><?php print _ ('You can add additional custom fields to IP addresses and subnets (like CustomerId, location, ...)'); ?>.</div>
 <hr style="margin-top:50px;clear:both;">
 
 
@@ -37,18 +37,18 @@ 
 
 <tr>
 	<td></td>
-	<td><?php print _('Title'); ?></td>
-	<td><?php print _('Description'); ?></td>
-	<td><?php print _('Field type'); ?></td>
-	<td><?php print _('Default'); ?></td>
-	<td><?php print _('Required'); ?></td>
-	<td><?php print _('Visible'); ?></td>
+	<td><?php print _ ('Title'); ?></td>
+	<td><?php print _ ('Description'); ?></td>
+	<td><?php print _ ('Field type'); ?></td>
+	<td><?php print _ ('Default'); ?></td>
+	<td><?php print _ ('Required'); ?></td>
+	<td><?php print _ ('Visible'); ?></td>
 	<td></td>
 </tr>
 
 <?php
 # printout each
-foreach($custom_fields as $k=>$cf) {
+foreach ($custom_fields as $k=>$cf) {
 
 	# save vars and unset
 	$title   = $cf['title'];
@@ -61,41 +61,41 @@ 
 	$table = $k;
 
 	# get custom fields
-	$ffields = json_decode($User->settings->hiddenCustomFields, true);
-	$ffields = is_array(@$ffields[$table]) ? $ffields[$table] : array();
+	$ffields = json_decode ($User->settings->hiddenCustomFields, true);
+	$ffields = is_array (@$ffields[$table]) ? $ffields[$table] : array ();
 
 	print "<tbody id='custom-$k'>";
 
 	//title
 	print "	<tr>";
 	print "	<th colspan='8'>";
-	print "		<h5>"._($title)."</h5>";
+	print "		<h5>"._ ($title)."</h5>";
 	print "	</th>";
 	print "	</tr>";
 
 	//empty
-	if(sizeof($cf) == 0) {
+	if (sizeof ($cf) == 0) {
 	print "	<tr>";
 	print "	<td colspan='8'>";
-	print "		<div class='alert alert-info alert-nomargin'>"._('No custom fields created yet')."</div>";
+	print "		<div class='alert alert-info alert-nomargin'>"._ ('No custom fields created yet')."</div>";
 	print "	</td>";
 	print "	</tr>";
 	}
 	//content
 	else {
-		$size = sizeof($cf);		//we must remove title
-		$m=0;
+		$size = sizeof ($cf); //we must remove title
+		$m = 0;
 
-		foreach($cf as $f)
+		foreach ($cf as $f)
 		{
 			# space?
-			$class = !preg_match('/^[a-zA-Z0-9 \_]+$/i', $f['name']) ? "alert-danger" : "";
+			$class = !preg_match ('/^[a-zA-Z0-9 \_]+$/i', $f['name']) ? "alert-danger" : "";
 
 			print "<tr class='$class'>";
 
 			# ordering
-			if (( ($m+1) != $size) ) 	{ print "<td style='width:10px;'><button class='btn btn-xs btn-default down' data-direction='down' data-table='$table' rel='tooltip' title='Move down' data-fieldname='".$custom_fields_numeric[$table][$m]['name']."' data-nextfieldname='".$custom_fields_numeric[$table][$m+1]['name']."'><i class='fa fa-chevron-down'></i></button></td>";	}
-			else 						{ print "<td style='width:10px;'></td>";}
+			if ((($m + 1) != $size)) { print "<td style='width:10px;'><button class='btn btn-xs btn-default down' data-direction='down' data-table='$table' rel='tooltip' title='Move down' data-fieldname='".$custom_fields_numeric[$table][$m]['name']."' data-nextfieldname='".$custom_fields_numeric[$table][$m + 1]['name']."'><i class='fa fa-chevron-down'></i></button></td>"; }
+			else { print "<td style='width:10px;'></td>"; }
 
 			print "<td class='name'>$f[name]</td>";
 
@@ -110,12 +110,12 @@ 
 
 
 			# NULL
-			if(@$f['Null']=="NO")		{ print "<td>"._('Required')."</td>"; }
-			else						{ print "<td></td>"; }
+			if (@$f['Null'] == "NO") { print "<td>"._ ('Required')."</td>"; }
+			else { print "<td></td>"; }
 
 			# visible
-			if(in_array($f['name'], $ffields))	{ print "<td><span class='text-danger'>"._('No')."</span></td>"; }
-			else								{ print "<td><span class='text-success'>"._('Yes')."</span></td>"; }
+			if (in_array ($f['name'], $ffields)) { print "<td><span class='text-danger'>"._ ('No')."</span></td>"; }
+			else { print "<td><span class='text-success'>"._ ('Yes')."</span></td>"; }
 
 			#actions
 			print "<td class='actions'>";
@@ -125,7 +125,7 @@ 
 			print "	</div>";
 
 			# warning for older versions
-			if((is_numeric(substr($f['name'], 0, 1))) || (!preg_match('!^[\w_ ]*$!', $f['name'])) ) { print '<span class="alert alert-warning"><strong>Warning</strong>: '._('Invalid field name').'!</span>'; }
+			if ((is_numeric (substr ($f['name'], 0, 1))) || (!preg_match ('!^[\w_ ]*$!', $f['name']))) { print '<span class="alert alert-warning"><strong>Warning</strong>: '._ ('Invalid field name').'!</span>'; }
 
 			print "</td>";
 			print "</tr>";
@@ -138,14 +138,14 @@ 
 	//add
 	print "<tr>";
 	print "<td colspan='8' style='padding-right:0px;'>";
-	print "	<button class='btn btn-xs btn-default pull-right edit-custom-field' data-action='add'  data-fieldname='' data-table='$table' rel='tooltip' data-placement='right' title='"._($tooltip)."'><i class='fa fa-plus'></i></button>";
+	print "	<button class='btn btn-xs btn-default pull-right edit-custom-field' data-action='add'  data-fieldname='' data-table='$table' rel='tooltip' data-placement='right' title='"._ ($tooltip)."'><i class='fa fa-plus'></i></button>";
 	print "</td>";
 	print "</tr>";
 
 	//filter
 	print "<tr>";
 	print "<td colspan='8' style='padding-right:0px;'>";
-	print "	<button class='btn btn-xs btn-info pull-right edit-custom-filter' data-table='$table' rel='tooltip' data-placement='right' title='"._("Set which field to display in table")."'><i class='fa fa-filter'></i> Filter</button>";
+	print "	<button class='btn btn-xs btn-info pull-right edit-custom-filter' data-table='$table' rel='tooltip' data-placement='right' title='"._ ("Set which field to display in table")."'><i class='fa fa-filter'></i> Filter</button>";
 	print "</td>";
 	print "</tr>";
 

app/admin/custom-fields/filter.php

Spacing +14 added lines, -14 removed lines

@@ -12,23 +12,23 @@ 
 
 
 /* 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);
 $Tools	 	= new Tools ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # get hidden custom fields from settings
-$filters = json_decode($User->settings->hiddenCustomFields, true);
-isset($filters[$_POST['table']]) ? : $filters[$_POST['table']] = array();
+$filters = json_decode ($User->settings->hiddenCustomFields, true);
+isset($filters[$_POST['table']]) ? : $filters[$_POST['table']] = array ();
 
 # fetch custom fields
-$custom = $Tools->fetch_custom_fields($_POST['table']);
+$custom = $Tools->fetch_custom_fields ($_POST['table']);
 ?>
 
 <script type="text/javascript">
@@ -48,7 +48,7 @@ 
 </script>
 
 <!-- header -->
-<div class="pHeader"><?php print _('Filter custom field display'); ?></div>
+<div class="pHeader"><?php print _ ('Filter custom field display'); ?></div>
 
 <!-- content -->
 <div class="pContent">
@@ -59,12 +59,12 @@ 
 	<input type="hidden" name="table" value="<?php print $_POST['table']; ?>">
 
 	<?php
-	foreach($custom as $k=>$c) {
+	foreach ($custom as $k=>$c) {
 		print "<tr>";
 		# select
 		print "	<td style='width:20px;'>";
-		if(in_array($k, $filters[$_POST['table']]))	{ print "<input type='checkbox' class='input-switch' name='$k' checked>"; }
-		else										{ print "<input type='checkbox' class='input-switch' name='$k'>"; }
+		if (in_array ($k, $filters[$_POST['table']])) { print "<input type='checkbox' class='input-switch' name='$k' checked>"; }
+		else { print "<input type='checkbox' class='input-switch' name='$k'>"; }
 		print "	</td>";
 		# name and comment
 		print "	<td>".$k." (".$c['Comment'].")</td>";
@@ -77,7 +77,7 @@ 
 
 	<hr>
 	<div class="text-muted">
-	<?php print _("Selected fields will not be visible in table view, only in detail view"); ?>
+	<?php print _ ("Selected fields will not be visible in table view, only in detail view"); ?>
 	</div>
 	<hr>
 </div>
@@ -85,8 +85,8 @@ 
 <!-- footer -->
 <div class="pFooter">
 	<div class="btn-group">
-		<button class="btn btn-sm btn-default hidePopups"><?php print _('Close'); ?></button>
-		<button class="btn btn-sm btn-default " id="editcustomFilterSubmit"><i class="fa fa-check"></i> <?php print ucwords(_("Save filter")); ?></button>
+		<button class="btn btn-sm btn-default hidePopups"><?php print _ ('Close'); ?></button>
+		<button class="btn btn-sm btn-default " id="editcustomFilterSubmit"><i class="fa fa-check"></i> <?php print ucwords (_ ("Save filter")); ?></button>
 	</div>
 	<!-- result -->
 	<div class="customEditFilterResult"></div>

app/admin/custom-fields/filter-result.php

Spacing +8 added lines, -8 removed lines

@@ -6,24 +6,24 @@ 
 
 
 /* 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 ();
 
 # set table name
 $table = $_POST['table'];
 unset($_POST['table']);
 
 /* enthing to write? */
-if(sizeof($_POST)>0) {
-	foreach($_POST as $k=>$v) {
+if (sizeof ($_POST) > 0) {
+	foreach ($_POST as $k=>$v) {
 		$filtered_fields[] = $k;
 	}
 }
@@ -32,6 +32,6 @@ 
 }
 
 /* save */
-if(!$Admin->save_custom_fields_filter($table, $filtered_fields))	{  }
-else																{ $Result->show("success", _('Filter saved')); }
+if (!$Admin->save_custom_fields_filter ($table, $filtered_fields)) {  }
+else { $Result->show ("success", _ ('Filter saved')); }
 ?>
\ No newline at end of file

app/admin/custom-fields/order.php

Spacing +7 added lines, -7 removed lines

@@ -6,23 +6,23 @@
 
 
 /* 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 ();
 
 # some verifications
-if( (empty($_POST['current'])) || (empty($_POST['next'])) ) 							{ $Result->show("danger", _('Fileds cannot be empty')."!", true); }
+if ((empty($_POST['current'])) || (empty($_POST['next']))) { $Result->show ("danger", _ ('Fileds cannot be empty')."!", true); }
 
 
 /* reorder */
-if(!$Admin->reorder_custom_fields($_POST['table'], $_POST['next'], $_POST['current'])) 	{ $Result->show("danger", _('Reordering failed')."!", true); }
-else 																					{ $Result->show("success", _('Fields reordered successfully')."!");}
+if (!$Admin->reorder_custom_fields ($_POST['table'], $_POST['next'], $_POST['current'])) { $Result->show ("danger", _ ('Reordering failed')."!", true); }
+else { $Result->show ("success", _ ('Fields reordered successfully')."!"); }
 
 ?>
\ No newline at end of file

app/admin/api/edit.php

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>