diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-11-01 15:51:45 -0800 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-11-01 15:51:45 -0800 |
| commit | b62614bbd48151837e29ab56a53e683d2f4dcb01 (patch) | |
| tree | 0766bf0e7d27fb0a4ca7603e7447f4afbd2b1799 | |
| parent | a8cdbd44e8ab393cf24f2f36746c3382c1e63327 (diff) | |
| download | volse-hubzilla-b62614bbd48151837e29ab56a53e683d2f4dcb01.tar.gz volse-hubzilla-b62614bbd48151837e29ab56a53e683d2f4dcb01.tar.bz2 volse-hubzilla-b62614bbd48151837e29ab56a53e683d2f4dcb01.zip | |
improve /locs page with some field notes and the ability to do a forced sync
| -rw-r--r-- | include/notifier.php | 2 | ||||
| -rw-r--r-- | mod/locs.php | 12 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/tpl/locmanage.tpl | 11 |
4 files changed, 25 insertions, 2 deletions
diff --git a/include/notifier.php b/include/notifier.php index 0b29146c1..34a527e15 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -675,7 +675,7 @@ function notifier_run($argv, $argc){ dbesc(json_encode($encoded_item)) ); // only create delivery reports for normal undeleted items - if(array_key_exists('postopts',$target_item) && (! $target_item['item_deleted'])) { + if(is_array($target_item) && array_key_exists('postopts',$target_item) && (! $target_item['item_deleted'])) { q("insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_result, dreport_time, dreport_xchan, dreport_queue ) values ( '%s','%s','%s','%s','%s','%s','%s' ) ", dbesc($target_item['mid']), dbesc($hub['hubloc_host']), diff --git a/mod/locs.php b/mod/locs.php index 3c6a5da67..9f66e3263 100644 --- a/mod/locs.php +++ b/mod/locs.php @@ -35,6 +35,7 @@ function locs_post(&$a) { } } + if($_REQUEST['drop']) { $hubloc_id = intval($_REQUEST['drop']); @@ -85,6 +86,13 @@ function locs_content(&$a) { $channel = $a->get_channel(); + if($_REQUEST['sync']) { + proc_run('php','include/notifier.php','location',$channel['channel_id']); + info( t('Syncing locations') . EOL); + goaway(z_root() . '/locs'); + } + + $r = q("select * from hubloc where hubloc_hash = '%s'", dbesc($channel['channel_hash']) ); @@ -106,6 +114,10 @@ function locs_content(&$a) { '$mkprm' => t('Primary Location'), '$drop' => t('Drop location'), '$submit' => t('Submit'), + '$sync' => t('Sync now'), + '$sync_text' => t('Please wait several minutes between consecutive operations.'), + '$drop_text' => t('When possible, drop a location by logging into that website/hub and removing your channel.'), + '$last_resort' => t('Use this form to drop the location if the hub is no longer operating.'), '$hubs' => $r )); diff --git a/version.inc b/version.inc index 76b17ba98..820093fdc 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-10-31.1202 +2015-11-01.1203 diff --git a/view/tpl/locmanage.tpl b/view/tpl/locmanage.tpl index 970d13300..c94cf60a7 100644 --- a/view/tpl/locmanage.tpl +++ b/view/tpl/locmanage.tpl @@ -10,6 +10,15 @@ function drophub(id) { } </script> +<div class="descriptive-text">{{$sync_text}}</div> +<br /> +<div class="descriptive-text">{{$drop_text}}</div> +<div class="descriptive-text">{{$last_resort}}</div> +<br /> + + + + <table> <tr><td>{{$loc}}</td><td>{{$mkprm}}</td><td>{{$drop}}</td></tr> {{foreach $hubs as $hub}} @@ -25,3 +34,5 @@ function drophub(id) { {{/foreach}} </table> </div> +<div class="clear"></div> +<button class="btn btn-std" onclick="window.location.href='/locs/f=&sync=1'; return false;">{{$sync}}</button> |