migration to last utf8 standart

docs/wiki/update_auth_wiki.pl

@@ -4,6 +4,9 @@
 # Copyright (C) Roman Dmitiriev, rnd@rajven.ru
 #
 
+use utf8;
+use English;
+use base;
 use FindBin '$Bin';
 use lib "$Bin/";
 use Data::Dumper;

docs/wiki/update_wiki.pl

@@ -4,6 +4,9 @@
 # Copyright (C) Roman Dmitiriev, rnd@rajven.ru
 #
 
+use utf8;
+use English;
+use base;
 use FindBin '$Bin';
 use lib "$Bin/";
 use Data::Dumper;
@@ -91,10 +94,6 @@ $empty_fields{mac}=1;
 
 #apply patch
 foreach my $row (@tmp) {
-if ($row=~/\%META\:FIELD\{name\=\"Description\"/) {
-    $empty_fields{descr}=0;
-    if ($auth->{comments}) { push(@wiki_dev,'%META:FIELD{name="Description" title="Description" value="'.$auth->{comments}.'"}%'); next; }
-    }
 if ($row=~/\%META\:FIELD\{name\=\"Parent\"/) {
     $empty_fields{parent}=0;
     if ($device_name) { push(@wiki_dev,'%META:FIELD{name="Parent" title="Parent" value="'.$device_name.'"}%'); next; }
@@ -112,7 +111,6 @@ push(@wiki_dev,$row);
 
 foreach my $field (keys %empty_fields) {
 next if (!$empty_fields{$field});
-if ($field eq 'descr' and $auth->{comments}) { push(@wiki_dev,'%META:FIELD{name="Description" title="Description" value="'.$auth->{comments}.'"}%'); next; }
 if ($field eq 'parent' and $device_name) { push(@wiki_dev,'%META:FIELD{name="Parent" title="Parent" value="'.$device_name.'"}%'); next; }
 if ($field eq 'parent_port' and $device_port) { push(@wiki_dev,'%META:FIELD{name="ParentPort" title="Parent Port" value="'.$device_port.'"}%'); next; }
 if ($field eq 'mac' and $auth->{mac}) { push(@wiki_dev,'%META:FIELD{name="Mac" title="Mac" value="'.$auth->{mac}.'"}%'); next; }

scripts/Rstat/cmd.pm

@@ -4,6 +4,7 @@ package Rstat::cmd;
 # Copyright (C) Roman Dmitiriev, rnd@rajven.ru
 #
 
+use utf8;
 use strict;
 use English;
 use FindBin '$Bin';

scripts/Rstat/config.pm

@@ -4,6 +4,7 @@ package Rstat::config;
 # Copyright (C) Roman Dmitiriev, rnd@rajven.ru
 #
 
+use utf8;
 use strict;
 use English;
 use FindBin '$Bin';

scripts/Rstat/main.pm

@@ -4,6 +4,7 @@ package Rstat::main;
 # Copyright (C) Roman Dmitiriev, rnd@rajven.ru
 #
 
+use utf8;
 use strict;
 use English;
 use FindBin '$Bin';
@@ -512,7 +513,6 @@ while ($start<=$count-1) {
         die "cannot fork" if($childid == -1);
         # redirect child Input|Output
         unless($childid) {
-            # ÐÏÔÏÍÏË
             open STDIN, "<&", $hparent;
             open STDOUT, ">&", $hparent;
             open STDERR, ">&", $hparent;

scripts/Rstat/mysql.pm

@@ -4,6 +4,7 @@ package Rstat::mysql;
 # Copyright (C) Roman Dmitiriev, rnd@rajven.ru
 #
 
+use utf8;
 use strict;
 use English;
 use FindBin '$Bin';
@@ -146,23 +147,17 @@ sub batch_db_sql_cached {
 my $db = DBI->connect("dbi:mysql:database=$DBNAME;host=$DBHOST","$DBUSER","$DBPASS", { RaiseError => 0, AutoCommit => 0 });
 if ( !defined $db ) { die "Cannot connect to mySQL server: $DBI::errstr\n"; }
 $db->{mysql_auto_reconnect} = 1;
-
 my $table= shift;
 my $batch_sql=shift;
-
 return if (!$db);
 if (ref($batch_sql) eq 'ARRAY') {
     my $sth = $db->prepare_cached($table) or die "Unable to prepare:" . $db->errstr;
-    db_log_debug($db,"Start prepare data");
     foreach my $sSQL (@$batch_sql) {
         next if (!$sSQL);
         $sth->execute(@$sSQL) or die "Unable to execute:" . $db->errstr;
         }
-    db_log_debug($db,"End prepare data");
     }
-db_log_debug($db,"Start commit");
 $db->commit();
-db_log_debug($db,"End commit");
 $db->disconnect();
 }
 
@@ -258,7 +253,6 @@ sub init_db {
 # Create new database handle. If we can't connect, die()
 my $db = DBI->connect("dbi:mysql:database=$DBNAME;host=$DBHOST","$DBUSER","$DBPASS", { RaiseError => 0, AutoCommit => 1 });
 if ( !defined $db ) { die "Cannot connect to mySQL server: $DBI::errstr\n"; }
-$db->do('SET NAMES utf8mb4');
 $db->{mysql_auto_reconnect} = 1;
 return $db;
 }
@@ -316,9 +310,10 @@ my $tsql = shift;
 my @result;
 return @result if (!$db);
 return @result if (!$tsql);
-my $list = $db->prepare( $tsql . ' LIMIT 1' ) or die "Unable to prepare $tsql: " . $db->errstr;
+$tsql.=' LIMIT 1';
+my $list = $db->prepare($tsql) or die "Unable to prepare $tsql: " . $db->errstr;
 $list->execute() or die "Unable to execute $tsql: " . $db->errstr;
-my $row_ref = $list ->fetchrow_hashref();
+my $row_ref = $list->fetchrow_hashref();
 $list->finish();
 return $row_ref;
 }

scripts/Rstat/net_utils.pm

@@ -4,6 +4,7 @@ package Rstat::net_utils;
 # Copyright (C) Roman Dmitiriev, rnd@rajven.ru
 #
 
+use utf8;
 use strict;
 use English;
 use FindBin qw($Bin);

scripts/Rstat/snmp.pm

@@ -4,6 +4,7 @@ package Rstat::snmp;
 # Copyright (C) Roman Dmitiriev, rnd@rajven.ru
 #
 
+use utf8;
 use strict;
 use English;
 use FindBin '$Bin';

scripts/backupcfg.pl

@@ -4,6 +4,9 @@
 # Copyright (C) Roman Dmitiriev, rnd@rajven.ru
 #
 
+use utf8;
+use English;
+use base;
 use FindBin '$Bin';
 use lib "$Bin";
 use strict;

scripts/check_dhcp_pool.pl

@@ -4,6 +4,9 @@
 # Copyright (C) Roman Dmitiriev, rnd@rajven.ru
 #
 
+use utf8;
+use English;
+use base;
 use FindBin '$Bin';
 use lib "$Bin/";
 use strict;

scripts/dhcp-log.pl

@@ -4,6 +4,9 @@
 # Copyright (C) Roman Dmitiriev, rnd@rajven.ru
 #
 
+use utf8;
+use English;
+use base;
 use FindBin '$Bin';
 use lib "$Bin/";
 use Data::Dumper;

scripts/fetch_new_arp.pl

@@ -4,6 +4,9 @@
 # Copyright (C) Roman Dmitiriev, rnd@rajven.ru
 #
 
+use utf8;
+use English;
+use base;
 use FindBin '$Bin';
 use lib "$Bin/";
 use strict;

scripts/garbage.pl

@@ -4,6 +4,9 @@
 # Copyright (C) Roman Dmitiriev, rnd@rajven.ru
 #
 
+use utf8;
+use English;
+use base;
 use FindBin '$Bin';
 use lib "$Bin/";
 use strict;

scripts/parse_flow.pl

@@ -4,6 +4,7 @@
 # Copyright (C) Roman Dmitiriev, rnd@rajven.ru
 #
 
+use utf8;
 use English;
 use base;
 use FindBin '$Bin';

scripts/print-customers.pl

@@ -4,6 +4,9 @@
 # Copyright (C) Roman Dmitiriev, rnd@rajven.ru
 #
 
+use utf8;
+use English;
+use base;
 use FindBin '$Bin';
 use lib "$Bin/";
 use strict;

scripts/print-dnsmasq.pl

@@ -4,6 +4,9 @@
 # Copyright (C) Roman Dmitiriev, rnd@rajven.ru
 #
 
+use utf8;
+use English;
+use base;
 use FindBin '$Bin';
 use lib "$Bin/";
 use strict;

scripts/set_port_descr.pl

@@ -4,6 +4,9 @@
 # Copyright (C) Roman Dmitiriev, rnd@rajven.ru
 #
 
+use utf8;
+use English;
+use base;
 use FindBin '$Bin';
 use lib "$Bin/";
 use strict;

scripts/stat-sync.pl

@@ -4,6 +4,9 @@
 # Copyright (C) Roman Dmitiriev, rnd@rajven.ru
 #
 
+use utf8;
+use English;
+use base;
 use FindBin '$Bin';
 use lib "$Bin/";
 use Data::Dumper;

scripts/sync_mikrotik.pl

@@ -4,6 +4,9 @@
 # Copyright (C) Roman Dmitiriev, rnd@rajven.ru
 #
 
+use utf8;
+use English;
+use base;
 use FindBin '$Bin';
 use lib "$Bin/";
 use strict;

scripts/syslog-stat.pl

@@ -4,6 +4,9 @@
 # Copyright (C) Roman Dmitiriev, rnd@rajven.ru
 #
 
+use utf8;
+use English;
+use base;
 use FindBin '$Bin';
 use lib "$Bin";
 use strict;