diff --git a/core/user_settings/user_dashboard.php b/core/user_settings/user_dashboard.php index 3d339b4f4b..6b49af586c 100644 --- a/core/user_settings/user_dashboard.php +++ b/core/user_settings/user_dashboard.php @@ -956,7 +956,7 @@ $hud[$n]['html'] .= "\n"; //pbx version - $hud[$n]['html'] .= "\n"; + $hud[$n]['html'] .= "\n"; $hud[$n]['html'] .= "FusionPBX\n"; $hud[$n]['html'] .= "".software_version()."\n"; $hud[$n]['html'] .= "\n"; @@ -970,7 +970,7 @@ $switch_version = $matches[1]; $switch_bits = $matches[2]; if ($switch_version != '' && $switch_bits != '') { - $hud[$n]['html'] .= "\n"; + $hud[$n]['html'] .= "\n"; $hud[$n]['html'] .= "".$text['label-switch']."\n"; $hud[$n]['html'] .= "".$switch_version." (".$switch_bits.")\n"; $hud[$n]['html'] .= "\n"; @@ -988,7 +988,7 @@ $uptime .= (($tmp[7]) ? $tmp[3].'m ' : null); $uptime .= (($tmp[9]) ? $tmp[3].'s' : null); if ($uptime != '') { - $hud[$n]['html'] .= "\n"; + $hud[$n]['html'] .= "\n"; $hud[$n]['html'] .= "".$text['label-switch_uptime']."\n"; $hud[$n]['html'] .= "".$uptime."\n"; $hud[$n]['html'] .= "\n"; @@ -1011,7 +1011,7 @@ $uptime .= (($tmp['m'] != 0 && $tmp['m'] != '') ? $tmp['m'].'m ' : null); $uptime .= (($tmp['s'] != 0 && $tmp['s'] != '') ? $tmp['s'].'s' : null); if ($uptime != '') { - $hud[$n]['html'] .= "\n"; + $hud[$n]['html'] .= "\n"; $hud[$n]['html'] .= "".$text['label-system_uptime']."\n"; $hud[$n]['html'] .= "".$uptime."\n"; $hud[$n]['html'] .= "\n"; @@ -1023,7 +1023,7 @@ if (stristr(PHP_OS, 'Linux')) { $percent_memory = round(shell_exec("free | awk 'FNR == 3 {print $3/($3+$4)*100}'"), 1); if ($percent_memory != '') { - $hud[$n]['html'] .= "\n"; + $hud[$n]['html'] .= "\n"; $hud[$n]['html'] .= "".$text['label-memory_usage']."\n"; $hud[$n]['html'] .= "".$percent_memory."%\n"; $hud[$n]['html'] .= "\n"; @@ -1035,7 +1035,7 @@ if (stristr(PHP_OS, 'Linux')) { //calculated above if ($percent_disk_usage != '') { - $hud[$n]['html'] .= "\n"; + $hud[$n]['html'] .= "\n"; $hud[$n]['html'] .= "".$text['label-disk_usage']."\n"; $hud[$n]['html'] .= "".$percent_disk_usage."%\n"; $hud[$n]['html'] .= "\n"; @@ -1051,7 +1051,7 @@ $tmp = explode(' ', trim($tmp)); $percent_cpu = $tmp[0]; if ($percent_cpu != '') { - $hud[$n]['html'] .= "\n"; + $hud[$n]['html'] .= "\n"; $hud[$n]['html'] .= "".$text['label-processor_usage']."\n"; $hud[$n]['html'] .= "".$percent_cpu."%\n"; $hud[$n]['html'] .= "\n"; @@ -1083,7 +1083,7 @@ unset ($sql, $prep_statement, $result); } if ($connections != '') { - $hud[$n]['html'] .= "\n"; + $hud[$n]['html'] .= "\n"; $hud[$n]['html'] .= "".$text['label-database_connections']."\n"; $hud[$n]['html'] .= "".$connections."\n"; $hud[$n]['html'] .= "\n"; @@ -1098,7 +1098,7 @@ $tmp = explode(' ', $tmp); $tmp = $tmp[0]; $channels = (is_numeric($tmp)) ? $tmp : 0; - $hud[$n]['html'] .= "\n"; + $hud[$n]['html'] .= "\n"; $hud[$n]['html'] .= "".$text['label-channels']."\n"; $hud[$n]['html'] .= "".$channels."\n"; $hud[$n]['html'] .= "\n"; diff --git a/resources/functions.php b/resources/functions.php index 703d61a71e..f04f3dfd7a 100644 --- a/resources/functions.php +++ b/resources/functions.php @@ -1672,6 +1672,58 @@ function number_pad($number,$n) { } } +//format border radius values + if (!function_exists('format_border_radius')) { + function format_border_radius($radius_value, $default = 5) { + $radius_value = ($radius_value != '') ? $radius_value : $default; + $br_a = explode(' ', $radius_value); + foreach ($br_a as $index => $br) { + if (substr_count($br, '%') > 0) { + $br_b[$index]['number'] = str_replace('%', '', $br); + $br_b[$index]['unit'] = '%'; + } + else { + $br_b[$index]['number'] = str_replace('px', '', strtolower($br)); + $br_b[$index]['unit'] = 'px'; + } + } + unset($br_a, $br); + if (sizeof($br_b) == 4) { + $br['tl']['n'] = $br_b[0]['number']; + $br['tr']['n'] = $br_b[1]['number']; + $br['br']['n'] = $br_b[2]['number']; + $br['bl']['n'] = $br_b[3]['number']; + $br['tl']['u'] = $br_b[0]['unit']; + $br['tr']['u'] = $br_b[1]['unit']; + $br['br']['u'] = $br_b[2]['unit']; + $br['bl']['u'] = $br_b[3]['unit']; + } + else if (sizeof($br_b) == 2) { + $br['tl']['n'] = $br_b[0]['number']; + $br['tr']['n'] = $br_b[0]['number']; + $br['br']['n'] = $br_b[1]['number']; + $br['bl']['n'] = $br_b[1]['number']; + $br['tl']['u'] = $br_b[0]['unit']; + $br['tr']['u'] = $br_b[0]['unit']; + $br['br']['u'] = $br_b[1]['unit']; + $br['bl']['u'] = $br_b[1]['unit']; + } + else { + $br['tl']['n'] = $br_b[0]['number']; + $br['tr']['n'] = $br_b[0]['number']; + $br['br']['n'] = $br_b[0]['number']; + $br['bl']['n'] = $br_b[0]['number']; + $br['tl']['u'] = $br_b[0]['unit']; + $br['tr']['u'] = $br_b[0]['unit']; + $br['br']['u'] = $br_b[0]['unit']; + $br['bl']['u'] = $br_b[0]['unit']; + } + unset($br_b); + + return $br; //array + } + } + //converts a string to a regular expression if (!function_exists('string_to_regex')) { function string_to_regex($string) { diff --git a/resources/login.php b/resources/login.php index a3d3fce700..b874463a84 100644 --- a/resources/login.php +++ b/resources/login.php @@ -211,11 +211,13 @@ echo "
\n"; echo "
\n"; echo "\n"; - echo "
\n"; - echo "
\n"; + echo "
\n"; + echo "
\n"; if ($_SESSION['login']['domain_name_visible']['boolean'] == "true") { if (count($_SESSION['login']['domain_name']) > 0) { - echo "\n"; echo " \n"; sort($_SESSION['login']['domain_name']); foreach ($_SESSION['login']['domain_name'] as &$row) { @@ -224,7 +226,7 @@ echo "
\n"; } else { - echo "
\n"; + echo "
\n"; } } echo "\n"; @@ -242,7 +244,7 @@ echo "
\n"; echo " \n"; echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; if ($_SESSION['login']['domain_name_visible']['boolean'] == "true") { @@ -1955,7 +2135,7 @@ echo " \n"; echo " \n"; if (count($_SESSION['login']['domain_name']) > 0) { - echo " \n"; echo " \n"; sort($_SESSION['login']['domain_name']); foreach ($_SESSION['login']['domain_name'] as &$row) { @@ -1964,7 +2144,7 @@ echo " \n"; } else { - echo " \n"; + echo " \n"; } echo " \n"; }