clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'fabrixxm-master' 

Conflicts:
	boot.php
This commit is contained in:
Friendika 2011-05-23 18:17:02 -07:00
parent 3e6180183b dd32a2366c
commit 78b2db3a98
34 changed files with 475 additions and 330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addon/facebook/facebook.php
View File

@ -245,12 +245,12 @@ function facebook_content(&$a) {
if($a->argc > 1 && $a->argv[1] === 'remove') { if($a->argc > 1 && $a->argv[1] === 'remove') {
del_pconfig(local_user(),'facebook','post'); del_pconfig(local_user(),'facebook','post');
notice( t('Facebook disabled') . EOL); info( t('Facebook disabled') . EOL);
} }
if($a->argc > 1 && $a->argv[1] === 'friends') { if($a->argc > 1 && $a->argv[1] === 'friends') {
fb_get_friends(local_user()); fb_get_friends(local_user());
notice( t('Updating contacts') . EOL); info( t('Updating contacts') . EOL);
} }

2
addon/statusnet/statusnet.php
View File

@ -169,7 +169,7 @@ function statusnet_settings_post ($a,$post) {
// to post a tweet for every new __public__ posting to the wall // to post a tweet for every new __public__ posting to the wall
set_pconfig(local_user(),'statusnet','post',intval($_POST['statusnet-enable'])); set_pconfig(local_user(),'statusnet','post',intval($_POST['statusnet-enable']));
set_pconfig(local_user(),'statusnet','post_by_default',intval($_POST['statusnet-default'])); set_pconfig(local_user(),'statusnet','post_by_default',intval($_POST['statusnet-default']));
notice( t('StatusNet settings updated.') . EOL); info( t('StatusNet settings updated.') . EOL);
}}}} }}}}
} }
function statusnet_settings(&$a,&$s) { function statusnet_settings(&$a,&$s) {

7
boot.php
View File

@ -1007,6 +1007,13 @@ function notice($s) {
if($a->interactive) if($a->interactive)
$_SESSION['sysmsg'] .= $s; $_SESSION['sysmsg'] .= $s;
}} }}
if(! function_exists('info')) {
function info($s) {
$a = get_app();
if($a->interactive)
$_SESSION['sysmsg_info'] .= $s;
}}
// wrapper around config to limit the text length of an incoming message // wrapper around config to limit the text length of an incoming message

8
include/auth.php
View File

