updating tinymce to 1.43 and fixed some bugs

This commit is contained in:
JT Smith 2005-03-09 00:51:58 +00:00
parent 98dc54e16d
commit 914f29b169
209 changed files with 2183 additions and 1506 deletions

View file

@ -130,7 +130,7 @@ sub start {
} else {
$val = URI::URL::url($val)->abs($self->{Url},1); # make absolute
}
if ($val->scheme eq "http") {
if ($val->scheme eq "http" || $val->scheme eq "https") {
if ($self->{rewriteUrls} && lc($tag) ne "iframe") {
if (lc($tag) eq "form" && lc($_) eq "action") { # Found FORM ACTION
$self->{FormActionIsDefined}=1;

View file

@ -166,11 +166,13 @@ sub createAccount {
$vars->{'create.message'} = $_[0] if ($_[0]);
my $storage = WebGUI::Storage::Image->createTemp;
my ($filename, $challenge) = $storage->addFileFromCaptcha;
$vars->{'create.form.captcha'} = WebGUI::Form::text({"name"=>"authWebGUI.captcha", size=>6, maxlength=>6})
.WebGUI::Form::hidden({name=>"authWebGUI.captcha.validation", value=>Digest::MD5::md5_base64(lc($challenge))})
.'<img src="'.$storage->getUrl($filename).'" border="0" alt="captcha" align="middle" />';
$vars->{'create.form.captcha.label'} = WebGUI::International::get("captcha label","AuthWebGUI");
$vars->{useCaptcha} = $session{setting}{webguiUseCaptcha};
if ($vars->{useCaptcha}) {
$vars->{'create.form.captcha'} = WebGUI::Form::text({"name"=>"authWebGUI.captcha", size=>6, maxlength=>6})
.WebGUI::Form::hidden({name=>"authWebGUI.captcha.validation", value=>Digest::MD5::md5_base64(lc($challenge))})
.'<img src="'.$storage->getUrl($filename).'" border="0" alt="captcha" align="middle" />';
$vars->{'create.form.captcha.label'} = WebGUI::International::get("captcha label","AuthWebGUI");
}
$vars->{'create.form.username'} = WebGUI::Form::text({"name"=>"authWebGUI.username","value"=>$session{form}{"authWebGUI.username"}});
$vars->{'create.form.username.label'} = WebGUI::International::get(50);
$vars->{'create.form.password'} = WebGUI::Form::password({"name"=>"authWebGUI.identifier","value"=>$session{form}{"authWebGUI.identifier"}});

View file

@ -213,7 +213,7 @@ sub _tableFormRow {
unless ($_[0]->{_noTable}) {
my $class = $_[0]->{_class};
$class = qq| class="$class" | if($class);
return '<tr'.$class.'><td class="formDescription" valign="top">'.$_[1].'</td><td class="tableData" style="width: 95%;">'.$_[2]."</td></tr>\n";
return '<tr'.$class.'><td class="formDescription" valign="top" style="width: 25%;">'.$_[1].'</td><td class="tableData" style="width: 75%;">'.$_[2]."</td></tr>\n";
} else {
return $_[2];
}

View file

@ -121,10 +121,10 @@ sub addEntry {
$subject = $_[2];
$message = $_[3];
$url = $_[4];
unless ($url =~ /^http/ || !defined $url) {
if ($url && !$url =~ /^http/) {
$url = WebGUI::URL::getSiteURL().$url;
}
unless ($url =~ /func=/ || $url =~ /op=/ || !defined $url) {
if ($url && !($url =~ /func=/ || $url =~ /op=/)) {
$url = WebGUI::URL::append($url, "op=viewMessageLogMessage");
}
$status = $_[5];
@ -189,10 +189,10 @@ sub addInternationalizedEntry {
$userId = $_[0];
$groupId = $_[1];
$url = $_[2];
unless ($url =~ /^http/ || !defined $url) {
if ($url && !$url =~ /^http/) {
$url = WebGUI::URL::getSiteURL().$url;
}
unless ($url =~ /func=/ || $url =~ /op=/ || !defined $url) {
if ($url && !($url =~ /func=/ || $url =~ /op=/)) {
$url = WebGUI::URL::append($url, "op=viewMessageLogMessage");
}
$internationalId = $_[3];