Skip to content

Commit

Permalink
Merge pull request #7 from Athar42/master
Browse files Browse the repository at this point in the history 
Correctif #6
  • Loading branch information
@darknoon29
darknoon29 authored Nov 12, 2018
2 parents d6fa7eb + 9508d19 commit 7240525
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 34 deletions.
6 changes: 3 additions & 3 deletions includes/qms_html.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ function make_spy_OGameStyle($table_spy,$j,$from_popup=0){ // Affiche l'espion
}
}
else
*/ $s_action = "&nbsp";
*/ $s_action = " ";
// Texte de l'espionnage
$retour = "<tr>";
$retour.="<td class='e' align='center' valign='center' rowspan='2'>$s_action</td><td class='c'>$s_date</td>";
Expand All @@ -297,8 +297,8 @@ function make_spy_OGameStyle($table_spy,$j,$from_popup=0){ // Affiche l'espion
$retour.="</tr>\n";

// Ligne vide pour aérer
echo"<tr><td class='e' colspan='4'>&nbsp</td></tr>\n\n";
echo"<tr><td class='e' colspan='4'>&nbsp;</td></tr>\n\n";

return $retour;
}
?>
?>
6 changes: 3 additions & 3 deletions includes/qms_sql.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ function analyse_globale($periodes,$nb_rapport,$JorA){ // Analyse des esp
$tooltip="";//get_tooltip_spy($name,$sender_list[$j],$datadate,$JorA);
$retour .= "<th><a $tooltip><b>".$count_spy[$name][$s_id]."</b></a></th>\n";
}else
$retour .= "<th>&nbsp</th>\n";
$retour .= "<th>&nbsp;</th>\n";
}
$retour .= "</tr>\n";
}else
Expand All @@ -478,7 +478,7 @@ function analyse_globale($periodes,$nb_rapport,$JorA){ // Analyse des esp
$tooltip="";//get_tooltip_spy("?",$sender_list[$j],$datadate,$JorA);
$retour .= "<th><a $tooltip><b>".$count_spy[$lastone][$s_id]."</b></a></th>\n";
}else
$retour .= "<th>&nbsp</th>\n";
$retour .= "<th>&nbsp;</th>\n";
}
$retour .= "</tr>\n";
}
Expand Down Expand Up @@ -540,4 +540,4 @@ function delete_qms_config($userid){
$query = "DELETE FROM ".TABLE_QMS_config." WHERE `user_id`=".$userid." AND `config`!='search'";
$db->sql_query($query);
}
?>
?>
8 changes: 4 additions & 4 deletions lang/lang_french.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
if (!defined('IN_SPYOGAME')) die("Hacking attempt");

// Jours de la semaine
$day_array = Array ('1'=>'Lundi','2'=>'Mardi','3'=>'Mercredi','4'=>'Jeudi','5'=>'Vendredi','6'=>'Samedi','0'=>'Dimanche');
$day_array = Array ('1'=>'Lundi','2'=>'Mardi','3'=>'Mercredi','4'=>'Jeudi','5'=>'Vendredi','6'=>'Samedi','7'=>'Total','0'=>'Dimanche');

// Variable (pour les helps)
$h_rapport = isset($pub_nb_rapport)?$pub_nb_rapport:0;
Expand Down Expand Up @@ -339,7 +339,7 @@
$lang['qms_spylist_check_inverser'] = "Inverser";
$lang['qms_spylist_check_modifies'] = "Les modifiés";
$lang['qms_spylist_check_inconnus'] = "les &quot?&quot";
$lang['qms_spylist_check_on_selection'] = "sur la sélection...&nbsp";
$lang['qms_spylist_check_on_selection'] = "sur la sélection...&nbsp;";
$lang['qms_spylist_check_on_selection_suppr'] = "Supprimer";
$lang['qms_spylist_check_on_selection_update'] = "Mettre à jour";
$lang['qms_spylist_page_on_page'] = "Page %d sur %d";
Expand Down Expand Up @@ -593,6 +593,6 @@
"<div align=\"right\"><font size=\"2\">%1\$s v%2\$s by <a href='mailto:[email protected]'>Sylar</a> <s>©</s> 2008</font><br/>\n".
"<font size=\"1\">Mod de Gestion des Espionnages subits<br />".
"<a href='index.php?action=%1\$s&page=changelog'>ChangeLog</a> / ".
"<a href='http://board.ogsteam.fr/viewtopic.php?id=4816' target='_blank'>plus d'infos</a></font><br/></div>\n";
"<a href='https://forum.ogsteam.fr/index.php?topic=817.0' target='_blank'>plus d'infos</a></font><br/></div>\n";

