From 94d78cc663b8d0e7a12c792cb228a2d3c03eec13 Mon Sep 17 00:00:00 2001 From: mikewaters Date: Fri, 29 Jul 2005 08:08:42 +0000 Subject: [PATCH] Modified Files: repository.html - added help buttons and changed hive buttons resource.class.php - hive/makelink.php added version and format options hive/openhive.php - obsolete Added Files: hive/hp-footer-hive-powered.gif - hive logo hive/openlitebrowse.php - new openhive option hive/openlitesearch.php - new openhive option --- .../hive/hp-footer-hive-powered.gif | Bin 0 -> 1210 bytes .../type/repository/hive/makelink.php | 16 +++- .../type/repository/hive/openhive.php | 39 ++++++++-- .../type/repository/hive/openlitebrowse.php | 69 ++++++++++++++++++ .../type/repository/hive/openlitesearch.php | 69 ++++++++++++++++++ mod/resource/type/repository/repository.html | 23 +++++- .../type/repository/resource.class.php | 19 ++++- 7 files changed, 227 insertions(+), 8 deletions(-) create mode 100644 mod/resource/type/repository/hive/hp-footer-hive-powered.gif create mode 100644 mod/resource/type/repository/hive/openlitebrowse.php create mode 100644 mod/resource/type/repository/hive/openlitesearch.php diff --git a/mod/resource/type/repository/hive/hp-footer-hive-powered.gif b/mod/resource/type/repository/hive/hp-footer-hive-powered.gif new file mode 100644 index 0000000000000000000000000000000000000000..8f324524ffb3d3ec620425704149a6efc697df38 GIT binary patch literal 1210 zcmV;r1V#HtNk%w1VS)f00K@A6&xcB^zoj_t>I`0C8Jpv20! z)a2ahsg1bx^7qun+}zOO?dS0E?DT+EnEUzs|Ni~{{P_6x`up_aiesPs`SAVy{`&a) z{{H{``~Cg={pQulA^8LV00000EC2ui0D=G<06+!*ARvxpX`X1Ru59bRa7k4cG2D2L z2NbFZf`{lQSU?yCphSof6r2nJW&)Tz3z4Y6kPtzdK+GZmloEx2r(x50ZWW?&Qm_;` znv!JqWz+fp1Q{j{NoYR?a!Lk>Q3WMeA{+}~Z*65x5noCQNe&`f3J(%x3{+%Fd7f?t zqYPx8F|o3!-n5wwu@?c;e>emI)h0v^8WcneL}dmRkN`;90wKu)EtdpDI90|083|Mz z08uasg9iY3s63e14~PLGT|6||6XTaOUL!L9oTRtxo6A}e3O!)p>;eFly+jmq7r-Wf z00@KydqF{^4gx-3DqYGng)y5Hc)o*X%vsA4XNCY-&=f@!hyaMNDnl}shEZi#P{4&O zLxu`)X#|)%ciMpyVi(O>Foqo&1C|WnYk*e64-BV-kSS2mi5CE07kH4kB@YmXKpuGb z%a;KJ4iXJOcp?G90<=V>A*ctS=mlVO=Qg{MlSJ0ATTUtPa0sAd5fl0)Fr3*-1ON{j zc+l_!!`BS}C_Ct&1#^+jZ}eyg4WXii2&g->C>p@eT@kZ$91zsCJ&Ozn0--;DlRyNZ z?(^$c!CS%UA|t$0OfdsofDAGK7{kl|1vTvFpne=s&_gjTAu|^MxbR@$Gwa1rgEP+5 z_TY#ljt~@2#-vyb0#}vjVpBb2@J>7f1jF75p*=v(Aq$YR9~l@x7n(;Bq!j~m0vO3c zc{LgnR59`Cz#3M?;Z}qO05rgt1p+mooDmi@z@-RbvcrLC?2ItM0uM+A86D%?1HgY0 zh^K*R$B|$GUugmtK?5U+=fZ0eVi+Gh&dd`{Qnp>DRS<5BLPrN~II+(_Nvh$70vu@C z#7v}YB!DLiB!K~VTe#6hq)A8+okyg=K*5YRaHwEBy4d5c<@95 zry#3Fsi`Kw)mIV0N(Vk_2sx4e2EVHDKoSgiz(Jrdyw%!W@#?ry%z!g1k2q6M6pn(QWFaSdz&pZRvYYLXj z=%a>Yw}rm~jOK)(0K^2uaTbhX0I*I#KnJkgo>D*p(#;tLvl0}bM*~T$JO>1)SeB#% z67;xaJoBV?REt$a5P_f*I88+a4?JK28y&DQ<_OpH2>`YZBqtC65IEqUk83^ + diff --git a/mod/resource/type/repository/hive/openhive.php b/mod/resource/type/repository/hive/openhive.php index d23dfeaaa81..356852cf44b 100644 --- a/mod/resource/type/repository/hive/openhive.php +++ b/mod/resource/type/repository/hive/openhive.php @@ -2,16 +2,44 @@ require_once("../../../../../config.php"); - print_header(); - - if (empty($CFG->hivehost) or empty($CFG->hivehost) or empty($CFG->hivehost) or empty($CFG->hivehost)) { + if (empty($CFG->hivehost) or empty($CFG->hiveport) or empty($CFG->hiveprotocol) or empty($CFG->hivepath)) { + print_header(); notify('A Hive repository is not yet configured in Moodle. Please see Resource settings.'); + print_footer(); die; } + if (empty($SESSION->HIVE_SESSION)) { + print_header(); + notify('You do not have access to the Hive repository. Moodle signs you into Hive when you log in. This process may have failed.'); + close_window_button(); + print_footer(); + die; + } + +$query .= '&HISTORY='; +$query .= '&hiveLanguage=en_AU'; +$query .= '&PUBCATEGORY_LIST='; +$query .= '&CATEGORY_LIST='; +$query .= '&HIDE_LOGOUT=Y'; +$query .= '&mkurl='.$CFG->wwwroot.'/mod/resource/type/repository/hive/makelink.php'; +$query .= '&HIDE_CHANGEUSERDETAILS=Y'; +$query .= '&HIVE_RET=ORG'; +$query .= '&HIVE_PAGE=Lite%20Browse'; +$query .= '&HIVE_REQ=2113'; +$query .= '&HIVE_ERRCODE=0'; +$query .= '&mklms=Doodle'; +$query .= '&HIVE_PROD=0'; +$query .= '&HIVE_REF=hin:hive@Hive%20Login%20HTML%20Template'; +$query .= '&HIVE_LITEMODE=liteBrowse'; +$query .= '&HIVE_SEREF='.$CFG->wwwroot.'/sso/hive/expired.php'; +$query .= '&HIVE_SESSION='.$SESSION->HIVE_SESSION; + + redirect($CFG->hiveprotocol .'://'. $CFG->hivehost .':'. $CFG->hiveport .''. $CFG->hivepath .'?'.$query); +/***********8 notify('Opening HarvestRoad Hive. Please wait. Contacting '. $CFG->hivehost ); - echo '
'; + echo ''; echo ''; echo ''; @@ -33,7 +61,8 @@ echo '
'; echo ''; + print_footer(); +*************/ ?> diff --git a/mod/resource/type/repository/hive/openlitebrowse.php b/mod/resource/type/repository/hive/openlitebrowse.php new file mode 100644 index 00000000000..2a83215bd15 --- /dev/null +++ b/mod/resource/type/repository/hive/openlitebrowse.php @@ -0,0 +1,69 @@ +hivehost) or empty($CFG->hiveport) or empty($CFG->hiveprotocol) or empty($CFG->hivepath)) { + print_header(); + notify('A Hive repository is not yet configured in Moodle. Please see Resource settings.'); + print_footer(); + die; + } + + if (empty($SESSION->HIVE_SESSION)) { + print_header(); + notify('You do not have access to the Hive repository. Moodle signs you into Hive when you log in. This process may have failed.'); + close_window_button(); + print_footer(); + die; + } + +// MW Redirect to the Hive page. No need for a self-posting form as there is no sensitive data. +$query .= '&HISTORY='; +$query .= '&hiveLanguage=en_AU'; +$query .= '&PUBCATEGORY_LIST='; +$query .= '&CATEGORY_LIST='; +$query .= '&HIDE_LOGOUT=Y'; +$query .= '&mkurl='.$CFG->wwwroot.'/mod/resource/type/repository/hive/makelink.php'; +$query .= '&HIDE_CHANGEUSERDETAILS=Y'; +$query .= '&HIVE_RET=ORG'; +$query .= '&HIVE_REQ=2113'; +$query .= '&HIVE_ERRCODE=0'; +$query .= '&mklms=Moodle'; +$query .= '&HIVE_PROD=0'; +$query .= '&HIVE_REF=hin:hive@Hive%20Login%20HTML%20Template'; +$query .= '&HIVE_LITEMODE=liteBrowse'; +$query .= '&HIVE_SEREF='.$CFG->wwwroot.'/sso/hive/expired.php'; +$query .= '&HIVE_SESSION='.$SESSION->HIVE_SESSION; + + redirect($CFG->hiveprotocol .'://'. $CFG->hivehost .':'. $CFG->hiveport .''. $CFG->hivepath .'?'.$query); +/*********** +// MW The original form + notify('Opening HarvestRoad Hive. Please wait. Contacting '. $CFG->hivehost ); + + echo '
'; + + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo '
'; + echo ''; + + print_footer(); +*************/ +?> diff --git a/mod/resource/type/repository/hive/openlitesearch.php b/mod/resource/type/repository/hive/openlitesearch.php new file mode 100644 index 00000000000..6e1d993ff79 --- /dev/null +++ b/mod/resource/type/repository/hive/openlitesearch.php @@ -0,0 +1,69 @@ +hivehost) or empty($CFG->hiveport) or empty($CFG->hiveprotocol) or empty($CFG->hivepath)) { + print_header(); + notify('A Hive repository is not yet configured in Moodle. Please see Resource settings.'); + print_footer(); + die; + } + + if (empty($SESSION->HIVE_SESSION)) { + print_header(); + notify('You do not have access to the Hive repository. Moodle signs you into Hive when you log in. This process may have failed.'); + close_window_button(); + print_footer(); + die; + } + +// MW Redirect to the Hive page. No need for a self-posting form as there is no sensitive data. +$query .= '&HISTORY='; +$query .= '&hiveLanguage=en_AU'; +$query .= '&PUBCATEGORY_LIST='; +$query .= '&CATEGORY_LIST='; +$query .= '&HIDE_LOGOUT=Y'; +$query .= '&mkurl='.$CFG->wwwroot.'/mod/resource/type/repository/hive/makelink.php'; +$query .= '&HIDE_CHANGEUSERDETAILS=Y'; +$query .= '&HIVE_RET=ORG'; +$query .= '&HIVE_REQ=2113'; +$query .= '&HIVE_ERRCODE=0'; +$query .= '&mklms=Moodle'; +$query .= '&HIVE_PROD=0'; +$query .= '&HIVE_REF=hin:hive@Hive%20Login%20HTML%20Template'; +$query .= '&HIVE_LITEMODE=liteSearch'; +$query .= '&HIVE_SEREF='.$CFG->wwwroot.'/sso/hive/expired.php'; +$query .= '&HIVE_SESSION='.$SESSION->HIVE_SESSION; + + redirect($CFG->hiveprotocol .'://'. $CFG->hivehost .':'. $CFG->hiveport .''. $CFG->hivepath .'?'.$query); +/*********** +// MW The original form + notify('Opening HarvestRoad Hive. Please wait. Contacting '. $CFG->hivehost ); + + echo '
'; + + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo '
'; + echo ''; + + print_footer(); +*************/ +?> diff --git a/mod/resource/type/repository/repository.html b/mod/resource/type/repository/repository.html index f4a01d1b15d..a90a9e5ad3d 100644 --- a/mod/resource/type/repository/repository.html +++ b/mod/resource/type/repository/repository.html @@ -36,7 +36,28 @@ reference\" alt=\"reference\" />
"; - button_to_popup_window ('/mod/resource/type/repository/hive/openhive.php', 'Hive', 'Hive', 500, 750, $strchooseafile); +//MW add image icon next to Hive... button + ?> + + + + + + + + diff --git a/mod/resource/type/repository/resource.class.php b/mod/resource/type/repository/resource.class.php index 052e6a74ebf..7ca909390ed 100644 --- a/mod/resource/type/repository/resource.class.php +++ b/mod/resource/type/repository/resource.class.php @@ -256,7 +256,7 @@ function display() { $inpopup = !empty($_GET["inpopup"]); - $fullurl = $CFG->hiveprot .'://'. $CFG->hivehost .':'. $CFG->hiveport .''. $CFG->hivepath . '?'. $resource->reference . '&HIVE_SESSION='.$SESSION->HIVE_SESSION; + $fullurl = $CFG->hiveprotocol .'://'. $CFG->hivehost .':'. $CFG->hiveport .''. $CFG->hivepath . '?'. $resource->reference . '&HIVE_SESSION='.$SESSION->HIVE_SESSION; if (!empty($querystring)) { $urlpieces = parse_url($resource->reference); @@ -267,6 +267,23 @@ function display() { } } + /// MW check that the HIVE_SESSION is there + if (empty($SESSION->HIVE_SESSION)) { + if ($inpopup) { + print_header($pagetitle, $course->fullname); + } else { + print_header($pagetitle, $course->fullname, "$this->navigation ".format_string($resource->name), "", "", true, update_module_button($cm->id, $course->id, $this->strresource), navmenu($course, $cm)); + } + notify('You do not have access to HarvestRoad Hive. This resource is unavailable.'); + if ($inpopup) { + close_window_button(); + } + print_footer('none'); + die; + } + /// MW END + + /// Print a notice and redirect if we are trying to access a file on a local file system /// and the config setting has been disabled if (!$CFG->resource_allowlocalfiles and (strpos($resource->reference, RESOURCE_LOCALPATH) === 0)) {