diff --git a/DocDB/cgi/AddFiles b/DocDB/cgi/AddFiles index 07909978..b736bf48 100755 --- a/DocDB/cgi/AddFiles +++ b/DocDB/cgi/AddFiles @@ -30,6 +30,8 @@ use DBI; $StartTime = new Benchmark; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "ResponseElements.pm"; require "SecuritySQL.pm"; diff --git a/DocDB/cgi/AddFilesForm b/DocDB/cgi/AddFilesForm index 7981f97e..505fbc17 100755 --- a/DocDB/cgi/AddFilesForm +++ b/DocDB/cgi/AddFilesForm @@ -27,6 +27,8 @@ use CGI qw(-nosticky); use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "Messages.pm"; diff --git a/DocDB/cgi/AdministerElements.pm b/DocDB/cgi/AdministerElements.pm index 8eb3bd4f..86ebb089 100644 --- a/DocDB/cgi/AdministerElements.pm +++ b/DocDB/cgi/AdministerElements.pm @@ -29,13 +29,10 @@ sub AdministerActions (%) { my $Form = $Params{-form} || ""; my $AddTransfer = $Params{-addTransfer} || $FALSE; - my %Action = (); + my @Action = ('New', 'Delete', 'Modify'); - $Action{Delete} = "Delete"; - $Action{New} = "New"; - $Action{Modify} = "Modify"; if ($AddTransfer) { - $Action{Transfer} = "Transfer"; + unshift( @Action, "Transfer" ); } print FormElementTitle(-helplink => "admaction", -helptext => "Action"); print $query -> radio_group(-name => "admaction", diff --git a/DocDB/cgi/AdministerForm b/DocDB/cgi/AdministerForm index e7a915f6..6b9ef363 100755 --- a/DocDB/cgi/AdministerForm +++ b/DocDB/cgi/AdministerForm @@ -26,6 +26,8 @@ use CGI; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "AdministerElements.pm"; require "FormElements.pm"; diff --git a/DocDB/cgi/AdministerHome b/DocDB/cgi/AdministerHome index 4cad6c8b..6340784e 100755 --- a/DocDB/cgi/AdministerHome +++ b/DocDB/cgi/AdministerHome @@ -31,6 +31,8 @@ use CGI qw(-nosticky); use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "HTMLUtilities.pm"; require "SecuritySQL.pm"; diff --git a/DocDB/cgi/AuthorAdd b/DocDB/cgi/AuthorAdd index a9052bd1..1231e97f 100755 --- a/DocDB/cgi/AuthorAdd +++ b/DocDB/cgi/AuthorAdd @@ -29,6 +29,8 @@ use CGI; use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "ResponseElements.pm"; require "SecuritySQL.pm"; diff --git a/DocDB/cgi/AuthorAddForm b/DocDB/cgi/AuthorAddForm index 0eca817d..3c25a7a4 100755 --- a/DocDB/cgi/AuthorAddForm +++ b/DocDB/cgi/AuthorAddForm @@ -28,6 +28,8 @@ use CGI qw(-nosticky); use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "FormElements.pm"; require "Scripts.pm"; diff --git a/DocDB/cgi/AuthorAdminister b/DocDB/cgi/AuthorAdminister index 0b517f06..f22e6bd8 100755 --- a/DocDB/cgi/AuthorAdminister +++ b/DocDB/cgi/AuthorAdminister @@ -31,6 +31,8 @@ use CGI; use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "ResponseElements.pm"; require "Security.pm"; diff --git a/DocDB/cgi/BulkCertificateInsert b/DocDB/cgi/BulkCertificateInsert index a3e6acb0..831c0db2 100755 --- a/DocDB/cgi/BulkCertificateInsert +++ b/DocDB/cgi/BulkCertificateInsert @@ -26,6 +26,8 @@ use CGI qw(-nosticky); use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "AdministerElements.pm"; require "ResponseElements.pm"; diff --git a/DocDB/cgi/CertificateApplyForm b/DocDB/cgi/CertificateApplyForm index 718e3228..81d5acae 100755 --- a/DocDB/cgi/CertificateApplyForm +++ b/DocDB/cgi/CertificateApplyForm @@ -25,6 +25,8 @@ use DBI; $StartTime = new Benchmark; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "Messages.pm"; require "HTMLUtilities.pm"; diff --git a/DocDB/cgi/ConfirmTalkHint b/DocDB/cgi/ConfirmTalkHint index aae9a1e9..8123f876 100755 --- a/DocDB/cgi/ConfirmTalkHint +++ b/DocDB/cgi/ConfirmTalkHint @@ -29,6 +29,8 @@ use CGI; use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "Messages.pm"; diff --git a/DocDB/cgi/CustomListForm b/DocDB/cgi/CustomListForm index e37afa3f..8145e9c5 100755 --- a/DocDB/cgi/CustomListForm +++ b/DocDB/cgi/CustomListForm @@ -31,6 +31,8 @@ use CGI qw(-nosticky); use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "AdministerElements.pm"; require "ResponseElements.pm"; diff --git a/DocDB/cgi/DeleteConfirm b/DocDB/cgi/DeleteConfirm index 83c535cb..7d2202c4 100755 --- a/DocDB/cgi/DeleteConfirm +++ b/DocDB/cgi/DeleteConfirm @@ -30,6 +30,8 @@ use CGI; use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "ResponseElements.pm"; require "Security.pm"; diff --git a/DocDB/cgi/DeleteDocument b/DocDB/cgi/DeleteDocument index 893e260b..25b15c93 100755 --- a/DocDB/cgi/DeleteDocument +++ b/DocDB/cgi/DeleteDocument @@ -30,6 +30,8 @@ use CGI; use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "ResponseElements.pm"; require "Security.pm"; diff --git a/DocDB/cgi/DisplayMeeting b/DocDB/cgi/DisplayMeeting index 1d945fe1..18a448f1 100755 --- a/DocDB/cgi/DisplayMeeting +++ b/DocDB/cgi/DisplayMeeting @@ -32,6 +32,8 @@ use DBI; $StartTime = new Benchmark; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "Messages.pm"; diff --git a/DocDB/cgi/DocDBHelp b/DocDB/cgi/DocDBHelp index ea18350c..8fbd538d 100755 --- a/DocDB/cgi/DocDBHelp +++ b/DocDB/cgi/DocDBHelp @@ -28,6 +28,8 @@ use CGI; use CGI::Untaint; use XML::Simple; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "HTMLUtilities.pm"; require "UntaintInput.pm"; @@ -54,15 +56,15 @@ my ($DefaultText, $DefaultTitle, $ProjectText, $ProjectTitle, $Action); my $HelpXML = XMLin("DocDBHelp.xml"); -$DefaultText = %{$HelpXML->{entry}{$helpterm}}->{text}; -$DefaultTitle = %{$HelpXML->{entry}{$helpterm}}->{title}; +$DefaultText = %{$HelpXML->{entry}{$helpterm}}{text}; +$DefaultTitle = %{$HelpXML->{entry}{$helpterm}}{title}; if ($ProjectHelp) { my $ProjectXML = XMLin("ProjectHelp.xml"); - $ProjectText = %{$ProjectXML->{entry}{$helpterm}}->{text}; - $ProjectTitle = %{$ProjectXML->{entry}{$helpterm}}->{title}; - $Action = %{$ProjectXML->{entry}{$helpterm}}->{action}; + $ProjectText = %{$ProjectXML->{entry}{$helpterm}}{text}; + $ProjectTitle = %{$ProjectXML->{entry}{$helpterm}}{title}; + $Action = %{$ProjectXML->{entry}{$helpterm}}{action}; } # Remove line breaks and XML element tags diff --git a/DocDB/cgi/DocDBInstructions b/DocDB/cgi/DocDBInstructions index 780d1667..66124c60 100755 --- a/DocDB/cgi/DocDBInstructions +++ b/DocDB/cgi/DocDBInstructions @@ -29,6 +29,8 @@ use CGI; use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "HTMLUtilities.pm"; require "UntaintInput.pm"; diff --git a/DocDB/cgi/DocTypeAdminister b/DocDB/cgi/DocTypeAdminister index 110e3d2d..b214965d 100755 --- a/DocDB/cgi/DocTypeAdminister +++ b/DocDB/cgi/DocTypeAdminister @@ -29,6 +29,8 @@ use CGI; use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "ResponseElements.pm"; require "Security.pm"; diff --git a/DocDB/cgi/DocumentAddForm b/DocDB/cgi/DocumentAddForm index d514b7f4..2dfa3372 100755 --- a/DocDB/cgi/DocumentAddForm +++ b/DocDB/cgi/DocumentAddForm @@ -27,6 +27,8 @@ use CGI qw(-nosticky); use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "Cookies.pm"; require "Scripts.pm"; diff --git a/DocDB/cgi/DocumentDatabase b/DocDB/cgi/DocumentDatabase index 5ec110fc..84c4f8d3 100755 --- a/DocDB/cgi/DocumentDatabase +++ b/DocDB/cgi/DocumentDatabase @@ -32,6 +32,8 @@ use DBI; $StartTime = new Benchmark; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "HTMLUtilities.pm"; require "ResponseElements.pm"; diff --git a/DocDB/cgi/EditTalkInfo b/DocDB/cgi/EditTalkInfo index 04f01b5b..2bf91abc 100755 --- a/DocDB/cgi/EditTalkInfo +++ b/DocDB/cgi/EditTalkInfo @@ -30,6 +30,8 @@ use CGI qw(-nosticky); use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "Messages.pm"; diff --git a/DocDB/cgi/EmailAdminister b/DocDB/cgi/EmailAdminister index ff24e886..6a29c1d0 100755 --- a/DocDB/cgi/EmailAdminister +++ b/DocDB/cgi/EmailAdminister @@ -33,6 +33,8 @@ use CGI; use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "ResponseElements.pm"; require "Security.pm"; diff --git a/DocDB/cgi/EmailAdministerForm b/DocDB/cgi/EmailAdministerForm index 2fb0cdbb..7907cddb 100755 --- a/DocDB/cgi/EmailAdministerForm +++ b/DocDB/cgi/EmailAdministerForm @@ -29,6 +29,8 @@ use CGI qw(-nosticky); use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "Scripts.pm"; require "ResponseElements.pm"; diff --git a/DocDB/cgi/EmailLogin b/DocDB/cgi/EmailLogin index 0bc9739a..9c57f7eb 100755 --- a/DocDB/cgi/EmailLogin +++ b/DocDB/cgi/EmailLogin @@ -26,6 +26,8 @@ use CGI; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "HTMLUtilities.pm"; require "ResponseElements.pm"; diff --git a/DocDB/cgi/EventAdministerForm b/DocDB/cgi/EventAdministerForm index dd91d814..dd4933d3 100755 --- a/DocDB/cgi/EventAdministerForm +++ b/DocDB/cgi/EventAdministerForm @@ -31,6 +31,8 @@ use CGI qw(-nosticky); use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "AdministerElements.pm"; require "ResponseElements.pm"; diff --git a/DocDB/cgi/ExternalDocDBAdministerForm b/DocDB/cgi/ExternalDocDBAdministerForm index 0929a523..7cb73638 100755 --- a/DocDB/cgi/ExternalDocDBAdministerForm +++ b/DocDB/cgi/ExternalDocDBAdministerForm @@ -29,6 +29,8 @@ use CGI qw(-nosticky); use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "AdministerElements.pm"; require "ResponseElements.pm"; diff --git a/DocDB/cgi/FNALSSOUtilities.pm b/DocDB/cgi/FNALSSOUtilities.pm index 7aae6118..0642494a 100644 --- a/DocDB/cgi/FNALSSOUtilities.pm +++ b/DocDB/cgi/FNALSSOUtilities.pm @@ -22,6 +22,8 @@ # along with DocDB; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "SecuritySQL.pm"; diff --git a/DocDB/cgi/GroupAdminister b/DocDB/cgi/GroupAdminister index e764a4f0..ac18455f 100755 --- a/DocDB/cgi/GroupAdminister +++ b/DocDB/cgi/GroupAdminister @@ -30,6 +30,8 @@ use CGI; use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "ResponseElements.pm"; require "Security.pm"; diff --git a/DocDB/cgi/GroupAdministerForm b/DocDB/cgi/GroupAdministerForm index 8d21ca23..9c1ee8d4 100755 --- a/DocDB/cgi/GroupAdministerForm +++ b/DocDB/cgi/GroupAdministerForm @@ -26,6 +26,8 @@ use CGI qw(-nosticky); use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "AdministerElements.pm"; require "ResponseElements.pm"; diff --git a/DocDB/cgi/InstitutionAdminister b/DocDB/cgi/InstitutionAdminister index e450f719..867ecfee 100755 --- a/DocDB/cgi/InstitutionAdminister +++ b/DocDB/cgi/InstitutionAdminister @@ -29,6 +29,8 @@ use CGI; use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "ResponseElements.pm"; require "Security.pm"; diff --git a/DocDB/cgi/JournalAdminister b/DocDB/cgi/JournalAdminister index 937ff6b6..d0b9ac59 100755 --- a/DocDB/cgi/JournalAdminister +++ b/DocDB/cgi/JournalAdminister @@ -28,6 +28,8 @@ use CGI; use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "ResponseElements.pm"; require "Security.pm"; diff --git a/DocDB/cgi/KeywordAdministerForm b/DocDB/cgi/KeywordAdministerForm index 1c8f8c77..77cb4e76 100755 --- a/DocDB/cgi/KeywordAdministerForm +++ b/DocDB/cgi/KeywordAdministerForm @@ -26,6 +26,8 @@ use CGI; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "AdministerElements.pm"; require "FormElements.pm"; diff --git a/DocDB/cgi/KeywordGroupAdminister b/DocDB/cgi/KeywordGroupAdminister index bfb38b2c..30dfa1c4 100755 --- a/DocDB/cgi/KeywordGroupAdminister +++ b/DocDB/cgi/KeywordGroupAdminister @@ -29,6 +29,8 @@ use CGI; use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "ResponseElements.pm"; require "Security.pm"; diff --git a/DocDB/cgi/KeywordListAdminister b/DocDB/cgi/KeywordListAdminister index dae6381d..d71655f9 100755 --- a/DocDB/cgi/KeywordListAdminister +++ b/DocDB/cgi/KeywordListAdminister @@ -30,6 +30,8 @@ use CGI; use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "Sorts.pm"; require "ResponseElements.pm"; diff --git a/DocDB/cgi/ListAllMeetings b/DocDB/cgi/ListAllMeetings index d2ecc19b..1badb248 100755 --- a/DocDB/cgi/ListAllMeetings +++ b/DocDB/cgi/ListAllMeetings @@ -29,6 +29,8 @@ use CGI; use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "MeetingSQL.pm"; require "MeetingHTML.pm"; diff --git a/DocDB/cgi/ListAuthors b/DocDB/cgi/ListAuthors index 99df7d66..86b297da 100755 --- a/DocDB/cgi/ListAuthors +++ b/DocDB/cgi/ListAuthors @@ -22,6 +22,8 @@ use CGI; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "AuthorSQL.pm"; require "ResponseElements.pm"; diff --git a/DocDB/cgi/ListBy b/DocDB/cgi/ListBy index c65cbe12..b301f1fa 100755 --- a/DocDB/cgi/ListBy +++ b/DocDB/cgi/ListBy @@ -32,6 +32,8 @@ use DBI; $StartTime = new Benchmark; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "DocumentHTML.pm"; require "SecuritySQL.pm"; diff --git a/DocDB/cgi/ListEventsBy b/DocDB/cgi/ListEventsBy index b3f3219c..fe035821 100755 --- a/DocDB/cgi/ListEventsBy +++ b/DocDB/cgi/ListEventsBy @@ -30,6 +30,8 @@ use CGI qw(-nosticky); use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "MeetingSQL.pm"; diff --git a/DocDB/cgi/ListGroupUsers b/DocDB/cgi/ListGroupUsers index 27bf7ee2..635f3f8c 100755 --- a/DocDB/cgi/ListGroupUsers +++ b/DocDB/cgi/ListGroupUsers @@ -29,6 +29,8 @@ use CGI qw(-nosticky); use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "ResponseElements.pm"; require "Security.pm"; diff --git a/DocDB/cgi/ListGroups b/DocDB/cgi/ListGroups index 98237d4b..0251c656 100755 --- a/DocDB/cgi/ListGroups +++ b/DocDB/cgi/ListGroups @@ -22,6 +22,8 @@ use CGI; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "SecuritySQL.pm"; require "SecurityHTML.pm"; diff --git a/DocDB/cgi/ListKeywords b/DocDB/cgi/ListKeywords index a0a8f8de..7a670585 100755 --- a/DocDB/cgi/ListKeywords +++ b/DocDB/cgi/ListKeywords @@ -30,6 +30,8 @@ use CGI; use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "KeywordSQL.pm"; require "ResponseElements.pm"; diff --git a/DocDB/cgi/ListManagedDocuments b/DocDB/cgi/ListManagedDocuments index ca8c3b87..306d8ecb 100755 --- a/DocDB/cgi/ListManagedDocuments +++ b/DocDB/cgi/ListManagedDocuments @@ -25,6 +25,8 @@ use DBI; $StartTime = new Benchmark; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "SecuritySQL.pm"; diff --git a/DocDB/cgi/ListTopics b/DocDB/cgi/ListTopics index bdbec0be..a8223719 100755 --- a/DocDB/cgi/ListTopics +++ b/DocDB/cgi/ListTopics @@ -22,6 +22,8 @@ use CGI; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "TopicSQL.pm"; require "TopicHTML.pm"; diff --git a/DocDB/cgi/ListTypes b/DocDB/cgi/ListTypes index 293aea4f..89e89bfb 100755 --- a/DocDB/cgi/ListTypes +++ b/DocDB/cgi/ListTypes @@ -22,6 +22,8 @@ use CGI; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "MiscSQL.pm"; require "ResponseElements.pm"; diff --git a/DocDB/cgi/MeetingModify b/DocDB/cgi/MeetingModify index 266b7eeb..5219739f 100755 --- a/DocDB/cgi/MeetingModify +++ b/DocDB/cgi/MeetingModify @@ -29,6 +29,8 @@ use CGI::Untaint; use DBI; use Time::Local; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "Messages.pm"; diff --git a/DocDB/cgi/MeetingSQL.pm b/DocDB/cgi/MeetingSQL.pm index ae4ba29e..d520155a 100644 --- a/DocDB/cgi/MeetingSQL.pm +++ b/DocDB/cgi/MeetingSQL.pm @@ -496,6 +496,7 @@ sub InsertEvent (%) { my $AltLocation = exists $ArgRef->{-altlocation} ? $ArgRef->{-altlocation} : ""; my $URL = exists $ArgRef->{-url} ? $ArgRef->{-url} : ""; my $ShowAllTalks = exists $ArgRef->{-showalltalks} ? $ArgRef->{-showalltalks} : 0; + if ($ShowAllTalks == '') $ShowAllTalks = 0; my $Preamble = exists $ArgRef->{-preamble} ? $ArgRef->{-preamble} : ""; my $Epilogue = exists $ArgRef->{-epilogue} ? $ArgRef->{-epilogue} : ""; my @TopicIDs = exists $ArgRef->{-topicids} ? @{$ArgRef->{-topicids}} : (); diff --git a/DocDB/cgi/ModifyHome b/DocDB/cgi/ModifyHome index cd15f8f4..8f3c7a5e 100755 --- a/DocDB/cgi/ModifyHome +++ b/DocDB/cgi/ModifyHome @@ -26,6 +26,8 @@ use CGI qw(-nosticky); use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "HTMLUtilities.pm"; require "SecuritySQL.pm"; diff --git a/DocDB/cgi/ProcessDocumentAdd b/DocDB/cgi/ProcessDocumentAdd index da0bd483..b1644570 100755 --- a/DocDB/cgi/ProcessDocumentAdd +++ b/DocDB/cgi/ProcessDocumentAdd @@ -29,6 +29,8 @@ use DBI; $StartTime = new Benchmark; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "ResponseElements.pm"; require "AuthorSQL.pm"; diff --git a/DocDB/cgi/RetrieveArchive b/DocDB/cgi/RetrieveArchive index 95f1ec42..d12915ca 100755 --- a/DocDB/cgi/RetrieveArchive +++ b/DocDB/cgi/RetrieveArchive @@ -31,6 +31,8 @@ use CGI; use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "ResponseElements.pm"; require "SecuritySQL.pm"; diff --git a/DocDB/cgi/RetrieveFile b/DocDB/cgi/RetrieveFile index 95927a6f..3174b80a 100755 --- a/DocDB/cgi/RetrieveFile +++ b/DocDB/cgi/RetrieveFile @@ -29,6 +29,8 @@ use CGI; use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "ResponseElements.pm"; require "SecuritySQL.pm"; diff --git a/DocDB/cgi/SSOAccessApply b/DocDB/cgi/SSOAccessApply index 4a5c427a..f1280607 100644 --- a/DocDB/cgi/SSOAccessApply +++ b/DocDB/cgi/SSOAccessApply @@ -31,6 +31,8 @@ use DBI; $StartTime = new Benchmark; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "Messages.pm"; require "HTMLUtilities.pm"; diff --git a/DocDB/cgi/Search b/DocDB/cgi/Search index b533c46f..dbf1ac8b 100755 --- a/DocDB/cgi/Search +++ b/DocDB/cgi/Search @@ -32,6 +32,8 @@ use DBI; $StartTime = new Benchmark; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "HTMLUtilities.pm"; require "Search.pm"; diff --git a/DocDB/cgi/SearchAtoms.pm b/DocDB/cgi/SearchAtoms.pm index 5683c873..bbdd68b0 100644 --- a/DocDB/cgi/SearchAtoms.pm +++ b/DocDB/cgi/SearchAtoms.pm @@ -113,7 +113,7 @@ sub RegExpSearchAtom { } if ($RequireWord) { - if $MySQLVersion < 8 { + if ($MySQLVersion < 8) { $RegExpAtom .= '[[:<:]]'; } else { $RegExpAtom .= '\\b'; @@ -123,7 +123,7 @@ sub RegExpSearchAtom { $RegExpAtom .= join '|', @RegExpParts; $RegExpAtom .= ')'; if ($RequireWord) { - if $MySQLVersion < 8 { + if ($MySQLVersion < 8) { $RegExpAtom .= '[[:>:]]'; } else { $RegExpAtom .= '\\b'; diff --git a/DocDB/cgi/SearchForm b/DocDB/cgi/SearchForm index cf4d88fb..63849923 100755 --- a/DocDB/cgi/SearchForm +++ b/DocDB/cgi/SearchForm @@ -26,6 +26,8 @@ use CGI qw(-nosticky); use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "FormElements.pm"; require "SearchFormElements.pm"; diff --git a/DocDB/cgi/SelectEmailPrefs b/DocDB/cgi/SelectEmailPrefs index 0a261a60..d7cc447f 100755 --- a/DocDB/cgi/SelectEmailPrefs +++ b/DocDB/cgi/SelectEmailPrefs @@ -28,6 +28,8 @@ use CGI qw(-nosticky); use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "ResponseElements.pm"; require "EmailSecurity.pm"; diff --git a/DocDB/cgi/SelectGroups b/DocDB/cgi/SelectGroups index 8529a4b5..a00717ea 100755 --- a/DocDB/cgi/SelectGroups +++ b/DocDB/cgi/SelectGroups @@ -26,6 +26,8 @@ use CGI qw(-nosticky); use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "Messages.pm"; require "HTMLUtilities.pm"; diff --git a/DocDB/cgi/SelectPrefs b/DocDB/cgi/SelectPrefs index 582306e9..bcf010c2 100755 --- a/DocDB/cgi/SelectPrefs +++ b/DocDB/cgi/SelectPrefs @@ -28,6 +28,8 @@ use CGI qw(-nosticky); use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "HTMLUtilities.pm"; require "SecuritySQL.pm"; diff --git a/DocDB/cgi/SessionModify b/DocDB/cgi/SessionModify index f4dee865..cdcf363b 100755 --- a/DocDB/cgi/SessionModify +++ b/DocDB/cgi/SessionModify @@ -29,6 +29,8 @@ use CGI qw(-nosticky); use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "Messages.pm"; require "Cookies.pm"; diff --git a/DocDB/cgi/SetGroups b/DocDB/cgi/SetGroups index 9989ef7b..4e0f6fcb 100755 --- a/DocDB/cgi/SetGroups +++ b/DocDB/cgi/SetGroups @@ -28,6 +28,8 @@ use CGI qw(-nosticky); use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "HTMLUtilities.pm"; require "UntaintInput.pm"; diff --git a/DocDB/cgi/SetPrefs b/DocDB/cgi/SetPrefs index 511db715..8838d957 100755 --- a/DocDB/cgi/SetPrefs +++ b/DocDB/cgi/SetPrefs @@ -30,6 +30,8 @@ use CGI; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "Messages.pm"; require "HTMLUtilities.pm"; diff --git a/DocDB/cgi/ShowCalendar b/DocDB/cgi/ShowCalendar index e1e17b0a..41a21f84 100755 --- a/DocDB/cgi/ShowCalendar +++ b/DocDB/cgi/ShowCalendar @@ -36,6 +36,8 @@ use CGI::Untaint; use DBI; use DateTime; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "DBUtilities.pm"; require "HTMLUtilities.pm"; diff --git a/DocDB/cgi/ShowDocument b/DocDB/cgi/ShowDocument index 1321d5c7..195971b1 100755 --- a/DocDB/cgi/ShowDocument +++ b/DocDB/cgi/ShowDocument @@ -27,6 +27,8 @@ use CGI; use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "ResponseElements.pm"; require "SecuritySQL.pm"; diff --git a/DocDB/cgi/ShowTalkNote b/DocDB/cgi/ShowTalkNote index cfb27d84..2f7cf4c6 100755 --- a/DocDB/cgi/ShowTalkNote +++ b/DocDB/cgi/ShowTalkNote @@ -30,6 +30,8 @@ use CGI qw(-nosticky); use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "Messages.pm"; diff --git a/DocDB/cgi/SignRevision b/DocDB/cgi/SignRevision index 76e5bac3..0dea24da 100755 --- a/DocDB/cgi/SignRevision +++ b/DocDB/cgi/SignRevision @@ -27,6 +27,8 @@ use CGI; use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "HTMLUtilities.pm"; require "UntaintInput.pm"; diff --git a/DocDB/cgi/SignatureReport b/DocDB/cgi/SignatureReport index a98e5815..27c6462e 100755 --- a/DocDB/cgi/SignatureReport +++ b/DocDB/cgi/SignatureReport @@ -38,6 +38,8 @@ use DBI; $StartTime = new Benchmark; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "SignoffSQL.pm"; diff --git a/DocDB/cgi/SignoffChooser b/DocDB/cgi/SignoffChooser index 9343df66..b810ea56 100755 --- a/DocDB/cgi/SignoffChooser +++ b/DocDB/cgi/SignoffChooser @@ -30,6 +30,8 @@ use CGI; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "Messages.pm"; diff --git a/DocDB/cgi/Statistics b/DocDB/cgi/Statistics index 6b9870cc..98569e5b 100755 --- a/DocDB/cgi/Statistics +++ b/DocDB/cgi/Statistics @@ -25,6 +25,8 @@ use CGI; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "DocDBVersion.pm"; require "HTMLUtilities.pm"; diff --git a/DocDB/cgi/TopicAdminister b/DocDB/cgi/TopicAdminister index dbfc8caf..61212cd2 100755 --- a/DocDB/cgi/TopicAdminister +++ b/DocDB/cgi/TopicAdminister @@ -30,6 +30,8 @@ use CGI qw(-nosticky); use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "AdministerElements.pm"; require "ResponseElements.pm"; diff --git a/DocDB/cgi/TopicHTML.pm b/DocDB/cgi/TopicHTML.pm index 9fc958f8..a0ccc67a 100644 --- a/DocDB/cgi/TopicHTML.pm +++ b/DocDB/cgi/TopicHTML.pm @@ -24,6 +24,8 @@ # along with DocDB; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "HTMLUtilities.pm"; diff --git a/DocDB/cgi/UserAccessApply b/DocDB/cgi/UserAccessApply index 882bec14..fddf6572 100755 --- a/DocDB/cgi/UserAccessApply +++ b/DocDB/cgi/UserAccessApply @@ -30,6 +30,8 @@ use DBI; $StartTime = new Benchmark; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "Messages.pm"; require "HTMLUtilities.pm"; diff --git a/DocDB/cgi/WatchDocument b/DocDB/cgi/WatchDocument index c993bd8a..040c6f6c 100755 --- a/DocDB/cgi/WatchDocument +++ b/DocDB/cgi/WatchDocument @@ -27,6 +27,8 @@ use CGI; use CGI::Untaint; use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "HTMLUtilities.pm"; require "UntaintInput.pm"; diff --git a/DocDB/cgi/XMLUpload b/DocDB/cgi/XMLUpload index 3619aeb6..7ee85884 100755 --- a/DocDB/cgi/XMLUpload +++ b/DocDB/cgi/XMLUpload @@ -32,6 +32,8 @@ use CGI qw(-nosticky); use DBI; use XML::Twig; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "HTMLUtilities.pm"; require "ResponseElements.pm"; diff --git a/DocDB/cgi/XSearch b/DocDB/cgi/XSearch index 3ce7ba74..37f32afb 100755 --- a/DocDB/cgi/XSearch +++ b/DocDB/cgi/XSearch @@ -23,6 +23,8 @@ use CGI qw(-nosticky); use DBI; +use FindBin qw($Bin); +use lib $Bin; require "DocDBGlobals.pm"; require "DBUtilities.pm"; require "Utilities.pm";