Partial fix of #1577

bureau/admin/index.php

@@ -61,7 +61,7 @@ if (file_exists("styles/style-custom.css") ) {
     <div id="content" style="width:1000px;">
 <?php
 // Getting logo
-$logo = variable_get('logo_login', '' ,'You can specify a logo for the login page, example /images/my_logo.png . Set 0 or empty to reset it. ');
+$logo = variable_get('logo_login', '' ,'You can specify a logo for the login page, example /images/my_logo.png .', array(array('desc'=>'URL','type'=>'string')));
 if ( empty($logo) ||  ! $logo ) { 
   $logo = 'images/logo.png'; 
 }

bureau/admin/main.php

@@ -44,7 +44,7 @@ if ($mem->user["lastfail"]) {
 
 if (!empty($error) ) { echo "<p class='alert alert-danger'>$error</p>";$error=''; } 
 
-$feed_url = variable_get('rss_feed', 0, 'This is an RSS feed that will be displayed on the users homepages when they log in. Set this to 0 or a "false" string to ignore.');
+$feed_url = variable_get('rss_feed', '', 'This is an RSS feed that will be displayed on the users homepages when they log in.', array(array('desc'=>'URL','type'=>'string')));
 if (!empty($feed_url)) {
   $cache_time = 60*5; // 5 minutes
   $cache_file = "/tmp/alterncpanel_cache_main.rss";

bureau/admin/menu.php

@@ -30,7 +30,7 @@
 require_once("../class/config.php");
 
 // Getting logo
-$logo = variable_get('logo_menu', '' ,'You can specify a logo for the menu, example /images/my_logo.png . Set 0 or empty to reset it. ');
+$logo = variable_get('logo_menu', '' ,'You can specify a logo for the menu, example /images/my_logo.png .', array(array('desc'=>'URL','type'=>'string')));
 if ( empty($logo) ||  ! $logo ) { 
   $logo = 'images/logo3.png'; 
 }

bureau/class/m_dom.php

@@ -84,7 +84,8 @@ class m_dom {
    * Constructeur
    */
   function m_dom() {
-    $this->tld_no_check_at_all = variable_get('tld_no_check_at_all', 0,'Set to 1 to disable ALL check on the TLD (users will be able to add any domain)');
+    $this->tld_no_check_at_all = variable_get('tld_no_check_at_all', 0,'Disable ALL check on the TLD (users will be able to add any domain)', array(array('desc'=>'Disabled','type'=>'boolean')));
+    variable_get('mailname_bounce', '%%FQDN%%','FQDN of the mail server, used to create vhost virtual mail_adress.', array(array('desc'=>'FQDN','type'=>'string')));
   }
 
   function get_panel_url_list() {

bureau/class/m_ftp.php

@@ -36,7 +36,7 @@ class m_ftp {
    */
   function m_ftp() {
     global $L_FQDN;
-    $this->srv_name = variable_get('ftp_human_name', $L_FQDN,'Human name for FTP server');
+    $this->srv_name = variable_get('ftp_human_name', '%%FQDN%%','Human name for FTP server', array(array('desc'=>'Name','type'=>'string')));
   }
 
 

bureau/class/m_lxc.php

@@ -43,10 +43,10 @@ class m_lxc implements vm {
    * Constructor, initialize the class informations from AlternC's variables
    */
   function m_lxc() {
-    $this->IP   = variable_get('lxc_ip', '', "IP address of the Alternc's LXC server. If empty, no LXC server.");
-    $this->PORT = variable_get('lxc_port', '6504', "Port of the Alternc's LXC server");
-    $this->KEY  = variable_get('lxc_key', '', "Shared key with the Alternc's LXC server");
-    $this->maxtime = variable_get('lxc_maxtime', '4', "How many hours do we allow to have a server before shutting it down");
+    $this->IP   = variable_get('lxc_ip', '', "IP address of the Alternc's LXC server. If empty, no LXC server.", array(array('desc'=>'IP address','type'=>'ip')));
+    $this->PORT = variable_get('lxc_port', '6504', "Port of the Alternc's LXC server", array(array('desc'=>'Port','type'=>'integer')));
+    $this->KEY  = variable_get('lxc_key', '', "Shared key with the Alternc's LXC server", array(array('desc'=>'Shared key','type'=>'string')));
+    $this->maxtime = variable_get('lxc_maxtime', '4', "How many hours do we allow to have a server before shutting it down", array(array('desc'=>'Max time','type'=>'integer')));
   }
 
 

bureau/class/m_mail.php

@@ -81,14 +81,13 @@ class m_mail {
    * Constructeur
    */
   function m_mail() {
-    global $L_FQDN;
-    $this->srv_submission = variable_get('mail_human_submission', $L_FQDN,'Human name for mail server (submission protocol)');
-    $this->srv_smtp       = variable_get('mail_human_smtp',       $L_FQDN,'Human name for mail server (SMTP protocol)');
-    $this->srv_smtps      = variable_get('mail_human_smtps',      $L_FQDN,'Human name for mail server (SMTPS protocol)');
-    $this->srv_imap       = variable_get('mail_human_imap',       $L_FQDN,'Human name for IMAP mail server');
-    $this->srv_imaps      = variable_get('mail_human_imaps',      $L_FQDN,'Human name for IMAPS mail server');
-    $this->srv_pop3       = variable_get('mail_human_pop3',       $L_FQDN,'Human name for POP3 mail server');
-    $this->srv_pop3s      = variable_get('mail_human_pop3s',      $L_FQDN,'Human name for POP3s mail server');
+    $this->srv_submission = variable_get('mail_human_submission', '%%FQDN%%','Human name for mail server (submission protocol)', array(array('desc'=>'Name','type'=>'string')));
+    $this->srv_smtp       = variable_get('mail_human_smtp',       '%%FQDN%%','Human name for mail server (SMTP protocol)', array(array('desc'=>'Name','type'=>'string')));
+    $this->srv_smtps      = variable_get('mail_human_smtps',      '%%FQDN%%','Human name for mail server (SMTPS protocol)', array(array('desc'=>'Name','type'=>'string')));
+    $this->srv_imap       = variable_get('mail_human_imap',       '%%FQDN%%','Human name for IMAP mail server', array(array('desc'=>'Name','type'=>'string')));
+    $this->srv_imaps      = variable_get('mail_human_imaps',      '%%FQDN%%','Human name for IMAPS mail server', array(array('desc'=>'Name','type'=>'string')));
+    $this->srv_pop3       = variable_get('mail_human_pop3',       '%%FQDN%%','Human name for POP3 mail server', array(array('desc'=>'Name','type'=>'string')));
+    $this->srv_pop3s      = variable_get('mail_human_pop3s',      '%%FQDN%%','Human name for POP3s mail server', array(array('desc'=>'Name','type'=>'string')));
   }
 
   function hook_menu() {

bureau/class/m_quota.php

@@ -49,7 +49,7 @@ class m_quota {
    * Constructor
    */
   function m_quota() {
-    $this->disk_quota_enable = variable_get('disk_quota_enable', 1,'Are disk quota enabled for this server');
+    $this->disk_quota_enable = variable_get('disk_quota_enable', 1,'Are disk quota enabled for this server', array(array('desc'=>'Enabled','type'=>'boolean')));
     if ( $this->disk_quota_enable ) {
       $this->disk = Array( "web"=>"web" );
     }

install/alternc.install

@@ -488,8 +488,6 @@ fi
 test -e "/etc/mailname" || hostname -f > "/etc/mailname" 
 # Allow for all the users to view /etc/mailname
 chmod +r "/etc/mailname"
-mailname=`cat /etc/mailname`
-mysql_query "update variable SET value='"$mailname"' where name='mailname_bounce';" 
 
 #######################################################################
 # Save installed files to check them during next install

install/mysql.sql

@@ -409,9 +409,6 @@ the domain "username.example.com".
 
 If this is set to 0 or a "false" string, it will be ignored.');
 
-INSERT IGNORE INTO `variable` (name, value, comment) VALUES ('mailname_bounce', '',
-'FQDN of the mail server, used to create vhost virtual mail_adress.');
-
 --
 -- Table structure for table `dbusers`
 --