mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 06:55:19 +00:00
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
This commit is contained in:
zotlabs
commit
62d6bada4c
2 changed files with 41 additions and 37 deletions
|
|
@ -24,34 +24,34 @@ class Display {
|
|||
$mobile_theme = ((x($_POST,'mobile_theme')) ? notags(trim($_POST['mobile_theme'])) : '');
|
||||
$preload_images = ((x($_POST,'preload_images')) ? intval($_POST['preload_images']) : 0);
|
||||
$user_scalable = ((x($_POST,'user_scalable')) ? intval($_POST['user_scalable']) : 0);
|
||||
$nosmile = ((x($_POST,'nosmile')) ? intval($_POST['nosmile']) : 0);
|
||||
$title_tosource = ((x($_POST,'title_tosource')) ? intval($_POST['title_tosource']) : 0);
|
||||
$nosmile = ((x($_POST,'nosmile')) ? intval($_POST['nosmile']) : 0);
|
||||
$title_tosource = ((x($_POST,'title_tosource')) ? intval($_POST['title_tosource']) : 0);
|
||||
$channel_list_mode = ((x($_POST,'channel_list_mode')) ? intval($_POST['channel_list_mode']) : 0);
|
||||
$network_list_mode = ((x($_POST,'network_list_mode')) ? intval($_POST['network_list_mode']) : 0);
|
||||
$manual_update = ((array_key_exists('manual_update',$_POST)) ? intval($_POST['manual_update']) : 0);
|
||||
|
||||
|
||||
$channel_divmore_height = ((x($_POST,'channel_divmore_height')) ? intval($_POST['channel_divmore_height']) : 400);
|
||||
if($channel_divmore_height < 50)
|
||||
$channel_divmore_height = 50;
|
||||
$network_divmore_height = ((x($_POST,'network_divmore_height')) ? intval($_POST['network_divmore_height']) : 400);
|
||||
if($network_divmore_height < 50)
|
||||
$network_divmore_height = 50;
|
||||
|
||||
|
||||
$browser_update = ((x($_POST,'browser_update')) ? intval($_POST['browser_update']) : 0);
|
||||
$browser_update = $browser_update * 1000;
|
||||
if($browser_update < 10000)
|
||||
$browser_update = 10000;
|
||||
|
||||
|
||||
$itemspage = ((x($_POST,'itemspage')) ? intval($_POST['itemspage']) : 20);
|
||||
if($itemspage > 100)
|
||||
$itemspage = 100;
|
||||
|
||||
if ($mobile_theme == "---")
|
||||
|
||||
if ($mobile_theme == "---")
|
||||
del_pconfig(local_channel(),'system','mobile_theme');
|
||||
else {
|
||||
set_pconfig(local_channel(),'system','mobile_theme',$mobile_theme);
|
||||
}
|
||||
|
||||
|
||||
set_pconfig(local_channel(),'system','preload_images',$preload_images);
|
||||
set_pconfig(local_channel(),'system','user_scalable',$user_scalable);
|
||||
set_pconfig(local_channel(),'system','update_interval', $browser_update);
|
||||
|
|
@ -63,7 +63,7 @@ class Display {
|
|||
set_pconfig(local_channel(),'system','channel_divmore_height', $channel_divmore_height);
|
||||
set_pconfig(local_channel(),'system','network_divmore_height', $network_divmore_height);
|
||||
set_pconfig(local_channel(),'system','manual_conversation_update', $manual_update);
|
||||
|
||||
|
||||
$newschema = '';
|
||||
if($theme){
|
||||
// call theme_post only if theme has not been changed
|
||||
|
|
@ -76,7 +76,7 @@ class Display {
|
|||
if(array_key_exists($_POST['schema'],$schemas))
|
||||
$newschema = $_POST['schema'];
|
||||
if($newschema === '---')
|
||||
$newschema = '';
|
||||
$newschema = '';
|
||||
$theme_config->post();
|
||||
}
|
||||
}
|
||||
|
|
@ -85,18 +85,18 @@ class Display {
|
|||
logger('theme: ' . $theme . (($newschema) ? ':' . $newschema : ''));
|
||||
|
||||
$_SESSION['theme'] = $theme . (($newschema) ? ':' . $newschema : '');
|
||||
|
||||
|
||||
$r = q("UPDATE channel SET channel_theme = '%s' WHERE channel_id = %d",
|
||||
dbesc($theme . (($newschema) ? ':' . $newschema : '')),
|
||||
intval(local_channel())
|
||||
);
|
||||
|
||||
|
||||
call_hooks('display_settings_post', $_POST);
|
||||
build_sync_packet();
|
||||
goaway(z_root() . '/settings/display' );
|
||||
return; // NOTREACHED
|
||||
}
|
||||
|
||||
|
||||
|
||||
function get() {
|
||||
|
||||
|
|
@ -115,16 +115,16 @@ class Display {
|
|||
$default_mobile_theme = get_config('system','mobile_theme');
|
||||
if(! $mobile_default_theme)
|
||||
$mobile_default_theme = 'none';
|
||||
|
||||
|
||||
$allowed_themes_str = get_config('system','allowed_themes');
|
||||
$allowed_themes_raw = explode(',',$allowed_themes_str);
|
||||
$allowed_themes = array();
|
||||
if(count($allowed_themes_raw))
|
||||
foreach($allowed_themes_raw as $x)
|
||||
foreach($allowed_themes_raw as $x)
|
||||
if(strlen(trim($x)) && is_dir("view/theme/$x"))
|
||||
$allowed_themes[] = trim($x);
|
||||
|
||||
|
||||
|
||||
$themes = array();
|
||||
$files = glob('view/theme/*');
|
||||
if($allowed_themes) {
|
||||
|
|
@ -144,7 +144,7 @@ class Display {
|
|||
$is_library = file_exists('view/theme/'. $th . '/library');
|
||||
$mobile_themes['---'] = t("No special theme for mobile devices");
|
||||
|
||||
if (!$is_experimental or ($is_experimental && (get_config('experimentals','exp_themes')==1 or get_config('experimentals','exp_themes')===false))){
|
||||
if (!$is_experimental or ($is_experimental && (get_config('experimentals','exp_themes')==1 or get_config('experimentals','exp_themes')===false))){
|
||||
$theme_name = (($is_experimental) ? sprintf(t('%s - (Experimental)'), $f) : $f);
|
||||
if (! $is_library) {
|
||||
if($is_mobile) {
|
||||
|
|
@ -160,26 +160,30 @@ class Display {
|
|||
|
||||
$theme_selected = ((array_key_exists('theme',$_SESSION) && $_SESSION['theme']) ? $_SESSION['theme'] : $theme);
|
||||
|
||||
if (strpos($theme_selected, ':')) {
|
||||
$theme_selected = explode(':', $theme_selected)[0];
|
||||
}
|
||||
|
||||
$mobile_theme_selected = (!x($_SESSION,'mobile_theme')? $default_mobile_theme : $_SESSION['mobile_theme']);
|
||||
|
||||
|
||||
$preload_images = get_pconfig(local_channel(),'system','preload_images');
|
||||
$preload_images = (($preload_images===false)? '0': $preload_images); // default if not set: 0
|
||||
|
||||
|
||||
$user_scalable = get_pconfig(local_channel(),'system','user_scalable');
|
||||
$user_scalable = (($user_scalable===false)? '0': $user_scalable); // default if not set: 0
|
||||
|
||||
|
||||
$browser_update = intval(get_pconfig(local_channel(), 'system','update_interval'));
|
||||
$browser_update = (($browser_update == 0) ? 80 : $browser_update / 1000); // default if not set: 40 seconds
|
||||
|
||||
|
||||
$itemspage = intval(get_pconfig(local_channel(), 'system','itemspage'));
|
||||
$itemspage = (($itemspage > 0 && $itemspage < 101) ? $itemspage : 20); // default if not set: 20 items
|
||||
|
||||
|
||||
$nosmile = get_pconfig(local_channel(),'system','no_smilies');
|
||||
$nosmile = (($nosmile===false)? '0': $nosmile); // default if not set: 0
|
||||
|
||||
|
||||
$title_tosource = get_pconfig(local_channel(),'system','title_tosource');
|
||||
$title_tosource = (($title_tosource===false)? '0': $title_tosource); // default if not set: 0
|
||||
|
||||
|
||||
$theme_config = "";
|
||||
if(($themeconfigfile = $this->get_theme_config_file($theme)) != null){
|
||||
require_once($themeconfigfile);
|
||||
|
|
@ -192,18 +196,18 @@ class Display {
|
|||
}
|
||||
|
||||
// logger('schemas: ' . print_r($schemas,true));
|
||||
|
||||
|
||||
$tpl = get_markup_template("settings_display.tpl");
|
||||
$o = replace_macros($tpl, array(
|
||||
'$ptitle' => t('Display Settings'),
|
||||
'$d_tset' => t('Theme Settings'),
|
||||
'$d_ctset' => t('Custom Theme Settings'),
|
||||
'$d_tset' => t('Theme Settings'),
|
||||
'$d_ctset' => t('Custom Theme Settings'),
|
||||
'$d_cset' => t('Content Settings'),
|
||||
'$form_security_token' => get_form_security_token("settings_display"),
|
||||
'$submit' => t('Submit'),
|
||||
'$baseurl' => z_root(),
|
||||
'$uid' => local_channel(),
|
||||
|
||||
|
||||
'$theme' => (($themes) ? array('theme', t('Display Theme:'), $theme_selected, '', $themes, 'preview') : false),
|
||||
'$schema' => array('schema', t('Select scheme'), $existing_schema, '' , $schemas),
|
||||
|
||||
|
|
@ -222,11 +226,11 @@ class Display {
|
|||
'$network_list_mode' => array('network_list_mode', t('Use blog/list mode on grid page'), get_pconfig(local_channel(),'system','network_list_mode'), t('(comments displayed separately)'), $yes_no),
|
||||
'$channel_divmore_height' => array('channel_divmore_height', t('Channel page max height of content (in pixels)'), ((get_pconfig(local_channel(),'system','channel_divmore_height')) ? get_pconfig(local_channel(),'system','channel_divmore_height') : 400), t('click to expand content exceeding this height')),
|
||||
'$network_divmore_height' => array('network_divmore_height', t('Grid page max height of content (in pixels)'), ((get_pconfig(local_channel(),'system','network_divmore_height')) ? get_pconfig(local_channel(),'system','network_divmore_height') : 400) , t('click to expand content exceeding this height')),
|
||||
|
||||
|
||||
|
||||
|
||||
));
|
||||
|
||||
call_hooks('display_settings',$o);
|
||||
call_hooks('display_settings',$o);
|
||||
return $o;
|
||||
}
|
||||
|
||||
|
|
@ -234,10 +238,10 @@ class Display {
|
|||
function get_theme_config_file($theme){
|
||||
|
||||
$base_theme = \App::$theme_info['extends'];
|
||||
|
||||
|
||||
if (file_exists("view/theme/$theme/php/config.php")){
|
||||
return "view/theme/$theme/php/config.php";
|
||||
}
|
||||
}
|
||||
if (file_exists("view/theme/$base_theme/php/config.php")){
|
||||
return "view/theme/$base_theme/php/config.php";
|
||||
}
|
||||
|
|
@ -246,5 +250,5 @@ class Display {
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -170,9 +170,9 @@ EOT;
|
|||
|
||||
if(local_channel()) {
|
||||
|
||||
$nav['network'] = array('network', t('Grid'), "", t('Your grid'),'network_nav_btn');
|
||||
$nav['network']['all'] = [ 'network', t('View your network/grid'), '','' ];
|
||||
$nav['network']['mark'] = array('', t('Mark all grid notifications seen'), '','');
|
||||
$nav['network'] = array('network', t('Activity'), "", t('Network Activity'),'network_nav_btn');
|
||||
$nav['network']['all'] = [ 'network', t('View your network activity'), '','' ];
|
||||
$nav['network']['mark'] = array('', t('Mark all activity notifications seen'), '','');
|
||||
|
||||
$nav['home'] = array('channel/' . $channel['channel_address'], t('Channel Home'), "", t('Channel home'),'home_nav_btn');
|
||||
$nav['home']['all'] = [ 'channel/' . $channel['channel_address'], t('View your channel home'), '' , '' ];
|
||||
|
|
|
|||
Loading…
Reference in a new issue