\r\n --> \n

Cause all the .php files containing lines ending with \r\n to instead end with \n.

DYI with:

find fusionpbx -type f -name '*.php' -exec dos2unix '{}' \;

app_defaults.php

@@ -1,89 +1,89 @@
-<?php
-
-if ($domains_processed == 1) {
-
-	//define array of editor settings
-		$x = 0;
-		$array[$x]['default_setting_category'] = 'editor';
-		$array[$x]['default_setting_subcategory'] = 'font_size';
-		$array[$x]['default_setting_name'] = 'text';
-		$array[$x]['default_setting_value'] = '14px';
-		$array[$x]['default_setting_enabled'] = 'false';
-		$array[$x]['default_setting_description'] = 'Set the default text size for Editor.';
-		$x++;
-		$array[$x]['default_setting_category'] = 'editor';
-		$array[$x]['default_setting_subcategory'] = 'indent_guides';
-		$array[$x]['default_setting_name'] = 'boolean';
-		$array[$x]['default_setting_value'] = 'false';
-		$array[$x]['default_setting_enabled'] = 'false';
-		$array[$x]['default_setting_description'] = 'Set the default visibility of indent guides for Editor.';
-		$x++;
-		$array[$x]['default_setting_category'] = 'editor';
-		$array[$x]['default_setting_subcategory'] = 'invisibles';
-		$array[$x]['default_setting_name'] = 'boolean';
-		$array[$x]['default_setting_value'] = 'false';
-		$array[$x]['default_setting_enabled'] = 'false';
-		$array[$x]['default_setting_description'] = 'Set the default state of invisible characters for Editor.';
-		$x++;
-		$array[$x]['default_setting_category'] = 'editor';
-		$array[$x]['default_setting_subcategory'] = 'line_numbers';
-		$array[$x]['default_setting_name'] = 'boolean';
-		$array[$x]['default_setting_value'] = 'false';
-		$array[$x]['default_setting_enabled'] = 'false';
-		$array[$x]['default_setting_description'] = 'Set the default visibility of line numbers for Editor.';
-		$x++;
-		$array[$x]['default_setting_category'] = 'editor';
-		$array[$x]['default_setting_subcategory'] = 'live_previews';
-		$array[$x]['default_setting_name'] = 'boolean';
-		$array[$x]['default_setting_value'] = 'false';
-		$array[$x]['default_setting_enabled'] = 'false';
-		$array[$x]['default_setting_description'] = 'Enable or disable live previewing of syntax, text size and theme changes.';
-		$x++;
-		$array[$x]['default_setting_category'] = 'editor';
-		$array[$x]['default_setting_subcategory'] = 'theme';
-		$array[$x]['default_setting_name'] = 'text';
-		$array[$x]['default_setting_value'] = 'Cobalt';
-		$array[$x]['default_setting_enabled'] = 'false';
-		$array[$x]['default_setting_description'] = 'Set the default theme.';
-
-	//get an array of the default settings
-		$sql = "select * from v_default_settings ";
-		$sql .= "where default_setting_category = 'editor' ";
-		$prep_statement = $db->prepare($sql);
-		$prep_statement->execute();
-		$default_settings = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-		unset ($prep_statement, $sql);
-
-	//find the missing default settings
-		$x = 0;
-		foreach ($array as $setting) {
-			$found = false;
-			$missing[$x] = $setting;
-			foreach ($default_settings as $row) {
-				if (trim($row['default_setting_subcategory']) == trim($setting['default_setting_subcategory'])) {
-					$found = true;
-					//remove items from the array that were found
-					unset($missing[$x]);
-				}
-			}
-			$x++;
-		}
-
-	//add the missing default settings
-		foreach ($missing as $row) {
-			//add the default settings
-			$orm = new orm;
-			$orm->name('default_settings');
-			$orm->save($row);
-			$message = $orm->message;
-			unset($orm);
-			//print_r($message);
-		}
-		unset($missing);
-
-	//unset the array variable
-		unset($array);
-
-}
-
+<?php
+
+if ($domains_processed == 1) {
+
+	//define array of editor settings
+		$x = 0;
+		$array[$x]['default_setting_category'] = 'editor';
+		$array[$x]['default_setting_subcategory'] = 'font_size';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '14px';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the default text size for Editor.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'editor';
+		$array[$x]['default_setting_subcategory'] = 'indent_guides';
+		$array[$x]['default_setting_name'] = 'boolean';
+		$array[$x]['default_setting_value'] = 'false';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the default visibility of indent guides for Editor.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'editor';
+		$array[$x]['default_setting_subcategory'] = 'invisibles';
+		$array[$x]['default_setting_name'] = 'boolean';
+		$array[$x]['default_setting_value'] = 'false';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the default state of invisible characters for Editor.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'editor';
+		$array[$x]['default_setting_subcategory'] = 'line_numbers';
+		$array[$x]['default_setting_name'] = 'boolean';
+		$array[$x]['default_setting_value'] = 'false';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the default visibility of line numbers for Editor.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'editor';
+		$array[$x]['default_setting_subcategory'] = 'live_previews';
+		$array[$x]['default_setting_name'] = 'boolean';
+		$array[$x]['default_setting_value'] = 'false';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Enable or disable live previewing of syntax, text size and theme changes.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'editor';
+		$array[$x]['default_setting_subcategory'] = 'theme';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = 'Cobalt';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the default theme.';
+
+	//get an array of the default settings
+		$sql = "select * from v_default_settings ";
+		$sql .= "where default_setting_category = 'editor' ";
+		$prep_statement = $db->prepare($sql);
+		$prep_statement->execute();
+		$default_settings = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+		unset ($prep_statement, $sql);
+
+	//find the missing default settings
+		$x = 0;
+		foreach ($array as $setting) {
+			$found = false;
+			$missing[$x] = $setting;
+			foreach ($default_settings as $row) {
+				if (trim($row['default_setting_subcategory']) == trim($setting['default_setting_subcategory'])) {
+					$found = true;
+					//remove items from the array that were found
+					unset($missing[$x]);
+				}
+			}
+			$x++;
+		}
+
+	//add the missing default settings
+		foreach ($missing as $row) {
+			//add the default settings
+			$orm = new orm;
+			$orm->name('default_settings');
+			$orm->save($row);
+			$message = $orm->message;
+			unset($orm);
+			//print_r($message);
+		}
+		unset($missing);
+
+	//unset the array variable
+		unset($array);
+
+}
+
 ?>

