pppsetup.cgi: Add support for QMI profiles

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/doc/language_issues.de b/doc/language_issues.de
index aa55d224ccb2eedd60d2553c526c1d6bcf119748..327fe8a1591d4956ac73739fa717d71f4c26e454 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -863,6 +863,9 @@ WARNING: translation string unused: zoneconf val vlan amount assignment error
 WARNING: translation string unused: zoneconf val vlan tag assignment error
 WARNING: translation string unused: zoneconf val vlan tag range error
 WARNING: translation string unused: zoneconf val zoneslave amount error
+WARNING: untranslated string: access point name = Access Point Name
+WARNING: untranslated string: access point name is invalid = Access Point Name is invalid
+WARNING: untranslated string: access point name is required = Access Point Name is required
 WARNING: untranslated string: aliases default interface = - Default Interface -
 WARNING: untranslated string: cake profile bridged-llcsnap 32 = Bridged LLC SNAP (32 bytes)
 WARNING: untranslated string: cake profile bridged-ptm 19 = Bridged PTM (19 bytes)

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 8770ad75553aba8ef733f7f7692092331f111f1f..d8cb95479f59970330a49be63019f97ee93966dc 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -89,6 +89,9 @@ WARNING: untranslated string: a ca certificate with this name already exists = A
 WARNING: untranslated string: a connection with this common name already exists = A connection with this common name already exists.
 WARNING: untranslated string: a connection with this name already exists = A connection with this name already exists.
 WARNING: untranslated string: abort = abort
+WARNING: untranslated string: access point name = Access Point Name
+WARNING: untranslated string: access point name is invalid = Access Point Name is invalid
+WARNING: untranslated string: access point name is required = Access Point Name is required
 WARNING: untranslated string: acpitemp = ACPI - Temperatures
 WARNING: untranslated string: action = Action
 WARNING: untranslated string: activate = Activate

diff --git a/doc/language_issues.es b/doc/language_issues.es
index c07c97f9d41b6e2995a59eb518a93f9059950997..c00b04081910f70e0cab1b831390fc110c3fab55 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -791,6 +791,9 @@ WARNING: untranslated string: MTU settings = MTU settings:
 WARNING: untranslated string: Number of Countries for the pie chart = Number of Countries for the pie chart
 WARNING: untranslated string: Scan for Songs = unknown string
 WARNING: untranslated string: Set time on boot = Force setting the system clock on boot
+WARNING: untranslated string: access point name = Access Point Name
+WARNING: untranslated string: access point name is invalid = Access Point Name is invalid
+WARNING: untranslated string: access point name is required = Access Point Name is required
 WARNING: untranslated string: acpitemp = ACPI - Temperatures
 WARNING: untranslated string: addons = Addons
 WARNING: untranslated string: administrator password = Administrator password

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 36a54fee34a72c1a9c4707809f946fa192d13083..65263a2a17e040ac4d53dce1a7a4fece217f4e4b 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -906,6 +906,9 @@ WARNING: translation string unused: zoneconf val vlan amount assignment error
 WARNING: translation string unused: zoneconf val vlan tag assignment error
 WARNING: translation string unused: zoneconf val vlan tag range error
 WARNING: translation string unused: zoneconf val zoneslave amount error
+WARNING: untranslated string: access point name = Access Point Name
+WARNING: untranslated string: access point name is invalid = Access Point Name is invalid
+WARNING: untranslated string: access point name is required = Access Point Name is required
 WARNING: untranslated string: advproxy errmsg invalid url = Invalid URL
 WARNING: untranslated string: core notice 3 = available.
 WARNING: untranslated string: email recipient invalid = Invalid email recipient

diff --git a/doc/language_issues.it b/doc/language_issues.it
index 38c15edd08cd09d84bf74fb635ea97f675d619f3..6b0c6f9aa6258d8ca39fc34a74b198ddb901e737 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -884,6 +884,9 @@ WARNING: untranslated string: Captive wrong ext = Uploaded file has wrong filety
 WARNING: untranslated string: MTU settings = MTU settings:
 WARNING: untranslated string: Number of Countries for the pie chart = Number of Countries for the pie chart
 WARNING: untranslated string: Scan for Songs = unknown string
+WARNING: untranslated string: access point name = Access Point Name
+WARNING: untranslated string: access point name is invalid = Access Point Name is invalid
+WARNING: untranslated string: access point name is required = Access Point Name is required
 WARNING: untranslated string: acpitemp = ACPI - Temperatures
 WARNING: untranslated string: administrator password = Administrator password
 WARNING: untranslated string: administrator username = Administrator username

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 25062bcddf7b260d99bd56ddcb4ea70849fa0dbf..56196dab0b0cb349cd0426efa4ddd420225da2df 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -882,6 +882,9 @@ WARNING: untranslated string: Captive wrong ext = Uploaded file has wrong filety
 WARNING: untranslated string: MTU settings = MTU settings:
 WARNING: untranslated string: Number of Countries for the pie chart = Number of Countries for the pie chart
 WARNING: untranslated string: Scan for Songs = unknown string
