diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/dfrn_request.php | 10 | ||||
| -rw-r--r-- | mod/events.php | 216 | ||||
| -rw-r--r-- | mod/follow.php | 5 | ||||
| -rw-r--r-- | mod/install.php | 5 | ||||
| -rw-r--r-- | mod/salmon.php | 5 | ||||
| -rw-r--r-- | mod/settings.php | 3 | ||||
| -rw-r--r-- | mod/viewcontacts.php | 13 |
7 files changed, 247 insertions, 10 deletions
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 537a7a497..338dc9cf1 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -626,19 +626,21 @@ function dfrn_request_content(&$a) { else $tpl = get_markup_template('auto_request.tpl'); + $prv = get_config('system','strict_privacy'); + $o .= replace_macros($tpl,array( '$header' => t('Friend/Connection Request'), - '$desc' => t('Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca'), + '$desc' => t('Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo') . (($prv) ? ', testuser@identi.ca' : ''), '$pls_answer' => t('Please answer the following:'), - '$does_know' => t('Does $name know you?'), + '$does_know' => sprintf( t('Does %s know you?'),$a->profile['name']), '$yes' => t('Yes'), '$no' => t('No'), '$add_note' => t('Add a personal note:'), '$page_desc' => t("Please enter your 'Identity Address' from one of the following supported social networks:"), '$friendika' => t('Friendika'), - '$statusnet' => t('StatusNet/Federated Social Web'), + '$statusnet' => (($prv) ? t('StatusNet/Federated Social Web') : ''), '$private_net' => t("Private \x28secure\x29 network"), - '$public_net' => t("Public \x28insecure\x29 network"), + '$public_net' => (($prv) ? t("Public \x28insecure\x29 network") : ''), '$your_address' => t('Your Identity Address:'), '$submit' => t('Submit Request'), '$cancel' => t('Cancel'), diff --git a/mod/events.php b/mod/events.php new file mode 100644 index 000000000..293e9a260 --- /dev/null +++ b/mod/events.php @@ -0,0 +1,216 @@ +<?php + +require_once('include/datetime.php'); +require_once('include/event.php'); + +function events_post(&$a) { + + if(! local_user()) + return; + + $event_id = ((x($_POST,'event_id')) ? intval($_POST['event_id']) : 0); + $uid = local_user(); + $startyear = intval($_POST['startyear']); + $startmonth = intval($_POST['startmonth']); + $startday = intval($_POST['startday']); + $starthour = intval($_POST['starthour']); + $startminute = intval($_POST['startminute']); + + $finishyear = intval($_POST['finishyear']); + $finishmonth = intval($_POST['finishmonth']); + $finishday = intval($_POST['finishday']); + $finishhour = intval($_POST['finishhour']); + $finishminute = intval($_POST['finishminute']); + + $adjust = intval($_POST['adjust']); + + + $start = sprintf('%d-%d-%d %d:%d:0',$startyear,$startmonth,$startday,$starthour,$startminute); + $finish = sprintf('%d-%d-%d %d:%d:0',$finishyear,$finishmonth,$finishday,$finishhour,$finishminute); + + if($adjust) { + $start = datetime_convert(date_default_timezone_get(),'UTC',$start); + $finish = datetime_convert(date_default_timezone_get(),'UTC',$finish); + } + else { + $start = datetime_convert('UTC','UTC',$start); + $finish = datetime_convert('UTC','UTC',$finish); + } + + + $desc = escape_tags($_POST['desc']); + $location = escape_tags($_POST['location']); + $type = 'event'; + + $str_group_allow = perms2str($_POST['group_allow']); + $str_contact_allow = perms2str($_POST['contact_allow']); + $str_group_deny = perms2str($_POST['group_deny']); + $str_contact_deny = perms2str($_POST['contact_deny']); + +dbg(1); + if($event_id) { + $r = q("UPDATE `event` SET + `edited` = '%s', + `start` = '%s', + `finish` = '%s', + `desc` = '%s', + `location` = '%s', + `type` = '%s', + `adjust` = %d, + `allow_cid` = '%s', + `allow_gid` = '%s', + `deny_cid` = '%s', + `deny_gid` = '%s' + WHERE `id` = %d AND `uid` = %d LIMIT 1", + + dbesc(datetime_convert()), + dbesc($start), + dbesc($finish), + dbesc($desc), + dbesc($location), + dbesc($type), + intval($adjust), + dbesc($str_contact_allow), + dbesc($str_group_allow), + dbesc($str_contact_deny), + dbesc($str_group_deny), + intval($event_id), + intval($local_user()) + ); + + } + else { + + $uri = item_new_uri($a->get_hostname(),local_user()); + + $r = q("INSERT INTO `event` ( `uid`,`uri`,`created`,`edited`,`start`,`finish`,`desc`,`location`,`type`, + `adjust`,`allow_cid`,`allow_gid`,`deny_cid`,`deny_gid`) + VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s' ) ", + intval(local_user()), + dbesc($uri), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc($start), + dbesc($finish), + dbesc($desc), + dbesc($location), + dbesc($type), + intval($adjust), + dbesc($str_contact_allow), + dbesc($str_group_allow), + dbesc($str_contact_deny), + dbesc($str_group_deny) + + ); + } + +} + + + +function events_content(&$a) { + + if(! local_user()) { + notice( t('Permission denied.') . EOL); + return; + } + + $o .= '<h2>' . t('Events') . '</h2>'; + + $mode = 'view'; + $y = 0; + $m = 0; + + if($a->argc > 1) { + if($a->argc > 2 && $a->argv[1] == 'event') { + $mode = 'edit'; + $event_id = intval($a->argv[2]); + } + if($a->argv[1] === 'new') { + $mode = 'new'; + $event_id = 0; + } + if($a->argc > 2 && intval($a->argv[1]) && intval($a->argv[2])) { + $mode = 'view'; + $y = intval($a->argv[1]); + $m = intval($a->argv[2]); + } + } + + if($mode == 'view') { + $thisyear = datetime_convert('UTC',date_default_timezone_get(),'now','Y'); + $thismonth = datetime_convert('UTC',date_default_timezone_get(),'now','m'); + if(! $y) + $y = intval($thisyear); + if(! $m) + $m = intval($thismonth); + + $nextyear = $y; + $nextmonth = $m + 1; + if($nextmonth > 12) { + $nextmonth = 1; + $nextyear ++; + } + + $prevyear = $y; + if($m > 1) + $prevmonth = $m - 1; + else { + $prevmonth = 12; + $prevyear --; + } + + + $o .= '<a href="' . $a->get_baseurl() . '/events/' . $prevyear . '/' . $prevmonth . '" class="prevcal">' . t('<< Previous') . '</a> | <a href="' . $a->get_baseurl() . '/events/' . $nextyear . '/' . $nextmonth . '" class="nextcal">' . t('Next >>') . '</a>'; + $o .= cal($y,$m,false, ' eventcal'); + + $dim = get_dim($y,$m); + $start = sprintf('%d-%d-%d %d:%d:%d',$y,$m,1,0,0,0); + $finish = sprintf('%d-%d-%d %d:%d:%d',$y,$m,$dim,23,59,59); + + + $r = q("SELECT * FROM `event` WHERE `start` >= '%s' AND `finish` <= '%s' AND `uid` = %d ", + dbesc($start), + dbesc($finish), + intval(local_user()) + ); + + if(count($r)) + foreach($r as $rr) + $o .= format_event_html($rr); + + return $o; + } + + if($mode === 'edit' || $mode === 'new') { + $htpl = get_markup_template('profed_head.tpl'); + $a->page['htmlhead'] .= replace_macros($htpl,array('$baseurl' => $a->get_baseurl())); + + $tpl = get_markup_template('event_form.tpl'); + + $year = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y'); + $month = datetime_convert('UTC', date_default_timezone_get(), 'now', 'm'); + $day = datetime_convert('UTC', date_default_timezone_get(), 'now', 'd'); + + $o .= replace_macros($tpl,array( + '$post' => $a->get_baseurl() . '/events', + '$e_text' => t('Event details'), + '$s_text' => t('Start: year-month-day hour:minute'), + '$s_dsel' => datesel('start',$year+5,$year,false,$year,$month,$day), + '$s_tsel' => timesel('start',0,0), + '$f_text' => t('Finish: year-month-day hour:minute'), + '$f_dsel' => datesel('finish',$year+5,$year,false,$year,$month,$day), + '$f_tsel' => timesel('finish',0,0), + '$a_text' => t('Adjust for viewer timezone'), + '$a_checked' => '', + '$d_text' => t('Description:'), + '$d_orig' => '', + '$l_text' => t('Location:'), + '$l_orig' => '', + '$submit' => t('Submit') + + )); + + return $o; + } +}
\ No newline at end of file diff --git a/mod/follow.php b/mod/follow.php index 9a9f9da7d..31cfcfb64 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -22,10 +22,8 @@ function follow_post(&$a) { // NOTREACHED } - $ret = probe_url($url); - if($ret['network'] === NETWORK_DFRN) { if(strlen($a->path)) $myaddr = bin2hex($a->get_baseurl() . '/profile/' . $a->user['nickname']); @@ -36,6 +34,9 @@ function follow_post(&$a) { // NOTREACHED } + elseif(get_config('system','strict_privacy')) { + unset($ret['notify']); + } // do we have enough information? diff --git a/mod/install.php b/mod/install.php index 35c2b3dae..b9deb6114 100644 --- a/mod/install.php +++ b/mod/install.php @@ -194,7 +194,10 @@ function check_funcs() { if(! function_exists('openssl_public_encrypt')) notice( t('Error: openssl PHP module required but not installed.') . EOL); if(! function_exists('mysqli_connect')) - notice( t('Error: mysqli PHP module required but not installed.') . EOL); + notice( t('Error: mysqli PHP module required but not installed.') . EOL); + if(! function_exists('mb_strlen')) + notice( t('Error: mb_string PHP module required but not installed.') . EOL); + if((x($_SESSION,'sysmsg')) && strlen($_SESSION['sysmsg'])) notice( t('Please see the file "INSTALL.txt".') . EOL); } diff --git a/mod/salmon.php b/mod/salmon.php index c2f76aa0a..bf33033d8 100644 --- a/mod/salmon.php +++ b/mod/salmon.php @@ -192,6 +192,11 @@ function salmon_post(&$a) { // NOTREACHED } + // Check if we're allowed to talk to insecure networks + + if(get_config('system','strict_privacy')) + salmon_return(400); + require_once('include/items.php'); // Placeholder for hub discovery. We shouldn't find any hubs diff --git a/mod/settings.php b/mod/settings.php index 86d1ae015..916e04270 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -431,7 +431,8 @@ function settings_content(&$a) { $f = basename($file); $selected = (($f == $_SESSION['theme']) || ($f === $default_theme && (! x($_SESSION,'theme'))) ? ' selected="selected" ' : '' ); - $theme_selector .= '<option val="' . basename($file) . '"' . $selected . '>' . basename($file) . '</option>'; + $theme_name = ((file_exists($file . '/experimental')) ? sprintf("%s - \x28Experimental\x29", $f) : $f); + $theme_selector .= '<option value="' . $f . '"' . $selected . '>' . $theme_name . '</option>'; } } diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php index e8c2462e2..f9510bd6b 100644 --- a/mod/viewcontacts.php +++ b/mod/viewcontacts.php @@ -47,13 +47,22 @@ function viewcontacts_content(&$a) { if($rr['self']) continue; + $url = $rr['url']; + + // route DFRN profiles through the redirect + + $is_owner = ((local_user() && ($a->profile['profile_uid'] == local_user())) ? true : false); + + if($is_owner && ($rr['network'] === NETWORK_DFRN) && ($rr['rel'])) + $url = 'redir/' . $rr['id']; + $o .= replace_macros($tpl, array( '$id' => $rr['id'], - '$alt_text' => t('Visit $username\'s profile'), + '$alt_text' => sprintf( t('Visit %s\'s profile [%s]'), $rr['name'], $rr['url']), '$thumb' => $rr['thumb'], '$name' => substr($rr['name'],0,20), '$username' => $rr['name'], - '$url' => $rr['url'] + '$url' => $url )); } |