@ -24,7 +24,7 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
// process logout request // process logout request
nuke_session(); nuke_session();
notice( t('Logged out.') . EOL); info( t('Logged out.') . EOL);
goaway($a->get_baseurl()); goaway($a->get_baseurl());
} }
@ -205,11 +205,11 @@ else {
if($a->user['login_date'] === '0000-00-00 00:00:00') { if($a->user['login_date'] === '0000-00-00 00:00:00') {
$_SESSION['return_url'] = 'profile_photo/new'; $_SESSION['return_url'] = 'profile_photo/new';
$a->module = 'profile_photo'; $a->module = 'profile_photo';
notice( t("Welcome ") . $a->user['username'] . EOL); info( t("Welcome ") . $a->user['username'] . EOL);
notice( t('Please upload a profile photo.') . EOL); info( t('Please upload a profile photo.') . EOL);
} }
else else
notice( t("Welcome back ") . $a->user['username'] . EOL); info( t("Welcome back ") . $a->user['username'] . EOL);
if(strlen($a->user['timezone'])) { if(strlen($a->user['timezone'])) {
date_default_timezone_set($a->user['timezone']); date_default_timezone_set($a->user['timezone']);

11
index.php
View File

@ -110,6 +110,9 @@ if(! x($_SESSION,'authenticated'))
if(! x($_SESSION,'sysmsg')) if(! x($_SESSION,'sysmsg'))
$_SESSION['sysmsg'] = ''; $_SESSION['sysmsg'] = '';
if(! x($_SESSION,'sysmsg_info'))
$_SESSION['sysmsg_info'] = '';
/* /*
* check_config() is responsible for running update scripts. These automatically * check_config() is responsible for running update scripts. These automatically
* update the DB schema whenever we push a new one out. It also checks to see if * update the DB schema whenever we push a new one out. It also checks to see if
@ -262,8 +265,16 @@ if(stristr($_SESSION['sysmsg'], t('Permission denied'))) {
if(x($_SESSION,'sysmsg')) { if(x($_SESSION,'sysmsg')) {
$a->page['content'] = "<div id=\"sysmsg\" class=\"error-message\">{$_SESSION['sysmsg']}</div>\r\n" $a->page['content'] = "<div id=\"sysmsg\" class=\"error-message\">{$_SESSION['sysmsg']}</div>\r\n"
. ((x($a->page,'content')) ? $a->page['content'] : ''); . ((x($a->page,'content')) ? $a->page['content'] : '');
$_SESSION['sysmsg']="";
unset($_SESSION['sysmsg']); unset($_SESSION['sysmsg']);
} }
if(x($_SESSION,'sysmsg_info')) {
$a->page['content'] = "<div id=\"sysmsg_info\" class=\"info-message\">{$_SESSION['sysmsg_info']}</div>\r\n"
. ((x($a->page,'content')) ? $a->page['content'] : '');
$_SESSION['sysmsg_info']="";
unset($_SESSION['sysmsg_info']);
}
call_hooks('page_end', $a->page['content']); call_hooks('page_end', $a->page['content']);

10
mod/contacts.php
View File

@ -85,7 +85,7 @@ logger('contact_edit ' . print_r($_POST,true));
intval(local_user()) intval(local_user())
); );
if($r) if($r)
notice( t('Contact updated.') . EOL); info( t('Contact updated.') . EOL);
else else
notice( t('Failed to update contact record.') . EOL); notice( t('Failed to update contact record.') . EOL);
return; return;
@ -143,7 +143,7 @@ function contacts_content(&$a) {
); );
if($r) { if($r) {
//notice( t('Contact has been ') . (($blocked) ? t('blocked') : t('unblocked')) . EOL ); //notice( t('Contact has been ') . (($blocked) ? t('blocked') : t('unblocked')) . EOL );
notice( (($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')) . EOL ); info( (($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')) . EOL );
} }
goaway($a->get_baseurl() . '/contacts/' . $contact_id); goaway($a->get_baseurl() . '/contacts/' . $contact_id);
return; // NOTREACHED return; // NOTREACHED
@ -157,7 +157,7 @@ function contacts_content(&$a) {
intval(local_user()) intval(local_user())
); );
if($r) { if($r) {
notice( (($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')) . EOL ); info( (($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')) . EOL );
} }
goaway($a->get_baseurl() . '/contacts/' . $contact_id); goaway($a->get_baseurl() . '/contacts/' . $contact_id);
return; // NOTREACHED return; // NOTREACHED
@ -197,7 +197,7 @@ function contacts_content(&$a) {
contact_remove($contact_id); contact_remove($contact_id);
notice( t('Contact has been removed.') . EOL ); info( t('Contact has been removed.') . EOL );
goaway($a->get_baseurl() . '/contacts'); goaway($a->get_baseurl() . '/contacts');
return; // NOTREACHED return; // NOTREACHED
} }
@ -402,4 +402,4 @@ function contacts_content(&$a) {
} }
$o .= paginate($a); $o .= paginate($a);
return $o; return $o;
} }

4
mod/crepair.php
View File

@ -39,7 +39,7 @@ function crepair_post(&$a) {
); );
if($r) if($r)
notice( t('Contact settings applied.') . EOL); info( t('Contact settings applied.') . EOL);
else else
notice( t('Contact update failed.') . EOL); notice( t('Contact update failed.') . EOL);
@ -102,4 +102,4 @@ function crepair_content(&$a) {
return $o; return $o;
} }

4
mod/dfrn_poll.php
View File

@ -81,7 +81,7 @@ function dfrn_poll_init(&$a) {
$_SESSION['visitor_id'] = $r[0]['id']; $_SESSION['visitor_id'] = $r[0]['id'];
$_SESSION['visitor_home'] = $r[0]['url']; $_SESSION['visitor_home'] = $r[0]['url'];
$_SESSION['visitor_visiting'] = $r[0]['uid']; $_SESSION['visitor_visiting'] = $r[0]['uid'];
notice( sprintf(t('%s welcomes %s'), $r[0]['username'] , $r[0]['name']) . EOL); info( sprintf(t('%s welcomes %s'), $r[0]['username'] , $r[0]['name']) . EOL);
// Visitors get 1 day session. // Visitors get 1 day session.
$session_id = session_id(); $session_id = session_id();
$expire = time() + 86400; $expire = time() + 86400;
@ -507,7 +507,7 @@ function dfrn_poll_content(&$a) {
$_SESSION['visitor_id'] = $r[0]['id']; $_SESSION['visitor_id'] = $r[0]['id'];
$_SESSION['visitor_home'] = $r[0]['url']; $_SESSION['visitor_home'] = $r[0]['url'];
$_SESSION['visitor_visiting'] = $r[0]['uid']; $_SESSION['visitor_visiting'] = $r[0]['uid'];
notice( sprintf(t('%s welcomes %s'), $r[0]['username'] , $r[0]['name']) . EOL); info( sprintf(t('%s welcomes %s'), $r[0]['username'] , $r[0]['name']) . EOL);
// Visitors get 1 day session. // Visitors get 1 day session.
$session_id = session_id(); $session_id = session_id();
$expire = time() + 86400; $expire = time() + 86400;

8
mod/dfrn_request.php
View File

@ -165,7 +165,7 @@ function dfrn_request_post(&$a) {
} }
if($r) { if($r) {
notice( t("Introduction complete.") . EOL); info( t("Introduction complete.") . EOL);
} }
/** /**
@ -424,7 +424,7 @@ function dfrn_request_post(&$a) {
// This notice will only be seen by the requestor if the requestor and requestee are on the same server. // This notice will only be seen by the requestor if the requestor and requestee are on the same server.
if(! $failed) if(! $failed)
notice( t('Your introduction has been sent.') . EOL ); info( t('Your introduction has been sent.') . EOL );
// "Homecoming" - send the requestor back to their site to record the introduction. // "Homecoming" - send the requestor back to their site to record the introduction.
@ -478,7 +478,7 @@ function dfrn_request_content(&$a) {
if(x($_GET,'dfrn_url')) { if(x($_GET,'dfrn_url')) {
if(! local_user()) { if(! local_user()) {
notice( t("Please login to confirm introduction.") . EOL ); info( t("Please login to confirm introduction.") . EOL );
/* setup the return URL to come back to this page if they use openid */ /* setup the return URL to come back to this page if they use openid */
@ -650,4 +650,4 @@ function dfrn_request_content(&$a) {
} }
return; // Somebody is fishing. return; // Somebody is fishing.
}} }}

