-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into feature/FormBannerSupport
- Loading branch information
Showing
14 changed files
with
409 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,10 +2,12 @@ | |
|
|
||
| /** | ||
| * A helper InputField class for datetime-local, extends the datetime class for | ||
| * the time being as browser support for datetime-local is very poor. | ||
| * the time being (as)/(in case?) browser support for datetime-local is very poor. | ||
| * | ||
| * @author Adam Buckley <[email protected]> | ||
| */ | ||
| class DatetimeLocal extends \Html\Form\InputField\Datetime { | ||
|
|
||
| public $type = "datetime-local"; | ||
|
|
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -94,3 +94,5 @@ | |
| 'secret' => '', | ||
| ], | ||
| ]); | ||
|
|
||
| Config::set('system.use_api', true); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <?php | ||
| Config::set('tokens', array( | ||
| 'active' => true, | ||
| 'path' => 'system/modules', | ||
| 'topmenu' => false, | ||
| 'hooks' => [ | ||
| 'auth', | ||
| 'tokens' | ||
| ], | ||
| )); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| <?php | ||
|
|
||
| /**@author Derek Crannaford */ | ||
|
|
||
| class ApiOutputService extends DbService | ||
| { | ||
| // This function, having no apparent need for elaboration | ||
| // was retired for feature into 8.1, beware if you used it externally! | ||
| // public function useNoTemplate($w) | ||
| // { | ||
| // $w->setLayout(null); | ||
| // } | ||
|
|
||
| public function apiReturnCmfiveStyledHtml($w, $response) | ||
| { | ||
| $w->setLayout("layout-modal"); | ||
| $w->enqueueScript( | ||
| [ | ||
| "name" => "main.js", "uri" => "/system/templates/js/main.js", "weight" => 995 | ||
| ] | ||
| ); | ||
| $w->enqueueStyle( | ||
| [ | ||
| "name" => "foundation.css", "uri" => "/system/templates/js/foundation-5.5.0/css/foundation.css", "weight" => 1005 | ||
| ] | ||
| ); | ||
| // $w->enqueueStyle(array("name" => "style.css", "uri" => "/system/templates/css/style.css", "weight" => 1000)); | ||
| // $w->outputStyles(); | ||
| // $w->outputScripts(); | ||
| $w->out($response); | ||
| echo $w->_buffer; | ||
| exit(0); | ||
| } | ||
|
|
||
| public function apiReturnJsonResponse($response) | ||
| { | ||
| $this->w->setLayout(null); | ||
| http_response_code($response['status']); | ||
| // mark header for return content type JSON | ||
| if (substr($response['status'], 0, 1) == "2") { | ||
| header('Content-Type: application/json'); | ||
| } else { | ||
| LogService::getInstance($this->w)->info("API request rejected: " . $response['referer']); | ||
| // Don't need, already have set response code! | ||
| // header($_SERVER["SERVER_PROTOCOL"] . " " . $response['status'] . " " . $response['payload'][0]); | ||
| } | ||
|
|
||
| echo json_encode(['response' => $response]); | ||
| exit(0); | ||
| } | ||
|
|
||
| // JSON simple message | ||
| public function apiKeyedResponse($payload = [], $message = "Success", $status_code = "200") | ||
| { | ||
| $success = [ | ||
| 'status' => $status_code, | ||
| 'message' => $message, | ||
| 'payload' => $payload | ||
| ]; | ||
| $this->apiReturnJsonResponse($success); | ||
| } | ||
|
|
||
| // JSON simple message | ||
| public function apiSimpleResponse($detail = "", $message = "Success", $status_code = "200") | ||
| { | ||
| $payload[] = $detail; | ||
| $success = [ | ||
| 'status' => $status_code, | ||
| 'message' => $message, | ||
| 'payload' => $payload | ||
| ]; | ||
| $this->apiReturnJsonResponse($success); | ||
| } | ||
|
|
||
| // JSON nice fail message | ||
| public function apiFailMessage($source = "", $detail = "", $message = "Failure", $status_code = "500") | ||
| { | ||
| $payload[] = $detail; | ||
| $errors = [ | ||
| 'status' => $status_code, | ||
| 'referer' => $source, | ||
| 'message' => $message, | ||
| 'payload' => $payload | ||
| ]; | ||
| $this->apiReturnJsonResponse($errors); | ||
| } | ||
|
|
||
| // JSON nice refuse message | ||
| public function apiRefuseMessage($source = "", $detail = "", $message = "Unauthorised", $status_code = "403") | ||
| { | ||
| $payload[] = $detail; | ||
| $errors = [ | ||
| 'status' => $status_code, | ||
| 'referer' => $source, | ||
| 'message' => $message, | ||
| 'payload' => $payload | ||
| ]; | ||
|
|
||
| $this->apiReturnJsonResponse($errors); | ||
| } | ||
| } |
Oops, something went wrong.