diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/babel.php | 19 | ||||
| -rw-r--r-- | mod/group.php | 16 | ||||
| -rwxr-xr-x | mod/like.php | 5 | ||||
| -rw-r--r-- | mod/network.php | 34 | ||||
| -rw-r--r-- | mod/ping.php | 301 |
5 files changed, 134 insertions, 241 deletions
diff --git a/mod/babel.php b/mod/babel.php index 1c881a5bd..ca2c068f8 100644 --- a/mod/babel.php +++ b/mod/babel.php @@ -19,6 +19,12 @@ function babel_content(&$a) { $o .= '<br /><br />'; + $o .= '<form action="babel" method="post">'; + $o .= t('Source (Diaspora) text to convert to BBcode:') . EOL . '<textarea name="d2bbtext" >' . htmlspecialchars($_REQUEST['d2bbtext']) .'</textarea>' . EOL; + $o .= '<input type="submit" name="submit" value="Submit" /></form>'; + + $o .= '<br /><br />'; + if(x($_REQUEST,'text')) { $text = trim($_REQUEST['text']); @@ -52,5 +58,18 @@ function babel_content(&$a) { } + + if(x($_REQUEST,'d2bbtext')) { + + $d2bbtext = trim($_REQUEST['d2bbtext']); + $o .= t("Source input (Diaspora format): ") . EOL. EOL; + $o .= visible_lf($d2bbtext) . EOL. EOL; + + + $bb = diaspora2bb($d2bbtext); + $o .= t("diaspora2bb: ") . EOL. EOL; + $o .= visible_lf($bb) . EOL. EOL; + } + return $o; } diff --git a/mod/group.php b/mod/group.php index a282dbccf..69a7892c0 100644 --- a/mod/group.php +++ b/mod/group.php @@ -44,7 +44,7 @@ function group_post(&$a) { intval(local_user()) ); if(! count($r)) { - notice( t('Group not found.') . EOL ); + notice( t('Contact group not found.') . EOL ); goaway($a->get_baseurl() . '/contacts'); return; // NOTREACHED } @@ -57,7 +57,7 @@ function group_post(&$a) { intval($group['id']) ); if($r) - info( t('Group name changed.') . EOL ); + info( t('Contact group name changed.') . EOL ); } $a->page['aside'] = group_side(); @@ -88,7 +88,7 @@ function group_content(&$a) { return replace_macros($tpl, $context + array( '$title' => t('Create a group of contacts/friends.'), - '$gname' => array('groupname',t('Group Name: '), '', ''), + '$gname' => array('groupname',t('Contact Group Name: '), '', ''), '$gid' => 'new', '$form_security_token' => get_form_security_token("group_edit"), )); @@ -107,9 +107,9 @@ function group_content(&$a) { if(count($r)) $result = group_rmv(local_user(),$r[0]['name']); if($result) - info( t('Group removed.') . EOL); + info( t('Contact group removed.') . EOL); else - notice( t('Unable to remove group.') . EOL); + notice( t('Unable to remove contact group.') . EOL); } goaway($a->get_baseurl() . '/group'); // NOTREACHED @@ -134,7 +134,7 @@ function group_content(&$a) { intval(local_user()) ); if(! count($r)) { - notice( t('Group not found.') . EOL ); + notice( t('Contact group not found.') . EOL ); goaway($a->get_baseurl() . '/contacts'); } $group = $r[0]; @@ -173,8 +173,8 @@ function group_content(&$a) { $context = $context + array( - '$title' => t('Group Editor'), - '$gname' => array('groupname',t('Group Name: '),$group['name'], ''), + '$title' => t('Contact Group Editor'), + '$gname' => array('groupname',t('Contact Group Name: '),$group['name'], ''), '$gid' => $group['id'], '$drop' => $drop_txt, '$form_security_token' => get_form_security_token('group_edit'), diff --git a/mod/like.php b/mod/like.php index 5519bffdb..8fe0cf735 100755 --- a/mod/like.php +++ b/mod/like.php @@ -106,11 +106,12 @@ function like_content(&$a) { $r = q("SELECT * FROM `item` WHERE `verb` = '%s' AND `deleted` = 0 - AND `contact-id` = %d AND ( `parent` = '%s' OR `parent-uri` = '%s') LIMIT 1", + AND `contact-id` = %d AND ( `parent` = '%s' OR `parent-uri` = '%s' OR `thr-parent` = '%s') LIMIT 1", dbesc($activity), intval($contact['id']), dbesc($item_id), - dbesc($item_id) + dbesc($item_id), + dbesc($item['uri']) ); if(count($r)) { $like_item = $r[0]; diff --git a/mod/network.php b/mod/network.php index bb37ea6dc..f058319f4 100644 --- a/mod/network.php +++ b/mod/network.php @@ -92,29 +92,17 @@ function network_init(&$a) { ); } - $a->page['content'] .= '<div id="slider-range" class="ui-slider ui-slider-horizontal ui-widget ui-widget-content ui-corner-all"> -<div class="ui-slider-range ui-widget-header" style="margin-left: 30px; margin-right: 30px;"></div> -<a class="ui-slider-handle ui-state-default ui-corner-all" href="#" style="left: 0%;"></a> -<a class="ui-slider-handle ui-state-default ui-corner-all" href="#" style="left: 100%;"></a> -</div> - <script> - $(function() { - $( "#slider-range" ).slider({ - range: true, - min: 0, - max: 500, - values: [ 75, 300 ], - slide: function( event, ui ) { - $( "#amount" ).val( "$" + ui.values[ 0 ] + " - $" + ui.values[ 1 ] ); - } - }); - $( "#amount" ).val( "$" + $( "#slider-range" ).slider( "values", 0 ) + - " - $" + $( "#slider-range" ).slider( "values", 1 ) ); - }); - </script> -'; - - + $tpl = get_markup_template('main_slider.tpl'); + $a->page['content'] .= replace_macros($tpl,array( + '$me' => t('Me'), + '$intimate' => t('Best Friends'), + '$friends' => t('Friends'), + '$coworkers' => t('Co-workers'), + '$oldfriends' => t('Former Friends'), + '$acquaintances' => t('Acquaintances'), + '$world' => t('Everybody') + )); + // search terms header if(x($_GET,'search')) { $a->page['content'] .= '<h2>' . t('Search Results For:') . ' ' . htmlspecialchars($search) . '</h2>'; diff --git a/mod/ping.php b/mod/ping.php index 55dcb26bb..05287e499 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -1,27 +1,22 @@ <?php -require_once("include/datetime.php"); -function ping_init(&$a) { - - header("Content-type: text/xml"); - - echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?> - <result>"; - - $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; +require_once('include/bbcode.php'); - if(local_user()){ +function ping_init(&$a) { - // Different login session than the page that is calling us. + $result = array(); + $notifs = array(); - if(intval($_GET['uid']) && intval($_GET['uid']) != local_user()) { - echo '<invalid>1</invalid></result>'; - killme(); - } + header("content-type: application/json"); - $firehose = intval(get_pconfig(local_user(),'system','notify_full')); + if((! local_user()) || ((intval($_GET['uid'])) && (intval($_GET['uid']) != local_user()))) { + $result[] = array('success' => false, 'message' => 'Authentication error'); + echo json_encode($result); + killme(); + } + if($a->argc > 1 && $a->argv[1] === 'notify') { $t = q("select count(*) as total from notify where uid = %d and seen = 0", intval(local_user()) ); @@ -30,231 +25,121 @@ function ping_init(&$a) { and seen = 0 order by date desc limit 0, 50", intval(local_user()) ); - $sysnotify = $t[0]['total']; } else { $z1 = q("select * from notify where uid = %d and seen = 0 order by date desc limit 0, 50", intval(local_user()) ); - $z2 = q("select * from notify where uid = %d and seen = 1 order by date desc limit 0, %d", intval(local_user()), intval(50 - intval($t[0]['total'])) ); $z = array_merge($z1,$z2); - $sysnotify = 0; // we will update this in a moment } - - - $tags = array(); - $comments = array(); - $likes = array(); - $dislikes = array(); - $friends = array(); - $posts = array(); - $home = 0; - $network = 0; - - $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`wall`, `item`.`author-name`, - `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`, - `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink` - FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent` - WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND - `item`.`deleted` = 0 AND `item`.`uid` = %d - ORDER BY `item`.`created` DESC", - intval(local_user()) - ); - - if(count($r)) { - - foreach ($r as $it) { - - if($it['wall']) - $home ++; - else - $network ++; - - switch($it['verb']){ - case ACTIVITY_TAG: - $obj = parse_xml_string($xmlhead.$it['object']); - $it['tname'] = $obj->content; - $tags[] = $it; - break; - case ACTIVITY_LIKE: - $likes[] = $it; - break; - case ACTIVITY_DISLIKE: - $dislikes[] = $it; - break; - case ACTIVITY_FRIEND: - $obj = parse_xml_string($xmlhead.$it['object']); - $it['fname'] = $obj->title; - $friends[] = $it; - break; - default: - if ($it['parent']!=$it['id']) { - $comments[] = $it; - } else { - if(! $it['wall']) - $posts[] = $it; - } - } + if(count($z)) { + foreach($z as $zz) { + $notifs[] = array( + 'notify_link' => $a->get_baseurl() . '/notify/view/' . $zz['id'], + 'name' => $zz['name'], + 'url' => $zz['url'], + 'photo' => $zz['photo'], + 'when' => relative_date($zz['date']), + 'classs' => (($zz['seen']) ? 'notify-seen' : 'notify-unseen'), + 'message' => strip_tags(bbcode($zz['msg'])) + ); } } - $intros1 = q("SELECT `intro`.`id`, `intro`.`datetime`, - `fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo` - FROM `intro` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id` - WHERE `intro`.`uid` = %d AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`fid`!=0", - intval(local_user()) - ); - $intros2 = q("SELECT `intro`.`id`, `intro`.`datetime`, - `contact`.`name`, `contact`.`url`, `contact`.`photo` - FROM `intro` LEFT JOIN `contact` ON `intro`.`contact-id` = `contact`.`id` - WHERE `intro`.`uid` = %d AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`contact-id`!=0", - intval(local_user()) - ); - - $intro = count($intros1) + count($intros2); - $intros = $intros1+$intros2; - + echo json_encode(array('notify' => $notifs)); + killme(); - - $myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'] ; - $mails = q("SELECT *, COUNT(*) AS `total` FROM `mail` - WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ", - intval(local_user()), - dbesc($myurl) - ); - if($mails) - $mail = $mails[0]['total']; - - if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()){ - $regs = q("SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`, COUNT(*) as `total` FROM `contact` RIGHT JOIN `register` ON `register`.`uid`=`contact`.`uid` WHERE `contact`.`self`=1"); - if($regs) - $register = $regs[0]['total']; - } else { - $register = "0"; + } + + $result['notify'] = 0; + $result['home'] = 0; + $result['network'] = 0; + $result['intros'] = 0; + $result['mail'] = 0; + $result['register'] = 0; + $result['notice'] = array(); + $result['info'] = array(); + + + + $t = q("select count(*) as total from notify where uid = %d and seen = 0", + intval(local_user()) + ); + if($t) + $result['notify'] = intval($t[0]['total']); + + $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`wall`, `item`.`author-name`, + `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`, + `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink` + FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent` + WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND + `item`.`deleted` = 0 AND `item`.`uid` = %d + ORDER BY `item`.`created` DESC", + intval(local_user()) + ); + + if(count($r)) { + foreach ($r as $it) { + if($it['wall']) + $result['home'] ++; + else + $result['network'] ++; } + } - - 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); - call_hooks('ping_xmlize', $data); - $notsxml = '<note href="%s" name="%s" url="%s" photo="%s" date="%s" seen="%s" >%s</note>'; - return sprintf ( $notsxml, - xmlify($href), xmlify($name), xmlify($url), xmlify($photo), xmlify($date), xmlify($seen), xmlify($message) - ); - } + $intros1 = q("SELECT `intro`.`id`, `intro`.`datetime`, + `fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo` + FROM `intro` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id` + WHERE `intro`.`uid` = %d AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`fid`!=0", + intval(local_user()) + ); + $intros2 = q("SELECT `intro`.`id`, `intro`.`datetime`, + `contact`.`name`, `contact`.`url`, `contact`.`photo` + FROM `intro` LEFT JOIN `contact` ON `intro`.`contact-id` = `contact`.`id` + WHERE `intro`.`uid` = %d AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`contact-id`!=0", + intval(local_user()) + ); - echo "<intro>$intro</intro> - <mail>$mail</mail> - <net>$network</net> - <home>$home</home>"; - if ($register!=0) echo "<register>$register</register>"; + $intro = count($intros1) + count($intros2); + $result['intros'] = intval($intros); + + $myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'] ; + $mails = q("SELECT *, COUNT(*) AS `total` FROM `mail` + WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ", + intval(local_user()), + dbesc($myurl) + ); + if($mails) + $result['mail'] = intval($mails[0]['total']); + + if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()){ + $regs = q("SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`, COUNT(*) as `total` FROM `contact` RIGHT JOIN `register` ON `register`.`uid`=`contact`.`uid` WHERE `contact`.`self`=1"); + if($regs) + $result['register'] = intval($regs[0]['total']); + } - $tot = $mail+$intro+$register+count($comments)+count($likes)+count($dislikes)+count($friends)+count($posts)+count($tags); - - require_once('include/bbcode.php'); - - if($firehose) { - echo ' <notif count="'.$tot.'">'; - } - else { - if(count($z) && (! $sysnotify)) { - foreach($z as $zz) { - if($zz['seen'] == 0) - $sysnotify ++; - } - } - - echo ' <notif count="'. $sysnotify .'">'; - if(count($z)) { - foreach($z as $zz) { - echo xmlize($a->get_baseurl() . '/notify/view/' . $zz['id'], $zz['name'],$zz['url'],$zz['photo'],relative_date($zz['date']), ($zz['seen'] ? 'notify-seen' : 'notify-unseen'), ($zz['seen'] ? '' : '→ ') .strip_tags(bbcode($zz['msg']))); - } - } - } - - if($firehose) { - if ($intro>0){ - foreach ($intros as $i) { - echo xmlize( $a->get_baseurl().'/notifications/intros/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), 'notify-unseen',t("{0} wants to be your friend") ); - }; - } - if ($mail>0){ - foreach ($mails as $i) { - echo xmlize( $a->get_baseurl().'/message/'.$i['id'], $i['from-name'], $i['from-url'], $i['from-photo'], relative_date($i['created']), 'notify-unseen',t("{0} sent you a message") ); - }; - } - if ($register>0){ - foreach ($regs as $i) { - echo xmlize( $a->get_baseurl().'/admin/users/', $i['name'], $i['url'], $i['micro'], relative_date($i['created']), 'notify-unseen',t("{0} requested registration") ); - }; - } - - if (count($comments)){ - foreach ($comments as $i) { - echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',sprintf( t("{0} commented %s's post"), $i['pname'] ) ); - }; - } - if (count($likes)){ - foreach ($likes as $i) { - echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',sprintf( t("{0} liked %s's post"), $i['pname'] ) ); - }; - } - if (count($dislikes)){ - foreach ($dislikes as $i) { - echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',sprintf( t("{0} disliked %s's post"), $i['pname'] ) ); - }; - } - if (count($friends)){ - foreach ($friends as $i) { - echo xmlize($a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'],$i['author-name'],$i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',sprintf( t("{0} is now friends with %s"), $i['fname'] ) ); - }; - } - if (count($posts)){ - foreach ($posts as $i) { - echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',sprintf( t("{0} posted") ) ); - }; - } - if (count($tags)){ - foreach ($tags as $i) { - echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',sprintf( t("{0} tagged %s's post with #%s"), $i['pname'], $i['tname'] ) ); - }; - } - - if (count($cit)){ - foreach ($cit as $i) { - echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',t("{0} mentioned you in a post") ); - }; - } - } - - echo " </notif>"; - } - echo " <sysmsgs>"; - if(x($_SESSION,'sysmsg')){ foreach ($_SESSION['sysmsg'] as $m){ - echo "<notice>".xmlify($m)."</notice>"; + $result['notice'][] = $m; } unset($_SESSION['sysmsg']); } if(x($_SESSION,'sysmsg_info')){ foreach ($_SESSION['sysmsg_info'] as $m){ - echo "<info>".xmlify($m)."</info>"; + $result['info'][] = $m; } unset($_SESSION['sysmsg_info']); } - echo " </sysmsgs>"; - echo"</result> - "; - + echo json_encode($result); killme(); + } |