phpipam / phpipam

app/admin/custom-fields/edit.php

Indentation +15 added lines, -15 removed lines

@@ -72,24 +72,24 @@
 	<tr>
 		<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");
-		//reformat old type
-		$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']; }
-		?>
+        // define supported types
+        $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));
+
+        //exceptions
+        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>
 		</td>
 	</tr>

app/admin/devices/index.php

Indentation +105 added lines, -105 removed lines

@@ -16,9 +16,9 @@ 
 # fetch all Device types and reindex
 $device_types = $Admin->fetch_all_objects("deviceTypes", "tid");
 if ($device_types !== false) {
-	foreach ($device_types as $dt) {
-		$device_types_i[$dt->tid] = $dt;
-	}
+    foreach ($device_types as $dt) {
+        $device_types_i[$dt->tid] = $dt;
+    }
 }
 
 # fetch custom fields
@@ -39,65 +39,65 @@ 
 <?php
 /* first check if they exist! */
 if($devices===false) {
-	$Result->show("warn alert-absolute", _('No devices configured').'!', false);
+    $Result->show("warn alert-absolute", _('No devices configured').'!', false);
 }
 /* Print them out */
 else {
 
-	print '<table id="switchManagement" class="table table-striped sorted table-td-top">';
+    print '<table id="switchManagement" class="table table-striped sorted table-td-top">';
 
-	# headers
-	print "<thead>";
-	print '<tr>';
-	print '	<th>'._('Name').'</th>';
-	print '	<th>'._('IP address').'</th>';
-	print '	<th>'._('Type').'</th>';
-	print '	<th>'._('Description').'</th>';
+    # headers
+    print "<thead>";
+    print '<tr>';
+    print '	<th>'._('Name').'</th>';
+    print '	<th>'._('IP address').'</th>';
+    print '	<th>'._('Type').'</th>';
+    print '	<th>'._('Description').'</th>';
     if($User->settings->enableSNMP=="1")
-	print '	<th>'._('SNMP').'</th>';
+    print '	<th>'._('SNMP').'</th>';
     if($User->settings->enableRACK=="1")
-	print '	<th>'._('Rack').'</th>';
-	print '	<th><i class="icon-gray icon-info-sign" rel="tooltip" title="'._('Shows in which sections device will be visible for selection').'"></i> '._('Sections').'</th>';
-	if(sizeof($custom) > 0) {
-		foreach($custom as $field) {
-			if(!in_array($field['name'], $hidden_custom_fields)) {
-				print "<th class='hidden-xs hidden-sm hidden-md'>$field[name]</th>";
-			}
-		}
-	}
-	print '	<th class="actions"></th>';
-	print '</tr>';
+    print '	<th>'._('Rack').'</th>';
+    print '	<th><i class="icon-gray icon-info-sign" rel="tooltip" title="'._('Shows in which sections device will be visible for selection').'"></i> '._('Sections').'</th>';
+    if(sizeof($custom) > 0) {
+        foreach($custom as $field) {
+            if(!in_array($field['name'], $hidden_custom_fields)) {
+                print "<th class='hidden-xs hidden-sm hidden-md'>$field[name]</th>";
+            }
+        }
+    }
+    print '	<th class="actions"></th>';
+    print '</tr>';
     print "</thead>";
 
     print "<tbody>";
-	# loop through devices
-	foreach ($devices as $device) {
-		//cast
-		$device = (array) $device;
-
-		//print details
-		print '<tr>'. "\n";
-
-		print '	<td><a href="'.create_link("tools","devices","hosts",$device['id']).'">'. $device['hostname'] .'</a></td>'. "\n";
-		print '	<td>'. $device['ip_addr'] .'</td>'. "\n";
-		print '	<td>'. @$device_types_i[$device['type']]->tname .'</td>'. "\n";
-		print '	<td class="description">'. $device['description'] .'</td>'. "\n";
-
-		// SNMP
-		if($User->settings->enableSNMP=="1") {
-    		print "<td>";
-    		// not set
-    		if ($device['snmp_version']==0 || strlen($device['snmp_version'])==0) {
-        		print "<span class='text-muted'>"._("Disabled")."</span>";
-    		}
-    		else {
+    # loop through devices
+    foreach ($devices as $device) {
+        //cast
+        $device = (array) $device;
+
+        //print details
+        print '<tr>'. "\n";
+
+        print '	<td><a href="'.create_link("tools","devices","hosts",$device['id']).'">'. $device['hostname'] .'</a></td>'. "\n";
+        print '	<td>'. $device['ip_addr'] .'</td>'. "\n";
+        print '	<td>'. @$device_types_i[$device['type']]->tname .'</td>'. "\n";
+        print '	<td class="description">'. $device['description'] .'</td>'. "\n";
+
+        // SNMP
+        if($User->settings->enableSNMP=="1") {
+            print "<td>";
+            // not set
+            if ($device['snmp_version']==0 || strlen($device['snmp_version'])==0) {
+                print "<span class='text-muted'>"._("Disabled")."</span>";
+            }
+            else {
                 print _("Version").": $device[snmp_version]<br>";
                 print _("Community").": $device[snmp_community]<br>";
-    		}
-    		print "</td>";
-		}
+            }
+            print "</td>";
+        }
 
-		// rack
+        // rack
         if($User->settings->enableRACK=="1") {
             print "<td>";
             # rack
@@ -109,62 +109,62 @@ 
             print "</td>";
         }
 
-		//sections
-		print '	<td class="sections">';
-			$temp = explode(";",$device['sections']);
-			if( (sizeof($temp) > 0) && (!empty($temp[0])) ) {
-			foreach($temp as $line) {
-				$section = $Sections->fetch_section(null, $line);
-				if(!empty($section)) {
-				print '<div class="switchSections text-muted">'. $section->name .'</div>'. "\n";
-				}
-			}
-			}
-
-		print '	</td>'. "\n";
-
-		//custom
-		if(sizeof($custom) > 0) {
-			foreach($custom as $field) {
-				if(!in_array($field['name'], $hidden_custom_fields)) {
-					print "<td class='hidden-xs hidden-sm hidden-md'>";
-
-					// create links
-					$device[$field['name']] = $Result->create_links ($device[$field['name']], $field['type']);
-
-					//booleans
-					if($field['type']=="tinyint(1)")	{
-						if($device[$field['name']] == "0")		{ print _("No"); }
-						elseif($device[$field['name']] == "1")	{ print _("Yes"); }
-					}
-					//text
-					elseif($field['type']=="text") {
-						if(strlen($device[$field['name']])>0)	{ print "<i class='fa fa-gray fa-comment' rel='tooltip' data-container='body' data-html='true' title='".str_replace("\n", "<br>", $device[$field['name']])."'>"; }
-						else											{ print ""; }
-					}
-					else {
-						print $device[$field['name']];
-
-					}
-					print "</td>";
-				}
-			}
-		}
-
-		print '	<td class="actions">'. "\n";
-		print "	<div class='btn-group'>";
-		print "		<button class='btn btn-xs btn-default editSwitch' data-action='edit'   data-switchid='$device[id]'><i class='fa fa-pencil'></i></button>";
-		if($User->settings->enableSNMP=="1")
-		print "		<button class='btn btn-xs btn-default editSwitchSNMP' data-action='edit' data-switchid='$device[id]'><i class='fa fa-cogs'></i></button>";
-		print "		<button class='btn btn-xs btn-default editSwitch' data-action='delete' data-switchid='$device[id]'><i class='fa fa-times'></i></button>";
-		print "	</div>";
-		print '	</td>'. "\n";
-
-		print '</tr>'. "\n";
-
-	}
-	print "</tbody>";
-	print '</table>';
+        //sections
+        print '	<td class="sections">';
+            $temp = explode(";",$device['sections']);
+            if( (sizeof($temp) > 0) && (!empty($temp[0])) ) {
+            foreach($temp as $line) {
+                $section = $Sections->fetch_section(null, $line);
+                if(!empty($section)) {
+                print '<div class="switchSections text-muted">'. $section->name .'</div>'. "\n";
+                }
+            }
+            }
+
+        print '	</td>'. "\n";
+
+        //custom
+        if(sizeof($custom) > 0) {
+            foreach($custom as $field) {
+                if(!in_array($field['name'], $hidden_custom_fields)) {
+                    print "<td class='hidden-xs hidden-sm hidden-md'>";
+
+                    // create links
+                    $device[$field['name']] = $Result->create_links ($device[$field['name']], $field['type']);
+
+                    //booleans
+                    if($field['type']=="tinyint(1)")	{
+                        if($device[$field['name']] == "0")		{ print _("No"); }
+                        elseif($device[$field['name']] == "1")	{ print _("Yes"); }
+                    }
+                    //text
+                    elseif($field['type']=="text") {
+                        if(strlen($device[$field['name']])>0)	{ print "<i class='fa fa-gray fa-comment' rel='tooltip' data-container='body' data-html='true' title='".str_replace("\n", "<br>", $device[$field['name']])."'>"; }
+                        else											{ print ""; }
+                    }
+                    else {
+                        print $device[$field['name']];
+
+                    }
+                    print "</td>";
+                }
+            }
+        }
+
+        print '	<td class="actions">'. "\n";
+        print "	<div class='btn-group'>";
+        print "		<button class='btn btn-xs btn-default editSwitch' data-action='edit'   data-switchid='$device[id]'><i class='fa fa-pencil'></i></button>";
+        if($User->settings->enableSNMP=="1")
+        print "		<button class='btn btn-xs btn-default editSwitchSNMP' data-action='edit' data-switchid='$device[id]'><i class='fa fa-cogs'></i></button>";
+        print "		<button class='btn btn-xs btn-default editSwitch' data-action='delete' data-switchid='$device[id]'><i class='fa fa-times'></i></button>";
+        print "	</div>";
+        print '	</td>'. "\n";
+
+        print '</tr>'. "\n";
+
+    }
+    print "</tbody>";
+    print '</table>';
 }
 ?>
 

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

