Skip to content

Commit

Permalink
WIP login ui:
Browse files Browse the repository at this point in the history
- Move login.json file into pixelegg
- Include icons into json file
  • Loading branch information
hnategh committed May 3, 2021
1 parent 1d843ea commit 635ca0a
Show file tree
Hide file tree
Showing 3 changed files with 95 additions and 94 deletions.
92 changes: 0 additions & 92 deletions api/setup/login.json

This file was deleted.

4 changes: 2 additions & 2 deletions api/src/Framework/Login.php
Expand Up @@ -306,10 +306,10 @@ static function get_apps_node()
{
if (!($json = Api\Cache::getCache(Api\Cache::TREE, __CLASS__, 'egw_login_json')))
{
$json = file_get_contents('https://www.egroupware.org/egw_login_feed.json',
$json = file_get_contents('https://www.egroupware.org/pixelegg/login/login.json',
false, Api\Framework::proxy_context());
// Fallback login.json
if (!$json) $json = file_get_contents('api/setup/login.json');
if (!$json) $json = file_get_contents('pixelegg/login/login.json');
// Cache the json object for a day
Api\Cache::setCache(Api\Cache::TREE, __CLASS__, 'egw_login_json', $json, 86400);
}
Expand Down

0 comments on commit 635ca0a

Please sign in to comment.