From f889f52fa0241533918133ef5890aa41fc2d7e1b Mon Sep 17 00:00:00 2001 From: DarkNoon <13015521+darknoon29@users.noreply.github.com> Date: Thu, 20 Jun 2024 10:47:43 +0200 Subject: [PATCH] Sonar Fixes --- includes/chart_js.php | 2 +- includes/config.php | 1 + includes/galaxy.php | 8 +- install/index.php | 6 +- install/install.php | 12 ++- install/upgrade_to_latest.php | 2 +- lang/bs/lang_message.php | 7 +- lang/lang_main.php | 5 +- views/about_ogsteam.php | 1 + views/admin.php | 6 +- views/admin_affichage.php | 116 ++++++++++---------- views/admin_helper.php | 2 +- views/admin_members.php | 114 ++++++++++---------- views/admin_members_group.php | 119 +++++++++++---------- views/admin_mod.php | 88 +++++++-------- views/admin_parameters.php | 194 +++++++++++++++++----------------- views/admin_viewer.php | 80 +++++++------- views/cartography.php | 4 +- views/galaxy.php | 83 +++++++-------- views/galaxy_obsolete.php | 134 +++++++++++------------ views/galaxy_sector.php | 2 +- views/home.php | 20 ++-- views/home_empire.php | 9 +- views/home_simulation.php | 2 +- views/home_spy.php | 48 ++++----- views/home_stat.php | 166 ++++++++++++++--------------- views/login.php | 8 +- 27 files changed, 619 insertions(+), 620 deletions(-) diff --git a/includes/chart_js.php b/includes/chart_js.php index 0feb631e..bfb83284 100644 --- a/includes/chart_js.php +++ b/includes/chart_js.php @@ -250,7 +250,7 @@ function create_curves($_player, $_date_min, $_date_max, $_comp) { $retour = ""; - // todo quel est ce $contenur ? + // TODO quel est ce $contenur ? if (!isset($_player)) { $retour .= affiche_error($conteneur, 'erreur 3'); return $retour; diff --git a/includes/config.php b/includes/config.php index 8f7bb8f6..16c588c6 100644 --- a/includes/config.php +++ b/includes/config.php @@ -1,4 +1,5 @@ - + - + - + @@ -1927,7 +1927,7 @@ function displayGalaxyTablethead()     - +   = 0)) { + if (version_compare(PHP_VERSION, "7.4.0") < 0) { echo "" . $lang['INSTALL_PHPERROR'] . ""; echo "" . $lang['INSTALL_PHP_ADVISE']; echo "

" . $lang['INSTALL_PHPVERSION'] . PHP_VERSION; @@ -128,7 +128,7 @@
OGSpy is an OGSteam Software - (c) 2005-2023
+ (c) 2005-2024 diff --git a/install/install.php b/install/install.php index 5e0e513a..cf9dd882 100644 --- a/install/install.php +++ b/install/install.php @@ -1,4 +1,4 @@ -
OGSpy is an - OGSteam Software (c)2005-2023
v
+ OGSteam Software (c)2005-2024
v diff --git a/install/upgrade_to_latest.php b/install/upgrade_to_latest.php index e40c327a..675e5635 100644 --- a/install/upgrade_to_latest.php +++ b/install/upgrade_to_latest.php @@ -1,4 +1,4 @@ - - * - */ - /* message.php */ $lang['MSG_SYSTEM'] = "Sistemska poruka"; $lang['MSG_FORBIDDEN'] = "Nemate dovoljnu razinu prava za izvršenje ove akcije"; @@ -69,4 +64,4 @@ $lang['MSG_DB_OPTIM_AFTER'] = "Prostora korišteno nakon optimizacije"; $lang['MSG_EMPIRE_DATA_FAILURE'] = "Došlo je do problema prilikom dohvaćanja podataka o carstvu"; $lang['MSG_RATIO_RAZ'] = "Reset omjera je napravljen"; -$lang['MSG_BACK'] = "Natrag"; \ No newline at end of file +$lang['MSG_BACK'] = "Natrag"; diff --git a/lang/lang_main.php b/lang/lang_main.php index d371665c..9672f2d6 100644 --- a/lang/lang_main.php +++ b/lang/lang_main.php @@ -1,4 +1,5 @@ -
+
- +
diff --git a/views/admin_affichage.php b/views/admin_affichage.php index e8ef7da1..07a7baa8 100755 --- a/views/admin_affichage.php +++ b/views/admin_affichage.php @@ -1,4 +1,4 @@ - - + - - + + - onClick="if (view.enable_portee_missil.checked == false) + onClick="if (view.enable_portee_missil.checked == false) view.enable_portee_missil.checked = false;"> @@ -63,7 +63,7 @@ - + @@ -71,178 +71,178 @@ - - + + - onClick="if (view.enable_stat_view.checked == false) + onClick="if (view.enable_stat_view.checked == false) view.enable_members_view.checked = false;"> - - + + - onClick="if (view.enable_stat_view.checked == false) + onClick="if (view.enable_stat_view.checked == false) view.enable_members_view.checked = false;"> - + - + - + - + - + - + - + - - + +
- + - + - + - + - + - + - + - - + + - onClick="if (view.enable_register_view.checked == false) + onClick="if (view.enable_register_view.checked == false) view.enable_members_view.checked = false;"> - - + + - + - + - + - + - + - + + diff --git a/views/admin_helper.php b/views/admin_helper.php index e4adc4ce..e4b70945 100644 --- a/views/admin_helper.php +++ b/views/admin_helper.php @@ -1,4 +1,4 @@ - - + - + @@ -48,14 +48,14 @@ - + - + @@ -63,7 +63,7 @@ - + @@ -71,7 +71,7 @@ - + @@ -79,36 +79,36 @@ - + - +
- + - +
- + - + @@ -119,8 +119,8 @@ @@ -128,10 +128,10 @@ - - + + - + @@ -148,34 +148,34 @@ - + - + - + - + - + - - + + - - + + - +   @@ -196,25 +196,25 @@ -
+ - + - + - + @@ -223,10 +223,10 @@ @@ -238,10 +238,10 @@ @@ -250,29 +250,29 @@ - + - '> + '>
-
+ - '> + '>
-
+ - '> + '>
@@ -281,6 +281,6 @@ - +
diff --git a/views/admin_members_group.php b/views/admin_members_group.php index 4fd649b6..75dabee4 100755 --- a/views/admin_members_group.php +++ b/views/admin_members_group.php @@ -1,4 +1,4 @@ - - + - - + + - + - + @@ -55,23 +55,23 @@
- + - + - + @@ -82,9 +82,9 @@ - + - + 0) : ?> @@ -95,12 +95,12 @@ - ?");> + ?");> @@ -112,21 +112,21 @@ - + @@ -137,147 +137,147 @@
- + - "> + ">
- '> + '> - '> + '>
- + - + - "> + "> - - + + - - + + - + @@ -291,4 +291,3 @@ - \ No newline at end of file diff --git a/views/admin_mod.php b/views/admin_mod.php index 5f472c49..a86c0398 100755 --- a/views/admin_mod.php +++ b/views/admin_mod.php @@ -1,4 +1,4 @@ - - + - - + + @@ -32,39 +32,39 @@ @@ -74,8 +74,8 @@ - - + + @@ -83,39 +83,39 @@ @@ -130,7 +130,7 @@
- + - "> + ">
- + - > + >
- + - > + >
- + - > + >
- + - > + >
- + - > + >
- + - > + >
- + - > + >
- + - > + >
- + - > + >
- + - > + >
- + - > + >
- + - > + >
- +
- - + +
- + - '> + '>   - '> + '> - '> - + '> + - '> - + '> + - '> - + '> + - '> - + '> +
- + - '> + '>   - '> + '> - '> - + '> + - '> - + '> + - '> - + '> + - '> - + '> +
- + @@ -138,22 +138,22 @@ @@ -169,18 +169,18 @@
- + - '> - + '> + - '> - + '> + - '> - + '> +
- + @@ -196,18 +196,18 @@
- + - '> - + '> +
- + diff --git a/views/admin_parameters.php b/views/admin_parameters.php index eaff4269..8ed41027 100755 --- a/views/admin_parameters.php +++ b/views/admin_parameters.php @@ -1,4 +1,4 @@ - - - + + - - + + - - + + - - + + - - + - - + + - + - - + - - + - - + + - - + + - - + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + - - + - - + + - - - + + + - + - - + - - + - - + + - - + + - - + + - - + + - + - + - + - + - + - + - - - - + + - + - - + diff --git a/views/admin_viewer.php b/views/admin_viewer.php index 0b616717..84b738fc 100755 --- a/views/admin_viewer.php +++ b/views/admin_viewer.php @@ -1,4 +1,4 @@ - - - + + + @@ -85,28 +85,28 @@ - @@ -123,9 +123,9 @@ - + @@ -141,28 +141,28 @@ - + - @@ -171,7 +171,7 @@ - + @@ -181,37 +181,37 @@
- + - '> - + '> +
- +
>>
- +
>>
+
- +
- +
- +

