diff --git a/lib/WebGUI/Asset/File/Image.pm b/lib/WebGUI/Asset/File/Image.pm index d2c8213f0..b998c3c51 100644 --- a/lib/WebGUI/Asset/File/Image.pm +++ b/lib/WebGUI/Asset/File/Image.pm @@ -132,7 +132,7 @@ sub getEditForm { $tabform->getTab("properties")->readOnly( -label=>$i18n->get('thumbnail'), -hoverHelp=>$i18n->get('Thumbnail description'), - -value=>'thumbnail' + -value=>'thumbnail' ); my ($x, $y) = $self->getStorageLocation->getSizeInPixels($self->get("filename")); $tabform->getTab("properties")->readOnly( diff --git a/lib/WebGUI/Asset/Wobject/Collaboration.pm b/lib/WebGUI/Asset/Wobject/Collaboration.pm index b78054825..d3a508fd1 100644 --- a/lib/WebGUI/Asset/Wobject/Collaboration.pm +++ b/lib/WebGUI/Asset/Wobject/Collaboration.pm @@ -1105,7 +1105,7 @@ sub www_unsubscribe { my @_months = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec); sub _get_rfc822_date { my ($time) = @_; - my ($year, $mon, $mday, $hour, $min, $sec) = $self->session->datetime->loca$self->session->datetime->time($time); + my ($year, $mon, $mday, $hour, $min, $sec) = $self->session->datetime->localtime($time); my $month = $_months[$mon - 1]; return sprintf("%02d %s %04d %02d:%02d:%02d GMT", $mday, $month, $year, $hour, $min, $sec); diff --git a/lib/WebGUI/Asset/Wobject/InOutBoard.pm b/lib/WebGUI/Asset/Wobject/InOutBoard.pm index ddf42daf1..f36167fdf 100644 --- a/lib/WebGUI/Asset/Wobject/InOutBoard.pm +++ b/lib/WebGUI/Asset/Wobject/InOutBoard.pm @@ -428,7 +428,7 @@ sub www_viewReport { ); $f->submit(-value=>"Search"); $var{'form'} = $f->print; - my $url = $self->getUrl("func=viewReport&selectDepartment=$self->session->form->process("selectDepartment")&reportPagination=$self->session->form->process("reportPagination")&startDate=$self->session->form->process("startDate")&endDate=$self->session->form->process("endDate")&doit=1"); + my $url = $self->getUrl("func=viewReport;selectDepartment=".$self->session->form->process("selectDepartment").";reportPagination=".$self->session->form->process("reportPagination").";startDate=".$self->session->form->process("startDate").";endDate=".$self->session->form->process("endDate").";doit=1"); if ($self->session->form->process("doit")) { $var{showReport} = 1; $endDate = $self->session->datetime->addToTime($endDate,24,0,0); diff --git a/lib/WebGUI/Asset/Wobject/Poll.pm b/lib/WebGUI/Asset/Wobject/Poll.pm index 5424c4a25..9a1c600a2 100644 --- a/lib/WebGUI/Asset/Wobject/Poll.pm +++ b/lib/WebGUI/Asset/Wobject/Poll.pm @@ -26,7 +26,7 @@ sub _hasVoted { my $self = shift; my ($hasVoted) = $self->session->db->quickArray("select count(*) from Poll_answer where assetId=".$self->session->db->quote($self->getId)." and ((userId=".$self->session->db->quote($self->session->user->profileField("userId"))." - and userId<>'1') or (userId=".$self->session->db->quote($self->session->user->profileField("userId"))." and ipAddress='$self->session->env->get("REMOTE_ADDR")'))"); + and userId<>'1') or (userId=".$self->session->db->quote($self->session->user->profileField("userId"))." and ipAddress='".$self->session->env->get("REMOTE_ADDR")."'))"); return $hasVoted; } diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm index 76766cf21..ed8eae5be 100644 --- a/lib/WebGUI/Asset/Wobject/Survey.pm +++ b/lib/WebGUI/Asset/Wobject/Survey.pm @@ -1173,16 +1173,16 @@ sub www_respond { if ($key =~ /^answerId_(.+)$/) { my $id = $1; my ($previousResponse) = $self->session->db->quickArray("select count(*) from Survey_questionResponse - where Survey_answerId=".$self->session->db->quote($self->session->form->process(""answerId_".$id"))." and Survey_responseId=".$self->session->db->quote($self->session->scratch->get($varname))); + where Survey_answerId=".$self->session->db->quote($self->session->form->process("answerId_".$id))." and Survey_responseId=".$self->session->db->quote($self->session->scratch->get($varname))); next if ($previousResponse); - my $answer = $self->getCollateral("Survey_answer","Survey_answerId",$self->session->form->process(""answerId_".$id")); + my $answer = $self->getCollateral("Survey_answer","Survey_answerId",$self->session->form->process("answerId_".$id)); if ($self->get("questionOrder") eq "response" && $answer->{gotoQuestion} eq "") { $terminate = 1; } - my $response = $self->session->form->process(""textResponse_".$id} || $answer->{answer"); + my $response = $self->session->form->process("textResponse_".$id) || $answer->{answer}); $self->session->db->write("insert into Survey_questionResponse (Survey_answerId,Survey_questionId,Survey_responseId,Survey_id,comment,response,dateOfResponse) values ( ".$self->session->db->quote($answer->{Survey_answerId}).", ".$self->session->db->quote($answer->{Survey_questionId}).", ".$self->session->db->quote($self->session->scratch->get($varname).", ".$self->session->db->quote($answer->{Survey_id}).", - ".$self->session->db->quote($self->session->form->process(""comment_".$id")).", ".$self->session->db->quote($response).", ".$self->session->datetime->time().")"); + ".$self->session->db->quote($self->session->form->process("comment_".$id)).", ".$self->session->db->quote($response).", ".$self->session->datetime->time().")"); } } my $responseCount = $self->getQuestionResponseCount($self->session->scratch->get($varname)); diff --git a/lib/WebGUI/Auth/LDAP.pm b/lib/WebGUI/Auth/LDAP.pm index 3a4d9f4c8..ea0a919ec 100644 --- a/lib/WebGUI/Auth/LDAP.pm +++ b/lib/WebGUI/Auth/LDAP.pm @@ -222,9 +222,9 @@ sub createAccount { value=>[$connection->{ldapLinkId}], extras=>qq|onchange="location.href='$url'+this.options[this.selectedIndex].value"| }); - $vars->{'create.form.ldapId'} = WebGUI::Form::text($self->session,{"name"=>"authLDAP_ldapId","value"=>$self->session->form->process(""authLDAP_ldapId"}")); + $vars->{'create.form.ldapId'} = WebGUI::Form::text($self->session,{"name"=>"authLDAP_ldapId","value"=>$self->session->form->process("authLDAP_ldapId"})); $vars->{'create.form.ldapId.label'} = $connection->{ldapIdentityName}; - $vars->{'create.form.password'} = WebGUI::Form::password($self->session,{"name"=>"authLDAP_identifier","value"=>$self->session->form->process(""authLDAP_identifier"}")); + $vars->{'create.form.password'} = WebGUI::Form::password($self->session,{"name"=>"authLDAP_identifier","value"=>$self->session->form->process("authLDAP_identifier")}); $vars->{'create.form.password.label'} = $connection->{ldapPasswordName}; $vars->{'create.form.hidden'} = WebGUI::Form::hidden($self->session,{"name"=>"confirm","value"=>$self->session->form->process("confirm")}); diff --git a/lib/WebGUI/Auth/WebGUI.pm b/lib/WebGUI/Auth/WebGUI.pm index f76d551f8..250c356dc 100644 --- a/lib/WebGUI/Auth/WebGUI.pm +++ b/lib/WebGUI/Auth/WebGUI.pm @@ -176,7 +176,7 @@ sub createAccount { .'captcha'; $vars->{'create.form.captcha.label'} = $i18n->get("captcha label","AuthWebGUI"); } - $vars->{'create.form.username'} = WebGUI::Form::text($self->session,{"name"=>"authWebGUI.username","value"=>$self->session->form->process(""authWebGUI.username"}")); + $vars->{'create.form.username'} = WebGUI::Form::text($self->session,{"name"=>"authWebGUI.username","value"=>$self->session->form->process("authWebGUI.username"})); $vars->{'create.form.username.label'} = $i18n->get(50); $vars->{'create.form.password'} = WebGUI::Form::password($self->session,{"name"=>"authWebGUI.identifier"}); $vars->{'create.form.password.label'} = $i18n->get(51); diff --git a/lib/WebGUI/Form/SelectList.pm b/lib/WebGUI/Form/SelectList.pm index 91389673b..78d0fd2cd 100644 --- a/lib/WebGUI/Form/SelectList.pm +++ b/lib/WebGUI/Form/SelectList.pm @@ -98,15 +98,15 @@ sub toHtml { tie %options, 'Tie::IxHash'; %options = $self->orderedHash; my @values = $self->getValues(); - foreach my $key (keys %options) { + foreach my $key (keys %options) { $output .= ''; - } + $output .= '>'.$self->get("options")->{$key}.''; + } $output .= ''."\n"; return $output; } diff --git a/lib/WebGUI/Macro/LastModified.pm b/lib/WebGUI/Macro/LastModified.pm index 6ffc43da4..054814271 100644 --- a/lib/WebGUI/Macro/LastModified.pm +++ b/lib/WebGUI/Macro/LastModified.pm @@ -47,7 +47,7 @@ sub process { ($time) = $session->dbSlave->quickArray("SELECT max(revisionDate) FROM assetData where assetId=".$session->db->quote($session->asset->getId)); my $i18n = WebGUI::International->new($session,'Macro_LastModified'); return $i18n->get('never') if $time eq 0; - return $label$session->datetime->epochToHuman($time,$format) if ($time); + return $label.$session->datetime->epochToHuman($time,$format) if ($time); } 1; diff --git a/lib/WebGUI/Macro/RandomThread.pm b/lib/WebGUI/Macro/RandomThread.pm index 053cfcef7..f44cb8408 100644 --- a/lib/WebGUI/Macro/RandomThread.pm +++ b/lib/WebGUI/Macro/RandomThread.pm @@ -108,7 +108,7 @@ sub process { } } # If we reach this point, we had no success in finding an asset the user can view: - $session->errorHandler->warn("Could not find a random thread that was viewable by the user $session->user->profileField("username") after $numberOfTries tries. Check parameters of macro on page ".$session->asset->get('url')); + $session->errorHandler->warn("Could not find a random thread that was viewable by the user ".$session->user->profileField("username")." after $numberOfTries tries. Check parameters of macro on page ".$session->asset->get('url')); return ''; } diff --git a/lib/WebGUI/Operation/ActiveSessions.pm b/lib/WebGUI/Operation/ActiveSessions.pm index b7b44ca87..f8b12fbd1 100644 --- a/lib/WebGUI/Operation/ActiveSessions.pm +++ b/lib/WebGUI/Operation/ActiveSessions.pm @@ -64,8 +64,8 @@ sub www_viewActiveSessions { while (%data = $sth->hash) { $row[$i] = ''.$data{username}.' ('.$data{userId}.')'; $row[$i] .= ''.$data{sessionId}.''; - $row[$i] .= ''$session->datetime->epochToHuman($data{expires}).''; - $row[$i] .= ''$session->datetime->epochToHuman($data{lastPageView}).''; + $row[$i] .= ''.$session->datetime->epochToHuman($data{expires}).''; + $row[$i] .= ''.$session->datetime->epochToHuman($data{lastPageView}).''; $row[$i] .= ''.$data{lastIP}.''; $row[$i] .= ''.$session->icon->delete("op=killSession;sid=$data{sessionId}").''; $i++; diff --git a/lib/WebGUI/Operation/Group.pm b/lib/WebGUI/Operation/Group.pm index c9cd244ce..453e3c335 100644 --- a/lib/WebGUI/Operation/Group.pm +++ b/lib/WebGUI/Operation/Group.pm @@ -478,7 +478,7 @@ sub www_editGrouping { sub www_editGroupingSave { my $session = shift; return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid"))); - $group->userGroupExpireDate($session->form->process("uid"),$session->form->process("gid")$session->datetime->setToEpoch($session->form->process("expireDate"))); + $group->userGroupExpireDate($session->form->process("uid"),$session->form->process("gid"),$session->datetime->setToEpoch($session->form->process("expireDate"))); $group->userIsAdmin($session->form->process("uid"),$session->form->process("gid"),$session->form->process("groupAdmin")); return www_manageUsersInGroup(); } @@ -659,7 +659,7 @@ sub www_manageUsersInGroup { .$session->icon->edit('op=editGrouping;uid='.$row->{userId}.';gid='.$session->form->process("gid")) .''; $output .= ''.$row->{username}.''; - $output .= ''$session->datetime->epochToHuman($row->{expireDate},"%z").''; + $output .= ''.$session->datetime->epochToHuman($row->{expireDate},"%z").''; } $output .= ''.WebGUI::Form::formFooter($session,); $output .= $p->getBarTraditional; diff --git a/lib/WebGUI/Operation/LoginHistory.pm b/lib/WebGUI/Operation/LoginHistory.pm index 52e9ebdfd..c52a19588 100644 --- a/lib/WebGUI/Operation/LoginHistory.pm +++ b/lib/WebGUI/Operation/LoginHistory.pm @@ -44,7 +44,7 @@ sub www_viewLoginHistory { $data{username} = $i18n->get('unknown user') if ($data{userId} eq "0"); $row[$i] = ''.$data{username}.' ('.$data{userId}.')'; $row[$i] .= ''.$data{status}.''; - $row[$i] .= ''$session->datetime->epochToHuman($data{timeStamp},"%H:%n%p %M/%D/%y").''; + $row[$i] .= ''.$session->datetime->epochToHuman($data{timeStamp},"%H:%n%p %M/%D/%y").''; $row[$i] .= ''.$data{ipAddress}.''; $row[$i] .= ''.$data{userAgent}.''; $i++; diff --git a/lib/WebGUI/Operation/User.pm b/lib/WebGUI/Operation/User.pm index fed9cf248..403646097 100644 --- a/lib/WebGUI/Operation/User.pm +++ b/lib/WebGUI/Operation/User.pm @@ -503,12 +503,12 @@ sub www_listUsers { $output .= ''.$data->{username}.''; $output .= ''.$data->{email}.''; - $output .= ''$session->datetime->epochToHuman($data->{dateCreated},"%z").''; - $output .= ''$session->datetime->epochToHuman($data->{lastUpdated},"%z").''; + $output .= ''.$session->datetime->epochToHuman($data->{dateCreated},"%z").''; + $output .= ''.$session->datetime->epochToHuman($data->{lastUpdated},"%z").''; my ($lastLoginStatus, $lastLogin) = $session->db->quickArray("select status,timeStamp from userLoginLog where userId=".$session->db->quote($data->{userId})." order by timeStamp DESC"); if ($lastLogin) { - $output .= ''$session->datetime->epochToHuman($lastLogin).''; + $output .= ''.$session->datetime->epochToHuman($lastLogin).''; } else { $output .= ' - '; }