4
mod/directory.php
View File

@ -138,7 +138,7 @@ function directory_content(&$a) {
} }
else else
notice( t("No entries \x28some entries may be hidden\x29.") . EOL); info( t("No entries \x28some entries may be hidden\x29.") . EOL);
return $o; return $o;
} }

6
mod/group.php
View File

@ -24,7 +24,7 @@ function group_post(&$a) {
$name = notags(trim($_POST['groupname'])); $name = notags(trim($_POST['groupname']));
$r = group_add(local_user(),$name); $r = group_add(local_user(),$name);
if($r) { if($r) {
notice( t('Group created.') . EOL ); info( t('Group created.') . EOL );
$r = group_byname(local_user(),$name); $r = group_byname(local_user(),$name);
if($r) if($r)
goaway($a->get_baseurl() . '/group/' . $r); goaway($a->get_baseurl() . '/group/' . $r);
@ -53,7 +53,7 @@ function group_post(&$a) {
intval($group['id']) intval($group['id'])
); );
if($r) if($r)
notice( t('Group name changed.') . EOL ); info( t('Group name changed.') . EOL );
} }
$a->page['aside'] = group_side(); $a->page['aside'] = group_side();
@ -87,7 +87,7 @@ function group_content(&$a) {
if(count($r)) if(count($r))
$result = group_rmv(local_user(),$r[0]['name']); $result = group_rmv(local_user(),$r[0]['name']);
if($result) if($result)
notice( t('Group removed.') . EOL); info( t('Group removed.') . EOL);
else else
notice( t('Unable to remove group.') . EOL); notice( t('Unable to remove group.') . EOL);
} }

