X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fcontact_widgets.php;h=9c44f4d15695027027a5f756f8cfb93a1f62d92f;hb=a817a1a070b4530eaeb07c90608e289e451c755b;hp=0f78d5bf5cb6781f635caa809ce859205352fc16;hpb=ed0d858f98babfa7b02e92186ea747b92605aad9;p=friendica.git diff --git a/include/contact_widgets.php b/include/contact_widgets.php index 0f78d5bf5c..9c44f4d156 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -1,8 +1,19 @@ t('Add New Contact'), '$desc' => t('Enter address or web location'), '$hint' => t('Example: bob@example.com, http://example.com/barbara'), @@ -13,20 +24,19 @@ function follow_widget($value = "") { } function findpeople_widget() { - require_once('include/Contact.php'); - $a = get_app(); + $global_dir = Config::get('system', 'directory'); - if (get_config('system','invitation_only')) { - $x = get_pconfig(local_user(),'system','invites_remaining'); + if (Config::get('system', 'invitation_only')) { + $x = PConfig::get(local_user(), 'system', 'invites_remaining'); if ($x || is_site_admin()) { $a->page['aside'] .= '' . $inv; } } - return replace_macros(get_markup_template('peoplefind.tpl'),array( + return replace_macros(get_markup_template('peoplefind.tpl'), array( '$findpeople' => t('Find People'), '$desc' => t('Enter name or interest'), '$label' => t('Connect/Follow'), @@ -35,7 +45,9 @@ function findpeople_widget() { '$suggest' => t('Friend Suggestions'), '$similar' => t('Similar Interests'), '$random' => t('Random Profile'), - '$inv' => t('Invite Friends') + '$inv' => t('Invite Friends'), + '$directory' => t('View Global Directory'), + '$global_dir' => $global_dir )); } @@ -45,32 +57,41 @@ function unavailable_networks() { $networks = array(); - if (!plugin_enabled("appnet")) + if (!plugin_enabled("appnet")) { $networks[] = NETWORK_APPNET; + } - if (!plugin_enabled("fbpost") AND !plugin_enabled("facebook")) + if (!plugin_enabled("fbpost") && !plugin_enabled("facebook")) { $networks[] = NETWORK_FACEBOOK; + } - if (!plugin_enabled("statusnet")) + if (!plugin_enabled("statusnet")) { $networks[] = NETWORK_STATUSNET; + } - if (!plugin_enabled("pumpio")) + if (!plugin_enabled("pumpio")) { $networks[] = NETWORK_PUMPIO; + } - if (!plugin_enabled("twitter")) + if (!plugin_enabled("twitter")) { $networks[] = NETWORK_TWITTER; + } - if (get_config("system","ostatus_disabled")) + if (Config::get("system", "ostatus_disabled")) { $networks[] = NETWORK_OSTATUS; + } - if (!get_config("system","diaspora_enabled")) + if (!Config::get("system", "diaspora_enabled")) { $networks[] = NETWORK_DIASPORA; + } - if (!plugin_enabled("pnut")) + if (!plugin_enabled("pnut")) { $networks[] = NETWORK_PNUT; + } - if (!sizeof($networks)) + if (!sizeof($networks)) { return ""; + } $network_filter = implode("','", $networks); @@ -79,7 +100,7 @@ function unavailable_networks() { return $network_filter; } -function networks_widget($baseurl,$selected = '') { +function networks_widget($baseurl, $selected = '') { $a = get_app(); @@ -87,31 +108,30 @@ function networks_widget($baseurl,$selected = '') { return ''; } - if (!feature_enabled(local_user(),'networks')) { + if (!Feature::isEnabled(local_user(), 'networks')) { return ''; } $extra_sql = unavailable_networks(); - $r = q("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = %d AND `network` != '' $extra_sql ORDER BY `network`", - intval(local_user()) + $r = dba::p("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = ? AND `network` != '' $extra_sql ORDER BY `network`", + local_user() ); $nets = array(); - if (dbm::is_result($r)) { - require_once('include/contact_selectors.php'); - foreach ($r as $rr) { - /// @TODO If 'network' is not there, this triggers an E_NOTICE - if ($rr['network']) { - $nets[] = array('ref' => $rr['network'], 'name' => network_to_name($rr['network']), 'selected' => (($selected == $rr['network']) ? 'selected' : '' )); - } + while ($rr = dba::fetch($r)) { + /// @TODO If 'network' is not there, this triggers an E_NOTICE + if ($rr['network']) { + $nets[] = array('ref' => $rr['network'], 'name' => network_to_name($rr['network']), 'selected' => (($selected == $rr['network']) ? 'selected' : '' )); } } + dba::close($r); - if (count($nets) < 2) + if (count($nets) < 2) { return ''; + } - return replace_macros(get_markup_template('nets.tpl'),array( + return replace_macros(get_markup_template('nets.tpl'), array( '$title' => t('Networks'), '$desc' => '', '$sel_all' => (($selected == '') ? 'selected' : ''), @@ -122,31 +142,31 @@ function networks_widget($baseurl,$selected = '') { )); } -function fileas_widget($baseurl,$selected = '') { +function fileas_widget($baseurl, $selected = '') { if (! local_user()) { return ''; } - if (! feature_enabled(local_user(),'filing')) { + if (! Feature::isEnabled(local_user(), 'filing')) { return ''; } - $saved = get_pconfig(local_user(),'system','filetags'); + $saved = PConfig::get(local_user(), 'system', 'filetags'); if (! strlen($saved)) { return; } $matches = false; $terms = array(); - $cnt = preg_match_all('/\[(.*?)\]/',$saved,$matches,PREG_SET_ORDER); + $cnt = preg_match_all('/\[(.*?)\]/', $saved, $matches, PREG_SET_ORDER); if ($cnt) { foreach ($matches as $mtch) { $unescaped = xmlify(file_tag_decode($mtch[1])); - $terms[] = array('name' => $unescaped,'selected' => (($selected == $unescaped) ? 'selected' : '')); + $terms[] = array('name' => $unescaped, 'selected' => (($selected == $unescaped) ? 'selected' : '')); } } - return replace_macros(get_markup_template('fileas_widget.tpl'),array( + return replace_macros(get_markup_template('fileas_widget.tpl'), array( '$title' => t('Saved Folders'), '$desc' => '', '$sel_all' => (($selected == '') ? 'selected' : ''), @@ -157,31 +177,31 @@ function fileas_widget($baseurl,$selected = '') { )); } -function categories_widget($baseurl,$selected = '') { +function categories_widget($baseurl, $selected = '') { $a = get_app(); - if (! feature_enabled($a->profile['profile_uid'],'categories')) { + if (! Feature::isEnabled($a->profile['profile_uid'], 'categories')) { return ''; } - $saved = get_pconfig($a->profile['profile_uid'],'system','filetags'); + $saved = PConfig::get($a->profile['profile_uid'], 'system', 'filetags'); if (! strlen($saved)) { return; } $matches = false; $terms = array(); - $cnt = preg_match_all('/<(.*?)>/',$saved,$matches,PREG_SET_ORDER); + $cnt = preg_match_all('/<(.*?)>/', $saved, $matches, PREG_SET_ORDER); if ($cnt) { foreach ($matches as $mtch) { $unescaped = xmlify(file_tag_decode($mtch[1])); - $terms[] = array('name' => $unescaped,'selected' => (($selected == $unescaped) ? 'selected' : '')); + $terms[] = array('name' => $unescaped, 'selected' => (($selected == $unescaped) ? 'selected' : '')); } } - return replace_macros(get_markup_template('categories_widget.tpl'),array( + return replace_macros(get_markup_template('categories_widget.tpl'), array( '$title' => t('Categories'), '$desc' => '', '$sel_all' => (($selected == '') ? 'selected' : ''), @@ -196,8 +216,9 @@ function common_friends_visitor_widget($profile_uid) { $a = get_app(); - if (local_user() == $profile_uid) + if (local_user() == $profile_uid) { return; + } $cid = $zcid = 0; @@ -212,18 +233,14 @@ function common_friends_visitor_widget($profile_uid) { if (! $cid) { if (get_my_url()) { - $r = q("select id from contact where nurl = '%s' and uid = %d limit 1", - dbesc(normalise_link(get_my_url())), - intval($profile_uid) - ); - if (dbm::is_result($r)) { - $cid = $r[0]['id']; + $r = dba::select('contact', array('id'), + array('nurl' => normalise_link(get_my_url()), 'uid' => $profile_uid), array('limit' => 1)); + if (DBM::is_result($r)) { + $cid = $r['id']; } else { - $r = q("select id from gcontact where nurl = '%s' limit 1", - dbesc(normalise_link(get_my_url())) - ); - if (dbm::is_result($r)) - $zcid = $r[0]['id']; + $r = dba::select('gcontact', array('id'), array('nurl' => normalise_link(get_my_url())), array('limit' => 1)); + if (DBM::is_result($r)) + $zcid = $r['id']; } } } @@ -232,31 +249,28 @@ function common_friends_visitor_widget($profile_uid) { return; } - require_once('include/socgraph.php'); - if ($cid) { - $t = count_common_friends($profile_uid,$cid); + $t = GContact::countCommonFriends($profile_uid, $cid); } else { - $t = count_common_friends_zcid($profile_uid,$zcid); + $t = GContact::countCommonFriendsZcid($profile_uid, $zcid); } if (! $t) { return; } if ($cid) { - $r = common_friends($profile_uid,$cid,0,5,true); + $r = GContact::commonFriends($profile_uid, $cid, 0, 5, true); } else { - $r = common_friends_zcid($profile_uid,$zcid,0,5,true); + $r = GContact::commonFriendsZcid($profile_uid, $zcid, 0, 5, true); } return replace_macros(get_markup_template('remote_friends_common.tpl'), array( - '$desc' => sprintf( tt("%d contact in common", "%d contacts in common", $t), $t), - '$base' => App::get_baseurl(), + '$desc' => sprintf(tt("%d contact in common", "%d contacts in common", $t), $t), + '$base' => System::baseUrl(), '$uid' => $profile_uid, '$cid' => (($cid) ? $cid : '0'), '$linkmore' => (($t > 5) ? 'true' : ''), '$more' => t('show more'), - '$items' => $r - )); - -}; + '$items' => $r) + ); +}