diff options
| -rw-r--r-- | Zotlabs/Module/Connections.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Connedit.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Module/Profiles.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Module/Thing.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Viewconnections.php | 3 | ||||
| -rw-r--r-- | include/contact_selectors.php | 97 | ||||
| -rw-r--r-- | include/network.php | 26 | ||||
| -rw-r--r-- | include/selectors.php (renamed from include/profile_selectors.php) | 44 |
8 files changed, 77 insertions, 104 deletions
diff --git a/Zotlabs/Module/Connections.php b/Zotlabs/Module/Connections.php index 564f4e527..ebf8ff8e6 100644 --- a/Zotlabs/Module/Connections.php +++ b/Zotlabs/Module/Connections.php @@ -3,7 +3,7 @@ namespace Zotlabs\Module; require_once('include/Contact.php'); require_once('include/socgraph.php'); -require_once('include/contact_selectors.php'); +require_once('include/selectors.php'); require_once('include/group.php'); require_once('include/contact_widgets.php'); require_once('include/zot.php'); diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php index 0820c76bf..8bf4ac9b4 100644 --- a/Zotlabs/Module/Connedit.php +++ b/Zotlabs/Module/Connedit.php @@ -9,7 +9,7 @@ namespace Zotlabs\Module; require_once('include/Contact.php'); require_once('include/socgraph.php'); -require_once('include/contact_selectors.php'); +require_once('include/selectors.php'); require_once('include/group.php'); require_once('include/contact_widgets.php'); require_once('include/zot.php'); @@ -583,8 +583,6 @@ class Connedit extends \Zotlabs\Web\Controller { if(intval($contact['abook_self'])) $self = true; - require_once('include/contact_selectors.php'); - $tpl = get_markup_template("abook_edit.tpl"); if(feature_enabled(local_channel(),'affinity')) { diff --git a/Zotlabs/Module/Profiles.php b/Zotlabs/Module/Profiles.php index 3db089e53..e738d0c96 100644 --- a/Zotlabs/Module/Profiles.php +++ b/Zotlabs/Module/Profiles.php @@ -2,6 +2,7 @@ namespace Zotlabs\Module; require_once('include/identity.php'); +require_once('include/selectors.php'); class Profiles extends \Zotlabs\Web\Controller { @@ -625,7 +626,7 @@ class Profiles extends \Zotlabs\Web\Controller { return; } - require_once('include/profile_selectors.php'); + require_once('include/selectors.php'); $editselect = 'none'; diff --git a/Zotlabs/Module/Thing.php b/Zotlabs/Module/Thing.php index e95ec53f6..6fc5219d8 100644 --- a/Zotlabs/Module/Thing.php +++ b/Zotlabs/Module/Thing.php @@ -7,7 +7,7 @@ namespace Zotlabs\Module; require_once('include/items.php'); require_once('include/security.php'); -require_once('include/contact_selectors.php'); +require_once('include/selectors.php'); require_once('include/acl_selectors.php'); diff --git a/Zotlabs/Module/Viewconnections.php b/Zotlabs/Module/Viewconnections.php index 726ef043b..a9445cdeb 100644 --- a/Zotlabs/Module/Viewconnections.php +++ b/Zotlabs/Module/Viewconnections.php @@ -1,6 +1,7 @@ <?php namespace Zotlabs\Module; -require_once('include/contact_selectors.php'); + +require_once('include/selectors.php'); require_once('include/Contact.php'); diff --git a/include/contact_selectors.php b/include/contact_selectors.php deleted file mode 100644 index 0de4ece00..000000000 --- a/include/contact_selectors.php +++ /dev/null @@ -1,97 +0,0 @@ -<?php /** @file */ - - -function contact_profile_assign($current) { - - $o = ''; - - $o .= "<select id=\"contact-profile-selector\" name=\"profile_assign\" class=\"form-control\"/>\r\n"; - - $r = q("SELECT profile_guid, profile_name FROM `profile` WHERE `uid` = %d", - intval($_SESSION['uid'])); - - if($r) { - foreach($r as $rr) { - $selected = (($rr['profile_guid'] == $current) ? " selected=\"selected\" " : ""); - $o .= "<option value=\"{$rr['profile_guid']}\" $selected >{$rr['profile_name']}</option>\r\n"; - } - } - $o .= "</select>\r\n"; - return $o; -} - -/* unused currently - -function contact_reputation($current) { - - $o = ''; - $o .= "<select id=\"contact-reputation-selector\" name=\"reputation\" />\r\n"; - - $rep = array( - 0 => t('Unknown | Not categorized'), - 1 => t('Block immediately'), - 2 => t('Shady, spammer, self-marketer'), - 3 => t('Known to me, but no opinion'), - 4 => t('OK, probably harmless'), - 5 => t('Reputable, has my trust') - ); - - foreach($rep as $k => $v) { - $selected = (($k == $current) ? " selected=\"selected\" " : ""); - $o .= "<option value=\"$k\" $selected >$v</option>\r\n"; - } - $o .= "</select>\r\n"; - return $o; -} - -*/ - -function contact_poll_interval($current, $disabled = false) { - - $dis = (($disabled) ? ' disabled="disabled" ' : ''); - $o = ''; - $o .= "<select id=\"contact-poll-interval\" name=\"poll\" $dis />" . "\r\n"; - - $rep = array( - 0 => t('Frequently'), - 1 => t('Hourly'), - 2 => t('Twice daily'), - 3 => t('Daily'), - 4 => t('Weekly'), - 5 => t('Monthly') - ); - - foreach($rep as $k => $v) { - $selected = (($k == $current) ? " selected=\"selected\" " : ""); - $o .= "<option value=\"$k\" $selected >$v</option>\r\n"; - } - $o .= "</select>\r\n"; - return $o; -} - - -function network_to_name($s) { - - $nets = array( - NETWORK_DFRN => t('Friendica'), - NETWORK_FRND => t('Friendica'), - NETWORK_OSTATUS => t('OStatus'), - NETWORK_GNUSOCIAL => t('GNU-Social'), - NETWORK_FEED => t('RSS/Atom'), - NETWORK_MAIL => t('Email'), - NETWORK_DIASPORA => t('Diaspora'), - NETWORK_FACEBOOK => t('Facebook'), - NETWORK_ZOT => t('Zot'), - NETWORK_LINKEDIN => t('LinkedIn'), - NETWORK_XMPP => t('XMPP/IM'), - NETWORK_MYSPACE => t('MySpace'), - ); - - call_hooks('network_to_name', $nets); - - $search = array_keys($nets); - $replace = array_values($nets); - - return str_replace($search,$replace,$s); - -} diff --git a/include/network.php b/include/network.php index 25307f857..f38f8d548 100644 --- a/include/network.php +++ b/include/network.php @@ -2150,3 +2150,29 @@ function get_repository_version($branch = 'master') { return '?.?'; } + +function network_to_name($s) { + + $nets = array( + NETWORK_DFRN => t('Friendica'), + NETWORK_FRND => t('Friendica'), + NETWORK_OSTATUS => t('OStatus'), + NETWORK_GNUSOCIAL => t('GNU-Social'), + NETWORK_FEED => t('RSS/Atom'), + NETWORK_MAIL => t('Email'), + NETWORK_DIASPORA => t('Diaspora'), + NETWORK_FACEBOOK => t('Facebook'), + NETWORK_ZOT => t('Zot'), + NETWORK_LINKEDIN => t('LinkedIn'), + NETWORK_XMPP => t('XMPP/IM'), + NETWORK_MYSPACE => t('MySpace'), + ); + + call_hooks('network_to_name', $nets); + + $search = array_keys($nets); + $replace = array_values($nets); + + return str_replace($search,$replace,$s); + +} diff --git a/include/profile_selectors.php b/include/selectors.php index 9f993f803..d7d070d31 100644 --- a/include/profile_selectors.php +++ b/include/selectors.php @@ -1,6 +1,49 @@ <?php /** @file */ +function contact_profile_assign($current) { + + $o = ''; + + $o .= "<select id=\"contact-profile-selector\" name=\"profile_assign\" class=\"form-control\"/>\r\n"; + + $r = q("SELECT profile_guid, profile_name FROM `profile` WHERE `uid` = %d", + intval($_SESSION['uid'])); + + if($r) { + foreach($r as $rr) { + $selected = (($rr['profile_guid'] == $current) ? " selected=\"selected\" " : ""); + $o .= "<option value=\"{$rr['profile_guid']}\" $selected >{$rr['profile_name']}</option>\r\n"; + } + } + $o .= "</select>\r\n"; + return $o; +} + +function contact_poll_interval($current, $disabled = false) { + + $dis = (($disabled) ? ' disabled="disabled" ' : ''); + $o = ''; + $o .= "<select id=\"contact-poll-interval\" name=\"poll\" $dis />" . "\r\n"; + + $rep = array( + 0 => t('Frequently'), + 1 => t('Hourly'), + 2 => t('Twice daily'), + 3 => t('Daily'), + 4 => t('Weekly'), + 5 => t('Monthly') + ); + + foreach($rep as $k => $v) { + $selected = (($k == $current) ? " selected=\"selected\" " : ""); + $o .= "<option value=\"$k\" $selected >$v</option>\r\n"; + } + $o .= "</select>\r\n"; + return $o; +} + + function gender_selector($current="",$suffix="") { $o = ''; $select = array('', t('Male'), t('Female'), t('Currently Male'), t('Currently Female'), t('Mostly Male'), t('Mostly Female'), t('Transgender'), t('Intersex'), t('Transsexual'), t('Hermaphrodite'), t('Neuter'), t('Non-specific'), t('Other'), t('Undecided')); @@ -108,3 +151,4 @@ function marital_selector_min($current="",$suffix="") { $o .= '</select>'; return $o; } + |