Update the references for header.php and footer.php files to point the resources directory.

core/databases/database_delete.php

@@ -53,12 +53,12 @@ if (strlen($id)>0) {
 	unset($sql);
 }
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 echo "<meta http-equiv=\"refresh\" content=\"2;url=databases.php\">\n";
 echo "<div align='center'>\n";
 echo $text['message-delete']."\n";
 echo "</div>\n";
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 return;
 
 ?>

core/databases/database_edit.php

@@ -91,7 +91,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($database_path) == 0) { $msg .= $text['message-required'].$text['label-path']."<br>\n"; }
 		//if (strlen($database_description) == 0) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -99,7 +99,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -143,12 +143,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				require_once "app_defaults.php";
 
 			//redirect the browser
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=databases.php\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-add']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 		} //if ($action == "add")
 
@@ -173,12 +173,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				require_once "app_defaults.php";
 
 			//redirect the browser
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=databases.php\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-update']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 		} //if ($action == "update")
 	} //if ($_POST["persistformvar"] != "true")
@@ -208,7 +208,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	if ($action == "update") {
 		$page["title"] = $text['title-database-edit'];
 	}
@@ -414,5 +414,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>

core/databases/databases.php

@@ -40,10 +40,10 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 $page["title"] = $text['title-databases'];
 
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 
 //get variables used to control the order
 	$order_by = $_GET["order_by"];
@@ -169,5 +169,5 @@ require_once "includes/paging.php";
 	echo "<br><br>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>

core/default_settings/default_setting_delete.php

@@ -54,12 +54,12 @@ if (strlen($id)>0) {
 }
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=default_settings.php\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>

core/default_settings/default_setting_edit.php

@@ -74,7 +74,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($default_setting_enabled) == 0) { $msg .= $text['message-required'].$text['label-enabled']."<br>\n"; }
 		//if (strlen($default_setting_description) == 0) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -82,7 +82,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -112,12 +112,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=default_settings.php\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-add']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			} //if ($action == "add")
 
@@ -133,12 +133,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=default_settings.php\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-update']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			} //if ($action == "update")
 		} //if ($_POST["persistformvar"] != "true")
@@ -165,7 +165,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	if ($action == "update") {
 		$page["title"] = $text['title-default_setting-edit'];
 	}
@@ -429,5 +429,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>

core/default_settings/default_settings.php

@@ -40,10 +40,10 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 $page["title"] = $text['title-default_settings'];
 
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 
 //get variables used to control the order
 	$order_by = $_GET["order_by"];
@@ -212,5 +212,5 @@ require_once "includes/paging.php";
 	echo "<br /><br />";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>

core/domain_settings/domain_settings.php

@@ -34,8 +34,8 @@ else {
 	exit;
 }
 
-require_once "includes/header.php";
-require_once "includes/paging.php";
+require_once "resources/header.php";
+require_once "resources/paging.php";
 
 //get variables used to control the order
 	$order_by = $_GET["order_by"];
@@ -205,5 +205,5 @@ require_once "includes/paging.php";
 	echo "<br /><br />";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>

core/domain_settings/domain_settings_delete.php

@@ -56,12 +56,12 @@ if (strlen($id)>0) {
 }
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=domains_edit.php?id=$domain_uuid\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>

core/domain_settings/domain_settings_edit.php

@@ -78,7 +78,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($domain_setting_enabled) == 0) { $msg .= $text['message-required'].$text['label-enabled']."<br>\n"; }
 		//if (strlen($domain_setting_description) == 0) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -86,7 +86,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -118,12 +118,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=domains_edit.php?id=$domain_uuid\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-add']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			} //if ($action == "add")
 
@@ -140,12 +140,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=domains_edit.php?id=$domain_uuid\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-update']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			} //if ($action == "update")
 		} //if ($_POST["persistformvar"] != "true")
