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.

Sign up for GitHub

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

Issue #485: Strip all namespaces from SUSHI responses #609

Closed
wants to merge 54 commits into from
Closed

Issue #485: Strip all namespaces from SUSHI responses #609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
3afce21
Create LICENSE.md
ialford Dec 11, 2018
7640a6e
Reset development footer to 'DEVELOPMENT'
jeffnm Feb 14, 2019
2a00ee2
Merge pull request #540 from jeffnm/release_prep_3_0_1
jeffnm Feb 14, 2019
50b8089
Issue 360: PHP 7.2 compatibility
Feb 20, 2019
86798b7
Issue 360: PHP 7.2 compatibility
Feb 20, 2019
e193331
Issue 360: PHP 7.2 compatibility
veggiematts Feb 20, 2019
942be82
Revert "Update footer in preparation for release."
Feb 20, 2019
91cac09
The issue 387 proposed to add icons replacing the 'add' links when th…
Feb 27, 2019
01d57a5
add css class : div.ImportElement, div.addElement, div.adminHeader
Feb 28, 2019
1b61b76
Adding icons : add, update, edit, remove in organization, resources, …
Mar 1, 2019
5c9ccd7
Escape "import configuration saved" message
veggiematts Mar 4, 2019
b0e9009
Merge pull request #545 from biblibre/fix_save_mapping_message
veggiematts Mar 4, 2019
16ab20d
Icon align modifications in licensing, organizations and resources aj…
Mar 4, 2019
c7f9f80
The issue 387 asks to replace links by icons especially in the tables…
Mar 4, 2019
779b673
The issue 387 asks to replace links by icons especially in the tables…
Malmousque Mar 4, 2019
971e91d
The issue 387 asks to replace links by icons especially in the tables…
Malmousque Mar 5, 2019
3f625e8
Fix bugs : some icons was inactives in resource module. Adding icones…
Malmousque Mar 6, 2019
60fc3b7
Fix translation, typo and misplacing mentionned in PR, there is stil…
Malmousque Mar 7, 2019
d022591
Fix translation issue in licensing/js/admin.js and misplaced line in …
Malmousque Mar 7, 2019
874507a
Issue 552: Add missing field ilsID.
veggiematts Mar 12, 2019
f908dc7
556, make Authorized Sites compatible with multiple ordering
t4k Mar 12, 2019
9039c9f
Merge pull request #557 from caltechlibrary/556-resources-authorized-…
veggiematts Mar 13, 2019
6f1d1d1
Issue 375: SUSHI server registry link
vinny75 Mar 13, 2019
145adde
Issue 480 COUNTER Release 3 for Sushi
vinny75 Mar 13, 2019
48c8bed
Issue 480 COUNTER Release 3 for Sushi
vinny75 Mar 13, 2019
3450161
Issue 525 report.php: typos in CSS definition
vinny75 Mar 14, 2019
37c10f0
Merge pull request #560 from vinny75/vinny75-issue-525
veggiematts Mar 14, 2019
c22c091
In the ressource module the add icon appearsnext to the headings and …
Malmousque Mar 14, 2019
b330b2b
Merge pull request #559 from vinny75/vinny75-issue-375
veggiematts Mar 14, 2019
7b7945c
The 'add an email' and the 'add day' text in alert settings ressource…
Malmousque Mar 14, 2019
f2e8970
Issue 508: Misleading error message when importing
vinny75 Mar 18, 2019
44c9925
Issue 508: Misleading error message when importing
vinny75 Mar 18, 2019
fc48a3e
Remplacing the 'Update' by 'Edit' as well as corresponding icons, ico…
Malmousque Mar 28, 2019
a589926
New 'import fund' icon in resources -admin
Malmousque Mar 29, 2019
24a739e
Change 'import fund' black icon to color
Malmousque Mar 29, 2019
9bd7dba
delete icons .svg and blue
Malmousque Mar 29, 2019
b678414
Change the 'Upload' title of pop up windows into 'Edit', harmonizatio…
Malmousque Mar 29, 2019
ae0583e
Revert "Update footer in preparation for release."
Malmousque Apr 1, 2019
4a2bfb4
Merge pull request #546 from biblibre/issue_387_remplacingLinksByIcons
veggiematts Apr 3, 2019
240def3
ILS Connection: use a dropdown list when searching an ILS vendor
veggiematts Apr 12, 2019
9d1b8fa
ILS Connection: use a dropdown list when searching an ILS vendor
veggiematts Apr 12, 2019
1d97d48
Merge pull request #553 from biblibre/Issue_552_Add_missing_field_ilsID
veggiematts Apr 17, 2019
ad0cfb4
Merge pull request #577 from biblibre/dropdown_for_ils_vendors
veggiematts Apr 17, 2019
13ada0f
Merge pull request #562 from vinny75/vinny75-issue508
veggiematts Apr 18, 2019
3ffc5a8
Issue 508: Misleading error message when importing usage statistics
veggiematts Apr 18, 2019
bc11cbe
Merge pull request #580 from biblibre/Issue_508
veggiematts Apr 18, 2019
56d1b4c
Merge pull request #541 from biblibre/Issue_360_php_compat
jeffnm Apr 22, 2019
ba20e83
Issue 581: Specify datepickers date format in common/configuration.ini
veggiematts Apr 25, 2019
26e8fce
Merge pull request #582 from biblibre/Issue_581_datepicker_date_format
jeffnm Apr 29, 2019
a76a2e9
Merge pull request #517 from ialford/patch-1
jeffnm May 7, 2019
70e8211
Merge pull request #564 from vinny75/vinny75-issue-480
jeffnm May 7, 2019
4544ebd
Fix merge issue from PR 577: ILS Connection: use a dropdown list when…
veggiematts May 15, 2019
356e936
[wip]
queryluke May 22, 2019
087f2dc
new stripNamespaces function
queryluke May 22, 2019
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
635 changes: 635 additions & 0 deletions LICENSE.md
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion auth/admin/classes/common/Object.php → auth/admin/classes/common/Base_Object.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/


