Dashboard - Settings: Fix Enabled state on edit.

core/dashboard/dashboard.php

@@ -89,100 +89,100 @@
 
 
 //action add or update
-	if (isset($_REQUEST["export"])) {
-		$export = $_REQUEST["export"];
-	}
-
-//expore provider settings
-	if (isset($export) && $export == 'true') {
-
-		//get the dashboard
-			$sql = "select ";
-			$sql .= "dashboard_uuid, ";
-			$sql .= "dashboard_name, ";
-			$sql .= "dashboard_path, ";
-			$sql .= "dashboard_order, ";
-			$sql .= "cast(dashboard_enabled as text), ";
-			$sql .= "dashboard_description ";
-			$sql .= "from v_dashboard ";
-			$database = new database;
-			$dashboard_widgets = $database->select($sql, $parameters, 'all');
-			unset($sql, $parameters);
-
-		//prepare the array
-			if (is_array($dashboard_widgets)) {
-				$x = 0;
-				$y = 0;
-				foreach ($dashboard_widgets as $row) {
-					//add to the array
-					$array['dashboard'][$x]['dashboard_uuid'] = $row["dashboard_uuid"];
-					$array['dashboard'][$x]['dashboard_name'] = $row["dashboard_name"];
-					$array['dashboard'][$x]['dashboard_path'] = $row["dashboard_path"];
-					$array['dashboard'][$x]['dashboard_order'] = $row["dashboard_order"];
-					$array['dashboard'][$x]['dashboard_enabled'] = $row["dashboard_enabled"];
-					$array['dashboard'][$x]['dashboard_description'] = $row["dashboard_description"];
-
-					//get the dashboard groups
-					$sql = "select ";
-					$sql .= "dashboard_group_uuid, ";
-					$sql .= "dashboard_uuid, ";
-					$sql .= "group_uuid, ";
-					$sql .= "(select group_name from v_groups where v_dashboard_groups.group_uuid = group_uuid) as group_name ";
-					$sql .= "from v_dashboard_groups ";
-					$sql .= "where dashboard_uuid = :dashboard_uuid ";
-					$parameters['dashboard_uuid'] = $row["dashboard_uuid"];
-					$database = new database;
-					$dashboard_groups = $database->select($sql, $parameters, 'all');
-					unset($sql, $parameters);
-					if (is_array($dashboard_groups)) {
-						$y = 0;
-						foreach ($dashboard_groups as $row) {
-							$array['dashboard'][$x]['dashboard_groups'][$y]['dashboard_group_uuid'] = $row["dashboard_group_uuid"];
-							$array['dashboard'][$x]['dashboard_groups'][$y]['dashboard_uuid'] = $row["dashboard_uuid"];
-							//$array['dashboard'][$x]['dashboard_groups'][$y]['group_uuid'] = $row["group_uuid"];
-							$array['dashboard'][$x]['dashboard_groups'][$y]['group_name'] = $row["group_name"];
-							$y++;
-						}
-					}
-					
-					$x++;
-				}
-			}
-
-		//write the code
-			echo "<textarea style=\"width: 100%; max-width: 100%; height: 100%; max-height: 100%;\">\n";
-			if (is_array($array['dashboard'])) {
-				echo "\n\n\n";
-				//echo "\$x = 0;\n";
-				foreach ($array['dashboard'] as $row) {
-					foreach ($row as $key => $value) {
-						if (is_array($value)) {
-							echo "\$y = 0;\n";
-							$count = count($value);
-							$i = 1;
-							foreach ($value as $row) {
-								foreach ($row as $key => $value) {
-									echo "\$array['dashboard'][\$x]['dashboard_groups'][\$y]['{$key}'] = '{$value}';\n";
-								}
-								if ($i < $count) {
-									echo "\$y++;\n";
-								}
-								else {
-									echo "\n\n---------------------------\n\n\n";
-								}
-								$i++;
-							}
-						}
-						else {
-							echo "\$array['dashboard'][\$x]['{$key}'] = '{$value}';\n";
-						}
-					}
-				}
-			}
-
-			echo "</textarea>\n";
-			exit;
-	}
+// 	if (isset($_REQUEST["export"])) {
+// 		$export = $_REQUEST["export"];
+// 	}
+//
+//expore settings
+// 	if (isset($export) && $export == 'true') {
+//
+// 		//get the dashboard
+// 			$sql = "select ";
+// 			$sql .= "dashboard_uuid, ";
+// 			$sql .= "dashboard_name, ";
+// 			$sql .= "dashboard_path, ";
+// 			$sql .= "dashboard_order, ";
+// 			$sql .= "cast(dashboard_enabled as text), ";
+// 			$sql .= "dashboard_description ";
+// 			$sql .= "from v_dashboard ";
+// 			$database = new database;
+// 			$dashboard_widgets = $database->select($sql, $parameters, 'all');
+// 			unset($sql, $parameters);
+//
+// 		//prepare the array
+// 			if (is_array($dashboard_widgets)) {
+// 				$x = 0;
+// 				$y = 0;
+// 				foreach ($dashboard_widgets as $row) {
+// 					//add to the array
+// 					$array['dashboard'][$x]['dashboard_uuid'] = $row["dashboard_uuid"];
+// 					$array['dashboard'][$x]['dashboard_name'] = $row["dashboard_name"];
+// 					$array['dashboard'][$x]['dashboard_path'] = $row["dashboard_path"];
+// 					$array['dashboard'][$x]['dashboard_order'] = $row["dashboard_order"];
+// 					$array['dashboard'][$x]['dashboard_enabled'] = $row["dashboard_enabled"] ?: 'false';
+// 					$array['dashboard'][$x]['dashboard_description'] = $row["dashboard_description"];
+//
+// 					//get the dashboard groups
+// 					$sql = "select ";
+// 					$sql .= "dashboard_group_uuid, ";
+// 					$sql .= "dashboard_uuid, ";
+// 					$sql .= "group_uuid, ";
+// 					$sql .= "(select group_name from v_groups where v_dashboard_groups.group_uuid = group_uuid) as group_name ";
+// 					$sql .= "from v_dashboard_groups ";
+// 					$sql .= "where dashboard_uuid = :dashboard_uuid ";
+// 					$parameters['dashboard_uuid'] = $row["dashboard_uuid"];
+// 					$database = new database;
+// 					$dashboard_groups = $database->select($sql, $parameters, 'all');
+// 					unset($sql, $parameters);
+// 					if (is_array($dashboard_groups)) {
+// 						$y = 0;
+// 						foreach ($dashboard_groups as $row) {
+// 							$array['dashboard'][$x]['dashboard_groups'][$y]['dashboard_group_uuid'] = $row["dashboard_group_uuid"];
+// 							$array['dashboard'][$x]['dashboard_groups'][$y]['dashboard_uuid'] = $row["dashboard_uuid"];
+// 							//$array['dashboard'][$x]['dashboard_groups'][$y]['group_uuid'] = $row["group_uuid"];
+// 							$array['dashboard'][$x]['dashboard_groups'][$y]['group_name'] = $row["group_name"];
+// 							$y++;
+// 						}
+// 					}
+//
+// 					$x++;
+// 				}
+// 			}
+//
+// 		//write the code
+// 			echo "<textarea style=\"width: 100%; max-width: 100%; height: 100%; max-height: 100%;\">\n";
+// 			if (is_array($array['dashboard'])) {
+// 				echo "\n\n\n";
+// 				//echo "\$x = 0;\n";
+// 				foreach ($array['dashboard'] as $row) {
+// 					foreach ($row as $key => $value) {
+// 						if (is_array($value)) {
+// 							echo "\$y = 0;\n";
+// 							$count = count($value);
+// 							$i = 1;
+// 							foreach ($value as $row) {
+// 								foreach ($row as $key => $value) {
+// 									echo "\$array['dashboard'][\$x]['dashboard_groups'][\$y]['{$key}'] = '{$value}';\n";
+// 								}
+// 								if ($i < $count) {
+// 									echo "\$y++;\n";
+// 								}
+// 								else {
+// 									echo "\n\n---------------------------\n\n\n";
+// 								}
+// 								$i++;
+// 							}
+// 						}
+// 						else {
+// 							echo "\$array['dashboard'][\$x]['{$key}'] = '{$value}';\n";
+// 						}
+// 					}
+// 				}
+// 			}
+//
+// 			echo "</textarea>\n";
+// 			exit;
+// 	}
 
 //get the count
 	$sql = "select count(dashboard_uuid) ";