@@ -173,7 +173,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	if ($action == "update") {
 		$page["title"] = $text['title-domain_setting-edit'];
 	}
@@ -390,5 +390,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>

core/domain_settings/domains.php

@@ -84,10 +84,10 @@ else {
 	}
 
 //includes
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-domains'];
 
-	require_once "includes/paging.php";
+	require_once "resources/paging.php";
 
 //get variables used to control the order
 	$order_by = $_GET["order_by"];
@@ -219,5 +219,5 @@ else {
 	echo "<br /><br />";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>

core/domain_settings/domains_delete.php

@@ -190,12 +190,12 @@ if (strlen($id) > 0) {
 }
 
 //redirect the browser
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=domains.php\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>

core/domain_settings/domains_edit.php

@@ -66,7 +66,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($domain_name) == 0) { $msg .= $text['message-required'].$text['label-name']."<br>\n"; }
 		//if (strlen($domain_description) == 0) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -74,7 +74,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -126,7 +126,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 			unset($_SESSION['switch']);
 
 		//redirect the browser
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=domains.php\">\n";
 			echo "<div align='center'>\n";
 			if ($action == "update") {
@@ -136,7 +136,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 				echo $text['message-add']."\n";
 			}
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		} //if ($_POST["persistformvar"] != "true")
 } //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
@@ -156,7 +156,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	if ($action == "update") {
 		$page["title"] = $text['title-domain-edit'];
 	}
@@ -244,5 +244,5 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>

core/menu/menu.php

@@ -40,10 +40,10 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 $page["title"] = $text['title-menus'];
 
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 
 //get variables used to control the order
 	$order_by = $_GET["order_by"];
@@ -157,5 +157,5 @@ require_once "includes/paging.php";
 	echo "<br><br>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>

core/menu/menu_delete.php

@@ -78,12 +78,12 @@ if (strlen($id)>0) {
 }
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=menu.php\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>

core/menu/menu_edit.php

@@ -69,7 +69,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($menu_language) == 0) { $msg .= $text['message-required'].$text['label-language']."<br>\n"; }
 		//if (strlen($menu_description) == 0) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -77,7 +77,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -113,12 +113,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$menu->restore();
 
 			//redirect the user back to the main menu
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=menu.php\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-add']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 		} //if ($action == "add")
 
@@ -133,12 +133,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				unset($sql);
 
 			//redirect the user back to the main menu
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=menu.php\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-update']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 		} //if ($action == "update")
 	} //if ($_POST["persistformvar"] != "true")
@@ -163,7 +163,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	if ($action == "update") {
 		$page["title"] = $text['title-menu-edit'];
 	}
@@ -258,5 +258,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	require_once "core/menu/menu_item_list.php";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>

core/menu/menu_item_delete.php

@@ -56,12 +56,12 @@ if (count($_GET)>0) {
 		unset($sql);
 
 	//redirect the user
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		echo "<meta http-equiv=\"refresh\" content=\"2;url=menu_edit.php?id=$menu_uuid\">\n";
 		echo "<div align='center'>";
 		echo $text['message-delete'];
 		echo "</div>";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 		return;
 }
 

core/menu/menu_item_edit.php

@@ -54,12 +54,12 @@ else {
 			$sql .= "and group_name = '".$group_name."' ";
 			$db->exec(check_sql($sql));
 		//redirect the browser
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=menu_item_edit.php?id=$menu_uuid&menu_item_uuid=$menu_item_uuid&menu_uuid=$menu_uuid\">\n";
 			echo "<div align='center'>\n";
 			echo $text['message-delete']."\n";
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 	}
 
