From a03233cebafc62ec7d88a24856b8a7b37fef4381 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak <alec@alec.pl> Date: Wed, 07 Oct 2015 03:14:18 -0400 Subject: [PATCH] CS fixes --- program/lib/Roundcube/bootstrap.php | 31 ++++++++++++++++++------------- 1 files changed, 18 insertions(+), 13 deletions(-) diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php index c173274..94e628b 100644 --- a/program/lib/Roundcube/bootstrap.php +++ b/program/lib/Roundcube/bootstrap.php @@ -138,7 +138,7 @@ /** * Parse a human readable string for a number of bytes. * - * @param string $str Input string + * @param string $str Input string * * @return float Number of bytes */ @@ -188,7 +188,7 @@ /** * Returns number of seconds for a specified offset string. * - * @param string $str String representation of the offset (e.g. 20min, 5h, 2days, 1week) + * @param string $str String representation of the offset (e.g. 20min, 5h, 2days, 1week) * * @return int Number of seconds */ @@ -220,12 +220,12 @@ /** * Create a unix timestamp with a specified offset from now. * - * @param string $offset_str String representation of the offset (e.g. 20min, 5h, 2days) - * @param int $factor Factor to multiply with the offset + * @param string $offset_str String representation of the offset (e.g. 20min, 5h, 2days) + * @param int $factor Factor to multiply with the offset * * @return int Unix timestamp */ -function get_offset_time($offset_str, $factor=1) +function get_offset_time($offset_str, $factor = 1) { return time() + get_offset_sec($offset_str) * $factor; } @@ -241,7 +241,7 @@ * * @return string Abbreviated string */ -function abbreviate_string($str, $maxlength, $placeholder='...', $ending=false) +function abbreviate_string($str, $maxlength, $placeholder = '...', $ending = false) { $length = mb_strlen($str); @@ -254,7 +254,9 @@ $first_part_length = floor(($maxlength - $placeholder_length)/2); $second_starting_location = $length - $maxlength + $first_part_length + $placeholder_length; - $str = mb_substr($str, 0, $first_part_length) . $placeholder . mb_substr($str, $second_starting_location); + $prefix = mb_substr($str, 0, $first_part_length); + $suffix = mb_substr($str, $second_starting_location); + $str = $prefix . $placeholder . $suffix; } return $str; @@ -263,7 +265,7 @@ /** * Get all keys from array (recursive). * - * @param array $array Input array + * @param array $array Input array * * @return array List of array keys */ @@ -309,8 +311,8 @@ /** * Compose a valid representation of name and e-mail address * - * @param string $email E-mail address - * @param string $name Person name + * @param string $email E-mail address + * @param string $name Person name * * @return string Formatted string */ @@ -364,7 +366,8 @@ return str_replace( array('-stable', '-git'), array('.0', '.99'), - $version); + $version + ); } /** @@ -378,7 +381,7 @@ static $idn, $loaded; if (!$loaded) { - $idn = new Net_IDNA2(); + $idn = new Net_IDNA2(); $loaded = true; } @@ -389,6 +392,7 @@ catch (Exception $e) { } } + return $domain; } } @@ -400,7 +404,7 @@ static $idn, $loaded; if (!$loaded) { - $idn = new Net_IDNA2(); + $idn = new Net_IDNA2(); $loaded = true; } @@ -411,6 +415,7 @@ catch (Exception $e) { } } + return $domain; } } -- Gitblit v1.9.1