Merge branch 'develop' of git.ispconfig.org:ispconfig/ispconfig3 into develop

florian030 · florian030 · commit 0f39f31773c5 · 2020-10-17T10:56:58.000+02:00
diff --git a/install/dist/conf/centos72.conf.php b/install/dist/conf/centos72.conf.php
@@ -96,6 +96,9 @@
 $conf['web']['apps_vhost_user'] = 'ispapps';
 $conf['web']['apps_vhost_group'] = 'ispapps';
 
+//* AWStats settings
+$conf['awstats']['pl'] = '/usr/share/awstats/wwwroot/cgi-bin/awstats.pl';
+
 //* Fastcgi
 $conf['fastcgi']['fastcgi_phpini_path'] = '/etc/';
 $conf['fastcgi']['fastcgi_starter_path'] = '/var/www/php-fcgi-scripts/[system_user]/';
diff --git a/install/dist/conf/centos80.conf.php b/install/dist/conf/centos80.conf.php
@@ -96,6 +96,9 @@
 $conf['web']['apps_vhost_user'] = 'ispapps';
 $conf['web']['apps_vhost_group'] = 'ispapps';
 
+//* AWStats settings
+$conf['awstats']['pl'] = '/usr/share/awstats/wwwroot/cgi-bin/awstats.pl';
+
 //* Fastcgi
 $conf['fastcgi']['fastcgi_phpini_path'] = '/etc/';
 $conf['fastcgi']['fastcgi_starter_path'] = '/var/www/php-fcgi-scripts/[system_user]/';
