From 4c21abe533c6a5bcd87b453760c551fed109a79a Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 2 Jan 2013 23:07:46 -0800 Subject: [PATCH] verify table needs auto_increment flag --- boot.php | 2 +- images/red.png | Bin 4909 -> 1265 bytes include/notifier.php | 4 +- install/database.sql | 2 +- install/update.php | 10 +++- mod/search.php | 108 ++++++++++++++++++++++++++++++++++--------- 6 files changed, 98 insertions(+), 28 deletions(-) diff --git a/boot.php b/boot.php index 9bee6c35c..b8742b458 100644 --- a/boot.php +++ b/boot.php @@ -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', '
' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/images/red.png b/images/red.png index 1d0a2950e871f955a766e8d93cf36978a49b4231..c7831bb52396aa4ffea272614565ba98cc6e8c87 100644 GIT binary patch delta 1246 zcmV<41R?vaCh-Z7BYyw}VoOIv00000008+zyMF)x010qNS#tmY4c7nw4c7reD4Tcy z000McNliru-2npwCl3XkGNJ$g1b#_GK~z}7&6iDRR96(of9Jk8Zzhvzt)gfW7h+Yc zg-B~71wjl}EL8+4r9!cVR%q9?ix$Byx(S8sT!}lux)Mq%^s4^4H(KmC^hz7gd&7 zbqLLs$oK0-4`tgS)h0&lY5F#pyG#P+K;-rXh zTZH>-UOlt!gMarw^1j@%f}m)!{oImVFE~I&uqqg5@TX(6aZnNvN^`xR1x6Jk z22jl7kp4T8c80`1*l$(_)mNB-2c5Gz-w>EwzejQ!w`4(E-sE21;k$@X$auA zwUOSvn}5`f9e8WjAfAT~4G~?wOy$A_?EU*wXBQ7Z7iPm>y_($N!^oaJ1nD#{XR{a) zsv9=YvU4Y?&6}C%>A~K+H%osCj4CsWyqV8enNffqEBi4iWLOi-K0|~GU+tdTBPBP z(*$%{m6s13K(krg*cccyWjvk9P&{!0s@3@ci06^+>?G*v;U&*QXQ0+NMxuzc2+p}F z<4OIHZaXd_GJPebRZUcXNL$Pr32y|)&xql4B%hcMf>lU7Y=pEETCxg2AC zeT??@Vuy#3hb#z02(D6jau(R)820zEN0P(z_hVMBB-7PJDw{=|n|>ly{B#;srFi-@ z;l+!O)Pw2_mgdg_0cohsjAGLOQ8|B}@qgpTsfHmYm&40s@LF1ES-u=~j=R0Rl+K== z(wUV>BFvq${Ka-OTPRREc8s{cpKNzGnf2@OJdbE_knqYC%9k#o=O6o?FQgZ|h_-F`kL7;@K!2GN zIL)4nWKRBT!-8LOlmawIV{VU7s*=p|%?1!VB|?cr2yrM5zvKshq*S(9gjj_#jxvI6 zG6&Ld?g54ol&U(l;)x%<`TB{WzlXL3PBj*!qRHIe%tv^bwq;R9P>PM$&bF=k(=SzO zCr8(=d$&G#<3mq{5~?LZtT;rQ2UkKxsi;s>RZuZYmc{LFbbTTK$M)_^-5UJsyYlex zS9W5;vqlkT8YDdDXNiInPyyq>iI7^gYM^aP*Jtm2@%goX0BGDffn|gHDgXcg07*qo IM6N<$g1rn~-T(jq literal 4909 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 diff --git a/include/notifier.php b/include/notifier.php index 71571cbd5..ebb6f7bb5 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -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) { diff --git a/install/database.sql b/install/database.sql index 5a17346e1..a4d885541 100644 --- a/install/database.sql +++ b/install/database.sql @@ -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 '', diff --git a/install/update.php b/install/update.php index 549ae63ed..cff3115a2 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ get_observer(); + $o = '' . "\r\n"; $o .= '

' . t('Search') . '

'; @@ -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 .= '
' . "\r\n"; + $o .= "\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; }