Bug#989603: Fwd: Re: Fwd: Bug#989603: ocsinventory-server: Does not start after install
Yadd
yadd at debian.org
Tue Jul 13 13:03:19 BST 2021
Le 13/07/2021 à 11:56, Adrian Bunk a écrit :
> On Sat, Jun 26, 2021 at 09:43:07PM +0200, Yadd wrote:
>> As-tu vu que le bug a été clos ?
>> ...
>
> ocsinventory-server needs an unblock request for getting this fix
> into bullseye.
>
> cu
> Adrian
Yes but (filtered) debdiff is big...
-------------- next part --------------
--- a/Apache/Ocsinventory.pm
+++ b/Apache/Ocsinventory.pm
@@ -39,8 +39,8 @@ BEGIN{
}
}
-$Apache::Ocsinventory::VERSION = '2.8';
-$Apache::Ocsinventory::BUILD_VERSION = '760';
+$Apache::Ocsinventory::VERSION = '2.8.1';
+$Apache::Ocsinventory::BUILD_VERSION = '780';
$XML::Simple::PREFERRED_PARSER = 'XML::Parser';
# Ocs modules
--- a/Apache/Ocsinventory/Map.pm
+++ b/Apache/Ocsinventory/Map.pm
@@ -1102,5 +1102,27 @@ our %DATA_MAP= (
}
},
+ unixusers => {
+ mask => 0,
+ multi => 1,
+ auto => 1,
+ delOnReplace => 1,
+ sortBy => 'NAME_USERS',
+ writeDiff => 0,
+ cache => 0,
+ fields => {
+ ID_USERS => {},
+ GID_USERS => {},
+ HOME_USERS => {},
+ LOGIN_USERS => {},
+ NAME_USERS => {},
+ GROUP_USERS => {},
+ SHELL_USERS => {},
+ ID_GROUP => {},
+ MEMBER_GROUP => {},
+ NAME_GROUP => {}
+ }
+ },
+
);
1;
--- a/Apache/Ocsinventory/Server/Capacities/Ipdiscover.pm
+++ b/Apache/Ocsinventory/Server/Capacities/Ipdiscover.pm
@@ -149,6 +149,8 @@ sub _ipdiscover_main{
my $current_context = shift;
return if $current_context->{'LOCAL_FL'};
+
+ return unless (ref $current_context->{'PARAMS'}{'IPDISCOVER'} eq ref {}); # Not a HASH reference
my $DeviceID = $current_context->{'DATABASE_ID'};
my $dbh = $current_context->{'DBI_HANDLE'};
@@ -278,10 +280,10 @@ sub _ipdiscover_read_result{
my $row_verif = $request_verif->fetchrow_hashref;
if (defined $row_verif->{'TAG'}) {
- $update_req = $dbh->prepare('UPDATE netmap SET IP=?,MASK=?,NETID=?,DATE=NULL, NAME=? WHERE MAC=? AND TAG=?');
+ $update_req = $dbh->prepare('UPDATE netmap SET IP=?,MASK=?,NETID=?,DATE=NOW(), NAME=? WHERE MAC=? AND TAG=?');
$update_req->execute($_->{I}, $mask, $subnet, $_->{N}, $_->{M}, $tag);
} else {
- $update_req = $dbh->prepare('UPDATE netmap SET IP=?,MASK=?,NETID=?,DATE=NULL, NAME=?, TAG=? WHERE MAC=?');
+ $update_req = $dbh->prepare('UPDATE netmap SET IP=?,MASK=?,NETID=?,DATE=NOW(), NAME=?, TAG=? WHERE MAC=?');
$update_req->execute($_->{I}, $mask, $subnet, $_->{N}, $tag, $_->{M});
}
unless($update_req->rows){
@@ -291,7 +293,7 @@ sub _ipdiscover_read_result{
}
} else {
# We insert the results (MAC/IP)
- $update_req = $dbh->prepare('UPDATE netmap SET IP=?,MASK=?,NETID=?,DATE=NULL, NAME=? WHERE MAC=?');
+ $update_req = $dbh->prepare('UPDATE netmap SET IP=?,MASK=?,NETID=?,DATE=NOW(), NAME=? WHERE MAC=?');
$insert_req = $dbh->prepare('INSERT INTO netmap(IP, MAC, MASK, NETID, NAME) VALUES(?,?,?,?,?)');
for(@$base){
@@ -319,6 +321,13 @@ sub _ipdiscover_read_result{
return 1;
}
+ # check ignored subnet
+ $request=$dbh->prepare('SELECT SUBNET FROM blacklist_subnet WHERE SUBNET=?');
+ $request->execute($subnet);
+ if($request->rows > 0){
+ return 1;
+ }
+
return 0;
}
@@ -338,6 +347,13 @@ sub _ipdiscover_find_iface{
if($_->{IPMASK}=~/^(?:255\.){2}|^0x(?:ff){2}/){
if($_->{IPSUBNET}=~/^(\d{1,3}(?:\.\d{1,3}){3})$/){
+ # check ignored subnet
+ $request = $dbh->prepare('SELECT SUBNET FROM blacklist_subnet WHERE SUBNET=?');
+ $request->execute($_->{IPSUBNET});
+ if($request->rows > 0){
+ next;
+ }
+
# Looking for a need of ipdiscover
$request = $dbh->prepare('SELECT HARDWARE_ID FROM devices WHERE TVALUE=? AND NAME="IPDISCOVER"');
$request->execute($_->{IPSUBNET});
--- a/Apache/Ocsinventory/Server/Capacities/Snmp/Inventory.pm
+++ b/Apache/Ocsinventory/Server/Capacities/Snmp/Inventory.pm
@@ -95,45 +95,55 @@ sub _snmp_inventory{
my ( $sectionsMeta, $sectionsList, $agentDatabaseId ) = @_;
my ($section,$XmlSection);
- my $dbh = $Apache::Ocsinventory::CURRENT_CONTEXT{'DBI_HANDLE'};
my $result = $Apache::Ocsinventory::CURRENT_CONTEXT{'XML_ENTRY'};
my $snmp_devices = $result->{CONTENT};
-
+
#Getting data for the several snmp devices that we have in the xml
- foreach my $snmp_key (keys %{$snmp_devices}){
- my @columns;
- my @bind_num;
- my @arguments;
- my @update;
- my $i = 1;
-
- foreach my $snmp_infos (keys %{$snmp_devices->{$snmp_key}}) {
- push @columns, $snmp_infos;
- push @bind_num, '?';
- push @arguments, $snmp_devices->{$snmp_key}->{$snmp_infos};
- push @update, $snmp_infos." = ?";
+ while (my ($key, $value) = each (%{$snmp_devices})) {
+ if(ref $value eq 'ARRAY') {
+ while (my ($keybis, $valuebis) = each (@{$value})) {
+ insert_snmp_inventory($key, $valuebis);
+ }
+ } else {
+ insert_snmp_inventory($key, $value);
}
+ }
+}
- my $column = join ',', @columns;
- my $args_prepare = join ',', @bind_num;
- my $update_prepare = join ',', @update;
-
- my $query = $dbh->prepare("INSERT INTO $snmp_key($column) VALUES($args_prepare) ON DUPLICATE KEY UPDATE $update_prepare");
+sub insert_snmp_inventory{
+ my ($key, $value) = @_;
+ my $dbh = $Apache::Ocsinventory::CURRENT_CONTEXT{'DBI_HANDLE'};
+ my @columns;
+ my @bind_num;
+ my @arguments;
+ my @update;
+ my $i = 1;
+
+ foreach my $snmp_infos (keys %{$value}) {
+ push @columns, $snmp_infos;
+ push @bind_num, '?';
+ push @arguments, $value->{$snmp_infos};
+ push @update, $snmp_infos." = ?";
+ }
- foreach my $value (@arguments) {
- $query->bind_param($i, $value);
- $i++;
- }
+ my $column = join ',', @columns;
+ my $args_prepare = join ',', @bind_num;
+ my $update_prepare = join ',', @update;
- foreach my $value (@arguments) {
- $query->bind_param($i, $value);
- $i++;
- }
+ my $query = $dbh->prepare("INSERT INTO $key($column) VALUES($args_prepare) ON DUPLICATE KEY UPDATE $update_prepare");
- $query->execute;
-
+ foreach my $values (@arguments) {
+ $query->bind_param($i, $values);
+ $i++;
+ }
+
+ foreach my $values (@arguments) {
+ $query->bind_param($i, $values);
+ $i++;
}
+
+ $query->execute;
}
sub _update_snmp_inventory_section{
--- a/Apache/Ocsinventory/Server/Groups.pm
+++ b/Apache/Ocsinventory/Server/Groups.pm
@@ -190,7 +190,7 @@ sub _build_group_cache{
}
# Updating cache time
- $dbh->do("UPDATE groups SET CREATE_TIME=UNIX_TIMESTAMP(), REVALIDATE_FROM=UNIX_TIMESTAMP()+? WHERE HARDWARE_ID=?", {}, $offset, $group_id);
+ $dbh->do("UPDATE `groups` SET CREATE_TIME=UNIX_TIMESTAMP(), REVALIDATE_FROM=UNIX_TIMESTAMP()+? WHERE HARDWARE_ID=?", {}, $offset, $group_id);
&_log(307,'groups', "revalidate_cache($group_id(".scalar @ids."))") if $ENV{'OCS_OPT_LOGLEVEL'};
}
1;
--- a/Apache/Ocsinventory/Server/Inventory/Software.pm
+++ b/Apache/Ocsinventory/Server/Inventory/Software.pm
@@ -61,26 +61,23 @@ sub _prepare_sql {
sub _insert_software_name {
my ($name, $cat) = @_;
my $sql;
- my $resultVerif;
- my $valueVerif = undef;
my $categoryVerif = undef;
- my $valueResult;
+ my $valueResult = undef;
my $result;
# Verif if value exist
my @argVerif = ();
$sql = "SELECT ID, CATEGORY FROM software_name WHERE NAME = ?";
push @argVerif, $name;
- $resultVerif = _prepare_sql($sql, @argVerif);
+ $result = _prepare_sql($sql, @argVerif);
- while(my $row = $resultVerif->fetchrow_hashref()){
- $valueVerif = $row->{ID};
+ while(my $row = $result->fetchrow_hashref()){
+ $valueResult = $row->{ID};
$categoryVerif = $row->{CATEGORY};
}
- my @argInsert = ();
-
- if(!defined $valueVerif) {
+ if(!defined $valueResult) {
+ my @argInsert = ();
if(!defined $cat) {
# Insert if undef
$sql = "INSERT INTO software_name (NAME) VALUES(?)";
@@ -92,38 +89,37 @@ sub _insert_software_name {
push @argInsert, $cat;
}
_prepare_sql($sql, @argInsert);
+
+ # Get last Insert or Update ID
+ my @argSelect = ();
+ $sql = "SELECT ID FROM software_name WHERE NAME = ?";
+ push @argSelect, $name;
+ $result = _prepare_sql($sql, @argSelect);
+
+ while(my $row = $result->fetchrow_hashref()){
+ $valueResult = $row->{ID};
+ }
}
- if(defined $valueVerif && defined $cat) {
+ if(defined $cat) {
if((!defined $categoryVerif) || ($cat != $categoryVerif)) {
- my @arg = ();
+ my @argUpdate = ();
my $sqlUpdate = "UPDATE software_name SET CATEGORY = ? WHERE ID = ?";
- push @arg, $cat;
- push @arg, $valueVerif;
- _prepare_sql($sqlUpdate, @arg);
+ push @argUpdate, $cat;
+ push @argUpdate, $valueResult;
+ _prepare_sql($sqlUpdate, @argUpdate);
}
}
- # Get last Insert or Update ID
- my @argSelect = ();
- $sql = "SELECT ID FROM software_name WHERE NAME = ?";
- push @argSelect, $name;
- $result = _prepare_sql($sql, @argSelect);
-
- while(my $row = $result->fetchrow_hashref()){
- $valueResult = $row->{ID};
- }
-
return $valueResult;
}
sub _get_info_software {
my ($value, $table, $column) = @_;
my $sql;
- my $valueResult;
+ my $valueResult = undef;
my $result;
my $resultVerif;
- my $valueVerif = undef;
# Verif if value exist
my @argVerif = ();
@@ -132,27 +128,27 @@ sub _get_info_software {
$resultVerif = _prepare_sql($sql, @argVerif);
while(my $row = $resultVerif->fetchrow_hashref()){
- $valueVerif = $row->{ID};
+ $valueResult = $row->{ID};
}
- my @argInsert = ();
+ if(!defined $valueResult) {
+ my @argInsert = ();
- if(!defined $valueVerif) {
# Insert if undef
$sql = "INSERT INTO $table ($column) VALUES(?)";
push @argInsert, $value;
- }
- _prepare_sql($sql, @argInsert);
+ _prepare_sql($sql, @argInsert);
- # Get last Insert or Update ID
- my @argSelect = ();
- $sql = "SELECT ID FROM $table WHERE $column = ?";
- push @argSelect, $value;
- $result = _prepare_sql($sql, @argSelect);
+ # Get last Insert or Update ID
+ my @argSelect = ();
+ $sql = "SELECT ID FROM $table WHERE $column = ?";
+ push @argSelect, $value;
+ $result = _prepare_sql($sql, @argSelect);
- while(my $row = $result->fetchrow_hashref()){
- $valueResult = $row->{ID};
+ while(my $row = $result->fetchrow_hashref()){
+ $valueResult = $row->{ID};
+ }
}
return $valueResult;
@@ -226,25 +222,10 @@ sub _insert_software {
push @arg, $arrayValue{$arrayKey};
}
- my @arg_verif = ();
- my $result_verif;
- my $value_verif = undef;
- my $sql_verif = "SELECT HARDWARE_ID FROM software WHERE HARDWARE_ID = ? AND NAME_ID = ? AND VERSION_ID = ?";
- push @arg_verif, $arrayValue{HARDWARE_ID};
- push @arg_verif, $arrayValue{NAME_ID};
- push @arg_verif, $arrayValue{VERSION_ID};
- $result_verif = _prepare_sql($sql_verif, @arg_verif);
-
- while(my $row = $result_verif->fetchrow_hashref()){
- $value_verif = $row->{HARDWARE_ID};
- }
-
- if(!defined $value_verif) {
- $sql = "INSERT INTO software ($arrayRefString) VALUES(";
- $sql .= (join ',', @bind_num).') ';
- _prepare_sql($sql, @arg);
- }
+ $sql = "INSERT INTO software ($arrayRefString) VALUES(";
+ $sql .= (join ',', @bind_num).') ';
+ _prepare_sql($sql, @arg);
}
}
-1;
\ No newline at end of file
+1;
--- a/Api/Ocsinventory/Restapi/ApiCommon.pm
+++ b/Api/Ocsinventory/Restapi/ApiCommon.pm
@@ -70,7 +70,7 @@ sub api_database_connect{
}
# Connection...
- my $dbh = DBI->connect( "DBI:mysql:database=$dbName;host=$dbHost;port=$dbPort".$sslMode, $dbUser, $dbPwd, {RaiseError => 1}) or die $DBI::errstr;
+ my $dbh = DBI->connect( "DBI:mysql:database=$dbName;host=$dbHost;port=$dbPort".$sslMode, $dbUser, $dbPwd, {RaiseError => 1, mysql_enable_utf8 => 1}) or die $DBI::errstr;
return $dbh;
--- a/Api/Ocsinventory/Restapi/Loader.pm
+++ b/Api/Ocsinventory/Restapi/Loader.pm
@@ -79,21 +79,18 @@ get '/v1/ipdiscover' => sub {
$c->render(format => 'json', text => Api::Ocsinventory::Restapi::Ipdiscover::Get::Ipdiscover::get_ipdiscovers($start, $limit));
};
-get '/v1/ipdiscover/:tag' => sub {
+get '/v1/ipdiscover/tag/:tag' => sub {
my $c = shift;
my $tag = $c->stash('tag');
$c->render(json => Api::Ocsinventory::Restapi::Ipdiscover::Get::IpdiscoverTag::get_ipdiscover_tag($tag));
};
-get '/v1/ipdiscover/:network' => sub {
+get '/v1/ipdiscover/network/#network' => sub {
my $c = shift;
- # Debuggibg MH : Dump $c Mojo Object in /var/log/apache2/error.log
-# warn "/v1/ipdiscover/:network : ".Dumper($c)."\n";
+
my $network = $c->stash('network');
- # QuickFix MH: donit know why a IPv4 10.20.30.40 is split as Mojo attrs: param=>10 format=20.30.40
- $network .= ".".$c->stash('format');
-
+
$c->render(format => 'json', text => Api::Ocsinventory::Restapi::Ipdiscover::Get::IpdiscoverNetwork::get_ipdiscover_network($network));
};
--- a/binutils/ocsinventory-injector.pl
+++ b/binutils/ocsinventory-injector.pl
@@ -28,7 +28,7 @@ my $useragent;
my $remove;
my $verbose;
my $stdin;
-
+my $timeout;
sub loadfile {
$file = shift;
@@ -80,7 +80,7 @@ sub sendContent {
my $ua = LWP::UserAgent->new(
protocols_allowed => ['http', 'https'],
- timeout => 10,
+ timeout => $timeout,
ssl_opts => {
verify_hostname => $sslmode,
SSL_ca_file => $cafile
@@ -125,6 +125,7 @@ sub usage {
--useragent : HTTP user agent, default is OCS-NG_LOCAL_PL_v".VERSION."
-r --remove : remove successfully injected files
-v --verbose : verbose mode
+ -t --timeout : injector timeout value
--stdin : read data from STDIN
You can specify a --file or a --directory or STDIN. Current directory is the default
@@ -143,6 +144,7 @@ GetOptions(
'useragent=s' => \$useragent,
'r|remove' => \$remove,
'v|verbose' => \$verbose,
+ 't|timeout' => \$timeout,
'stdin' => \$stdin,
);
@@ -152,6 +154,7 @@ $useragent = 'OCS-NG_INJECTOR_PL_v'.VERSION unless $useragent;
$directory = '.' unless $directory;
$sslmode = 0 unless $sslmode;
$cafile = "cacert.pem" unless $cafile;
+$timeout = 10 unless $timeout;
###
$|=1;
--- /dev/null
+++ b/binutils/ocsinventory-powershell-injector.ps1
@@ -0,0 +1,186 @@
+<#
+ Copyright 2005-2020 OCSInventory-NG/OCSInventory-server contributors.
+ See the Contributors file for more details about them.
+
+ This file is part of OCSInventory-NG/OCSInventory-server.
+
+ OCSInventory-NG/OCSInventory-server is free software: you can redistribute
+ it and/or modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation, either version 2 of the License,
+ or (at your option) any later version.
+
+ OCSInventory-NG/OCSInventory-server is distributed in the hope that it
+ will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OCSInventory-NG/OCSInventory-server. if not, write to the
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02110-1301, USA.
+#>
+param (
+ [switch]$help = $false,
+ [string]$directory,
+ [string]$file,
+ [string]$url,
+ [string]$user,
+ [string]$pass,
+ [switch]$ssl = $false,
+ [switch]$remove = $false,
+ [switch]$info = $false
+)
+
+<#
+ .SYNOPSIS
+ Display help
+ .DESCRIPTION
+ If -help is set in the command line, return the helper and quit
+#>
+function Get-InjectorHelper {
+ Write-Output "
+ DESCRIPTION:
+
+ A command line tools to import .ocs files.
+ USAGE:
+ -help : this menu
+ -directory : load every .ocs files from a directory
+ -file : load a speficic file
+ -url : ocsinventory backend URL
+ -ssl : enable SSL inventory injection
+ -user : Basic auth username
+ -pass : User password
+ -remove : remove successfully injected files
+ -info : verbose mode
+ "
+}
+
+<#
+ .SYNOPSIS
+ Display debug log
+ .DESCRIPTION
+ Display debug log only if -info is sent
+#>
+function Write-InfoLog($str) {
+ if($info.IsPresent){
+ $currentTime = Get-Date -Format "MM/dd/yyyy HH:mm:ss"
+ Write-Output "[OCSInject] $currentTime : $str"
+ }
+}
+
+<#
+ .SYNOPSIS
+ Send file to OCS Server
+ .DESCRIPTION
+ Take the file, retrieve its content and send it to the OCS Inventory server
+#>
+function Send-File{
+
+ Param(
+ [parameter(Mandatory=$true)]
+ [string] $filePath,
+ [parameter(Mandatory=$true)]
+ [hashtable] $headers
+ )
+
+ $fileContent = Get-Content($filePath)
+ $fileName = Split-Path $filePath -leaf
+
+ if($ssl.IsPresent -eq $true){
+ add-type "
+ using System.Net;
+ using System.Security.Cryptography.X509Certificates;
+ public class TrustAllCertsPolicy : ICertificatePolicy {
+ public bool CheckValidationResult(
+ ServicePoint srvPoint, X509Certificate certificate,
+ WebRequest request, int certificateProblem) {
+ return true;
+ }
+ }
+ "
+ [System.Net.ServicePointManager]::CertificatePolicy = New-Object TrustAllCertsPolicy
+ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Ssl3, [Net.SecurityProtocolType]::Tls, [Net.SecurityProtocolType]::Tls11, [Net.SecurityProtocolType]::Tls12
+
+ $webRequestStatus = Invoke-WebRequest `
+ -Uri $url `
+ -ContentType "application/xml" `
+ -Method POST `
+ -Body $fileContent `
+ -UserAgent "OCS_POWERSHELL_INJECTOR_V2.8" `
+ -Headers $headers
+ }else{
+ $webRequestStatus = Invoke-WebRequest `
+ -Uri $url `
+ -ContentType "application/xml" `
+ -Method POST `
+ -Body $fileContent `
+ -UserAgent "OCS_POWERSHELL_INJECTOR_V2.8" `
+ -Headers $headers
+ }
+
+
+ if($webRequestStatus.StatusCode -eq 200){
+ Write-InfoLog("Injecting file $fileName => OK")
+ }else{
+ Write-InfoLog("Injecting file $fileName => ERROR " + $webRequestStatus.StatusCode)
+ }
+}
+
+Write-InfoLog("Starting injector")
+
+#### Help trigger ####
+if($help.IsPresent){
+ Get-InjectorHelper
+ Exit
+}
+
+#### Test for basic parameters ####
+if($url.isPresent -eq $false){
+ Write-InfoLog("URL Missing, please provide one !")
+ Exit
+}
+
+# Manage Auth
+if(-not ([string]::IsNullOrEmpty($user)) -And -not ([string]::IsNullOrEmpty($pass))){
+ Write-InfoLog("Auth required, setting headers...")
+
+ $pair = "$($user):$($pass)"
+ $encodedCreds = [System.Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes($pair))
+ $basicAuthValue = "Basic $encodedCreds"
+
+ Write-InfoLog("Auth basic : $encodedCreds")
+
+ $headers = @{
+ "Authorization" = $basicAuthValue; "Cache-Control" = "no-cache"
+ }
+}else{
+ $headers = @{
+ "Cache-Control" = "no-cache"
+ }
+}
+
+$pathOk = $false
+
+# File inject management
+if($file -And (Test-Path -Path $file) -eq $true){
+ $pathOk = $true
+ Send-File $file $headers
+ Exit
+}
+
+# Directory inject management
+if ($directory -And (Test-Path -Path $directory) -eq $true) {
+ Write-InfoLog("Injecting files present in the directory=> $directory")
+ Get-ChildItem $directory -Filter *.ocs |
+ Foreach-Object {
+ Send-File $_.FullName $headers
+ }
+ $pathOk = $true
+ Exit
+}
+
+# Path not working
+if($pathOk -eq $false){
+ Write-InfoLog("File or Directory provided is wrong or not accessible, please check your arguments")
+ Exit
+}
--- /dev/null
+++ b/cpanfile
@@ -0,0 +1,11 @@
+#requires 'mod_perl2', '> 2.0';
+requires 'XML::Simple', '>= 2.12';
+requires 'Compress::Zlib', '>= 1.33';
+requires 'Apache::DBI', '>= 1.10';
+#requires 'DBD::mysql', '>= 4.050';
+requires 'Net::IP', '>= 1.20';
+requires 'Mojolicious', '>= 8';
+requires 'Plack', '>= 1.0047';
+requires 'Archive::Zip', '>= 1.4';
+requires 'Switch', '>= 2.0';
+requires 'YAML', '>= 1.0';
\ No newline at end of file
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ocsinventory-server (2.8.1+dfsg1-1) unstable; urgency=medium
+
+ * Removes reference to an obsolete plugin
+ * Fixes a typo in a patch
+ * Adds missing Api folder (needed for REST API)
+ * Adds Apache configuration for the /Api REST endpoint
+ * New upstream version 2.8.1+dfsg1
+ * Fixes a build issue due to recent inclusion of the /Api folder
+
+ -- Cyrille Bollu <cyr.debian at bollu.be> Fri, 12 Mar 2021 07:41:12 +0100
+
ocsinventory-server (2.8+dfsg1-1) unstable; urgency=medium
[ gregor herrmann ]
--- /dev/null
+++ b/debian/conf/ocsinventory-restapi.conf
@@ -0,0 +1,23 @@
+PerlOptions +Parent
+
+<Perl>
+ $ENV{PLACK_ENV} = 'production';
+ $ENV{MOJO_HOME} = 'REST_API_PATH';
+ $ENV{MOJO_MODE} = 'deployment';
+ $ENV{OCS_DB_HOST} = 'localhost';
+ $ENV{OCS_DB_PORT} = '3306';
+ $ENV{OCS_DB_LOCAL} = 'ocsweb';
+ $ENV{OCS_DB_USER} = 'ocs';
+ $ENV{OCS_DB_PWD} = 'ocs';
+ $ENV{OCS_DB_SSL_ENABLED} = 0;
+# $ENV{OCS_DB_SSL_CLIENT_KEY} = '';
+# $ENV{OCS_DB_SSL_CLIENT_CERT} = '';
+# $ENV{OCS_DB_SSL_CA_CERT} = '';
+ $ENV{OCS_DB_SSL_MODE} = 'SSL_MODE_PREFERRED';
+</Perl>
+
+<Location /ocsapi>
+ SetHandler perl-script
+ PerlResponseHandler Plack::Handler::Apache2
+ PerlSetVar psgi_app 'REST_API_LOADER_PATH'
+</Location>
--- a/debian/conf/ocsinventory-server.conf
+++ b/debian/conf/ocsinventory-server.conf
@@ -253,7 +253,6 @@
PerlModule XML::Simple
# Ocs plugins
- PerlModule Apache::Ocsinventory::Plugins::Apache
PerlModule Apache::Ocsinventory::Plugins
# Ocs
@@ -310,22 +309,6 @@
PerlHandler Apache::Ocsinventory
</Location>
-#Web Service for plugin engine
- <Location /ocsplugins>
- <IfModule mod_authz_core.c>
- # Apache 2.4
- Require local
- </IfModule>
- <IfModule !mod_authz_core.c>
- # Apache 2.2
- order deny,allow
- allow from 127.0.0.1
- </IfModule>
- SetHandler perl-script
- PerlHandler Apache::Ocsinventory::Plugins::Apache
- </Location>
-
-
# Web service apache settings
PerlModule Apache::Ocsinventory::SOAP
--- a/debian/ocsinventory-server.apache2
+++ b/debian/ocsinventory-server.apache2
@@ -1 +1,2 @@
conf debian/conf/ocsinventory-server.conf
+conf debian/conf/ocsinventory-restapi.conf
--- a/debian/ocsinventory-server.install
+++ b/debian/ocsinventory-server.install
@@ -1,3 +1,4 @@
/binutils /usr/share/ocsinventory-server/
/debian/conf/extra_useragents /etc/ocsinventory/
/debian/tmp/usr /
+/Api /usr/share/perl5/
--- a/debian/patches/use_system_libraries
+++ b/debian/patches/use_system_libraries
@@ -66,12 +66,6 @@ Last-Update: 2018-08-02
--- a/ocsreports/var.php
+++ b/ocsreports/var.php
-@@ -1,4 +1,4 @@
--<?php
-+/<?php
- /*
- * Copyright 2005-2016 OCSInventory-NG/OCSInventory-ocsreports contributors.
- * See the Contributors file for more details about them.
@@ -50,7 +50,7 @@
/**
* Mac address file
--- a/etc/ocsinventory/ocsinventory-server.conf
+++ b/etc/ocsinventory/ocsinventory-server.conf
@@ -328,22 +328,6 @@
PerlHandler Apache::Ocsinventory
</Location>
-#Web Service for plugin engine
- <Location /ocsplugins>
- <IfModule mod_authz_core.c>
- # Apache 2.4
- Require local
- </IfModule>
- <IfModule !mod_authz_core.c>
- # Apache 2.2
- order deny,allow
- allow from 127.0.0.1
- </IfModule>
- SetHandler perl-script
- PerlHandler Apache::Ocsinventory::Plugins::Apache
- </Location>
-
-
# Web service apache settings
PerlModule Apache::Ocsinventory::SOAP
--- /dev/null
+++ b/ocsreports/.github/Contributing.md
@@ -0,0 +1,120 @@
+<p align="center">
+ <img src="https://cdn.ocsinventory-ng.org/common/banners/banner660px.png" height=300 width=660 alt="Banner">
+</p>
+
+<h1 align="center">OCS Inventory</h1>
+<p align="center">
+ <b>Some Links:</b><br>
+ <a href="http://ask.ocsinventory-ng.org">Ask question</a> |
+ <a href="#COMMING_SOON_STAY_CONNECTED">Installation</a> |
+ <a href="https://www.ocsinventory-ng.org/?utm_source=github-ocs">Website</a>
+</p>
+
+# OCS Inventory Contributing Guidelines
+
+## Pull Request Process
+
+1. Fork it!
+2. Create your feature branch: `git checkout -b my-new-feature`
+3. Add your changes: `git add folder/file1.php`
+4. Commit your changes: `git commit -m 'Add some feature'`
+5. Push to the branch: `git push origin my-new-feature`
+6. Submit a pull request !
+
+## Pull Request Informations
+
+When contributing, please open an issue before or contact the team using mail. This will prevent all the duplicate of work.
+Also, check if your contribution is not already in the roadmap or affiliated to an issue.
+
+If you are contributing on a small scale (translation, a few line modification), you don't need open an issue or contact the team but you will need to explain what you've done in the Pull Request comment and provide as accurate commit messages as possible.
+Cf. Commits Messages Name Informations
+
+If you need to discuss about a big change or need some help of our team during the development of your contribution,
+we can use other communication method like Telegram, IRC, Skype.
+
+## Commits Messages Name Informations
+
+Try to create as accurate as possible commit messages.
+This will help us to speed up the review process and to reduce the misunderstanding (which can lead to a Pull Request to be rejected)
+
+There is no commit messages convention but here are some examples :
+1. Create as short as possible commit name
+2. One commit for one modification
+3. Always leave the second commit line blank
+
+If it seems difficult to summarize what your commit does, it may be because it includes several logical changes or bug fixes, and are better split up into several commits using `git add -p`.
+
+## Code of Conduct
+
+### Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+### Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+### Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+### Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+### Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at `contact at ocsinventory-ng.org` . All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+### Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/
--- a/ocsreports/Changes
+++ b/ocsreports/Changes
@@ -1,4 +1,27 @@
Revision history for ocsreports
+2.8.1
+
+ * Add IpDiscover purge configuration
+ * Add IpDiscover purge related translation
+ * Add IpDiscover purge crontab
+ * Add Unix users in computer details
+ * Add explicit error message during SNMP type configuration
+ * Update ocsbase.sql for clean installation
+ * Update Spanish, Deutsh and Brazilian translation
+ * Authorized - and _ for login
+ * Fix role attribution especially when using memberof
+ * Fix multisearch for dynamic group
+ * Fix software displaying in dictionary
+ * Fix IpDiscover subnet list
+ * Fix IpDiscover form when inventory is not linked to a tag
+ * Fix reference link in CVE reporting
+ * Fix special characters for label and type on SNMP configuration
+ * Fix user table and removal
+ * Fix CVE regex matching
+ * Fix PHP warning
+ * Remove local ocs file import
+ * Remove old plugins manager page
+
2.8
* Rework SNMP Interface and configuration
* Rework IPDiscover manager
--- a/ocsreports/backend/AUTH/auth.php
+++ b/ocsreports/backend/AUTH/auth.php
@@ -118,11 +118,11 @@ if ($login_successful == "OK" && isset($login_successful)) {
<div class="form-group">
<label for="LOGIN"><?php echo $l->g(243); ?> :</label>
- <input type="text" class="form-control" name="LOGIN" id="LOGIN" value='<?php echo preg_replace("/[^A-Za-z0-9\.]/", "", $protectedPost['LOGIN']); ?>' placeholder="<?php echo $l->g(243); ?>">
+ <input type="text" class="form-control" name="LOGIN" id="LOGIN" value='<?php echo preg_replace("/[^A-Za-z0-9-_\.]/", "", $protectedPost['LOGIN']); ?>' placeholder="<?php echo $l->g(243); ?>">
</div>
<div class="form-group">
<label for="PASSWD"><?php echo $l->g(217); ?> :</label>
- <input type="password" class="form-control" name="PASSWD" id="PASSWD" value='<?php echo preg_replace("/[^A-Za-z0-9\.]/", "", $protectedPost['PASSWD']); ?>' placeholder="<?php echo $l->g(217); ?>">
+ <input type="password" class="form-control" name="PASSWD" id="PASSWD" value='<?php echo preg_replace("/[^A-Za-z0-9-_\.]/", "", $protectedPost['PASSWD']); ?>' placeholder="<?php echo $l->g(217); ?>">
</div>
<input type="submit" class="btn btn-lg btn-block btn-success" id="btn-logon" name="Valid_CNX" value="<?php echo $l->g(13); ?>" />
--- a/ocsreports/backend/AUTH/methode/ldap.php
+++ b/ocsreports/backend/AUTH/methode/ldap.php
@@ -60,7 +60,7 @@ function search_on_loginnt($login) {
$f2_name = $_SESSION['OCS']['config']['LDAP_CHECK_FIELD2_NAME'];
// default attributes for query
- $attributs = array("dn", "cn", "givenname", "sn", "mail", "title");
+ $attributs = array("dn", "cn", "givenname", "sn", "mail", "title", "memberof");
// search for the custom user level attributes if they're defined
if ($f1_name != '') {
@@ -86,23 +86,19 @@ function search_on_loginnt($login) {
$_SESSION['OCS']['details']['mail'] = $info[0]['mail'][0];
$_SESSION['OCS']['details']['title'] = $info[0]['title'][0];
- // if the extra attributes are there, save them as well
- if ($info[0][$f1_name][0] != '') {
-
- if ($f1_name == "memberof") {
- $_SESSION['OCS']['details'][$f1_name] = $info[0][strtolower($f1_name)];
- } else {
- $_SESSION['OCS']['details'][$f1_name] = $info[0][strtolower($f1_name)][0];
- }
+ if (strtolower($f1_name) == "memberof") {
+ $_SESSION['OCS']['details'][$f1_name] = $info[0][strtolower($f1_name)];
+ } else {
+ $_SESSION['OCS']['details'][$f1_name] = $info[0][strtolower($f1_name)][0];
}
+
- if ($info[0][strtolower($f2_name)][0] != '') {
- if ($f2_name == "memberof") {
- $_SESSION['OCS']['details'][$f2_name] = $info[0][strtolower($f2_name)];
- } else {
- $_SESSION['OCS']['details'][$f2_name] = $info[0][strtolower($f2_name)][0];
- }
+ if (strtolower($f2_name) == "memberof") {
+ $_SESSION['OCS']['details'][$f2_name] = $info[0][strtolower($f2_name)];
+ } else {
+ $_SESSION['OCS']['details'][$f2_name] = $info[0][strtolower($f2_name)][0];
}
+
return $info;
}
--- a/ocsreports/backend/identity/methode/ldap.php
+++ b/ocsreports/backend/identity/methode/ldap.php
@@ -87,10 +87,9 @@ $f1_name = $config['LDAP_CHECK_FIELD1_NAME'];
$f2_name = $config['LDAP_CHECK_FIELD2_NAME'];
$f1_value = $_SESSION['OCS']['details'][$f1_name];
$f2_value = $_SESSION['OCS']['details'][$f2_name];
-if ($f1_value != '') {
- //NEW CODE BELOW
- //FIXME: casing? -> 'memberOf'
- if ($f1_name == "memberof") {
+
+if (!empty($f1_value)) {
+ if (strtolower($f1_name) == "memberof") {
//the idea here is to iterate through the groups array looking for a match
//if we find it, unset the array and store only the match, else leave as it is
foreach ($f1_value as $group) {
@@ -108,9 +107,8 @@ if ($f1_value != '') {
}
}
-if ($f2_value != '') {
- //NEW CODE BELOW
- if ($f2_name == "memberof") {
+if (!empty($f2_value)) {
+ if (strtolower($f2_name) == "memberof") {
foreach ($f2_value as $group) {
if ($group == $config['LDAP_CHECK_FIELD2_VALUE']) {
$f2_value = array();
--- a/ocsreports/composer.lock
+++ b/ocsreports/composer.lock
@@ -46,6 +46,10 @@
"hashing",
"password"
],
+ "support": {
+ "issues": "https://github.com/ircmaxell/password_compat/issues",
+ "source": "https://github.com/ircmaxell/password_compat/tree/v1.0"
+ },
"time": "2014-11-20T16:49:30+00:00"
},
{
@@ -101,31 +105,39 @@
"cas",
"jasig"
],
+ "support": {
+ "issues": "https://github.com/apereo/phpCAS/issues",
+ "source": "https://github.com/apereo/phpCAS/tree/1.3.8"
+ },
"time": "2019-08-18T20:01:55+00:00"
},
{
"name": "phpmailer/phpmailer",
- "version": "v6.1.7",
+ "version": "v6.2.0",
"source": {
"type": "git",
"url": "https://github.com/PHPMailer/PHPMailer.git",
- "reference": "2c2370ba3df7034f9eb7b8f387c97b52b2ba5ad0"
+ "reference": "e38888a75c070304ca5514197d4847a59a5c853f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/2c2370ba3df7034f9eb7b8f387c97b52b2ba5ad0",
- "reference": "2c2370ba3df7034f9eb7b8f387c97b52b2ba5ad0",
+ "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/e38888a75c070304ca5514197d4847a59a5c853f",
+ "reference": "e38888a75c070304ca5514197d4847a59a5c853f",
"shasum": ""
},
"require": {
"ext-ctype": "*",
"ext-filter": "*",
+ "ext-hash": "*",
"php": ">=5.5.0"
},
"require-dev": {
+ "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
"doctrine/annotations": "^1.2",
- "friendsofphp/php-cs-fixer": "^2.2",
- "phpunit/phpunit": "^4.8 || ^5.7"
+ "phpcompatibility/php-compatibility": "^9.3.5",
+ "roave/security-advisories": "dev-latest",
+ "squizlabs/php_codesniffer": "^3.5.6",
+ "yoast/phpunit-polyfills": "^0.2.0"
},
"suggest": {
"ext-mbstring": "Needed to send email in multibyte encoding charset",
@@ -163,13 +175,17 @@
}
],
"description": "PHPMailer is a full-featured email creation and transfer class for PHP",
+ "support": {
+ "issues": "https://github.com/PHPMailer/PHPMailer/issues",
+ "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.2.0"
+ },
"funding": [
{
- "url": "https://github.com/synchro",
+ "url": "https://github.com/Synchro",
"type": "github"
}
],
- "time": "2020-07-14T18:50:27+00:00"
+ "time": "2020-11-25T15:24:57+00:00"
}
],
"packages-dev": [],
@@ -180,5 +196,5 @@
"prefer-lowest": false,
"platform": [],
"platform-dev": [],
- "plugin-api-version": "1.1.0"
+ "plugin-api-version": "2.0.0"
}
--- a/ocsreports/config/computer/plugins.xml
+++ b/ocsreports/config/computer/plugins.xml
@@ -164,4 +164,10 @@
<category>other</category>
<available>repository</available>
</plugin>
+ <plugin id="cd_unixusers">
+ <label>g(235)</label>
+ <system>1</system>
+ <category>other</category>
+ <available>unixusers</available>
+ </plugin>
</plugins>
--- a/ocsreports/config/main_menu.xml
+++ b/ocsreports/config/main_menu.xml
@@ -138,10 +138,6 @@
<label>g(175)</label>
<url>ms_doubles</url>
</menu-elem>
- <menu-elem id="ms_local">
- <label>g(287)</label>
- <url>ms_local</url>
- </menu-elem>
</submenu>
</menu-elem>
<menu-elem id="extension">
--- a/ocsreports/config/urls.xml
+++ b/ocsreports/config/urls.xml
@@ -120,10 +120,6 @@
<value>admin_perim</value>
<directory>ms_users</directory>
</url>
- <url key="ms_local">
- <value>admin_local_import</value>
- <directory>ms_upload_file</directory>
- </url>
<url key="ms_help">
<value>help</value>
<directory>ms_help</directory>
--- /dev/null
+++ b/ocsreports/crontab/cron_ipdiscover.php
@@ -0,0 +1,32 @@
+#!/usr/bin/php
+<?php
+require_once('../dbconfig.inc.php');
+require_once('../var.php');
+require_once('../require/function_commun.php');
+require_once('../require/config/include.php');
+require_once('../require/fichierConf.class.php');
+
+$_SESSION['OCS']["writeServer"] = dbconnect(SERVER_WRITE, COMPTE_BASE, PSWD_BASE, DB_NAME, SSL_KEY, SSL_CERT, CA_CERT, SERVER_PORT);
+$_SESSION['OCS']["readServer"] = dbconnect(SERVER_READ, COMPTE_BASE, PSWD_BASE, DB_NAME, SSL_KEY, SSL_CERT, CA_CERT, SERVER_PORT);
+
+$configToLookOut = [
+ 'IPDISCOVER_PURGE_OLD' => 'IPDISCOVER_PURGE_OLD',
+ 'IPDISCOVER_PURGE_VALIDITY_TIME' => 'IPDISCOVER_PURGE_VALIDITY_TIME'
+];
+
+$ipdiscoverPurgeConfig = look_config_default_values($configToLookOut);
+
+if($ipdiscoverPurgeConfig["ivalue"]["IPDISCOVER_PURGE_OLD"] == "1"){
+ $purgeValidityTime = $ipdiscoverPurgeConfig["ivalue"]["IPDISCOVER_PURGE_VALIDITY_TIME"];
+
+ $dateformat = "Y-m-d H:i:s";
+ $timedelta = sprintf("-%s days", $purgeValidityTime);
+
+ $datetime = new Datetime("NOW");
+ $datetime->modify($timedelta);
+ $purgeDate = $datetime->format($dateformat);
+
+ $purgeQuery = "DELETE FROM `netmap` WHERE `date` < '%s'";
+
+ mysql2_query_secure($purgeQuery, $_SESSION['OCS']["writeServer"], $purgeDate);
+}
\ No newline at end of file
--- /dev/null
+++ b/ocsreports/dbconfig.inc.php
@@ -0,0 +1,35 @@
+<?php
+/*
+ * Copyright 2005-2016 OCSInventory-NG/OCSInventory-ocsreports contributors.
+ * See the Contributors file for more details about them.
+ *
+ * This file is part of OCSInventory-NG/OCSInventory-ocsreports.
+ *
+ * OCSInventory-NG/OCSInventory-ocsreports is free software: you can redistribute
+ * it and/or modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * OCSInventory-NG/OCSInventory-ocsreports is distributed in the hope that it
+ * will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with OCSInventory-NG/OCSInventory-ocsreports. if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+define("DB_NAME", "ocsweb");
+define("SERVER_READ","localhost");
+define("SERVER_WRITE","localhost");
+define("SERVER_PORT", 3306);
+define("COMPTE_BASE","ocs");
+define("PSWD_BASE","ocs");
+define("ENABLE_SSL","0");
+define("SSL_MODE","");
+define("SSL_KEY","/path/to/client-key.pem");
+define("SSL_CERT","/path/to/client-cert.pem");
+define("CA_CERT","/path/to/ca.pem");
+?>
--- a/ocsreports/files/ocsbase.sql
+++ b/ocsreports/files/ocsbase.sql
@@ -1,11 +1,26 @@
-- If it's a new database
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!50503 SET NAMES utf8mb4 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
--
-- Table structure for table `accesslog`
--
+DROP TABLE IF EXISTS `accesslog`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `accesslog` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`USERID` varchar(255) DEFAULT NULL,
`LOGDATE` datetime DEFAULT NULL,
`PROCESSES` text,
@@ -13,63 +28,133 @@ CREATE TABLE `accesslog` (
KEY `HARDWARE_ID` (`HARDWARE_ID`),
KEY `USERID` (`USERID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `accesslog`
+--
+
+LOCK TABLES `accesslog` WRITE;
+/*!40000 ALTER TABLE `accesslog` DISABLE KEYS */;
+/*!40000 ALTER TABLE `accesslog` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `accountinfo`
--
+DROP TABLE IF EXISTS `accountinfo`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `accountinfo` (
- `HARDWARE_ID` int(11) NOT NULL,
+ `HARDWARE_ID` int NOT NULL,
`TAG` varchar(255) DEFAULT 'NA',
PRIMARY KEY (`HARDWARE_ID`),
KEY `TAG` (`TAG`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `accountinfo`
+--
+
+LOCK TABLES `accountinfo` WRITE;
+/*!40000 ALTER TABLE `accountinfo` DISABLE KEYS */;
+/*!40000 ALTER TABLE `accountinfo` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `accountinfo_config`
--
+DROP TABLE IF EXISTS `accountinfo_config`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `accountinfo_config` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`NAME_ACCOUNTINFO` varchar(255) DEFAULT NULL,
- `TYPE` int(11) DEFAULT NULL,
+ `TYPE` int DEFAULT NULL,
`NAME` varchar(255) DEFAULT NULL,
- `ID_TAB` int(11) DEFAULT NULL,
+ `ID_TAB` int DEFAULT NULL,
`COMMENT` varchar(255) DEFAULT NULL,
- `SHOW_ORDER` int(11) NOT NULL,
+ `SHOW_ORDER` int NOT NULL,
`ACCOUNT_TYPE` varchar(255) DEFAULT NULL,
`DEFAULT_VALUE` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `accountinfo_config`
--
LOCK TABLES `accountinfo_config` WRITE;
+/*!40000 ALTER TABLE `accountinfo_config` DISABLE KEYS */;
INSERT INTO `accountinfo_config` VALUES (1,'TAG',0,'TAG',1,'TAG',1,'COMPUTERS',NULL),(2,'TAG',0,'TAG',1,'TAG',1,'SNMP',NULL);
+/*!40000 ALTER TABLE `accountinfo_config` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `archive`
+--
+
+DROP TABLE IF EXISTS `archive`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `archive` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
+ PRIMARY KEY (`ID`),
+ UNIQUE KEY `HARDWARE_ID` (`HARDWARE_ID`),
+ CONSTRAINT `archive_ibfk_1` FOREIGN KEY (`HARDWARE_ID`) REFERENCES `hardware` (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `archive`
+--
+
+LOCK TABLES `archive` WRITE;
+/*!40000 ALTER TABLE `archive` DISABLE KEYS */;
+/*!40000 ALTER TABLE `archive` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `assets_categories`
--
+DROP TABLE IF EXISTS `assets_categories`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `assets_categories` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`CATEGORY_NAME` varchar(255) NOT NULL,
`CATEGORY_DESC` varchar(255) NOT NULL,
`SQL_QUERY` text NOT NULL,
`SQL_ARGS` text NOT NULL,
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `assets_categories`
+--
+
+LOCK TABLES `assets_categories` WRITE;
+/*!40000 ALTER TABLE `assets_categories` DISABLE KEYS */;
+/*!40000 ALTER TABLE `assets_categories` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `batteries`
--
+DROP TABLE IF EXISTS `batteries`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `batteries` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`LOCATION` varchar(255) DEFAULT NULL,
`MANUFACTURER` varchar(255) DEFAULT NULL,
`MANUFACTUREDATE` varchar(10) DEFAULT NULL,
@@ -79,20 +164,33 @@ CREATE TABLE `batteries` (
`DESIGNCAPACITY` varchar(10) DEFAULT NULL,
`DESIGNVOLTAGE` varchar(20) DEFAULT NULL,
`SBDSVERSION` varchar(255) DEFAULT NULL,
- `MAXERROR` int(10) DEFAULT NULL,
+ `MAXERROR` int DEFAULT NULL,
`OEMSPECIFIC` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`),
KEY `NAME` (`NAME`),
KEY `MANUFACTURER` (`MANUFACTURER`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `batteries`
+--
+
+LOCK TABLES `batteries` WRITE;
+/*!40000 ALTER TABLE `batteries` DISABLE KEYS */;
+/*!40000 ALTER TABLE `batteries` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `bios`
--
+DROP TABLE IF EXISTS `bios`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `bios` (
- `HARDWARE_ID` int(11) NOT NULL,
+ `HARDWARE_ID` int NOT NULL,
`SMANUFACTURER` varchar(255) DEFAULT NULL,
`SMODEL` varchar(255) DEFAULT NULL,
`SSN` varchar(255) DEFAULT NULL,
@@ -108,96 +206,151 @@ CREATE TABLE `bios` (
KEY `SSN` (`SSN`),
KEY `ASSETTAG` (`ASSETTAG`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `bios`
+--
+
+LOCK TABLES `bios` WRITE;
+/*!40000 ALTER TABLE `bios` DISABLE KEYS */;
+/*!40000 ALTER TABLE `bios` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `blacklist_macaddresses`
--
+DROP TABLE IF EXISTS `blacklist_macaddresses`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `blacklist_macaddresses` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`MACADDRESS` varchar(255) NOT NULL DEFAULT '',
PRIMARY KEY (`ID`),
UNIQUE KEY `MACADDRESS` (`MACADDRESS`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `blacklist_macaddresses`
--
LOCK TABLES `blacklist_macaddresses` WRITE;
-INSERT INTO `blacklist_macaddresses` VALUES (1,'00:00:00:00:00:00'),(2,'FF:FF:FF:FF:FF:FF'),(3,'44:45:53:54:00:00'),(4,'44:45:53:54:00:01'),(5,'00:01:02:7D:9B:1C'),(6,'00:08:A1:46:06:35'),(7,'00:08:A1:66:E2:1A'),(8,'00:09:DD:10:37:68'),(9,'00:0F:EA:9A:E2:F0'),(10,'00:10:5A:72:71:F3'),(11,'00:11:11:85:08:8B'),(12,'10:11:11:11:11:11'),(13,'44:45:53:54:61:6F'),(14,'');
+/*!40000 ALTER TABLE `blacklist_macaddresses` DISABLE KEYS */;
+INSERT INTO `blacklist_macaddresses` VALUES (14,''),(1,'00:00:00:00:00:00'),(5,'00:01:02:7D:9B:1C'),(6,'00:08:A1:46:06:35'),(7,'00:08:A1:66:E2:1A'),(8,'00:09:DD:10:37:68'),(9,'00:0F:EA:9A:E2:F0'),(10,'00:10:5A:72:71:F3'),(11,'00:11:11:85:08:8B'),(12,'10:11:11:11:11:11'),(3,'44:45:53:54:00:00'),(4,'44:45:53:54:00:01'),(13,'44:45:53:54:61:6F'),(2,'FF:FF:FF:FF:FF:FF');
+/*!40000 ALTER TABLE `blacklist_macaddresses` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `blacklist_serials`
--
+DROP TABLE IF EXISTS `blacklist_serials`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `blacklist_serials` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`SERIAL` varchar(255) NOT NULL DEFAULT '',
PRIMARY KEY (`ID`),
UNIQUE KEY `SERIAL` (`SERIAL`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=35 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `blacklist_serials`
--
LOCK TABLES `blacklist_serials` WRITE;
-INSERT INTO `blacklist_serials` VALUES (1,'N/A'),(2,'(null string)'),(3,'INVALID'),(4,'SYS-1234567890'),(5,'SYS-9876543210'),(6,'SN-12345'),(7,'SN-1234567890'),(8,'1111111111'),(9,'1111111'),(10,'1'),(11,'0123456789'),(12,'12345'),(13,'123456'),(14,'1234567'),(15,'12345678'),(16,'123456789'),(17,'1234567890'),(18,'123456789000'),(19,'12345678901234567'),(20,'0000000000'),(21,'000000000'),(22,'00000000'),(23,'0000000'),(24,'000000'),(25,'NNNNNNN'),(26,'xxxxxxxxxxx'),(27,'EVAL'),(28,'IATPASS'),(29,'none'),(30,'To Be Filled By O.E.M.'),(31,'Tulip Computers'),(32,'Serial Number xxxxxx'),(33,'SN-123456fvgv3i0b8o5n6n7k'),(34,'');
+/*!40000 ALTER TABLE `blacklist_serials` DISABLE KEYS */;
+INSERT INTO `blacklist_serials` VALUES (34,''),(2,'(null string)'),(24,'000000'),(23,'0000000'),(22,'00000000'),(21,'000000000'),(20,'0000000000'),(11,'0123456789'),(10,'1'),(9,'1111111'),(8,'1111111111'),(12,'12345'),(13,'123456'),(14,'1234567'),(15,'12345678'),(16,'123456789'),(17,'1234567890'),(18,'123456789000'),(19,'12345678901234567'),(27,'EVAL'),(28,'IATPASS'),(3,'INVALID'),(1,'N/A'),(25,'NNNNNNN'),(29,'none'),(32,'Serial Number xxxxxx'),(6,'SN-12345'),(7,'SN-1234567890'),(33,'SN-123456fvgv3i0b8o5n6n7k'),(4,'SYS-1234567890'),(5,'SYS-9876543210'),(30,'To Be Filled By O.E.M.'),(31,'Tulip Computers'),(26,'xxxxxxxxxxx');
+/*!40000 ALTER TABLE `blacklist_serials` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `blacklist_subnet`
--
+DROP TABLE IF EXISTS `blacklist_subnet`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `blacklist_subnet` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`SUBNET` varchar(20) NOT NULL DEFAULT '',
`MASK` varchar(20) NOT NULL DEFAULT '',
PRIMARY KEY (`ID`),
UNIQUE KEY `SUBNET` (`SUBNET`,`MASK`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `blacklist_subnet`
+--
+
+LOCK TABLES `blacklist_subnet` WRITE;
+/*!40000 ALTER TABLE `blacklist_subnet` DISABLE KEYS */;
+/*!40000 ALTER TABLE `blacklist_subnet` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `config`
--
+DROP TABLE IF EXISTS `config`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `config` (
`NAME` varchar(50) NOT NULL,
- `IVALUE` int(11) DEFAULT NULL,
+ `IVALUE` int DEFAULT NULL,
`TVALUE` varchar(255) DEFAULT NULL,
`COMMENTS` text,
PRIMARY KEY (`NAME`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `config`
--
LOCK TABLES `config` WRITE;
-INSERT INTO `config` VALUES ('AUTO_DUPLICATE_LVL',7,'','Duplicates bitmap'),('DEPLOY',1,'','Activates or not the automatic deployment option'),('DOWNLOAD',0,'','Activate softwares auto deployment feature'),('DOWNLOAD_CYCLE_LATENCY',60,'','Time between two cycles (seconds)'),('DOWNLOAD_FRAG_LATENCY',10,'','Time between two downloads (seconds)'),('DOWNLOAD_GROUPS_TRACE_EVENTS',1,'','Specify if you want to track packages affected to a group on computer\'s level'),('DOWNLOAD_PACK_DIR',0,'/var/lib/ocsinventory-reports','Directory for download files'),('DOWNLOAD_PERIOD_LATENCY',1,'','Time between two periods (seconds)'),('DOWNLOAD_PERIOD_LENGTH',10,'','Number of cycles in a period'),('DOWNLOAD_REDISTRIB',0,'','Use redistribution servers'),('DOWNLOAD_SERVER_DOCROOT',0,'d:\\tele_ocs','Server directory used for group of server'),('DOWNLOAD_SERVER_URI',0,'$IP$/local','Server url used for group of server'),('DOWNLOAD_TIMEOUT',30,'','Validity of a package (in days)'),('ENABLE_GROUPS',1,'','Enable the computer\'s groups feature'),('FREQUENCY',0,'','Specify the frequency (days) of inventories. (0: inventory at each login. -1: no inventory)'),('GENERATE_OCS_FILES',0,'','Use with ocsinventory-injector, enable the multi entities feature'),('GROUPS_CACHE_OFFSET',43200,'','Random number computed in the defined range. Designed to avoid computing many groups in the same process'),('GROUPS_CACHE_REVALIDATE',43200,'','Specify the validity of computer\'s groups (default: compute it once a day - see offset)'),('GUI_REPORT_AGIN_MACH',30,'','Filter on lastdate for console page'),('GUI_REPORT_DD_MAX',4000,'','Filter on Hard Drive for console page'),('GUI_REPORT_DD_MINI',500,'','Filter on PROCESSOR for console page'),('GUI_REPORT_NOT_VIEW',3,'','Filter on DAY for console page'),('GUI_REPORT_PROC_MAX',3000,'','Filter on PROCESSOR for console page'),('GUI_REPORT_PROC_MINI',1000,'','Filter on Hard Drive for console page'),('GUI_REPORT_RAM_MAX',512,'','Filter on RAM for console page'),('GUI_REPORT_RAM_MINI',128,'','Filter on RAM for console page'),('INVENTORY_CACHE_ENABLED',1,'','Enable some stuff to improve DB queries, especially for GUI multicriteria searching system'),('INVENTORY_CACHE_REVALIDATE',7,'','the engine will clean the inventory cache structures'),('INVENTORY_DIFF',1,'','Activate/Deactivate inventory incremental writing'),('INVENTORY_FILTER_ENABLED',0,'','Enable core filter system to modify some things \"on the fly\"'),('INVENTORY_FILTER_FLOOD_IP',0,'','Enable inventory flooding filter. A dedicated ipaddress ia allowed to send a new computer only once in this period'),('INVENTORY_FILTER_FLOOD_IP_CACHE_TIME',300,'','Period definition for INVENTORY_FILTER_FLOOD_IP'),('INVENTORY_FILTER_ON',0,'','Enable inventory filter stack'),('INVENTORY_ON_STARTUP',1,'1','Launch inventory on agent service statup'),('INVENTORY_TRANSACTION',1,'','Enable/disable db commit at each inventory section'),('INVENTORY_WRITE_DIFF',0,'','Configure engine to make a differential update of inventory sections (row level). Lower DB backend load, higher frontend load'),('IPDISCOVER',2,'','Max number of computers per gateway retrieving IP on the network'),('IPDISCOVER_BETTER_THRESHOLD',1,'','Specify the minimal difference to replace an ipdiscover agent'),('IPDISCOVER_IPD_DIR',0,'/var/lib/ocsinventory-reports','Directory for Ipdiscover files'),('IPDISCOVER_LATENCY',100,'','Default latency between two arp requests'),('IPDISCOVER_MAX_ALIVE',7,'','Max number of days before an Ip Discover computer is replaced'),('IPDISCOVER_NO_POSTPONE',0,'','Disable the time before a first election (not recommended)'),('IPDISCOVER_USE_GROUPS',1,'','Enable groups for ipdiscover (for example, you might want to prevent some groups'),('LOCK_REUSE_TIME',600,'','Validity of a computer\'s lock'),('LOGLEVEL',0,'','ocs engine loglevel'),('LOG_DIR',0,'/var/lib/ocsinventory-reports','Directory for logs files'),('LOG_SCRIPT',0,'/var/lib/ocsinventory-reports','Directory for logs scripts files'),('OCS_FILES_FORMAT',0,'OCS','Generate either compressed file or clear XML text'),('OCS_FILES_OVERWRITE',0,'','Specify if you want to keep trace of all inventory between to synchronisation with the higher level server'),('OCS_FILES_PATH',0,'/tmp','Path to ocs files directory (must be writeable)'),('OCS_SERVER_ADDRESS',0,'127.0.0.1','Ocs serveur ip for plugin webservice'),('PASSWORD_VERSION',1,'PASSWORD_BCRYPT','Password encryption version'),('PROLOG_FILTER_ON',0,'','Enable prolog filter stack'),('PROLOG_FREQ',24,'','Specify the frequency (hours) of prolog, on agents'),('REGISTRY',0,'','Activates or not the registry query function'),('SESSION_VALIDITY_TIME',600,'','Validity of a session (prolog=>postinventory)'),('SNMP_INVENTORY_DIFF',1,NULL,'Configure engine to update snmp inventory regarding to snmp_laststate table (lower DB backend load)'),('TAB_ACCOUNTAG_1',1,'TAG','Default TAB on computers accountinfo'),('TAB_ACCOUNTSNMP_1',1,'TAG','Default TAB on snmp accountinfo'),('TRACE_DELETED',0,'','Trace deleted/duplicated computers (Activated by GLPI)'),('UPDATE',0,'','Activates or not the update feature'),('WARN_UPDATE',1,'1','Warn user if an update is available'),('WOL_PORT',0,'7,9','Wol ports');
-
-INSERT INTO `config` VALUES ('GUI_VERSION',0,'7017','Version of the installed GUI and database');
+/*!40000 ALTER TABLE `config` DISABLE KEYS */;
+INSERT INTO `config` VALUES ('AUTO_DUPLICATE_LVL',7,'','Duplicates bitmap'),('DEFAULT_CATEGORY',NULL,NULL,NULL),('DEPLOY',1,'','Activates or not the automatic deployment option'),('DOWNLOAD',0,'','Activate softwares auto deployment feature'),('DOWNLOAD_CYCLE_LATENCY',60,'','Time between two cycles (seconds)'),('DOWNLOAD_FRAG_LATENCY',10,'','Time between two downloads (seconds)'),('DOWNLOAD_GROUPS_TRACE_EVENTS',1,'','Specify if you want to track packages affected to a group on computer\'s level'),('DOWNLOAD_PACK_DIR',0,'/var/lib/ocsinventory-reports','Directory for download files'),('DOWNLOAD_PERIOD_LATENCY',1,'','Time between two periods (seconds)'),('DOWNLOAD_PERIOD_LENGTH',10,'','Number of cycles in a period'),('DOWNLOAD_REDISTRIB',0,'','Use redistribution servers'),('DOWNLOAD_SERVER_DOCROOT',0,'d:\\tele_ocs','Server directory used for group of server'),('DOWNLOAD_SERVER_URI',0,'$IP$/local','Server url used for group of server'),('DOWNLOAD_TIMEOUT',30,'','Validity of a package (in days)'),('ENABLE_GROUPS',1,'','Enable the computer\'s groups feature'),('FREQUENCY',0,'','Specify the frequency (days) of inventories. (0: inventory at each login. -1: no inventory)'),('GENERATE_OCS_FILES',0,'','Use with ocsinventory-injector, enable the multi entities feature'),('GROUPS_CACHE_OFFSET',43200,'','Random number computed in the defined range. Designed to avoid computing many groups in the same process'),('GROUPS_CACHE_REVALIDATE',43200,'','Specify the validity of computer\'s groups (default: compute it once a day - see offset)'),('GUI_REPORT_AGIN_MACH',30,'','Filter on lastdate for console page'),('GUI_REPORT_DD_MAX',4000,'','Filter on Hard Drive for console page'),('GUI_REPORT_DD_MINI',500,'','Filter on PROCESSOR for console page'),('GUI_REPORT_NOT_VIEW',3,'','Filter on DAY for console page'),('GUI_REPORT_PROC_MAX',3000,'','Filter on PROCESSOR for console page'),('GUI_REPORT_PROC_MINI',1000,'','Filter on Hard Drive for console page'),('GUI_REPORT_RAM_MAX',512,'','Filter on RAM for console page'),('GUI_REPORT_RAM_MINI',128,'','Filter on RAM for console page'),('GUI_VERSION',0,'7039','Version of the installed GUI and database'),('INVENTORY_CACHE_ENABLED',1,'','Enable some stuff to improve DB queries, especially for GUI multicriteria searching system'),('INVENTORY_CACHE_REVALIDATE',7,'','the engine will clean the inventory cache structures'),('INVENTORY_DIFF',1,'','Activate/Deactivate inventory incremental writing'),('INVENTORY_FILTER_ENABLED',0,'','Enable core filter system to modify some things \"on the fly\"'),('INVENTORY_FILTER_FLOOD_IP',0,'','Enable inventory flooding filter. A dedicated ipaddress ia allowed to send a new computer only once in this period'),('INVENTORY_FILTER_FLOOD_IP_CACHE_TIME',300,'','Period definition for INVENTORY_FILTER_FLOOD_IP'),('INVENTORY_FILTER_ON',0,'','Enable inventory filter stack'),('INVENTORY_ON_STARTUP',1,'1','Launch inventory on agent service statup'),('INVENTORY_TRANSACTION',1,'','Enable/disable db commit at each inventory section'),('INVENTORY_WRITE_DIFF',0,'','Configure engine to make a differential update of inventory sections (row level). Lower DB backend load, higher frontend load'),('IPDISCOVER',2,'','Max number of computers per gateway retrieving IP on the network'),('IPDISCOVER_BETTER_THRESHOLD',1,'','Specify the minimal difference to replace an ipdiscover agent'),('IPDISCOVER_IPD_DIR',0,'/var/lib/ocsinventory-reports','Directory for Ipdiscover files'),('IPDISCOVER_LATENCY',100,'','Default latency between two arp requests'),('IPDISCOVER_MAX_ALIVE',7,'','Max number of days before an Ip Discover computer is replaced'),('IPDISCOVER_NO_POSTPONE',0,'','Disable the time before a first election (not recommended)'),('IPDISCOVER_PURGE_OLD',0,'','Purge of the old IPDiscover data'),('IPDISCOVER_PURGE_VALIDITY_TIME',30,'','IPDiscover data validity time'),('IPDISCOVER_USE_GROUPS',1,'','Enable groups for ipdiscover (for example, you might want to prevent some groups'),('LOCK_REUSE_TIME',600,'','Validity of a computer\'s lock'),('LOGLEVEL',0,'','ocs engine loglevel'),('LOG_DIR',0,'/var/lib/ocsinventory-reports','Directory for logs files'),('LOG_SCRIPT',0,'/var/lib/ocsinventory-reports','Directory for logs scripts files'),('OCS_FILES_FORMAT',0,'OCS','Generate either compressed file or clear XML text'),('OCS_FILES_OVERWRITE',0,'','Specify if you want to keep trace of all inventory between to synchronisation with the higher level server'),('OCS_FILES_PATH',0,'/tmp','Path to ocs files directory (must be writeable)'),('OCS_SERVER_ADDRESS',0,'127.0.0.1','Ocs serveur ip for plugin webservice'),('PASSWORD_VERSION',1,'PASSWORD_BCRYPT','Password encryption version'),('PROLOG_FILTER_ON',0,'','Enable prolog filter stack'),('PROLOG_FREQ',24,'','Specify the frequency (hours) of prolog, on agents'),('REGISTRY',0,'','Activates or not the registry query function'),('SESSION_VALIDITY_TIME',600,'','Validity of a session (prolog=>postinventory)'),('SNMP_INVENTORY_DIFF',1,NULL,'Configure engine to update snmp inventory regarding to snmp_laststate table (lower DB backend load)'),('TAB_ACCOUNTAG_1',1,'TAG','Default TAB on computers accountinfo'),('TAB_ACCOUNTSNMP_1',1,'TAG','Default TAB on snmp accountinfo'),('TRACE_DELETED',0,'','Trace deleted/duplicated computers (Activated by GLPI)'),('UPDATE',0,'','Activates or not the update feature'),('WARN_UPDATE',1,'1','Warn user if an update is available'),('WOL_PORT',0,'7,9','Wol ports');
+/*!40000 ALTER TABLE `config` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `conntrack`
--
+DROP TABLE IF EXISTS `conntrack`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `conntrack` (
`IP` varchar(255) NOT NULL DEFAULT '',
`TIMESTAMP` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (`IP`)
) ENGINE=MEMORY DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `conntrack`
+--
+
+LOCK TABLES `conntrack` WRITE;
+/*!40000 ALTER TABLE `conntrack` DISABLE KEYS */;
+/*!40000 ALTER TABLE `conntrack` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `controllers`
--
+DROP TABLE IF EXISTS `controllers`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `controllers` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`MANUFACTURER` varchar(255) DEFAULT NULL,
`NAME` varchar(255) DEFAULT NULL,
`CAPTION` varchar(255) DEFAULT NULL,
@@ -207,105 +360,289 @@ CREATE TABLE `controllers` (
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `controllers`
+--
+
+LOCK TABLES `controllers` WRITE;
+/*!40000 ALTER TABLE `controllers` DISABLE KEYS */;
+/*!40000 ALTER TABLE `controllers` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `cpus`
--
+DROP TABLE IF EXISTS `cpus`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `cpus` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`MANUFACTURER` varchar(255) DEFAULT NULL,
`TYPE` varchar(255) DEFAULT NULL,
`SERIALNUMBER` varchar(255) DEFAULT NULL,
`SPEED` varchar(255) DEFAULT NULL,
- `CORES` int(11) DEFAULT NULL,
+ `CORES` int DEFAULT NULL,
`L2CACHESIZE` varchar(255) DEFAULT NULL,
`CPUARCH` varchar(255) DEFAULT NULL,
- `DATA_WIDTH` int(11) DEFAULT NULL,
- `CURRENT_ADDRESS_WIDTH` int(11) DEFAULT NULL,
- `LOGICAL_CPUS` int(11) DEFAULT NULL,
+ `DATA_WIDTH` int DEFAULT NULL,
+ `CURRENT_ADDRESS_WIDTH` int DEFAULT NULL,
+ `LOGICAL_CPUS` int DEFAULT NULL,
`VOLTAGE` varchar(255) DEFAULT NULL,
`CURRENT_SPEED` varchar(255) DEFAULT NULL,
`SOCKET` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `cpus`
+--
+
+LOCK TABLES `cpus` WRITE;
+/*!40000 ALTER TABLE `cpus` DISABLE KEYS */;
+/*!40000 ALTER TABLE `cpus` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `cve_search`
+--
+
+DROP TABLE IF EXISTS `cve_search`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `cve_search` (
+ `PUBLISHER_ID` int NOT NULL,
+ `NAME_ID` int NOT NULL,
+ `VERSION_ID` int NOT NULL,
+ `CVSS` double(4,2) NOT NULL,
+ `CVE` varchar(255) DEFAULT NULL,
+ `LINK` varchar(255) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `cve_search`
+--
+
+LOCK TABLES `cve_search` WRITE;
+/*!40000 ALTER TABLE `cve_search` DISABLE KEYS */;
+/*!40000 ALTER TABLE `cve_search` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `cve_search_correspondance`
+--
+
+DROP TABLE IF EXISTS `cve_search_correspondance`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `cve_search_correspondance` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `NAME_REG` varchar(255) NOT NULL,
+ `PUBLISH_RESULT` varchar(255) DEFAULT NULL,
+ `NAME_RESULT` varchar(255) DEFAULT NULL,
+ PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `cve_search_correspondance`
+--
+
+LOCK TABLES `cve_search_correspondance` WRITE;
+/*!40000 ALTER TABLE `cve_search_correspondance` DISABLE KEYS */;
+/*!40000 ALTER TABLE `cve_search_correspondance` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `cve_search_history`
+--
+
+DROP TABLE IF EXISTS `cve_search_history`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `cve_search_history` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `FLAG_DATE` datetime NOT NULL,
+ `CVE_NB` int DEFAULT '0',
+ `PUBLISHER_ID` int NOT NULL,
+ PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `cve_search_history`
+--
+
+LOCK TABLES `cve_search_history` WRITE;
+/*!40000 ALTER TABLE `cve_search_history` DISABLE KEYS */;
+/*!40000 ALTER TABLE `cve_search_history` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `deleted_equiv`
--
+DROP TABLE IF EXISTS `deleted_equiv`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `deleted_equiv` (
+ `ID` int NOT NULL AUTO_INCREMENT,
`DATE` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
`DELETED` varchar(255) NOT NULL,
`EQUIVALENT` varchar(255) DEFAULT NULL,
+ PRIMARY KEY (`ID`),
KEY `DELETED` (`DELETED`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `deleted_equiv`
+--
+
+LOCK TABLES `deleted_equiv` WRITE;
+/*!40000 ALTER TABLE `deleted_equiv` DISABLE KEYS */;
+/*!40000 ALTER TABLE `deleted_equiv` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `deploy`
--
+DROP TABLE IF EXISTS `deploy`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `deploy` (
`NAME` varchar(255) NOT NULL,
`CONTENT` longblob NOT NULL,
PRIMARY KEY (`NAME`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `deploy`
+--
+
+LOCK TABLES `deploy` WRITE;
+/*!40000 ALTER TABLE `deploy` DISABLE KEYS */;
+/*!40000 ALTER TABLE `deploy` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `devices`
--
+DROP TABLE IF EXISTS `devices`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `devices` (
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`NAME` varchar(50) NOT NULL,
- `IVALUE` int(11) DEFAULT NULL,
+ `IVALUE` int DEFAULT NULL,
`TVALUE` varchar(255) DEFAULT NULL,
`COMMENTS` text,
+ PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`),
KEY `TVALUE` (`TVALUE`),
KEY `IVALUE` (`IVALUE`),
KEY `NAME` (`NAME`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `devices`
+--
+
+LOCK TABLES `devices` WRITE;
+/*!40000 ALTER TABLE `devices` DISABLE KEYS */;
+/*!40000 ALTER TABLE `devices` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `devicetype`
--
+DROP TABLE IF EXISTS `devicetype`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `devicetype` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`NAME` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `devicetype`
+--
+
+LOCK TABLES `devicetype` WRITE;
+/*!40000 ALTER TABLE `devicetype` DISABLE KEYS */;
+/*!40000 ALTER TABLE `devicetype` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `dico_ignored`
--
+DROP TABLE IF EXISTS `dico_ignored`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `dico_ignored` (
`EXTRACTED` varchar(255) NOT NULL,
PRIMARY KEY (`EXTRACTED`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `dico_ignored`
+--
+
+LOCK TABLES `dico_ignored` WRITE;
+/*!40000 ALTER TABLE `dico_ignored` DISABLE KEYS */;
+/*!40000 ALTER TABLE `dico_ignored` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `dico_soft`
--
+DROP TABLE IF EXISTS `dico_soft`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `dico_soft` (
`EXTRACTED` varchar(255) NOT NULL,
`FORMATTED` varchar(255) NOT NULL,
PRIMARY KEY (`EXTRACTED`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `dico_soft`
+--
+
+LOCK TABLES `dico_soft` WRITE;
+/*!40000 ALTER TABLE `dico_soft` DISABLE KEYS */;
+/*!40000 ALTER TABLE `dico_soft` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `download_affect_rules`
--
+DROP TABLE IF EXISTS `download_affect_rules`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `download_affect_rules` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `RULE` int(11) NOT NULL,
- `PRIORITY` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `RULE` int NOT NULL,
+ `PRIORITY` int NOT NULL,
`CFIELD` varchar(20) NOT NULL,
`OP` varchar(20) NOT NULL,
`COMPTO` varchar(20) NOT NULL,
@@ -313,125 +650,222 @@ CREATE TABLE `download_affect_rules` (
`RULE_NAME` varchar(200) NOT NULL,
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `download_affect_rules`
+--
+
+LOCK TABLES `download_affect_rules` WRITE;
+/*!40000 ALTER TABLE `download_affect_rules` DISABLE KEYS */;
+/*!40000 ALTER TABLE `download_affect_rules` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `download_available`
--
+DROP TABLE IF EXISTS `download_available`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `download_available` (
`FILEID` varchar(255) NOT NULL,
`NAME` varchar(255) NOT NULL,
- `PRIORITY` int(11) NOT NULL,
- `FRAGMENTS` int(11) NOT NULL,
- `SIZE` int(11) NOT NULL,
+ `PRIORITY` int NOT NULL,
+ `FRAGMENTS` int NOT NULL,
+ `SIZE` int NOT NULL,
`OSNAME` varchar(255) NOT NULL,
`COMMENT` text,
- `ID_WK` int(11) DEFAULT NULL,
- `DELETED` int(1) DEFAULT '0',
+ `ID_WK` int DEFAULT NULL,
+ `DELETED` int DEFAULT '0',
PRIMARY KEY (`FILEID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `download_available`
+--
+
+LOCK TABLES `download_available` WRITE;
+/*!40000 ALTER TABLE `download_available` DISABLE KEYS */;
+/*!40000 ALTER TABLE `download_available` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `download_enable`
--
+DROP TABLE IF EXISTS `download_enable`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `download_enable` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`FILEID` varchar(255) NOT NULL,
`INFO_LOC` varchar(255) NOT NULL,
`PACK_LOC` varchar(255) NOT NULL,
`CERT_PATH` varchar(255) DEFAULT NULL,
`CERT_FILE` varchar(255) DEFAULT NULL,
- `SERVER_ID` int(11) DEFAULT NULL,
- `GROUP_ID` int(11) DEFAULT NULL,
+ `SERVER_ID` int DEFAULT NULL,
+ `GROUP_ID` int DEFAULT NULL,
PRIMARY KEY (`ID`),
KEY `FILEID` (`FILEID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `download_enable`
+--
+
+LOCK TABLES `download_enable` WRITE;
+/*!40000 ALTER TABLE `download_enable` DISABLE KEYS */;
+/*!40000 ALTER TABLE `download_enable` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `download_history`
--
+DROP TABLE IF EXISTS `download_history`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `download_history` (
- `HARDWARE_ID` int(11) NOT NULL,
- `PKG_ID` int(11) NOT NULL DEFAULT '0',
+ `HARDWARE_ID` int NOT NULL,
+ `PKG_ID` int NOT NULL DEFAULT '0',
`PKG_NAME` varchar(255) DEFAULT NULL,
PRIMARY KEY (`HARDWARE_ID`,`PKG_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `download_history`
+--
+
+LOCK TABLES `download_history` WRITE;
+/*!40000 ALTER TABLE `download_history` DISABLE KEYS */;
+/*!40000 ALTER TABLE `download_history` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `download_servers`
--
+DROP TABLE IF EXISTS `download_servers`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `download_servers` (
- `HARDWARE_ID` int(11) NOT NULL,
+ `HARDWARE_ID` int NOT NULL,
`URL` varchar(250) NOT NULL,
- `ADD_PORT` int(11) NOT NULL,
+ `ADD_PORT` int NOT NULL,
`ADD_REP` varchar(250) NOT NULL,
- `GROUP_ID` int(11) NOT NULL,
+ `GROUP_ID` int NOT NULL,
PRIMARY KEY (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `download_servers`
+--
+
+LOCK TABLES `download_servers` WRITE;
+/*!40000 ALTER TABLE `download_servers` DISABLE KEYS */;
+/*!40000 ALTER TABLE `download_servers` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `downloadwk_conf_values`
--
+DROP TABLE IF EXISTS `downloadwk_conf_values`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `downloadwk_conf_values` (
- `FIELD` int(11) DEFAULT NULL,
+ `FIELD` int DEFAULT NULL,
`VALUE` varchar(100) DEFAULT NULL,
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `DEFAULT_FIELD` int(1) DEFAULT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `DEFAULT_FIELD` int DEFAULT NULL,
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `downloadwk_conf_values`
+--
+
+LOCK TABLES `downloadwk_conf_values` WRITE;
+/*!40000 ALTER TABLE `downloadwk_conf_values` DISABLE KEYS */;
+/*!40000 ALTER TABLE `downloadwk_conf_values` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `downloadwk_fields`
--
+DROP TABLE IF EXISTS `downloadwk_fields`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `downloadwk_fields` (
`TAB` varchar(100) DEFAULT NULL,
`FIELD` varchar(100) DEFAULT NULL,
- `TYPE` int(11) DEFAULT NULL,
+ `TYPE` int DEFAULT NULL,
`LBL` varchar(100) DEFAULT NULL,
- `MUST_COMPLETED` int(11) DEFAULT NULL,
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `MUST_COMPLETED` int DEFAULT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
`VALUE` varchar(255) DEFAULT NULL,
- `DEFAULT_FIELD` int(1) DEFAULT NULL,
- `RESTRICTED` int(1) DEFAULT NULL,
- `LINK_STATUS` int(11) DEFAULT NULL,
+ `DEFAULT_FIELD` int DEFAULT NULL,
+ `RESTRICTED` int DEFAULT NULL,
+ `LINK_STATUS` int DEFAULT NULL,
PRIMARY KEY (`ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `downloadwk_fields`
--
LOCK TABLES `downloadwk_fields` WRITE;
+/*!40000 ALTER TABLE `downloadwk_fields` DISABLE KEYS */;
INSERT INTO `downloadwk_fields` VALUES ('1','USER',3,'1038',1,1,'loggeduser',1,0,0),('2','NAME_TELEDEPLOY',0,'1037',1,2,'',1,0,0),('2','INFO_PACK',0,'53',1,3,'',1,0,0),('3','PRIORITY',2,'1039',1,4,'',1,0,0),('3','NOTIF_USER',2,'1040',1,5,'',1,0,0),('3','REPORT_USER',2,'1041',1,6,'',1,0,0),('3','REBOOT',2,'1042',1,7,'',1,0,0),('4','VALID_INSTALL',6,'1043',1,8,'',1,0,0),('4','STATUS',2,'1046',0,9,'2',1,1,0),('5','LIST_HISTO',10,'1052',0,10,'select AUTHOR,DATE,ACTION from downloadwk_history where id_dde=%s$$$$OLD_MODIF',1,0,0);
+/*!40000 ALTER TABLE `downloadwk_fields` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `downloadwk_history`
--
+DROP TABLE IF EXISTS `downloadwk_history`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `downloadwk_history` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `ID_DDE` int(11) DEFAULT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `ID_DDE` int DEFAULT NULL,
`AUTHOR` varchar(255) DEFAULT NULL,
`DATE` date DEFAULT NULL,
`ACTION` longtext,
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `downloadwk_history`
+--
+
+LOCK TABLES `downloadwk_history` WRITE;
+/*!40000 ALTER TABLE `downloadwk_history` DISABLE KEYS */;
+/*!40000 ALTER TABLE `downloadwk_history` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `downloadwk_pack`
--
+DROP TABLE IF EXISTS `downloadwk_pack`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `downloadwk_pack` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`LOGIN_USER` varchar(255) DEFAULT NULL,
`GROUP_USER` varchar(255) DEFAULT NULL,
- `Q_DATE` int(11) DEFAULT NULL,
+ `Q_DATE` int DEFAULT NULL,
`fields_1` varchar(255) DEFAULT NULL,
`fields_2` varchar(255) DEFAULT NULL,
`fields_3` varchar(255) DEFAULT NULL,
@@ -444,96 +878,188 @@ CREATE TABLE `downloadwk_pack` (
`fields_10` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `downloadwk_pack`
+--
+
+LOCK TABLES `downloadwk_pack` WRITE;
+/*!40000 ALTER TABLE `downloadwk_pack` DISABLE KEYS */;
+/*!40000 ALTER TABLE `downloadwk_pack` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `downloadwk_statut_request`
--
+DROP TABLE IF EXISTS `downloadwk_statut_request`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `downloadwk_statut_request` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`NAME` varchar(20) DEFAULT NULL,
`LBL` varchar(255) DEFAULT NULL,
- `ACTIF` int(11) DEFAULT NULL,
+ `ACTIF` int DEFAULT NULL,
PRIMARY KEY (`ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `downloadwk_statut_request`
--
LOCK TABLES `downloadwk_statut_request` WRITE;
+/*!40000 ALTER TABLE `downloadwk_statut_request` DISABLE KEYS */;
INSERT INTO `downloadwk_statut_request` VALUES (1,'NIV0','DELETE',0),(2,'NIV1','WAITING FOR INCLUSION',0),(3,'NIV2','ACKNOWLEDGEMENT',0),(4,'NIV3','REFUSAL',0),(5,'NIV4','NEED TO CHANGE',0),(6,'NIV5','CREATE PACKAGE',0),(7,'NIV6','LOCAL TEST',0),(8,'NIV7','PERIMETER LIMITED DEPLOYMENT',0),(9,'NIV8','DURING DEPLOYMENT',0);
+/*!40000 ALTER TABLE `downloadwk_statut_request` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `downloadwk_tab_values`
--
+DROP TABLE IF EXISTS `downloadwk_tab_values`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `downloadwk_tab_values` (
`FIELD` varchar(100) DEFAULT NULL,
`VALUE` varchar(100) DEFAULT NULL,
`LBL` varchar(100) DEFAULT NULL,
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `DEFAULT_FIELD` int(1) DEFAULT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `DEFAULT_FIELD` int DEFAULT NULL,
PRIMARY KEY (`ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `downloadwk_tab_values`
--
LOCK TABLES `downloadwk_tab_values` WRITE;
+/*!40000 ALTER TABLE `downloadwk_tab_values` DISABLE KEYS */;
INSERT INTO `downloadwk_tab_values` VALUES ('TAB','INFO_DEM','1033',1,1),('TAB','INFO_PAQUET','1034',2,1),('TAB','INFO_CONF','1035',3,1),('TAB','INFO_VALID','1036',4,1),('TAB','INFO_HISTO','1052',5,1);
+/*!40000 ALTER TABLE `downloadwk_tab_values` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `drives`
--
+DROP TABLE IF EXISTS `drives`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `drives` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`LETTER` varchar(255) DEFAULT NULL,
`TYPE` varchar(255) DEFAULT NULL,
`FILESYSTEM` varchar(255) DEFAULT NULL,
- `TOTAL` int(11) DEFAULT NULL,
- `FREE` int(11) DEFAULT NULL,
- `NUMFILES` int(11) DEFAULT NULL,
+ `TOTAL` int DEFAULT NULL,
+ `FREE` int DEFAULT NULL,
+ `NUMFILES` int DEFAULT NULL,
`VOLUMN` varchar(255) DEFAULT NULL,
`CREATEDATE` date DEFAULT NULL,
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `drives`
+--
+
+LOCK TABLES `drives` WRITE;
+/*!40000 ALTER TABLE `drives` DISABLE KEYS */;
+/*!40000 ALTER TABLE `drives` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `engine_mutex`
--
+DROP TABLE IF EXISTS `engine_mutex`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `engine_mutex` (
`NAME` varchar(255) NOT NULL DEFAULT '',
- `PID` int(11) DEFAULT NULL,
+ `PID` int DEFAULT NULL,
`TAG` varchar(255) NOT NULL DEFAULT '',
PRIMARY KEY (`NAME`,`TAG`),
KEY `PID` (`PID`)
) ENGINE=MEMORY DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `engine_mutex`
+--
+
+LOCK TABLES `engine_mutex` WRITE;
+/*!40000 ALTER TABLE `engine_mutex` DISABLE KEYS */;
+/*!40000 ALTER TABLE `engine_mutex` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `engine_persistent`
--
+DROP TABLE IF EXISTS `engine_persistent`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `engine_persistent` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`NAME` varchar(255) NOT NULL DEFAULT '',
- `IVALUE` int(11) DEFAULT NULL,
+ `IVALUE` int DEFAULT NULL,
`TVALUE` varchar(255) DEFAULT NULL,
UNIQUE KEY `NAME` (`NAME`),
KEY `ID` (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `engine_persistent`
+--
+
+LOCK TABLES `engine_persistent` WRITE;
+/*!40000 ALTER TABLE `engine_persistent` DISABLE KEYS */;
+/*!40000 ALTER TABLE `engine_persistent` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `extensions`
+--
+
+DROP TABLE IF EXISTS `extensions`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `extensions` (
+ `id` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+ `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+ `description` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+ `version` double NOT NULL,
+ `licence` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+ `author` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+ `contributor` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+ `install_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `extensions`
+--
+
+LOCK TABLES `extensions` WRITE;
+/*!40000 ALTER TABLE `extensions` DISABLE KEYS */;
+/*!40000 ALTER TABLE `extensions` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `files`
--
+DROP TABLE IF EXISTS `files`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `files` (
`NAME` varchar(100) NOT NULL,
`VERSION` varchar(50) NOT NULL,
@@ -541,37 +1067,76 @@ CREATE TABLE `files` (
`CONTENT` longblob NOT NULL,
PRIMARY KEY (`NAME`,`OS`,`VERSION`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `files`
+--
+
+LOCK TABLES `files` WRITE;
+/*!40000 ALTER TABLE `files` DISABLE KEYS */;
+/*!40000 ALTER TABLE `files` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `groups`
--
+DROP TABLE IF EXISTS `groups`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `groups` (
- `HARDWARE_ID` int(11) NOT NULL DEFAULT '0',
+ `HARDWARE_ID` int NOT NULL DEFAULT '0',
`REQUEST` longtext,
- `CREATE_TIME` int(11) DEFAULT '0',
- `REVALIDATE_FROM` int(11) DEFAULT '0',
+ `CREATE_TIME` int DEFAULT '0',
+ `REVALIDATE_FROM` int DEFAULT '0',
`XMLDEF` longtext,
PRIMARY KEY (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `groups`
+--
+
+LOCK TABLES `groups` WRITE;
+/*!40000 ALTER TABLE `groups` DISABLE KEYS */;
+/*!40000 ALTER TABLE `groups` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `groups_cache`
--
+DROP TABLE IF EXISTS `groups_cache`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `groups_cache` (
- `HARDWARE_ID` int(11) NOT NULL DEFAULT '0',
- `GROUP_ID` int(11) NOT NULL DEFAULT '0',
- `STATIC` int(11) DEFAULT '0',
+ `HARDWARE_ID` int NOT NULL DEFAULT '0',
+ `GROUP_ID` int NOT NULL DEFAULT '0',
+ `STATIC` int DEFAULT '0',
PRIMARY KEY (`HARDWARE_ID`,`GROUP_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `groups_cache`
+--
+
+LOCK TABLES `groups_cache` WRITE;
+/*!40000 ALTER TABLE `groups_cache` DISABLE KEYS */;
+/*!40000 ALTER TABLE `groups_cache` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `hardware`
--
+DROP TABLE IF EXISTS `hardware`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `hardware` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`DEVICEID` varchar(255) NOT NULL,
`NAME` varchar(255) DEFAULT NULL,
`WORKGROUP` varchar(255) DEFAULT NULL,
@@ -580,10 +1145,10 @@ CREATE TABLE `hardware` (
`OSVERSION` varchar(255) DEFAULT NULL,
`OSCOMMENTS` varchar(255) DEFAULT NULL,
`PROCESSORT` varchar(255) DEFAULT NULL,
- `PROCESSORS` int(11) DEFAULT '0',
- `PROCESSORN` smallint(6) DEFAULT NULL,
- `MEMORY` int(11) DEFAULT NULL,
- `SWAP` int(11) DEFAULT NULL,
+ `PROCESSORS` int DEFAULT '0',
+ `PROCESSORN` smallint DEFAULT NULL,
+ `MEMORY` int DEFAULT NULL,
+ `SWAP` int DEFAULT NULL,
`IPADDR` varchar(255) DEFAULT NULL,
`DNS` varchar(255) DEFAULT NULL,
`DEFAULTGATEWAY` varchar(255) DEFAULT NULL,
@@ -591,21 +1156,22 @@ CREATE TABLE `hardware` (
`LASTDATE` datetime DEFAULT NULL,
`LASTCOME` datetime DEFAULT NULL,
`QUALITY` decimal(7,4) DEFAULT NULL,
- `FIDELITY` bigint(20) DEFAULT '1',
+ `FIDELITY` bigint DEFAULT '1',
`USERID` varchar(255) DEFAULT NULL,
- `TYPE` int(11) DEFAULT NULL,
+ `TYPE` int DEFAULT NULL,
`DESCRIPTION` varchar(255) DEFAULT NULL,
`WINCOMPANY` varchar(255) DEFAULT NULL,
`WINOWNER` varchar(255) DEFAULT NULL,
`WINPRODID` varchar(255) DEFAULT NULL,
`WINPRODKEY` varchar(255) DEFAULT NULL,
`USERAGENT` varchar(50) DEFAULT NULL,
- `CHECKSUM` bigint(20) unsigned DEFAULT '262143',
- `SSTATE` int(11) DEFAULT '0',
+ `CHECKSUM` bigint unsigned DEFAULT '262143',
+ `SSTATE` int DEFAULT '0',
`IPSRC` varchar(255) DEFAULT NULL,
`UUID` varchar(255) DEFAULT NULL,
`ARCH` varchar(10) DEFAULT NULL,
- `CATEGORY_ID` int(11) DEFAULT NULL,
+ `CATEGORY_ID` int DEFAULT NULL,
+ `ARCHIVE` int DEFAULT NULL,
PRIMARY KEY (`ID`),
KEY `DEVICEID` (`DEVICEID`),
KEY `NAME` (`NAME`),
@@ -615,25 +1181,51 @@ CREATE TABLE `hardware` (
KEY `OSNAME` (`OSNAME`),
KEY `MEMORY` (`MEMORY`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `hardware`
+--
+
+LOCK TABLES `hardware` WRITE;
+/*!40000 ALTER TABLE `hardware` DISABLE KEYS */;
+/*!40000 ALTER TABLE `hardware` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `hardware_osname_cache`
--
+DROP TABLE IF EXISTS `hardware_osname_cache`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `hardware_osname_cache` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`OSNAME` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`),
UNIQUE KEY `OSNAME` (`OSNAME`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `hardware_osname_cache`
+--
+
+LOCK TABLES `hardware_osname_cache` WRITE;
+/*!40000 ALTER TABLE `hardware_osname_cache` DISABLE KEYS */;
+/*!40000 ALTER TABLE `hardware_osname_cache` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `inputs`
--
+DROP TABLE IF EXISTS `inputs`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `inputs` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`TYPE` varchar(255) DEFAULT NULL,
`MANUFACTURER` varchar(255) DEFAULT NULL,
`CAPTION` varchar(255) DEFAULT NULL,
@@ -643,102 +1235,193 @@ CREATE TABLE `inputs` (
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `inputs`
+--
+
+LOCK TABLES `inputs` WRITE;
+/*!40000 ALTER TABLE `inputs` DISABLE KEYS */;
+/*!40000 ALTER TABLE `inputs` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `itmgmt_comments`
--
+DROP TABLE IF EXISTS `itmgmt_comments`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `itmgmt_comments` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`COMMENTS` longtext,
`USER_INSERT` varchar(100) DEFAULT NULL,
`DATE_INSERT` date DEFAULT NULL,
`ACTION` varchar(255) DEFAULT NULL,
- `VISIBLE` int(11) DEFAULT NULL,
+ `VISIBLE` int DEFAULT NULL,
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `itmgmt_comments`
+--
+
+LOCK TABLES `itmgmt_comments` WRITE;
+/*!40000 ALTER TABLE `itmgmt_comments` DISABLE KEYS */;
+/*!40000 ALTER TABLE `itmgmt_comments` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `javainfo`
--
+DROP TABLE IF EXISTS `javainfo`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `javainfo` (
- `HARDWARE_ID` int(11) NOT NULL,
+ `HARDWARE_ID` int NOT NULL,
`JAVANAME` varchar(255) DEFAULT 'NONAME',
- `JAVAPATHLEVEL` int(11) DEFAULT '0',
+ `JAVAPATHLEVEL` int DEFAULT '0',
`JAVACOUNTRY` varchar(255) DEFAULT NULL,
`JAVACLASSPATH` varchar(255) DEFAULT NULL,
`JAVAHOME` varchar(255) DEFAULT NULL,
PRIMARY KEY (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `javainfo`
+--
+
+LOCK TABLES `javainfo` WRITE;
+/*!40000 ALTER TABLE `javainfo` DISABLE KEYS */;
+/*!40000 ALTER TABLE `javainfo` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `journallog`
--
+DROP TABLE IF EXISTS `journallog`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `journallog` (
- `HARDWARE_ID` int(11) NOT NULL,
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
`JOURNALLOG` longtext,
`LISTENERNAME` varchar(255) DEFAULT 'NONAME',
`DATE` varchar(255) DEFAULT NULL,
- `STATUS` int(11) DEFAULT '0',
- `ERRORCODE` int(11) DEFAULT '0',
+ `STATUS` int DEFAULT '0',
+ `ERRORCODE` int DEFAULT '0',
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `journallog`
+--
+
+LOCK TABLES `journallog` WRITE;
+/*!40000 ALTER TABLE `journallog` DISABLE KEYS */;
+/*!40000 ALTER TABLE `journallog` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `languages`
--
+DROP TABLE IF EXISTS `languages`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `languages` (
`NAME` varchar(60) NOT NULL,
`IMG` blob,
`JSON_VALUE` longtext,
PRIMARY KEY (`NAME`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `languages`
+--
+
+LOCK TABLES `languages` WRITE;
+/*!40000 ALTER TABLE `languages` DISABLE KEYS */;
+/*!40000 ALTER TABLE `languages` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `locks`
--
+DROP TABLE IF EXISTS `locks`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `locks` (
- `HARDWARE_ID` int(11) NOT NULL,
- `ID` int(11) DEFAULT NULL,
+ `HARDWARE_ID` int NOT NULL,
+ `ID` int DEFAULT NULL,
`SINCE` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (`HARDWARE_ID`),
KEY `SINCE` (`SINCE`)
) ENGINE=MEMORY DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `locks`
+--
+
+LOCK TABLES `locks` WRITE;
+/*!40000 ALTER TABLE `locks` DISABLE KEYS */;
+/*!40000 ALTER TABLE `locks` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `memories`
--
+DROP TABLE IF EXISTS `memories`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `memories` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`CAPTION` varchar(255) DEFAULT NULL,
`DESCRIPTION` varchar(255) DEFAULT NULL,
`CAPACITY` varchar(255) DEFAULT NULL,
`PURPOSE` varchar(255) DEFAULT NULL,
`TYPE` varchar(255) DEFAULT NULL,
`SPEED` varchar(255) DEFAULT NULL,
- `NUMSLOTS` smallint(6) DEFAULT NULL,
+ `NUMSLOTS` smallint DEFAULT NULL,
`SERIALNUMBER` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `memories`
+--
+
+LOCK TABLES `memories` WRITE;
+/*!40000 ALTER TABLE `memories` DISABLE KEYS */;
+/*!40000 ALTER TABLE `memories` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `modems`
--
+DROP TABLE IF EXISTS `modems`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `modems` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`NAME` varchar(255) DEFAULT NULL,
`MODEL` varchar(255) DEFAULT NULL,
`DESCRIPTION` varchar(255) DEFAULT NULL,
@@ -746,14 +1429,27 @@ CREATE TABLE `modems` (
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `monitors`
+-- Dumping data for table `modems`
--
+LOCK TABLES `modems` WRITE;
+/*!40000 ALTER TABLE `modems` DISABLE KEYS */;
+/*!40000 ALTER TABLE `modems` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `monitors`
+--
+
+DROP TABLE IF EXISTS `monitors`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `monitors` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`MANUFACTURER` varchar(255) DEFAULT NULL,
`CAPTION` varchar(255) DEFAULT NULL,
`DESCRIPTION` varchar(255) DEFAULT NULL,
@@ -762,11 +1458,24 @@ CREATE TABLE `monitors` (
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `monitors`
+--
+
+LOCK TABLES `monitors` WRITE;
+/*!40000 ALTER TABLE `monitors` DISABLE KEYS */;
+/*!40000 ALTER TABLE `monitors` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `netmap`
--
+DROP TABLE IF EXISTS `netmap`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `netmap` (
`IP` varchar(15) NOT NULL,
`MAC` varchar(17) NOT NULL,
@@ -774,17 +1483,31 @@ CREATE TABLE `netmap` (
`NETID` varchar(15) NOT NULL,
`DATE` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`NAME` varchar(255) DEFAULT NULL,
+ `TAG` varchar(255) DEFAULT NULL,
PRIMARY KEY (`MAC`),
KEY `IP` (`IP`),
KEY `NETID` (`NETID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `netmap`
+--
+
+LOCK TABLES `netmap` WRITE;
+/*!40000 ALTER TABLE `netmap` DISABLE KEYS */;
+/*!40000 ALTER TABLE `netmap` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `network_devices`
--
+DROP TABLE IF EXISTS `network_devices`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `network_devices` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`DESCRIPTION` varchar(255) DEFAULT NULL,
`TYPE` varchar(255) DEFAULT NULL,
`MACADDR` varchar(255) DEFAULT NULL,
@@ -792,14 +1515,27 @@ CREATE TABLE `network_devices` (
PRIMARY KEY (`ID`),
KEY `MACADDR` (`MACADDR`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `network_devices`
+--
+
+LOCK TABLES `network_devices` WRITE;
+/*!40000 ALTER TABLE `network_devices` DISABLE KEYS */;
+/*!40000 ALTER TABLE `network_devices` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `networks`
--
+DROP TABLE IF EXISTS `networks`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `networks` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`DESCRIPTION` varchar(255) DEFAULT NULL,
`TYPE` varchar(255) DEFAULT NULL,
`TYPEMIB` varchar(255) DEFAULT NULL,
@@ -820,88 +1556,110 @@ CREATE TABLE `networks` (
KEY `IPSUBNET` (`IPSUBNET`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `networks`
+--
+
+LOCK TABLES `networks` WRITE;
+/*!40000 ALTER TABLE `networks` DISABLE KEYS */;
+/*!40000 ALTER TABLE `networks` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `notification`
--
+DROP TABLE IF EXISTS `notification`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `notification` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`TYPE` varchar(255) NOT NULL,
`FILE` varchar(255) DEFAULT NULL,
`SUBJECT` varchar(255) DEFAULT NULL,
`ALTBODY` text,
PRIMARY KEY (`ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `notification`
--
LOCK TABLES `notification` WRITE;
+/*!40000 ALTER TABLE `notification` DISABLE KEYS */;
INSERT INTO `notification` VALUES (1,'SELECTED','DEFAULT',NULL,NULL),(2,'DEFAULT','templates/OCS_template.html','Notification OCSInventory','Default report inventory'),(3,'PERSO',NULL,NULL,NULL);
+/*!40000 ALTER TABLE `notification` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `notification_config`
--
+DROP TABLE IF EXISTS `notification_config`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `notification_config` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`NAME` varchar(255) NOT NULL,
`TVALUE` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `notification_config`
+--
+
+LOCK TABLES `notification_config` WRITE;
+/*!40000 ALTER TABLE `notification_config` DISABLE KEYS */;
+/*!40000 ALTER TABLE `notification_config` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `operators`
--
+DROP TABLE IF EXISTS `operators`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `operators` (
`ID` varchar(255) NOT NULL DEFAULT '',
`FIRSTNAME` varchar(255) DEFAULT NULL,
`LASTNAME` varchar(255) DEFAULT NULL,
`PASSWD` varchar(255) DEFAULT NULL,
- `ACCESSLVL` int(11) DEFAULT NULL,
+ `ACCESSLVL` int DEFAULT NULL,
`COMMENTS` text,
`NEW_ACCESSLVL` varchar(255) DEFAULT NULL,
`EMAIL` varchar(255) DEFAULT NULL,
`USER_GROUP` varchar(255) DEFAULT NULL,
- `PASSWORD_VERSION` int(11) DEFAULT '0',
+ `PASSWORD_VERSION` int DEFAULT '0',
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `operators`
--
LOCK TABLES `operators` WRITE;
-INSERT INTO `operators` VALUES ('admin','admin','admin','21232f297a57a5a743894a0e4a801fc3',1,'Default administrator account','sadmin',NULL,NULL,0);
+/*!40000 ALTER TABLE `operators` DISABLE KEYS */;
+INSERT INTO `operators` VALUES ('admin','admin','admin','$2y$10$1HpmlSx7CW/nitCCSM5h.Od6m/C8Go2xoPzISnt0jnXKkoM3vFhLi',1,'Default administrator account','sadmin',NULL,NULL,1);
+/*!40000 ALTER TABLE `operators` ENABLE KEYS */;
UNLOCK TABLES;
---
--- Table structure for table `plugins`
---
-
-CREATE TABLE `plugins` (
- `id` int(6) unsigned NOT NULL AUTO_INCREMENT,
- `name` varchar(30) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
- `version` double NOT NULL,
- `licence` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
- `author` varchar(30) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
- `verminocs` double NOT NULL,
- `activated` tinyint(1) NOT NULL,
- `reg_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--
-- Table structure for table `ports`
--
+DROP TABLE IF EXISTS `ports`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `ports` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`TYPE` varchar(255) DEFAULT NULL,
`NAME` varchar(255) DEFAULT NULL,
`CAPTION` varchar(255) DEFAULT NULL,
@@ -909,14 +1667,27 @@ CREATE TABLE `ports` (
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `ports`
+--
+
+LOCK TABLES `ports` WRITE;
+/*!40000 ALTER TABLE `ports` DISABLE KEYS */;
+/*!40000 ALTER TABLE `ports` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `printers`
--
+DROP TABLE IF EXISTS `printers`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `printers` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`NAME` varchar(255) DEFAULT NULL,
`DRIVER` varchar(255) DEFAULT NULL,
`PORT` varchar(255) DEFAULT NULL,
@@ -925,82 +1696,160 @@ CREATE TABLE `printers` (
`SHARENAME` varchar(255) DEFAULT NULL,
`RESOLUTION` varchar(50) DEFAULT NULL,
`COMMENT` varchar(255) DEFAULT NULL,
- `SHARED` int(11) DEFAULT NULL,
- `NETWORK` int(11) DEFAULT NULL,
+ `SHARED` int DEFAULT NULL,
+ `NETWORK` int DEFAULT NULL,
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `printers`
+--
+
+LOCK TABLES `printers` WRITE;
+/*!40000 ALTER TABLE `printers` DISABLE KEYS */;
+/*!40000 ALTER TABLE `printers` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `prolog_conntrack`
--
+DROP TABLE IF EXISTS `prolog_conntrack`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `prolog_conntrack` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`DEVICEID` varchar(255) DEFAULT NULL,
- `TIMESTAMP` int(11) DEFAULT NULL,
- `PID` int(11) DEFAULT NULL,
+ `TIMESTAMP` int DEFAULT NULL,
+ `PID` int DEFAULT NULL,
PRIMARY KEY (`ID`),
KEY `DEVICEID` (`DEVICEID`)
) ENGINE=MEMORY DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `prolog_conntrack`
+--
+
+LOCK TABLES `prolog_conntrack` WRITE;
+/*!40000 ALTER TABLE `prolog_conntrack` DISABLE KEYS */;
+/*!40000 ALTER TABLE `prolog_conntrack` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `regconfig`
--
+DROP TABLE IF EXISTS `regconfig`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `regconfig` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`NAME` varchar(255) DEFAULT NULL,
- `REGTREE` int(11) DEFAULT NULL,
+ `REGTREE` int DEFAULT NULL,
`REGKEY` text,
`REGVALUE` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`),
KEY `NAME` (`NAME`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `regconfig`
+--
+
+LOCK TABLES `regconfig` WRITE;
+/*!40000 ALTER TABLE `regconfig` DISABLE KEYS */;
+/*!40000 ALTER TABLE `regconfig` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `registry`
--
+DROP TABLE IF EXISTS `registry`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `registry` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`NAME` varchar(255) DEFAULT NULL,
- `REGVALUE` varchar(255) DEFAULT NULL,
+ `REGVALUE` text CHARACTER SET utf8 COLLATE utf8_general_ci,
PRIMARY KEY (`ID`),
KEY `NAME` (`NAME`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `registry`
+--
+
+LOCK TABLES `registry` WRITE;
+/*!40000 ALTER TABLE `registry` DISABLE KEYS */;
+/*!40000 ALTER TABLE `registry` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `registry_name_cache`
--
+DROP TABLE IF EXISTS `registry_name_cache`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `registry_name_cache` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`NAME` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`),
UNIQUE KEY `NAME` (`NAME`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `registry_name_cache`
+--
+
+LOCK TABLES `registry_name_cache` WRITE;
+/*!40000 ALTER TABLE `registry_name_cache` DISABLE KEYS */;
+/*!40000 ALTER TABLE `registry_name_cache` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `registry_regvalue_cache`
--
+DROP TABLE IF EXISTS `registry_regvalue_cache`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `registry_regvalue_cache` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`REGVALUE` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`),
UNIQUE KEY `REGVALUE` (`REGVALUE`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `registry_regvalue_cache`
+--
+
+LOCK TABLES `registry_regvalue_cache` WRITE;
+/*!40000 ALTER TABLE `registry_regvalue_cache` DISABLE KEYS */;
+/*!40000 ALTER TABLE `registry_regvalue_cache` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `repository`
--
+DROP TABLE IF EXISTS `repository`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `repository` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`BASEURL` varchar(255) DEFAULT NULL,
`EXCLUDE` varchar(255) DEFAULT NULL,
`EXCLUDED` varchar(255) DEFAULT NULL,
@@ -1016,147 +1865,184 @@ CREATE TABLE `repository` (
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `repository`
+--
+
+LOCK TABLES `repository` WRITE;
+/*!40000 ALTER TABLE `repository` DISABLE KEYS */;
+/*!40000 ALTER TABLE `repository` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `saas`
--
+DROP TABLE IF EXISTS `saas`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `saas` (
- `SAAS_EXP_ID` int(6) NOT NULL,
- `HARDWARE_ID` int(11) NOT NULL,
+ `SAAS_EXP_ID` int NOT NULL,
+ `HARDWARE_ID` int NOT NULL,
`ENTRY` varchar(255) NOT NULL,
`DATA` varchar(255) NOT NULL,
- `TTL` int(64) NOT NULL
+ `TTL` int NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `saas`
+--
+
+LOCK TABLES `saas` WRITE;
+/*!40000 ALTER TABLE `saas` DISABLE KEYS */;
+/*!40000 ALTER TABLE `saas` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `saas_exp`
--
+DROP TABLE IF EXISTS `saas_exp`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `saas_exp` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`NAME` varchar(255) NOT NULL,
`DNS_EXP` varchar(255) NOT NULL,
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `sim`
+-- Dumping data for table `saas_exp`
--
-CREATE TABLE `sim` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
- `OPERATOR` varchar(255) DEFAULT NULL,
- `OPNAME` varchar(255) DEFAULT NULL,
- `COUNTRY` varchar(255) DEFAULT NULL,
- `SERIALNUMBER` varchar(255) DEFAULT NULL,
- `DEVICEID` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`ID`),
- KEY `HARDWARE_ID` (`HARDWARE_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+LOCK TABLES `saas_exp` WRITE;
+/*!40000 ALTER TABLE `saas_exp` DISABLE KEYS */;
+/*!40000 ALTER TABLE `saas_exp` ENABLE KEYS */;
+UNLOCK TABLES;
--
--- Table structure for table `slots`
+-- Table structure for table `save_query`
--
-CREATE TABLE `slots` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
- `NAME` varchar(255) DEFAULT NULL,
- `DESCRIPTION` varchar(255) DEFAULT NULL,
- `DESIGNATION` varchar(255) DEFAULT NULL,
- `PURPOSE` varchar(255) DEFAULT NULL,
- `STATUS` varchar(255) DEFAULT NULL,
- `PSHARE` tinyint(4) DEFAULT NULL,
- PRIMARY KEY (`ID`),
- KEY `HARDWARE_ID` (`HARDWARE_ID`)
+DROP TABLE IF EXISTS `save_query`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `save_query` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `QUERY_NAME` varchar(255) NOT NULL,
+ `DESCRIPTION` text,
+ `PARAMETERS` text NOT NULL,
+ PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `snmp`
+-- Dumping data for table `save_query`
--
-CREATE TABLE `snmp` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `IPADDR` varchar(255) DEFAULT NULL,
- `MACADDR` varchar(255) NOT NULL,
- `SNMPDEVICEID` varchar(255) NOT NULL,
- `NAME` varchar(255) DEFAULT NULL,
- `DESCRIPTION` varchar(255) DEFAULT NULL,
- `CONTACT` varchar(255) DEFAULT NULL,
- `LOCATION` varchar(255) DEFAULT NULL,
- `UPTIME` varchar(255) DEFAULT NULL,
- `DOMAIN` varchar(255) DEFAULT NULL,
- `TYPE` varchar(255) DEFAULT NULL,
- `LASTDATE` datetime DEFAULT NULL,
- `CHECKSUM` bigint(20) unsigned DEFAULT '0',
- PRIMARY KEY (`ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+LOCK TABLES `save_query` WRITE;
+/*!40000 ALTER TABLE `save_query` DISABLE KEYS */;
+/*!40000 ALTER TABLE `save_query` ENABLE KEYS */;
+UNLOCK TABLES;
--
--- Table structure for table `snmp_accountinfo`
+-- Table structure for table `schedule_WOL`
--
-CREATE TABLE `snmp_accountinfo` (
- `SNMP_ID` int(11) NOT NULL,
- `TAG` varchar(255) DEFAULT 'NA',
- PRIMARY KEY (`SNMP_ID`),
- KEY `TAG` (`TAG`)
+DROP TABLE IF EXISTS `schedule_WOL`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `schedule_WOL` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `MACHINE_ID` varchar(255) NOT NULL,
+ `WOL_DATE` datetime NOT NULL,
+ PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `snmp_blades`
+-- Dumping data for table `schedule_WOL`
--
-CREATE TABLE `snmp_blades` (
- `SNMP_ID` int(11) NOT NULL AUTO_INCREMENT,
- `SERIALNUMBER` varchar(255) DEFAULT NULL,
- `SYSTEM` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`SNMP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+LOCK TABLES `schedule_WOL` WRITE;
+/*!40000 ALTER TABLE `schedule_WOL` DISABLE KEYS */;
+/*!40000 ALTER TABLE `schedule_WOL` ENABLE KEYS */;
+UNLOCK TABLES;
--
--- Table structure for table `snmp_cards`
+-- Table structure for table `sim`
--
-CREATE TABLE `snmp_cards` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `DESCRIPTION` varchar(255) DEFAULT NULL,
- `REFERENCE` varchar(255) DEFAULT NULL,
- `FIRMWARE` varchar(255) DEFAULT NULL,
- `SOFTWARE` varchar(255) DEFAULT NULL,
- `REVISION` varchar(255) DEFAULT NULL,
+DROP TABLE IF EXISTS `sim`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `sim` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
+ `OPERATOR` varchar(255) DEFAULT NULL,
+ `OPNAME` varchar(255) DEFAULT NULL,
+ `COUNTRY` varchar(255) DEFAULT NULL,
`SERIALNUMBER` varchar(255) DEFAULT NULL,
- `MANUFACTURER` varchar(255) DEFAULT NULL,
- `TYPE` varchar(255) DEFAULT NULL,
+ `DEVICEID` varchar(255) DEFAULT NULL,
+ `PHONENUMBER` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
+ KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `sim`
+--
+
+LOCK TABLES `sim` WRITE;
+/*!40000 ALTER TABLE `sim` DISABLE KEYS */;
+/*!40000 ALTER TABLE `sim` ENABLE KEYS */;
+UNLOCK TABLES;
--
--- Table structure for table `snmp_cartridges`
+-- Table structure for table `slots`
--
-CREATE TABLE `snmp_cartridges` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
+DROP TABLE IF EXISTS `slots`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `slots` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
+ `NAME` varchar(255) DEFAULT NULL,
`DESCRIPTION` varchar(255) DEFAULT NULL,
- `TYPE` varchar(255) DEFAULT NULL,
- `LEVEL` int(11) DEFAULT NULL,
- `MAXCAPACITY` int(11) DEFAULT NULL,
- `COLOR` varchar(255) DEFAULT NULL,
+ `DESIGNATION` varchar(255) DEFAULT NULL,
+ `PURPOSE` varchar(255) DEFAULT NULL,
+ `STATUS` varchar(255) DEFAULT NULL,
+ `PSHARE` tinyint DEFAULT NULL,
PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
+ KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `slots`
+--
+
+LOCK TABLES `slots` WRITE;
+/*!40000 ALTER TABLE `slots` DISABLE KEYS */;
+/*!40000 ALTER TABLE `slots` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `snmp_communities`
--
+DROP TABLE IF EXISTS `snmp_communities`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `snmp_communities` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`VERSION` varchar(5) DEFAULT NULL,
`NAME` varchar(255) DEFAULT NULL,
`USERNAME` varchar(255) DEFAULT NULL,
@@ -1164,169 +2050,100 @@ CREATE TABLE `snmp_communities` (
`AUTHPASSWD` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `snmp_computers`
---
-
-CREATE TABLE `snmp_computers` (
- `SNMP_ID` int(11) NOT NULL AUTO_INCREMENT,
- `SYSTEM` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`SNMP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `snmp_cpus`
+-- Dumping data for table `snmp_communities`
--
-CREATE TABLE `snmp_cpus` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `SPEED` varchar(255) DEFAULT NULL,
- `TYPE` varchar(255) DEFAULT NULL,
- `MANUFACTURER` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `snmp_drives`
---
-
-CREATE TABLE `snmp_drives` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `LETTER` varchar(255) DEFAULT NULL,
- `TYPE` varchar(255) DEFAULT NULL,
- `FILESYSTEM` varchar(255) DEFAULT NULL,
- `TOTAL` int(11) DEFAULT NULL,
- `FREE` int(11) DEFAULT NULL,
- `NUMFILES` int(11) DEFAULT NULL,
- `VOLUMN` varchar(255) DEFAULT NULL,
- `LABEL` varchar(255) DEFAULT NULL,
- `SERIAL` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `snmp_fans`
---
-
-CREATE TABLE `snmp_fans` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `DESCRIPTION` varchar(255) DEFAULT NULL,
- `REFERENCE` varchar(255) DEFAULT NULL,
- `REVISION` varchar(255) DEFAULT NULL,
- `SERIALNUMBER` varchar(255) DEFAULT NULL,
- `MANUFACTURER` varchar(255) DEFAULT NULL,
- `TYPE` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+LOCK TABLES `snmp_communities` WRITE;
+/*!40000 ALTER TABLE `snmp_communities` DISABLE KEYS */;
+/*!40000 ALTER TABLE `snmp_communities` ENABLE KEYS */;
+UNLOCK TABLES;
--
--- Table structure for table `snmp_firewalls`
+-- Table structure for table `snmp_configs`
--
-CREATE TABLE `snmp_firewalls` (
- `SNMP_ID` int(11) NOT NULL AUTO_INCREMENT,
- `SERIALNUMBER` varchar(255) DEFAULT NULL,
- `SYSTEM` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`SNMP_ID`)
+DROP TABLE IF EXISTS `snmp_configs`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `snmp_configs` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `TYPE_ID` int NOT NULL,
+ `LABEL_ID` int NOT NULL,
+ `OID` varchar(255) NOT NULL,
+ `RECONCILIATION` varchar(255) DEFAULT NULL,
+ PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `snmp_inputs`
+-- Dumping data for table `snmp_configs`
--
-CREATE TABLE `snmp_inputs` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `DESCRIPTION` varchar(255) DEFAULT NULL,
- `TYPE` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+LOCK TABLES `snmp_configs` WRITE;
+/*!40000 ALTER TABLE `snmp_configs` DISABLE KEYS */;
+/*!40000 ALTER TABLE `snmp_configs` ENABLE KEYS */;
+UNLOCK TABLES;
--
--- Table structure for table `snmp_laststate`
+-- Table structure for table `snmp_labels`
--
-CREATE TABLE `snmp_laststate` (
- `SNMP_ID` int(11) NOT NULL,
- `COMMON` varchar(255) DEFAULT NULL,
- `PRINTERS` varchar(255) DEFAULT NULL,
- `TRAYS` varchar(255) DEFAULT NULL,
- `CARTRIDGES` varchar(255) DEFAULT NULL,
- `NETWORKS` varchar(255) DEFAULT NULL,
- `SWITCHS` varchar(255) DEFAULT NULL,
- `BLADES` varchar(255) DEFAULT NULL,
- `STORAGES` varchar(255) DEFAULT NULL,
- `DRIVES` varchar(255) DEFAULT NULL,
- `POWERSUPPLIES` varchar(255) DEFAULT NULL,
- `FANS` varchar(255) DEFAULT NULL,
- `SWITCHINFOS` varchar(255) DEFAULT NULL,
- `LOADBALANCERS` varchar(255) DEFAULT NULL,
- `CARDS` varchar(255) DEFAULT NULL,
- `COMPUTERS` varchar(255) DEFAULT NULL,
- `SOFTWARES` varchar(255) DEFAULT NULL,
- `MEMORIES` varchar(255) DEFAULT NULL,
- `CPUS` varchar(255) DEFAULT NULL,
- `INPUTS` varchar(255) DEFAULT NULL,
- `PORTS` varchar(255) DEFAULT NULL,
- `SOUNDS` varchar(255) DEFAULT NULL,
- `VIDEOS` varchar(255) DEFAULT NULL,
- `MODEMS` varchar(255) DEFAULT NULL,
- `LOCALPRINTERS` varchar(255) DEFAULT NULL,
- `VIRTUALMACHINES` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`SNMP_ID`)
+DROP TABLE IF EXISTS `snmp_labels`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `snmp_labels` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `LABEL_NAME` varchar(255) NOT NULL,
+ PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `snmp_loadbalancers`
+-- Dumping data for table `snmp_labels`
--
-CREATE TABLE `snmp_loadbalancers` (
- `SNMP_ID` int(11) NOT NULL AUTO_INCREMENT,
- `SERIALNUMBER` varchar(255) DEFAULT NULL,
- `SYSTEM` varchar(255) DEFAULT NULL,
- `MANUFACTURER` varchar(255) DEFAULT NULL,
- `TYPE` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`SNMP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+LOCK TABLES `snmp_labels` WRITE;
+/*!40000 ALTER TABLE `snmp_labels` DISABLE KEYS */;
+/*!40000 ALTER TABLE `snmp_labels` ENABLE KEYS */;
+UNLOCK TABLES;
--
--- Table structure for table `snmp_localprinters`
+-- Table structure for table `snmp_links`
--
-CREATE TABLE `snmp_localprinters` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `NAME` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
+DROP TABLE IF EXISTS `snmp_links`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `snmp_links` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `TYPE_ID` int NOT NULL,
+ `DEVICE_ID` int NOT NULL,
+ `ACCOUNT_ID` int NOT NULL,
+ PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `snmp_memories`
+-- Dumping data for table `snmp_links`
--
-CREATE TABLE `snmp_memories` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `CAPACITY` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+LOCK TABLES `snmp_links` WRITE;
+/*!40000 ALTER TABLE `snmp_links` DISABLE KEYS */;
+/*!40000 ALTER TABLE `snmp_links` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `snmp_mibs`
--
+DROP TABLE IF EXISTS `snmp_mibs`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `snmp_mibs` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`VENDOR` varchar(255) DEFAULT NULL,
`URL` varchar(255) DEFAULT NULL,
`CHECKSUM` varchar(255) DEFAULT NULL,
@@ -1334,290 +2151,269 @@ CREATE TABLE `snmp_mibs` (
`PARSER` varchar(5) DEFAULT NULL,
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `snmp_modems`
+-- Dumping data for table `snmp_mibs`
--
-CREATE TABLE `snmp_modems` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `NAME` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+LOCK TABLES `snmp_mibs` WRITE;
+/*!40000 ALTER TABLE `snmp_mibs` DISABLE KEYS */;
+/*!40000 ALTER TABLE `snmp_mibs` ENABLE KEYS */;
+UNLOCK TABLES;
--
--- Table structure for table `snmp_networks`
+-- Table structure for table `snmp_types`
--
-CREATE TABLE `snmp_networks` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `DESCRIPTION` varchar(255) DEFAULT NULL,
- `MACADDR` varchar(255) DEFAULT NULL,
- `DEVICEMACADDR` varchar(255) DEFAULT NULL,
- `SLOT` varchar(255) DEFAULT NULL,
- `STATUS` varchar(255) DEFAULT NULL,
- `SPEED` varchar(255) DEFAULT NULL,
- `TYPE` varchar(255) DEFAULT NULL,
- `DEVICEADDRESS` varchar(255) DEFAULT NULL,
- `DEVICENAME` varchar(255) DEFAULT NULL,
- `DEVICEPORT` varchar(255) DEFAULT NULL,
- `DEVICETYPE` varchar(255) DEFAULT NULL,
- `TYPEMIB` varchar(255) DEFAULT NULL,
- `IPADDR` varchar(255) DEFAULT NULL,
- `IPMASK` varchar(255) DEFAULT NULL,
- `IPGATEWAY` varchar(255) DEFAULT NULL,
- `IPSUBNET` varchar(255) DEFAULT NULL,
- `IPDHCP` varchar(255) DEFAULT NULL,
- `DRIVER` varchar(255) DEFAULT NULL,
- `VIRTUALDEV` int(11) NOT NULL DEFAULT '0',
- PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
+DROP TABLE IF EXISTS `snmp_types`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `snmp_types` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `TYPE_NAME` varchar(255) NOT NULL,
+ `CONDITION_OID` varchar(255) NOT NULL,
+ `CONDITION_VALUE` varchar(255) NOT NULL,
+ `TABLE_TYPE_NAME` varchar(255) NOT NULL,
+ PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `snmp_ports`
+-- Dumping data for table `snmp_types`
--
-CREATE TABLE `snmp_ports` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `NAME` varchar(255) DEFAULT NULL,
- `TYPE` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+LOCK TABLES `snmp_types` WRITE;
+/*!40000 ALTER TABLE `snmp_types` DISABLE KEYS */;
+/*!40000 ALTER TABLE `snmp_types` ENABLE KEYS */;
+UNLOCK TABLES;
--
--- Table structure for table `snmp_powersupplies`
+-- Table structure for table `software`
--
-CREATE TABLE `snmp_powersupplies` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `MANUFACTURER` varchar(255) DEFAULT NULL,
- `REFERENCE` varchar(255) DEFAULT NULL,
- `TYPE` varchar(255) DEFAULT NULL,
- `SERIALNUMBER` varchar(255) DEFAULT NULL,
- `DESCRIPTION` varchar(255) DEFAULT NULL,
- `REVISION` varchar(255) DEFAULT NULL,
+DROP TABLE IF EXISTS `software`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `software` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
+ `NAME_ID` int NOT NULL,
+ `PUBLISHER_ID` int NOT NULL,
+ `VERSION_ID` int NOT NULL,
+ `FOLDER` text,
+ `COMMENTS` text,
+ `FILENAME` varchar(255) DEFAULT NULL,
+ `FILESIZE` int DEFAULT '0',
+ `SOURCE` int DEFAULT NULL,
+ `GUID` varchar(255) DEFAULT NULL,
+ `LANGUAGE` varchar(255) DEFAULT NULL,
+ `INSTALLDATE` datetime DEFAULT NULL,
+ `BITSWIDTH` int DEFAULT NULL,
PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
+ KEY `HARDWARE_ID` (`HARDWARE_ID`),
+ KEY `NAME_ID` (`NAME_ID`),
+ KEY `PUBLISHER_ID` (`PUBLISHER_ID`),
+ KEY `VERSION_ID` (`VERSION_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `snmp_printers`
+-- Dumping data for table `software`
--
-CREATE TABLE `snmp_printers` (
- `SNMP_ID` int(11) NOT NULL,
- `NAME` varchar(255) DEFAULT NULL,
- `SERIALNUMBER` varchar(255) DEFAULT NULL,
- `COUNTER` varchar(255) DEFAULT NULL,
- `STATUS` varchar(255) DEFAULT NULL,
- `ERRORSTATE` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`SNMP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+LOCK TABLES `software` WRITE;
+/*!40000 ALTER TABLE `software` DISABLE KEYS */;
+/*!40000 ALTER TABLE `software` ENABLE KEYS */;
+UNLOCK TABLES;
--
--- Table structure for table `snmp_softwares`
+-- Table structure for table `software_categories`
--
-CREATE TABLE `snmp_softwares` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `NAME` varchar(255) DEFAULT NULL,
- `INSTALLDATE` varchar(255) DEFAULT NULL,
- `COMMENTS` text,
- `VERSION` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
+DROP TABLE IF EXISTS `software_categories`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `software_categories` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `CATEGORY_NAME` varchar(255) NOT NULL,
+ `OS` varchar(255) DEFAULT NULL,
+ PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `snmp_sounds`
+-- Dumping data for table `software_categories`
--
-CREATE TABLE `snmp_sounds` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `NAME` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+LOCK TABLES `software_categories` WRITE;
+/*!40000 ALTER TABLE `software_categories` DISABLE KEYS */;
+/*!40000 ALTER TABLE `software_categories` ENABLE KEYS */;
+UNLOCK TABLES;
--
--- Table structure for table `snmp_storages`
+-- Table structure for table `software_category_exp`
--
-CREATE TABLE `snmp_storages` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `DESCRIPTION` varchar(255) DEFAULT NULL,
- `MANUFACTURER` varchar(255) DEFAULT NULL,
- `NAME` varchar(255) DEFAULT NULL,
- `MODEL` varchar(255) DEFAULT NULL,
- `DISKSIZE` int(11) DEFAULT NULL,
- `TYPE` varchar(255) DEFAULT NULL,
- `SERIALNUMBER` varchar(255) DEFAULT NULL,
- `FIRMWARE` varchar(255) DEFAULT NULL,
+DROP TABLE IF EXISTS `software_category_exp`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `software_category_exp` (
+ `CATEGORY_ID` int NOT NULL,
+ `SOFTWARE_EXP` varchar(255) NOT NULL,
+ `SIGN_VERSION` varchar(255) DEFAULT NULL,
+ `VERSION` varchar(255) DEFAULT NULL,
+ `PUBLISHER` varchar(255) DEFAULT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
+ KEY `CATEGORY_ID` (`CATEGORY_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `snmp_switchinfos`
+-- Dumping data for table `software_category_exp`
--
-CREATE TABLE `snmp_switchinfos` (
- `SNMP_ID` int(11) NOT NULL,
- `TYPE` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`SNMP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+LOCK TABLES `software_category_exp` WRITE;
+/*!40000 ALTER TABLE `software_category_exp` DISABLE KEYS */;
+/*!40000 ALTER TABLE `software_category_exp` ENABLE KEYS */;
+UNLOCK TABLES;
--
--- Table structure for table `snmp_switchs`
+-- Table structure for table `software_name`
--
-CREATE TABLE `snmp_switchs` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `MANUFACTURER` varchar(255) DEFAULT NULL,
- `REFERENCE` varchar(255) DEFAULT NULL,
- `TYPE` varchar(255) DEFAULT NULL,
- `SOFTVERSION` varchar(255) DEFAULT NULL,
- `FIRMVERSION` varchar(255) DEFAULT NULL,
- `SERIALNUMBER` varchar(255) DEFAULT NULL,
- `REVISION` varchar(255) DEFAULT NULL,
- `DESCRIPTION` varchar(255) DEFAULT NULL,
+DROP TABLE IF EXISTS `software_name`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `software_name` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `NAME` varchar(255) NOT NULL,
+ `CATEGORY` int DEFAULT NULL,
PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
+ UNIQUE KEY `NAME` (`NAME`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `snmp_trays`
+-- Dumping data for table `software_name`
--
-CREATE TABLE `snmp_trays` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `NAME` varchar(255) DEFAULT NULL,
- `DESCRIPTION` varchar(255) DEFAULT NULL,
- `LEVEL` varchar(255) DEFAULT NULL,
- `MAXCAPACITY` int(11) DEFAULT NULL,
- PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+LOCK TABLES `software_name` WRITE;
+/*!40000 ALTER TABLE `software_name` DISABLE KEYS */;
+/*!40000 ALTER TABLE `software_name` ENABLE KEYS */;
+UNLOCK TABLES;
--
--- Table structure for table `snmp_videos`
+-- Table structure for table `software_publisher`
--
-CREATE TABLE `snmp_videos` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `NAME` varchar(255) DEFAULT NULL,
+DROP TABLE IF EXISTS `software_publisher`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `software_publisher` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `PUBLISHER` varchar(255) NOT NULL,
PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+ UNIQUE KEY `PUBLISHER` (`PUBLISHER`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `snmp_virtualmachines`
+-- Dumping data for table `software_publisher`
--
-CREATE TABLE `snmp_virtualmachines` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `CONFIG_FILE` varchar(255) DEFAULT NULL,
- `CPU` int(11) DEFAULT NULL,
- `MEMORY` int(11) DEFAULT NULL,
- `NAME` varchar(255) DEFAULT NULL,
- `OS` varchar(255) DEFAULT NULL,
- `POWER` varchar(255) DEFAULT NULL,
- `UUID` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+LOCK TABLES `software_publisher` WRITE;
+/*!40000 ALTER TABLE `software_publisher` DISABLE KEYS */;
+INSERT INTO `software_publisher` VALUES (1,'Unavailable');
+/*!40000 ALTER TABLE `software_publisher` ENABLE KEYS */;
+UNLOCK TABLES;
--
--- Table structure for table `software_categories`
+-- Table structure for table `software_version`
--
-CREATE TABLE `software_categories` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `CATEGORY_NAME` varchar(255) NOT NULL,
- PRIMARY KEY (`ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+DROP TABLE IF EXISTS `software_version`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `software_version` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `VERSION` varchar(255) NOT NULL,
+ PRIMARY KEY (`ID`),
+ UNIQUE KEY `VERSION` (`VERSION`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `software_category_exp`
+-- Dumping data for table `software_version`
--
-CREATE TABLE `software_category_exp` (
- `CATEGORY_ID` int(6) NOT NULL,
- `SOFTWARE_EXP` varchar(255) NOT NULL,
- KEY `CATEGORY_ID` (`CATEGORY_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+LOCK TABLES `software_version` WRITE;
+/*!40000 ALTER TABLE `software_version` DISABLE KEYS */;
+INSERT INTO `software_version` VALUES (1,'Unavailable');
+/*!40000 ALTER TABLE `software_version` ENABLE KEYS */;
+UNLOCK TABLES;
--
--- Table structure for table `softwares`
+-- Table structure for table `softwares_name_cache`
--
-CREATE TABLE `softwares` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
- `PUBLISHER` varchar(255) DEFAULT NULL,
+DROP TABLE IF EXISTS `softwares_name_cache`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `softwares_name_cache` (
+ `ID` int NOT NULL AUTO_INCREMENT,
`NAME` varchar(255) DEFAULT NULL,
- `VERSION` varchar(255) DEFAULT NULL,
- `FOLDER` text,
- `COMMENTS` text,
- `FILENAME` varchar(255) DEFAULT NULL,
- `FILESIZE` int(11) DEFAULT '0',
- `SOURCE` int(11) DEFAULT NULL,
- `GUID` varchar(255) DEFAULT NULL,
- `LANGUAGE` varchar(255) DEFAULT NULL,
- `INSTALLDATE` datetime DEFAULT NULL,
- `BITSWIDTH` int(11) DEFAULT NULL,
- `CATEGORY` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`),
- KEY `NAME` (`NAME`),
- KEY `VERSION` (`VERSION`),
- KEY `HARDWARE_ID` (`HARDWARE_ID`)
+ UNIQUE KEY `NAME` (`NAME`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `softwares_name_cache`
+-- Dumping data for table `softwares_name_cache`
--
-CREATE TABLE `softwares_name_cache` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `NAME` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`ID`),
- UNIQUE KEY `NAME` (`NAME`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+LOCK TABLES `softwares_name_cache` WRITE;
+/*!40000 ALTER TABLE `softwares_name_cache` DISABLE KEYS */;
+/*!40000 ALTER TABLE `softwares_name_cache` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `sounds`
--
+DROP TABLE IF EXISTS `sounds`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `sounds` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`MANUFACTURER` varchar(255) DEFAULT NULL,
`NAME` varchar(255) DEFAULT NULL,
`DESCRIPTION` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `sounds`
+--
+
+LOCK TABLES `sounds` WRITE;
+/*!40000 ALTER TABLE `sounds` DISABLE KEYS */;
+/*!40000 ALTER TABLE `sounds` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `ssl_store`
--
+DROP TABLE IF EXISTS `ssl_store`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `ssl_store` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`FILE` longblob,
`AUTHOR` varchar(255) DEFAULT NULL,
`FILE_NAME` varchar(255) DEFAULT NULL,
@@ -1625,43 +2421,82 @@ CREATE TABLE `ssl_store` (
`DESCRIPTION` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `ssl_store`
+--
+
+LOCK TABLES `ssl_store` WRITE;
+/*!40000 ALTER TABLE `ssl_store` DISABLE KEYS */;
+/*!40000 ALTER TABLE `ssl_store` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `storages`
--
+DROP TABLE IF EXISTS `storages`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `storages` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`MANUFACTURER` varchar(255) DEFAULT NULL,
`NAME` varchar(255) DEFAULT NULL,
`MODEL` varchar(255) DEFAULT NULL,
`DESCRIPTION` varchar(255) DEFAULT NULL,
`TYPE` varchar(255) DEFAULT NULL,
- `DISKSIZE` int(11) DEFAULT NULL,
+ `DISKSIZE` int DEFAULT NULL,
`SERIALNUMBER` varchar(255) DEFAULT NULL,
`FIRMWARE` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `storages`
+--
+
+LOCK TABLES `storages` WRITE;
+/*!40000 ALTER TABLE `storages` DISABLE KEYS */;
+/*!40000 ALTER TABLE `storages` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `subnet`
--
+DROP TABLE IF EXISTS `subnet`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `subnet` (
`NETID` varchar(15) NOT NULL,
`NAME` varchar(255) DEFAULT NULL,
`ID` varchar(255) DEFAULT NULL,
`MASK` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`NETID`),
+ `TAG` varchar(255) DEFAULT NULL,
KEY `ID` (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `subnet`
+--
+
+LOCK TABLES `subnet` WRITE;
+/*!40000 ALTER TABLE `subnet` DISABLE KEYS */;
+/*!40000 ALTER TABLE `subnet` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `tags`
--
+DROP TABLE IF EXISTS `tags`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `tags` (
`Tag` varchar(100) NOT NULL DEFAULT '',
`Login` varchar(100) NOT NULL DEFAULT '',
@@ -1669,13 +2504,26 @@ CREATE TABLE `tags` (
KEY `Tag` (`Tag`),
KEY `Login` (`Login`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `tags`
+--
+
+LOCK TABLES `tags` WRITE;
+/*!40000 ALTER TABLE `tags` DISABLE KEYS */;
+/*!40000 ALTER TABLE `tags` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `temp_files`
--
+DROP TABLE IF EXISTS `temp_files`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `temp_files` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`TABLE_NAME` varchar(255) DEFAULT NULL,
`FIELDS_NAME` varchar(255) DEFAULT NULL,
`file` longblob,
@@ -1683,18 +2531,63 @@ CREATE TABLE `temp_files` (
`AUTHOR` varchar(255) DEFAULT NULL,
`FILE_NAME` varchar(255) DEFAULT NULL,
`FILE_TYPE` varchar(255) DEFAULT NULL,
- `FILE_SIZE` int(11) DEFAULT NULL,
- `ID_DDE` int(11) DEFAULT NULL,
+ `FILE_SIZE` int DEFAULT NULL,
+ `ID_DDE` int DEFAULT NULL,
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `temp_files`
+--
+
+LOCK TABLES `temp_files` WRITE;
+/*!40000 ALTER TABLE `temp_files` DISABLE KEYS */;
+/*!40000 ALTER TABLE `temp_files` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `unixusers`
+--
+
+DROP TABLE IF EXISTS `unixusers`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `unixusers` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
+ `ID_USERS` varchar(255) COLLATE utf8_bin DEFAULT NULL,
+ `GID_USERS` varchar(255) COLLATE utf8_bin DEFAULT NULL,
+ `NAME_USERS` varchar(255) COLLATE utf8_bin DEFAULT NULL,
+ `HOME_USERS` varchar(255) COLLATE utf8_bin DEFAULT NULL,
+ `SHELL_USERS` varchar(255) COLLATE utf8_bin DEFAULT NULL,
+ `LOGIN_USERS` varchar(255) COLLATE utf8_bin DEFAULT NULL,
+ `ID_GROUP` varchar(255) COLLATE utf8_bin DEFAULT NULL,
+ `NAME_GROUP` varchar(255) COLLATE utf8_bin DEFAULT NULL,
+ `MEMBER_GROUP` varchar(255) COLLATE utf8_bin DEFAULT NULL,
+ PRIMARY KEY (`ID`,`HARDWARE_ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `unixusers`
+--
+
+LOCK TABLES `unixusers` WRITE;
+/*!40000 ALTER TABLE `unixusers` DISABLE KEYS */;
+/*!40000 ALTER TABLE `unixusers` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `usbdevices`
--
+DROP TABLE IF EXISTS `usbdevices`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `usbdevices` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`DESCRIPTION` varchar(255) DEFAULT NULL,
`INTERFACE` varchar(255) DEFAULT NULL,
`MANUFACTURER` varchar(255) DEFAULT NULL,
@@ -1703,14 +2596,27 @@ CREATE TABLE `usbdevices` (
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `usbdevices`
+--
+
+LOCK TABLES `usbdevices` WRITE;
+/*!40000 ALTER TABLE `usbdevices` DISABLE KEYS */;
+/*!40000 ALTER TABLE `usbdevices` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `videos`
--
+DROP TABLE IF EXISTS `videos`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `videos` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`NAME` varchar(255) DEFAULT NULL,
`CHIPSET` varchar(255) DEFAULT NULL,
`MEMORY` varchar(255) DEFAULT NULL,
@@ -1718,22 +2624,55 @@ CREATE TABLE `videos` (
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `videos`
+--
+
+LOCK TABLES `videos` WRITE;
+/*!40000 ALTER TABLE `videos` DISABLE KEYS */;
+/*!40000 ALTER TABLE `videos` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `virtualmachines`
--
+DROP TABLE IF EXISTS `virtualmachines`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `virtualmachines` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`NAME` varchar(255) DEFAULT NULL,
`STATUS` varchar(255) DEFAULT NULL,
`SUBSYSTEM` varchar(255) DEFAULT NULL,
`VMTYPE` varchar(255) DEFAULT NULL,
`UUID` varchar(255) DEFAULT NULL,
- `VCPU` int(11) DEFAULT NULL,
- `MEMORY` int(11) DEFAULT NULL,
+ `VCPU` int DEFAULT NULL,
+ `MEMORY` int DEFAULT NULL,
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `virtualmachines`
+--
+
+LOCK TABLES `virtualmachines` WRITE;
+/*!40000 ALTER TABLE `virtualmachines` DISABLE KEYS */;
+/*!40000 ALTER TABLE `virtualmachines` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+-- Dump completed on 2020-12-01 10:13:28
--- a/ocsreports/files/ocsbase_new.sql
+++ b/ocsreports/files/ocsbase_new.sql
@@ -1,11 +1,26 @@
-- If it's a new database
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!50503 SET NAMES utf8mb4 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
--
-- Table structure for table `accesslog`
--
+DROP TABLE IF EXISTS `accesslog`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `accesslog` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`USERID` varchar(255) DEFAULT NULL,
`LOGDATE` datetime DEFAULT NULL,
`PROCESSES` text,
@@ -13,63 +28,133 @@ CREATE TABLE `accesslog` (
KEY `HARDWARE_ID` (`HARDWARE_ID`),
KEY `USERID` (`USERID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `accesslog`
+--
+
+LOCK TABLES `accesslog` WRITE;
+/*!40000 ALTER TABLE `accesslog` DISABLE KEYS */;
+/*!40000 ALTER TABLE `accesslog` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `accountinfo`
--
+DROP TABLE IF EXISTS `accountinfo`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `accountinfo` (
- `HARDWARE_ID` int(11) NOT NULL,
+ `HARDWARE_ID` int NOT NULL,
`TAG` varchar(255) DEFAULT 'NA',
PRIMARY KEY (`HARDWARE_ID`),
KEY `TAG` (`TAG`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `accountinfo`
+--
+
+LOCK TABLES `accountinfo` WRITE;
+/*!40000 ALTER TABLE `accountinfo` DISABLE KEYS */;
+/*!40000 ALTER TABLE `accountinfo` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `accountinfo_config`
--
+DROP TABLE IF EXISTS `accountinfo_config`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `accountinfo_config` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`NAME_ACCOUNTINFO` varchar(255) DEFAULT NULL,
- `TYPE` int(11) DEFAULT NULL,
+ `TYPE` int DEFAULT NULL,
`NAME` varchar(255) DEFAULT NULL,
- `ID_TAB` int(11) DEFAULT NULL,
+ `ID_TAB` int DEFAULT NULL,
`COMMENT` varchar(255) DEFAULT NULL,
- `SHOW_ORDER` int(11) NOT NULL,
+ `SHOW_ORDER` int NOT NULL,
`ACCOUNT_TYPE` varchar(255) DEFAULT NULL,
`DEFAULT_VALUE` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `accountinfo_config`
--
LOCK TABLES `accountinfo_config` WRITE;
+/*!40000 ALTER TABLE `accountinfo_config` DISABLE KEYS */;
INSERT INTO `accountinfo_config` VALUES (1,'TAG',0,'TAG',1,'TAG',1,'COMPUTERS',NULL),(2,'TAG',0,'TAG',1,'TAG',1,'SNMP',NULL);
+/*!40000 ALTER TABLE `accountinfo_config` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `archive`
+--
+
+DROP TABLE IF EXISTS `archive`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `archive` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
+ PRIMARY KEY (`ID`),
+ UNIQUE KEY `HARDWARE_ID` (`HARDWARE_ID`),
+ CONSTRAINT `archive_ibfk_1` FOREIGN KEY (`HARDWARE_ID`) REFERENCES `hardware` (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `archive`
+--
+
+LOCK TABLES `archive` WRITE;
+/*!40000 ALTER TABLE `archive` DISABLE KEYS */;
+/*!40000 ALTER TABLE `archive` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `assets_categories`
--
+DROP TABLE IF EXISTS `assets_categories`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `assets_categories` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`CATEGORY_NAME` varchar(255) NOT NULL,
`CATEGORY_DESC` varchar(255) NOT NULL,
`SQL_QUERY` text NOT NULL,
`SQL_ARGS` text NOT NULL,
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `assets_categories`
+--
+
+LOCK TABLES `assets_categories` WRITE;
+/*!40000 ALTER TABLE `assets_categories` DISABLE KEYS */;
+/*!40000 ALTER TABLE `assets_categories` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `batteries`
--
+DROP TABLE IF EXISTS `batteries`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `batteries` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`LOCATION` varchar(255) DEFAULT NULL,
`MANUFACTURER` varchar(255) DEFAULT NULL,
`MANUFACTUREDATE` varchar(10) DEFAULT NULL,
@@ -79,20 +164,33 @@ CREATE TABLE `batteries` (
`DESIGNCAPACITY` varchar(10) DEFAULT NULL,
`DESIGNVOLTAGE` varchar(20) DEFAULT NULL,
`SBDSVERSION` varchar(255) DEFAULT NULL,
- `MAXERROR` int(10) DEFAULT NULL,
+ `MAXERROR` int DEFAULT NULL,
`OEMSPECIFIC` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`),
KEY `NAME` (`NAME`),
KEY `MANUFACTURER` (`MANUFACTURER`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `batteries`
+--
+
+LOCK TABLES `batteries` WRITE;
+/*!40000 ALTER TABLE `batteries` DISABLE KEYS */;
+/*!40000 ALTER TABLE `batteries` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `bios`
--
+DROP TABLE IF EXISTS `bios`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `bios` (
- `HARDWARE_ID` int(11) NOT NULL,
+ `HARDWARE_ID` int NOT NULL,
`SMANUFACTURER` varchar(255) DEFAULT NULL,
`SMODEL` varchar(255) DEFAULT NULL,
`SSN` varchar(255) DEFAULT NULL,
@@ -108,96 +206,151 @@ CREATE TABLE `bios` (
KEY `SSN` (`SSN`),
KEY `ASSETTAG` (`ASSETTAG`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `bios`
+--
+
+LOCK TABLES `bios` WRITE;
+/*!40000 ALTER TABLE `bios` DISABLE KEYS */;
+/*!40000 ALTER TABLE `bios` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `blacklist_macaddresses`
--
+DROP TABLE IF EXISTS `blacklist_macaddresses`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `blacklist_macaddresses` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`MACADDRESS` varchar(255) NOT NULL DEFAULT '',
PRIMARY KEY (`ID`),
UNIQUE KEY `MACADDRESS` (`MACADDRESS`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `blacklist_macaddresses`
--
LOCK TABLES `blacklist_macaddresses` WRITE;
-INSERT INTO `blacklist_macaddresses` VALUES (1,'00:00:00:00:00:00'),(2,'FF:FF:FF:FF:FF:FF'),(3,'44:45:53:54:00:00'),(4,'44:45:53:54:00:01'),(5,'00:01:02:7D:9B:1C'),(6,'00:08:A1:46:06:35'),(7,'00:08:A1:66:E2:1A'),(8,'00:09:DD:10:37:68'),(9,'00:0F:EA:9A:E2:F0'),(10,'00:10:5A:72:71:F3'),(11,'00:11:11:85:08:8B'),(12,'10:11:11:11:11:11'),(13,'44:45:53:54:61:6F'),(14,'');
+/*!40000 ALTER TABLE `blacklist_macaddresses` DISABLE KEYS */;
+INSERT INTO `blacklist_macaddresses` VALUES (14,''),(1,'00:00:00:00:00:00'),(5,'00:01:02:7D:9B:1C'),(6,'00:08:A1:46:06:35'),(7,'00:08:A1:66:E2:1A'),(8,'00:09:DD:10:37:68'),(9,'00:0F:EA:9A:E2:F0'),(10,'00:10:5A:72:71:F3'),(11,'00:11:11:85:08:8B'),(12,'10:11:11:11:11:11'),(3,'44:45:53:54:00:00'),(4,'44:45:53:54:00:01'),(13,'44:45:53:54:61:6F'),(2,'FF:FF:FF:FF:FF:FF');
+/*!40000 ALTER TABLE `blacklist_macaddresses` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `blacklist_serials`
--
+DROP TABLE IF EXISTS `blacklist_serials`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `blacklist_serials` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`SERIAL` varchar(255) NOT NULL DEFAULT '',
PRIMARY KEY (`ID`),
UNIQUE KEY `SERIAL` (`SERIAL`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=35 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `blacklist_serials`
--
LOCK TABLES `blacklist_serials` WRITE;
-INSERT INTO `blacklist_serials` VALUES (1,'N/A'),(2,'(null string)'),(3,'INVALID'),(4,'SYS-1234567890'),(5,'SYS-9876543210'),(6,'SN-12345'),(7,'SN-1234567890'),(8,'1111111111'),(9,'1111111'),(10,'1'),(11,'0123456789'),(12,'12345'),(13,'123456'),(14,'1234567'),(15,'12345678'),(16,'123456789'),(17,'1234567890'),(18,'123456789000'),(19,'12345678901234567'),(20,'0000000000'),(21,'000000000'),(22,'00000000'),(23,'0000000'),(24,'000000'),(25,'NNNNNNN'),(26,'xxxxxxxxxxx'),(27,'EVAL'),(28,'IATPASS'),(29,'none'),(30,'To Be Filled By O.E.M.'),(31,'Tulip Computers'),(32,'Serial Number xxxxxx'),(33,'SN-123456fvgv3i0b8o5n6n7k'),(34,'');
+/*!40000 ALTER TABLE `blacklist_serials` DISABLE KEYS */;
+INSERT INTO `blacklist_serials` VALUES (34,''),(2,'(null string)'),(24,'000000'),(23,'0000000'),(22,'00000000'),(21,'000000000'),(20,'0000000000'),(11,'0123456789'),(10,'1'),(9,'1111111'),(8,'1111111111'),(12,'12345'),(13,'123456'),(14,'1234567'),(15,'12345678'),(16,'123456789'),(17,'1234567890'),(18,'123456789000'),(19,'12345678901234567'),(27,'EVAL'),(28,'IATPASS'),(3,'INVALID'),(1,'N/A'),(25,'NNNNNNN'),(29,'none'),(32,'Serial Number xxxxxx'),(6,'SN-12345'),(7,'SN-1234567890'),(33,'SN-123456fvgv3i0b8o5n6n7k'),(4,'SYS-1234567890'),(5,'SYS-9876543210'),(30,'To Be Filled By O.E.M.'),(31,'Tulip Computers'),(26,'xxxxxxxxxxx');
+/*!40000 ALTER TABLE `blacklist_serials` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `blacklist_subnet`
--
+DROP TABLE IF EXISTS `blacklist_subnet`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `blacklist_subnet` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`SUBNET` varchar(20) NOT NULL DEFAULT '',
`MASK` varchar(20) NOT NULL DEFAULT '',
PRIMARY KEY (`ID`),
UNIQUE KEY `SUBNET` (`SUBNET`,`MASK`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `blacklist_subnet`
+--
+
+LOCK TABLES `blacklist_subnet` WRITE;
+/*!40000 ALTER TABLE `blacklist_subnet` DISABLE KEYS */;
+/*!40000 ALTER TABLE `blacklist_subnet` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `config`
--
+DROP TABLE IF EXISTS `config`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `config` (
`NAME` varchar(50) NOT NULL,
- `IVALUE` int(11) DEFAULT NULL,
+ `IVALUE` int DEFAULT NULL,
`TVALUE` varchar(255) DEFAULT NULL,
`COMMENTS` text,
PRIMARY KEY (`NAME`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `config`
--
LOCK TABLES `config` WRITE;
-INSERT INTO `config` VALUES ('AUTO_DUPLICATE_LVL',7,'','Duplicates bitmap'),('DEPLOY',1,'','Activates or not the automatic deployment option'),('DOWNLOAD',0,'','Activate softwares auto deployment feature'),('DOWNLOAD_CYCLE_LATENCY',60,'','Time between two cycles (seconds)'),('DOWNLOAD_FRAG_LATENCY',10,'','Time between two downloads (seconds)'),('DOWNLOAD_GROUPS_TRACE_EVENTS',1,'','Specify if you want to track packages affected to a group on computer\'s level'),('DOWNLOAD_PACK_DIR',0,'/var/lib/ocsinventory-reports','Directory for download files'),('DOWNLOAD_PERIOD_LATENCY',1,'','Time between two periods (seconds)'),('DOWNLOAD_PERIOD_LENGTH',10,'','Number of cycles in a period'),('DOWNLOAD_REDISTRIB',1,'','Use redistribution servers'),('DOWNLOAD_SERVER_DOCROOT',0,'d:\\tele_ocs','Server directory used for group of server'),('DOWNLOAD_SERVER_URI',0,'$IP$/local','Server url used for group of server'),('DOWNLOAD_TIMEOUT',30,'','Validity of a package (in days)'),('ENABLE_GROUPS',1,'','Enable the computer\'s groups feature'),('FREQUENCY',0,'','Specify the frequency (days) of inventories. (0: inventory at each login. -1: no inventory)'),('GENERATE_OCS_FILES',0,'','Use with ocsinventory-injector, enable the multi entities feature'),('GROUPS_CACHE_OFFSET',43200,'','Random number computed in the defined range. Designed to avoid computing many groups in the same process'),('GROUPS_CACHE_REVALIDATE',43200,'','Specify the validity of computer\'s groups (default: compute it once a day - see offset)'),('GUI_REPORT_AGIN_MACH',30,'','Filter on lastdate for console page'),('GUI_REPORT_DD_MAX',4000,'','Filter on Hard Drive for console page'),('GUI_REPORT_DD_MINI',500,'','Filter on PROCESSOR for console page'),('GUI_REPORT_NOT_VIEW',3,'','Filter on DAY for console page'),('GUI_REPORT_PROC_MAX',3000,'','Filter on PROCESSOR for console page'),('GUI_REPORT_PROC_MINI',1000,'','Filter on Hard Drive for console page'),('GUI_REPORT_RAM_MAX',512,'','Filter on RAM for console page'),('GUI_REPORT_RAM_MINI',128,'','Filter on RAM for console page'),('INVENTORY_CACHE_ENABLED',1,'','Enable some stuff to improve DB queries, especially for GUI multicriteria searching system'),('INVENTORY_CACHE_REVALIDATE',7,'','the engine will clean the inventory cache structures'),('INVENTORY_DIFF',1,'','Activate/Deactivate inventory incremental writing'),('INVENTORY_FILTER_ENABLED',0,'','Enable core filter system to modify some things \"on the fly\"'),('INVENTORY_FILTER_FLOOD_IP',0,'','Enable inventory flooding filter. A dedicated ipaddress ia allowed to send a new computer only once in this period'),('INVENTORY_FILTER_FLOOD_IP_CACHE_TIME',300,'','Period definition for INVENTORY_FILTER_FLOOD_IP'),('INVENTORY_FILTER_ON',0,'','Enable inventory filter stack'),('INVENTORY_ON_STARTUP',1,'1','Launch inventory on agent service statup'),('INVENTORY_TRANSACTION',1,'','Enable/disable db commit at each inventory section'),('INVENTORY_WRITE_DIFF',0,'','Configure engine to make a differential update of inventory sections (row level). Lower DB backend load, higher frontend load'),('IPDISCOVER',2,'','Max number of computers per gateway retrieving IP on the network'),('IPDISCOVER_BETTER_THRESHOLD',1,'','Specify the minimal difference to replace an ipdiscover agent'),('IPDISCOVER_IPD_DIR',0,'/var/lib/ocsinventory-reports','Directory for Ipdiscover files'),('IPDISCOVER_LATENCY',100,'','Default latency between two arp requests'),('IPDISCOVER_MAX_ALIVE',7,'','Max number of days before an Ip Discover computer is replaced'),('IPDISCOVER_NO_POSTPONE',0,'','Disable the time before a first election (not recommended)'),('IPDISCOVER_USE_GROUPS',1,'','Enable groups for ipdiscover (for example, you might want to prevent some groups'),('LOCK_REUSE_TIME',600,'','Validity of a computer\'s lock'),('LOGLEVEL',0,'','ocs engine loglevel'),('LOG_DIR',0,'/var/lib/ocsinventory-reports','Directory for logs files'),('LOG_SCRIPT',0,'/var/lib/ocsinventory-reports','Directory for logs scripts files'),('OCS_FILES_FORMAT',0,'OCS','Generate either compressed file or clear XML text'),('OCS_FILES_OVERWRITE',0,'','Specify if you want to keep trace of all inventory between to synchronisation with the higher level server'),('OCS_FILES_PATH',0,'/tmp','Path to ocs files directory (must be writeable)'),('OCS_SERVER_ADDRESS',0,'127.0.0.1','Ocs serveur ip for plugin webservice'),('PASSWORD_VERSION',1,'PASSWORD_BCRYPT','Password encryption version'),('PROLOG_FILTER_ON',0,'','Enable prolog filter stack'),('PROLOG_FREQ',24,'','Specify the frequency (hours) of prolog, on agents'),('REGISTRY',0,'','Activates or not the registry query function'),('SESSION_VALIDITY_TIME',600,'','Validity of a session (prolog=>postinventory)'),('SNMP_INVENTORY_DIFF',1,NULL,'Configure engine to update snmp inventory regarding to snmp_laststate table (lower DB backend load)'),('TAB_ACCOUNTAG_1',1,'TAG','Default TAB on computers accountinfo'),('TAB_ACCOUNTSNMP_1',1,'TAG','Default TAB on snmp accountinfo'),('TRACE_DELETED',0,'','Trace deleted/duplicated computers (Activated by GLPI)'),('UPDATE',0,'','Activates or not the update feature'),('WARN_UPDATE',1,'1','Warn user if an update is available'),('WOL_PORT',0,'7,9','Wol ports');
-
-INSERT INTO `config` VALUES ('GUI_VERSION',0,'7017','Version of the installed GUI and database');
+/*!40000 ALTER TABLE `config` DISABLE KEYS */;
+INSERT INTO `config` VALUES ('AUTO_DUPLICATE_LVL',7,'','Duplicates bitmap'),('DEFAULT_CATEGORY',NULL,NULL,NULL),('DEPLOY',1,'','Activates or not the automatic deployment option'),('DOWNLOAD',0,'','Activate softwares auto deployment feature'),('DOWNLOAD_CYCLE_LATENCY',60,'','Time between two cycles (seconds)'),('DOWNLOAD_FRAG_LATENCY',10,'','Time between two downloads (seconds)'),('DOWNLOAD_GROUPS_TRACE_EVENTS',1,'','Specify if you want to track packages affected to a group on computer\'s level'),('DOWNLOAD_PACK_DIR',0,'/var/lib/ocsinventory-reports','Directory for download files'),('DOWNLOAD_PERIOD_LATENCY',1,'','Time between two periods (seconds)'),('DOWNLOAD_PERIOD_LENGTH',10,'','Number of cycles in a period'),('DOWNLOAD_REDISTRIB',0,'','Use redistribution servers'),('DOWNLOAD_SERVER_DOCROOT',0,'d:\\tele_ocs','Server directory used for group of server'),('DOWNLOAD_SERVER_URI',0,'$IP$/local','Server url used for group of server'),('DOWNLOAD_TIMEOUT',30,'','Validity of a package (in days)'),('ENABLE_GROUPS',1,'','Enable the computer\'s groups feature'),('FREQUENCY',0,'','Specify the frequency (days) of inventories. (0: inventory at each login. -1: no inventory)'),('GENERATE_OCS_FILES',0,'','Use with ocsinventory-injector, enable the multi entities feature'),('GROUPS_CACHE_OFFSET',43200,'','Random number computed in the defined range. Designed to avoid computing many groups in the same process'),('GROUPS_CACHE_REVALIDATE',43200,'','Specify the validity of computer\'s groups (default: compute it once a day - see offset)'),('GUI_REPORT_AGIN_MACH',30,'','Filter on lastdate for console page'),('GUI_REPORT_DD_MAX',4000,'','Filter on Hard Drive for console page'),('GUI_REPORT_DD_MINI',500,'','Filter on PROCESSOR for console page'),('GUI_REPORT_NOT_VIEW',3,'','Filter on DAY for console page'),('GUI_REPORT_PROC_MAX',3000,'','Filter on PROCESSOR for console page'),('GUI_REPORT_PROC_MINI',1000,'','Filter on Hard Drive for console page'),('GUI_REPORT_RAM_MAX',512,'','Filter on RAM for console page'),('GUI_REPORT_RAM_MINI',128,'','Filter on RAM for console page'),('GUI_VERSION',0,'7039','Version of the installed GUI and database'),('INVENTORY_CACHE_ENABLED',1,'','Enable some stuff to improve DB queries, especially for GUI multicriteria searching system'),('INVENTORY_CACHE_REVALIDATE',7,'','the engine will clean the inventory cache structures'),('INVENTORY_DIFF',1,'','Activate/Deactivate inventory incremental writing'),('INVENTORY_FILTER_ENABLED',0,'','Enable core filter system to modify some things \"on the fly\"'),('INVENTORY_FILTER_FLOOD_IP',0,'','Enable inventory flooding filter. A dedicated ipaddress ia allowed to send a new computer only once in this period'),('INVENTORY_FILTER_FLOOD_IP_CACHE_TIME',300,'','Period definition for INVENTORY_FILTER_FLOOD_IP'),('INVENTORY_FILTER_ON',0,'','Enable inventory filter stack'),('INVENTORY_ON_STARTUP',1,'1','Launch inventory on agent service statup'),('INVENTORY_TRANSACTION',1,'','Enable/disable db commit at each inventory section'),('INVENTORY_WRITE_DIFF',0,'','Configure engine to make a differential update of inventory sections (row level). Lower DB backend load, higher frontend load'),('IPDISCOVER',2,'','Max number of computers per gateway retrieving IP on the network'),('IPDISCOVER_BETTER_THRESHOLD',1,'','Specify the minimal difference to replace an ipdiscover agent'),('IPDISCOVER_IPD_DIR',0,'/var/lib/ocsinventory-reports','Directory for Ipdiscover files'),('IPDISCOVER_LATENCY',100,'','Default latency between two arp requests'),('IPDISCOVER_MAX_ALIVE',7,'','Max number of days before an Ip Discover computer is replaced'),('IPDISCOVER_NO_POSTPONE',0,'','Disable the time before a first election (not recommended)'),('IPDISCOVER_PURGE_OLD',0,'','Purge of the old IPDiscover data'),('IPDISCOVER_PURGE_VALIDITY_TIME',30,'','IPDiscover data validity time'),('IPDISCOVER_USE_GROUPS',1,'','Enable groups for ipdiscover (for example, you might want to prevent some groups'),('LOCK_REUSE_TIME',600,'','Validity of a computer\'s lock'),('LOGLEVEL',0,'','ocs engine loglevel'),('LOG_DIR',0,'/var/lib/ocsinventory-reports','Directory for logs files'),('LOG_SCRIPT',0,'/var/lib/ocsinventory-reports','Directory for logs scripts files'),('OCS_FILES_FORMAT',0,'OCS','Generate either compressed file or clear XML text'),('OCS_FILES_OVERWRITE',0,'','Specify if you want to keep trace of all inventory between to synchronisation with the higher level server'),('OCS_FILES_PATH',0,'/tmp','Path to ocs files directory (must be writeable)'),('OCS_SERVER_ADDRESS',0,'127.0.0.1','Ocs serveur ip for plugin webservice'),('PASSWORD_VERSION',1,'PASSWORD_BCRYPT','Password encryption version'),('PROLOG_FILTER_ON',0,'','Enable prolog filter stack'),('PROLOG_FREQ',24,'','Specify the frequency (hours) of prolog, on agents'),('REGISTRY',0,'','Activates or not the registry query function'),('SESSION_VALIDITY_TIME',600,'','Validity of a session (prolog=>postinventory)'),('SNMP_INVENTORY_DIFF',1,NULL,'Configure engine to update snmp inventory regarding to snmp_laststate table (lower DB backend load)'),('TAB_ACCOUNTAG_1',1,'TAG','Default TAB on computers accountinfo'),('TAB_ACCOUNTSNMP_1',1,'TAG','Default TAB on snmp accountinfo'),('TRACE_DELETED',0,'','Trace deleted/duplicated computers (Activated by GLPI)'),('UPDATE',0,'','Activates or not the update feature'),('WARN_UPDATE',1,'1','Warn user if an update is available'),('WOL_PORT',0,'7,9','Wol ports');
+/*!40000 ALTER TABLE `config` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `conntrack`
--
+DROP TABLE IF EXISTS `conntrack`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `conntrack` (
`IP` varchar(255) NOT NULL DEFAULT '',
`TIMESTAMP` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (`IP`)
) ENGINE=MEMORY DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `conntrack`
+--
+
+LOCK TABLES `conntrack` WRITE;
+/*!40000 ALTER TABLE `conntrack` DISABLE KEYS */;
+/*!40000 ALTER TABLE `conntrack` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `controllers`
--
+DROP TABLE IF EXISTS `controllers`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `controllers` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`MANUFACTURER` varchar(255) DEFAULT NULL,
`NAME` varchar(255) DEFAULT NULL,
`CAPTION` varchar(255) DEFAULT NULL,
@@ -207,105 +360,289 @@ CREATE TABLE `controllers` (
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `controllers`
+--
+
+LOCK TABLES `controllers` WRITE;
+/*!40000 ALTER TABLE `controllers` DISABLE KEYS */;
+/*!40000 ALTER TABLE `controllers` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `cpus`
--
+DROP TABLE IF EXISTS `cpus`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `cpus` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`MANUFACTURER` varchar(255) DEFAULT NULL,
`TYPE` varchar(255) DEFAULT NULL,
`SERIALNUMBER` varchar(255) DEFAULT NULL,
`SPEED` varchar(255) DEFAULT NULL,
- `CORES` int(11) DEFAULT NULL,
+ `CORES` int DEFAULT NULL,
`L2CACHESIZE` varchar(255) DEFAULT NULL,
`CPUARCH` varchar(255) DEFAULT NULL,
- `DATA_WIDTH` int(11) DEFAULT NULL,
- `CURRENT_ADDRESS_WIDTH` int(11) DEFAULT NULL,
- `LOGICAL_CPUS` int(11) DEFAULT NULL,
+ `DATA_WIDTH` int DEFAULT NULL,
+ `CURRENT_ADDRESS_WIDTH` int DEFAULT NULL,
+ `LOGICAL_CPUS` int DEFAULT NULL,
`VOLTAGE` varchar(255) DEFAULT NULL,
`CURRENT_SPEED` varchar(255) DEFAULT NULL,
`SOCKET` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `cpus`
+--
+
+LOCK TABLES `cpus` WRITE;
+/*!40000 ALTER TABLE `cpus` DISABLE KEYS */;
+/*!40000 ALTER TABLE `cpus` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `cve_search`
+--
+
+DROP TABLE IF EXISTS `cve_search`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `cve_search` (
+ `PUBLISHER_ID` int NOT NULL,
+ `NAME_ID` int NOT NULL,
+ `VERSION_ID` int NOT NULL,
+ `CVSS` double(4,2) NOT NULL,
+ `CVE` varchar(255) DEFAULT NULL,
+ `LINK` varchar(255) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `cve_search`
+--
+
+LOCK TABLES `cve_search` WRITE;
+/*!40000 ALTER TABLE `cve_search` DISABLE KEYS */;
+/*!40000 ALTER TABLE `cve_search` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `cve_search_correspondance`
+--
+
+DROP TABLE IF EXISTS `cve_search_correspondance`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `cve_search_correspondance` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `NAME_REG` varchar(255) NOT NULL,
+ `PUBLISH_RESULT` varchar(255) DEFAULT NULL,
+ `NAME_RESULT` varchar(255) DEFAULT NULL,
+ PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `cve_search_correspondance`
+--
+
+LOCK TABLES `cve_search_correspondance` WRITE;
+/*!40000 ALTER TABLE `cve_search_correspondance` DISABLE KEYS */;
+/*!40000 ALTER TABLE `cve_search_correspondance` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `cve_search_history`
+--
+
+DROP TABLE IF EXISTS `cve_search_history`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `cve_search_history` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `FLAG_DATE` datetime NOT NULL,
+ `CVE_NB` int DEFAULT '0',
+ `PUBLISHER_ID` int NOT NULL,
+ PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `cve_search_history`
+--
+
+LOCK TABLES `cve_search_history` WRITE;
+/*!40000 ALTER TABLE `cve_search_history` DISABLE KEYS */;
+/*!40000 ALTER TABLE `cve_search_history` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `deleted_equiv`
--
+DROP TABLE IF EXISTS `deleted_equiv`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `deleted_equiv` (
+ `ID` int NOT NULL AUTO_INCREMENT,
`DATE` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
`DELETED` varchar(255) NOT NULL,
`EQUIVALENT` varchar(255) DEFAULT NULL,
+ PRIMARY KEY (`ID`),
KEY `DELETED` (`DELETED`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `deleted_equiv`
+--
+
+LOCK TABLES `deleted_equiv` WRITE;
+/*!40000 ALTER TABLE `deleted_equiv` DISABLE KEYS */;
+/*!40000 ALTER TABLE `deleted_equiv` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `deploy`
--
+DROP TABLE IF EXISTS `deploy`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `deploy` (
`NAME` varchar(255) NOT NULL,
`CONTENT` longblob NOT NULL,
PRIMARY KEY (`NAME`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `deploy`
+--
+
+LOCK TABLES `deploy` WRITE;
+/*!40000 ALTER TABLE `deploy` DISABLE KEYS */;
+/*!40000 ALTER TABLE `deploy` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `devices`
--
+DROP TABLE IF EXISTS `devices`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `devices` (
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`NAME` varchar(50) NOT NULL,
- `IVALUE` int(11) DEFAULT NULL,
+ `IVALUE` int DEFAULT NULL,
`TVALUE` varchar(255) DEFAULT NULL,
`COMMENTS` text,
+ PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`),
KEY `TVALUE` (`TVALUE`),
KEY `IVALUE` (`IVALUE`),
KEY `NAME` (`NAME`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `devices`
+--
+
+LOCK TABLES `devices` WRITE;
+/*!40000 ALTER TABLE `devices` DISABLE KEYS */;
+/*!40000 ALTER TABLE `devices` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `devicetype`
--
+DROP TABLE IF EXISTS `devicetype`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `devicetype` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`NAME` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `devicetype`
+--
+
+LOCK TABLES `devicetype` WRITE;
+/*!40000 ALTER TABLE `devicetype` DISABLE KEYS */;
+/*!40000 ALTER TABLE `devicetype` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `dico_ignored`
--
+DROP TABLE IF EXISTS `dico_ignored`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `dico_ignored` (
`EXTRACTED` varchar(255) NOT NULL,
PRIMARY KEY (`EXTRACTED`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `dico_ignored`
+--
+
+LOCK TABLES `dico_ignored` WRITE;
+/*!40000 ALTER TABLE `dico_ignored` DISABLE KEYS */;
+/*!40000 ALTER TABLE `dico_ignored` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `dico_soft`
--
+DROP TABLE IF EXISTS `dico_soft`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `dico_soft` (
`EXTRACTED` varchar(255) NOT NULL,
`FORMATTED` varchar(255) NOT NULL,
PRIMARY KEY (`EXTRACTED`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `dico_soft`
+--
+
+LOCK TABLES `dico_soft` WRITE;
+/*!40000 ALTER TABLE `dico_soft` DISABLE KEYS */;
+/*!40000 ALTER TABLE `dico_soft` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `download_affect_rules`
--
+DROP TABLE IF EXISTS `download_affect_rules`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `download_affect_rules` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `RULE` int(11) NOT NULL,
- `PRIORITY` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `RULE` int NOT NULL,
+ `PRIORITY` int NOT NULL,
`CFIELD` varchar(20) NOT NULL,
`OP` varchar(20) NOT NULL,
`COMPTO` varchar(20) NOT NULL,
@@ -313,125 +650,222 @@ CREATE TABLE `download_affect_rules` (
`RULE_NAME` varchar(200) NOT NULL,
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `download_affect_rules`
+--
+
+LOCK TABLES `download_affect_rules` WRITE;
+/*!40000 ALTER TABLE `download_affect_rules` DISABLE KEYS */;
+/*!40000 ALTER TABLE `download_affect_rules` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `download_available`
--
+DROP TABLE IF EXISTS `download_available`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `download_available` (
`FILEID` varchar(255) NOT NULL,
`NAME` varchar(255) NOT NULL,
- `PRIORITY` int(11) NOT NULL,
- `FRAGMENTS` int(11) NOT NULL,
- `SIZE` int(11) NOT NULL,
+ `PRIORITY` int NOT NULL,
+ `FRAGMENTS` int NOT NULL,
+ `SIZE` int NOT NULL,
`OSNAME` varchar(255) NOT NULL,
`COMMENT` text,
- `ID_WK` int(11) DEFAULT NULL,
- `DELETED` int(1) DEFAULT '0',
+ `ID_WK` int DEFAULT NULL,
+ `DELETED` int DEFAULT '0',
PRIMARY KEY (`FILEID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `download_available`
+--
+
+LOCK TABLES `download_available` WRITE;
+/*!40000 ALTER TABLE `download_available` DISABLE KEYS */;
+/*!40000 ALTER TABLE `download_available` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `download_enable`
--
+DROP TABLE IF EXISTS `download_enable`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `download_enable` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`FILEID` varchar(255) NOT NULL,
`INFO_LOC` varchar(255) NOT NULL,
`PACK_LOC` varchar(255) NOT NULL,
`CERT_PATH` varchar(255) DEFAULT NULL,
`CERT_FILE` varchar(255) DEFAULT NULL,
- `SERVER_ID` int(11) DEFAULT NULL,
- `GROUP_ID` int(11) DEFAULT NULL,
+ `SERVER_ID` int DEFAULT NULL,
+ `GROUP_ID` int DEFAULT NULL,
PRIMARY KEY (`ID`),
KEY `FILEID` (`FILEID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `download_enable`
+--
+
+LOCK TABLES `download_enable` WRITE;
+/*!40000 ALTER TABLE `download_enable` DISABLE KEYS */;
+/*!40000 ALTER TABLE `download_enable` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `download_history`
--
+DROP TABLE IF EXISTS `download_history`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `download_history` (
- `HARDWARE_ID` int(11) NOT NULL,
- `PKG_ID` int(11) NOT NULL DEFAULT '0',
+ `HARDWARE_ID` int NOT NULL,
+ `PKG_ID` int NOT NULL DEFAULT '0',
`PKG_NAME` varchar(255) DEFAULT NULL,
PRIMARY KEY (`HARDWARE_ID`,`PKG_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `download_history`
+--
+
+LOCK TABLES `download_history` WRITE;
+/*!40000 ALTER TABLE `download_history` DISABLE KEYS */;
+/*!40000 ALTER TABLE `download_history` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `download_servers`
--
+DROP TABLE IF EXISTS `download_servers`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `download_servers` (
- `HARDWARE_ID` int(11) NOT NULL,
+ `HARDWARE_ID` int NOT NULL,
`URL` varchar(250) NOT NULL,
- `ADD_PORT` int(11) NOT NULL,
+ `ADD_PORT` int NOT NULL,
`ADD_REP` varchar(250) NOT NULL,
- `GROUP_ID` int(11) NOT NULL,
+ `GROUP_ID` int NOT NULL,
PRIMARY KEY (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `download_servers`
+--
+
+LOCK TABLES `download_servers` WRITE;
+/*!40000 ALTER TABLE `download_servers` DISABLE KEYS */;
+/*!40000 ALTER TABLE `download_servers` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `downloadwk_conf_values`
--
+DROP TABLE IF EXISTS `downloadwk_conf_values`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `downloadwk_conf_values` (
- `FIELD` int(11) DEFAULT NULL,
+ `FIELD` int DEFAULT NULL,
`VALUE` varchar(100) DEFAULT NULL,
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `DEFAULT_FIELD` int(1) DEFAULT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `DEFAULT_FIELD` int DEFAULT NULL,
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `downloadwk_conf_values`
+--
+
+LOCK TABLES `downloadwk_conf_values` WRITE;
+/*!40000 ALTER TABLE `downloadwk_conf_values` DISABLE KEYS */;
+/*!40000 ALTER TABLE `downloadwk_conf_values` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `downloadwk_fields`
--
+DROP TABLE IF EXISTS `downloadwk_fields`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `downloadwk_fields` (
`TAB` varchar(100) DEFAULT NULL,
`FIELD` varchar(100) DEFAULT NULL,
- `TYPE` int(11) DEFAULT NULL,
+ `TYPE` int DEFAULT NULL,
`LBL` varchar(100) DEFAULT NULL,
- `MUST_COMPLETED` int(11) DEFAULT NULL,
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `MUST_COMPLETED` int DEFAULT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
`VALUE` varchar(255) DEFAULT NULL,
- `DEFAULT_FIELD` int(1) DEFAULT NULL,
- `RESTRICTED` int(1) DEFAULT NULL,
- `LINK_STATUS` int(11) DEFAULT NULL,
+ `DEFAULT_FIELD` int DEFAULT NULL,
+ `RESTRICTED` int DEFAULT NULL,
+ `LINK_STATUS` int DEFAULT NULL,
PRIMARY KEY (`ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `downloadwk_fields`
--
LOCK TABLES `downloadwk_fields` WRITE;
+/*!40000 ALTER TABLE `downloadwk_fields` DISABLE KEYS */;
INSERT INTO `downloadwk_fields` VALUES ('1','USER',3,'1038',1,1,'loggeduser',1,0,0),('2','NAME_TELEDEPLOY',0,'1037',1,2,'',1,0,0),('2','INFO_PACK',0,'53',1,3,'',1,0,0),('3','PRIORITY',2,'1039',1,4,'',1,0,0),('3','NOTIF_USER',2,'1040',1,5,'',1,0,0),('3','REPORT_USER',2,'1041',1,6,'',1,0,0),('3','REBOOT',2,'1042',1,7,'',1,0,0),('4','VALID_INSTALL',6,'1043',1,8,'',1,0,0),('4','STATUS',2,'1046',0,9,'2',1,1,0),('5','LIST_HISTO',10,'1052',0,10,'select AUTHOR,DATE,ACTION from downloadwk_history where id_dde=%s$$$$OLD_MODIF',1,0,0);
+/*!40000 ALTER TABLE `downloadwk_fields` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `downloadwk_history`
--
+DROP TABLE IF EXISTS `downloadwk_history`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `downloadwk_history` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `ID_DDE` int(11) DEFAULT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `ID_DDE` int DEFAULT NULL,
`AUTHOR` varchar(255) DEFAULT NULL,
`DATE` date DEFAULT NULL,
`ACTION` longtext,
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `downloadwk_history`
+--
+
+LOCK TABLES `downloadwk_history` WRITE;
+/*!40000 ALTER TABLE `downloadwk_history` DISABLE KEYS */;
+/*!40000 ALTER TABLE `downloadwk_history` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `downloadwk_pack`
--
+DROP TABLE IF EXISTS `downloadwk_pack`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `downloadwk_pack` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`LOGIN_USER` varchar(255) DEFAULT NULL,
`GROUP_USER` varchar(255) DEFAULT NULL,
- `Q_DATE` int(11) DEFAULT NULL,
+ `Q_DATE` int DEFAULT NULL,
`fields_1` varchar(255) DEFAULT NULL,
`fields_2` varchar(255) DEFAULT NULL,
`fields_3` varchar(255) DEFAULT NULL,
@@ -444,96 +878,188 @@ CREATE TABLE `downloadwk_pack` (
`fields_10` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `downloadwk_pack`
+--
+
+LOCK TABLES `downloadwk_pack` WRITE;
+/*!40000 ALTER TABLE `downloadwk_pack` DISABLE KEYS */;
+/*!40000 ALTER TABLE `downloadwk_pack` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `downloadwk_statut_request`
--
+DROP TABLE IF EXISTS `downloadwk_statut_request`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `downloadwk_statut_request` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`NAME` varchar(20) DEFAULT NULL,
`LBL` varchar(255) DEFAULT NULL,
- `ACTIF` int(11) DEFAULT NULL,
+ `ACTIF` int DEFAULT NULL,
PRIMARY KEY (`ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `downloadwk_statut_request`
--
LOCK TABLES `downloadwk_statut_request` WRITE;
+/*!40000 ALTER TABLE `downloadwk_statut_request` DISABLE KEYS */;
INSERT INTO `downloadwk_statut_request` VALUES (1,'NIV0','DELETE',0),(2,'NIV1','WAITING FOR INCLUSION',0),(3,'NIV2','ACKNOWLEDGEMENT',0),(4,'NIV3','REFUSAL',0),(5,'NIV4','NEED TO CHANGE',0),(6,'NIV5','CREATE PACKAGE',0),(7,'NIV6','LOCAL TEST',0),(8,'NIV7','PERIMETER LIMITED DEPLOYMENT',0),(9,'NIV8','DURING DEPLOYMENT',0);
+/*!40000 ALTER TABLE `downloadwk_statut_request` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `downloadwk_tab_values`
--
+DROP TABLE IF EXISTS `downloadwk_tab_values`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `downloadwk_tab_values` (
`FIELD` varchar(100) DEFAULT NULL,
`VALUE` varchar(100) DEFAULT NULL,
`LBL` varchar(100) DEFAULT NULL,
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `DEFAULT_FIELD` int(1) DEFAULT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `DEFAULT_FIELD` int DEFAULT NULL,
PRIMARY KEY (`ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `downloadwk_tab_values`
--
LOCK TABLES `downloadwk_tab_values` WRITE;
+/*!40000 ALTER TABLE `downloadwk_tab_values` DISABLE KEYS */;
INSERT INTO `downloadwk_tab_values` VALUES ('TAB','INFO_DEM','1033',1,1),('TAB','INFO_PAQUET','1034',2,1),('TAB','INFO_CONF','1035',3,1),('TAB','INFO_VALID','1036',4,1),('TAB','INFO_HISTO','1052',5,1);
+/*!40000 ALTER TABLE `downloadwk_tab_values` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `drives`
--
+DROP TABLE IF EXISTS `drives`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `drives` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`LETTER` varchar(255) DEFAULT NULL,
`TYPE` varchar(255) DEFAULT NULL,
`FILESYSTEM` varchar(255) DEFAULT NULL,
- `TOTAL` int(11) DEFAULT NULL,
- `FREE` int(11) DEFAULT NULL,
- `NUMFILES` int(11) DEFAULT NULL,
+ `TOTAL` int DEFAULT NULL,
+ `FREE` int DEFAULT NULL,
+ `NUMFILES` int DEFAULT NULL,
`VOLUMN` varchar(255) DEFAULT NULL,
`CREATEDATE` date DEFAULT NULL,
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `drives`
+--
+
+LOCK TABLES `drives` WRITE;
+/*!40000 ALTER TABLE `drives` DISABLE KEYS */;
+/*!40000 ALTER TABLE `drives` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `engine_mutex`
--
+DROP TABLE IF EXISTS `engine_mutex`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `engine_mutex` (
`NAME` varchar(255) NOT NULL DEFAULT '',
- `PID` int(11) DEFAULT NULL,
+ `PID` int DEFAULT NULL,
`TAG` varchar(255) NOT NULL DEFAULT '',
PRIMARY KEY (`NAME`,`TAG`),
KEY `PID` (`PID`)
) ENGINE=MEMORY DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `engine_mutex`
+--
+
+LOCK TABLES `engine_mutex` WRITE;
+/*!40000 ALTER TABLE `engine_mutex` DISABLE KEYS */;
+/*!40000 ALTER TABLE `engine_mutex` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `engine_persistent`
--
+DROP TABLE IF EXISTS `engine_persistent`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `engine_persistent` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`NAME` varchar(255) NOT NULL DEFAULT '',
- `IVALUE` int(11) DEFAULT NULL,
+ `IVALUE` int DEFAULT NULL,
`TVALUE` varchar(255) DEFAULT NULL,
UNIQUE KEY `NAME` (`NAME`),
KEY `ID` (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `engine_persistent`
+--
+
+LOCK TABLES `engine_persistent` WRITE;
+/*!40000 ALTER TABLE `engine_persistent` DISABLE KEYS */;
+/*!40000 ALTER TABLE `engine_persistent` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `extensions`
+--
+
+DROP TABLE IF EXISTS `extensions`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `extensions` (
+ `id` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+ `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+ `description` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+ `version` double NOT NULL,
+ `licence` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+ `author` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+ `contributor` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+ `install_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `extensions`
+--
+
+LOCK TABLES `extensions` WRITE;
+/*!40000 ALTER TABLE `extensions` DISABLE KEYS */;
+/*!40000 ALTER TABLE `extensions` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `files`
--
+DROP TABLE IF EXISTS `files`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `files` (
`NAME` varchar(100) NOT NULL,
`VERSION` varchar(50) NOT NULL,
@@ -541,37 +1067,76 @@ CREATE TABLE `files` (
`CONTENT` longblob NOT NULL,
PRIMARY KEY (`NAME`,`OS`,`VERSION`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `files`
+--
+
+LOCK TABLES `files` WRITE;
+/*!40000 ALTER TABLE `files` DISABLE KEYS */;
+/*!40000 ALTER TABLE `files` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `groups`
--
+DROP TABLE IF EXISTS `groups`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `groups` (
- `HARDWARE_ID` int(11) NOT NULL DEFAULT '0',
+ `HARDWARE_ID` int NOT NULL DEFAULT '0',
`REQUEST` longtext,
- `CREATE_TIME` int(11) DEFAULT '0',
- `REVALIDATE_FROM` int(11) DEFAULT '0',
+ `CREATE_TIME` int DEFAULT '0',
+ `REVALIDATE_FROM` int DEFAULT '0',
`XMLDEF` longtext,
PRIMARY KEY (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `groups`
+--
+
+LOCK TABLES `groups` WRITE;
+/*!40000 ALTER TABLE `groups` DISABLE KEYS */;
+/*!40000 ALTER TABLE `groups` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `groups_cache`
--
+DROP TABLE IF EXISTS `groups_cache`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `groups_cache` (
- `HARDWARE_ID` int(11) NOT NULL DEFAULT '0',
- `GROUP_ID` int(11) NOT NULL DEFAULT '0',
- `STATIC` int(11) DEFAULT '0',
+ `HARDWARE_ID` int NOT NULL DEFAULT '0',
+ `GROUP_ID` int NOT NULL DEFAULT '0',
+ `STATIC` int DEFAULT '0',
PRIMARY KEY (`HARDWARE_ID`,`GROUP_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `groups_cache`
+--
+
+LOCK TABLES `groups_cache` WRITE;
+/*!40000 ALTER TABLE `groups_cache` DISABLE KEYS */;
+/*!40000 ALTER TABLE `groups_cache` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `hardware`
--
+DROP TABLE IF EXISTS `hardware`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `hardware` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`DEVICEID` varchar(255) NOT NULL,
`NAME` varchar(255) DEFAULT NULL,
`WORKGROUP` varchar(255) DEFAULT NULL,
@@ -580,10 +1145,10 @@ CREATE TABLE `hardware` (
`OSVERSION` varchar(255) DEFAULT NULL,
`OSCOMMENTS` varchar(255) DEFAULT NULL,
`PROCESSORT` varchar(255) DEFAULT NULL,
- `PROCESSORS` int(11) DEFAULT '0',
- `PROCESSORN` smallint(6) DEFAULT NULL,
- `MEMORY` int(11) DEFAULT NULL,
- `SWAP` int(11) DEFAULT NULL,
+ `PROCESSORS` int DEFAULT '0',
+ `PROCESSORN` smallint DEFAULT NULL,
+ `MEMORY` int DEFAULT NULL,
+ `SWAP` int DEFAULT NULL,
`IPADDR` varchar(255) DEFAULT NULL,
`DNS` varchar(255) DEFAULT NULL,
`DEFAULTGATEWAY` varchar(255) DEFAULT NULL,
@@ -591,21 +1156,22 @@ CREATE TABLE `hardware` (
`LASTDATE` datetime DEFAULT NULL,
`LASTCOME` datetime DEFAULT NULL,
`QUALITY` decimal(7,4) DEFAULT NULL,
- `FIDELITY` bigint(20) DEFAULT '1',
+ `FIDELITY` bigint DEFAULT '1',
`USERID` varchar(255) DEFAULT NULL,
- `TYPE` int(11) DEFAULT NULL,
+ `TYPE` int DEFAULT NULL,
`DESCRIPTION` varchar(255) DEFAULT NULL,
`WINCOMPANY` varchar(255) DEFAULT NULL,
`WINOWNER` varchar(255) DEFAULT NULL,
`WINPRODID` varchar(255) DEFAULT NULL,
`WINPRODKEY` varchar(255) DEFAULT NULL,
`USERAGENT` varchar(50) DEFAULT NULL,
- `CHECKSUM` bigint(20) unsigned DEFAULT '262143',
- `SSTATE` int(11) DEFAULT '0',
+ `CHECKSUM` bigint unsigned DEFAULT '262143',
+ `SSTATE` int DEFAULT '0',
`IPSRC` varchar(255) DEFAULT NULL,
`UUID` varchar(255) DEFAULT NULL,
`ARCH` varchar(10) DEFAULT NULL,
- `CATEGORY_ID` int(11) DEFAULT NULL,
+ `CATEGORY_ID` int DEFAULT NULL,
+ `ARCHIVE` int DEFAULT NULL,
PRIMARY KEY (`ID`),
KEY `DEVICEID` (`DEVICEID`),
KEY `NAME` (`NAME`),
@@ -615,25 +1181,51 @@ CREATE TABLE `hardware` (
KEY `OSNAME` (`OSNAME`),
KEY `MEMORY` (`MEMORY`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `hardware`
+--
+
+LOCK TABLES `hardware` WRITE;
+/*!40000 ALTER TABLE `hardware` DISABLE KEYS */;
+/*!40000 ALTER TABLE `hardware` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `hardware_osname_cache`
--
+DROP TABLE IF EXISTS `hardware_osname_cache`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `hardware_osname_cache` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`OSNAME` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`),
UNIQUE KEY `OSNAME` (`OSNAME`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `hardware_osname_cache`
+--
+
+LOCK TABLES `hardware_osname_cache` WRITE;
+/*!40000 ALTER TABLE `hardware_osname_cache` DISABLE KEYS */;
+/*!40000 ALTER TABLE `hardware_osname_cache` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `inputs`
--
+DROP TABLE IF EXISTS `inputs`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `inputs` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`TYPE` varchar(255) DEFAULT NULL,
`MANUFACTURER` varchar(255) DEFAULT NULL,
`CAPTION` varchar(255) DEFAULT NULL,
@@ -643,102 +1235,193 @@ CREATE TABLE `inputs` (
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `inputs`
+--
+
+LOCK TABLES `inputs` WRITE;
+/*!40000 ALTER TABLE `inputs` DISABLE KEYS */;
+/*!40000 ALTER TABLE `inputs` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `itmgmt_comments`
--
+DROP TABLE IF EXISTS `itmgmt_comments`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `itmgmt_comments` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`COMMENTS` longtext,
`USER_INSERT` varchar(100) DEFAULT NULL,
`DATE_INSERT` date DEFAULT NULL,
`ACTION` varchar(255) DEFAULT NULL,
- `VISIBLE` int(11) DEFAULT NULL,
+ `VISIBLE` int DEFAULT NULL,
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `itmgmt_comments`
+--
+
+LOCK TABLES `itmgmt_comments` WRITE;
+/*!40000 ALTER TABLE `itmgmt_comments` DISABLE KEYS */;
+/*!40000 ALTER TABLE `itmgmt_comments` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `javainfo`
--
+DROP TABLE IF EXISTS `javainfo`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `javainfo` (
- `HARDWARE_ID` int(11) NOT NULL,
+ `HARDWARE_ID` int NOT NULL,
`JAVANAME` varchar(255) DEFAULT 'NONAME',
- `JAVAPATHLEVEL` int(11) DEFAULT '0',
+ `JAVAPATHLEVEL` int DEFAULT '0',
`JAVACOUNTRY` varchar(255) DEFAULT NULL,
`JAVACLASSPATH` varchar(255) DEFAULT NULL,
`JAVAHOME` varchar(255) DEFAULT NULL,
PRIMARY KEY (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `javainfo`
+--
+
+LOCK TABLES `javainfo` WRITE;
+/*!40000 ALTER TABLE `javainfo` DISABLE KEYS */;
+/*!40000 ALTER TABLE `javainfo` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `journallog`
--
+DROP TABLE IF EXISTS `journallog`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `journallog` (
- `HARDWARE_ID` int(11) NOT NULL,
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
`JOURNALLOG` longtext,
`LISTENERNAME` varchar(255) DEFAULT 'NONAME',
`DATE` varchar(255) DEFAULT NULL,
- `STATUS` int(11) DEFAULT '0',
- `ERRORCODE` int(11) DEFAULT '0',
+ `STATUS` int DEFAULT '0',
+ `ERRORCODE` int DEFAULT '0',
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `journallog`
+--
+
+LOCK TABLES `journallog` WRITE;
+/*!40000 ALTER TABLE `journallog` DISABLE KEYS */;
+/*!40000 ALTER TABLE `journallog` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `languages`
--
+DROP TABLE IF EXISTS `languages`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `languages` (
`NAME` varchar(60) NOT NULL,
`IMG` blob,
`JSON_VALUE` longtext,
PRIMARY KEY (`NAME`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `languages`
+--
+
+LOCK TABLES `languages` WRITE;
+/*!40000 ALTER TABLE `languages` DISABLE KEYS */;
+/*!40000 ALTER TABLE `languages` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `locks`
--
+DROP TABLE IF EXISTS `locks`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `locks` (
- `HARDWARE_ID` int(11) NOT NULL,
- `ID` int(11) DEFAULT NULL,
+ `HARDWARE_ID` int NOT NULL,
+ `ID` int DEFAULT NULL,
`SINCE` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (`HARDWARE_ID`),
KEY `SINCE` (`SINCE`)
) ENGINE=MEMORY DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `locks`
+--
+
+LOCK TABLES `locks` WRITE;
+/*!40000 ALTER TABLE `locks` DISABLE KEYS */;
+/*!40000 ALTER TABLE `locks` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `memories`
--
+DROP TABLE IF EXISTS `memories`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `memories` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`CAPTION` varchar(255) DEFAULT NULL,
`DESCRIPTION` varchar(255) DEFAULT NULL,
`CAPACITY` varchar(255) DEFAULT NULL,
`PURPOSE` varchar(255) DEFAULT NULL,
`TYPE` varchar(255) DEFAULT NULL,
`SPEED` varchar(255) DEFAULT NULL,
- `NUMSLOTS` smallint(6) DEFAULT NULL,
+ `NUMSLOTS` smallint DEFAULT NULL,
`SERIALNUMBER` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `memories`
+--
+
+LOCK TABLES `memories` WRITE;
+/*!40000 ALTER TABLE `memories` DISABLE KEYS */;
+/*!40000 ALTER TABLE `memories` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `modems`
--
+DROP TABLE IF EXISTS `modems`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `modems` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`NAME` varchar(255) DEFAULT NULL,
`MODEL` varchar(255) DEFAULT NULL,
`DESCRIPTION` varchar(255) DEFAULT NULL,
@@ -746,14 +1429,27 @@ CREATE TABLE `modems` (
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `monitors`
+-- Dumping data for table `modems`
--
+LOCK TABLES `modems` WRITE;
+/*!40000 ALTER TABLE `modems` DISABLE KEYS */;
+/*!40000 ALTER TABLE `modems` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `monitors`
+--
+
+DROP TABLE IF EXISTS `monitors`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `monitors` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`MANUFACTURER` varchar(255) DEFAULT NULL,
`CAPTION` varchar(255) DEFAULT NULL,
`DESCRIPTION` varchar(255) DEFAULT NULL,
@@ -762,11 +1458,24 @@ CREATE TABLE `monitors` (
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `monitors`
+--
+
+LOCK TABLES `monitors` WRITE;
+/*!40000 ALTER TABLE `monitors` DISABLE KEYS */;
+/*!40000 ALTER TABLE `monitors` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `netmap`
--
+DROP TABLE IF EXISTS `netmap`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `netmap` (
`IP` varchar(15) NOT NULL,
`MAC` varchar(17) NOT NULL,
@@ -774,17 +1483,31 @@ CREATE TABLE `netmap` (
`NETID` varchar(15) NOT NULL,
`DATE` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`NAME` varchar(255) DEFAULT NULL,
+ `TAG` varchar(255) DEFAULT NULL,
PRIMARY KEY (`MAC`),
KEY `IP` (`IP`),
KEY `NETID` (`NETID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `netmap`
+--
+
+LOCK TABLES `netmap` WRITE;
+/*!40000 ALTER TABLE `netmap` DISABLE KEYS */;
+/*!40000 ALTER TABLE `netmap` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `network_devices`
--
+DROP TABLE IF EXISTS `network_devices`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `network_devices` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`DESCRIPTION` varchar(255) DEFAULT NULL,
`TYPE` varchar(255) DEFAULT NULL,
`MACADDR` varchar(255) DEFAULT NULL,
@@ -792,14 +1515,27 @@ CREATE TABLE `network_devices` (
PRIMARY KEY (`ID`),
KEY `MACADDR` (`MACADDR`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `network_devices`
+--
+
+LOCK TABLES `network_devices` WRITE;
+/*!40000 ALTER TABLE `network_devices` DISABLE KEYS */;
+/*!40000 ALTER TABLE `network_devices` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `networks`
--
+DROP TABLE IF EXISTS `networks`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `networks` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`DESCRIPTION` varchar(255) DEFAULT NULL,
`TYPE` varchar(255) DEFAULT NULL,
`TYPEMIB` varchar(255) DEFAULT NULL,
@@ -820,88 +1556,110 @@ CREATE TABLE `networks` (
KEY `IPSUBNET` (`IPSUBNET`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `networks`
+--
+
+LOCK TABLES `networks` WRITE;
+/*!40000 ALTER TABLE `networks` DISABLE KEYS */;
+/*!40000 ALTER TABLE `networks` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `notification`
--
+DROP TABLE IF EXISTS `notification`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `notification` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`TYPE` varchar(255) NOT NULL,
`FILE` varchar(255) DEFAULT NULL,
`SUBJECT` varchar(255) DEFAULT NULL,
`ALTBODY` text,
PRIMARY KEY (`ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `notification`
--
LOCK TABLES `notification` WRITE;
+/*!40000 ALTER TABLE `notification` DISABLE KEYS */;
INSERT INTO `notification` VALUES (1,'SELECTED','DEFAULT',NULL,NULL),(2,'DEFAULT','templates/OCS_template.html','Notification OCSInventory','Default report inventory'),(3,'PERSO',NULL,NULL,NULL);
+/*!40000 ALTER TABLE `notification` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `notification_config`
--
+DROP TABLE IF EXISTS `notification_config`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `notification_config` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`NAME` varchar(255) NOT NULL,
`TVALUE` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `notification_config`
+--
+
+LOCK TABLES `notification_config` WRITE;
+/*!40000 ALTER TABLE `notification_config` DISABLE KEYS */;
+/*!40000 ALTER TABLE `notification_config` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `operators`
--
+DROP TABLE IF EXISTS `operators`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `operators` (
`ID` varchar(255) NOT NULL DEFAULT '',
`FIRSTNAME` varchar(255) DEFAULT NULL,
`LASTNAME` varchar(255) DEFAULT NULL,
`PASSWD` varchar(255) DEFAULT NULL,
- `ACCESSLVL` int(11) DEFAULT NULL,
+ `ACCESSLVL` int DEFAULT NULL,
`COMMENTS` text,
`NEW_ACCESSLVL` varchar(255) DEFAULT NULL,
`EMAIL` varchar(255) DEFAULT NULL,
`USER_GROUP` varchar(255) DEFAULT NULL,
- `PASSWORD_VERSION` int(11) DEFAULT '0',
+ `PASSWORD_VERSION` int DEFAULT '0',
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `operators`
--
LOCK TABLES `operators` WRITE;
-INSERT INTO `operators` VALUES ('admin','admin','admin','21232f297a57a5a743894a0e4a801fc3',1,'Default administrator account','sadmin',NULL,NULL,0);
+/*!40000 ALTER TABLE `operators` DISABLE KEYS */;
+INSERT INTO `operators` VALUES ('admin','admin','admin','$2y$10$1HpmlSx7CW/nitCCSM5h.Od6m/C8Go2xoPzISnt0jnXKkoM3vFhLi',1,'Default administrator account','sadmin',NULL,NULL,1);
+/*!40000 ALTER TABLE `operators` ENABLE KEYS */;
UNLOCK TABLES;
---
--- Table structure for table `plugins`
---
-
-CREATE TABLE `plugins` (
- `id` int(6) unsigned NOT NULL AUTO_INCREMENT,
- `name` varchar(30) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
- `version` double NOT NULL,
- `licence` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
- `author` varchar(30) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
- `verminocs` double NOT NULL,
- `activated` tinyint(1) NOT NULL,
- `reg_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--
-- Table structure for table `ports`
--
+DROP TABLE IF EXISTS `ports`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `ports` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`TYPE` varchar(255) DEFAULT NULL,
`NAME` varchar(255) DEFAULT NULL,
`CAPTION` varchar(255) DEFAULT NULL,
@@ -909,14 +1667,27 @@ CREATE TABLE `ports` (
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `ports`
+--
+
+LOCK TABLES `ports` WRITE;
+/*!40000 ALTER TABLE `ports` DISABLE KEYS */;
+/*!40000 ALTER TABLE `ports` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `printers`
--
+DROP TABLE IF EXISTS `printers`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `printers` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`NAME` varchar(255) DEFAULT NULL,
`DRIVER` varchar(255) DEFAULT NULL,
`PORT` varchar(255) DEFAULT NULL,
@@ -925,82 +1696,160 @@ CREATE TABLE `printers` (
`SHARENAME` varchar(255) DEFAULT NULL,
`RESOLUTION` varchar(50) DEFAULT NULL,
`COMMENT` varchar(255) DEFAULT NULL,
- `SHARED` int(11) DEFAULT NULL,
- `NETWORK` int(11) DEFAULT NULL,
+ `SHARED` int DEFAULT NULL,
+ `NETWORK` int DEFAULT NULL,
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `printers`
+--
+
+LOCK TABLES `printers` WRITE;
+/*!40000 ALTER TABLE `printers` DISABLE KEYS */;
+/*!40000 ALTER TABLE `printers` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `prolog_conntrack`
--
+DROP TABLE IF EXISTS `prolog_conntrack`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `prolog_conntrack` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`DEVICEID` varchar(255) DEFAULT NULL,
- `TIMESTAMP` int(11) DEFAULT NULL,
- `PID` int(11) DEFAULT NULL,
+ `TIMESTAMP` int DEFAULT NULL,
+ `PID` int DEFAULT NULL,
PRIMARY KEY (`ID`),
KEY `DEVICEID` (`DEVICEID`)
) ENGINE=MEMORY DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `prolog_conntrack`
+--
+
+LOCK TABLES `prolog_conntrack` WRITE;
+/*!40000 ALTER TABLE `prolog_conntrack` DISABLE KEYS */;
+/*!40000 ALTER TABLE `prolog_conntrack` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `regconfig`
--
+DROP TABLE IF EXISTS `regconfig`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `regconfig` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`NAME` varchar(255) DEFAULT NULL,
- `REGTREE` int(11) DEFAULT NULL,
+ `REGTREE` int DEFAULT NULL,
`REGKEY` text,
`REGVALUE` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`),
KEY `NAME` (`NAME`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `regconfig`
+--
+
+LOCK TABLES `regconfig` WRITE;
+/*!40000 ALTER TABLE `regconfig` DISABLE KEYS */;
+/*!40000 ALTER TABLE `regconfig` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `registry`
--
+DROP TABLE IF EXISTS `registry`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `registry` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`NAME` varchar(255) DEFAULT NULL,
- `REGVALUE` varchar(255) DEFAULT NULL,
+ `REGVALUE` text CHARACTER SET utf8 COLLATE utf8_general_ci,
PRIMARY KEY (`ID`),
KEY `NAME` (`NAME`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `registry`
+--
+
+LOCK TABLES `registry` WRITE;
+/*!40000 ALTER TABLE `registry` DISABLE KEYS */;
+/*!40000 ALTER TABLE `registry` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `registry_name_cache`
--
+DROP TABLE IF EXISTS `registry_name_cache`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `registry_name_cache` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`NAME` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`),
UNIQUE KEY `NAME` (`NAME`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `registry_name_cache`
+--
+
+LOCK TABLES `registry_name_cache` WRITE;
+/*!40000 ALTER TABLE `registry_name_cache` DISABLE KEYS */;
+/*!40000 ALTER TABLE `registry_name_cache` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `registry_regvalue_cache`
--
+DROP TABLE IF EXISTS `registry_regvalue_cache`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `registry_regvalue_cache` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`REGVALUE` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`),
UNIQUE KEY `REGVALUE` (`REGVALUE`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `registry_regvalue_cache`
+--
+
+LOCK TABLES `registry_regvalue_cache` WRITE;
+/*!40000 ALTER TABLE `registry_regvalue_cache` DISABLE KEYS */;
+/*!40000 ALTER TABLE `registry_regvalue_cache` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `repository`
--
+DROP TABLE IF EXISTS `repository`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `repository` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`BASEURL` varchar(255) DEFAULT NULL,
`EXCLUDE` varchar(255) DEFAULT NULL,
`EXCLUDED` varchar(255) DEFAULT NULL,
@@ -1016,147 +1865,184 @@ CREATE TABLE `repository` (
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `repository`
+--
+
+LOCK TABLES `repository` WRITE;
+/*!40000 ALTER TABLE `repository` DISABLE KEYS */;
+/*!40000 ALTER TABLE `repository` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `saas`
--
+DROP TABLE IF EXISTS `saas`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `saas` (
- `SAAS_EXP_ID` int(6) NOT NULL,
- `HARDWARE_ID` int(11) NOT NULL,
+ `SAAS_EXP_ID` int NOT NULL,
+ `HARDWARE_ID` int NOT NULL,
`ENTRY` varchar(255) NOT NULL,
`DATA` varchar(255) NOT NULL,
- `TTL` int(64) NOT NULL
+ `TTL` int NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `saas`
+--
+
+LOCK TABLES `saas` WRITE;
+/*!40000 ALTER TABLE `saas` DISABLE KEYS */;
+/*!40000 ALTER TABLE `saas` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `saas_exp`
--
+DROP TABLE IF EXISTS `saas_exp`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `saas_exp` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`NAME` varchar(255) NOT NULL,
`DNS_EXP` varchar(255) NOT NULL,
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `sim`
+-- Dumping data for table `saas_exp`
--
-CREATE TABLE `sim` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
- `OPERATOR` varchar(255) DEFAULT NULL,
- `OPNAME` varchar(255) DEFAULT NULL,
- `COUNTRY` varchar(255) DEFAULT NULL,
- `SERIALNUMBER` varchar(255) DEFAULT NULL,
- `DEVICEID` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`ID`),
- KEY `HARDWARE_ID` (`HARDWARE_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+LOCK TABLES `saas_exp` WRITE;
+/*!40000 ALTER TABLE `saas_exp` DISABLE KEYS */;
+/*!40000 ALTER TABLE `saas_exp` ENABLE KEYS */;
+UNLOCK TABLES;
--
--- Table structure for table `slots`
+-- Table structure for table `save_query`
--
-CREATE TABLE `slots` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
- `NAME` varchar(255) DEFAULT NULL,
- `DESCRIPTION` varchar(255) DEFAULT NULL,
- `DESIGNATION` varchar(255) DEFAULT NULL,
- `PURPOSE` varchar(255) DEFAULT NULL,
- `STATUS` varchar(255) DEFAULT NULL,
- `PSHARE` tinyint(4) DEFAULT NULL,
- PRIMARY KEY (`ID`),
- KEY `HARDWARE_ID` (`HARDWARE_ID`)
+DROP TABLE IF EXISTS `save_query`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `save_query` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `QUERY_NAME` varchar(255) NOT NULL,
+ `DESCRIPTION` text,
+ `PARAMETERS` text NOT NULL,
+ PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `snmp`
+-- Dumping data for table `save_query`
--
-CREATE TABLE `snmp` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `IPADDR` varchar(255) DEFAULT NULL,
- `MACADDR` varchar(255) NOT NULL,
- `SNMPDEVICEID` varchar(255) NOT NULL,
- `NAME` varchar(255) DEFAULT NULL,
- `DESCRIPTION` varchar(255) DEFAULT NULL,
- `CONTACT` varchar(255) DEFAULT NULL,
- `LOCATION` varchar(255) DEFAULT NULL,
- `UPTIME` varchar(255) DEFAULT NULL,
- `DOMAIN` varchar(255) DEFAULT NULL,
- `TYPE` varchar(255) DEFAULT NULL,
- `LASTDATE` datetime DEFAULT NULL,
- `CHECKSUM` bigint(20) unsigned DEFAULT '0',
- PRIMARY KEY (`ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+LOCK TABLES `save_query` WRITE;
+/*!40000 ALTER TABLE `save_query` DISABLE KEYS */;
+/*!40000 ALTER TABLE `save_query` ENABLE KEYS */;
+UNLOCK TABLES;
--
--- Table structure for table `snmp_accountinfo`
+-- Table structure for table `schedule_WOL`
--
-CREATE TABLE `snmp_accountinfo` (
- `SNMP_ID` int(11) NOT NULL,
- `TAG` varchar(255) DEFAULT 'NA',
- PRIMARY KEY (`SNMP_ID`),
- KEY `TAG` (`TAG`)
+DROP TABLE IF EXISTS `schedule_WOL`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `schedule_WOL` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `MACHINE_ID` varchar(255) NOT NULL,
+ `WOL_DATE` datetime NOT NULL,
+ PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `snmp_blades`
+-- Dumping data for table `schedule_WOL`
--
-CREATE TABLE `snmp_blades` (
- `SNMP_ID` int(11) NOT NULL AUTO_INCREMENT,
- `SERIALNUMBER` varchar(255) DEFAULT NULL,
- `SYSTEM` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`SNMP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+LOCK TABLES `schedule_WOL` WRITE;
+/*!40000 ALTER TABLE `schedule_WOL` DISABLE KEYS */;
+/*!40000 ALTER TABLE `schedule_WOL` ENABLE KEYS */;
+UNLOCK TABLES;
--
--- Table structure for table `snmp_cards`
+-- Table structure for table `sim`
--
-CREATE TABLE `snmp_cards` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `DESCRIPTION` varchar(255) DEFAULT NULL,
- `REFERENCE` varchar(255) DEFAULT NULL,
- `FIRMWARE` varchar(255) DEFAULT NULL,
- `SOFTWARE` varchar(255) DEFAULT NULL,
- `REVISION` varchar(255) DEFAULT NULL,
+DROP TABLE IF EXISTS `sim`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `sim` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
+ `OPERATOR` varchar(255) DEFAULT NULL,
+ `OPNAME` varchar(255) DEFAULT NULL,
+ `COUNTRY` varchar(255) DEFAULT NULL,
`SERIALNUMBER` varchar(255) DEFAULT NULL,
- `MANUFACTURER` varchar(255) DEFAULT NULL,
- `TYPE` varchar(255) DEFAULT NULL,
+ `DEVICEID` varchar(255) DEFAULT NULL,
+ `PHONENUMBER` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
+ KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `sim`
+--
+
+LOCK TABLES `sim` WRITE;
+/*!40000 ALTER TABLE `sim` DISABLE KEYS */;
+/*!40000 ALTER TABLE `sim` ENABLE KEYS */;
+UNLOCK TABLES;
--
--- Table structure for table `snmp_cartridges`
+-- Table structure for table `slots`
--
-CREATE TABLE `snmp_cartridges` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
+DROP TABLE IF EXISTS `slots`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `slots` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
+ `NAME` varchar(255) DEFAULT NULL,
`DESCRIPTION` varchar(255) DEFAULT NULL,
- `TYPE` varchar(255) DEFAULT NULL,
- `LEVEL` int(11) DEFAULT NULL,
- `MAXCAPACITY` int(11) DEFAULT NULL,
- `COLOR` varchar(255) DEFAULT NULL,
+ `DESIGNATION` varchar(255) DEFAULT NULL,
+ `PURPOSE` varchar(255) DEFAULT NULL,
+ `STATUS` varchar(255) DEFAULT NULL,
+ `PSHARE` tinyint DEFAULT NULL,
PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
+ KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `slots`
+--
+
+LOCK TABLES `slots` WRITE;
+/*!40000 ALTER TABLE `slots` DISABLE KEYS */;
+/*!40000 ALTER TABLE `slots` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `snmp_communities`
--
+DROP TABLE IF EXISTS `snmp_communities`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `snmp_communities` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`VERSION` varchar(5) DEFAULT NULL,
`NAME` varchar(255) DEFAULT NULL,
`USERNAME` varchar(255) DEFAULT NULL,
@@ -1164,169 +2050,100 @@ CREATE TABLE `snmp_communities` (
`AUTHPASSWD` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `snmp_computers`
---
-
-CREATE TABLE `snmp_computers` (
- `SNMP_ID` int(11) NOT NULL AUTO_INCREMENT,
- `SYSTEM` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`SNMP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `snmp_cpus`
+-- Dumping data for table `snmp_communities`
--
-CREATE TABLE `snmp_cpus` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `SPEED` varchar(255) DEFAULT NULL,
- `TYPE` varchar(255) DEFAULT NULL,
- `MANUFACTURER` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `snmp_drives`
---
-
-CREATE TABLE `snmp_drives` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `LETTER` varchar(255) DEFAULT NULL,
- `TYPE` varchar(255) DEFAULT NULL,
- `FILESYSTEM` varchar(255) DEFAULT NULL,
- `TOTAL` int(11) DEFAULT NULL,
- `FREE` int(11) DEFAULT NULL,
- `NUMFILES` int(11) DEFAULT NULL,
- `VOLUMN` varchar(255) DEFAULT NULL,
- `LABEL` varchar(255) DEFAULT NULL,
- `SERIAL` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `snmp_fans`
---
-
-CREATE TABLE `snmp_fans` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `DESCRIPTION` varchar(255) DEFAULT NULL,
- `REFERENCE` varchar(255) DEFAULT NULL,
- `REVISION` varchar(255) DEFAULT NULL,
- `SERIALNUMBER` varchar(255) DEFAULT NULL,
- `MANUFACTURER` varchar(255) DEFAULT NULL,
- `TYPE` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+LOCK TABLES `snmp_communities` WRITE;
+/*!40000 ALTER TABLE `snmp_communities` DISABLE KEYS */;
+/*!40000 ALTER TABLE `snmp_communities` ENABLE KEYS */;
+UNLOCK TABLES;
--
--- Table structure for table `snmp_firewalls`
+-- Table structure for table `snmp_configs`
--
-CREATE TABLE `snmp_firewalls` (
- `SNMP_ID` int(11) NOT NULL AUTO_INCREMENT,
- `SERIALNUMBER` varchar(255) DEFAULT NULL,
- `SYSTEM` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`SNMP_ID`)
+DROP TABLE IF EXISTS `snmp_configs`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `snmp_configs` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `TYPE_ID` int NOT NULL,
+ `LABEL_ID` int NOT NULL,
+ `OID` varchar(255) NOT NULL,
+ `RECONCILIATION` varchar(255) DEFAULT NULL,
+ PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `snmp_inputs`
+-- Dumping data for table `snmp_configs`
--
-CREATE TABLE `snmp_inputs` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `DESCRIPTION` varchar(255) DEFAULT NULL,
- `TYPE` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+LOCK TABLES `snmp_configs` WRITE;
+/*!40000 ALTER TABLE `snmp_configs` DISABLE KEYS */;
+/*!40000 ALTER TABLE `snmp_configs` ENABLE KEYS */;
+UNLOCK TABLES;
--
--- Table structure for table `snmp_laststate`
+-- Table structure for table `snmp_labels`
--
-CREATE TABLE `snmp_laststate` (
- `SNMP_ID` int(11) NOT NULL,
- `COMMON` varchar(255) DEFAULT NULL,
- `PRINTERS` varchar(255) DEFAULT NULL,
- `TRAYS` varchar(255) DEFAULT NULL,
- `CARTRIDGES` varchar(255) DEFAULT NULL,
- `NETWORKS` varchar(255) DEFAULT NULL,
- `SWITCHS` varchar(255) DEFAULT NULL,
- `BLADES` varchar(255) DEFAULT NULL,
- `STORAGES` varchar(255) DEFAULT NULL,
- `DRIVES` varchar(255) DEFAULT NULL,
- `POWERSUPPLIES` varchar(255) DEFAULT NULL,
- `FANS` varchar(255) DEFAULT NULL,
- `SWITCHINFOS` varchar(255) DEFAULT NULL,
- `LOADBALANCERS` varchar(255) DEFAULT NULL,
- `CARDS` varchar(255) DEFAULT NULL,
- `COMPUTERS` varchar(255) DEFAULT NULL,
- `SOFTWARES` varchar(255) DEFAULT NULL,
- `MEMORIES` varchar(255) DEFAULT NULL,
- `CPUS` varchar(255) DEFAULT NULL,
- `INPUTS` varchar(255) DEFAULT NULL,
- `PORTS` varchar(255) DEFAULT NULL,
- `SOUNDS` varchar(255) DEFAULT NULL,
- `VIDEOS` varchar(255) DEFAULT NULL,
- `MODEMS` varchar(255) DEFAULT NULL,
- `LOCALPRINTERS` varchar(255) DEFAULT NULL,
- `VIRTUALMACHINES` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`SNMP_ID`)
+DROP TABLE IF EXISTS `snmp_labels`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `snmp_labels` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `LABEL_NAME` varchar(255) NOT NULL,
+ PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `snmp_loadbalancers`
+-- Dumping data for table `snmp_labels`
--
-CREATE TABLE `snmp_loadbalancers` (
- `SNMP_ID` int(11) NOT NULL AUTO_INCREMENT,
- `SERIALNUMBER` varchar(255) DEFAULT NULL,
- `SYSTEM` varchar(255) DEFAULT NULL,
- `MANUFACTURER` varchar(255) DEFAULT NULL,
- `TYPE` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`SNMP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+LOCK TABLES `snmp_labels` WRITE;
+/*!40000 ALTER TABLE `snmp_labels` DISABLE KEYS */;
+/*!40000 ALTER TABLE `snmp_labels` ENABLE KEYS */;
+UNLOCK TABLES;
--
--- Table structure for table `snmp_localprinters`
+-- Table structure for table `snmp_links`
--
-CREATE TABLE `snmp_localprinters` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `NAME` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
+DROP TABLE IF EXISTS `snmp_links`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `snmp_links` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `TYPE_ID` int NOT NULL,
+ `DEVICE_ID` int NOT NULL,
+ `ACCOUNT_ID` int NOT NULL,
+ PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `snmp_memories`
+-- Dumping data for table `snmp_links`
--
-CREATE TABLE `snmp_memories` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `CAPACITY` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+LOCK TABLES `snmp_links` WRITE;
+/*!40000 ALTER TABLE `snmp_links` DISABLE KEYS */;
+/*!40000 ALTER TABLE `snmp_links` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `snmp_mibs`
--
+DROP TABLE IF EXISTS `snmp_mibs`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `snmp_mibs` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`VENDOR` varchar(255) DEFAULT NULL,
`URL` varchar(255) DEFAULT NULL,
`CHECKSUM` varchar(255) DEFAULT NULL,
@@ -1334,290 +2151,269 @@ CREATE TABLE `snmp_mibs` (
`PARSER` varchar(5) DEFAULT NULL,
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `snmp_modems`
+-- Dumping data for table `snmp_mibs`
--
-CREATE TABLE `snmp_modems` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `NAME` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+LOCK TABLES `snmp_mibs` WRITE;
+/*!40000 ALTER TABLE `snmp_mibs` DISABLE KEYS */;
+/*!40000 ALTER TABLE `snmp_mibs` ENABLE KEYS */;
+UNLOCK TABLES;
--
--- Table structure for table `snmp_networks`
+-- Table structure for table `snmp_types`
--
-CREATE TABLE `snmp_networks` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `DESCRIPTION` varchar(255) DEFAULT NULL,
- `MACADDR` varchar(255) DEFAULT NULL,
- `DEVICEMACADDR` varchar(255) DEFAULT NULL,
- `SLOT` varchar(255) DEFAULT NULL,
- `STATUS` varchar(255) DEFAULT NULL,
- `SPEED` varchar(255) DEFAULT NULL,
- `TYPE` varchar(255) DEFAULT NULL,
- `DEVICEADDRESS` varchar(255) DEFAULT NULL,
- `DEVICENAME` varchar(255) DEFAULT NULL,
- `DEVICEPORT` varchar(255) DEFAULT NULL,
- `DEVICETYPE` varchar(255) DEFAULT NULL,
- `TYPEMIB` varchar(255) DEFAULT NULL,
- `IPADDR` varchar(255) DEFAULT NULL,
- `IPMASK` varchar(255) DEFAULT NULL,
- `IPGATEWAY` varchar(255) DEFAULT NULL,
- `IPSUBNET` varchar(255) DEFAULT NULL,
- `IPDHCP` varchar(255) DEFAULT NULL,
- `DRIVER` varchar(255) DEFAULT NULL,
- `VIRTUALDEV` int(11) NOT NULL DEFAULT '0',
- PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
+DROP TABLE IF EXISTS `snmp_types`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `snmp_types` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `TYPE_NAME` varchar(255) NOT NULL,
+ `CONDITION_OID` varchar(255) NOT NULL,
+ `CONDITION_VALUE` varchar(255) NOT NULL,
+ `TABLE_TYPE_NAME` varchar(255) NOT NULL,
+ PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `snmp_ports`
+-- Dumping data for table `snmp_types`
--
-CREATE TABLE `snmp_ports` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `NAME` varchar(255) DEFAULT NULL,
- `TYPE` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+LOCK TABLES `snmp_types` WRITE;
+/*!40000 ALTER TABLE `snmp_types` DISABLE KEYS */;
+/*!40000 ALTER TABLE `snmp_types` ENABLE KEYS */;
+UNLOCK TABLES;
--
--- Table structure for table `snmp_powersupplies`
+-- Table structure for table `software`
--
-CREATE TABLE `snmp_powersupplies` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `MANUFACTURER` varchar(255) DEFAULT NULL,
- `REFERENCE` varchar(255) DEFAULT NULL,
- `TYPE` varchar(255) DEFAULT NULL,
- `SERIALNUMBER` varchar(255) DEFAULT NULL,
- `DESCRIPTION` varchar(255) DEFAULT NULL,
- `REVISION` varchar(255) DEFAULT NULL,
+DROP TABLE IF EXISTS `software`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `software` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
+ `NAME_ID` int NOT NULL,
+ `PUBLISHER_ID` int NOT NULL,
+ `VERSION_ID` int NOT NULL,
+ `FOLDER` text,
+ `COMMENTS` text,
+ `FILENAME` varchar(255) DEFAULT NULL,
+ `FILESIZE` int DEFAULT '0',
+ `SOURCE` int DEFAULT NULL,
+ `GUID` varchar(255) DEFAULT NULL,
+ `LANGUAGE` varchar(255) DEFAULT NULL,
+ `INSTALLDATE` datetime DEFAULT NULL,
+ `BITSWIDTH` int DEFAULT NULL,
PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
+ KEY `HARDWARE_ID` (`HARDWARE_ID`),
+ KEY `NAME_ID` (`NAME_ID`),
+ KEY `PUBLISHER_ID` (`PUBLISHER_ID`),
+ KEY `VERSION_ID` (`VERSION_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `snmp_printers`
+-- Dumping data for table `software`
--
-CREATE TABLE `snmp_printers` (
- `SNMP_ID` int(11) NOT NULL,
- `NAME` varchar(255) DEFAULT NULL,
- `SERIALNUMBER` varchar(255) DEFAULT NULL,
- `COUNTER` varchar(255) DEFAULT NULL,
- `STATUS` varchar(255) DEFAULT NULL,
- `ERRORSTATE` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`SNMP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+LOCK TABLES `software` WRITE;
+/*!40000 ALTER TABLE `software` DISABLE KEYS */;
+/*!40000 ALTER TABLE `software` ENABLE KEYS */;
+UNLOCK TABLES;
--
--- Table structure for table `snmp_softwares`
+-- Table structure for table `software_categories`
--
-CREATE TABLE `snmp_softwares` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `NAME` varchar(255) DEFAULT NULL,
- `INSTALLDATE` varchar(255) DEFAULT NULL,
- `COMMENTS` text,
- `VERSION` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
+DROP TABLE IF EXISTS `software_categories`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `software_categories` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `CATEGORY_NAME` varchar(255) NOT NULL,
+ `OS` varchar(255) DEFAULT NULL,
+ PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `snmp_sounds`
+-- Dumping data for table `software_categories`
--
-CREATE TABLE `snmp_sounds` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `NAME` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+LOCK TABLES `software_categories` WRITE;
+/*!40000 ALTER TABLE `software_categories` DISABLE KEYS */;
+/*!40000 ALTER TABLE `software_categories` ENABLE KEYS */;
+UNLOCK TABLES;
--
--- Table structure for table `snmp_storages`
+-- Table structure for table `software_category_exp`
--
-CREATE TABLE `snmp_storages` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `DESCRIPTION` varchar(255) DEFAULT NULL,
- `MANUFACTURER` varchar(255) DEFAULT NULL,
- `NAME` varchar(255) DEFAULT NULL,
- `MODEL` varchar(255) DEFAULT NULL,
- `DISKSIZE` int(11) DEFAULT NULL,
- `TYPE` varchar(255) DEFAULT NULL,
- `SERIALNUMBER` varchar(255) DEFAULT NULL,
- `FIRMWARE` varchar(255) DEFAULT NULL,
+DROP TABLE IF EXISTS `software_category_exp`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `software_category_exp` (
+ `CATEGORY_ID` int NOT NULL,
+ `SOFTWARE_EXP` varchar(255) NOT NULL,
+ `SIGN_VERSION` varchar(255) DEFAULT NULL,
+ `VERSION` varchar(255) DEFAULT NULL,
+ `PUBLISHER` varchar(255) DEFAULT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
+ KEY `CATEGORY_ID` (`CATEGORY_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `snmp_switchinfos`
+-- Dumping data for table `software_category_exp`
--
-CREATE TABLE `snmp_switchinfos` (
- `SNMP_ID` int(11) NOT NULL,
- `TYPE` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`SNMP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+LOCK TABLES `software_category_exp` WRITE;
+/*!40000 ALTER TABLE `software_category_exp` DISABLE KEYS */;
+/*!40000 ALTER TABLE `software_category_exp` ENABLE KEYS */;
+UNLOCK TABLES;
--
--- Table structure for table `snmp_switchs`
+-- Table structure for table `software_name`
--
-CREATE TABLE `snmp_switchs` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `MANUFACTURER` varchar(255) DEFAULT NULL,
- `REFERENCE` varchar(255) DEFAULT NULL,
- `TYPE` varchar(255) DEFAULT NULL,
- `SOFTVERSION` varchar(255) DEFAULT NULL,
- `FIRMVERSION` varchar(255) DEFAULT NULL,
- `SERIALNUMBER` varchar(255) DEFAULT NULL,
- `REVISION` varchar(255) DEFAULT NULL,
- `DESCRIPTION` varchar(255) DEFAULT NULL,
+DROP TABLE IF EXISTS `software_name`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `software_name` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `NAME` varchar(255) NOT NULL,
+ `CATEGORY` int DEFAULT NULL,
PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
+ UNIQUE KEY `NAME` (`NAME`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `snmp_trays`
+-- Dumping data for table `software_name`
--
-CREATE TABLE `snmp_trays` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `NAME` varchar(255) DEFAULT NULL,
- `DESCRIPTION` varchar(255) DEFAULT NULL,
- `LEVEL` varchar(255) DEFAULT NULL,
- `MAXCAPACITY` int(11) DEFAULT NULL,
- PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+LOCK TABLES `software_name` WRITE;
+/*!40000 ALTER TABLE `software_name` DISABLE KEYS */;
+/*!40000 ALTER TABLE `software_name` ENABLE KEYS */;
+UNLOCK TABLES;
--
--- Table structure for table `snmp_videos`
+-- Table structure for table `software_publisher`
--
-CREATE TABLE `snmp_videos` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `NAME` varchar(255) DEFAULT NULL,
+DROP TABLE IF EXISTS `software_publisher`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `software_publisher` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `PUBLISHER` varchar(255) NOT NULL,
PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+ UNIQUE KEY `PUBLISHER` (`PUBLISHER`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `snmp_virtualmachines`
+-- Dumping data for table `software_publisher`
--
-CREATE TABLE `snmp_virtualmachines` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `SNMP_ID` int(11) NOT NULL,
- `CONFIG_FILE` varchar(255) DEFAULT NULL,
- `CPU` int(11) DEFAULT NULL,
- `MEMORY` int(11) DEFAULT NULL,
- `NAME` varchar(255) DEFAULT NULL,
- `OS` varchar(255) DEFAULT NULL,
- `POWER` varchar(255) DEFAULT NULL,
- `UUID` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`ID`),
- KEY `SNMP_ID` (`SNMP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+LOCK TABLES `software_publisher` WRITE;
+/*!40000 ALTER TABLE `software_publisher` DISABLE KEYS */;
+INSERT INTO `software_publisher` VALUES (1,'Unavailable');
+/*!40000 ALTER TABLE `software_publisher` ENABLE KEYS */;
+UNLOCK TABLES;
--
--- Table structure for table `software_categories`
+-- Table structure for table `software_version`
--
-CREATE TABLE `software_categories` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `CATEGORY_NAME` varchar(255) NOT NULL,
- PRIMARY KEY (`ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+DROP TABLE IF EXISTS `software_version`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `software_version` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `VERSION` varchar(255) NOT NULL,
+ PRIMARY KEY (`ID`),
+ UNIQUE KEY `VERSION` (`VERSION`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `software_category_exp`
+-- Dumping data for table `software_version`
--
-CREATE TABLE `software_category_exp` (
- `CATEGORY_ID` int(6) NOT NULL,
- `SOFTWARE_EXP` varchar(255) NOT NULL,
- KEY `CATEGORY_ID` (`CATEGORY_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+LOCK TABLES `software_version` WRITE;
+/*!40000 ALTER TABLE `software_version` DISABLE KEYS */;
+INSERT INTO `software_version` VALUES (1,'Unavailable');
+/*!40000 ALTER TABLE `software_version` ENABLE KEYS */;
+UNLOCK TABLES;
--
--- Table structure for table `softwares`
+-- Table structure for table `softwares_name_cache`
--
-CREATE TABLE `softwares` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
- `PUBLISHER` varchar(255) DEFAULT NULL,
+DROP TABLE IF EXISTS `softwares_name_cache`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `softwares_name_cache` (
+ `ID` int NOT NULL AUTO_INCREMENT,
`NAME` varchar(255) DEFAULT NULL,
- `VERSION` varchar(255) DEFAULT NULL,
- `FOLDER` text,
- `COMMENTS` text,
- `FILENAME` varchar(255) DEFAULT NULL,
- `FILESIZE` int(11) DEFAULT '0',
- `SOURCE` int(11) DEFAULT NULL,
- `GUID` varchar(255) DEFAULT NULL,
- `LANGUAGE` varchar(255) DEFAULT NULL,
- `INSTALLDATE` datetime DEFAULT NULL,
- `BITSWIDTH` int(11) DEFAULT NULL,
- `CATEGORY` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`),
- KEY `NAME` (`NAME`),
- KEY `VERSION` (`VERSION`),
- KEY `HARDWARE_ID` (`HARDWARE_ID`)
+ UNIQUE KEY `NAME` (`NAME`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `softwares_name_cache`
+-- Dumping data for table `softwares_name_cache`
--
-CREATE TABLE `softwares_name_cache` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `NAME` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`ID`),
- UNIQUE KEY `NAME` (`NAME`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+LOCK TABLES `softwares_name_cache` WRITE;
+/*!40000 ALTER TABLE `softwares_name_cache` DISABLE KEYS */;
+/*!40000 ALTER TABLE `softwares_name_cache` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `sounds`
--
+DROP TABLE IF EXISTS `sounds`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `sounds` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`MANUFACTURER` varchar(255) DEFAULT NULL,
`NAME` varchar(255) DEFAULT NULL,
`DESCRIPTION` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `sounds`
+--
+
+LOCK TABLES `sounds` WRITE;
+/*!40000 ALTER TABLE `sounds` DISABLE KEYS */;
+/*!40000 ALTER TABLE `sounds` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `ssl_store`
--
+DROP TABLE IF EXISTS `ssl_store`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `ssl_store` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`FILE` longblob,
`AUTHOR` varchar(255) DEFAULT NULL,
`FILE_NAME` varchar(255) DEFAULT NULL,
@@ -1625,43 +2421,82 @@ CREATE TABLE `ssl_store` (
`DESCRIPTION` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `ssl_store`
+--
+
+LOCK TABLES `ssl_store` WRITE;
+/*!40000 ALTER TABLE `ssl_store` DISABLE KEYS */;
+/*!40000 ALTER TABLE `ssl_store` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `storages`
--
+DROP TABLE IF EXISTS `storages`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `storages` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`MANUFACTURER` varchar(255) DEFAULT NULL,
`NAME` varchar(255) DEFAULT NULL,
`MODEL` varchar(255) DEFAULT NULL,
`DESCRIPTION` varchar(255) DEFAULT NULL,
`TYPE` varchar(255) DEFAULT NULL,
- `DISKSIZE` int(11) DEFAULT NULL,
+ `DISKSIZE` int DEFAULT NULL,
`SERIALNUMBER` varchar(255) DEFAULT NULL,
`FIRMWARE` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `storages`
+--
+
+LOCK TABLES `storages` WRITE;
+/*!40000 ALTER TABLE `storages` DISABLE KEYS */;
+/*!40000 ALTER TABLE `storages` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `subnet`
--
+DROP TABLE IF EXISTS `subnet`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `subnet` (
`NETID` varchar(15) NOT NULL,
`NAME` varchar(255) DEFAULT NULL,
`ID` varchar(255) DEFAULT NULL,
`MASK` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`NETID`),
+ `TAG` varchar(255) DEFAULT NULL,
KEY `ID` (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `subnet`
+--
+
+LOCK TABLES `subnet` WRITE;
+/*!40000 ALTER TABLE `subnet` DISABLE KEYS */;
+/*!40000 ALTER TABLE `subnet` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `tags`
--
+DROP TABLE IF EXISTS `tags`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `tags` (
`Tag` varchar(100) NOT NULL DEFAULT '',
`Login` varchar(100) NOT NULL DEFAULT '',
@@ -1669,13 +2504,26 @@ CREATE TABLE `tags` (
KEY `Tag` (`Tag`),
KEY `Login` (`Login`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `tags`
+--
+
+LOCK TABLES `tags` WRITE;
+/*!40000 ALTER TABLE `tags` DISABLE KEYS */;
+/*!40000 ALTER TABLE `tags` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `temp_files`
--
+DROP TABLE IF EXISTS `temp_files`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `temp_files` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
+ `ID` int NOT NULL AUTO_INCREMENT,
`TABLE_NAME` varchar(255) DEFAULT NULL,
`FIELDS_NAME` varchar(255) DEFAULT NULL,
`file` longblob,
@@ -1683,18 +2531,63 @@ CREATE TABLE `temp_files` (
`AUTHOR` varchar(255) DEFAULT NULL,
`FILE_NAME` varchar(255) DEFAULT NULL,
`FILE_TYPE` varchar(255) DEFAULT NULL,
- `FILE_SIZE` int(11) DEFAULT NULL,
- `ID_DDE` int(11) DEFAULT NULL,
+ `FILE_SIZE` int DEFAULT NULL,
+ `ID_DDE` int DEFAULT NULL,
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `temp_files`
+--
+
+LOCK TABLES `temp_files` WRITE;
+/*!40000 ALTER TABLE `temp_files` DISABLE KEYS */;
+/*!40000 ALTER TABLE `temp_files` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `unixusers`
+--
+
+DROP TABLE IF EXISTS `unixusers`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `unixusers` (
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
+ `ID_USERS` varchar(255) COLLATE utf8_bin DEFAULT NULL,
+ `GID_USERS` varchar(255) COLLATE utf8_bin DEFAULT NULL,
+ `NAME_USERS` varchar(255) COLLATE utf8_bin DEFAULT NULL,
+ `HOME_USERS` varchar(255) COLLATE utf8_bin DEFAULT NULL,
+ `SHELL_USERS` varchar(255) COLLATE utf8_bin DEFAULT NULL,
+ `LOGIN_USERS` varchar(255) COLLATE utf8_bin DEFAULT NULL,
+ `ID_GROUP` varchar(255) COLLATE utf8_bin DEFAULT NULL,
+ `NAME_GROUP` varchar(255) COLLATE utf8_bin DEFAULT NULL,
+ `MEMBER_GROUP` varchar(255) COLLATE utf8_bin DEFAULT NULL,
+ PRIMARY KEY (`ID`,`HARDWARE_ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `unixusers`
+--
+
+LOCK TABLES `unixusers` WRITE;
+/*!40000 ALTER TABLE `unixusers` DISABLE KEYS */;
+/*!40000 ALTER TABLE `unixusers` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `usbdevices`
--
+DROP TABLE IF EXISTS `usbdevices`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `usbdevices` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`DESCRIPTION` varchar(255) DEFAULT NULL,
`INTERFACE` varchar(255) DEFAULT NULL,
`MANUFACTURER` varchar(255) DEFAULT NULL,
@@ -1703,14 +2596,27 @@ CREATE TABLE `usbdevices` (
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `usbdevices`
+--
+
+LOCK TABLES `usbdevices` WRITE;
+/*!40000 ALTER TABLE `usbdevices` DISABLE KEYS */;
+/*!40000 ALTER TABLE `usbdevices` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `videos`
--
+DROP TABLE IF EXISTS `videos`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `videos` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`NAME` varchar(255) DEFAULT NULL,
`CHIPSET` varchar(255) DEFAULT NULL,
`MEMORY` varchar(255) DEFAULT NULL,
@@ -1718,22 +2624,55 @@ CREATE TABLE `videos` (
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `videos`
+--
+
+LOCK TABLES `videos` WRITE;
+/*!40000 ALTER TABLE `videos` DISABLE KEYS */;
+/*!40000 ALTER TABLE `videos` ENABLE KEYS */;
+UNLOCK TABLES;
--
-- Table structure for table `virtualmachines`
--
+DROP TABLE IF EXISTS `virtualmachines`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `virtualmachines` (
- `ID` int(11) NOT NULL AUTO_INCREMENT,
- `HARDWARE_ID` int(11) NOT NULL,
+ `ID` int NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` int NOT NULL,
`NAME` varchar(255) DEFAULT NULL,
`STATUS` varchar(255) DEFAULT NULL,
`SUBSYSTEM` varchar(255) DEFAULT NULL,
`VMTYPE` varchar(255) DEFAULT NULL,
`UUID` varchar(255) DEFAULT NULL,
- `VCPU` int(11) DEFAULT NULL,
- `MEMORY` int(11) DEFAULT NULL,
+ `VCPU` int DEFAULT NULL,
+ `MEMORY` int DEFAULT NULL,
PRIMARY KEY (`ID`),
KEY `HARDWARE_ID` (`HARDWARE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `virtualmachines`
+--
+
+LOCK TABLES `virtualmachines` WRITE;
+/*!40000 ALTER TABLE `virtualmachines` DISABLE KEYS */;
+/*!40000 ALTER TABLE `virtualmachines` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+-- Dump completed on 2020-12-01 10:13:28
--- /dev/null
+++ b/ocsreports/files/update/7038.sql
@@ -0,0 +1,2 @@
+INSERT INTO `config` VALUES('IPDISCOVER_PURGE_OLD',0,'','Purge of the old IPDiscover data');
+INSERT INTO `config` VALUES('IPDISCOVER_PURGE_VALIDITY_TIME',30,'','IPDiscover data validity time');
\ No newline at end of file
--- /dev/null
+++ b/ocsreports/files/update/7039.sql
@@ -0,0 +1,16 @@
+DROP TABLE IF EXISTS `unixusers`;
+
+CREATE TABLE IF NOT EXISTS `unixusers` (
+ `ID` INT(11) NOT NULL AUTO_INCREMENT,
+ `HARDWARE_ID` INT(11) NOT NULL,
+ `ID_USERS` VARCHAR(255) DEFAULT NULL,
+ `GID_USERS` VARCHAR(255) DEFAULT NULL,
+ `NAME_USERS` VARCHAR(255) DEFAULT NULL,
+ `HOME_USERS` VARCHAR(255) DEFAULT NULL,
+ `SHELL_USERS` VARCHAR(255) DEFAULT NULL,
+ `LOGIN_USERS` VARCHAR(255) DEFAULT NULL,
+ `ID_GROUP` VARCHAR(255) DEFAULT NULL,
+ `NAME_GROUP` VARCHAR(255) DEFAULT NULL,
+ `MEMBER_GROUP` VARCHAR(255) DEFAULT NULL,
+ PRIMARY KEY (`ID`,`HARDWARE_ID`)
+) ENGINE=InnoDB ;
\ No newline at end of file
--- /dev/null
+++ b/ocsreports/plugins/computer_detail/cd_unixusers/cd_unixusers.php
@@ -0,0 +1,75 @@
+<?php
+/*
+ * Copyright 2005-2016 OCSInventory-NG/OCSInventory-ocsreports contributors.
+ * See the Contributors file for more details about them.
+ *
+ * This file is part of OCSInventory-NG/OCSInventory-ocsreports.
+ *
+ * OCSInventory-NG/OCSInventory-ocsreports is free software: you can redistribute
+ * it and/or modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * OCSInventory-NG/OCSInventory-ocsreports is distributed in the hope that it
+ * will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with OCSInventory-NG/OCSInventory-ocsreports. if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+if (AJAX){
+ parse_str($protectedPost['ocs']['0'], $params);
+ $protectedPost+=$params;
+ ob_start();
+ $ajax = true;
+}
+else{
+ $ajax=false;
+}
+
+print_item_header("Unix users");
+
+if (!isset($protectedPost['SHOW']))
+ $protectedPost['SHOW'] = 'NOSHOW';
+
+$form_name="unixusers";
+$table_name=$form_name;
+$tab_options=$protectedPost;
+$tab_options['form_name']=$form_name;
+$tab_options['table_name']=$table_name;
+
+echo open_form($form_name);
+
+$list_fields=array( 'Name_Users' => 'NAME_USERS',
+ 'Id_Users' => 'ID_USERS',
+ 'Login_Users' => 'LOGIN_USERS',
+ 'Shell_Users' => 'SHELL_USERS',
+ 'Gid_Users' => 'GID_USERS',
+ 'Home_Users' => 'HOME_USERS',
+ 'Id_Group' => 'ID_GROUP',
+ 'Name_Group' => 'NAME_GROUP',
+ 'Member_Group' => 'MEMBER_GROUP',
+);
+
+$list_col_cant_del=$list_fields;
+$default_fields= $list_fields;
+$sql=prepare_sql_tab($list_fields);
+$sql['SQL'] .= "FROM $table_name WHERE (hardware_id=$systemid)";
+
+$tab_options['ARG_SQL']=$sql['ARG'];
+$tab_options['ARG_SQL_COUNT']=$systemid;
+
+ajaxtab_entete_fixe($list_fields,$default_fields,$tab_options,$list_col_cant_del);
+echo close_form();
+
+if ($ajax){
+ ob_end_clean();
+ tab_req($list_fields,$default_fields,$list_col_cant_del,$sql['SQL'],$tab_options);
+ ob_start();
+}
+
+?>
\ No newline at end of file
--- a/ocsreports/plugins/language/br_BR/br_BR.txt
+++ b/ocsreports/plugins/language/br_BR/br_BR.txt
@@ -10,7 +10,7 @@
25 Sistema Operacional
26 Memória
27 Velocidade da Memória (MHz)
-28 Número da Máquina
+28 Número de Máquinas
30 Pesquisar
31 Escolha um parâmetro
32 Escolha
@@ -79,8 +79,8 @@
142 Administradores locais
143 solicitantes de implantação
162 Apagar seleção
-168 Este formato de arquivo é inválido (deve ser um .exe)
-170 O mesmo arquivo já existe !
+168 Este formato de arquivo é inválido (deve ser um exe)
+170 Esse arquivo já existe !
171 Arquivo apagado
172 Um erro aconteceu, o arquivo
173 não foi adicionado à base
@@ -130,7 +130,7 @@
219 IPs desconhecidos
220 apagado
221 Computadores coletores de IP
-222 Aviso ! Todos os computadores selecionados serão reunidos num único computador! Tem certeza?
+222 Aviso ! Todos os computadores selecionados serão agrupados num único computador! Tem certeza?
223 Informação
224 Valor
225 Informação administrativa
@@ -218,7 +218,7 @@
307 Adicionar um tipo
308 Nome do tipo
309 Tipos de equipamentos de rede
-310 Descobrir IPs menor que
+310 Descoberta de IPs menor que
311 Hosts
312 Descoberta de IPs
313 Computadores gateway
@@ -277,12 +277,12 @@
368 da rede
369 Enviado por
370 Implantação
-371 Todos os componentes
+371 Todos componentes
372 Escolha os componentes
373 Usuário registrado
374 Usuário atualizado
375 Versão do Agente OCS-NG
-376 Computador indisponível. Por favor tente novamente em alguns instantes
+376 Computador bloqueado. Por favor tente novamente em alguns instantes
377 Velocidade do processador (MHz)
380 Dicionário
381 Número de instalações
@@ -307,11 +307,11 @@
412 Coletar de chaves do registro
413 Atualização automática
414 Habilitar Implantação
-415 Registrar computadores deletados (utilizado pela GLPI)
+415 Registrar computadores apagados (requerido pelo GLPI)
416 Registrar atividades (log)
417 Implantação automática de software
418 Diferenciação de inventário
-419 Número máximo de dias para um computador de descoberta de IPs ser substituído
+419 Máximo de dias para um computador de descoberta de IPs ser substituído
420 Implantação automática de software: consulte a documentação.
421 Implantação automática de software: consulte a documentação.
422 Implantação automática de software: consulte a documentação.
@@ -329,7 +329,7 @@
434 Construtor de pacotes
435 Construir novo pacote
436 Não foi possível abrir o arquivo
-437 O pacote foi criado com êxito no diretório
+437 O pacote foi criado com sucesso no diretório
438 Criação de novo pacote
439 Protocolo
440 Prioridade
@@ -348,14 +348,14 @@
453 Necessário ação do usuário para concluir instalação
454 NÃO
455 SIM
-456 Executar
+456 Executar comando
457 Armazenar
-458 Lançar
+458 Executar arquivo
459 Contador deve ser um número
460 Identificador único
461 Digest
462 Tamanho total
-463 Tamanho das fragmentos
+463 Tamanho dos fragmentos
464 Número de fragmentos
465 Ativação de pacote
466 AVISO: Não foi possível encontrar o arquivo de informações em
@@ -451,7 +451,7 @@
556 Monitor: descrição
557 Usuário de Domínio
558 Pacotes atribuídos
-559 Este arquivo não é um .ocs
+559 Este arquivo não é .ocs
560 Ao servidor
561 Desconhecido (pacote deletado)
562 Redes com uid:
@@ -501,7 +501,7 @@
610 ESTATICAMENTE INCLUÍDO
611 SEM CACHE
612 ESTÁTICO
-613 DIN MICO
+613 DINÂMICO
614 EXCLUÍDO
615 Pesquisa
616 Perímetro do Usuário
@@ -530,7 +530,7 @@
640 Deseja realmente apagar
641 Gestão de servidores de redistribuição
642 o grupo
-643 Todas máquinas
+643 Todas as máquinas
644 esta máquina
645 DETALHE DO GRUPO
646 URL
@@ -540,9 +540,9 @@
650 MANUAL
651 Grupo de redistribuição
652 Máquinas
-653 Lista negra de endereços MAC
-654 Entre com o novo endereço MAC para a lista negra
-655 Inserção feita
+653 Endereços MAC ignorados
+654 Entre com o novo endereço MAC para ignorar
+655 Inserção efetuada
656 Este dado já existe na lista
657 Campos em vermelho com ERRO!!! (Campos vazios ou tamanho < 2)
658 máquina não tem um servidor de redistribuição. <br>É necessário atribuir este pacote manualmente.
@@ -550,8 +550,8 @@
660 GRUPO DE REDISTRIBUIÇÃO NÃO EXISTE
661 PACOTES PARA SERVIDORES DE REDISTRIBUIÇÃO
662 Regras de atribuição
-663 PROBLEMAS INTERNOS
-664 Ação realizada
+663 PROBLEMA INTERNO
+664 Ação efetuada
665 NENHUMA MÁQUINA FOI SELECIONADA. GRUPO DE REDISTRIBUIÇÃO NÃO CRIADO
666 Grupo de redistribuição criado
667 PARA O PACOTE
@@ -573,10 +573,10 @@
684 Os campos a seguir devem ser apreendidos
685 Adicionar a regra
686 A condição
-687 Você não pode apagar isto.
+687 Você não pode apagar isso.
688 Pacotes estão associados neste grupo!
689 Pacotes estão atribuídos neste servidor!
-690 Você não pode apagar todas máquinas
+690 Você não pode apagar todas as máquinas
691 Valores Genéricos: $IP$ e $NAME$
692 Você irá modificar TODOS os valores dos servidores
693 Você irá modificar os valores do servidor:
@@ -586,13 +586,13 @@
697 a máquina
698 grupo de redistribuição
699 Tem certeza que quer atribuir esse pacotes nessas máquinas?
-700 Escolha a Lista Negra
-701 Lista Negra de número de série
-702 Entre com o novo número de série para lista negra
-703 Lista Negra
-704 Tem certeza que deseja adicionar a lista negra
-705 Tem certeza que deseja remover da lista negra
-706 Remover da lista negra
+700 Lista de ignorados
+701 Números de série ignorados
+702 Entre com o novo número de série para ignorar
+703 Lista de ignorados
+704 Tem certeza que deseja adicionar a lista de ignorados
+705 Tem certeza que deseja remover da lista de ignorados
+706 Des-ignorar
707 este número de série
708 este endereço MAC
709 PROLOG_FREQ personalizado
@@ -620,7 +620,7 @@
731 Recurso nomeados na base de cada seção de inventário.
732 milissegundo(s)
733 Inativo
-734 Arquivo de Inventário
+734 Arquivos de Inventário
735 Filtros
736 Ativar o recurso de grupos de computadores
737 Número aleatório calculado no intervalo definido. Projetado para evitar calcular muitos grupos no mesmo processo
@@ -648,14 +648,14 @@
759 É necessário ser igual ou superior
760 Webservice
761 Habilita/Desabilita o serviço SOAP
-762 Resultado por tamanho (esteja ciente dos problemas de desempenho)
+762 Tamanho da página de resultados (esteja ciente dos problemas de desempenho)
763 Incluir arquivos de seus próprios módulos
764 Opções a seguir não são configuráveis pela interface do usuário. <br> (edite manualmente ocsinventory-server.conf)
765 Todos softwares
766 SEM RESULTADO
767 AVISO: RESULTADO FILTRADO
768 Número de gravações
-769 Transferência feita
+769 Transferência efetuada
770 ATUALIZADO DE
771 Esta categoria já existe
772 O nome da categoria não pode ser nulo
@@ -663,7 +663,7 @@
774 Você está tentando transferir para mesma categoria
775 Diretório de criação de pacotes
776 Diretório de cache das análises de descoberta de IPs
-777 Validade da seção
+777 Validade da sessão
778 Grupos de trabalho distintos
779 TAGs distintas
780 Subredes distintas
@@ -689,7 +689,7 @@
800 Outro
801 Não mostre esse campo
802 Mostre esse campo
-803 Total de dias que a máquina não se reporta
+803 Total de dias que a máquina não faz contato
804 Velocidade mínima de processador
805 Velocidade máxima de processador
806 Tamanho mínimo de RAM
@@ -732,7 +732,7 @@
843 Disco: Nome do volume
844 Grupo: Id
845 Grupo: Estático?
-846 Software: Companhia
+846 Software: Empresa
847 Software: Nome
848 Software: Versão
849 Software: Diretório de instalação
@@ -773,11 +773,11 @@
884 AVISO: Resultados Filtrados
885 desconhecido
886 Desatribuição
-887 É possível que este pacote não está atribuído a grupos de redistribuição
+887 É possível que este pacote não esteja atribuído a grupos de redistribuição
888 Remoção
889 Conectado a
890 Interface está atualmente travada na pesquisa com vários critérios
-891 Remover trava da interface
+891 Remover trava
892 conectar com outra conta
893 NENHUMA TAG DEFINIDA AO SEU PERFIL
894 NENHUM DIREITO DEFINIDO AO SEU PERFIL
@@ -794,7 +794,7 @@
907 Explicação sobre a remoção do pacote<br>neste computador
908 Informações de terminal móvel
909 MODIFICAÇÃO NÃO REALIZADA: NOVO PERFIL ERRADO
-910 Validar
+910 Aplicar
911 Trocar perfil de
912 Exportar lista de computadores que possuem esse software
913 Interfaces de rede não inventariadas
@@ -844,7 +844,7 @@
957 Todos os SUCESSOS
958 PROBLEMA DE VALOR DE IMPLANTAÇÃO
959 MUITOS SOFTWARES ENCONTRADOS. SEJA MAIS ESPECÍFICO NA PESQUISA
-960 NENHUM SOFTWARE CORRESPONDENTE COM A PESQUISA
+960 NENHUM SOFTWARE CORRESPONDE COM A PESQUISA
961 LISTA DE
962 (separado por vírgula ',')
963 LISTA DIFERENTE DE
@@ -861,15 +861,15 @@
974 computadores inseridos no cache
975 Adicionar ao grupo
976 TRAVAR INTERFACE NO RESULTADO
-977 Trava
+977 Travar
978 Você irá travar toda a interface no resultado da pesquisa
979 Para voltar ao estado padrão, você deve clicar no ícone <span class='glyphicon glyphicon-lock'></span> que está no canto superior direito da interface
980 Pacotes nos computadores
981 Pacotes nos grupos de redistribuição
-982 NENHUMA REGRA DE ATRIBUIÇÃO ESTÁ DISPONÍVEL. NENHUMA REDISTRIBUIÇÃO POSSÍVEL.
+982 NENHUMA REGRA DE ATRIBUIÇÃO DISPONÍVEL. NENHUMA REDISTRIBUIÇÃO POSSÍVEL.
983 Você deve escolher o tipo para fazer alterações
984 Modificações
-985 DELEÇÃO DE COMPUTADORES
+985 REMOÇÃO DE COMPUTADORES
986 REMOVER COMPUTADORES PARA
987 Esta chave de registro já existe
988 VOCÊ DEVE PREENCHER TODOS OS CAMPOS
@@ -877,7 +877,7 @@
990 Pacotes criados manualmente
991 Pacotes criados automaticamente
992 Tempo estimado para implantação
-993 Campos vermelhos estão com erro
+993 Campos em vermelho estão com erro
994 PDA/SMARTPHONE
995 Login
996 Último nome
@@ -889,7 +889,7 @@
1002 Tempo estimado para implantação
1003 Parâmetro do pacote do servidor de redistribuição
1004 Não foi possível criar o diretório de pacotes (/var/lib/ocsinventory-reports/download/).
-1005 Não foi possível criar o pacote.
+1005 Não é possível criar pacote.
1006 não há direitos de escrita
1007 O diretório
1008 Usar redistribuição
@@ -903,11 +903,11 @@
1016 Login ROOT
1017 Password ROOT
1018 (Não escreva nada se deseja usar conexão anônima)
-1019 Travar resultado
+1019 Travar
1020 Nome da tag
1021 Administrador de implantação
1022 Administrador de TAG
-1023 pacotes atribuídos no estado
+1023 pacotes atribuídos com estado
1024 será removido
1025 Desatribuir
1026 Pacotes removidos nos computadores
@@ -915,7 +915,7 @@
1028 Novo
1029 Ignorado
1030 Não modificado
-1031 workflow for Teledeploy
+1031 fluxo de trabalho para implantação
1032 Ativar fluxo de trabalho para implantação
1033 Informação do Solicitante
1034 Pacote Informação geral
@@ -940,7 +940,7 @@
1053 Pedido alterado
1054 Pedido efetuado
1055 Seu email não é válido
-1056 Contate o administrador do OCS
+1056 Contate o administrador do OCS-NG
1057 Não foi possível conectar-se ao servidor de email
1058 Nenhum email válido
1059 Dados existentes
@@ -964,7 +964,7 @@
1077 Estado para criação de pacote
1078 Estado de teste
1079 Nível de perímetro restrito
-1080 Nível de perímetro total
+1080 Nível de perímetro global
1081 Informações por email
1082 Administradores de fluxo de trabalho
1083 Identificação do perímetro
@@ -979,7 +979,7 @@
1092 publicar novo pedido
1093 Banco de dados está incompleto
1094 Por favor, repita a instalação completa da base
-1095 Status Admin
+1095 Admin de estado
1096 Lista de campos
1097 Lista de abas
1098 Nome do campo
@@ -991,7 +991,7 @@
1104 Nível
1105 Fluxo de trabalho está habilitado
1106 Só é possível criar um pacote se existir um pedido
-1107 Está no estado de criação de pacotes
+1107 E o estado está correto
1108 Configuração LDAP
1109 Filtro
1110 A atribuição de um pacote depende do estado do pedido
@@ -1005,14 +1005,14 @@
1118 Editar
1119 Selecionar
1120 Quantidade
-1121 Atualização pronta
+1121 Atualização efetuada
1122 Wiki
1123 IRC
1124 Fóruns
1125 Porcentagem
1126 Data da nota
1127 Autor da nota
-1128 Nota
+1128 Notas
1129 PACOTE REMOVIDO
1130 Editor de linguagem
1131 Palavra
@@ -1026,12 +1026,12 @@
1139 Administrar
1140 Administrar subrede
1141 Subrede adicionada
-1142 Informe a nova subrede para a lista negra
+1142 Informe a nova subrede para a ignorar
1143 Máscara
1144 Endereço MAC Inválido. (deve ser: XX.XX.XX.XX.XX.XX)
1145 o valor deve ser entre
1146 Administrar perfis
-1147 Você não pode atualizá-lo.
+1147 Você não pode alterar.
1148 <b>AVISO:</b> Nenhum backup automático de arquivos de configuração será possível
1149 Nome do novo perfil
1150 Perfil de referência
@@ -1060,7 +1060,7 @@
1173 Informações de perfil
1174 Páginas de Usuário
1175 Restrições
-1176 Direitos para lista negra
+1176 Direitos para lista de ignorados
1177 Direitos para Gerenciar
1178 Esse campo
1179 é uma variável. Não pode conter caracteres especiais
@@ -1074,11 +1074,11 @@
1187 Configuração está pendente
1188 Este grupo está declarado como perímetro de TESTE
1189 Este grupo está declarado como perímetro RESTRITO
-1190 Você só pode atribuir pacotes de nível maior que
+1190 Você não pode atribuir pacotes de nível superior
1191 Informação: o fluxo de trabalho está habilitado
1192 Grupo que pode receber pacotes de TESTE
1193 Grupo que pode receber pacotes RESTRITOS
-1194 Apenas pacotes de nível maior que
+1194 Apenas pacotes de nível superior
1195 pode ser atribuído
1196 Perfil
1197 Funcionalidade SNMP
@@ -1098,7 +1098,7 @@
1211 URL do arquivo da comunidade SNMP
1212 Comunidade removida
1213 Separador de arquivo exportado
-1214 Configurar motor para atualizar inventário snmp na tabela snmp_laststate (menor carga no banco de dados)
+1214 Configurar motor para atualizar inventário snmp conforme tabela snmp_laststate (menor carga no banco de dados)
1215 Servidor Blade
1216 Firewall
1217 Balanceamento de Carga
@@ -1174,7 +1174,7 @@
1294 Hora de instalação
1295 Data de instalação
1296 OCS Profissional
-1297 Número de identificação
+1297 Identificação do dispositivo SNMP
1298 Administração de QRCode
1299 QRCode
1300 Verificar QRCode
@@ -1231,9 +1231,9 @@
1351 ,
1352 Conteúdo do pedido inválido
1353 Acesso não autorizado
-1354 Direitos insuficientes para acessar o recurso solicitado
+1354 Proibido acesso ao recurso
1355 Página não encontrada
-1356 A URL solicitado é muito longa, tente excluir os cookies do OCS (você será desconectado)
+1356 A URL solicitado é muito longa, tente excluir os cookies
1357 Erro interno do servidor
1358 Serviço indisponível
1359 Usuário desconectado
@@ -1247,7 +1247,7 @@
1367 Rede
1368 CPU
1369 Versão do PHP
-1370 Servidor WEB
+1370 Servidor Web
1371 Servidor SQL
1372 Kernel
1373 Distribuição
@@ -1327,14 +1327,82 @@
1447 Dados administrativos
1448 é nulo
1449 Configurações Gerais
+1450 ID
+1451 Estático ?
+1452 Início da garantia
+1453 GUID
+1454 Origem
+1455 Interface virtual
+1456 Número do telefone
+1457 Associar descoberta de rede a tag do computador</br><b style="color:#d9534f;">Saia e logue novamente depois de atualizar essa configuração</b>
+
+1460 Gerenciamento de pesquisa-CVE
+1461 Ativar Relatórios CVE
+1462 URL do servidor de pesquisa-cve para o relatório
+1463 Relatório CVE
+1464 Relatório CVE não está habilitado.
+1465 Por CVSS
+1466 Por favor, consulte a documentação para configurar o Relatório CVE : <a href="http://wiki.ocsinventory-ng.org/04.Management-console-and-its-advanced-features/CVE-Search-management/"> Managing CVE-search reporting </a>
+1467 Link
+1468 Pontuação de vulnerabilidade entre
+1469 Selecione as categorias de software que você não deseja processar
+1470 Ativar pesquisa-CVE verbose
+1471 Ative para obter o CVE correspondente a todas as versões de software
+1472 Inventário CVE
+1473 Nova regex correspondente
+1474 Lista de correspondência
+1475 Nome ou Regex
+1476 Resultado do editor
+1477 Nome resultado
+1478 Ou importe arquivo CSV
+1479 Importar
+1480 Baixar exemplo de arquivo CSV
+1481 Histórico CVE
+1482 Última data de execução
+1483 Contagem CVE
+1484 Tempo de validade de um CVE após a varredura do inventário OCS
+1485 Por software
+1486 Por computador
1500 Categoria de software
1501 Nova categoria
1502 Lista de categorias
1503 Adicionar software
-1504 Expressão regular ou Nome do software
-1505 Selecionar categoria padrão para os softwares
+1504 Expressão regular ou nome do software
+1505 Selecione a categoria padrão para os softwares
1506 Nenhuma categoria criada
+1507 Versão do software
+1508 Fornecedor de software
+1509 Configurações avançadas
+1510 Comparador de versão de software
+1511 Comparador de versão
+1512 menor ou igual
+1513 maior ou igual
+1514 Categoria
+1515 Todos os sistemas operacionais
+1516 Todos softwares
+1517 Nenhuma categoria foi selecionada
+
+1550 Você realmente deseja arquivar
+1551 Arquivar
+1552 Restaurar
+1553 Você realmente deseja restaurar
+1554 COMPUTADORES ARQUIVADOS
+1555 COMPUTADORES ATIVOS
+1556 Arquivar / Restaurar
+1557 TODOS COMPUTADORES
+1558 Arquivos
+
+1560 Apagar dados antigos da Descoberta de IPs
+1561 Validade em dias da Descoberta de IPs
+
+1600 Meu painel
+1601 Grupos dinâmicos
+1602 não contém
+1603 mais de X dias
+1604 menos de X dias
+1605 outros
+1606 não está vazio
1700 Configuração avançada
1701 Aba disponível
@@ -1364,12 +1432,12 @@
2021 Seu diretório de logs não é gravável (padrão: /var/lib/ocsinventory-reports/logs)
2022 Não é possível enviar um arquivo maior que
2023 Deletar isto
-2024 O usuário/senha padrão está ativo no seu banco de dados:
-2025 Alterar a sua senha para o usuário 'ocs' no MySQL
+2024 O usuário/senha padrão está definido no seu banco de dados:
+2025 Altere sua senha para o usuário 'ocs' no MySQL
2026 O usuário/senha padrão está ativo na interface de usuário do OCS-NG
-2027 Alterar sua senha 'admin' na interface de usuário do OCS-NG
+2027 Altere sua senha 'admin' na interface de usuário do OCS-NG
2028 Chave de autenticação
-2029 O diretório de configuração não está gravável
+2029 O diretório de configuração não é gravável
2030 Instalação do OCS Inventory
2031 Versão atual instalada
@@ -1396,13 +1464,13 @@
2054 falhou, KEY estava muito longa<br>Você precisará refazer essa consulta mais tarde ou terá problemas graves de desempenho.
2055 Banco de dados gerado com sucesso
2056 Arquivo de configuração do MySql gravado com sucesso
-2057 atualizando o banco de dados existente
-2058 verificando engine do banco de dados...
+2057 banco de dados existente atualizado
+2058 verificando motor do banco de dados...
2059 ERRO: A query de alteração falhou
2060 ERRO: A query show table status falhou
2061 ERRO: Conversão InnoDB falhou, instale suporte a InnoDB no servidor MySql<br>ou você terá problemas graves de desempenho.<br>(Tente descomentar skip-innodb no seu arquivo de configuração do MySql.)<br>Reinstale quando corrigido.
2062 ERRO: Conversão HEAP falhou, instale suporte a HEAP no servidor mysql<br>ou você terá problemas graves de desempenho.
-2063 Engine do banco de dados atualizada com sucesso
+2063 Motor do banco de dados atualizado com sucesso
2064 tabelas alteradas
2065 ERRO: Instalação finalizada com erro, reinicie o install.php quando os problemas estiverem corrigidos
2066 AVISO: o diretório 'files' está faltando, não foi possível importar
@@ -1418,7 +1486,7 @@
2078 ERRO: Não foi possível inserir a rede
2079 na tabela subnet, erro
2080 AVISO: Rede
-2081 não foi inserido (ip ou máscara inválida
+2081 não foi inserida (ip ou máscara inválida
2082 Processando rede netid. Por favor aguarde...
2083 ERRO: Não foi possível atualizar netid para
2084 Rede netid foi processada
@@ -1468,6 +1536,19 @@
2129 Retornar a pesquisa
2130 Categorias de ativos
2131 Número de máquinas por categoria
+2132 Categoria de ativos
+2133 Você não criou uma categoria de ativo
+2134 Você não criou uma categoria de software
+2135 Nenhuma máquina foi inventariada
+2136 Atualizar
+2137 Escolha um novo arquivo se você quer modificar o antigo
+2138 Salvar minha pesquisa
+2139 A consulta de pesquisa atual será salva. Você poderá recuperar suas pesquisas salvas em <i><b>Gerenciar > Pesquisa salva</b></i> ou usando <i><b>Usar uma pesquisa salva</b></i> na pesquisa de vários critérios.
+2140 Use uma pesquisa salva
+2141 Pesquisas salvas
+2142 Crie uma pesquisa
+2143 Pesquisa salva com sucesso
+2144 Atualizar uma pesquisa salva existente
5000 [DEBUG]computers insertions request =>[DEBUG]
5001 [DEBUG]REQUEST MADE => [DEBUG]
@@ -1478,7 +1559,7 @@
5006 [DEBUG]array count request[DEBUG]
5007 [DEBUG]Cache use for lines number[DEBUG]
5008 [DEBUG]array request[DEBUG]
-5009 [DEBUG]RAW DATAS[DEBUG]
+5009 [DEBUG]RAW DATA[DEBUG]
5010 [DEBUG]table field=[DEBUG]
5011 [DEBUG]Comparison field=[DEBUG]
5012 [DEBUG]valor a pesquisar=[DEBUG]
@@ -1506,23 +1587,30 @@
6011 Clique aqui para resolver seu problema
6012 Todas
-7000 Plugins
-7001 Gerenciador de plugins
-7002 Nome do plugin
+7000 Extensões
+7001 Gerenciador de extensões
+7002 Nome da extensão
7003 Versão
7004 Licença
7005 Autor
7006 Última atualização
-7007 Tem certeza de que deseja excluir este plugin?
-7008 Instalar plugin
-7009 Plugins instalados
-7010 Este plugin já está instalado
-7011 é um plugin inválido, verifique suas fontes.
+7007 Tem certeza de que deseja excluir esta extensão?
+7008 Instalar extensão
+7009 Extensão instalados
+7010 Esta extensão já está instalada
+7011 é uma extensão inválida, verifique suas fontes.
7012 Instalação abortada !
7013 instalado
-7014 Não há atualmente nenhum plugin disponível para instalação
+7014 Atualmente não há nenhuma extensão disponível para instalação
7015 Selecione pelo menos um computador !
7016 MTU
+7017 Extensão instalada com sucesso ! <br> Por favor, saia e logue novamente para finalizar a instalação na console.
+7018 Esta extensão já está instalada.
+7019 Ocorreu um erro de PHP.
+7020 Extensão desinstalada com sucesso !
+7021 Extensão "%s" não compatível
+7022 Função "%s" ausente em "%s"!
+7023 Incapaz de incluir install.php
8000 Notificações
8001 Ativar o acompanhamento de notificações
@@ -1540,9 +1628,62 @@
8013 Aqui está o resumo padrão do OCS Inventory, ele contém um relatório das categorias de software e categorias de ativos :
8014 Upload com sucesso
8015 Upload falhou
-8016 Aqui você pode baixar o seu modelo de notificação personalizado:</br>• O arquivo deve ser um arquivo html.</br></br>Informações:</br>• Para obter uma tradução, coloque {{g.(número da tradução)}} no seu código html - Exemplo: {{g.49}} = Nome</br>• No momento você tem duas opções de relatórios de inventário: </br> {{Report.Software}} - Número de softwares por categoria </br> {{Report.Asset}} - Número de máquinas por categoria de ativo
+8016 Aqui você pode baixar o seu modelo de notificação personalizado:</br>• O arquivo deve ser um arquivo html.</br></br>Informações:</br>• Para obter uma tradução, coloque {{g.(number of translation)}} no seu código html - Exemplo: {{g.49}} = Nome</br>• No momento você tem duas opções de relatórios de inventário: </br> {{Report.Software}} - Número de softwares por categoria </br> {{Report.Asset}} - Número de máquinas por categoria de ativo
8017 Este arquivo não é um arquivo html
8018 Assunto
8019 Notificação OCSInventory
8020 AVISO : Arquivo de modelo de email não encontrado
8021 O arquivo enviado precisa ter extensão .html para ser válido
+8022 Ver notícias
+8023 ... Ver mais
+8024 Fechar notícias
+8025 Voltar ao menu de notícias
+8026 Ativar Notícias OCS Inventory no painel
+8027 Ocorreu um problema ao obter as notícias OCS
+8028 Você tem notícias recentes
+8029 não é gravável
+
+8100 Inventário de aplicativos web
+8101 Lista de aplicativos web
+8102 Adicionar aplicativo web
+8103 DNS associado
+8104 Entrada
+8105 Dados
+8106 Tempo de vida
+8107 Este aplicativo web já existe
+8108 Habilitar inventário de aplicativos web
+
+8200 Agendar Wake On Lan
+8201 Salvar
+8202 WOL data/hora
+8203 WOL salvo !
+
+9000 Configuração SNMP
+9001 Criar tipo
+9002 Configuração de tipo
+9003 Criar etiqueta
+9004 OID
+9005 Valor da string OID
+9006 Nome do rótulo
+9007 O nome do tipo é único e não deve conter nenhum caractere especial, exceto sublinhado.</br>Não use palavras-chave do MySQL ou palavras reservadas, consulte: <a href="https://dev.mysql.com/doc/refman/8.0/en/keywords.html">MySQL Keywords</a>
+9008 Adicionar arquivo MIB
+9009 Coloque o arquivo MIB no diretório MIBs do servidor. <br> Não se esqueça de definir o caminho do diretório MIBs em <b>Configurações > Configurações gerais > SNMP</b>
+9010 Diretório SNMP MIBs do servidor
+9011 Filtrar por tipo:
+9012 Detalhes SNMP
+9013 Mostrar detalhes
+9014 A configuração SNMP está vazia. Verifique a documentação para saber como configurar SNMP: <a href="http://wiki.ocsinventory-ng.org/06.Network-Discovery-with-OCS-Inventory-NG/Managing-and-using-SNMP-feature/">Managing SNMP on Web Console</a>
+9015 Use para reconciliação
+9016 Selecione o tipo que você deseja configurar.
+9017 OID numérico
+9018 Nome do campo de inventário
+9019 String de nome OID
+9020 Adicionar ao modelo SNMP
+9021 Pesquisar por linha específica
+
+9100 Caminho da chave SSL
+9101 Caminho do certificado SSL
+9102 Habilitar SSL
+9103 modo SSL
+9104 Caminho do certificado CA
+9105 Porta MySQL
--- a/ocsreports/plugins/language/de_DE/de_DE.txt
+++ b/ocsreports/plugins/language/de_DE/de_DE.txt
@@ -1301,6 +1301,8 @@
1370 Webserver
1371 Datenbank-Server
1373 Distribution
+1376 FAQ
+1377 Frequently Asked Questions
1378 Freier Speicher
1379 Installierter Speicher
1380 Spalten zurücksetzen
@@ -1357,17 +1359,36 @@
1469 Software-Kategorien für die keine CVE-Berichte gesucht werden sollen
+1471 Aktivieren, um CVE für alle Software-Versionen zu erhalten
+
+1473 Neue Regex
+1474 Übereinstimmungen
+
+1481 CVE Historie
+
+1484 Zeitspanne wie lange ein CVE Scan nach einem OCS Inventory Scan gültig ist
+1485 Nach Software
+1486 Nach Computer
+
1500 Software Kategorie
1501 Neue Kategorie
1502 Liste der Kategorien
1503 Software hinzufügen
+1504 Regulärer Ausdruck oder Software-Name
1505 Standard-Kategorie für neue Software
1506 Keine Kategorie erstellt
1509 Erweiterte Einstellungen
+
+1516 Gesamte Software (but default)
1517 Es wurde keine Kategorie ausgewählt
+1554 ARCHIVIERTE COMPUTER
+1555 AKTIVE COMPUTER
+
+1557 ALLE COMPUTER
+
1600 Mein Dashboard
1601 Dynamische Gruppen
@@ -1404,7 +1425,6 @@
2027 Ändern Sie das Admin-Kennwort in der OCS-GUI!
2028 Authentifizierungs-Schlüssel
-
2030 OCS-NG Inventory Installation
2031 Derzeit installierte Version
2032 ist niedriger als diese Version
@@ -1498,6 +1518,12 @@
2133 Es wurde noch keine Asset Kategorie angelegt
2134 Es wurde noch keine Software Kategorie angelegt
+2140 Eine gespeicherte Suche nutzen
+2141 Gespeicherte Suche
+2142 Eine Suche generieren
+2143 Suche wurde erfolgreich gespeichert
+2144 Eine vorhandene Suche anpassen
+
5000 [DEBUG]computers insertions request =>[DEBUG]
5001 [DEBUG]REQUEST MADE => [DEBUG]
5002 [DEBUG] => weight: [DEBUG]
@@ -1574,3 +1600,5 @@
9000 SNMP-Konfiguration
9010 SNMP MIBs-Verzeichnis auf dem Server
+
+9014 SNMP ist nicht konfiguriert. Lesen Sie die Dokumentation um zu erfahren wie SNMP eingerichtet wird: <a href="http://wiki.ocsinventory-ng.org/06.Network-Discovery-with-OCS-Inventory-NG/Managing-and-using-SNMP-feature/">Managing SNMP on Web Console</a>
\ No newline at end of file
--- a/ocsreports/plugins/language/en_GB/en_GB.txt
+++ b/ocsreports/plugins/language/en_GB/en_GB.txt
@@ -1392,6 +1392,9 @@
1557 ALL COMPUTERS
1558 Archives
+1560 Purge old IPDiscover data
+1561 Validity time (in days) of an IPDiscover data
+
1600 My dashboard
1601 Dynamic groups
1602 Doesn't contain
@@ -1662,7 +1665,7 @@
9004 OID
9005 OID string value
9006 Label name
-9007 Type name is unique and must not contain any special characters except underscore.</br>Please don't use MySQL keywords or reserved words, refer to : <a href="https://dev.mysql.com/doc/refman/8.0/en/keywords.html">MySQL Keywords</a>
+9007 <b>The name is unique and must not contain any special characters except underscore.</b></br>Please don't use MySQL keywords or reserved words, refer to : <a href="https://dev.mysql.com/doc/refman/8.0/en/keywords.html">MySQL Keywords</a>
9008 Add MIB file
9009 Put the MIB file on your server MIBs directory. <br> Don't forget to set your MIBs directory path in <b>Configuration > General configuration > SNMP</b>
9010 Server SNMP MIBs directory
@@ -1677,6 +1680,15 @@
9019 OID name string
9020 Add to SNMP Model
9021 Search for specific row
+9022 Can't create type with empty OID or empty OID string value
+9023 Type name already exists
+9024 An error happened during the SNMP type creation
+9025 Label already exists
+9026 An error happened during the SNMP label creation
+9027 An error happened during the SNMP configuration
+9028 An error happened during the type deletion
+9029 An error happened during the label deletion
+9030 An error happened during the config deletion
9100 SSL key path
9101 SSL certificat path
@@ -1684,3 +1696,7 @@
9103 SSL mode
9104 CA certificat path
9105 MySQL Port
+
+9200 Package deployment for computer
+9201 Package deployment for selection
+9202 Package deployment for group
\ No newline at end of file
--- a/ocsreports/plugins/language/es_ES/es_ES.txt
+++ b/ocsreports/plugins/language/es_ES/es_ES.txt
@@ -1,19 +1,31 @@
2 Todos los dispositivos
-3 Equipos con sotfware...
+3 Dispositivos con sotfware...
+4 Dispositivos sin software...
5 Códigos de elementos bajo mi responsabilidad
+6 Dispositivo fuera de garantía
+7 Detalles del dispositivo fuera de garantía
+8 Elija sus peticiones
9 Búsqueda por varios criterios
+10 Dispositivos por etiqueta
+11 Dispositivos por etiquetas
12 Valor de la etiqueta
13 Aceptar
+14 Gestión
+15 Etiquetas
+16 Administración
17 Agente
18 Revisión
19 Versión del software
20 Software
+21 Primera cita
+22 Fecha fuera de la garantía
23 Dispositivo
24 Nombre usuario
25 Sistema Operativo
26 Memoria
27 Velocidad de la memoria (MHz)
28 Número de dispositivos
+29 El servidor LDAP no responde
30 Buscar
31 Seleccionar un parámetro
32 Seleccionar
@@ -21,11 +33,17 @@
34 Dirección IP
35 Nombre del dispositivo
36 Número de serie
+37 Orden
+38 Orden de entrega
+39 Origen
+40 Código
41 Inicializar
42 No hay resultados
43 Menú principal
+44 Elija una opción
45 Espacio libre
46 Último inventario
+47 Última página
48 Detalles del dispositivo
49 Nombre
50 Memoria virtual
@@ -35,6 +53,10 @@
54 Procesador(es)
55 Número
56 Datos administrativos
+57 Número de comando
+58 Fecha de comando
+59 Código
+60 Orden de entrega
61 Tarjeta de video
62 Resolución
63 Almacenamiento
@@ -42,8 +64,17 @@
65 Modelo
66 Tipo
67 Tamaño del disco
+68 Directorio
69 Editor
70 Designación
+71 Garantía
+72 Intervención(es)
+73 Valor
+74 Fecha de la demanda
+75 Tipo de demanda
+76 Fecha de la intervención
+77 Tipo de intervención
+78 Cuenta
79 Impresora(s)
80 Identificador
81 Estado
@@ -54,6 +85,7 @@
86 Sistema de archivos
87 Total
88 Libre
+89 Fecha de la orden de entrega
90 Resultado(s)
91 Dispositivos de entrada
92 Disco(s)
@@ -64,30 +96,77 @@
97 Monitor(es)
98 <b>ATENCIÓN:</b> Sólo puede seleccionar 8 opciones
99 Detalles del dispositivo
+100 Parámetros de arranque
+101 Orden
+102 Nueva búsqueda
103 Actualizar
+104 afectados directamente
+105 en unidades
+106 Opciones de configuración
107 Configurar
108 Claves del registro
+109 Tipo de dispositivo
+110 a
111 Licencia Windows
+112 Fecha de garantía
113 Cancelar
114 Registrar
115 Actualizar
116 Añadir
117 Registro
+118 Ir a la página
119 ¿Realmente desea borrar el dispositivo?
+120 cero
+121 Borrar dispositivo
122 Borrar
+123 Cambiar tipo de dispositivo
+124 Añadir nuevo tipo de dispositivo
+125 Último
+126 Siguiente
+127 Primero
+128 Último
129 Igual
130 Diferente
+131 Archivo de iconos
+132 Archivo de imagen
+133 Inventario
134 Añadir un nuevo archivo al sistema
135 Tenga cuidado, ¡está a punto de borrar este archivo de forma definitiva!
136 Descargar
137 Archivo
+138 Crea
+139 Crear/Borrar
140 Super administradores
141 Administradores
142 Administradores locales
143 solicitantes teledespliegue
+144 Los administradores ven todos los dispositivos pero no pueden asignar una etiqueta de unidad.
+145 Los administradores locales ven sólo su dispositivo y no pueden asignar una etiqueta de unidad.
+146 Seleccione un administrador
+147 Tenga cuidado, ¡está a punto de borrar los permisos definitivamente!
+148 ETIQUETA ISMERETLEN
+149 Etiquetas de unidad bajo la responsabilidad de
+150 permiso(s) en su lugar
+151 permiso(s) de la ley
+152 ¡Atención, esta operación anula los permisos del administrador afectado!
+153 Ninguna unidad de etiqueta afectada por este administrador
+154 Añadir una etiqueta a un administrador
+155 Añadir administrador a una etiqueta
+156 Añadir una etiqueta de unidad
+
+158 Copia los permisos de
+159 permisos copiados de
+160 No hay administrador para esta etiqueta
+161 Etiqueta de unidad bajo la responsabilidad de
162 Eliminar seleccionados
-168 Formato de archivo no válido (Debe ser zip, pl o binario unix)
-170 ¡Ya existe el mismo archivo!
+163 Número del tipo de registro
+164 Personas responsables de la etiqueta de la unidad
+165 ¡Debe introducir un nombre o una lista para buscar!
+166 ¡Debe elegir un elemento de la lista!
+167 Ver los detalles
+168 Formato de archivo no válido (Debe ser zip, pl o binario UNIX)
+169 añadir a la base
+170 ¡Ya existe el archivo!
171 Archivo borrado
172 Apareció un error, el archivo
173 No se añadirá al sistema
@@ -96,10 +175,12 @@
176 IPs
177 Mezclar dispositivos redundantes
178 Etiqueta / Distribución de PCs
+179 Nombre de la unidad
180 Usuario no registrado
-182 Dispositivos que tienen una etiqueta dada
+181 Error de usuario o contraseña
+182 Dispositivos con una determinada etiqueta
183 Descargar
-184 Este archivo no contiene "use versión constante"
+184 Este archivo no contiene "usar versión constante"
185 La versión debe ser mayor de 1
186 Este archivo no contiene el archivo de versión
187 Archivo zip no válido
@@ -136,7 +217,7 @@
218 Versiones de agentes
219 interfaces de red sin inventariar
220 borrado
-221 Equipos que registran IPs
+221 Dispositivos que registran IPs
222 <b>AVISO:</b> Los dispositivos seleccionados se van a unir como un único dispositivo, ¿está seguro?
223 Información
224 Valor
@@ -228,8 +309,8 @@
310 IpDiscover menor de
311 Dispositivos
312 Descubrimiento IP
-313 Equipos Puerta de enlace
-314 Dispositivos IpDiscover Puerta de enlace
+313 Dispositivo de puerta de enlace
+314 IpDiscover dispositivo de puerta de enlace
315 Dispositivos sin inventariar
316 Subred
317 ANALIZAR
@@ -239,7 +320,7 @@
321 ¿Desea ver los datos en caché?
322 Datos en caché
323 generado el
-324 MÁQUINAS EVALUADAS COMO
+324 HOSTS EVALUADOS COMO
325 Vacío
326 No se especificó la máscara
327 Detalles del dispositivo
@@ -289,7 +370,7 @@
373 Usuario registrado
374 Sociedad registrada
375 Versión del Agente OCS NG
-376 Equipo bloqueado. Por favor vuelva a intentarlo en unos minutos
+376 Dispositivo bloqueado. Por favor vuelva a intentarlo en unos minutos
377 Velocidad del procesador (MHz)
380 Diccionario
381 Número
@@ -378,7 +459,7 @@
475 Fecha y hora (Marca temporal)
476 O activar un paquete manualmente
477 Afectar un paquete
-478 Equipo(s)
+478 Dispositivo(s)
479 No se seleccionaron dispositivos
480 Partes
481 Paquetes activados
@@ -422,7 +503,7 @@
519 El dispositivo ya está elegido para la red
520 El dispositivo ya FORZÓ IpDiscover para la red
521 El dispositivo ya está en estado ilegible FORZADO
-522 Equipo estándar
+522 Dispositivo estándar
523 Revertir a estado estándar
524 NUNCA volver a afectar
525 ¿ESTÁ SEGURO(A)?
@@ -452,7 +533,7 @@
549 Archivo (Desplegado en dispositivos clientes)
550 Archivo (Opcional, la orden "Ejecutar" lo puede usar)
551 Este nombre de paquete ya existe
-552 <i>Haga una búsqueda de dispositivos y luego haga clic en <b>Instalar</b> para afectar los paquetes activados.<br>También puede afectar un paquete a un equipo utilizando la opción <b>Personalizar</b> de la página de detalles del dispositivo deseado</i>.
+552 <i>Haga una búsqueda de dispositivos y luego haga clic en <b>Instalar</b> para afectar los paquetes activados.<br>También puede afectar un paquete a un dispositivo utilizando la opción <b>Personalizar</b> de la página de detalles del dispositivo deseado</i>.
553 Clave Windows
554 Monitor: Número de serie
555 Monitor: Fabricante
@@ -533,6 +614,7 @@
633 Administración de grupos de servidores
634 Acción deseada
635 Nuevo nombre
+636 Descripción
637 Reemplazar
638 EL NOMBRE DEL GRUPO NO PUEDE ESTAR VACÍO
639 ESTE SERVIDOR DE GRUPOS NO EXISTE
@@ -555,18 +637,19 @@
656 Este dato ya existe en la lista
657 ¡Los campos en color rojo contienen un error! (Vacíos o tamaño < 2)
658 la máquina no tiene servidores de redistribución. <br>Es necesario afectar este paquete individualmente.
-659 Los dispositivos ya tienen este paquete instalado remotamente. El estado del paquete para estos equipos es ahora
-660 GRUPO DE SERVIDORES NO EXISTE
+659 Los dispositivos ya tienen instalado este paquete remotamente. El estado del paquete para estos dispositivos es ahora
+660 GRUPO DE REDISTRIBUCIÓN NO EXISTE
661 PAQUETES PARA SERVIDOR DE REDISTRIBUCIÓN
662 Reglas de afectación
663 PROBLEMA INTERNO
664 Acción efectuada
-665 MÁQUINA NO SELECCIONADA. GRUPO DE SERVIDORES NO CREADO
-666 Grupo de servidores hecho
+665 DISPOSITIVO NO SELECCIONADO. GRUPO DE SERVIDORES NO CREADO
+666 Grupo de servidores creado
667 PARA EL PAQUETE
668 ¿Afectar cualquier regla?
-669 <b>ATENCIÓN:</b> Hay duplicados de prioridad <br> ¡Solo se mantendrá una regla! <br>
+669 <b>ATENCIÓN:</b> Hay duplicados de prioridad <br>¡Solo se mantendrá una regla!<br>
670 Una regla ya tiene este nombre
+671 ¡El nombre de la regla no puede estar vacío!
672 ¡Esta regla no existe!
673 La administración de las reglas de afectación
674 NOMBRE DE LA REGLA
@@ -577,7 +660,7 @@
679 NOMBRE
680 DOMINIO
681 USUARIO
-682 para Añadir una condición adicional
+682 para añadir una condición adicional
683 Validar la regla
684 Se debe cambiar el tamaño de los siguientes campos
685 Añadir una regla
@@ -603,7 +686,7 @@
705 ¿Está seguro que desea quitar de la lista negra
706 Quitar de lista negra
707 este número de serie
-708 esta dirección mac
+708 esta dirección MAC
709 PROLOG_FREQ personalizado
710 Descarga personalizada
711 Incluir modificaciones
@@ -638,7 +721,7 @@
739 Mejoras de seguridad futuras
740 Validez de un bloqueo de dispositivo
741 Actualizar el inventario respecto a los valores obtenidos la primera vez por el agente (Menor carga BackEnd DB)
-742 Inventariado como una transacción (Menor concurrencia, mejor uso del disco)
+742 Permitir que el motor trate el inventariado como una transacción (Menor valor, mejor uso del disco)
743 Configurar motor para hacer una actualización diferencial de las secciones del inventario (A nivel de registro). Menor carga BackEnd DB, mayor carga de frontend.
744 Aceptar un inventario únicamente si lo solicita el servidor (Rechazar inventarios "forzados")
745 Especifique cuando se eliminarán las estructuras de caché del inventario
@@ -774,11 +857,11 @@
875 Clave de registro: Valor
876 GRUPO DE REDISTRIBUCIÓN simple, inefectivo
877 ALGUNOS DISPOSITIVOS NO SE HAN AGREGADO AL GRUPO PORQUE:
-878 <b>Recordatorio:</b> Un ordenador puede ser miembro de un solo grupo de redistribución
+878 <b>Recordatorio:</b> Un dispositivo puede ser miembro de un solo grupo de redistribución
879 GRUPO REEMPLAZADO
880 GRUPO CREADO
-881 Ordenadores añadidos
-882 Ordenadores borrados del grupo
+881 Dispositivos añadidos
+882 Dispositivos eliminados del grupo
883 Restringir vista
884 <b>ADVERTENCIA:</b> CON FILTRO de visualización
885 desconocido/a
@@ -789,9 +872,11 @@
890 La interfaz está bloqueada en una búsqueda con varios criterios
891 Eliminar interfaz LOCK
892 Conectar con otra cuenta
-893 NINGUNA ETIQUETA AFECTA A SU PERFIL
-894 NINGÚN NIVEL DE DERECHOS DEFINIDO PARA SU PERFIL
+893 NINGUNA ETIQUETA AFECTA PARA SU PERFIL
+894 NO HAY DEFINIDO NINGÚN NIVEL DE PERMISOS PARA SU PERFIL
895 Modificar etiqueta
+896 Anotaciones
+897 Nota de la fecha
898 Añadir nota
899 Autor
900 ¿Realmente quiere eliminar la selección?
@@ -900,7 +985,7 @@
1003 Parámetros de paquetes de servidores de redistribución
1004 No es posible crear el directorio de creación de paquetes
1005 La creación del paquete no es posible por
-1006 No tienen derechos de escritura
+1006 No tienen permisos de escritura
1007 El directorio
1008 Usar redistribución en este paquete
1009 Directorio de almacenamiento de servidores
@@ -1070,8 +1155,8 @@
1173 Información del perfil
1174 Páginas de usuario
1175 Restricciones
-1176 Derechos a la lista negra
-1177 Derechos para administrar
+1176 Permisos a la lista negra
+1177 Permisos para administrar
1178 Este campo
1179 Una variable no puede contener caracteres especiales
1180 No puede estar vacío
@@ -1179,6 +1264,13 @@
1282 Orden enviada Wake On Lan
1283 ¿Quiere realizar Wake On Lan en este dispositivo?
1284 IP de origen
+1285 Las credenciales han sido añadidas
+1286 GNU General Public License, version 2.0
+1287 apoyo disponible
+1288 Apoyo a la validación
+1289 Identificadores admitidos
+1290 Correo electrónico de contacto
+1291 Personas autorizadas
1292 Use las opciones avanzadas de teledespliegue
1293 Forzar teledespliegue
1294 Tiempo de instalación
@@ -1343,7 +1435,36 @@
1453 GUID
1454 Origen
1455 Interfaz virtual
+1456 Número de teléfono
+1457 Enlazar la red IpDiscover al TAG del dispositivo </br><b style="color:#d9534f;">Cerrar sesión / Iniciar sesión después de actualizar esta configuración</b>
+1460 Gestionar CVE-search
+1461 Habilitar CVE Reporting
+1462 URL del host de CVE-search que se utilizará para la presentación de informes
+1463 CVE Reporting
+1464 CVE Reporting no está activado.
+1465 Por CVSS
+1466 Por favor, consulte la documentación para configurar CVE Reporting : <a href="http://wiki.ocsinventory-ng.org/04.Management-console-and-its-advanced-features/CVE-Search-management/"> Gestión de informes de búsqueda CVE </a>
+1467 Enlace
+1468 Puntuación de vulnerabilidad entre
+1469 Seleccione las categorías de software que no desea procesar
+1470 Habilitar búsqueda-CVE
+1471 Habilitar para obtener el CVE correspondiente a toda la versión de software
+1472 Inventario CVE
+1473 Nueva regex coincidente
+1474 Lista de coincidencias
+1475 Nombre o Regex
+1476 Resultado de la publicación
+1477 Nombre del resultado
+1478 O importar un archivo CSV
+1479 Importar
+1480 Descargar archivo de ejemplo CSV
+1481 Historial CVE
+1482 Última fecha de ejecución
+1483 Recuento CVE
+1484 Tiempo de validez de un CVE después del escaneo de OCS Inventory
+1485 Por software
+1486 Por dispositivo
1500 Categoría de software
1501 Nueva categoría
@@ -1364,17 +1485,29 @@
1516 Todo el software (Pero por defecto)
1517 No ha sido seleccionada ninguna categoría
+1550 ¿Realmente quieres archivar
+1551 Archivar
+1552 Restaurar
+1553 ¿Realmente quieres restaurar
+1554 DISPOSITIVOS ARCHIVADOS
+1555 DISPOSITIVOS ACTIVOS
+1556 Archivar / Restaurar
+1557 TODOS LOS DISPOSITIVOS
+1558 Archivos
1600 Panel principal
1601 Grupos dinámicos
-
+1602 No contiene
+1603 Más de X días
+1604 Menos de X días
+1605 Otros
+1606 No está vacío
1700 Configuración avanzada
1701 Pestaña disponible
1702 Nueva pestaña
1703 Añadir paquetes seleccionados
-
2000 * SETUP voices 2000-2200 * (2000-2029 Common voices *** 2030-2200 Setup voices)
2001 <b>ERROR:</b>
2002 <b>ERROR:</b> línea
@@ -1416,7 +1549,6 @@
2038 <b>ADVERTENCIA:</b> GD para PHP no está instalado correctamente. <br>No podrá ver ninguna pantalla gráfica. <br>Intente descomentar la extensión = php_gd2.dll (Windows) quitando el punto y coma en el archivo php.ini, o intente instalar el paquete php5-gd (Linux).
2039 <b>ADVERTENCIA:</b> OpenSSL para PHP no está instalado correctamente. Algunas características de implementación automática no estarán disponibles. <br>Pruebe descomentar la extensión = php_openssl.dll (Windows) eliminando el punto y coma en el archivo php.ini, o intente instalar el paquete php-openssl (Linux).
2040 <b>ADVERTENCIA:</b> No podrá construir ningún paquete de implementación con un tamaño superior a
-Debe aumentar tanto <font color="red"> post_max_size </font> como <font color="red"> upload_max_filesize </ font> en su php.ini para aumentar este límite.
2041 Debe aumentar tanto <font color="red">post_max_size</font> como <font color="red">upload_max_filesize</font> en su configuración de vhost para aumentar este límite.
2042 <b>ADVERTENCIA:</b> Su contraseña de root predeterminada está configurada en su servidor MySQL. Cámbielo lo antes posible. (Usando la contraseña de root = en blanco)
2043 <b>ADVERTENCIA:</b> El usuario que escribió no parece ser root. <br>Si encuentra algún problema con la inserción de archivos, intente configurar <font color="red"> max_allowed_packet </font> como valor MySQL de al menos 2MB en su archivo de configuración del servidor.
@@ -1426,7 +1558,7 @@ Debe aumentar tanto <font color="red"> post_max_size </font> como <font color="r
2047 Debe agregar las 'contraseñas antiguas' en su archivo de configuración MySQL (my.ini). Luego reinicia MySQL, y reinicia install.php
2050 La instalación finalizó, puede iniciar sesión en index.php con login=admin y password=admin
2051 Click aquí para entrar OCS-NG GUI
-2052 <b>ERROR:</b> No se puede escribir en el directorio (En dbconfig.inc.php), configure los derechos necesarios para instalar OCSInventory (debe eliminar el modo de escritura una vez que la instalación se haya realizado correctamente)
+2052 <b>ERROR:</b> No se puede escribir en el directorio (En dbconfig.inc.php), configure los permisos necesarios para instalar OCSInventory (debe eliminar el modo de escritura una vez que la instalación se haya realizado correctamente)
2053 Espere, la actualización de la base de datos puede tardar hasta 30 minutos ...
2054 falló, KEY es demasiado largo. Necesita volver a realizar esta consulta más adelante o experimentará problemas graves de rendimiento.
2055 Base de datos generada con éxito
@@ -1470,7 +1602,7 @@ Debe aumentar tanto <font color="red"> post_max_size </font> como <font color="r
2096 Por favor introduzca la etiqueta del cuadro de entrada de etiqueta de cliente de Windows:
2097 Déjelo vacío si no desea que se muestre una ventana emergente en cada lanzamiento del agente
2098 <b>ERROR:</b> ZIP para PHP no está instalado correctamente. <br>Intente descomentar el comentario de extensión = php_zip.dll (Windows) eliminando el punto y coma en el archivo php.ini, o intente instalar el paquete libphp-pclzip (Linux).
-2099 <b>ERROR:</b> Este inicio de sesión de MySQL no tiene los derechos para crear la base de datos
+2099 <b>ERROR:</b> Este inicio de sesión de MySQL no tiene los permisos para crear la base de datos
2100 Actualizar información de agentes antiguos
2101 Agregar por script
2102 <b>ADVERTENCIA:</b> Si cambia el nombre predeterminado de la base de datos (ocsweb), no se olvide de actualizar los archivos del motor de ocs.2103 Modo DEMO: no puede actualizar los datos
@@ -1509,7 +1641,13 @@ Debe aumentar tanto <font color="red"> post_max_size </font> como <font color="r
2135 Ningún dispositivo ha sido inventariado
2136 Actualizar
2137 Elija un archivo nuevo si desea modificar el anterior en
-
+2138 Guardar mi búsqueda
+2139 La búsqueda múltiple actual será guardada. Podrá recuperar sus búsquedas guardadas en <i><b>Gestionar > Búsqueda guardada</b></i> o usando <i><b>Utilizar una búsqueda guardada</b></i> en multibúsqueda.
+2140 Usar una búsqueda guardada
+2141 Búsquedas guardadas
+2142 Crear una búsqueda
+2143 La búsqueda fue guardada con éxito
+2144 Actualizar una búsqueda guardada existente
5000 [DEBUG]solicitud de inserciones de dispositivos =>[DEBUG]
5001 [DEBUG]SOLICITUD HECHA => [DEBUG]
@@ -1536,7 +1674,6 @@ Debe aumentar tanto <font color="red"> post_max_size </font> como <font color="r
5022 [DEBUG]NORMAL CONDITION REQUEST[DEBUG]
5023 [DEBUG]DIFF CONDITION REQUEST[DEBUG]
-
6000 Complementos/Plugins
6001 Seleccionar columnas para mostrar/ocultar
6002 Distribución de las licencias de ofimática
@@ -1550,7 +1687,6 @@ Debe aumentar tanto <font color="red"> post_max_size </font> como <font color="r
6011 Haga clic aquí para resolver su problema
6012 Seleccionar todo
-
7000 Complementos/Plugins
7001 Administrador de complementos
7002 Nombre Plugin
@@ -1568,7 +1704,13 @@ Debe aumentar tanto <font color="red"> post_max_size </font> como <font color="r
7014 Actualmente no hay ningún complemento disponible para su instalación
7015 ¡Seleccione al menos un dispositivo!
7016 MTU
-
+7017 ¡Extensión instalada con éxito! <br> Por favor, cierre la sesión y vuelva a abrirla para terminar la instalación de la consola.
+7018 Esta extensión ya está instalada.
+7019 Se ha producido un error de PHP.
+7020 Extensión desinstalada correctamente!
+7021 La extensión "%s" no es compatible.
+7022 ¡Función perdida "%s" en "%s"!
+7023 No se puede incluir install.php
8000 Notificaciones
8001 Habilite el seguimiento de notificaciones
@@ -1579,27 +1721,27 @@ Debe aumentar tanto <font color="red"> post_max_size </font> como <font color="r
8006 Host SMTP
8007 SMTP identificador
8008 Contraseña SMTP
-8009 Modo de envío de correo electrónico
+8009 Modo de envío de email
8010 (Opcional)
8011 Configuración
-8012 Personalizar plantilla
-8013 Aquí está el resumen predeterminado del inventario de OCS, que contiene un informe de las categorías de software y categorías de activos:
-8014 Carga exitosa
-8015 Carga fallida
-8016 Aquí puede descargar su plantilla de notificación personalizada: </br>• El archivo debe ser un archivo html.</br></br>Informaciones:</br>• Para obtener traducción, {{g. (Número de traducción) )}} en su código html - Ejemplo: {{g.49}} = Nombre</br>• Por el momento tiene dos opciones de inventario de informes:</br> {{Report.Software}} - Número de programas por categoría de software</br> {{Report.Asset}} - Número de dispositivos por categoría de activos
+8012 Personalizar la plantilla
+8013 Este es el resumen del inventario de OCS por defecto, contiene un informe de las categorías de software y de las categorías de activos:
+8014 Subida correcta
+8015 Fallo en la subida
+8016 Aquí puede descargar su plantilla de notificación personalizada:</br>• El archivo debe ser un archivo html.</br><br>Información:</br>• Para obtener la traducción ponga {{g.(number of translation)}} en su código html - Ejemplo: {{g.49}} = Name</br>• Por el momento tiene dos opciones de inventario de informe: </br> {{Report.Software}} - Número de software por categoría de software </br> {{Report.Asset}} - Número de máquinas por categoría de activos
8017 Este archivo no es un archivo html
8018 Asunto
8019 Notificación OCSInventory
-8020 ADVERTENCIA: Archivo de plantilla de correo no encontrado
-8021 El archivo cargado debe tener una extensión .html para ser válido
+8020 ADVERTENCIA: Archivo de plantilla de correo no encontrado.
+8021 El archivo subido debe tener la extensión .html para ser válido
8022 Ver noticias
8023 ... Leer más
8024 Cerrar noticias
8025 Volver al menú de noticias
-8026 Habilitar noticias de OCS Inventory en el panel principal
-8027 Se ha producido un problema al recuperar las noticias de OCS
+8026 Activar las noticias de OCS Inventory en el dashboard
+8027 Se ha producido un problema en la recuperación de datos de las noticias de OCS
8028 Tiene noticias recientes
-8029 no es escribible
+8029 no es editable
8100 SAAS Inventory
8101 Lista SAAS
@@ -1610,3 +1752,38 @@ Debe aumentar tanto <font color="red"> post_max_size </font> como <font color="r
8106 Tiempo de vida
8107 Este SAAS ya existe
8108 Habilitar el software como un inventario de servicios
+
+8200 Programar Wake On Lan
+8201 Guardar
+8202 WOL fecha/hora
+8203 ¡WOL guardado!
+
+9000 Configuración SNMP
+9001 Creat tipo
+9002 Configuración de tipo
+9003 Crear etiqueta
+9004 OID
+9005 Valor de la cadena OID
+9006 Nombre de la etiqueta
+9007 El nombre del tipo es único y no debe contener ningún carácter especial excepto el subrayado. </br>Por favor no use palabras claves de MySQL o palabras reservadas, puede consultarlo en: <a href="https://dev.mysql.com/doc/refman/8.0/en/keywords.html">Palabras clave MySQL</a>
+9008 Agregar archivo MIB
+9009 Ponga el archivo MIB en el directorio MIB de su servidor. <br>No te olvides de poner la ruta del directorio de MIBs en <b>Configuración > Configuración General > SNMP</b>
+9010 Directorio de MIBs del servidor SNMP
+9011 Filtrar por tipo:
+9012 Detalles SNMP
+9013 Mostrar detalles
+9014 La configuración SNMP está vacía. Consulte la documentación para saber cómo configurar SNMP: <a href="http://wiki.ocsinventory-ng.org/06.Network-Discovery-with-OCS-Inventory-NG/Managing-and-using-SNMP-feature/">Managing SNMP on Web Console</a>
+9015 Uso para la reconciliación
+9016 Seleccione el tipo que desea configurar.
+9017 OID numérico
+9018 Nombre del campo de inventario
+9019 Cadena de nombres OID
+9020 Añadir al modelo SNMP
+9021 Buscar una fila específica
+
+9100 Ruta de la clave SSL
+9101 Ruta del certificado SSL
+9102 Habilitar SSL
+9103 Modo SSL
+9104 Ruta del certificado CA
+9105 Puerto MySQL
--- a/ocsreports/plugins/language/fr_FR/fr_FR.txt
+++ b/ocsreports/plugins/language/fr_FR/fr_FR.txt
@@ -1393,6 +1393,9 @@
1557 TOUS LES ORDINATEURS
1558 Archive
+1560 Purge des anciennes données IPDiscover
+1561 Période de validité d'une donnée IPDiscover
+
1600 Mon tableau de bord
1601 Groupes dynamiques
1602 Ne contient pas
@@ -1669,13 +1672,26 @@
9016 Sélectionnez le type que vous souhaitez configurer.
9017 OID numérique
9018 Nom du champ d'inventaire
-9019 OID name string
+9019 nom d'OID
9020 Ajouter au model SNMP
9021 Rechercher une ligne spécifique
+9022 Vous ne pouvez pas créer un type avec un OID numérique vide et un nom d'OID vide
+9023 Nom de type déjà existant
+9024 Une erreur est survenue lors de la création du type
+9025 Label déjà existant
+9026 Une erreur est survenue lors de la création du label
+9027 Une erreur est survenue lors de la création de la configuration
+9028 Une erreur est survenue lors de la suppression du type
+9029 Une erreur est survenue lors de la suppression du label
+9030 Une erreur est survenue lors de la suppression de la configuration
9100 Chemin de la clé SSL
9101 Chemin du certificat SSL
9102 Activer SSL
9103 Mode SSL
9104 Chemin du certificat CA
-9105 Port MySQL
\ No newline at end of file
+9105 Port MySQL
+
+9200 Deploiement de paquet pour la machine
+9201 Deploiement de paquet pour la sélection
+9202 Deploiement de paquet pour le groupe
\ No newline at end of file
--- a/ocsreports/plugins/main_sections/ms_all_soft/ms_all_soft.php
+++ b/ocsreports/plugins/main_sections/ms_all_soft/ms_all_soft.php
@@ -142,7 +142,7 @@ if($protectedPost['onglet'] == "ALL"){
}
if (isset($sql)) {
- $sql['SQL'] .= " GROUP BY CONCAT(s.NAME_ID,'_', s.VERSION_ID)";
+ $sql['SQL'] .= " GROUP BY s.NAME_ID, s.VERSION_ID";
if ($sql_fin['SQL'] != '') {
$sql['SQL'] .= $sql_fin['SQL'];
$sql['ARG'] = $sql_fin['ARG'];
@@ -186,7 +186,7 @@ elseif($protectedPost['onglet'] == "WITHOUT") {
$sql['ARG'] = array($values['ivalue']['DEFAULT_CATEGORY']);
if (isset($sql)) {
- $sql['SQL'] .= " GROUP BY CONCAT(s.NAME_ID,'_', s.VERSION_ID)";
+ $sql['SQL'] .= " GROUP BY s.NAME_ID, s.VERSION_ID";
if ($sql_fin['SQL'] != '') {
$sql['SQL'] .= $sql_fin['SQL'];
$sql['ARG'] = $softCat->array_merge_values($sql['ARG'], $sql_fin['ARG']);
@@ -226,7 +226,7 @@ else {
$sql['ARG'] = array($protectedPost['onglet']);
if (isset($sql)) {
- $sql['SQL'] .= " GROUP BY CONCAT(s.NAME_ID,'_', s.VERSION_ID)";
+ $sql['SQL'] .= " GROUP BY s.NAME_ID, s.VERSION_ID";
if ($sql_fin['SQL'] != '') {
$sql['SQL'] .= $sql_fin['SQL'];
$sql['ARG'] = $softCat->array_merge_values($sql['ARG'], $sql_fin['ARG']);
--- a/ocsreports/plugins/main_sections/ms_computer/ms_computer_views.php
+++ b/ocsreports/plugins/main_sections/ms_computer/ms_computer_views.php
@@ -69,7 +69,7 @@ function show_computer_actions($computer){
echo '</h3>';
echo " ";
- if ($_SESSION['OCS']['profile']->getRestriction('WOL', 'NO') == "NO") {
+ if ($_SESSION['OCS']['profile']->getRestriction('WOL', 'NO') == "NO" && isset($protectedGet['cat']) && $protectedGet['cat'] == 'admin') {
echo "<button class='btn btn-action' OnClick='confirme(\"\",\"WOL\",\"bandeau\",\"WOL\",\"" . $l->g(1283) . "\");'>WOL</button> ";
}
echo "</div>";
--- a/ocsreports/plugins/main_sections/ms_config/ms_snmp_config.php
+++ b/ocsreports/plugins/main_sections/ms_config/ms_snmp_config.php
@@ -79,19 +79,19 @@ if($protectedPost['onglet'] == 'SNMP_RULE') {
// Remove type
$result_remove = $snmp->delete_type($protectedPost['SUP_PROF']);
unset($protectedPost['SUP_PROF']);
- if($result_remove == true){
+ if($result_remove == 0){
msg_success($l->g(572));
}else{
- msg_error($l->g(573));
+ msg_error($l->g($result_remove));
}
}
if(isset($protectedPost['create_type'])) {
$result = $snmp->create_type($protectedPost['type_name'], $protectedPost['condition_oid'], $protectedPost['condition_value']);
- if($result == true){
+ if($result == 0){
msg_success($l->g(572));
}else{
- msg_error($l->g(573));
+ msg_error($l->g($result));
}
unset($protectedPost['create_type']);
}
@@ -133,19 +133,19 @@ if($protectedPost['onglet'] == 'SNMP_LABEL') {
// Remove type
$result_remove = $snmp->delete_label($protectedPost['SUP_PROF']);
unset($protectedPost['SUP_PROF']);
- if($result_remove == true){
+ if($result_remove == 0){
msg_success($l->g(572));
}else{
- msg_error($l->g(573));
+ msg_error($l->g($result_remove));
}
}
if(isset($protectedPost['create_label'])) {
$result = $snmp->create_label($protectedPost['label_name']);
- if($result == true){
+ if($result == 0){
msg_success($l->g(572));
}else{
- msg_error($l->g(573));
+ msg_error($l->g($result));
}
unset($protectedPost['create_label']);
}
@@ -183,19 +183,19 @@ if($protectedPost['onglet'] == 'SNMP_TYPE') {
// Remove config
$result_remove = $snmp->delete_config($protectedPost['SUP_PROF']);
unset($protectedPost['SUP_PROF']);
- if($result_remove == true){
+ if($result_remove == 0){
msg_success($l->g(572));
}else{
- msg_error($l->g(573));
+ msg_error($l->g($result_remove));
}
}
if(isset($protectedPost['update_snmp'])) {
$result = $snmp->snmp_config($protectedPost['type_id'], $protectedPost['label_id'], $protectedPost['oid'], $protectedPost['reconciliation']);
- if($result == true){
+ if($result == 0){
msg_success($l->g(572));
}else{
- msg_error($l->g(573));
+ msg_error($l->g($result));
}
unset($protectedPost['update_snmp']);
}
@@ -264,10 +264,10 @@ if($protectedPost['onglet'] == 'SNMP_MIB') {
// Remove config
$result_remove = $snmp->delete_config($protectedPost['SUP_PROF']);
unset($protectedPost['SUP_PROF']);
- if($result_remove == true){
+ if($result_remove == 0){
msg_success($l->g(572));
}else{
- msg_error($l->g(573));
+ msg_error($l->g($result_remove));
}
}
--- a/ocsreports/plugins/main_sections/ms_console/ms_console.php
+++ b/ocsreports/plugins/main_sections/ms_console/ms_console.php
@@ -185,7 +185,7 @@ $tab_options['ARG_SQL'] = $query['ARG'];
$querygroup = $query['SQL'];
-$querygroup .= " from hardware h,groups g ";
+$querygroup .= " from hardware h, `groups` g ";
$querygroup .= "where g.hardware_id=h.id and h.deviceid = '_SYSTEMGROUP_' ";
$querygroup .= " and ((g.request is not null and trim(g.request) != '')
--- a/ocsreports/plugins/main_sections/ms_cve_correspondance/ms_cve_correspondance.php
+++ b/ocsreports/plugins/main_sections/ms_cve_correspondance/ms_cve_correspondance.php
@@ -97,10 +97,18 @@ if($protectedPost['onglet'] == "NEW_CORR") {
if($protectedPost['onglet'] == "LIST_CORR") {
//delete regex
if (is_defined($protectedPost['SUP_PROF'])) {
- $reqDcatall = "DELETE FROM cve_search_correspondance WHERE ID = ".$protectedPost['SUP_PROF'];
+ $reqDcatall = 'DELETE FROM cve_search_correspondance WHERE NAME_REG = "'.$protectedPost['SUP_PROF'].'"';
mysqli_query($_SESSION['OCS']["writeServer"], $reqDcatall) or die(mysqli_error($_SESSION['OCS']["writeServer"]));
unset($protectedPost['SUP_PROF']);
- }
+ } else if (isset($protectedPost['del_check']) and $protectedPost['del_check'] != '') {
+ // delete multiple selected rows
+ $ids = explode(',', $protectedPost['del_check']);
+ foreach ($ids as $id) {
+ $reqDcatall = 'DELETE FROM cve_search_correspondance WHERE ID = '.$id;
+ mysqli_query($_SESSION['OCS']["writeServer"], $reqDcatall) or die(mysqli_error($_SESSION['OCS']["writeServer"]));
+ }
+ $tab_options['CACHE'] = 'RESET';
+ }
$sql['SQL'] = 'SELECT * FROM cve_search_correspondance';
@@ -110,8 +118,9 @@ if($protectedPost['onglet'] == "LIST_CORR") {
$l->g(1477) => 'NAME_RESULT',
);
- $list_fields['SUP'] = 'ID';
- $list_col_cant_del = array('SUP' => 'SUP');
+ $list_fields['SUP'] = 'NAME_REG';
+ $list_fields['CHECK'] = 'ID';
+ $list_col_cant_del = array('SUP' => 'SUP', 'CHECK' => 'CHECK');
$default_fields = $list_fields;
$list_col_cant_del = $default_fields;
$tab_options['ARG_SQL'] = $sql['ARG'];
@@ -119,6 +128,7 @@ if($protectedPost['onglet'] == "LIST_CORR") {
$tab_options['table_name'] = $form_name;
$result = ajaxtab_entete_fixe($list_fields, $default_fields, $tab_options, $list_col_cant_del);
+ del_selection($form_name);
}
echo '</div>';
--- a/ocsreports/plugins/main_sections/ms_cve_search/ms_cve_search.php
+++ b/ocsreports/plugins/main_sections/ms_cve_search/ms_cve_search.php
@@ -141,7 +141,7 @@ if($cve->CVE_ACTIVE != 1){
$tab_options['LIEN_CHAMP']['computer'] = 'computerid';
$tab_options['LBL']['computer'] = $l->g(23);
$tab_options['LIEN_LBL']['Link'] = ' ';
- $tab_options['LIEN_CHAMP']['Link'] = 'Link';
+ $tab_options['LIEN_CHAMP']['Link'] = 'LINK';
$tab_options['LBL']['Link'] = $l->g(1467);
$tab_options['ARG_SQL'] = $sql['ARG'];
$tab_options['form_name'] = $form_name;
--- a/ocsreports/plugins/main_sections/ms_dict/ms_dict.php
+++ b/ocsreports/plugins/main_sections/ms_dict/ms_dict.php
@@ -232,9 +232,12 @@ if ($protectedPost['onglet'] == 'NEW') {
$querydico .= ' count(NAME) as ' . $value . ',';
}
}
+
$querydico = substr($querydico, 0, -1);
$querydico .= " from software_name
- where name in (" . $list_soft . ") and name != ''
+ where name != ''
+ and name not in (select extracted name from dico_soft)
+ and name not in (select extracted name from dico_ignored)
group by name ";
}
/* * *****************************************************CAS OF IGNORED****************************************************** */
--- a/ocsreports/plugins/main_sections/ms_ipdiscover/ms_admin_ipdiscover.php
+++ b/ocsreports/plugins/main_sections/ms_ipdiscover/ms_admin_ipdiscover.php
@@ -73,6 +73,7 @@ if ($protectedPost['onglet'] == 'ADMIN_RSX') {
$url_show_ipdiscover = 'index.php?function=show_ipdiscover';
if (!$method) {
+
if (is_defined($protectedPost['SUP_PROF'])) {
$ipdiscover->delete_subnet($protectedPost['SUP_PROF']);
$tab_options['CACHE'] = 'RESET';
@@ -147,6 +148,8 @@ if ($protectedPost['onglet'] == 'ADMIN_RSX') {
$list_subnet = array();
}
+ $is_tag_linked = look_config_default_values('IPDISCOVER_LINK_TAG_NETWORK');
+
$list_subnet = array(0 => "") + $list_subnet;
$list_tag = $ipdiscover->get_tag();
@@ -159,7 +162,7 @@ if ($protectedPost['onglet'] == 'ADMIN_RSX') {
'ADD_SX_RSX' => $protectedPost['ADD_SX_RSX']
);
- $ipdiscover->form_add_subnet($title, $default_values, $form_name);
+ $ipdiscover->form_add_subnet($title, $default_values, $form_name, $is_tag_linked['ivalue']['IPDISCOVER_LINK_TAG_NETWORK']);
} else {
$sql = "SELECT NETID, NAME, ID, MASK, TAG, CONCAT(NETID,IFNULL(TAG, '')) as supsub FROM subnet";
@@ -208,11 +211,11 @@ if ($protectedPost['onglet'] == 'ADMIN_TYPE') {
}
}
- if ($protectedPost['MODIF'] != '') {
+ if (!empty($protectedPost['MODIF'])) {
echo "<input type='hidden' name='MODIF' id='MODIF' value='" . $protectedPost['MODIF'] . "'";
}
- if (isset($protectedPost['ADD_TYPE']) || $protectedPost['MODIF']) {
- if ($protectedPost['MODIF']) {
+ if (isset($protectedPost['ADD_TYPE']) || !empty($protectedPost['MODIF'])) {
+ if (!empty($protectedPost['MODIF'])) {
$info = $ipdiscover->find_info_type('', $protectedPost['MODIF']);
$protectedPost['TYPE_NAME'] = $info->NAME;
}
--- a/ocsreports/plugins/main_sections/ms_plugins/functions_check.php
+++ /dev/null
@@ -1,222 +0,0 @@
-<?php
-/*
- * Copyright 2005-2016 OCSInventory-NG/OCSInventory-ocsreports contributors.
- * See the Contributors file for more details about them.
- *
- * This file is part of OCSInventory-NG/OCSInventory-ocsreports.
- *
- * OCSInventory-NG/OCSInventory-ocsreports is free software: you can redistribute
- * it and/or modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 2 of the License,
- * or (at your option) any later version.
- *
- * OCSInventory-NG/OCSInventory-ocsreports is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with OCSInventory-NG/OCSInventory-ocsreports. if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-/**
- * This function extracts the archive content and
- * puts it in the ocs reports for initialization.
- */
-function install($archiveName) {
- if (file_exists(PLUGINS_DL_DIR . $archiveName)) {
- $archive = new ZipArchive();
- $archive->open(PLUGINS_DL_DIR . $archiveName);
- $arrayplugin = explode(".", $archiveName);
- $plugindir = $arrayplugin[0];
- if (!file_exists(MAIN_SECTIONS_DIR . "ms_" . $plugindir)) {
- $archive->extractTo(MAIN_SECTIONS_DIR . "ms_" . $plugindir);
- $archive->close();
- return true;
- } else {
- return false;
- }
- }
-}
-
-/**
- * This function checks if the plugin is already in the DATABASE and installed.
- * If not an entry is created in the table "plugins" with the plugins infos.
- */
-function check($plugarray) {
-
- $conn = new PDO('mysql:host=' . SERVER_WRITE . ';port=' . SERVER_PORT . ';dbname=' . DB_NAME . ';charset=utf8', COMPTE_BASE, PSWD_BASE);
-
- foreach ($plugarray as $value) {
-
- $query = $conn->query("SELECT EXISTS( SELECT * FROM `plugins` WHERE name = '" . $value . "' ) AS name_exists");
- $anwser = $query->fetch();
-
- // If the plugin isn't in the database ... add it
- if ($anwser[0] == false) {
- if (file_exists(MAIN_SECTIONS_DIR . "ms_" . $value . "/install.php")) {
- require MAIN_SECTIONS_DIR . "ms_" . $value . "/install.php";
-
- if (!function_exists("plugin_version_" . $value) || !function_exists("plugin_init_" . $value) || !function_exists("plugin_delete_" . $value)) {
-
- rrmdir(MAIN_SECTIONS_DIR . "ms_" . $value);
- return false;
- }
-
- // Retrieve infos from the plugin_version_plugname functions and add it to the database
-
- $fonc = "plugin_version_" . $value;
- $infoplugin = $fonc();
-
- $conn->query("INSERT INTO `" . DB_NAME . "`.`plugins` (`id`, `name`, `version`, `licence`, `author`, `verminocs`, `activated`, `reg_date`)
- VALUES (NULL, '" . $infoplugin['name'] . "', '" . $infoplugin['version'] . "', '" . $infoplugin['license'] . "', '" . $infoplugin['author'] . "', '" . $infoplugin['verMinOcs'] . "', '1', CURRENT_TIMESTAMP);");
-
- // Initialize the plugins requirement (New menus, Set permissions etc etc)
- $init = "plugin_init_" . $value;
- $infoplugin = $init();
-
- return true;
- } else {
- rrmdir(MAIN_SECTIONS_DIR . "ms_" . $value);
-
- return false;
- }
- }
- }
-}
-
-/**
- * Scan the DL plugins dir.
- * If the plugin isn't installed in the ocsreports, this function call the "install" function
- */
-function scan_downloaded_plugins() {
- if (!file_exists(PLUGINS_DL_DIR)) {
- mkdir(PLUGINS_DL_DIR, '0775', true);
- }
-
- // Scan plugins download directory
- $directory = PLUGINS_DL_DIR;
- $scanned_directory = array_diff(scandir($directory), array('..', '.', 'README'));
-
- return $scanned_directory;
-}
-
-/**
- * This function checks and returns all plugins installed in the OCS Reports...
- *
- * @return ArrayObject
- */
-function scan_for_plugins() {
- $scanned_plugins = array_diff(scandir(MAIN_SECTIONS_DIR), array('img', 'ms_all_soft', 'ms_debug', 'ms_groups', 'ms_multi_search', 'ms_stats', 'ms_computer', 'ms_dict', 'ms_help', 'ms_plugins', 'ms_search_soft', 'ms_teledeploy', 'ms_admininfo', 'ms_config', 'ms_doubles', 'ms_ipdiscover', 'ms_regconfig', 'ms_server_infos', 'ms_upload_file', 'ms_all_computers', 'ms_console', 'ms_export', 'ms_logs', 'ms_repart_tag', 'ms_snmp', 'ms_users', '.', '..'));
-
- $plugins_name = array();
-
- foreach ($scanned_plugins as $value) {
- $exp = explode("_", $value);
- $plugins_name[] = $exp[1];
- }
-
- return $plugins_name;
-}
-
-/**
- * This function checks if a cd_pluginame dir exists.
- * In that case the cd_pluginame dir is moved into computer_detail directory
- */
-function mv_computer_detail($name) {
- if (file_exists($old = MAIN_SECTIONS_DIR . "ms_" . $name . "/cd_" . $name)) {
- $new = PLUGINS_DIR . "/computer_detail/cd_" . $name;
- rename($old, $new);
- }
-}
-
-/**
- * This function creates a plugin archive for the server side part of a plugin which contains the map.pm
- * This part will be downloaded and installed by the communication server.
- */
-function mv_server_side($name) {
- $dir = MAIN_SECTIONS_DIR . "ms_" . $name . "/APACHE/";
-
- if (file_exists($dir)) {
-
- $archive = new ZipArchive();
- $archive->open(PLUGINS_SRV_SIDE . $name . ".zip", ZipArchive::CREATE);
-
- $scanned_directory = array_diff(scandir($dir), array('..', '.', 'README'));
-
- foreach ($scanned_directory as $value) {
- $archive->addFile($dir . $value, $value);
- }
-
- $archive->close();
- rrmdir($dir);
-
- return true;
- } else {
- return false;
- }
-}
-
-/**
- * This function checks for required php dependencies.
- * Can't install plugin if not installed
- */
-function checkDependencies() {
- global $l;
-
- $missing_module = false;
- $str_msg = "";
-
- $modules_to_check = array(
- "ZipArchive"
- );
-
- foreach ($modules_to_check as $value) {
- if (!class_exists($value)) {
- $missing_module = true;
- $str_msg .= " - " . $value . "<br>";
- }
- }
-
- if ($missing_module == true) {
- msg_error($l->g(6007) . "<br>" . $str_msg);
- return false;
- } else {
- return true;
- }
-}
-
-/**
- * This function checks if directories are writable.
- * Can't install plugin if not writable
- */
-function checkWritable() {
- global $l;
-
- $missing_permissions = false;
- $str_msg = "";
-
- $sup_writable_dir = array(
- CD_CONFIG_DIR,
- CONFIG_DIR,
- PLUGINS_DIR . "language",
- MAIN_SECTIONS_DIR,
- PLUGINS_SRV_SIDE
- );
-
- foreach ($sup_writable_dir as $value) {
- if (!is_writable($value)) {
- $missing_permissions = true;
- $str_msg .= " - " . $value . "<br>";
- }
- }
-
- if ($missing_permissions == true) {
- msg_error($l->g(6008) . "<br>" . $str_msg);
- return false;
- } else {
- return true;
- }
-}
--- a/ocsreports/plugins/main_sections/ms_teledeploy/ms_custom_pack.php
+++ b/ocsreports/plugins/main_sections/ms_teledeploy/ms_custom_pack.php
@@ -26,8 +26,44 @@ if (AJAX) {
ob_start();
}
+
require_once('require/function_telediff.php');
require_once('require/function_search.php');
+require_once('plugins/main_sections/ms_computer/ms_computer_views.php');
+require_once('require/function_machine.php');
+
+
+$ids = $protectedPost['systemid'] = $protectedGet['idchecked'];
+
+if (strpos($ids, ',') == true) {
+ $text_selection = $l->g(9201);
+ $ids = explode(',', $ids);
+} else {
+ $ids = (array)$ids;
+ if (info($protectedGet, $ids)->DEVICEID == '_SYSTEMGROUP_') {
+ $text_selection = $l->g(9202);
+ } else {
+ $text_selection = $l->g(9200);
+ }
+}
+
+foreach ($ids as $value) {
+ $protectedPost['systemid'] = $value;
+ $item = info($protectedGet, $protectedPost['systemid']);
+ $name .= " / ".$item->NAME." / ";
+}
+
+echo "<h3> $text_selection : </h3>";
+
+?>
+
+<?php
+ echo "<div class='col col-md-10 col-md-offset-1' style='overflow-y: auto; height:50px; width:80%%;'>
+ {$name}
+ </div>"
+?>
+
+<?php
$form_name = "pack_affect";
$table_name = "LIST_PACK_SEARCH";
$tab_options = $protectedPost;
--- a/ocsreports/plugins/main_sections/ms_teledeploy/ms_tele_popup_active.php
+++ b/ocsreports/plugins/main_sections/ms_teledeploy/ms_tele_popup_active.php
@@ -125,7 +125,7 @@ if (!isset($info_id['ERROR'])) {
$type_field = array(0, 0);
$value_field = array($protectedPost['FILE_SERV'], $protectedPost['HTTPS_SERV']);
} else {
- if (count($groupListServers) == 0) {
+ if (empty($groupListServers)) {
msg_error($l->g(660));
} else {
$tab_name = array($l->g(651), $l->g(470));
--- a/ocsreports/plugins/main_sections/ms_upload_file/ms_local.php
+++ /dev/null
@@ -1,215 +0,0 @@
-<?php
-/*
- * Copyright 2005-2016 OCSInventory-NG/OCSInventory-ocsreports contributors.
- * See the Contributors file for more details about them.
- *
- * This file is part of OCSInventory-NG/OCSInventory-ocsreports.
- *
- * OCSInventory-NG/OCSInventory-ocsreports is free software: you can redistribute
- * it and/or modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 2 of the License,
- * or (at your option) any later version.
- *
- * OCSInventory-NG/OCSInventory-ocsreports is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with OCSInventory-NG/OCSInventory-ocsreports. if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-require_once('require/function_files.php');
-$form_name="insert_computers";
-$data_on['FILE']=$l->g(288);
-$data_on['MANUEL']=$l->g(1258);
-echo open_form($form_name, '', '', 'form-horizontal');
-//$protectedPost['onglet']='FILE';
-show_tabs($data_on,$form_name,"onglet",true);
-echo "<div class='col col-md-10' >";
-
-if ($protectedPost['onglet'] == 'FILE'){
- ?>
- <script language='javascript'>
-
- function getext(filename){
- var parts = filename.split('.');
- return(parts[(parts.length-1)]);
- }
-
- function namefile(filename){
- var parts = filename.split('.');
- return(parts[0]);
- }
-
- function verif_file_format(champ){
- var ExtList=['ocs','OCS','xml','XML'];
- filename = document.getElementById(champ).value.toLowerCase();
- fileExt = getext(filename);
- for (i=0; i<ExtList.length; i++)
- {
- if ( fileExt == ExtList[i] )
- {
- return (true);
- }
- }
- alert('<?php echo mysqli_real_escape_string($_SESSION['OCS']["readServer"],$l->g(559)) ?>');
- return (false);
- }
-
- </script>
- <?php
- //
- $form_name1="SEND_FILE";
- $data_config=look_config_default_values(array('LOCAL_URI_SERVER'),'',
- array('TVALUE'=>array('LOCAL_URI_SERVER'=>'http://localhost:80/ocsinventory')));
-
- $server = $data_config['tvalue']['LOCAL_URI_SERVER'];
- $array_port=explode(':',$server);
- $port_trait=array_pop($array_port);
- $array_port=explode('/',$port_trait);
- $port=$array_port[0];
- if(is_uploaded_file($_FILES['file_upload']['tmp_name'])) {
-
- $fd = fopen($_FILES['file_upload']['tmp_name'], "r");
- if ($_FILES['file_upload']['size'] != 0){
- $contents = fread($fd, filesize ($_FILES['file_upload']['tmp_name']));
- fclose($fd);
-
- $result = post_ocs_file_to_server($contents, $server, $port);
-
- if (isset($result["errno"])) {
- $errno = $result["errno"];
- $errstr = $result["errstr"];
- msg_error($l->g(344). " ". $errno . " / " . $errstr);
- }else {
- if( ! strstr ( $result[0], "200") )
- msg_error($l->g(344). " " . $result[0]);
- else {
- msg_success($l->g(287)." OK");
- }
- }
- }else
- msg_error($l->g(1244));
- }
- printEntete($l->g(560).": ".$server);
- echo close_form();
- echo "<br>";
- echo open_form($form_name1,'',"enctype='multipart/form-data' onsubmit=\"return verif_file_format('file_upload');\"", 'form-horizontal');
- formGroup('file', 'file_upload', $l->g(1048), '', '', $protectedPost['file_upload']);
-
- echo "<input name='GO' class='btn btn-success' id='GO' type='submit' value='".$l->g(13)."'>";
- echo close_form();
-}else{
- require_once('require/function_computers.php');
- require_once('require/function_admininfo.php');
- //list fields for form
- $form_fields_typeinput=array('COMPUTER_NAME_GENERIC'=>$l->g(35),
- 'SERIAL_GENERIC'=>$l->g(36),
- 'ADDR_MAC_GENERIC'=>$l->g(95));
-
-
- if (isset($protectedPost['Valid_modif'])){
- $error='';
- if (!is_numeric($protectedPost['NB_COMPUTERS']))
- $error.=$l->g(28).',';
-
- foreach ($form_fields_typeinput as $key=>$value){
- if (trim($protectedPost[$key]) == '')
- $error.=$value.',';
-
- }
-
- if ($error == ""){
- $check_trait=array();
- foreach ($protectedPost as $key=>$value){
- if ($value != ''){
- if (substr($key,0,7) == 'fields_' or $key == 'TAG'){
- $temp_field=explode('_',$key);
-
- //checkbox cas
- if (isset($temp_field[2])){
- $check_trait[$temp_field[0].'_'.$temp_field[1]].=$temp_field[2]."&&&";
- }else{
- $fields[]=$key;
- $values_fields[]=$value;
- }
- }
- }
- }
- //cas of checkbox
- if ($check_trait != array()){
- foreach ($check_trait as $key=>$value){
- $fields[]=$key;
- $values_fields[]=$value;
- }
- }
- /*if ($protectedPost['NB_COMPUTERS'] === 1)
- $protectedPost['NB_COMPUTERS']='';*/
- $i=0;
- while ($i < $protectedPost['NB_COMPUTERS']){
- $id_computer=insert_manual_computer($protectedPost,$protectedPost['NB_COMPUTERS']);
- if (!is_array($fields)){
- $fields[]='TAG';
- $values_fields[]='';
- }
- insertinfo_computer($id_computer,$fields,$values_fields);
- $i++;
- }
- msg_success($l->g(881));
- }else
- msg_error($l->g(684)."<br>".$error);
- }
-
- $i=0;
- $info_form['FIELDS']['name_field'][$i]='NB_COMPUTERS';
- $info_form['FIELDS']['type_field'][$i]=0;
- $info_form['FIELDS']['value_field'][$i]=($protectedPost['NB_COMPUTERS'] != '' ? $protectedPost['NB_COMPUTERS']:'1');
- $info_form['FIELDS']['tab_name'][$i]=$l->g(28);
- $config[$i]['CONFIG']['SIZE']=4 ;
- $config[$i]['CONFIG']['MAXLENGTH']=4 ;
- $other_data['COMMENT_AFTER'][$i]='';
- $config[$i]['CONFIG']['JAVASCRIPT']=$chiffres;
-
- foreach ($form_fields_typeinput as $key=>$value){
- $i++;
- $info_form['FIELDS']['name_field'][$i]=$key;
- $info_form['FIELDS']['type_field'][$i]=0;
- if ($key == 'ADDR_MAC_GENERIC')
- $info_form['FIELDS']['value_field'][$i]=(isset($protectedPost[$key])? $protectedPost[$key]:RandomMAC()) ;
- else
- $info_form['FIELDS']['value_field'][$i]=(isset($protectedPost[$key])? $protectedPost[$key]:rand()) ;
- $info_form['FIELDS']['tab_name'][$i]=$value."*";
- $config[$i]['CONFIG']['SIZE']=30;
- $other_data['COMMENT_AFTER'][$i]='_M';
- }
-
- $accountinfo_form=show_accountinfo('','COMPUTERS','5');
-
- //merge data
- $info_form['FIELDS']['name_field']=array_merge ($info_form['FIELDS']['name_field'],$accountinfo_form['FIELDS']['name_field']);
- $info_form['FIELDS']['type_field']=array_merge ($info_form['FIELDS']['type_field'],$accountinfo_form['FIELDS']['type_field']);
- $info_form['FIELDS']['value_field']=array_merge ($info_form['FIELDS']['value_field'],$accountinfo_form['FIELDS']['value_field']);
- $info_form['FIELDS']['tab_name']=array_merge ($info_form['FIELDS']['tab_name'],$accountinfo_form['FIELDS']['tab_name']);
- $config=array_merge ($config,$accountinfo_form['CONFIG']);
- $other_data['COMMENT_AFTER']=array_merge ($other_data['COMMENT_AFTER'],$accountinfo_form['COMMENT_AFTER']);
-
-
- $tab_typ_champ=show_field($info_form['FIELDS']['name_field'],$info_form['FIELDS']['type_field'],$info_form['FIELDS']['value_field']);
- foreach ($config as $key=>$value){
- $tab_typ_champ[$key]['CONFIG']=$value['CONFIG'];
- $tab_typ_champ[$key]['COMMENT_AFTER']=$other_data['COMMENT_AFTER'][$key];
- }
-
-
- if (isset($tab_typ_champ)){
- modif_values($info_form['FIELDS']['tab_name'],$tab_typ_champ,$tab_hidden, array(
- 'show_frame' => false
- ));
- }
-
- echo "</div>";
- echo close_form();
-}
-?>
--- a/ocsreports/require/console/Console.php
+++ b/ocsreports/require/console/Console.php
@@ -47,7 +47,7 @@
if(strpos($item['USERAGENT'], 'unix') !== false) {
$machine['unix'] = intval($item['nb']);
$machine['all'] = $machine['all'] + intval($item['nb']);
- } elseif(strpos($item['USERAGENT'], 'WINDOWS') !== false) {
+ } elseif(strpos(strtoupper($item['USERAGENT']), 'WINDOWS') !== false) {
$machine['windows'] = intval($item['nb']);
$machine['all'] = $machine['all'] + intval($item['nb']);
} elseif(strpos($item['USERAGENT'], 'Android') !== false) {
--- a/ocsreports/require/cve/Cve.php
+++ b/ocsreports/require/cve/Cve.php
@@ -227,7 +227,7 @@ class Cve
foreach($regs as $key => $reg) {
$reg_publish = $this->stringMatchWithWildcard(trim($values['VENDOR']), $reg['NAME_REG']);
- $reg_name = $this->stringMatchWithWildcard($reg['NAME_REG'], trim($values['NAME']));
+ $reg_name = $this->stringMatchWithWildcard(trim($values['NAME']), $reg['NAME_REG']);
if($reg_name || $reg_publish) {
if($reg['NAME_RESULT'] != "") {
@@ -261,10 +261,11 @@ class Cve
$regex = str_replace(
array("\*", "\?"), // wildcard chars
array('.*','.'), // regexp chars
+ array("\\/", ""),
preg_quote($pattern)
);
- return preg_match('/^'.$regex.'$/is', $source);
+ return preg_match('/^'.$regex.'$/is', strtolower($source));
}
/**
@@ -312,7 +313,7 @@ class Cve
foreach($array as $keys => $values) {
if(isset($values["vulnerable_configuration"])) {
foreach($values["vulnerable_configuration"] as $keys => $vuln){
- if((strpos($vuln, $vuln_conf) !== false) || (strpos($vuln, $vuln_conf_all) !== false)){
+ if((strpos(strval($vuln), strval($vuln_conf)) !== false) || (strpos(strval($vuln), strval($vuln_conf_all)) !== false)){
$result = $this->get_infos_cve($values['cvss'], $values['id'], $values['references'][0]);
if($result != null) {
if($this->CVE_VERBOSE == 1) {
@@ -474,10 +475,10 @@ class Cve
while ($item = mysqli_fetch_array($result)) {
$list[$item['NAME_ID']]['NAME'] = $item['NAME'];
- $list[$item['NAME_ID']][$item['VERSION_ID']]['VERSION'] = $item['VERSION'];
- $list[$item['NAME_ID']][$item['VERSION_ID']]['CVSS'] = $item['CVSS'];
- $list[$item['NAME_ID']][$item['VERSION_ID']]['CVE'] = $item['CVE'];
- $list[$item['NAME_ID']][$item['VERSION_ID']]['LINK'] = $item['LINK'];
+ $list[$item['NAME_ID']][$item['CVE']]['VERSION'] = $item['VERSION'];
+ $list[$item['NAME_ID']][$item['CVE']]['CVSS'] = $item['CVSS'];
+ $list[$item['NAME_ID']][$item['CVE']]['CVE'] = $item['CVE'];
+ $list[$item['NAME_ID']][$item['CVE']]['LINK'] = $item['LINK'];
}
return $list;
--- a/ocsreports/require/function_computers.php
+++ b/ocsreports/require/function_computers.php
@@ -26,7 +26,7 @@
* @param id Hardware identifier to be locked
*/
function lock($id) {
- $reqClean = "DELETE FROM locks WHERE unix_timestamp(since)<(unix_timestamp(NOW())-3600)";
+ $reqClean = "DELETE FROM locks WHERE since<(date_sub(NOW(), interval 3600 second))";
mysql2_query_secure($reqClean, $_SESSION['OCS']["writeServer"]);
$reqLock = "INSERT INTO locks(hardware_id) VALUES ('%s')";
--- a/ocsreports/require/function_config_generale.php
+++ b/ocsreports/require/function_config_generale.php
@@ -388,7 +388,7 @@ function update_default_value($POST) {
'IT_SET_PERIM', 'IT_SET_MAIL', 'IT_SET_MAIL_ADMIN', 'SNMP', 'DOWNLOAD_REDISTRIB', 'SNMP_INVENTORY_DIFF', 'TAB_CACHE',
'INVENTORY_CACHE_ENABLED', 'USE_NEW_SOFT_TABLES', 'WARN_UPDATE', 'INVENTORY_ON_STARTUP', 'DEFAULT_CATEGORY', 'ADVANCE_CONFIGURATION',
'INVENTORY_SAAS_ENABLED', 'ACTIVE_NEWS', 'VULN_CVESEARCH_ENABLE','VULN_CVESEARCH_VERBOSE', 'VULN_CVESEARCH_ALL', 'VULN_CVE_EXPIRE_TIME',
- 'IPDISCOVER_LINK_TAG_NETWORK');
+ 'IPDISCOVER_LINK_TAG_NETWORK','IPDISCOVER_PURGE_OLD','IPDISCOVER_PURGE_VALIDITY_TIME');
//tableau des champs ou il faut interpréter la valeur retourner et mettre à jour tvalue
$array_interprete_tvalue = array('DOWNLOAD_REP_CREAT' => 'DOWNLOAD_REP_CREAT_edit', 'DOWNLOAD_PACK_DIR' => 'DOWNLOAD_PACK_DIR_edit',
'IPDISCOVER_IPD_DIR' => 'IPDISCOVER_IPD_DIR_edit', 'LOG_DIR' => 'LOG_DIR_edit',
@@ -798,7 +798,9 @@ function pageipdiscover($advance) {
'IPDISCOVER_MAX_ALIVE' => 'IPDISCOVER_MAX_ALIVE',
'IPDISCOVER_NO_POSTPONE' => 'IPDISCOVER_NO_POSTPONE',
'IPDISCOVER_USE_GROUPS' => 'IPDISCOVER_USE_GROUPS',
- 'IPDISCOVER_LINK_TAG_NETWORK' => 'IPDISCOVER_LINK_TAG_NETWORK'
+ 'IPDISCOVER_LINK_TAG_NETWORK' => 'IPDISCOVER_LINK_TAG_NETWORK',
+ 'IPDISCOVER_PURGE_OLD' => 'IPDISCOVER_PURGE_OLD',
+ 'IPDISCOVER_PURGE_VALIDITY_TIME' => 'IPDISCOVER_PURGE_VALIDITY_TIME',
);
} else {
$champs = array('IPDISCOVER' => 'IPDISCOVER');
@@ -823,6 +825,8 @@ function pageipdiscover($advance) {
ligne('IPDISCOVER_NO_POSTPONE', $l->g(747), 'radio', array(1 => 'ON', 0 => 'OFF', 'VALUE' => $values['ivalue']['IPDISCOVER_NO_POSTPONE']));
ligne('IPDISCOVER_USE_GROUPS', $l->g(748), 'radio', array(1 => 'ON', 0 => 'OFF', 'VALUE' => $values['ivalue']['IPDISCOVER_USE_GROUPS']));
ligne('IPDISCOVER_LINK_TAG_NETWORK', $l->g(1457), 'radio', array(1 => 'ON', 0 => 'OFF', 'VALUE' => $values['ivalue']['IPDISCOVER_LINK_TAG_NETWORK']));
+ ligne('IPDISCOVER_PURGE_OLD', $l->g(1560), 'radio', array(1 => 'ON', 0 => 'OFF', 'VALUE' => $values['ivalue']['IPDISCOVER_PURGE_OLD']));
+ ligne('IPDISCOVER_PURGE_VALIDITY_TIME', $l->g(1561), 'input', array('VALUE' => $values['ivalue']['IPDISCOVER_PURGE_VALIDITY_TIME'], 'END' => $l->g(496), 'SIZE' => 1, 'MAXLENGTH' => 3, 'JAVASCRIPT' => $numeric), '', '', $sup1);
} else {
ligne('IPDISCOVER', $l->g(425), 'radio', array('ON' => 'ON', 'OFF' => 'OFF', 'VALUE' => $values['ivalue']['IPDISCOVER']), array('HIDDEN' => 'ON', 'HIDDEN_VALUE' => $ipdiscover, 'END' => $l->g(729), 'JAVASCRIPT' => $numeric));
}
--- a/ocsreports/require/function_table_html.php
+++ b/ocsreports/require/function_table_html.php
@@ -1677,14 +1677,20 @@ function ajaxgestionresults($resultDetails,$list_fields,$tab_options){
break;
case "SUP":
if ( $value_of_field!= ' '){
- if (isset($tab_options['LBL_POPUP'][$key])){
- if (isset($row[$tab_options['LBL_POPUP'][$key]]))
+ if (isset($tab_options['LBL_POPUP'][$key])) {
+ if (isset($row[$tab_options['LBL_POPUP'][$key]])) {
$lbl_msg=$l->g(640)." ".$row_temp[$tab_options['LBL_POPUP'][$key]];
- else
+ } else {
$lbl_msg=$tab_options['LBL_POPUP'][$key];
- }else
+ }
+ } else {
$lbl_msg=$l->g(640)." ".$value_of_field;
- $row[$key]="<a href=# OnClick='confirme(\"\",\"".htmlspecialchars($value_of_field, ENT_QUOTES)."\",\"".$form_name."\",\"SUP_PROF\",\"".htmlspecialchars($lbl_msg, ENT_QUOTES)."\");'><span class='glyphicon glyphicon-remove'></span></a>";
+ }
+ if($form_name == "admins" && $_SESSION['OCS']["loggeduser"] == htmlspecialchars($value_of_field, ENT_QUOTES)) {
+ // Do nothing
+ } else {
+ $row[$key]="<a href=# OnClick='confirme(\"\",\"".htmlspecialchars($value_of_field, ENT_QUOTES)."\",\"".$form_name."\",\"SUP_PROF\",\"".htmlspecialchars($lbl_msg, ENT_QUOTES)."\");'><span class='glyphicon glyphicon-remove'></span></a>";
+ }
}
break;
case "NAME":
--- a/ocsreports/require/function_telediff.php
+++ b/ocsreports/require/function_telediff.php
@@ -416,6 +416,7 @@ function create_pack($sql_details, $info_details, $modif = "true") {
if ($size = @filesize($fname)) {
$handle = fopen($fname, "rb");
$read = 0;
+ if(!isset($sql_details['nbfrags'])) $sql_details['nbfrags'] = 1;
for ($i = 1; $i < $sql_details['nbfrags']; $i++) {
$contents = fread($handle, $size / $sql_details['nbfrags']);
$read += strlen($contents);
--- a/ocsreports/require/ipdiscover/Ipdiscover.php
+++ b/ocsreports/require/ipdiscover/Ipdiscover.php
@@ -63,10 +63,15 @@ class Ipdiscover
return $row;
}
- public function form_add_subnet($title = '', $default_value, $form) {
+ public function form_add_subnet($title = '', $default_value, $form, $is_tag_linked) {
global $l, $pages_refs;
- $name_field = array("RSX_NAME", "ID_NAME", "ADD_TAG", "ADD_IP", "ADD_SX_RSX");
+ if($is_tag_linked){
+ $name_field = array("RSX_NAME", "ID_NAME", "ADD_TAG", "ADD_IP", "ADD_SX_RSX");
+ }else{
+ $name_field = array("RSX_NAME", "ID_NAME", "ADD_IP", "ADD_SX_RSX");
+ }
+
if (isset($_SESSION['OCS']["ipdiscover_id"])) {
$lbl_id = $_SESSION['OCS']["ipdiscover_id"];
@@ -74,15 +79,33 @@ class Ipdiscover
$lbl_id = $l->g(305) . ":";
}
- $tab_name = array($l->g(304) . " :", $lbl_id . " :", "TAG :", $l->g(34) . " :", $l->g(208) . " :");
+ if($is_tag_linked){
+ $tab_name = array($l->g(304) . " :", $lbl_id . " :", "TAG :", $l->g(34) . " :", $l->g(208) . " :");
+ }else{
+ $tab_name = array($l->g(304) . " :", $lbl_id . " :", $l->g(34) . " :", $l->g(208) . " :");
+ }
+
- if ($title == $l->g(931)) {
- $type_field = array(0, 2, 2, 13, 0);
- } else {
- $type_field = array(0, 2, 2, 0, 0);
+ if($is_tag_linked){
+ if ($title == $l->g(931)) {
+ $type_field = array(0, 2, 2, 13, 0);
+ } else {
+ $type_field = array(0, 2, 2, 0, 0);
+ }
+ }else{
+ if ($title == $l->g(931)) {
+ $type_field = array(0, 2, 13, 0);
+ } else {
+ $type_field = array(0, 2, 0, 0);
+ }
}
- $value_field = array($default_value['RSX_NAME'], $default_value['ID_NAME'], $default_value['ADD_TAG'], $default_value['ADD_IP'], $default_value['ADD_SX_RSX']);
+ if($is_tag_linked){
+ $value_field = array($default_value['RSX_NAME'], $default_value['ID_NAME'], $default_value['ADD_TAG'], $default_value['ADD_IP'], $default_value['ADD_SX_RSX']);
+ }else{
+ $value_field = array($default_value['RSX_NAME'], $default_value['ID_NAME'], $default_value['ADD_IP'], $default_value['ADD_SX_RSX']);
+ }
+
$tab_typ_champ = show_field($name_field, $type_field, $value_field);
@@ -300,12 +323,9 @@ class Ipdiscover
exec($command);
}
- /* Returns all known subnets except those blacklisted */
public function find_all_subnet($dpt_choise = '') {
if ($dpt_choise != '') {
- return array_filter(array_keys($_SESSION['OCS']["ipdiscover"][$dpt_choise]), function($k) {
- return !(array_key_exists($k, $_SESSION['OCS']["ipdiscover"]["--Blacklist--"]));
- });
+ return array_keys($_SESSION['OCS']["ipdiscover"][$dpt_choise]);
}
if (isset($_SESSION['OCS']["ipdiscover"])) {
--- a/ocsreports/require/search/AccountinfoSearch.php
+++ b/ocsreports/require/search/AccountinfoSearch.php
@@ -21,7 +21,7 @@
* MA 02110-1301, USA.
*/
-require 'require/function_admininfo.php';
+require_once 'require/function_admininfo.php';
/**
* This class implement basic behavior for accountinfo search management
--- a/ocsreports/require/search/GroupSearch.php
+++ b/ocsreports/require/search/GroupSearch.php
@@ -32,7 +32,7 @@
* @return array $table
*/
public function get_group_name() {
- $sql = 'SELECT h.NAME, h.ID FROM hardware h INNER JOIN groups g ON g.HARDWARE_ID = h.ID';
+ $sql = 'SELECT h.NAME, h.ID FROM hardware h INNER JOIN `groups` g ON g.HARDWARE_ID = h.ID';
$tableList = mysql2_query_secure($sql, $_SESSION['OCS']["readServer"]);
while ($tableInfos = mysqli_fetch_array($tableList)) {
--- a/ocsreports/require/search/Search.php
+++ b/ocsreports/require/search/Search.php
@@ -331,7 +331,11 @@
if($tableName != "hardware"){
// Generate union
- $this->searchQuery .= "INNER JOIN $tableName on hardware.id = $tableName.hardware_id ";
+ if ($tableName == "groups_cache") {
+ $this->searchQuery .= "LEFT JOIN $tableName on hardware.id = $tableName.hardware_id ";
+ } else {
+ $this->searchQuery .= "INNER JOIN $tableName on hardware.id = $tableName.hardware_id ";
+ }
}
if($tableName == SoftwareSearch::SOFTWARE_TABLE) {
@@ -1124,7 +1128,7 @@
if(empty($field[2])){
if(strpos($field[0], 'HARDWARE') !== false){
- if(!array_key_exists('HARDWARE-'.$field[1].$comp.preg_replace("/\s+/","", preg_replace("/_/","",$value)).preg_replace("/_/","",$value2),$_SESSION['OCS']['multi_search']['hardware'])){
+ if(!isset($_SESSION['OCS']['multi_search']['hardware']) || !array_key_exists('HARDWARE-'.$field[1].$comp.preg_replace("/\s+/","", preg_replace("/_/","",$value)).preg_replace("/_/","",$value2),$_SESSION['OCS']['multi_search']['hardware'])){
$_SESSION['OCS']['multi_search'] = array();
$_SESSION['OCS']['multi_search']['hardware']['HARDWARE-'.$field[1].$comp.preg_replace("/\s+/","", preg_replace("/_/","",$value)).preg_replace("/_/","",$value2)] = [
'fields' => $field[1],
@@ -1139,7 +1143,7 @@
];
}
}elseif(strpos($field[0], 'ACCOUNTINFO') !== false){
- if(!array_key_exists('ACCOUNTINFO-'.$field[1].$comp.$value,$_SESSION['OCS']['multi_search']['accountinfo'])){
+ if(!isset($_SESSION['OCS']['multi_search']['accountinfo']) || !array_key_exists('ACCOUNTINFO-'.$field[1].$comp.$value,$_SESSION['OCS']['multi_search']['accountinfo'])){
$_SESSION['OCS']['multi_search'] = array();
$_SESSION['OCS']['multi_search']['accountinfo']['ACCOUNTINFO-'.$field[1].$comp.preg_replace("/_/","",$value)] = [
'fields' => $field[1],
@@ -1148,7 +1152,7 @@
];
}
}elseif(strpos($field[0], 'NETWORKS') !== false){
- if(!array_key_exists('NETWORKS-'.$field[1].$comp.$value,$_SESSION['OCS']['multi_search']['networks'])){
+ if(!isset($_SESSION['OCS']['multi_search']['networks']) || !array_key_exists('NETWORKS-'.$field[1].$comp.$value,$_SESSION['OCS']['multi_search']['networks'])){
$_SESSION['OCS']['multi_search'] = array();
$_SESSION['OCS']['multi_search']['networks']['NETWORKS-'.$field[1].$comp.preg_replace("/_/","",$value)] = [
'fields' => $field[1],
@@ -1157,7 +1161,7 @@
];
}
}elseif(strpos($field[0], 'VIDEOS') !== false){
- if(!array_key_exists('VIDEOS-'.$field[1].$comp.$value,$_SESSION['OCS']['multi_search']['videos'])){
+ if(!isset($_SESSION['OCS']['multi_search']['videos']) || !array_key_exists('VIDEOS-'.$field[1].$comp.$value,$_SESSION['OCS']['multi_search']['videos'])){
$_SESSION['OCS']['multi_search'] = array();
$_SESSION['OCS']['multi_search']['videos']['VIDEOS-'.$field[1].$comp.preg_replace("/_/","",$value)] = [
'fields' => $field[1],
@@ -1166,7 +1170,7 @@
];
}
}elseif(strpos($field[0], 'ASSETS') !== false){
- if(!array_key_exists('ASSETS'.$value,$_SESSION['OCS']['multi_search']['hardware'])){
+ if(!isset($_SESSION['OCS']['multi_search']['hardware']) || !array_key_exists('ASSETS'.$value,$_SESSION['OCS']['multi_search']['hardware'])){
$_SESSION['OCS']['multi_search'] = array();
$_SESSION['OCS']['multi_search']['hardware']['ASSETS'.preg_replace("/_/","",$value)] = [
'fields' => 'CATEGORY_ID',
--- a/ocsreports/require/snmp/Snmp.php
+++ b/ocsreports/require/snmp/Snmp.php
@@ -36,15 +36,32 @@ class OCSSnmp
* @return boolean
*/
public function create_type($typeName, $oid, $oidString) {
-
+ // Verif if type already exists
$sql_verif = "SELECT * FROM `snmp_types` WHERE `TYPE_NAME` = '%s'";
$sql_verif_arg = array(addslashes($typeName));
$verif = mysql2_query_secure($sql_verif, $_SESSION['OCS']["readServer"], $sql_verif_arg);
+ // If oid and oid string value empty return error
+ if(trim($oid) == "" || trim($oidString) == "") {
+ return 9022;
+ }
+
if($verif->num_rows == 0) {
- $tableTypeName = str_replace(" ", "_", $typeName);
+ // Insert info table in type snmp table
+ $typeName = str_replace("'", "'", $typeName);
+ $tableTypeName = $this->cleanString($typeName);
$tableTypeName = strtolower($tableTypeName);
$tableTypeName = "snmp_".$tableTypeName;
+ $oidString = str_replace("'", "'", $oidString);
+
+ $sql = "INSERT INTO `snmp_types` (`TYPE_NAME`,`CONDITION_OID`,`CONDITION_VALUE`, `TABLE_TYPE_NAME`) VALUES ('%s','%s','%s', '%s')";
+ $sql_arg = array(addslashes($typeName), addslashes($oid), addslashes($oidString), $tableTypeName);
+
+ $result = mysql2_query_secure($sql, $_SESSION['OCS']["writeServer"], $sql_arg);
+
+ if(!$result) {
+ return 9024;
+ }
$sql_create_table = "CREATE TABLE IF NOT EXISTS `%s` (
`ID` INT(6) NOT NULL AUTO_INCREMENT,
@@ -55,21 +72,16 @@ class OCSSnmp
$result_create = mysql2_query_secure($sql_create_table, $_SESSION['OCS']["writeServer"], $sql_arg_table);
if($result_create) {
- $sql = "INSERT INTO `snmp_types` (`TYPE_NAME`,`CONDITION_OID`,`CONDITION_VALUE`, `TABLE_TYPE_NAME`) VALUES ('%s','%s','%s', '%s')";
- $sql_arg = array(addslashes($typeName), addslashes($oid), addslashes($oidString), $tableTypeName);
+ return 0;
+ } else {
+ $sql = "DELETE FROM `snmp_types` WHERE `TABLE_TYPE_NAME` = '%s'";
+ $sql_arg = array($tableTypeName);
$result = mysql2_query_secure($sql, $_SESSION['OCS']["writeServer"], $sql_arg);
-
- if($result) {
- return true;
- } else {
- return false;
- }
- } else {
- return false;
+ return 9024; // inserer erreur insertion dans la config
}
} else {
- return false;
+ return 9023;
}
}
@@ -80,6 +92,7 @@ class OCSSnmp
* @return boolean
*/
public function create_label($labelName) {
+ $labelName = $this->cleanString($labelName);
$sql_verif = "SELECT * FROM `snmp_labels` WHERE `LABEL_NAME` = '%s'";
$sql_verif_arg = array(addslashes($labelName));
$verif = mysql2_query_secure($sql_verif, $_SESSION['OCS']["readServer"], $sql_verif_arg);
@@ -91,12 +104,12 @@ class OCSSnmp
$result = mysql2_query_secure($sql, $_SESSION['OCS']["writeServer"], $sql_arg);
if($result) {
- return true;
+ return 0;
} else {
- return false;
+ return 9026;
}
} else {
- return false;
+ return 9025;
}
}
@@ -146,9 +159,9 @@ class OCSSnmp
*/
public function snmp_config($typeID, $labelID, $oid, $reconciliation = null) {
global $l;
- $result_alter_table = $this->add_label_column($typeID, $labelID, $reconciliation);
+ $result_alter_table = $this->add_label_column($typeID, $labelID, $reconciliation);
- if($result_alter_table){
+ if($result_alter_table) {
if($reconciliation != null) {
$sql = "INSERT INTO `snmp_configs` (`TYPE_ID`,`LABEL_ID`,`OID`,`RECONCILIATION`) VALUES (%s,%s,'%s','%s')";
$sql_arg = array($typeID, $labelID, addslashes($oid), 'Yes');
@@ -156,15 +169,15 @@ class OCSSnmp
$sql = "INSERT INTO `snmp_configs` (`TYPE_ID`,`LABEL_ID`,`OID`) VALUES (%s,%s,'%s')";
$sql_arg = array($typeID, $labelID, addslashes($oid));
}
-
$result = mysql2_query_secure($sql, $_SESSION['OCS']["writeServer"], $sql_arg);
+
if($result) {
- return true;
+ return 0;
} else {
- return false;
+ return 9027;
}
- }else{
- return false;
+ } else {
+ return 9027;
}
}
@@ -178,7 +191,7 @@ class OCSSnmp
private function add_label_column($typeID, $labelID, $reconciliation) {
$tableName = $this->get_table_type_drop($typeID);
$labelName = $this->get_label_drop($labelID);
-
+
$sql_alter = "ALTER TABLE `%s` ADD `%s` VARCHAR(255) NOT NULL";
$arg_alter = array($tableName, $labelName);
@@ -189,9 +202,9 @@ class OCSSnmp
$arg_unique = array($tableName, $labelName);
$result_unique = mysql2_query_secure($sql_unique, $_SESSION['OCS']["writeServer"], $arg_unique);
}
- if($result_alter){
+ if($result_alter) {
return true;
- }else{
+ } else {
return false;
}
}
@@ -203,7 +216,6 @@ class OCSSnmp
* @return boolean
*/
public function delete_type($id){
-
$result = $this->drop_table($id);
if($result){
$sqlQuery = "DELETE FROM `snmp_types` WHERE ID = %s";
@@ -215,9 +227,9 @@ class OCSSnmp
$sqlArg = [$id];
mysql2_query_secure($sqlQuery, $_SESSION['OCS']["writeServer"], $sqlArg);
- return true;
+ return 0;
}else{
- return false;
+ return 9028;
}
}
@@ -230,7 +242,7 @@ class OCSSnmp
private function drop_table($id){
$tableName = $this->get_table_type_drop($id);
- $sql_drop_table = "DROP TABLE %s";
+ $sql_drop_table = "DROP TABLE `%s`";
$arg_drop_table = array($tableName);
$result_drop = mysql2_query_secure($sql_drop_table, $_SESSION['OCS']["writeServer"], $arg_drop_table);
@@ -262,9 +274,9 @@ class OCSSnmp
$sqlArg = [$id];
$result = mysql2_query_secure($sqlQuery, $_SESSION['OCS']["writeServer"], $sqlArg);
if($result){
- return true;
+ return 0;
} else {
- return false;
+ return 9029;
}
}
}
@@ -375,12 +387,12 @@ class OCSSnmp
$sqlArg = [$id];
$result = mysql2_query_secure($sqlQuery, $_SESSION['OCS']["writeServer"], $sqlArg);
if($result){
- return true;
+ return 0;
}else{
- return false;
+ return 9030;
}
} else {
- return false;
+ return 9030;
}
}
@@ -483,4 +495,34 @@ class OCSSnmp
return $infos;
}
+ /**
+ * Clean specil characters from string
+ */
+ private function cleanString($text) {
+ $utf8 = array(
+ '/[áàâãªä]/u' => 'a',
+ '/[ÁÀÂÃÄ]/u' => 'A',
+ '/[ÍÌÎÏ]/u' => 'I',
+ '/[íìîï]/u' => 'i',
+ '/[éèêë]/u' => 'e',
+ '/[ÉÈÊË]/u' => 'E',
+ '/[óòôõºö]/u' => 'o',
+ '/[ÓÒÔÕÖ]/u' => 'O',
+ '/[úùûü]/u' => 'u',
+ '/[ÚÙÛÜ]/u' => 'U',
+ '/ç/' => 'c',
+ '/Ç/' => 'C',
+ '/ñ/' => 'n',
+ '/Ñ/' => 'N',
+ '/–/' => '_', // UTF-8 hyphen to "normal" hyphen
+ '/[’‘‹›‚]/u' => '_', // Literally a single quote
+ '/[“”«»„]/u' => '_', // Double quote
+ '/ /' => '_', // nonbreaking space (equiv. to 0x160)
+ '/'/' => '_',
+ '/-/' => '_',
+ "/'/" => '_',
+ );
+ return preg_replace(array_keys($utf8), array_values($utf8), $text);
+ }
+
}
\ No newline at end of file
--- a/ocsreports/require/stats/Stats.php
+++ b/ocsreports/require/stats/Stats.php
@@ -62,14 +62,14 @@ class Stats{
foreach($form as $key => $value){
if ($key == 'NB_OS') {
- $sql = "select count(h.osname) c,h.osname as name from hardware h LEFT JOIN accountinfo a ON a.HARDWARE_ID = h.ID where h.osname != ''";
+ $sql = "select count(h.osname) c,h.osname as name from hardware h LEFT JOIN accountinfo a ON a.HARDWARE_ID = h.ID where h.osname != '' AND h.deviceid != '_SYSTEMGROUP_'";
if (is_defined($_SESSION['OCS']["mesmachines"])) {
$sql .= " AND " . $_SESSION['OCS']["mesmachines"];
}
$sql .= " group by h.osname order by count(h.osname) DESC ";
$height_legend = 300;
} else {
- $sql = "select count(h.useragent) c,h.useragent as name from hardware h LEFT JOIN accountinfo a ON a.HARDWARE_ID = h.ID where h.useragent != ''";
+ $sql = "select count(h.useragent) c,h.useragent as name from hardware h LEFT JOIN accountinfo a ON a.HARDWARE_ID = h.ID where h.useragent != '' AND h.deviceid != '_SYSTEMGROUP_'";
if (is_defined($_SESSION['OCS']["mesmachines"])) {
$sql .= " AND " . $_SESSION['OCS']["mesmachines"];
}
@@ -96,7 +96,7 @@ class Stats{
if($key == 'SEEN'){
//last seen since
$date = date("y-m-d",strtotime("-15 day"));
- $sql_seen = "SELECT DATE_FORMAT(h.lastcome, '%Y-%m') AS contact, count(h.lastcome) AS conta FROM `hardware` h LEFT JOIN accountinfo a ON a.HARDWARE_ID = h.ID WHERE h.LASTCOME < '".$date."'";
+ $sql_seen = "SELECT DATE_FORMAT(h.lastcome, '%Y-%m') AS contact, count(h.lastcome) AS conta FROM `hardware` h LEFT JOIN accountinfo a ON a.HARDWARE_ID = h.ID WHERE h.LASTCOME < '".$date."' AND h.deviceid != '_SYSTEMGROUP_'";
if (is_defined($_SESSION['OCS']["mesmachines"])) {
$sql_seen .= " AND " . $_SESSION['OCS']["mesmachines"];
}
--- a/ocsreports/var.php
+++ b/ocsreports/var.php
@@ -69,11 +69,11 @@ define('TEMPLATE', __DIR__.'/templates/');
/**
* OCS' MySQL database version
*/
-define('GUI_VER', '7037');
+define('GUI_VER', '7039');
/**
* GUI Version
*/
-define('GUI_VER_SHOW', '2.8');
+define('GUI_VER_SHOW', '2.8.1');
/**
* Default GUI language
*/
--- a/ocsreports/vendor/autoload.php
+++ b/ocsreports/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInit17a1dae8d2cec5050e88c7e4aeeb129d::getLoader();
+return ComposerAutoloaderInit48eeeef285024088e1cf7b565004cd79::getLoader();
--- a/ocsreports/vendor/composer/ClassLoader.php
+++ b/ocsreports/vendor/composer/ClassLoader.php
@@ -37,8 +37,8 @@ namespace Composer\Autoload;
*
* @author Fabien Potencier <fabien at symfony.com>
* @author Jordi Boggiano <j.boggiano at seld.be>
- * @see http://www.php-fig.org/psr/psr-0/
- * @see http://www.php-fig.org/psr/psr-4/
+ * @see https://www.php-fig.org/psr/psr-0/
+ * @see https://www.php-fig.org/psr/psr-4/
*/
class ClassLoader
{
--- /dev/null
+++ b/ocsreports/vendor/composer/InstalledVersions.php
@@ -0,0 +1,246 @@
+<?php
+
+
+
+
+
+
+
+
+
+
+
+namespace Composer;
+
+use Composer\Semver\VersionParser;
+
+
+
+
+
+
+class InstalledVersions
+{
+private static $installed = array (
+ 'root' =>
+ array (
+ 'pretty_version' => '1.0.0+no-version-set',
+ 'version' => '1.0.0.0',
+ 'aliases' =>
+ array (
+ ),
+ 'reference' => NULL,
+ 'name' => 'vendor/composer',
+ ),
+ 'versions' =>
+ array (
+ 'ircmaxell/password-compat' =>
+ array (
+ 'pretty_version' => 'v1.0.4',
+ 'version' => '1.0.4.0',
+ 'aliases' =>
+ array (
+ ),
+ 'reference' => '5c5cde8822a69545767f7c7f3058cb15ff84614c',
+ ),
+ 'jasig/phpcas' =>
+ array (
+ 'pretty_version' => '1.3.8',
+ 'version' => '1.3.8.0',
+ 'aliases' =>
+ array (
+ ),
+ 'reference' => '40c0769ce05a30c8172b36ceab11124375c8366e',
+ ),
+ 'phpmailer/phpmailer' =>
+ array (
+ 'pretty_version' => 'v6.2.0',
+ 'version' => '6.2.0.0',
+ 'aliases' =>
+ array (
+ ),
+ 'reference' => 'e38888a75c070304ca5514197d4847a59a5c853f',
+ ),
+ 'vendor/composer' =>
+ array (
+ 'pretty_version' => '1.0.0+no-version-set',
+ 'version' => '1.0.0.0',
+ 'aliases' =>
+ array (
+ ),
+ 'reference' => NULL,
+ ),
+ ),
+);
+
+
+
+
+
+
+
+public static function getInstalledPackages()
+{
+return array_keys(self::$installed['versions']);
+}
+
+
+
+
+
+
+
+
+
+public static function isInstalled($packageName)
+{
+return isset(self::$installed['versions'][$packageName]);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public static function satisfies(VersionParser $parser, $packageName, $constraint)
+{
+$constraint = $parser->parseConstraints($constraint);
+$provided = $parser->parseConstraints(self::getVersionRanges($packageName));
+
+return $provided->matches($constraint);
+}
+
+
+
+
+
+
+
+
+
+
+public static function getVersionRanges($packageName)
+{
+if (!isset(self::$installed['versions'][$packageName])) {
+throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+}
+
+$ranges = array();
+if (isset(self::$installed['versions'][$packageName]['pretty_version'])) {
+$ranges[] = self::$installed['versions'][$packageName]['pretty_version'];
+}
+if (array_key_exists('aliases', self::$installed['versions'][$packageName])) {
+$ranges = array_merge($ranges, self::$installed['versions'][$packageName]['aliases']);
+}
+if (array_key_exists('replaced', self::$installed['versions'][$packageName])) {
+$ranges = array_merge($ranges, self::$installed['versions'][$packageName]['replaced']);
+}
+if (array_key_exists('provided', self::$installed['versions'][$packageName])) {
+$ranges = array_merge($ranges, self::$installed['versions'][$packageName]['provided']);
+}
+
+return implode(' || ', $ranges);
+}
+
+
+
+
+
+public static function getVersion($packageName)
+{
+if (!isset(self::$installed['versions'][$packageName])) {
+throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+}
+
+if (!isset(self::$installed['versions'][$packageName]['version'])) {
+return null;
+}
+
+return self::$installed['versions'][$packageName]['version'];
+}
+
+
+
+
+
+public static function getPrettyVersion($packageName)
+{
+if (!isset(self::$installed['versions'][$packageName])) {
+throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+}
+
+if (!isset(self::$installed['versions'][$packageName]['pretty_version'])) {
+return null;
+}
+
+return self::$installed['versions'][$packageName]['pretty_version'];
+}
+
+
+
+
+
+public static function getReference($packageName)
+{
+if (!isset(self::$installed['versions'][$packageName])) {
+throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+}
+
+if (!isset(self::$installed['versions'][$packageName]['reference'])) {
+return null;
+}
+
+return self::$installed['versions'][$packageName]['reference'];
+}
+
+
+
+
+
+public static function getRootPackage()
+{
+return self::$installed['root'];
+}
+
+
+
+
+
+
+
+public static function getRawData()
+{
+return self::$installed;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public static function reload($data)
+{
+self::$installed = $data;
+}
+}
--- a/ocsreports/vendor/composer/autoload_classmap.php
+++ b/ocsreports/vendor/composer/autoload_classmap.php
@@ -50,5 +50,6 @@ return array(
'CAS_Request_MultiRequestInterface' => $vendorDir . '/jasig/phpcas/source/CAS/Request/MultiRequestInterface.php',
'CAS_Request_RequestInterface' => $vendorDir . '/jasig/phpcas/source/CAS/Request/RequestInterface.php',
'CAS_TypeMismatchException' => $vendorDir . '/jasig/phpcas/source/CAS/TypeMismatchException.php',
+ 'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
'phpCAS' => $vendorDir . '/jasig/phpcas/source/CAS.php',
);
--- a/ocsreports/vendor/composer/autoload_real.php
+++ b/ocsreports/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInit17a1dae8d2cec5050e88c7e4aeeb129d
+class ComposerAutoloaderInit48eeeef285024088e1cf7b565004cd79
{
private static $loader;
@@ -22,15 +22,17 @@ class ComposerAutoloaderInit17a1dae8d2cec5050e88c7e4aeeb129d
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit17a1dae8d2cec5050e88c7e4aeeb129d', 'loadClassLoader'), true, true);
+ require __DIR__ . '/platform_check.php';
+
+ spl_autoload_register(array('ComposerAutoloaderInit48eeeef285024088e1cf7b565004cd79', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInit17a1dae8d2cec5050e88c7e4aeeb129d', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit48eeeef285024088e1cf7b565004cd79', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
- require_once __DIR__ . '/autoload_static.php';
+ require __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInit17a1dae8d2cec5050e88c7e4aeeb129d::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit48eeeef285024088e1cf7b565004cd79::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -51,19 +53,19 @@ class ComposerAutoloaderInit17a1dae8d2cec5050e88c7e4aeeb129d
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInit17a1dae8d2cec5050e88c7e4aeeb129d::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInit48eeeef285024088e1cf7b565004cd79::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequire17a1dae8d2cec5050e88c7e4aeeb129d($fileIdentifier, $file);
+ composerRequire48eeeef285024088e1cf7b565004cd79($fileIdentifier, $file);
}
return $loader;
}
}
-function composerRequire17a1dae8d2cec5050e88c7e4aeeb129d($fileIdentifier, $file)
+function composerRequire48eeeef285024088e1cf7b565004cd79($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;
--- a/ocsreports/vendor/composer/autoload_static.php
+++ b/ocsreports/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInit17a1dae8d2cec5050e88c7e4aeeb129d
+class ComposerStaticInit48eeeef285024088e1cf7b565004cd79
{
public static $files = array (
'e40631d46120a9c38ea139981f8dab26' => __DIR__ . '/..' . '/ircmaxell/password-compat/lib/password.php',
@@ -69,15 +69,16 @@ class ComposerStaticInit17a1dae8d2cec5050e88c7e4aeeb129d
'CAS_Request_MultiRequestInterface' => __DIR__ . '/..' . '/jasig/phpcas/source/CAS/Request/MultiRequestInterface.php',
'CAS_Request_RequestInterface' => __DIR__ . '/..' . '/jasig/phpcas/source/CAS/Request/RequestInterface.php',
'CAS_TypeMismatchException' => __DIR__ . '/..' . '/jasig/phpcas/source/CAS/TypeMismatchException.php',
+ 'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
'phpCAS' => __DIR__ . '/..' . '/jasig/phpcas/source/CAS.php',
);
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInit17a1dae8d2cec5050e88c7e4aeeb129d::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInit17a1dae8d2cec5050e88c7e4aeeb129d::$prefixDirsPsr4;
- $loader->classMap = ComposerStaticInit17a1dae8d2cec5050e88c7e4aeeb129d::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit48eeeef285024088e1cf7b565004cd79::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit48eeeef285024088e1cf7b565004cd79::$prefixDirsPsr4;
+ $loader->classMap = ComposerStaticInit48eeeef285024088e1cf7b565004cd79::$classMap;
}, null, ClassLoader::class);
}
--- a/ocsreports/vendor/composer/installed.json
+++ b/ocsreports/vendor/composer/installed.json
@@ -1,173 +1,196 @@
-[
- {
- "name": "ircmaxell/password-compat",
- "version": "v1.0.4",
- "version_normalized": "1.0.4.0",
- "source": {
- "type": "git",
- "url": "https://github.com/ircmaxell/password_compat.git",
- "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/5c5cde8822a69545767f7c7f3058cb15ff84614c",
- "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c",
- "shasum": ""
- },
- "require-dev": {
- "phpunit/phpunit": "4.*"
- },
- "time": "2014-11-20T16:49:30+00:00",
- "type": "library",
- "installation-source": "dist",
- "autoload": {
- "files": [
- "lib/password.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Anthony Ferrara",
- "email": "ircmaxell at php.net",
- "homepage": "http://blog.ircmaxell.com"
- }
- ],
- "description": "A compatibility library for the proposed simplified password hashing algorithm: https://wiki.php.net/rfc/password_hash",
- "homepage": "https://github.com/ircmaxell/password_compat",
- "keywords": [
- "hashing",
- "password"
- ]
- },
- {
- "name": "jasig/phpcas",
- "version": "1.3.8",
- "version_normalized": "1.3.8.0",
- "source": {
- "type": "git",
- "url": "https://github.com/apereo/phpCAS.git",
- "reference": "40c0769ce05a30c8172b36ceab11124375c8366e"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/apereo/phpCAS/zipball/40c0769ce05a30c8172b36ceab11124375c8366e",
- "reference": "40c0769ce05a30c8172b36ceab11124375c8366e",
- "shasum": ""
- },
- "require": {
- "ext-curl": "*",
- "php": ">=5.4.0"
- },
- "require-dev": {
- "phpunit/phpunit": "~3.7.10"
- },
- "time": "2019-08-18T20:01:55+00:00",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.3.x-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "classmap": [
- "source/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "Apache-2.0"
- ],
- "authors": [
- {
- "name": "Joachim Fritschi",
- "homepage": "https://wiki.jasig.org/display/~fritschi"
- },
- {
- "name": "Adam Franco",
- "homepage": "https://wiki.jasig.org/display/~adamfranco"
- }
- ],
- "description": "Provides a simple API for authenticating users against a CAS server",
- "homepage": "https://wiki.jasig.org/display/CASC/phpCAS",
- "keywords": [
- "apereo",
- "cas",
- "jasig"
- ]
- },
- {
- "name": "phpmailer/phpmailer",
- "version": "v6.1.7",
- "version_normalized": "6.1.7.0",
- "source": {
- "type": "git",
- "url": "https://github.com/PHPMailer/PHPMailer.git",
- "reference": "2c2370ba3df7034f9eb7b8f387c97b52b2ba5ad0"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/2c2370ba3df7034f9eb7b8f387c97b52b2ba5ad0",
- "reference": "2c2370ba3df7034f9eb7b8f387c97b52b2ba5ad0",
- "shasum": ""
- },
- "require": {
- "ext-ctype": "*",
- "ext-filter": "*",
- "php": ">=5.5.0"
- },
- "require-dev": {
- "doctrine/annotations": "^1.2",
- "friendsofphp/php-cs-fixer": "^2.2",
- "phpunit/phpunit": "^4.8 || ^5.7"
- },
- "suggest": {
- "ext-mbstring": "Needed to send email in multibyte encoding charset",
- "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
- "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
- "psr/log": "For optional PSR-3 debug logging",
- "stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication",
- "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)"
- },
- "time": "2020-07-14T18:50:27+00:00",
- "type": "library",
- "installation-source": "dist",
- "autoload": {
- "psr-4": {
- "PHPMailer\\PHPMailer\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "LGPL-2.1-only"
- ],
- "authors": [
- {
- "name": "Marcus Bointon",
- "email": "phpmailer at synchromedia.co.uk"
- },
- {
- "name": "Jim Jagielski",
- "email": "jimjag at gmail.com"
- },
- {
- "name": "Andy Prevost",
- "email": "codeworxtech at users.sourceforge.net"
- },
- {
- "name": "Brent R. Matzelle"
- }
- ],
- "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
- "funding": [
- {
- "url": "https://github.com/synchro",
- "type": "github"
- }
- ]
- }
-]
+{
+ "packages": [
+ {
+ "name": "ircmaxell/password-compat",
+ "version": "v1.0.4",
+ "version_normalized": "1.0.4.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/ircmaxell/password_compat.git",
+ "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/5c5cde8822a69545767f7c7f3058cb15ff84614c",
+ "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c",
+ "shasum": ""
+ },
+ "require-dev": {
+ "phpunit/phpunit": "4.*"
+ },
+ "time": "2014-11-20T16:49:30+00:00",
+ "type": "library",
+ "installation-source": "dist",
+ "autoload": {
+ "files": [
+ "lib/password.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Anthony Ferrara",
+ "email": "ircmaxell at php.net",
+ "homepage": "http://blog.ircmaxell.com"
+ }
+ ],
+ "description": "A compatibility library for the proposed simplified password hashing algorithm: https://wiki.php.net/rfc/password_hash",
+ "homepage": "https://github.com/ircmaxell/password_compat",
+ "keywords": [
+ "hashing",
+ "password"
+ ],
+ "support": {
+ "issues": "https://github.com/ircmaxell/password_compat/issues",
+ "source": "https://github.com/ircmaxell/password_compat/tree/v1.0"
+ },
+ "install-path": "../ircmaxell/password-compat"
+ },
+ {
+ "name": "jasig/phpcas",
+ "version": "1.3.8",
+ "version_normalized": "1.3.8.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/apereo/phpCAS.git",
+ "reference": "40c0769ce05a30c8172b36ceab11124375c8366e"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/apereo/phpCAS/zipball/40c0769ce05a30c8172b36ceab11124375c8366e",
+ "reference": "40c0769ce05a30c8172b36ceab11124375c8366e",
+ "shasum": ""
+ },
+ "require": {
+ "ext-curl": "*",
+ "php": ">=5.4.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~3.7.10"
+ },
+ "time": "2019-08-18T20:01:55+00:00",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.3.x-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "classmap": [
+ "source/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "Apache-2.0"
+ ],
+ "authors": [
+ {
+ "name": "Joachim Fritschi",
+ "homepage": "https://wiki.jasig.org/display/~fritschi"
+ },
+ {
+ "name": "Adam Franco",
+ "homepage": "https://wiki.jasig.org/display/~adamfranco"
+ }
+ ],
+ "description": "Provides a simple API for authenticating users against a CAS server",
+ "homepage": "https://wiki.jasig.org/display/CASC/phpCAS",
+ "keywords": [
+ "apereo",
+ "cas",
+ "jasig"
+ ],
+ "support": {
+ "issues": "https://github.com/apereo/phpCAS/issues",
+ "source": "https://github.com/apereo/phpCAS/tree/1.3.8"
+ },
+ "install-path": "../jasig/phpcas"
+ },
+ {
+ "name": "phpmailer/phpmailer",
+ "version": "v6.2.0",
+ "version_normalized": "6.2.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/PHPMailer/PHPMailer.git",
+ "reference": "e38888a75c070304ca5514197d4847a59a5c853f"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/e38888a75c070304ca5514197d4847a59a5c853f",
+ "reference": "e38888a75c070304ca5514197d4847a59a5c853f",
+ "shasum": ""
+ },
+ "require": {
+ "ext-ctype": "*",
+ "ext-filter": "*",
+ "ext-hash": "*",
+ "php": ">=5.5.0"
+ },
+ "require-dev": {
+ "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
+ "doctrine/annotations": "^1.2",
+ "phpcompatibility/php-compatibility": "^9.3.5",
+ "roave/security-advisories": "dev-latest",
+ "squizlabs/php_codesniffer": "^3.5.6",
+ "yoast/phpunit-polyfills": "^0.2.0"
+ },
+ "suggest": {
+ "ext-mbstring": "Needed to send email in multibyte encoding charset",
+ "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
+ "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
+ "psr/log": "For optional PSR-3 debug logging",
+ "stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication",
+ "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)"
+ },
+ "time": "2020-11-25T15:24:57+00:00",
+ "type": "library",
+ "installation-source": "dist",
+ "autoload": {
+ "psr-4": {
+ "PHPMailer\\PHPMailer\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "LGPL-2.1-only"
+ ],
+ "authors": [
+ {
+ "name": "Marcus Bointon",
+ "email": "phpmailer at synchromedia.co.uk"
+ },
+ {
+ "name": "Jim Jagielski",
+ "email": "jimjag at gmail.com"
+ },
+ {
+ "name": "Andy Prevost",
+ "email": "codeworxtech at users.sourceforge.net"
+ },
+ {
+ "name": "Brent R. Matzelle"
+ }
+ ],
+ "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
+ "support": {
+ "issues": "https://github.com/PHPMailer/PHPMailer/issues",
+ "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.2.0"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/Synchro",
+ "type": "github"
+ }
+ ],
+ "install-path": "../phpmailer/phpmailer"
+ }
+ ],
+ "dev": true,
+ "dev-package-names": []
+}
--- /dev/null
+++ b/ocsreports/vendor/composer/installed.php
@@ -0,0 +1,51 @@
+<?php return array (
+ 'root' =>
+ array (
+ 'pretty_version' => '1.0.0+no-version-set',
+ 'version' => '1.0.0.0',
+ 'aliases' =>
+ array (
+ ),
+ 'reference' => NULL,
+ 'name' => 'vendor/composer',
+ ),
+ 'versions' =>
+ array (
+ 'ircmaxell/password-compat' =>
+ array (
+ 'pretty_version' => 'v1.0.4',
+ 'version' => '1.0.4.0',
+ 'aliases' =>
+ array (
+ ),
+ 'reference' => '5c5cde8822a69545767f7c7f3058cb15ff84614c',
+ ),
+ 'jasig/phpcas' =>
+ array (
+ 'pretty_version' => '1.3.8',
+ 'version' => '1.3.8.0',
+ 'aliases' =>
+ array (
+ ),
+ 'reference' => '40c0769ce05a30c8172b36ceab11124375c8366e',
+ ),
+ 'phpmailer/phpmailer' =>
+ array (
+ 'pretty_version' => 'v6.2.0',
+ 'version' => '6.2.0.0',
+ 'aliases' =>
+ array (
+ ),
+ 'reference' => 'e38888a75c070304ca5514197d4847a59a5c853f',
+ ),
+ 'vendor/composer' =>
+ array (
+ 'pretty_version' => '1.0.0+no-version-set',
+ 'version' => '1.0.0.0',
+ 'aliases' =>
+ array (
+ ),
+ 'reference' => NULL,
+ ),
+ ),
+);
--- /dev/null
+++ b/ocsreports/vendor/composer/platform_check.php
@@ -0,0 +1,26 @@
+<?php
+
+// platform_check.php @generated by Composer
+
+$issues = array();
+
+if (!(PHP_VERSION_ID >= 50500)) {
+ $issues[] = 'Your Composer dependencies require a PHP version ">= 5.5.0". You are running ' . PHP_VERSION . '.';
+}
+
+if ($issues) {
+ if (!headers_sent()) {
+ header('HTTP/1.1 500 Internal Server Error');
+ }
+ if (!ini_get('display_errors')) {
+ if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+ fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL);
+ } elseif (!headers_sent()) {
+ echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL;
+ }
+ }
+ trigger_error(
+ 'Composer detected issues in your platform: ' . implode(' ', $issues),
+ E_USER_ERROR
+ );
+}
--- a/ocsreports/vendor/phpmailer/phpmailer/README.md
+++ b/ocsreports/vendor/phpmailer/phpmailer/README.md
@@ -167,15 +167,9 @@ Build status: [](h
If this isn't passing, is there something you can do to help?
## Security
-Please disclose any vulnerabilities found responsibly - report any security problems found to the maintainers privately.
+Please disclose any vulnerabilities found responsibly – report security issues to the maintainers privately.
-PHPMailer versions prior to 5.2.22 (released January 9th 2017) have a local file disclosure vulnerability, [CVE-2017-5223](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2017-5223). If content passed into `msgHTML()` is sourced from unfiltered user input, relative paths can map to absolute local file paths and added as attachments. Also note that `addAttachment` (just like `file_get_contents`, `passthru`, `unlink`, etc) should not be passed user-sourced params either! Reported by Yongxiang Li of Asiasecurity.
-
-PHPMailer versions prior to 5.2.20 (released December 28th 2016) are vulnerable to [CVE-2016-10045](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-10045) a remote code execution vulnerability, responsibly reported by [Dawid Golunski](https://legalhackers.com/advisories/PHPMailer-Exploit-Remote-Code-Exec-CVE-2016-10045-Vuln-Patch-Bypass.html), and patched by Paul Buonopane (@Zenexer).
-
-PHPMailer versions prior to 5.2.18 (released December 2016) are vulnerable to [CVE-2016-10033](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-10033) a critical remote code execution vulnerability, responsibly reported by [Dawid Golunski](http://legalhackers.com/advisories/PHPMailer-Exploit-Remote-Code-Exec-CVE-2016-10033-Vuln.html).
-
-See [SECURITY](https://github.com/PHPMailer/PHPMailer/tree/master/SECURITY.md) for more detail on security issues.
+See [SECURITY](https://github.com/PHPMailer/PHPMailer/tree/master/SECURITY.md) for details on security issues.
## Contributing
Please submit bug reports, suggestions and pull requests to the [GitHub issue tracker](https://github.com/PHPMailer/PHPMailer/issues).
--- a/ocsreports/vendor/phpmailer/phpmailer/VERSION
+++ b/ocsreports/vendor/phpmailer/phpmailer/VERSION
@@ -1 +1 @@
-6.1.7
\ No newline at end of file
+6.2.0
\ No newline at end of file
--- a/ocsreports/vendor/phpmailer/phpmailer/composer.json
+++ b/ocsreports/vendor/phpmailer/phpmailer/composer.json
@@ -21,26 +21,30 @@
],
"funding": [
{
- "url": "https://github.com/synchro",
+ "url": "https://github.com/Synchro",
"type": "github"
}
],
"require": {
"php": ">=5.5.0",
"ext-ctype": "*",
- "ext-filter": "*"
+ "ext-filter": "*",
+ "ext-hash": "*"
},
"require-dev": {
- "friendsofphp/php-cs-fixer": "^2.2",
- "phpunit/phpunit": "^4.8 || ^5.7",
- "doctrine/annotations": "^1.2"
+ "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
+ "doctrine/annotations": "^1.2",
+ "phpcompatibility/php-compatibility": "^9.3.5",
+ "roave/security-advisories": "dev-latest",
+ "squizlabs/php_codesniffer": "^3.5.6",
+ "yoast/phpunit-polyfills": "^0.2.0"
},
"suggest": {
- "psr/log": "For optional PSR-3 debug logging",
- "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
+ "ext-mbstring": "Needed to send email in multibyte encoding charset",
"hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
+ "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
+ "psr/log": "For optional PSR-3 debug logging",
"stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication",
- "ext-mbstring": "Needed to send email in multibyte encoding charset",
"symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)"
},
"autoload": {
--- a/ocsreports/vendor/phpmailer/phpmailer/get_oauth_token.php
+++ b/ocsreports/vendor/phpmailer/phpmailer/get_oauth_token.php
@@ -1,4 +1,5 @@
<?php
+
/**
* PHPMailer - PHP email creation and transport class.
* PHP Version 5.5
@@ -8,7 +9,7 @@
* @author Jim Jagielski (jimjag) <jimjag at gmail.com>
* @author Andy Prevost (codeworxtech) <codeworxtech at users.sourceforge.net>
* @author Brent R. Matzelle (original founder)
- * @copyright 2012 - 2017 Marcus Bointon
+ * @copyright 2012 - 2020 Marcus Bointon
* @copyright 2010 - 2012 Jim Jagielski
* @copyright 2004 - 2009 Andy Prevost
* @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
@@ -16,6 +17,7 @@
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE.
*/
+
/**
* Get an OAuth2 token from an OAuth2 provider.
* * Install this script on your server so that it's accessible
@@ -44,7 +46,7 @@ use Hayageek\OAuth2\Client\Provider\Yahoo;
use Stevenmaguire\OAuth2\Client\Provider\Microsoft;
if (!isset($_GET['code']) && !isset($_GET['provider'])) {
-?>
+ ?>
<html>
<body>Select Provider:<br/>
<a href='?provider=Google'>Google</a><br/>
@@ -52,8 +54,8 @@ if (!isset($_GET['code']) && !isset($_GET['provider'])) {
<a href='?provider=Microsoft'>Microsoft/Outlook/Hotmail/Live/Office365</a><br/>
</body>
</html>
-<?php
-exit;
+ <?php
+ exit;
}
require 'vendor/autoload.php';
--- a/ocsreports/vendor/phpmailer/phpmailer/language/phpmailer.lang-ba.php
+++ b/ocsreports/vendor/phpmailer/phpmailer/language/phpmailer.lang-ba.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Bosnian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
@@ -23,4 +24,4 @@ $PHPMAILER_LANG['signing'] = 'Greška prilikom prijave: ';
$PHPMAILER_LANG['smtp_connect_failed'] = 'Spajanje na SMTP server nije uspjelo.';
$PHPMAILER_LANG['smtp_error'] = 'SMTP greška: ';
$PHPMAILER_LANG['variable_set'] = 'Nije moguće postaviti varijablu ili je vratiti nazad: ';
-$PHPMAILER_LANG['extension_missing'] = 'Nedostaje ekstenzija: ';
\ No newline at end of file
+$PHPMAILER_LANG['extension_missing'] = 'Nedostaje ekstenzija: ';
--- a/ocsreports/vendor/phpmailer/phpmailer/language/phpmailer.lang-da.php
+++ b/ocsreports/vendor/phpmailer/phpmailer/language/phpmailer.lang-da.php
@@ -1,10 +1,11 @@
<?php
+
/**
* Danish PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
* @author John Sebastian <jms at iwb.dk>
- * Rewrite and extension of the work by Mikael Stokkebro <info at stokkebro.dk>
- *
+ * Rewrite and extension of the work by Mikael Stokkebro <info at stokkebro.dk>
+ *
*/
$PHPMAILER_LANG['authenticate'] = 'SMTP fejl: Login mislykkedes.';
--- a/ocsreports/vendor/phpmailer/phpmailer/language/phpmailer.lang-de.php
+++ b/ocsreports/vendor/phpmailer/phpmailer/language/phpmailer.lang-de.php
@@ -1,4 +1,5 @@
<?php
+
/**
* German PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
@@ -15,6 +16,8 @@ $PHPMAILER_LANG['file_open'] = 'Dateifehler: Konnte folgende Datei ni
$PHPMAILER_LANG['from_failed'] = 'Die folgende Absenderadresse ist nicht korrekt: ';
$PHPMAILER_LANG['instantiate'] = 'Mail-Funktion konnte nicht initialisiert werden.';
$PHPMAILER_LANG['invalid_address'] = 'Die Adresse ist ungültig: ';
+$PHPMAILER_LANG['invalid_hostentry'] = 'Ungültiger Hosteintrag: ';
+$PHPMAILER_LANG['invalid_host'] = 'Ungültiger Host: ';
$PHPMAILER_LANG['mailer_not_supported'] = ' mailer wird nicht unterstützt.';
$PHPMAILER_LANG['provide_address'] = 'Bitte geben Sie mindestens eine Empfängeradresse an.';
$PHPMAILER_LANG['recipients_failed'] = 'SMTP-Fehler: Die folgenden Empfänger sind nicht korrekt: ';
--- a/ocsreports/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php
+++ b/ocsreports/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php
@@ -1,4 +1,5 @@
<?php
+
/**
* French PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
@@ -19,6 +20,8 @@ $PHPMAILER_LANG['file_open'] = 'Ouverture du fichier impossible : '
$PHPMAILER_LANG['from_failed'] = 'L\'adresse d\'expéditeur suivante a échoué : ';
$PHPMAILER_LANG['instantiate'] = 'Impossible d\'instancier la fonction mail.';
$PHPMAILER_LANG['invalid_address'] = 'L\'adresse courriel n\'est pas valide : ';
+$PHPMAILER_LANG['invalid_hostentry'] = 'L\'entrée hôte n\'est pas valide : ';
+$PHPMAILER_LANG['invalid_host'] = 'L\'hôte n\'est pas valide : ';
$PHPMAILER_LANG['mailer_not_supported'] = ' client de messagerie non supporté.';
$PHPMAILER_LANG['provide_address'] = 'Vous devez fournir au moins une adresse de destinataire.';
$PHPMAILER_LANG['recipients_failed'] = 'Erreur SMTP : les destinataires suivants sont en erreur : ';
--- a/ocsreports/vendor/phpmailer/phpmailer/language/phpmailer.lang-id.php
+++ b/ocsreports/vendor/phpmailer/phpmailer/language/phpmailer.lang-id.php
@@ -1,9 +1,11 @@
<?php
+
/**
* Indonesian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
* @author Cecep Prawiro <cecep.prawiro at gmail.com>
* @author @januridp
+ * @author Ian Mustafa <mail at ianmustafa.com>
*/
$PHPMAILER_LANG['authenticate'] = 'Kesalahan SMTP: Tidak dapat mengotentikasi.';
@@ -11,17 +13,19 @@ $PHPMAILER_LANG['connect_host'] = 'Kesalahan SMTP: Tidak dapat terhubung
$PHPMAILER_LANG['data_not_accepted'] = 'Kesalahan SMTP: Data tidak diterima.';
$PHPMAILER_LANG['empty_message'] = 'Isi pesan kosong';
$PHPMAILER_LANG['encoding'] = 'Pengkodean karakter tidak dikenali: ';
-$PHPMAILER_LANG['execute'] = 'Tidak dapat menjalankan proses : ';
-$PHPMAILER_LANG['file_access'] = 'Tidak dapat mengakses berkas : ';
-$PHPMAILER_LANG['file_open'] = 'Kesalahan File: Berkas tidak dapat dibuka : ';
-$PHPMAILER_LANG['from_failed'] = 'Alamat pengirim berikut mengakibatkan kesalahan : ';
-$PHPMAILER_LANG['instantiate'] = 'Tidak dapat menginisialisasi fungsi surel';
-$PHPMAILER_LANG['invalid_address'] = 'Gagal terkirim, alamat surel tidak benar : ';
-$PHPMAILER_LANG['provide_address'] = 'Harus disediakan minimal satu alamat tujuan';
+$PHPMAILER_LANG['execute'] = 'Tidak dapat menjalankan proses: ';
+$PHPMAILER_LANG['file_access'] = 'Tidak dapat mengakses berkas: ';
+$PHPMAILER_LANG['file_open'] = 'Kesalahan Berkas: Berkas tidak dapat dibuka: ';
+$PHPMAILER_LANG['from_failed'] = 'Alamat pengirim berikut mengakibatkan kesalahan: ';
+$PHPMAILER_LANG['instantiate'] = 'Tidak dapat menginisialisasi fungsi surel.';
+$PHPMAILER_LANG['invalid_address'] = 'Gagal terkirim, alamat surel tidak sesuai: ';
+$PHPMAILER_LANG['invalid_hostentry'] = 'Gagal terkirim, entri host tidak sesuai: ';
+$PHPMAILER_LANG['invalid_host'] = 'Gagal terkirim, host tidak sesuai: ';
+$PHPMAILER_LANG['provide_address'] = 'Harus tersedia minimal satu alamat tujuan';
$PHPMAILER_LANG['mailer_not_supported'] = ' mailer tidak didukung';
-$PHPMAILER_LANG['recipients_failed'] = 'Kesalahan SMTP: Alamat tujuan berikut menghasilkan kesalahan : ';
-$PHPMAILER_LANG['signing'] = 'Kesalahan dalam tanda tangan : ';
+$PHPMAILER_LANG['recipients_failed'] = 'Kesalahan SMTP: Alamat tujuan berikut menyebabkan kesalahan: ';
+$PHPMAILER_LANG['signing'] = 'Kesalahan dalam penandatangan SSL: ';
$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() gagal.';
-$PHPMAILER_LANG['smtp_error'] = 'Kesalahan pada pelayan SMTP : ';
-$PHPMAILER_LANG['variable_set'] = 'Tidak dapat mengatur atau mengatur ulang variable : ';
-$PHPMAILER_LANG['extension_missing'] = 'Ekstensi hilang: ';
+$PHPMAILER_LANG['smtp_error'] = 'Kesalahan pada pelayan SMTP: ';
+$PHPMAILER_LANG['variable_set'] = 'Tidak dapat mengatur atau mengatur ulang variabel: ';
+$PHPMAILER_LANG['extension_missing'] = 'Ekstensi PHP tidak tersedia: ';
--- a/ocsreports/vendor/phpmailer/phpmailer/language/phpmailer.lang-pl.php
+++ b/ocsreports/vendor/phpmailer/phpmailer/language/phpmailer.lang-pl.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Polish PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
@@ -14,7 +15,7 @@ $PHPMAILER_LANG['file_access'] = 'Brak dostępu do pliku: ';
$PHPMAILER_LANG['file_open'] = 'Nie można otworzyć pliku: ';
$PHPMAILER_LANG['from_failed'] = 'Następujący adres Nadawcy jest nieprawidłowy: ';
$PHPMAILER_LANG['instantiate'] = 'Nie można wywołać funkcji mail(). Sprawdź konfigurację serwera.';
-$PHPMAILER_LANG['invalid_address'] = 'Nie można wysłać wiadomości, '.
+$PHPMAILER_LANG['invalid_address'] = 'Nie można wysłać wiadomości, ' .
'następujący adres Odbiorcy jest nieprawidłowy: ';
$PHPMAILER_LANG['provide_address'] = 'Należy podać prawidłowy adres email Odbiorcy.';
$PHPMAILER_LANG['mailer_not_supported'] = 'Wybrana metoda wysyłki wiadomości nie jest obsługiwana.';
--- a/ocsreports/vendor/phpmailer/phpmailer/language/phpmailer.lang-sl.php
+++ b/ocsreports/vendor/phpmailer/phpmailer/language/phpmailer.lang-sl.php
@@ -1,9 +1,11 @@
<?php
+
/**
* Slovene PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
* @author Klemen Tušar <techouse at gmail.com>
* @author Filip Š <projects at filips.si>
+ * @author Blaž Oražem <blaz at orazem.si>
*/
$PHPMAILER_LANG['authenticate'] = 'SMTP napaka: Avtentikacija ni uspela.';
@@ -17,8 +19,10 @@ $PHPMAILER_LANG['file_open'] = 'Ne morem odpreti datoteke: ';
$PHPMAILER_LANG['from_failed'] = 'Neveljaven e-naslov pošiljatelja: ';
$PHPMAILER_LANG['instantiate'] = 'Ne morem inicializirati mail funkcije.';
$PHPMAILER_LANG['invalid_address'] = 'E-poštno sporočilo ni bilo poslano. E-naslov je neveljaven: ';
+$PHPMAILER_LANG['invalid_hostentry'] = 'Neveljaven vnos gostitelja: ';
+$PHPMAILER_LANG['invalid_host'] = 'Neveljaven gostitelj: ';
$PHPMAILER_LANG['mailer_not_supported'] = ' mailer ni podprt.';
-$PHPMAILER_LANG['provide_address'] = 'Prosim vnesite vsaj enega naslovnika.';
+$PHPMAILER_LANG['provide_address'] = 'Prosimo, vnesite vsaj enega naslovnika.';
$PHPMAILER_LANG['recipients_failed'] = 'SMTP napaka: Sledeči naslovniki so neveljavni: ';
$PHPMAILER_LANG['signing'] = 'Napaka pri podpisovanju: ';
$PHPMAILER_LANG['smtp_connect_failed'] = 'Ne morem vzpostaviti povezave s SMTP strežnikom.';
--- a/ocsreports/vendor/phpmailer/phpmailer/language/phpmailer.lang-tl.php
+++ b/ocsreports/vendor/phpmailer/phpmailer/language/phpmailer.lang-tl.php
@@ -1,27 +1,28 @@
<?php
+
/**
* Tagalog PHPMailer language file: refer to English translation for definitive list
*
* @package PHPMailer
- * @author Adriane Justine Tan <adrianetan12 at gmail.com>
+ * @author Adriane Justine Tan <eidoriantan at gmail.com>
*/
-
+
$PHPMAILER_LANG['authenticate'] = 'SMTP Error: Hindi mapatotohanan.';
$PHPMAILER_LANG['connect_host'] = 'SMTP Error: Hindi makakonekta sa SMTP host.';
-$PHPMAILER_LANG['data_not_accepted'] = 'SMTP Error: Ang datos ay hindi maaaring matatanggap.';
+$PHPMAILER_LANG['data_not_accepted'] = 'SMTP Error: Ang datos ay hindi naitanggap.';
$PHPMAILER_LANG['empty_message'] = 'Walang laman ang mensahe';
$PHPMAILER_LANG['encoding'] = 'Hindi alam ang encoding: ';
$PHPMAILER_LANG['execute'] = 'Hindi maisasagawa: ';
$PHPMAILER_LANG['file_access'] = 'Hindi ma-access ang file: ';
-$PHPMAILER_LANG['file_open'] = 'Hindi mabuksan ang file: ';
+$PHPMAILER_LANG['file_open'] = 'File Error: Hindi mabuksan ang file: ';
$PHPMAILER_LANG['from_failed'] = 'Ang sumusunod na address ay nabigo: ';
-$PHPMAILER_LANG['instantiate'] = 'Hindi maaaring magbigay ng institusyon ang mail';
+$PHPMAILER_LANG['instantiate'] = 'Hindi maisimulan ang instance ng mail function.';
$PHPMAILER_LANG['invalid_address'] = 'Hindi wasto ang address na naibigay: ';
-$PHPMAILER_LANG['mailer_not_supported'] = 'Ang mailer ay hindi suportado';
-$PHPMAILER_LANG['provide_address'] = 'Kailangan mong magbigay ng kahit isang email address na tatanggap';
+$PHPMAILER_LANG['mailer_not_supported'] = 'Ang mailer ay hindi suportado.';
+$PHPMAILER_LANG['provide_address'] = 'Kailangan mong magbigay ng kahit isang email address na tatanggap.';
$PHPMAILER_LANG['recipients_failed'] = 'SMTP Error: Ang mga sumusunod na tatanggap ay nabigo: ';
-$PHPMAILER_LANG['signing'] = 'Hindi ma-sign';
-$PHPMAILER_LANG['smtp_connect_failed'] = 'Ang SMTP connect() ay nabigo';
-$PHPMAILER_LANG['smtp_error'] = 'Ang server ng SMTP ay nabigo';
-$PHPMAILER_LANG['variable_set'] = 'Hindi matatakda ang mga variables: ';
-$PHPMAILER_LANG['extension_missing'] = 'Nawawala ang extension';
+$PHPMAILER_LANG['signing'] = 'Hindi ma-sign: ';
+$PHPMAILER_LANG['smtp_connect_failed'] = 'Ang SMTP connect() ay nabigo.';
+$PHPMAILER_LANG['smtp_error'] = 'Ang server ng SMTP ay nabigo: ';
+$PHPMAILER_LANG['variable_set'] = 'Hindi matatakda o ma-reset ang mga variables: ';
+$PHPMAILER_LANG['extension_missing'] = 'Nawawala ang extension: ';
--- a/ocsreports/vendor/phpmailer/phpmailer/src/Exception.php
+++ b/ocsreports/vendor/phpmailer/phpmailer/src/Exception.php
@@ -1,4 +1,5 @@
<?php
+
/**
* PHPMailer Exception class.
* PHP Version 5.5.
@@ -9,7 +10,7 @@
* @author Jim Jagielski (jimjag) <jimjag at gmail.com>
* @author Andy Prevost (codeworxtech) <codeworxtech at users.sourceforge.net>
* @author Brent R. Matzelle (original founder)
- * @copyright 2012 - 2017 Marcus Bointon
+ * @copyright 2012 - 2020 Marcus Bointon
* @copyright 2010 - 2012 Jim Jagielski
* @copyright 2004 - 2009 Andy Prevost
* @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
--- a/ocsreports/vendor/phpmailer/phpmailer/src/OAuth.php
+++ b/ocsreports/vendor/phpmailer/phpmailer/src/OAuth.php
@@ -1,4 +1,5 @@
<?php
+
/**
* PHPMailer - PHP email creation and transport class.
* PHP Version 5.5.
@@ -9,7 +10,7 @@
* @author Jim Jagielski (jimjag) <jimjag at gmail.com>
* @author Andy Prevost (codeworxtech) <codeworxtech at users.sourceforge.net>
* @author Brent R. Matzelle (original founder)
- * @copyright 2012 - 2015 Marcus Bointon
+ * @copyright 2012 - 2020 Marcus Bointon
* @copyright 2010 - 2012 Jim Jagielski
* @copyright 2004 - 2009 Andy Prevost
* @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
--- a/ocsreports/vendor/phpmailer/phpmailer/src/POP3.php
+++ b/ocsreports/vendor/phpmailer/phpmailer/src/POP3.php
@@ -1,4 +1,5 @@
<?php
+
/**
* PHPMailer POP-Before-SMTP Authentication Class.
* PHP Version 5.5.
@@ -9,7 +10,7 @@
* @author Jim Jagielski (jimjag) <jimjag at gmail.com>
* @author Andy Prevost (codeworxtech) <codeworxtech at users.sourceforge.net>
* @author Brent R. Matzelle (original founder)
- * @copyright 2012 - 2019 Marcus Bointon
+ * @copyright 2012 - 2020 Marcus Bointon
* @copyright 2010 - 2012 Jim Jagielski
* @copyright 2004 - 2009 Andy Prevost
* @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
@@ -45,7 +46,7 @@ class POP3
*
* @var string
*/
- const VERSION = '6.1.7';
+ const VERSION = '6.2.0';
/**
* Default POP3 port number.
@@ -62,12 +63,16 @@ class POP3
const DEFAULT_TIMEOUT = 30;
/**
- * Debug display level.
- * Options: 0 = no, 1+ = yes.
+ * POP3 class debug output mode.
+ * Debug output level.
+ * Options:
+ * @see POP3::DEBUG_OFF: No output
+ * @see POP3::DEBUG_SERVER: Server messages, connection/server errors
+ * @see POP3::DEBUG_CLIENT: Client and Server messages, connection/server errors
*
* @var int
*/
- public $do_debug = 0;
+ public $do_debug = self::DEBUG_OFF;
/**
* POP3 mail server hostname.
@@ -130,6 +135,28 @@ class POP3
*/
const LE = "\r\n";
+ /**
+ * Debug level for no output.
+ *
+ * @var int
+ */
+ const DEBUG_OFF = 0;
+
+ /**
+ * Debug level to show server -> client messages
+ * also shows clients connection errors or errors from server
+ *
+ * @var int
+ */
+ const DEBUG_SERVER = 1;
+
+ /**
+ * Debug level to show client -> server and server -> client messages.
+ *
+ * @var int
+ */
+ const DEBUG_CLIENT = 2;
+
/**
* Simple static wrapper for all-in-one POP before SMTP.
*
@@ -329,7 +356,7 @@ class POP3
protected function getResponse($size = 128)
{
$response = fgets($this->pop_conn, $size);
- if ($this->do_debug >= 1) {
+ if ($this->do_debug >= self::DEBUG_SERVER) {
echo 'Server -> Client: ', $response;
}
@@ -346,7 +373,7 @@ class POP3
protected function sendString($string)
{
if ($this->pop_conn) {
- if ($this->do_debug >= 2) { //Show client messages when debug >= 2
+ if ($this->do_debug >= self::DEBUG_CLIENT) { //Show client messages when debug >= 2
echo 'Client -> Server: ', $string;
}
@@ -384,7 +411,7 @@ class POP3
protected function setError($error)
{
$this->errors[] = $error;
- if ($this->do_debug >= 1) {
+ if ($this->do_debug >= self::DEBUG_SERVER) {
echo '<pre>';
foreach ($this->errors as $e) {
print_r($e);
--- a/ocsreports/vendor/phpmailer/phpmailer/src/SMTP.php
+++ b/ocsreports/vendor/phpmailer/phpmailer/src/SMTP.php
@@ -1,4 +1,5 @@
<?php
+
/**
* PHPMailer RFC821 SMTP email transport class.
* PHP Version 5.5.
@@ -9,7 +10,7 @@
* @author Jim Jagielski (jimjag) <jimjag at gmail.com>
* @author Andy Prevost (codeworxtech) <codeworxtech at users.sourceforge.net>
* @author Brent R. Matzelle (original founder)
- * @copyright 2012 - 2019 Marcus Bointon
+ * @copyright 2012 - 2020 Marcus Bointon
* @copyright 2010 - 2012 Jim Jagielski
* @copyright 2004 - 2009 Andy Prevost
* @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
@@ -34,7 +35,7 @@ class SMTP
*
* @var string
*/
- const VERSION = '6.1.7';
+ const VERSION = '6.2.0';
/**
* SMTP line break constant.
@@ -417,8 +418,8 @@ class SMTP
// Windows does not have support for this timeout function
if (strpos(PHP_OS, 'WIN') !== 0) {
$max = (int)ini_get('max_execution_time');
- // Don't bother if unlimited
- if (0 !== $max && $timeout > $max) {
+ // Don't bother if unlimited, or if set_time_limit is disabled
+ if (0 !== $max && $timeout > $max && strpos(ini_get('disable_functions'), 'set_time_limit') === false) {
@set_time_limit($timeout);
}
stream_set_timeout($connection, $timeout, 0);
@@ -539,11 +540,12 @@ class SMTP
return false;
}
// Send encoded username and password
- if (!$this->sendCommand(
- 'User & Password',
- base64_encode("\0" . $username . "\0" . $password),
- 235
- )
+ if (
+ !$this->sendCommand(
+ 'User & Password',
+ base64_encode("\0" . $username . "\0" . $password),
+ 235
+ )
) {
return false;
}
@@ -1086,8 +1088,10 @@ class SMTP
{
//If SMTP transcripts are left enabled, or debug output is posted online
//it can leak credentials, so hide credentials in all but lowest level
- if (self::DEBUG_LOWLEVEL > $this->do_debug &&
- in_array($command, ['User & Password', 'Username', 'Password'], true)) {
+ if (
+ self::DEBUG_LOWLEVEL > $this->do_debug &&
+ in_array($command, ['User & Password', 'Username', 'Password'], true)
+ ) {
$this->edebug('CLIENT -> SERVER: [credentials hidden]', self::DEBUG_CLIENT);
} else {
$this->edebug('CLIENT -> SERVER: ' . $data, self::DEBUG_CLIENT);
@@ -1207,7 +1211,8 @@ class SMTP
self::DEBUG_LOWLEVEL
);
- //stream_select returns false when the `select` system call is interrupted by an incoming signal, try the select again
+ //stream_select returns false when the `select` system call is interrupted
+ //by an incoming signal, try the select again
if (stripos($message, 'interrupted system call') !== false) {
$this->edebug(
'SMTP -> get_lines(): retrying stream_select',
More information about the pkg-perl-maintainers
mailing list