mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-21 13:55:17 +00:00
Merge branch 'dev' of /home/macgirvin/roadhouse into dev
This commit is contained in:
commit
0ea8773847
4 changed files with 10 additions and 4 deletions
|
@ -42,7 +42,7 @@ class System {
|
||||||
|
|
||||||
|
|
||||||
static public function get_project_version() {
|
static public function get_project_version() {
|
||||||
if((! array_path_exists('system/hide_version', App::$config)) || App::$config['system']['hide_version'])
|
if(array_path_exists('system/hide_version', App::$config) && intval(App::$config['system']['hide_version']))
|
||||||
return '';
|
return '';
|
||||||
if(is_array(App::$config) && is_array(App::$config['system']) && array_key_exists('std_version',App::$config['system']))
|
if(is_array(App::$config) && is_array(App::$config['system']) && array_key_exists('std_version',App::$config['system']))
|
||||||
return App::$config['system']['std_version'];
|
return App::$config['system']['std_version'];
|
||||||
|
|
|
@ -7,7 +7,7 @@ class Sites extends \Zotlabs\Web\Controller {
|
||||||
|
|
||||||
function get() {
|
function get() {
|
||||||
|
|
||||||
$sql_extra = (($_REQUEST['project']) ? " and site_project = '" . escape_tags(protect_sprintf(escape_tags($_REQUEST['project']))) . "' " : "");
|
$sql_extra = (($_REQUEST['project']) ? " and site_project = '" . escape_tags(protect_sprintf(dbesc($_REQUEST['project']))) . "' " : "");
|
||||||
|
|
||||||
$desc = t('This page provides information about related projects and websites that are currently known to this system. These are a small fraction of the thousands of websites and dozens of projects and providers which make up the fediverse.');
|
$desc = t('This page provides information about related projects and websites that are currently known to this system. These are a small fraction of the thousands of websites and dozens of projects and providers which make up the fediverse.');
|
||||||
|
|
||||||
|
|
2
boot.php
2
boot.php
|
@ -16,7 +16,7 @@ use Zotlabs\Daemon\Run;
|
||||||
* @brief This file defines some global constants and includes the central App class.
|
* @brief This file defines some global constants and includes the central App class.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
define ( 'STD_VERSION', '21.03.31' );
|
define ( 'STD_VERSION', '21.04.02' );
|
||||||
define ( 'ZOT_REVISION', '10.0' );
|
define ( 'ZOT_REVISION', '10.0' );
|
||||||
|
|
||||||
define ( 'DB_UPDATE_VERSION', 1247 );
|
define ( 'DB_UPDATE_VERSION', 1247 );
|
||||||
|
|
|
@ -1588,10 +1588,16 @@ function format_filer(&$item) {
|
||||||
function generate_map($coord) {
|
function generate_map($coord) {
|
||||||
|
|
||||||
$coord = str_replace(array(',','/',' '),array(' ',' ',' '),trim($coord));
|
$coord = str_replace(array(',','/',' '),array(' ',' ',' '),trim($coord));
|
||||||
$zoom = substr($coord,strpos($coord,'?z=')+3);
|
|
||||||
|
|
||||||
|
$zoom = ((strpos($coord,'?z=') !== false) ? substr($coord,strpos($coord,'?z=')+3) : 0);
|
||||||
|
|
||||||
if ($zoom) {
|
if ($zoom) {
|
||||||
$coord = substr($coord,0,strpos($coord,'?'));
|
$coord = substr($coord,0,strpos($coord,'?'));
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
$zoom = 16;
|
||||||
|
}
|
||||||
|
|
||||||
$arr = [
|
$arr = [
|
||||||
'lat' => trim(substr($coord, 0, strpos($coord, ' '))),
|
'lat' => trim(substr($coord, 0, strpos($coord, ' '))),
|
||||||
|
|
Loading…
Reference in a new issue