Changeset 3107

Timestamp:

10/19/11 17:19:07 (19 months ago)

Author:

benjamin

Message:

Adding the ability for users to choose the url of their mailman lists from a list of 4 : http(s)?:(paneldom|listdom)/cgi-bin/mailman/

Location:

alternc-mailman/trunk

Files:

• bureau/admin/mman_dourl.php (added)
• bureau/admin/mman_list.php (modified) (1 diff)
• bureau/admin/mman_url.php (added)
• bureau/class/m_mailman.php (modified) (1 diff)
• bureau/locales/fr_FR/LC_MESSAGES/mailman.po (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• debian/rules (modified) (2 diffs)
• src/get_url_alternc.py (added)
• src/mailman.geturl (added)
• src/mailman.seturl (added)
• src/set_url_alternc.py (added)

alternc-mailman/trunk/bureau/admin/mman_list.php

@@ -89 +89 @@
                 ?>
                 <tr class="lst<?php echo $col; ?>">
-                   <td align="center"><?php if ($val["list"]!="mailman") { ?><input type="checkbox" class="inc" name="d[]" value="<?php echo $val["id"]; ?>" id="d_<?php echo $val["id"]; ?>" /><?php } ?></td>
-                   <td><label for="d_<?php echo $val["id"]; ?>"><?php echo $val["list"]."@".$val["domain"] ?></label></td>
+                   <td align="center" rowspan="2"><?php if ($val["list"]!="mailman") { ?><input type="checkbox" class="inc" name="d[]" value="<?php echo $val["id"]; ?>" id="d_<?php echo $val["id"]; ?>" /><?php } ?></td>
+                   <td rowspan="2"><label for="d_<?php echo $val["id"]; ?>"><?php echo $val["list"]."@".$val["domain"] ?></label></td>
                         <td><div class="ina"><a href="http://<?php echo $L_FQDN; ?>/cgi-bin/mailman/listinfo/<?php echo $val["name"] ?>"><?php __("Public page"); ?></a></div></td>
                         <td><div class="ina"><a href="http://<?php echo $L_FQDN; ?>/cgi-bin/mailman/admin/<?php echo $val["name"] ?>"><?php __("List admin"); ?></a></div></td>
                         <td><div class="ina"><a href="http://<?php echo $L_FQDN; ?>/cgi-bin/mailman/admindb/<?php echo $val["name"] ?>"><?php __("Pending messages"); ?></a></div></td>
+</tr><tr class="lst<?php echo $col; ?>">
                         <td><div class="ina"><a href="mman_passwd.php?id=<?php echo $val["id"] ?>"><?php __("Change password"); ?></a></div></td>
+                        <td><div class="ina"><a href="mman_url.php?id=<?php echo $val["id"] ?>"><?php __("Change url"); ?></a></div></td>
                         <td><div class="ina"><a href="mman_members.php?id=<?php echo $val["id"] ?>"><?php __("List Members"); ?></a></div></td>
                 </tr>

alternc-mailman/trunk/bureau/class/m_mailman.php

@@ -338 +338 @@
 
   /* ----------------------------------------------------------------- */
+  /**
+   * Returns the current url for $list administration
+   * @param $list integer the list for which we want the url
+   * @return string the url (starting by http or https) or false if an error occured
+   */
+  function get_list_url($list) {
+    global $db,$err,$cuid;
+    $q = "SELECT * FROM mailman WHERE uid = '" . $cuid . "' && id = '" . intval($list) . "'";
+    $db->query($q);
+    $db->next_record();
+    if (!$db->f("id")) {
+      $err->raise("mailman",9);
+      return false;
+    }
+    $list=$db->Record["name"];
+    unset($out);
+    $exec="/usr/lib/alternc/mailman.geturl ".escapeshellarg($list);
+    exec($exec,$out,$ret);
+    if ($ret) return false;
+    if ($out[0]) 
+      return $out[0]; 
+    else 
+      return false;
+  }
+
+
+  /* ----------------------------------------------------------------- */
+  /**
+   * Set the management url for $list 
+   * @param $list integer the list for which we want to change the url
+   * @param $url string the url, MUST be either http:// or https:// + domain + /cgi-bin/mailman/
+   * @return boolean TRUE if the url has been changes
+   */
+  function set_list_url($list,$newurl) {
+    global $db,$err,$cuid;
+    $q = "SELECT * FROM mailman WHERE uid = '" . $cuid . "' && id = '" . intval($list) . "'";
+    $db->query($q);
+    $db->next_record();
+    if (!$db->f("id")) {
+      $err->raise("mailman",9);
+      return false;
+    }
+    $list=$db->Record["name"];
+    unset($out);
+    $exec="/usr/lib/alternc/mailman.seturl ".escapeshellarg($list)." ".escapeshellarg($newurl);
+    exec($exec,$out,$ret);
+    if ($ret) return false;
+    return true;
+  }
+
+
+  /* ----------------------------------------------------------------- */
   /** This function is a hook who is called each time a domain is uninstalled
    * in an account (or when we select "gesmx = no" in the domain panel.)

alternc-mailman/trunk/bureau/locales/fr_FR/LC_MESSAGES/mailman.po

@@ -141 +141 @@
 msgid "Change the password."
 msgstr "Modifier le mot de passe."
+
+msgid "The mailing list management url has been successfully changed."
+msgstr "L'adresse URL de gestion de la liste a été modifiée avec succès."
+
+msgid "This is the current url to access administration and public pages for this list. If you want to change it, select another url in the list and submit this form. <br />If you don't know what you are doing, don't change anything here."
+msgstr "Voici l'adresse actuelle d'administration de votre liste, et des pages publiques. Si vous souhaitez la changer, choisissez une autre adresse dans la liste ci-dessous et validez. <br />Si vous ne savez pas de quoi il s'agit, ne touchez à rien."
+
+msgid "Changing management url of list %s"
+msgstr "Modification de l'adresse de gestion de la liste %s"
+
+msgid "Current list url"
+msgstr "Adresse actuelle"
+
+msgid "New list management url"
+msgstr "Nouvelle adresse de la liste"
+
+msgid "Change the url."
+msgstr "Modifier l'adresse."
+
+msgid "Change url"
+msgstr "Changer l'adresse"

alternc-mailman/trunk/debian/changelog

@@ +1 @@
+alternc-mailman (2.1) stable; urgency=low
+
+  * ADD the ability to choose the URL of the web pages for mailman lists
+
+ -- Benjamin Sonntag <benjamin@alternc.org>  Wed, 19 Oct 2011 17:12:00 +0200
+
 alternc-mailman (2.0) stable; urgency=low
 

alternc-mailman/trunk/debian/rules

@@ -35 +35 @@
         install -m 0644 mm_cfg.py \
                 debian/alternc-mailman/etc/alternc/templates/mailman/
+        install -m 0644 -o root -g root src/get_url_alternc.py src/set_url_alternc.py \
+                debian/alternc-mailman/var/lib/mailman/bin/
         install -m 0644 alternc-mailman.conf debian/alternc-mailman/etc/apache/conf.d/
         install -m 0644 alternc-mailman.conf debian/alternc-mailman/etc/apache-ssl/conf.d/
@@ -41 +43 @@
                 src/mailman.create src/mailman.delete src/mailman.list src/mailman.passwd \
                 src/mailman.sub src/mailman.unsub \
-                debian/alternc-mailman/usr/lib/alternc/
+                debian/alternc-mailman/usr/lib/alternc/ \
+                src/mailman.seturl src/mailman.geturl
         install -m 0644 mailman.sql \
                 debian/alternc-mailman/usr/share/alternc/install/