alias_mgm: new alias type suppress feature

Author: dariusstefan

config/tools/users/alias_management/settings.inc.php

@@ -56,15 +56,15 @@
 		),
 		"tip" => "If checked, the domain will automatically be used as the alias domain."
 	),
-    "show_one_option" => array(
-        "default" => True,
-        "name" => "Show One Option",
+    "suppress_alias_type" => array(
+        "default" => False,
+        "name" => "Suppress Alias Type",
         "type" => "dropdown",
         "options" => array(
             "No" => False,
             "Yes" => True
         ),
-        "tip" => "If checked, select boxes will be shown even if there is only one option."
+        "tip" => "Suppress alias type checkbox if only one choice is available."
     ),
 	"alias_format" => array(
 		"name" => "Alias Format",

web/tools/users/alias_management/template/alias_management.form.php

@@ -28,32 +28,26 @@
 $alias_types = get_settings_value("table_aliases");
 $alias_format = get_settings_value("alias_format");
 $implicit_domain = get_settings_value("implicit_domain");
-$show_one_option = get_settings_value("show_one_option");
+$suppress_atype = get_settings_value("suppress_alias_type");
 
 form_generate_input_text("Username", "The name of the user", "username",
 	"n", $am_form['username'], 128, "^[a-zA-Z0-9&=+$,;?/%]+$");
 
-if (count($domains) != 1 || $show_one_option)
-    form_generate_select("Domain", "Users's domain", "domain", 200,
-        $am_form['domain'], $domains);
+form_generate_select("Domain", "Users's domain", "domain", 200,
+    $am_form['domain'], $domains);
 
 form_generate_input_text("Alias Username", "The name of the alias", "alias_username",
 	"n", $am_form['alias_username'], 128, $alias_format);
 
-if (($am_edit || !$implicit_domain) && (count($domains) != 1 || $show_one_option))
+if ($am_edit || !$implicit_domain)
     form_generate_select("Alias Domain", "Alias's domain", "alias_domain", 200,
         $am_form['alias_domain'], $domains);
 
-if (!$am_edit && (count($alias_types) != 1 || $show_one_option))
+if (!$am_edit && (count($alias_types) != 1 || !$suppress_atype))
 	form_generate_select("Alias Type", "The type of the alias, as you may have multiple type/groups of aliases, for different purposes",
 		"alias_type", 64, $am_form['alias_type'], array_values($alias_types), array_keys($alias_types));
 
-if (count($domains) == 1 && !$show_one_option) {
-    form_generate_hidden("domain", $domains[0]);
-    form_generate_hidden("alias_domain", $domains[0]);
-}
-
-if (count($alias_types) == 1 && !$show_one_option) {
+if (count($alias_types) == 1 && $suppress_atype) {
     form_generate_hidden("alias_type", array_values($alias_types)[0]);
 }
 ?>

web/tools/users/alias_management/template/alias_management.main.php

@@ -28,11 +28,8 @@
 $search_atype=$_SESSION['alias_type'];
 
 $implicit_domain = get_settings_value("implicit_domain");
-$show_one_option = get_settings_value("show_one_option");
-
-require_once("../../../tools/system/domains/lib/functions.inc.php");
-$domains = get_domains("user_management", false);
 
+$suppress_alias_type = get_settings_value("suppress_alias_type");
 $alias_types = get_alias_types();
 ?>
 
@@ -46,42 +43,33 @@
 value="<?=$search_ausername?>" maxlength="16" class="searchInput"></td>
 </tr>
 
-<?php if ($show_one_option || count($domains) != 1) { ?>
 <tr>
 <td class="searchRecord" align="left">Domain</td>
 <td class="searchRecord" width="200"><?php print_domains("domain",$search_domain,TRUE);?></td>
 </tr>
-<?php } ?>
 
 <tr>
 <td class="searchRecord" align="left">Alias Username</td>
 <td class="searchRecord" width="200"><input type="text" name="alias_username"
 value="<?=$search_aaliasusername?>" maxlength="16" class="searchInput"></td>
 </tr>
 
-<?php if (!$implicit_domain && ($show_one_option || count($domains) != 1)) { ?>
+<?php if (!$implicit_domain) { ?>
 <tr>
 <td class="searchRecord" align="left">Alias Domain</td>
 <td class="searchRecord" width="200"><?php print_domains("alias_domain",$search_adomain,TRUE);?></td>
 </tr>
 <?php } ?>
 
-<?php 
-if (!$show_one_option && count($domains) == 1) { 
-    $search_domain = $domains[0]; 
-    $search_adomain = $domains[0];
-}
-?>
-
-<?php if ($show_one_option || count($alias_types) != 1) { ?>
+<?php if (!$suppress_alias_type || count($alias_types) != 1) { ?>
 <tr>
 <td class="searchRecord" align="left">Alias Type</td>
 <td class="searchRecord" width="200"><?php print_aliasType($search_atype,TRUE)?></td>
 </tr>
 <?php } ?>
 
 <?php 
-if (!$show_one_option && count($alias_types) == 1) { 
+if ($suppress_alias_type && count($alias_types) == 1) { 
     $search_atype = $alias_types[0]['label'];
 }
 ?>
@@ -109,8 +97,9 @@
 <?php
 if (!$implicit_domain)
     echo('<th class="listTitle">Alias Domain</th>');
+if (!$suppress_alias_type || count($alias_types) != 1)
+    echo('<th class="listTitle">Alias Type</th>');
 ?>
-<th class="listTitle">Alias Type</th>
 <th class="listTitle">Username</th>
 <th class="listTitle">Domain</th>
 <?php
@@ -155,7 +144,11 @@
 	$labels[$options[$k]['value']] = $options[$k]['label'];
 
 if(!$_SESSION['read_only']){
-        $colspan = $implicit_domain ? 6 : 7;
+        $colspan = 7;
+        if ($implicit_domain)
+            $colspan--;
+        if ($suppress_alias_type && count($alias_types) == 1)
+            $colspan--;
 }else{
         $colspan = 5;
 }
@@ -309,8 +302,9 @@
   <?php
   if (!$implicit_domain)
     echo('<td class="'.$row_style.'">&nbsp;'.$resultset[$i]['alias_domain'].'</td>');
+  if (!$suppress_alias_type || count($alias_types) != 1)
+    echo('<td class="'.$row_style.'">&nbsp;'.(isset($labels[$table])?$labels[$table]:$table).'</td>');
   ?>
-  <td class="<?=$row_style?>">&nbsp;<?=(isset($labels[$table])?$labels[$table]:$table)?></td>
   <td class="<?=$row_style?>">&nbsp;<?=$resultset[$i]['username']?></td>
   <td class="<?=$row_style?>">&nbsp;<?=$resultset[$i]['domain']?></td>
    <?php