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

Fixes for Mac OSX compatibility.

Browse source
This commit is contained in:
JT Smith 2002-11-29 19:08:40 +00:00
parent c15b7c32ec
commit 341b2ada4e
3 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/WebGUI/Attachment.pm
View file

@ -307,9 +307,7 @@ sub getIcon {
=cut =cut
sub getPath { sub getPath {
my ($slash); return $_[0]->{_node}->getPath.$session{os}{slash}.$_[0]->getFilename;
$slash = ($^O =~ /Win/i) ? "\\" : "/";
return $_[0]->{_node}->getPath.$slash.$_[0]->getFilename;
} }
@ -322,9 +320,8 @@ sub getPath {
=cut =cut
sub getSize { sub getSize {
my ($size, $slash); my ($size);
$slash = ($^O =~ /Win/i) ? "\\" : "/"; my (@attributes) = stat($_[0]->{_node}->getPath.$session{os}{slash}.$_[0]->getFilename);
my (@attributes) = stat($_[0]->{_node}->getPath.$slash.$_[0]->getFilename);
if ($attributes[7] > 1048576) { if ($attributes[7] > 1048576) {
$size = round($attributes[7]/1048576); $size = round($attributes[7]/1048576);
$size .= 'mb'; $size .= 'mb';
@ -350,12 +347,10 @@ sub getSize {
=cut =cut
sub getThumbnail { sub getThumbnail {
my ($slash);
$slash = ($^O =~ /Win/i) ? "\\" : "/";
if ($hasImageMagick && isIn($_[0]->getType, qw(jpg jpeg gif png))) { if ($hasImageMagick && isIn($_[0]->getType, qw(jpg jpeg gif png))) {
return $_[0]->{_node}->getURL.$slash.'thumb-'.$_[0]->getFilename; return $_[0]->{_node}->getURL.'/thumb-'.$_[0]->getFilename;
} elsif ($hasImageMagick && isIn($_[0]->getType, qw(tif tiff bmp))) { } elsif ($hasImageMagick && isIn($_[0]->getType, qw(tif tiff bmp))) {
return $_[0]->{_node}->getURL.$slash.'thumb-'.$_[0]->getFilename.'.png'; return $_[0]->{_node}->getURL.'/thumb-'.$_[0]->getFilename.'.png';
} else { } else {
return ""; return "";
} }
@ -446,9 +441,7 @@ sub new {
=cut =cut
sub rename { sub rename {
my ($slash); rename $_[0]->getPath, $_[0]->{_node}->getPath.$session{os}{slash}.$_[1];
$slash = ($^O =~ /Win/i) ? "\\" : "/";
rename $_[0]->getPath, $_[0]->{_node}->getPath.$slash.$_[1];
$_[0]->{_filename} = $_[1]; $_[0]->{_filename} = $_[1];
} }

29
lib/WebGUI/Session.pm
View file

@ -122,9 +122,8 @@ sub _setupUserInfo {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub _loadAuthentication { sub _loadAuthentication {
my ($dir, @files, $slash, $file, $cmd, $namespace, $exclude, @availableModules); my ($dir, @files, $slash, $file, $cmd, $namespace, $exclude, @availableModules);
$slash = ($^O =~ /Win/i) ? "\\" : "/"; $dir = $session{config}{webguiRoot}.$session{os}{slash}."lib".$session{os}{slash}."WebGUI".$session{os}{slash}."Authentication";
$dir = $slash."lib".$slash."WebGUI".$slash."Authentication"; opendir (DIR,$dir) or WebGUI::ErrorHandler::fatalError("Can't open Authentication module directory!");
opendir (DIR,$session{config}{webguiRoot}.$dir) or WebGUI::ErrorHandler::fatalError("Can't open Authentication module directory!");
@files = readdir(DIR); @files = readdir(DIR);
foreach $file (@files) { foreach $file (@files) {
if ($file =~ /(.*?)\.pm$/) { if ($file =~ /(.*?)\.pm$/) {
@ -150,10 +149,9 @@ sub _loadAuthentication {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub _loadMacros { sub _loadMacros {
my ($slash, $namespace, $cmd, @files, $file, $dir, $exclude); my ($namespace, $cmd, @files, $file, $dir, $exclude);
$slash = ($^O =~ /Win/i) ? "\\" : "/"; $dir = $session{config}{webguiRoot}.$session{os}{slash}."lib".$session{os}{slash}."WebGUI".$session{os}{slash}."Authentication";
$dir = $slash."lib".$slash."WebGUI".$slash."Macro"; opendir (DIR,$dir) or WebGUI::ErrorHandler::fatalError("Can't open macro directory!");
opendir (DIR,$session{config}{webguiRoot}.$dir) or WebGUI::ErrorHandler::fatalError("Can't open macro directory!");
@files = readdir(DIR); @files = readdir(DIR);
foreach $file (@files) { foreach $file (@files) {
if ($file =~ /(.*?)\.pm$/) { if ($file =~ /(.*?)\.pm$/) {
@ -173,10 +171,9 @@ sub _loadMacros {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub _loadWobjects { sub _loadWobjects {
my ($dir, @files, $slash, $file, $cmd, $namespace, $exclude); my ($dir, @files, $file, $cmd, $namespace, $exclude);
$slash = ($^O =~ /Win/i) ? "\\" : "/"; $dir = $session{config}{webguiRoot}.$session{os}{slash}."lib".$session{os}{slash}."WebGUI".$session{os}{slash}."Authentication";
$dir = $slash."lib".$slash."WebGUI".$slash."Wobject"; opendir (DIR,$dir) or WebGUI::ErrorHandler::fatalError("Can't open wobject directory!");
opendir (DIR,$session{config}{webguiRoot}.$dir) or WebGUI::ErrorHandler::fatalError("Can't open wobject directory!");
@files = readdir(DIR); @files = readdir(DIR);
foreach $file (@files) { foreach $file (@files) {
if ($file =~ /(.*?)\.pm$/) { if ($file =~ /(.*?)\.pm$/) {
@ -246,6 +243,16 @@ sub httpRedirect {
sub open { sub open {
my ($key, $config); my ($key, $config);
###---------------------------- ###----------------------------
### operating system specific things
$session{os}{name} = $^O;
if ($session{os}{name} =~ /^Win/i) {
$session{os}{type} = "Windowsish";
$session{os}{slash} = "\\";
} else {
$session{os}{type} = "Linuxish";
$session{os}{slash} = "/";
}
###----------------------------
### config variables ### config variables
$session{config}{webguiRoot} = $_[0]; $session{config}{webguiRoot} = $_[0];
$session{config}{configFile} = $_[1] || "WebGUI.conf"; $session{config}{configFile} = $_[1] || "WebGUI.conf";

4
sbin/testEnvironment.pl
View file

@ -29,8 +29,8 @@ print "\nWebGUI is checking your system environment:\n\n";
my ($os, $prereq, $dbi, $dbDrivers); my ($os, $prereq, $dbi, $dbDrivers);
$prereq = 1; $prereq = 1;
if ($^O =~ /Win/i) { if ($^O =~ /^Win/i) {
$os = "Microsoftish"; $os = "Windowsish";
} else { } else {
$os = "Linuxish"; $os = "Linuxish";
} }