From 74c1716f7b5eee16790756577e0e2d2b83eefc2d Mon Sep 17 00:00:00 2001 From: rowan04 Date: Mon, 19 Dec 2022 14:24:38 +0000 Subject: [PATCH 1/9] Make references to operational tools configurable - added config options for helpdesk link, helpdesk support unit, request tracker and community documentation - so that different instances of gocdb can have links point directly to their tooling, instead of having general references --- config/local_info.xml | 8 ++++++ .../static_html/Help_And_Contact.html | 20 +++++++++---- lib/Gocdb_Services/Config.php | 28 +++++++++++++++++++ 3 files changed, 50 insertions(+), 6 deletions(-) diff --git a/config/local_info.xml b/config/local_info.xml index 6115d7ed8..0054c6c4c 100755 --- a/config/local_info.xml +++ b/config/local_info.xml @@ -17,6 +17,14 @@ no-reply@localhost gocdb-admins@localhost + + + + + + + + AUP location AUP title diff --git a/htdocs/web_portal/static_html/Help_And_Contact.html b/htdocs/web_portal/static_html/Help_And_Contact.html index 7fc80e781..76f55ae2e 100644 --- a/htdocs/web_portal/static_html/Help_And_Contact.html +++ b/htdocs/web_portal/static_html/Help_And_Contact.html @@ -13,9 +13,9 @@

GOCDB

Need information?

- Please browse the GOCDB - - Documentation or your community documentation source. + Please browse your + getCommunityDocumentation)> + Community Documentation.

@@ -24,7 +24,10 @@

Found a bug?

First, check our known bugs to see if this has not already been reported.
- If not, please open a request in your community support desk or our + If not, please open a request in your + getHelpdeskLink)> + community support desk + or our GitHub issues page, if the former is not appropriate. @@ -36,7 +39,10 @@

Want to suggest something?

Before you make any request, check this is not already integrated to our development plans, see GOCDB Development Plans.
Any suggestion, new feature or improvement request should - be submitted to your community request tracker or our + be submitted to your + getRequestTracker)> + community request tracker + or our GitHub issues page, if the former is not appropriate.
@@ -51,7 +57,9 @@

Need some support?

For all other enquiries including general questions, temporary problem reports or support requests please open a - request in your community support desk. + request in your + getHelpdeskLink)> + community support desk.

diff --git a/lib/Gocdb_Services/Config.php b/lib/Gocdb_Services/Config.php index b7bd22328..554f1fc69 100644 --- a/lib/Gocdb_Services/Config.php +++ b/lib/Gocdb_Services/Config.php @@ -556,4 +556,32 @@ public function getEmailTo() return $emailTo; } + + public function getHelpdeskLink() + { + $link = $this->GetLocalInfoXML()->helpdesk->link; + + return $link; + } + + public function getHelpdeskSupportUnit() + { + $supportUnit = $this->GetLocalInfoXML()->helpdesk->support_unit; + + return $supportUnit; + } + + public function getRequestTracker() + { + $requestTracker = $this->GetLocalInfoXML()->request_tracker; + + return $requestTracker; + } + + public function getCommunityDocumentation() + { + $communityDocumentation = $this->GetLocalInfoXML()->community_documentation; + + return $communityDocumentation; + } } From f2934fe23ca9749c124dbe8dbacc1d7a1d0a1a0c Mon Sep 17 00:00:00 2001 From: rowan04 Date: Tue, 20 Dec 2022 17:02:59 +0000 Subject: [PATCH 2/9] Edits to pass code tests - shortened variable name - fixed href formatting - still doen't work as planned - needs a php file rework - this commit was made as I'm about to leave for christmas --- config/local_info.xml | 4 ++-- htdocs/web_portal/static_html/Help_And_Contact.html | 10 +++++----- lib/Gocdb_Services/Config.php | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/config/local_info.xml b/config/local_info.xml index 0054c6c4c..5869f1932 100755 --- a/config/local_info.xml +++ b/config/local_info.xml @@ -21,9 +21,9 @@ - + - + AUP location diff --git a/htdocs/web_portal/static_html/Help_And_Contact.html b/htdocs/web_portal/static_html/Help_And_Contact.html index 76f55ae2e..f31a91cd7 100644 --- a/htdocs/web_portal/static_html/Help_And_Contact.html +++ b/htdocs/web_portal/static_html/Help_And_Contact.html @@ -14,8 +14,8 @@

