diff --git a/lib/handy_utilities.pl b/lib/handy_utilities.pl index c836e7c8e..0b4a96710 100644 --- a/lib/handy_utilities.pl +++ b/lib/handy_utilities.pl @@ -1603,128 +1603,268 @@ sub main::Groups { -# Modify and get user to group relationships - if ($user and $group) { - if ($function eq 'add') { #Add user to group and add the group if needed - $UserGroups->{user}->{$user}->{$group} = 1; - $UserGroups->{group}->{$group}->{status} = 1; #Add the group - store $UserGroups, $file; - return 1; - } elsif ($function eq 'remove') { #Remove a user from a group - delete $UserGroups->{user}->{$user}->{$group}; - store $UserGroups, $file; - return 1; - } elsif ( ($UserGroups) and ($function eq 'memberof') ) { #Check is user is a member of a specific group - foreach my $ugroup ( keys %{$UserGroups->{user}->{$user}} ) { - return 1 if $ugroup eq $group; - } - return 0; - } - } elsif ( $UserGroups and $user and ($function eq 'get') ) { #Get all of the groups for a specific user - foreach my $ugroup ( keys %{$UserGroups->{user}->{$user}} ) { - push (@ugroups, $ugroup); - } - return \@ugroups; - -# Modify and get group permissions - } elsif ( $UserGroups and $group and $cmd and $function and $cmdperm and $type and ( defined($line) ) ) { - if ($function eq 'add') { #Add an allowed/denied CMD for a group on a specific line +# If the group file is empty, add user/group admin by default so we dont crash +unless ( ref($UserGroups) eq 'HASH' ) { + $UserGroups->{user}->{admin}->{status} = 1; + $UserGroups->{group}->{admin}->{status} = 1; + $UserGroups->{user}->{admin}->{group}->{admin} = 1; + push @{ $UserGroups->{user}->{admin}->{grouplist} }, 'admin'; + $UserGroups->{user}->{admin}->{defaultperm}->{_global_} = 'allow'; + store $UserGroups, $file; +} + + +# Modify and get user to group relationships + if ( $user and $group and ($function eq 'add') ) { #Add user to group and add the group if needed + $UserGroups->{user}->{$user}->{status} = 1 unless ( defined($UserGroups->{user}->{$user}->{status}) ); #Add the user if needed + $UserGroups->{group}->{$group}->{status} = 1 unless ( defined($UserGroups->{group}->{$group}->{status}) ); #Add the group if needed + unless ( $UserGroups->{user}->{$user}->{group}->{$group} ) { + $UserGroups->{user}->{$user}->{group}->{$group} = 1; #Add the user to the group + if ( defined($line) ) { #Add the group to the user on a specific line if line is defined + my $cmdindex = 0; + if ( $UserGroups->{user}->{$user}->{grouplist} ) { + $cmdindex = scalar(@{ $UserGroups->{user}->{$user}->{grouplist} }); + } + return 0 if $line > $cmdindex; + splice(@{ $UserGroups->{user}->{$user}->{grouplist} }, $line, 1); + ${ $UserGroups->{user}->{$user}->{grouplist} }[$line] = $group; + } else { + push @{ $UserGroups->{user}->{$user}->{grouplist} }, $group; #Add the user to the group to the bottom of the list + } + } + store $UserGroups, $file; + return 1; + } elsif ( $user and ($function eq 'add') ) { #Add a new user + unless ( defined($UserGroups->{user}->{$user}->{status}) ) { + $UserGroups->{user}->{$user}->{status} = 1; + $UserGroups->{user}->{$user}->{password} = ""; + $UserGroups->{user}->{$user}->{password} = $type if (defined $type and $type ne ""); + store $UserGroups, $file; + return 1; + } + return 0; + } elsif ( $UserGroups and $user and ($function eq 'disable') ) { #Disable user + if ( $user eq 'admin' ) { return 0 } # Disallow admin from being disabled + if ( defined($UserGroups->{user}->{$user}->{status}) && ( not $UserGroups->{user}->{$user}->{status} == 0 ) ) { + $UserGroups->{user}->{$user}->{status} = 0; + store $UserGroups, $file; + return 1; + } + return 0; + } elsif ( $UserGroups and $user and ($function eq 'enable') ) { #Enable user + if ( defined($UserGroups->{user}->{$user}->{status}) && ( not $UserGroups->{user}->{$user}->{status} == 1 ) ) { + $UserGroups->{user}->{$user}->{status} = 1; + store $UserGroups, $file; + return 1; + } + return 0; + } elsif ( $UserGroups and $user and ($function eq 'getpw') ) { #Return stored password + if ( defined($UserGroups->{user}->{$user}->{password}) ) { +print "PWD = $UserGroups->{user}->{$user}->{password}\n"; + return ($UserGroups->{user}->{$user}->{password}); + } + return ""; + } elsif ( $UserGroups and $user and $group and ($function eq 'remove') ) { #Remove a user from a group + if ( ( $user eq 'admin' ) && ( $group eq 'admin' ) ) { return 0 } # Disallow admin from being removed from admin group + delete $UserGroups->{user}->{$user}->{group}->{$group}; + my $lc = -1; + foreach my $ugroup ( @{ $UserGroups->{user}->{$user}->{grouplist} } ) { + $lc++; + if ( $ugroup eq $group ) { splice @{ $UserGroups->{user}->{$user}->{grouplist} }, $lc, 1 } ## Delete group from user group array + } + store $UserGroups, $file; + return 1; + } elsif ( $UserGroups and $user and ($function eq 'delete') ) { #Delete a user + if ( $user eq 'admin' ) { return 0 } # Disallow admin from being deleted + if ( defined($UserGroups->{user}->{$user}->{status}) ) { + delete $UserGroups->{user}->{$user}; + return 1; + } + return 0; + } elsif ( $UserGroups and $user and $group and ($function eq 'memberof') ) { #Check is user is a member of a specific group + return 1 if $UserGroups->{user}->{$user}->{group}->{$group}; + return 0; + } elsif ( $UserGroups and $user and ($function eq 'get') ) { #Get all of the groups for a specific user + return \@{ $UserGroups->{user}->{$user}->{grouplist} }; + } elsif ( $UserGroups and $user and $cmdperm and $type and ($function eq 'defaultperm') ) { #Set the default permission for a user and specific ACL type + if ( $user eq 'admin' ) { return 0 } # Disallow admin user from being modified + $UserGroups->{user}->{$user}->{defaultperm}->{$type} = $cmdperm; + store $UserGroups, $file; + return 1; + } elsif ( $UserGroups and $user and $cmdperm and ($function eq 'defaultperm') ) { #Set the default global (all types) permission for a user + if ( $user eq 'admin' ) { return 0 } # Disallow admin user from being modified + $UserGroups->{user}->{$user}->{defaultperm}->{_global_} = $cmdperm; + store $UserGroups, $file; + return 1; + } elsif ( $UserGroups and $user and $type and $cmd and ($function eq 'check') ) { #Check a CMD to see if its allowed for the user (requires ACL type) + return 'deny' unless $UserGroups->{user}->{$user}->{status}; #User is disabled + foreach my $ugroup ( @{ $UserGroups->{user}->{$user}->{grouplist} } ) { + next if ( $UserGroups->{group}->{$ugroup}->{status} == 0 ); #Group is disabled, skip it + foreach my $cmdarray ( @{ $UserGroups->{group}->{$ugroup}->{acl}->{$type} } ) { + my $matchcmd = ${ $cmdarray }[0]; + my $permission = ${ $cmdarray }[1]; + + if ( $cmd =~ /$matchcmd/ ) { + return $permission; + } elsif ( $matchcmd eq 'all' ) { + return $permission; + } + } + } + return $UserGroups->{user}->{$user}->{defaultperm}->{$type} if ( $UserGroups->{user}->{$user}->{defaultperm}->{$type} ); #Return user default permission for cmd type if defined + return $UserGroups->{user}->{$user}->{defaultperm}->{_global_} if ( $UserGroups->{user}->{$user}->{defaultperm}->{_global_} ); #Return user default permission if defined + return 'deny'; #Return deny by default + + } elsif ( $UserGroups and $user and $type and ($function eq 'fullacl') ) { #Get the full user ACL for a specific ACL type (returns array) + my @aclarray; + foreach my $ugroup ( @{ $UserGroups->{user}->{$user}->{grouplist} } ) { + next if ( $UserGroups->{group}->{$ugroup}->{status} == 0 ); #Group is disabled, skip it + foreach my $cmdarray ( @{ $UserGroups->{group}->{$ugroup}->{acl}->{$type} } ) { + my $matchcmd = ${ $cmdarray }[0]; + my $permission = ${ $cmdarray }[1]; + my $index = push @aclarray, $matchcmd; + ${ $aclarray[$index] }[0] = $permission + } + } + return \@aclarray; + } elsif ( $UserGroups and $user and ($function eq 'fullacl') ) { #Get the full user ACL for all ACL types (returns hash of arrays) + my $aclhash; + foreach my $ugroup ( @{ $UserGroups->{user}->{$user}->{grouplist} } ) { + next if ( $UserGroups->{group}->{$ugroup}->{status} == 0 ); #Group is disabled, skip it + foreach my $type ( keys %{$UserGroups->{group}->{$ugroup}->{acl}} ) { + foreach my $cmdarray ( @{ $UserGroups->{group}->{$ugroup}->{acl}->{$type} } ) { + my $matchcmd = ${ $cmdarray }[0]; + my $permission = ${ $cmdarray }[1]; + my $index = push @{ $aclhash->{$type} }, $matchcmd; + ${ ${ $aclhash->{$type} }[$index] }[0] = $permission + } + } + } + return \$aclhash; + + # Modify and get group permissions + } elsif ( $UserGroups and $group and $cmd and ($function eq 'add') and $cmdperm and $type) { #Add an allowed/denied CMD for a group my $cmdindex = 0; - if ( $UserGroups->{group}->{$group}->{$type} ) { - $cmdindex = scalar(@{ $UserGroups->{group}->{$group}->{$type} }); + if ( $UserGroups->{group}->{$group}->{acl}->{$type} ) { + $cmdindex = scalar(@{ $UserGroups->{group}->{$group}->{acl}->{$type} }); + } + my $lc = -1; + foreach my $cmdarray ( @{ $UserGroups->{group}->{$group}->{acl}->{$type} } ) { + $lc++; + my $matchcmd = ${ $cmdarray }[0]; + my $permission = ${ $cmdarray }[1]; + if ( $matchcmd eq $cmd ) { + if ( defined($line) ) { + splice @{ $UserGroups->{group}->{$group}->{acl}->{$type} }, $lc, 1; #A specific line number was specified, so delete the matching cmd + $cmdindex--; + last; + } + if ( $permission eq $cmdperm ) { return 0 } #Duplicate, dont add anything + ${ ${ $UserGroups->{group}->{$group}->{acl}->{$type} }[$lc] }[1] = $cmdperm; #update perm only + store $UserGroups, $file; + return 1; + } } - return 0 if $line > $cmdindex; - splice(@{ $UserGroups->{group}->{$group}->{$type} }, $line, 1, undef); - ${ ${ $UserGroups->{group}->{$group}->{$type} }[$line] }[0] = $cmd; - ${ ${ $UserGroups->{group}->{$group}->{$type} }[$line] }[1] = $cmdperm; + if ( defined($line) ) { #A specific line number was specified + $line = $cmdindex if $line > $cmdindex; + splice(@{ $UserGroups->{group}->{$group}->{acl}->{$type} }, $line, 0, undef); #Insert a new line on the specified line number + ${ ${ $UserGroups->{group}->{$group}->{acl}->{$type} }[$line] }[0] = $cmd; + ${ ${ $UserGroups->{group}->{$group}->{acl}->{$type} }[$line] }[1] = $cmdperm; + store $UserGroups, $file; + return 1; + } + ${ ${ $UserGroups->{group}->{$group}->{acl}->{$type} }[$cmdindex] }[0] = $cmd; + ${ ${ $UserGroups->{group}->{$group}->{acl}->{$type} }[$cmdindex] }[1] = $cmdperm; store $UserGroups, $file; return 1; - } - } elsif ( $UserGroups and $group and $cmd and $function and $cmdperm and $type) { - if ($function eq 'add') { #Add an allowed/denied CMD for a group - my $cmdindex = 0; - if ( $UserGroups->{group}->{$group}->{$type} ) { - $cmdindex = scalar(@{ $UserGroups->{group}->{$group}->{$type} }); - } - ${ ${ $UserGroups->{group}->{$group}->{$type} }[$cmdindex] }[0] = $cmd; - ${ ${ $UserGroups->{group}->{$group}->{$type} }[$cmdindex] }[1] = $cmdperm; - store $UserGroups, $file; - return 1; - } - } elsif ( $UserGroups and $group and $cmd and $type and $function ) { - if ($function eq 'check') { #Check a CMD to see if its allowed for the group - foreach my $cmdarray ( @{ $UserGroups->{group}->{$group}->{$type} } ) { - my $matchcmd = ${ $cmdarray }[0]; - my $permission = ${ $cmdarray }[1]; - - if ( $cmd =~ /$matchcmd/ ) { - return $permission; - } elsif ( $matchcmd eq 'all' ) { - return $permission; - } - } - return $UserGroups->{group}->{$group}->{defaultperm}->{$type} if ( $UserGroups->{group}->{$group}->{defaultperm}->{$type} ); #Return group default permission for cmd type if defined - return $UserGroups->{group}->{$group}->{defaultperm}->{_global_} if ( $UserGroups->{group}->{$group}->{defaultperm}->{_global_} ); #Return group default permission if defined - return 'deny'; #Return deny by default - } elsif ($function eq 'removebyname') { + } elsif ( $UserGroups and $group and $type and ($function eq 'removeall') ) { #Remove all ACL lines for an ACL type + if ( defined($UserGroups->{group}->{$group}->{acl}->{$type}) ) { + delete $UserGroups->{group}->{$group}->{acl}->{$type}; + delete $UserGroups->{group}->{$group}->{acl} unless ( keys %{ $UserGroups->{group}->{$group}->{acl} } ); + store $UserGroups, $file; + return 1; + } + return 0; + } elsif ( $UserGroups and $group and $cmd and $type and ($function eq 'removebyname') ) { #Remove an ACL line by the CMD my $c = 0; - my $deleted = 0; - foreach my $cmdarray ( @{ $UserGroups->{group}->{$group}->{$type} } ) { - if ( ${ $cmdarray }[0] eq $cmd ) { # Delete matching cmd - splice @{ $UserGroups->{group}->{$group}->{$type} }, $c, 1; - $deleted++ - } + my $deleted = 0; + foreach my $cmdarray ( @{ $UserGroups->{group}->{$group}->{acl}->{$type} } ) { + if ( ${ $cmdarray }[0] eq $cmd ) { # Delete matching cmd + splice @{ $UserGroups->{group}->{$group}->{acl}->{$type} }, $c, 1; + $deleted++ + } $c++; } store $UserGroups, $file if $deleted; return $deleted; - } elsif ($function eq 'removebyindex') { - splice @{ $UserGroups->{group}->{$group}->{$type} }, $cmd, 1; - store $UserGroups, $file; - return 1; - } - } elsif ( $UserGroups and $group and ($function eq 'defaultperm') and $cmdperm and $type) { - $UserGroups->{group}->{$group}->{defaultperm}->{$type} = $cmdperm; - store $UserGroups, $file; - return 1; - } elsif ( $UserGroups and $group and ($function eq 'defaultperm') and $cmdperm ) { - $UserGroups->{group}->{$group}->{defaultperm}->{_global_} = $cmdperm; - store $UserGroups, $file; - return 1; - } elsif ( $UserGroups and $group ) { - if ($function eq 'get') { #Get all users in a group - foreach my $cuser ( keys %{$UserGroups->{user}} ) { - foreach my $ugroup ( keys %{$UserGroups->{user}->{$cuser}} ) { - push (@users, $cuser) if $ugroup eq $group; - } - } - return \@users; - } elsif ($function eq 'getgroupdet') { - return \$UserGroups->{group}->{$group}; - } elsif ($function eq 'add') { #Add a new group - $UserGroups->{group}->{$group}->{status} = 1; #Add the group - store $UserGroups, $file; - return 1; - } elsif ($function eq 'delete') { #Delete a group + } elsif ( $UserGroups and $group and $type and ($function eq 'removebyindex') and defined($line) ) { #Remove an ACL line by line number + my $cmdindex = 0; + if ( $UserGroups->{group}->{$group}->{acl}->{$type} ) { + $cmdindex = scalar(@{ $UserGroups->{group}->{$group}->{acl}->{$type} }); + } + return 0 if $line > $cmdindex; + + splice @{ $UserGroups->{group}->{$group}->{acl}->{$type} }, $cmd, 1; + store $UserGroups, $file; + return 1; + } elsif ( $UserGroups and $group and ($function eq 'get') ) { #Get all users in a group (returns an array) + my @users; + foreach my $cuser ( keys %{$UserGroups->{user}} ) { + push (@users, $cuser) if $UserGroups->{user}->{$cuser}->{group}->{$group}; + } + return \@users; + } elsif ( $UserGroups and $group and ($function eq 'getgroupdet') ) { + return \$UserGroups->{group}->{$group}; + } elsif ( $UserGroups and $group and ($function eq 'add') ) { #Add a new group + unless ( defined($UserGroups->{group}->{$group}->{status}) ) { + $UserGroups->{group}->{$group}->{status} = 1; #Add the group + store $UserGroups, $file; + return 1; + } + return 0; + } elsif ( $UserGroups and $group and ($function eq 'delete') ) { #Delete a group + if ( $group eq 'admin' ) { return 0 } # Disallow admin group from being deleted delete $UserGroups->{group}->{$group}; #Delete group from group hash foreach my $cuser ( keys %{$UserGroups->{user}} ) { - foreach my $ugroup ( keys %{$UserGroups->{user}->{$cuser}} ) { - delete $UserGroups->{user}->{$user}->{$group} if $ugroup eq $group; #Delete group from users + foreach my $ugroup ( keys %{$UserGroups->{user}->{$cuser}->{group}} ) { + if ( $ugroup eq $group ) { + delete $UserGroups->{user}->{$cuser}->{group}->{$group}; #Delete group from users + my $lc = -1; + foreach my $usrgroup ( @{ $UserGroups->{user}->{$cuser}->{grouplist} } ) { + $lc++; + if ( $usrgroup eq $group ) { splice @{ $UserGroups->{user}->{$cuser}->{grouplist} }, $lc, 1 } ## Delete group from user group array + } + } } } store $UserGroups, $file; return 1; + } elsif ( $UserGroups and $group and ($function eq 'disable') ) { #Disable a group + if ( $group eq 'admin' ) { return 0 } # Disallow admin from being disabled + if ( defined($UserGroups->{group}->{$group}->{status}) && ( not $UserGroups->{group}->{$group}->{status} == 0 ) ) { + $UserGroups->{group}->{$group}->{status} = 0; + store $UserGroups, $file; + return 1; + } + return 0; + } elsif ( $UserGroups and $group and ($function eq 'enable') ) { #Enable a group + if ( defined($UserGroups->{group}->{$group}->{status}) && ( not $UserGroups->{group}->{$group}->{status} == 1 ) ) { + $UserGroups->{group}->{$group}->{status} = 1; + store $UserGroups, $file; + return 1; + } + return 0; + } elsif ( $UserGroups and ($function eq 'getgroupnames') ) { #Get all the group names (returns array) + my @ugroups; + foreach my $ugroup ( keys %{$UserGroups->{group}} ) { + push (@ugroups, $ugroup); + } + return \@ugroups; + } elsif ( $UserGroups and ($function eq 'getgroupdet') ) { #Get all groups and their details (allowedd cmd, etc) + return \$UserGroups->{group}; + } elsif ( $UserGroups and ($function eq 'getall') ) { #Get entire hash with user and group details, for caching in MH because storable reads from a file. + return \$UserGroups; } - } elsif ( $UserGroups and ($function eq 'getgroupnames') ) { - foreach my $ugroup ( keys %{$UserGroups->{group}} ) { - push (@ugroups, $ugroup); - } - return \@ugroups; - } elsif ( $UserGroups and ($function eq 'getgroupdet') ) { #Get all groups and their details (allowedd cmd, etc) - return \$UserGroups->{group}; - } elsif ( $UserGroups and ($function eq 'getall') ) { #Get entire hash with user and group details, for caching in MH because storable reads from a file. - return \$UserGroups; - } return 0; } diff --git a/lib/json_server.pl b/lib/json_server.pl index 9cc0420ed..fa3e1c1e5 100755 --- a/lib/json_server.pl +++ b/lib/json_server.pl @@ -48,6 +48,7 @@ =head2 METHODS use IO::Compress::Gzip qw(gzip); use vars qw(%json_table); use File::Copy; +use Digest::MD5 qw(md5 md5_hex); my %json_cache; my @json_notifications = (); #noloop my $web_counter; #noloop; @@ -266,10 +267,12 @@ sub json_put { &Groups('add',$body->{name},$members); } if ($body->{pk} eq 'add_user') { - &Groups('add','',$body->{name}); - print("add_user &Groups('add','',$body->{name})\n"); + my $passwd = ""; + $passwd = $body->{password}; + $passwd = md5_hex($passwd) unless ($body->{md5} eq "true"); + &Groups('add','',$body->{name},$passwd); + print("add_user &Groups('add','',$body->{name},$passwd), [$body->{md5}]\n"); - #Add create password function foreach my $group (@{$body->{groups}}) { &Groups('add',$group,$body->{name}); print("add_user &Groups('add',$group,$body->{name})\n"); @@ -881,26 +884,59 @@ sub json_get { if ( $path[0] eq 'security' ) { #check if $Authorized - my $ref; - my $users; - my $found = 0; - if ($args{user} && $args{user}[0] ne "") { - $ref->{user} = &Groups('get','',$args{user}[0]); - #$json_data{security}{users} = - $found = 1; - } - if ($args{group} && $args{group}[0] ne "") { - $ref->{group} = &Groups('get',$args{group}[0]); - #$json_data{security}{groups} = - $found = 1; - } - if (!$found) { - $ref = ${&Groups('getall')}; + if (defined $path[1] and $path[1] eq 'authorize') { + print "IN AUTHORIZE\n"; + my $status = ""; + if ($args{user} && $args{user}[0] eq "") { + $status = "Empty Username"; + } elsif ($args{password} && $args{password}[0] eq "") { + $status = "Empty Password"; + } else { + my $password = &Groups('getpw','',$args{user}[0]); + my $time_seed = &main::time_date_stamp('18',$Time); + my $time_seedY = &main::time_date_stamp('18',$Time - 86400); + my $time_seedT = &main::time_date_stamp('18',$Time + 86400); + + #if time is between 11:55 and midnight then also check tomorrow + #if time is between midnight and 00:05 then also check yesterday + print "PW=$password, time_seed=$time_seed, $time_seedY, $time_seedT\n"; + my $pwdcheck = md5_hex($password . $time_seed); + print "PWC=$pwdcheck\n"; + + if (lc $args{password}[0] eq lc $pwdcheck) { + $status = "success"; + } else { + $status = "fail"; + } + } + $json_data{security}->{authorize} = $status; + } else { + my $ref; + my $users; + my $found = 0; + if ($args{user} && $args{user}[0] ne "") { + $ref->{user} = &Groups('get','',$args{user}[0]); + #$json_data{security}{users} = + $found = 1; + } + if ($args{group} && $args{group}[0] ne "") { + $ref->{group} = &Groups('get',$args{group}[0]); + #$json_data{security}{groups} = + $found = 1; + } + if (!$found) { + $ref = ${&Groups('getall')}; + } + #ref->{acl} = ${&Groups('fullacl')}; + print Dumper $ref; + $json_data{security} = $ref if (defined $ref); + #$json_data{security} = ${$ref} if (defined ${$ref}); + #print Dumper $json_data{security}; + } } - print Dumper $ref; - $json_data{security} = $ref if (defined $ref); - #$json_data{security} = ${$ref} if (defined ${$ref}); - #print Dumper $json_data{security}; + + if ( $path[0] eq 'authorize' ) { + # /json/security/authorize?$user=admin&password=MD5HASH } # List subroutines diff --git a/web/ia7/house/whatsnew.shtml b/web/ia7/house/whatsnew.shtml index 6f4dcc58e..e717af24e 100644 --- a/web/ia7/house/whatsnew.shtml +++ b/web/ia7/house/whatsnew.shtml @@ -3,6 +3,7 @@
+

@@ -21,19 +22,33 @@

- Dynamic Modules and Zoneminder events + Dynamic Modules and Zoneminder events

-
+
    -
  • Faster Loading -
  • Zoneminder +
  • Faster Loading on pages +
  • Zoneminder will now generate a modal if an event is detected. Requires external utility zmeventserver
- +
+
+

+ Users and Groups +

+
+
+
+
    +
  • Users and Groups can be created from the GUI +
  • MH can be used as an authentication source /json/security/authorize?username=&password=MD5HASHYYYYDDMM +
+
+
+

v5.0

diff --git a/web/ia7/include/javascript.js b/web/ia7/include/javascript.js index ee7568ac4..719fc8088 100644 --- a/web/ia7/include/javascript.js +++ b/web/ia7/include/javascript.js @@ -1,5 +1,5 @@ -var ia7_ver = "v2.0.680"; +var ia7_ver = "v2.0.690"; var coll_ver = ""; var entity_store = {}; //global storage of entities var json_store = {}; @@ -98,6 +98,8 @@ function HashtoURL(URLHash) { return location.path + "#" + pairs.join('&'); } +var MD5 = function(s){function L(k,d){return(k<>>(32-d))}function K(G,k){var I,d,F,H,x;F=(G&2147483648);H=(k&2147483648);I=(G&1073741824);d=(k&1073741824);x=(G&1073741823)+(k&1073741823);if(I&d){return(x^2147483648^F^H)}if(I|d){if(x&1073741824){return(x^3221225472^F^H)}else{return(x^1073741824^F^H)}}else{return(x^F^H)}}function r(d,F,k){return(d&F)|((~d)&k)}function q(d,F,k){return(d&k)|(F&(~k))}function p(d,F,k){return(d^F^k)}function n(d,F,k){return(F^(d|(~k)))}function u(G,F,aa,Z,k,H,I){G=K(G,K(K(r(F,aa,Z),k),I));return K(L(G,H),F)}function f(G,F,aa,Z,k,H,I){G=K(G,K(K(q(F,aa,Z),k),I));return K(L(G,H),F)}function D(G,F,aa,Z,k,H,I){G=K(G,K(K(p(F,aa,Z),k),I));return K(L(G,H),F)}function t(G,F,aa,Z,k,H,I){G=K(G,K(K(n(F,aa,Z),k),I));return K(L(G,H),F)}function e(G){var Z;var F=G.length;var x=F+8;var k=(x-(x%64))/64;var I=(k+1)*16;var aa=Array(I-1);var d=0;var H=0;while(H>>29;return aa}function B(x){var k="",F="",G,d;for(d=0;d<=3;d++){G=(x>>>(d*8))&255;F="0"+G.toString(16);k=k+F.substr(F.length-2,2)}return k}function J(k){k=k.replace(/rn/g,"n");var d="";for(var F=0;F127)&&(x<2048)){d+=String.fromCharCode((x>>6)|192);d+=String.fromCharCode((x&63)|128)}else{d+=String.fromCharCode((x>>12)|224);d+=String.fromCharCode(((x>>6)&63)|128);d+=String.fromCharCode((x&63)|128)}}}return d}var C=Array();var P,h,E,v,g,Y,X,W,V;var S=7,Q=12,N=17,M=22;var A=5,z=9,y=14,w=20;var o=4,m=11,l=16,j=23;var U=6,T=10,R=15,O=21;s=J(s);C=e(s);Y=1732584193;X=4023233417;W=2562383102;V=271733878;for(P=0;P

Object Log

"); $('#control').find('.modal-body').append(object_log_header); for (var i = 0; i < json_store.ia7_config.prefs.state_log_entries; i++) { + if (json_store.objects[entity].state_log == undefined) continue; if (json_store.objects[entity].state_log[i] == undefined) continue; var slog = json_store.objects[entity].state_log[i].split("set_by="); $('#control').find('.obj_log').append(slog[0]+"
"); @@ -4074,8 +4080,10 @@ var create_develop_item_modal = function(colid,col_parent) { type: 'post', contentType: 'application/json', data: JSON.stringify(data), - success: function( data, status, error ){ - console.log("data="+data+" status="+status+" error="+error); + currentUser: {user: current_user}, + success: function( data, status, error){ + var user = this.currentUser.user; + console.log("data="+data+" status="+status+" error="+error+" user="+user); //throw up red warning if the response isn't good from MH if (data.status !== undefined || data.status == "error") { var message = "Unknown server error"; @@ -4089,17 +4097,18 @@ var create_develop_item_modal = function(colid,col_parent) { $('.btn-dev-apply').addClass('disabled'); dev_changes = 0; } - data[700].user = current_user; + json_store.collections[700].user = user; }, error: function( xhr, status, error ){ var message = "Unknown ajax request error"; + var user = this.currentUser.user; var data = JSON.parse(xhr.responseText); if (data !== undefined && data.text !== undefined) message = data.text; console.log("status="+status); console.log("error="+error); $(".modal-header").append($("

 Failure: "+message+"

")); $(".write-status").delay(4000).fadeOut("slow", function () { $(this).remove(); }); - data[700].user = current_user; + json_store.collections[700].user = user; } }); });