keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge commit 'mike/master'

Browse source
This commit is contained in:
olivierm 2011-02-23 20:25:37 +01:00
commit 75a8b684fc
4 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
boot.php
View file

@ -2430,13 +2430,13 @@ function prepare_body($item) {
* $cmd and string args are surrounded with "" * $cmd and string args are surrounded with ""
*/ */
if(! function_exists('run_proc')) { if(! function_exists('proc_run')) {
function proc_run($cmd){ function proc_run($cmd){
$args = func_get_args(); $args = func_get_args();
call_hooks("proc_run", $args); call_hooks("proc_run", $args);
foreach ($args as &$arg){ foreach ($args as $arg){
if(is_string($arg)) $arg='"'.$arg.'"'; $arg = escapeshellarg($arg);
} }
$cmdline = implode($args," "); $cmdline = implode($args," ");
proc_close(proc_open($cmdline." &",array(),$foo)); proc_close(proc_open($cmdline." &",array(),$foo));

2
include/datetime.php
View file

@ -275,7 +275,7 @@ function cal($y = 0,$m = 0, $links = false) {
$o = '<table class="calendar">'; $o = '<table class="calendar">';
$o .= "<caption>$str_month $y</caption><tr>"; $o .= "<caption>$str_month $y</caption><tr>";
for($a = 0; $a < 7; $a ++) for($a = 0; $a < 7; $a ++)
$o .= '<th>' . substr(day_translate($dn[$a]),0,3) . '</th>'; $o .= '<th>' . mb_substr(day_translate($dn[$a]),0,3,'UTF-8') . '</th>';
$o .= '</tr><tr>'; $o .= '</tr><tr>';
while($d <= $l) { while($d <= $l) {

8
mod/register.php
View file

@ -346,6 +346,14 @@ function register_post(&$a) {
goaway($a->get_baseurl()); goaway($a->get_baseurl());
} }
}
if($netpublish && $a->config['register_policy'] != REGISTER_APPROVE) {
$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
$url = $a->get_baseurl() . "/profile/$nickname";
if($url && strlen(get_config('system','directory_submit_url')))
proc_run($php_path,"include/directory.php","$url");
} }
return; return;
}} }}

10
mod/regmod.php
View file

@ -70,6 +70,16 @@ function regmod_content(&$a) {
intval($register[0]['uid']) intval($register[0]['uid'])
); );
$r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default` = 1",
intval($user[0]['uid'])
);
if(count($r) && $r[0]['net-publish']) {
$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
$url = $a->get_baseurl() . '/profile/' . $user[0]['nickname'];
if($url && strlen(get_config('system','directory_submit_url')))
proc_run($php_path,"include/directory.php","$url");
}
$email_tpl = load_view_file("view/register_open_eml.tpl"); $email_tpl = load_view_file("view/register_open_eml.tpl");
$email_tpl = replace_macros($email_tpl, array( $email_tpl = replace_macros($email_tpl, array(
'$sitename' => $a->config['sitename'], '$sitename' => $a->config['sitename'],