refactor: Refactor fix php codesniffer 3.x issues (#7816)

We cannot use 3.x because it requires php 5.4, so update to 2.9.1 or newer 2.x release.
2024-10-07 16:52:45 +00:00 · 2017-11-29 02:23:19 -06:00
parent ce913cd8d3
commit d6db01abb5
23 changed files with 231 additions and 171 deletions
--- a/composer.json
+++ b/composer.json
@@ -34,7 +34,7 @@
        "palanik/corsslim": "^1.1"
    },
    "require-dev": {
-        "squizlabs/php_codesniffer": "2.6.*",
+        "squizlabs/php_codesniffer": "^2.9.1",
        "phpunit/phpunit": "4.*",
        "jakub-onderka/php-parallel-lint": "*",
        "jakub-onderka/php-console-highlighter": "*",
--- a/html/includes/modal/new_bill.inc.php
+++ b/html/includes/modal/new_bill.inc.php
@@ -53,7 +53,8 @@ if (is_admin() !== false) {
                    <label class="col-sm-4 control-label" for="port_id">Port</label>
                    <div class="col-sm-8">
                        <select class="form-control input-sm" id="port_id" name="port_id">
-                        <?php if (is_array($port)) {
+                        <?php
+                        if (is_array($port)) {
                            // Need to pre-populate port as we've got a port pre-selected
                            foreach (dbFetch('SELECT * FROM ports WHERE device_id = ?', array($port_device_id)) as $interface) {
                                $interface  = cleanPort($interface);
@@ -61,7 +62,8 @@ if (is_admin() !== false) {
                                $selected = $interface['port_id'] === $port['port_id'] ? " selected" : "";
                                echo "<option value='${interface['port_id']}' $selected>$string</option>\n";
                            }
-}   ?>
+                        }
+                        ?>
                        </select>
                    </div>
                </div>
--- a/html/install.php
+++ b/html/install.php
@@ -221,9 +221,12 @@ echo "</td></tr>";
      <div class="col-md-6 col-md-offset-3">
        <form class="form-inline" role="form" method="post">
          <input type="hidden" name="stage" value="1">
-          <button type="submit" class="btn btn-success pull-right" <?php if (!$complete) {
+          <button type="submit" class="btn btn-success pull-right"
+            <?php
+            if (!$complete) {
                echo "disabled='disabled'";
-} ?>>Next Stage</button>
+            }
+            ?>>Next Stage</button>
        </form>
      </div>
    </div>
@@ -498,9 +501,12 @@ if (Auth::get()->canManageUsers()) {
          <input type="hidden" name="dbpass" value="<?php echo $dbpass; ?>">
          <input type="hidden" name="dbname" value="<?php echo $dbname; ?>">
          <input type="hidden" name="dbsocket" value="<?php echo $dbsocket; ?>">
-          <button type="submit" class="btn btn-success pull-right" <?php if ($proceed == "1") {
+          <button type="submit" class="btn btn-success pull-right"
+            <?php
+            if ($proceed == "1") {
                echo "disabled='disabled'";
-} ?>>Generate Config</button>
+            }
+            ?>>Generate Config</button>
        </form>
      </div>
      <div class="col-md-3">
--- a/html/pages/bill/addoreditbill.inc.php
+++ b/html/pages/bill/addoreditbill.inc.php
@@ -9,14 +9,20 @@
  <label class="col-sm-4 control-label" for="bill_type">Billing Type</label>
  <div class="col-sm-8">
    <label class="radio-inline">
-      <input type="radio" name="bill_type" id="bill_type_cdr" value="cdr" <?php if ($bill_data['bill_type'] == 'cdr') {
+      <input type="radio" name="bill_type" id="bill_type_cdr" value="cdr"
+            <?php
+            if ($bill_data['bill_type'] == 'cdr') {
                echo "checked";
-} ?> onchange="javascript: billType();" /> CDR 95th
+            }
+            ?> onchange="javascript: billType();" /> CDR 95th
    </label>
    <label class="radio-inline">
-      <input type="radio" name="bill_type" id="bill_type_quota" value="quota" <?php if ($bill_data['bill_type'] == 'quota') {
+      <input type="radio" name="bill_type" id="bill_type_quota" value="quota"
+            <?php
+            if ($bill_data['bill_type'] == 'quota') {
                echo "checked";
-} ?> onchange="javascript: billType();" /> Quota
+            }
+            ?> onchange="javascript: billType();" /> Quota
    </label>
  </div>
 </div>
--- a/html/pages/bills.inc.php
+++ b/html/pages/bills.inc.php
@@ -127,21 +127,33 @@ include 'includes/modal/new_bill.inc.php';
                    </select>
                    <select name='bill_type' id='bill_type' class="form-control input-sm">
                      <option value=''>All Types</option>
-                      <option value='cdr' <?php if ($_GET['bill_type'] === 'cdr') {
+                      <option value='cdr'
+                            <?php
+                            if ($_GET['bill_type'] === 'cdr') {
                                echo 'selected';
-} ?>>CDR</option>
-                      <option value='quota' <?php if ($_GET['bill_type'] === 'quota') {
+                            }
+                            ?>>CDR</option>
+                      <option value='quota'
+                            <?php
+                            if ($_GET['bill_type'] === 'quota') {
                                echo 'selected';
-} ?>>Quota</option>
+                            }
+                            ?>>Quota</option>
                    </select>
                    <select name='state' id='state' class="form-control input-sm">
                      <option value=''>All States</option>
-                      <option value='under' <?php if ($_GET['state'] === 'under') {
+                      <option value='under'
+                            <?php
+                            if ($_GET['state'] === 'under') {
                                echo 'selected';
-} ?>>Under Quota</option>
-                      <option value='over' <?php if ($_GET['state'] === 'over') {
+                            }
+                            ?>>Under Quota</option>
+                      <option value='over'
+                            <?php
+                            if ($_GET['state'] === 'over') {
                                echo 'selected';
-} ?>>Over Quota</option>
+                            }
+                            ?>>Over Quota</option>
                    </select>
                  </fieldset>
                </span>
--- a/html/pages/device/edit/device.inc.php
+++ b/html/pages/device/edit/device.inc.php
@@ -145,33 +145,45 @@ if ($updated && $update_message) {
 <div class="form-group">
    <label for="sysLocation" class="col-sm-2 control-label">Override sysLocation:</label>
    <div class="col-sm-6">
-      <input onclick="edit.sysLocation.disabled=!edit.override_sysLocation.checked" type="checkbox" name="override_sysLocation"<?php if ($override_sysLocation) {
+      <input onclick="edit.sysLocation.disabled=!edit.override_sysLocation.checked" type="checkbox" name="override_sysLocation"
+            <?php
+            if ($override_sysLocation) {
                echo(' checked="1"');
-} ?> />
+            }
+            ?> />
    </div>
 </div>
 <div class="form-group">
    <div class="col-sm-2"></div>
    <div class="col-sm-6">
-      <input id="sysLocation" name="sysLocation" class="form-control" <?php if (!$override_sysLocation) {
+      <input id="sysLocation" name="sysLocation" class="form-control"
+            <?php
+            if (!$override_sysLocation) {
                echo(' disabled="1"');
-} ?> value="<?php echo($override_sysLocation_string); ?>" />
+            }
+            ?> value="<?php echo($override_sysLocation_string); ?>" />
    </div>
 </div>
 <div class="form-group">
    <label for="disabled" class="col-sm-2 control-label">Disable:</label>
    <div class="col-sm-6">
-      <input name="disabled" type="checkbox" id="disabled" value="1" <?php if ($device["disabled"]) {
+      <input name="disabled" type="checkbox" id="disabled" value="1"
+            <?php
+            if ($device["disabled"]) {
                echo("checked=checked");
-} ?> />
+            }
+            ?> />
    </div>
 </div>
 <div class="form-group">
    <label for="ignore" class="col-sm-2 control-label">Ignore</label>
    <div class="col-sm-6">
-       <input name="ignore" type="checkbox" id="ignore" value="1" <?php if ($device['ignore']) {
+       <input name="ignore" type="checkbox" id="ignore" value="1"
+            <?php
+            if ($device['ignore']) {
                echo("checked=checked");
-} ?> />
+            }
+            ?> />
    </div>
 </div>
 <div class="row">
--- a/html/pages/ports.inc.php
+++ b/html/pages/ports.inc.php
@@ -114,22 +114,37 @@ foreach ($results as $data) {

 ?>
      </select>
-      <input type="text" name="hostname" id="hostname" title="Hostname" class="form-control input-sm" <?php if (strlen($vars['hostname'])) {
+      <input type="text" name="hostname" id="hostname" title="Hostname" class="form-control input-sm"
+            <?php
+            if (strlen($vars['hostname'])) {
                echo('value="' . $vars['hostname'] . '"');
-} ?> placeholder="Hostname" />
+            }
+            ?> placeholder="Hostname"/>
    </div>
    <div class="form-group">
      <select name="state" id="state" class="form-control input-sm">
        <option value="">All States</option>
-        <option value="up" <?php if ($vars['state'] == "up") {
+        <option value="up"
+            <?php
+            if ($vars['state'] == "up") {
                echo("selected");
-} ?>>Up</option>
-        <option value="down"<?php if ($vars['state'] == "down") {
+            }
+            ?>>Up
+        </option>
+        <option value="down"
+            <?php
+            if ($vars['state'] == "down") {
                echo("selected");
-} ?>>Down</option>
-        <option value="admindown" <?php if ($vars['state'] == "admindown") {
+            }
+            ?>>Down
+        </option>
+        <option value="admindown"
+            <?php
+            if ($vars['state'] == "admindown") {
                echo("selected");
-} ?>>Shutdown</option>
+            }
+            ?>>Shutdown
+        </option>
      </select>

      <select name="ifSpeed" id="ifSpeed" class="form-control input-sm">
@@ -201,9 +216,12 @@ foreach ($ports as $data) {
      </select>
    </div>
    <div class="form-group">
-      <input title="Port Description" type="text" name="ifAlias" id="ifAlias" class="form-control input-sm" <?php if (strlen($vars['ifAlias'])) {
+      <input title="Port Description" type="text" name="ifAlias" id="ifAlias" class="form-control input-sm"
+            <?php
+            if (strlen($vars['ifAlias'])) {
                echo('value="' . $vars['ifAlias'] . '"');
-} ?> placeholder="Port Description"/>
+            }
+            ?> placeholder="Port Description"/>
        <select title="Location" name="location" id="location" class="form-control input-sm">
          <option value="">All Locations</option>
 <?php
@@ -223,17 +241,26 @@ foreach (getlocations() as $location) {
      </div>
      <div class="form-group">
        <label for="ignore">Ignored</label>
-        <input type=checkbox id="ignore" name="ignore" value="1" <?php if ($vars['ignore']) {
+        <input type=checkbox id="ignore" name="ignore" value="1"
+            <?php
+            if ($vars['ignore']) {
                echo("checked");
-} ?> >
+            }
+            ?> >
        <label for="disabled">Disabled</label>
-        <input type=checkbox id="disabled" name="disabled" value=1 <?php if ($vars['disabled']) {
+        <input type=checkbox id="disabled" name="disabled" value=1
+            <?php
+            if ($vars['disabled']) {
                echo("checked");
-} ?> >
+            }
+            ?> >
        <label for="deleted">Deleted</label>
-        <input type=checkbox id="deleted" name="deleted" value=1 <?php if ($vars['deleted']) {
+        <input type=checkbox id="deleted" name="deleted" value=1
+            <?php
+            if ($vars['deleted']) {
                echo("checked");
-} ?> >
+            }
+            ?> >
      </div>
      <button type="submit" class="btn btn-default btn-sm">Search</button>
      <a class="btn btn-default btn-sm" href="<?php echo(generate_url(array('page' => 'ports', 'section' => $vars['section'], 'bare' => $vars['bare']))); ?>" title="Reset critera to default." >Reset</a>
--- a/includes/polling/os/calix.inc.php
+++ b/includes/polling/os/calix.inc.php
@@ -15,9 +15,7 @@


 if (strstr($sysObjectId, '.6321.1.2.3')) { // E5-1xx Series
-
    if (strpos($device['sysObjectID'], 'enterprises.6321.1.2.3.4') !== false) { // E5-121
-
        $version = snmp_get($device, 'iesSlotModuleFWVersion.0.0', '-Oqv', '+E5-121-IESCOMMON-MIB', 'calix');
        $hardware = snmp_get($device, 'iesSlotModuleDescr.0.0', '-Ovqs', '+E5-121-IESCOMMON-MIB', 'calix');
        $serial   = snmp_get($device, 'iesChassisSerialNumber.0', '-OQv', '+E5-121-IESCOMMON-MIB', 'calix');
@@ -29,7 +27,6 @@ if (strstr($sysObjectId, '.6321.1.2.3')) { // E5-1xx Series
    }

    if (strpos($device['sysObjectID'], 'enterprises.6321.1.2.3.3') !== false) { // E5-120
-
        $version = snmp_get($device, 'iesSlotModuleFWVersion.0.0', '-Oqv', '+E5-120-IESCOMMON-MIB', 'calix');
        $hardware = snmp_get($device, 'iesSlotModuleDescr.0.0', '-Ovqs', '+E5-120-IESCOMMON-MIB', 'calix');
        $serial   = snmp_get($device, 'iesChassisSerialNumber.0', '-OQv', '+E5-120-IESCOMMON-MIB', 'calix');
@@ -41,7 +38,6 @@ if (strstr($sysObjectId, '.6321.1.2.3')) { // E5-1xx Series
    }

    if (strpos($device['sysObjectID'], 'enterprises.6321.1.2.3.2') !== false) { // E5-111
-
        $version = snmp_get($device, 'iesSlotModuleFWVersion.0.0', '-Oqv', '+E5-111-IESCOMMON-MIB', 'calix');
        $hardware = snmp_get($device, 'iesSlotModuleDescr.0.0', '-Ovqs', '+E5-111-IESCOMMON-MIB', 'calix');
        $serial   = snmp_get($device, 'iesChassisSerialNumber.0', '-OQv', '+E5-111-IESCOMMON-MIB', 'calix');
@@ -53,7 +49,6 @@ if (strstr($sysObjectId, '.6321.1.2.3')) { // E5-1xx Series
    }

    if (strpos($device['sysObjectID'], 'enterprises.6321.1.2.3.1') !== false) { // E5-110
-
        $version = snmp_get($device, 'iesSlotModuleFWVersion.0.0', '-Oqv', '+E5-110-IESCOMMON-MIB', 'calix');
        $hardware = snmp_get($device, 'iesSlotModuleDescr.0.0', '-Ovqs', '+E5-110-IESCOMMON-MIB', 'calix');
        $serial   = snmp_get($device, 'iesChassisSerialNumber.0', '-OQv', '+E5-110-IESCOMMON-MIB', 'calix');