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

Moved extras, uploadsURL, and uploadsPath settings to config file.

Browse source
This commit is contained in:
JT Smith 2002-07-12 00:25:02 +00:00
parent b81aa7f9aa
commit 29d2b0e63c
19 changed files with 86 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/WebGUI/Attachment.pm
View file

@ -115,7 +115,7 @@ sub _resizeImage {
sub box {
my ($output);
$output = '<p><table cellpadding=3 cellspacing=0 border=1><tr><td class="tableHeader">'.
'<a href="'.$_[0]->getURL.'"><img src="'.$session{setting}{lib}.
'<a href="'.$_[0]->getURL.'"><img src="'.$session{config}{extras}.
'/attachment.gif" border=0 alt="'.
$_[0]->getFilename.'"></a></td><td><a href="'.$_[0]->getURL.
'"><img src="'.$_[0]->getIcon.
@ -223,7 +223,7 @@ sub getFilename {
sub getIcon {
my ($extension, $icon);
$extension = $_[0]->getType;
$icon = $session{setting}{lib}."/fileIcons/";
$icon = $session{config}{extras}."/fileIcons/";
if (isIn($extension, qw(doc dot wri))) {
$icon .= "doc.gif";
} elsif (isIn($extension, qw(txt log sql config conf pm cnf readme))) {

12
lib/WebGUI/HTMLForm.pm
View file

@ -272,7 +272,7 @@ sub date {
$output = '<input type="text" name="'.$name.'" value="'.$value.'" size="'.
$size.'" maxlength="10" '.$extras.'>';
$output .= '<input type="button" style="font-size: 8pt;" onClick="window.dateField = this.form.'.
$name.';calendar = window.open(\''.$session{setting}{lib}.
$name.';calendar = window.open(\''.$session{config}{extras}.
'/calendar.html\',\'cal\',\'WIDTH=200,HEIGHT=250\');return false" value="'.
WebGUI::International::get(34).'">';
$output .= _subtext($subtext);
@ -335,7 +335,7 @@ sub email {
$extras = shift;
$subtext = shift;
$size = shift || $session{setting}{textBoxSize} || 30;
$output = '<script language="javascript" src="'.$session{setting}{lib}.'/emailCheck.js"></script>';
$output = '<script language="javascript" src="'.$session{config}{extras}.'/emailCheck.js"></script>';
$output .= '<input type="text" name="'.$name.'" value="'.$value.'" size="'.
$size.'" maxlength="'.$maxLength.'" onBlur="emailCheck(this.value)" '.$extras.'>';
$output .= _subtext($subtext);
@ -564,19 +564,19 @@ sub HTMLArea {
var formObj;
function openEditWindow(obj) {
formObj = obj;
window.open("'.$session{setting}{lib}.'/eopro.html","editWindow","width=720,height=450,resizable=1");
window.open("'.$session{config}{extras}.'/eopro.html","editWindow","width=720,height=450,resizable=1");
}
</script>';
} else {
$output .= '<script language="JavaScript">
var formObj;
var extrasDir="'.$session{setting}{lib}.'";
var extrasDir="'.$session{config}{extras}.'";
function openEditWindow(obj) {
formObj = obj;
if (navigator.userAgent.substr(navigator.userAgent.indexOf("MSIE")+5,1)>=5)
window.open("'.$session{setting}{lib}.'/ieEdit.html","editWindow","width=490,height=400,resizable=1");
window.open("'.$session{config}{extras}.'/ieEdit.html","editWindow","width=490,height=400,resizable=1");
else
window.open("'.$session{setting}{lib}.'/nonIeEdit.html","editWindow","width=500,height=410");
window.open("'.$session{config}{extras}.'/nonIeEdit.html","editWindow","width=500,height=410");
}
function setContent(content) {
formObj.value = content;

24
lib/WebGUI/Icon.pm
View file

@ -72,7 +72,7 @@ our @EXPORT = qw(&helpIcon &becomeIcon &cutIcon &copyIcon &deleteIcon &editIcon
sub becomeIcon {
my ($output);
$output = '<a href="'.WebGUI::URL::page($_[0]).'">';
$output .= '<img src="'.$session{setting}{lib}.'/become.gif" align="middle" border="0" alt="Become"></a>';
$output .= '<img src="'.$session{config}{extras}.'/become.gif" align="middle" border="0" alt="Become"></a>';
return $output;
}
@ -92,7 +92,7 @@ sub becomeIcon {
sub copyIcon {
my ($output);
$output = '<a href="'.WebGUI::URL::page($_[0]).'">';
$output .= '<img src="'.$session{setting}{lib}.'/copy.gif" align="middle" border="0" alt="Copy"></a>';
$output .= '<img src="'.$session{config}{extras}.'/copy.gif" align="middle" border="0" alt="Copy"></a>';
return $output;
}
@ -112,7 +112,7 @@ sub copyIcon {
sub cutIcon {
my ($output);
$output = '<a href="'.WebGUI::URL::page($_[0]).'">';
$output .= '<img src="'.$session{setting}{lib}.'/cut.gif" align="middle" border="0" alt="Cut"></a>';
$output .= '<img src="'.$session{config}{extras}.'/cut.gif" align="middle" border="0" alt="Cut"></a>';
return $output;
}
@ -132,7 +132,7 @@ sub cutIcon {
sub deleteIcon {
my ($output);
$output = '<a href="'.WebGUI::URL::page($_[0]).'">';
$output .= '<img src="'.$session{setting}{lib}.'/delete.gif" align="middle" border="0" alt="Delete"></a>';
$output .= '<img src="'.$session{config}{extras}.'/delete.gif" align="middle" border="0" alt="Delete"></a>';
return $output;
}
@ -152,7 +152,7 @@ sub deleteIcon {
sub editIcon {
my ($output);
$output = '<a href="'.WebGUI::URL::page($_[0]).'">';
$output .= '<img src="'.$session{setting}{lib}.'/edit.gif" align="middle" border="0" alt="Edit"></a>';
$output .= '<img src="'.$session{config}{extras}.'/edit.gif" align="middle" border="0" alt="Edit"></a>';
return $output;
}
@ -178,7 +178,7 @@ sub helpIcon {
my ($output, $namespace);
$namespace = $_[1] || "WebGUI";
$output = '<a href="'.WebGUI::URL::page('op=viewHelp&hid='.$_[0].'&namespace='.$namespace).
'" target="_blank"><img src="'.$session{setting}{lib}.'/help.gif" border="0" align="right"></a>';
'" target="_blank"><img src="'.$session{config}{extras}.'/help.gif" border="0" align="right"></a>';
return $output;
}
@ -198,7 +198,7 @@ sub helpIcon {
sub moveBottomIcon {
my ($output);
$output = '<a href="'.WebGUI::URL::page($_[0]).'">';
$output .= '<img src="'.$session{setting}{lib}.'/jumpDown.gif" align="middle" border="0" alt="Move To Bottom"></a>';
$output .= '<img src="'.$session{config}{extras}.'/jumpDown.gif" align="middle" border="0" alt="Move To Bottom"></a>';
return $output;
}
@ -218,7 +218,7 @@ sub moveBottomIcon {
sub moveDownIcon {
my ($output);
$output = '<a href="'.WebGUI::URL::page($_[0]).'">';
$output .= '<img src="'.$session{setting}{lib}.'/downArrow.gif" align="middle" border="0" alt="Move Down"></a>';
$output .= '<img src="'.$session{config}{extras}.'/downArrow.gif" align="middle" border="0" alt="Move Down"></a>';
return $output;
}
@ -238,7 +238,7 @@ sub moveDownIcon {
sub moveTopIcon {
my ($output);
$output = '<a href="'.WebGUI::URL::page($_[0]).'">';
$output .= '<img src="'.$session{setting}{lib}.'/jumpUp.gif" align="middle" border="0" alt="Move To Top"></a>';
$output .= '<img src="'.$session{config}{extras}.'/jumpUp.gif" align="middle" border="0" alt="Move To Top"></a>';
return $output;
}
@ -258,7 +258,7 @@ sub moveTopIcon {
sub moveUpIcon {
my ($output);
$output = '<a href="'.WebGUI::URL::page($_[0]).'">';
$output .= '<img src="'.$session{setting}{lib}.'/upArrow.gif" align="middle" border="0" alt="Move Up"></a>';
$output .= '<img src="'.$session{config}{extras}.'/upArrow.gif" align="middle" border="0" alt="Move Up"></a>';
return $output;
}
@ -273,7 +273,7 @@ sub moveUpIcon {
=cut
sub pageIcon {
return '<img src="'.$session{setting}{lib}.'/page.gif" align="middle" border="0" alt="Page Settings">';
return '<img src="'.$session{config}{extras}.'/page.gif" align="middle" border="0" alt="Page Settings">';
}
#-------------------------------------------------------------------
@ -292,7 +292,7 @@ sub pageIcon {
sub viewIcon {
my ($output);
$output = '<a href="'.WebGUI::URL::page($_[0]).'">';
$output .= '<img src="'.$session{setting}{lib}.'/view.gif" align="middle" border="0" alt="View"></a>';
$output .= '<img src="'.$session{config}{extras}.'/view.gif" align="middle" border="0" alt="View"></a>';
return $output;
}

2
lib/WebGUI/Macro/Extras.pm
View file

@ -17,7 +17,7 @@ use WebGUI::Session;
sub process {
my ($output);
$output = $_[0];
$output =~ s/\^Extras\;/$session{setting}{lib}\//g;
$output =~ s/\^Extras\;/$session{config}{extras}\//g;
return $output;
}

8
lib/WebGUI/Node.pm
View file

@ -59,13 +59,13 @@ use WebGUI::Session;
sub create {
my ($slash, $node);
$slash = ($^O =~ /Win/i) ? "\\" : "/";
$node = $session{setting}{attachmentDirectoryLocal}.$slash.$_[0]->{_node1};
$node = $session{config}{uploadsPath}.$slash.$_[0]->{_node1};
mkdir($node);
unless ($! eq "File exists" || $! eq "") {
WebGUI::ErrorHandler::warn("Couldn't create node: $node : $!");
}
if ($_[0]->{_node2} ne "") {
$node = $session{setting}{attachmentDirectoryLocal}.$slash.$_[0]->{_node1}.$slash.$_[0]->{_node2};
$node = $session{config}{uploadsPath}.$slash.$_[0]->{_node1}.$slash.$_[0]->{_node2};
mkdir($node);
unless ($! eq "File exists" || $! eq "") {
WebGUI::ErrorHandler::warn("Couldn't create node: $node : $!");
@ -97,7 +97,7 @@ sub delete {
sub getPath {
my ($path,$slash);
$slash = ($^O =~ /Win/i) ? "\\" : "/";
$path = $session{setting}{attachmentDirectoryLocal}.$slash.$_[0]->{_node1};
$path = $session{config}{uploadsPath}.$slash.$_[0]->{_node1};
if ($_[0]->{_node2} ne "") {
$path .= $slash.$_[0]->{_node2};
}
@ -115,7 +115,7 @@ sub getPath {
sub getURL {
my ($url);
$url = $session{setting}{attachmentDirectoryWeb}.'/'.$_[0]->{_node1};
$url = $session{config}{uploadsURL}.'/'.$_[0]->{_node1};
if ($_[0]->{_node2} ne "") {
$url .= '/'.$_[0]->{_node2};
}

9
lib/WebGUI/Operation/Group.pm
View file

@ -142,11 +142,10 @@ sub www_listGroups {
$sth = WebGUI::SQL->read("select groupId,groupName,description from groups
where groupId<>1 and groupId<>2 and groupId<>7 order by groupName");
while (@data = $sth->array) {
$row[$i] = '<tr><td valign="top" class="tableData"><a href="'.
WebGUI::URL::page('op=deleteGroup&gid='.$data[0]).
'"><img src="'.$session{setting}{lib}.'/delete.gif" border=0></a><a href="'.
WebGUI::URL::page('op=editGroup&gid='.$data[0]).
'"><img src="'.$session{setting}{lib}.'/edit.gif" border=0></a></td>';
$row[$i] = '<tr><td valign="top" class="tableData">'
.deleteIcon('op=deleteGroup&gid='.$data[0])
.editIcon('op=editGroup&gid='.$data[0])
.'</td>';
$row[$i] .= '<td valign="top" class="tableData">'.$data[1].'</td>';
$row[$i] .= '<td valign="top" class="tableData">'.$data[2].'</td></tr>';
$i++;

4
lib/WebGUI/Operation/Image.pm
View file

@ -187,7 +187,7 @@ sub www_listImages {
if($imageGroupId > 0) { # show previous link
$row[$i] = '<tr class="tableData">';
$row[$i] .= '<td colspan="5"><a href="'.WebGUI::URL::page('op=listImages&gid='.$imageGroupParentId)
.'"><img src="'.$session{setting}{lib}.'/smallAttachment.gif" border="0"></a>'
.'"><img src="'.$session{config}{extras}.'/smallAttachment.gif" border="0"></a>'
.'&nbsp;<a href="'.WebGUI::URL::page('op=listImages&gid='.$imageGroupParentId)
.'">'.WebGUI::International::get(542).'</a></td>'; # FIXME folder icon
$row[$i] .= '</tr>';
@ -203,7 +203,7 @@ sub www_listImages {
$row[$i] .= viewIcon('op=viewImageGroup&gid='.$data{imageGroupId}.'&pid='.$imageGroupId);
$row[$i] .= '</td>';
$row[$i] .= '<td><a href="'.WebGUI::URL::page('op=listImages&gid='.$data{imageGroupId}.'&pid='.$imageGroupId)
.'"><img src="'.$session{setting}{lib}.'/smallAttachment.gif" border="0"></a>'
.'"><img src="'.$session{config}{extras}.'/smallAttachment.gif" border="0"></a>'
.'&nbsp;<a href="'.WebGUI::URL::page('op=listImages&gid='.$data{imageGroupId}.'&pid='.$imageGroupId)
.'">'.$data{name}.'</a></td>'; # FIXME folder icon
$row[$i] .= '<td>'.$data{description}.'&nbsp;</td>';

6
lib/WebGUI/Operation/Page.pm
View file

@ -67,18 +67,18 @@ sub _traversePageTree {
my ($a, $b, %page, %wobject, $output, $depth, $i, $spacer);
tie %page, 'Tie::CPHash';
tie %wobject, 'Tie::CPHash';
$spacer = '<img src="'.$session{setting}{lib}.'/spacer.gif" width=12>';
$spacer = '<img src="'.$session{config}{extras}.'/spacer.gif" width=12>';
for ($i=1;$i<=$_[1];$i++) {
$depth .= $spacer;
}
$a = WebGUI::SQL->read("select * from page where (pageId<2 or pageId>25) and parentId='$_[0]' order by sequenceNumber");
while (%page = $a->hash) {
$output .= $depth.'<img src="'.$session{setting}{lib}.'/page.gif" align="middle">'.
$output .= $depth.'<img src="'.$session{config}{extras}.'/page.gif" align="middle">'.
' <a href="'.WebGUI::URL::gateway($page{urlizedTitle}).'">'.$page{title}.'</a><br>';
$b = WebGUI::SQL->read("select * from wobject where pageId=$page{pageId}");
while (%wobject = $b->hash) {
$output .= $depth.$spacer.
'<img src="'.$session{setting}{lib}.'/wobject.gif"> '.
'<img src="'.$session{config}{extras}.'/wobject.gif"> '.
$wobject{title}.'<br>';
}
$b->finish;

8
lib/WebGUI/Operation/Root.pm
View file

@ -37,13 +37,13 @@ sub www_listRoots {
while (%data = $sth->hash) {
$row[$i] = '<tr><td valign="top" class="tableData">'.
'<a href="'.WebGUI::URL::gateway($data{urlizedTitle}.'?op=deletePage').'">'.
'<img src="'.$session{setting}{lib}.'/delete.gif" border=0></a>'.
'<img src="'.$session{config}{extras}.'/delete.gif" border=0></a>'.
'<a href="'.WebGUI::URL::gateway($data{urlizedTitle}.'?op=cutPage').'">'.
'<img src="'.$session{setting}{lib}.'/cut.gif" border=0></a>'.
'<img src="'.$session{config}{extras}.'/cut.gif" border=0></a>'.
'<a href="'.WebGUI::URL::gateway($data{urlizedTitle}.'?op=editPage').'">'.
'<img src="'.$session{setting}{lib}.'/edit.gif" border=0></a>'.
'<img src="'.$session{config}{extras}.'/edit.gif" border=0></a>'.
'<a href="'.WebGUI::URL::gateway($data{urlizedTitle}).'">'.
'<img src="'.$session{setting}{lib}.'/view.gif" border=0></a>'.
'<img src="'.$session{config}{extras}.'/view.gif" border=0></a>'.
'</td>';
$row[$i] .= '<td valign="top" class="tableData">'.$data{title}.'</td>';
$row[$i] .= '<td valign="top" class="tableData">'.$data{urlizedTitle}.'</td></tr>';

46
lib/WebGUI/Operation/Settings.pm
View file

@ -22,7 +22,7 @@ use WebGUI::URL;
our @ISA = qw(Exporter);
our @EXPORT = qw(&www_editUserSettings &www_editUserSettingsSave &www_editCompanyInformation &www_editCompanyInformationSave
&www_editFileSettings &www_editFileSettingsSave &www_editMailSettings &www_editMailSettingsSave &www_editMiscSettings
&www_editMailSettings &www_editMailSettingsSave &www_editMiscSettings
&www_editContentSettings &www_editContentSettingsSave &www_editMiscSettingsSave &www_manageSettings);
#-------------------------------------------------------------------
@ -130,6 +130,9 @@ sub www_editContentSettings {
$f->text("docTypeDec",WebGUI::International::get(398),$session{setting}{docTypeDec});
$f->yesNo("addEditStampToPosts",WebGUI::International::get(524),$session{setting}{addEditStampToPosts});
$f->select("filterContributedHTML",\%htmlFilter,WebGUI::International::get(418),[$session{setting}{filterContributedHTML}]);
$f->integer("maxAttachmentSize",WebGUI::International::get(130),$session{setting}{maxAttachmentSize});
$f->integer("maxImageSize",WebGUI::International::get(583),$session{setting}{maxImageSize});
$f->integer("thumbnailSize",WebGUI::International::get(406),$session{setting}{thumbnailSize});
$f->integer("textAreaRows",WebGUI::International::get(463),$session{setting}{textAreaRows});
$f->integer("textAreaCols",WebGUI::International::get(464),$session{setting}{textAreaCols});
$f->integer("textBoxSize",WebGUI::International::get(465),$session{setting}{textBoxSize});
@ -154,43 +157,9 @@ sub www_editContentSettingsSave {
_saveSetting("textAreaCols");
_saveSetting("textBoxSize");
_saveSetting("richEditor");
return www_manageSettings();
} else {
return WebGUI::Privilege::adminOnly();
}
}
#-------------------------------------------------------------------
sub www_editFileSettings {
my ($output, $f);
if (WebGUI::Privilege::isInGroup(3)) {
$output .= helpIcon(11);
$output .= '<h1>'.WebGUI::International::get(128).'</h1>';
$f = WebGUI::HTMLForm->new;
$f->hidden("op","editFileSettingsSave");
$f->text("lib",WebGUI::International::get(129),$session{setting}{lib});
$f->integer("maxAttachmentSize",WebGUI::International::get(130),$session{setting}{maxAttachmentSize});
$f->integer("maxImageSize",WebGUI::International::get(583),$session{setting}{maxImageSize});
$f->integer("thumbnailSize",WebGUI::International::get(406),$session{setting}{thumbnailSize});
$f->text("attachmentDirectoryWeb",WebGUI::International::get(131),$session{setting}{attachmentDirectoryWeb});
$f->text("attachmentDirectoryLocal",WebGUI::International::get(132),$session{setting}{attachmentDirectoryLocal});
$f->submit;
$output .= $f->print;
} else {
$output = WebGUI::Privilege::adminOnly();
}
return $output;
}
#-------------------------------------------------------------------
sub www_editFileSettingsSave {
if (WebGUI::Privilege::isInGroup(3)) {
_saveSetting("lib");
_saveSetting("maxImageSize");
_saveSetting("maxAttachmentSize");
_saveSetting("thumbnailSize");
_saveSetting("attachmentDirectoryWeb");
_saveSetting("attachmentDirectoryLocal");
_saveSetting("maxImageSize");
_saveSetting("maxAttachmentSize");
_saveSetting("thumbnailSize");
return www_manageSettings();
} else {
return WebGUI::Privilege::adminOnly();
@ -265,7 +234,6 @@ sub www_manageSettings {
$output .= '<ul>';
$output .= '<li><a href="'.WebGUI::URL::page('op=editCompanyInformation').'">'.WebGUI::International::get(124).'</a>';
$output .= '<li><a href="'.WebGUI::URL::page('op=editContentSettings').'">'.WebGUI::International::get(525).'</a>';
$output .= '<li><a href="'.WebGUI::URL::page('op=editFileSettings').'">'.WebGUI::International::get(128).'</a>';
$output .= '<li><a href="'.WebGUI::URL::page('op=editMailSettings').'">'.WebGUI::International::get(133).'</a>';
$output .= '<li><a href="'.WebGUI::URL::page('op=editMiscSettings').'">'.WebGUI::International::get(140).'</a>';
$output .= '<li><a href="'.WebGUI::URL::page('op=editProfileSettings').'">'.WebGUI::International::get(308).'</a>';

2
lib/WebGUI/Operation/Statistics.pm
View file

@ -49,7 +49,7 @@ sub www_viewActiveSessions {
$row[$i] .= '<td>'.epochToHuman($data{expires},"%H:%n%p %M/%D/%y").'</td>';
$row[$i] .= '<td>'.epochToHuman($data{lastPageView},"%H:%n%p %M/%D/%y").'</td>';
$row[$i] .= '<td>'.$data{lastIP}.'</td>';
$row[$i] .= '<td align="center"><a href="'.WebGUI::URL::page("op=killSession&sid=$data{sessionId}").'">'.'<img src="'.$session{setting}{lib}.'/delete.gif" border="0"></a></td></tr>';
$row[$i] .= '<td align="center">'.deleteIcon("op=killSession&sid=$data{sessionId}").'</td></tr>';
$i++;
}
$sth->finish;

21
lib/WebGUI/Operation/User.pm
View file

@ -291,12 +291,10 @@ sub www_editUserGroup {
from groupings,groups where groupings.groupId=groups.groupId and
groupings.userId=$session{form}{uid} order by groups.groupName");
while (%hash = $sth->hash) {
$output .= '<tr><td><a href="'.WebGUI::URL::page('op=deleteGrouping&uid='.
$session{form}{uid}.'&gid='.$hash{groupId}).'"><img src="'.
$session{setting}{lib}.'/delete.gif" border=0></a><a href="'.
WebGUI::URL::page('op=editGrouping&uid='.$session{form}{uid}.
'&gid='.$hash{groupId}).'"><img src="'.$session{setting}{lib}.
'/edit.gif" border=0></a></td>';
$output .= '<tr><td>'
.deleteIcon('op=deleteGrouping&uid='.$session{form}{uid}.'&gid='.$hash{groupId})
.editIcon('op=editGrouping&uid='.$session{form}{uid}.'&gid='.$hash{groupId})
.'</td>';
$output .= '<td class="tableData">'.$hash{groupName}.'</td>';
$output .= '<td class="tableData">'.epochToHuman($hash{expireDate},"%z").'</td></tr>';
}
@ -434,13 +432,10 @@ sub www_listUsers {
}
$sth = WebGUI::SQL->read("select * from users $search order by users.username");
while (%data = $sth->hash) {
$row[$i] = '<tr class="tableData"><td>';
$row[$i] .= '<a href="'.WebGUI::URL::page('op=deleteUser&uid='.$data{userId}).
'"><img src="'.$session{setting}{lib}.'/delete.gif" border=0></a>';
$row[$i] .= '<a href="'.WebGUI::URL::page('op=editUser&uid='.$data{userId}).
'"><img src="'.$session{setting}{lib}.'/edit.gif" border=0></a>';
$row[$i] .= '<a href="'.WebGUI::URL::page('op=becomeUser&uid='.$data{userId}).
'"><img src="'.$session{setting}{lib}.'/become.gif" border=0></a>';
$row[$i] = '<tr class="tableData"><td>'
.deleteIcon('op=deleteUser&uid='.$data{userId})
.editIcon('op=editUser&uid='.$data{userId})
.becomeIcon('op=becomeUser&uid='.$data{userId});
$row[$i] .= '</td>';
$row[$i] .= '<td><a href="'.WebGUI::URL::page('op=viewProfile&uid='.$data{userId})
.'">'.$data{username}.'</a></td>';

2
lib/WebGUI/Style.pm
View file

@ -35,7 +35,7 @@ sub getStyle {
<head>
<title>';
$header .= $session{page}{title}.' - '.$session{setting}{companyName};
$header .= '</title><link REL="icon" HREF="'.$session{setting}{lib}.'/favicon.png" TYPE="image/png">'
$header .= '</title><link REL="icon" HREF="'.$session{config}{extras}.'/favicon.png" TYPE="image/png">'
.$style{styleSheet}
.$session{page}{metaTags};
if ($session{var}{adminOn}) {

4
lib/WebGUI/Utility.pm
View file

@ -69,9 +69,9 @@ sub sortByColumn {
$output .= '">'.$_[1].'</a>';
if ($session{form}{sort} eq $_[0]) {
if ($session{form}{sortDirection} eq "desc") {
$output .= ' <img src="'.$session{setting}{lib}.'/desc.gif">';
$output .= ' <img src="'.$session{config}{extras}.'/desc.gif">';
} else {
$output .= ' <img src="'.$session{setting}{lib}.'/asc.gif">';
$output .= ' <img src="'.$session{config}{extras}.'/asc.gif">';
}
}
return $output;

2
lib/WebGUI/Wobject/Poll.pm
View file

@ -211,7 +211,7 @@ sub www_view {
.$_[0]->get("wobjectId")." group by answer");
$output .= '<table cellpadding=0 cellspacing=0 border=0><tr><td width="'.
round($_[0]->get("graphWidth")*$data[0]/$totalResponses).'" class="pollColor"><img src="'.
$session{setting}{lib}.'/spacer.gif" height="1" width="1"></td><td class="pollAnswer">&nbsp;&nbsp;'.
$session{config}{extras}.'/spacer.gif" height="1" width="1"></td><td class="pollAnswer">&nbsp;&nbsp;'.
round(100*$data[0]/$totalResponses).'% ('.($data[0]+0).')</td></tr></table>';
}
}

2
lib/WebGUI/Wobject/Product.pm
View file

@ -180,7 +180,7 @@ sub _layoutStandard {
$i++;
}
$sth->finish;
$seperator = '<td class="productAttributeSeperator"><img src="'.$session{setting}{lib}.'/spacer.gif" width="1" height="1"></td>';
$seperator = '<td class="productAttributeSeperator"><img src="'.$session{config}{extras}.'/spacer.gif" width="1" height="1"></td>';
$output .= join($seperator,@column);
$output .= '</tr>';
$output .= '</table>';