?>
?>
2 changes: 1 addition & 1 deletion pages/admin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
</td>
</tr>
<tr>
<th width='10%'>&nbsp</th>
<th width='10%'>&nbsp;</th>
<th width='20%'><?php echo $lang['qms_admin_search_nom'].help('qms_search_nom'); ?></th>
<th width='40%'><?php echo $lang['qms_admin_search_link'].help('qms_search_link'); ?></th>
<th width='20%'><?php echo $lang['qms_admin_search_type'].help('qms_search_type'); ?></th>
Expand Down
4 changes: 2 additions & 2 deletions pages/config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@
echo"\t</tr>";
}
}else{
echo"\t<tr>\n\t\t<td class='c'>".$config['titre']."</td>\n\t\t<td class='d'>&nbsp<td>\n\t</tr>\n";
echo"\t<tr>\n\t\t<td class='c'>".$config['titre']."</td>\n\t\t<td class='d'>&nbsp;<td>\n\t</tr>\n";
}
}
?>
</table>
<center>
<input name='valider_user' type='submit' value='<?php echo $lang['qms_admin_config_submit']; ?>'/>&nbsp
<input name='valider_user' type='submit' value='<?php echo $lang['qms_admin_config_submit']; ?>'/>&nbsp;
<input name='restore_user' type='submit' value='<?php echo $lang['qms_admin_config_restore']; ?>'/>
</center>
</form>
Expand Down
4 changes: 2 additions & 2 deletions pages/own_details.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ function draw_tooltip_for_bbcode_global($id_list,$titre_list){
$code .= "<input type=\"text\" id=\"bb_color4\" name=\"bb_color4\" $styl value=\"".$data[10]."\" onchange=\"update_bbcode()\"><br/>";
$code .= "<br/><input type=\"submit\" name=\"bb_valid\" value=\"".$lang['qms_details_form_save']."\"></form><br/>";
$code .= "</td></tr><tr><th height=\"100%\" style=\"background-color:#FFFFFF\">";
$code .= "<div id=\"apercu_div\" style=\"text-align:left; height:150px; width=380px; overflow:scroll; color:#FFFFFF; background-color:#000000;\">&nbsp</div>";
$code .= "<div id=\"apercu_div\" style=\"text-align:left; height:150px; width=380px; overflow:scroll; color:#FFFFFF; background-color:#000000;\">&nbsp;</div>";
$code .= "</th></tr><tr><td class=\"b\" align=\"center\" colspan=\"2\">";
$code .= "<input type=\"submit\" onclick=\"document.getElementById('bb_div').style.visibility = 'hidden';\" value=\"Cacher...\">";
$code .= "</td></tr></table>";
Expand Down Expand Up @@ -800,4 +800,4 @@ function bb2html(vari)
}
return vari;
}
</script>
</script>
27 changes: 14 additions & 13 deletions pages/popup.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
* @package QuiMSonde
* @author Sylar
* @link http://ogsteam.fr
* @version : 1.5.1
* dernière modification : 11.08.08
* @version : 1.5.2
* dernière modification : 10.11.2018
*/
// On récupére les données
Expand Down Expand Up @@ -103,9 +103,9 @@
// On affiche les cibles
// On recupére les favorites
$cible_most=get_most('cible',$table_spy);
$cible_str1=isset($cible_most['data'][0])?"<a>".$cible_most['data'][0]."</a> <sup>".$cible_most['cnt'][0]."</sup>":"&nbsp";
$cible_str2=isset($cible_most['data'][1])?"<a>".$cible_most['data'][1]."</a> <sup>".$cible_most['cnt'][1]."</sup>":"&nbsp";
$cible_str3=isset($cible_most['data'][2])?"<a>".$cible_most['data'][2]."</a> <sup>".$cible_most['cnt'][2]."</sup>":"&nbsp";
$cible_str1=isset($cible_most['data'][0])?"<a>".$cible_most['data'][0]."</a> <sup>".$cible_most['cnt'][0]."</sup>":"&nbsp;";
$cible_str2=isset($cible_most['data'][1])?"<a>".$cible_most['data'][1]."</a> <sup>".$cible_most['cnt'][1]."</sup>":"&nbsp;";
$cible_str3=isset($cible_most['data'][2])?"<a>".$cible_most['data'][2]."</a> <sup>".$cible_most['cnt'][2]."</sup>":"&nbsp;";
$nb_cible_lst = get_list("cible",$private,"`joueur` = '".$table_spy['joueur'][0]."'");
$nb_cible = count($nb_cible_lst);

