Merge https://github.com/friendica/friendica into pull

diff --git a/boot.php b/boot.php
index 2119347ae54dc7a690424d54a93d800bd184e99a..3c54ccc3f88780fcf393cb03fc1f882bb380d7d9 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -11,7 +11,7 @@ require_once('include/cache.php');
 require_once('library/Mobile_Detect/Mobile_Detect.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1468' );
+define ( 'FRIENDICA_VERSION',      '3.0.1470' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1156      );
 

diff --git a/js/main.js b/js/main.js
index 6ab574c4e818f449742f9d9668c2b43b12b5ee2f..a28c8576f08fe1329ec1db9b6e47afb9b229a2a4 100644 (file)
--- a/js/main.js
+++ b/js/main.js
@@ -144,6 +144,29 @@
                        if(mail == 0) { mail = '';  $('#mail-update-li').removeClass('show') } else { $('#mail-update-li').addClass('show') }
                        $('#mail-update-li').html(mail);
 
+
+                       var allevents = $(data).find('all-events').text();
+                       if(allevents == 0) { allevents = ''; $('#allevents-update').removeClass('show') } else { $('#allevents-update').addClass('show') }
+                       $('#allevents-update').html(allevents);
+
+                       var alleventstoday = $(data).find('all-events-today').text();
+                       if(alleventstoday == 0) { $('#allevents-update').removeClass('notif-allevents-today') } else { $('#allevents-update').addClass('notif-allevents-today') }
+
+                       var events = $(data).find('events').text();
+                       if(events == 0) { events = ''; $('#events-update').removeClass('show') } else { $('#events-update').addClass('show') }
+                       $('#events-update').html(events);
+
+                       var eventstoday = $(data).find('events-today').text();
+                       if(eventstoday == 0) { $('#events-update').removeClass('notif-events-today') } else { $('#events-update').addClass('notif-events-today') }
+
+                       var birthdays = $(data).find('birthdays').text();
+                       if(birthdays == 0) {birthdays = ''; $('#birthdays-update').removeClass('show') } else { $('#birthdays-update').addClass('show') }
+                       $('#birthdays-update').html(birthdays);
+
+                       var birthdaystoday = $(data).find('birthdays-today').text();
+                       if(birthdaystoday == 0) { $('#birthdays-update').removeClass('notif-birthdays-today') } else { $('#birthdays-update').addClass('notif-birthdays-today') }
+
+
                        var eNotif = $(data).find('notif')
                        
                        if (eNotif.children("note").length==0){

diff --git a/mod/network.php b/mod/network.php
index 97f00eeda90ecfb1f3bc665793eac035d96fff6b..d77a644126d21f3753c449db6cb96ce37f39863d 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -471,7 +471,7 @@ function network_content(&$a, $update = 0) {
                }
        }
 