6
mod/install.php
View File

@ -35,7 +35,7 @@ function install_post(&$a) {
} }
} }
notice( t('Connected to database.') . EOL); info( t('Connected to database.') . EOL);
$tpl = get_intltext_template('htconfig.tpl'); $tpl = get_intltext_template('htconfig.tpl');
$txt = replace_macros($tpl,array( $txt = replace_macros($tpl,array(
@ -95,7 +95,7 @@ function install_content(&$a) {
} }
} }
notice( t('Welcome to Friendika.') . EOL); info( t('Welcome to Friendika.') . EOL);
check_funcs(); check_funcs();
@ -238,4 +238,4 @@ function load_database($db) {
} }
} }
return $errors; return $errors;
} }

2
mod/item.php
View File

@ -125,7 +125,7 @@ function item_post(&$a) {
$pubmail_enable = ((x($_POST,'pubmail_enable') && intval($_POST['pubmail_enable']) && (! $private)) ? 1 : 0); $pubmail_enable = ((x($_POST,'pubmail_enable') && intval($_POST['pubmail_enable']) && (! $private)) ? 1 : 0);
if(! strlen($body)) { if(! strlen($body)) {
notice( t('Empty post discarded.') . EOL ); info( t('Empty post discarded.') . EOL );
if(x($_POST,'return')) if(x($_POST,'return'))
goaway($a->get_baseurl() . "/" . $_POST['return'] ); goaway($a->get_baseurl() . "/" . $_POST['return'] );
killme(); killme();

6
mod/lostpass.php
View File

@ -24,7 +24,7 @@ function lostpass_post(&$a) {
intval($uid) intval($uid)
); );
if($r) if($r)
notice( t('Password reset request issued. Check your email.') . EOL); info( t('Password reset request issued. Check your email.') . EOL);
$email_tpl = get_intltext_template("lostpass_eml.tpl"); $email_tpl = get_intltext_template("lostpass_eml.tpl");
$email_tpl = replace_macros($email_tpl, array( $email_tpl = replace_macros($email_tpl, array(
@ -85,7 +85,7 @@ function lostpass_content(&$a) {
'$baseurl' => $a->get_baseurl() '$baseurl' => $a->get_baseurl()
)); ));
notice("Your password has been reset." . EOL); info("Your password has been reset." . EOL);
@ -120,4 +120,4 @@ function lostpass_content(&$a) {
return $o; return $o;
} }
} }

4
mod/manage.php
View File

