Skip to content

Commit c8ac70b

Browse files
committed
space to tabs
1 parent f3c43b1 commit c8ac70b

File tree

2 files changed

+33
-33
lines changed

2 files changed

+33
-33
lines changed

interface/lib/classes/system.inc.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,17 @@ public function has_service($userid, $service) {
3939

4040
if(!preg_match('/^[a-z]+$/', $service)) $app->error('Invalid service '.$service);
4141

42-
// Check the servers table to see which kinds of servers we actually have enabled.
43-
// simple query cache
44-
if($this->server_count===null) {
45-
$this->server_count = $app->db->queryOneRecord("SELECT SUM(mail_server) as mail, SUM(web_server) AS web, SUM(dns_server) AS dns, SUM(file_server) AS file,
46-
SUM(db_server) AS db, SUM(vserver_server) AS vserver, SUM(proxy_server) AS proxy, SUM(firewall_server) AS firewall, SUM(xmpp_server) AS xmpp
47-
FROM `server` WHERE mirror_server_id = 0");
48-
}
49-
// Check if we have the service enabled.
50-
if ($this->server_count[$service] == 0) {
51-
return FALSE;
52-
}
42+
// Check the servers table to see which kinds of servers we actually have enabled.
43+
// simple query cache
44+
if($this->server_count === null) {
45+
$this->server_count = $app->db->queryOneRecord("SELECT SUM(mail_server) as mail, SUM(web_server) AS web, SUM(dns_server) AS dns, SUM(file_server) AS file,
46+
SUM(db_server) AS db, SUM(vserver_server) AS vserver, SUM(proxy_server) AS proxy, SUM(firewall_server) AS firewall, SUM(xmpp_server) AS xmpp
47+
FROM `server` WHERE mirror_server_id = 0");
48+
}
49+
// Check if we have the service enabled.
50+
if ($this->server_count[$service] == 0) {
51+
return FALSE;
52+
}
5353

5454
if(isset($_SESSION['s']['user']) && $_SESSION['s']['user']['typ'] == 'admin') return true; //* We do not check admin-users
5555

interface/web/mail/lib/module.conf.php

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -153,28 +153,28 @@
153153
if ($app->system->has_service($userid, 'xmpp')) {
154154
$items = array();
155155

156-
if($app->auth->get_client_limit($userid, 'xmpp_domain') != 0)
157-
{
158-
$items[] = array( 'title' => 'XMPP Domain',
159-
'target' => 'content',
160-
'link' => 'mail/xmpp_domain_list.php',
161-
'html_id' => 'xmpp_domain_list');
162-
}
163-
164-
if($app->auth->get_client_limit($userid, 'xmpp_user') != 0)
165-
{
166-
$items[] = array( 'title' => 'XMPP Account',
167-
'target' => 'content',
168-
'link' => 'mail/xmpp_user_list.php',
169-
'html_id' => 'xmpp_user_list');
170-
}
171-
172-
if(count($items))
173-
{
174-
$module['nav'][] = array( 'title' => 'Jabber / XMPP',
175-
'open' => 1,
176-
'items' => $items);
177-
}
156+
if($app->auth->get_client_limit($userid, 'xmpp_domain') != 0)
157+
{
158+
$items[] = array( 'title' => 'XMPP Domain',
159+
'target' => 'content',
160+
'link' => 'mail/xmpp_domain_list.php',
161+
'html_id' => 'xmpp_domain_list');
162+
}
163+
164+
if($app->auth->get_client_limit($userid, 'xmpp_user') != 0)
165+
{
166+
$items[] = array( 'title' => 'XMPP Account',
167+
'target' => 'content',
168+
'link' => 'mail/xmpp_user_list.php',
169+
'html_id' => 'xmpp_user_list');
170+
}
171+
172+
if(count($items))
173+
{
174+
$module['nav'][] = array( 'title' => 'Jabber / XMPP',
175+
'open' => 1,
176+
'items' => $items);
177+
}
178178
}
179179

180180
//**** Statistics menu

0 commit comments

Comments
 (0)