harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert manual page updates to a display setting instead of a feature

Browse Source
This commit is contained in:
zotlabs 2016-11-02 18:40:50 -07:00
parent 6a6494d947
commit 9e2ccbd2a7
9 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Channel.php
View File

@ -111,7 +111,7 @@ class Channel extends \Zotlabs\Web\Controller {
if(! $update) {
$static = intval(feature_enabled(\App::$profile['profile_uid'],'static_updates'));
$static = channel_manual_conv_update(\App::$profile['profile_uid']);
$o .= profile_tabs($a, $is_owner, \App::$profile['channel_address']);

2
Zotlabs/Module/Display.php
View File

@ -138,7 +138,7 @@ class Display extends \Zotlabs\Web\Controller {
if((! $update) && (! $load)) {
$static = ((local_channel()) ? intval(feature_enabled(local_channel(),'static_updates')) : 0);
$static = ((local_channel()) ? channel_manual_conv_update(local_channel()) : 0);
$o .= '<div id="live-display"></div>' . "\r\n";
$o .= "<script> var profile_uid = " . ((intval(local_channel())) ? local_channel() : (-1))

2
Zotlabs/Module/Network.php
View File

@ -188,7 +188,7 @@ class Network extends \Zotlabs\Web\Controller {
$status_editor = status_editor($a,$x);
$o .= $status_editor;
$static = intval(feature_enabled(local_channel(),'static_updates'));
$static = channel_manual_conv_update(local_channel());
}

2
Zotlabs/Module/Pubstream.php
View File

@ -27,7 +27,7 @@ class Pubstream extends \Zotlabs\Web\Controller {
if(! $update) {
$static = ((local_channel()) ? intval(feature_enabled(local_channel(),'static_updates')) : 0);
$static = ((local_channel()) ? channel_manual_conv_update(local_channel()) : 0);
$maxheight = get_config('system','home_divmore_height');
if(! $maxheight)

2
Zotlabs/Module/Search.php
View File

@ -101,7 +101,7 @@ class Search extends \Zotlabs\Web\Controller {
if((! $update) && (! $load)) {
$static = ((local_channel()) ? intval(feature_enabled(local_channel(),'static_updates')) : 0);
$static = ((local_channel()) ? channel_manual_conv_update(local_channel()) : 0);
// This is ugly, but we can't pass the profile_uid through the session to the ajax updater,

3
Zotlabs/Module/Settings/Display.php
View File

@ -28,6 +28,7 @@ class Display {
$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)
@ -61,6 +62,7 @@ class Display {
set_pconfig(local_channel(),'system','network_list_mode', $network_list_mode);
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 == $existing_theme){
@ -204,6 +206,7 @@ class Display {
'$ajaxint' => array('browser_update', t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds, no maximum')),
'$itemspage' => array('itemspage', t("Maximum number of conversations to load at any time:"), $itemspage, t('Maximum of 100 items')),
'$nosmile' => array('nosmile', t("Show emoticons (smilies) as images"), 1-intval($nosmile), '', $yes_no),
'$manual_update' => array('manual_update', t('Manual conversation updates'), channel_manual_conv_update(local_channel()), t('Default is automatic, which may increase screen jumping'), $yes_no),
'$title_tosource' => array('title_tosource', t("Link post titles to source"), $title_tosource, '', $yes_no),
'$layout_editor' => t('System Page Layout Editor - (advanced)'),
'$theme_config' => $theme_config,

11
include/channel.php
View File

@ -1930,4 +1930,15 @@ function channel_reddress($channel) {
return '';
return strtolower($channel['channel_address'] . '@' . App::get_hostname());
}
function channel_manual_conv_update($channel_id) {
$x = get_pconfig($channel_id, 'system','manual_conversation_update');
if($x === false)
$x = get_config('system','manual_conversation_update');
return intval($x);
}

9
include/features.php
View File

@ -157,15 +157,6 @@ function get_features($filtered = true) {
feature_level('smart_birthdays',2),
],
[
'static_updates',
t('Manual Page Updates'),
t('Off = automatically update changing conversations. On = Wait until the page is re-loaded.'),
false,
get_config('feature_lock','static_updates'),
feature_level('static_updates',1),
],
[
'advanced_dirsearch',
t('Advanced Directory Search'),

1
view/tpl/settings_display.tpl
View File

@ -69,6 +69,7 @@
{{include file="field_checkbox.tpl" field=$network_list_mode}}
{{include file="field_checkbox.tpl" field=$user_scalable}}
{{include file="field_checkbox.tpl" field=$preload_images}}
{{include file="field_checkbox.tpl" field=$manual_update}}
{{if $expert}}
<div class="form-group">
<a class="btn btn-default "href="pdledit">{{$layout_editor}}</a>