Merge pull request #177 from Mdwiki-TD/update_new

1

Author: MrIbrahem

src/Tables/lang_names.json

@@ -20,7 +20,6 @@
 //---
 
 use function SQLorAPI\GetDataTab\get_td_or_sql_titles_infos;
-use function Tables\TablesDir\open_td_Tables_file;
 
 //---
 class MainTables
@@ -38,10 +37,6 @@ class MainTables
 	'langs_tables' => &MainTables::$x_Langs_table,
 );
 //---
-foreach ($tables_d as $key => &$value) {
-	$value = open_td_Tables_file("jsons/{$key}.json");
-}
-
 $titles_infos = get_td_or_sql_titles_infos();
 
 foreach ($titles_infos as $k => $tab) {
@@ -57,3 +52,14 @@ class MainTables
 	// ---
 	MainTables::$x_Assessments_table[$title] = $tab['importance'];
 };
+
+if (file_exists(__DIR__ . '/lang_names.json')) {
+	$contents = file_get_contents(__DIR__ . '/lang_names.json');
+	if ($contents !== false) {
+		$data = json_decode($contents, true);
+		if (is_array($data)) {
+			MainTables::$x_Langs_table = $data;
+			ksort(MainTables::$x_Langs_table);
+		}
+	}
+}

src/Tables/tables.php

@@ -16,7 +16,7 @@ function post_url_params_result(string $endPoint, array $params = []): string
 
     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_POSTFIELDS, http_build_query($params, '', '&', PHP_QUERY_RFC3986));
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
     // curl_setopt($ch, CURLOPT_COOKIEJAR, "cookie.txt");
     // curl_setopt($ch, CURLOPT_COOKIEFILE, "cookie.txt");
@@ -25,7 +25,7 @@ function post_url_params_result(string $endPoint, array $params = []): string
     curl_setopt($ch, CURLOPT_TIMEOUT, 5);
 
     $output = curl_exec($ch);
-    $url = "{$endPoint}?" . http_build_query($params);
+    $url = "{$endPoint}?" . http_build_query($params, '', '&', PHP_QUERY_RFC3986);
     // ---
     // remove "&format=json" from $url then make it link <a href="$url2">
     $url2 = str_replace('&format=json', '', $url);

src/api_calls/curl_api.php

@@ -17,7 +17,7 @@ function post_url_mdwiki(string $endPoint, array $params = []): string
     curl_setopt_array($ch, [
         CURLOPT_URL => $endPoint,
         CURLOPT_POST => true,
-        CURLOPT_POSTFIELDS => http_build_query($params),
+        CURLOPT_POSTFIELDS => http_build_query($params, '', '&', PHP_QUERY_RFC3986),
         CURLOPT_RETURNTRANSFER => true,
         CURLOPT_USERAGENT => $usr_agent,
         CURLOPT_CONNECTTIMEOUT => 5,
@@ -29,7 +29,7 @@ function post_url_mdwiki(string $endPoint, array $params = []): string
     // ---
     $output = curl_exec($ch);
     // ---
-    $url = "{$endPoint}?" . http_build_query($params);
+    $url = "{$endPoint}?" . http_build_query($params, '', '&', PHP_QUERY_RFC3986);
     // ---
     // remove "&format=json" from $url then make it link <a href="$url2">
     $url2 = str_replace('&format=json', '', $url);

src/api_calls/mdwiki_api.php

@@ -24,7 +24,7 @@ function make_view_by_number($target, $numb, $lang, $pupdate)
         // 'range' => 'all-time',
         'redirects' => '0',
         'pages' => $target,
-    ));
+    ), '', '&', PHP_QUERY_RFC3986);
     // ---
     $numb3 = (is_numeric($numb2)) ? number_format($numb2) : $numb2;
     $link = "<a target='_blank' href='$url'>$numb3</a>";

src/api_calls/wiki_api.php

@@ -192,7 +192,7 @@ function get_td_or_sql_users_no_inprocess()
     return $users;
 }
 
-function get_td_or_sql_full_translators()
+function get_td_or_sql_full_translators($column = null)
 {
     // ---
     static $full_tr = [];
@@ -203,6 +203,10 @@ function get_td_or_sql_full_translators()
     $query = "SELECT * FROM full_translators";
     $full_tr = super_function($api_params, [], $query);
     // ---
+    if ($column) {
+        return array_column($full_tr, $column);
+    }
+    // ---
     return $full_tr;
 }
 

src/api_or_sql/data_tab.php

@@ -1,5 +1,5 @@
 <?PHP
 //---
-$stats = http_build_query($_GET);
+$stats = http_build_query($_GET, '', '&', PHP_QUERY_RFC3986);
 //---
 HEADER("Location: /auth/index.php?$stats");

src/auth.php

@@ -1,5 +1,5 @@
 <?PHP
 //---
-$stats = http_build_query($_GET);
+$stats = http_build_query($_GET, '', '&', PHP_QUERY_RFC3986);
 //---
 HEADER("Location: /tdc/index.php?$stats");

src/coordinator.php

@@ -211,8 +211,8 @@ function make_translation_url($title, $lang, $tr_type)
     //---
     $url = "//$lang.wikipedia.org/wiki/Special:ContentTranslation";
     //---
-    // $url .= "?" . http_build_query($params) . "#/sx/sentence-selector";
-    $url .= "?" . http_build_query($params) . "#/sx?previousRoute=dashboard&eventSource=direct_preselect";
+    // $url .= "?" . http_build_query($params, '', '&', PHP_QUERY_RFC3986) . "#/sx/sentence-selector";
+    $url .= "?" . http_build_query($params, '', '&', PHP_QUERY_RFC3986) . "#/sx?previousRoute=dashboard&eventSource=direct_preselect";
     //---
     // $url = "//$lang.wikipedia.org/wiki/Special:ContentTranslation?page=User%3AMr.+Ibrahem%2F$title&from=en&to=$lang&targettitle=$title#draft";
     //---

src/include_first/html.php

@@ -19,7 +19,7 @@ function open_td_Tables_file($path, $echo = true)
 {
 	$tables_dir = getenv("HOME") . '/public_html/td/Tables';
 	//---
-	if (substr($tables_dir, 0, 2) == 'I:') {
+	if (substr(__DIR__, 0, 2) == 'I:') {
 		$tables_dir = 'I:/mdwiki/mdwiki/public_html/td/Tables';
 	}
 	//---