harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Thomas Willingham 2013-01-03 09:17:11 +00:00
commit b1a02cf450
11 changed files with 132 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -16,7 +16,7 @@ require_once('include/features.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica Red');
define ( 'FRIENDICA_VERSION', trim(file_get_contents('version.inc')) . 'R');
define ( 'ZOT_REVISION', 1 );
define ( 'DB_UPDATE_VERSION', 1014 );
define ( 'DB_UPDATE_VERSION', 1015 );
define ( 'EOL', '<br />' . "\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );

BIN
images/red.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

18
include/items.php
View File

@ -4200,13 +4200,15 @@ function fetch_post_tags($items) {
$tag_finder = array();
if($items) {
foreach($items as $item) {
if(array_key_exists('item_id',$item)) {
if(! in_array($item['item_id'],$tag_finder))
$tag_finder[] = $item['item_id'];
}
else {
if(! in_array($item['id'],$tag_finder))
$tag_finder[] = $item['id'];
if(is_array($item)) {
if(array_key_exists('item_id',$item)) {
if(! in_array($item['item_id'],$tag_finder))
$tag_finder[] = $item['item_id'];
}
else {
if(! in_array($item['id'],$tag_finder))
$tag_finder[] = $item['id'];
}
}
}
}
@ -4222,7 +4224,7 @@ function fetch_post_tags($items) {
for($x = 0; $x < count($items); $x ++) {
if(count($tags)) {
if($tags) {
foreach($tags as $t) {
if(array_key_exists('item_id',$items[$x])) {
if($t['oid'] == $items[$x]['item_id']) {

4
include/notifier.php
View File

@ -49,7 +49,7 @@ require_once('include/html2plain.php');
require_once('include/cli_startup.php');
require_once('include/zot.php');
require_once('include/queue_fn.php');
function notifier_run($argv, $argc){
@ -261,8 +261,8 @@ function notifier_run($argv, $argc){
stringify_array_elms($recipients);
if(! $recipients)
return;
logger('notifier: recipients: ' . print_r($recipients,true));
logger('notifier: recipients: ' . print_r($recipients,true));
$env_recips = null;
if($private) {

8
include/zot.php
View File

@ -358,7 +358,13 @@ function zot_register_hub($arr) {
$guid_hash = base64url_encode(hash('whirlpool',$arr['guid'] . $arr['guid_sig'], true));
$x = z_fetch_url($arr['url'] . '/.well-known/zot-info/?f=&hash=' . $guid_hash);
$url = $arr['url'] . '/.well-known/zot-info/?f=&guid_hash=' . $guid_hash;
logger('zot_register_hub: ' . $url);
$x = z_fetch_url($url);
logger('zot_register_hub: ' . print_r($x,true));
if($x['success']) {
$record = json_decode($x['body'],true);

2
install/database.sql
View File

@ -805,7 +805,7 @@ CREATE TABLE IF NOT EXISTS `tokens` (
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `verify` (
`id` int(10) unsigned NOT NULL,
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`channel` int(10) unsigned NOT NULL DEFAULT '0',
`type` char(32) NOT NULL DEFAULT '',
`token` char(255) NOT NULL DEFAULT '',

10
install/update.php
View File

@ -1,6 +1,6 @@
<?php
define( 'UPDATE_VERSION' , 1014 );
define( 'UPDATE_VERSION' , 1015 );
/**
*
@ -211,3 +211,11 @@ function update_r1013() {
return UPDATE_SUCCESS;
return UPDATE_FAILED;
}
function update_r1014() {
$r = q("ALTER TABLE `verify` CHANGE `id` `id` INT( 10 ) UNSIGNED NOT NULL AUTO_INCREMENT");
if($r)
return UPDATE_SUCCESS;
return UPDATE_FAILED;
}

19
mod/profile.php
View File

@ -28,11 +28,22 @@ function profile_aside(&$a) {
$profile = argv(1);
}
profile_load($a,$which,$profile);
$a->set_widget('archive',posted_date_widget($a->get_baseurl(true) . '/channel/' . $a->profile['nickname'],$a->profile['profile_uid'],true));
$a->set_widget('categories',categories_widget($a->get_baseurl(true) . '/channel/' . $a->profile['nickname'],$cat));
$x = q("select uid as profile_uid from channel where address = '%s' limit 1",
dbesc(argv(1))
);
if($x) {
$a->profile = $x[0];
$channel_display = get_pconfig($a->profile['profile_uid'],'system','channel_format');
if(! $channel_display)
profile_load($a,$which,$profile);
if($channel_display === 'full')
$a->page['template'] = 'full';
else {
$a->set_widget('archive',posted_date_widget($a->get_baseurl(true) . '/channel/' . $a->profile['nickname'],$a->profile['profile_uid'],true));
$a->set_widget('categories',categories_widget($a->get_baseurl(true) . '/channel/' . $a->profile['nickname'],$cat));
}
}
}

108
mod/search.php
View File

@ -88,6 +88,9 @@ function search_content(&$a) {
require_once('include/conversation.php');
require_once('include/items.php');
$observer = $a->get_observer();
$o = '<div id="live-search"></div>' . "\r\n";
$o .= '<h3>' . t('Search') . '</h3>';
@ -136,26 +139,90 @@ function search_content(&$a) {
// OR your own posts if you are a logged in member
// No items will be shown if the member has a blocked profile wall.
if(! get_pconfig(local_user(),'system','alt_pager')) {
$r = q("SELECT distinct(`item`.`uri`) as `total`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
AND (( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0)
OR `item`.`uid` = %d )
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
$sql_extra group by `item`.`uri` ",
intval(local_user())
);
if(count($r))
$a->set_pager_total(count($r));
if(! count($r)) {
info( t('No results.') . EOL);
return $o;
}
if((! $update) && (! $load)) {
// This is ugly, but we can't pass the profile_uid through the session to the ajax updater,
// because browser prefetching might change it on us. We have to deliver it with the page.
$o .= '<div id="live-channel"></div>' . "\r\n";
$o .= "<script> var profile_uid = " . $a->profile['profile_uid']
. "; var netargs = '?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
$a->page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array(
'$baseurl' => z_root(),
'$pgtype' => 'search',
'$uid' => (($a->profile['profile_uid']) ? $a->profile['profile_uid'] : '0'),
'$gid' => '0',
'$cid' => '0',
'$cmin' => '0',
'$cmax' => '0',
'$star' => '0',
'$liked' => '0',
'$conv' => '0',
'$spam' => '0',
'$nouveau' => '0',
'$wall' => '0',
'$page' => (($a->pager['page'] != 1) ? $a->pager['page'] : 1),
'$search' => (($tag) ? '#' : '') . $search,
'$order' => '',
'$file' => '',
'$cats' => '',
'$dend' => '',
'$dbegin' => ''
));
}
if(($update) && ($load)) {
$pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
if($load) {
$r = q("SELECT distinct(uri), item.* from item
WHERE item_restrict = 0
AND (( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND not ( item_flags & %d ))
OR ( `item`.`uid` = %d ))
$sql_extra
group by uri ORDER BY created DESC $pager_sql ",
intval(ITEM_PRIVATE),
intval(local_user()),
intval(ABOOK_FLAG_BLOCKED)
);
}
else {
$r = array();
}
}
if($r) {
$parents_str = ids_to_querystr($r,'item_id');
$items = q("SELECT `item`.*, `item`.`id` AS `item_id`
FROM `item`
WHERE item_restrict = 0 and
$sql_extra ",
intval($a->profile['profile_uid']),
dbesc($parents_str)
);
xchan_query($items);
$items = fetch_post_tags($items);
$items = conv_sort($items,'created');
} else {
$items = array();
}
$r = q("SELECT distinct(`item`.`uri`), `item`.*, `item`.`id` AS `item_id`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
@ -177,7 +244,7 @@ function search_content(&$a) {
);
$a = fetch_post_tags($a);
// $a = fetch_post_tags($a);
if(! count($r)) {
info( t('No results.') . EOL);
@ -192,12 +259,7 @@ function search_content(&$a) {
$o .= conversation($a,$r,'search',false);
if(! get_pconfig(local_user(),'system','alt_pager')) {
$o .= paginate($a);
}
else {
$o .= alt_pager($a,count($r));
}
$o .= alt_pager($a,count($r));
return $o;
}

2
mod/zfinger.php
View File

@ -42,7 +42,7 @@ function zfinger_init(&$a) {
dbesc($zhash)
);
}
if(strlen($zguid) && strlen($zguid_sig)) {
elseif(strlen($zguid) && strlen($zguid_sig)) {
$r = q("select channel.*, xchan.* from channel left join xchan on channel_hash = xchan_hash
where channel_guid = '%s' and channel_guid_sig = '%s' limit 1",
dbesc($zguid),

2
version.inc
View File

@ -1 +1 @@
2013-01-01.187
2013-01-02.188