Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 674772
Collapse All | Expand All

(-)a/lib/perl/Requests/WebDAVRequest.pm (-1 / +1 lines)
Lines 134-140 sub get_prop_stat { Link Here
134
    $fn .= $is_dir && $fn !~ /\/$/xms ? q{/} : q{};
134
    $fn .= $is_dir && $fn !~ /\/$/xms ? q{/} : q{};
135
    foreach my $prop ( @{$props} ) {
135
    foreach my $prop ( @{$props} ) {
136
        my ( $xmlnsuri, $propname ) = ( 'DAV:', $prop );
136
        my ( $xmlnsuri, $propname ) = ( 'DAV:', $prop );
137
        if ( $prop =~ /^{([^}]*)}(.*)$/xms ) {
137
        if ( $prop =~ /^[{]([^}]*)[}](.*)$/xms ) {
138
            ( $xmlnsuri, $propname ) = ( $1, $2 );
138
            ( $xmlnsuri, $propname ) = ( $1, $2 );
139
        }
139
        }
140
140
(-)a/lib/perl/WebDAV/Properties.pm (-2 / +2 lines)
Lines 139-145 sub set_property { Link Here
139
    my $rfn = $self->resolve($fn);
139
    my $rfn = $self->resolve($fn);
140
    my $ru  = $REQUEST_URI;
140
    my $ru  = $REQUEST_URI;
141
    my ( $ns, $pn );
141
    my ( $ns, $pn );
142
    if ( $propname =~ /^{([^}]+)}(.*)$/xms ) {
142
    if ( $propname =~ /^[{]([^}]+)[}](.*)$/xms ) {
143
        ( $ns, $pn ) = ( $1, $2 );
143
        ( $ns, $pn ) = ( $1, $2 );
144
    }
144
    }
145
145
Lines 186-192 sub set_property { Link Here
186
        if (   $parref
186
        if (   $parref
187
            && ref($parref) eq 'HASH'
187
            && ref($parref) eq 'HASH'
188
            && ( !${$parref}{xmlns} || ${$parref}{xmlns} eq q{} )
188
            && ( !${$parref}{xmlns} || ${$parref}{xmlns} eq q{} )
189
            && $n !~ /^{[^}]*}/xms )
189
            && $n !~ /^[{][^}]*[}]/xms )
190
        {
190
        {
191
            $n = '{}' . $n;
191
            $n = '{}' . $n;
192
        }
192
        }
(-)a/lib/perl/WebDAV/XMLHelper.pm (-1 / +1 lines)
Lines 229-235 sub get_namespace_uri { Link Here
229
229
230
sub nonamespace {
230
sub nonamespace {
231
    my ($prop) = @_;
231
    my ($prop) = @_;
232
    $prop =~ s/^{[^}]*}//xms;
232
    $prop =~ s/^[{][^}]*[}]//xms;
233
    return $prop;
233
    return $prop;
234
}
234
}
235
235
(-)a/lib/perl/WebInterface/Extension/PropertiesViewer.pm (-1 / +1 lines)
Lines 157-163 sub _render_viewer { Link Here
157
        my $title = create_xml( $r200{prop},        1 );
157
        my $title = create_xml( $r200{prop},        1 );
158
        my $value = create_xml( $r200{prop}{$prop}, 1 );
158
        my $value = create_xml( $r200{prop}{$prop}, 1 );
159
        my $namespace = get_namespace_uri($prop);
159
        my $namespace = get_namespace_uri($prop);
160
        if ( $prop =~ /^{([^}]*)}/xms ) {
160
        if ( $prop =~ /^[{]([^}]*)[}]/xms ) {
161
            $namespace = $1;
161
            $namespace = $1;
162
        }
162
        }
163
        push @bgstyleclasses, shift @bgstyleclasses;
163
        push @bgstyleclasses, shift @bgstyleclasses;
(-)a/lib/perl/WebInterface/View/Simple/RenderFileListTable.pm (-3 / +3 lines)
Lines 85-91 sub render_file_list_table { Link Here
85
        unselectable => $self->is_unselectable($fn)        ? 'yes' : 'no',
85
        unselectable => $self->is_unselectable($fn)        ? 'yes' : 'no',
86
    );
86
    );
87
    $filelisttabletemplate =~
87
    $filelisttabletemplate =~
88
        s/[\$]{?(\w+)}?/exists $stdvars{$1} && defined $stdvars{$1}?$stdvars{$1}:"\$$1"/xmegs;
88
        s/[\$][{]?(\w+)[}]?/exists $stdvars{$1} && defined $stdvars{$1}?$stdvars{$1}:"\$$1"/xmegs;
