Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-25 20:40:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of git://github.com/friendika/friendika

Browse source
This commit is contained in:
root 2011-01-05 07:37:01 +01:00
commit 830a56723c
12 changed files with 72 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/main.js
View file

@ -44,10 +44,11 @@
$('#pause').html('');
}
}
if(event.keyCode == '36') {
event.preventDefault();
if(homebase)
if(event.keyCode == '36' && event.shiftKey == true) {
if(homebase !== undefined) {
event.preventDefault();
document.location = homebase;
}
}
});
});
@ -82,8 +83,12 @@
if(mail == 0) { mail = ''; }
$('#mail-update').html(mail);
var intro = $(this).find('intro').text();
var register = $(this).find('register').text();
if(intro == 0) { intro = ''; }
if(register != 0 && intro != '') { intro = intro+'/'+register; }
if(register != 0 && intro == '') { intro = '0/'+register; }
$('#notify-update').html(intro);
});
}) ;
}

9
index.php
View file

@ -173,8 +173,15 @@ if($a->module_loaded) {
}
// let javascript take you home
if(x($_SESSION,'visitor_home'))
$a->page['content'] .= '<script>var homebase="' . $_SESSION['visitor_home'] . '" ; </script>';
$homebase = $_SESSION['visitor_home'];
elseif(local_user())
$homebase = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
if(isset($homebase))
$a->page['content'] .= '<script>var homebase="' . $homebase . '" ; </script>';
if(stristr($_SESSION['sysmsg'], t('Permission denied'))) {
header($_SERVER["SERVER_PROTOCOL"] . ' 403 ' . t('Permission denied.'));

26
mod/notifications.php
View file

@ -126,5 +126,31 @@ function notifications_content(&$a) {
else
notice( t('No notifications.') . EOL);
if ($a->config['register_policy'] = REGISTER_APPROVE &&
$a->config['admin_email'] === $a->user['email']){
$o .= load_view_file('view/registrations-top.tpl');
$r = q("SELECT `register`.*, `contact`.`name`, `user`.`email`
FROM `register`
LEFT JOIN `contact` ON `register`.`uid` = `contact`.`uid`
LEFT JOIN `user` ON `register`.`uid` = `user`.`uid`;");
if(($r !== false) && (count($r))) {
$tpl = load_view_file("view/registrations.tpl");
foreach($r as $rr) {
$o .= "<ul>";
$o .= replace_macros($tpl, array(
'$fullname' => $rr['name'],
'$email' => $rr['email'],
'$approvelink' => "regmod/allow/".$rr['hash'],
'$denylink' => "regmod/deny/".$rr['hash'],
));
$o .= "</ul>";
}
}
else
notice( t('No registrations.') . EOL);
}
return $o;
}

11
mod/ping.php
View file

@ -25,6 +25,15 @@ function ping_init(&$a) {
);
$intro = $r[0]['total'];
if ($a->config['register_policy'] = REGISTER_APPROVE &&
$a->config['admin_email'] = $a->user['email']){
$r = q("SELECT COUNT(*) AS `total` FROM `register`");
$register = $r[0]['total'];
} else {
$register = "0";
}
$myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'] ;
$r = q("SELECT COUNT(*) AS `total` FROM `mail`
WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
@ -35,7 +44,7 @@ function ping_init(&$a) {
$mail = $r[0]['total'];
header("Content-type: text/xml");
echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\r\n<result><intro>$intro</intro><mail>$mail</mail><net>$network</net><home>$home</home></result>\r\n";
echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\r\n<result><register>$register</register><intro>$intro</intro><mail>$mail</mail><net>$network</net><home>$home</home></result>\r\n";
killme();
}

5
mod/regmod.php
View file

@ -12,6 +12,11 @@ function regmod_content(&$a) {
return $o;
}
if((! (x($a->config,'admin_email'))) || ($a->config['admin_email'] !== $a->user['email'])) {
notice( t('Permission denied.') . EOL);
return '';
}
if($a->argc != 3)
killme();

4
mod/settings.php
View file

@ -95,6 +95,10 @@ function settings_post(&$a) {
$email_changed = true;
if(! valid_email($email))
$err .= t(' Not valid email.');
if((x($a->config,'admin_email')) && (strcasecmp($email,$a->config['admin_email']) == 0)) {
$err .= t(' Cannot change to that email.');
$email = $a->user['email'];
}
}
if(strlen($err)) {

1
util/strings.php
View file

@ -242,6 +242,7 @@ $a->strings['Friend/Connect Request'] = 'Friend/Connect Request';
$a->strings['New Follower'] = 'New Follower';
$a->strings['Approve'] = 'Approve';
$a->strings['No notifications.'] = 'No notifications.';
$a->strings['No registrations.'] = 'No registrations.';
$a->strings['Login failed.'] = 'Login failed.';
$a->strings["Welcome back "] = "Welcome back ";
$a->strings['Photo Albums'] = 'Photo Albums';

3
view/en/registrations-top.tpl Normal file
View file

@ -0,0 +1,3 @@
<h1>User registrations waiting for confirm</h1>

1
view/en/registrations.tpl Normal file
View file

@ -0,0 +1 @@
<li>$fullname ($email) : <a href="$approvelink">Approve</a> - <a href="$denylink">Deny</a></li>

3
view/it/registrations-top.tpl Normal file
View file

@ -0,0 +1,3 @@
<h1>Registrazioni in attesa di conferma</h1>

1
view/it/registrations.tpl Normal file
View file

@ -0,0 +1 @@
<li>$fullname ($email) : <a href="$approvelink">Approva</a> - <a href="$denylink">Rifiuta</a></li>

1
view/it/strings.php
View file

@ -244,6 +244,7 @@ $a->strings['Friend/Connect Request'] = 'Richiesta Amicizia/Connessione';
$a->strings['New Follower'] = 'Nuovo Seguace';
$a->strings['Approve'] = 'Approva';
$a->strings['No notifications.'] = 'Nessuna notifica.';
$a->strings['No registrations.'] = 'Nessuna registrazione.';
$a->strings['Login failed.'] = 'Accesso fallito.';
$a->strings["Welcome back "] = "Bentornato ";
$a->strings['Photo Albums'] = 'Album Foto';