GOCDB

Need information?

Please browse your - getCommunityDocumentation)> - Community Documentation. + + community documentation.

@@ -25,7 +25,7 @@

Found a bug?

known bugs to see if this has not already been reported.
If not, please open a request in your - getHelpdeskLink)> + community support desk or our @@ -40,7 +40,7 @@

Want to suggest something?

GOCDB Development Plans.
Any suggestion, new feature or improvement request should be submitted to your - getRequestTracker)> + community request tracker or our @@ -58,7 +58,7 @@

Need some support?

For all other enquiries including general questions, temporary problem reports or support requests please open a request in your - getHelpdeskLink)> + community support desk.

diff --git a/lib/Gocdb_Services/Config.php b/lib/Gocdb_Services/Config.php index 554f1fc69..a417406fc 100644 --- a/lib/Gocdb_Services/Config.php +++ b/lib/Gocdb_Services/Config.php @@ -578,10 +578,10 @@ public function getRequestTracker() return $requestTracker; } - public function getCommunityDocumentation() + public function getCommunityDocs() { - $communityDocumentation = $this->GetLocalInfoXML()->community_documentation; + $communityDocs = $this->GetLocalInfoXML()->community_docs; - return $communityDocumentation; + return $communityDocs; } } From e0218f8a5d88c1e59d2ba0c2005df1ff79274b84 Mon Sep 17 00:00:00 2001 From: rowan04 Date: Wed, 22 Feb 2023 11:26:16 +0000 Subject: [PATCH 3/9] Changes Help_And_Contact page from .html to .php - in order to have configurable links in Help_And_Contact, - the file had to be changed from .html to .php - so it was also moved to the static_php directory - the operationalLinks file was made to call the config file and assign to variables - this file is then called in Help_And_Contact --- .../static_html/Help_And_Contact.html | 65 ----------------- .../static_php/Help_And_Contact.php | 70 +++++++++++++++++++ .../static_php/operationalLinks.php | 13 ++++ 3 files changed, 83 insertions(+), 65 deletions(-) delete mode 100644 htdocs/web_portal/static_html/Help_And_Contact.html create mode 100644 htdocs/web_portal/static_php/Help_And_Contact.php create mode 100644 htdocs/web_portal/static_php/operationalLinks.php diff --git a/htdocs/web_portal/static_html/Help_And_Contact.html b/htdocs/web_portal/static_html/Help_And_Contact.html deleted file mode 100644 index f31a91cd7..000000000 --- a/htdocs/web_portal/static_html/Help_And_Contact.html +++ /dev/null @@ -1,65 +0,0 @@ -
-

Documentation, Help and Support

-
-
- -

GOCDB

-

What is GOCDB?

-

- See Release notes -
- Download, Install -

- -

Need information?

-

- Please browse your - - community documentation. -

-

- -

Found a bug?

-

- First, check our - - known bugs to see if this has not already been reported.
- If not, please open a request in your - - community support desk - or our - - GitHub issues - page, if the former is not appropriate. -

-

- -

Want to suggest something?

-

- Before you make any request, check this is not already integrated to our development plans, see - GOCDB Development Plans.
- Any suggestion, new feature or improvement request should - be submitted to your - - community request tracker - or our - - GitHub issues - page, if the former is not appropriate.
- Suggestions will be discussed by the GOCDB developers and - any relevant project body before inclusion into development plans. - These bodies reserve the right to decline unsuitable requests. -

-

- -

Need some support?

- -

- For all other enquiries including general questions, temporary - problem reports or support requests please open a - request in your - - community support desk. -

