Skip to content

Create a helper to read in a optional local_url to bypass the need to… #795

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

Merged
merged 5 commits into from
Aug 25, 2024
Merged

Create a helper to read in a optional local_url to bypass the need to… #795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8463eda
Create a helper to read in a optional local_url to bypass the need to…
Aug 23, 2024
0145701
Forgot something to make it work
Aug 23, 2024
2316331
Print the url just in the development version
winnieXY Aug 23, 2024
6ee6a95
Move the ?? into system/Core/Config.php to do not fail if the local_u…
Aug 23, 2024
90aac66
Move also the comment from the helper function to core/Config.php
Aug 23, 2024
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
5 changes: 4 additions & 1 deletion application/controllers/Cron.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,10 @@ public function run() {
echo "CRON: " . $cron->id . " -> is due: " . $isdue_result . "\n";
echo "CRON: " . $cron->id . " -> RUNNING...\n";

$url = base_url() . $cron->function;
$url = local_url() . $cron->function;
if (ENVIRONMENT == "development") {
echo "CRON: " . $cron->id . " -> URL: " . $url . "\n";
}

$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $url);
Expand Down
32 changes: 32 additions & 0 deletions system/core/Config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,38 @@ public function base_url($uri = '', $protocol = NULL)
return $base_url.$this->_uri_string($uri);
}

/**
* Local URL
*
* Returns local_url [. uri_string]
*
* If local_url is not defined return base_url instead.
*
* @uses CI_Config::_uri_string()
*
* @param string|string[] $uri URI string or an array of segments
* @param string $protocol
* @return string
*/
public function local_url($uri = '', $protocol = NULL)
{
$local_url = $this->slash_item('local_url') ?? $this->slash_item('base_url');
if (isset($protocol))
{
// For protocol-relative links
if ($protocol === '')
{
$local_url = substr($local_url, strpos($local_url, '//'));
}
else
{
$local_url = $protocol.substr($local_url, strpos($local_url, '://'));
}
}

return $local_url.$this->_uri_string($uri);
}

// -------------------------------------------------------------

/**
Expand Down
20 changes: 20 additions & 0 deletions system/helpers/url_helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,26 @@ function base_url($uri = '', $protocol = NULL)
}
}

if ( ! function_exists('local_url'))
{
/**
* Local URL
*
* For cornercases where you have no access to the base_url from
* within e.g. the docker container to the base_url use this url
* for cron jobs.
*
* @param string $uri
* @param string $protocol
* @return string
*/

function local_url($uri = '', $protocol = NULL)
{
return get_instance()->config->local_url($uri, $protocol);
}
}

// ------------------------------------------------------------------------

if ( ! function_exists('current_url'))
Expand Down