Skip to content

Commit f35123e

Browse files
tbrehmtbrehm
committed
Fixed line indention of some files.
1 parent d281bb4 commit f35123e

File tree

2 files changed

+101
-99
lines changed

2 files changed

+101
-99
lines changed

‎install/lib/install.lib.php‎

Lines changed: 75 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -68,80 +68,81 @@ function get_distname() {
6868

6969
//** Debian or Ubuntu
7070
if(file_exists('/etc/debian_version')) {
71-
if (strstr(trim(file_get_contents('/etc/issue')), 'Ubuntu')) {
72-
if (strstr(trim(file_get_contents('/etc/issue')), 'LTS')) {
73-
$lts=" LTS";
74-
}else{
75-
$lts="";
76-
}
77-
$issue=file_get_contents('/etc/issue');
78-
$distname = 'Ubuntu';
79-
$distid = 'debian40';
80-
$distbaseid = 'debian';
81-
$ver = explode(' ',$issue);
82-
$ver = array_filter($ver);
83-
$ver = next($ver);
84-
$mainver = explode('.',$ver);
85-
$mainver = array_filter($mainver);
86-
$mainver = current($mainver).'.'.next($mainver);
87-
switch ($mainver){
88-
case "12.10":
89-
$relname = "(Quantal Quetzal)";
90-
break;
91-
case "12.04":
92-
$relname = "(Precise Pangolin)";
93-
break;
94-
case "11.10":
95-
$relname = "(Oneiric Ocelot)";
96-
break;
97-
case "11.14":
98-
$relname = "(Natty Narwhal)";
99-
break;
100-
case "10.10":
101-
$relname = "(Maverick Meerkat)";
102-
break;
103-
case "10.04":
104-
$relname = "(Lucid Lynx)";
105-
break;
106-
case "9.10":
107-
$relname = "(Karmic Koala)";
108-
break;
109-
case "9.04":
110-
$relname = "(Jaunty Jackpole)";
111-
break;
112-
case "8.10":
113-
$relname = "(Intrepid Ibex)";
114-
break;
115-
case "8.04":
116-
$relname = "(Hardy Heron)";
117-
break;
118-
case "7.10":
119-
$relname = "(Gutsy Gibbon)";
120-
break;
121-
case "7.04":
122-
$relname = "(Feisty Fawn)";
123-
break;
124-
case "6.10":
125-
$relname = "(Edgy Eft)";
126-
break;
127-
case "6.06":
128-
$relname = "(Dapper Drake)";
129-
break;
130-
case "5.10":
131-
$relname = "(Breezy Badger)";
132-
break;
133-
case "5.04":
134-
$relname = "(Hoary Hedgehog)";
135-
break;
136-
case "4.10":
137-
$relname = "(Warty Warthog)";
138-
break;
139-
default:
140-
$relname = "UNKNOWN";
141-
}
142-
$distver = $ver.$lts." ".$relname;
143-
echo $distver;
144-
} elseif(trim(file_get_contents('/etc/debian_version')) == '4.0') {
71+
if (strstr(trim(file_get_contents('/etc/issue')), 'Ubuntu')) {
72+
if (strstr(trim(file_get_contents('/etc/issue')), 'LTS')) {
73+
$lts=" LTS";
74+
} else {
75+
$lts="";
76+
}
77+
78+
$issue=file_get_contents('/etc/issue');
79+
$distname = 'Ubuntu';
80+
$distid = 'debian40';
81+
$distbaseid = 'debian';
82+
$ver = explode(' ',$issue);
83+
$ver = array_filter($ver);
84+
$ver = next($ver);
85+
$mainver = explode('.',$ver);
86+
$mainver = array_filter($mainver);
87+
$mainver = current($mainver).'.'.next($mainver);
88+
switch ($mainver){
89+
case "12.10":
90+
$relname = "(Quantal Quetzal)";
91+
break;
92+
case "12.04":
93+
$relname = "(Precise Pangolin)";
94+
break;
95+
case "11.10":
96+
$relname = "(Oneiric Ocelot)";
97+
break;
98+
case "11.14":
99+
$relname = "(Natty Narwhal)";
100+
break;
101+
case "10.10":
102+
$relname = "(Maverick Meerkat)";
103+
break;
104+
case "10.04":
105+
$relname = "(Lucid Lynx)";
106+
break;
107+
case "9.10":
108+
$relname = "(Karmic Koala)";
109+
break;
110+
case "9.04":
111+
$relname = "(Jaunty Jackpole)";
112+
break;
113+
case "8.10":
114+
$relname = "(Intrepid Ibex)";
115+
break;
116+
case "8.04":
117+
$relname = "(Hardy Heron)";
118+
break;
119+
case "7.10":
120+
$relname = "(Gutsy Gibbon)";
121+
break;
122+
case "7.04":
123+
$relname = "(Feisty Fawn)";
124+
break;
125+
case "6.10":
126+
$relname = "(Edgy Eft)";
127+
break;
128+
case "6.06":
129+
$relname = "(Dapper Drake)";
130+
break;
131+
case "5.10":
132+
$relname = "(Breezy Badger)";
133+
break;
134+
case "5.04":
135+
$relname = "(Hoary Hedgehog)";
136+
break;
137+
case "4.10":
138+
$relname = "(Warty Warthog)";
139+
break;
140+
default:
141+
$relname = "UNKNOWN";
142+
}
143+
$distver = $ver.$lts." ".$relname;
144+
swriteln("Operating System: ".$distver."\n");
145+
} elseif(trim(file_get_contents('/etc/debian_version')) == '4.0') {
145146
$distname = 'Debian';
146147
$distver = '4.0';
147148
$distid = 'debian40';

‎server/lib/classes/monitor_tools.inc.php‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,13 @@ public function get_distname() {
4444

4545
//** Debian or Ubuntu
4646
if (file_exists('/etc/debian_version')) {
47-
if (strstr(trim(file_get_contents('/etc/issue')), 'Ubuntu')) {
48-
if (strstr(trim(file_get_contents('/etc/issue')), 'LTS')) {
49-
$lts=" LTS";
50-
}else{
51-
$lts="";
52-
}
47+
if (strstr(trim(file_get_contents('/etc/issue')), 'Ubuntu')) {
48+
if (strstr(trim(file_get_contents('/etc/issue')), 'LTS')) {
49+
$lts=" LTS";
50+
} else {
51+
$lts="";
52+
}
53+
5354
$issue=file_get_contents('/etc/issue');
5455
$distname = 'Ubuntu';
5556
$distid = 'debian40';
@@ -63,60 +64,60 @@ public function get_distname() {
6364
switch ($mainver){
6465
case "12.10":
6566
$relname = "(Quantal Quetzal)";
66-
break;
67+
break;
6768
case "12.04":
6869
$relname = "(Precise Pangolin)";
69-
break;
70+
break;
7071
case "11.10":
7172
$relname = "(Oneiric Ocelot)";
72-
break;
73+
break;
7374
case "11.14":
7475
$relname = "(Natty Narwhal)";
75-
break;
76+
break;
7677
case "10.10":
7778
$relname = "(Maverick Meerkat)";
78-
break;
79+
break;
7980
case "10.04":
8081
$relname = "(Lucid Lynx)";
81-
break;
82+
break;
8283
case "9.10":
8384
$relname = "(Karmic Koala)";
84-
break;
85+
break;
8586
case "9.04":
8687
$relname = "(Jaunty Jackpole)";
87-
break;
88+
break;
8889
case "8.10":
89-
$relname = "(Intrepid Ibex)";
90-
break;
90+
$relname = "(Intrepid Ibex)";
91+
break;
9192
case "8.04":
9293
$relname = "(Hardy Heron)";
93-
break;
94+
break;
9495
case "7.10":
9596
$relname = "(Gutsy Gibbon)";
96-
break;
97+
break;
9798
case "7.04":
9899
$relname = "(Feisty Fawn)";
99-
break;
100+
break;
100101
case "6.10":
101102
$relname = "(Edgy Eft)";
102-
break;
103+
break;
103104
case "6.06":
104105
$relname = "(Dapper Drake)";
105-
break;
106+
break;
106107
case "5.10":
107108
$relname = "(Breezy Badger)";
108-
break;
109+
break;
109110
case "5.04":
110111
$relname = "(Hoary Hedgehog)";
111-
break;
112+
break;
112113
case "4.10":
113114
$relname = "(Warty Warthog)";
114-
break;
115+
break;
115116
default:
116117
$relname = "UNKNOWN";
117118
}
118119
$distver = $ver.$lts." ".$relname;
119-
echo $distver;
120+
swriteln("Operating System: ".$distver."\n");
120121
} elseif(trim(file_get_contents('/etc/debian_version')) == '4.0') {
121122
$distname = 'Debian';
122123
$distver = '4.0';

0 commit comments

Comments
 (0)