89
    my %jsondata = (
89
    my %jsondata = (
90
        content => $self->minify_html(
90
        content => $self->minify_html(
91
            $self->render_template( $fn, $ru, $filelisttabletemplate )
91
            $self->render_template( $fn, $ru, $filelisttabletemplate )
Lines 253-260 sub _render_file_list_entry { Link Here
253
    my $displayname = $self->{cgi}->escapeHTML( $self->{backend}->getDisplayName($full) );
253
    my $displayname = $self->{cgi}->escapeHTML( $self->{backend}->getDisplayName($full) );
254
    my $now = $self->{c}{_render_file_list_entry}{now}{$lang} //= DateTime->now( locale => $lang );
254
    my $now = $self->{c}{_render_file_list_entry}{now}{$lang} //= DateTime->now( locale => $lang );
255
    my $cct = $self->can_create_thumb($full);
255
    my $cct = $self->can_create_thumb($full);
256
    my $u   = $self->{c}{_render_file_list_entry}{uid}{$uid // 'unknown'} //= $uid && $uid=~/^\d+$/xms ? scalar getpwuid( $uid ) : $uid ? $uid : 'unknown';
256
    my $u   = $self->{c}{_render_file_list_entry}{uid}{$uid // 'unknown'} //= $uid && $uid=~/^\d+$/xms ? scalar getpwuid( $uid ) // $uid: $uid ? $uid : 'unknown';
257
    my $g   = $self->{c}{_render_file_list_entry}{gid}{$gid // 'unknown'} //= $gid && $gid=~/^\d+$/xms ? scalar getgrgid( $gid ) : $gid ? $gid : 'unknown';
257
    my $g   = $self->{c}{_render_file_list_entry}{gid}{$gid // 'unknown'} //= $gid && $gid=~/^\d+$/xms ? scalar getgrgid( $gid ) // $gid: $gid ? $gid : 'unknown';
258
    my $icon = $self->{c}{_render_file_list_entry}{icon}{$mime}
258
    my $icon = $self->{c}{_render_file_list_entry}{icon}{$mime}
259
        //= $self->get_icon($mime);
259
        //= $self->get_icon($mime);
260
    my $enthumb = $self->{c}{_render_file_list_entry}{cookie}{thumbnails}
260
    my $enthumb = $self->{c}{_render_file_list_entry}{cookie}{thumbnails}
(-)a/lib/perl/WebInterface/Common.pm (-18 / +18 lines)
Lines 212-235 Link Here
212
sub replace_vars {
212
sub replace_vars {
213
    my ( $self, $t, $v ) = @_;
213
    my ( $self, $t, $v ) = @_;
214
    my $lt = localtime;
214
    my $lt = localtime;
215
    $t =~ s/\${?NOW}?/strftime $self->tl('varnowformat'),$lt/exmsg;
215
    $t =~ s/\$[{]?NOW[}]?/strftime $self->tl('varnowformat'),$lt/exmsg;
216
    $t =~ s/\${?TIME}?/strftime $self->tl('vartimeformat'), $lt/exmsg;
216
    $t =~ s/\$[{]?TIME[}]?/strftime $self->tl('vartimeformat'), $lt/exmsg;
217
    $t =~ s/\${?USER}?/$REMOTE_USER/xmsg;
217
    $t =~ s/\$[{]?USER[}]?/$REMOTE_USER/xmsg;
218
    $t =~ s/\${?REQUEST_URI}?/$REQUEST_URI/xmsg;
218
    $t =~ s/\$[{]?REQUEST_URI[}]?/$REQUEST_URI/xmsg;
219
    $t =~ s/\${?PATH_TRANSLATED}?/$PATH_TRANSLATED/xmsg;
219
    $t =~ s/\$[{]?PATH_TRANSLATED[}]?/$PATH_TRANSLATED/xmsg;
220
    $t =~ s/\${?ENV{([^}]+?)}}?/$ENV{$1}/exmsg;
220
    $t =~ s/\$[{]?ENV[{]([^}]+?)[}][}]?/$ENV{$1}/exmsg;
221
    my $clockfmt = $self->tl('vartimeformat');
221
    my $clockfmt = $self->tl('vartimeformat');
222
    $t =~
222
    $t =~
223
s{\${?CLOCK}?}{<span id="clock"></span><script>startClock('clock','$clockfmt');</script>}xmsg;
223
s{\$[{]?CLOCK[}]?}{<span id="clock"></span><script>startClock('clock','$clockfmt');</script>}xmsg;
224
    $t =~ s/\${?LANG}?/$LANG/xmsg;
224
    $t =~ s/\$[{]?LANG[}]?/$LANG/xmsg;
225
    $t =~ s/\${?TL{([^}]+)}}?/$self->tl($1)/exmsg;
225
    $t =~ s/\$[{]?TL[{]([^}]+)[}][}]?/$self->tl($1)/exmsg;
226
    my $vbase = $self->get_vbase();
226
    my $vbase = $self->get_vbase();
227
    $t =~ s/\${?VBASE}?/$vbase/xmsg;
227
    $t =~ s/\$[{]?VBASE[}]?/$vbase/xmsg;
228
    $t =~ s/\${?VHTDOCS}?/$vbase$VHTDOCS/xmsg;
228
    $t =~ s/\$[{]?VHTDOCS[}]?/$vbase$VHTDOCS/xmsg;
229
229
230
    if ($v) {
230
    if ($v) {
231
        $t =~ s{\$\[(\w+)\]}{ $$v{$1} // "\$$1"}exmsg;
231
        $t =~ s{\$\[(\w+)\]}{ $$v{$1} // "\$$1"}exmsg;
232
        $t =~ s{\${?(\w+)}?}{ $$v{$1} // "\$$1"}exmsg;
232
        $t =~ s{\$[{]?(\w+)[}]?}{ $$v{$1} // "\$$1"}exmsg;
233
    }
233
    }
234
    return $t;
234
    return $t;
235
}
235
}
Lines 548-556 Link Here
548
            next if defined $filter && $hashref->{$key} =~ $filter;
548
            next if defined $filter && $hashref->{$key} =~ $filter;
549
            my $t = $tmpl;
549
            my $t = $tmpl;
550
            $t =~ s/\$k/$key/xmsg;
550
            $t =~ s/\$k/$key/xmsg;
551
            $t =~ s/\${k}/$key/xmsg;
551
            $t =~ s/\$[{]k[}]/$key/xmsg;
552
            $t =~ s/\$v/$hashref->{$key}/xmsg;
552
            $t =~ s/\$v/$hashref->{$key}/xmsg;
553
            $t =~ s/\${v}/$hashref->{$key}/xmsg;
553
            $t =~ s/\$[{]v[}]/$hashref->{$key}/xmsg;
554
            $content .= $t;
554
            $content .= $t;
555
        }
555
        }
556
    }
556
    }
Lines 569-575 Link Here
569
            next if defined $filter && $val =~ $filter;
569
            next if defined $filter && $val =~ $filter;
570
            my $t = $tmpl;
570
            my $t = $tmpl;
571
            $t =~ s/\$[kv]/$val/xmsg;
571
            $t =~ s/\$[kv]/$val/xmsg;
572
            $t =~ s/\${[kv]}/$val/xmsg;
572
            $t =~ s/\$[{][kv][}]/$val/xmsg;
573
            $content .= $t;
573
            $content .= $t;
574
        }
574
        }
575
    }
575
    }
Lines 617-624 Link Here
617
    {
617
    {
618
    }
618
    }
619
619
620
    $content =~ s/\${?ENV{([^}]+?)}}?/$ENV{$1}/exmsg;