+
- +
+
- +

- +
+ 		>>
>>
>>
>>
>>
() ()
TEST
  
+
()
()
>
>
>
>
+
- + 		+

+
- + 		>>
- - + +
-
- + - '" title=''> - &directory=TRUE'" title=''> + '" title=''> + &directory=TRUE'" title=''> - + - + + - '" title=''> + '" title=''> - +
- +
- + - '> - '> + '> + '> - + - + + - '> + '> - - + +
- +
- + - -
- - + +
+ +
-
- - +
+ +
- +
- + - + @@ -227,7 +227,7 @@ echo $line; prev($log); } - ?> + ?> diff --git a/views/cartography.php b/views/cartography.php index b60fde23..e77ed2b3 100755 --- a/views/cartography.php +++ b/views/cartography.php @@ -1,4 +1,4 @@ - \ No newline at end of file +?> diff --git a/views/galaxy.php b/views/galaxy.php index 2270d711..c423e1b7 100755 --- a/views/galaxy.php +++ b/views/galaxy.php @@ -16,12 +16,11 @@ } use Ogsteam\Ogspy\Helper\ToolTip_Helper; +use Ogsteam\Ogspy\Model\Group_Model; global $user_data; $ToolTip_Helper = new ToolTip_Helper(); -//var_dump($user_data); - $info_system = galaxy_show(); $population = $info_system["population"]; $galaxy = $info_system["galaxy"]; @@ -42,9 +41,9 @@ $missil = ""; //TODO sortir requete de la vue //recherche du group -$user_group = (new \Ogsteam\Ogspy\Model\Group_Model())->get_user_group($user_data["user_id"]); +$user_group = (new Group_Model())->get_user_group($user_data["user_id"]); //recherche des droits liés -$tInfosGroups = (new \Ogsteam\Ogspy\Model\Group_Model())->get_group_rights($user_group); +$tInfosGroups = (new Group_Model())->get_group_rights($user_group); //si autorisé server_show_positionhided doit etre a 1 !!!!!!!!!!! @@ -57,7 +56,7 @@ -require_once("views/page_header.php"); +require_once 'views/page_header.php'; ?>
@@ -67,10 +66,10 @@
@@ -78,27 +77,27 @@ @@ -111,11 +110,11 @@ - + - + @@ -161,7 +160,7 @@ $ToolTip_Helper->addTooltip("legende", $legend); ?> @@ -176,7 +175,7 @@ @@ -188,20 +187,20 @@ - [GetHTMLClassContent(array("tooltipstered"), "ttp_alliance_" . $value["ally"]); ?>> - + [GetHTMLClassContent(array("tooltipstered"), "ttp_alliance_" . $value["ally"]) ?>> + ] - &strict=on" GetHTMLClassContent(array("tooltipstered"), "ttp_player_" . $value["player"]); ?>> - + &strict=on" GetHTMLClassContent(array("tooltipstered"), "ttp_player_" . $value["player"]) ?>> + - en - [ " . $value["galaxy"] . ":" . $value['range_up']; ?>] + en + [ " . $value["galaxy"] . ":" . $value['range_up'] ?>] - + @@ -210,7 +209,7 @@ @@ -225,7 +224,7 @@ @@ -233,16 +232,16 @@ @@ -260,15 +259,15 @@ @@ -294,5 +293,5 @@ -require_once("views/page_tail.php"); +require_once 'views/page_tail.php'; ?> diff --git a/views/galaxy_obsolete.php b/views/galaxy_obsolete.php index 780c3fc3..2cb819f1 100755 --- a/views/galaxy_obsolete.php +++ b/views/galaxy_obsolete.php @@ -1,4 +1,4 @@ -
- + - +
- + - +
- + - + - + - + - + - +
- +
@@ -132,22 +131,22 @@ - - + +
- +
- GetHTMLClassContent(); ?>> + GetHTMLClassContent() ?>>
- +
- +
- +
- + - + - + - +
- - + +
- +
- + @@ -88,16 +88,16 @@ - +
@@ -50,36 +50,36 @@ + ?>>    - +       > + ?>> > + ?>>
@@ -107,17 +107,17 @@ ?> - + - - - - - - - - + + + + + + + +
- + - - - - - - - - + + + + + + + +
- + - - - - - - - - + + + + + + + +
- + - - - - - - - - + + + + + + + +
- + - - - - - - - - + + + + + + + +
+ - - - - - - - - + + + + + + + +
- + -
+
- + -
+
- + -
+
- + -
- + + $reqValue) { diff --git a/views/home_simulation.php b/views/home_simulation.php index f168cdac..8a427066 100755 --- a/views/home_simulation.php +++ b/views/home_simulation.php @@ -166,7 +166,7 @@ --> - + diff --git a/views/home_spy.php b/views/home_spy.php index dc9c56f1..b067a989 100755 --- a/views/home_spy.php +++ b/views/home_spy.php @@ -1,4 +1,4 @@ - @@ -82,8 +82,8 @@   - - + + @@ -101,30 +101,30 @@   - "> - + "> + - + diff --git a/views/home_stat.php b/views/home_stat.php index de5a0fea..7c45d117 100755 --- a/views/home_stat.php +++ b/views/home_stat.php @@ -96,16 +96,16 @@ - + - + - + @@ -184,17 +184,17 @@ - -
-
- - + + - - + + - - + + - - + +   - - + + @@ -67,14 +67,14 @@
- +   - - + + - + - + - ' onclick="window.open('index.php?action=show_reportspy&galaxy=&system=&row=&spy_id=','_blank','width=640, height=480, toolbar=0, location=0, directories=0, status=0, scrollbars=1, resizable=1, copyhistory=0, menuBar=0');return(false)" /> + ' onclick="window.open('index.php?action=show_reportspy&galaxy=&system=&row=&spy_id=','_blank','width=640, height=480, toolbar=0, location=0, directories=0, status=0, scrollbars=1, resizable=1, copyhistory=0, menuBar=0');return(false)" /> - ' onclick="window.location = 'index.php?action=del_favorite_spy&spy_id=&info=1';" /> + ' onclick="window.location = 'index.php?action=del_favorite_spy&spy_id=&info=1';" />
- + - " /> + " /> @@ -114,53 +114,53 @@
- + - + - +
- + - " /> + " /> - +
- + - " /> + " />
- + - " alt="zoom" /> + " alt="zoom" />
: - " /> - - " /> - + " /> + + " /> + : " alt="zoom" /> + : " alt="zoom" />
- + +
@@ -325,7 +325,7 @@ } ?>