@@ -324,11 +324,11 @@
 			if (permission_exists('dashboard_edit')) {
 				echo "	<td class='no-link center'>\n";
 				echo "		<input type='hidden' name='number_translations[$x][dashboard_enabled]' value='".escape($row['dashboard_enabled'])."' />\n";
-				echo button::create(['type'=>'submit','class'=>'link','label'=>$text['label-'.$row['dashboard_enabled']],'title'=>$text['button-toggle'],'onclick'=>"list_self_check('checkbox_".$x."'); list_action_set('toggle'); list_form_submit('form_list')"]);
+				echo button::create(['type'=>'submit','class'=>'link','label'=>$text['label-'.($row['dashboard_enabled']?:'false')],'title'=>$text['button-toggle'],'onclick'=>"list_self_check('checkbox_".$x."'); list_action_set('toggle'); list_form_submit('form_list')"]);
 			}
 			else {
 				echo "	<td class='center'>\n";
-				echo $text['label-'.$row['dashboard_enabled']];
+				echo $text['label-'.($row['dashboard_enabled']?:'false')];
 			}
 			echo "	</td>\n";
 			echo "	<td class='description overflow hide-sm-dn'>".escape($row['dashboard_description'])."</td>\n";

core/dashboard/dashboard_edit.php

@@ -218,15 +218,12 @@
 			$dashboard_column_span = $row["dashboard_column_span"];
 			$dashboard_details_state = $row["dashboard_details_state"];
 			$dashboard_order = $row["dashboard_order"];
