Merge pull request #173 from Mdwiki-TD/update_new

Refactor includes and namespaces, consolidate init logic

Author: MrIbrahem

src/404.php

@@ -1,7 +1,7 @@
 <?php
 http_response_code(404);
-
-// Include header
+//---
+include_once __DIR__ . '/include_all.php';
 include_once __DIR__ . '/header.php';
 //---
 function print_h3_title($h3_title)

src/Tables/include.php

@@ -1,10 +1,12 @@
 <?PHP
 /*
-include_once __DIR__ . '/tables_dir.php';
 include_once __DIR__ . '/tables.php';
 include_once __DIR__ . '/langcode.php';
 include_once __DIR__ . '/sql_tables.php';
 */
+
+include_once __DIR__ . '/tables_dir.php';
+
 foreach (glob(__DIR__ . "/*.php") as $filename) {
     if ($filename == __FILE__) {
         continue;

src/Tables/sql_tables.php

@@ -15,9 +15,6 @@
 include_once __DIR__ . '/Tables/sql_tables.php'; // Tables::$s_cat_titles Tables::$s_cat_to_camp Tables::$s_camp_to_cat
 */
 //---
-include_once __DIR__ . '/../actions/load_request.php';
-include_once __DIR__ . '/../api_or_sql/index.php';
-//---
 use function SQLorAPI\GetDataTab\get_td_or_sql_translate_type;
 use function SQLorAPI\GetDataTab\get_td_or_sql_categories;
 use function SQLorAPI\GetDataTab\get_td_or_sql_settings;

src/Tables/tables.php

@@ -18,7 +18,6 @@
 	error_reporting(E_ALL);
 };
 //---
-include_once __DIR__ . '/../api_or_sql/index.php';
 
 use function SQLorAPI\GetDataTab\get_td_or_sql_titles_infos;
 use function Tables\TablesDir\open_td_Tables_file;

src/api_or_sql/index.php

@@ -23,12 +23,6 @@
     $use_td_api  = $_GET['use_td_api'] != "x";
 }
 
-include_once __DIR__ . '/get_lead.php';
-include_once __DIR__ . '/data_tab.php';
-include_once __DIR__ . '/process_data.php';
-include_once __DIR__ . '/top.php';
-include_once __DIR__ . '/funcs.php';
-
 function isvalid($str)
 {
     return !empty($str) && strtolower($str) != "all";

src/header.php

@@ -12,22 +12,11 @@
 //---
 include_once __DIR__ . '/userinfos_wrap.php';
 //---
-if (isset($GLOBALS['global_username']) && $GLOBALS['global_username'] != '') {
-	$global_username = $GLOBALS['global_username'];
-} else {
-	$GLOBALS['global_username'] = '';
-}
-//---
-include_once __DIR__ . '/renders/include.php';
+include_once __DIR__ . '/include_first/include.php';
 //---
 include_once __DIR__ . '/head.php';
-include_once __DIR__ . '/td_api_wrap/td_api.php';
-include_once __DIR__ . '/Tables/tables_dir.php';
-include_once __DIR__ . '/actions/mdwiki_sql.php';
-include_once __DIR__ . '/actions/html.php';
-include_once __DIR__ . '/api_or_sql/index.php';
 //---
-use function Actions\Html\banner_alert;
+use function TD\Render\Html\banner_alert;
 use function SQLorAPI\Funcs\get_coordinator;
 //---
 $coordinators = array_column(get_coordinator(), 'user');
@@ -43,7 +32,8 @@
 //---
 $coord_tools = "";
 //---
-if (in_array($GLOBALS['global_username'], $coordinators)) {
+// if (in_array($GLOBALS['global_username'], $coordinators)) {
+if ($GLOBALS['user_in_coord'] === true) {
 	$coord_tools = '<a href="/tdc/index.php" class="nav-link py-2 px-0 px-lg-2"><span class="navtitles"></span> <i class="bi bi-tools me-1"></i> Coordinator Tools</a>';
 };
 //---

src/include_all.php

@@ -0,0 +1,26 @@
+<?PHP
+
+// foreach (glob(__DIR__ . "/*.php") as $filename) {
+//     if ($filename == __FILE__) continue;
+//     include_once $filename;
+// }
+
+include_once __DIR__ . '/include_first/include.php';
+
+foreach (glob(__DIR__ . "/actions/*.php") as $filename) {
+    include_once $filename;
+}
+
+foreach (glob(__DIR__ . "/td_api_wrap/*.php") as $filename) {
+    include_once $filename;
+}
+
+foreach (glob(__DIR__ . "/api_or_sql/*.php") as $filename) {
+    include_once $filename;
+}
+
+include_once __DIR__ . "/Tables/include.php";
+
+include_once __DIR__ . '/leaderboard/include_leaderboards.php';
+
+include_once __DIR__ . '/results/include.php';

src/renders/forms.php renamed to src/include_first/forms.php

@@ -1,29 +1,29 @@
 <?php
 
-namespace Actions\Html;
+namespace TD\Render\Html;
 /*
 https://live.datatables.net/lopevege/1/edit
 
 Usage:
-use function Actions\Html\banner_alert;
-use function Actions\Html\login_card;
-use function Actions\Html\makeCard;
-use function Actions\Html\makeColSm4;
-use function Actions\Html\makeDropdown;
-use function Actions\Html\make_cat_url;
-use function Actions\Html\make_col_sm_body;
-use function Actions\Html\make_datalist_options;
-use function Actions\Html\make_drop;
-use function Actions\Html\make_form_check_input;
-use function Actions\Html\make_input_group;
-use function Actions\Html\make_input_group_no_col;
-use function Actions\Html\make_mdwiki_title;
-use function Actions\Html\make_mdwiki_user_url;
-use function Actions\Html\make_modal_fade;
-use function Actions\Html\make_project_to_user;
-use function Actions\Html\make_talk_url;
-use function Actions\Html\make_target_url;
-use function Actions\Html\make_translation_url;
+use function TD\Render\Html\banner_alert;
+use function TD\Render\Html\login_card;
+use function TD\Render\Html\makeCard;
+use function TD\Render\Html\makeColSm4;
+use function TD\Render\Html\makeDropdown;
+use function TD\Render\Html\make_cat_url;
+use function TD\Render\Html\make_col_sm_body;
+use function TD\Render\Html\make_datalist_options;
+use function TD\Render\Html\make_drop;
+use function TD\Render\Html\make_form_check_input;
+use function TD\Render\Html\make_input_group;
+use function TD\Render\Html\make_input_group_no_col;
+use function TD\Render\Html\make_mdwiki_title;
+use function TD\Render\Html\make_mdwiki_user_url;
+use function TD\Render\Html\make_modal_fade;
+use function TD\Render\Html\make_project_to_user;
+use function TD\Render\Html\make_talk_url;
+use function TD\Render\Html\make_target_url;
+use function TD\Render\Html\make_translation_url;
 */
 
 

src/actions/html.php renamed to src/include_first/html.php

@@ -1,7 +1,7 @@
 <?php
 
 /*
-include_once __DIR__ . '/renders/include.php';
+include_once __DIR__ . '/include_first/include.php';
 */
 foreach (glob(__DIR__ . "/*.php") as $filename) {
     if ($filename == __FILE__) {