oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lots of minor changes and bug fixes

Browse source
This commit is contained in:
JT Smith 2006-04-18 18:33:53 +00:00
parent cf50652604
commit 095d0a7dfd
5 changed files with 27 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/WebGUI/Auth.pm
View file

@ -86,9 +86,6 @@ sub _isValidUsername {
if ($username eq "") {
$error .= '<li>'.$i18n->get(725).'</li>';
}
unless ($username =~ /^[A-Za-z0-9\-\_\.\,\@]+$/) {
$error .= '<li>'.$i18n->get(747).'</li>';
}
$self->error($error);
return $error eq "";
}

11
lib/WebGUI/Operation/FormHelpers.pm
View file

@ -45,14 +45,15 @@ sub www_formAssetTree {
}
my $output = '<p>'.join(" &gt; ", @crumb)."</p>\n";
my $children = $base->getLineage(["children"],{returnObjects=>1});
my $i18n = WebGUI::International->new($session);
foreach my $child (@{$children}) {
next unless $child->canView;
if ($child->get("className") =~ /^$session->form->process("classLimiter")/) {
$output .= '<a href="#" onclick="window.opener.document.getElementById(\''.$session->form->process("formId")
.'\').value=\''.$child->getId.'\';window.opener.document.getElementById(\''.
$session->form->process("formId").'_display\').value=\''.$child->get("title").'\';window.close();">(&bull;)</a> ';
$session->form->process("formId").'_display\').value=\''.$child->get("title").'\';window.close();">['.$i18n->get("select").']</a> ';
} else {
$output .= "(&bull;) ";
$output .= "[".$i18n->get("select")."] ";
}
$output .= '<a href="'.$child->getUrl("op=formAssetTree;classLimiter=".$session->form->process("classLimiter").";formId="
.$session->form->process("formId")).'">'.$child->get("menuTitle").'</a>'."<br />\n";
@ -118,7 +119,7 @@ function createLink() {
my $children = $base->getLineage(["children"],{returnObjects=>1});
foreach my $child (@{$children}) {
next unless $child->canView;
$output .= '<a href="#" onclick="document.getElementById(\'url_formId\').value=\''.$child->get("url").'\'">(&bull;)</a> <a href="'.$child->getUrl("op=richEditPageTree").'">'.$child->get("menuTitle").'</a>'."<br />\n";
$output .= '<a href="#" onclick="document.getElementById(\'url_formId\').value=\''.$child->get("url").'\'">['.$i18n->get("select").']</a> <a href="'.$child->getUrl("op=richEditPageTree").'">'.$child->get("menuTitle").'</a>'."<br />\n";
}
$session->style->useEmptyStyle("1");
return $output.'</fieldset></fieldset>';
@ -167,9 +168,9 @@ sub www_richEditImageTree {
foreach my $child (@{$children}) {
next unless $child->canView;
if ($child->get("className") =~ /^WebGUI::Asset::File::Image/) {
push(@output, '<a href="'.$child->getUrl("op=richEditViewThumbnail").'" target="viewer">(&bull;)</a> ');
push(@output, '<a href="'.$child->getUrl("op=richEditViewThumbnail").'" target="viewer">['.$i18n->get("select","WebGUI").']</a> ');
} else {
push(@output, "(&bull;) ");
push(@output, "[".$i18n->get("select","WebGUI")."] ");
}
push(@output, '<a href="'.$child->getUrl("op=richEditImageTree").'">'.$child->get("menuTitle").'</a>'."<br />\n");
}

11
lib/WebGUI/i18n/English/WebGUI.pm
View file

@ -1,6 +1,12 @@
package WebGUI::i18n::English::WebGUI;
our $I18N = {
'select' => {
message => q|Select|,
lastUpdated => 0,
context=>"form helpers"
},
'mail return path help' => {
message => q|To what email address should undeliverable messages be sent?|,
lastUpdated => 0,
@ -1949,11 +1955,6 @@ default WebGUI groups such as Admin or Content Manager.</p> |,
lastUpdated => 1039587250
},
'747' => {
message => q|Usernames must contain only alpha-numeric characters, dashes, underscores, periods, commas or @ signs.|,
lastUpdated => 1129431985
},
'159' => {
message => q|Inbox|,
lastUpdated => 1031514049