app_menu.php

@@ -1,89 +1,89 @@
-<?php
-
-	$y = 0;
-	$apps[$x]['menu'][$y]['title']['en-us'] = "Script Editor";
-	$apps[$x]['menu'][$y]['title']['es-cl'] = "Editor de Scripts";
-	$apps[$x]['menu'][$y]['title']['es-mx'] = "";
-	$apps[$x]['menu'][$y]['title']['de-de'] = "";
-	$apps[$x]['menu'][$y]['title']['de-ch'] = "";
-	$apps[$x]['menu'][$y]['title']['de-at'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-fr'] = "Editeur de script";
-	$apps[$x]['menu'][$y]['title']['fr-ca'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-ch'] = "";
-	$apps[$x]['menu'][$y]['title']['pt-pt'] = "Editor de Scripts";
-	$apps[$x]['menu'][$y]['title']['pt-br'] = "";
-	$apps[$x]['menu'][$y]['uuid'] = "f1905fec-0577-daef-6045-59d09b7d3f94";
-	$apps[$x]['menu'][$y]['parent_uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f";
-	$apps[$x]['menu'][$y]['category'] = "external";
-	$apps[$x]['menu'][$y]['path'] = "/app/edit/index.php?dir=scripts";
-	$apps[$x]['menu'][$y]['groups'][] = "superadmin";
-	$y++;
-	$apps[$x]['menu'][$y]['title']['en-us'] = "XML Editor";
-	$apps[$x]['menu'][$y]['title']['es-cl'] = "Editor XML";
-	$apps[$x]['menu'][$y]['title']['es-mx'] = "";
-	$apps[$x]['menu'][$y]['title']['de-de'] = "";
-	$apps[$x]['menu'][$y]['title']['de-ch'] = "";
-	$apps[$x]['menu'][$y]['title']['de-at'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-fr'] = "Editeur XML";
-	$apps[$x]['menu'][$y]['title']['fr-ca'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-ch'] = "";
-	$apps[$x]['menu'][$y]['title']['pt-pt'] = "Editor XML";
-	$apps[$x]['menu'][$y]['title']['pt-br'] = "";
-	$apps[$x]['menu'][$y]['uuid'] = "16013877-606a-2a05-7d6a-c1b215839131";
-	$apps[$x]['menu'][$y]['parent_uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f";
-	$apps[$x]['menu'][$y]['category'] = "external";
-	$apps[$x]['menu'][$y]['path'] = "/app/edit/index.php?dir=xml";
-	$apps[$x]['menu'][$y]['groups'][] = "superadmin";
-	$y++;
-	$apps[$x]['menu'][$y]['title']['en-us'] = "Provision Editor";
-	$apps[$x]['menu'][$y]['title']['es-cl'] = "Editor de Provisionamiento";
-	$apps[$x]['menu'][$y]['title']['es-mx'] = "";
-	$apps[$x]['menu'][$y]['title']['de-de'] = "";
-	$apps[$x]['menu'][$y]['title']['de-ch'] = "";
-	$apps[$x]['menu'][$y]['title']['de-at'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-fr'] = "Editeur de Provisioning";
-	$apps[$x]['menu'][$y]['title']['fr-ca'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-ch'] = "";
-	$apps[$x]['menu'][$y]['title']['pt-pt'] = "Editor de Provisionamento";
-	$apps[$x]['menu'][$y]['title']['pt-br'] = "";
-	$apps[$x]['menu'][$y]['uuid'] = "57773542-a565-1a29-605d-6535da1a0870";
-	$apps[$x]['menu'][$y]['parent_uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f";
-	$apps[$x]['menu'][$y]['category'] = "external";
-	$apps[$x]['menu'][$y]['path'] = "/app/edit/index.php?dir=provision";
-	$apps[$x]['menu'][$y]['groups'][] = "superadmin";
-	$y++;
-	$apps[$x]['menu'][$y]['title']['en-us'] = "PHP Editor";
-	$apps[$x]['menu'][$y]['title']['es-cl'] = "Editor PHP";
-	$apps[$x]['menu'][$y]['title']['es-mx'] = "";
-	$apps[$x]['menu'][$y]['title']['de-de'] = "";
-	$apps[$x]['menu'][$y]['title']['de-ch'] = "";
-	$apps[$x]['menu'][$y]['title']['de-at'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-fr'] = "Editeur PHP";
-	$apps[$x]['menu'][$y]['title']['fr-ca'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-ch'] = "";
-	$apps[$x]['menu'][$y]['title']['pt-pt'] = "Editor de PHP";
-	$apps[$x]['menu'][$y]['title']['pt-br'] = "";
-	$apps[$x]['menu'][$y]['uuid'] = "eae1f2d6-789b-807c-cc26-44501e848693";
-	$apps[$x]['menu'][$y]['parent_uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f";
-	$apps[$x]['menu'][$y]['category'] = "external";
-	$apps[$x]['menu'][$y]['path'] = "/app/edit/index.php?dir=php";
-	$apps[$x]['menu'][$y]['groups'][] = "superadmin";
-	$y++;
-	$apps[$x]['menu'][$y]['title']['en-us'] = "Grammar Editor";
-	$apps[$x]['menu'][$y]['title']['es-cl'] = "Editor Gramático";
-	$apps[$x]['menu'][$y]['title']['es-mx'] = "Editor Gramático";
-	$apps[$x]['menu'][$y]['title']['de-de'] = "";
-	$apps[$x]['menu'][$y]['title']['de-ch'] = "";
-	$apps[$x]['menu'][$y]['title']['de-at'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-fr'] = "Editeur de Grammaire";
-	$apps[$x]['menu'][$y]['title']['fr-ca'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-ch'] = "";
-	$apps[$x]['menu'][$y]['title']['pt-pt'] = "Editor Gramático";
-	$apps[$x]['menu'][$y]['title']['pt-br'] = "";
-	$apps[$x]['menu'][$y]['uuid'] = "c3db739e-89f9-0fa2-44ce-0f4c2ff43b1a";
-	$apps[$x]['menu'][$y]['parent_uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f";
-	$apps[$x]['menu'][$y]['category'] = "external";
-	$apps[$x]['menu'][$y]['path'] = "/app/edit/index.php?dir=grammar";
-	$apps[$x]['menu'][$y]['groups'][] = "superadmin";
-
+<?php
+
+	$y = 0;
+	$apps[$x]['menu'][$y]['title']['en-us'] = "Script Editor";
+	$apps[$x]['menu'][$y]['title']['es-cl'] = "Editor de Scripts";
+	$apps[$x]['menu'][$y]['title']['es-mx'] = "";
+	$apps[$x]['menu'][$y]['title']['de-de'] = "";
+	$apps[$x]['menu'][$y]['title']['de-ch'] = "";
+	$apps[$x]['menu'][$y]['title']['de-at'] = "";
+	$apps[$x]['menu'][$y]['title']['fr-fr'] = "Editeur de script";
+	$apps[$x]['menu'][$y]['title']['fr-ca'] = "";
+	$apps[$x]['menu'][$y]['title']['fr-ch'] = "";
+	$apps[$x]['menu'][$y]['title']['pt-pt'] = "Editor de Scripts";
+	$apps[$x]['menu'][$y]['title']['pt-br'] = "";
+	$apps[$x]['menu'][$y]['uuid'] = "f1905fec-0577-daef-6045-59d09b7d3f94";
+	$apps[$x]['menu'][$y]['parent_uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f";
+	$apps[$x]['menu'][$y]['category'] = "external";
+	$apps[$x]['menu'][$y]['path'] = "/app/edit/index.php?dir=scripts";
+	$apps[$x]['menu'][$y]['groups'][] = "superadmin";
+	$y++;
+	$apps[$x]['menu'][$y]['title']['en-us'] = "XML Editor";
+	$apps[$x]['menu'][$y]['title']['es-cl'] = "Editor XML";
+	$apps[$x]['menu'][$y]['title']['es-mx'] = "";
+	$apps[$x]['menu'][$y]['title']['de-de'] = "";
+	$apps[$x]['menu'][$y]['title']['de-ch'] = "";
+	$apps[$x]['menu'][$y]['title']['de-at'] = "";
+	$apps[$x]['menu'][$y]['title']['fr-fr'] = "Editeur XML";
+	$apps[$x]['menu'][$y]['title']['fr-ca'] = "";
+	$apps[$x]['menu'][$y]['title']['fr-ch'] = "";
+	$apps[$x]['menu'][$y]['title']['pt-pt'] = "Editor XML";
+	$apps[$x]['menu'][$y]['title']['pt-br'] = "";
+	$apps[$x]['menu'][$y]['uuid'] = "16013877-606a-2a05-7d6a-c1b215839131";
+	$apps[$x]['menu'][$y]['parent_uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f";
+	$apps[$x]['menu'][$y]['category'] = "external";
+	$apps[$x]['menu'][$y]['path'] = "/app/edit/index.php?dir=xml";
+	$apps[$x]['menu'][$y]['groups'][] = "superadmin";
+	$y++;
+	$apps[$x]['menu'][$y]['title']['en-us'] = "Provision Editor";
+	$apps[$x]['menu'][$y]['title']['es-cl'] = "Editor de Provisionamiento";
+	$apps[$x]['menu'][$y]['title']['es-mx'] = "";
+	$apps[$x]['menu'][$y]['title']['de-de'] = "";
+	$apps[$x]['menu'][$y]['title']['de-ch'] = "";
+	$apps[$x]['menu'][$y]['title']['de-at'] = "";
+	$apps[$x]['menu'][$y]['title']['fr-fr'] = "Editeur de Provisioning";
+	$apps[$x]['menu'][$y]['title']['fr-ca'] = "";
+	$apps[$x]['menu'][$y]['title']['fr-ch'] = "";
+	$apps[$x]['menu'][$y]['title']['pt-pt'] = "Editor de Provisionamento";
+	$apps[$x]['menu'][$y]['title']['pt-br'] = "";
+	$apps[$x]['menu'][$y]['uuid'] = "57773542-a565-1a29-605d-6535da1a0870";
+	$apps[$x]['menu'][$y]['parent_uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f";
+	$apps[$x]['menu'][$y]['category'] = "external";
+	$apps[$x]['menu'][$y]['path'] = "/app/edit/index.php?dir=provision";
+	$apps[$x]['menu'][$y]['groups'][] = "superadmin";
+	$y++;
+	$apps[$x]['menu'][$y]['title']['en-us'] = "PHP Editor";
+	$apps[$x]['menu'][$y]['title']['es-cl'] = "Editor PHP";
+	$apps[$x]['menu'][$y]['title']['es-mx'] = "";
+	$apps[$x]['menu'][$y]['title']['de-de'] = "";
+	$apps[$x]['menu'][$y]['title']['de-ch'] = "";
+	$apps[$x]['menu'][$y]['title']['de-at'] = "";
+	$apps[$x]['menu'][$y]['title']['fr-fr'] = "Editeur PHP";
+	$apps[$x]['menu'][$y]['title']['fr-ca'] = "";
+	$apps[$x]['menu'][$y]['title']['fr-ch'] = "";
+	$apps[$x]['menu'][$y]['title']['pt-pt'] = "Editor de PHP";
+	$apps[$x]['menu'][$y]['title']['pt-br'] = "";
+	$apps[$x]['menu'][$y]['uuid'] = "eae1f2d6-789b-807c-cc26-44501e848693";
+	$apps[$x]['menu'][$y]['parent_uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f";
+	$apps[$x]['menu'][$y]['category'] = "external";
+	$apps[$x]['menu'][$y]['path'] = "/app/edit/index.php?dir=php";
+	$apps[$x]['menu'][$y]['groups'][] = "superadmin";
+	$y++;
+	$apps[$x]['menu'][$y]['title']['en-us'] = "Grammar Editor";
+	$apps[$x]['menu'][$y]['title']['es-cl'] = "Editor Gramático";
+	$apps[$x]['menu'][$y]['title']['es-mx'] = "Editor Gramático";
+	$apps[$x]['menu'][$y]['title']['de-de'] = "";
+	$apps[$x]['menu'][$y]['title']['de-ch'] = "";
+	$apps[$x]['menu'][$y]['title']['de-at'] = "";
+	$apps[$x]['menu'][$y]['title']['fr-fr'] = "Editeur de Grammaire";
+	$apps[$x]['menu'][$y]['title']['fr-ca'] = "";
+	$apps[$x]['menu'][$y]['title']['fr-ch'] = "";
+	$apps[$x]['menu'][$y]['title']['pt-pt'] = "Editor Gramático";
+	$apps[$x]['menu'][$y]['title']['pt-br'] = "";
+	$apps[$x]['menu'][$y]['uuid'] = "c3db739e-89f9-0fa2-44ce-0f4c2ff43b1a";
+	$apps[$x]['menu'][$y]['parent_uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f";
+	$apps[$x]['menu'][$y]['category'] = "external";
+	$apps[$x]['menu'][$y]['path'] = "/app/edit/index.php?dir=grammar";
+	$apps[$x]['menu'][$y]['groups'][] = "superadmin";
+
 ?>