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

send stuff to zothub as a fallback directory master for now

Browse Source
This commit is contained in:
friendica 2012-12-18 19:10:56 -08:00
parent e9c87a69ce
commit 44e70bdca3
3 changed files with 46 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
include/directory.php
View File

@ -1,27 +1,56 @@
<?php <?php
require_once('boot.php'); require_once('boot.php');
require_once('include/zot.php');
require_once('include/cli_startup.php'); require_once('include/cli_startup.php');
function find_upstream_directory($dirmode) {
return;
}
function directory_run($argv, $argc){ function directory_run($argv, $argc){
cli_startup(); cli_startup();
if(argc() != 2) if($argc != 2)
return; return;
$dir = get_config('system','directory_submit_url'); $dirmode = get_config('system','directory_mode');
if($dirmode === false)
$dirmode = DIRECTORY_MODE_NORMAL;
if(! strlen($dir)) if(($dirmode == DIRECTORY_MODE_PRIMARY) || ($dirmode == DIRECTORY_MODE_STANDALONE)) {
// syncdirs();
return;
}
$x = q("select * from channel where channel_id = %d limit 1",
intval($argv[1])
);
if(! $x)
return; return;
$arr = array('url' => argv(1)); $channel = $x[0];
call_hooks('globaldir_update', $arr); // is channel profile visible to the public?
// FIXME - remove dir entry if permission is revoked
if(strlen($arr['url'])) if(! perm_is_allowed($channel['channel_id'],null,'view_profile'))
fetch_url($dir . '?url=' . bin2hex($arr['url'])); return;
$directory = find_upstream_directory($dirmode);
if($directory) {
$url = $directory['url'];
}
else {
$url = DIRECTORY_FALLBACK_MASTER . '/post';
}
$packet = zot_build_packet($channel,'refresh');
$z = zot_zot($url,$packet);
// re-queue if unsuccessful
return;
} }
if (array_search(__file__,get_included_files())===0){ if (array_search(__file__,get_included_files())===0){

5
mod/profiles.php
View File

@ -299,10 +299,7 @@ function profiles_post(&$a) {
} }
if($is_default) { if($is_default) {
// Update global directory in background proc_run('php','include/directory.php',local_user());
$url = $_SESSION['my_url'];
if($url && strlen(get_config('system','directory_submit_url')))
proc_run('php',"include/directory.php","$url");
} }
} }
} }

14
mod/settings.php
View File

@ -339,8 +339,7 @@ function settings_post(&$a) {
$arr['channel_w_mail'] = (($_POST['post_mail']) ? $_POST['post_mail'] : 0); $arr['channel_w_mail'] = (($_POST['post_mail']) ? $_POST['post_mail'] : 0);
$arr['channel_w_photos'] = (($_POST['post_photos']) ? $_POST['post_photos'] : 0); $arr['channel_w_photos'] = (($_POST['post_photos']) ? $_POST['post_photos'] : 0);
$arr['channel_w_chat'] = (($_POST['chat']) ? $_POST['chat'] : 0); $arr['channel_w_chat'] = (($_POST['chat']) ? $_POST['chat'] : 0);
$arr['channel_a_delegate'] = (($_POST['delegate']) ? $_POST['delegate'] : 0);
$notify = 0; $notify = 0;
@ -438,7 +437,7 @@ function settings_post(&$a) {
); );
*/ */
$r = q("update channel set channel_r_stream = %d, channel_r_profile = %d, channel_r_photos = %d, channel_r_abook = %d, channel_w_stream = %d, channel_w_wall = %d, channel_w_tagwall = %d, channel_w_comment = %d, channel_w_mail = %d, channel_w_photos = %d, channel_w_chat = %d where channel_id = %d limit 1", $r = q("update channel set channel_r_stream = %d, channel_r_profile = %d, channel_r_photos = %d, channel_r_abook = %d, channel_w_stream = %d, channel_w_wall = %d, channel_w_tagwall = %d, channel_w_comment = %d, channel_w_mail = %d, channel_w_photos = %d, channel_w_chat = %d, channel_a_delegate = %d where channel_id = %d limit 1",
intval($arr['channel_r_stream']), intval($arr['channel_r_stream']),
intval($arr['channel_r_profile']), intval($arr['channel_r_profile']),
intval($arr['channel_r_photos']), intval($arr['channel_r_photos']),
@ -450,6 +449,7 @@ function settings_post(&$a) {
intval($arr['channel_w_mail']), intval($arr['channel_w_mail']),
intval($arr['channel_w_photos']), intval($arr['channel_w_photos']),
intval($arr['channel_w_chat']), intval($arr['channel_w_chat']),
intval($arr['channel_a_delegate']),
intval(local_user()) intval(local_user())
); );
@ -480,13 +480,15 @@ function settings_post(&$a) {
// ); // );
// } // }
if(($old_visibility != $net_publish) || ($page_flags != $old_page_flags)) { // if(($old_visibility != $net_publish) || ($page_flags != $old_page_flags)) {
// Update global directory in background // Update global directory in background
$url = $_SESSION['my_url']; $url = $_SESSION['my_url'];
// if($url && strlen(get_config('system','directory_submit_url'))) // if($url && strlen(get_config('system','directory_submit_url')))
// proc_run('php',"include/directory.php","$url");
}
proc_run('php','include/directory.php',local_user());
// }
//$_SESSION['theme'] = $theme; //$_SESSION['theme'] = $theme;
if($email_changed && $a->config['register_policy'] == REGISTER_VERIFY) { if($email_changed && $a->config['register_policy'] == REGISTER_VERIFY) {