@@ -107,7 +107,7 @@ else {
 			if (strlen($menu_item_category) == 0) { $msg .= $text['message-required'].$text['label-category']."<br>\n"; }
 			//if (strlen($menu_item_link) == 0) { $msg .= $text['message-required'].$text['label-link']."<br>\n"; }
 			if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				require_once "resources/persist_form_var.php";
 				echo "<div align='center'>\n";
 				echo "<table><tr><td>\n";
@@ -115,7 +115,7 @@ else {
 				echo "</td></tr></table>\n";
 				persistformvar($_POST);
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			}
 
@@ -221,7 +221,7 @@ else {
 				}
 
 			//redirect the user
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 					echo "<meta http-equiv=\"refresh\" content=\"2;url=menu_edit.php?id=$menu_uuid\">\n";
 					echo "<div align='center'>\n";
 					if ($action == "add") {
@@ -231,7 +231,7 @@ else {
 						echo $text['message-update']."\n";
 					}
 					echo "</div>\n";
-					require_once "includes/footer.php";
+					require_once "resources/footer.php";
 					return;
 		} //if ($_POST["persistformvar"] != "true")
 	} //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
@@ -266,7 +266,7 @@ else {
 	}
 
 //include the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	if ($action == "update") {
 		$page["title"] = $text['title-menu_item-edit'];
 	}
@@ -459,5 +459,5 @@ else {
 	echo "</div>";
 
 //include the footer
-  require_once "includes/footer.php";
+  require_once "resources/footer.php";
 ?>

core/menu/menu_item_list.php

@@ -174,7 +174,7 @@ function build_db_child_menu_list ($db, $menu_item_level, $menu_item_uuid, $c) {
 	//end check for children
 }
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 $order_by = $_GET["order_by"];
 $order = $_GET["order"];
 
@@ -355,6 +355,6 @@ $order = $_GET["order"];
 	echo "</div>";
 
 	echo "<br><br>";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 
 ?>

core/menu/menu_item_move_down.php

@@ -82,12 +82,12 @@ if (count($_GET)>0) {
 	}
 
 	//redirect the user
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		echo "<meta http-equiv=\"refresh\" content=\"1;url=menu_list.php?menu_item_id=$menu_item_id\">\n";
 		echo "<div align='center'>";
 		echo $text['message-moved_down'];
 		echo "</div>";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 		return;
 }
 

core/menu/menu_item_move_up.php

@@ -69,12 +69,12 @@ if (count($_GET)>0) {
 	}
 
 	//redirect the user
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		echo "<meta http-equiv=\"refresh\" content=\"1;url=menu_list.php?menu_item_id=$menu_item_id\">\n";
 		echo "<div align='center'>";
 		echo $text['message-moved_up'];
 		echo "</div>";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 		return;
 }
 

core/menu/menu_restore_default.php