@ -34,7 +34,7 @@ function manage_post(&$a) {
$_SESSION['page_flags'] = $r[0]['page-flags']; $_SESSION['page_flags'] = $r[0]['page-flags'];
$_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $r[0]['nickname']; $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $r[0]['nickname'];
notice( sprintf( t("Welcome back %s") , $r[0]['username']) . EOL); info( sprintf( t("Welcome back %s") , $r[0]['username']) . EOL);
$a->user = $r[0]; $a->user = $r[0];
if(strlen($a->user['timezone'])) { if(strlen($a->user['timezone'])) {
@ -107,4 +107,4 @@ function manage_content(&$a) {
return $o; return $o;
} }

4
mod/match.php
View File

@ -47,11 +47,11 @@ function match_content(&$a) {
$o .= '<div id="profile-match-wrapper-end"></div>'; $o .= '<div id="profile-match-wrapper-end"></div>';
} }
else { else {
notice( t('No matches') . EOL); info( t('No matches') . EOL);
} }
} }
$o .= paginate($a); $o .= paginate($a);
return $o; return $o;
} }

10
mod/message.php
View File

@ -99,7 +99,7 @@ function message_post(&$a) {
if($post_id) { if($post_id) {
proc_run('php',"include/notifier.php","mail","$post_id"); proc_run('php',"include/notifier.php","mail","$post_id");
notice( t('Message sent.') . EOL ); info( t('Message sent.') . EOL );
} }
else { else {
notice( t('Message could not be sent.') . EOL ); notice( t('Message could not be sent.') . EOL );
@ -139,7 +139,7 @@ function message_content(&$a) {
intval(local_user()) intval(local_user())
); );
if($r) { if($r) {
notice( t('Message deleted.') . EOL ); info( t('Message deleted.') . EOL );
} }
goaway($a->get_baseurl() . '/message' ); goaway($a->get_baseurl() . '/message' );
} }
@ -155,7 +155,7 @@ function message_content(&$a) {
intval(local_user()) intval(local_user())
); );
if($r) if($r)
notice( t('Conversation removed.') . EOL ); info( t('Conversation removed.') . EOL );
} }
goaway($a->get_baseurl() . '/message' ); goaway($a->get_baseurl() . '/message' );
} }
@ -221,7 +221,7 @@ function message_content(&$a) {
intval($a->pager['itemspage']) intval($a->pager['itemspage'])
); );
if(! count($r)) { if(! count($r)) {
notice( t('No messages.') . EOL); info( t('No messages.') . EOL);
return $o; return $o;
} }
@ -328,4 +328,4 @@ function message_content(&$a) {
return $o; return $o;
} }
} }

7
mod/network.php
View File

@ -61,8 +61,9 @@ function network_content(&$a, $update = 0) {
if(! $update) { if(! $update) {
if(group) { if(group) {
if(($t = group_public_members($group)) && (! get_pconfig(local_user(),'system','nowarn_insecure'))) { if(($t = group_public_members($group)) && (! get_pconfig(local_user(),'system','nowarn_insecure'))) {
$plural_form = sprintf( tt('%d member', '%d members', $t), $t); notice( sprintf( tt('Warning: This group contains %s member from an insecure network.',
notice( sprintf( t('Warning: This group contains %s from an insecure network.'), $plural_form ) . EOL); 'Warning: This group contains %s members from an insecure network.',
$t), $t ) . EOL);
notice( t('Private messages to this group are at risk of public disclosure.') . EOL); notice( t('Private messages to this group are at risk of public disclosure.') . EOL);
} }
} }
@ -136,7 +137,7 @@ function network_content(&$a, $update = 0) {
} }
else { else {
$contact_str = ' 0 '; $contact_str = ' 0 ';
notice( t('Group is empty')); info( t('Group is empty'));
} }
$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` REGEXP '<" . intval($group) . ">' )) "; $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` REGEXP '<" . intval($group) . ">' )) ";

4
mod/notifications.php
View File

@ -136,7 +136,7 @@ function notifications_content(&$a) {
} }
} }
else else
notice( t('No notifications.') . EOL); info( t('No notifications.') . EOL);
if ($a->config['register_policy'] == REGISTER_APPROVE && if ($a->config['register_policy'] == REGISTER_APPROVE &&
$a->config['admin_email'] === $a->user['email']){ $a->config['admin_email'] === $a->user['email']){
@ -156,7 +156,7 @@ function notifications_content(&$a) {
$o .= "</ul>"; $o .= "</ul>";
} }
else else
notice( t('No registrations.') . EOL); info( t('No registrations.') . EOL);
} }

2
mod/oexchange.php
View File

@ -24,7 +24,7 @@ function oexchange_content(&$a) {
} }
if(($a->argc > 1) && $a->argv[1] === 'done') { if(($a->argc > 1) && $a->argv[1] === 'done') {
notice( t('Post successful.') . EOL); info( t('Post successful.') . EOL);
return; return;
} }

8
mod/openid.php
View File

@ -75,11 +75,11 @@ function openid_content(&$a) {
if($a->user['login_date'] === '0000-00-00 00:00:00') { if($a->user['login_date'] === '0000-00-00 00:00:00') {
$_SESSION['return_url'] = 'profile_photo/new'; $_SESSION['return_url'] = 'profile_photo/new';
$a->module = 'profile_photo'; $a->module = 'profile_photo';
notice( t("Welcome ") . $a->user['username'] . EOL); info( t("Welcome ") . $a->user['username'] . EOL);
notice( t('Please upload a profile photo.') . EOL); info( t('Please upload a profile photo.') . EOL);
} }
else else
notice( t("Welcome back ") . $a->user['username'] . EOL); info( t("Welcome back ") . $a->user['username'] . EOL);
if(strlen($a->user['timezone'])) { if(strlen($a->user['timezone'])) {
@ -122,4 +122,4 @@ function openid_content(&$a) {
notice( t('Login failed.') . EOL); notice( t('Login failed.') . EOL);
goaway($a->get_baseurl()); goaway($a->get_baseurl());
// NOTREACHED // NOTREACHED
} }

2
mod/profile_photo.php
View File

@ -236,7 +236,7 @@ function profile_photo_crop_ui_head(&$a, $ph){
$r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 0 ); $r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 0 );
if($r) if($r)
notice( t('Image uploaded successfully.') . EOL ); info( t('Image uploaded successfully.') . EOL );
else else
notice( t('Image upload failed.') . EOL ); notice( t('Image upload failed.') . EOL );

10
mod/profiles.php
View File

@ -196,7 +196,7 @@ function profiles_post(&$a) {
); );
if($r) if($r)
notice( t('Profile updated.') . EOL); info( t('Profile updated.') . EOL);
if($namechanged && $is_default) { if($namechanged && $is_default) {
@ -251,7 +251,7 @@ function profiles_content(&$a) {
intval(local_user()) intval(local_user())
); );
if($r) if($r)
notice( t('Profile deleted.') . EOL); info( t('Profile deleted.') . EOL);
goaway($a->get_baseurl() . '/profiles'); goaway($a->get_baseurl() . '/profiles');
return; // NOTREACHED return; // NOTREACHED
@ -286,7 +286,7 @@ function profiles_content(&$a) {
dbesc($name) dbesc($name)
); );
notice( t('New profile created.') . EOL); info( t('New profile created.') . EOL);
if(count($r3) == 1) if(count($r3) == 1)
goaway($a->get_baseurl() . '/profiles/' . $r3[0]['id']); goaway($a->get_baseurl() . '/profiles/' . $r3[0]['id']);
goaway($a->get_baseurl() . '/profiles'); goaway($a->get_baseurl() . '/profiles');
@ -325,7 +325,7 @@ function profiles_content(&$a) {
intval(local_user()), intval(local_user()),
dbesc($name) dbesc($name)
); );
notice( t('New profile created.') . EOL); info( t('New profile created.') . EOL);
if(count($r3) == 1) if(count($r3) == 1)
goaway($a->get_baseurl() . '/profiles/' . $r3[0]['id']); goaway($a->get_baseurl() . '/profiles/' . $r3[0]['id']);
goaway($a->get_baseurl() . '/profiles'); goaway($a->get_baseurl() . '/profiles');
@ -475,4 +475,4 @@ function profiles_content(&$a) {
return $o; return $o;
} }
} }

4
mod/register.php
View File

@ -336,7 +336,7 @@ function register_post(&$a) {
if($res) { if($res) {
notice( t('Registration successful. Please check your email for further instructions.') . EOL ) ; info( t('Registration successful. Please check your email for further instructions.') . EOL ) ;
goaway($a->get_baseurl()); goaway($a->get_baseurl());
} }
else { else {
@ -374,7 +374,7 @@ function register_post(&$a) {
. 'Content-type: text/plain; charset=UTF-8' . "\n" . 'Content-type: text/plain; charset=UTF-8' . "\n"
. 'Content-transfer-encoding: 8bit' ); . 'Content-transfer-encoding: 8bit' );
if($res) { if($res) {
notice( t('Your registration is pending approval by the site owner.') . EOL ) ; info( t('Your registration is pending approval by the site owner.') . EOL ) ;
goaway($a->get_baseurl()); goaway($a->get_baseurl());
} }

6
mod/regmod.php
View File

@ -7,7 +7,7 @@ function regmod_content(&$a) {
$_SESSION['return_url'] = $a->cmd; $_SESSION['return_url'] = $a->cmd;
if(! local_user()) { if(! local_user()) {
notice( t('Please login.') . EOL); info( t('Please login.') . EOL);
$o .= '<br /><br />' . login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1); $o .= '<br /><br />' . login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1);
return $o; return $o;
} }
@ -96,8 +96,8 @@ function regmod_content(&$a) {
. 'Content-transfer-encoding: 8bit' ); . 'Content-transfer-encoding: 8bit' );
if($res) { if($res) {
notice( t('Account approved.') . EOL ); info( t('Account approved.') . EOL );
return; return;
} }
} }
} }

2
mod/search.php
View File

@ -66,7 +66,7 @@ function search_content(&$a) {
$a->set_pager_total($r[0]['total']); $a->set_pager_total($r[0]['total']);
if(! $r[0]['total']) { if(! $r[0]['total']) {
notice( t('No results.') . EOL); info( t('No results.') . EOL);
return $o; return $o;
} }

8
mod/settings.php
View File

@ -51,7 +51,7 @@ function settings_post(&$a) {
intval(local_user()) intval(local_user())
); );
if($r) if($r)
notice( t('Password changed.') . EOL); info( t('Password changed.') . EOL);
else else
notice( t('Password update failed. Please try again.') . EOL); notice( t('Password update failed. Please try again.') . EOL);
} }
@ -203,7 +203,7 @@ function settings_post(&$a) {
intval(local_user()) intval(local_user())
); );
if($r) if($r)
notice( t('Settings updated.') . EOL); info( t('Settings updated.') . EOL);
$r = q("UPDATE `profile` $r = q("UPDATE `profile`
SET `publish` = %d, `net-publish` = %d SET `publish` = %d, `net-publish` = %d
@ -374,7 +374,7 @@ function settings_content(&$a) {
? true : false); ? true : false);
if($invisible) if($invisible)
notice( t('Profile is <strong>not published</strong>.') . EOL ); info( t('Profile is <strong>not published</strong>.') . EOL );
$theme_selector = '<select name="theme" id="theme-select" >'; $theme_selector = '<select name="theme" id="theme-select" >';
@ -485,7 +485,7 @@ function settings_content(&$a) {
'$imap_replyto' => $mail_replyto, '$imap_replyto' => $mail_replyto,
'$lbl_imap7' => t('Send public posts to all email contacts:'), '$lbl_imap7' => t('Send public posts to all email contacts:'),
'$pubmail_checked' => (($mail_pubmail) ? ' checked="checked" ' : ''), '$pubmail_checked' => (($mail_pubmail) ? ' checked="checked" ' : ''),
'$mail_disabled' => (($mail_disabled) ? '<div class="error-message">' . t('Email access is disabled on this site.') . '</div>' : ''), '$mail_disabled' => (($mail_disabled) ? '<div class="info-message">' . t('Email access is disabled on this site.') . '</div>' : ''),
'$imap_disabled' => $imap_disabled '$imap_disabled' => $imap_disabled
)); ));

4
mod/tagrm.php
View File

@ -38,7 +38,7 @@ function tagrm_post(&$a) {
intval(local_user()) intval(local_user())
); );
notice( t('Tag removed') . EOL ); info( t('Tag removed') . EOL );
goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']); goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
// NOTREACHED // NOTREACHED
@ -96,4 +96,4 @@ function tagrm_content(&$a) {
return $o; return $o;
} }

4
mod/viewcontacts.php
View File

@ -37,7 +37,7 @@ function viewcontacts_content(&$a) {
intval($a->pager['itemspage']) intval($a->pager['itemspage'])
); );
if(! count($r)) { if(! count($r)) {
notice( t('No contacts.') . EOL ); info( t('No contacts.') . EOL );
return $o; return $o;
} }
@ -62,4 +62,4 @@ function viewcontacts_content(&$a) {
$o .= paginate($a); $o .= paginate($a);
return $o; return $o;
} }

609
util/messages.po
View File

File diff suppressed because it is too large Load Diff

4
view/settings_nick_set.tpl
View File

@ -1,7 +1,5 @@
<div id="settings-nick-wrapper" > <div id="settings-nick-wrapper" >
<p id="settings-nickname-desc"> <div id="settings-nickname-desc" class="info-message">$desc <strong>'$nickname@$basepath'</strong>$subdir</div>
<div class="error-message">$desc <strong>'$nickname@$basepath'</strong>$subdir</div>
</p>
</div> </div>
<div id="settings-nick-end" ></div> <div id="settings-nick-end" ></div>

15
view/theme/dispy/style.css
View File

@ -171,6 +171,18 @@ nav .nav-link {
#home-update { background-position: -90px 0px; } #home-update { background-position: -90px 0px; }
/** sysmsg **/ /** sysmsg **/
#sysmsg_info{
position:fixed;
bottom: 0px; right:20%;
-moz-box-shadow: 0px 0px 5px #888;
-webkit-box-shadow: 0px 0px 5px #888;
box-shadow: 0px 0px 5px #888;
padding: 10px;
background-color: #fcaf3e; border:2px solid #f8911b;
border-bottom:0px;
padding-bottom: 50px;
z-index: 1000;
}
#sysmsg { #sysmsg {
position:fixed; position:fixed;
bottom: 0px; right:10%; bottom: 0px; right:10%;
@ -183,12 +195,15 @@ nav .nav-link {
padding-bottom: 50px; padding-bottom: 50px;
z-index: 1000; z-index: 1000;
} }
#sysmsg_info br,
#sysmsg br { #sysmsg br {
display:block; display:block;
margin:2px 0px; margin:2px 0px;
border-top: 1px solid #ccccce; border-top: 1px solid #ccccce;
} }
/** /**
* aside * aside
**/ **/

8
view/theme/duepuntozero/style.css
View File

@ -93,6 +93,14 @@ nav #site-location {
padding: 10px; padding: 10px;
} }
.info-message {
color: #204a87;
font-size: 1.1em;
border: 1px solid #3465a4;
background-color: #d7e3f1;
padding: 10px;
}
nav #banner { nav #banner {
display: block; display: block;

8
view/theme/loozah/style.css
View File

@ -290,6 +290,14 @@ nav {
background-color: #FFEEEE; background-color: #FFEEEE;
padding: 10px; padding: 10px;
} }
.info-message {
color: #204a87;
font-size: 1.1em;
border: 1px solid #3465a4;
background-color: #d7e3f1;
padding: 10px;
}
.nav-link { .nav-link {
float: right; float: right;