Expand All @@ -131,9 +131,9 @@
// On affiche les positions
// On recupére les favorites
$cible_most=get_most('position',$table_spy);
$pos_str1=isset($cible_most['data'][0])?"<a>".$cible_most['data'][0]."</a> <sup>".$cible_most['cnt'][0]."</sup>":"&nbsp";
$pos_str2=isset($cible_most['data'][1])?"<a>".$cible_most['data'][1]."</a> <sup>".$cible_most['cnt'][1]."</sup>":"&nbsp";
$pos_str3=isset($cible_most['data'][2])?"<a>".$cible_most['data'][2]."</a> <sup>".$cible_most['cnt'][2]."</sup>":"&nbsp";
$pos_str1=isset($cible_most['data'][0])?"<a>".$cible_most['data'][0]."</a> <sup>".$cible_most['cnt'][0]."</sup>":"&nbsp;";
$pos_str2=isset($cible_most['data'][1])?"<a>".$cible_most['data'][1]."</a> <sup>".$cible_most['cnt'][1]."</sup>":"&nbsp;";
$pos_str3=isset($cible_most['data'][2])?"<a>".$cible_most['data'][2]."</a> <sup>".$cible_most['cnt'][2]."</sup>":"&nbsp;";
$nb_pos_lst = get_list("position",$private,"`joueur` = '".$table_spy['joueur'][0]."'");
$nb_pos = count($nb_pos_lst);

