lib/perl/NB/CGI.pm

diff --git a/lib/perl/NB/CGI.pm b/lib/perl/NB/CGI.pm
index 4a200c048951768e7d1994257b31fdf0f4a1dd4d..4951799a4dd157966fbbcd328e19c69174b9baaa 100644 (file)
--- a/lib/perl/NB/CGI.pm
+++ b/lib/perl/NB/CGI.pm
@@ -26,11 +26,11 @@ sub _new {
 }
 
 sub new {
-       my $cgi = &CGI::new(@_);
+       my $cgi = CGI::new(@_);
        #$cgi->_setup_symbols;
        $CGI::PARAM_UTF8 = 1;
        $cgi->charset('utf-8') if $CGI::PARAM_UTF8;
-       &CGI::charset($cgi->charset);
+       CGI::charset($cgi->charset);
        return $cgi;
 }
 
@@ -130,7 +130,7 @@ sub status_msg {
                530 => "Site is frozen",
                599 => "Network connect timeout error",
        );
-       # NB 08.01.26 my($self,@p) = &self_or_default(@_);
+       # NB 08.01.26 my($self,@p) = self_or_default(@_);
        my $status = $_[0];
        #die $status;
        return $status_codes{$status};
@@ -138,7 +138,7 @@ sub status_msg {
 
 sub header_status {
        return "" if $NO_HEADERS;
-       my($self,@p) = &self_or_default(@_);
+       my($self,@p) = self_or_default(@_);
   return "" if $self->{'.header_status_printed'}++ and $CGI::HEADERS_ONCE;
   return "" if $self->{'.header_printed'} and $CGI::HEADERS_ONCE;
        my $status = shift @p;
@@ -194,11 +194,11 @@ sub argsAdd {
        # Add new one
        #push(@$p,$key,$val);
        unshift(@$p,$key,$val);
-       return &args2hash(@$p);
+       return args2hash(@$p);
 }
 
 sub no_headers {
-       my($self,@p) = &self_or_default(@_);
+       my($self,@p) = self_or_default(@_);
        my $no_header_sav = $NO_HEADERS;
        $NO_HEADERS = $p[0] if @p;
        return $no_header_sav;
@@ -206,21 +206,21 @@ sub no_headers {
 
 sub header {
        return "" if $NO_HEADERS;
-       my($self,@p) = &self_or_default(@_);
-       my %p = &args2hash(@p);
-       #&argsAdd(\@p,'expires',-1) unless $p{expires};
+       my($self,@p) = self_or_default(@_);
+       my %p = args2hash(@p);
+       #argsAdd(\@p,'expires',-1) unless $p{expires};
        # Cache-Control: private, no-cache, no-store, must-revalidate, post-check=0, pre-check=0
        $p{expires} ||= 0;
        if ($p{expires} =~ /^\d+$/ and $p{expires} <=0)
        {
-               %p = &argsAdd(\@p,'Cache-Control','private, no-cache, no-store, must-revalidate, post-check=0, pre-check=0');
-               %p = &argsAdd(\@p,'Pragma','no-cache');
-               %p = &argsAdd(\@p,'expires','now');
-               #&CGI::cache(0); # we dont want doubles headers
+               %p = argsAdd(\@p,'Cache-Control','private, no-cache, no-store, must-revalidate, post-check=0, pre-check=0');
+               %p = argsAdd(\@p,'Pragma','no-cache');
+               %p = argsAdd(\@p,'expires','now');
+               #CGI::cache(0); # we dont want doubles headers
        }
        my $status = '';
 
-       if (!&CGI::nph())
+       if (!CGI::nph())
        {
                for (my $i=0;$i<@p-1;$i++)
                {
@@ -231,8 +231,8 @@ sub header {
        }
 
        my @head = ();
-       push @head,&CGI::header(@p);
-       if ($status and @head and !&CGI::nph)
+       push @head,CGI::header(@p);
+       if ($status and @head and !CGI::nph)
        {
                $status = $self->header_status($status);
                $status =~ s/\s+$//;
@@ -242,16 +242,16 @@ sub header {
 }
 
 # NB 01.12.23 sub init {
-       # NB 01.12.23 &CGI::charset('utf-8') if $CGI::PARAM_UTF8;
-       # NB 01.12.23 &CGI::init(@_);
+       # NB 01.12.23 CGI::charset('utf-8') if $CGI::PARAM_UTF8;
+       # NB 01.12.23 CGI::init(@_);
 # NB 01.12.23 }
 
 sub text {
-       my($self,@p) = &self_or_default(@_);
+       my($self,@p) = self_or_default(@_);
        if (@p)
        {
                $TEXT_OUTPUT = $p[0];
-               # NB 06.12.23 &textOutput if $TEXT_OUTPUT;
+               # NB 06.12.23 textOutput if $TEXT_OUTPUT;
        }
        return $TEXT_OUTPUT;
 }
@@ -261,7 +261,7 @@ sub eot {
        return ($TEXT_OUTPUT ? "" : "\n");
 }
 
-#&CGI::eot { }
+#CGI::eot { }
 
 sub script_code {
        my ($self,@p) = @_;
@@ -270,14 +270,14 @@ sub script_code {
 
 sub tag {
        shift if ref($_[0]) eq __PACKAGE__; # _tag_func first arg must be tagname
-       return &_tag_func(@_);
+       return _tag_func(@_);
 }
 
 sub _tag_func_ {
        #warn 'TEXT' if $TEXT_OUTPUT;
        return _tag_func_text(@_) if $TEXT_OUTPUT;
        shift if ref($_[0]) eq __PACKAGE__; # for case: $cgi->_tag_func
-       return &CGI::_tag_func(@_);
+       return CGI::_tag_func(@_);
 }
 
 sub _tag_func {
@@ -310,7 +310,7 @@ sub _tag_func {
 }
 
 sub _tag_func_text {
-       my $self; ($self,@_) = &self_or_default(@_);
+       my $self; ($self,@_) = self_or_default(@_);
        my $tagname = shift;
        my ($q,$a,@rest) = self_or_default(@_);
 
@@ -372,18 +372,18 @@ sub _tag_func_text {
 sub start_html {
        return "" if $TEXT_OUTPUT;
        #my($self,@p) = self_or_default(@_);
-       #local $_ = &CGI::start_html(@p);
-       local $_ = &CGI::start_html(@_);
+       #local $_ = CGI::start_html(@p);
+       local $_ = CGI::start_html(@_);
        s/<!DOCTYPE .*?>/<!DOCTYPE html>/s;
        return $_;
 }
-#sub div { return &tag(@_) }
-sub end_html { return "" if $TEXT_OUTPUT; return &CGI::end_html(@_); }
-sub start_TR { if ($TEXT_OUTPUT) {$_TD_TEXT_PREFF = ""; return ""}; return &CGI::start_TR(@_); }
-sub end_TR { return "\n" if $TEXT_OUTPUT; return &CGI::end_TR(@_); }
-sub button { return "" if $TEXT_OUTPUT; return &CGI::button(@_); }
-sub checkbox { return "" if $TEXT_OUTPUT; return &CGI::checkbox(@_); }
-sub popup_menu { return &text_popup_menu(@_) if $TEXT_OUTPUT; return &CGI::popup_menu(@_); }
+#sub div { return tag(@_) }
+sub end_html { return "" if $TEXT_OUTPUT; return CGI::end_html(@_); }
+sub start_TR { if ($TEXT_OUTPUT) {$_TD_TEXT_PREFF = ""; return ""}; return CGI::start_TR(@_); }
+sub end_TR { return "\n" if $TEXT_OUTPUT; return CGI::end_TR(@_); }
+sub button { return "" if $TEXT_OUTPUT; return CGI::button(@_); }
+sub checkbox { return "" if $TEXT_OUTPUT; return CGI::checkbox(@_); }
+sub popup_menu { return text_popup_menu(@_) if $TEXT_OUTPUT; return CGI::popup_menu(@_); }
 sub text_popup_menu {
        my($self,@p) = self_or_default(@_);
        #use Data::Dumper; die Dumper(\@p);
@@ -417,13 +417,9 @@ sub self_or_default {
        return wantarray ? @_ : $Q;
 }
 
-# NB 06.12.23 sub _self_or_CGI {
-       # NB 06.12.23 local $^W=0;                # prevent a warning
-       # NB 06.12.23 if (defined($_[0]) && (substr(ref($_[0]),0,3) eq 'NB::CGI' || UNIVERSAL::isa($_[0],'NB::CGI'))) {
-               # NB 06.12.23 return @_;
-       # NB 06.12.23 } else {
-               # NB 06.12.23 return ($DefaultClass,@_);
-       # NB 06.12.23 }
-# NB 06.12.23 }
+sub css {
+       my ($self,@p) = self_or_default(@_);
+       print $self->_style({code => join($CGI::CRLF,@p)});
+}
 
 1;