-       if((! $group) && (! $cid) && (! $update)) {
+       if((! $group) && (! $cid) && (! $update) && (! get_config('theme','hide_eventlist'))) {
                $o .= get_birthdays();
                $o .= get_events();
        }

diff --git a/mod/ping.php b/mod/ping.php
index 55dcb26bb5b199c70e7ddab8cb277e8d2f386e5d..2698956d7ddd104d5b75c62a37dda39b833dca85 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -55,6 +55,7 @@ function ping_init(&$a) {
                $dislikes = array();
                $friends = array();
                $posts = array();
+
                $home = 0;
                $network = 0;
 
@@ -140,6 +141,48 @@ function ping_init(&$a) {
                        $register = "0";
                }
 
+               $all_events = 0;
+               $all_events_today = 0;
+               $events = 0;
+               $events_today = 0;
+               $birthdays = 0;
+               $birthdays_today = 0;
+
+
+               $ev = q("SELECT count(`event`.`id`) as total, type, start, adjust FROM `event`
+                       WHERE `event`.`uid` = %d AND `start` < '%s' AND `finish` > '%s' and `ignore` = 0
+                       ORDER BY `start` ASC ",
+                       intval(local_user()),
+                       dbesc(datetime_convert('UTC','UTC','now + 7 days')),
+                       dbesc(datetime_convert('UTC','UTC','now'))
+               );
+
+               if($ev && count($ev)) {
+                       $all_events = intval($ev[0]['total']);
+
+                       if($all_events) {
+                               $str_now = datetime_convert('UTC',$a->timezone,'now','Y-m-d');
+                               foreach($ev as $x) {
+                                       $bd = false;
+                                       if($x['type'] === 'birthday') {
+                                               $birthdays ++;
+                                               $bd = true;
+                                       }
+                                       else {
+                                               $events ++;
+                                       }
+                                       if(datetime_convert('UTC',((intval($x['adjust'])) ? $a->timezone : 'UTC'), $x['start'],'Y-m-d') === $str_now) {
+                                               $all_events_today ++;
+                                               if($bd)
+                                                       $birthdays_today ++;
+                                               else
+                                                       $events_today ++;
+                                       }
+                               }
+                       }
+               }
+
+
 
                function xmlize($href, $name, $url, $photo, $date, $seen, $message){
                        $data = array('href' => &$href, 'name' => &$name, 'url'=>&$url, 'photo'=>&$photo, 'date'=>&$date, 'seen'=>&$seen, 'messsage'=>&$message);
@@ -153,8 +196,15 @@ function ping_init(&$a) {
                echo "<intro>$intro</intro>
                                <mail>$mail</mail>
                                <net>$network</net>
-                               <home>$home</home>";
+                               <home>$home</home>\r\n";
                if ($register!=0) echo "<register>$register</register>";
+
+               echo "<all-events>$all_events</all-events>
+                       <all-events-today>$all_events_today</all-events-today>
+                       <events>$events</events>
+                       <events-today>$events_today</events-today>
+                       <birthdays>$birthdays</birthdays>
+                       <birthdays-today>$birthdays_today</birthdays-today>\r\n";
                
                $tot = $mail+$intro+$register+count($comments)+count($likes)+count($dislikes)+count($friends)+count($posts)+count($tags);
 

diff --git a/mod/profile.php b/mod/profile.php
index a4dce791802b8ad974599846fd55185a0d04424c..b33b181de1b1b7332611799ac225d366c12fd48a 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -304,7 +304,7 @@ function profile_content(&$a, $update = 0) {
                $items = array();
        }
 
-       if($is_owner && ! $update) {
+       if($is_owner && (! $update) && (! get_config('theme','hide_eventlist'))) {
                $o .= get_birthdays();
                $o .= get_events();
        }

diff --git a/util/messages.po b/util/messages.po
index c71344e91ef4250c988e00299e4aeafb89d7f846..5508bf632de6b1ba052cd7b8f35b2ab0fc3fbbb2 100644 (file)
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1468\n"
+"Project-Id-Version: 3.0.1470\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-16 10:00-0700\n"
+"POT-Creation-Date: 2012-09-18 10:00-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -142,7 +142,7 @@ msgstr ""
 #: ../../addon/facebook/facebook.php:619
 #: ../../addon/snautofollow/snautofollow.php:64 ../../addon/bg/bg.php:90
 #: ../../addon/fbpost/fbpost.php:226 ../../addon/yourls/yourls.php:76
-#: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57
+#: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:88
 #: ../../addon/page/page.php:210 ../../addon/planets/planets.php:158
 #: ../../addon/uhremotestorage/uhremotestorage.php:89
 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
@@ -3088,7 +3088,7 @@ msgid "People Search"
 msgstr ""
 
 #: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/tagger.php:62
-#: ../../addon/facebook/facebook.php:1594
+#: ../../addon/facebook/facebook.php:1598
 #: ../../addon/communityhome/communityhome.php:158
 #: ../../addon/communityhome/communityhome.php:167
 #: ../../view/theme/diabook/theme.php:565
@@ -3098,7 +3098,7 @@ msgstr ""
 msgid "status"
 msgstr ""
 
-#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1598
+#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602
 #: ../../addon/communityhome/communityhome.php:172
 #: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1840
 #: ../../include/conversation.php:137
@@ -5237,11 +5237,11 @@ msgstr ""
 msgid "Post to LiveJournal by default"
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:47
+#: ../../addon/nsfw/nsfw.php:78
 msgid "Not Safe For Work (General Purpose Content Filter) settings"
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:49
+#: ../../addon/nsfw/nsfw.php:80
 msgid ""
 "This plugin looks in posts for the words/text you specify below, and "
 "collapses any content containing those keywords so it is not displayed at "
@@ -5251,23 +5251,23 @@ msgid ""
 "can thereby be used as a general purpose content filter."
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:50
+#: ../../addon/nsfw/nsfw.php:81
 msgid "Enable Content filter"
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:53
+#: ../../addon/nsfw/nsfw.php:84
 msgid "Comma separated list of keywords to hide"
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:58
+#: ../../addon/nsfw/nsfw.php:89
 msgid "Use /expression/ to provide regular expressions"
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:74
+#: ../../addon/nsfw/nsfw.php:105
 msgid "NSFW Settings saved."
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:121
+#: ../../addon/nsfw/nsfw.php:157
 #, php-format
 msgid "%s - Click to open/close"
 msgstr ""