tobias/friendica
1
0
Fork 0
Code Pull requests Activity

contact search + sync to personal edition, installer db check + curl proxy

Browse source
This commit is contained in:
Mike Macgirvin 2010-08-17 18:44:13 -07:00
commit 1a1f9b296c
9 changed files with 64 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

25
mod/contacts.php
View file

@ -209,17 +209,31 @@ function contacts_content(&$a) {
}
if(($a->argc == 2) && ($a->argv[1] == 'all'))
$sql_extra = '';
else
$sql_extra = " AND `blocked` = 0 ";
$search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : '');
$tpl = file_get_contents("view/contacts-top.tpl");
$o .= replace_macros($tpl,array(
'$hide_url' => ((strlen($sql_extra)) ? 'contacts/all' : 'contacts' ),
'$hide_text' => ((strlen($sql_extra)) ? t('Show Blocked Connections') : t('Hide Blocked Connections'))
'$hide_text' => ((strlen($sql_extra)) ? t('Show Blocked Connections') : t('Hide Blocked Connections')),
'$search' => $search,
'$finding' => (strlen($search) ? '<h4>' . t('Finding: ') . "'" . $search . "'" . '</h4>' : ""),
'$submit' => t('Find'),
'$cmd' => $a->cmd
));
if($search)
$search = dbesc($search.'*');
$sql_extra .= ((strlen($search)) ? " AND MATCH `name` AGAINST ('$search' IN BOOLEAN MODE) " : "");
switch($sort_type) {
case DIRECTION_BOTH :
$sql_extra2 = " AND `dfrn-id` != '' AND `issued-id` != '' ";
@ -242,8 +256,11 @@ function contacts_content(&$a) {
if(count($r))
$a->set_pager_total($r[0]['total']);
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `pending` = 0 $sql_extra $sql_extra2 ",
intval($_SESSION['uid']));
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `pending` = 0 $sql_extra $sql_extra2 ORDER BY `name` ASC LIMIT %d , %d ",
intval($_SESSION['uid']),
intval($a->pager['start']),
intval($a->pager['itemspage'])
);
if(count($r)) {
@ -283,8 +300,8 @@ function contacts_content(&$a) {
));
}
$o .= '<div id="contact-edit-end"></div>';
$o .= paginate($a);
}
$o .= paginate($a);
return $o;
}

2
mod/directory.php
View file

@ -11,7 +11,7 @@ function directory_content(&$a) {
$o .= replace_macros($tpl, array(
'$search' => $search,
'$finding' => (strlen($search) ? "<h4>Finding: '$search'</h4>" : "")
'$finding' => (strlen($search) ? '<h4>' . t('Finding: ') . "'" . $search . "'" . '</h4>' : "")
));
if($search)

2
mod/install.php
View file

@ -16,7 +16,7 @@ function install_post(&$a) {
$db = new dba($dbhost, $dbuser, $dbpass, $dbdata, $true);
if(! $db->getdb()) {
if(mysqli_connect_errno()) {
notice( t('Could not connect to database.') . EOL);
return;
}