diff --git a/website/agenda/planung/event-history.cgi b/website/agenda/planung/event-history.cgi index 09d52da..b8cb861 100755 --- a/website/agenda/planung/event-history.cgi +++ b/website/agenda/planung/event-history.cgi @@ -8,9 +8,6 @@ use URI::Escape(); use Data::Dumper; use MIME::Base64(); -#use Text::Diff::FormattedHTML(); -use Text::Diff::Unified::XS; - use params(); use config(); use entry(); @@ -26,8 +23,8 @@ use event_history(); use events(); use series_events(); use localization(); - -#binmode STDOUT, ":utf8"; +use utf8; +binmode STDOUT, ":utf8"; my $r = shift; ( my $cgi, my $params, my $error ) = params::get($r); @@ -36,10 +33,17 @@ my $config = config::get('../config/config.cgi'); my $debug = $config->{system}->{debug}; my ( $user, $expires ) = auth::get_user( $config, $params, $cgi ); return if ( ( !defined $user ) || ( $user eq '' ) ); - -my $user_presets = uac::get_user_presets( $config, { user => $user, studio_id => $params->{studio_id} } ); +my $user_presets = uac::get_user_presets( + $config, + { + user => $user, + project_id => $params->{project_id}, + studio_id => $params->{studio_id} + } +); $params->{default_studio_id} = $user_presets->{studio_id}; $params = uac::setDefaultStudio( $params, $user_presets ); +$params = uac::setDefaultProject( $params, $user_presets ); my $request = { url => $ENV{QUERY_STRING} || '', @@ -61,12 +65,16 @@ template::process( $config, 'print', template::check( $config, 'default.html' ), return unless uac::check( $config, $params, $user_presets ) == 1; print q{ - - - - - - + }; $config->{access}->{write} = 0; @@ -135,8 +143,6 @@ sub compare { return; } - print qq{} . "\n"; - if ( $params->{v1} > $params->{v2} ) { my $t = $params->{v1}; $params->{v1} = $params->{v2}; @@ -172,58 +178,59 @@ sub compare { print ''; print ''; - #log::save_file('/tmp/diff-a.txt', $t1); - #log::save_file('/tmp/diff-b.txt', $t2); - #my $diff=`/usr/bin/diff /tmp/diff-a.txt /tmp/diff-b.txt`; - - my $diff = diff( \$t1, \$t2 ); - - #$diff=~s/\&/\&/g; - #$diff=~s/\/\>/g; - #$diff=~s/\"/\"/g; - #$diff=~s/\'/\'/g; - $diff =~ s/\'/\\\'/g; - - #$diff=~s/\n/\'+\'/g; - $diff = join( qq{\\n' + '}, split( /\r?\n/, $diff ) ); - - #
$diff
- print qq! -
- - - - !; - - #print ''; - - #print ""; - #print '
';
-    #my $diff=diff_strings( { vertical => 1 }, $t1, $t2);
-    #my $diff = Text::Diff::FormattedHTML::diff_strings( {}, $t1, $t2 );
-
-    #print Text::Diff::diff(\$t1, \$t2, { STYLE => "Table" });
-    #print Text::Diff::diff($v1, $v2, { STYLE => "Table" });
-    #print $diff;
-
-    #print '
'; + my $cmd="/usr/bin/colordiff /tmp/diff-a.txt /tmp/diff-b.txt | ansi2html"; + #print "$cmd\n"; + log::save_file('/tmp/diff-a.txt', $t1); + log::save_file('/tmp/diff-b.txt', $t2); + print qq{ + + }; + my $diff = qx{$cmd}; + $diff = substr($diff, index($diff, "")+6); + $diff = substr($diff, 0, index($diff, "")); + print "$diff\n"; + } sub eventToText {