diff options
| author | zotlabs <mike@macgirvin.com> | 2018-03-02 01:01:30 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-03-02 01:03:14 -0800 |
| commit | dcfe9bc64f822af02021767bf8c70fbe9d847bda (patch) | |
| tree | 04e29f46f64965ab8b822745e4ed2262ab0921db /include | |
| parent | 8fd619da7178fa87352bb6f917aa569a96e323d2 (diff) | |
| download | volse-hubzilla-dcfe9bc64f822af02021767bf8c70fbe9d847bda.tar.gz volse-hubzilla-dcfe9bc64f822af02021767bf8c70fbe9d847bda.tar.bz2 volse-hubzilla-dcfe9bc64f822af02021767bf8c70fbe9d847bda.zip | |
background work for caldav integration continued, modify mod_follow to allow it to be called from ajax without redirecting.
Diffstat (limited to 'include')
| -rw-r--r-- | include/event.php | 22 | ||||
| -rw-r--r-- | include/follow.php | 15 |
2 files changed, 34 insertions, 3 deletions
diff --git a/include/event.php b/include/event.php index 1077a3c64..84a16e8be 100644 --- a/include/event.php +++ b/include/event.php @@ -1322,3 +1322,25 @@ function translate_type($type) { return [$type, t('Other') . ' (' . $type . ')']; } } + + +function cal_store_lowlevel($arr) { + + $store = [ + 'cal_aid' => ((array_key_exists('cal_aid',$arr)) ? $arr['cal_aid'] : 0), + 'cal_uid' => ((array_key_exists('cal_uid',$arr)) ? $arr['cal_uid'] : 0), + 'cal_hash' => ((array_key_exists('cal_hash',$arr)) ? $arr['cal_hash'] : ''), + 'cal_name' => ((array_key_exists('cal_name',$arr)) ? $arr['cal_name'] : ''), + 'uri' => ((array_key_exists('uri',$arr)) ? $arr['uri'] : ''), + 'logname' => ((array_key_exists('logname',$arr)) ? $arr['logname'] : ''), + 'pass' => ((array_key_exists('pass',$arr)) ? $arr['pass'] : ''), + 'ctag' => ((array_key_exists('ctag',$arr)) ? $arr['ctag'] : ''), + 'synctoken' => ((array_key_exists('synctoken',$arr)) ? $arr['synctoken'] : ''), + 'cal_types' => ((array_key_exists('cal_types',$arr)) ? $arr['cal_types'] : ''), + ]; + + return create_table_from_array('cal', $store); + +} + + diff --git a/include/follow.php b/include/follow.php index 0843802c5..a63fe66ea 100644 --- a/include/follow.php +++ b/include/follow.php @@ -88,9 +88,18 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) // Premium channel, set confirm before callback to avoid recursion - if(array_key_exists('connect_url',$j) && ($interactive) && (! $confirm)) - goaway(zid($j['connect_url'])); - + if(array_key_exists('connect_url',$j) && (! $confirm)) { + if($interactive) { + goaway(zid($j['connect_url'])); + } + else { + $result['message'] = t('Premium channel - please visit:') . ' ' . zid($j['connect_url']); + logger('mod_follow: ' . $result['message']); + return $result; + } + } + + // do we have an xchan and hubloc? // If not, create them. |