+WARNING: untranslated string: access point name = Access Point Name
+WARNING: untranslated string: access point name is invalid = Access Point Name is invalid
+WARNING: untranslated string: access point name is required = Access Point Name is required
 WARNING: untranslated string: acpitemp = ACPI - Temperatures
 WARNING: untranslated string: administrator password = Administrator password
 WARNING: untranslated string: administrator username = Administrator username

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index e6cb2ecf7f3118e577c70e6426f79bd134328b55..933b6774aff1195b0572562e8b3b7792e5957a23 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -803,6 +803,9 @@ WARNING: untranslated string: MB written = MB written
 WARNING: untranslated string: MTU settings = MTU settings:
 WARNING: untranslated string: Number of Countries for the pie chart = Number of Countries for the pie chart
 WARNING: untranslated string: Scan for Songs = unknown string
+WARNING: untranslated string: access point name = Access Point Name
+WARNING: untranslated string: access point name is invalid = Access Point Name is invalid
+WARNING: untranslated string: access point name is required = Access Point Name is required
 WARNING: untranslated string: acpitemp = ACPI - Temperatures
 WARNING: untranslated string: addons = Addons
 WARNING: untranslated string: administrator password = Administrator password

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index e3d3faff30bdcad84c8352dea4da4180fe31fc3d..194f555e52ab71e59eb38842e9ba7b0475d04e78 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -799,6 +799,9 @@ WARNING: untranslated string: MB written = MB written
 WARNING: untranslated string: MTU settings = MTU settings:
 WARNING: untranslated string: Number of Countries for the pie chart = Number of Countries for the pie chart
 WARNING: untranslated string: Scan for Songs = unknown string
+WARNING: untranslated string: access point name = Access Point Name
+WARNING: untranslated string: access point name is invalid = Access Point Name is invalid
+WARNING: untranslated string: access point name is required = Access Point Name is required
 WARNING: untranslated string: acpitemp = ACPI - Temperatures
 WARNING: untranslated string: addons = Addons
 WARNING: untranslated string: administrator password = Administrator password

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 1c5ce2d1636dd33e064f602913f7962ad8600cba..879a57b7211753e38efce71442a50071a2421a62 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -878,6 +878,9 @@ WARNING: translation string unused: yearly firewallhits
 WARNING: untranslated string: Captive clients = unknown string
 WARNING: untranslated string: Captive delete logo = Delete Logo
 WARNING: untranslated string: Scan for Songs = unknown string
+WARNING: untranslated string: access point name = Access Point Name
+WARNING: untranslated string: access point name is invalid = Access Point Name is invalid
+WARNING: untranslated string: access point name is required = Access Point Name is required
 WARNING: untranslated string: acpitemp = ACPI - Temperatures
 WARNING: untranslated string: advproxy asbased anomaly detection = Anomaly detections based on Autonomous Systems information
 WARNING: untranslated string: advproxy errmsg invalid url = Invalid URL

diff --git a/doc/language_missings b/doc/language_missings
index aa549a132f53748130ecaa9fc90ba42371188a77..b35bb4f1301a7169f41f9644152921d8e4b0e84e 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -1,6 +1,9 @@
 ############################################################################
 # Checking cgi-bin translations for language: de                           #
 ############################################################################
+< access point name
+< access point name is invalid
+< access point name is required
 < advproxy update information
 < aliases default interface
 < ansi t1.483
@@ -96,6 +99,9 @@
 # Checking cgi-bin translations for language: es                           #
 ############################################################################
 < 24 hours
+< access point name
+< access point name is invalid
+< access point name is required
 < acpitemp
 < addons
 < administrator password
@@ -1036,6 +1042,9 @@
 ############################################################################
 # Checking cgi-bin translations for language: fr                           #
 ############################################################################
+< access point name
+< access point name is invalid
+< access point name is required
 < advproxy errmsg invalid url
 < ansi t1.483
 < bewan adsl pci st
@@ -1050,6 +1059,9 @@
 # Checking cgi-bin translations for language: it                           #
 ############################################################################
 < 24 hours
+< access point name
+< access point name is invalid
+< access point name is required
 < acpitemp
 < administrator password
 < administrator username
@@ -1546,6 +1558,9 @@
 # Checking cgi-bin translations for language: nl                           #
 ############################################################################
 < 24 hours
+< access point name
+< access point name is invalid
+< access point name is required
 < acpitemp
 < administrator password
 < administrator username
