Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move shared module directory code to a shared file and support autoloading module interfaces #299

Merged
merged 26 commits into from
Dec 19, 2017
Merged
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
2819a91
Additional Search Fields
jeffnm Feb 27, 2017
132eb12
Fix PHP Notices on organizations landing page.
t4k Jun 14, 2017
d381b5e
Add a check in case user does not have first or last names.
t4k Jun 20, 2017
1c27089
Issue 281: Fix button when adding a step in admin workflow edit
veggiematts Sep 6, 2017
397709f
fixing type in update script.
Sep 12, 2017
734ecd5
Delete info.php
jeffnm Sep 15, 2017
38854da
refactor directory.php module files to share common code
jsavell Sep 20, 2017
ddcf978
move some language management to common_directory file
jsavell Sep 20, 2017
3e3c814
include common_directory from licensing module, include global LangCo…
jsavell Sep 20, 2017
0c076ed
update autoloader to find module defined interfaces
jsavell Sep 20, 2017
10a6d00
fix license headers
jsavell Sep 20, 2017
a79493e
move format_date function to common directory
jsavell Sep 21, 2017
384122b
fix usage directory and move more shared functions to common directory
jsavell Sep 21, 2017
3992765
Merge pull request #295 from coral-erm/jeffnm-patch-5
veggiematts Sep 25, 2017
69245b5
Merge pull request #238 from caltechlibrary/issue77-php-notices-organ…
veggiematts Oct 10, 2017
a5b0afc
Issue #77: Undefined index: auth/…/Utility.php Line 71
t4k Oct 13, 2017
df6bd68
Merge pull request #309 from caltechlibrary/77-notice-auth-utility-71
veggiematts Oct 18, 2017
1990daa
Merge pull request #290 from jcraitz/jcraitz-fix-SQL_typo-update_2.0.0
veggiematts Oct 18, 2017
4c5eef8
Add checks to avoid PHP Notices in Resources code. (#233)
t4k Oct 19, 2017
112a659
Merge pull request #286 from biblibre/Issue_281_Wrong_Button_In_Worfk…
t4k Oct 27, 2017
b74d408
Add checks for indexes and update HTML structure.
t4k Oct 31, 2017
75db7fc
Merge branch 'development' into jeffnm-resources-search
t4k Oct 31, 2017
78ea34a
Re-add <b> element; required for CSS.
t4k Oct 31, 2017
e65b038
Merge pull request #183 from coral-erm/jeffnm-resources-search
t4k Oct 31, 2017
5dc838b
Merge remote-tracking branch 'origin/pull/299' into PR299
veggiematts Dec 18, 2017
143d1aa
PR299: Fix API
veggiematts Dec 18, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add checks to avoid PHP Notices in Resources code. (#233)
* Fixes for PHP Notices on resources landing page.

PHP message: PHP Notice: Undefined index: orderBy in /var/www/coral/resources/admin/classes/domain/Resource.php on line 805
PHP message: PHP Notice: Undefined index: page in /var/www/coral/resources/admin/classes/domain/Resource.php on line 805
PHP message: PHP Notice: Undefined index: recordsPerPage in /var/www/coral/resources/admin/classes/domain/Resource.php on line 805
PHP message: PHP Notice: Undefined variable: currentPage in /var/www/coral/resources/index.php on line 32
PHP message: PHP Notice: Undefined index: startWith in /var/www/coral/resources/index.php on line 49
PHP message: PHP Notice: Undefined index: name in /var/www/coral/resources/index.php on line 69
PHP message: PHP Notice: Undefined index: resourceISBNOrISSN in /var/www/coral/resources/index.php on line 80
PHP message: PHP Notice: Undefined index: fund in /var/www/coral/resources/index.php on line 92
PHP message: PHP Notice: Undefined index: acquisitionTypeID in /var/www/coral/resources/index.php on line 125
PHP message: PHP Notice: Undefined index: acquisitionTypeID in /var/www/coral/resources/index.php on line 125
PHP message: PHP Notice: Undefined index: acquisitionTypeID in /var/www/coral/resources/index.php on line 125
PHP message: PHP Notice: Undefined index: acquisitionTypeID in /var/www/coral/resources/index.php on line 125
PHP message: PHP Notice: Undefined index: statusID in /var/www/coral/resources/index.php on line 150
PHP message: PHP Notice: Undefined index: statusID in /var/www/coral/resources/index.php on line 150
PHP message: PHP Notice: Undefined index: statusID in /var/www/coral/resources/index.php on line 150
PHP message: PHP Notice: Undefined index: creatorLoginID in /var/www/coral/resources/index.php on line 186
PHP message: PHP Notice: Undefined index: resourceFormatID in /var/www/coral/resources/index.php on line 211
PHP message: PHP Notice: Undefined index: resourceFormatID in /var/www/coral/resources/index.php on line 211
PHP message: PHP Notice: Undefined index: resourceFormatID in /var/www/coral/resources/index.php on line 211
PHP message: PHP Notice: Undefined index: resourceTypeID in /var/www/coral/resources/index.php on line 232
PHP message: PHP Notice: Undefined index: resourceTypeID in /var/www/coral/resources/index.php on line 243
PHP message: PHP Notice: Undefined index: generalSubjectID in /var/www/coral/resources/index.php on line 264
PHP message: PHP Notice: Undefined index: generalSubjectID in /var/www/coral/resources/index.php on line 275
PHP message: PHP Notice: Undefined index: detailedSubjectID in /var/www/coral/resources/index.php on line 295
PHP message: PHP Notice: Undefined index: noteTypeID in /var/www/coral/resources/index.php on line 356
PHP message: PHP Notice: Undefined index: noteTypeID in /var/www/coral/resources/index.php on line 366
PHP message: PHP Notice: Undefined index: noteTypeID in /var/www/coral/resources/index.php on line 366
PHP message: PHP Notice: Undefined index: noteTypeID in /var/www/coral/resources/index.php on line 366
PHP message: PHP Notice: Undefined index: noteTypeID in /var/www/coral/resources/index.php on line 366
PHP message: PHP Notice: Undefined index: noteTypeID in /var/www/coral/resources/index.php on line 366
PHP message: PHP Notice: Undefined index: noteTypeID in /var/www/coral/resources/index.php on line 366
PHP message: PHP Notice: Undefined index: resourceNote in /var/www/coral/resources/index.php on line 382
PHP message: PHP Notice: Undefined index: resourceNote in /var/www/coral/resources/index.php on line 384
PHP message: PHP Notice: Undefined index: createDateStart in /var/www/coral/resources/index.php on line 393
PHP message: PHP Notice: Undefined index: createDateEnd in /var/www/coral/resources/index.php on line 399
PHP message: PHP Notice: Undefined index: purchaseSiteID in /var/www/coral/resources/index.php on line 414
PHP message: PHP Notice: Undefined index: purchaseSiteID in /var/www/coral/resources/index.php on line 424
PHP message: PHP Notice: Undefined index: authorizedSiteID in /var/www/coral/resources/index.php on line 446
PHP message: PHP Notice: Undefined index: authorizedSiteID in /var/www/coral/resources/index.php on line 456
PHP message: PHP Notice: Undefined index: administeringSiteID in /var/www/coral/resources/index.php on line 478
PHP message: PHP Notice: Undefined index: administeringSiteID in /var/www/coral/resources/index.php on line 488
PHP message: PHP Notice: Undefined index: authenticationTypeID in /var/www/coral/resources/index.php on line 508
PHP message: PHP Notice: Undefined index: authenticationTypeID in /var/www/coral/resources/index.php on line 519
PHP message: PHP Notice: Undefined index: authenticationTypeID in /var/www/coral/resources/index.php on line 519
PHP message: PHP Notice: Undefined index: authenticationTypeID in /var/www/coral/resources/index.php on line 519
PHP message: PHP Notice: Undefined index: catalogingStatusID in /var/www/coral/resources/index.php on line 537
PHP message: PHP Notice: Undefined index: catalogingStatusID in /var/www/coral/resources/index.php on line 546
PHP message: PHP Notice: Undefined index: catalogingStatusID in /var/www/coral/resources/index.php on line 546
PHP message: PHP Notice: Undefined index: catalogingStatusID in /var/www/coral/resources/index.php on line 546
PHP message: PHP Notice: Undefined index: stepName in /var/www/coral/resources/index.php on line 568
PHP message: PHP Notice: Undefined index: stepName in /var/www/coral/resources/index.php on line 568
PHP message: PHP Notice: Undefined index: stepName in /var/www/coral/resources/index.php on line 568
PHP message: PHP Notice: Undefined index: stepName in /var/www/coral/resources/index.php on line 568

* Fix for PHP Notices on resources queue.

PHP message: PHP Notice:  Undefined variable: currentPage in /var/www/coral/resources/queue.php on line 24

* Fix for PHP Notices on resources admin.

PHP message: PHP Warning:  session_start(): Cannot send session cookie - headers already sent by (output started at /var/www/coral/resources/templates/header.php:183) in /var/www/coral/resources/admin/classes/common/CoralSession.php on line 25
PHP message: PHP Warning:  session_start(): Cannot send session cache limiter - headers already sent (output started at /var/www/coral/resources/templates/header.php:183) in /var/www/coral/resources/admin/classes/common/CoralSession.php on line 25

* Fix for PHP Notices on resources admin.

PHP message: PHP Notice:  Undefined variable: currentPage in /var/www/coral/resources/admin.php on line 24

* Fix for PHP Notices on resources resource.

PHP message: PHP Notice:  Undefined variable: currentPage in /var/www/coral/resources/resource.php on line 34
PHP message: PHP Notice:  Undefined index: ref in /var/www/coral/resources/resource.php on line 52
PHP message: PHP Notice:  Undefined index: workflowID in /var/www/coral/resources/admin/classes/domain/Resource.php on line 1976

* Fix PHP Notices on resources getUpdateProductForm.

PHP message: PHP Notice:  Undefined variable: resourceOrganization in /var/www/coral/resources/ajax_forms/getUpdateProductForm.php on line 306
PHP message: PHP Notice:  Undefined index: resourceID in /var/www/coral/resources/admin/classes/domain/Resource.php on line 1526

* Fix PHP Notices in resources getNewDowntimeForm.

PHP message: PHP Notice:  Undefined index: organizationID in /var/www/coral/resources/ajax_forms/getNewDowntimeForm.php on line 4
PHP message: PHP Notice:  Undefined index: issueID in /var/www/coral/resources/ajax_forms/getNewDowntimeForm.php on line 7
PHP message: PHP Notice:  Undefined offset: 0 in /var/www/coral/resources/admin/classes/domain/Downtime.php on line 67
PHP message: PHP Notice:  Undefined index: downtimeTypeID in /var/www/coral/resources/ajax_forms/getNewDowntimeForm.php on line 97
PHP message: PHP Notice:  Undefined index: shortName in /var/www/coral/resources/ajax_forms/getNewDowntimeForm.php on line 97

* Change isset() to be separate from is_array().
t4k authored Oct 19, 2017
commit 4c5eef88e0183eca1a7cc7c0b2058e3598b48635
7 changes: 4 additions & 3 deletions resources/admin.php
Original file line number Diff line number Diff line change
@@ -19,11 +19,12 @@

include_once 'directory.php';

$pageTitle=_('Administration');
include 'templates/header.php';

//set referring page
CoralSession::set('ref_script', $currentPage);
CoralSession::set('ref_script', $currentPage = '');

$pageTitle=_('Administration');
include 'templates/header.php';

$config = new Configuration;

2 changes: 1 addition & 1 deletion resources/admin/classes/domain/Downtime.php
Original file line number Diff line number Diff line change
@@ -64,7 +64,7 @@ public function getDowntimeTypesArray() {
$result = $this->db->processQuery($query, "assoc");
$names = array();

if (is_array($result[0])) {
if (isset($result[0]) && is_array($result[0])) {
foreach ($result as $name) {
array_push($names, $name);
}
8 changes: 4 additions & 4 deletions resources/ajax_forms/getNewDowntimeForm.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
$util = new utility();

$organizationID = $_GET["organizationID"];
$organizationID = isset($_GET["organizationID"]) ? $_GET["organizationID"] : NULL;

$resourceID = $_GET["resourceID"];
$issueID = $_GET['issueID'];
$resourceID = isset($_GET["resourceID"]) ? $_GET["resourceID"] : NULL;
$issueID = isset($_GET['issueID']) ? $_GET['issueID'] : NULL;

$resource = new Resource(new NamedArguments(array('primaryKey' => $resourceID)));

@@ -94,7 +94,7 @@
<select class="downtimeType" name="downtimeType">
<?php
foreach ($downtimeTypeNames as $downtimeType) {
echo "<option value=".$downtimeType["downtimeTypeID"].">".$downtimeType["shortName"]."</option>";
echo "<option value=" . (isset($downtimeType['downtimeTypeID']) ? $downtimeType['downtimeTypeID'] : '') . ">" . (isset($downtimeType['shortName']) ? $downtimeType['shortName'] : '') . "</option>";
}
?>
</select>
2 changes: 1 addition & 1 deletion resources/ajax_forms/getUpdateProductForm.php
Original file line number Diff line number Diff line change
@@ -303,7 +303,7 @@
</td>

<td style='vertical-align:top;text-align:left;width:40px;'>
<a href='javascript:void();'><img src='images/cross.gif' alt="<?php echo _("remove organization");?>" title='<?php echo _("remove ").$resourceOrganization['shortName']._("organization"); ?>' class='remove' /></a>
<a href='javascript:void();'><img src='images/cross.gif' alt="<?php echo _("remove organization");?>" title="<?php echo _("remove organization");?>" class='remove' /></a>
</td>

</tr>
62 changes: 31 additions & 31 deletions resources/index.php
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@
if (CoralSession::get('ref_script') != "resource.php"){
Resource::resetSearch();
}
CoralSession::set('ref_script', $currentPage);
CoralSession::set('ref_script', $currentPage = '');
$search = Resource::getSearch();

//print header
@@ -46,7 +46,7 @@
<form method="get" action="ajax_htmldata.php?action=getSearchResources" id="resourceSearchForm">
<?php
foreach(array('orderBy','page','recordsPerPage','startWith') as $hidden) {
echo Html::hidden_search_field_tag($hidden, $search[$hidden]);
echo Html::hidden_search_field_tag($hidden, isset($search[$hidden]) ? $search[$hidden] : '' );
}
?>

@@ -66,7 +66,7 @@
<br />
<?php echo Html::text_search_field_tag('name', isset($search['name']) ? $search['name'] : '' ); ?>
<br />
<div id='div_searchName' style='<?php if (!$search['name']) echo "display:none;"; ?>margin-left:123px;'><input type='button' name='btn_searchName' value='<?php echo _("go!");?>' class='searchButton' /></div>
<div id='div_searchName' style='<?php if (!isset($search['name'])) echo "display:none;"; ?>margin-left:123px;'><input type='button' name='btn_searchName' value='<?php echo _("go!");?>' class='searchButton' /></div>
</td>
</tr>

@@ -77,7 +77,7 @@
<br />
<?php echo Html::text_search_field_tag('resourceISBNOrISSN', isset($search['resourceISBNOrISSN']) ? $search['resourceISBNOrISSN'] : ''); ?>
<br />
<div id='div_searchISBNOrISSN' style='<?php if (!$search['resourceISBNOrISSN']) echo "display:none;"; ?>margin-left:123px;'><input type='button' name='btn_searchResourceISBNOrISSN' value='<?php echo _("go!");?>' class='searchButton' /></div>
<div id='div_searchISBNOrISSN' style='<?php if (!isset($search['resourceISBNOrISSN'])) echo "display:none;"; ?>margin-left:123px;'><input type='button' name='btn_searchResourceISBNOrISSN' value='<?php echo _("go!");?>' class='searchButton' /></div>
</td>
</tr>

@@ -89,7 +89,7 @@
<select name='search[fund]' id='searchFund' style='width:150px' class ='changeInput'>
<option value=''><?php echo _("All");?></option>
<?php
if ($search['fund'] == "none"){
if (isset($search['fund']) && $search['fund'] == "none"){
echo "<option value='none' selected>" . _("(none)") . "</option>";
}else{
echo "<option value='none'>" . _("(none)") . "</option>";
@@ -122,7 +122,7 @@
$acquisitionType = new AcquisitionType();

foreach($acquisitionType->allAsArray() as $display) {
if ($search['acquisitionTypeID'] == $display['acquisitionTypeID']) {
if (isset($search['acquisitionTypeID']) && $search['acquisitionTypeID'] == $display['acquisitionTypeID']) {
echo "<option value='" . $display['acquisitionTypeID'] . "' selected>" . $display['shortName'] . "</option>";
}else{
echo "<option value='" . $display['acquisitionTypeID'] . "'>" . $display['shortName'] . "</option>";
@@ -147,7 +147,7 @@
foreach($status->allAsArray() as $display) {
//exclude saved status
if (strtoupper($display['shortName']) != 'SAVED'){
if ($search['statusID'] == $display['statusID']){
if (isset($search['statusID']) && $search['statusID'] == $display['statusID']){
echo "<option value='" . $display['statusID'] . "' selected>" . $display['shortName'] . "</option>";
}else{
echo "<option value='" . $display['statusID'] . "'>" . $display['shortName'] . "</option>";
@@ -183,7 +183,7 @@
$name = $display['loginID'];
}

if ($search['creatorLoginID'] == $display['loginID']){
if (isset($search['creatorLoginID']) && $search['creatorLoginID'] == $display['loginID']){
echo "<option value='" . $display['loginID'] . "' selected>" . $name . "</option>";
}else{
echo "<option value='" . $display['loginID'] . "'>" . $name . "</option>";
@@ -208,7 +208,7 @@
$resourceFormat = new ResourceFormat();

foreach($resourceFormat->allAsArray() as $display) {
if ($search['resourceFormatID'] == $display['resourceFormatID']){
if (isset($search['resourceFormatID']) && $search['resourceFormatID'] == $display['resourceFormatID']){
echo "<option value='" . $display['resourceFormatID'] . "' selected>" . $display['shortName'] . "</option>";
}else{
echo "<option value='" . $display['resourceFormatID'] . "'>" . $display['shortName'] . "</option>";
@@ -229,7 +229,7 @@

<?php

if ($search['resourceTypeID'] == "none"){
if (isset($search['resourceTypeID']) && $search['resourceTypeID'] == "none"){
echo "<option value='none' selected>"._("(none)")."</option>";
}else{
echo "<option value='none'>"._("(none)")."</option>";
@@ -240,7 +240,7 @@
$resourceType = new ResourceType();

foreach($resourceType->allAsArray() as $display) {
if ($search['resourceTypeID'] == $display['resourceTypeID']){
if (isset($search['resourceTypeID']) && $search['resourceTypeID'] == $display['resourceTypeID']){
echo "<option value='" . $display['resourceTypeID'] . "' selected>" . $display['shortName'] . "</option>";
}else{
echo "<option value='" . $display['resourceTypeID'] . "'>" . $display['shortName'] . "</option>";
@@ -261,7 +261,7 @@

<?php

if ($search['generalSubjectID'] == "none"){
if (isset($search['generalSubjectID']) && $search['generalSubjectID'] == "none"){
echo "<option value='none' selected>"._("(none)")."</option>";
}else{
echo "<option value='none'>"._("(none)")."</option>";
@@ -272,7 +272,7 @@
$generalSubject = new GeneralSubject();

foreach($generalSubject->allAsArray() as $display) {
if ($search['generalSubjectID'] == $display['generalSubjectID']){
if (isset($search['generalSubjectID']) && $search['generalSubjectID'] == $display['generalSubjectID']){
echo "<option value='" . $display['generalSubjectID'] . "' selected>" . $display['shortName'] . "</option>";
}else{
echo "<option value='" . $display['generalSubjectID'] . "'>" . $display['shortName'] . "</option>";
@@ -292,7 +292,7 @@

<?php

if ($search['detailedSubjectID'] == "none"){
if (isset($search['detailedSubjectID']) && $search['detailedSubjectID'] == "none"){
echo "<option value='none' selected>"._("(none)")."</option>";
}else{
echo "<option value='none'>"._("(none)")."</option>";
@@ -353,7 +353,7 @@
<option value=''><?php echo _("All");?></option>
<?php

if ($search['noteTypeID'] == "none") {
if (isset($search['noteTypeID']) && $search['noteTypeID'] == "none") {
echo "<option value='none' selected>"._("(none)")."</option>";
}else{
echo "<option value='none'>"._("(none)")."</option>";
@@ -363,7 +363,7 @@
$noteType = new NoteType();

foreach($noteType->allAsArray() as $display) {
if ($search['noteTypeID'] == $display['noteTypeID']) {
if (isset($search['noteTypeID']) && $search['noteTypeID'] == $display['noteTypeID']) {
echo "<option value='" . $display['noteTypeID'] . "' selected>" . $display['shortName'] . "</option>";
}else{
echo "<option value='" . $display['noteTypeID'] . "'>" . $display['shortName'] . "</option>";
@@ -379,9 +379,9 @@
<tr>
<td class='searchRow'><label for='searchResourceNote'><b><?php echo _("Note (contains)");?></b></label>
<br />
<?php echo Html::text_search_field_tag('resourceNote', $search['resourceNote']); ?>
<?php echo Html::text_search_field_tag('resourceNote', isset($search['resourceNote']) ? $search['resourceNote'] : ''); ?>
<br />
<div id='div_searchResourceNote' style='<?php if (!$search['resourceNote']) echo "display:none;"; ?>margin-left:123px;'><input type='button' name='btn_searchResourceNote' value='<?php echo _("go!");?>' class='searchButton' /></div>
<div id='div_searchResourceNote' style='<?php if (!isset($search['resourceNote'])) echo "display:none;"; ?>margin-left:123px;'><input type='button' name='btn_searchResourceNote' value='<?php echo _("go!");?>' class='searchButton' /></div>
</td>
</tr>

@@ -390,13 +390,13 @@

<tr>
<td class='searchRow'><label for='createDate'><b><?php echo _("Date Created Between");?></b></label><br />
<?php echo Html::text_search_field_tag('createDateStart', $search['createDateStart'], array('class' => 'date-pick', 'width' => '65px')); ?>
<?php echo Html::text_search_field_tag('createDateStart', isset($search['createDateStart']) ? $search['createDateStart'] : '', array('class' => 'date-pick', 'width' => '65px')); ?>
&nbsp;&nbsp;<b><?php echo _("and");?></b>
</td>
</tr>
<tr>
<td style="border-top:0px;padding-top:0px;">
<?php echo Html::text_search_field_tag('createDateEnd', $search['createDateEnd'], array('class' => 'date-pick', 'width' => '65px')); ?>
<?php echo Html::text_search_field_tag('createDateEnd', isset($search['createDateEnd']) ? $search['createDateEnd'] : '', array('class' => 'date-pick', 'width' => '65px')); ?>
<br />
<div id='div_searchCreateDate' style='display:none;'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type='button' class='searchButton' value='<?php echo _("go!");?>' /></div>
</td>
@@ -411,7 +411,7 @@
<option value=''><?php echo _("All");?></option>
<?php

if ($search['purchaseSiteID'] == "none"){
if (isset($search['purchaseSiteID']) && $search['purchaseSiteID'] == "none"){
echo "<option value='none' selected>"._("(none)")."</option>";
}else{
echo "<option value='none'>"._("(none)")."</option>";
@@ -421,7 +421,7 @@
$purchaseSite = new PurchaseSite();

foreach($purchaseSite->allAsArray() as $display) {
if ($search['purchaseSiteID'] == $display['purchaseSiteID']){
if (isset($search['purchaseSiteID']) && $search['purchaseSiteID'] == $display['purchaseSiteID']){
echo "<option value='" . $display['purchaseSiteID'] . "' selected>" . $display['shortName'] . "</option>";
}else{
echo "<option value='" . $display['purchaseSiteID'] . "'>" . $display['shortName'] . "</option>";
@@ -443,7 +443,7 @@
<option value=''><?php echo _("All");?></option>
<?php

if ($search['authorizedSiteID'] == "none") {
if (isset($search['authorizedSiteID']) && $search['authorizedSiteID'] == "none") {
echo "<option value='none' selected>"._("(none)")."</option>";
}else{
echo "<option value='none'>"._("(none)")."</option>";
@@ -453,7 +453,7 @@
$authorizedSite = new AuthorizedSite();

foreach($authorizedSite->allAsArray() as $display) {
if ($search['authorizedSiteID'] == $display['authorizedSiteID']){
if (isset($search['authorizedSiteID']) && $search['authorizedSiteID'] == $display['authorizedSiteID']){
echo "<option value='" . $display['authorizedSiteID'] . "' selected>" . $display['shortName'] . "</option>";
}else{
echo "<option value='" . $display['authorizedSiteID'] . "'>" . $display['shortName'] . "</option>";
@@ -475,7 +475,7 @@
<option value=''><?php echo _("All");?></option>
<?php

if ($search['administeringSiteID'] == "none") {
if (isset($search['administeringSiteID']) && $search['administeringSiteID'] == "none") {
echo "<option value='none' selected>"._("(none)")."</option>";
}else{
echo "<option value='none'>"._("(none)")."</option>";
@@ -485,7 +485,7 @@
$administeringSite = new AdministeringSite();

foreach($administeringSite->allAsArray() as $display) {
if ($search['administeringSiteID'] == $display['administeringSiteID']) {
if (isset($search['administeringSiteID']) && $search['administeringSiteID'] == $display['administeringSiteID']) {
echo "<option value='" . $display['administeringSiteID'] . "' selected>" . $display['shortName'] . "</option>";
}else{
echo "<option value='" . $display['administeringSiteID'] . "'>" . $display['shortName'] . "</option>";
@@ -505,7 +505,7 @@
<option value=''><?php echo _("All");?></option>
<?php

if ($search['authenticationTypeID'] == "none") {
if (isset($search['authenticationTypeID']) && $search['authenticationTypeID'] == "none") {
echo "<option value='none' selected>"._("(none)")."</option>";
}else{
echo "<option value='none'>"._("(none)")."</option>";
@@ -516,7 +516,7 @@
$authenticationType = new AuthenticationType();

foreach($authenticationType->allAsArray() as $display) {
if ($search['authenticationTypeID'] == $display['authenticationTypeID']) {
if (isset($search['authenticationTypeID']) && $search['authenticationTypeID'] == $display['authenticationTypeID']) {
echo "<option value='" . $display['authenticationTypeID'] . "' selected>" . $display['shortName'] . "</option>";
}else{
echo "<option value='" . $display['authenticationTypeID'] . "'>" . $display['shortName'] . "</option>";
@@ -534,7 +534,7 @@
<select name='search[catalogingStatusID]' id='searchCatalogingStatusID' style='width:150px'>
<option value=''><?php echo _("All");?></option>
<?php
if ($search['catalogingStatusID'] == "none") {
if (isset($search['catalogingStatusID']) && $search['catalogingStatusID'] == "none") {
echo "<option value='none' selected>"._("(none)")."</option>";
}else{
echo "<option value='none'>"._("(none)")."</option>";
@@ -543,7 +543,7 @@
$catalogingStatus = new CatalogingStatus();

foreach($catalogingStatus->allAsArray() as $status) {
if ($search['catalogingStatusID'] == $status['catalogingStatusID']) {
if (isset($search['catalogingStatusID']) && $search['catalogingStatusID'] == $status['catalogingStatusID']) {
echo "<option value='" . $status['catalogingStatusID'] . "' selected>" . $status['shortName'] . "</option>";
}else{
echo "<option value='" . $status['catalogingStatusID'] . "'>" . $status['shortName'] . "</option>";
@@ -565,7 +565,7 @@
$stepNames = $step->allStepNames();

foreach($stepNames as $stepName) {
if ($search['stepName'] == $stepName) {
if (isset($search['stepName']) && $search['stepName'] == $stepName) {
$stepSelected = " selected";
} else {
$stepSelected = false;
2 changes: 1 addition & 1 deletion resources/queue.php
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@


//set referring page
CoralSession::set('ref_script', $currentPage);
CoralSession::set('ref_script', $currentPage = '');

$pageTitle=_('My Queue');
include 'templates/header.php';
4 changes: 2 additions & 2 deletions resources/resource.php
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@
if ((isset($_GET['ref'])) && ($_GET['ref'] == 'new')){
CoralSession::set('ref_script', 'new');
}else{
CoralSession::set('ref_script', $currentPage);
CoralSession::set('ref_script', $currentPage = '');
}

//set this to turn off displaying the title header in header.php
@@ -49,7 +49,7 @@

<div style='vertical-align:top; width:100%; height:35px; margin-left:5px;padding:0;'>
<span class="headerText" id='span_resourceName' style='float:left;vertical-align:text-top;'><?php echo $resource->titleText; ?>&nbsp;</span>
<div id='div_new' style='float:left;vertical-align:bottom;font-weight:115%;margin-top:3px;' class='darkRedText'><?php if ($_GET['ref'] == 'new'){ ?>&nbsp;&nbsp;<img src='images/red_checkmark.gif' />
<div id='div_new' style='float:left;vertical-align:bottom;font-weight:115%;margin-top:3px;' class='darkRedText'><?php if (isset($_GET['ref']) && $_GET['ref'] == 'new'){ ?>&nbsp;&nbsp;<img src='images/red_checkmark.gif' />
<span class='boldText'><?php echo _("Success!");?></span>&nbsp;&nbsp;<?php echo _("New resource added"); } ?>
</div>
</div>