Merge pull request #176 from Mdwiki-TD/update_new

.

Author: MrIbrahem

src/Tables/include.php

@@ -5,11 +5,11 @@
 include_once __DIR__ . '/sql_tables.php';
 */
 
-include_once __DIR__ . '/tables_dir.php';
-
 foreach (glob(__DIR__ . "/*.php") as $filename) {
-    if ($filename == __FILE__) {
+    if ($filename == __FILE__ || basename($filename) == 'langcode.php') {
         continue;
     }
     include_once $filename;
 }
+
+include_once __DIR__ . '/langcode.php';

src/Tables/langcode.php

@@ -43,7 +43,7 @@
 "zh-yue" : "yue"
 */
 // ---
-require_once __DIR__ . '/tables.php';
+// require_once __DIR__ . '/tables.php';
 
 use Tables\Main\MainTables;
 

src/actions/curl_api.php renamed to src/api_calls/curl_api.php

@@ -1,10 +1,9 @@
 <?php
 
-namespace Actions\CurlApi;
+namespace APICalls\CurlApi;
 /*
 Usage:
-require_once __DIR__ . '/../actions/curl_api.php';
-use function Actions\CurlApi\post_url_params_result;
+use function APICalls\CurlApi\post_url_params_result;
 */
 
 use function TD\Render\TestPrint\test_print;

src/actions/mdwiki_api.php renamed to src/api_calls/mdwiki_api.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Actions\MdwikiApi;
+namespace APICalls\MdwikiApi;
 /*
 Usage:
-use function Actions\MdwikiApi\get_mdwiki_url_with_params;
+use function APICalls\MdwikiApi\get_mdwiki_url_with_params;
 */
 
 use function TD\Render\TestPrint\test_print;
@@ -13,18 +13,22 @@ function post_url_mdwiki(string $endPoint, array $params = []): string
     $usr_agent = "WikiProjectMed Translation Dashboard/1.0 (https://mdwiki.toolforge.org/; [email protected])";
 
     $ch = curl_init();
-
-    curl_setopt($ch, CURLOPT_URL, $endPoint);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($params));
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-    // curl_setopt($ch, CURLOPT_COOKIEJAR, "cookie.txt");
-    // curl_setopt($ch, CURLOPT_COOKIEFILE, "cookie.txt");
-    curl_setopt($ch, CURLOPT_USERAGENT, $usr_agent);
-    curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
-    curl_setopt($ch, CURLOPT_TIMEOUT, 5);
-
+    // ---
+    curl_setopt_array($ch, [
+        CURLOPT_URL => $endPoint,
+        CURLOPT_POST => true,
+        CURLOPT_POSTFIELDS => http_build_query($params),
+        CURLOPT_RETURNTRANSFER => true,
+        CURLOPT_USERAGENT => $usr_agent,
+        CURLOPT_CONNECTTIMEOUT => 5,
+        CURLOPT_TIMEOUT => 5,
+        // لاستخدام ملفات الكوكيز عند الحاجة:
+        // CURLOPT_COOKIEJAR => "cookie.txt",
+        // CURLOPT_COOKIEFILE => "cookie.txt",
+    ]);
+    // ---
     $output = curl_exec($ch);
+    // ---
     $url = "{$endPoint}?" . http_build_query($params);
     // ---
     // remove "&format=json" from $url then make it link <a href="$url2">

src/actions/mdwiki_sql.php renamed to src/api_calls/mdwiki_sql.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Actions\MdwikiSql;
+namespace APICalls\MdwikiSql;
 /*
 Usage:
-use function Actions\MdwikiSql\fetch_query;
-use function Actions\MdwikiSql\execute_query;
+use function APICalls\MdwikiSql\fetch_query;
+use function APICalls\MdwikiSql\execute_query;
 */
 
 if (isset($_REQUEST['test']) || isset($_COOKIE['test'])) {

src/actions/wiki_api.php renamed to src/api_calls/wiki_api.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Actions\WikiApi;
+namespace APICalls\WikiApi;
 /*
 Usage:
-use function Actions\WikiApi\make_view_by_number;
-use function Actions\WikiApi\get_views;
+use function APICalls\WikiApi\make_view_by_number;
+use function APICalls\WikiApi\get_views;
 */
 
 function make_view_by_number($target, $numb, $lang, $pupdate)

src/api_or_sql/index.php

@@ -11,8 +11,8 @@
 
 */
 
-use function Actions\MdwikiSql\fetch_query;
-use function Actions\TDApi\get_td_api;
+use function APICalls\MdwikiSql\fetch_query;
+use function APICalls\TDApi\get_td_api;
 use function TD\Render\TestPrint\test_print;
 
 $settings_tabe = array_column(get_td_api(['get' => 'settings']), 'value', 'title');

src/include_all.php

@@ -7,7 +7,7 @@
 
 include_once __DIR__ . '/include_first/include.php';
 
-foreach (glob(__DIR__ . "/actions/*.php") as $filename) {
+foreach (glob(__DIR__ . "/api_calls/*.php") as $filename) {
     include_once $filename;
 }
 

src/Tables/tables_dir.php renamed to src/include_first/tables_dir.php

@@ -15,20 +15,13 @@
 
 use function TD\Render\TestPrint\test_print;
 
-$tables_dir = __DIR__ . '/../../td/Tables';
-//---
-if (substr($tables_dir, 0, 2) == 'I:') {
-	$tables_dir = 'I:/mdwiki/mdwiki/public_html/td/Tables';
-}
-//---
-if (!getenv('tables_dir')) {
-	// set env
-	putenv('tables_dir=' . $tables_dir);
-}
-
 function open_td_Tables_file($path, $echo = true)
 {
-	global $tables_dir;
+	$tables_dir = getenv("HOME") . '/public_html/td/Tables';
+	//---
+	if (substr($tables_dir, 0, 2) == 'I:') {
+		$tables_dir = 'I:/mdwiki/mdwiki/public_html/td/Tables';
+	}
 	//---
 	$file_path = "$tables_dir/$path";
 	//---

src/leaderboard/subs/lead_help.php

@@ -15,7 +15,7 @@
 
 use Tables\Main\MainTables;
 use Tables\SqlTables\TablesSql;
-use function Actions\WikiApi\make_view_by_number;
+use function APICalls\WikiApi\make_view_by_number;
 use function TD\Render\Html\make_cat_url;
 use function TD\Render\Html\make_mdwiki_title;
 use function TD\Render\Html\make_target_url;