Skip to content

Commit 4923354

Browse files
phpipamphpipam
authored
Merge pull request phpipam#1556 from phpipam/master
SCHEMA fix
2 parents c690bf1 + 0a40ee2 commit 4923354

5 files changed

Lines changed: 10 additions & 3150 deletions

File tree

‎css/1.3.1/bootstrap/bootstrap-custom.min.css‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎db/SCHEMA.sql‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,8 +274,6 @@ CREATE TABLE `devices` (
274274
`hostname` varchar(100) DEFAULT NULL,
275275
`ip_addr` varchar(100) DEFAULT NULL,
276276
`type` int(2) DEFAULT '0',
277-
`custom_vendor` varchar(156) DEFAULT NULL,
278-
`custom_model` varchar(124) DEFAULT NULL,
279277
`description` varchar(256) DEFAULT NULL,
280278
`sections` varchar(1024) DEFAULT NULL,
281279
`snmp_community` varchar(100) DEFAULT NULL,

‎functions/checks/check_php_build.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
/* headers */
6262
$error = "<html>";
6363
$error .= "<head>";
64-
$error .= "<base href="proxy.php?url=https%3A%2F%2Fgithub.com.%2F%3C%2Fspan%3E%3Cspan+class%3D"pl-s1">$url' />";
64+
$error .= "<base href="proxy.php?url=https%3A%2F%2Fgithub.com.%2F%3C%2Fspan%3E%3Cspan+class%3D"pl-s1">$url".BASE."' />";
6565
$error .= '<link rel="stylesheet" type="text/css" href="css/'.SCRIPT_PREFIX.'/bootstrap/bootstrap.min.css">';
6666
$error .= '<link rel="stylesheet" type="text/css" href="css/'.SCRIPT_PREFIX.'/bootstrap/bootstrap-custom.css">';
6767
$error .= "</head>";

‎index.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
/* site functions */
99
require('functions/functions.php');
1010

11-
header("Cache-Control: no-cache, must-revalidate"); //HTTP 1.1
12-
header("Pragma: no-cache"); //HTTP 1.0
13-
header("Expires: Sat, 26 Jul 2016 05:00:00 GMT"); //Date in the past
11+
// header("Cache-Control: no-cache, must-revalidate"); //HTTP 1.1
12+
// header("Pragma: no-cache"); //HTTP 1.0
13+
// header("Expires: Sat, 26 Jul 2016 05:00:00 GMT"); //Date in the past
1414

1515
# set default page
1616
if(!isset($_GET['page'])) { $_GET['page'] = "dashboard"; }
@@ -91,7 +91,7 @@
9191
<!-- css -->
9292
<link rel="shortcut icon" type="image/png" href="css/<?php print SCRIPT_PREFIX; ?>/images/favicon.png">
9393
<link rel="stylesheet" type="text/css" href="css/<?php print SCRIPT_PREFIX; ?>/bootstrap/bootstrap.min.css">
94-
<link rel="stylesheet" type="text/css" href="proxy.php?url=https%3A%2F%2Fgithub.com.%2Fcss%2F%3Cspan+class%3D"pl-ent"><?php print SCRIPT_PREFIX; ?>/bootstrap/bootstrap-custom.css">
94+
<link rel="stylesheet" type="text/css" href="proxy.php?url=https%3A%2F%2Fgithub.com.%2Fcss%2F%3Cspan+class%3D"pl-ent"><?php print SCRIPT_PREFIX; ?>/bootstrap/bootstrap-custom.min.css">
9595
<link rel="stylesheet" type="text/css" href="css/<?php print SCRIPT_PREFIX; ?>/font-awesome/font-awesome.min.css">
9696
<link rel="stylesheet" type="text/css" href="css/<?php print SCRIPT_PREFIX; ?>/bootstrap/bootstrap-switch.min.css">
9797
<link rel="stylesheet" href="css/<?php print SCRIPT_PREFIX; ?>/bootstrap-table/bootstrap-table.min.css">
@@ -105,7 +105,7 @@
105105
<?php if($_GET['page']=="login" || $_GET['page']=="request_ip") { ?>
106106
<script type="text/javascript" src="js/<?php print SCRIPT_PREFIX; ?>/login.js"></script>
107107
<?php } ?>
108-
<script type="text/javascript" src="proxy.php?url=https%3A%2F%2Fgithub.com.%2Fjs%2F%3Cspan+class%3D"pl-ent"><?php print SCRIPT_PREFIX; ?>/magic.js"></script>
108+
<script type="text/javascript" src="proxy.php?url=https%3A%2F%2Fgithub.com.%2Fjs%2F%3Cspan+class%3D"pl-ent"><?php print SCRIPT_PREFIX; ?>/magic.min.js"></script>
109109
<script type="text/javascript" src="js/<?php print SCRIPT_PREFIX; ?>/bootstrap.min.js"></script>
110110
<script type="text/javascript" src="js/<?php print SCRIPT_PREFIX; ?>/jquery-ui-1.10.4.custom.min.js"></script>
111111
<script type="text/javascript" src="js/<?php print SCRIPT_PREFIX; ?>/bootstrap-switch.min.js"></script>

0 commit comments

Comments
 (0)