Commit eb1177f6 authored by Marius Cramer's avatar Marius Cramer

Merge branch 'master' into 'master'

Master

See merge request !221
parents 8a77a74e 2df8c0b8
...@@ -186,7 +186,8 @@ class functions { ...@@ -186,7 +186,8 @@ class functions {
global $app; global $app;
if($type == 'IPv4'){ if($type == 'IPv4'){
$regex = "/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/"; // $regex = "/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/";
$regex = "/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/";
} else { } else {
// IPv6 // IPv6
$regex = "/^(\:\:([a-f0-9]{1,4}\:){0,6}?[a-f0-9]{0,4}|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){0,6}?\:\:|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){1,6}?\:\:([a-f0-9]{1,4}\:){1,6}?[a-f0-9]{1,4})(\/\d{1,3})?$/i"; $regex = "/^(\:\:([a-f0-9]{1,4}\:){0,6}?[a-f0-9]{0,4}|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){0,6}?\:\:|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){1,6}?\:\:([a-f0-9]{1,4}\:){1,6}?[a-f0-9]{1,4})(\/\d{1,3})?$/i";
......
...@@ -1058,11 +1058,10 @@ class tform_base { ...@@ -1058,11 +1058,10 @@ class tform_base {
} }
break; break;
case 'ISIPV4': case 'ISIPV4':
$vip=1; $vip=1;
if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){ // if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){
if(preg_match("/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/", $field_value)){
$groups=explode(".", $field_value); $groups=explode(".", $field_value);
foreach($groups as $group){ foreach($groups as $group){
if($group<0 or $group>255) if($group<0 or $group>255)
...@@ -1078,6 +1077,7 @@ class tform_base { ...@@ -1078,6 +1077,7 @@ class tform_base {
} }
} }
break; break;
case 'ISIP': case 'ISIP':
if($validator['allowempty'] != 'y') $validator['allowempty'] = 'n'; if($validator['allowempty'] != 'y') $validator['allowempty'] = 'n';
if($validator['allowempty'] == 'y' && $field_value == '') { if($validator['allowempty'] == 'y' && $field_value == '') {
...@@ -1107,7 +1107,8 @@ class tform_base { ...@@ -1107,7 +1107,8 @@ class tform_base {
if(preg_match("/^(\:\:([a-f0-9]{1,4}\:){0,6}?[a-f0-9]{0,4}|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){0,6}?\:\:|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){1,6}?\:\:([a-f0-9]{1,4}\:){1,6}?[a-f0-9]{1,4})(\/\d{1,3})?$/i", $field_value)){ if(preg_match("/^(\:\:([a-f0-9]{1,4}\:){0,6}?[a-f0-9]{0,4}|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){0,6}?\:\:|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){1,6}?\:\:([a-f0-9]{1,4}\:){1,6}?[a-f0-9]{1,4})(\/\d{1,3})?$/i", $field_value)){
$ip_ok = 1; $ip_ok = 1;
} }
if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){ // if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){
if(preg_match("/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/", $field_value)){
$ip_ok = 1; $ip_ok = 1;
} }
if($ip_ok == 0) { if($ip_ok == 0) {
......
...@@ -44,7 +44,8 @@ class validate_database { ...@@ -44,7 +44,8 @@ class validate_database {
$cur_value = trim($cur_value); $cur_value = trim($cur_value);
$valid = true; $valid = true;
if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $cur_value)) { // if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $cur_value)) {
if(preg_match("/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/", $cur_value)) {
$groups = explode(".", $cur_value); $groups = explode(".", $cur_value);
foreach($groups as $group){ foreach($groups as $group){
if($group<0 or $group>255) if($group<0 or $group>255)
......
...@@ -315,7 +315,8 @@ class validate_dns { ...@@ -315,7 +315,8 @@ class validate_dns {
if(preg_match("/^(\:\:([a-f0-9]{1,4}\:){0,6}?[a-f0-9]{0,4}|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){0,6}?\:\:|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){1,6}?\:\:([a-f0-9]{1,4}\:){1,6}?[a-f0-9]{1,4})(\/\d{1,3})?$/i", $field_value)){ if(preg_match("/^(\:\:([a-f0-9]{1,4}\:){0,6}?[a-f0-9]{0,4}|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){0,6}?\:\:|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){1,6}?\:\:([a-f0-9]{1,4}\:){1,6}?[a-f0-9]{1,4})(\/\d{1,3})?$/i", $field_value)){
$ip_ok = 1; $ip_ok = 1;
} }
if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){ // if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){
if(preg_match("/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/", $field_value)){
$ip_ok = 1; $ip_ok = 1;
} }
if($ip_ok == 0) { if($ip_ok == 0) {
......
...@@ -28,8 +28,8 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, ...@@ -28,8 +28,8 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
$form["title"] = "IP Addresse mapping"; $form["title"] = "IPv4 Address mapping";
$form["description"] = ""; $form["description"] = "Form to map IPv4-addresses for Web-Server";
$form["name"] = "server_ip_map"; $form["name"] = "server_ip_map";
$form["action"] = "server_ip_map_edit.php"; $form["action"] = "server_ip_map_edit.php";
$form["db_table"] = "server_ip_map"; $form["db_table"] = "server_ip_map";
......
...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active'; ...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
$wb["ip_error_wrong"] = 'The Destination IP address is invalid'; $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
$wb["destination_ip_empty"] = 'The Destination IP is empty.'; $wb["destination_ip_empty"] = 'The Destination IP is empty.';
$wb["source_ip_empty"] = 'The Source IP is empty.'; $wb["source_ip_empty"] = 'The Source IP is empty.';
$wb["server_empty_error"] = 'The Server is empty.';
$wb["duplicate_mapping_error"] = "Mapping already exists."; $wb["duplicate_mapping_error"] = "Mapping already exists.";
$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server"; $wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
?> ?>
...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active'; ...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
$wb["ip_error_wrong"] = 'The Destination IP address is invalid'; $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
$wb["destination_ip_empty"] = 'The Destination IP is empty.'; $wb["destination_ip_empty"] = 'The Destination IP is empty.';
$wb["source_ip_empty"] = 'The Source IP is empty.'; $wb["source_ip_empty"] = 'The Source IP is empty.';
$wb["server_empty_error"] = 'The Server is empty.';
$wb["duplicate_mapping_error"] = "Mapping already exists."; $wb["duplicate_mapping_error"] = "Mapping already exists.";
$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server"; $wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
?> ?>
...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active'; ...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
$wb["ip_error_wrong"] = 'The Destination IP address is invalid'; $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
$wb["destination_ip_empty"] = 'The Destination IP is empty.'; $wb["destination_ip_empty"] = 'The Destination IP is empty.';
$wb["source_ip_empty"] = 'The Source IP is empty.'; $wb["source_ip_empty"] = 'The Source IP is empty.';
$wb["server_empty_error"] = 'The Server is empty.';
$wb["duplicate_mapping_error"] = "Mapping already exists."; $wb["duplicate_mapping_error"] = "Mapping already exists.";
$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server"; $wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
?> ?>
...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active'; ...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
$wb["ip_error_wrong"] = 'The Destination IP address is invalid'; $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
$wb["destination_ip_empty"] = 'The Destination IP is empty.'; $wb["destination_ip_empty"] = 'The Destination IP is empty.';
$wb["source_ip_empty"] = 'The Source IP is empty.'; $wb["source_ip_empty"] = 'The Source IP is empty.';
$wb["server_empty_error"] = 'The Server is empty.';
$wb["duplicate_mapping_error"] = "Mapping already exists."; $wb["duplicate_mapping_error"] = "Mapping already exists.";
$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server"; $wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
?> ?>
...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Aktiv'; ...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Aktiv';
$wb["ip_error_wrong"] = 'Die neue IP ist ungueltig'; $wb["ip_error_wrong"] = 'Die neue IP ist ungueltig';
$wb["destination_ip_empty"] = 'Die neue IP ist leer.'; $wb["destination_ip_empty"] = 'Die neue IP ist leer.';
$wb["source_ip_empty"] = 'Die eigentliche IP ist leer.'; $wb["source_ip_empty"] = 'Die eigentliche IP ist leer.';
$wb["server_empty_error"] = 'Der Server ist leer.';
$wb["duplicate_mapping_error"] = "Mapping existiert bereits."; $wb["duplicate_mapping_error"] = "Mapping existiert bereits.";
$wb["duplicate_mapping_error"] = "Die eigentliche IP darf keine IP des Rewrite-Servers sein."; $wb["ip_mapping_error"] = "Die eigentliche IP darf keine IP des Rewrite-Servers sein.";
?> ?>
...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active'; ...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
$wb["ip_error_wrong"] = 'The Destination IP address is invalid'; $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
$wb["destination_ip_empty"] = 'The Destination IP is empty.'; $wb["destination_ip_empty"] = 'The Destination IP is empty.';
$wb["source_ip_empty"] = 'The Source IP is empty.'; $wb["source_ip_empty"] = 'The Source IP is empty.';
$wb["server_empty_error"] = 'The Server is empty.';
$wb["duplicate_mapping_error"] = "Mapping already exists."; $wb["duplicate_mapping_error"] = "Mapping already exists.";
$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server"; $wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
?> ?>
...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active'; ...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
$wb["ip_error_wrong"] = 'The Destination IP address is invalid'; $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
$wb["destination_ip_empty"] = 'The Destination IP is empty.'; $wb["destination_ip_empty"] = 'The Destination IP is empty.';
$wb["source_ip_empty"] = 'The Source IP is empty.'; $wb["source_ip_empty"] = 'The Source IP is empty.';
$wb["server_empty_error"] = 'The Server is empty.';
$wb["duplicate_mapping_error"] = "Mapping already exists."; $wb["duplicate_mapping_error"] = "Mapping already exists.";
$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server"; $wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
?> ?>
...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active'; ...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
$wb["ip_error_wrong"] = 'The Destination IP address is invalid'; $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
$wb["destination_ip_empty"] = 'The Destination IP is empty.'; $wb["destination_ip_empty"] = 'The Destination IP is empty.';
$wb["source_ip_empty"] = 'The Source IP is empty.'; $wb["source_ip_empty"] = 'The Source IP is empty.';
$wb["server_empty_error"] = 'The Server is empty.';
$wb["duplicate_mapping_error"] = "Mapping already exists."; $wb["duplicate_mapping_error"] = "Mapping already exists.";
$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server"; $wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
?> ?>
...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active'; ...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
$wb["ip_error_wrong"] = 'The Destination IP address is invalid'; $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
$wb["destination_ip_empty"] = 'The Destination IP is empty.'; $wb["destination_ip_empty"] = 'The Destination IP is empty.';
$wb["source_ip_empty"] = 'The Source IP is empty.'; $wb["source_ip_empty"] = 'The Source IP is empty.';
$wb["server_empty_error"] = 'The Server is empty.';
$wb["duplicate_mapping_error"] = "Mapping already exists."; $wb["duplicate_mapping_error"] = "Mapping already exists.";
$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server"; $wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
?> ?>
...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active'; ...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
$wb["ip_error_wrong"] = 'The Destination IP address is invalid'; $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
$wb["destination_ip_empty"] = 'The Destination IP is empty.'; $wb["destination_ip_empty"] = 'The Destination IP is empty.';
$wb["source_ip_empty"] = 'The Source IP is empty.'; $wb["source_ip_empty"] = 'The Source IP is empty.';
$wb["server_empty_error"] = 'The Server is empty.';
$wb["duplicate_mapping_error"] = "Mapping already exists."; $wb["duplicate_mapping_error"] = "Mapping already exists.";
$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server"; $wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
?> ?>
...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active'; ...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
$wb["ip_error_wrong"] = 'The Destination IP address is invalid'; $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
$wb["destination_ip_empty"] = 'The Destination IP is empty.'; $wb["destination_ip_empty"] = 'The Destination IP is empty.';
$wb["source_ip_empty"] = 'The Source IP is empty.'; $wb["source_ip_empty"] = 'The Source IP is empty.';
$wb["server_empty_error"] = 'The Server is empty.';
$wb["duplicate_mapping_error"] = "Mapping already exists."; $wb["duplicate_mapping_error"] = "Mapping already exists.";
$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server"; $wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
?> ?>
...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active'; ...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
$wb["ip_error_wrong"] = 'The Destination IP address is invalid'; $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
$wb["destination_ip_empty"] = 'The Destination IP is empty.'; $wb["destination_ip_empty"] = 'The Destination IP is empty.';
$wb["source_ip_empty"] = 'The Source IP is empty.'; $wb["source_ip_empty"] = 'The Source IP is empty.';
$wb["server_empty_error"] = 'The Server is empty.';
$wb["duplicate_mapping_error"] = "Mapping already exists."; $wb["duplicate_mapping_error"] = "Mapping already exists.";
$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server"; $wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
?> ?>
...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active'; ...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
$wb["ip_error_wrong"] = 'The Destination IP address is invalid'; $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
$wb["destination_ip_empty"] = 'The Destination IP is empty.'; $wb["destination_ip_empty"] = 'The Destination IP is empty.';
$wb["source_ip_empty"] = 'The Source IP is empty.'; $wb["source_ip_empty"] = 'The Source IP is empty.';
$wb["server_empty_error"] = 'The Server is empty.';
$wb["duplicate_mapping_error"] = "Mapping already exists."; $wb["duplicate_mapping_error"] = "Mapping already exists.";
$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server"; $wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
?> ?>
...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active'; ...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
$wb["ip_error_wrong"] = 'The Destination IP address is invalid'; $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
$wb["destination_ip_empty"] = 'The Destination IP is empty.'; $wb["destination_ip_empty"] = 'The Destination IP is empty.';
$wb["source_ip_empty"] = 'The Source IP is empty.'; $wb["source_ip_empty"] = 'The Source IP is empty.';
$wb["server_empty_error"] = 'The Server is empty.';
$wb["duplicate_mapping_error"] = "Mapping already exists."; $wb["duplicate_mapping_error"] = "Mapping already exists.";
$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server"; $wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
?> ?>
...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active'; ...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
$wb["ip_error_wrong"] = 'The Destination IP address is invalid'; $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
$wb["destination_ip_empty"] = 'The Destination IP is empty.'; $wb["destination_ip_empty"] = 'The Destination IP is empty.';
$wb["source_ip_empty"] = 'The Source IP is empty.'; $wb["source_ip_empty"] = 'The Source IP is empty.';
$wb["server_empty_error"] = 'The Server is empty.';
$wb["duplicate_mapping_error"] = "Mapping already exists."; $wb["duplicate_mapping_error"] = "Mapping already exists.";
$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server"; $wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
?> ?>
...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active'; ...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
$wb["ip_error_wrong"] = 'The Destination IP address is invalid'; $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
$wb["destination_ip_empty"] = 'The Destination IP is empty.'; $wb["destination_ip_empty"] = 'The Destination IP is empty.';
$wb["source_ip_empty"] = 'The Source IP is empty.'; $wb["source_ip_empty"] = 'The Source IP is empty.';
$wb["server_empty_error"] = 'The Server is empty.';
$wb["duplicate_mapping_error"] = "Mapping already exists."; $wb["duplicate_mapping_error"] = "Mapping already exists.";
$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server"; $wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
?> ?>
...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active'; ...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
$wb["ip_error_wrong"] = 'The Destination IP address is invalid'; $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
$wb["destination_ip_empty"] = 'The Destination IP is empty.'; $wb["destination_ip_empty"] = 'The Destination IP is empty.';
$wb["source_ip_empty"] = 'The Source IP is empty.'; $wb["source_ip_empty"] = 'The Source IP is empty.';
$wb["server_empty_error"] = 'The Server is empty.';
$wb["duplicate_mapping_error"] = "Mapping already exists."; $wb["duplicate_mapping_error"] = "Mapping already exists.";
$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server"; $wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
?> ?>
...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active'; ...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
$wb["ip_error_wrong"] = 'The Destination IP address is invalid'; $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
$wb["destination_ip_empty"] = 'The Destination IP is empty.'; $wb["destination_ip_empty"] = 'The Destination IP is empty.';
$wb["source_ip_empty"] = 'The Source IP is empty.'; $wb["source_ip_empty"] = 'The Source IP is empty.';
$wb["server_empty_error"] = 'The Server is empty.';
$wb["duplicate_mapping_error"] = "Mapping already exists."; $wb["duplicate_mapping_error"] = "Mapping already exists.";
$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server"; $wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
?> ?>
...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active'; ...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
$wb["ip_error_wrong"] = 'The Destination IP address is invalid'; $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
$wb["destination_ip_empty"] = 'The Destination IP is empty.'; $wb["destination_ip_empty"] = 'The Destination IP is empty.';
$wb["source_ip_empty"] = 'The Source IP is empty.'; $wb["source_ip_empty"] = 'The Source IP is empty.';
$wb["server_empty_error"] = 'The Server is empty.';
$wb["duplicate_mapping_error"] = "Mapping already exists."; $wb["duplicate_mapping_error"] = "Mapping already exists.";
$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server"; $wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
?> ?>
...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active'; ...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
$wb["ip_error_wrong"] = 'The Destination IP address is invalid'; $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
$wb["destination_ip_empty"] = 'The Destination IP is empty.'; $wb["destination_ip_empty"] = 'The Destination IP is empty.';
$wb["source_ip_empty"] = 'The Source IP is empty.'; $wb["source_ip_empty"] = 'The Source IP is empty.';
$wb["server_empty_error"] = 'The Server is empty.';
$wb["duplicate_mapping_error"] = "Mapping already exists."; $wb["duplicate_mapping_error"] = "Mapping already exists.";
$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server"; $wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
?> ?>
...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active'; ...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
$wb["ip_error_wrong"] = 'The Destination IP address is invalid'; $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
$wb["destination_ip_empty"] = 'The Destination IP is empty.'; $wb["destination_ip_empty"] = 'The Destination IP is empty.';
$wb["source_ip_empty"] = 'The Source IP is empty.'; $wb["source_ip_empty"] = 'The Source IP is empty.';
$wb["server_empty_error"] = 'The Server is empty.';
$wb["duplicate_mapping_error"] = "Mapping already exists."; $wb["duplicate_mapping_error"] = "Mapping already exists.";
$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server"; $wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
?> ?>
...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active'; ...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
$wb["ip_error_wrong"] = 'The Destination IP address is invalid'; $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
$wb["destination_ip_empty"] = 'The Destination IP is empty.'; $wb["destination_ip_empty"] = 'The Destination IP is empty.';
$wb["source_ip_empty"] = 'The Source IP is empty.'; $wb["source_ip_empty"] = 'The Source IP is empty.';
$wb["server_empty_error"] = 'The Server is empty.';
$wb["duplicate_mapping_error"] = "Mapping already exists."; $wb["duplicate_mapping_error"] = "Mapping already exists.";
$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server"; $wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
?> ?>
...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active'; ...@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
$wb["ip_error_wrong"] = 'The Destination IP address is invalid'; $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
$wb["destination_ip_empty"] = 'The Destination IP is empty.'; $wb["destination_ip_empty"] = 'The Destination IP is empty.';
$wb["source_ip_empty"] = 'The Source IP is empty.'; $wb["source_ip_empty"] = 'The Source IP is empty.';
$wb["server_empty_error"] = 'The Server is empty.';
$wb["duplicate_mapping_error"] = "Mapping already exists."; $wb["duplicate_mapping_error"] = "Mapping already exists.";
$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server"; $wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
?> ?>
...@@ -42,7 +42,7 @@ $items[] = array( 'title' => 'Server IP addresses', ...@@ -42,7 +42,7 @@ $items[] = array( 'title' => 'Server IP addresses',
'link' => 'admin/server_ip_list.php', 'link' => 'admin/server_ip_list.php',
'html_id' => 'server_ip_list'); 'html_id' => 'server_ip_list');
$items[] = array( 'title' => 'Server IP mapping', $items[] = array( 'title' => 'Server IPv4 mapping',
'target' => 'content', 'target' => 'content',
'link' => 'admin/server_ip_map_list.php', 'link' => 'admin/server_ip_map_list.php',
'html_id' => 'server_ip_map_list'); 'html_id' => 'server_ip_map_list');
......
...@@ -59,7 +59,7 @@ class page_action extends tform_actions { ...@@ -59,7 +59,7 @@ class page_action extends tform_actions {
$app->tpl->setVar('server_id', $server_select); $app->tpl->setVar('server_id', $server_select);
// ip-list // ip-list
$sql = "SELECT server_ip.server_ip_id, server_ip.ip_address AS ip_address, server.server_name, CONCAT(server_ip.ip_address,' :: [', server.server_name, ']') AS source FROM server_ip, server WHERE (server_ip.server_id = server.server_id AND server.web_server =1 AND mirror_server_id = 0 AND virtualhost = 'y')"; $sql = "SELECT server_ip.server_ip_id, server_ip.ip_address AS ip_address, server.server_name, CONCAT(server_ip.ip_address,' :: [', server.server_name, ']') AS source FROM server_ip, server WHERE (server_ip.server_id = server.server_id AND server.web_server =1 AND mirror_server_id = 0 AND virtualhost = 'y' AND IP_TYPE = 'IPv4')";
$ips = $app->db->queryAllRecords($sql); $ips = $app->db->queryAllRecords($sql);
$ip_select = "<option value=''></option>"; $ip_select = "<option value=''></option>";
if(is_array($ips)) { if(is_array($ips)) {
...@@ -77,9 +77,11 @@ class page_action extends tform_actions { ...@@ -77,9 +77,11 @@ class page_action extends tform_actions {
function onBeforeInsert() { function onBeforeInsert() {
global $app; global $app;
if($this->dataRecord['server_id']=='') $app->tform->errorMessage .= $app->tform->wordbook['server_empty_error'];
$sql = "SELECT * FROM server_ip WHERE server_id = ? and ip_address = ?"; $sql = "SELECT * FROM server_ip WHERE server_id = ? and ip_address = ?";
$ip_check=$app->db->queryOneRecord($sql, $this->dataRecord['server_id'], $this->dataRecord['source_ip']); $ip_check=$app->db->queryOneRecord($sql, $this->dataRecord['server_id'], $this->dataRecord['source_ip']);
if (is_array($ip_check)) $app->tform->errorMessage .= $app->tform->wordbook['duplicate_mapping_error']; if (is_array($ip_check)) $app->tform->errorMessage .= $app->tform->wordbook['ip_mapping_error'];
$sql = 'SELECT count(*) as no FROM server_ip_map WHERE server_id = ? AND source_ip = ? AND destination_ip = ?'; $sql = 'SELECT count(*) as no FROM server_ip_map WHERE server_id = ? AND source_ip = ? AND destination_ip = ?';
$check = $app->db->queryOneRecord($sql, $this->dataRecord['server_id'], $this->dataRecord['source_ip'], $this->dataRecord['destination_ip']); $check = $app->db->queryOneRecord($sql, $this->dataRecord['server_id'], $this->dataRecord['source_ip'], $this->dataRecord['destination_ip']);
...@@ -88,9 +90,12 @@ class page_action extends tform_actions { ...@@ -88,9 +90,12 @@ class page_action extends tform_actions {
function onBeforeUpdate() { function onBeforeUpdate() {
global $app; global $app;
if($this->dataRecord['server_id']=='') $app->tform->errorMessage .= $app->tform->wordbook['server_empty_error'];
$sql = "SELECT * FROM server_ip WHERE server_id = ? and ip_address = ?"; $sql = "SELECT * FROM server_ip WHERE server_id = ? and ip_address = ?";
$ip_check=$app->db->queryOneRecord($sql, $this->dataRecord['server_id'], $this->dataRecord['source_ip']); $ip_check=$app->db->queryOneRecord($sql, $this->dataRecord['server_id'], $this->dataRecord['source_ip']);
if (is_array($ip_check)) $app->tform->errorMessage .= $app->tform->wordbook['duplicate_mapping_error']; if (is_array($ip_check)) $app->tform->errorMessage .= $app->tform->wordbook['ip_mapping_error'];
$this->oldDataRecord = $app->tform->getDataRecord($this->id); $this->oldDataRecord = $app->tform->getDataRecord($this->id);
if ($this->dataRecord['source_ip'] != $this->oldDataRecord['source_ip'] || $this->dataRecord['destination_ip'] != $this->oldDataRecord['destination_ip']) { if ($this->dataRecord['source_ip'] != $this->oldDataRecord['source_ip'] || $this->dataRecord['destination_ip'] != $this->oldDataRecord['destination_ip']) {
......
...@@ -230,7 +230,8 @@ class functions { ...@@ -230,7 +230,8 @@ class functions {
global $app; global $app;
if($type == 'IPv4'){ if($type == 'IPv4'){
$regex = "/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/"; // $regex = "/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/";
$regex = "/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/";
} else { } else {
// IPv6 // IPv6
$regex = "/^(\:\:([a-f0-9]{1,4}\:){0,6}?[a-f0-9]{0,4}|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){0,6}?\:\:|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){1,6}?\:\:([a-f0-9]{1,4}\:){1,6}?[a-f0-9]{1,4})(\/\d{1,3})?$/i"; $regex = "/^(\:\:([a-f0-9]{1,4}\:){0,6}?[a-f0-9]{0,4}|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){0,6}?\:\:|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){1,6}?\:\:([a-f0-9]{1,4}\:){1,6}?[a-f0-9]{1,4})(\/\d{1,3})?$/i";
......
...@@ -101,7 +101,8 @@ class mysql_clientdb_plugin { ...@@ -101,7 +101,8 @@ class mysql_clientdb_plugin {
$valid = true; $valid = true;
if($db_host == '%' || $db_host == 'localhost') { if($db_host == '%' || $db_host == 'localhost') {
$valid = true; $valid = true;
} elseif(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $db_host)) { // } elseif(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $db_host)) {
} elseif(preg_match("/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/", $db_host)) {
$groups = explode('.', $db_host); $groups = explode('.', $db_host);
foreach($groups as $group){ foreach($groups as $group){
if($group<0 or $group>255) if($group<0 or $group>255)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment