Skip to content

Commit 89f65e6

Browse files
mmabrahamsonmmabrahamson
committed
Pulling updates from 20.05 for https
2 parents 8c2f534 + b7f2f58 commit 89f65e6

10 files changed

Lines changed: 33 additions & 33 deletions

File tree

‎Apps/itemmatch/app_itemmatch.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

2-
jQuery('.table-striped').before('<div id="resultListControl"></div>');
3-
jQuery('body').append('<link rel="stylesheet" type="text/css" href="http://gss.ebscohost.com/alvet/Koha/recom.css">');
2+
jQuery('.table-striped').before('<div id="resultListControl"></div>');
3+
jQuery('body').append('<link rel="stylesheet" type="text/css" href="https://widgets.ebscohost.com/prod/simplekey/recom/koha/recom.css">');
44

5-
jQuery.getScript('http://widgets.ebscohost.com/prod/simplekey/recom/recom.js', function (data, textStatus, jqxhr) {
6-
Recommender(jQuery('#translControl1').val(), 'en', 'https://gss.ebscohost.com/alvet/Koha/', 'json', 'placardb', '3', '1', '0', 'php');
7-
});
5+
jQuery.getScript('https://widgets.ebscohost.com/prod/simplekey/recom/recom.js', function (data, textStatus, jqxhr) {
6+
Recommender(jQuery('#translControl1').val(), 'en', 'https://widgets.ebscohost.com/prod/simplekey/recom/koha/', 'json', 'placardb', '3', '1', '0', 'php');
7+
});

‎Koha/Plugin/EDS.pm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ sub opac_js {
251251

252252

253253
sub PageURL{
254-
# http://stackoverflow.com/questions/3412280/how-do-i-obtain-the-current-url-in-perl
254+
# https://stackoverflow.com/questions/3412280/how-do-i-obtain-the-current-url-in-perl
255255
my $page_url = 'http';
256256
if ($ENV{HTTPS} == "on") {
257257
#$page_url .= "s";

‎Koha/Plugin/EDS/admin/configure.tt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/plugins/plugins-home.pl">Plugins</a> &rsaquo; EDS API &rsaquo; Configure</div>
1919

2020
<div id="doc3">
21-
<div align="right" style="float:right;width:170px"><a href="http://eadmin.ebscohost.com" target="_blank"><img src="http://eadmin.ebscohost.com/eadmin/images/lib/logoAdmin.gif" ></a>
22-
<p>Visit <a href="http://eadmin.ebscohost.com" target="_blank">EBSCO Admin</a> to configure the EDS API profile</p></div>
21+
<div align="right" style="float:right;width:170px"><a href="https://eadmin.ebscohost.com" target="_blank"><img src="https://eadmin.ebscohost.com/eadmin/images/lib/logoAdmin.gif" ></a>
22+
<p>Visit <a href="https://eadmin.ebscohost.com" target="_blank">EBSCO Admin</a> to configure the EDS API profile</p></div>
2323

2424
<!-- We can access our own plugins resource files using the PLUGIN_PATH variable. -->
25-
<a target="_blank" href="http://www.ebscohost.com/discovery"><img src="https://widgets.ebscohost.com/prod/api/koha/eds_logo.png" width="250" /></a>
25+
<a target="_blank" href="https://www.ebscohost.com/discovery"><img src="https://widgets.ebscohost.com/prod/api/koha/eds_logo.png" width="250" /></a>
2626
<h3>Koha: EDS API: Configure</h3>
2727
<!-- Notice our form here has no 'action', this is good, it means that our forms will always get passed back to 'plugins/run.pl'. You could hard code it instead if you prefer -->
2828
<form method="get">
@@ -84,7 +84,7 @@
8484
<td align="left" valign="top">
8585
<input name="catalogueanprefix" type="text" class="textbox" id="catalogueanprefix" value="[% catalogueanprefix %]">
8686
<small><p>Required if your catalogue is harvested through OAI-PMH or uploaded through FTP in MARC format. You can get this from the URL of a detailed record or permalink in EDS.<br>e.g.
87-
http://ehis.ebscohost.com/eds/detail?AN=prefval.530894. Enter prefval including period (dot) into the text field.</p></small>
87+
https://ehis.ebscohost.com/eds/detail?AN=prefval.530894. Enter prefval including period (dot) into the text field.</p></small>
8888
</td>
8989
</tr>
9090
<tr>
@@ -99,7 +99,7 @@
9999
<th align="left" valign="top" nowrap class="settingLabel" scope="row"> IP Addresses:</th>
100100
<td align="left" valign="top">
101101
[% IF iprange == '' %]<input name="iprange" type="text" class="textbox" id="iprange" value="">[% ELSE %]<input name="iprange" type="text" class="textbox" id="iprange" value="[% iprange %]">[% END %]
102-
<small>Authenticate into EDS using local IP by entering valid IPs seperated by comma(,) e.g. 127.0.0.1,127.0.0.2. To Enter a range; use the example format 100.0.0.0 - 200.79.255.255 <!-- http://stackoverflow.com/questions/24916371/how-do-i-check-if-an-ip-address-is-in-a-specific-range-in-perl -->(<a href="javascript:GetLocalIP();">Get Local IP</a>)</small>
102+
<small>Authenticate into EDS using local IP by entering valid IPs seperated by comma(,) e.g. 127.0.0.1,127.0.0.2. To Enter a range; use the example format 100.0.0.0 - 200.79.255.255 <!-- https://stackoverflow.com/questions/24916371/how-do-i-check-if-an-ip-address-is-in-a-specific-range-in-perl -->(<a href="javascript:GetLocalIP();">Get Local IP</a>)</small>
103103
</td>
104104
</tr>
105105
<tr>

‎Koha/Plugin/EDS/admin/setuptool.pl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ sub UpdateEDSPlugin{
148148
}
149149
}
150150
}
151-
# http://www.perlfect.com/articles/perlfile.shtml - PERL file operations
151+
# https://www.perlfect.com/articles/perlfile.shtml - PERL file operations
152152
#use Data::Dumper; die Dumper $PluginDir."/opac/.htaccess";
153153

154154
return $updateLog;

‎Koha/Plugin/EDS/admin/setuptool.tt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/plugins/plugins-home.pl">Plugins</a> &rsaquo; EDS API &rsaquo; Setup Tool</div>
2929

3030
<div id="doc3">
31-
<div align="right" style="float:right;width:170px"><a href="http://eadmin.ebscohost.com" target="_blank"><img src="http://eadmin.ebscohost.com/eadmin/images/lib/logoAdmin.gif" ></a>
32-
<p>Visit <a href="http://eadmin.ebscohost.com" target="_blank">EBSCO Admin</a> to configure the EDS API profile</p></div>
31+
<div align="right" style="float:right;width:170px"><a href="https://eadmin.ebscohost.com" target="_blank"><img src="https://eadmin.ebscohost.com/eadmin/images/lib/logoAdmin.gif" ></a>
32+
<p>Visit <a href="https://eadmin.ebscohost.com" target="_blank">EBSCO Admin</a> to configure the EDS API profile</p></div>
3333

34-
<a target="_blank" href="http://www.ebscohost.com/discovery"><img src="https://widgets.ebscohost.com/prod/api/koha/eds_logo.png" width="250" /></a>
34+
<a target="_blank" href="https://www.ebscohost.com/discovery"><img src="https://widgets.ebscohost.com/prod/api/koha/eds_logo.png" width="250" /></a>
3535
<h3>Koha: EDS API: Setup Tool</h3>
3636
<p>This setup tool details version information and provides access to the App manager.</p>
3737

‎Koha/Plugin/EDS/bootstrap/modules/eds-advsearch.tt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128

129129
<div id="advsearch-itemtypes" class="advsearch ui-tabs-panel ui-corner-bottom ui-widget-content" aria-labelledby="ui-id-1" role="tabpanel" aria-hidden="false">
130130
<fieldset>
131-
<legend>[% EDSLANG.eds_advsearch_TT_search_opt_modes %]<a class="helplink" target="_blank" href="http://support.ebsco.com/help/?int=eds&lang=en&feature_id=SrcMode&TOC_ID=Always&SI=0&BU=0&GU=1&PS=0&ver=live&dbs=">
131+
<legend>[% EDSLANG.eds_advsearch_TT_search_opt_modes %]<a class="helplink" target="_blank" href="https://support.ebsco.com/help/?int=eds&lang=en&feature_id=SrcMode&TOC_ID=Always&SI=0&BU=0&GU=1&PS=0&ver=live&dbs=">
132132
<img valign="middle" src="../images/iconQuestionMarkGeneric.png" width="21" alt="Help (opens in new window)">
133133
</a></legend>
134134
<div id="modeExpanders">
@@ -143,7 +143,7 @@
143143
[% ELSE %]
144144
<input class="advSBOps" name="searchMode" id="[% mode.Mode %]" type="radio" value="[% mode.AddAction %]">
145145
[% END %]
146-
[% mode.Label %]<sub><a href="http://support.ebsco.com/help/?int=eds&lang=en&feature_id=SrcMode&TOC_ID=Always&SI=0&BU=0&GU=1&PS=0&ver=live&dbs=" target="_blank" title="[% EDSLANG.eds_advsearch_TT_search_help_title %]">[% EDSLANG.eds_advsearch_TT_search_help %]</a></sub>
146+
[% mode.Label %]<sub><a href="https://support.ebsco.com/help/?int=eds&lang=en&feature_id=SrcMode&TOC_ID=Always&SI=0&BU=0&GU=1&PS=0&ver=live&dbs=" target="_blank" title="[% EDSLANG.eds_advsearch_TT_search_help_title %]">[% EDSLANG.eds_advsearch_TT_search_help %]</a></sub>
147147
</label>
148148
[% ELSE %]
149149
<label for="[% mode.Mode %]" >

‎Koha/Plugin/EDS/opac/eds-detail.pl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ sub cust_EDSSearch
151151
$EDSQuery =~s/ /\+/g;
152152

153153
# generate URI
154-
my $uri = 'http://eds-api.ebscohost.com/edsapi/rest/'.$EDSQuery;
154+
my $uri = 'https://eds-api.ebscohost.com/edsapi/rest/'.$EDSQuery;
155155
$uri=~s/\|/\&/g;
156156

157157
my $response = decode_json(CallREST('GET',$uri,'', GetAuth(), GetSession()));

‎Koha/Plugin/EDS/opac/eds-methods.pl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ sub GetAuth
153153
sub CreateSession
154154
{
155155
#end session
156-
my $uri = 'http://eds-api.ebscohost.com/edsapi/rest/endsession';
156+
my $uri = 'https://eds-api.ebscohost.com/edsapi/rest/endsession';
157157
my $json = '{"sessiontoken":"'.$input->cookie('sessionToken').'"}';
158158
if($authtoken eq ''){
159159
$authtoken = CreateAuth();
@@ -163,8 +163,8 @@ sub CreateSession
163163
#$GuestTracker = CheckIPAuthentication();
164164

165165
#ask for SessionToken from EDSAPI
166-
$uri = 'http://eds-api.ebscohost.com/edsapi/rest/createsession';
167-
$json = '{"Profile":"'.$edsprofileid.'","Guest":"'.$GuestTracker.'","Org":"'.$edscustomerid.'"}';
166+
$uri = 'https://eds-api.ebscohost.com/edsapi/rest/createsession';
167+
$json = '{"Profile":"'.$edsprofileid.'","Guest":"'.$GuestTracker.'","Org":"koha-'.$edscustomerid.'"}';
168168

169169
$response = CallREST('POST',$uri,$json, $authtoken, '');
170170

@@ -270,7 +270,7 @@ sub PFISearch
270270
}
271271
$EDSQuery =~s/ /\+/g;
272272
print STDERR "---==---" . $EDSQuery;
273-
my $uri = 'http://eds-api.ebscohost.com/edsapi/'.$apiType.'/'.$EDSQuery;
273+
my $uri = 'https://eds-api.ebscohost.com/edsapi/'.$apiType.'/'.$EDSQuery;
274274
$uri=~s/\|/\&/g;
275275
# use Data::Dumper; die Dumper $uri;
276276
print STDERR "---==---" . $uri;
@@ -324,7 +324,7 @@ sub EDSSearch
324324
$EDSQuery =~s/\{.*?\}/$encodedTerm/;
325325
}
326326
$EDSQuery =~s/ /\+/g;
327-
my $uri = 'http://eds-api.ebscohost.com/edsapi/'.$apiType.'/'.$EDSQuery;
327+
my $uri = 'https://eds-api.ebscohost.com/edsapi/'.$apiType.'/'.$EDSQuery;
328328
$uri=~s/\|/\&/g;
329329
# use Data::Dumper; die Dumper $uri;
330330

‎Koha/Plugin/EDS/opac/templates/eds-methods.tt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -158,14 +158,14 @@ sub CreateAuth
158158
my %jsondata =(
159159
'UserId' => $edsusername,
160160
'Password' => $edspassword,
161-
'InterfaceId' => 'KohaEDS'
161+
'Org' => 'KohaEDS'
162162
);
163163
my $json = encode_json \%jsondata;
164-
#my $json = encode_json '{"UserId":"'.$edsusername.'","Password":"'.$edspassword.'","InterfaceId":"KohaEDS"}';
164+
#my $json = encode_json '{"UserId":"'.$edsusername.'","Password":"'.$edspassword.'","Org":"KohaEDS"}';
165165

166166
if($edsusername eq "-"){
167167
$uri = 'https://eds-api.ebscohost.com/authservice/rest/ipauth';
168-
$json = '{"InterfaceId":"KohaEDS"}';
168+
$json = '{"Org":"KohaEDS"}';
169169
}
170170

171171

@@ -186,7 +186,7 @@ sub GetAuth
186186
sub CreateSession
187187
{
188188
#end session
189-
my $uri = 'http://eds-api.ebscohost.com/edsapi/rest/endsession';
189+
my $uri = 'https://eds-api.ebscohost.com/edsapi/rest/endsession';
190190
my $json = '{"sessiontoken":"'.$input->cookie('sessionToken').'"}';
191191
if($authtoken eq ''){
192192
$authtoken = CreateAuth();
@@ -196,8 +196,8 @@ sub CreateSession
196196
#$GuestTracker = CheckIPAuthentication();
197197

198198
#ask for SessionToken from EDSAPI
199-
$uri = 'http://eds-api.ebscohost.com/edsapi/rest/createsession';
200-
$json = '{"Profile":"'.$edsprofileid.'","Guest":"'.$GuestTracker.'","Org":"'.$edscustomerid.'"}';
199+
$uri = 'https://eds-api.ebscohost.com/edsapi/rest/createsession';
200+
$json = '{"Profile":"'.$edsprofileid.'","Guest":"'.$GuestTracker.'","Org":"koha-'.$edscustomerid.'"}';
201201

202202
$response = CallREST('POST',$uri,$json, $authtoken, '');
203203

@@ -303,7 +303,7 @@ sub PFISearch
303303
}
304304
$EDSQuery =~s/ /\+/g;
305305
print STDERR "---==---" . $EDSQuery;
306-
my $uri = 'http://eds-api.ebscohost.com/edsapi/'.$apiType.'/'.$EDSQuery;
306+
my $uri = 'https://eds-api.ebscohost.com/edsapi/'.$apiType.'/'.$EDSQuery;
307307
$uri=~s/\|/\&/g;
308308
# use Data::Dumper; die Dumper $uri;
309309
print STDERR "---==---" . $uri;
@@ -357,7 +357,7 @@ sub EDSSearch
357357
$EDSQuery =~s/\{.*?\}/$encodedTerm/;
358358
}
359359
$EDSQuery =~s/ /\+/g;
360-
my $uri = 'http://eds-api.ebscohost.com/edsapi/'.$apiType.'/'.$EDSQuery;
360+
my $uri = 'https://eds-api.ebscohost.com/edsapi/'.$apiType.'/'.$EDSQuery;
361361
$uri=~s/\|/\&/g;
362362
# use Data::Dumper; die Dumper $uri;
363363

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ KohaCon17 | [Presentation](https://github.com/ebsco/edsapi-koha-plugin/blob/mast
5858

5959
[![video_kohacon17](https://i.ytimg.com/vi/38xb_ysctfQ/hqdefault.jpg?sqp=-oaymwEWCMQBEG5IWvKriqkDCQgBFQAAiEIYAQ==&rs=AOn4CLDiwKmM0GFbSM3gWRXOHDlYgIrPxQ)](https://www.youtube.com/watch?v=38xb_ysctfQ)
6060

61-
KohaCon16 | [Presentation](https://github.com/ebsco/edsapi-koha-plugin/blob/master/Xtras-help/kohacon/KohaCon16.pdf) | [Video Recording](http://www.livemedia.com/video/236823)
61+
KohaCon16 | [Presentation](https://github.com/ebsco/edsapi-koha-plugin/blob/master/Xtras-help/kohacon/KohaCon16.pdf) | [Video Recording](https://www.livemedia.com/video/236823)
6262

6363

64-
[![video_kohacon16](https://i.ytimg.com/vi/wXJcnaM1m64/hqdefault.jpg?sqp=-oaymwEWCMQBEG5IWvKriqkDCQgBFQAAiEIYAQ==&rs=AOn4CLCL_QAX9A0wpp_VFeKwyxqKN9b4sg)](http://www.livemedia.com/video/236823)
64+
[![video_kohacon16](https://i.ytimg.com/vi/wXJcnaM1m64/hqdefault.jpg?sqp=-oaymwEWCMQBEG5IWvKriqkDCQgBFQAAiEIYAQ==&rs=AOn4CLCL_QAX9A0wpp_VFeKwyxqKN9b4sg)](https://www.livemedia.com/video/236823)
6565

6666
KohaCon14 | [Presentation](https://github.com/ebsco/edsapi-koha-plugin/blob/master/Xtras-help/kohacon/KohaCon14.pdf) | [Video Recording](https://www.youtube.com/watch?v=cw0Aq4cPick)
6767

0 commit comments

Comments
 (0)