Indentation +11 added lines, -11 removed lines

@@ -42,23 +42,23 @@
 
 # set snmp queries
 foreach($_POST as $key=>$line) {
-	if (strlen(strstr($key,"query-"))>0) {
-		$key2 = str_replace("query-", "", $key);
-		$temp[] = $key2;
-		unset($_POST[$key]);
-	}
+    if (strlen(strstr($key,"query-"))>0) {
+        $key2 = str_replace("query-", "", $key);
+        $temp[] = $key2;
+        unset($_POST[$key]);
+    }
 }
 # glue sections together
 $_POST['snmp_queries'] = sizeof($temp)>0 ? implode(";", $temp) : null;
 
 # set update values
 $values = array("id"=>$_POST['device_id'],
-				"snmp_version"=>$_POST['snmp_version'],
-				"snmp_community"=>$_POST['snmp_community'],
-				"snmp_port"=>$_POST['snmp_port'],
-				"snmp_timeout"=>$_POST['snmp_timeout'],
-				"snmp_queries"=>$_POST['snmp_queries']
-				);
+                "snmp_version"=>$_POST['snmp_version'],
+                "snmp_community"=>$_POST['snmp_community'],
+                "snmp_port"=>$_POST['snmp_port'],
+                "snmp_timeout"=>$_POST['snmp_timeout'],
+                "snmp_queries"=>$_POST['snmp_queries']
+                );
 
 # update device
 if(!$Admin->object_modify("devices", "edit", "id", $values))    { $Result->show("danger",  _("SNMP edit failed").'!', false); }

