From a2cec8899ad191b47d116f4ea124be6bd5b05472 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 19 May 2016 22:26:37 -0700 Subject: daemon conversion continued... --- Zotlabs/Module/Admin.php | 4 ++-- Zotlabs/Module/Connect.php | 3 ++- Zotlabs/Module/Connedit.php | 10 +++++----- Zotlabs/Module/Events.php | 2 +- Zotlabs/Module/Follow.php | 5 ++--- Zotlabs/Module/Fsuggest.php | 2 +- Zotlabs/Module/Import.php | 4 ++-- Zotlabs/Module/Item.php | 4 ++-- Zotlabs/Module/Like.php | 4 ++-- Zotlabs/Module/Locs.php | 6 +++--- Zotlabs/Module/Mail.php | 2 +- Zotlabs/Module/Mood.php | 2 +- Zotlabs/Module/Prate.php | 2 +- Zotlabs/Module/Profile_photo.php | 4 ++-- Zotlabs/Module/Profiles.php | 2 +- Zotlabs/Module/Rate.php | 6 ++---- Zotlabs/Module/Settings.php | 2 +- Zotlabs/Module/Tagger.php | 2 +- 18 files changed, 32 insertions(+), 34 deletions(-) (limited to 'Zotlabs/Module') diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php index 4d052cdf8..0a167b273 100644 --- a/Zotlabs/Module/Admin.php +++ b/Zotlabs/Module/Admin.php @@ -1082,7 +1082,7 @@ class Admin extends \Zotlabs\Web\Controller { intval(PAGE_CENSORED), intval( $uid ) ); - proc_run('php','include/directory.php',$uid,'nopush'); + \Zotlabs\Daemon\Master::Summon(array('Directory',$uid,'nopush')); } notice( sprintf( tt("%s channel censored/uncensored", "%s channels censored/uncensored", count($channels)), count($channels)) ); } @@ -1141,7 +1141,7 @@ class Admin extends \Zotlabs\Web\Controller { intval($pflags), intval( $uid ) ); - proc_run('php','include/directory.php',$uid,'nopush'); + \Zotlabs\Daemon\Master::Summon(array('Directory',$uid,'nopush')); notice( sprintf( (($pflags & PAGE_CENSORED) ? t("Channel '%s' censored"): t("Channel '%s' uncensored")) , $channel[0]['channel_name'] . ' (' . $channel[0]['channel_address'] . ')' ) . EOL); }; break; diff --git a/Zotlabs/Module/Connect.php b/Zotlabs/Module/Connect.php index 6ef3577d7..382abf370 100644 --- a/Zotlabs/Module/Connect.php +++ b/Zotlabs/Module/Connect.php @@ -47,7 +47,8 @@ class Connect extends \Zotlabs\Web\Controller { intval(PAGE_PREMIUM), intval(local_channel()) ); - proc_run('php','include/notifier.php','refresh_all',\App::$data['channel']['channel_id']); + + \Zotlabs\Daemon\Master::Summon(array('Notifier','refresh_all',\App::$data['channel']['channel_id'])); } set_pconfig(\App::$data['channel']['channel_id'],'system','selltext',$text); // reload the page completely to get fresh data diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php index a1268510d..0820c76bf 100644 --- a/Zotlabs/Module/Connedit.php +++ b/Zotlabs/Module/Connedit.php @@ -176,7 +176,7 @@ class Connedit extends \Zotlabs\Web\Controller { $record = $z[0]['xlink_id']; } if($record) { - proc_run('php','include/ratenotif.php','rating',$record); + \Zotlabs\Daemon\Master::Summon(array('Ratenotif','rating',$record)); } } @@ -230,7 +230,7 @@ class Connedit extends \Zotlabs\Web\Controller { if(\App::$poi && \App::$poi['abook_my_perms'] != $abook_my_perms && (! intval(\App::$poi['abook_self']))) { - proc_run('php', 'include/notifier.php', (($new_friend) ? 'permission_create' : 'permission_update'), $contact_id); + \Zotlabs\Daemon\Master(array('Notifier', (($new_friend) ? 'permission_create' : 'permission_update'), $contact_id)); } if($new_friend) { @@ -283,7 +283,7 @@ class Connedit extends \Zotlabs\Web\Controller { // pull in a bit of content if there is any to pull in - proc_run('php','include/onepoll.php',$contact_id); + \Zotlabs\Daemon\Master::Summon(array('Onepoll',$contact_id)); } @@ -414,7 +414,7 @@ class Connedit extends \Zotlabs\Web\Controller { if($cmd === 'update') { // pull feed and consume it, which should subscribe to the hub. - proc_run('php',"include/poller.php","$contact_id"); + \Zotlabs\Daemon\Master::Summon(array('Poller',$contact_id)); goaway(z_root() . '/connedit/' . $contact_id); } @@ -427,7 +427,7 @@ class Connedit extends \Zotlabs\Web\Controller { else { // if you are on a different network we'll force a refresh of the connection basic info - proc_run('php','include/notifier.php','permission_update',$contact_id); + Zotlabs\Daemon\Master::Summon(array('Notifier','permission_update',$contact_id)); } goaway(z_root() . '/connedit/' . $contact_id); } diff --git a/Zotlabs/Module/Events.php b/Zotlabs/Module/Events.php index 9519ca11b..3440e0727 100644 --- a/Zotlabs/Module/Events.php +++ b/Zotlabs/Module/Events.php @@ -232,7 +232,7 @@ class Events extends \Zotlabs\Web\Controller { } if($share) - proc_run('php',"include/notifier.php","event","$item_id"); + \Zotlabs\Daemon\Master(array('Notifier','event',$item_id)); } diff --git a/Zotlabs/Module/Follow.php b/Zotlabs/Module/Follow.php index 1701328bf..1df382a89 100644 --- a/Zotlabs/Module/Follow.php +++ b/Zotlabs/Module/Follow.php @@ -53,14 +53,13 @@ class Follow extends \Zotlabs\Web\Controller { // If we can view their stream, pull in some posts if(($result['abook']['abook_their_perms'] & PERMS_R_STREAM) || ($result['abook']['xchan_network'] === 'rss')) - proc_run('php','include/onepoll.php',$result['abook']['abook_id']); + \Zotlabs\Daemon\Master::Summon(array('Onepoll',$result['abook']['abook_id'])); goaway(z_root() . '/connedit/' . $result['abook']['abook_id'] . '?f=&follow=1'); } - function get() { - + function get() { if(! local_channel()) { return login(); } diff --git a/Zotlabs/Module/Fsuggest.php b/Zotlabs/Module/Fsuggest.php index 143fd34e1..a371f9d21 100644 --- a/Zotlabs/Module/Fsuggest.php +++ b/Zotlabs/Module/Fsuggest.php @@ -61,7 +61,7 @@ class Fsuggest extends \Zotlabs\Web\Controller { intval($fsuggest_id), intval(local_channel()) ); - proc_run('php', 'include/notifier.php', 'suggest' , $fsuggest_id); + \Zotlabs\Daemon\Master::Summon(array('Notifier', 'suggest' , $fsuggest_id)); } info( t('Friend suggestion sent.') . EOL); diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php index dadbf8ff1..4e99155fb 100644 --- a/Zotlabs/Module/Import.php +++ b/Zotlabs/Module/Import.php @@ -496,11 +496,11 @@ class Import extends \Zotlabs\Web\Controller { // send out refresh requests // notify old server that it may no longer be primary. - proc_run('php','include/notifier.php','location',$channel['channel_id']); + \Zotlabs\Daemon\Master::Summon(array('Notifier','location',$channel['channel_id'])); // This will indirectly perform a refresh_all *and* update the directory - proc_run('php', 'include/directory.php', $channel['channel_id']); + \Zotlabs\Daemon\Master::Summon(array('Directory', $channel['channel_id'])); notice( t('Import completed.') . EOL); diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index 93570fdec..ff8510ade 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -901,7 +901,7 @@ class Item extends \Zotlabs\Web\Controller { } } if(! $nopush) - proc_run('php', "include/notifier.php", 'edit_post', $post_id); + \Zotlabs\Daemon\Master::Summon(array('Notifier', 'edit_post', $post_id)); if((x($_REQUEST,'return')) && strlen($return_path)) { logger('return: ' . $return_path); @@ -1008,7 +1008,7 @@ class Item extends \Zotlabs\Web\Controller { call_hooks('post_local_end', $datarray); if(! $nopush) - proc_run('php', 'include/notifier.php', $notify_type, $post_id); + \Zotlabs\Daemon\Master::Summon(array('Notifier', $notify_type, $post_id)); logger('post_complete'); diff --git a/Zotlabs/Module/Like.php b/Zotlabs/Module/Like.php index ac8791950..3ef67ddcc 100644 --- a/Zotlabs/Module/Like.php +++ b/Zotlabs/Module/Like.php @@ -346,7 +346,7 @@ class Like extends \Zotlabs\Web\Controller { // drop_item was not done interactively, so we need to invoke the notifier // in order to push the changes to connections - proc_run('php','include/notifier.php','drop',$rr['id']); + \Zotlabs\Daemon\Master::Summon(array('Notifier','drop',$rr['id'])); } @@ -531,7 +531,7 @@ class Like extends \Zotlabs\Web\Controller { } - proc_run('php',"include/notifier.php","like","$post_id"); + \Zotlabs\Daemon\Master::Summon(array('Notifier','like',$post_id)); if($interactive) { notice( t('Action completed.') . EOL); diff --git a/Zotlabs/Module/Locs.php b/Zotlabs/Module/Locs.php index 4b5d58df5..4b1e3ffe2 100644 --- a/Zotlabs/Module/Locs.php +++ b/Zotlabs/Module/Locs.php @@ -34,7 +34,7 @@ class Locs extends \Zotlabs\Web\Controller { dbesc($channel['channel_hash']) ); - proc_run('php','include/notifier.php','location',$channel['channel_id']); + \Zotlabs\Daemon\Master::Summon(array('Notifier','location',$channel['channel_id'])); return; } } @@ -72,7 +72,7 @@ class Locs extends \Zotlabs\Web\Controller { intval($hubloc_id), dbesc($channel['channel_hash']) ); - proc_run('php','include/notifier.php','location',$channel['channel_id']); + \Zotlabs\Daemon\Master::Summon(array('Notifier','location',$channel['channel_id'])); return; } } @@ -91,7 +91,7 @@ class Locs extends \Zotlabs\Web\Controller { $channel = \App::get_channel(); if($_REQUEST['sync']) { - proc_run('php','include/notifier.php','location',$channel['channel_id']); + \Zotlabs\Daemon\Master::Summon(array('Notifier','location',$channel['channel_id'])); info( t('Syncing locations') . EOL); goaway(z_root() . '/locs'); } diff --git a/Zotlabs/Module/Mail.php b/Zotlabs/Module/Mail.php index 35cb3b9bf..e6487d681 100644 --- a/Zotlabs/Module/Mail.php +++ b/Zotlabs/Module/Mail.php @@ -173,7 +173,7 @@ class Mail extends \Zotlabs\Web\Controller { build_sync_packet(local_channel(),array('mail' => encode_mail($x[0],true))); } - proc_run('php','include/notifier.php','mail',intval(argv(3))); + \Zotlabs\Daemon\Master::Summon(array('Notifier','mail',intval(argv(3)))); if($r) { info( t('Message recalled.') . EOL ); diff --git a/Zotlabs/Module/Mood.php b/Zotlabs/Module/Mood.php index b1007fd06..d1bd44526 100644 --- a/Zotlabs/Module/Mood.php +++ b/Zotlabs/Module/Mood.php @@ -97,7 +97,7 @@ class Mood extends \Zotlabs\Web\Controller { $item_id = $post['item_id']; if($item_id) { - proc_run('php',"include/notifier.php","activity", $item_id); + \Zotlabs\Daemon\Master::Summon(array('Notifier','activity', $item_id)); } call_hooks('post_local_end', $arr); diff --git a/Zotlabs/Module/Prate.php b/Zotlabs/Module/Prate.php index 65bbcca9a..2a8539ed0 100644 --- a/Zotlabs/Module/Prate.php +++ b/Zotlabs/Module/Prate.php @@ -85,7 +85,7 @@ class Prate extends \Zotlabs\Web\Controller { $record = $z[0]['xlink_id']; } if($record) { - proc_run('php','include/ratenotif.php','rating',$record); + \Zotlabs\Daemon\Master::Summon(array('Ratenotif','rating',$record)); } json_return_and_die(array('result' => true));; diff --git a/Zotlabs/Module/Profile_photo.php b/Zotlabs/Module/Profile_photo.php index 8f879503c..efcc7bece 100644 --- a/Zotlabs/Module/Profile_photo.php +++ b/Zotlabs/Module/Profile_photo.php @@ -179,7 +179,7 @@ class Profile_photo extends \Zotlabs\Web\Controller { info( t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL); // Update directory in background - proc_run('php',"include/directory.php",$channel['channel_id']); + \Zotlabs\Daemon\Master::Summon(array('Directory',$channel['channel_id'])); // Now copy profile-permissions to pictures, to prevent privacyleaks by automatically created folder 'Profile Pictures' @@ -311,7 +311,7 @@ class Profile_photo extends \Zotlabs\Web\Controller { ); profile_photo_set_profile_perms(); //Reset default photo permissions to public - proc_run('php','include/directory.php',local_channel()); + \Zotlabs\Daemon\Master::Summon(array('Directory',local_channel())); goaway(z_root() . '/profiles'); } diff --git a/Zotlabs/Module/Profiles.php b/Zotlabs/Module/Profiles.php index 72edf396f..3db089e53 100644 --- a/Zotlabs/Module/Profiles.php +++ b/Zotlabs/Module/Profiles.php @@ -584,7 +584,7 @@ class Profiles extends \Zotlabs\Web\Controller { if($is_default) { // reload the info for the sidebar widget - why does this not work? profile_load($a,$channel['channel_address']); - proc_run('php','include/directory.php',local_channel()); + \Zotlabs\Daemon\Master::Summon(array('Directory',local_channel())); } } } diff --git a/Zotlabs/Module/Rate.php b/Zotlabs/Module/Rate.php index e2c05b6d4..da23b840e 100644 --- a/Zotlabs/Module/Rate.php +++ b/Zotlabs/Module/Rate.php @@ -102,14 +102,12 @@ class Rate extends \Zotlabs\Web\Controller { } if($record) { - proc_run('php','include/ratenotif.php','rating',$record); + \Zotlabs\Daemon\Master::Summon(array('Ratenotif','rating',$record)); } } - - - function get() { + function get() { if(! local_channel()) { notice( t('Permission denied.') . EOL); diff --git a/Zotlabs/Module/Settings.php b/Zotlabs/Module/Settings.php index f588e2824..3d37faab6 100644 --- a/Zotlabs/Module/Settings.php +++ b/Zotlabs/Module/Settings.php @@ -543,7 +543,7 @@ class Settings extends \Zotlabs\Web\Controller { ); } - proc_run('php','include/directory.php',local_channel()); + \Zotlabs\Daemon\Master::Summon(array('Directory',local_channel())); build_sync_packet(); diff --git a/Zotlabs/Module/Tagger.php b/Zotlabs/Module/Tagger.php index 879cf3dbb..26d1c58ea 100644 --- a/Zotlabs/Module/Tagger.php +++ b/Zotlabs/Module/Tagger.php @@ -131,7 +131,7 @@ class Tagger extends \Zotlabs\Web\Controller { $ret = post_activity_item($arr); if($ret['success']) - proc_run('php','include/notifier.php','tag',$ret['activity']['id']); + \Zotlabs\Daemon\Master::Summon(array('Notifier','tag',$ret['activity']['id'])); killme(); -- cgit v1.2.3