Merge pull request #1 from billz/zbchristian-master

Code style fixes + locale update
2020-06-29 14:09:59 +02:00 · 2020-06-29 14:09:59 +02:00 · fc4e234b45
parent 90e5f50da6 42032e0df0
commit fc4e234b45
7 changed files with 175 additions and 140 deletions
--- a/config/config.php
+++ b/config/config.php
@ -23,6 +23,8 @@ define('RASPI_OPENVPN_CLIENT_LOGIN', '/etc/openvpn/client/login.conf');
 define('RASPI_OPENVPN_SERVER_CONFIG', '/etc/openvpn/server/server.conf');
 define('RASPI_TORPROXY_CONFIG', '/etc/tor/torrc');
 define('RASPI_LIGHTTPD_CONFIG', '/etc/lighttpd/lighttpd.conf');
+define('RASPI_ACCESS_CHECK_IP', '1.1.1.1');
+define('RASPI_ACCESS_CHECK_DNS', 'one.one.one.one');

 // Constant for the 5GHz wireless regulatory domain
 define('RASPI_5GHZ_ISO_ALPHA2', array('US'));
--- a/includes/defaults.php
+++ b/includes/defaults.php
@ -27,6 +27,8 @@ $defaults = [
  'RASPI_OPENVPN_SERVER_CONFIG' => '/etc/openvpn/server/server.conf',
  'RASPI_TORPROXY_CONFIG' => '/etc/tor/torrc',
  'RASPI_LIGHTTPD_CONFIG' => '/etc/lighttpd/lighttpd.conf',
+  'RASPI_ACCESS_CHECK_IP' => '1.1.1.1',
+  'RASPI_ACCESS_CHECK_DNS' => 'one.one.one.one',

  // Optional services, set to true to enable.
  'RASPI_WIFICLIENT_ENABLED' => true,
--- a/includes/internetRoute.php
+++ b/includes/internetRoute.php
@ -1,36 +1,30 @@
 <?php

-define("ACCESS_CHECK_IP","1.1.1.1");
-define("ACCESS_CHECK_DNS","one.one.one.one");
-
-     $rInfo=array();
+$rInfo=array();
 // get all default routes
-     exec('ip route list |  sed -rn "s/default via (([0-9]{1,3}\.){3}[0-9]{1,3}).*dev (\w*).*src (([0-9]{1,3}\.){3}[0-9]{1,3}).*/\3 \4 \1/p"',$routes);
-     if ( !empty($routes) ) {
+exec('ip route list |  sed -rn "s/default via (([0-9]{1,3}\.){3}[0-9]{1,3}).*dev (\w*).*src (([0-9]{1,3}\.){3}[0-9]{1,3}).*/\3 \4 \1/p"', $routes);
+if (!empty($routes) ) {
    foreach ($routes as $i => $route) {
-          $prop=explode(' ',$route);
+        $prop=explode(' ', $route);
        $rInfo[$i]["interface"]=$prop[0];
        $rInfo[$i]["ip-address"]=$prop[1];
        $rInfo[$i]["gateway"]=$prop[2];
        // resolve the name of the gateway (if possible)
        unset($host);
-          exec('host '.$prop[2].' | sed -rn "s/.*domain name pointer (.*)\./\1/p" | head -n 1',$host);
-          if (empty($host)) $host[0]="*";
-          $rInfo[$i]["gw-name"] = $host[0];
+        exec('host '.$prop[2].' | sed -rn "s/.*domain name pointer (.*)\./\1/p" | head -n 1', $host);
+        $rInfo[$i]["gw-name"] = empty($host) ? "*" : $host[0];
        if (isset($checkAccess) && $checkAccess) {
            // check internet connectivity w/ and w/o DNS resolution
            unset($okip);
-            exec('ping -W1 -c 1 -I '.$prop[0].' '.ACCESS_CHECK_IP.' |  sed -rn "s/.*icmp_seq=1.*time=.*/\&check\;/p"',$okip);
-            if (empty($okip)) $okip[0]="failed";
-            $rInfo[$i]["access-ip"] = $okip[0];
+            exec('ping -W1 -c 1 -I '.$prop[0].' '.RASPI_ACCESS_CHECK_IP.' |  sed -rn "s/.*icmp_seq=1.*time=.*/OK/p"',$okip);
+            $rInfo[$i]["access-ip"] = empty($okip) ? false : true;
            unset($okdns);
-            exec('ping -W1 -c 1 -I '.$prop[0].' '.ACCESS_CHECK_DNS.' |  sed -rn "s/.*icmp_seq=1.*time=.*/\&check\;/p"',$okdns);
-            if (empty($okdns)) $okdns[0]="failed";
-            $rInfo[$i]["access-dns"] = $okdns[0];
+            exec('ping -W1 -c 1 -I '.$prop[0].' '.RASPI_ACCESS_CHECK_DNS.' |  sed -rn "s/.*icmp_seq=1.*time=.*/OK/p"',$okdns);
+            $rInfo[$i]["access-dns"] = empty($okdns) ? false : true;
        }
    }
-      } else {
+} else {
    $rInfo = array("error"=>"No route to the internet found");
-      }
-      $rInfo_json = json_encode($rInfo);
+}
+$rInfo_json = json_encode($rInfo);
 ?>
--- a/installers/common.sh
+++ b/installers/common.sh
@ -30,12 +30,17 @@ git_source_url="https://github.com/$repo"  # $repo from install.raspap.com

 # Prompts user to set installation options
 function _config_installation() {
-    _install_log "Configure installation"
+    if [ "$upgrade" == 1 ]; then
+        opt=(Upgrade Upgrading upgrade)
+    else
+        opt=(Install Installing installation)
+    fi
+    _install_log "Configure ${opt[2]}"
    _get_linux_distro
    echo "Detected OS: ${DESC}"
    echo "Using GitHub repository: ${repo} ${branch} branch"
-    echo "Install directory: ${raspap_dir}"
-    echo -n "Install to lighttpd root: ${webroot_dir}? [Y/n]: "
+    echo "Configuration directory: ${raspap_dir}"
+    echo -n "lighttpd root: ${webroot_dir}? [Y/n]: "
    if [ "$assume_yes" == 0 ]; then
        read answer < /dev/tty
        if [ "$answer" != "${answer#[Nn]}" ]; then
@ -44,8 +49,12 @@ function _config_installation() {
    else
        echo -e
    fi
-    echo "Installing to lighttpd directory: ${webroot_dir}"
-    echo -n "Complete installation with these values? [Y/n]: "
+    echo "${opt[1]} lighttpd directory: ${webroot_dir}"
+    if [ "$upgrade" == 1 ]; then
+        echo "This will upgrade your existing install to version ${RASPAP_LATEST}"
+        echo "Your configuration will NOT be changed"
+    fi
+    echo -n "Complete ${opt[2]} with these values? [Y/n]: "
    if [ "$assume_yes" == 0 ]; then
        read answer < /dev/tty
        if [ "$answer" != "${answer#[Nn]}" ]; then
@ -290,6 +299,12 @@ function _download_latest_files() {
    git clone --branch $branch --depth 1 $git_source_url /tmp/raspap-webgui || _install_status 1 "Unable to download files from github"

    sudo mv /tmp/raspap-webgui $webroot_dir || _install_status 1 "Unable to move raspap-webgui to web root"
+    if [ "$upgrade" == 1 ]; then
+        _install_log "Applying existing configuration to ${webroot_dir}/includes"
+        sudo mv /tmp/config.php $webroot_dir/includes  || _install_status 1 "Unable to move config.php to ${webroot_dir}/includes"
+        sudo mv /tmp/defaults.php $webroot_dir/includes || _install_status 1 "Unable to move defaults.php to ${webroot_dir}/includes"
+    fi
+
    _install_status 0
 }

@ -305,6 +320,12 @@ function _change_file_ownership() {

 # Check for existing configuration files
 function _check_for_old_configs() {
+    if [ "$upgrade" == 1 ]; then
+        _install_log "Moving existing configuration to /tmp"
+        sudo mv $webroot_dir/includes/config.php /tmp || _install_status 1 "Unable to move config.php to /tmp"
+        sudo mv $webroot_dir/includes/defaults.php /tmp || _install_status 1 "Unable to move defaults.php to /tmp"
+    else
+        _install_log "Backing up existing configs to ${raspap_dir}/backups"
        if [ -f /etc/network/interfaces ]; then
            sudo cp /etc/network/interfaces "$raspap_dir/backups/interfaces.`date +%F-%R`"
            sudo ln -sf "$raspap_dir/backups/interfaces.`date +%F-%R`" "$raspap_dir/backups/interfaces"
@ -332,6 +353,7 @@ function _check_for_old_configs() {
                sudo ln -sf "${raspap_dir}/backups/${filename}.`date +%F-%R`" "${raspap_dir}/backups/${filename}"
            fi
        done
+    fi
    _install_status 0
 }

@ -348,6 +370,7 @@ function _move_config_file() {

 # Set up default configuration
 function _default_configuration() {
+    if [ "$upgrade" == 0 ]; then
        _install_log "Applying default configuration to installed services"
        if [ -f /etc/default/hostapd ]; then
            sudo mv /etc/default/hostapd /tmp/default_hostapd.old || _install_status 1 "Unable to remove old /etc/default/hostapd file"
@ -371,6 +394,7 @@ function _default_configuration() {
            sudo cp "$webroot_dir/config/config.php" "$webroot_dir/includes/config.php"
        fi
        _install_status 0
+    fi
 }

 # Install and enable RaspAP daemon
@ -453,6 +477,7 @@ function _patch_system_files() {

 # Optimize configuration of php-cgi.
 function _optimize_php() {
+    if [ "$upgrade" == 0 ]; then
        _install_log "Optimize PHP configuration"
        if [ ! -f "$phpcgiconf" ]; then
            _install_warning "PHP configuration could not be found."
@ -501,6 +526,7 @@ function _optimize_php() {
                fi
            fi
        fi
+    fi
 }

 function _install_complete() {
--- a/installers/raspbian.sh
+++ b/installers/raspbian.sh
@ -20,6 +20,8 @@
 #    Overrides the default git branch (master)
 # -h, --help
 #    Outputs usage notes and exits
+# -u, --upgrade
+#    Upgrades an existing installation to the latest release version
 # -v, --version
 #    Outputs release info and exits
 #
@ -37,6 +39,7 @@
 repo="billz/raspap-webgui"
 branch="master"
 assume_yes=0
+upgrade=0
 ovpn_option=1
 adblock_option=1

@ -61,6 +64,7 @@ Usage: raspbian.sh [OPTION]\n
 -r, --repo, --repository <name>\n\tOverrides the default GitHub repo (billz/raspap-webgui)
 -b, --branch <name>\n\tOverrides the default git branch (master)
 -h, --help\n\tOutputs usage notes and exits
+-u, --upgrade\n\tUpgrades an existing installation to the latest release version
 -v, --version\n\tOutputs release info and exits\n
 EOF
 )
@ -95,6 +99,9 @@ while :; do
        printf "$usage"
        exit 1
        ;;
+        -u|--upgrade)
+        upgrade=1
+        ;;
        -v|--version)
        printf "RaspAP v${RASPAP_LATEST} - Simple AP setup & WiFi management for Debian-based devices\n"
        exit 1
--- a/locale/en_US/LC_MESSAGES/messages.po
+++ b/locale/en_US/LC_MESSAGES/messages.po
@ -451,6 +451,9 @@ msgstr "Configures the max_num_sta option of hostapd. The default and maximum is
 msgid "Summary"
 msgstr "Summary"

+msgid "Internet connection"
+msgstr "Internet connection"
+
 msgid "Current settings"
 msgstr "Current settings"

--- a/templates/networking.php
+++ b/templates/networking.php
@ -18,7 +18,7 @@
            // defaults to false
            $bridgedEnabled = $arrHostapdConf['BridgedEnable'];
            ?>
-          <?php if (!$bridgedEnabled): // no interface details when bridged ?>
+          <?php if (!$bridgedEnabled) : // no interface details when bridged ?>
                <?php foreach ($interfaces as $if): ?>
                    <?php $if_quoted = htmlspecialchars($if, ENT_QUOTES) ?>
          <li role="presentation" class="nav-item"><a class="nav-link" href="#<?php echo $if_quoted ?>" aria-controls="<?php echo $if_quoted ?>" role="tab" data-toggle="tab"><?php echo $if_quoted ?></a></li>
@ -26,7 +26,6 @@
          <?php endif ?>
        </ul>
        <div class="tab-content">
-
          <div role="tabpanel" class="tab-pane active" id="summary">
            <h4 class="mt-3"><?php echo _("Internet connection"); ?></h4>
            <div class="row">
@ -45,8 +44,8 @@
                      </thead>
                      <tbody>
                        <?php
-                         $checkAccess=True;
-                         include("includes/internetRoute.php");
+                         $checkAccess=true;
+                         require "includes/internetRoute.php";
                        if (isset($rInfo["error"]) || empty($rInfo)) {
                            echo "<tr><td colspan=5>No route to the internet found</td></tr>";
                        } else {
@ -55,8 +54,10 @@
                                echo "<td>".$route["interface"]."</td>";
                                echo "<td>".$route["ip-address"]."</td>";
                                echo "<td>".$route["gateway"]."<br>".$route["gw-name"]."</td>";
-                              echo "<td>".$route["access-ip"]."<br>".ACCESS_CHECK_IP."</td>";
-                              echo "<td>".$route["access-dns"]."<br>".ACCESS_CHECK_DNS."</td>";
+                                $checkok = $route["access-ip"] ? "&check;" : "failed";
+                                echo "<td>".$checkok."<br>".RASPI_ACCESS_CHECK_IP."</td>";
+                                $checkok = $route["access-dns"] ? "&check;" : "failed";
+                                echo "<td>".$checkok."<br>".RASPI_ACCESS_CHECK_DNS."</td>";
                                echo "</tr>";
                            }
                        }
@ -141,7 +142,7 @@
                    <label for="<?php echo $if_quoted ?>-dnssvralt"><?php echo _("Alternate DNS Server") ?></label>
                    <input type="text" class="form-control" id="<?php echo $if_quoted ?>-dnssvralt" placeholder="0.0.0.0">
          </div>
-                  <?php if (!RASPI_MONITOR_ENABLED): ?>
+                  <?php if (!RASPI_MONITOR_ENABLED) : ?>
                      <a href="#" class="btn btn-outline btn-primary intsave" data-int="<?php echo $if_quoted ?>"><?php echo _("Save settings") ?></a>
              <a href="#" class="btn btn-warning intapply" data-int="<?php echo $if_quoted ?>"><?php echo _("Apply settings") ?></a>
                  <?php endif ?>