-
-
diff --git a/htdocs/web_portal/static_php/Help_And_Contact.php b/htdocs/web_portal/static_php/Help_And_Contact.php new file mode 100644 index 000000000..1a4f3fabb --- /dev/null +++ b/htdocs/web_portal/static_php/Help_And_Contact.php @@ -0,0 +1,70 @@ + + +
+

Documentation, Help and Support

+
+
+ +

GOCDB

+

What is GOCDB?

+

+ See Release notes +
+ Download, Install +

+ +

Need information?

+

+ Please browse your + + community documentation. +

+

+ +

Found a bug?

+

+ First, check our + + known bugs to see if this has not already been reported.
+ If not, please open a request in your + + community support desk + or our + + GitHub issues + page, if the former is not appropriate. +

+

+ +

Want to suggest something?

+

+ Before you make any request, check this is not already integrated to our development plans, see + GOCDB Development Plans.
+ Any suggestion, new feature or improvement request should + be submitted to your + + community request tracker + or our + + GitHub issues + page, if the former is not appropriate.
+ Suggestions will be discussed by the GOCDB developers and + any relevant project body before inclusion into development plans. + These bodies reserve the right to decline unsuitable requests. +

+

+ +

Need some support?

+ +

+ For all other enquiries including general questions, temporary + problem reports or support requests please open a + request in your + + community support desk. +

