Compare commits

..

No commits in common. "f05edd0fc7c382588a270f3b53854ebdab216f9b" and "68a98fb5a5de773c6602aa8a6ff04954e4d861e1" have entirely different histories.

5 changed files with 12 additions and 67 deletions

View File

@ -132,14 +132,14 @@ Exemples: <?= $_SERVER['REMOTE_ADDR']; ?>/24 <?= $_SERVER['SERVER_NAME']; ?> 10.
title="[num de protocole]"> title="[num de protocole]">
</div> </div>
<div class="inline fields"> <div class="fields">
<div class="field"> <div class="inline field">
<div class="ui toggle checkbox"> <div class="ui toggle checkbox">
<input type="checkbox" id="PRCheckbox" name="-PR" <?= $options['-PR'] ?? false ? 'checked' : ''; ?> /> <input type="checkbox" id="PRCheckbox" name="-PR" <?= $options['-PR'] ?? false ? 'checked' : ''; ?> />
<label for="PRCheckbox" title="-PR">Ping ARP</label> <label for="PRCheckbox" title="-PR">Ping ARP</label>
</div> </div>
</div> </div>
<div class="field"> <div class="inline field">
<div class="ui toggle checkbox"> <div class="ui toggle checkbox">
<input type="checkbox" id="sendIPCheckbox" name="--send-ip" <?= $options['--send-ip'] ?? false ? 'checked' : ''; ?> /> <input type="checkbox" id="sendIPCheckbox" name="--send-ip" <?= $options['--send-ip'] ?? false ? 'checked' : ''; ?> />
<label for="sendIPCheckbox" title="--send-ip">Pas de scan ARP</label> <label for="sendIPCheckbox" title="--send-ip">Pas de scan ARP</label>
@ -147,14 +147,14 @@ Exemples: <?= $_SERVER['REMOTE_ADDR']; ?>/24 <?= $_SERVER['SERVER_NAME']; ?> 10.
</div> </div>
</div> </div>
<div class="inline fields"> <div class="fields">
<div class="field"> <div class="inline field">
<div class="ui toggle checkbox"> <div class="ui toggle checkbox">
<input type="checkbox" id="nCheckbox" name="-n" <?= $options['-n'] ?? false ? 'checked' : ''; ?> /> <input type="checkbox" id="nCheckbox" name="-n" <?= $options['-n'] ?? false ? 'checked' : ''; ?> />
<label for="nCheckbox" title="-n">Ne jamais résoudre les noms DNS</label> <label for="nCheckbox" title="-n">Ne jamais résoudre les noms DNS</label>
</div> </div>
</div> </div>
<div class="field"> <div class="inline field">
<div class="ui toggle checkbox"> <div class="ui toggle checkbox">
<input type="checkbox" id="RCheckbox" name="-R" <?= $options['-R'] ?? false ? 'checked' : ''; ?> /> <input type="checkbox" id="RCheckbox" name="-R" <?= $options['-R'] ?? false ? 'checked' : ''; ?> />
<label for="nCheckbox" title="-R">Toujours résoudre les noms DNS<br />(par défault seuls les hôtes actifs sont résolus)</label> <label for="nCheckbox" title="-R">Toujours résoudre les noms DNS<br />(par défault seuls les hôtes actifs sont résolus)</label>
@ -397,7 +397,7 @@ Exemples: <?= $_SERVER['REMOTE_ADDR']; ?>/24 <?= $_SERVER['SERVER_NAME']; ?> 10.
<div class="field"> <div class="field">
<label for="maxOSTriesInput" title="--max-os-tries">Nombre d'essais maximum</label> <label for="maxOSTriesInput" title="--max-os-tries">Nombre d'essais maximum</label>
<input type="number" min="0" id="maxOSTriesInput" name="--max-os-tries" placeholder="Tentatives" <input type="number" min="0" id="maxOSTriesInput" name="--max-os-tries" placeholder="Nombre d'essais"
value="<?= $options["--max-os-tries"] ?? "" ?>"> value="<?= $options["--max-os-tries"] ?? "" ?>">
</div> </div>
</div> </div>
@ -415,56 +415,6 @@ Exemples: <?= $_SERVER['REMOTE_ADDR']; ?>/24 <?= $_SERVER['SERVER_NAME']; ?> 10.
<option value="5"<?=($options["-T"]??"")==5?" selected":""?>>Dément</option> <option value="5"<?=($options["-T"]??"")==5?" selected":""?>>Dément</option>
</select> </select>
</div> </div>
<div class="field">
<label for="refreshPeriodInput">Rafraîchir toutes les</label>
<div class="ui right labeled input">
<input type="number" min="0" id="refreshPeriodInput" name="refreshPeriod" placeholder="Période"
value="<?= $options["refreshPeriod"] ?? "" ?>">
<div class="ui label">secondes</div>
</div>
</div>
<div class="field">
<label>Temps d'aller-retour des paquets de tests</label>
<div class="two fields">
<div class="field">
<label for="minRTTInput">Minimum</label>
<div class="ui right labeled input">
<input type="number" min="0" id="minRTTDuration" placeholder="Durée"
oninput="minRTTHidden.value = minRTTDuration.value? minRTTDuration.value+minRTTUnit.value: ''; maxRTTHidden.min=minRTTHidden.value"
<?= preg_match("/^\d+/", $options["--min-rtt-timeout"] ?? "", $matches) ? "value='{$matches[0]}'" : "" ?>>
<select class="ui dropdown label" id="minRTTUnit"
oninput="minRTTHidden.value = minRTTDuration.value? minRTTDuration.value+minRTTUnit.value: ''">
<option value="">millisecondes</option>
<option value="s" <?=substr($options["--min-rtt-timeout"] ?? "", -1) == "s" ? "selected" : "" ?>>secondes</option>
<option value="m" <?=substr($options["--min-rtt-timeout"] ?? "", -1) == "m" ? "selected" : "" ?>>minutes</option>
<option value="h" <?=substr($options["--min-rtt-timeout"] ?? "", -1) == "h" ? "selected" : "" ?>>heures</option>
</select>
</div>
<input type="hidden" id="minRTTHidden" name="--min-rtt-timeout"
value="<?= $options["--min-rtt-timeout"] ?? "" ?>">
</div>
<div class="field">
<label for="maxRTTInput">Maximum</label>
<div class="ui right labeled input">
<input type="number" max="0" id="maxRTTDuration" placeholder="Durée"
oninput="maxRTTHidden.value = maxRTTDuration.value? maxRTTDuration.value+maxRTTUnit.value: ''; minRTTHidden.max=maxRTTHidden.value"
<?= preg_match("/^\d+/", $options["--max-rtt-timeout"] ?? "", $matches) ? "value='{$matches[0]}'" : "" ?>>
<select class="ui dropdown label" id="maxRTTUnit"
oninput="maxRTTHidden.value = maxRTTDuration.value? maxRTTDuration.value+maxRTTUnit.value: ''">
<option value="">millisecondes</option>
<option value="s" <?=substr($options["--max-rtt-timeout"] ?? "", -1) == "s" ? "selected" : "" ?>>secondes</option>
<option value="m" <?=substr($options["--max-rtt-timeout"] ?? "", -1) == "m" ? "selected" : "" ?>>minutes</option>
<option value="h" <?=substr($options["--max-rtt-timeout"] ?? "", -1) == "h" ? "selected" : "" ?>>heures</option>
</select>
</div>
<input type="hidden" id="maxRTTHidden" name="--max-rtt-timeout"
value="<?= $options["--max-rtt-timeout"] ?? "" ?>">
</div>
</div>
</div>
</div> </div>
<div class="title"><i class="icon dropdown"></i>Divers</div> <div class="title"><i class="icon dropdown"></i>Divers</div>
@ -637,15 +587,10 @@ foreach ([$DATADIR, $NMAPDIR] as $dir) {
$(".ui.accordion").accordion() $(".ui.accordion").accordion()
$("#stylesheetSelect").dropdown()
$("#compareWithSelect").dropdown({ $("#compareWithSelect").dropdown({
clearable: true clearable: true
}) })
$("#minRTTUnit").dropdown({
clearable: true
})
$("#maxRTTUnit").dropdown({
clearable: true
})
new TagsInput(targetsInput, {}, " ") new TagsInput(targetsInput, {}, " ")
new TagsInput(excludeInput) new TagsInput(excludeInput)

View File

@ -32,7 +32,7 @@ Exemples: <?= $_SERVER['REMOTE_ADDR']; ?>/24 <?= $_SERVER['SERVER_NAME']; ?> 10.
</div> </div>
<button id="hiddenButton" style="display: none;" type="submit" formmethod="get" formaction="scan.php"></button> <button id="hiddenButton" style="display: none;" type="submit" formmethod="get" formaction="scan.php"></button>
<button class="ui teal icon submit button" type="submit" formmethod="get" formaction="options.php" onclick="targetsInput.required=false"> <button class="ui teal icon submit button" type="submit" formmethod="get" formaction="options.php" onclick="targetsInput.required=false">
<i class="settings icon"></i> <i class="sliders horizontal icon"></i>
</button> </button>
<a class="ui teal icon button" href="https://nmap.org/man/fr/index.html" target="_blank"> <a class="ui teal icon button" href="https://nmap.org/man/fr/index.html" target="_blank">
<i class="question circle icon"></i> <i class="question circle icon"></i>

View File

@ -176,7 +176,7 @@ function hostScanning(link) {
<xsl:text>/?preset=host&amp;targets=</xsl:text> <xsl:text>/?preset=host&amp;targets=</xsl:text>
<xsl:value-of select="$hostAddress"/> <xsl:value-of select="$hostAddress"/>
</xsl:attribute> </xsl:attribute>
<i class="settings icon"></i> <i class="sliders horizontal icon"></i>
</a> </a>
</div> </div>
</div> </div>

View File

@ -187,7 +187,7 @@ function hostScanning(link) {
<xsl:text>/?preset=host&amp;targets=</xsl:text> <xsl:text>/?preset=host&amp;targets=</xsl:text>
<xsl:value-of select="$hostAddress"/> <xsl:value-of select="$hostAddress"/>
</xsl:attribute> </xsl:attribute>
<i class="settings icon"></i> <i class="sliders horizontal icon"></i>
</a> </a>
</div> </div>
</td> </td>

View File

@ -39,7 +39,7 @@ Exemples: 192.168.1.0/24 scanme.nmap.org 10.0-255.0-255.1-254"/>
<i class="sync icon"></i> <i class="sync icon"></i>
</button> </button>
<button class="ui teal icon submit button" type="submit" formmethod="get" formaction="{$basedir}/"> <button class="ui teal icon submit button" type="submit" formmethod="get" formaction="{$basedir}/">
<i class="settings icon"></i> <i class="sliders horizontal icon"></i>
</button> </button>
<a class="ui teal icon button" href="https://nmap.org/man/fr/index.html" target="_blank"> <a class="ui teal icon button" href="https://nmap.org/man/fr/index.html" target="_blank">
<i class="question circle icon"></i> <i class="question circle icon"></i>