app/admin/devices/edit-snmp.php

Indentation +8 added lines, -8 removed lines

@@ -122,15 +122,15 @@
 		<td><?php print _('Queries'); ?></td>
 		<td style="text-align:top">
 		<?php
-		# select queries
-		$queries = explode(";", $device->snmp_queries);
-		$queries = is_array($queries) ? $queries : array();
+        # select queries
+        $queries = explode(";", $device->snmp_queries);
+        $queries = is_array($queries) ? $queries : array();
         // loop
-		foreach($Snmp->snmp_queries as $k=>$m) {
-			if(in_array($k, $queries)) 	{ print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="query-'. $k .'" value="on" checked> '. $k .'</div>'. "\n"; }
-			else 							{ print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="query-'. $k .'" value="on">'. $k .'</span></div>'. "\n"; }
-		}
-		?>
+        foreach($Snmp->snmp_queries as $k=>$m) {
+            if(in_array($k, $queries)) 	{ print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="query-'. $k .'" value="on" checked> '. $k .'</div>'. "\n"; }
+            else 							{ print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="query-'. $k .'" value="on">'. $k .'</span></div>'. "\n"; }
+        }
+        ?>
 		</td>
 	</tr>
 

app/admin/devices/edit-result.php

Indentation +29 added lines, -29 removed lines

@@ -29,12 +29,12 @@ 
 
 # available devices set
 foreach($device as $key=>$line) {
-	if (strlen(strstr($key,"section-"))>0) {
-		$key2 = str_replace("section-", "", $key);
-		$temp[] = $key2;
+    if (strlen(strstr($key,"section-"))>0) {
+        $key2 = str_replace("section-", "", $key);
+        $temp[] = $key2;
 
-		unset($device[$key]);
-	}
+        unset($device[$key]);
+    }
 }
 # glue sections together
 $device['sections'] = sizeof($temp)>0 ? implode(";", $temp) : null;
@@ -61,33 +61,33 @@ 
 # fetch custom fields
 $custom = $Tools->fetch_custom_fields('devices');
 if(sizeof($custom) > 0) {
-	foreach($custom as $myField) {
-		//booleans can be only 0 and 1!
-		if($myField['type']=="tinyint(1)") {
-			if($device[$myField['name']]>1) {
-				$device[$myField['name']] = 0;
-			}
-		}
-		//not null!
-		if($myField['Null']=="NO" && strlen($device[$myField['name']])==0) {
-																		{ $Result->show("danger", $myField['name'].'" can not be empty!', true); }
-		}
-		# save to update array
-		$update[$myField['name']] = $device[$myField['name']];
-	}
+    foreach($custom as $myField) {
+        //booleans can be only 0 and 1!
+        if($myField['type']=="tinyint(1)") {
+            if($device[$myField['name']]>1) {
+                $device[$myField['name']] = 0;
+            }
+        }
+        //not null!
+        if($myField['Null']=="NO" && strlen($device[$myField['name']])==0) {
+                                                                        { $Result->show("danger", $myField['name'].'" can not be empty!', true); }
+        }
+        # save to update array
+        $update[$myField['name']] = $device[$myField['name']];
+    }
 }
 
 # set update values
 $values = array("id"=>@$device['switchId'],
-				"hostname"=>@$device['hostname'],
-				"ip_addr"=>@$device['ip_addr'],
-				"type"=>@$device['type'],
-				"description"=>@$device['description'],
-				"sections"=>@$device['sections']
-				);
+                "hostname"=>@$device['hostname'],
+                "ip_addr"=>@$device['ip_addr'],
+                "type"=>@$device['type'],
+                "description"=>@$device['description'],
+                "sections"=>@$device['sections']
+                );
 # custom fields
 if(isset($update)) {
-	$values = array_merge($values, $update);
+    $values = array_merge($values, $update);
 }
 # rack
 if (strlen(@$device['rack']>0)) {
@@ -102,9 +102,9 @@ 
 else																	{ $Result->show("success", _("Device $device[action] successfull").'!', false); }
 
 if($_POST['action']=="delete"){
-	# remove all references from subnets and ip addresses
-	$Admin->remove_object_references ("subnets", "device", $values["id"]);
-	$Admin->remove_object_references ("ipaddresses", "switch", $values["id"]);
+    # remove all references from subnets and ip addresses
+    $Admin->remove_object_references ("subnets", "device", $values["id"]);
+    $Admin->remove_object_references ("ipaddresses", "switch", $values["id"]);
 }
 
 ?>

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

Indentation +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
     $Result->show("Query result", implode("", $res), false, true, false, true);
 }
 else {
-   $Result->show("warning", _("No queries"), false, true, false, true);
+    $Result->show("warning", _("No queries"), false, true, false, true);
 }
 ?>
 

app/admin/devices/edit.php

Indentation +124 added lines, -124 removed lines

@@ -28,9 +28,9 @@ 
 
 # fetch device details
 if( ($_POST['action'] == "edit") || ($_POST['action'] == "delete") ) {
-	$device = (array) $Admin->fetch_object("devices", "id", $_POST['switchId']);
-	// false
-	if ($device===false)                                            { $Result->show("danger", _("Invalid ID"), true, true);  }
+    $device = (array) $Admin->fetch_object("devices", "id", $_POST['switchId']);
+    // false
+    if ($device===false)                                            { $Result->show("danger", _("Invalid ID"), true, true);  }
 }
 
 # set readonly flag
@@ -88,12 +88,12 @@ 
 		<td>
 			<select name="type" class="form-control input-sm input-w-auto">
 			<?php
-			$types = $Admin->fetch_all_objects("deviceTypes", "tid");
-			foreach($types as $name) {
-				if($device['type'] == $name->tid)	{ print "<option value='$name->tid' selected='selected'>$name->tname</option>"; }
-				else								{ print "<option value='$name->tid' >$name->tname</option>"; }
-			}
-			?>
+            $types = $Admin->fetch_all_objects("deviceTypes", "tid");
+            foreach($types as $name) {
+                if($device['type'] == $name->tid)	{ print "<option value='$name->tid' selected='selected'>$name->tname</option>"; }
+                else								{ print "<option value='$name->tid' >$name->tname</option>"; }
+            }
+            ?>
 			</select>
 		</td>
 	</tr>
@@ -114,8 +114,8 @@ 
                 <option value=""><?php print _("None"); ?></option>
                 <?php
                 foreach ($Racks->all_racks as $r) {
-     				if($device['rack'] == $r->id)	{ print "<option value='$r->id' selected='selected'>$r->name</option>"; }
-    				else							{ print "<option value='$r->id' >$r->name</option>"; }
+                        if($device['rack'] == $r->id)	{ print "<option value='$r->id' selected='selected'>$r->name</option>"; }
+                    else							{ print "<option value='$r->id' >$r->name</option>"; }
                 }
                 ?>
             </select>
@@ -158,9 +158,9 @@ 
 		<td>
 			<textarea name="description" class="form-control input-sm" placeholder="<?php print _('Description'); ?>" <?php print $readonly; ?>><?php if(isset($device['description'])) print $device['description']; ?></textarea>
 			<?php
-			if( ($_POST['action'] == "edit") || ($_POST['action'] == "delete") ) {
-				print '<input type="hidden" name="switchId" value="'. $_POST['switchId'] .'">'. "\n";
-			} ?>
+            if( ($_POST['action'] == "edit") || ($_POST['action'] == "delete") ) {
+                print '<input type="hidden" name="switchId" value="'. $_POST['switchId'] .'">'. "\n";
+            } ?>
 			<input type="hidden" name="action" value="<?php print $_POST['action']; ?>">
 			<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
 		</td>
@@ -168,101 +168,101 @@ 
 
 	<!-- Custom -->
 	<?php
-	if(sizeof($custom) > 0) {
-
-		print '<tr>';
-		print '	<td colspan="2"><hr></td>';
-		print '</tr>';
-
-		# count datepickers
-		$timeP = 0;
-
-		# all my fields
-		foreach($custom as $field) {
-			# replace spaces with |
-			$field['nameNew'] = str_replace(" ", "___", $field['name']);
-
-			# required
-			if($field['Null']=="NO")	{ $required = "*"; }
-			else						{ $required = ""; }
-
-			# set default value !
-			if ($_POST['action']=="add")	{ $device[$field['name']] = $field['Default']; }
-
-			print '<tr>'. "\n";
-			print '	<td>'. ucwords($field['name']) .' '.$required.'</td>'. "\n";
-			print '	<td>'. "\n";
-
-			//set type
-			if(substr($field['type'], 0,3) == "set" || substr($field['type'], 0,4) == "enum") {
-				//parse values
-				$tmp = substr($field['type'], 0,3)=="set" ? explode(",", str_replace(array("set(", ")", "'"), "", $field['type'])) : explode(",", str_replace(array("enum(", ")", "'"), "", $field['type']));
-				//null
-				if($field['Null']!="NO") { array_unshift($tmp, ""); }
-
-				print "<select name='$field[nameNew]' class='form-control input-sm input-w-auto' rel='tooltip' data-placement='right' title='$field[Comment]'>";
-				foreach($tmp as $v) {
-					if($v==$device[$field['name']])	{ print "<option value='$v' selected='selected'>$v</option>"; }
-					else							{ print "<option value='$v'>$v</option>"; }
-				}
-				print "</select>";
-			}
-			//date and time picker
-			elseif($field['type'] == "date" || $field['type'] == "datetime") {
-				// just for first
-				if($timeP==0) {
-					print '<link rel="stylesheet" type="text/css" href="css/1.2/bootstrap/bootstrap-datetimepicker.min.css">';
-					print '<script type="text/javascript" src="js/1.2/bootstrap-datetimepicker.min.js"></script>';
-					print '<script type="text/javascript">';
-					print '$(document).ready(function() {';
-					//date only
-					print '	$(".datepicker").datetimepicker( {pickDate: true, pickTime: false, pickSeconds: false });';
-					//date + time
-					print '	$(".datetimepicker").datetimepicker( { pickDate: true, pickTime: true } );';
-
-					print '})';
-					print '</script>';
-				}
-				$timeP++;
-
-				//set size
-				if($field['type'] == "date")	{ $size = 10; $class='datepicker';		$format = "yyyy-MM-dd"; }
-				else							{ $size = 19; $class='datetimepicker';	$format = "yyyy-MM-dd"; }
-
-				//field
-				if(!isset($device[$field['name']]))	{ print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'. $field['nameNew'] .'" maxlength="'.$size.'" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n"; }
-				else								{ print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'. $field['nameNew'] .'" maxlength="'.$size.'" value="'. $device[$field['name']]. '" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n"; }
-			}
-			//boolean
-			elseif($field['type'] == "tinyint(1)") {
-				print "<select name='$field[nameNew]' class='form-control input-sm input-w-auto' rel='tooltip' data-placement='right' title='$field[Comment]'>";
-				$tmp = array(0=>"No",1=>"Yes");
-				//null
-				if($field['Null']!="NO") { $tmp[2] = ""; }
-
-				foreach($tmp as $k=>$v) {
-					if(strlen($device[$field['name']])==0 && $k==2)	{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
-					elseif($k==$device[$field['name']])				{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
-					else											{ print "<option value='$k'>"._($v)."</option>"; }
-				}
-				print "</select>";
-			}
-			//text
-			elseif($field['type'] == "text") {
-				print ' <textarea class="form-control input-sm" name="'. $field['nameNew'] .'" placeholder="'. $field['name'] .'" rowspan=3 rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. $device[$field['name']]. '</textarea>'. "\n";
-			}
-			//default - input field
-			else {
-				print ' <input type="text" class="ip_addr form-control input-sm" name="'. $field['nameNew'] .'" placeholder="'. $field['name'] .'" value="'. $device[$field['name']]. '" size="30" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n";
-			}
-
-			print '	</td>'. "\n";
-			print '</tr>'. "\n";
-		}
-
-	}
-
-	?>
+    if(sizeof($custom) > 0) {
+
+        print '<tr>';
+        print '	<td colspan="2"><hr></td>';
+        print '</tr>';
+
+        # count datepickers
+        $timeP = 0;
+
+        # all my fields
+        foreach($custom as $field) {
+            # replace spaces with |
+            $field['nameNew'] = str_replace(" ", "___", $field['name']);
+
+            # required
+            if($field['Null']=="NO")	{ $required = "*"; }
+            else						{ $required = ""; }
+
+            # set default value !
+            if ($_POST['action']=="add")	{ $device[$field['name']] = $field['Default']; }
+
+            print '<tr>'. "\n";
+            print '	<td>'. ucwords($field['name']) .' '.$required.'</td>'. "\n";
+            print '	<td>'. "\n";
+
+            //set type
+            if(substr($field['type'], 0,3) == "set" || substr($field['type'], 0,4) == "enum") {
+                //parse values
+                $tmp = substr($field['type'], 0,3)=="set" ? explode(",", str_replace(array("set(", ")", "'"), "", $field['type'])) : explode(",", str_replace(array("enum(", ")", "'"), "", $field['type']));
+                //null
+                if($field['Null']!="NO") { array_unshift($tmp, ""); }
+
+                print "<select name='$field[nameNew]' class='form-control input-sm input-w-auto' rel='tooltip' data-placement='right' title='$field[Comment]'>";
+                foreach($tmp as $v) {
+                    if($v==$device[$field['name']])	{ print "<option value='$v' selected='selected'>$v</option>"; }
+                    else							{ print "<option value='$v'>$v</option>"; }
+                }
+                print "</select>";
+            }
+            //date and time picker
+            elseif($field['type'] == "date" || $field['type'] == "datetime") {
+                // just for first
+                if($timeP==0) {
+                    print '<link rel="stylesheet" type="text/css" href="css/1.2/bootstrap/bootstrap-datetimepicker.min.css">';
+                    print '<script type="text/javascript" src="js/1.2/bootstrap-datetimepicker.min.js"></script>';
+                    print '<script type="text/javascript">';
+                    print '$(document).ready(function() {';
+                    //date only
+                    print '	$(".datepicker").datetimepicker( {pickDate: true, pickTime: false, pickSeconds: false });';
+                    //date + time
+                    print '	$(".datetimepicker").datetimepicker( { pickDate: true, pickTime: true } );';
+
+                    print '})';
+                    print '</script>';
+                }
+                $timeP++;
+
+                //set size
+                if($field['type'] == "date")	{ $size = 10; $class='datepicker';		$format = "yyyy-MM-dd"; }
+                else							{ $size = 19; $class='datetimepicker';	$format = "yyyy-MM-dd"; }
+
+                //field
+                if(!isset($device[$field['name']]))	{ print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'. $field['nameNew'] .'" maxlength="'.$size.'" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n"; }
+                else								{ print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'. $field['nameNew'] .'" maxlength="'.$size.'" value="'. $device[$field['name']]. '" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n"; }
+            }
+            //boolean
+            elseif($field['type'] == "tinyint(1)") {
+                print "<select name='$field[nameNew]' class='form-control input-sm input-w-auto' rel='tooltip' data-placement='right' title='$field[Comment]'>";
+                $tmp = array(0=>"No",1=>"Yes");
+                //null
+                if($field['Null']!="NO") { $tmp[2] = ""; }
+
+                foreach($tmp as $k=>$v) {
+                    if(strlen($device[$field['name']])==0 && $k==2)	{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
+                    elseif($k==$device[$field['name']])				{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
+                    else											{ print "<option value='$k'>"._($v)."</option>"; }
+                }
+                print "</select>";
+            }
+            //text
+            elseif($field['type'] == "text") {
+                print ' <textarea class="form-control input-sm" name="'. $field['nameNew'] .'" placeholder="'. $field['name'] .'" rowspan=3 rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. $device[$field['name']]. '</textarea>'. "\n";
+            }
+            //default - input field
+            else {
+                print ' <input type="text" class="ip_addr form-control input-sm" name="'. $field['nameNew'] .'" placeholder="'. $field['name'] .'" value="'. $device[$field['name']]. '" size="30" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n";
+            }
+
+            print '	</td>'. "\n";
+            print '</tr>'. "\n";
+        }
+
+    }
+
+    ?>
 
 	<!-- Sections -->
 	<tr>
@@ -277,21 +277,21 @@ 
 		<td></td>
 		<td>
 		<?php
-		# select sections
-		$Sections = new Sections ($Database);
-		$sections = $Sections->fetch_all_sections();
-
-		# reformat device sections to array
-		$deviceSections = explode(";", $device['sections']);
-		$deviceSections = is_array($deviceSections) ? $deviceSections : array();
-
-		if ($sections!==false) {
-			foreach($sections as $section) {
-				if(in_array($section->id, $deviceSections)) 	{ print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="section-'. $section->id .'" value="on" checked> '. $section->name .'</div>'. "\n"; }
-				else 											{ print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="section-'. $section->id .'" value="on">'. $section->name .'</span></div>'. "\n"; }
-			}
-		}
-		?>
+        # select sections
+        $Sections = new Sections ($Database);
+        $sections = $Sections->fetch_all_sections();
+
+        # reformat device sections to array
+        $deviceSections = explode(";", $device['sections']);
+        $deviceSections = is_array($deviceSections) ? $deviceSections : array();
+
+        if ($sections!==false) {
+            foreach($sections as $section) {
+                if(in_array($section->id, $deviceSections)) 	{ print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="section-'. $section->id .'" value="on" checked> '. $section->name .'</div>'. "\n"; }
+                else 											{ print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="section-'. $section->id .'" value="on">'. $section->name .'</span></div>'. "\n"; }
+            }
+        }
+        ?>
 		</td>
 	</tr>
 

app/admin/import-export/import-load-data.php

Indentation +70 added lines, -70 removed lines

@@ -17,9 +17,9 @@ 
 $expfields = explode("|",$_GET['expfields']);
 $reqfields = explode("|",$_GET['reqfields']);
 if (isset($_GET['filetype'])) {
-	$filetype = $_GET['filetype'];
+    $filetype = $_GET['filetype'];
 } else {
-	$Result->show('danger', _("Error: could not read the uploaded file type!"), true, true);
+    $Result->show('danger', _("Error: could not read the uploaded file type!"), true, true);
 }
 
 # Load colors and icons
@@ -30,87 +30,87 @@ 
 
 # read field mapping from previous window
 foreach ($expfields as $expfield) {
-	if (isset($_GET['importFields__'.str_replace(" ", "_",$expfield)])) {
-		$impfield = $_GET['importFields__'.str_replace(" ", "_",$expfield)];
-		if (in_array($expfield,$reqfields) && ($impfield == "-")) {
-			$Result->show('danger', _("Error: missing required field mapping for expected field")." <b>".$expfield."</b>."._("Please check field matching in previous window."), true, true);
-		} else {
-			if ($impfield != "-") { $impfields[$impfield] = $expfield; }
-		}
-	} else {
-		$Result->show('danger', _("Internal error: missing import field mapping."), true, true);
-	}
-	# prepare header row for preview table
-	$hrow.="<th>".$expfield."</th>";
-	# prepare select field to transfer to actual import file
-	$hiddenfields.="<input name='importFields__".str_replace(" ", "_",$expfield)."' type='hidden' value='".$impfield."' style='display:none;'>";
+    if (isset($_GET['importFields__'.str_replace(" ", "_",$expfield)])) {
+        $impfield = $_GET['importFields__'.str_replace(" ", "_",$expfield)];
+        if (in_array($expfield,$reqfields) && ($impfield == "-")) {
+            $Result->show('danger', _("Error: missing required field mapping for expected field")." <b>".$expfield."</b>."._("Please check field matching in previous window."), true, true);
+        } else {
+            if ($impfield != "-") { $impfields[$impfield] = $expfield; }
+        }
+    } else {
+        $Result->show('danger', _("Internal error: missing import field mapping."), true, true);
+    }
+    # prepare header row for preview table
+    $hrow.="<th>".$expfield."</th>";
+    # prepare select field to transfer to actual import file
+    $hiddenfields.="<input name='importFields__".str_replace(" ", "_",$expfield)."' type='hidden' value='".$impfield."' style='display:none;'>";
 }
 
 $data = array();
 
 # read first row from CSV
 if (strtolower($filetype) == "csv") {
-	# open CSV file
-	$filehdl = fopen('upload/data_import.csv', 'r');
+    # open CSV file
+    $filehdl = fopen('upload/data_import.csv', 'r');
 
-	# read header row
-	$row = 0;$col = 0;
-	$line = fgets($filehdl);
-	$row++;
-	$line = str_replace( array("\r\n","\r") , "" , $line);	//remove line break
-	$cols = preg_split("/[;]/", $line); //split by comma or semi-colon
-	foreach ($cols as $val) {
-		$col++;
-		# map import columns to expected fields as per previous window
-		$fieldmap[$col] = $impfields[$val];
-		$hcol = $col;
-	}
+    # read header row
+    $row = 0;$col = 0;
+    $line = fgets($filehdl);
+    $row++;
+    $line = str_replace( array("\r\n","\r") , "" , $line);	//remove line break
+    $cols = preg_split("/[;]/", $line); //split by comma or semi-colon
+    foreach ($cols as $val) {
+        $col++;
+        # map import columns to expected fields as per previous window
+        $fieldmap[$col] = $impfields[$val];
+        $hcol = $col;
+    }
 
-	# read each remaining row into a dictionary with expected fields as keys
-	while (($line = fgets($filehdl)) !== false) {
-		$row++;$col = 0;
-		$line = str_replace( array("\r\n","\r") , "" , $line);	//remove line break
-		$cols = preg_split("/[;]/", $line); //split by comma or semi-colon
-		$record = array();
-		foreach ($cols as $val) {
-			$col++;
-			if ($col > $hcol) {
-				$Result->show('danger', _("Extra column found on line ").$row._(" in CSV file. CSV delimiter used in value field?"), true);
-			} else {
-				# read each row into a dictionary with expected fields as keys
-				$record[$fieldmap[$col]] = trim($val);
-			}
-		}
-		$data[] = $record;
-	}
-	fclose($filehdl);
+    # read each remaining row into a dictionary with expected fields as keys
+    while (($line = fgets($filehdl)) !== false) {
+        $row++;$col = 0;
+        $line = str_replace( array("\r\n","\r") , "" , $line);	//remove line break
+        $cols = preg_split("/[;]/", $line); //split by comma or semi-colon
+        $record = array();
+        foreach ($cols as $val) {
+            $col++;
+            if ($col > $hcol) {
+                $Result->show('danger', _("Extra column found on line ").$row._(" in CSV file. CSV delimiter used in value field?"), true);
+            } else {
+                # read each row into a dictionary with expected fields as keys
+                $record[$fieldmap[$col]] = trim($val);
+            }
+        }
+        $data[] = $record;
+    }
+    fclose($filehdl);
 }
 # read first row from XLS
 elseif(strtolower($filetype) == "xls") {
-	# get excel object
-	require_once(dirname(__FILE__) . '/../../../functions/php-excel-reader/excel_reader2.php');				//excel reader 2.21
-	$xls = new Spreadsheet_Excel_Reader('upload/data_import.xls', false);
-	$sheet = 0; $row = 1;
+    # get excel object
+    require_once(dirname(__FILE__) . '/../../../functions/php-excel-reader/excel_reader2.php');				//excel reader 2.21
+    $xls = new Spreadsheet_Excel_Reader('upload/data_import.xls', false);
+    $sheet = 0; $row = 1;
 
-	# map import columns to expected fields as per previous window
-	for($col=1;$col<=$xls->colcount($sheet);$col++) {
-		$fieldmap[$col] = $impfields[$xls->val($row,$col,$sheet)];
-		$hcol = $col;
-	}
+    # map import columns to expected fields as per previous window
+    for($col=1;$col<=$xls->colcount($sheet);$col++) {
+        $fieldmap[$col] = $impfields[$xls->val($row,$col,$sheet)];
+        $hcol = $col;
+    }
 
-	# read each remaining row into a dictionary with expected fields as keys
-	for($row=2;$row<=$xls->rowcount($sheet);$row++) {
-		$record = array();
-		for($col=1;$col<=$xls->colcount($sheet);$col++) {
-			$record++;
-			if ($col > $hcol) {
-					$Result->show('danger', _("Extra column found on line ").$row._(" in XLS file. Please check input file."), true);
-			} else {
-				$record[$fieldmap[$col]] = trim($xls->val($row,$col,$sheet));
-			}
-		}
-		$data[] = $record;
-	}
+    # read each remaining row into a dictionary with expected fields as keys
+    for($row=2;$row<=$xls->rowcount($sheet);$row++) {
+        $record = array();
+        for($col=1;$col<=$xls->colcount($sheet);$col++) {
+            $record++;
+            if ($col > $hcol) {
+                    $Result->show('danger', _("Extra column found on line ").$row._(" in XLS file. Please check input file."), true);
+            } else {
+                $record[$fieldmap[$col]] = trim($xls->val($row,$col,$sheet));
+            }
+        }
+        $data[] = $record;
+    }
 }
 
 ?>
\ No newline at end of file

app/admin/import-export/export-vlan.php

Indentation +96 added lines, -96 removed lines

@@ -48,33 +48,33 @@ 
 
 //write headers
 if( (isset($_GET['name'])) && ($_GET['name'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('Name') ,$format_header);
-	$rowCount++;
+    $worksheet->write($lineCount, $rowCount, _('Name') ,$format_header);
+    $rowCount++;
 }
 if( (isset($_GET['number'])) && ($_GET['number'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('Number') ,$format_header);
-	$rowCount++;
+    $worksheet->write($lineCount, $rowCount, _('Number') ,$format_header);
+    $rowCount++;
 }
 if( (isset($_GET['domain'])) && ($_GET['domain'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('Domain') ,$format_header);
-	$rowCount++;
+    $worksheet->write($lineCount, $rowCount, _('Domain') ,$format_header);
+    $rowCount++;
 }
 if( (isset($_GET['description'])) && ($_GET['description'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('Description') ,$format_header);
-	$rowCount++;
+    $worksheet->write($lineCount, $rowCount, _('Description') ,$format_header);
+    $rowCount++;
 }
 
 //custom fields
 if(sizeof($custom_fields) > 0) {
-	foreach($custom_fields as $myField) {
-		//set temp name - replace space with three ___
-		$myField['nameTemp'] = str_replace(" ", "___", $myField['name']);
-
-		if( (isset($_GET[$myField['nameTemp']])) && ($_GET[$myField['nameTemp']] == "on") ) {
-			$worksheet->write($lineCount, $rowCount, $myField['name'] ,$format_header);
-			$rowCount++;
-		}
-	}
+    foreach($custom_fields as $myField) {
+        //set temp name - replace space with three ___
+        $myField['nameTemp'] = str_replace(" ", "___", $myField['name']);
+
+        if( (isset($_GET[$myField['nameTemp']])) && ($_GET[$myField['nameTemp']] == "on") ) {
+            $worksheet->write($lineCount, $rowCount, $myField['name'] ,$format_header);
+            $rowCount++;
+        }
+    }
 }
 
 
@@ -82,56 +82,56 @@ 
 
 //write Subnet entries for the selected sections
 foreach ($vlan_domains as $vlan_domain) {
-	//cast
-	$vlan_domain = (array) $vlan_domain;
-
-	if( (isset($_GET['exportDomain__'.str_replace(" ", "_",$vlan_domain['name'])])) && ($_GET['exportDomain__'.str_replace(" ", "_",$vlan_domain['name'])] == "on") ) {
-		// get all VLANs in VLAN domain
-		$all_vlans = $Admin->fetch_multiple_objects("vlans", "domainId", $vlan_domain['id'], "number");
-		$all_vlans = (array) $all_vlans;
-		// skip empty domains
-		if (sizeof($all_vlans)==0) { continue; }
-		//write all VLAN entries
-		foreach ($all_vlans as $vlan) {
-			//cast
-			$vlan = (array) $vlan;
-
-			//reset row count
-			$rowCount = 0;
-
-			if( (isset($_GET['name'])) && ($_GET['name'] == "on") ) {
-				$worksheet->write($lineCount, $rowCount, $vlan['name'], $format_text);
-				$rowCount++;
-			}
-			if( (isset($_GET['number'])) && ($_GET['number'] == "on") ) {
-				$worksheet->write($lineCount, $rowCount, $vlan['number'], $format_text);
-				$rowCount++;
-			}
-			if( (isset($_GET['domain'])) && ($_GET['domain'] == "on") ) {
-				$worksheet->write($lineCount, $rowCount, $vlan_domain['name'], $format_text);
-				$rowCount++;
-			}
-			if( (isset($_GET['description'])) && ($_GET['description'] == "on") ) {
-				$worksheet->write($lineCount, $rowCount, $vlan['description'], $format_text);
-				$rowCount++;
-			}
-
-			//custom fields, per VLAN
-			if(sizeof($custom_fields) > 0) {
-				foreach($custom_fields as $myField) {
-					//set temp name - replace space with three ___
-					$myField['nameTemp'] = str_replace(" ", "___", $myField['name']);
-
-					if( (isset($_GET[$myField['nameTemp']])) && ($_GET[$myField['nameTemp']] == "on") ) {
-						$worksheet->write($lineCount, $rowCount, $vlan[$myField['name']], $format_text);
-						$rowCount++;
-					}
-				}
-			}
-
-			$lineCount++;
-		}
-	}
+    //cast
+    $vlan_domain = (array) $vlan_domain;
+
+    if( (isset($_GET['exportDomain__'.str_replace(" ", "_",$vlan_domain['name'])])) && ($_GET['exportDomain__'.str_replace(" ", "_",$vlan_domain['name'])] == "on") ) {
+        // get all VLANs in VLAN domain
+        $all_vlans = $Admin->fetch_multiple_objects("vlans", "domainId", $vlan_domain['id'], "number");
+        $all_vlans = (array) $all_vlans;
+        // skip empty domains
+        if (sizeof($all_vlans)==0) { continue; }
+        //write all VLAN entries
+        foreach ($all_vlans as $vlan) {
+            //cast
+            $vlan = (array) $vlan;
+
+            //reset row count
+            $rowCount = 0;
+
+            if( (isset($_GET['name'])) && ($_GET['name'] == "on") ) {
+                $worksheet->write($lineCount, $rowCount, $vlan['name'], $format_text);
+                $rowCount++;
+            }
+            if( (isset($_GET['number'])) && ($_GET['number'] == "on") ) {
+                $worksheet->write($lineCount, $rowCount, $vlan['number'], $format_text);
+                $rowCount++;
+            }
+            if( (isset($_GET['domain'])) && ($_GET['domain'] == "on") ) {
+                $worksheet->write($lineCount, $rowCount, $vlan_domain['name'], $format_text);
+                $rowCount++;
+            }
+            if( (isset($_GET['description'])) && ($_GET['description'] == "on") ) {
+                $worksheet->write($lineCount, $rowCount, $vlan['description'], $format_text);
+                $rowCount++;
+            }
+
+            //custom fields, per VLAN
+            if(sizeof($custom_fields) > 0) {
+                foreach($custom_fields as $myField) {
+                    //set temp name - replace space with three ___
+                    $myField['nameTemp'] = str_replace(" ", "___", $myField['name']);
+
+                    if( (isset($_GET[$myField['nameTemp']])) && ($_GET[$myField['nameTemp']] == "on") ) {
+                        $worksheet->write($lineCount, $rowCount, $vlan[$myField['name']], $format_text);
+                        $rowCount++;
+                    }
+                }
+            }
+
+            $lineCount++;
+        }
+    }
 }
 
 //new line
@@ -139,35 +139,35 @@ 
 
 //write domain sheet
 if( (isset($_GET['exportVLANDomains'])) && ($_GET['exportVLANDomains'] == "on") ) {
-	// Create a worksheet
-	$worksheet_domains =& $workbook->addWorksheet('Domains');
-
-	$lineCount = 0;
-	$rowCount = 0;
-
-	//write headers
-	$worksheet_domains->write($lineCount, $rowCount, _('Name') ,$format_header);
-	$rowCount++;
-	$worksheet_domains->write($lineCount, $rowCount, _('Description') ,$format_header);
-	$rowCount++;
-
-	$lineCount++;
-	$rowCount = 0;
-
-	foreach ($vlan_domains as $vlan_domain) {
-		//cast
-		$vlan_domain = (array) $vlan_domain;
-
-		if( (isset($_GET['exportDomain__'.str_replace(" ", "_",$vlan_domain['name'])])) && ($_GET['exportDomain__'.str_replace(" ", "_",$vlan_domain['name'])] == "on") ) {
-			$worksheet_domains->write($lineCount, $rowCount, $vlan_domain['name'], $format_text);
-			$rowCount++;
-			$worksheet_domains->write($lineCount, $rowCount, $vlan_domain['description'], $format_text);
-			$rowCount++;
-		}
-
-		$lineCount++;
-		$rowCount = 0;
-	}
+    // Create a worksheet
+    $worksheet_domains =& $workbook->addWorksheet('Domains');
+
+    $lineCount = 0;
+    $rowCount = 0;
+
+    //write headers
+    $worksheet_domains->write($lineCount, $rowCount, _('Name') ,$format_header);
+    $rowCount++;
+    $worksheet_domains->write($lineCount, $rowCount, _('Description') ,$format_header);
+    $rowCount++;
+
+    $lineCount++;
+    $rowCount = 0;
+
+    foreach ($vlan_domains as $vlan_domain) {
+        //cast
+        $vlan_domain = (array) $vlan_domain;
+
+        if( (isset($_GET['exportDomain__'.str_replace(" ", "_",$vlan_domain['name'])])) && ($_GET['exportDomain__'.str_replace(" ", "_",$vlan_domain['name'])] == "on") ) {
+            $worksheet_domains->write($lineCount, $rowCount, $vlan_domain['name'], $format_text);
+            $rowCount++;
+            $worksheet_domains->write($lineCount, $rowCount, $vlan_domain['description'], $format_text);
+            $rowCount++;
+        }
+
+        $lineCount++;
+        $rowCount = 0;
+    }
 }
 
 // sending HTTP headers