+
+
+ diff --git a/htdocs/web_portal/static_php/operationalLinks.php b/htdocs/web_portal/static_php/operationalLinks.php new file mode 100644 index 000000000..fcd43f0d3 --- /dev/null +++ b/htdocs/web_portal/static_php/operationalLinks.php @@ -0,0 +1,13 @@ +getCommunityDocs(); +$helpdeskLink = $configService->getHelpdeskLink(); +$requestTracker = $configService->getRequestTracker(); From 07c3d0ba1b368282dbd37fce9413c03674d509be Mon Sep 17 00:00:00 2001 From: rowan04 Date: Wed, 22 Feb 2023 11:27:47 +0000 Subject: [PATCH 4/9] Allows Help_And_Contact.php to be displayed - as Help_And_Contact page was moved from a .html file to .php, - the methods that display it on the gocdb web needed to be changed - as it is no longer a static_html file --- config/web_portal/menu.xml | 2 +- htdocs/web_portal/index.php | 57 +++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/config/web_portal/menu.xml b/config/web_portal/menu.xml index 310afcfc8..7547cc91a 100644 --- a/config/web_portal/menu.xml +++ b/config/web_portal/menu.xml @@ -117,7 +117,7 @@ all Doc, Help & Support - index.php?Page_Type=Static_HTML&Page=Help_And_Contact + index.php?Page_Type=Static_PHP&Page=Help_And_Contact diff --git a/htdocs/web_portal/index.php b/htdocs/web_portal/index.php index 2e21d49f6..92db66df4 100644 --- a/htdocs/web_portal/index.php +++ b/htdocs/web_portal/index.php @@ -208,6 +208,11 @@ function Draw_Page($Page_Type) { //rejectIfNotAuthenticated(); Draw_Static_HTML(); break; + case "Static_PHP": + //rejectIfNotAuthenticated(); + //require_once __DIR__.'/components/Draw_Components/draw_page_components.php'; + Draw_Static_PHP(); + break; case "Search": //rejectIfNotAuthenticated(); require_once __DIR__.'/controllers/search.php'; @@ -654,6 +659,7 @@ function Draw_Page($Page_Type) { } } + /* Draws a static HTML page */ function Draw_Static_HTML() { $Page_Name = Get_Static_Page_Name(); @@ -661,6 +667,15 @@ function Draw_Static_HTML() { Draw_Standard_Page($Page_Content); } + +/* Draws a static PHP HTML page */ +function Draw_Static_PHP() { + $PHP_Page_Name = Get_Static_PHP_Page_Name(); + $PHP_Page_Content = Get_Static_PHP_Page_Contents($PHP_Page_Name); + Draw_Standard_PHP_Page($PHP_Page_Content); +} + + /* Finds out if a static page has been requested. If it has, return * the page name, otherwise return a blank string. */ function Get_Static_Page_Name() { @@ -672,6 +687,17 @@ function Get_Static_Page_Name() { } +/* Finds out if a static php page has been requested. If it has, return + * the page name, otherwise return a blank string. */ +function Get_Static_PHP_Page_Name() { + if(!isset($_REQUEST['Page'])) { + return ""; + } else { + return $_REQUEST['Page'].'.php'; + } +} + + /* Get the contents of the static HTML page specified in $Page_Name * if the page name isn't specified then return a blank string */ function Get_Static_Page_Contents($Page_Name) { @@ -686,6 +712,25 @@ function Get_Static_Page_Contents($Page_Name) { } +/* Get the contents of the static PHP page specified in $PHP_Page_Name + * if the page name isn't specified then return a blank string */ +function Get_Static_PHP_Page_Contents($PHP_Page_Name) { + require_once __DIR__.'/components/Draw_Components/draw_page_components.php'; + $phpDir = __DIR__."/static_php"; + $Available_Static_Pages = Get_Directory_Contents($phpDir); + if(!isset($Available_Static_Pages[$PHP_Page_Name])) { + return ""; + } + $PHP = Get_File_Contents($phpDir."/".$PHP_Page_Name); + return $PHP; + /* ob_start(); + * include $phpDir."/".$PHP_Page_Name; + * $PHP = ob_get_contents(); + * ob_end_clean(); + * return $PHP; */ +} + + /* Returns the contents of a specified directory name */ function Get_Directory_Contents($Directory_Name) { if ($File_Handle = opendir($Directory_Name)) @@ -711,6 +756,18 @@ function Draw_Standard_Page($Page_Content, $title=null) { } +/* Draws a standard GOCDB layout with the string $PHP_Page_Content in the + * right frame */ +function Draw_Standard_PHP_Page($PHP_Page_Content, $title=null) { + require_once __DIR__.'/components/Draw_Components/draw_page_components.php'; + $PHP = ""; + $PHP .= Get_Standard_Top_Section_HTML($title); + $PHP .= $PHP_Page_Content; + $PHP .= Get_Standard_Bottom_Section_HTML(); + echo $PHP; +} + + /* Given the name of a file in the view directory, include it * as the body of a standard GOCDB page */ From 425d0cc611acb67c2b8a236ea8463ac2a0fe3175 Mon Sep 17 00:00:00 2001 From: rowan04 Date: Wed, 22 Feb 2023 12:28:55 +0000 Subject: [PATCH 5/9] Fixes configurable links not working on webpage - changed method of ouputting the Help_And_Contact.php file - so it now outputs the executed file, not the file contents - meaning the php parts within the html are properly executed, and not just output --- htdocs/web_portal/index.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/htdocs/web_portal/index.php b/htdocs/web_portal/index.php index 92db66df4..83b464587 100644 --- a/htdocs/web_portal/index.php +++ b/htdocs/web_portal/index.php @@ -721,13 +721,12 @@ function Get_Static_PHP_Page_Contents($PHP_Page_Name) { if(!isset($Available_Static_Pages[$PHP_Page_Name])) { return ""; } - $PHP = Get_File_Contents($phpDir."/".$PHP_Page_Name); + // below returns the executed php file, not just the contents of the file + ob_start(); + include $phpDir."/".$PHP_Page_Name; + $PHP = ob_get_contents(); + ob_end_clean(); return $PHP; - /* ob_start(); - * include $phpDir."/".$PHP_Page_Name; - * $PHP = ob_get_contents(); - * ob_end_clean(); - * return $PHP; */ } From 1db128886c96291636601e05db866989336fdfb6 Mon Sep 17 00:00:00 2001 From: rowan04 Date: Wed, 22 Feb 2023 12:36:42 +0000 Subject: [PATCH 6/9] Tidies up code and improves comments - removes unnecessary commented out code - adds to existing comments - fixes out of date code in search_ses.php --- htdocs/web_portal/controllers/service_group/search_ses.php | 4 ++-- htdocs/web_portal/index.php | 3 +-- htdocs/web_portal/static_php/operationalLinks.php | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/htdocs/web_portal/controllers/service_group/search_ses.php b/htdocs/web_portal/controllers/service_group/search_ses.php index a968aa387..7ecc2ccb2 100644 --- a/htdocs/web_portal/controllers/service_group/search_ses.php +++ b/htdocs/web_portal/controllers/service_group/search_ses.php @@ -47,10 +47,10 @@ function search_ses() { } catch(Exception $ex){ show_view( 'error.php', $ex->getMessage() . "

Please contact the " - . "" + . "" . "GOCDB support team if you need help with this issue."); } $params = array('ses' => $ses); show_view('service_group/se_search.php', $params, null, true); -} \ No newline at end of file +} diff --git a/htdocs/web_portal/index.php b/htdocs/web_portal/index.php index 83b464587..e5b75f048 100644 --- a/htdocs/web_portal/index.php +++ b/htdocs/web_portal/index.php @@ -210,7 +210,6 @@ function Draw_Page($Page_Type) { break; case "Static_PHP": //rejectIfNotAuthenticated(); - //require_once __DIR__.'/components/Draw_Components/draw_page_components.php'; Draw_Static_PHP(); break; case "Search": @@ -712,7 +711,7 @@ function Get_Static_Page_Contents($Page_Name) { } -/* Get the contents of the static PHP page specified in $PHP_Page_Name +/* Get the executed contents of the static PHP page specified in $PHP_Page_Name * if the page name isn't specified then return a blank string */ function Get_Static_PHP_Page_Contents($PHP_Page_Name) { require_once __DIR__.'/components/Draw_Components/draw_page_components.php'; diff --git a/htdocs/web_portal/static_php/operationalLinks.php b/htdocs/web_portal/static_php/operationalLinks.php index fcd43f0d3..264072712 100644 --- a/htdocs/web_portal/static_php/operationalLinks.php +++ b/htdocs/web_portal/static_php/operationalLinks.php @@ -1,7 +1,7 @@ Date: Thu, 2 Mar 2023 10:37:38 +0000 Subject: [PATCH 7/9] Change Help_And_Contact.php page to use a view/controller setup instead of a static_php setup - moved static_php/Help_And_Contact.php to views/help_and_contact.php - removed static_php/operationalLinks and replaced it with controllers/help_and_contact.php - this was done so that there wasn't lots of new code for the static_php method in index.php --- .../controllers/help_and_contact.php | 47 +++++++++++++++++++ .../static_php/operationalLinks.php | 13 ----- .../help_and_contact.php} | 11 ++--- 3 files changed, 51 insertions(+), 20 deletions(-) create mode 100644 htdocs/web_portal/controllers/help_and_contact.php delete mode 100644 htdocs/web_portal/static_php/operationalLinks.php rename htdocs/web_portal/{static_php/Help_And_Contact.php => views/help_and_contact.php} (90%) diff --git a/htdocs/web_portal/controllers/help_and_contact.php b/htdocs/web_portal/controllers/help_and_contact.php new file mode 100644 index 000000000..7aa5e723b --- /dev/null +++ b/htdocs/web_portal/controllers/help_and_contact.php @@ -0,0 +1,47 @@ +getCommunityDocs(); + if (!empty($communityDocs)) { + $params['communityDocs'] = $communityDocs; + } + + $helpdeskLink = $configService->getHelpdeskLink(); + if (!empty($helpdeskLink)) { + $params['helpdeskLink'] = $helpdeskLink; + } + + $requestTracker = $configService->getRequestTracker(); + if (!empty($requestTracker)) { + $params['requestTracker'] = $requestTracker; + } + + $title = "Doc, Help and Support"; + show_view('help_and_contact.php', $params, $title); +} diff --git a/htdocs/web_portal/static_php/operationalLinks.php b/htdocs/web_portal/static_php/operationalLinks.php deleted file mode 100644 index 264072712..000000000 --- a/htdocs/web_portal/static_php/operationalLinks.php +++ /dev/null @@ -1,13 +0,0 @@ -getCommunityDocs(); -$helpdeskLink = $configService->getHelpdeskLink(); -$requestTracker = $configService->getRequestTracker(); diff --git a/htdocs/web_portal/static_php/Help_And_Contact.php b/htdocs/web_portal/views/help_and_contact.php similarity index 90% rename from htdocs/web_portal/static_php/Help_And_Contact.php rename to htdocs/web_portal/views/help_and_contact.php index 1a4f3fabb..e025d8e88 100644 --- a/htdocs/web_portal/static_php/Help_And_Contact.php +++ b/htdocs/web_portal/views/help_and_contact.php @@ -1,7 +1,4 @@ -

Documentation, Help and Support


@@ -18,7 +15,7 @@

Need information?

Please browse your - + community documentation.

@@ -29,7 +26,7 @@ known bugs to see if this has not already been reported.
If not, please open a request in your - + community support desk or our @@ -44,7 +41,7 @@ GOCDB Development Plans.
Any suggestion, new feature or improvement request should be submitted to your - + community request tracker or our @@ -62,7 +59,7 @@ For all other enquiries including general questions, temporary problem reports or support requests please open a request in your - + community support desk.

From 542d18e7398fa5611eb1043f4bfcc37668fa785b Mon Sep 17 00:00:00 2001 From: rowan04 Date: Thu, 2 Mar 2023 10:41:11 +0000 Subject: [PATCH 8/9] Changes to files to work with the new view/controller setup for help_and_contact.php - change to menu.xml so that it uses correct index.php case - change index.php case to use the new view/controller setup - change search_ses.php to use the correct new link --- config/web_portal/menu.xml | 4 +- .../controllers/service_group/search_ses.php | 2 +- htdocs/web_portal/index.php | 59 ++----------------- 3 files changed, 8 insertions(+), 57 deletions(-) diff --git a/config/web_portal/menu.xml b/config/web_portal/menu.xml index 7547cc91a..1fb99cc1e 100644 --- a/config/web_portal/menu.xml +++ b/config/web_portal/menu.xml @@ -113,11 +113,11 @@ - + all Doc, Help & Support - index.php?Page_Type=Static_PHP&Page=Help_And_Contact + index.php?Page_Type=Help_And_Contact diff --git a/htdocs/web_portal/controllers/service_group/search_ses.php b/htdocs/web_portal/controllers/service_group/search_ses.php index 7ecc2ccb2..b8cff2741 100644 --- a/htdocs/web_portal/controllers/service_group/search_ses.php +++ b/htdocs/web_portal/controllers/service_group/search_ses.php @@ -47,7 +47,7 @@ function search_ses() { } catch(Exception $ex){ show_view( 'error.php', $ex->getMessage() . "

Please contact the " - . "" + . "" . "GOCDB support team if you need help with this issue."); } $params = array('ses' => $ses); diff --git a/htdocs/web_portal/index.php b/htdocs/web_portal/index.php index e5b75f048..1640c9715 100644 --- a/htdocs/web_portal/index.php +++ b/htdocs/web_portal/index.php @@ -208,10 +208,6 @@ function Draw_Page($Page_Type) { //rejectIfNotAuthenticated(); Draw_Static_HTML(); break; - case "Static_PHP": - //rejectIfNotAuthenticated(); - Draw_Static_PHP(); - break; case "Search": //rejectIfNotAuthenticated(); require_once __DIR__.'/controllers/search.php'; @@ -306,6 +302,11 @@ function Draw_Page($Page_Type) { require_once __DIR__.'/controllers/my_sites.php'; my_sites(); break; + case "Help_And_Contact"; + //rejectIfNotAuthenticated(); + require_once __DIR__.'/controllers/help_and_contact.php'; + help_and_contact(); + break; case "Edit_NGI": rejectIfNotAuthenticated(); require_once __DIR__.'/controllers/ngi/edit_ngi.php'; @@ -667,14 +668,6 @@ function Draw_Static_HTML() { } -/* Draws a static PHP HTML page */ -function Draw_Static_PHP() { - $PHP_Page_Name = Get_Static_PHP_Page_Name(); - $PHP_Page_Content = Get_Static_PHP_Page_Contents($PHP_Page_Name); - Draw_Standard_PHP_Page($PHP_Page_Content); -} - - /* Finds out if a static page has been requested. If it has, return * the page name, otherwise return a blank string. */ function Get_Static_Page_Name() { @@ -686,17 +679,6 @@ function Get_Static_Page_Name() { } -/* Finds out if a static php page has been requested. If it has, return - * the page name, otherwise return a blank string. */ -function Get_Static_PHP_Page_Name() { - if(!isset($_REQUEST['Page'])) { - return ""; - } else { - return $_REQUEST['Page'].'.php'; - } -} - - /* Get the contents of the static HTML page specified in $Page_Name * if the page name isn't specified then return a blank string */ function Get_Static_Page_Contents($Page_Name) { @@ -711,24 +693,6 @@ function Get_Static_Page_Contents($Page_Name) { } -/* Get the executed contents of the static PHP page specified in $PHP_Page_Name - * if the page name isn't specified then return a blank string */ -function Get_Static_PHP_Page_Contents($PHP_Page_Name) { - require_once __DIR__.'/components/Draw_Components/draw_page_components.php'; - $phpDir = __DIR__."/static_php"; - $Available_Static_Pages = Get_Directory_Contents($phpDir); - if(!isset($Available_Static_Pages[$PHP_Page_Name])) { - return ""; - } - // below returns the executed php file, not just the contents of the file - ob_start(); - include $phpDir."/".$PHP_Page_Name; - $PHP = ob_get_contents(); - ob_end_clean(); - return $PHP; -} - - /* Returns the contents of a specified directory name */ function Get_Directory_Contents($Directory_Name) { if ($File_Handle = opendir($Directory_Name)) @@ -754,19 +718,6 @@ function Draw_Standard_Page($Page_Content, $title=null) { } -/* Draws a standard GOCDB layout with the string $PHP_Page_Content in the - * right frame */ -function Draw_Standard_PHP_Page($PHP_Page_Content, $title=null) { - require_once __DIR__.'/components/Draw_Components/draw_page_components.php'; - $PHP = ""; - $PHP .= Get_Standard_Top_Section_HTML($title); - $PHP .= $PHP_Page_Content; - $PHP .= Get_Standard_Bottom_Section_HTML(); - echo $PHP; -} - - - /* Given the name of a file in the view directory, include it * as the body of a standard GOCDB page */ function show_view($view, $params=null, $title=null, $rawOutput=null) { From 2908314aa09ef350deb57c6e8a76c16d5b4aeba0 Mon Sep 17 00:00:00 2001 From: rowan04 Date: Thu, 2 Mar 2023 10:52:08 +0000 Subject: [PATCH 9/9] Change to pass code tests - adds missed \ in search_ses.php --- htdocs/web_portal/controllers/service_group/search_ses.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/web_portal/controllers/service_group/search_ses.php b/htdocs/web_portal/controllers/service_group/search_ses.php index b8cff2741..252efe10c 100644 --- a/htdocs/web_portal/controllers/service_group/search_ses.php +++ b/htdocs/web_portal/controllers/service_group/search_ses.php @@ -47,7 +47,7 @@ function search_ses() { } catch(Exception $ex){ show_view( 'error.php', $ex->getMessage() . "

Please contact the " - . "" + . "" . "GOCDB support team if you need help with this issue."); } $params = array('ses' => $ses);