diff --git a/interface/lib/classes/auth.inc.php b/interface/lib/classes/auth.inc.php
@@ -58,7 +58,7 @@ public function has_clients($userid) {
 
 		$userid = $app->functions->intval($userid);
 		$client = $app->db->queryOneRecord("SELECT client.limit_client FROM sys_user, client WHERE sys_user.userid = ? AND sys_user.client_id = client.client_id", $userid);
-		if($client['limit_client'] != 0) {
+		if(is_array($client) && $client['limit_client'] != 0) {
 			return true;
 		} else {
 			return false;
diff --git a/interface/lib/lang/ar.lng b/interface/lib/lang/ar.lng
@@ -119,6 +119,9 @@ $wb['datalog_status_u_server'] = 'Update server settings';
 $wb['datalog_status_d_server'] = 'Delete server';
 $wb['datalog_status_i_cron'] = 'Create cron job';
 $wb['datalog_status_u_cron'] = 'Update cron job';
+$wb['datalog_status_i_server_ip'] = 'Add server IP';
+$wb['datalog_status_u_server_ip'] = 'Update server IP';
+$wb['datalog_status_d_server_ip'] = 'Delete server IP';
 $wb['datalog_status_d_cron'] = 'Delete cron job';
 $wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
 $wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
diff --git a/interface/lib/lang/bg.lng b/interface/lib/lang/bg.lng
@@ -119,6 +119,9 @@ $wb['datalog_status_u_server'] = 'Update server settings';
 $wb['datalog_status_d_server'] = 'Delete server';
 $wb['datalog_status_i_cron'] = 'Създай автоматична задача';
 $wb['datalog_status_u_cron'] = 'Обнови автоматична задача';
+$wb['datalog_status_i_server_ip'] = 'Add server IP';
+$wb['datalog_status_u_server_ip'] = 'Update server IP';
+$wb['datalog_status_d_server_ip'] = 'Delete server IP';
 $wb['datalog_status_d_cron'] = 'Изтрий автоматична задача';
 $wb['datalog_status_i_mail_get'] = 'Създай имейл акаунт за извличане на поща';
 $wb['datalog_status_u_mail_get'] = 'Обнови имейл акаунт за извличане на поща';
diff --git a/interface/lib/lang/br.lng b/interface/lib/lang/br.lng
@@ -122,6 +122,9 @@ $wb['datalog_status_u_server'] = 'Update server settings';
 $wb['datalog_status_d_server'] = 'Delete server';
 $wb['datalog_status_i_cron'] = 'Adicionar tarefa no cron';
 $wb['datalog_status_u_cron'] = 'Atualizar tarefa no cron';
+$wb['datalog_status_i_server_ip'] = 'Add server IP';
+$wb['datalog_status_u_server_ip'] = 'Update server IP';
+$wb['datalog_status_d_server_ip'] = 'Delete server IP';
 $wb['datalog_status_d_cron'] = 'Remover tarefa no cron';
 $wb['datalog_status_i_mail_get'] = 'Adicionar conta de busca de e-mail';
 $wb['datalog_status_u_mail_get'] = 'Atualizar conta de busca de e-mail';
diff --git a/interface/lib/lang/ca.lng b/interface/lib/lang/ca.lng
@@ -122,6 +122,9 @@ $wb['datalog_status_u_server'] = 'Update server settings';
 $wb['datalog_status_d_server'] = 'Delete server';
 $wb['datalog_status_i_cron'] = 'Créer une tâche cron';
 $wb['datalog_status_u_cron'] = 'Modifier une tâche cron';
+$wb['datalog_status_i_server_ip'] = 'Add server IP';
+$wb['datalog_status_u_server_ip'] = 'Update server IP';
+$wb['datalog_status_d_server_ip'] = 'Delete server IP';
 $wb['datalog_status_d_cron'] = 'Supprimer une tâche cron';
 $wb['datalog_status_i_mail_get'] = 'Créer un compte mail récupérateur';
 $wb['datalog_status_u_mail_get'] = 'Modifier un compte mail récupérateur';
diff --git a/interface/lib/lang/cz.lng b/interface/lib/lang/cz.lng
@@ -122,6 +122,9 @@ $wb['datalog_status_u_server'] = 'Update server settings';
 $wb['datalog_status_d_server'] = 'Delete server';
 $wb['datalog_status_i_cron'] = 'Vytvoření shell uživatele';
 $wb['datalog_status_u_cron'] = 'Aktualizace nastavení shell uživatele';
+$wb['datalog_status_i_server_ip'] = 'Add server IP';
+$wb['datalog_status_u_server_ip'] = 'Update server IP';
+$wb['datalog_status_d_server_ip'] = 'Delete server IP';
 $wb['datalog_status_d_cron'] = 'Odstranění shell uživatele';
 $wb['datalog_status_i_mail_get'] = 'Vytvoření účtu pro získávání externí e-mailové pošty';
 $wb['datalog_status_u_mail_get'] = 'Aktualizace nastavení účtu pro získávání externí e-mailové pošty';
diff --git a/interface/lib/lang/de.lng b/interface/lib/lang/de.lng
@@ -123,6 +123,9 @@ $wb['datalog_status_u_server'] = 'Update server settings';
 $wb['datalog_status_d_server'] = 'Delete server';
 $wb['datalog_status_i_cron'] = 'Cronjob anlegen';
 $wb['datalog_status_u_cron'] = 'Cronjob ändern';
+$wb['datalog_status_i_server_ip'] = 'Add server IP';
+$wb['datalog_status_u_server_ip'] = 'Update server IP';
+$wb['datalog_status_d_server_ip'] = 'Delete server IP';
 $wb['datalog_status_d_cron'] = 'Cronjob löschen';
 $wb['datalog_status_i_mail_get'] = 'E-Mailabruf anlegen';
 $wb['datalog_status_u_mail_get'] = 'E-Mailabruf ändern';
diff --git a/interface/lib/lang/dk.lng b/interface/lib/lang/dk.lng
@@ -122,6 +122,9 @@ $wb['datalog_status_u_server'] = 'Update server settings';
 $wb['datalog_status_d_server'] = 'Delete server';
 $wb['datalog_status_i_cron'] = 'Opret cron job';
 $wb['datalog_status_u_cron'] = 'Opdater cron job';
+$wb['datalog_status_i_server_ip'] = 'Add server IP';
+$wb['datalog_status_u_server_ip'] = 'Update server IP';
+$wb['datalog_status_d_server_ip'] = 'Delete server IP';
 $wb['datalog_status_d_cron'] = 'Slet cron job';
 $wb['datalog_status_i_mail_get'] = 'Opret mail-hentnings konto';
 $wb['datalog_status_u_mail_get'] = 'Opdater mail-hentnings konto';
diff --git a/interface/lib/lang/el.lng b/interface/lib/lang/el.lng
@@ -119,6 +119,9 @@ $wb['datalog_status_u_server'] = 'Update server settings';
 $wb['datalog_status_d_server'] = 'Delete server';
 $wb['datalog_status_i_cron'] = 'Create cron job';
 $wb['datalog_status_u_cron'] = 'Update cron job';
+$wb['datalog_status_i_server_ip'] = 'Add server IP';
+$wb['datalog_status_u_server_ip'] = 'Update server IP';
+$wb['datalog_status_d_server_ip'] = 'Delete server IP';
 $wb['datalog_status_d_cron'] = 'Delete cron job';
 $wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
 $wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
diff --git a/interface/lib/lang/en.lng b/interface/lib/lang/en.lng
@@ -123,6 +123,9 @@ $wb['datalog_status_u_server'] = 'Update server settings';
 $wb['datalog_status_d_server'] = 'Delete server';
 $wb['datalog_status_i_cron'] = 'Create cron job';
 $wb['datalog_status_u_cron'] = 'Update cron job';
+$wb['datalog_status_i_server_ip'] = 'Add server IP';
+$wb['datalog_status_u_server_ip'] = 'Update server IP';
+$wb['datalog_status_d_server_ip'] = 'Delete server IP';
 $wb['datalog_status_d_cron'] = 'Delete cron job';
 $wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
 $wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
diff --git a/interface/lib/lang/es.lng b/interface/lib/lang/es.lng
@@ -122,6 +122,9 @@ $wb['datalog_status_u_server'] = 'Update server settings';
 $wb['datalog_status_d_server'] = 'Delete server';
 $wb['datalog_status_i_cron'] = 'Añadir cron job';
 $wb['datalog_status_u_cron'] = 'Actualizar cron job';
+$wb['datalog_status_i_server_ip'] = 'Add server IP';
+$wb['datalog_status_u_server_ip'] = 'Update server IP';
+$wb['datalog_status_d_server_ip'] = 'Delete server IP';
 $wb['datalog_status_d_cron'] = 'Borrar cron job';
 $wb['datalog_status_i_mail_get'] = 'Añadir cuenta de rescatador de correo';
 $wb['datalog_status_u_mail_get'] = 'Actualizar cuenta de rescatador de correo';
diff --git a/interface/lib/lang/fi.lng b/interface/lib/lang/fi.lng
@@ -119,6 +119,9 @@ $wb['datalog_status_u_server'] = 'Update server settings';
 $wb['datalog_status_d_server'] = 'Delete server';
 $wb['datalog_status_i_cron'] = 'Create cron job';
 $wb['datalog_status_u_cron'] = 'Update cron job';
+$wb['datalog_status_i_server_ip'] = 'Add server IP';
+$wb['datalog_status_u_server_ip'] = 'Update server IP';
+$wb['datalog_status_d_server_ip'] = 'Delete server IP';
 $wb['datalog_status_d_cron'] = 'Delete cron job';
 $wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
 $wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
diff --git a/interface/lib/lang/fr.lng b/interface/lib/lang/fr.lng
@@ -122,6 +122,9 @@ $wb['datalog_status_u_server'] = 'Update server settings';
 $wb['datalog_status_d_server'] = 'Delete server';
 $wb['datalog_status_i_cron'] = 'Créer une tâche cron';
 $wb['datalog_status_u_cron'] = 'Modifier une tâche cron';
+$wb['datalog_status_i_server_ip'] = 'Add server IP';
+$wb['datalog_status_u_server_ip'] = 'Update server IP';
+$wb['datalog_status_d_server_ip'] = 'Delete server IP';
 $wb['datalog_status_d_cron'] = 'Supprimer une tâche cron';
 $wb['datalog_status_i_mail_get'] = 'Créer un compte mail récupérateur';
 $wb['datalog_status_u_mail_get'] = 'Modifier un compte mail récupérateur';
diff --git a/interface/lib/lang/hr.lng b/interface/lib/lang/hr.lng
@@ -119,6 +119,9 @@ $wb['datalog_status_u_server'] = 'Update server settings';
 $wb['datalog_status_d_server'] = 'Delete server';
 $wb['datalog_status_i_cron'] = 'Kreiraj cron zadatak';
 $wb['datalog_status_u_cron'] = 'Podesi cron zadatak';
+$wb['datalog_status_i_server_ip'] = 'Add server IP';
+$wb['datalog_status_u_server_ip'] = 'Update server IP';
+$wb['datalog_status_d_server_ip'] = 'Delete server IP';
 $wb['datalog_status_d_cron'] = 'Obriši cron zadatak';
 $wb['datalog_status_i_mail_get'] = 'Kreiraj mail fetcher račun';
 $wb['datalog_status_u_mail_get'] = 'Podesi mail fetcher račun';
diff --git a/interface/lib/lang/hu.lng b/interface/lib/lang/hu.lng
@@ -119,6 +119,9 @@ $wb['datalog_status_u_server'] = 'Update server settings';
 $wb['datalog_status_d_server'] = 'Delete server';
 $wb['datalog_status_i_cron'] = 'Create cron job';
 $wb['datalog_status_u_cron'] = 'Update cron job';
+$wb['datalog_status_i_server_ip'] = 'Add server IP';
+$wb['datalog_status_u_server_ip'] = 'Update server IP';
+$wb['datalog_status_d_server_ip'] = 'Delete server IP';
 $wb['datalog_status_d_cron'] = 'Delete cron job';
 $wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
 $wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
diff --git a/interface/lib/lang/id.lng b/interface/lib/lang/id.lng
@@ -119,6 +119,9 @@ $wb['datalog_status_u_server'] = 'Update server settings';
 $wb['datalog_status_d_server'] = 'Delete server';
 $wb['datalog_status_i_cron'] = 'Create cron job';
 $wb['datalog_status_u_cron'] = 'Update cron job';
+$wb['datalog_status_i_server_ip'] = 'Add server IP';
+$wb['datalog_status_u_server_ip'] = 'Update server IP';
+$wb['datalog_status_d_server_ip'] = 'Delete server IP';
 $wb['datalog_status_d_cron'] = 'Delete cron job';
 $wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
 $wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
diff --git a/interface/lib/lang/it.lng b/interface/lib/lang/it.lng
@@ -118,6 +118,9 @@ $wb['datalog_status_u_server'] = 'Update server settings';
 $wb['datalog_status_d_server'] = 'Delete server';
 $wb['datalog_status_i_cron'] = 'Crea  cron job';
 $wb['datalog_status_u_cron'] = 'Aggiorna   cron job';
+$wb['datalog_status_i_server_ip'] = 'Add server IP';
+$wb['datalog_status_u_server_ip'] = 'Update server IP';
+$wb['datalog_status_d_server_ip'] = 'Delete server IP';
 $wb['datalog_status_d_cron'] = 'Elimina cron job';
 $wb['datalog_status_i_mail_mailinglist'] = 'Crea  mailing list';
 $wb['datalog_status_u_mail_mailinglist'] = 'Aggiorna   mailing list';
diff --git a/interface/lib/lang/ja.lng b/interface/lib/lang/ja.lng
@@ -119,6 +119,9 @@ $wb['datalog_status_u_server'] = 'Update server settings';
 $wb['datalog_status_d_server'] = 'Delete server';
 $wb['datalog_status_i_cron'] = 'Create cron job';
 $wb['datalog_status_u_cron'] = 'Update cron job';
+$wb['datalog_status_i_server_ip'] = 'Add server IP';
+$wb['datalog_status_u_server_ip'] = 'Update server IP';
+$wb['datalog_status_d_server_ip'] = 'Delete server IP';
 $wb['datalog_status_d_cron'] = 'Delete cron job';
 $wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
 $wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
diff --git a/interface/lib/lang/nl.lng b/interface/lib/lang/nl.lng
@@ -119,6 +119,9 @@ $wb['datalog_status_u_server'] = 'Update server settings';
 $wb['datalog_status_d_server'] = 'Delete server';
 $wb['datalog_status_i_cron'] = 'Aanmaken cron job';
 $wb['datalog_status_u_cron'] = 'Bijwerken cron job';
+$wb['datalog_status_i_server_ip'] = 'Add server IP';
+$wb['datalog_status_u_server_ip'] = 'Update server IP';
+$wb['datalog_status_d_server_ip'] = 'Delete server IP';
 $wb['datalog_status_d_cron'] = 'Verwijderen cron job';
 $wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
 $wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
diff --git a/interface/lib/lang/pl.lng b/interface/lib/lang/pl.lng
@@ -122,6 +122,9 @@ $wb['datalog_status_u_server'] = 'Update server settings';
 $wb['datalog_status_d_server'] = 'Delete server';
 $wb['datalog_status_i_cron'] = 'Utwórz zadanie Cron';
 $wb['datalog_status_u_cron'] = 'Edytuj zadanie Cron';
+$wb['datalog_status_i_server_ip'] = 'Add server IP';
+$wb['datalog_status_u_server_ip'] = 'Update server IP';
+$wb['datalog_status_d_server_ip'] = 'Delete server IP';
 $wb['datalog_status_d_cron'] = 'Usuń zadanie Cron';
 $wb['datalog_status_i_mail_get'] = 'Utwórz konto mail fetcher';
 $wb['datalog_status_u_mail_get'] = 'Edytuj konto mail fetcher';
diff --git a/interface/lib/lang/pt.lng b/interface/lib/lang/pt.lng
@@ -119,6 +119,9 @@ $wb['datalog_status_u_server'] = 'Update server settings';
 $wb['datalog_status_d_server'] = 'Delete server';
 $wb['datalog_status_i_cron'] = 'Create cron job';
 $wb['datalog_status_u_cron'] = 'Update cron job';
+$wb['datalog_status_i_server_ip'] = 'Add server IP';
+$wb['datalog_status_u_server_ip'] = 'Update server IP';
+$wb['datalog_status_d_server_ip'] = 'Delete server IP';
 $wb['datalog_status_d_cron'] = 'Delete cron job';
 $wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
 $wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
diff --git a/interface/lib/lang/ro.lng b/interface/lib/lang/ro.lng
@@ -119,6 +119,9 @@ $wb['datalog_status_u_server'] = 'Update server settings';
 $wb['datalog_status_d_server'] = 'Delete server';
 $wb['datalog_status_i_cron'] = 'Create cron job';
 $wb['datalog_status_u_cron'] = 'Update cron job';
+$wb['datalog_status_i_server_ip'] = 'Add server IP';
+$wb['datalog_status_u_server_ip'] = 'Update server IP';
+$wb['datalog_status_d_server_ip'] = 'Delete server IP';
 $wb['datalog_status_d_cron'] = 'Delete cron job';
 $wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
 $wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
diff --git a/interface/lib/lang/ru.lng b/interface/lib/lang/ru.lng
@@ -119,6 +119,9 @@ $wb['datalog_status_u_server'] = 'Update server settings';
 $wb['datalog_status_d_server'] = 'Delete server';
 $wb['datalog_status_i_cron'] = 'Создать задание Пданировщика задач';
 $wb['datalog_status_u_cron'] = 'Обновить задание Пданировщика задач';
+$wb['datalog_status_i_server_ip'] = 'Add server IP';
+$wb['datalog_status_u_server_ip'] = 'Update server IP';
+$wb['datalog_status_d_server_ip'] = 'Delete server IP';
 $wb['datalog_status_d_cron'] = 'Удалить задание Пданировщика задач';
 $wb['datalog_status_i_mail_get'] = 'Создать аккаунт сборщика почты';
 $wb['datalog_status_u_mail_get'] = 'Обновить аккаунт сборщика почты';
diff --git a/interface/lib/lang/se.lng b/interface/lib/lang/se.lng
@@ -119,6 +119,9 @@ $wb['datalog_status_u_server'] = 'Update server settings';
 $wb['datalog_status_d_server'] = 'Delete server';
 $wb['datalog_status_i_cron'] = 'Skapa cron-jobb';
 $wb['datalog_status_u_cron'] = 'Uppdatera cron-jobb';
+$wb['datalog_status_i_server_ip'] = 'Add server IP';
+$wb['datalog_status_u_server_ip'] = 'Update server IP';
+$wb['datalog_status_d_server_ip'] = 'Delete server IP';
 $wb['datalog_status_d_cron'] = 'Radera cron-jobb';
 $wb['datalog_status_i_mail_get'] = 'Skapa eposthämtarkonto';
 $wb['datalog_status_u_mail_get'] = 'Uppdatera eposthämtarkonto';
diff --git a/interface/lib/lang/sk.lng b/interface/lib/lang/sk.lng
@@ -119,6 +119,9 @@ $wb['datalog_status_u_server'] = 'Update server settings';
 $wb['datalog_status_d_server'] = 'Delete server';
 $wb['datalog_status_i_cron'] = 'Create cron job';
 $wb['datalog_status_u_cron'] = 'Update cron job';
+$wb['datalog_status_i_server_ip'] = 'Add server IP';
+$wb['datalog_status_u_server_ip'] = 'Update server IP';
+$wb['datalog_status_d_server_ip'] = 'Delete server IP';
 $wb['datalog_status_d_cron'] = 'Delete cron job';
 $wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
 $wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
diff --git a/interface/lib/lang/tr.lng b/interface/lib/lang/tr.lng
@@ -123,6 +123,9 @@ $wb['datalog_status_u_server'] = 'Update server settings';
 $wb['datalog_status_d_server'] = 'Delete server';
 $wb['datalog_status_i_cron'] = 'Zamanlanmış Görev Ekle';
 $wb['datalog_status_u_cron'] = 'Zamanlanmış Görevi Güncelle';
+$wb['datalog_status_i_server_ip'] = 'Add server IP';
+$wb['datalog_status_u_server_ip'] = 'Update server IP';
+$wb['datalog_status_d_server_ip'] = 'Delete server IP';
 $wb['datalog_status_d_cron'] = 'Zamanlanmış Görevi Sil';
 $wb['datalog_status_i_mail_get'] = 'E-posta Alma Hesabı Ekle';
 $wb['datalog_status_u_mail_get'] = 'E-posta Alma Hesabını Güncelle';
diff --git a/interface/web/client/templates/clients_list.htm b/interface/web/client/templates/clients_list.htm
@@ -5,12 +5,12 @@ <h1><tmpl_var name="list_head_txt"></h1>
 
 
         <p class="fieldset-legend">{tmpl_var name="toolsarea_head_txt"}</p>
-            
+
                 <button class="btn btn-default formbutton-success" type="button" data-load-content="client/client_edit.php">{tmpl_var name="add_new_record_txt"}</button>
-            
-        
 
-    
+
+
+
         <p class="fieldset-legend"><tmpl_var name="list_head_txt"></p>
             <div class="table-wrapper marginTop15">
 			<table class="table">
@@ -74,13 +74,13 @@ <h1><tmpl_var name="list_head_txt"></h1>
                     </tmpl_loop>
                     <tmpl_unless name="records">
                         <tr class="tbl_row_noresults tbl_row_{tmpl_if name='__EVEN__'}even{tmpl_else}uneven{/tmpl_if}">
-                            <td colspan="{tmpl_if name="has_robot"}9{tmpl_else}8{/tmpl_if}">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
+                            <td colspan="{tmpl_if name="has_robot"}10{tmpl_else}9{/tmpl_if}">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
                         </tr>
                     </tmpl_unless>
                 </tbody>
                 <tfoot>
                     <tr>
-                        <td colspan="{tmpl_if name="has_robot"}9{tmpl_else}8{/tmpl_if}"><tmpl_var name="paging"></td>
+                        <td colspan="{tmpl_if name="has_robot"}10{tmpl_else}9{/tmpl_if}"><tmpl_var name="paging"></td>
                     </tr>
                 </tfoot>
             </table>
diff --git a/interface/web/sites/templates/database_admin_list.htm b/interface/web/sites/templates/database_admin_list.htm
@@ -4,12 +4,12 @@ <h1><tmpl_var name="list_head_txt"></h1>
 
 
         <p class="fieldset-legend">{tmpl_var name="toolsarea_head_txt"}</p>
-            
+
                 <button class="btn btn-default formbutton-success" type="button" data-load-content="sites/database_edit.php">{tmpl_var name="add_new_record_txt"}</button>
-            
-        
 
-    
+
+
+
         <p class="fieldset-legend"><tmpl_var name="list_head_txt"></p>
             <div class="table-wrapper marginTop15">
 <table class="table">
@@ -67,7 +67,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
                     </tmpl_loop>
                     <tmpl_unless name="records">
                         <tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-                            <td colspan="9">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
+                            <td colspan="8">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
                         </tr>
                     </tmpl_unless>
                 </tbody>
diff --git a/interface/web/sites/templates/database_user_admin_list.htm b/interface/web/sites/templates/database_user_admin_list.htm
diff --git a/server/lib/classes/system.inc.php b/server/lib/classes/system.inc.php
