diff --git a/config.inc.php b/config.inc.php index d175efcb..bd9fecc5 100644 --- a/config.inc.php +++ b/config.inc.php @@ -525,11 +525,7 @@ $CONF['show_vacation_color']='turquoise'; // show disabled accounts $CONF['show_disabled']='YES'; $CONF['show_disabled_color']='grey'; -<<<<<<< HEAD // show POP/IMAP mailboxes -======= -// show IMAP/POP capabilities ->>>>>>> 72dddbc93be15cb6f975343524a15103763acf89 $CONF['show_popimap']='YES'; $CONF['show_popimap_color']='darkgrey'; // you can assign special colors to some domains. To do this, diff --git a/functions.inc.php b/functions.inc.php index 75ca955f..c753bfef 100644 --- a/functions.inc.php +++ b/functions.inc.php @@ -1,22 +1,22 @@ '; - foreach($supported_languages as $lang => $lang_name) { + foreach ($supported_languages as $lang => $lang_name) { if ($lang == $current_lang) { $selected = ' selected="selected"'; } else { @@ -191,15 +215,15 @@ function language_selector() { /** - * Checks if a domain is valid + * Checks if a domain is valid * @param string $domain - * @return empty string if the domain is valid, otherwise string with the errormessage + * @return string empty if the domain is valid, otherwise string with the errormessage * * TODO: make check_domain able to handle as example .local domains * TODO: skip DNS check if the domain exists in PostfixAdmin? */ -function check_domain ($domain) { - if (!preg_match ('/^([-0-9A-Z]+\.)+' . '([-0-9A-Z]){2,13}$/i', ($domain))) { +function check_domain($domain) { + if (!preg_match('/^([-0-9A-Z]+\.)+' . '([-0-9A-Z]){2,13}$/i', ($domain))) { return sprintf(Config::lang('pInvalidDomainRegex'), htmlentities($domain)); } @@ -207,15 +231,15 @@ function check_domain ($domain) { // Look for an AAAA, A, or MX record for the domain - if(function_exists('checkdnsrr')) { + if (function_exists('checkdnsrr')) { $start = microtime(true); # check for slow nameservers, part 1 // AAAA (IPv6) is only available in PHP v. >= 5 - if (version_compare(phpversion(), "5.0.0", ">=") && checkdnsrr($domain,'AAAA')) { + if (version_compare(phpversion(), "5.0.0", ">=") && checkdnsrr($domain, 'AAAA')) { $retval = ''; - } elseif (checkdnsrr($domain,'A')) { + } elseif (checkdnsrr($domain, 'A')) { $retval = ''; - } elseif (checkdnsrr($domain,'MX')) { + } elseif (checkdnsrr($domain, 'MX')) { $retval = ''; } else { $retval = sprintf(Config::lang('pInvalidDomainDNS'), htmlentities($domain)); @@ -236,47 +260,39 @@ function check_domain ($domain) { return ''; } -/** - * get_password_expiration_value - * Get password expiration value for a domain - * @param String $domain - a string that may be a domain - * @return password expiration value for this domain - * TODO: return specific value for invalid (not existing) domain - */ -function get_password_expiration_value ($domain) { - $table_domain = table_by_key('domain'); - $query = "SELECT password_expiration_value FROM $table_domain WHERE domain='$domain'"; - $result = db_query ($query); - $password_expiration_value = db_array ($result['result']); - return $password_expiration_value[0]; -} /** * check_email * Checks if an email is valid - if it is, return true, else false. - * @param String $email - a string that may be an email address. - * @return empty string if it's a valid email address, otherwise string with the errormessage + * @param string $email - a string that may be an email address. + * @return string empty if it's a valid email address, otherwise string with the errormessage * TODO: make check_email able to handle already added domains */ -function check_email ($email) { +function check_email($email) { $ce_email=$email; //strip the vacation domain out if we are using it //and change from blah#foo.com@autoreply.foo.com to blah@foo.com - if (Config::bool('vacation')) { + if (Config::bool('vacation')) { $vacation_domain = Config::read('vacation_domain'); $ce_email = preg_replace("/@$vacation_domain\$/", '', $ce_email); $ce_email = preg_replace("/#/", '@', $ce_email); } // Perform non-domain-part sanity checks - if (!preg_match ('/^[-!#$%&\'*+\\.\/0-9=?A-Z^_{|}~]+' . '@' . '[^@]+$/i', $ce_email)) { + if (!preg_match('/^[-!#$%&\'*+\\.\/0-9=?A-Z^_{|}~]+' . '@' . '[^@]+$/i', $ce_email)) { return Config::lang_f('pInvalidMailRegex', $email); } + if (function_exists('filter_var')) { + $check = filter_var($email, FILTER_VALIDATE_EMAIL); + if (!$check) { + return Config::lang_f('pInvalidMailRegex', $email); + } + } // Determine domain name $matches=array(); - if (!preg_match('|@(.+)$|',$ce_email,$matches)) { + if (!preg_match('|@(.+)$|', $ce_email, $matches)) { return Config::lang_f('pInvalidMailRegex', $email); } $domain=$matches[1]; @@ -291,26 +307,26 @@ function check_email ($email) { * Clean a string, escaping any meta characters that could be * used to disrupt an SQL string. i.e. "'" => "\'" etc. * - * @param String (or Array) - * @return String (or Array) of cleaned data, suitable for use within an SQL - * statement. + * @param string|array $string parameters to escape + * @return string|array of cleaned data, suitable for use within an SQL statement. */ -function escape_string ($string) { +function escape_string($string) { global $CONF; // if the string is actually an array, do a recursive cleaning. // Note, the array keys are not cleaned. - if(is_array($string)) { + if (is_array($string)) { $clean = array(); - foreach(array_keys($string) as $row) { - $clean[$row] = escape_string($string[$row]); + foreach ($string as $k => $v) { + $clean[$k] = escape_string($v); } return $clean; } - if (get_magic_quotes_gpc ()) { + if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) { $string = stripslashes($string); } if (!is_numeric($string)) { $link = db_connect(); + if ($CONF['database_type'] == "mysql") { $escaped_string = mysql_real_escape_string($string, $link); } @@ -342,66 +358,75 @@ function escape_string ($string) { * - or - * $param = safeget('param', 'default') * - * @param String parameter name. - * @param String (optional) - default value if key is not set. - * @return String + * @param string $param parameter name. + * @param string $default (optional) - default value if key is not set. + * @return string */ -function safeget ($param, $default="") { +function safeget($param, $default="") { $retval=$default; - if (isset($_GET[$param])) $retval=$_GET[$param]; + if (isset($_GET[$param])) { + $retval=$_GET[$param]; + } return $retval; } /** - * safepost - similar to safeget() + * safepost - similar to safeget() but for $_POST * @see safeget() - * @param String parameter name - * @param String (optional) default value (defaults to "") - * @return String - value in $_POST[$param] or $default - * same as safeget, but for $_POST + * @param string $param parameter name + * @param string $default (optional) default value (defaults to "") + * @return string - value in $_POST[$param] or $default */ -function safepost ($param, $default="") { +function safepost($param, $default="") { $retval=$default; - if (isset($_POST[$param])) $retval=$_POST[$param]; + if (isset($_POST[$param])) { + $retval=$_POST[$param]; + } return $retval; } /** * safeserver * @see safeget() - * @param String $param - * @param String $default (optional) - * @return String value from $_SERVER[$param] or $default + * @param string $param + * @param string $default (optional) + * @return string value from $_SERVER[$param] or $default */ -function safeserver ($param, $default="") { +function safeserver($param, $default="") { $retval=$default; - if (isset($_SERVER[$param])) $retval=$_SERVER[$param]; + if (isset($_SERVER[$param])) { + $retval=$_SERVER[$param]; + } return $retval; } /** * safecookie * @see safeget() - * @param String $param - * @param String $default (optional) - * @return String value from $_COOKIE[$param] or $default + * @param string $param + * @param string $default (optional) + * @return string value from $_COOKIE[$param] or $default */ -function safecookie ($param, $default="") { +function safecookie($param, $default="") { $retval=$default; - if (isset($_COOKIE[$param])) $retval=$_COOKIE[$param]; + if (isset($_COOKIE[$param])) { + $retval=$_COOKIE[$param]; + } return $retval; } /** * safesession * @see safeget() - * @param String $param - * @param String $default (optional) - * @return String value from $_SESSION[$param] or $default + * @param string $param + * @param string $default (optional) + * @return string value from $_SESSION[$param] or $default */ -function safesession ($param, $default="") { +function safesession($param, $default="") { $retval=$default; - if (isset($_SESSION[$param])) $retval=$_SESSION[$param]; + if (isset($_SESSION[$param])) { + $retval=$_SESSION[$param]; + } return $retval; } @@ -411,18 +436,21 @@ function safesession ($param, $default="") { * @param int $allow_editing * @param int $display_in_form * @param int display_in_list - * @param String $type - * @param String PALANG_label - * @param String PALANG_desc + * @param string $type + * @param string PALANG_label + * @param string PALANG_desc * @param any optional $default - * @param array optional $options - * @param int or $not_in_db - if array, can contain the remaining parameters as associated array - * @param ... + * @param array $options optional options + * @param int or $not_in_db - if array, can contain the remaining parameters as associated array. Otherwise counts as $not_in_db * @return array for $struct */ function pacol($allow_editing, $display_in_form, $display_in_list, $type, $PALANG_label, $PALANG_desc, $default = "", $options = array(), $multiopt=0, $dont_write_to_db=0, $select="", $extrafrom="", $linkto="") { - if ($PALANG_label != '') $PALANG_label = Config::lang($PALANG_label); - if ($PALANG_desc != '') $PALANG_desc = Config::lang($PALANG_desc ); + if ($PALANG_label != '') { + $PALANG_label = Config::lang($PALANG_label); + } + if ($PALANG_desc != '') { + $PALANG_desc = Config::lang($PALANG_desc); + } if (is_array($multiopt)) { # remaining parameters provided in named array $not_in_db = 0; # keep default value @@ -450,13 +478,12 @@ function pacol($allow_editing, $display_in_form, $display_in_list, $type, $PALAN ); } -// -// get_domain_properties -// Action: Get all the properties of a domain. -// Call: get_domain_properties (string domain) -// -function get_domain_properties ($domain) { - +/** + * Action: Get all the properties of a domain. + * @param string $domain + * @return array + */ +function get_domain_properties($domain) { $handler = new DomainHandler(); if (!$handler->init($domain)) { die("Error: " . join("\n", $handler->errormsg)); @@ -476,9 +503,9 @@ function get_domain_properties ($domain) { * Action: Get page browser for a long list of mailboxes, aliases etc. * Call: $pagebrowser = create_page_browser('table.field', 'query', 50) # replaces $param = $_GET['param'] * - * @param String idxfield - database field name to use as title - * @param String query - core part of the query (starting at "FROM") - * @return String + * @param string $idxfield - database field name to use as title + * @param string $querypart - core part of the query (starting at "FROM") + * @return array */ function create_page_browser($idxfield, $querypart) { global $CONF; @@ -492,12 +519,12 @@ function create_page_browser($idxfield, $querypart) { # get number of rows $query = "SELECT count(*) as counter FROM (SELECT $idxfield $querypart) AS tmp"; - $result = db_query ($query); + $result = db_query($query); if ($result['rows'] > 0) { - $row = db_array ($result['result']); + $row = db_assoc($result['result']); $count_results = $row['counter'] -1; # we start counting at 0, not 1 } -# echo "
rows: " . ($count_results +1) . " --- $query"; + # echo "
rows: " . ($count_results +1) . " --- $query"; if ($count_results < $page_size) { return array(); # only one page - no pagebrowser required @@ -509,23 +536,23 @@ function create_page_browser($idxfield, $querypart) { $initcount = "CREATE TEMPORARY SEQUENCE rowcount MINVALUE 0"; } if (!db_sqlite()) { - $result = db_query($initcount); + db_query($initcount); } # get labels for relevant rows (first and last of each page) $page_size_zerobase = $page_size - 1; $query = " SELECT * FROM ( - SELECT $idxfield AS label, @row := @row + 1 AS row $querypart + SELECT $idxfield AS label, @row := @row + 1 AS 'row' $querypart ) idx WHERE MOD(idx.row, $page_size) IN (0,$page_size_zerobase) OR idx.row = $count_results - "; + "; if (db_pgsql()) { $query = " SELECT * FROM ( - SELECT $idxfield AS label, nextval('rowcount') AS row $querypart + SELECT $idxfield AS label, nextval('rowcount') AS row $querypart ) idx WHERE MOD(idx.row, $page_size) IN (0,$page_size_zerobase) OR idx.row = $count_results - "; + "; } if (db_sqlite()) { @@ -536,65 +563,59 @@ function create_page_browser($idxfield, $querypart) { WHERE (row % $page_size) IN (0,$page_size_zerobase) OR row = $count_results"; } -# echo "
$query"; + # PostgreSQL: + # http://www.postgresql.org/docs/8.1/static/sql-createsequence.html + # http://www.postgresonline.com/journal/archives/79-Simulating-Row-Number-in-PostgreSQL-Pre-8.4.html + # http://www.pg-forum.de/sql/1518-nummerierung-der-abfrageergebnisse.html + # CREATE TEMPORARY SEQUENCE foo MINVALUE 0 MAXVALUE $page_size_zerobase CYCLE + # afterwards: DROP SEQUENCE foo -# TODO: $query is MySQL-specific - -# PostgreSQL: -# http://www.postgresql.org/docs/8.1/static/sql-createsequence.html -# http://www.postgresonline.com/journal/archives/79-Simulating-Row-Number-in-PostgreSQL-Pre-8.4.html -# http://www.pg-forum.de/sql/1518-nummerierung-der-abfrageergebnisse.html -# CREATE TEMPORARY SEQUENCE foo MINVALUE 0 MAXVALUE $page_size_zerobase CYCLE -# afterwards: DROP SEQUENCE foo - - $result = db_query ($query); + $result = db_query($query); if ($result['rows'] > 0) { - while ($row = db_array ($result['result'])) { - if ($row2 = db_array ($result['result'])) { - $label = substr($row['label'],0,$label_len) . '-' . substr($row2['label'],0,$label_len); + while ($row = db_assoc($result['result'])) { + if ($row2 = db_assoc($result['result'])) { + $label = substr($row['label'], 0, $label_len) . '-' . substr($row2['label'], 0, $label_len); $pagebrowser[] = $label; } else { # only one row remaining - $label = substr($row['label'],0,$label_len); + $label = substr($row['label'], 0, $label_len); $pagebrowser[] = $label; } } } if (db_pgsql()) { - db_query ("DROP SEQUENCE rowcount"); + db_query("DROP SEQUENCE rowcount"); } return $pagebrowser; } - - - - -// -// divide_quota -// Action: Recalculates the quota from MBs to bytes (divide, /) -// Call: divide_quota (string $quota) -// -function divide_quota ($quota) { - if ($quota == -1) return $quota; - $value = round($quota / Config::read('quota_multiplier'),2); +/** + * Recalculates the quota from MBs to bytes (divide, /) + * @param int $quota + * @return float + */ +function divide_quota($quota) { + if ($quota == -1) { + return $quota; + } + $value = round($quota / Config::read('quota_multiplier'), 2); return $value; } - -// -// check_owner -// Action: Checks if the admin is the owner of the domain (or global-admin) -// Call: check_owner (string admin, string domain) -// -function check_owner ($username, $domain) { +/** + * Checks if the admin is the owner of the domain (or global-admin) + * @param string $username + * @param string $domain + * @return bool + */ +function check_owner($username, $domain) { $table_domain_admins = table_by_key('domain_admins'); $E_username = escape_string($username); $E_domain = escape_string($domain); - $result = db_query ("SELECT 1 FROM $table_domain_admins WHERE username='$E_username' AND (domain='$E_domain' OR domain='ALL') AND active='1'"); + $result = db_query("SELECT 1 FROM $table_domain_admins WHERE username='$E_username' AND (domain='$E_domain' OR domain='ALL') AND active='1'"); if ($result['rows'] == 1 || $result['rows'] == 2) { # "ALL" + specific domain permissions is possible # TODO: if superadmin, check if given domain exists in the database @@ -611,11 +632,11 @@ function check_owner ($username, $domain) { /** - * List domains for an admin user. + * List domains for an admin user. * @param String $username * @return array of domain names. */ -function list_domains_for_admin ($username) { +function list_domains_for_admin($username) { $table_domain = table_by_key('domain'); $table_domain_admins = table_by_key('domain_admins'); @@ -624,22 +645,22 @@ function list_domains_for_admin ($username) { $query = "SELECT $table_domain.domain FROM $table_domain "; $condition[] = "$table_domain.domain != 'ALL'"; - $result = db_query ("SELECT username FROM $table_domain_admins WHERE username='$E_username' AND domain='ALL'"); + $result = db_query("SELECT username FROM $table_domain_admins WHERE username='$E_username' AND domain='ALL'"); if ($result['rows'] < 1) { # not a superadmin $query .= " LEFT JOIN $table_domain_admins ON $table_domain.domain=$table_domain_admins.domain "; $condition[] = "$table_domain_admins.username='$E_username' "; $condition[] = "$table_domain.active='" . db_get_boolean(true) . "'"; # TODO: does it really make sense to exclude inactive... - $condition[] = "$table_domain.backupmx='" . db_get_boolean(False) . "'"; # TODO: ... and backupmx domains for non-superadmins? + $condition[] = "$table_domain.backupmx='" . db_get_boolean(false) . "'"; # TODO: ... and backupmx domains for non-superadmins? } $query .= " WHERE " . join(' AND ', $condition); $query .= " ORDER BY $table_domain.domain"; - $list = array (); - $result = db_query ($query); + $list = array(); + $result = db_query($query); if ($result['rows'] > 0) { $i = 0; - while ($row = db_array ($result['result'])) { + while ($row = db_assoc($result['result'])) { $list[$i] = $row['domain']; $i++; } @@ -648,20 +669,19 @@ function list_domains_for_admin ($username) { } - -// -// list_domains -// Action: List all available domains. -// Call: list_domains () -// -function list_domains () { +/** + * List all available domains. + * + * @return array + */ +function list_domains() { $list = array(); $table_domain = table_by_key('domain'); - $result = db_query ("SELECT domain FROM $table_domain WHERE domain!='ALL' ORDER BY domain"); + $result = db_query("SELECT domain FROM $table_domain WHERE domain!='ALL' ORDER BY domain"); if ($result['rows'] > 0) { $i = 0; - while ($row = db_array ($result['result'])) { + while ($row = db_assoc($result['result'])) { $list[$i] = $row['domain']; $i++; } @@ -679,7 +699,7 @@ function list_domains () { // // was admin_list_admins // -function list_admins () { +function list_admins() { $handler = new AdminHandler(); $handler->getList(''); @@ -693,14 +713,14 @@ function list_admins () { // Action: Encode a string according to RFC 1522 for use in headers if it contains 8-bit characters. // Call: encode_header (string header, string charset) // -function encode_header ($string, $default_charset = "utf-8") { - if (strtolower ($default_charset) == 'iso-8859-1') { - $string = str_replace ("\240",' ',$string); +function encode_header($string, $default_charset = "utf-8") { + if (strtolower($default_charset) == 'iso-8859-1') { + $string = str_replace("\240", ' ', $string); } - $j = strlen ($string); - $max_l = 75 - strlen ($default_charset) - 7; - $aRet = array (); + $j = strlen($string); + $max_l = 75 - strlen($default_charset) - 7; + $aRet = array(); $ret = ''; $iEncStart = $enc_init = false; $cur_l = $iOffset = 0; @@ -718,20 +738,20 @@ function encode_header ($string, $default_charset = "utf-8") { } $cur_l+=3; if ($cur_l > ($max_l-2)) { - $aRet[] = substr ($string,$iOffset,$iEncStart-$iOffset); + $aRet[] = substr($string, $iOffset, $iEncStart-$iOffset); $aRet[] = "=?$default_charset?Q?$ret?="; $iOffset = $i; $cur_l = 0; $ret = ''; $iEncStart = false; } else { - $ret .= sprintf ("=%02X",ord($string{$i})); + $ret .= sprintf("=%02X", ord($string{$i})); } break; case '(': case ')': if ($iEncStart !== false) { - $aRet[] = substr ($string,$iOffset,$iEncStart-$iOffset); + $aRet[] = substr($string, $iOffset, $iEncStart-$iOffset); $aRet[] = "=?$default_charset?Q?$ret?="; $iOffset = $i; $cur_l = 0; @@ -743,7 +763,7 @@ function encode_header ($string, $default_charset = "utf-8") { if ($iEncStart !== false) { $cur_l++; if ($cur_l > $max_l) { - $aRet[] = substr ($string,$iOffset,$iEncStart-$iOffset); + $aRet[] = substr($string, $iOffset, $iEncStart-$iOffset); $aRet[] = "=?$default_charset?Q?$ret?="; $iOffset = $i; $cur_l = 0; @@ -755,21 +775,21 @@ function encode_header ($string, $default_charset = "utf-8") { } break; default: - $k = ord ($string{$i}); + $k = ord($string{$i}); if ($k > 126) { if ($iEncStart === false) { // do not start encoding in the middle of a string, also take the rest of the word. - $sLeadString = substr ($string,0,$i); - $aLeadString = explode (' ',$sLeadString); - $sToBeEncoded = array_pop ($aLeadString); - $iEncStart = $i - strlen ($sToBeEncoded); + $sLeadString = substr($string, 0, $i); + $aLeadString = explode(' ', $sLeadString); + $sToBeEncoded = array_pop($aLeadString); + $iEncStart = $i - strlen($sToBeEncoded); $ret .= $sToBeEncoded; - $cur_l += strlen ($sToBeEncoded); + $cur_l += strlen($sToBeEncoded); } $cur_l += 3; // first we add the encoded string that reached it's max size if ($cur_l > ($max_l-2)) { - $aRet[] = substr ($string,$iOffset,$iEncStart-$iOffset); + $aRet[] = substr($string, $iOffset, $iEncStart-$iOffset); $aRet[] = "=?$default_charset?Q?$ret?= "; $cur_l = 3; $ret = ''; @@ -777,12 +797,12 @@ function encode_header ($string, $default_charset = "utf-8") { $iEncStart = $i; } $enc_init = true; - $ret .= sprintf ("=%02X", $k); + $ret .= sprintf("=%02X", $k); } else { if ($iEncStart !== false) { $cur_l++; if ($cur_l > $max_l) { - $aRet[] = substr ($string,$iOffset,$iEncStart-$iOffset); + $aRet[] = substr($string, $iOffset, $iEncStart-$iOffset); $aRet[] = "=?$default_charset?Q?$ret?="; $iEncStart = false; $iOffset = $i; @@ -799,26 +819,30 @@ function encode_header ($string, $default_charset = "utf-8") { } if ($enc_init) { if ($iEncStart !== false) { - $aRet[] = substr ($string,$iOffset,$iEncStart-$iOffset); + $aRet[] = substr($string, $iOffset, $iEncStart-$iOffset); $aRet[] = "=?$default_charset?Q?$ret?="; } else { - $aRet[] = substr ($string,$iOffset); + $aRet[] = substr($string, $iOffset); } - $string = implode ('',$aRet); + $string = implode('', $aRet); } return $string; } +if (!function_exists('random_int')) { // PHP version < 7.0 + function random_int() { // someone might not be using php_crypt or ask for password generation, in which case random_int() won't be called + die(__FILE__ . " Postfixadmin security: Please install https://github.com/paragonie/random_compat OR enable the 'Phar' extension."); + } +} -// -// generate_password -// Action: Generates a random password -// Call: generate_password () -// -function generate_password () { - // length of the generated password - $length = 8; +/** + * Generate a random password of $length characters. + * @param int $length (optional, default: 12) + * @return string + * + */ +function generate_password($length = 12) { // define possible characters $possible = "2345678923456789abcdefghijkmnpqrstuvwxyzABCDEFGHIJKLMNPQRSTUVWXYZ"; # skip 0 and 1 to avoid confusion with O and l @@ -826,8 +850,8 @@ function generate_password () { // add random characters to $password until $length is reached $password = ""; while (strlen($password) < $length) { - // pick a random character from the possible ones - $char = substr($possible, mt_rand(0, strlen($possible)-1), 1); + $random = random_int(0, strlen($possible) -1); + $char = substr($possible, $random, 1); // we don't want this character if it's already in the password if (!strstr($password, $char)) { @@ -842,7 +866,7 @@ function generate_password () { /** * Check if a password is strong enough based on the conditions in $CONF['password_validation'] - * @param String $password + * @param string $password * @return array of error messages, or empty array if the password is ok */ function validate_password($password) { @@ -868,164 +892,330 @@ function validate_password($password) { return $result; } +function _pacrypt_md5crypt($pw, $pw_db) { + $split_salt = preg_split('/\$/', $pw_db); + if (isset($split_salt[2])) { + $salt = $split_salt[2]; + return md5crypt($pw, $salt); + } + + return md5crypt($pw); +} + +function _pacrypt_crypt($pw, $pw_db) { + if ($pw_db) { + return crypt($pw, $pw_db); + } + return crypt($pw); +} + +function _pacrypt_mysql_encrypt($pw, $pw_db) { + // See https://sourceforge.net/tracker/?func=detail&atid=937966&aid=1793352&group_id=191583 + // this is apparently useful for pam_mysql etc. + $pw = escape_string($pw); + if ($pw_db!="") { + $salt=escape_string(substr($pw_db, 0, 2)); + $res=db_query("SELECT ENCRYPT('".$pw."','".$salt."');"); + } else { + $res=db_query("SELECT ENCRYPT('".$pw."');"); + } + $l = db_row($res["result"]); + $password = $l[0]; + return $password; +} + +function _pacrypt_authlib($pw, $pw_db) { + global $CONF; + $flavor = $CONF['authlib_default_flavor']; + $salt = substr(create_salt(), 0, 2); # courier-authlib supports only two-character salts + if (preg_match('/^{.*}/', $pw_db)) { + // we have a flavor in the db -> use it instead of default flavor + $result = preg_split('/[{}]/', $pw_db, 3); # split at { and/or } + $flavor = $result[1]; + $salt = substr($result[2], 0, 2); + } + + if (stripos($flavor, 'md5raw') === 0) { + $password = '{' . $flavor . '}' . md5($pw); + } elseif (stripos($flavor, 'md5') === 0) { + $password = '{' . $flavor . '}' . base64_encode(md5($pw, true)); + } elseif (stripos($flavor, 'crypt') === 0) { + $password = '{' . $flavor . '}' . crypt($pw, $salt); + } elseif (stripos($flavor, 'SHA') === 0) { + $password = '{' . $flavor . '}' . base64_encode(sha1($pw, true)); + } else { + die("authlib_default_flavor '" . $flavor . "' unknown. Valid flavors are 'md5raw', 'md5', 'SHA' and 'crypt'"); + } + return $password; +} /** - * Encrypt a password, using the apparopriate hashing mechanism as defined in - * config.inc.php ($CONF['encrypt']). + * @param string $pw - plain text password + * @param string $pw_db - encrypted password, or '' for generation. + * @return string + */ +function _pacrypt_dovecot($pw, $pw_db) { + global $CONF; + + $split_method = preg_split('/:/', $CONF['encrypt']); + $method = strtoupper($split_method[1]); + # If $pw_db starts with {method}, change $method accordingly + if (!empty($pw_db) && preg_match('/^\{([A-Z0-9.-]+)\}.+/', $pw_db, $method_matches)) { + $method = $method_matches[1]; + } + if (! preg_match("/^[A-Z0-9.-]+$/", $method)) { + die("invalid dovecot encryption method"); + } + + # TODO: check against a fixed list? + # if (strtolower($method) == 'md5-crypt') die("\$CONF['encrypt'] = 'dovecot:md5-crypt' will not work because dovecotpw generates a random salt each time. Please use \$CONF['encrypt'] = 'md5crypt' instead."); + # $crypt_method = preg_match ("/.*-CRYPT$/", $method); + + # digest-md5 and SCRAM-SHA-1 hashes include the username - until someone implements it, let's declare it as unsupported + if (strtolower($method) == 'digest-md5') { + die("Sorry, \$CONF['encrypt'] = 'dovecot:digest-md5' is not supported by PostfixAdmin."); + } + if (strtoupper($method) == 'SCRAM-SHA-1') { + die("Sorry, \$CONF['encrypt'] = 'dovecot:scram-sha-1' is not supported by PostfixAdmin."); + } + # TODO: add -u option for those hashes, or for everything that is salted (-u was available before dovecot 2.1 -> no problem with backward compatibility ) + + $dovecotpw = "doveadm pw"; + if (!empty($CONF['dovecotpw'])) { + $dovecotpw = $CONF['dovecotpw']; + } + + # Use proc_open call to avoid safe_mode problems and to prevent showing plain password in process table + $spec = array( + 0 => array("pipe", "r"), // stdin + 1 => array("pipe", "w"), // stdout + 2 => array("pipe", "w"), // stderr + ); + + $nonsaltedtypes = "SHA|SHA1|SHA256|SHA512|CLEAR|CLEARTEXT|PLAIN|PLAIN-TRUNC|CRAM-MD5|HMAC-MD5|PLAIN-MD4|PLAIN-MD5|LDAP-MD5|LANMAN|NTLM|RPA"; + $salted = ! preg_match("/^($nonsaltedtypes)(\.B64|\.BASE64|\.HEX)?$/", strtoupper($method)); + + $dovepasstest = ''; + if ($salted && (!empty($pw_db))) { + # only use -t for salted passwords to be backward compatible with dovecot < 2.1 + $dovepasstest = " -t " . escapeshellarg($pw_db); + } + $pipe = proc_open("$dovecotpw '-s' $method$dovepasstest", $spec, $pipes); + + if (!$pipe) { + die("can't proc_open $dovecotpw"); + } + + // use dovecot's stdin, it uses getpass() twice (except when using -t) + // Write pass in pipe stdin + if (empty($dovepasstest)) { + fwrite($pipes[0], $pw . "\n", 1+strlen($pw)); + usleep(1000); + } + fwrite($pipes[0], $pw . "\n", 1+strlen($pw)); + fclose($pipes[0]); + + // Read hash from pipe stdout + $password = fread($pipes[1], "200"); + + if (empty($dovepasstest)) { + if (!preg_match('/^\{' . $method . '\}/', $password)) { + $stderr_output = stream_get_contents($pipes[2]); + error_log('dovecotpw password encryption failed. STDERR output: '. $stderr_output); + die("can't encrypt password with dovecotpw, see error log for details"); + } + } else { + if (!preg_match('(verified)', $password)) { + $password="Thepasswordcannotbeverified"; + } else { + $password = rtrim(str_replace('(verified)', '', $password)); + } + } + + fclose($pipes[1]); + fclose($pipes[2]); + proc_close($pipe); + + if ((!empty($pw_db)) && (substr($pw_db, 0, 1) != '{')) { + # for backward compability with "old" dovecot passwords that don't have the {method} prefix + $password = str_replace('{' . $method . '}', '', $password); + } + + return rtrim($password); +} + +/** + * @param string $pw + * @param string $pw_db (can be empty if setting a new password) + * @return string + */ +function _pacrypt_php_crypt($pw, $pw_db) { + global $CONF; + + // use PHPs crypt(), which uses the system's crypt() + // same algorithms as used in /etc/shadow + // you can have mixed hash types in the database for authentication, changed passwords get specified hash type + // the algorithm for a new hash is chosen by feeding a salt with correct magic to crypt() + // set $CONF['encrypt'] to 'php_crypt' to use the default SHA512 crypt method + // set $CONF['encrypt'] to 'php_crypt:METHOD' to use another method; methods supported: DES, MD5, BLOWFISH, SHA256, SHA512 + // tested on linux + + if (strlen($pw_db) > 0) { + // existing pw provided. send entire password hash as salt for crypt() to figure out + $salt = $pw_db; + } else { + $salt_method = 'SHA512'; // hopefully a reasonable default (better than MD5) + $hash_difficulty = ''; + // no pw provided. create new password hash + if (strpos($CONF['encrypt'], ':') !== false) { + // use specified hash method + $split_method = explode(':', $CONF['encrypt']); + $salt_method = $split_method[1]; + if (count($split_method) >= 3) { + $hash_difficulty = $split_method[2]; + } + } + // create appropriate salt for selected hash method + $salt = _php_crypt_generate_crypt_salt($salt_method, $hash_difficulty); + } + // send it to PHPs crypt() + $password = crypt($pw, $salt); + return $password; +} + +/** + * @param string $hash_type must be one of: MD5, DES, BLOWFISH, SHA256 or SHA512 (default) + * @param int hash difficulty + * @return string + */ +function _php_crypt_generate_crypt_salt($hash_type='SHA512', $hash_difficulty=null) { + // generate a salt (with magic matching chosen hash algorithm) for the PHP crypt() function + + // most commonly used alphabet + $alphabet = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'; + + switch ($hash_type) { + case 'DES': + $alphabet = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'; + $length = 2; + $salt = _php_crypt_random_string($alphabet, $length); + return $salt; + + case 'MD5': + $length = 12; + $algorithm = '1'; + $salt = _php_crypt_random_string($alphabet, $length); + return sprintf('$%s$%s', $algorithm, $salt); + + case 'BLOWFISH': + $length = 22; + if (empty($hash_difficulty)) { + $cost = 10; + } else { + $cost = (int)$hash_difficulty; + if ($cost < 4 || $cost > 31) { + die('invalid encrypt difficulty setting "' . $hash_difficulty . '" for ' . $hash_type . ', the valid range is 4-31'); + } + } + if (version_compare(PHP_VERSION, '5.3.7') >= 0) { + $algorithm = '2y'; // bcrypt, with fixed unicode problem + } else { + $algorithm = '2a'; // bcrypt + } + $salt = _php_crypt_random_string($alphabet, $length); + return sprintf('$%s$%02d$%s', $algorithm, $cost, $salt); + + case 'SHA256': + $length = 16; + $algorithm = '5'; + if (empty($hash_difficulty)) { + $rounds = ''; + } else { + $rounds = (int)$hash_difficulty; + if ($rounds < 1000 || $rounds > 999999999) { + die('invalid encrypt difficulty setting "' . $hash_difficulty . '" for ' . $hash_type . ', the valid range is 1000-999999999'); + } + } + $salt = _php_crypt_random_string($alphabet, $length); + if (!empty($rounds)) { + $rounds = sprintf('rounds=%d$', $rounds); + } + return sprintf('$%s$%s%s', $algorithm, $rounds, $salt); + + case 'SHA512': + $length = 16; + $algorithm = '6'; + if (empty($hash_difficulty)) { + $rounds = ''; + } else { + $rounds = (int)$hash_difficulty; + if ($rounds < 1000 || $rounds > 999999999) { + die('invalid encrypt difficulty setting "' . $hash_difficulty . '" for ' . $hash_type . ', the valid range is 1000-999999999'); + } + } + $salt = _php_crypt_random_string($alphabet, $length); + if (!empty($rounds)) { + $rounds = sprintf('rounds=%d$', $rounds); + } + return sprintf('$%s$%s%s', $algorithm, $rounds, $salt); + + default: + die("unknown hash type: '$hash_type'"); + } +} + +/** + * Generates a random string of specified $length from $characters. + * @param string $characters + * @param int $length + * @return string of given $length + */ +function _php_crypt_random_string($characters, $length) { + $string = ''; + for ($p = 0; $p < $length; $p++) { + $string .= $characters[random_int(0, strlen($characters) -1)]; + } + return $string; +} + + +/** + * Encrypt a password, using the apparopriate hashing mechanism as defined in + * config.inc.php ($CONF['encrypt']). * When wanting to compare one pw to another, it's necessary to provide the salt used - hence * the second parameter ($pw_db), which is the existing hash from the DB. * * @param string $pw - * @param string $encrypted password + * @param string $pw_db optional encrypted password * @return string encrypted password. */ -function pacrypt ($pw, $pw_db="") { +function pacrypt($pw, $pw_db="") { global $CONF; - $password = ""; - $salt = ""; - if ($CONF['encrypt'] == 'md5crypt') { - $split_salt = preg_split ('/\$/', $pw_db); - if (isset ($split_salt[2])) { - $salt = $split_salt[2]; - } - $password = md5crypt ($pw, $salt); + switch ($CONF['encrypt']) { + case 'md5crypt': + return _pacrypt_md5crypt($pw, $pw_db); + case 'md5': + return md5($pw); + case 'system': + return _pacrypt_crypt($pw, $pw_db); + case 'cleartext': + return $pw; + case 'mysql_encrypt': + return _pacrypt_mysql_encrypt($pw, $pw_db); + case 'authlib': + return _pacrypt_authlib($pw, $pw_db); } - elseif ($CONF['encrypt'] == 'md5') { - $password = md5($pw); + if (preg_match("/^dovecot:/", $CONF['encrypt'])) { + return _pacrypt_dovecot($pw, $pw_db); } - elseif ($CONF['encrypt'] == 'system') { - if ($pw_db) { - $password = crypt($pw, $pw_db); - } else { - $password = crypt($pw); - } + if (substr($CONF['encrypt'], 0, 9) === 'php_crypt') { + return _pacrypt_php_crypt($pw, $pw_db); } - elseif ($CONF['encrypt'] == 'cleartext') { - $password = $pw; - } - - // See https://sourceforge.net/tracker/?func=detail&atid=937966&aid=1793352&group_id=191583 - // this is apparently useful for pam_mysql etc. - elseif ($CONF['encrypt'] == 'mysql_encrypt') { - $pw = escape_string($pw); - if ($pw_db!="") { - $salt=escape_string(substr($pw_db,0,2)); - $res=db_query("SELECT ENCRYPT('".$pw."','".$salt."');"); - } else { - $res=db_query("SELECT ENCRYPT('".$pw."');"); - } - $l = db_row($res["result"]); - $password = $l[0]; - } - - elseif ($CONF['encrypt'] == 'authlib') { - $flavor = $CONF['authlib_default_flavor']; - $salt = substr(create_salt(), 0, 2); # courier-authlib supports only two-character salts - if(preg_match('/^{.*}/', $pw_db)) { - // we have a flavor in the db -> use it instead of default flavor - $result = preg_split('/[{}]/', $pw_db, 3); # split at { and/or } - $flavor = $result[1]; - $salt = substr($result[2], 0, 2); - } - - if(stripos($flavor, 'md5raw') === 0) { - $password = '{' . $flavor . '}' . md5($pw); - } elseif(stripos($flavor, 'md5') === 0) { - $password = '{' . $flavor . '}' . base64_encode(md5($pw, TRUE)); - } elseif(stripos($flavor, 'crypt') === 0) { - $password = '{' . $flavor . '}' . crypt($pw, $salt); - } elseif(stripos($flavor, 'SHA') === 0) { - $password = '{' . $flavor . '}' . base64_encode(sha1($pw, TRUE)); - } else { - die("authlib_default_flavor '" . $flavor . "' unknown. Valid flavors are 'md5raw', 'md5', 'SHA' and 'crypt'"); - } - } - - elseif (preg_match("/^dovecot:/", $CONF['encrypt'])) { - $split_method = preg_split ('/:/', $CONF['encrypt']); - $method = strtoupper($split_method[1]); - # If $pw_db starts with {method}, change $method accordingly - if (!empty($pw_db) && preg_match('/^\{([A-Z0-9.-]+)\}.+/', $pw_db, $method_matches)) { $method = $method_matches[1]; } - if (! preg_match("/^[A-Z0-9.-]+$/", $method)) { die("invalid dovecot encryption method"); } # TODO: check against a fixed list? - # if (strtolower($method) == 'md5-crypt') die("\$CONF['encrypt'] = 'dovecot:md5-crypt' will not work because dovecotpw generates a random salt each time. Please use \$CONF['encrypt'] = 'md5crypt' instead."); - # $crypt_method = preg_match ("/.*-CRYPT$/", $method); - - # digest-md5 and SCRAM-SHA-1 hashes include the username - until someone implements it, let's declare it as unsupported - if (strtolower($method) == 'digest-md5') die("Sorry, \$CONF['encrypt'] = 'dovecot:digest-md5' is not supported by PostfixAdmin."); - if (strtoupper($method) == 'SCRAM-SHA-1') die("Sorry, \$CONF['encrypt'] = 'dovecot:scram-sha-1' is not supported by PostfixAdmin."); - # TODO: add -u option for those hashes, or for everything that is salted (-u was available before dovecot 2.1 -> no problem with backward compability) - - $dovecotpw = "doveadm pw"; - if (!empty($CONF['dovecotpw'])) $dovecotpw = $CONF['dovecotpw']; - - # Use proc_open call to avoid safe_mode problems and to prevent showing plain password in process table - $spec = array( - 0 => array("pipe", "r"), // stdin - 1 => array("pipe", "w"), // stdout - 2 => array("pipe", "w"), // stderr - ); - - $nonsaltedtypes = "SHA|SHA1|SHA256|SHA512|CLEAR|CLEARTEXT|PLAIN|PLAIN-TRUNC|CRAM-MD5|HMAC-MD5|PLAIN-MD4|PLAIN-MD5|LDAP-MD5|LANMAN|NTLM|RPA"; - $salted = ! preg_match("/^($nonsaltedtypes)(\.B64|\.BASE64|\.HEX)?$/", strtoupper($method) ); - - $dovepasstest = ''; - if ( $salted && (!empty($pw_db)) ) { - # only use -t for salted passwords to be backward compatible with dovecot < 2.1 - $dovepasstest = " -t " . escapeshellarg($pw_db); - } - $pipe = proc_open("$dovecotpw '-s' $method$dovepasstest", $spec, $pipes); - - if (!$pipe) { - die("can't proc_open $dovecotpw"); - } else { - // use dovecot's stdin, it uses getpass() twice (except when using -t) - // Write pass in pipe stdin - if (empty($dovepasstest)) { - fwrite($pipes[0], $pw . "\n", 1+strlen($pw)); usleep(1000); - } - fwrite($pipes[0], $pw . "\n", 1+strlen($pw)); - fclose($pipes[0]); - - // Read hash from pipe stdout - $password = fread($pipes[1], "200"); - - if (empty($dovepasstest)) { - if ( !preg_match('/^\{' . $method . '\}/', $password)) { - $stderr_output = stream_get_contents($pipes[2]); - error_log('dovecotpw password encryption failed.'); - error_log('STDERR output: ' . $stderr_output); - die("can't encrypt password with dovecotpw, see error log for details"); - } - } else { - if ( !preg_match('(verified)', $password)) { - $password="Thepasswordcannotbeverified"; - } else { - $password = rtrim(str_replace('(verified)', '', $password)); - } - } - - fclose($pipes[1]); - fclose($pipes[2]); - proc_close($pipe); - - if ( (!empty($pw_db)) && (substr($pw_db,0,1) != '{') ) { - # for backward compability with "old" dovecot passwords that don't have the {method} prefix - $password = str_replace('{' . $method . '}', '', $password); - } - - $password = rtrim($password); - } - } - - else { - die ('unknown/invalid $CONF["encrypt"] setting: ' . $CONF['encrypt']); - } - - return $password; + die('unknown/invalid $CONF["encrypt"] setting: ' . $CONF['encrypt']); } // @@ -1034,77 +1224,91 @@ function pacrypt ($pw, $pw_db="") { // Call: md5crypt (string cleartextpassword) // -function md5crypt ($pw, $salt="", $magic="") { +function md5crypt($pw, $salt="", $magic="") { $MAGIC = "$1$"; - if ($magic == "") $magic = $MAGIC; - if ($salt == "") $salt = create_salt (); - $slist = explode ("$", $salt); - if ($slist[0] == "1") $salt = $slist[1]; + if ($magic == "") { + $magic = $MAGIC; + } + if ($salt == "") { + $salt = create_salt(); + } + $slist = explode("$", $salt); + if ($slist[0] == "1") { + $salt = $slist[1]; + } - $salt = substr ($salt, 0, 8); + $salt = substr($salt, 0, 8); $ctx = $pw . $magic . $salt; - $final = hex2bin (md5 ($pw . $salt . $pw)); + $final = hex2bin(md5($pw . $salt . $pw)); - for ($i=strlen ($pw); $i>0; $i-=16) { + for ($i=strlen($pw); $i>0; $i-=16) { if ($i > 16) { - $ctx .= substr ($final,0,16); + $ctx .= substr($final, 0, 16); } else { - $ctx .= substr ($final,0,$i); + $ctx .= substr($final, 0, $i); } } - $i = strlen ($pw); + $i = strlen($pw); while ($i > 0) { - if ($i & 1) $ctx .= chr (0); - else $ctx .= $pw[0]; + if ($i & 1) { + $ctx .= chr(0); + } else { + $ctx .= $pw[0]; + } $i = $i >> 1; } - $final = hex2bin (md5 ($ctx)); + $final = hex2bin(md5($ctx)); for ($i=0;$i<1000;$i++) { $ctx1 = ""; if ($i & 1) { $ctx1 .= $pw; } else { - $ctx1 .= substr ($final,0,16); + $ctx1 .= substr($final, 0, 16); + } + if ($i % 3) { + $ctx1 .= $salt; + } + if ($i % 7) { + $ctx1 .= $pw; } - if ($i % 3) $ctx1 .= $salt; - if ($i % 7) $ctx1 .= $pw; if ($i & 1) { - $ctx1 .= substr ($final,0,16); + $ctx1 .= substr($final, 0, 16); } else { $ctx1 .= $pw; } - $final = hex2bin (md5 ($ctx1)); + $final = hex2bin(md5($ctx1)); } $passwd = ""; - $passwd .= to64 (((ord ($final[0]) << 16) | (ord ($final[6]) << 8) | (ord ($final[12]))), 4); - $passwd .= to64 (((ord ($final[1]) << 16) | (ord ($final[7]) << 8) | (ord ($final[13]))), 4); - $passwd .= to64 (((ord ($final[2]) << 16) | (ord ($final[8]) << 8) | (ord ($final[14]))), 4); - $passwd .= to64 (((ord ($final[3]) << 16) | (ord ($final[9]) << 8) | (ord ($final[15]))), 4); - $passwd .= to64 (((ord ($final[4]) << 16) | (ord ($final[10]) << 8) | (ord ($final[5]))), 4); - $passwd .= to64 (ord ($final[11]), 2); + $passwd .= to64(((ord($final[0]) << 16) | (ord($final[6]) << 8) | (ord($final[12]))), 4); + $passwd .= to64(((ord($final[1]) << 16) | (ord($final[7]) << 8) | (ord($final[13]))), 4); + $passwd .= to64(((ord($final[2]) << 16) | (ord($final[8]) << 8) | (ord($final[14]))), 4); + $passwd .= to64(((ord($final[3]) << 16) | (ord($final[9]) << 8) | (ord($final[15]))), 4); + $passwd .= to64(((ord($final[4]) << 16) | (ord($final[10]) << 8) | (ord($final[5]))), 4); + $passwd .= to64(ord($final[11]), 2); return "$magic$salt\$$passwd"; } -function create_salt () { - srand ((double) microtime ()*1000000); - $salt = substr (md5 (rand (0,9999999)), 0, 8); +function create_salt() { + srand((double) microtime()*1000000); + $salt = substr(md5(rand(0, 9999999)), 0, 8); return $salt; } /**/ if (!function_exists('hex2bin')) { # PHP around 5.3.8 includes hex2bin as native function - http://php.net/hex2bin -function hex2bin ($str) { - $len = strlen ($str); - $nstr = ""; - for ($i=0;$i<$len;$i+=2) { - $num = sscanf (substr ($str,$i,2), "%x"); - $nstr.=chr ($num[0]); + function hex2bin($str) { + $len = strlen($str); + $nstr = ""; + for ($i=0;$i<$len;$i+=2) { + $num = sscanf(substr($str, $i, 2), "%x"); + $nstr.=chr($num[0]); + } + return $nstr; } - return $nstr; + /**/ } -/**/ } /* * remove item $item from array $array @@ -1117,12 +1321,12 @@ function remove_from_array($array, $item) { $found = 0; } else { $found = 1; - unset ($array[$ret]); + unset($array[$ret]); } return array($found, $array); } -function to64 ($v, $n) { +function to64($v, $n) { $ITOA64 = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; $ret = ""; while (($n - 1) >= 0) { @@ -1147,13 +1351,13 @@ function to64 ($v, $n) { * @return bool - true on success, otherwise false * TODO: Replace this with something decent like PEAR::Mail or Zend_Mail. */ -function smtp_mail ($to, $from, $data, $body = "") { +function smtp_mail($to, $from, $data, $body = "") { global $CONF; $smtpd_server = $CONF['smtp_server']; $smtpd_port = $CONF['smtp_port']; //$smtp_server = $_SERVER["SERVER_NAME"]; $smtp_server = php_uname('n'); - if(!empty($CONF['smtp_client'])) { + if (!empty($CONF['smtp_client'])) { $smtp_server = $CONF['smtp_client']; } $errno = "0"; @@ -1161,10 +1365,10 @@ function smtp_mail ($to, $from, $data, $body = "") { $timeout = "30"; if ($body != "") { - $maildata = + $maildata = "To: " . $to . "\n" . "From: " . $from . "\n" - . "Subject: " . encode_header ($data) . "\n" + . "Subject: " . encode_header($data) . "\n" . "MIME-Version: 1.0\n" . "Content-Type: text/plain; charset=utf-8\n" . "Content-Transfer-Encoding: 8bit\n" @@ -1175,26 +1379,26 @@ function smtp_mail ($to, $from, $data, $body = "") { $maildata = $data; } - $fh = @fsockopen ($smtpd_server, $smtpd_port, $errno, $errstr, $timeout); + $fh = @fsockopen($smtpd_server, $smtpd_port, $errno, $errstr, $timeout); if (!$fh) { error_log("fsockopen failed - errno: $errno - errstr: $errstr"); return false; } else { - $res = smtp_get_response($fh); - fputs ($fh, "EHLO $smtp_server\r\n"); - $res = smtp_get_response($fh); - fputs ($fh, "MAIL FROM:<$from>\r\n"); - $res = smtp_get_response($fh); - fputs ($fh, "RCPT TO:<$to>\r\n"); - $res = smtp_get_response($fh); - fputs ($fh, "DATA\r\n"); - $res = smtp_get_response($fh); - fputs ($fh, "$maildata\r\n.\r\n"); - $res = smtp_get_response($fh); - fputs ($fh, "QUIT\r\n"); - $res = smtp_get_response($fh); - fclose ($fh); + smtp_get_response($fh); + fputs($fh, "EHLO $smtp_server\r\n"); + smtp_get_response($fh); + fputs($fh, "MAIL FROM:<$from>\r\n"); + smtp_get_response($fh); + fputs($fh, "RCPT TO:<$to>\r\n"); + smtp_get_response($fh); + fputs($fh, "DATA\r\n"); + smtp_get_response($fh); + fputs($fh, "$maildata\r\n.\r\n"); + smtp_get_response($fh); + fputs($fh, "QUIT\r\n"); + smtp_get_response($fh); + fclose($fh); } return true; } @@ -1207,10 +1411,11 @@ function smtp_mail ($to, $from, $data, $body = "") { */ function smtp_get_admin_email() { $admin_email = Config::read('admin_email'); - if(!empty($admin_email)) - return $admin_email; - else - return authentication_get_username(); + if (!empty($admin_email)) { + return $admin_email; + } else { + return authentication_get_username(); + } } @@ -1219,13 +1424,12 @@ function smtp_get_admin_email() { // Action: Get response from mail server // Call: smtp_get_response (string FileHandle) // -function smtp_get_response ($fh) { +function smtp_get_response($fh) { $res =''; do { $line = fgets($fh, 256); $res .= $line; - } - while (preg_match("/^\d\d\d\-/", $line)); + } while (preg_match("/^\d\d\d\-/", $line)); return $res; } @@ -1252,11 +1456,16 @@ $DEBUG_TEXT = "\n * - call die() in case of connection problems * b) with $ignore_errors == TRUE * array($link, $error_text); + * + * @param bool $ignore_errors + * @return resource connection to db (normally) */ -function db_connect ($ignore_errors = 0) { +function db_connect($ignore_errors = false) { global $CONF; global $DEBUG_TEXT; - if ($ignore_errors != 0) $DEBUG_TEXT = ''; + if ($ignore_errors != 0) { + $DEBUG_TEXT = ''; + } $error_text = ''; static $link; @@ -1265,32 +1474,45 @@ function db_connect ($ignore_errors = 0) { return array($link, $error_text); } return $link; - } $link = 0; + } + $link = 0; if ($CONF['database_type'] == "mysql") { - if (function_exists ("mysql_connect")) { - $link = @mysql_connect ($CONF['database_host'], $CONF['database_user'], $CONF['database_password']) or $error_text .= ("
DEBUG INFORMATION:Warning: empty alias_domain parameter.
'; - return false; - } - - $cmdarg1=escapeshellarg($alias_domain); - $command=$CONF[$confpar]." $cmdarg1"; - $retval=0; - $output=array(); - $firstline=''; - $firstline=exec($command,$output,$retval); - if (0!=$retval) { - error_log("Running $command yielded return value=$retval, first line of output=$firstline"); - print 'WARNING: Problems running alias_domain postdeletion script!
'; - return FALSE; - } - - return TRUE; -} - // // gen_show_status -// Action: Return a string of colored 's that indicate +// Action: Return a string of colored 's that indicate // the if an alias goto has an error or is sent to -// addresses list in show_custom_domains +// addresses list in show_custom_domains // Call: gen_show_status (string alias_address) // -function gen_show_status ($show_alias) { +function gen_show_status($show_alias) { global $CONF; $table_alias = table_by_key('alias'); $stat_string = ""; @@ -1880,9 +2151,9 @@ function gen_show_status ($show_alias) { $show_alias = escape_string($show_alias); $stat_goto = ""; - $stat_result = db_query ("SELECT goto FROM $table_alias WHERE address='$show_alias'"); + $stat_result = db_query("SELECT goto FROM $table_alias WHERE address='$show_alias'"); if ($stat_result['rows'] > 0) { - $row = db_row ($stat_result['result']); + $row = db_row($stat_result['result']); $stat_goto = $row[0]; } @@ -1892,68 +2163,42 @@ function gen_show_status ($show_alias) { } // UNDELIVERABLE CHECK - if ( $CONF['show_undeliverable'] == 'YES' ) { + if ($CONF['show_undeliverable'] == 'YES') { $gotos=array(); - $gotos=explode(',',$stat_goto); + $gotos=explode(',', $stat_goto); $undel_string=""; //make sure this alias goes somewhere known $stat_ok = 1; - while ( ($g=array_pop($gotos)) && $stat_ok ) { - list(/*NULL*/,$stat_domain) = explode('@',$g); + foreach ($gotos as $g) { + if (!$stat_ok) { + break; + } + if (strpos($g, '@') === false) { + continue; + } + + list($local_part, $stat_domain) = explode('@', $g); + $stat_delimiter = ""; - if (!empty($CONF['recipient_delimiter'])) { - $stat_delimiter = "OR address = '" . escape_string(preg_replace($delimiter_regex, "@", $g)) . "'"; - } - $stat_result = db_query ("SELECT address FROM $table_alias WHERE address = '" . escape_string($g) . "' OR address = '@" . escape_string($stat_domain) . "' $stat_delimiter"); + if (!empty($CONF['recipient_delimiter'])) { + $stat_delimiter = "OR address = '" . escape_string(preg_replace($delimiter_regex, "@", $g)) . "'"; + } + $stat_result = db_query("SELECT address FROM $table_alias WHERE address = '" . escape_string($g) . "' OR address = '@" . escape_string($stat_domain) . "' $stat_delimiter"); if ($stat_result['rows'] == 0) { $stat_ok = 0; } - if ( $stat_ok == 0 ) { - if ( $stat_domain == $CONF['vacation_domain'] || in_array($stat_domain, $CONF['show_undeliverable_exceptions']) ) { + if ($stat_ok == 0) { + if ($stat_domain == $CONF['vacation_domain'] || in_array($stat_domain, $CONF['show_undeliverable_exceptions'])) { $stat_ok = 1; } } } // while - if ( $stat_ok == 0 ) { - $stat_string .= "" . $CONF['show_status_text'] . " "; + if ($stat_ok == 0) { + $stat_string .= "" . $CONF['show_status_text'] . " "; } else { $stat_string .= $CONF['show_status_text'] . " "; - } - } - - // Vacation CHECK - if ( $CONF['show_vacation'] == 'YES' ) { - $stat_result = db_query ("SELECT * FROM ". $CONF['database_tables']['vacation'] ." WHERE email = '" . $show_alias . "' AND active = 1"); - if ($stat_result['rows'] == 1) { - $stat_string .= "" . $CONF['show_status_text'] . " "; - } else { - $stat_string .= $CONF['show_status_text'] . " "; - } - } - -// Disabled CHECK - if ( $CONF['show_disabled'] == 'YES' ) { - $stat_result = db_query ("SELECT * FROM ". $CONF['database_tables']['mailbox'] ." WHERE username = '" . $show_alias . "' AND active = 0"); - if ($stat_result['rows'] == 1) { - $stat_string .= "" . $CONF['show_status_text'] . " "; - } else { - $stat_string .= $CONF['show_status_text'] . " "; - } - } - - // Expired CHECK - if ( $CONF['show_expired'] == 'YES' ) { - $stat_result = db_query ("SELECT * FROM ". $CONF['database_tables']['mailbox'] ." WHERE username = '" . $show_alias . "' AND pw_expires_on <= now()"); - if ($stat_result['rows'] == 1) { - $stat_string .= "" . $CONF['show_status_text'] . " "; - } else { - $stat_string .= $CONF['show_status_text'] . " "; - } + } } // Vacation CHECK @@ -1990,45 +2235,50 @@ function gen_show_status ($show_alias) { } // POP/IMAP CHECK - if ( $CONF['show_popimap'] == 'YES' ) { - $stat_delimiter = ""; - if (!empty($CONF['recipient_delimiter'])) { - $stat_delimiter = ',' . preg_replace($delimiter_regex, "@", $stat_goto); - } + if ($CONF['show_popimap'] == 'YES') { + $stat_delimiter = ""; + if (!empty($CONF['recipient_delimiter'])) { + $stat_delimiter = ',' . preg_replace($delimiter_regex, "@", $stat_goto); + } //if the address passed in appears in its own goto field, its POP/IMAP # TODO: or not (might also be an alias loop) -> check mailbox table! - if ( preg_match ('/,' . $show_alias . ',/', ',' . $stat_goto . $stat_delimiter . ',') ) { + if (preg_match('/,' . $show_alias . ',/', ',' . $stat_goto . $stat_delimiter . ',')) { $stat_string .= "" . $CONF['show_status_text'] . " "; } else { $stat_string .= $CONF['show_status_text'] . " "; - } + } } // CUSTOM DESTINATION CHECK - if ( count($CONF['show_custom_domains']) > 0 ) { - for ($i = 0; $i < sizeof ($CONF['show_custom_domains']); $i++) { - if (preg_match ('/^.*' . $CONF['show_custom_domains'][$i] . '.*$/', $stat_goto)) { + if (count($CONF['show_custom_domains']) > 0) { + for ($i = 0; $i < sizeof($CONF['show_custom_domains']); $i++) { + if (preg_match('/^.*' . $CONF['show_custom_domains'][$i] . '.*$/', $stat_goto)) { $stat_string .= "" . $CONF['show_status_text'] . " "; } else { $stat_string .= $CONF['show_status_text'] . " "; - } - } + } + } } else { $stat_string .= "; "; - } + } // $stat_string .= " " . // " "; return $stat_string; } +/** + * @return string + */ function getRemoteAddr() { $REMOTE_ADDR = 'localhost'; - if (isset($_SERVER['REMOTE_ADDR'])) + if (isset($_SERVER['REMOTE_ADDR'])) { $REMOTE_ADDR = $_SERVER['REMOTE_ADDR']; + } + return $REMOTE_ADDR; } diff --git a/languages/en.lang b/languages/en.lang index 6b6bdbc2..99e22ef4 100644 --- a/languages/en.lang +++ b/languages/en.lang @@ -1,5 +1,5 @@ @@ -44,7 +44,7 @@ $PALANG['pLogin_username'] = 'Login (email)'; $PALANG['password'] = 'Password'; $PALANG['pLogin_language'] = 'Language'; $PALANG['pLogin_button'] = 'Login'; -$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; +$PALANG['pLogin_failed'] = 'Your email address or password is not correct.'; $PALANG['pLogin_login_users'] = 'Users click here to login to the user section.'; $PALANG['pMenu_main'] = 'Main'; @@ -146,11 +146,15 @@ $PALANG['pCreate_mailbox_username_text_error1'] = 'The EMAIL is not valid!'; $PALANG['pCreate_mailbox_username_text_error3'] = 'You have reached your limit to create mailboxes!'; $PALANG['pCreate_mailbox_password_text'] = 'Password for POP3/IMAP'; $PALANG['pCreate_mailbox_name_text'] = 'Full name'; +$PALANG['pCreate_mailbox_phone'] = 'Mobile phone'; +$PALANG['pCreate_mailbox_phone_desc'] = "Used to send a SMS if the password is forgotten"; +$PALANG['pCreate_mailbox_email'] = 'Other e-mail'; +$PALANG['pCreate_mailbox_email_desc'] = "Used if the password is forgotten"; $PALANG['pCreate_mailbox_mail'] = 'Send Welcome mail'; $PALANG['pCreate_mailbox_result_error'] = 'Creating the mailbox %s failed!'; $PALANG['pCreate_mailbox_result_success'] = 'The mailbox %s has been added to the mailbox table.'; $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox %s has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created.'; -$PALANG['mailbox_updated'] = "The mailbox %s has been updated."; +$PALANG['mailbox_updated'] = "The mailbox %s has been updated."; $PALANG['mailbox_update_failed'] = "Updating the mailbox %s failed!"; $PALANG['pEdit_mailbox_welcome'] = 'Edit a mailbox for your domain.'; @@ -174,6 +178,14 @@ $PALANG['change_password'] = 'Change Password'; $PALANG['pPassword_result_error'] = 'Changing the password for %s failed!'; $PALANG['pPassword_result_success'] = 'The password for %s has been changed.'; +$PALANG['pPassword_recovery_title'] = 'Follow the instructions to reset your password.'; +$PALANG['pPassword_recovery_button'] = 'Send me the code'; +$PALANG['pPassword_recovery_email_body'] = "Hello,\n\nUse the following link to change your email password :\n%s\n\nRegards,\n\n" . $CONF['admin_name']; +$PALANG['pPassword_recovery_sms_body'] = "Hello,\nThe code to change your password is: %s\n" . $CONF['admin_name']; +$PALANG['pPassword_recovery_processed'] = "We processed your request. If you entered a valid username, you'll receive an email/SMS with a password code."; +$PALANG['pPassword_password_code'] = 'Code sent by email/SMS'; +$PALANG['pPassword_code_text_error'] = 'Invalid code'; + $PALANG['pEdit_vacation_set'] = 'Change / Set away message'; $PALANG['pEdit_vacation_remove'] = 'Remove away message'; @@ -190,7 +202,7 @@ $PALANG['reply_every_mail'] = 'Reply on every mail'; $PALANG['reply_once_per_day'] = 'Reply once a day'; $PALANG['reply_once_per_week'] = 'Reply once a week'; -$PALANG['pViewlog_welcome'] = 'View the last 10 actions for '; +$PALANG['pViewlog_welcome'] = 'View the last %s actions for '; $PALANG['pViewlog_timestamp'] = 'Timestamp'; $PALANG['pViewlog_action'] = 'Action'; $PALANG['pViewlog_data'] = 'Data'; @@ -298,6 +310,7 @@ $PALANG['pAdminEdit_admin_result_success'] = 'The admin %s has been modified.'; $PALANG['pUsersLogin_welcome'] = 'Mailbox users login to change your password and aliases.'; $PALANG['pUsersLogin_username_incorrect'] = 'Your login is not correct. Make sure that you login with your email address!'; $PALANG['pUsersLogin_password_incorrect'] = 'Your password is not correct!'; +$PALANG['pUsersLogin_password_recover'] = 'I forgot my password'; $PALANG['pUsersMenu_vacation'] = 'Auto Response'; $PALANG['pUsersMenu_edit_alias'] = 'Change your forward'; @@ -331,15 +344,14 @@ $PALANG['pBroadcast_name'] = 'Your name'; $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; +$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; +$PALANG['broadcast_to_domains'] = 'Send to domains:'; $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; $PALANG['pStatus_disabled'] = 'Account disabled '; $PALANG['pStatus_expired'] = 'Password expired '; $PALANG['pStatus_vacation'] = 'Vacation enabled '; -<<<<<<< HEAD -======= ->>>>>>> 72dddbc93be15cb6f975343524a15103763acf89 $PALANG['pStatus_custom'] = 'Delivers to '; $PALANG['pStatus_popimap'] = 'POP/IMAP '; @@ -399,8 +411,7 @@ $PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; $PALANG['dateformat_pgsql'] = 'YYYY-mm-dd'; # translators: rearrange to your local date format, but make sure it's a valid PostgreSQL date format $PALANG['dateformat_mysql'] = '%Y-%m-%d'; # translators: rearrange to your local date format, but make sure it's a valid MySQL date format -$PALANG['password_expiration'] = 'Password expiration'; -$PALANG['password_expiration_desc'] = 'Maximum lifetime for a password'; +$PALANG['password_expiration'] = 'Pass expires'; $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ diff --git a/languages/fr.lang b/languages/fr.lang index 20fdcd01..942d051f 100644 --- a/languages/fr.lang +++ b/languages/fr.lang @@ -1,10 +1,12 @@ {$CONF.show_status_text}={$PALANG.pStatus_undeliverable} {/if} {if $CONF.show_vacation===YES} -<<<<<<< HEAD {$CONF.show_status_text}={$PALANG.pStatus_vacation} {/if} {if $CONF.show_disabled===YES} @@ -82,16 +81,6 @@ {$CONF.show_status_text}={$PALANG.pStatus_expired} {/if} -======= - {$CONF.show_status_text}={$PALANG.pStatus_vacation} - {/if} - {if $CONF.show_disabled===YES} - {$CONF.show_status_text}={$PALANG.pStatus_disabled} - {/if} - {if $CONF.show_expired===YES} - {$CONF.show_status_text}={$PALANG.pStatus_expired} - {/if} ->>>>>>> 72dddbc93be15cb6f975343524a15103763acf89 {if $CONF.show_popimap===YES} {$CONF.show_status_text}={$PALANG.pStatus_popimap} {/if}