@@ -2089,6 +2104,9 @@
 # Checking cgi-bin translations for language: pl                           #
 ############################################################################
 < 24 hours
+< access point name
+< access point name is invalid
+< access point name is required
 < acpitemp
 < addons
 < administrator password
@@ -3074,6 +3092,9 @@
 # Checking cgi-bin translations for language: ru                           #
 ############################################################################
 < 24 hours
+< access point name
+< access point name is invalid
+< access point name is required
 < acpitemp
 < Add a route
 < addons
@@ -4065,6 +4086,9 @@
 ############################################################################
 # Checking cgi-bin translations for language: tr                           #
 ############################################################################
+< access point name
+< access point name is invalid
+< access point name is required
 < acpitemp
 < advproxy asbased anomaly detection
 < advproxy errmsg invalid url

diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi
index d7e5799ec067af7372e94d496dc70eb1df13f4d2..696fa2c967832f9f3649d170204992f52c8b2de4 100644 (file)
--- a/html/cgi-bin/pppsetup.cgi
+++ b/html/cgi-bin/pppsetup.cgi
@@ -87,6 +87,16 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'})
                 $errormessage = $Lang::tr{'invalid input'};
                 goto ERROR;
         }
+       if ($pppsettings{'TYPE'} eq "qmi") {
+               # APN cannot be empty
+               if ($pppsettings{'APN'} eq "") {
+                       $errormessage = $Lang::tr{'access point name is required'};
+                       goto ERROR;
+               } elsif (!&General::validdomainname($pppsettings{'APN'})) {
+                       $errormessage = $Lang::tr{'access point name is invalid'};
+                       goto ERROR;
+               }
+       }
 
         if ($pppsettings{'PROFILENAME'} eq '') {
                 $errormessage = $Lang::tr{'profile name not given'};
@@ -523,6 +533,7 @@ print <<END
        <option value='pppoe' $selected{'TYPE'}{'pppoe'}>PPPoE</option>
        <option value='pptp' $selected{'TYPE'}{'pptp'}>PPTP</option>
        <option value='vdsl' $selected{'TYPE'}{'vdsl'}>VDSL</option>
+       <option value='qmi' $selected{'TYPE'}{'qmi'}>QMI</option>
 END
 ;
 
@@ -719,7 +730,8 @@ END
 ;
 }
 
-print <<END
+if ($pppsettings{'TYPE'} ne "qmi") {
+       print <<END
 <tr>
         <td colspan='3' width='75%'>$Lang::tr{'idle timeout'}&nbsp;<img src='/blob.gif' alt='*' /></td>
         <td width='25%'><input type='text' name='TIMEOUT' value='$pppsettings{'TIMEOUT'}' /></td>
@@ -738,7 +750,7 @@ print <<END
  </tr>
 END
 ;
-print <<END
+       print <<END
  <tr>
         <td colspan='4' width='100%'><input type='radio' name='RECONNECTION' value='persistent' $checked{'RECONNECTION'}{'persistent'}>$Lang::tr{'persistent'}</td>
  </tr>
@@ -767,6 +779,7 @@ END
 </tr>
 END
 ;
+}
 
 if ($pppsettings{'TYPE'} eq 'pptp')
 {
@@ -908,6 +921,26 @@ print <<END
 <tr>
         <td bgcolor='$color{'color20'}' colspan='4' width='100%'><b>$Lang::tr{'authentication'}</b></td>
 </tr>
+END
+;
+
+# Ask for the APN for QMI
+if ($pppsettings{'TYPE'} eq 'qmi') {
+       print <<END;
+               <tr>
+                       <td width="25%">
+                               $Lang::tr{'access point name'}
+                               &nbsp;
+                               <img src='/blob.gif' alt='*'/>
+                       </td>
+                       <td colspan="3" width="75%">
+                               <input type="text" name="APN" value="$pppsettings{'APN'}" />
+                       </td>
+               </tr>
+END
+}
+
+print <<END
 <tr>
         <td width='25%'>$Lang::tr{'username'}&nbsp;<img src='/blob.gif' alt='*' /></td>
         <td width='25%'><input type='text' name='USERNAME' value='$pppsettings{'USERNAME'}' /></td>

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index a24a86c7946fda6d3c87c164fd737fb5f545790d..457ffd15ce591d42e60697df22e1f41d314e7b1a 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -129,6 +129,9 @@
 'a connection with this name already exists' => 'A connection with this name already exists.',
 'abort' => 'abort',
 'access allowed' => 'Access allowed from:',
+'access point name' => 'Access Point Name',
+'access point name is invalid' => 'Access Point Name is invalid',
+'access point name is required' => 'Access Point Name is required',
 'access refused with this oinkcode' => 'Access refused with this Oink Code',
 'accounting' => 'Accounting',
 'accounting user nonpdc' => 'Accounting - none PDC Mode',