summaryrefslogtreecommitdiff
blob: 277bb8ca0a6735999c61b0a2ea2c3671e8263f10 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
diff -ruN phpsysinfo-dev-orig/includes/XPath.class.php phpsysinfo-dev/includes/XPath.class.php
--- phpsysinfo-dev-orig/includes/XPath.class.php	2005-04-01 16:19:55.684942096 +0000
+++ phpsysinfo-dev/includes/XPath.class.php	2005-03-23 16:27:33.000000000 +0000
@@ -4969,7 +4969,7 @@
       $pos += $afterText ? 1 : 0;
       $parentNode['textParts'] = array_merge(
                                    array_slice($parentNode['textParts'], 0, $pos),
-                                   '',
+                                   array(''),
                                    array_slice($parentNode['textParts'], $pos)
                                  );
       
@@ -5051,7 +5051,7 @@
       $pos -= $afterText ? 0 : 1;
       $parentNode['textParts'] = array_merge(
                                    array_slice($parentNode['textParts'], 0, $pos),
-                                   '',
+                                   array(''),
                                    array_slice($parentNode['textParts'], $pos)
                                  );
       // We are going from bottom to top, but the user will want results from top to bottom.
diff -ruN phpsysinfo-dev-orig/includes/os/class.Darwin.inc.php phpsysinfo-dev/includes/os/class.Darwin.inc.php
--- phpsysinfo-dev-orig/includes/os/class.Darwin.inc.php	2005-04-01 16:19:55.685941944 +0000
+++ phpsysinfo-dev/includes/os/class.Darwin.inc.php	2005-03-23 16:40:36.000000000 +0000
@@ -19,8 +19,13 @@
 
 // $Id: class.Darwin.inc.php,v 1.16 2004/06/26 23:46:36 webbie Exp $
 
+if(!file_exists('./includes/os/class.BSD.common.inc.php')) {
+    exit;
+}
+
 require('./includes/os/class.BSD.common.inc.php');
 
+
 echo "<p align=center><b>Note: The Darwin version of phpSysInfo is work in progress, some things currently don't work</b></p>";
 
 class sysinfo extends bsd_common {
diff -ruN phpsysinfo-dev-orig/includes/os/class.FreeBSD.inc.php phpsysinfo-dev/includes/os/class.FreeBSD.inc.php
--- phpsysinfo-dev-orig/includes/os/class.FreeBSD.inc.php	2005-04-01 16:19:55.685941944 +0000
+++ phpsysinfo-dev/includes/os/class.FreeBSD.inc.php	2005-03-23 16:41:02.000000000 +0000
@@ -19,6 +19,10 @@
 
 // $Id: class.FreeBSD.inc.php,v 1.10 2004/06/26 23:46:36 webbie Exp $
 
+if(!file_exists('./includes/os/class.BSD.common.inc.php')) {
+    exit;
+}
+
 require('./includes/os/class.BSD.common.inc.php');
 
 class sysinfo extends bsd_common {
diff -ruN phpsysinfo-dev-orig/includes/os/class.NetBSD.inc.php phpsysinfo-dev/includes/os/class.NetBSD.inc.php
--- phpsysinfo-dev-orig/includes/os/class.NetBSD.inc.php	2005-04-01 16:19:55.685941944 +0000
+++ phpsysinfo-dev/includes/os/class.NetBSD.inc.php	2005-03-23 16:41:25.000000000 +0000
@@ -19,8 +19,13 @@
 
 // $Id: class.NetBSD.inc.php,v 1.11 2004/06/26 23:46:36 webbie Exp $
 
+if(!file_exists('./includes/os/class.BSD.common.inc.php')) {
+    exit;
+}
+
 require('./includes/os/class.BSD.common.inc.php');
 
+
 class sysinfo extends bsd_common {
   var $cpu_regexp;
   var $scsi_regexp; 
diff -ruN phpsysinfo-dev-orig/includes/os/class.OpenBSD.inc.php phpsysinfo-dev/includes/os/class.OpenBSD.inc.php
--- phpsysinfo-dev-orig/includes/os/class.OpenBSD.inc.php	2005-04-01 16:19:55.686941792 +0000
+++ phpsysinfo-dev/includes/os/class.OpenBSD.inc.php	2005-03-23 16:41:19.000000000 +0000
@@ -19,8 +19,13 @@
 
 // $Id: class.OpenBSD.inc.php,v 1.14 2004/07/02 02:33:16 webbie Exp $
 
+if(!file_exists('./includes/os/class.BSD.common.inc.php')) {
+    exit;
+}
+
 require('./includes/os/class.BSD.common.inc.php');
 
+
 class sysinfo extends bsd_common {
   var $cpu_regexp;
   var $scsi_regexp; 
diff -ruN phpsysinfo-dev-orig/includes/system_footer.php phpsysinfo-dev/includes/system_footer.php
--- phpsysinfo-dev-orig/includes/system_footer.php	2005-04-01 16:19:55.687941640 +0000
+++ phpsysinfo-dev/includes/system_footer.php	2005-03-23 16:33:59.000000000 +0000
@@ -13,6 +13,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // $Id: system_footer.php,v 1.38 2004/08/13 23:02:32 webbie Exp $
+
+if (eregi('system_footer.php', $_SERVER['PHP_SELF'])) {
+	exit;
+}
+
 if (!$hide_picklist) {
   echo "<center>";
 
diff -ruN phpsysinfo-dev-orig/includes/system_header.php phpsysinfo-dev/includes/system_header.php
--- phpsysinfo-dev-orig/includes/system_header.php	2005-04-01 16:19:55.685941944 +0000
+++ phpsysinfo-dev/includes/system_header.php	2005-03-23 16:30:38.000000000 +0000
@@ -18,6 +18,11 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 // $Id: system_header.php,v 1.21 2003/11/08 23:49:16 precision Exp $
+
+if (eregi('system_header.php', $_SERVER['PHP_SELF'])) {
+	exit;
+}
+
 header("Cache-Control: no-cache, must-revalidate");
 if (!isset($charset)) {
   $charset = 'iso-8859-1';
diff -ruN phpsysinfo-dev-orig/index.php phpsysinfo-dev/index.php
--- phpsysinfo-dev-orig/index.php	2005-04-01 16:19:55.688941488 +0000
+++ phpsysinfo-dev/index.php	2005-03-23 16:35:50.000000000 +0000
@@ -122,7 +122,7 @@
     require('./includes/mb/class.' . $sensor_program . '.inc.php');
     $mbinfo = new mbinfo;
   } else {
-    echo '<center><b>Error: ' . $sensor_program . ' is not currently supported</b></center>';
+    echo '<center><b>Error: ' . htmlentities($sensor_program) . ' is not currently supported</b></center>';
     exit;
   }
 }