summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwjames5 <will@tekimaki.com>2010-01-06 19:07:53 +0000
committerwjames5 <will@tekimaki.com>2010-01-06 19:07:53 +0000
commit5eeb10d1d841bbcb6f5bd6639862cd35f07aa2a0 (patch)
tree4b481e00dd06a5feb60d4a07e740ca4c1ebfa797
parent98ac8941fda0313deb6f62fca23ec359cbcec2fd (diff)
downloadutil-5eeb10d1d841bbcb6f5bd6639862cd35f07aa2a0.tar.gz
util-5eeb10d1d841bbcb6f5bd6639862cd35f07aa2a0.tar.bz2
util-5eeb10d1d841bbcb6f5bd6639862cd35f07aa2a0.zip
expand acceptable list name chars and fix bug in return default
-rw-r--r--mailman_lib.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/mailman_lib.php b/mailman_lib.php
index 5d31057..80b9673 100644
--- a/mailman_lib.php
+++ b/mailman_lib.php
@@ -1,5 +1,5 @@
<?php
-// $Header: /cvsroot/bitweaver/_bit_util/mailman_lib.php,v 1.13 2009/10/01 13:45:53 wjames5 Exp $
+// $Header: /cvsroot/bitweaver/_bit_util/mailman_lib.php,v 1.14 2010/01/06 19:07:53 wjames5 Exp $
// Copyright (c) bitweaver Group
// All Rights Reserved.
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See http://www.gnu.org/copyleft/lesser.html for details.
@@ -14,7 +14,7 @@
function mailman_verify_list( $pListName ) {
$error = NULL;
- if( $matches = preg_match( '/[^A-Za-z0-9]/', $pListName ) ) {
+ if( $matches = preg_match( '/[^A-Za-z0-9\-\_]/', $pListName ) ) {
$error = tra( 'Invalid mailing list name' ).': '.tra( 'List names can only contain letters and numbers' );
} else {
$lists = mailman_list_lists();
@@ -323,7 +323,7 @@ function mailman_get_aliases_file() {
}
function mailman_command( $pCommand, &$output, $pOptions=NULL ) {
- $ret = NULL;
+ $ret_code = NULL;
if( $fullCommand = mailman_get_command( $pCommand ) ) {
$cmd = $fullCommand.' '.$pOptions;
if( !defined( 'IS_LIVE' ) || !IS_LIVE ) {