- +

- + - + @@ -391,15 +391,15 @@ -
"> - +
"> +
-
"> - +
"> +
@@ -409,7 +409,7 @@ - + @@ -422,7 +422,7 @@ - "; ?> + " ?> @@ -435,7 +435,7 @@ - + @@ -458,7 +458,7 @@ - + @@ -478,73 +478,73 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -554,7 +554,7 @@ - + @@ -564,11 +564,11 @@ - + - + @@ -580,11 +580,11 @@ 0) : ?> - + - + @@ -598,11 +598,11 @@ - + - + @@ -614,11 +614,11 @@ 0) : ?> - + - + @@ -630,11 +630,11 @@ - + - + @@ -646,11 +646,11 @@ 0) : ?> - + - + @@ -662,11 +662,11 @@ - + - + @@ -678,11 +678,11 @@ 0) : ?> - + - + @@ -695,11 +695,11 @@ - + - + @@ -711,11 +711,11 @@ 0) : ?> - + - + @@ -727,11 +727,11 @@ - + - + @@ -743,11 +743,11 @@ 0) : ?> - + - + @@ -759,11 +759,11 @@ - + - + @@ -775,11 +775,11 @@ 0) : ?> - + - + @@ -791,11 +791,11 @@ - + - + @@ -807,11 +807,11 @@ 0) : ?> - + - + diff --git a/views/login.php b/views/login.php index c134e1af..3234a941 100755 --- a/views/login.php +++ b/views/login.php @@ -1,4 +1,4 @@ - - \ No newline at end of file +