620
    $content =~ s/\$[{]?ENV[{]([^}]+?)[}][}]?/$ENV{$1}/exmsg;
621
    $content =~ s/\${?TL{([^}]+)}}?/$self->tl($1)/exmsg;
621
    $content =~ s/\$[{]?TL[{]([^}]+)[}][}]?/$self->tl($1)/exmsg;
622
622
623
    my $vbase = $self->get_vbase();
623
    my $vbase = $self->get_vbase();
624
624
Lines 643-649 Link Here
643
    };
643
    };
644
644
645
    $content =~ s{\$\[([\w.]+)\]}{$vars->{$1} // "\$$1"}exmsg;
645
    $content =~ s{\$\[([\w.]+)\]}{$vars->{$1} // "\$$1"}exmsg;
646
    $content =~ s{\${?([\w.]+)}?}{$vars->{$1} // "\$$1"}exmsg;
646
    $content =~ s{\$[{]?([\w.]+)[}]?}{$vars->{$1} // "\$$1"}exmsg;
647
    $content =~
647
    $content =~
648
s{<!--IF${cond_rx}-->${anyng_rx}((<!--ELSE-->)${anyng_rx})?<!--ENDIF-->}{eval($1)? ( $2 // q{} ): ($5 // q{})}exmsg;
648
s{<!--IF${cond_rx}-->${anyng_rx}((<!--ELSE-->)${anyng_rx})?<!--ENDIF-->}{eval($1)? ( $2 // q{} ): ($5 // q{})}exmsg;
649
    $content =~
649
    $content =~
(-)a/lib/perl/WebInterface/View/Simple/RenderFileListTable.pm (-1 / +1 lines)
Lines 333-339 Link Here
333
    $self->_call_fileprop_hook(\%stdvars, $full);
333
    $self->_call_fileprop_hook(\%stdvars, $full);
334
334
335
    ##$e=~s/\$\{?(\w+)\}?/exists $stdvars{$1} && defined $stdvars{$1}?$stdvars{$1}:"\$$1"/egs;
335
    ##$e=~s/\$\{?(\w+)\}?/exists $stdvars{$1} && defined $stdvars{$1}?$stdvars{$1}:"\$$1"/egs;
336
    $e =~ s{[\$]{?(\w+)}?}{  $stdvars{$1}//= "\$$1" }xmegs;
336
    $e =~ s{[\$][{]?(\w+)[}]?}{  $stdvars{$1}//= "\$$1" }xmegs;
337
    return $self->SUPER::render_template( $PATH_TRANSLATED, $REQUEST_URI, $e );
337
    return $self->SUPER::render_template( $PATH_TRANSLATED, $REQUEST_URI, $e );
338
}
338
}
339
sub _call_fileprop_hook {
339
sub _call_fileprop_hook {

Return to bug 674772