Expand Down Expand Up @@ -276,8 +276,8 @@ function get_top_hour($tableau,$titre=""){

// Création de la table
for($i=0;$i<24;$i++){
for($j=0;$j<7;$j++) ${'case'.$j} = "<th>&nbsp</th>";
$case7 = "<td class=\"c\">&nbsp</td>";
for($j=0;$j<7;$j++) ${'case'.$j} = "<th>&nbsp;</th>";
$case7 = "<td class=\"c\">&nbsp;</td>";
$total=0;
if(isset($tab[$i])){
foreach($tab[$i] as $k_day => $t_day){
Expand All @@ -295,14 +295,15 @@ function get_top_hour($tableau,$titre=""){
${'case'.$k_day} .= "<font color=\"".get_color($t_day['cnt'],$lemoins[0],$leplus[0])."\">".$t_day['cnt']."</font></a></th>";
}
}
if(isset($total_hour_[$i])&&$total_hour_[$i]>0)
$case7="<td class=\"c\"><font color=\"".get_color($total_hour_[$i],$totalH_min,$totalH_max)."\">".$total_hour_[$i]."</font></td>";
if(isset($total_hour_[$i])&&$total_hour_[$i]>0) {
$case7="<td class=\"c\" align=\"center\"><font color=\"".get_color($total_hour_[$i],$totalH_min,$totalH_max)."\">".$total_hour_[$i]."</font></td>";
}
for($j=0;$j<8;$j++) ${'ligne'.$j} .= ${'case'.$j};
}

// Finalisation : affichage de la derniere colonne.
for($j=0;$j<7;$j++)
${'ligne'.$j} = "<td class=\"c\">".$day_array[$j]."</td>".${'ligne'.$j}."<td class=\"c\">".(isset($total_jour_[$j])?"<font color=\"".($j!=7?get_color($total_jour_[$j],$totalJ_min,$totalJ_max):'#FFFFFF')."\">".$total_jour_[$j]."</font>":"&nbsp")."</td>";
${'ligne'.$j} = "<td class=\"c\">".$day_array[$j]."</td>".${'ligne'.$j}."<td class=\"c\">".(isset($total_jour_[$j])?"<font color=\"".($j!=7?get_color($total_jour_[$j],$totalJ_min,$totalJ_max):'#FFFFFF')."\">".$total_jour_[$j]."</font>":"&nbsp;")."</td>";

// Retour du code de la table
$retour = "<table><tr><td class='c' colspan='26'>$titre</td><tr>$ligne</tr>";
Expand Down
12 changes: 6 additions & 6 deletions pages/spy_list.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@
if($stop>$max_spy) $stop=$max_spy;

// 1ere ligne
$entete_tableau = Array ( Array ( 'class'=>'d', 'sort' => '', 'label' => '&nbsp', 'width' => '20' ),
Array ( 'class'=>'d', 'sort' => '', 'label' => '&nbsp', 'width' => '10' ),
$entete_tableau = Array ( Array ( 'class'=>'d', 'sort' => '', 'label' => '&nbsp;', 'width' => '20' ),
Array ( 'class'=>'d', 'sort' => '', 'label' => '&nbsp;', 'width' => '10' ),
Array ( 'class'=>'c', 'sort' => 'datadate', 'label' => $lang['qms_date'], 'width' => '140' ),
Array ( 'class'=>'c', 'sort' => 'position', 'label' => $lang['qms_depart'], 'width' => '80' ),
Array ( 'class'=>'c', 'sort' => 'joueur', 'label' => $lang['qms_joueur'], 'width' => '180' ),
Expand Down Expand Up @@ -208,9 +208,9 @@
$out_modify = "<a href='$modify_link' onclick=\"$confirm\" $tooltip>$img</a>";
}
else // Pas d'icone pour modifier
$out_modify = "&nbsp";
$out_modify = "&nbsp;";
if($private||($user_data['user_id']==$table_spy['sender_id'][$j])/*||IsUserAdmin()*/)
$out_checkbox="<input type='checkbox' value='".$table_spy['id'][$j]."' name='check_".$j."' id='check_".$j."' inconnu='$player_unknown' modifier='".($out_modify=="&nbsp"?'0':'1')."'>";
$out_checkbox="<input type='checkbox' value='".$table_spy['id'][$j]."' name='check_".$j."' id='check_".$j."' inconnu='$player_unknown' modifier='".($out_modify=="&nbsp;"?'0':'1')."'>";
else
$out_checkbox="";
//-------------INFO
Expand Down Expand Up @@ -245,14 +245,14 @@
}
?>
<tr>
<td class='d'>&nbsp</td>
<td class='d'>&nbsp;</td>
<td class='d' colspan='8'>
<img src='<?php echo FOLDER_QMS; ?>/images/arrow_ltr.png'>
<a href="Javascript:void(0)" onClick="GereChkbox('spy_list','1');"><?php echo $lang['qms_spylist_check_tout']; ?></a> /
<a href="Javascript:void(0)" onClick="GereChkbox('spy_list','0');"><?php echo $lang['qms_spylist_check_aucun']; ?></a> /
<a href="Javascript:void(0)" onClick="GereChkbox('spy_list','2');"><?php echo $lang['qms_spylist_check_inverser']; ?></a> /
<a href="Javascript:void(0)" onClick="GereChkbox('spy_list','3');"><?php echo $lang['qms_spylist_check_modifies']; ?></a> /
<a href="Javascript:void(0)" onClick="GereChkbox('spy_list','4');"><?php echo $lang['qms_spylist_check_inconnus']; ?></a>&nbsp
<a href="Javascript:void(0)" onClick="GereChkbox('spy_list','4');"><?php echo $lang['qms_spylist_check_inconnus']; ?></a>&nbsp;
<img src='<?php echo FOLDER_QMS; ?>/images/ligne.png'>
<input type='hidden' value='<?php echo $start; ?>' name='start'>
<input type='hidden' value='<?php echo $stop; ?>' name='stop'>
Expand Down

0 comments on commit 7240525

Please sign in to comment.