diff --git a/util/db-mysql.sql b/util/db-mysql.sql index e10f9e7..ccc1eb3 100644 --- a/util/db-mysql.sql +++ b/util/db-mysql.sql @@ -358,3 +358,12 @@ ) Engine=InnoDB; +create table if not exists `customer_settings` ( + `domain` varchar(255) not null unique, + `branding_text` varchar(255) default null, + `branding_url` varchar(255) default null, + `support_link` varchar(255) default null, + `colour` varchar(255) default null +) Engine=InnoDB; + + diff --git a/util/db-upgrade-0.1.23-vs-0.1.24.sql b/util/db-upgrade-0.1.23-vs-0.1.24.sql index 50ceff2..1709aa7 100644 --- a/util/db-upgrade-0.1.23-vs-0.1.24.sql +++ b/util/db-upgrade-0.1.23-vs-0.1.24.sql @@ -14,5 +14,12 @@ `ldap_bind_pw` varchar(255) not null ) Engine=InnoDB; +create table if not exists `customer_settings` ( + `domain` varchar(255) not null unique, + `branding_text` varchar(255) default null, + `branding_url` varchar(255) default null, + `support_link` varchar(255) default null, + `colour` varchar(255) default null +) Engine=InnoDB; diff --git a/webui/config.php b/webui/config.php index 13dfc5b..3453018 100644 --- a/webui/config.php +++ b/webui/config.php @@ -16,6 +16,7 @@ $config['BRANDING_TEXT'] = ''; $config['BRANDING_URL'] = ''; +$config['SUPPORT_LINK'] = ''; $config['DEFAULT_LANG'] = 'en'; @@ -267,6 +268,7 @@ define('TABLE_RETENTION_RULE', 'retention_rule'); define('TABLE_OPTION', 'option'); define('TABLE_LDAP', 'ldap'); +define('TABLE_CUSTOMER_SETTINGS', 'customer_settings'); define('TABLE_GOOGLE', 'google'); define('TABLE_GOOGLE_IMAP', 'google_imap'); define('VIEW_MESSAGES', 'v_messages'); diff --git a/webui/controller/common/menu.php b/webui/controller/common/menu.php index 1bbf701..efe8c06 100644 --- a/webui/controller/common/menu.php +++ b/webui/controller/common/menu.php @@ -10,10 +10,14 @@ $db = Registry::get('db'); + $this->load->model('saas/customer'); + $this->data['admin_user'] = Registry::get('admin_user'); $this->data['auditor_user'] = Registry::get('auditor_user'); $this->data['readonly_admin'] = Registry::get('readonly_admin'); + $this->data['settings'] = $this->model_saas_customer->get_customer_settings_by_email(); + $this->render(); } diff --git a/webui/language/de/messages.php b/webui/language/de/messages.php index 06c74ee..b1bb9bf 100644 --- a/webui/language/de/messages.php +++ b/webui/language/de/messages.php @@ -41,6 +41,7 @@ $_['text_compressed'] = "komprimiert"; $_['text_confirm_to_reset_counters'] = "Zurücksetzen des Zählers bestätigen"; $_['text_connection_failed'] = "Connection failed"; +$_['text_contact_support'] = "Contact support"; $_['text_connection_ok'] = "Connection OK"; $_['text_content_filter'] = "Inhaltsfilter"; $_['text_conversation_available'] = "Zugehörige Nachrichten vorhanden"; diff --git a/webui/language/en/messages.php b/webui/language/en/messages.php index 3038351..352eae2 100644 --- a/webui/language/en/messages.php +++ b/webui/language/en/messages.php @@ -42,6 +42,7 @@ $_['text_confirm_to_reset_counters'] = "Confirm to reset counters"; $_['text_connection_failed'] = "Connection failed"; $_['text_connection_ok'] = "Connection OK"; +$_['text_contact_support'] = "Contact support"; $_['text_content_filter'] = "Content filter"; $_['text_conversation_available'] = "Conversation available"; $_['text_copied'] = "Copied"; diff --git a/webui/language/hu/messages.iso-8859-2.php b/webui/language/hu/messages.iso-8859-2.php index 1d02063..7b50f2c 100644 --- a/webui/language/hu/messages.iso-8859-2.php +++ b/webui/language/hu/messages.iso-8859-2.php @@ -42,6 +42,7 @@ $_['text_confirm_to_reset_counters'] = "Sz�ml�l�k null�z�s�nak meger�s�t�se"; $_['text_connection_failed'] = "Sikertelen kapcsolat"; $_['text_connection_ok'] = "Sikeres kapcsolat"; +$_['text_contact_support'] = "Seg�t�g"; $_['text_content_filter'] = "Tartalomsz�r�"; $_['text_conversation_available'] = "Lev�lv�lt�s el�rhet�"; $_['text_copied'] = "�tm�solva"; diff --git a/webui/language/hu/messages.php b/webui/language/hu/messages.php index 653c59c..e53d9a0 100644 --- a/webui/language/hu/messages.php +++ b/webui/language/hu/messages.php @@ -42,6 +42,7 @@ $_['text_confirm_to_reset_counters'] = "Számlálók nullázásának megerősítése"; $_['text_connection_failed'] = "Sikertelen kapcsolat"; $_['text_connection_ok'] = "Sikeres kapcsolat"; +$_['text_contact_support'] = "Segítég"; $_['text_content_filter'] = "Tartalomszűrő"; $_['text_conversation_available'] = "Levélváltás elérhető"; $_['text_copied'] = "Átmásolva"; diff --git a/webui/language/pt/messages.php b/webui/language/pt/messages.php index 49ff671..8d0b586 100644 --- a/webui/language/pt/messages.php +++ b/webui/language/pt/messages.php @@ -39,6 +39,7 @@ $_['text_close'] = "Fechar"; $_['text_compressed'] = "comprimido"; $_['text_confirm_to_reset_counters'] = "Confirme para resetar os contadores"; +$_['text_contact_support'] = "Contact support"; $_['text_content_filter'] = "Filtro de conteúdo"; $_['text_conversation_available'] = "Conversão disponível"; $_['text_copied'] = "Copiado"; diff --git a/webui/model/saas/customer.php b/webui/model/saas/customer.php new file mode 100644 index 0000000..1634ca8 --- /dev/null +++ b/webui/model/saas/customer.php @@ -0,0 +1,35 @@ + BRANDING_TEXT, + 'branding_url' => BRANDING_URL, + 'branding_logo' => SITE_LOGO_SM, + 'support_link' => SUPPORT_LINK, + 'colour' => '' + ); + + + if(!isset($_SESSION['email']) || !strchr($_SESSION['email'], '@') ) { return $data; } + + list ($user, $domain) = explode("@", $_SESSION['email']); + + $query = $this->db->query("SELECT * FROM " . TABLE_CUSTOMER_SETTINGS . " WHERE domain=(SELECT mapped FROM " . TABLE_DOMAIN . " WHERE domain=?)", array($domain)); + + if($query->num_rows > 0) { + if($query->row['branding_text']) { $data['branding_text'] = $query->row['branding_text']; } + if($query->row['branding_url']) { $data['branding_url'] = $query->row['branding_url']; } + if($query->row['branding_logo']) { $data['branding_logo'] = $query->row['branding_logo']; } + if($query->row['support_link']) { $data['support_link'] = $query->row['support_link']; } + if($query->row['colour']) { $data['colour'] = $query->row['colour']; } + } + + return $data; + } + +} + +?> diff --git a/webui/view/theme/default/templates/common/menu.tpl b/webui/view/theme/default/templates/common/menu.tpl index 5bb47fd..5314812 100644 --- a/webui/view/theme/default/templates/common/menu.tpl +++ b/webui/view/theme/default/templates/common/menu.tpl @@ -2,7 +2,7 @@
-
+
style="background: ;"> - <?php print SITE_NAME; ?> + <?php print $settings['branding_text']; ?> @@ -52,6 +52,9 @@
  •  
    • + +
    • +
  •  
    • @@ -59,9 +62,12 @@ +