Changeset 196

Timestamp:

09/14/07 23:22:38 (16 months ago)

Author:

jonas

Message:

second step to make ml feature stable

Location:

trunk

Files:

• includes/func.inc.php (modified) (1 diff)
• includes/sites/domain_view.php (modified) (1 diff)
• sql_upgrades (modified) (1 diff)
• templates/domain_view.tpl (modified) (2 diffs)
• templates/list_add.tpl (modified) (1 diff)
• templates/list_del.tpl (modified) (1 diff)
• templates/list_view.tpl (modified) (1 diff)
• templates/navigation.tpl (modified) (1 diff)
• web/index.php (modified) (1 diff)

trunk/includes/func.inc.php

@@ -208 +208 @@
                         $do="p_check_grey";
                         break;
+                case 'mlists':
+                        $do="p_mlists";
+                        break;
                 default:
                         return false;

trunk/includes/sites/domain_view.php

@@ -216 +216 @@
         $smarty->assign('p_check_polw', $data['p_check_polw']);
         $smarty->assign('p_check_grey', $data['p_check_grey']);
+        $smarty->assign('p_mlists', $data['p_mlists']);
 
         $smarty->assign('max_emails', $data['max_email']);

trunk/sql_upgrades

@@ -167 +167 @@
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+ALTER TABLE `domains` ADD `p_mlists` TINYINT NOT NULL DEFAULT '0';

trunk/templates/domain_view.tpl

@@ -76 +76 @@
 </table>
 
-{if $config.mailinglists == '1'}
+{if $config.mailinglists == '1' && $access_domain_mlists == 1 }
 <table border="0" class="domain_view">
 <tr>
@@ -173 +173 @@
  {/if}</td>
 </tr>
+{if $config.mailinglists == '1'}
+<tr>
+ <td>{t}Mailinglist feature{/t}:</td>
+ <td></td>
+ <td style="text-align:right;">
+ {if $p_mlists ==  0 }
+   <a href="?module=domain_view&#038;did={$did}&#038;fstate=1&#038;f=mlists">
+ <img src="img/icons/button_cancel.png" style="border:0px;" title="{t}activate mailinglists.{/t}" /></a>
+ {else}
+   <a href="?module=domain_view&#038;did={$did}&#038;fstate=0&#038;f=mlists">
+ <img src="img/icons/button_ok.png" style="border:0px;" title="{t}deactivate mailinglists.{/t}" /></a>
+ {/if}</td>
+</tr>
+{/if}
 {if $config.recipient_classes_polw == 1}
 <tr>

trunk/templates/list_add.tpl

@@ -1 @@
-{if $if_superadmin == 1 or $if_admin == '1' and $access_domain eq 'true'}
+{if ($if_superadmin == 1 or $if_admin == '1' and $access_domain eq 'true') and $access_domain_mlists == 1 and $config.mailinglists == '1'}
 <form action="?module=list_add&#038;did={$did}" method="post">
 <table>

trunk/templates/list_del.tpl

@@ -1 @@
-{if $if_superadmin == 1 or $if_admin == '1' and $access_domain eq 'true'}
-
+{if ($if_superadmin == 1 or $if_admin == '1' and $access_domain eq 'true') and $access_domain_mlists == 1 and $config.mailinglists == '1'}
 {if $if_del_ok != "y" }
 <table>

trunk/templates/list_view.tpl

@@ -1 @@
-{if $if_superadmin == 1 or $if_admin == '1' and $access_domain eq 'true'}
+{if ($if_superadmin == 1 or $if_admin == '1' and $access_domain eq 'true') and $access_domain_mlists == 1 and $config.mailinglists == '1'}
 
 {if $email_added eq 'y'}

trunk/templates/navigation.tpl

@@ -7 +7 @@
         <a class="nav sub" href="?module=email_add&#038;did={$did}">{t}new emailaddress{/t}</a>
         <a class="nav sub" href="?module=forward_add&#038;did={$did}">{t}new forward{/t}</a>
-        {if $config.mailinglists == '1' }
+        {if $config.mailinglists == '1' && $access_domain_mlists == '1' }
         <a class="nav sub" href="?module=list_add&#038;did={$did}">{t}new mailinglist{/t}</a>
         {/if}

trunk/web/index.php

@@ -157 +157 @@
             $smarty->assign('if_domain_view', 'y');
             $smarty->assign('did',$_GET['did']);
-            
+        
             $access_domain=check_access_to_domain($_GET['did'], $db);
             $smarty->assign('access_domain', $access_domain);
+                $sql=sprintf("SELECT p_mlists FROM domains WHERE id='%d'",
+                        $db->escapeSimple($_GET['did']));
+                $result=&$db->query($sql);
+                $data=$result->fetchrow(DB_FETCHMODE_ASSOC);
+                $access_domain_mlists=$data['p_mlists'];
+                $smarty->assign('access_domain_mlists',$access_domain_mlists );
         }
 }