Merge pull request #2 from ikedas/sympa-6.2

Late changes on svn repo from soji

Author: Marc Chantreux

ChangeLog

@@ -503,9 +503,13 @@ $POWERED_BY$
     <input type="hidden" name="month" value="$mois$" />
     <input type="hidden" name="msgid" value="$MSGID$" />
     <input type="hidden" name="action" value="" />
-   ($tag$% IF user.email == '$FROMADDRNAME:J$@$FROMADDRDOMAIN$'  || is_owner %$tag$)
-    <input class="MainMenuLinks" type="submit" name="action_remove_arc" value="($tag$%|loc%$tag$)tag this mail for deletion($tag$%END%$tag$)" />
-    ($tag$% END %$tag$)
+    ($tag$% from_addr = BLOCK ~%$tag$)
+      ($tag$% '$FROMADDRNAME:J$@$FROMADDRDOMAIN$' | canonic_email %$tag$)
+    ($tag$%~ END ~%$tag$)
+    ($tag$% IF user.email == from_addr || is_owner ~%$tag$)
+      <input class="MainMenuLinks" type="submit" name="action_remove_arc"
+       value="($tag$%|loc%$tag$)tag this mail for deletion($tag$%END%$tag$)" />
+    ($tag$%~ END %$tag$)
     ($tag$% IF is_owner %$tag$)
     <br /><input class="MainMenuLinks" type="submit" name="action_view_source" value="($tag$%|loc%$tag$)view source($tag$%END%$tag$)" />
     ($tag$% END %$tag$)

default/mhonarc-ressources.tt2

@@ -45,17 +45,26 @@
 [% END %]
 </td>
 <td>
-[% IF confparam.vhost == '1' %]
+[% IF confparam.vhost == '1' ~%]
   [% IF confparam.edit == '1' && removethistesttoenblefeature == '1' %]
-    <select name="robot">
-	[% FOREACH vr = robots %]<option value="[% vr.key %]" [% IF vr.key == robot %] selected="selected" [% END %]>[% vr.key %]</option>[% END %]
-    </select>
-  [% ELSE %]
-	[% robot %]
-  [% END %]
-[% ELSE %]
-	[%|loc%]main conf[%END%]
-[% END %]
+    [%~ IF robots ~%]
+      <select name="robot">
+        [% FOREACH vr = robots ~%]
+          <option value="[% vr.key %]"
+          [%~ IF vr.key == robot %] selected="selected" [% END ~%]
+          >[% vr.key %]</option>
+        [% END %]
+      </select>
+    [%~ ELSE ~%]
+      <input type="hidden" name="robot" value="[% robot %] />
+      [%~ robot %]
+    [%~ END %]
+  [%~ ELSE ~%]
+    [% robot %]
+  [%~ END %]
+[%~ ELSE ~%]
+  [%|loc%]main conf[%END%]
+[%~ END %]
 </td>
 <td>[% confparam.default %]</td>
 </form>

default/web_tt2/edit_config.tt2

@@ -50,12 +50,14 @@
     <li class="[% class %]"><a href="[% 'serveradmin/templates' | url_rel %]">[%|loc%]Templates[%END%]</a></li>
 [% IF action == 'skinsedit' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
     <li class="[% class %]"><a href="[% 'skinsedit' | url_rel %]">[%|loc%]Skins, CSS and colors[%END%]</a></li>
-[% IF main_robot %]
-[% IF subaction == 'vhosts' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
+[% IF main_robot && robots ~%]
+    [% IF subaction == 'vhosts' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
     <li class="[% class %]"><a href="[% 'serveradmin/vhosts' | url_rel %]">[%|loc%]Virtual Robots[%END%]</a></li>
-[% IF action == 'edit_config' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
+[%~ END %]
+[% IF main_robot ~%]
+  [% IF action == 'edit_config' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
     <li class="[% class %]"><a href="[% 'edit_config' | url_rel %]">[%|loc%]Edit Robot Config[%END%]</a></li>
-[% END %]
+[%~ END %]
 [% IF families -%]
 [% IF subaction == 'families' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
     <li class="[% class %]"><a href="[% 'serveradmin/families' | url_rel %]">[%|loc%]Families[%END%]</a></li>