Changeset 577e6d3


Ignore:
Timestamp:
02/16/17 22:29:44 (8 years ago)
Author:
Edwin Eefting <edwin@datux.nl>
Branches:
master, perl-5.22
Children:
595c2eb
Parents:
55d876d
Message:

added extra openvpn options

Location:
npl/syn3/webint/src
Files:
23 edited

Legend:

Unmodified
Added
Removed

  • npl/syn3/webint/src/error.php

    r55d876d r577e6d3  
    1 <? 
     1<?
    22/** Functions to validate user input a generate apporiate messages.
    33 *
    4  * These functions will check the given parameters and return false 
     4 * These functions will check the given parameters and return false
    55 * if everything is allright. If something is wrong it will return an
    66 * errorstring that explains whats wrong in the users own language.
    77 * @package forms
    8  */ 
     8 */
    99
    1010        require_once("common.php");
    11        
     11
    1212        /** Check if filename name is valid.
    1313         * Returns false if its valid
    … …  
    2727        }
    2828
    29        
     29
    3030        /** Check if the tcp/ip $port number is valid.
    31          * 
     31         *
    3232         * Returns false if its valid.
    3333         * Returns a descriptive error message if its invalid.
    … …  
    3636        {
    3737                if (!$port)
    38                         return (_ErrorPortnumberIsRequired()); 
     38                        return (_ErrorPortnumberIsRequired());
    3939                elseif (!ValidPort($port))
    40                         return (_ErrorPortnumberIsInvalid($port));     
    41                 else
    42                         return false;
    43         }
    44        
     40                        return (_ErrorPortnumberIsInvalid($port));
     41                else
     42                        return false;
     43        }
     44
    4545        /** Check if the ip address $ip is valid.
    4646         *
    … …  
    5151        {
    5252                if (!$ip)
    53                         return (_ErrorIPAdressIsRequired());   
     53                        return (_ErrorIPAdressIsRequired());
    5454                elseif (!ValidIP($ip))
    55                         return (_ErrorIPAdressIsInvalid($ip)); 
     55                        return (_ErrorIPAdressIsInvalid($ip));
    5656                else
    5757                        return false;
    … …  
    6666        {
    6767                if (!$netmask)
    68                         return (_ErrorNetmaskIsRequired());     
     68                        return (_ErrorNetmaskIsRequired());
    6969                elseif (!ValidNetmask($netmask))
    70                         return (_ErrorNetmaskIsInvalid($netmask));     
    71                 else
    72                         return false;
    73         }
    74 
     70                        return (_ErrorNetmaskIsInvalid($netmask));
     71                else
     72                        return false;
     73        }
     74
     75    /** Check if CIDR subnet is valid. Format is 10.0.0.0/24
     76         *
     77         * Returns false if its valid.
     78         * Returns a descriptive error message if its invalid.
     79         */
     80        function Error_ValidSubnet($subnet)
     81        {
     82                if (!$subnet)
     83                        return (_ErrorSubnetIsRequired());
     84                elseif (!ValidSubnet($subnet))
     85                        return (_ErrorSubnetIsInvalid($subnet));
     86                else
     87                        return false;
     88        }
    7589
    7690        /** Check if mac is valid. Format is HEXHEX:HEXHEX:HEXHEX:HEXHEX:HEXHEX:HEXHEX
    … …  
    89103        }
    90104
    91                  
     105
    92106        /** Check if hostname is valid. A hostname has a minimum of 1 field.
    93107         *
    … …  
    98112        {
    99113                if (!$hostname)
    100                         return (_ErrorHostnameIsRequired());   
     114                        return (_ErrorHostnameIsRequired());
    101115                elseif (!ValidHostname($hostname))
    102                         return (_ErrorHostnameIsInvalid($hostname));   
     116                        return (_ErrorHostnameIsInvalid($hostname));
    103117                else
    104118                        return false;
    … …  
    113127        {
    114128                if (!$hostname)
    115                         return (_ErrorFQDNIsRequired());       
     129                        return (_ErrorFQDNIsRequired());
    116130                elseif (!ValidFQDN($hostname))
    117                         return (_ErrorFQDNIsInvalid($hostname));       
    118                 else
    119                         return false;
    120         }
    121 
    122                  
     131                        return (_ErrorFQDNIsInvalid($hostname));
     132                else
     133                        return false;
     134        }
     135
     136
    123137        /** Check if $address is a valid hostname OR ip adress.
    124138         *
    … …  
    131145                        return (_ErrorHostnameOrIpAddressIsRequired());
    132146                elseif (!ValidHostname($address) && !ValidIp($address))
    133                         return (_ErrorInvalidHostnameOrIpAddress($address));   
     147                        return (_ErrorInvalidHostnameOrIpAddress($address));
    134148                else
    135149                        return false;
    … …  
    144158        {
    145159                if (!$domain)
    146                         return (_ErrorDomainIsRequired());     
     160                        return (_ErrorDomainIsRequired());
    147161                elseif (!ValidDomain($domain))
    148                         return (_ErrorDomainIsInvalid($domain));       
    149                 else
    150                         return false;
    151         }
    152 
    153        
     162                        return (_ErrorDomainIsInvalid($domain));
     163                else
     164                        return false;
     165        }
     166
     167
    154168        /** Check if $address:$port is actually connectable.
    155169         *
    … …  
    163177                if ($err)
    164178                        return $err;
    165        
     179
    166180                $err=TestConnect($address,$port,$timeout);
    167181                if ($err)
    … …  
    170184                        return false;
    171185        }
    172        
     186
    173187        /** Check if email adress is valid.
    174188         *
    … …  
    178192        function Error_ValidEmail($address)
    179193        {
    180                 preg_match("/(.*)\@(.*)/",$address,$matches);   
     194                preg_match("/(.*)\@(.*)/",$address,$matches);
    181195                $name=$matches[1];
    182196                $domain=$matches[2];
    183                
     197
    184198                if (!$domain)
    185199                        return (_ErrorEmailAddressIsRequired());
    … …  
    187201                        return (_ErrorInvalidMailDomain($domain));
    188202                elseif (!ValidEmail($address))
    189                         return (_ErrorInvalidEmailAddress($address));   
     203                        return (_ErrorInvalidEmailAddress($address));
    190204                else
    191205                        return false;
    … …  
    200214        {
    201215                if (!$share)
    202                         return (_ErrorSharenameIsRequired());   
     216                        return (_ErrorSharenameIsRequired());
    203217                elseif (!ValidSmbShareName($share))
    204                         return (_ErrorSharenameIsInvalid($share));     
    205                 else
    206                         return false;
    207         }
    208        
     218                        return (_ErrorSharenameIsInvalid($share));
     219                else
     220                        return false;
     221        }
     222
    209223        /** Check if $integer is a valid number between $min and $max inclusive
    210224         *
    … …  
    222236                elseif(is_numeric($max) && $integer>$max)
    223237                        return(_ErrorIntToHigh($max));
    224                 else 
    225                         return false;
    226                
    227         }
    228        
     238                else
     239                        return false;
     240
     241        }
     242
    229243        /** Check if $choice exists in the $choices hash array
    230244         *
    … …  
    236250                if(! isset($choices[$choice]))
    237251                        return (_ErrorValidChoiceIsRequired());
    238                 else
    239                         return false;
    240         }
    241        
     252                else
     253                        return false;
     254        }

  • npl/syn3/webint/src/lang_de.php

    r55d876d r577e6d3  
    125125
    126126function _ErrorFilenameIsInvalid($a="",$b="",$c="",$d="") { return (
    127         "_ErrorFilenameIsInvalid($a,$b,$c,$d)"
     127        "Filename has invalid characters"
    128128);}
    129129
    130130function _ErrorFilenameIsRequired($a="",$b="",$c="",$d="") { return (
    131         "_ErrorFilenameIsRequired($a,$b,$c,$d)"
     131        "Enter filename"
    132132);}
    133133
    … …  
    244244);}
    245245
     246function _ErrorSubnetIsInvalid($a="",$b="",$c="",$d="") { return (
     247        "Invalid subnet (use CIDR format, e.g. 10.0.0.0/24)"
     248);}
     249
     250function _ErrorSubnetIsRequired($a="",$b="",$c="",$d="") { return (
     251        "Subnet is required (in CIRD form)"
     252);}
     253
    246254function _ErrorValidChoiceIsRequired($a="",$b="",$c="",$d="") { return (
    247255        "You need to make a valid choice!"

  • npl/syn3/webint/src/lang_deD.php

    r55d876d r577e6d3  
    124124);}
    125125
    126 function _ErrorFilenameIsInvalid($a="",$b="",$c="",$d="") { LangDebug("_ErrorFilenameIsInvalid($a,$b,$c,$d)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=de&add_labelID=_ErrorFilenameIsInvalid");return (
    127         "_ErrorFilenameIsInvalid($a,$b,$c,$d)"
    128 );}
    129 
    130 function _ErrorFilenameIsRequired($a="",$b="",$c="",$d="") { LangDebug("_ErrorFilenameIsRequired($a,$b,$c,$d)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=de&add_labelID=_ErrorFilenameIsRequired");return (
    131         "_ErrorFilenameIsRequired($a,$b,$c,$d)"
     126function _ErrorFilenameIsInvalid($a="",$b="",$c="",$d="") { LangDebug("Filename has invalid characters", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=de&add_labelID=_ErrorFilenameIsInvalid");return (
     127        "Filename has invalid characters"
     128);}
     129
     130function _ErrorFilenameIsRequired($a="",$b="",$c="",$d="") { LangDebug("Enter filename", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=de&add_labelID=_ErrorFilenameIsRequired");return (
     131        "Enter filename"
    132132);}
    133133
    … …  
    244244);}
    245245
     246function _ErrorSubnetIsInvalid($a="",$b="",$c="",$d="") { LangDebug("Invalid subnet (use CIDR format, e.g. 10.0.0.0/24)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=de&add_labelID=_ErrorSubnetIsInvalid");return (
     247        "Invalid subnet (use CIDR format, e.g. 10.0.0.0/24)"
     248);}
     249
     250function _ErrorSubnetIsRequired($a="",$b="",$c="",$d="") { LangDebug("Subnet is required (in CIRD form)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=de&add_labelID=_ErrorSubnetIsRequired");return (
     251        "Subnet is required (in CIRD form)"
     252);}
     253
    246254function _ErrorValidChoiceIsRequired($a="",$b="",$c="",$d="") { LangDebug("You need to make a valid choice!", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=de&add_labelID=_ErrorValidChoiceIsRequired");return (
    247255        "You need to make a valid choice!"

  • npl/syn3/webint/src/lang_en.php

    r55d876d r577e6d3  
    125125
    126126function _ErrorFilenameIsInvalid($a="",$b="",$c="",$d="") { return (
    127         "_ErrorFilenameIsInvalid($a,$b,$c,$d)"
     127        "Filename has invalid characters"
    128128);}
    129129
    130130function _ErrorFilenameIsRequired($a="",$b="",$c="",$d="") { return (
    131         "_ErrorFilenameIsRequired($a,$b,$c,$d)"
     131        "Enter filename"
    132132);}
    133133
    … …  
    242242function _ErrorSharenameIsRequired($a="",$b="",$c="",$d="") { return (
    243243        "Enter a share name."
     244);}
     245
     246function _ErrorSubnetIsInvalid($a="",$b="",$c="",$d="") { return (
     247        "Invalid subnet (use CIDR format, e.g. 10.0.0.0/24)"
     248);}
     249
     250function _ErrorSubnetIsRequired($a="",$b="",$c="",$d="") { return (
     251        "Subnet is required (in CIRD form)"
    244252);}
    245253

  • npl/syn3/webint/src/lang_enD.php

    r55d876d r577e6d3  
    124124);}
    125125
    126 function _ErrorFilenameIsInvalid($a="",$b="",$c="",$d="") { LangDebug("_ErrorFilenameIsInvalid($a,$b,$c,$d)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=en&add_labelID=_ErrorFilenameIsInvalid");return (
    127         "_ErrorFilenameIsInvalid($a,$b,$c,$d)"
    128 );}
    129 
    130 function _ErrorFilenameIsRequired($a="",$b="",$c="",$d="") { LangDebug("_ErrorFilenameIsRequired($a,$b,$c,$d)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=en&add_labelID=_ErrorFilenameIsRequired");return (
    131         "_ErrorFilenameIsRequired($a,$b,$c,$d)"
     126function _ErrorFilenameIsInvalid($a="",$b="",$c="",$d="") { LangDebug("Filename has invalid characters", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8319");return (
     127        "Filename has invalid characters"
     128);}
     129
     130function _ErrorFilenameIsRequired($a="",$b="",$c="",$d="") { LangDebug("Enter filename", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8320");return (
     131        "Enter filename"
    132132);}
    133133
    … …  
    242242function _ErrorSharenameIsRequired($a="",$b="",$c="",$d="") { LangDebug("Enter a share name.", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=1082");return (
    243243        "Enter a share name."
     244);}
     245
     246function _ErrorSubnetIsInvalid($a="",$b="",$c="",$d="") { LangDebug("Invalid subnet (use CIDR format, e.g. 10.0.0.0/24)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8322");return (
     247        "Invalid subnet (use CIDR format, e.g. 10.0.0.0/24)"
     248);}
     249
     250function _ErrorSubnetIsRequired($a="",$b="",$c="",$d="") { LangDebug("Subnet is required (in CIRD form)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8321");return (
     251        "Subnet is required (in CIRD form)"
    244252);}
    245253

  • npl/syn3/webint/src/lang_nl.php

    r55d876d r577e6d3  
    244244);}
    245245
     246function _ErrorSubnetIsInvalid($a="",$b="",$c="",$d="") { return (
     247        "Subnet is ongeldig (gebruik CIDR vorm, bijv. 10.0.0.0/24)"
     248);}
     249
     250function _ErrorSubnetIsRequired($a="",$b="",$c="",$d="") { return (
     251        "Subnet is vereist. (in CIDR vorm)"
     252);}
     253
    246254function _ErrorValidChoiceIsRequired($a="",$b="",$c="",$d="") { return (
    247255        "U moet een geldig keus maken!"

  • npl/syn3/webint/src/lang_nlD.php

    r55d876d r577e6d3  
    244244);}
    245245
     246function _ErrorSubnetIsInvalid($a="",$b="",$c="",$d="") { LangDebug("Subnet is ongeldig (gebruik CIDR vorm, bijv. 10.0.0.0/24)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8307");return (
     247        "Subnet is ongeldig (gebruik CIDR vorm, bijv. 10.0.0.0/24)"
     248);}
     249
     250function _ErrorSubnetIsRequired($a="",$b="",$c="",$d="") { LangDebug("Subnet is vereist. (in CIDR vorm)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8308");return (
     251        "Subnet is vereist. (in CIDR vorm)"
     252);}
     253
    246254function _ErrorValidChoiceIsRequired($a="",$b="",$c="",$d="") { LangDebug("U moet een geldig keus maken!", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=5426");return (
    247255        "U moet een geldig keus maken!"

  • npl/syn3/webint/src/lang_pl.php

    r55d876d r577e6d3  
    126126
    127127function _ErrorFilenameIsInvalid($a="",$b="",$c="",$d="") { return (
    128         "_ErrorFilenameIsInvalid($a,$b,$c,$d)"
     128        "Filename has invalid characters"
    129129);}
    130130
    131131function _ErrorFilenameIsRequired($a="",$b="",$c="",$d="") { return (
    132         "_ErrorFilenameIsRequired($a,$b,$c,$d)"
     132        "Enter filename"
    133133);}
    134134
    … …  
    245245);}
    246246
     247function _ErrorSubnetIsInvalid($a="",$b="",$c="",$d="") { return (
     248        "Invalid subnet (use CIDR format, e.g. 10.0.0.0/24)"
     249);}
     250
     251function _ErrorSubnetIsRequired($a="",$b="",$c="",$d="") { return (
     252        "Subnet is required (in CIRD form)"
     253);}
     254
    247255function _ErrorValidChoiceIsRequired($a="",$b="",$c="",$d="") { return (
    248256        "You need to make a valid choice!"

  • npl/syn3/webint/src/lang_plD.php

    r55d876d r577e6d3  
    126126);}
    127127
    128 function _ErrorFilenameIsInvalid($a="",$b="",$c="",$d="") { LangDebug("_ErrorFilenameIsInvalid($a,$b,$c,$d)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pl&add_labelID=_ErrorFilenameIsInvalid");return (
    129         "_ErrorFilenameIsInvalid($a,$b,$c,$d)"
    130 );}
    131 
    132 function _ErrorFilenameIsRequired($a="",$b="",$c="",$d="") { LangDebug("_ErrorFilenameIsRequired($a,$b,$c,$d)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pl&add_labelID=_ErrorFilenameIsRequired");return (
    133         "_ErrorFilenameIsRequired($a,$b,$c,$d)"
     128function _ErrorFilenameIsInvalid($a="",$b="",$c="",$d="") { LangDebug("Filename has invalid characters", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pl&add_labelID=_ErrorFilenameIsInvalid");return (
     129        "Filename has invalid characters"
     130);}
     131
     132function _ErrorFilenameIsRequired($a="",$b="",$c="",$d="") { LangDebug("Enter filename", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pl&add_labelID=_ErrorFilenameIsRequired");return (
     133        "Enter filename"
    134134);}
    135135
    … …  
    246246);}
    247247
     248function _ErrorSubnetIsInvalid($a="",$b="",$c="",$d="") { LangDebug("Invalid subnet (use CIDR format, e.g. 10.0.0.0/24)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pl&add_labelID=_ErrorSubnetIsInvalid");return (
     249        "Invalid subnet (use CIDR format, e.g. 10.0.0.0/24)"
     250);}
     251
     252function _ErrorSubnetIsRequired($a="",$b="",$c="",$d="") { LangDebug("Subnet is required (in CIRD form)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pl&add_labelID=_ErrorSubnetIsRequired");return (
     253        "Subnet is required (in CIRD form)"
     254);}
     255
    248256function _ErrorValidChoiceIsRequired($a="",$b="",$c="",$d="") { LangDebug("You need to make a valid choice!", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pl&add_labelID=_ErrorValidChoiceIsRequired");return (
    249257        "You need to make a valid choice!"

  • npl/syn3/webint/src/lang_pt.php

    r55d876d r577e6d3  
    125125
    126126function _ErrorFilenameIsInvalid($a="",$b="",$c="",$d="") { return (
    127         "_ErrorFilenameIsInvalid($a,$b,$c,$d)"
     127        "Filename has invalid characters"
    128128);}
    129129
    130130function _ErrorFilenameIsRequired($a="",$b="",$c="",$d="") { return (
    131         "_ErrorFilenameIsRequired($a,$b,$c,$d)"
     131        "Enter filename"
    132132);}
    133133
    … …  
    242242function _ErrorSharenameIsRequired($a="",$b="",$c="",$d="") { return (
    243243        "Enter a share name."
     244);}
     245
     246function _ErrorSubnetIsInvalid($a="",$b="",$c="",$d="") { return (
     247        "Invalid subnet (use CIDR format, e.g. 10.0.0.0/24)"
     248);}
     249
     250function _ErrorSubnetIsRequired($a="",$b="",$c="",$d="") { return (
     251        "Subnet is required (in CIRD form)"
    244252);}
    245253

  • npl/syn3/webint/src/lang_ptD.php

    r55d876d r577e6d3  
    124124);}
    125125
    126 function _ErrorFilenameIsInvalid($a="",$b="",$c="",$d="") { LangDebug("_ErrorFilenameIsInvalid($a,$b,$c,$d)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_ErrorFilenameIsInvalid");return (
    127         "_ErrorFilenameIsInvalid($a,$b,$c,$d)"
    128 );}
    129 
    130 function _ErrorFilenameIsRequired($a="",$b="",$c="",$d="") { LangDebug("_ErrorFilenameIsRequired($a,$b,$c,$d)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_ErrorFilenameIsRequired");return (
    131         "_ErrorFilenameIsRequired($a,$b,$c,$d)"
     126function _ErrorFilenameIsInvalid($a="",$b="",$c="",$d="") { LangDebug("Filename has invalid characters", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_ErrorFilenameIsInvalid");return (
     127        "Filename has invalid characters"
     128);}
     129
     130function _ErrorFilenameIsRequired($a="",$b="",$c="",$d="") { LangDebug("Enter filename", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_ErrorFilenameIsRequired");return (
     131        "Enter filename"
    132132);}
    133133
    … …  
    242242function _ErrorSharenameIsRequired($a="",$b="",$c="",$d="") { LangDebug("Enter a share name.", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_ErrorSharenameIsRequired");return (
    243243        "Enter a share name."
     244);}
     245
     246function _ErrorSubnetIsInvalid($a="",$b="",$c="",$d="") { LangDebug("Invalid subnet (use CIDR format, e.g. 10.0.0.0/24)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_ErrorSubnetIsInvalid");return (
     247        "Invalid subnet (use CIDR format, e.g. 10.0.0.0/24)"
     248);}
     249
     250function _ErrorSubnetIsRequired($a="",$b="",$c="",$d="") { LangDebug("Subnet is required (in CIRD form)", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_ErrorSubnetIsRequired");return (
     251        "Subnet is required (in CIRD form)"
    244252);}
    245253

  • npl/syn3/webint/src/openvpn/editsettings.php

    r55d876d r577e6d3  
    7474
    7575
     76echo "<tr><td>";
     77echo _OpenVPNRouteMode();
     78echo "<td>";
     79
     80form_FieldRadio(array(
     81        "name"          =>"ROUTE_MODE",
     82        "value"         =>$fields["ROUTE_MODE"],
     83        "errors"        =>$errors,
     84        "radiovalue"=>"all",
     85        "autosubmit"=>"1"
     86));
     87echo _OpenVPNRouteModeAll();
     88echo "<br>";
     89
     90form_FieldRadio(array(
     91        "name"          =>"ROUTE_MODE",
     92        "value"         =>$fields["ROUTE_MODE"],
     93        "errors"        =>$errors,
     94        "radiovalue"=>"subnet",
     95        "autosubmit"=>"1"
     96));
     97echo _OpenVPNRouteModeSubnet();
     98
     99echo "</tr>";
     100
     101
     102if ($fields['ROUTE_MODE']=="subnet")
     103{
     104    echo "<tr><td>";
     105    echo _OpenVPNSubnetToRoute();
     106    echo "<td>";
     107    form_FieldText(array(
     108        "name"          =>"SUBNET",
     109        "value"         =>$fields[SUBNET],
     110        "errors"        =>$errors,
     111        "error"         =>"",
     112        "disabled"      =>0,
     113        "length"        =>30
     114    ));
     115    echo "</tr>";
     116}
     117
     118echo "<tr><td>";
     119echo _OpenVPNPushDNS();
     120echo "<td>";
     121form_FieldText(array(
     122    "name"              =>"PUSH_DNS",
     123    "value"             =>$fields[PUSH_DNS],
     124    "errors"    =>$errors,
     125    "error"             =>"",
     126    "disabled"  =>0,
     127    "length"    =>30
     128));
     129echo "</tr>";
    76130
    77131echo "</table>";

  • npl/syn3/webint/src/openvpn/lang_de.php

    r55d876d r577e6d3  
    6464);}
    6565
     66function _OpenVPNPushDNS($a="",$b="",$c="",$d="") { return (
     67        "DNS server for clients"
     68);}
     69
     70function _OpenVPNRouteMode($a="",$b="",$c="",$d="") { return (
     71        "Routing mode"
     72);}
     73
     74function _OpenVPNRouteModeAll($a="",$b="",$c="",$d="") { return (
     75        "Route all internet traffic via server"
     76);}
     77
     78function _OpenVPNRouteModeSubnet($a="",$b="",$c="",$d="") { return (
     79        "Route a specific subnet"
     80);}
     81
    6682function _OpenVPNServerHost($a="",$b="",$c="",$d="") { return (
    6783        "OpenVPN server host"
    … …  
    8096);}
    8197
     98function _OpenVPNSubnetToRoute($a="",$b="",$c="",$d="") { return (
     99        "Routing subnet"
     100);}
     101
    82102function _RemoteIP($a="",$b="",$c="",$d="") { return (
    83103        "Client IP"

  • npl/syn3/webint/src/openvpn/lang_deD.php

    r55d876d r577e6d3  
    6464);}
    6565
     66function _OpenVPNPushDNS($a="",$b="",$c="",$d="") { LangDebug("DNS server for clients", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=de&add_labelID=_OpenVPNPushDNS");return (
     67        "DNS server for clients"
     68);}
     69
     70function _OpenVPNRouteMode($a="",$b="",$c="",$d="") { LangDebug("Routing mode", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=de&add_labelID=_OpenVPNRouteMode");return (
     71        "Routing mode"
     72);}
     73
     74function _OpenVPNRouteModeAll($a="",$b="",$c="",$d="") { LangDebug("Route all internet traffic via server", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=de&add_labelID=_OpenVPNRouteModeAll");return (
     75        "Route all internet traffic via server"
     76);}
     77
     78function _OpenVPNRouteModeSubnet($a="",$b="",$c="",$d="") { LangDebug("Route a specific subnet", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=de&add_labelID=_OpenVPNRouteModeSubnet");return (
     79        "Route a specific subnet"
     80);}
     81
    6682function _OpenVPNServerHost($a="",$b="",$c="",$d="") { LangDebug("OpenVPN server host", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=de&add_labelID=_OpenVPNServerHost");return (
    6783        "OpenVPN server host"
    … …  
    8096);}
    8197
     98function _OpenVPNSubnetToRoute($a="",$b="",$c="",$d="") { LangDebug("Routing subnet", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=de&add_labelID=_OpenVPNSubnetToRoute");return (
     99        "Routing subnet"
     100);}
     101
    82102function _RemoteIP($a="",$b="",$c="",$d="") { LangDebug("Client IP", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=de&add_labelID=_RemoteIP");return (
    83103        "Client IP"

  • npl/syn3/webint/src/openvpn/lang_en.php

    r55d876d r577e6d3  
    6464);}
    6565
     66function _OpenVPNPushDNS($a="",$b="",$c="",$d="") { return (
     67        "DNS server for clients"
     68);}
     69
     70function _OpenVPNRouteMode($a="",$b="",$c="",$d="") { return (
     71        "Routing mode"
     72);}
     73
     74function _OpenVPNRouteModeAll($a="",$b="",$c="",$d="") { return (
     75        "Route all internet traffic via server"
     76);}
     77
     78function _OpenVPNRouteModeSubnet($a="",$b="",$c="",$d="") { return (
     79        "Route a specific subnet"
     80);}
     81
    6682function _OpenVPNServerHost($a="",$b="",$c="",$d="") { return (
    6783        "OpenVPN server host"
    … …  
    8096);}
    8197
     98function _OpenVPNSubnetToRoute($a="",$b="",$c="",$d="") { return (
     99        "Routing subnet"
     100);}
     101
    82102function _RemoteIP($a="",$b="",$c="",$d="") { return (
    83103        "Client IP"

  • npl/syn3/webint/src/openvpn/lang_enD.php

    r55d876d r577e6d3  
    6464);}
    6565
     66function _OpenVPNPushDNS($a="",$b="",$c="",$d="") { LangDebug("DNS server for clients", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8314");return (
     67        "DNS server for clients"
     68);}
     69
     70function _OpenVPNRouteMode($a="",$b="",$c="",$d="") { LangDebug("Routing mode", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8315");return (
     71        "Routing mode"
     72);}
     73
     74function _OpenVPNRouteModeAll($a="",$b="",$c="",$d="") { LangDebug("Route all internet traffic via server", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8318");return (
     75        "Route all internet traffic via server"
     76);}
     77
     78function _OpenVPNRouteModeSubnet($a="",$b="",$c="",$d="") { LangDebug("Route a specific subnet", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8317");return (
     79        "Route a specific subnet"
     80);}
     81
    6682function _OpenVPNServerHost($a="",$b="",$c="",$d="") { LangDebug("OpenVPN server host", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8290");return (
    6783        "OpenVPN server host"
    … …  
    8096);}
    8197
     98function _OpenVPNSubnetToRoute($a="",$b="",$c="",$d="") { LangDebug("Routing subnet", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8316");return (
     99        "Routing subnet"
     100);}
     101
    82102function _RemoteIP($a="",$b="",$c="",$d="") { LangDebug("Client IP", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8294");return (
    83103        "Client IP"

  • npl/syn3/webint/src/openvpn/lang_nl.php

    r55d876d r577e6d3  
    6464);}
    6565
     66function _OpenVPNPushDNS($a="",$b="",$c="",$d="") { return (
     67        "DNS server voor clients"
     68);}
     69
     70function _OpenVPNRouteMode($a="",$b="",$c="",$d="") { return (
     71        "Routing modus"
     72);}
     73
     74function _OpenVPNRouteModeAll($a="",$b="",$c="",$d="") { return (
     75        "Routeer al het internet verkeer via de server."
     76);}
     77
     78function _OpenVPNRouteModeSubnet($a="",$b="",$c="",$d="") { return (
     79        "Routeer alleen een bepaald subnet naar de server"
     80);}
     81
    6682function _OpenVPNServerHost($a="",$b="",$c="",$d="") { return (
    6783        "OpenVPN server host"
    … …  
    8096);}
    8197
     98function _OpenVPNSubnetToRoute($a="",$b="",$c="",$d="") { return (
     99        "Routering subnet"
     100);}
     101
    82102function _RemoteIP($a="",$b="",$c="",$d="") { return (
    83103        "Client IP"

  • npl/syn3/webint/src/openvpn/lang_nlD.php

    r55d876d r577e6d3  
    6464);}
    6565
     66function _OpenVPNPushDNS($a="",$b="",$c="",$d="") { LangDebug("DNS server voor clients", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8309");return (
     67        "DNS server voor clients"
     68);}
     69
     70function _OpenVPNRouteMode($a="",$b="",$c="",$d="") { LangDebug("Routing modus", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8310");return (
     71        "Routing modus"
     72);}
     73
     74function _OpenVPNRouteModeAll($a="",$b="",$c="",$d="") { LangDebug("Routeer al het internet verkeer via de server.", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8311");return (
     75        "Routeer al het internet verkeer via de server."
     76);}
     77
     78function _OpenVPNRouteModeSubnet($a="",$b="",$c="",$d="") { LangDebug("Routeer alleen een bepaald subnet naar de server", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8312");return (
     79        "Routeer alleen een bepaald subnet naar de server"
     80);}
     81
    6682function _OpenVPNServerHost($a="",$b="",$c="",$d="") { LangDebug("OpenVPN server host", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8274");return (
    6783        "OpenVPN server host"
    … …  
    8096);}
    8197
     98function _OpenVPNSubnetToRoute($a="",$b="",$c="",$d="") { LangDebug("Routering subnet", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8313");return (
     99        "Routering subnet"
     100);}
     101
    82102function _RemoteIP($a="",$b="",$c="",$d="") { LangDebug("Client IP", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8278");return (
    83103        "Client IP"

  • npl/syn3/webint/src/openvpn/lang_pl.php

    r55d876d r577e6d3  
    6464);}
    6565
     66function _OpenVPNPushDNS($a="",$b="",$c="",$d="") { return (
     67        "DNS server for clients"
     68);}
     69
     70function _OpenVPNRouteMode($a="",$b="",$c="",$d="") { return (
     71        "Routing mode"
     72);}
     73
     74function _OpenVPNRouteModeAll($a="",$b="",$c="",$d="") { return (
     75        "Route all internet traffic via server"
     76);}
     77
     78function _OpenVPNRouteModeSubnet($a="",$b="",$c="",$d="") { return (
     79        "Route a specific subnet"
     80);}
     81
    6682function _OpenVPNServerHost($a="",$b="",$c="",$d="") { return (
    6783        "OpenVPN server host"
    … …  
    8096);}
    8197
     98function _OpenVPNSubnetToRoute($a="",$b="",$c="",$d="") { return (
     99        "Routing subnet"
     100);}
     101
    82102function _RemoteIP($a="",$b="",$c="",$d="") { return (
    83103        "Client IP"

  • npl/syn3/webint/src/openvpn/lang_plD.php

    r55d876d r577e6d3  
    6464);}
    6565
     66function _OpenVPNPushDNS($a="",$b="",$c="",$d="") { LangDebug("DNS server for clients", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pl&add_labelID=_OpenVPNPushDNS");return (
     67        "DNS server for clients"
     68);}
     69
     70function _OpenVPNRouteMode($a="",$b="",$c="",$d="") { LangDebug("Routing mode", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pl&add_labelID=_OpenVPNRouteMode");return (
     71        "Routing mode"
     72);}
     73
     74function _OpenVPNRouteModeAll($a="",$b="",$c="",$d="") { LangDebug("Route all internet traffic via server", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pl&add_labelID=_OpenVPNRouteModeAll");return (
     75        "Route all internet traffic via server"
     76);}
     77
     78function _OpenVPNRouteModeSubnet($a="",$b="",$c="",$d="") { LangDebug("Route a specific subnet", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pl&add_labelID=_OpenVPNRouteModeSubnet");return (
     79        "Route a specific subnet"
     80);}
     81
    6682function _OpenVPNServerHost($a="",$b="",$c="",$d="") { LangDebug("OpenVPN server host", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pl&add_labelID=_OpenVPNServerHost");return (
    6783        "OpenVPN server host"
    … …  
    8096);}
    8197
     98function _OpenVPNSubnetToRoute($a="",$b="",$c="",$d="") { LangDebug("Routing subnet", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pl&add_labelID=_OpenVPNSubnetToRoute");return (
     99        "Routing subnet"
     100);}
     101
    82102function _RemoteIP($a="",$b="",$c="",$d="") { LangDebug("Client IP", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pl&add_labelID=_RemoteIP");return (
    83103        "Client IP"

  • npl/syn3/webint/src/openvpn/lang_pt.php

    r55d876d r577e6d3  
    6464);}
    6565
     66function _OpenVPNPushDNS($a="",$b="",$c="",$d="") { return (
     67        "DNS server for clients"
     68);}
     69
     70function _OpenVPNRouteMode($a="",$b="",$c="",$d="") { return (
     71        "Routing mode"
     72);}
     73
     74function _OpenVPNRouteModeAll($a="",$b="",$c="",$d="") { return (
     75        "Route all internet traffic via server"
     76);}
     77
     78function _OpenVPNRouteModeSubnet($a="",$b="",$c="",$d="") { return (
     79        "Route a specific subnet"
     80);}
     81
    6682function _OpenVPNServerHost($a="",$b="",$c="",$d="") { return (
    6783        "OpenVPN server host"
    … …  
    8096);}
    8197
     98function _OpenVPNSubnetToRoute($a="",$b="",$c="",$d="") { return (
     99        "Routing subnet"
     100);}
     101
    82102function _RemoteIP($a="",$b="",$c="",$d="") { return (
    83103        "Client IP"

  • npl/syn3/webint/src/openvpn/lang_ptD.php

    r55d876d r577e6d3  
    6464);}
    6565
     66function _OpenVPNPushDNS($a="",$b="",$c="",$d="") { LangDebug("DNS server for clients", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_OpenVPNPushDNS");return (
     67        "DNS server for clients"
     68);}
     69
     70function _OpenVPNRouteMode($a="",$b="",$c="",$d="") { LangDebug("Routing mode", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_OpenVPNRouteMode");return (
     71        "Routing mode"
     72);}
     73
     74function _OpenVPNRouteModeAll($a="",$b="",$c="",$d="") { LangDebug("Route all internet traffic via server", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_OpenVPNRouteModeAll");return (
     75        "Route all internet traffic via server"
     76);}
     77
     78function _OpenVPNRouteModeSubnet($a="",$b="",$c="",$d="") { LangDebug("Route a specific subnet", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_OpenVPNRouteModeSubnet");return (
     79        "Route a specific subnet"
     80);}
     81
    6682function _OpenVPNServerHost($a="",$b="",$c="",$d="") { LangDebug("OpenVPN server host", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_OpenVPNServerHost");return (
    6783        "OpenVPN server host"
    … …  
    8096);}
    8197
     98function _OpenVPNSubnetToRoute($a="",$b="",$c="",$d="") { LangDebug("Routing subnet", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_OpenVPNSubnetToRoute");return (
     99        "Routing subnet"
     100);}
     101
    82102function _RemoteIP($a="",$b="",$c="",$d="") { LangDebug("Client IP", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_RemoteIP");return (
    83103        "Client IP"

  • npl/syn3/webint/src/openvpn/model.php

    r55d876d r577e6d3  
    5454                return (array("SERVER"=>_InvalidHostname()));
    5555
     56
    5657        FileWriteSettings("/etc/openvpn/syn3.conf", $data);
    57         LogInfo(_OpenVPNSettingsChanged());
     58
     59    //generate additional config settings
     60    $cfg=Array();
     61    $cfg[]="### Additional SYN-3 OpenVPN settings";
     62    $cfg[]="# will be overwritten when settings are saved in SCC";
     63
     64    if ($data['ROUTE_MODE']=="all")
     65        $cfg[]="push 'redirect-gateway'";
     66    else
     67    {
     68        if ($data['SUBNET'])
     69        {
     70            $err=Error_ValidSubnet($data['SUBNET']);
     71            if ($err)
     72                return (array("SUBNET"=>$err));
     73
     74            list($ip,$bits)=explode("/", $data['SUBNET']);
     75            $netmask=CalcMask($bits);
     76            $cfg[]="push 'route $ip $netmask'";
     77        }
     78    }
     79
     80    if ($data['PUSH_DNS']!="")
     81    {
     82        $err=Error_ValidIP($data['PUSH_DNS']);
     83        if ($err)
     84            return (array("PUSH_DNS"=>$err));
     85
     86        $cfg[]="push 'dhcp-option DNS ".$data['PUSH_DNS']."'";
     87    }
     88
     89
     90    FileWrite("/etc/openvpn/openvpn_syn3.conf",$cfg);
     91    LogInfo(_OpenVPNSettingsChanged());
     92
     93    SvcRestart("openvpn");
     94
    5895}
    5996
Note: See TracChangeset for help on using the changeset viewer.