class Object {
class Base_Object {

public function __construct(NamedArguments $arguments = NULL) {
if (method_exists($this, 'init')) {
Expand Down
2 changes: 1 addition & 1 deletion auth/admin/classes/common/DBService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/


class DBService extends Object {
class DBService extends Base_Object {

protected $db;
protected $config;
Expand Down
2 changes: 1 addition & 1 deletion auth/admin/classes/common/DynamicObject.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/


class DynamicObject extends Object {
class DynamicObject extends Base_Object {

protected $properties = array();

Expand Down
2 changes: 1 addition & 1 deletion auth/admin/classes/common/Email.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public function text() {
}


class Email extends Object {
class Email extends Base_Object {

protected $to;
protected $subject;
Expand Down
2 changes: 1 addition & 1 deletion common/Object.php → common/Base_Object.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/


class Object {
class Base_Object {

public function __construct(NamedArguments $arguments = NULL) {
if (method_exists($this, 'init')) {
Expand Down
4 changes: 2 additions & 2 deletions common/DBService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
* *************************************************************************************************************************
*/

require_once "common/Object.php";
require_once "common/Base_Object.php";
require_once "common/Config.php";
class DBService extends Object {
class DBService extends Base_Object {
const ERR_COULD_NOT_SELECT_DATABASE = 10040;
const ERR_COULD_NOT_CONNECT = 10041;
const ERR_ACCESS_DENIED = 10042;
Expand Down
11 changes: 11 additions & 0 deletions common/common_directory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,17 @@ function return_date_format() {
return $date_format;
}

function return_datepicker_date_format() {
$config = new Configuration();
$config_date_format = $config->settings->datepicker_date_format;
if (isset($config_date_format) && $config_date_format != '') {
$date_format = $config_date_format;
} else {
$date_format = "mm/dd/yyyy";
}
return $date_format;
}

function format_date($mysqlDate) {

//see http://php.net/manual/en/function.date.php for options
Expand Down
Binary file added css/indicator.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/cross.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion js/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@

//Required for date picker
Date.firstDayOfWeek = 0;
Date.format = 'mm/dd/yyyy';


// 1 visible, 0 hidden
Expand Down
28 changes: 13 additions & 15 deletions licensing/admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@

<table class="headerTable">
<tr><td>
<span class="headerText"><?php echo _("Users");?></span>&nbsp;&nbsp;<span id='span_User_response' class='redText'></span>
<br /><span id='span_newUser' class='adminAddInput'><a href='ajax_forms.php?action=getAdminUserUpdateForm&height=202&width=288&modal=true' class='thickbox' id='expression'><?php echo _("add new user");?></a></span>


<span class="headerText"><?php echo _("Users");?></span>&nbsp;&nbsp;<span id='span_User_response' class='redText'></span><span id='span_newUser' class='adminAddInput'><?php echo "<a href='ajax_forms.php?action=getAdminUserUpdateForm&height=202&width=288&modal=true' class='thickbox' id='expression'><img id='addUser class='AdminAddIcon' src='images/plus.gif' title='"._("add User")."' /></a>";?></span>

<br /><br />
<div id='div_User'>
<img src = "images/circle.gif"><?php echo _("Loading...");?>
Expand All @@ -49,8 +51,7 @@

<table class="headerTable">
<tr><td>
<span class="headerText"><?php echo _("Document Types");?></span>&nbsp;&nbsp;<span id='span_DocumentType_response'></span>
<br /><span id='span_newDocumentType' class='adminAddInput'><a href='javascript:showAdd("DocumentType");'><?php echo _("add new document type");?></a></span>
<span class="headerText"><?php echo _("Document Types");?></span>&nbsp;&nbsp;<span id='span_DocumentType_response'></span><span id='span_newDocumentType' class='adminAddInput'><a href='javascript:showAdd("DocumentType");'><?php echo "<img id='addDocument' class='AdminAddIcon' src='images/plus.gif' title='"._("add document type")."' />";?></a></span>
<br /><br />
<div id='div_DocumentType'>
<img src = "images/circle.gif"><?php echo _("Loading...");?>
Expand All @@ -63,8 +64,8 @@

<table class="headerTable">
<tr><td>
<span class="headerText"><?php echo _("Expression Types");?></span>&nbsp;&nbsp;<span id='span_ExpressionType_response'></span>
<br /><span id='span_newExpressionType' class='adminAddInput'><a href='ajax_forms.php?action=getExpressionTypeForm&height=148&width=265&modal=true' class='thickbox' id='expressionType'><?php echo _("add new expression type");?></a></span>
<span class="headerText"><?php echo _("Expression Types");?></span>&nbsp;&nbsp;<span id='span_ExpressionType_response'></span><span id='span_newExpressionType' class='adminAddInput'><a href='ajax_forms.php?action=getExpressionTypeForm&height=148&width=265&modal=true' class='thickbox' id='expressionType'><?php echo "<img id='addExpressionType' src='images/plus.gif' title='"._("add expression type")."' />";?></a></span>

<br /><br />
<div id='div_ExpressionType'>
<img src = "images/circle.gif"><?php echo _("Loading...");?>
Expand All @@ -76,8 +77,8 @@
<br />
<table class="headerTable">
<tr><td>
<span class="headerText"><?php echo _("Qualifiers");?></span>&nbsp;&nbsp;<span id='span_Qualifier_response'></span>
<br /><span id='span_newQualifier' class='adminAddInput'><a href='ajax_forms.php?action=getQualifierForm&height=148&width=295&modal=true' class='thickbox'><?php echo _("add new qualifier");?></a></span>
<span class="headerText"><?php echo _("Qualifiers");?></span>&nbsp;&nbsp;<span id='span_Qualifier_response'></span><span id='span_newQualifier' class='adminAddInput'><a href='ajax_forms.php?action=getQualifierForm&height=148&width=295&modal=true' class='thickbox'><?php echo "<img id='addQualifier' src='images/plus.gif' title='"._("add qualifier")."' />";?></a></span>

<br /><br />
<div id='div_Qualifier'>
<img src = "images/circle.gif"><?php echo _("Loading...");?>
Expand All @@ -90,8 +91,7 @@

<table class="headerTable">
<tr><td>
<span class="headerText"><?php echo _("Signature Types");?></span>&nbsp;&nbsp;<span id='span_SignatureType_response'></span>
<br /><span id='span_newSignatureType' class='adminAddInput'><a href='javascript:showAdd("SignatureType");'><?php echo _("add new signature type");?></a></span>
<span class="headerText"><?php echo _("Signature Types");?></span>&nbsp;&nbsp;<span id='span_SignatureType_response'></span><span id='span_newSignatureType' class='adminAddInput'><a href='javascript:showAdd("SignatureType");'><?php echo "<img id='addSignature' src='images/plus.gif' title='"._("add signature")."' />";?></a></span>
<br /><br />
<div id='div_SignatureType'>
<img src = "images/circle.gif"><?php echo _("Loading...");?>
Expand All @@ -105,8 +105,7 @@

<table class="headerTable">
<tr><td>
<span class="headerText"><?php echo _("License Statuses");?></span>&nbsp;&nbsp;<span id='span_Status_response'></span>
<br /><span id='span_newStatus' class='adminAddInput'><a href='javascript:showAdd("Status");'><?php echo _("add new license status");?></a></span>
<span class="headerText"><?php echo _("License Statuses");?></span>&nbsp;&nbsp;<span id='span_Status_response'></span><span id='span_newStatus' class='adminAddInput'><a href='javascript:showAdd("Status");'><?php echo "<img id='addLicenseStatuses' src='images/plus.gif' title='"._("add License statuses")."' />";?></a></span>
<br /><br />
<div id='div_Status'>
<img src = "images/circle.gif"><?php echo _("Loading...");?>
Expand Down Expand Up @@ -147,7 +146,7 @@
<table class="headerTable">
<tr><td>
<span class="headerText"><?php echo _("Consortia");?></span>&nbsp;&nbsp;<span id='span_Consortium_response'></span>
<br /><span id='span_newConsortium' class='adminAddInput'><a href='javascript:showAdd("Consortium");'><?php echo _("add new consortium");?></a></span>
<br /><span id='span_newConsortium' class='adminAddInput'><a href='javascript:showAdd("Consortium");'><?php echo _("add consortium");?></a></span>
<br /><br />
<div id='div_Consortium'>
<img src = "images/circle.gif"><?php echo _("Loading...");?>
Expand All @@ -161,7 +160,7 @@
<table class="headerTable">
<tr><td>
<span class="headerText"><?php echo _("Providers");?></span>&nbsp;&nbsp;<span id='span_Organization_response'></span>
<br /><span id='span_newOrganization' class='adminAddInput'><a href='javascript:showAdd("Organization");'><?php echo _("add new provider");?></a></span>
<br /><span id='span_newOrganization' class='adminAddInput'><a href='javascript:showAdd("Organization");'><?php echo _("add provider");?></a></span>
<br /><br />
<div id='div_Organization'>
<img src = "images/circle.gif"><?php echo _("Loading...");?>
Expand All @@ -182,4 +181,3 @@

include 'templates/footer.php';
?>

2 changes: 1 addition & 1 deletion licensing/admin/classes/common/Object.php → ...sing/admin/classes/common/Base_Object.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/


class Object {
class Base_Object {

public function __construct(NamedArguments $arguments = NULL) {
if (method_exists($this, 'init')) {
Expand Down
2 changes: 1 addition & 1 deletion licensing/admin/classes/common/DBService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@



class DBService extends Object {
class DBService extends Base_Object {

protected $db;
protected $config;
Expand Down
2 changes: 1 addition & 1 deletion licensing/admin/classes/common/DynamicObject.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/


class DynamicObject extends Object {
class DynamicObject extends Base_Object {

protected $properties = array();

Expand Down
2 changes: 1 addition & 1 deletion licensing/admin/classes/common/Email.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public function text() {
}


class Email extends Object {
class Email extends Base_Object {

protected $to;
protected $subject;
Expand Down
26 changes: 13 additions & 13 deletions licensing/ajax_forms.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,17 +857,17 @@
<div id='div_updateForm'>
<table class="thickboxTable" style="width:400px;">
<tr>
<td colspan='3'><span class='headerText'><?php echo _("Update");?></span><br /><span id='span_errors' style='color:#F00;'></span><br /></td>
<td colspan='3'><span class='headerText'><?php echo _("Edit");?></span><br /><span id='span_errors' style='color:#F00;'></span><br /></td>
</tr>
<tr>
<td>
<?php
echo "<input type='text' id='updateVal' name='updateVal' value='" . $instance->shortName . "' style='width:190px;'/></td><td><a href='javascript:updateData(\"" . $className . "\", \"" . $updateID . "\");' id='updateButton' class='submit-button'>"._("update")."</a>";
echo "<input type='text' id='updateVal' name='updateVal' value='" . $instance->shortName . "' style='width:190px;'/></td><td><a href='javascript:updateData(\"" . $className . "\", \"" . $updateID . "\");' id='updateButton' class='submit-button'>"._("Edit")."</a>";
?>


</td>
<td><a href='#' onclick='window.parent.tb_remove(); return false' class='cancel-button'><?php echo _("close");?></a></td>
<td><a href='#' onclick='window.parent.tb_remove(); return false' class='cancel-button'><?php echo _("Close");?></a></td>
</tr>
</table>
</div>
Expand Down Expand Up @@ -896,10 +896,10 @@
if (isset($_GET['loginID'])) $loginID = $_GET['loginID']; else $loginID = '';

if ($loginID != ''){
$update=_('Update');
$update=_('Edit');
$updateUser = new User(new NamedArguments(array('primaryKey' => $loginID)));
}else{
$update=_('Add New');
$update=_('Add');
}

$util = new Utility();
Expand Down Expand Up @@ -960,7 +960,7 @@

<tr style="vertical-align:middle;">
<td colspan='2' style="width:60px;"><input type='button' value='<?php echo $update; ?>' onclick='javascript:window.parent.submitUserData("<?php echo $loginID; ?>");' class='submit-button'></td>
<td><input type='button' value="<?php echo _("cancel");?>" onclick="window.parent.tb_remove(); return false" id='update-user-cancel' class='cancel-button'></td>
<td><input type='button' value="<?php echo _("Close");?>" onclick="window.parent.tb_remove(); return false" id='update-user-cancel' class='cancel-button'></td>
</tr>

</table>
Expand All @@ -979,10 +979,10 @@
if (isset($_GET['expressionTypeID'])) $expressionTypeID = $_GET['expressionTypeID']; else $expressionTypeID = '';

if ($expressionTypeID){
$update=_('Update');
$update=_('Edit');
$expressionType = new ExpressionType(new NamedArguments(array('primaryKey' => $expressionTypeID)));
}else{
$update=_('Add New');
$update=_('Add');
}


Expand All @@ -1006,7 +1006,7 @@

<tr>
<td style="width:60px;"><input type='button' value='<?php echo $update; ?>' onclick='javascript:window.parent.submitExpressionType();' id='update-expression-type' class='submit-button'></td>
<td><input type='button' value='<?php echo _("cancel");?>' onclick="window.parent.tb_remove(); return false;" id='cancel-expression-type' class='cancel-button'></td>
<td><input type='button' value='<?php echo _("Close");?>' onclick="window.parent.tb_remove(); return false;" id='cancel-expression-type' class='cancel-button'></td>
</tr>
</table>
</div>
Expand Down Expand Up @@ -1114,7 +1114,7 @@

<tr>
<td style="width:60px;"><input type='button' value='<?php echo $update; ?>' onclick='javascript:window.parent.submitCalendarSettings();' class='submit-button'></td>
<td><input type='button' value='<?php echo _("cancel");?>' onclick="window.parent.tb_remove(); return false" class='cancel-button'></td>
<td><input type='button' value='<?php echo _("Close");?>' onclick="window.parent.tb_remove(); return false" class='cancel-button'></td>
</tr>
</table>
</div>
Expand All @@ -1130,10 +1130,10 @@
if (isset($_GET['qualifierID'])) $qualifierID = $_GET['qualifierID']; else $qualifierID = '';

if ($qualifierID){
$update=_('Update');
$update=_('Edit');
$qualifier = new Qualifier(new NamedArguments(array('primaryKey' => $qualifierID)));
}else{
$update=_('Add New');
$update=_('Add');
}


Expand Down Expand Up @@ -1168,7 +1168,7 @@

<tr>
<td style="width:60px;"><input type='button' value='<?php echo $update; ?>' onclick='javascript:window.parent.submitQualifier();' id='submitQualifier' class='submit-button'></td>
<td><input type='button' value='<?php echo _("cancel");?>' onclick="window.parent.tb_remove(); return false" class='cancel-button'></td>
<td><input type='button' value='<?php echo _("Close");?>' onclick="window.parent.tb_remove(); return false" class='cancel-button'></td>
</tr>
</table>
</div>
Expand Down
Loading