-			$dashboard_enabled = $row["dashboard_enabled"];
+			$dashboard_enabled = $row["dashboard_enabled"] ?: 'false';
 			$dashboard_description = $row["dashboard_description"];
 		}
 		unset($sql, $parameters, $row);
 	}
 
-//set the defaults
-	if (strlen($dashboard_enabled) == 0) { $dashboard_enabled = true; }
-
 //get the child data
 	if (is_uuid($dashboard_uuid)) {
 		$sql = "select ";
@@ -474,14 +471,14 @@
 	echo "<td class='vtable' style='position: relative;' align='left'>\n";
 	if (substr($_SESSION['theme']['input_toggle_style']['text'], 0, 6) == 'switch') {
 		echo "	<label class='switch'>\n";
-		echo "		<input type='checkbox' id='dashboard_enabled' name='dashboard_enabled' value='true' ".($dashboard_enabled == true ? "checked='checked'" : null).">\n";
+		echo "		<input type='checkbox' id='dashboard_enabled' name='dashboard_enabled' value='true' ".($dashboard_enabled == 'true' ? "checked='checked'" : null).">\n";
 		echo "		<span class='slider'></span>\n";
 		echo "	</label>\n";
 	}
 	else {
 		echo "	<select class='formfld' id='dashboard_enabled' name='dashboard_enabled'>\n";
-		echo "		<option value='true' ".($dashboard_enabled == true ? "selected='selected'" : null).">".$text['option-true']."</option>\n";
-		echo "		<option value='false' ".($dashboard_enabled == false ? "selected='selected'" : null).">".$text['option-false']."</option>\n";
+		echo "		<option value='false'>".$text['option-false']."</option>\n";
+		echo "		<option value='true' ".($dashboard_enabled == 'true' ? "selected='selected'" : null).">".$text['option-true']."</option>\n";
 		echo "	</select>\n";
 	}
 	echo "<br />\n";