Merge branch 'master' of https://github.com/fusionpbx/fusionpbx

core/default_settings/default_settings.php

@@ -406,7 +406,7 @@ else {
 			echo "		 \n";
 			echo "	</td>\n";
 			echo "	<td valign='top' class='".$row_style[$c]." tr_link_void' style='text-align: center;'>\n";
-			echo "		<a href=\"javascript:document.location.href='?id[]=".$row['default_setting_uuid']."&enabled=".(($row['default_setting_enabled'] == 'true') ? 'false' : 'true')."&category=".$category."&search='+$('#default_setting_search').val();\">".ucwords($row['default_setting_enabled'])."</a>\n";
+			echo "		<a href=\"javascript:document.location.href='?id[]=".$row['default_setting_uuid']."&enabled=".(($row['default_setting_enabled'] == 'true') ? 'false' : 'true')."&category=".$category."&search='+$('#default_setting_search').val();\">".$text['label-'.$row['default_setting_enabled']]."</a>\n";
 			echo "	</td>\n";
 			echo "	<td valign='top' class='row_stylebg' style='width: 40%; max-width: 50px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;'>".$row['default_setting_description']."&nbsp;</td>\n";
 			echo "	<td class='list_control_icons' nowrap='nowrap'>";

core/domain_settings/domain_settings.php

@@ -236,7 +236,7 @@ if (sizeof($_REQUEST) > 1) {
 			echo "		 \n";
 			echo "	</td>\n";
 			echo "	<td valign='top' class='".$row_style[$c]." tr_link_void' style='text-align: center;'>\n";
-			echo "		<a href='?domain_id=".$row['domain_uuid']."&id[]=".$row['domain_setting_uuid']."&enabled=".(($row['domain_setting_enabled'] == 'true') ? 'false' : 'true')."'>".ucwords($row['domain_setting_enabled'])."</a>\n";
+			echo "		<a href='?domain_id=".$row['domain_uuid']."&id[]=".$row['domain_setting_uuid']."&enabled=".(($row['domain_setting_enabled'] == 'true') ? 'false' : 'true')."'>".$text['label-'.$row['domain_setting_enabled']]."</a>\n";
 			echo "	</td>\n";
 			echo "	<td valign='top' class='row_stylebg'>".$row['domain_setting_description']."&nbsp;</td>\n";
 			echo "	<td class='list_control_icons'>";

core/install/install.php

@@ -53,8 +53,8 @@ require_once "resources/classes/text.php";
 //TBD $locale = Locale::getDefault();
 $timezone = 'UTC';
 if (is_link('/etc/localtime')) {
-    // Mac OS X (and older Linuxes)    
-    // /etc/localtime is a symlink to the 
+    // Mac OS X (and older Linuxes)
+    // /etc/localtime is a symlink to the
     // timezone in /usr/share/zoneinfo.
     $filename = readlink('/etc/localtime');
     if (strpos($filename, '/usr/share/zoneinfo/') === 0) {
@@ -73,7 +73,7 @@ if (is_link('/etc/localtime')) {
         $timezone = $data['ZONE'];
     }
 }
- 
+
 date_default_timezone_set($timezone);
 
 //detect install state

core/install/resources/classes/detect_switch.php

@@ -22,7 +22,7 @@
 
 	Contributor(s):
 	Matthew Vale <[email protected]>
-	
+
 */
 require_once "root.php";
 require_once "resources/classes/EventSocket.php";
@@ -151,14 +151,14 @@ require_once "resources/classes/EventSocket.php";
 			}
 			return false;
 		}
-	
+
 		protected function event_socket_request($cmd) {
 			$esl = new EventSocket($this->event_socket);
 			$result = $esl->request($cmd);
 			$esl->reset_fp();
 			return $result;
 		}
-		
+
 		public function restart_switch() {
 			$this->connect_event_socket();
 			if(!$this->event_socket){

core/install/resources/classes/global_settings.php

@@ -22,7 +22,7 @@
 
 	Contributor(s):
 	Matthew Vale <[email protected]>
-	
+
 */
 require_once "root.php";
 

core/install/resources/classes/install_fusionpbx.php

@@ -427,7 +427,7 @@ include "root.php";
 
 				//create the table, user and set the permissions only if the db_create_username was provided
 					if ($this->global_settings->db_create()) {
-						$this->write_progress("\tCreating database");				
+						$this->write_progress("\tCreating database");
 						try {
 							$this->dbh = new PDO($connect_string, $this->global_settings->db_create_username(), db_create_password, array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
 							$this->dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);

core/install/resources/classes/install_switch.php

@@ -61,7 +61,7 @@ include "root.php";
 				echo "$message\n";
 			}
 		}
-		
+
 		function write_progress($message) {
 			if($this->echo_progress){
 				echo "$message\n";

core/install/resources/page_parts/install_config_detail.php

@@ -68,7 +68,7 @@
 	echo "<td class='vtable' align='left'>\n";
 	echo "		<select id='install_default_country' name='install_default_country' class='formfld' style=''>\n";
 	require "resources/countries.php";
- 
+
 	foreach ($countries as $iso_code => $country ){
 		if($iso_code == $install_default_country){
 			echo "			<option value='$iso_code' selected='selected'>".$country['country']."</option>\n";

core/install/resources/page_parts/install_event_socket.php

@@ -89,7 +89,7 @@
 	echo "</form>";
 	if($detect_ok){
 		echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-	
+
 		echo "<tr>\n";
 		echo "<td colspan='4' align='left' nowrap><b>".$text['title-detected_configuration']."</b></td>\n";
 		echo "</tr>\n";
@@ -102,7 +102,7 @@
 		echo "<td class='vtable' width='35%' align='left'>\n";
 		echo "    ".$switch_detect->version()."\n";
 		echo "</td>\n";
-		
+
 		foreach ($switch_detect->get_dirs() as $folder)
 		{
 			if($id % 2 == 0){ echo "<tr>\n"; }
@@ -132,7 +132,7 @@
 			if($id % 2 == 1){ echo "</tr>\n"; }
 			$id++;
 		}
-			
+
 		echo "</table>";
 	}
 

core/menu/app_config.php

@@ -163,7 +163,7 @@
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "menu_item_description";
 		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "menu_item_desc";
-		
+
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;

core/users/app_config.php

@@ -127,7 +127,7 @@
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "user_setting_category_edit";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		
+
 	//schema details
 		$y = 0; //table array index
 		$z = 0; //field array index

core/users/user_settings.php

@@ -206,7 +206,7 @@ else {
 			echo "		 \n";
 			echo "	</td>\n";
 			echo "	<td valign='top' class='".$row_style[$c]." tr_link_void' style='text-align: center;'>\n";
-			echo "		<a href='?user_id=".$row['user_uuid']."&id[]=".$row['user_setting_uuid']."&enabled=".(($row['user_setting_enabled'] == 'true') ? 'false' : 'true')."'>".ucwords($row['user_setting_enabled'])."</a>\n";
+			echo "		<a href='?user_id=".$row['user_uuid']."&id[]=".$row['user_setting_uuid']."&enabled=".(($row['user_setting_enabled'] == 'true') ? 'false' : 'true')."'>".$text['label-'.$row['user_setting_enabled']]."</a>\n";
 			echo "	</td>\n";
 			echo "	<td valign='top' class='row_stylebg'>".$row['user_setting_description']."&nbsp;</td>\n";
 			echo "	<td class='list_control_icons'>";

resources/classes/cache.php

@@ -2,7 +2,7 @@
 
 /**
  * cache class provides an abstracted cache
- * 
+ *
  * @method string set
  * @method string get
  * @method string delete

resources/classes/event/handler/syslog.php

@@ -21,7 +21,7 @@ class Syslog extends Event_Handler{
 		if ($_SESSION['event']['syslog']['enable'] <> 0){
 			closelog();
 		}
-	} 
+	}
 
 	public function log_event($event_type, $params){
 		if ($_SESSION['event']['syslog']['enable'] <> 0){

resources/classes/orm.php

@@ -661,7 +661,7 @@
 
 			//define singular function to convert a word in english to singular
 				private function singular($word) {
-					//"-es" is used for words that end in "-x", "-s", "-z", "-sh", "-ch" in which case you add 
+					//"-es" is used for words that end in "-x", "-s", "-z", "-sh", "-ch" in which case you add
 					if (substr($word, -2) == "es") {
 						if (substr($word, -3, 1) == "x") {
 							return substr($word,0,-2);

resources/classes/permissions.php

@@ -23,7 +23,7 @@
 
 /**
  * permission class
- * 
+ *
  * @method string add
  * @method string delete
  * @method string exists

resources/classes/template.php

@@ -80,7 +80,7 @@ include "root.php";
 					$this->object->assign($key, $value);
 				}
 				if ($this->engine === 'twig') {
-					$this->var_array[$key] = $value; 
+					$this->var_array[$key] = $value;
 				}
 			}
 

resources/jquery/flot/jquery.flot.time.js

@@ -158,7 +158,7 @@ API.txt for details.
 			return makeUtcWrapper(new Date(ts));
 		}
 	}
-	
+
 	// map of app. size of time units in milliseconds
 
 	var timeUnitSize = {
@@ -176,9 +176,9 @@ API.txt for details.
 
 	var baseSpec = [
 		[1, "second"], [2, "second"], [5, "second"], [10, "second"],
-		[30, "second"], 
+		[30, "second"],
 		[1, "minute"], [2, "minute"], [5, "minute"], [10, "minute"],
-		[30, "minute"], 
+		[30, "minute"],
 		[1, "hour"], [2, "hour"], [4, "hour"],
 		[8, "hour"], [12, "hour"],
 		[1, "day"], [2, "day"], [3, "day"],

resources/jquery/jquery-ui.css

@@ -53,8 +53,8 @@
 .ui-button, .ui-button:link, .ui-button:visited, .ui-button:hover, .ui-button:active { text-decoration: none; }
 .ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
 button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
-.ui-button-icons-only { width: 3.4em; } 
-button.ui-button-icons-only { width: 3.7em; } 
+.ui-button-icons-only { width: 3.4em; }
+button.ui-button-icons-only { width: 3.7em; }
 
 /*button text element */
 .ui-button .ui-button-text { display: block; line-height: 1.4;  }
@@ -92,7 +92,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
 .ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
 .ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
 .ui-datepicker select.ui-datepicker-month-year {width: 100%;}
-.ui-datepicker select.ui-datepicker-month, 
+.ui-datepicker select.ui-datepicker-month,
 .ui-datepicker select.ui-datepicker-year { width: 49%;}
 .ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
 .ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }