From e1107b55c6715d131ca808890ce51c6301e56ccc Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Mon, 23 May 2011 11:39:57 +0200 Subject: [PATCH 1/2] add info() function. Works like notice() but show messages in a div with class info-message. update code to use info() instead of notice() when appropriate (non-error message) add info-message class style in themes --- addon/facebook/facebook.php | 4 ++-- addon/statusnet/statusnet.php | 2 +- boot.php | 9 ++++++++- include/auth.php | 8 ++++---- index.php | 11 +++++++++++ mod/contacts.php | 10 +++++----- mod/crepair.php | 4 ++-- mod/dfrn_poll.php | 4 ++-- mod/dfrn_request.php | 8 ++++---- mod/directory.php | 4 ++-- mod/group.php | 6 +++--- mod/install.php | 6 +++--- mod/item.php | 2 +- mod/lostpass.php | 6 +++--- mod/manage.php | 4 ++-- mod/match.php | 4 ++-- mod/message.php | 10 +++++----- mod/network.php | 7 ++++--- mod/notifications.php | 4 ++-- mod/oexchange.php | 2 +- mod/openid.php | 8 ++++---- mod/profile_photo.php | 2 +- mod/profiles.php | 10 +++++----- mod/register.php | 4 ++-- mod/regmod.php | 6 +++--- mod/search.php | 2 +- mod/settings.php | 8 ++++---- mod/tagrm.php | 4 ++-- mod/viewcontacts.php | 4 ++-- view/settings_nick_set.tpl | 4 +--- view/theme/dispy/style.css | 15 +++++++++++++++ view/theme/duepuntozero/style.css | 8 ++++++++ view/theme/loozah/style.css | 8 ++++++++ 33 files changed, 123 insertions(+), 75 deletions(-) diff --git a/addon/facebook/facebook.php b/addon/facebook/facebook.php index eba9d04b9..17cc8bf56 100644 --- a/addon/facebook/facebook.php +++ b/addon/facebook/facebook.php @@ -245,12 +245,12 @@ function facebook_content(&$a) { if($a->argc > 1 && $a->argv[1] === 'remove') { del_pconfig(local_user(),'facebook','post'); - notice( t('Facebook disabled') . EOL); + info( t('Facebook disabled') . EOL); } if($a->argc > 1 && $a->argv[1] === 'friends') { fb_get_friends(local_user()); - notice( t('Updating contacts') . EOL); + info( t('Updating contacts') . EOL); } diff --git a/addon/statusnet/statusnet.php b/addon/statusnet/statusnet.php index 25aad028d..bd40f78d8 100644 --- a/addon/statusnet/statusnet.php +++ b/addon/statusnet/statusnet.php @@ -169,7 +169,7 @@ function statusnet_settings_post ($a,$post) { // 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_by_default',intval($_POST['statusnet-default'])); - notice( t('StatusNet settings updated.') . EOL); + info( t('StatusNet settings updated.') . EOL); }}}} } function statusnet_settings(&$a,&$s) { diff --git a/boot.php b/boot.php index 1a6bf622c..acb49ca93 100644 --- a/boot.php +++ b/boot.php @@ -1007,6 +1007,13 @@ function notice($s) { if($a->interactive) $_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 @@ -2748,4 +2755,4 @@ function is_site_admin() { if(local_user() && x($a->user,'email') && x($a->config,'admin_email') && ($a->user['email'] === $a->config['admin_email'])) return true; return false; -}} \ No newline at end of file +}} diff --git a/include/auth.php b/include/auth.php index 1c430406e..67e21d988 100644 --- a/include/auth.php +++ b/include/auth.php @@ -24,7 +24,7 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p // process logout request nuke_session(); - notice( t('Logged out.') . EOL); + info( t('Logged out.') . EOL); goaway($a->get_baseurl()); } @@ -205,11 +205,11 @@ else { if($a->user['login_date'] === '0000-00-00 00:00:00') { $_SESSION['return_url'] = 'profile_photo/new'; $a->module = 'profile_photo'; - notice( t("Welcome ") . $a->user['username'] . EOL); - notice( t('Please upload a profile photo.') . EOL); + info( t("Welcome ") . $a->user['username'] . EOL); + info( t('Please upload a profile photo.') . EOL); } else - notice( t("Welcome back ") . $a->user['username'] . EOL); + info( t("Welcome back ") . $a->user['username'] . EOL); if(strlen($a->user['timezone'])) { date_default_timezone_set($a->user['timezone']); diff --git a/index.php b/index.php index 05eef6c6e..dc149436c 100644 --- a/index.php +++ b/index.php @@ -124,6 +124,9 @@ if(! x($_SESSION,'authenticated')) if(! x($_SESSION,'sysmsg')) $_SESSION['sysmsg'] = ''; +if(! x($_SESSION,'sysmsg_info')) + $_SESSION['sysmsg_info'] = ''; + /* * 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 @@ -276,8 +279,16 @@ if(stristr($_SESSION['sysmsg'], t('Permission denied'))) { if(x($_SESSION,'sysmsg')) { $a->page['content'] = "
{$_SESSION['sysmsg']}
\r\n" . ((x($a->page,'content')) ? $a->page['content'] : ''); + $_SESSION['sysmsg']=""; unset($_SESSION['sysmsg']); } +if(x($_SESSION,'sysmsg_info')) { + $a->page['content'] = "
{$_SESSION['sysmsg_info']}
\r\n" + . ((x($a->page,'content')) ? $a->page['content'] : ''); + $_SESSION['sysmsg_info']=""; + unset($_SESSION['sysmsg_info']); +} + call_hooks('page_end', $a->page['content']); diff --git a/mod/contacts.php b/mod/contacts.php index 0ad0d217f..2ed7f198e 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -85,7 +85,7 @@ logger('contact_edit ' . print_r($_POST,true)); intval(local_user()) ); if($r) - notice( t('Contact updated.') . EOL); + info( t('Contact updated.') . EOL); else notice( t('Failed to update contact record.') . EOL); return; @@ -143,7 +143,7 @@ function contacts_content(&$a) { ); if($r) { //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); return; // NOTREACHED @@ -157,7 +157,7 @@ function contacts_content(&$a) { intval(local_user()) ); 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); return; // NOTREACHED @@ -197,7 +197,7 @@ function contacts_content(&$a) { contact_remove($contact_id); - notice( t('Contact has been removed.') . EOL ); + info( t('Contact has been removed.') . EOL ); goaway($a->get_baseurl() . '/contacts'); return; // NOTREACHED } @@ -402,4 +402,4 @@ function contacts_content(&$a) { } $o .= paginate($a); return $o; -} \ No newline at end of file +} diff --git a/mod/crepair.php b/mod/crepair.php index 01b88d37a..4babd6bf7 100644 --- a/mod/crepair.php +++ b/mod/crepair.php @@ -39,7 +39,7 @@ function crepair_post(&$a) { ); if($r) - notice( t('Contact settings applied.') . EOL); + info( t('Contact settings applied.') . EOL); else notice( t('Contact update failed.') . EOL); @@ -102,4 +102,4 @@ function crepair_content(&$a) { return $o; -} \ No newline at end of file +} diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php index 718aa165c..ef8469523 100644 --- a/mod/dfrn_poll.php +++ b/mod/dfrn_poll.php @@ -81,7 +81,7 @@ function dfrn_poll_init(&$a) { $_SESSION['visitor_id'] = $r[0]['id']; $_SESSION['visitor_home'] = $r[0]['url']; $_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. $session_id = session_id(); $expire = time() + 86400; @@ -507,7 +507,7 @@ function dfrn_poll_content(&$a) { $_SESSION['visitor_id'] = $r[0]['id']; $_SESSION['visitor_home'] = $r[0]['url']; $_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. $session_id = session_id(); $expire = time() + 86400; diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 8b44d22ba..537a7a497 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -165,7 +165,7 @@ function dfrn_request_post(&$a) { } 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. 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. @@ -478,7 +478,7 @@ function dfrn_request_content(&$a) { if(x($_GET,'dfrn_url')) { 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 */ @@ -650,4 +650,4 @@ function dfrn_request_content(&$a) { } return; // Somebody is fishing. -}} \ No newline at end of file +}} diff --git a/mod/directory.php b/mod/directory.php index dfe8ec0d9..0c60f04bf 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -138,7 +138,7 @@ function directory_content(&$a) { } 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; -} \ No newline at end of file +} diff --git a/mod/group.php b/mod/group.php index 3da633edf..2d7ea8c11 100644 --- a/mod/group.php +++ b/mod/group.php @@ -24,7 +24,7 @@ function group_post(&$a) { $name = notags(trim($_POST['groupname'])); $r = group_add(local_user(),$name); if($r) { - notice( t('Group created.') . EOL ); + info( t('Group created.') . EOL ); $r = group_byname(local_user(),$name); if($r) goaway($a->get_baseurl() . '/group/' . $r); @@ -53,7 +53,7 @@ function group_post(&$a) { intval($group['id']) ); if($r) - notice( t('Group name changed.') . EOL ); + info( t('Group name changed.') . EOL ); } $a->page['aside'] = group_side(); @@ -87,7 +87,7 @@ function group_content(&$a) { if(count($r)) $result = group_rmv(local_user(),$r[0]['name']); if($result) - notice( t('Group removed.') . EOL); + info( t('Group removed.') . EOL); else notice( t('Unable to remove group.') . EOL); } diff --git a/mod/install.php b/mod/install.php index b5f056df7..35c2b3dae 100644 --- a/mod/install.php +++ b/mod/install.php @@ -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'); $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(); @@ -238,4 +238,4 @@ function load_database($db) { } } return $errors; -} \ No newline at end of file +} diff --git a/mod/item.php b/mod/item.php index 66fdc13af..15dca3750 100644 --- a/mod/item.php +++ b/mod/item.php @@ -125,7 +125,7 @@ function item_post(&$a) { $pubmail_enable = ((x($_POST,'pubmail_enable') && intval($_POST['pubmail_enable']) && (! $private)) ? 1 : 0); if(! strlen($body)) { - notice( t('Empty post discarded.') . EOL ); + info( t('Empty post discarded.') . EOL ); if(x($_POST,'return')) goaway($a->get_baseurl() . "/" . $_POST['return'] ); killme(); diff --git a/mod/lostpass.php b/mod/lostpass.php index 530619bc4..e0bf6eed7 100644 --- a/mod/lostpass.php +++ b/mod/lostpass.php @@ -24,7 +24,7 @@ function lostpass_post(&$a) { intval($uid) ); 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 = replace_macros($email_tpl, array( @@ -85,7 +85,7 @@ function lostpass_content(&$a) { '$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; } -} \ No newline at end of file +} diff --git a/mod/manage.php b/mod/manage.php index 26f7315c3..2705cc932 100644 --- a/mod/manage.php +++ b/mod/manage.php @@ -34,7 +34,7 @@ function manage_post(&$a) { $_SESSION['page_flags'] = $r[0]['page-flags']; $_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]; if(strlen($a->user['timezone'])) { @@ -107,4 +107,4 @@ function manage_content(&$a) { return $o; -} \ No newline at end of file +} diff --git a/mod/match.php b/mod/match.php index 092595a09..2742b4a88 100644 --- a/mod/match.php +++ b/mod/match.php @@ -47,11 +47,11 @@ function match_content(&$a) { $o .= '
'; } else { - notice( t('No matches') . EOL); + info( t('No matches') . EOL); } } $o .= paginate($a); return $o; -} \ No newline at end of file +} diff --git a/mod/message.php b/mod/message.php index c9ff3bb8e..21f7b935e 100644 --- a/mod/message.php +++ b/mod/message.php @@ -99,7 +99,7 @@ function message_post(&$a) { if($post_id) { proc_run('php',"include/notifier.php","mail","$post_id"); - notice( t('Message sent.') . EOL ); + info( t('Message sent.') . EOL ); } else { notice( t('Message could not be sent.') . EOL ); @@ -139,7 +139,7 @@ function message_content(&$a) { intval(local_user()) ); if($r) { - notice( t('Message deleted.') . EOL ); + info( t('Message deleted.') . EOL ); } goaway($a->get_baseurl() . '/message' ); } @@ -155,7 +155,7 @@ function message_content(&$a) { intval(local_user()) ); if($r) - notice( t('Conversation removed.') . EOL ); + info( t('Conversation removed.') . EOL ); } goaway($a->get_baseurl() . '/message' ); } @@ -221,7 +221,7 @@ function message_content(&$a) { intval($a->pager['itemspage']) ); if(! count($r)) { - notice( t('No messages.') . EOL); + info( t('No messages.') . EOL); return $o; } @@ -328,4 +328,4 @@ function message_content(&$a) { return $o; } -} \ No newline at end of file +} diff --git a/mod/network.php b/mod/network.php index 16739b434..f38fb8c21 100644 --- a/mod/network.php +++ b/mod/network.php @@ -61,8 +61,9 @@ function network_content(&$a, $update = 0) { if(! $update) { if(group) { 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( t('Warning: This group contains %s from an insecure network.'), $plural_form ) . EOL); + notice( sprintf( tt('Warning: This group contains %s member from an insecure network.', + '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); } } @@ -136,7 +137,7 @@ function network_content(&$a, $update = 0) { } else { $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) . ">' )) "; diff --git a/mod/notifications.php b/mod/notifications.php index b860f6018..a3339199e 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -136,7 +136,7 @@ function notifications_content(&$a) { } } else - notice( t('No notifications.') . EOL); + info( t('No notifications.') . EOL); if ($a->config['register_policy'] == REGISTER_APPROVE && $a->config['admin_email'] === $a->user['email']){ @@ -156,7 +156,7 @@ function notifications_content(&$a) { $o .= ""; } else - notice( t('No registrations.') . EOL); + info( t('No registrations.') . EOL); } diff --git a/mod/oexchange.php b/mod/oexchange.php index d5af4813b..1a990c64f 100644 --- a/mod/oexchange.php +++ b/mod/oexchange.php @@ -24,7 +24,7 @@ function oexchange_content(&$a) { } if(($a->argc > 1) && $a->argv[1] === 'done') { - notice( t('Post successful.') . EOL); + info( t('Post successful.') . EOL); return; } diff --git a/mod/openid.php b/mod/openid.php index c3c6c11e9..a1824fb38 100644 --- a/mod/openid.php +++ b/mod/openid.php @@ -75,11 +75,11 @@ function openid_content(&$a) { if($a->user['login_date'] === '0000-00-00 00:00:00') { $_SESSION['return_url'] = 'profile_photo/new'; $a->module = 'profile_photo'; - notice( t("Welcome ") . $a->user['username'] . EOL); - notice( t('Please upload a profile photo.') . EOL); + info( t("Welcome ") . $a->user['username'] . EOL); + info( t('Please upload a profile photo.') . EOL); } else - notice( t("Welcome back ") . $a->user['username'] . EOL); + info( t("Welcome back ") . $a->user['username'] . EOL); if(strlen($a->user['timezone'])) { @@ -118,4 +118,4 @@ function openid_content(&$a) { notice( t('Login failed.') . EOL); goaway($a->get_baseurl()); // NOTREACHED -} \ No newline at end of file +} diff --git a/mod/profile_photo.php b/mod/profile_photo.php index b1fd0fc6e..8dc896653 100644 --- a/mod/profile_photo.php +++ b/mod/profile_photo.php @@ -236,7 +236,7 @@ function profile_photo_crop_ui_head(&$a, $ph){ $r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 0 ); if($r) - notice( t('Image uploaded successfully.') . EOL ); + info( t('Image uploaded successfully.') . EOL ); else notice( t('Image upload failed.') . EOL ); diff --git a/mod/profiles.php b/mod/profiles.php index 984420aa2..9c92d81ba 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -196,7 +196,7 @@ function profiles_post(&$a) { ); if($r) - notice( t('Profile updated.') . EOL); + info( t('Profile updated.') . EOL); if($namechanged && $is_default) { @@ -251,7 +251,7 @@ function profiles_content(&$a) { intval(local_user()) ); if($r) - notice( t('Profile deleted.') . EOL); + info( t('Profile deleted.') . EOL); goaway($a->get_baseurl() . '/profiles'); return; // NOTREACHED @@ -286,7 +286,7 @@ function profiles_content(&$a) { dbesc($name) ); - notice( t('New profile created.') . EOL); + info( t('New profile created.') . EOL); if(count($r3) == 1) goaway($a->get_baseurl() . '/profiles/' . $r3[0]['id']); goaway($a->get_baseurl() . '/profiles'); @@ -325,7 +325,7 @@ function profiles_content(&$a) { intval(local_user()), dbesc($name) ); - notice( t('New profile created.') . EOL); + info( t('New profile created.') . EOL); if(count($r3) == 1) goaway($a->get_baseurl() . '/profiles/' . $r3[0]['id']); goaway($a->get_baseurl() . '/profiles'); @@ -475,4 +475,4 @@ function profiles_content(&$a) { return $o; } -} \ No newline at end of file +} diff --git a/mod/register.php b/mod/register.php index c9521f9be..95bf60e32 100644 --- a/mod/register.php +++ b/mod/register.php @@ -336,7 +336,7 @@ function register_post(&$a) { 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()); } else { @@ -374,7 +374,7 @@ function register_post(&$a) { . 'Content-type: text/plain; charset=UTF-8' . "\n" . 'Content-transfer-encoding: 8bit' ); 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()); } diff --git a/mod/regmod.php b/mod/regmod.php index fe29cb185..2563a58d1 100644 --- a/mod/regmod.php +++ b/mod/regmod.php @@ -7,7 +7,7 @@ function regmod_content(&$a) { $_SESSION['return_url'] = $a->cmd; if(! local_user()) { - notice( t('Please login.') . EOL); + info( t('Please login.') . EOL); $o .= '

' . login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1); return $o; } @@ -96,8 +96,8 @@ function regmod_content(&$a) { . 'Content-transfer-encoding: 8bit' ); if($res) { - notice( t('Account approved.') . EOL ); + info( t('Account approved.') . EOL ); return; } } -} \ No newline at end of file +} diff --git a/mod/search.php b/mod/search.php index 33032e183..9c82b38e8 100644 --- a/mod/search.php +++ b/mod/search.php @@ -66,7 +66,7 @@ function search_content(&$a) { $a->set_pager_total($r[0]['total']); if(! $r[0]['total']) { - notice( t('No results.') . EOL); + info( t('No results.') . EOL); return $o; } diff --git a/mod/settings.php b/mod/settings.php index cba6958b3..055042916 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -51,7 +51,7 @@ function settings_post(&$a) { intval(local_user()) ); if($r) - notice( t('Password changed.') . EOL); + info( t('Password changed.') . EOL); else notice( t('Password update failed. Please try again.') . EOL); } @@ -203,7 +203,7 @@ function settings_post(&$a) { intval(local_user()) ); if($r) - notice( t('Settings updated.') . EOL); + info( t('Settings updated.') . EOL); $r = q("UPDATE `profile` SET `publish` = %d, `net-publish` = %d @@ -374,7 +374,7 @@ function settings_content(&$a) { ? true : false); if($invisible) - notice( t('Profile is not published.') . EOL ); + info( t('Profile is not published.') . EOL ); $theme_selector = '