@@ -60,12 +60,12 @@ else {
 	$_SESSION["template_content"] = '';
 
 //show a message to the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=".PROJECT_PATH."/core/menu/menu_edit.php?id=$menu_uuid\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-restore']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>

core/upgrade/upgrade.php

@@ -67,7 +67,7 @@
 
 //include the header
 	if ($display_results) {
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 	}
 
 if ($display_type == 'text') {
@@ -108,6 +108,6 @@ if ($display_type == 'text') {
 
 //include the footer
 	if ($display_results) {
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 	}
 ?>

core/upgrade/upgrade_schema.php

@@ -58,7 +58,7 @@
 				$text[$key] = $value[$_SESSION['domain']['language']['code']];
 			}
 
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		$page["title"] = $text['title-upgrade_schema'];
 
 		$display_type = 'html'; //html, text
@@ -80,7 +80,7 @@
 if ($display_results && $display_type == "html") {
 	echo "<br />\n";
 	echo "<br />\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 }
 
 ?>

core/user_settings/user_dashboard.php

@@ -30,7 +30,7 @@ if (!file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/includes/config.php"))
 }
 require_once "resources/require.php";
 require_once "resources/check_auth.php";
-require_once "includes/header.php";
+require_once "resources/header.php";
 
 //add multi-lingual support
 	echo "<!--\n";
@@ -100,5 +100,5 @@ require_once "includes/header.php";
 	}
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>

core/user_settings/user_edit.php

@@ -92,7 +92,7 @@ if (count($_POST)>0 && $_POST["persistform"] != "1") {
 	//if (strlen($user_time_zone) == 0) { $msg .= "Please provide an time zone.<br>\n"; }
 
 	if (strlen($msg) > 0) {
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		echo "<div align='center'>";
 		echo "<table><tr><td>";
 		echo $msg;
@@ -101,7 +101,7 @@ if (count($_POST)>0 && $_POST["persistform"] != "1") {
 		require_once "resources/persist_form.php";
 		echo persistform($_POST);
 		echo "</div>";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 		return;
 	}
 
@@ -199,10 +199,10 @@ if (count($_POST)>0 && $_POST["persistform"] != "1") {
 		//$_SESSION["template_content"] = '';
 
 	//redirect the browser
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		echo "<meta http-equiv=\"refresh\" content=\"2;url=".PROJECT_PATH."/core/user_settings/user_edit.php\">\n";
 		echo "<div align='center'>".$text['confirm-update']."</div>";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 		return;
 }
 else {
@@ -225,7 +225,7 @@ else {
 }
 
 //include the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 
 //show the content
 	$table_width ='width="100%"';
@@ -416,6 +416,6 @@ else {
 	echo "</form>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 
 ?>

core/users/group_permissions.php

@@ -40,10 +40,10 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 $page["title"] = $text['title-group_permissions'];
 
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 
 //get the list of installed apps from the core and mod directories
 	$config_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/app_config.php");
@@ -279,6 +279,6 @@ require_once "includes/paging.php";
 	echo "<form>\n";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 
 ?>

core/users/groupadd.php

@@ -71,17 +71,17 @@ if (strlen($group_name) > 0) {
 	}
 
 	//redirect the user
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		echo "<meta http-equiv=\"refresh\" content=\"2;url=groups.php\">\n";
 		echo "<div align='center'>\n";
 		echo $text['message-add']."\n";
 		echo "</div>\n";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 		return;
 }
 
 //include the header
-	include "includes/header.php";
+	include "resources/header.php";
 	$page["title"] = $text['title-group_add'];
 
 //show the content
@@ -137,6 +137,6 @@ if (strlen($group_name) > 0) {
 	echo "<br><br>";
 
 //include the footer
-	include "includes/footer.php";
+	include "resources/footer.php";
 
 ?>

core/users/groupmembers.php

@@ -63,7 +63,7 @@ else {
 	//$exampledatareturned = example("apples", 1);
 
 //include the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-group_members'];
 
 //show the content
@@ -164,5 +164,5 @@ else {
 	echo "<br><br>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>

core/users/groups.php

@@ -43,7 +43,7 @@ else {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-group_manager'];
 
 //show the content
@@ -139,6 +139,6 @@ else {
 	echo "</div>";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 
 ?>

core/users/index.php

@@ -41,7 +41,7 @@ else {
 	}
 
 //include the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-user_manager'];
 
 //show the user list
@@ -59,6 +59,6 @@ else {
 	echo "</div>";
 
 //include the footer
-	include "includes/footer.php";
+	include "resources/footer.php";
 
 ?>

core/users/permissions_default.php

@@ -47,12 +47,12 @@ else {
 	$permission->restore();
 
 //show a message to the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=groups.php\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-restore']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>

core/users/signup.php

@@ -87,7 +87,7 @@ if (count($_POST)>0 && check_str($_POST["persistform"]) != "1") {
 	if (strlen($user_email) == 0) { $msgerror .= $text['message-required'].$text['label-email']."<br>\n"; }
 
 	if (strlen($msgerror) > 0) {
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		echo "<div align='center'>";
 		echo "<table><tr><td>";
 		echo $msgerror;
@@ -95,7 +95,7 @@ if (count($_POST)>0 && check_str($_POST["persistform"]) != "1") {
 		require_once "resources/persist_form.php";
 		echo persistform($_POST);
 		echo "</div>";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 		return;
 	}
 
@@ -182,15 +182,15 @@ if (count($_POST)>0 && check_str($_POST["persistform"]) != "1") {
 	$db->exec(check_sql($sql));
 	unset($sql);
 
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"3;url=index.php\">\n";
 	echo "<div align='center'>".$text['message-add']."</div>";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 }
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-user_add'];
 
 //show the content
@@ -259,5 +259,5 @@ if (count($_POST)>0 && check_str($_POST["persistform"]) != "1") {
 	echo "</div>";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>

core/users/userlist.php

@@ -34,8 +34,8 @@ else {
 	exit;
 }
 
-//require_once "includes/header.php";
-	require_once "includes/paging.php";
+//require_once "resources/header.php";
+	require_once "resources/paging.php";
 
 $order_by = $_GET["order_by"];
 $order = $_GET["order"];

core/users/usersupdate.php

@@ -87,10 +87,10 @@ else {
 			$sql .= "and user_uuid = '$user_uuid' ";
 			$db->exec(check_sql($sql));
 		//redirect the user
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=usersupdate.php?id=$user_uuid\">\n";
 			echo "<div align='center'>".$text['message-update']."</div>";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 	}
 
@@ -133,7 +133,7 @@ if (count($_POST)>0 && $_POST["persistform"] != "1") {
 	if (strlen($user_enabled) == 0) { $msg_error .= $text['message-required'].$text['label-enabled']."<br>\n"; }
 
 	if ($msg_error) {
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		echo "<div align='center'>";
 		echo "<table><tr><td>";
 		echo $msg_error;
@@ -142,7 +142,7 @@ if (count($_POST)>0 && $_POST["persistform"] != "1") {
 		require_once "resources/persist_form.php";
 		echo persistform($_POST);
 		echo "</div>";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 		return;
 	}
 
@@ -280,7 +280,7 @@ if (count($_POST)>0 && $_POST["persistform"] != "1") {
 		//$_SESSION["template_content"] = '';
 
 	//redirect the browser
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		if (if_group("admin")) {
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=usersupdate.php?id=$user_uuid\">\n";
 		}
@@ -288,7 +288,7 @@ if (count($_POST)>0 && $_POST["persistform"] != "1") {
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=usersupdate.php?id=$user_uuid\">\n";
 		}
 		echo "<div align='center'>".$text['message-update']."</div>";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 		return;
 }
 else {
@@ -329,7 +329,7 @@ else {
 }
 
 //include the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-user_edit'];
 
 //show the content
@@ -644,6 +644,6 @@ else {
 	echo "</form>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 
 ?>

index.php

@@ -47,8 +47,8 @@ include "root.php";
 	}
 	else {
 		require_once "resources/require.php";
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		echo "<br /><br />\n";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 	}
 ?>

resources/install.php

@@ -1346,7 +1346,7 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist
 	ob_start();
 
 //show the html form
-	if (!is_writable($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/includes/header.php")) {
+	if (!is_writable($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/header.php")) {
 		$install_msg .= "<li>Write access to ".$_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/includes/ is required during the install.</li>\n";
 	}
 	if (!extension_loaded('PDO')) {

resources/login.php

@@ -40,7 +40,7 @@
 	}
 
 //add the header
-	include "includes/header.php";
+	include "resources/header.php";
 
 //show the message
 	if (strlen($msg) > 0) {
@@ -141,6 +141,6 @@
 	echo "</div>";
 
 //add the footer
-	include "includes/footer.php";
+	include "resources/footer.php";
 
 ?>

resources/recaptchalib.php

@@ -102,9 +102,9 @@ function _recaptcha_http_post($host, $path, $data, $port = 80) {
 function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false)
 {
 	if ($pubkey == null || $pubkey == '') {
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		echo "To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 		exit;
 	}