Compare commits

..

No commits in common. "master" and "testing" have entirely different histories.

6 changed files with 16 additions and 38 deletions

View File

@ -34,7 +34,8 @@ sub check_hash {
my ($base_hash) = @h; my ($base_hash) = @h;
if ( $hash eq $base_hash ) { if ( $hash eq $base_hash ) {
return 1; return 1;
} else { }
else {
return 0; return 0;
} }
} }
@ -83,16 +84,6 @@ sub write_out {
print "Message writed to DB!\n"; print "Message writed to DB!\n";
} }
sub del_out {
my ( $self, $hash ) = @_;
my $dbh = $self->{_dbh};
my $q = "delete from output where hash='$hash' and send=0";
my $sth = $dbh->prepare($q);
$sth->execute();
$sth->finish();
}
sub update_out { sub update_out {
my ( $self, $hash ) = @_; my ( $self, $hash ) = @_;
my $dbh = $self->{_dbh}; my $dbh = $self->{_dbh};

View File

@ -31,7 +31,7 @@ sub send {
my $host = $config->{host}; my $host = $config->{host};
my $auth = $config->{key}; my $auth = $config->{key};
$host .= "u/point"; $host .= "u/point";
my $ua = LWP::UserAgent->new(agent => 'Mozilla/5.0 (X11; Linux x86_64; rv:35.0) Gecko/20100101 Firefox/35.0'); my $ua = LWP::UserAgent->new();
my $response my $response
= $ua->post( $host, { 'pauth' => $auth, 'tmsg' => $base64 } ); = $ua->post( $host, { 'pauth' => $auth, 'tmsg' => $base64 } );

View File

@ -194,7 +194,7 @@ sub pre {
$post =~ s/ii:\/\/(\w{20})/<a href="\/send?hash=$1">$1<\/a>/g; $post =~ s/ii:\/\/(\w{20})/<a href="\/send?hash=$1">$1<\/a>/g;
# Users # Users
# $post =~ s/.+? \@(\w+)(.?.+)/<a href="\/u?user=$1">$1<\/a>$2/g; $post =~ s/.+? \@(\w+)(.?.+)/<a href="\/u?user=$1">$1<\/a>$2/g;
# Not are regexp parsing # Not are regexp parsing
my $pre = 0; my $pre = 0;
@ -218,7 +218,6 @@ sub pre {
$txt =~ s/<font.+>(>.+)<\/font>/$1/g if $pre == 1; $txt =~ s/<font.+>(>.+)<\/font>/$1/g if $pre == 1;
} }
close $fh; close $fh;
$txt =~ s/\n/<br>/g;
return $txt; return $txt;
} }

View File

@ -19,7 +19,7 @@ Install packages.
On Debian based systems: On Debian based systems:
apt-get install libplack-perl libhtml-template-perl libsql-abstract-perl \ apt-get install libplack-perl libhtml-template-perl libsql-abstract-perl \
libdbd-sqlite3-perl libconfig-tiny-perl libhtml-fromtext-perl libdbd-sqlite3-perl libconfig-tiny-perl
## Run ## Run

25
iiplc.app Executable file → Normal file
View File

@ -1,5 +1,5 @@
#!/usr/bin/perl #!/usr/bin/perl
# Copyright © 2014-2015 Difrex <difrex.punk@gmail.com> # Copyright © 2014 Difrex <difrex.punk@gmail.com>
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or # the Free Software Foundation, either version 3 of the License, or
@ -30,6 +30,9 @@ use II::Render;
use II::DB; use II::DB;
use II::Enc; use II::Enc;
# Debug
use Data::Dumper;
my $c = II::Config->new(); my $c = II::Config->new();
my $config = $c->load(); my $config = $c->load();
@ -72,7 +75,8 @@ my $get = sub {
my $GET = II::Get->new($config); my $GET = II::Get->new($config);
$msgs .= $GET->get_echo(); $msgs .= $GET->get_echo();
} }
} else { }
else {
my $GET = II::Get->new($config); my $GET = II::Get->new($config);
$msgs .= $GET->get_echo(); $msgs .= $GET->get_echo();
} }
@ -205,20 +209,6 @@ my $search = sub {
return [ 200, [ 'Content-type' => 'text/html' ], [$result], ]; return [ 200, [ 'Content-type' => 'text/html' ], [$result], ];
}; };
# Delete out message
####################
my $del = sub {
my $env = shift;
my $req = Plack::Request->new($env);
my $hash = $req->param('hash');
my $db = II::DB->new();
$db->del_out($hash);
return [301, ['Location' => '/out'], [], ];
};
# Mountpoints # Mountpoints
builder { builder {
mount "/static" => Plack::App::File->new( root => './s/' )->to_app; mount "/static" => Plack::App::File->new( root => './s/' )->to_app;
@ -229,11 +219,10 @@ builder {
mount '/u' => $user; mount '/u' => $user;
mount '/me' => $me; mount '/me' => $me;
mount '/tree' => $tree; mount '/tree' => $tree;
mount '/get/' => $get; mount '/get' => $get;
mount '/send' => $send; mount '/send' => $send;
mount '/enc' => $enc; mount '/enc' => $enc;
mount '/out' => $out; mount '/out' => $out;
mount '/push' => $push; mount '/push' => $push;
mount '/new' => $new; mount '/new' => $new;
mount '/del' => $del;
}; };

View File

@ -12,6 +12,5 @@
</div> </div>
<div class=answer> <div class=answer>
<a href="/push?echo=<TMPL_VAR NAME=ECHO>&base64=<TMPL_VAR NAME=BASE64>&hash=<TMPL_VAR NAME=HASH>">Отправить</a> <a href="/push?echo=<TMPL_VAR NAME=ECHO>&base64=<TMPL_VAR NAME=BASE64>&hash=<TMPL_VAR NAME=HASH>">Отправить</a>
<a href="/del?hash=<TMPL_VAR NAME=HASH>">Удалить</a>
</div> </div>
</div> </div>