diff options
| author | redmatrix <git@macgirvin.com> | 2016-05-22 16:54:30 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-05-22 16:54:30 -0700 |
| commit | de006771c7fe92a889d759c2c75c1473c420ad47 (patch) | |
| tree | 157391db6d2d48980719fa07c3d317fcb85ef70c | |
| parent | 2fdd1485985e2f341b413e978cf85edb858fce41 (diff) | |
| download | volse-hubzilla-de006771c7fe92a889d759c2c75c1473c420ad47.tar.gz volse-hubzilla-de006771c7fe92a889d759c2c75c1473c420ad47.tar.bz2 volse-hubzilla-de006771c7fe92a889d759c2c75c1473c420ad47.zip | |
renamed include files identity.php (channel.php) and Contact.php (connections.php)
62 files changed, 194 insertions, 240 deletions
diff --git a/Zotlabs/Daemon/Cron_weekly.php b/Zotlabs/Daemon/Cron_weekly.php index dc781ad73..1d8420947 100644 --- a/Zotlabs/Daemon/Cron_weekly.php +++ b/Zotlabs/Daemon/Cron_weekly.php @@ -21,7 +21,6 @@ class Cron_weekly { require_once('include/hubloc.php'); prune_hub_reinstalls(); - require_once('include/Contact.php'); mark_orphan_hubsxchans(); diff --git a/Zotlabs/Daemon/Externals.php b/Zotlabs/Daemon/Externals.php index 167b0524f..24cfe64ec 100644 --- a/Zotlabs/Daemon/Externals.php +++ b/Zotlabs/Daemon/Externals.php @@ -3,7 +3,7 @@ namespace Zotlabs\Daemon; require_once('include/zot.php'); -require_once('include/identity.php'); +require_once('include/channel.php'); class Externals { diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php index 65690f8ce..590be31ee 100644 --- a/Zotlabs/Daemon/Notifier.php +++ b/Zotlabs/Daemon/Notifier.php @@ -72,8 +72,7 @@ require_once('include/queue_fn.php'); require_once('include/datetime.php'); require_once('include/items.php'); require_once('include/bbcode.php'); -require_once('include/identity.php'); -require_once('include/Contact.php'); +require_once('include/channel.php'); class Notifier { diff --git a/Zotlabs/Daemon/Onepoll.php b/Zotlabs/Daemon/Onepoll.php index 2610ad151..036a4991b 100644 --- a/Zotlabs/Daemon/Onepoll.php +++ b/Zotlabs/Daemon/Onepoll.php @@ -4,7 +4,7 @@ namespace Zotlabs\Daemon; require_once('include/zot.php'); require_once('include/socgraph.php'); -require_once('include/Contact.php'); + class Onepoll { diff --git a/Zotlabs/Daemon/Ratenotif.php b/Zotlabs/Daemon/Ratenotif.php index a404273e2..1cba5e26d 100644 --- a/Zotlabs/Daemon/Ratenotif.php +++ b/Zotlabs/Daemon/Ratenotif.php @@ -12,7 +12,6 @@ class Ratenotif { require_once("datetime.php"); require_once('include/items.php'); - require_once('include/Contact.php'); if($argc < 3) return; diff --git a/Zotlabs/Lib/ThreadStream.php b/Zotlabs/Lib/ThreadStream.php index 2bcf167e9..a6d4f8517 100644 --- a/Zotlabs/Lib/ThreadStream.php +++ b/Zotlabs/Lib/ThreadStream.php @@ -165,7 +165,7 @@ class ThreadStream { $item->set_commentable(can_comment_on_post($this->observer['xchan_hash'],$item->data)); } } - require_once('include/identity.php'); + require_once('include/channel.php'); $item->set_conversation($this); $this->threads[] = $item; diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php index cd6e45e9f..172b109c8 100644 --- a/Zotlabs/Module/Admin.php +++ b/Zotlabs/Module/Admin.php @@ -902,7 +902,6 @@ class Admin extends \Zotlabs\Web\Controller { } // account delete button was submitted if (x($_POST, 'page_users_delete')) { - require_once('include/Contact.php'); foreach ($users as $uid){ account_remove($uid, true, false); } @@ -951,7 +950,6 @@ class Admin extends \Zotlabs\Web\Controller { switch (argv(2)){ case 'delete': // delete user - require_once('include/Contact.php'); account_remove($uid,true,false); notice( sprintf(t("Account '%s' deleted"), $account[0]['account_email']) . EOL); @@ -1096,7 +1094,6 @@ class Admin extends \Zotlabs\Web\Controller { notice( sprintf( tt("%s channel code allowed/disallowed", "%s channels code allowed/disallowed", count($channels)), count($channels)) ); } if (x($_POST,'page_channels_delete')){ - require_once("include/Contact.php"); foreach($channels as $uid){ channel_remove($uid,true); } @@ -1128,7 +1125,6 @@ class Admin extends \Zotlabs\Web\Controller { case "delete":{ check_form_security_token_redirectOnErr('/admin/channels', 'admin_channels', 't'); // delete channel - require_once("include/Contact.php"); channel_remove($uid,true); notice( sprintf(t("Channel '%s' deleted"), $channel[0]['channel_name']) . EOL); diff --git a/Zotlabs/Module/Blocks.php b/Zotlabs/Module/Blocks.php index ed702befb..32650a090 100644 --- a/Zotlabs/Module/Blocks.php +++ b/Zotlabs/Module/Blocks.php @@ -1,7 +1,7 @@ <?php namespace Zotlabs\Module; -require_once('include/identity.php'); +require_once('include/channel.php'); require_once('include/conversation.php'); require_once('include/acl_selectors.php'); diff --git a/Zotlabs/Module/Cal.php b/Zotlabs/Module/Cal.php index 958ce5aa6..602a2b5ab 100644 --- a/Zotlabs/Module/Cal.php +++ b/Zotlabs/Module/Cal.php @@ -6,8 +6,6 @@ require_once('include/bbcode.php'); require_once('include/datetime.php'); require_once('include/event.php'); require_once('include/items.php'); -require_once('include/Contact.php'); - class Cal extends \Zotlabs\Web\Controller { diff --git a/Zotlabs/Module/Chanview.php b/Zotlabs/Module/Chanview.php index 36fbbb864..c6dd07eb7 100644 --- a/Zotlabs/Module/Chanview.php +++ b/Zotlabs/Module/Chanview.php @@ -1,10 +1,8 @@ <?php namespace Zotlabs\Module; -require_once('include/Contact.php'); require_once('include/zot.php'); - class Chanview extends \Zotlabs\Web\Controller { function get() { diff --git a/Zotlabs/Module/Connect.php b/Zotlabs/Module/Connect.php index 382abf370..f68e0baac 100644 --- a/Zotlabs/Module/Connect.php +++ b/Zotlabs/Module/Connect.php @@ -2,7 +2,7 @@ namespace Zotlabs\Module; /** @file */ -require_once('include/Contact.php'); + require_once('include/contact_widgets.php'); require_once('include/items.php'); diff --git a/Zotlabs/Module/Connections.php b/Zotlabs/Module/Connections.php index ebf8ff8e6..a412d16ae 100644 --- a/Zotlabs/Module/Connections.php +++ b/Zotlabs/Module/Connections.php @@ -1,7 +1,7 @@ <?php namespace Zotlabs\Module; -require_once('include/Contact.php'); + require_once('include/socgraph.php'); require_once('include/selectors.php'); require_once('include/group.php'); diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php index 8bf4ac9b4..c9b20ae14 100644 --- a/Zotlabs/Module/Connedit.php +++ b/Zotlabs/Module/Connedit.php @@ -7,7 +7,7 @@ namespace Zotlabs\Module; * */ -require_once('include/Contact.php'); + require_once('include/socgraph.php'); require_once('include/selectors.php'); require_once('include/group.php'); @@ -485,7 +485,6 @@ class Connedit extends \Zotlabs\Web\Controller { if($cmd === 'drop') { - require_once('include/Contact.php'); // FIXME // We need to send either a purge or a refresh packet to the other side (the channel being unfriended). diff --git a/Zotlabs/Module/Cover_photo.php b/Zotlabs/Module/Cover_photo.php index aafc1bdb0..2e53696ff 100644 --- a/Zotlabs/Module/Cover_photo.php +++ b/Zotlabs/Module/Cover_photo.php @@ -8,7 +8,7 @@ namespace Zotlabs\Module; */ require_once('include/photo/photo_driver.php'); -require_once('include/identity.php'); +require_once('include/channel.php'); diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index 2a5a04a2a..6e880cbb4 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -185,7 +185,7 @@ class Display extends \Zotlabs\Web\Controller { if($load || ($checkjs->disabled())) { $r = null; - require_once('include/identity.php'); + require_once('include/channel.php'); $sys = get_sys_channel(); $sysid = $sys['channel_id']; @@ -233,7 +233,7 @@ class Display extends \Zotlabs\Web\Controller { elseif($update && !$load) { $r = null; - require_once('include/identity.php'); + require_once('include/channel.php'); $sys = get_sys_channel(); $sysid = $sys['channel_id']; diff --git a/Zotlabs/Module/Editblock.php b/Zotlabs/Module/Editblock.php index a79962033..fb86557f2 100644 --- a/Zotlabs/Module/Editblock.php +++ b/Zotlabs/Module/Editblock.php @@ -1,7 +1,7 @@ <?php namespace Zotlabs\Module; -require_once('include/identity.php'); +require_once('include/channel.php'); require_once('include/acl_selectors.php'); require_once('include/conversation.php'); diff --git a/Zotlabs/Module/Editlayout.php b/Zotlabs/Module/Editlayout.php index c5b50235a..5028882d2 100644 --- a/Zotlabs/Module/Editlayout.php +++ b/Zotlabs/Module/Editlayout.php @@ -1,7 +1,7 @@ <?php namespace Zotlabs\Module; -require_once('include/identity.php'); +require_once('include/channel.php'); require_once('include/acl_selectors.php'); require_once('include/conversation.php'); diff --git a/Zotlabs/Module/Editwebpage.php b/Zotlabs/Module/Editwebpage.php index c2346c53b..1b5c320a0 100644 --- a/Zotlabs/Module/Editwebpage.php +++ b/Zotlabs/Module/Editwebpage.php @@ -1,7 +1,7 @@ <?php namespace Zotlabs\Module; -require_once('include/identity.php'); +require_once('include/channel.php'); require_once('include/acl_selectors.php'); require_once('include/conversation.php'); require_once('include/PermissionDescription.php'); diff --git a/Zotlabs/Module/Getfile.php b/Zotlabs/Module/Getfile.php index 6999e77e8..09d761887 100644 --- a/Zotlabs/Module/Getfile.php +++ b/Zotlabs/Module/Getfile.php @@ -21,7 +21,6 @@ namespace Zotlabs\Module; -require_once('include/Contact.php'); require_once('include/attach.php'); diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php index 4e99155fb..57ced22a3 100644 --- a/Zotlabs/Module/Import.php +++ b/Zotlabs/Module/Import.php @@ -4,9 +4,9 @@ namespace Zotlabs\Module; // Import a channel, either by direct file upload or via // connection to original server. -require_once('include/Contact.php'); + require_once('include/zot.php'); -require_once('include/identity.php'); +require_once('include/channel.php'); require_once('include/import.php'); diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index ff8510ade..b4f493e5b 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -56,7 +56,7 @@ class Item extends \Zotlabs\Web\Controller { $remote_xchan = $remote_observer = false; $profile_uid = ((x($_REQUEST,'profile_uid')) ? intval($_REQUEST['profile_uid']) : 0); - require_once('include/identity.php'); + require_once('include/channel.php'); $sys = get_sys_channel(); if($sys && $profile_uid && ($sys['channel_id'] == $profile_uid) && is_site_admin()) { $uid = intval($sys['channel_id']); diff --git a/Zotlabs/Module/Layouts.php b/Zotlabs/Module/Layouts.php index 8a7207fc2..9b9fc22f3 100644 --- a/Zotlabs/Module/Layouts.php +++ b/Zotlabs/Module/Layouts.php @@ -1,7 +1,7 @@ <?php namespace Zotlabs\Module; -require_once('include/identity.php'); +require_once('include/channel.php'); require_once('include/conversation.php'); require_once('include/acl_selectors.php'); diff --git a/Zotlabs/Module/Mail.php b/Zotlabs/Module/Mail.php index 3dbfa8d71..aae7585c4 100644 --- a/Zotlabs/Module/Mail.php +++ b/Zotlabs/Module/Mail.php @@ -5,7 +5,7 @@ require_once('include/acl_selectors.php'); require_once('include/message.php'); require_once('include/zot.php'); require_once("include/bbcode.php"); -require_once('include/Contact.php'); + @@ -305,11 +305,6 @@ class Mail extends \Zotlabs\Web\Controller { else \App::$poi = $messages[0]['to']; - // require_once('include/Contact.php'); - - // \App::set_widget('mail_conversant',vcard_from_xchan(\App::$poi,$get_observer_hash,'mail')); - - $tpl = get_markup_template('msg-header.tpl'); \App::$page['htmlhead'] .= replace_macros($tpl, array( diff --git a/Zotlabs/Module/Menu.php b/Zotlabs/Module/Menu.php index 9ada63911..e98053f8c 100644 --- a/Zotlabs/Module/Menu.php +++ b/Zotlabs/Module/Menu.php @@ -2,7 +2,7 @@ namespace Zotlabs\Module; require_once('include/menu.php'); -require_once('include/identity.php'); +require_once('include/channel.php'); class Menu extends \Zotlabs\Web\Controller { diff --git a/Zotlabs/Module/Message.php b/Zotlabs/Module/Message.php index 58a138899..ea2127a1d 100644 --- a/Zotlabs/Module/Message.php +++ b/Zotlabs/Module/Message.php @@ -5,8 +5,6 @@ require_once('include/acl_selectors.php'); require_once('include/message.php'); require_once('include/zot.php'); require_once("include/bbcode.php"); -require_once('include/Contact.php'); - class Message extends \Zotlabs\Web\Controller { diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index c88258a78..238df3593 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -385,7 +385,7 @@ class Network extends \Zotlabs\Web\Controller { $abook_uids = " and abook.abook_channel = " . local_channel() . " "; if($firehose && (! get_config('system','disable_discover_tab'))) { - require_once('include/identity.php'); + require_once('include/channel.php'); $sys = get_sys_channel(); $uids = " and item.uid = " . intval($sys['channel_id']) . " "; \App::$data['firehose'] = intval($sys['channel_id']); diff --git a/Zotlabs/Module/New_channel.php b/Zotlabs/Module/New_channel.php index 3dca1b0b4..30d7c83c6 100644 --- a/Zotlabs/Module/New_channel.php +++ b/Zotlabs/Module/New_channel.php @@ -1,7 +1,7 @@ <?php namespace Zotlabs\Module; -require_once('include/identity.php'); +require_once('include/channel.php'); require_once('include/permissions.php'); diff --git a/Zotlabs/Module/Oep.php b/Zotlabs/Module/Oep.php index 638ea7e2d..89824fc7e 100644 --- a/Zotlabs/Module/Oep.php +++ b/Zotlabs/Module/Oep.php @@ -181,8 +181,8 @@ class Oep extends \Zotlabs\Web\Controller { function oep_profile_reply($args) { - require_once('include/identity.php'); - require_once('include/Contact.php'); + require_once('include/channel.php'); + $url = $args['url']; if(preg_match('#//(.*?)/(.*?)/(.*?)(/|\?|&|$)#',$url,$matches)) { diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php index 1659350a5..266ac05e0 100644 --- a/Zotlabs/Module/Photos.php +++ b/Zotlabs/Module/Photos.php @@ -1,12 +1,12 @@ <?php namespace Zotlabs\Module; + require_once('include/photo/photo_driver.php'); require_once('include/photos.php'); require_once('include/items.php'); require_once('include/acl_selectors.php'); require_once('include/bbcode.php'); require_once('include/security.php'); -require_once('include/Contact.php'); require_once('include/attach.php'); require_once('include/text.php'); require_once('include/PermissionDescription.php'); diff --git a/Zotlabs/Module/Profile_photo.php b/Zotlabs/Module/Profile_photo.php index efcc7bece..a8cf3cbee 100644 --- a/Zotlabs/Module/Profile_photo.php +++ b/Zotlabs/Module/Profile_photo.php @@ -9,7 +9,7 @@ namespace Zotlabs\Module; require_once('include/photo/photo_driver.php'); require_once('include/photos.php'); -require_once('include/identity.php'); +require_once('include/channel.php'); /* @brief Function for sync'ing permissions of profile-photos and their profile * diff --git a/Zotlabs/Module/Profiles.php b/Zotlabs/Module/Profiles.php index e899abb3f..54780499b 100644 --- a/Zotlabs/Module/Profiles.php +++ b/Zotlabs/Module/Profiles.php @@ -1,7 +1,7 @@ <?php namespace Zotlabs\Module; -require_once('include/identity.php'); +require_once('include/channel.php'); require_once('include/selectors.php'); @@ -602,7 +602,7 @@ class Profiles extends \Zotlabs\Web\Controller { return; } - require_once('include/identity.php'); + require_once('include/channel.php'); $profile_fields_basic = get_profile_fields_basic(); $profile_fields_advanced = get_profile_fields_advanced(); diff --git a/Zotlabs/Module/Profperm.php b/Zotlabs/Module/Profperm.php index 94267aaac..33e9d1ece 100644 --- a/Zotlabs/Module/Profperm.php +++ b/Zotlabs/Module/Profperm.php @@ -1,7 +1,7 @@ <?php namespace Zotlabs\Module; -require_once('include/Contact.php'); + require_once('include/photos.php'); diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php index adc16e6e6..c25e04312 100644 --- a/Zotlabs/Module/Pubstream.php +++ b/Zotlabs/Module/Pubstream.php @@ -71,7 +71,7 @@ class Pubstream extends \Zotlabs\Web\Controller { $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(\App::$pager['itemspage']), intval(\App::$pager['start'])); } - require_once('include/identity.php'); + require_once('include/channel.php'); require_once('include/security.php'); if(get_config('system','site_firehose')) { diff --git a/Zotlabs/Module/Randprof.php b/Zotlabs/Module/Randprof.php index 86b25c22a..dc2e925fe 100644 --- a/Zotlabs/Module/Randprof.php +++ b/Zotlabs/Module/Randprof.php @@ -6,7 +6,6 @@ namespace Zotlabs\Module; class Randprof extends \Zotlabs\Web\Controller { function init() { - require_once('include/Contact.php'); $x = random_profile(); if($x) goaway(chanlink_url($x)); diff --git a/Zotlabs/Module/Register.php b/Zotlabs/Module/Register.php index ca3f33238..7cd1ee501 100644 --- a/Zotlabs/Module/Register.php +++ b/Zotlabs/Module/Register.php @@ -1,7 +1,7 @@ <?php namespace Zotlabs\Module; -require_once('include/identity.php'); +require_once('include/channel.php'); class Register extends \Zotlabs\Web\Controller { diff --git a/Zotlabs/Module/Removeaccount.php b/Zotlabs/Module/Removeaccount.php index da496dfad..39e06bb7f 100644 --- a/Zotlabs/Module/Removeaccount.php +++ b/Zotlabs/Module/Removeaccount.php @@ -36,17 +36,12 @@ class Removeaccount extends \Zotlabs\Web\Controller { } } - require_once('include/Contact.php'); - $global_remove = intval($_POST['global']); - account_remove($account_id,true); - + account_remove($account_id, 1 - $global_remove); } - - - - function get() { + + function get() { if(! local_channel()) goaway(z_root()); diff --git a/Zotlabs/Module/Removeme.php b/Zotlabs/Module/Removeme.php index 9b634672a..e611d8112 100644 --- a/Zotlabs/Module/Removeme.php +++ b/Zotlabs/Module/Removeme.php @@ -35,8 +35,6 @@ class Removeme extends \Zotlabs\Web\Controller { } } - require_once('include/Contact.php'); - $global_remove = intval($_POST['global']); channel_remove(local_channel(),1 - $global_remove,true); @@ -44,8 +42,7 @@ class Removeme extends \Zotlabs\Web\Controller { } - - function get() { + function get() { if(! local_channel()) goaway(z_root()); diff --git a/Zotlabs/Module/Search.php b/Zotlabs/Module/Search.php index 9941ebbd2..fcc2506fc 100644 --- a/Zotlabs/Module/Search.php +++ b/Zotlabs/Module/Search.php @@ -139,7 +139,7 @@ class Search extends \Zotlabs\Web\Controller { $item_normal = item_normal(); $pub_sql = public_permissions_sql($observer_hash); - require_once('include/identity.php'); + require_once('include/channel.php'); $sys = get_sys_channel(); diff --git a/Zotlabs/Module/Settings.php b/Zotlabs/Module/Settings.php index 32ef89f68..5687ce84b 100644 --- a/Zotlabs/Module/Settings.php +++ b/Zotlabs/Module/Settings.php @@ -483,7 +483,7 @@ class Settings extends \Zotlabs\Web\Controller { if($username != $channel['channel_name']) { $name_change = true; - require_once('include/identity.php'); + require_once('include/channel.php'); $err = validate_channelname($username); if($err) { notice($err); diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php index f8c14951b..462ccced6 100644 --- a/Zotlabs/Module/Setup.php +++ b/Zotlabs/Module/Setup.php @@ -734,7 +734,7 @@ class Setup extends \Zotlabs\Web\Controller { set_config('system','curl_ssl_ciphers','ALL:!eNULL'); // Create a system channel - require_once ('include/identity.php'); + require_once ('include/channel.php'); create_sys_channel(); $baseurl = z_root(); diff --git a/Zotlabs/Module/Uexport.php b/Zotlabs/Module/Uexport.php index ada7e0986..d48f96d76 100644 --- a/Zotlabs/Module/Uexport.php +++ b/Zotlabs/Module/Uexport.php @@ -11,7 +11,7 @@ class Uexport extends \Zotlabs\Web\Controller { if(argc() > 1) { $channel = \App::get_channel(); - require_once('include/identity.php'); + require_once('include/channel.php'); if(argc() > 1 && intval(argv(1)) > 1900) { $year = intval(argv(1)); diff --git a/Zotlabs/Module/Viewconnections.php b/Zotlabs/Module/Viewconnections.php index a9445cdeb..d58c431e5 100644 --- a/Zotlabs/Module/Viewconnections.php +++ b/Zotlabs/Module/Viewconnections.php @@ -2,8 +2,6 @@ namespace Zotlabs\Module; require_once('include/selectors.php'); -require_once('include/Contact.php'); - class Viewconnections extends \Zotlabs\Web\Controller { @@ -16,7 +14,7 @@ class Viewconnections extends \Zotlabs\Web\Controller { profile_load($a,argv(1)); } - function get() { + function get() { if((get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) { notice( t('Public access denied.') . EOL); diff --git a/Zotlabs/Module/Wall_attach.php b/Zotlabs/Module/Wall_attach.php index 5bdecfa75..9a1019ddb 100644 --- a/Zotlabs/Module/Wall_attach.php +++ b/Zotlabs/Module/Wall_attach.php @@ -2,7 +2,7 @@ namespace Zotlabs\Module; require_once('include/attach.php'); -require_once('include/identity.php'); +require_once('include/channel.php'); require_once('include/photos.php'); diff --git a/Zotlabs/Module/Wall_upload.php b/Zotlabs/Module/Wall_upload.php index fff3ed03a..3868cb14e 100644 --- a/Zotlabs/Module/Wall_upload.php +++ b/Zotlabs/Module/Wall_upload.php @@ -2,7 +2,7 @@ namespace Zotlabs\Module; require_once('include/photo/photo_driver.php'); -require_once('include/identity.php'); +require_once('include/channel.php'); require_once('include/photos.php'); diff --git a/Zotlabs/Module/Webpages.php b/Zotlabs/Module/Webpages.php index d8adb55b2..bb8d454c8 100644 --- a/Zotlabs/Module/Webpages.php +++ b/Zotlabs/Module/Webpages.php @@ -1,7 +1,7 @@ <?php namespace Zotlabs\Module; -require_once('include/identity.php'); +require_once('include/channel.php'); require_once('include/conversation.php'); require_once('include/acl_selectors.php'); require_once('include/PermissionDescription.php'); diff --git a/Zotlabs/Zot/Finger.php b/Zotlabs/Zot/Finger.php index 27ba6ddca..63fdd4a4c 100644 --- a/Zotlabs/Zot/Finger.php +++ b/Zotlabs/Zot/Finger.php @@ -17,7 +17,7 @@ class Finger { * @param boolean $autofallback * fallback/failover to http if https connection cannot be established. Default is true. * - * @return array see z_post_url() and \ref mod/zfinger.php + * @return zotinfo array (with 'success' => true) or array('success' => false); */ static public function run($webbie, $channel = null, $autofallback = true) { @@ -108,7 +108,7 @@ class Finger { $x = json_decode($result['body'],true); if($x) { - $signed_token = $x['signed_token']; + $signed_token = ((is_array($x) && array_key_exists('signed_token',$x)) ? $x['signed_token'] : null); if($signed_token) { $valid = rsa_verify(self::$token,base64url_decode($signed_token),$x['key']); if(! $valid) { @@ -39,14 +39,14 @@ require_once('include/permissions.php'); require_once('library/Mobile_Detect/Mobile_Detect.php'); require_once('include/features.php'); require_once('include/taxonomy.php'); -require_once('include/identity.php'); -require_once('include/Contact.php'); +require_once('include/channel.php'); +require_once('include/connections.php'); require_once('include/account.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); define ( 'STD_VERSION', '1.7.1' ); -define ( 'ZOT_REVISION', 1 ); +define ( 'ZOT_REVISION', 1.1 ); define ( 'DB_UPDATE_VERSION', 1168 ); diff --git a/doc/hooks.html b/doc/hooks.html index c05de58ef..f4a5a7630 100644 --- a/doc/hooks.html +++ b/doc/hooks.html @@ -1 +1 @@ -<div><h3>Hooks</h3><table><tr><td>Function</td><td>Source File</td><td>Arg</td></tr><tr><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td></tr><tr><td>$a->module . _mod_aftercontent</td><td>index.php</td><td>$arr</td></tr><tr><td>$a->module . _mod_content</td><td>index.php</td><td>$arr</td></tr><tr><td>$a->module . _mod_init</td><td>index.php</td><td>$placeholder</td></tr><tr><td>$a->module . _mod_post</td><td>index.php</td><td>$_POST</td></tr><tr><td>$a->module . _post_ . $selname</td><td>include/acl_selectors.php</td><td>$o</td></tr><tr><td>$a->module . _post_ . $selname</td><td>include/acl_selectors.php</td><td>$o</td></tr><tr><td>$a->module . _post_ . $selname</td><td>include/acl_selectors.php</td><td>$o</td></tr><tr><td>$a->module . _pre_ . $selname</td><td>include/acl_selectors.php</td><td>$arr</td></tr><tr><td>$a->module . _pre_ . $selname</td><td>include/acl_selectors.php</td><td>$arr</td></tr><tr><td>$a->module . _pre_ . $selname</td><td>include/acl_selectors.php</td><td>$arr</td></tr><tr><td>$name</td><td>include/plugin.php</td><td>&$data = null</td></tr><tr><td>about_hook</td><td>mod/siteinfo.php</td><td>$o</td></tr><tr><td>accept_follow</td><td>mod/connedit.php</td><td>$arr</td></tr><tr><td>account_downgrade</td><td>include/account.php</td><td>$ret</td></tr><tr><td>account_downgrade</td><td>include/account.php</td><td>$ret</td></tr><tr><td>account_settings</td><td>mod/settings.php</td><td>$account_settings</td></tr><tr><td>activity_received</td><td>include/zot.php</td><td>$parr</td></tr><tr><td>affinity_labels</td><td>include/widgets.php</td><td>$labels</td></tr><tr><td>affinity_labels</td><td>mod/connedit.php</td><td>$labels</td></tr><tr><td>api_perm_is_allowed</td><td>include/permissions.php</td><td>$arr</td></tr><tr><td>app_menu</td><td>index.php</td><td>$arr</td></tr><tr><td>atom_author</td><td>include/items.php</td><td>$o</td></tr><tr><td>atom_entry</td><td>include/items.php</td><td>$o</td></tr><tr><td>atom_feed</td><td>include/items.php</td><td>$atom</td></tr><tr><td>atom_feed_end</td><td>include/items.php</td><td>$atom</td></tr><tr><td>attach_upload_file</td><td>include/attach.php</td><td>$f</td></tr><tr><td>authenticate</td><td>include/auth.php</td><td>$addon_auth</td></tr><tr><td>avatar_lookup</td><td>include/network.php</td><td>$avatar</td></tr><tr><td>bb2diaspora</td><td>include/bb2diaspora.php</td><td>$Text</td></tr><tr><td>bbcode</td><td>include/bbcode.php</td><td>$Text</td></tr><tr><td>channel_remove</td><td>include/Contact.php</td><td>$r[0]</td></tr><tr><td>chat_message</td><td>include/chat.php</td><td>$arr</td></tr><tr><td>chat_post</td><td>mod/chatsvc.php</td><td>$arr</td></tr><tr><td>check_account_email</td><td>include/account.php</td><td>$arr</td></tr><tr><td>check_account_invite</td><td>include/account.php</td><td>$arr</td></tr><tr><td>check_account_password</td><td>include/account.php</td><td>$arr</td></tr><tr><td>connect_premium</td><td>mod/connect.php</td><td>$arr</td></tr><tr><td>connector_settings</td><td>mod/settings.php</td><td>$settings_connectors</td></tr><tr><td>construct_page</td><td>boot.php</td><td>$arr</td></tr><tr><td>contact_block_end</td><td>include/text.php</td><td>$arr</td></tr><tr><td>contact_edit</td><td>mod/connedit.php</td><td>$arr</td></tr><tr><td>contact_edit_post</td><td>mod/connedit.php</td><td>$_POST</td></tr><tr><td>contact_select_options</td><td>include/acl_selectors.php</td><td>$x</td></tr><tr><td>conversation_start</td><td>include/conversation.php</td><td>$cb</td></tr><tr><td>create_identity</td><td>include/identity.php</td><td>$newuid</td></tr><tr><td>cron</td><td>include/cronhooks.php</td><td>$d</td></tr><tr><td>cron_daily</td><td>include/poller.php</td><td>datetime_convert()</td></tr><tr><td>cron_weekly</td><td>include/poller.php</td><td>datetime_convert()</td></tr><tr><td>directory_item</td><td>mod/directory.php</td><td>$arr</td></tr><tr><td>discover_by_webbie</td><td>include/network.php</td><td>$arr</td></tr><tr><td>display_item</td><td>include/ItemObject.php</td><td>$arr</td></tr><tr><td>display_item</td><td>include/conversation.php</td><td>$arr</td></tr><tr><td>display_settings</td><td>mod/settings.php</td><td>$o</td></tr><tr><td>display_settings_post</td><td>mod/settings.php</td><td>$_POST</td></tr><tr><td>donate_contributors</td><td>extend/addon/matrix/donate/donate.php</td><td>$contributors</td></tr><tr><td>donate_plugin</td><td>extend/addon/matrix/donate/donate.php</td><td>$o</td></tr><tr><td>donate_sponsors</td><td>extend/addon/matrix/donate/donate.php</td><td>$sponsors</td></tr><tr><td>dreport_is_storable</td><td>include/zot.php</td><td>$dr</td></tr><tr><td>drop_item</td><td>include/items.php</td><td>$arr</td></tr><tr><td>enotify</td><td>include/enotify.php</td><td>$h</td></tr><tr><td>enotify_mail</td><td>include/enotify.php</td><td>$datarray</td></tr><tr><td>enotify_store</td><td>include/enotify.php</td><td>$datarray</td></tr><tr><td>event_created</td><td>include/event.php</td><td>$event[id]</td></tr><tr><td>event_updated</td><td>include/event.php</td><td>$event[id]</td></tr><tr><td>externals_url_select</td><td>include/externals.php</td><td>$arr</td></tr><tr><td>feature_enabled</td><td>include/features.php</td><td>$arr</td></tr><tr><td>feature_settings</td><td>mod/settings.php</td><td>$settings_addons</td></tr><tr><td>feature_settings_post</td><td>mod/settings.php</td><td>$_POST</td></tr><tr><td>follow</td><td>include/follow.php</td><td>$arr</td></tr><tr><td>follow</td><td>include/follow.php</td><td>$arr</td></tr><tr><td>follow_allow</td><td>include/follow.php</td><td>$x</td></tr><tr><td>gender_selector</td><td>include/profile_selectors.php</td><td>$select</td></tr><tr><td>gender_selector_min</td><td>include/profile_selectors.php</td><td>$select</td></tr><tr><td>generate_map</td><td>include/text.php</td><td>$arr</td></tr><tr><td>generate_named_map</td><td>include/text.php</td><td>$arr</td></tr><tr><td>get_all_api_perms</td><td>include/permissions.php</td><td>$arr</td></tr><tr><td>get_all_perms</td><td>include/permissions.php</td><td>$arr</td></tr><tr><td>get_features</td><td>include/features.php</td><td>$arr</td></tr><tr><td>get_role_perms</td><td>include/permissions.php</td><td>$ret</td></tr><tr><td>get_widgets</td><td>boot.php</td><td>$arr</td></tr><tr><td>get_widgets</td><td>boot.php</td><td>$arr</td></tr><tr><td>global_permissions</td><td>include/permissions.php</td><td>$ret</td></tr><tr><td>home_content</td><td>mod/home.php</td><td>$o</td></tr><tr><td>home_init</td><td>mod/home.php</td><td>$ret</td></tr><tr><td>hostxrd</td><td>mod/hostxrd.php</td><td>$arr</td></tr><tr><td>html2bbcode</td><td>include/html2bbcode.php</td><td>$message</td></tr><tr><td>identity_basic_export</td><td>include/identity.php</td><td>$addon</td></tr><tr><td>import_author_xchan</td><td>include/items.php</td><td>$arr</td></tr><tr><td>import_channel</td><td>mod/import.php</td><td>$addon</td></tr><tr><td>import_directory_profile</td><td>include/zot.php</td><td>$d</td></tr><tr><td>import_xchan</td><td>include/zot.php</td><td>$arr</td></tr><tr><td>item_photo_menu</td><td>include/conversation.php</td><td>$args</td></tr><tr><td>item_store</td><td>include/items.php</td><td>$d</td></tr><tr><td>item_store</td><td>include/items.php</td><td>$arr</td></tr><tr><td>item_store_update</td><td>include/items.php</td><td>$d</td></tr><tr><td>item_translate</td><td>include/items.php</td><td>$translate</td></tr><tr><td>item_translate</td><td>include/items.php</td><td>$translate</td></tr><tr><td>jot_networks</td><td>include/acl_selectors.php</td><td>$jotnets</td></tr><tr><td>jot_networks</td><td>include/conversation.php</td><td>$jotnets</td></tr><tr><td>jot_networks</td><td>mod/editblock.php</td><td>$jotnets</td></tr><tr><td>jot_networks</td><td>mod/editpost.php</td><td>$jotnets</td></tr><tr><td>jot_networks</td><td>mod/editwebpage.php</td><td>$jotnets</td></tr><tr><td>jot_networks</td><td>mod/editlayout.php</td><td>$jotnets</td></tr><tr><td>jot_tool</td><td>include/conversation.php</td><td>$jotplugins</td></tr><tr><td>jot_tool</td><td>mod/editblock.php</td><td>$jotplugins</td></tr><tr><td>jot_tool</td><td>mod/editpost.php</td><td>$jotplugins</td></tr><tr><td>jot_tool</td><td>mod/editwebpage.php</td><td>$jotplugins</td></tr><tr><td>jot_tool</td><td>mod/editlayout.php</td><td>$jotplugins</td></tr><tr><td>load_pdl</td><td>boot.php</td><td>$arr</td></tr><tr><td>local_dir_update</td><td>include/dir_fns.php</td><td>$arr</td></tr><tr><td>logged_in</td><td>include/oauth.php</td><td>$a->user</td></tr><tr><td>logged_in</td><td>include/api.php</td><td>$a->user</td></tr><tr><td>logged_in</td><td>include/security.php</td><td>$a->account</td></tr><tr><td>logged_in</td><td>include/security.php</td><td>$user_record</td></tr><tr><td>logging_out</td><td>include/auth.php</td><td>$args</td></tr><tr><td>login_hook</td><td>boot.php</td><td>$o</td></tr><tr><td>magic_auth</td><td>mod/magic.php</td><td>$arr</td></tr><tr><td>magic_auth_openid_success</td><td>mod/openid.php</td><td>$arr</td></tr><tr><td>magic_auth_openid_success</td><td>mod/openid.php</td><td>$arr</td></tr><tr><td>magic_auth_success</td><td>mod/post.php</td><td>$arr</td></tr><tr><td>main_slider</td><td>include/widgets.php</td><td>$arr</td></tr><tr><td>marital_selector</td><td>include/profile_selectors.php</td><td>$select</td></tr><tr><td>marital_selector_min</td><td>include/profile_selectors.php</td><td>$select</td></tr><tr><td>module_loaded</td><td>index.php</td><td>$x</td></tr><tr><td>mood_verbs</td><td>include/text.php</td><td>$arr</td></tr><tr><td>nav</td><td>include/nav.php</td><td>$x</td></tr><tr><td>network_content_init</td><td>mod/network.php</td><td>$arr</td></tr><tr><td>network_ping</td><td>mod/ping.php</td><td>$arr</td></tr><tr><td>network_tabs</td><td>include/conversation.php</td><td>$arr</td></tr><tr><td>network_to_name</td><td>include/contact_selectors.php</td><td>$nets</td></tr><tr><td>notifier_end</td><td>include/notifier.php</td><td>$target_item</td></tr><tr><td>notifier_hub</td><td>include/notifier.php</td><td>$narr</td></tr><tr><td>notifier_normal</td><td>include/deliver_hooks.php</td><td>$r[0]</td></tr><tr><td>obj_verbs</td><td>include/taxonomy.php</td><td>$arr</td></tr><tr><td>oembed_probe</td><td>include/oembed.php</td><td>$x</td></tr><tr><td>page_content_top</td><td>index.php</td><td>$a->page[content]</td></tr><tr><td>page_end</td><td>index.php</td><td>$a->page[content]</td></tr><tr><td>page_header</td><td>include/nav.php</td><td>$a->page[nav]</td></tr><tr><td>parse_atom</td><td>include/items.php</td><td>$arr</td></tr><tr><td>parse_link</td><td>mod/linkinfo.php</td><td>$arr</td></tr><tr><td>pdl_selector</td><td>include/comanche.php</td><td>$arr</td></tr><tr><td>perm_is_allowed</td><td>include/permissions.php</td><td>$arr</td></tr><tr><td>permissions_create</td><td>include/notifier.php</td><td>$perm_update</td></tr><tr><td>permissions_update</td><td>include/notifier.php</td><td>$perm_update</td></tr><tr><td>personal_xrd</td><td>mod/xrd.php</td><td>$arr</td></tr><tr><td>photo_post_end</td><td>include/photos.php</td><td>$ret</td></tr><tr><td>photo_post_end</td><td>include/photos.php</td><td>$ret</td></tr><tr><td>photo_upload_begin</td><td>include/attach.php</td><td>$arr</td></tr><tr><td>photo_upload_begin</td><td>include/photos.php</td><td>$args</td></tr><tr><td>photo_upload_end</td><td>include/attach.php</td><td>$ret</td></tr><tr><td>photo_upload_end</td><td>include/attach.php</td><td>$ret</td></tr><tr><td>photo_upload_end</td><td>include/attach.php</td><td>$ret</td></tr><tr><td>photo_upload_end</td><td>include/attach.php</td><td>$ret</td></tr><tr><td>photo_upload_end</td><td>include/attach.php</td><td>$ret</td></tr><tr><td>photo_upload_end</td><td>include/photos.php</td><td>$ret</td></tr><tr><td>photo_upload_end</td><td>include/photos.php</td><td>$ret</td></tr><tr><td>photo_upload_end</td><td>include/photos.php</td><td>$ret</td></tr><tr><td>photo_upload_end</td><td>include/photos.php</td><td>$ret</td></tr><tr><td>photo_upload_file</td><td>include/attach.php</td><td>$f</td></tr><tr><td>photo_upload_file</td><td>include/photos.php</td><td>$f</td></tr><tr><td>photo_upload_form</td><td>mod/photos.php</td><td>$ret</td></tr><tr><td>poke_verbs</td><td>include/text.php</td><td>$arr</td></tr><tr><td>post_local</td><td>include/zot.php</td><td>$arr</td></tr><tr><td>post_local</td><td>include/items.php</td><td>$arr</td></tr><tr><td>post_local</td><td>mod/item.php</td><td>$datarray</td></tr><tr><td>post_local_end</td><td>include/items.php</td><td>$arr</td></tr><tr><td>post_local_end</td><td>include/attach.php</td><td>$arr</td></tr><tr><td>post_local_end</td><td>include/attach.php</td><td>$arr</td></tr><tr><td>post_local_end</td><td>extend/addon/matrix/randpost/randpost.php</td><td>$x</td></tr><tr><td>post_local_end</td><td>extend/addon/matrix/randpost/randpost.php</td><td>$x</td></tr><tr><td>post_local_end</td><td>mod/mood.php</td><td>$arr</td></tr><tr><td>post_local_end</td><td>mod/like.php</td><td>$arr</td></tr><tr><td>post_local_end</td><td>mod/item.php</td><td>$datarray</td></tr><tr><td>post_local_end</td><td>mod/subthread.php</td><td>$arr</td></tr><tr><td>post_local_start</td><td>mod/item.php</td><td>$_REQUEST</td></tr><tr><td>post_mail</td><td>include/items.php</td><td>$arr</td></tr><tr><td>post_mail_end</td><td>include/items.php</td><td>$arr</td></tr><tr><td>post_remote</td><td>include/items.php</td><td>$arr</td></tr><tr><td>post_remote_end</td><td>include/items.php</td><td>$arr</td></tr><tr><td>post_remote_update</td><td>include/items.php</td><td>$arr</td></tr><tr><td>post_remote_update_end</td><td>include/items.php</td><td>$arr</td></tr><tr><td>prepare_body</td><td>include/text.php</td><td>$prep_arr</td></tr><tr><td>prepare_body_final</td><td>include/text.php</td><td>$prep_arr</td></tr><tr><td>prepare_body_init</td><td>include/text.php</td><td>$item</td></tr><tr><td>probe_well_known</td><td>include/probe.php</td><td>$ret</td></tr><tr><td>proc_run</td><td>boot.php</td><td>$arr</td></tr><tr><td>process_channel_sync_delivery</td><td>include/zot.php</td><td>$addon</td></tr><tr><td>profile_advanced</td><td>mod/profile.php</td><td>$o</td></tr><tr><td>profile_edit</td><td>mod/profiles.php</td><td>$arr</td></tr><tr><td>profile_photo_content_end</td><td>mod/profile_photo.php</td><td>$o</td></tr><tr><td>profile_post</td><td>mod/profiles.php</td><td>$_POST</td></tr><tr><td>profile_sidebar</td><td>include/identity.php</td><td>$arr</td></tr><tr><td>profile_sidebar_enter</td><td>include/identity.php</td><td>$profile</td></tr><tr><td>profile_tabs</td><td>include/conversation.php</td><td>$arr</td></tr><tr><td>register_account</td><td>include/account.php</td><td>$result</td></tr><tr><td>render_location</td><td>include/conversation.php</td><td>$locate</td></tr><tr><td>replace_macros</td><td>include/text.php</td><td>$arr</td></tr><tr><td>reverse_magic_auth</td><td>mod/rmagic.php</td><td>$arr</td></tr><tr><td>settings_account</td><td>mod/settings.php</td><td>$_POST</td></tr><tr><td>settings_form</td><td>mod/settings.php</td><td>$o</td></tr><tr><td>settings_post</td><td>mod/settings.php</td><td>$_POST</td></tr><tr><td>sexpref_selector</td><td>include/profile_selectors.php</td><td>$select</td></tr><tr><td>sexpref_selector_min</td><td>include/profile_selectors.php</td><td>$select</td></tr><tr><td>smilie</td><td>include/text.php</td><td>$params</td></tr><tr><td>smilie</td><td>extend/addon/matrix/smileybutton/smileybutton.php</td><td>$params</td></tr><tr><td>tagged</td><td>include/items.php</td><td>$arr</td></tr><tr><td>validate_channelname</td><td>include/identity.php</td><td>$arr</td></tr><tr><td>webfinger</td><td>mod/wfinger.php</td><td>$arr</td></tr><tr><td>well_known</td><td>mod/_well_known.php</td><td>$arr</td></tr><tr><td>zid</td><td>include/identity.php</td><td>$arr</td></tr><tr><td>zid_init</td><td>include/identity.php</td><td>$arr</td></tr><tr><td>zot_finger</td><td>include/zot.php</td><td>$ret</td></tr></table><p>Generated Tue Nov 03 21:19:02 PST 2015</p></div>
\ No newline at end of file +<div><h3>Hooks</h3><table><tr><td>Function</td><td>Source File</td><td>Arg</td></tr><tr><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td></tr><tr><td>$a->module . _mod_aftercontent</td><td>index.php</td><td>$arr</td></tr><tr><td>$a->module . _mod_content</td><td>index.php</td><td>$arr</td></tr><tr><td>$a->module . _mod_init</td><td>index.php</td><td>$placeholder</td></tr><tr><td>$a->module . _mod_post</td><td>index.php</td><td>$_POST</td></tr><tr><td>$a->module . _post_ . $selname</td><td>include/acl_selectors.php</td><td>$o</td></tr><tr><td>$a->module . _post_ . $selname</td><td>include/acl_selectors.php</td><td>$o</td></tr><tr><td>$a->module . _post_ . $selname</td><td>include/acl_selectors.php</td><td>$o</td></tr><tr><td>$a->module . _pre_ . $selname</td><td>include/acl_selectors.php</td><td>$arr</td></tr><tr><td>$a->module . _pre_ . $selname</td><td>include/acl_selectors.php</td><td>$arr</td></tr><tr><td>$a->module . _pre_ . $selname</td><td>include/acl_selectors.php</td><td>$arr</td></tr><tr><td>$name</td><td>include/plugin.php</td><td>&$data = null</td></tr><tr><td>about_hook</td><td>mod/siteinfo.php</td><td>$o</td></tr><tr><td>accept_follow</td><td>mod/connedit.php</td><td>$arr</td></tr><tr><td>account_downgrade</td><td>include/account.php</td><td>$ret</td></tr><tr><td>account_downgrade</td><td>include/account.php</td><td>$ret</td></tr><tr><td>account_settings</td><td>mod/settings.php</td><td>$account_settings</td></tr><tr><td>activity_received</td><td>include/zot.php</td><td>$parr</td></tr><tr><td>affinity_labels</td><td>include/widgets.php</td><td>$labels</td></tr><tr><td>affinity_labels</td><td>mod/connedit.php</td><td>$labels</td></tr><tr><td>api_perm_is_allowed</td><td>include/permissions.php</td><td>$arr</td></tr><tr><td>app_menu</td><td>index.php</td><td>$arr</td></tr><tr><td>atom_author</td><td>include/items.php</td><td>$o</td></tr><tr><td>atom_entry</td><td>include/items.php</td><td>$o</td></tr><tr><td>atom_feed</td><td>include/items.php</td><td>$atom</td></tr><tr><td>atom_feed_end</td><td>include/items.php</td><td>$atom</td></tr><tr><td>attach_upload_file</td><td>include/attach.php</td><td>$f</td></tr><tr><td>authenticate</td><td>include/auth.php</td><td>$addon_auth</td></tr><tr><td>avatar_lookup</td><td>include/network.php</td><td>$avatar</td></tr><tr><td>bb2diaspora</td><td>include/bb2diaspora.php</td><td>$Text</td></tr><tr><td>bbcode</td><td>include/bbcode.php</td><td>$Text</td></tr><tr><td>channel_remove</td><td>include/Contact.php</td><td>$r[0]</td></tr><tr><td>chat_message</td><td>include/chat.php</td><td>$arr</td></tr><tr><td>chat_post</td><td>mod/chatsvc.php</td><td>$arr</td></tr><tr><td>check_account_email</td><td>include/account.php</td><td>$arr</td></tr><tr><td>check_account_invite</td><td>include/account.php</td><td>$arr</td></tr><tr><td>check_account_password</td><td>include/account.php</td><td>$arr</td></tr><tr><td>connect_premium</td><td>mod/connect.php</td><td>$arr</td></tr><tr><td>connector_settings</td><td>mod/settings.php</td><td>$settings_connectors</td></tr><tr><td>construct_page</td><td>boot.php</td><td>$arr</td></tr><tr><td>contact_block_end</td><td>include/text.php</td><td>$arr</td></tr><tr><td>contact_edit</td><td>mod/connedit.php</td><td>$arr</td></tr><tr><td>contact_edit_post</td><td>mod/connedit.php</td><td>$_POST</td></tr><tr><td>contact_select_options</td><td>include/acl_selectors.php</td><td>$x</td></tr><tr><td>conversation_start</td><td>include/conversation.php</td><td>$cb</td></tr><tr><td>create_identity</td><td>include/channel.php</td><td>$newuid</td></tr><tr><td>cron</td><td>include/cronhooks.php</td><td>$d</td></tr><tr><td>cron_daily</td><td>include/poller.php</td><td>datetime_convert()</td></tr><tr><td>cron_weekly</td><td>include/poller.php</td><td>datetime_convert()</td></tr><tr><td>directory_item</td><td>mod/directory.php</td><td>$arr</td></tr><tr><td>discover_by_webbie</td><td>include/network.php</td><td>$arr</td></tr><tr><td>display_item</td><td>include/ItemObject.php</td><td>$arr</td></tr><tr><td>display_item</td><td>include/conversation.php</td><td>$arr</td></tr><tr><td>display_settings</td><td>mod/settings.php</td><td>$o</td></tr><tr><td>display_settings_post</td><td>mod/settings.php</td><td>$_POST</td></tr><tr><td>donate_contributors</td><td>extend/addon/matrix/donate/donate.php</td><td>$contributors</td></tr><tr><td>donate_plugin</td><td>extend/addon/matrix/donate/donate.php</td><td>$o</td></tr><tr><td>donate_sponsors</td><td>extend/addon/matrix/donate/donate.php</td><td>$sponsors</td></tr><tr><td>dreport_is_storable</td><td>include/zot.php</td><td>$dr</td></tr><tr><td>drop_item</td><td>include/items.php</td><td>$arr</td></tr><tr><td>enotify</td><td>include/enotify.php</td><td>$h</td></tr><tr><td>enotify_mail</td><td>include/enotify.php</td><td>$datarray</td></tr><tr><td>enotify_store</td><td>include/enotify.php</td><td>$datarray</td></tr><tr><td>event_created</td><td>include/event.php</td><td>$event[id]</td></tr><tr><td>event_updated</td><td>include/event.php</td><td>$event[id]</td></tr><tr><td>externals_url_select</td><td>include/externals.php</td><td>$arr</td></tr><tr><td>feature_enabled</td><td>include/features.php</td><td>$arr</td></tr><tr><td>feature_settings</td><td>mod/settings.php</td><td>$settings_addons</td></tr><tr><td>feature_settings_post</td><td>mod/settings.php</td><td>$_POST</td></tr><tr><td>follow</td><td>include/follow.php</td><td>$arr</td></tr><tr><td>follow</td><td>include/follow.php</td><td>$arr</td></tr><tr><td>follow_allow</td><td>include/follow.php</td><td>$x</td></tr><tr><td>gender_selector</td><td>include/profile_selectors.php</td><td>$select</td></tr><tr><td>gender_selector_min</td><td>include/profile_selectors.php</td><td>$select</td></tr><tr><td>generate_map</td><td>include/text.php</td><td>$arr</td></tr><tr><td>generate_named_map</td><td>include/text.php</td><td>$arr</td></tr><tr><td>get_all_api_perms</td><td>include/permissions.php</td><td>$arr</td></tr><tr><td>get_all_perms</td><td>include/permissions.php</td><td>$arr</td></tr><tr><td>get_features</td><td>include/features.php</td><td>$arr</td></tr><tr><td>get_role_perms</td><td>include/permissions.php</td><td>$ret</td></tr><tr><td>get_widgets</td><td>boot.php</td><td>$arr</td></tr><tr><td>get_widgets</td><td>boot.php</td><td>$arr</td></tr><tr><td>global_permissions</td><td>include/permissions.php</td><td>$ret</td></tr><tr><td>home_content</td><td>mod/home.php</td><td>$o</td></tr><tr><td>home_init</td><td>mod/home.php</td><td>$ret</td></tr><tr><td>hostxrd</td><td>mod/hostxrd.php</td><td>$arr</td></tr><tr><td>html2bbcode</td><td>include/html2bbcode.php</td><td>$message</td></tr><tr><td>identity_basic_export</td><td>include/channel.php</td><td>$addon</td></tr><tr><td>import_author_xchan</td><td>include/items.php</td><td>$arr</td></tr><tr><td>import_channel</td><td>mod/import.php</td><td>$addon</td></tr><tr><td>import_directory_profile</td><td>include/zot.php</td><td>$d</td></tr><tr><td>import_xchan</td><td>include/zot.php</td><td>$arr</td></tr><tr><td>item_photo_menu</td><td>include/conversation.php</td><td>$args</td></tr><tr><td>item_store</td><td>include/items.php</td><td>$d</td></tr><tr><td>item_store</td><td>include/items.php</td><td>$arr</td></tr><tr><td>item_store_update</td><td>include/items.php</td><td>$d</td></tr><tr><td>item_translate</td><td>include/items.php</td><td>$translate</td></tr><tr><td>item_translate</td><td>include/items.php</td><td>$translate</td></tr><tr><td>jot_networks</td><td>include/acl_selectors.php</td><td>$jotnets</td></tr><tr><td>jot_networks</td><td>include/conversation.php</td><td>$jotnets</td></tr><tr><td>jot_networks</td><td>mod/editblock.php</td><td>$jotnets</td></tr><tr><td>jot_networks</td><td>mod/editpost.php</td><td>$jotnets</td></tr><tr><td>jot_networks</td><td>mod/editwebpage.php</td><td>$jotnets</td></tr><tr><td>jot_networks</td><td>mod/editlayout.php</td><td>$jotnets</td></tr><tr><td>jot_tool</td><td>include/conversation.php</td><td>$jotplugins</td></tr><tr><td>jot_tool</td><td>mod/editblock.php</td><td>$jotplugins</td></tr><tr><td>jot_tool</td><td>mod/editpost.php</td><td>$jotplugins</td></tr><tr><td>jot_tool</td><td>mod/editwebpage.php</td><td>$jotplugins</td></tr><tr><td>jot_tool</td><td>mod/editlayout.php</td><td>$jotplugins</td></tr><tr><td>load_pdl</td><td>boot.php</td><td>$arr</td></tr><tr><td>local_dir_update</td><td>include/dir_fns.php</td><td>$arr</td></tr><tr><td>logged_in</td><td>include/oauth.php</td><td>$a->user</td></tr><tr><td>logged_in</td><td>include/api.php</td><td>$a->user</td></tr><tr><td>logged_in</td><td>include/security.php</td><td>$a->account</td></tr><tr><td>logged_in</td><td>include/security.php</td><td>$user_record</td></tr><tr><td>logging_out</td><td>include/auth.php</td><td>$args</td></tr><tr><td>login_hook</td><td>boot.php</td><td>$o</td></tr><tr><td>magic_auth</td><td>mod/magic.php</td><td>$arr</td></tr><tr><td>magic_auth_openid_success</td><td>mod/openid.php</td><td>$arr</td></tr><tr><td>magic_auth_openid_success</td><td>mod/openid.php</td><td>$arr</td></tr><tr><td>magic_auth_success</td><td>mod/post.php</td><td>$arr</td></tr><tr><td>main_slider</td><td>include/widgets.php</td><td>$arr</td></tr><tr><td>marital_selector</td><td>include/profile_selectors.php</td><td>$select</td></tr><tr><td>marital_selector_min</td><td>include/profile_selectors.php</td><td>$select</td></tr><tr><td>module_loaded</td><td>index.php</td><td>$x</td></tr><tr><td>mood_verbs</td><td>include/text.php</td><td>$arr</td></tr><tr><td>nav</td><td>include/nav.php</td><td>$x</td></tr><tr><td>network_content_init</td><td>mod/network.php</td><td>$arr</td></tr><tr><td>network_ping</td><td>mod/ping.php</td><td>$arr</td></tr><tr><td>network_tabs</td><td>include/conversation.php</td><td>$arr</td></tr><tr><td>network_to_name</td><td>include/contact_selectors.php</td><td>$nets</td></tr><tr><td>notifier_end</td><td>include/notifier.php</td><td>$target_item</td></tr><tr><td>notifier_hub</td><td>include/notifier.php</td><td>$narr</td></tr><tr><td>notifier_normal</td><td>include/deliver_hooks.php</td><td>$r[0]</td></tr><tr><td>obj_verbs</td><td>include/taxonomy.php</td><td>$arr</td></tr><tr><td>oembed_probe</td><td>include/oembed.php</td><td>$x</td></tr><tr><td>page_content_top</td><td>index.php</td><td>$a->page[content]</td></tr><tr><td>page_end</td><td>index.php</td><td>$a->page[content]</td></tr><tr><td>page_header</td><td>include/nav.php</td><td>$a->page[nav]</td></tr><tr><td>parse_atom</td><td>include/items.php</td><td>$arr</td></tr><tr><td>parse_link</td><td>mod/linkinfo.php</td><td>$arr</td></tr><tr><td>pdl_selector</td><td>include/comanche.php</td><td>$arr</td></tr><tr><td>perm_is_allowed</td><td>include/permissions.php</td><td>$arr</td></tr><tr><td>permissions_create</td><td>include/notifier.php</td><td>$perm_update</td></tr><tr><td>permissions_update</td><td>include/notifier.php</td><td>$perm_update</td></tr><tr><td>personal_xrd</td><td>mod/xrd.php</td><td>$arr</td></tr><tr><td>photo_post_end</td><td>include/photos.php</td><td>$ret</td></tr><tr><td>photo_post_end</td><td>include/photos.php</td><td>$ret</td></tr><tr><td>photo_upload_begin</td><td>include/attach.php</td><td>$arr</td></tr><tr><td>photo_upload_begin</td><td>include/photos.php</td><td>$args</td></tr><tr><td>photo_upload_end</td><td>include/attach.php</td><td>$ret</td></tr><tr><td>photo_upload_end</td><td>include/attach.php</td><td>$ret</td></tr><tr><td>photo_upload_end</td><td>include/attach.php</td><td>$ret</td></tr><tr><td>photo_upload_end</td><td>include/attach.php</td><td>$ret</td></tr><tr><td>photo_upload_end</td><td>include/attach.php</td><td>$ret</td></tr><tr><td>photo_upload_end</td><td>include/photos.php</td><td>$ret</td></tr><tr><td>photo_upload_end</td><td>include/photos.php</td><td>$ret</td></tr><tr><td>photo_upload_end</td><td>include/photos.php</td><td>$ret</td></tr><tr><td>photo_upload_end</td><td>include/photos.php</td><td>$ret</td></tr><tr><td>photo_upload_file</td><td>include/attach.php</td><td>$f</td></tr><tr><td>photo_upload_file</td><td>include/photos.php</td><td>$f</td></tr><tr><td>photo_upload_form</td><td>mod/photos.php</td><td>$ret</td></tr><tr><td>poke_verbs</td><td>include/text.php</td><td>$arr</td></tr><tr><td>post_local</td><td>include/zot.php</td><td>$arr</td></tr><tr><td>post_local</td><td>include/items.php</td><td>$arr</td></tr><tr><td>post_local</td><td>mod/item.php</td><td>$datarray</td></tr><tr><td>post_local_end</td><td>include/items.php</td><td>$arr</td></tr><tr><td>post_local_end</td><td>include/attach.php</td><td>$arr</td></tr><tr><td>post_local_end</td><td>include/attach.php</td><td>$arr</td></tr><tr><td>post_local_end</td><td>extend/addon/matrix/randpost/randpost.php</td><td>$x</td></tr><tr><td>post_local_end</td><td>extend/addon/matrix/randpost/randpost.php</td><td>$x</td></tr><tr><td>post_local_end</td><td>mod/mood.php</td><td>$arr</td></tr><tr><td>post_local_end</td><td>mod/like.php</td><td>$arr</td></tr><tr><td>post_local_end</td><td>mod/item.php</td><td>$datarray</td></tr><tr><td>post_local_end</td><td>mod/subthread.php</td><td>$arr</td></tr><tr><td>post_local_start</td><td>mod/item.php</td><td>$_REQUEST</td></tr><tr><td>post_mail</td><td>include/items.php</td><td>$arr</td></tr><tr><td>post_mail_end</td><td>include/items.php</td><td>$arr</td></tr><tr><td>post_remote</td><td>include/items.php</td><td>$arr</td></tr><tr><td>post_remote_end</td><td>include/items.php</td><td>$arr</td></tr><tr><td>post_remote_update</td><td>include/items.php</td><td>$arr</td></tr><tr><td>post_remote_update_end</td><td>include/items.php</td><td>$arr</td></tr><tr><td>prepare_body</td><td>include/text.php</td><td>$prep_arr</td></tr><tr><td>prepare_body_final</td><td>include/text.php</td><td>$prep_arr</td></tr><tr><td>prepare_body_init</td><td>include/text.php</td><td>$item</td></tr><tr><td>probe_well_known</td><td>include/probe.php</td><td>$ret</td></tr><tr><td>proc_run</td><td>boot.php</td><td>$arr</td></tr><tr><td>process_channel_sync_delivery</td><td>include/zot.php</td><td>$addon</td></tr><tr><td>profile_advanced</td><td>mod/profile.php</td><td>$o</td></tr><tr><td>profile_edit</td><td>mod/profiles.php</td><td>$arr</td></tr><tr><td>profile_photo_content_end</td><td>mod/profile_photo.php</td><td>$o</td></tr><tr><td>profile_post</td><td>mod/profiles.php</td><td>$_POST</td></tr><tr><td>profile_sidebar</td><td>include/channel.php</td><td>$arr</td></tr><tr><td>profile_sidebar_enter</td><td>include/channel.php</td><td>$profile</td></tr><tr><td>profile_tabs</td><td>include/conversation.php</td><td>$arr</td></tr><tr><td>register_account</td><td>include/account.php</td><td>$result</td></tr><tr><td>render_location</td><td>include/conversation.php</td><td>$locate</td></tr><tr><td>replace_macros</td><td>include/text.php</td><td>$arr</td></tr><tr><td>reverse_magic_auth</td><td>mod/rmagic.php</td><td>$arr</td></tr><tr><td>settings_account</td><td>mod/settings.php</td><td>$_POST</td></tr><tr><td>settings_form</td><td>mod/settings.php</td><td>$o</td></tr><tr><td>settings_post</td><td>mod/settings.php</td><td>$_POST</td></tr><tr><td>sexpref_selector</td><td>include/profile_selectors.php</td><td>$select</td></tr><tr><td>sexpref_selector_min</td><td>include/profile_selectors.php</td><td>$select</td></tr><tr><td>smilie</td><td>include/text.php</td><td>$params</td></tr><tr><td>smilie</td><td>extend/addon/matrix/smileybutton/smileybutton.php</td><td>$params</td></tr><tr><td>tagged</td><td>include/items.php</td><td>$arr</td></tr><tr><td>validate_channelname</td><td>include/channel.php</td><td>$arr</td></tr><tr><td>webfinger</td><td>mod/wfinger.php</td><td>$arr</td></tr><tr><td>well_known</td><td>mod/_well_known.php</td><td>$arr</td></tr><tr><td>zid</td><td>include/channel.php</td><td>$arr</td></tr><tr><td>zid_init</td><td>include/channel.php</td><td>$arr</td></tr><tr><td>zot_finger</td><td>include/zot.php</td><td>$ret</td></tr></table><p>Generated Tue Nov 03 21:19:02 PST 2015</p></div>
\ No newline at end of file diff --git a/include/account.php b/include/account.php index 5998609d4..e367e002d 100644 --- a/include/account.php +++ b/include/account.php @@ -11,7 +11,7 @@ require_once('include/text.php'); require_once('include/language.php'); require_once('include/datetime.php'); require_once('include/crypto.php'); -require_once('include/identity.php'); +require_once('include/channel.php'); function check_account_email($email) { diff --git a/include/api.php b/include/api.php index 4a462d1e8..ba36cc01a 100644 --- a/include/api.php +++ b/include/api.php @@ -514,7 +514,7 @@ require_once('include/api_auth.php'); return false; } - require_once('include/identity.php'); + require_once('include/channel.php'); json_return_and_die(identity_basic_export(api_user(),(($_REQUEST['posts']) ? intval($_REQUEST['posts']) : 0 ))); } diff --git a/include/apps.php b/include/apps.php index 7439be6d4..e300bc50d 100644 --- a/include/apps.php +++ b/include/apps.php @@ -6,7 +6,7 @@ */ require_once('include/plugin.php'); -require_once('include/identity.php'); +require_once('include/channel.php'); function get_system_apps($translate = true) { diff --git a/include/identity.php b/include/channel.php index 4ef1105ea..050c4824b 100644 --- a/include/identity.php +++ b/include/channel.php @@ -1,6 +1,6 @@ <?php /** - * @file include/identity.php + * @file include/channel.php */ require_once('include/zot.php'); @@ -847,7 +847,7 @@ function profile_load(&$a, $nickname, $profile = '') { $extra_fields = array(); - require_once('include/identity.php'); + require_once('include/channel.php'); $profile_fields_basic = get_profile_fields_basic(); $profile_fields_advanced = get_profile_fields_advanced(); @@ -1004,8 +1004,6 @@ function profile_sidebar($profile, $block = 0, $show_connect = true, $zcard = fa call_hooks('profile_sidebar_enter', $profile); - require_once('include/Contact.php'); - if($show_connect) { // This will return an empty string if we're already connected. diff --git a/include/Contact.php b/include/connections.php index e50670a89..c55ffd817 100644 --- a/include/Contact.php +++ b/include/connections.php @@ -198,7 +198,7 @@ function account_remove($account_id,$local = true,$unset_session=true) { // Don't let anybody nuke the only admin account. - $r = q("select account_id from account where (account_roles & %d)>0", + $r = q("select account_id from account where (account_roles & %d) > 0", intval(ACCOUNT_ROLE_ADMIN) ); diff --git a/include/contact_widgets.php b/include/contact_widgets.php index e62d57aa2..14d26e257 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -3,9 +3,6 @@ function findpeople_widget() { - require_once('include/Contact.php'); - - $a = get_app(); if(get_config('system','invitation_only')) { $x = get_pconfig(local_channel(),'system','invites_remaining'); @@ -37,7 +34,6 @@ function findpeople_widget() { function fileas_widget($baseurl,$selected = '') { - $a = get_app(); if(! local_channel()) return ''; @@ -65,8 +61,6 @@ function fileas_widget($baseurl,$selected = '') { } function categories_widget($baseurl,$selected = '') { - - $a = get_app(); if(! feature_enabled(App::$profile['profile_uid'],'categories')) return ''; @@ -108,8 +102,6 @@ function categories_widget($baseurl,$selected = '') { function common_friends_visitor_widget($profile_uid) { - $a = get_app(); - if(local_channel() == $profile_uid) return; diff --git a/include/conversation.php b/include/conversation.php index fca07a91d..ca73a7a07 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1107,7 +1107,6 @@ function status_editor($a, $x, $popup = false) { $o = ''; - require_once('include/Contact.php'); $c = channelx_by_n($x['profile_uid']); if($c && $c['channel_moved']) return $o; @@ -1160,7 +1159,7 @@ function status_editor($a, $x, $popup = false) { $layoutselect = '<input type="hidden" name="layout_mid" value="' . $layout . '" />'; if(array_key_exists('channel_select',$x) && $x['channel_select']) { - require_once('include/identity.php'); + require_once('include/channel.php'); $id_select = identity_selector(); } else diff --git a/include/feedutils.php b/include/feedutils.php index 700198ff8..f370c540a 100644 --- a/include/feedutils.php +++ b/include/feedutils.php @@ -1087,7 +1087,6 @@ function update_feed_item($uid,$datarray) { function handle_feed($uid,$abook_id,$url) { - require_once('include/Contact.php'); $channel = channelx_by_n($uid); if(! $channel) return; diff --git a/include/items.php b/include/items.php index a25be72b3..de0941c3c 100755 --- a/include/items.php +++ b/include/items.php @@ -77,7 +77,7 @@ function collect_recipients($item, &$private_envelope) { // by the directives in $item['public_policy']. $private_envelope = false; - require_once('include/identity.php'); + require_once('include/channel.php'); //$sys = get_sys_channel(); if(array_key_exists('public_policy',$item) && $item['public_policy'] !== 'self') { diff --git a/include/text.php b/include/text.php index df6dac056..91aeae989 100644 --- a/include/text.php +++ b/include/text.php @@ -1319,7 +1319,7 @@ function theme_attachments(&$item) { $title = t('Size') . ' ' . (($r['length']) ? userReadableSize($r['length']) : t('unknown')); - require_once('include/identity.php'); + require_once('include/channel.php'); if(is_foreigner($item['author_xchan'])) $url = $r['href']; else @@ -1486,7 +1486,7 @@ function format_event($jobject) { } function prepare_body(&$item,$attach = false) { - require_once('include/identity.php'); + require_once('include/channel.php'); call_hooks('prepare_body_init', $item); @@ -2261,7 +2261,7 @@ function design_tools() { $sys = false; if(App::$is_sys && is_site_admin()) { - require_once('include/identity.php'); + require_once('include/channel.php'); $channel = get_sys_channel(); $sys = true; } diff --git a/include/widgets.php b/include/widgets.php index 2641a718e..a158633ad 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -8,7 +8,7 @@ require_once('include/dir_fns.php'); require_once('include/contact_widgets.php'); require_once('include/attach.php'); -require_once('include/Contact.php'); + function widget_profile($args) { @@ -806,7 +806,6 @@ function widget_photo_albums($arr) { function widget_vcard($arr) { - require_once ('include/Contact.php'); return vcard_from_xchan('', App::get_observer()); } @@ -1052,7 +1051,7 @@ function widget_photo($arr) { function widget_cover_photo($arr) { - require_once('include/identity.php'); + require_once('include/channel.php'); $o = ''; if(App::$module == 'channel' && $_REQUEST['mid']) diff --git a/include/zot.php b/include/zot.php index f5fb87e12..4b780db2a 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1332,7 +1332,7 @@ function zot_import($arr, $sender_url) { */ function public_recips($msg) { - require_once('include/identity.php'); + require_once('include/channel.php'); $check_mentions = false; $include_sys = false; @@ -3222,7 +3222,6 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { $clean = array(); if($abook['abook_xchan'] && $abook['entry_deleted']) { logger('process_channel_sync_delivery: removing abook entry for ' . $abook['abook_xchan']); - require_once('include/Contact.php'); $r = q("select abook_id, abook_feed from abook where abook_xchan = '%s' and abook_channel = %d and abook_self = 0 limit 1", dbesc($abook['abook_xchan']), @@ -3926,7 +3925,7 @@ function zotinfo($arr) { $ret['site']['accounts'] = account_total(); - require_once('include/identity.php'); + require_once('include/channel.php'); $ret['site']['channels'] = channel_total(); @@ -4421,7 +4420,6 @@ function zot_reply_purge($sender,$recipients) { $arr = $sender; $sender_hash = make_xchan_hash($arr['guid'],$arr['guid_sig']); - require_once('include/Contact.php'); remove_all_xchan_resources($sender_hash); $ret['success'] = true; diff --git a/util/hmessages.po b/util/hmessages.po index abc4d1a9f..c863c6a67 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -111,8 +111,8 @@ msgstr "" #: ../../Zotlabs/Module/Editwebpage.php:146 #: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Menu.php:112 #: ../../Zotlabs/Module/Settings.php:652 ../../Zotlabs/Module/Thing.php:260 -#: ../../Zotlabs/Module/Webpages.php:187 ../../include/identity.php:937 -#: ../../include/identity.php:941 ../../include/ItemObject.php:100 +#: ../../Zotlabs/Module/Webpages.php:187 ../../include/channel.php:937 +#: ../../include/channel.php:941 ../../include/ItemObject.php:100 #: ../../include/menu.php:108 ../../include/page_widgets.php:8 #: ../../include/page_widgets.php:36 ../../include/apps.php:291 msgid "Edit" @@ -247,7 +247,7 @@ msgstr "" #: ../../Zotlabs/Module/Editwebpage.php:33 #: ../../Zotlabs/Module/Filestorage.php:60 ../../Zotlabs/Module/Hcard.php:12 #: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Profile.php:20 -#: ../../Zotlabs/Module/Webpages.php:34 ../../include/identity.php:837 +#: ../../Zotlabs/Module/Webpages.php:34 ../../include/channel.php:837 msgid "Requested profile is not available." msgstr "" @@ -2030,8 +2030,8 @@ msgstr "" #: ../../Zotlabs/Module/Settings.php:346 ../../Zotlabs/Module/Settings.php:347 #: ../../Zotlabs/Module/Settings.php:350 ../../Zotlabs/Module/Settings.php:361 #: ../../include/profile_selectors.php:80 ../../include/widgets.php:495 -#: ../../include/identity.php:389 ../../include/identity.php:390 -#: ../../include/identity.php:397 +#: ../../include/channel.php:389 ../../include/channel.php:390 +#: ../../include/channel.php:397 msgid "Friends" msgstr "" @@ -2236,7 +2236,7 @@ msgstr "" msgid "%1$s updated their %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/identity.php:1807 +#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1807 msgid "cover photo" msgstr "" @@ -2318,12 +2318,12 @@ msgstr "" msgid "Homepage: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:306 ../../include/identity.php:1329 +#: ../../Zotlabs/Module/Directory.php:306 ../../include/channel.php:1329 msgid "Age:" msgstr "" #: ../../Zotlabs/Module/Directory.php:311 ../../include/event.php:52 -#: ../../include/identity.php:1029 ../../include/text.php:1481 +#: ../../include/channel.php:1029 ../../include/text.php:1481 #: ../../include/bb2diaspora.php:509 msgid "Location:" msgstr "" @@ -2332,18 +2332,18 @@ msgstr "" msgid "Description:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:322 ../../include/identity.php:1345 +#: ../../Zotlabs/Module/Directory.php:322 ../../include/channel.php:1345 msgid "Hometown:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:324 ../../include/identity.php:1353 +#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1353 msgid "About:" msgstr "" #: ../../Zotlabs/Module/Directory.php:325 ../../Zotlabs/Module/Match.php:68 #: ../../Zotlabs/Module/Suggest.php:56 ../../include/Contact.php:101 #: ../../include/widgets.php:147 ../../include/widgets.php:184 -#: ../../include/identity.php:1014 ../../include/conversation.php:961 +#: ../../include/channel.php:1014 ../../include/conversation.php:961 msgid "Connect" msgstr "" @@ -4182,7 +4182,7 @@ msgstr "" msgid "View all" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1130 ../../include/identity.php:1304 +#: ../../Zotlabs/Module/Photos.php:1130 ../../include/channel.php:1304 #: ../../include/ItemObject.php:179 ../../include/conversation.php:1748 #: ../../include/taxonomy.php:403 msgctxt "noun" @@ -4243,13 +4243,13 @@ msgstr "" msgid "added your channel" msgstr "" -#: ../../Zotlabs/Module/Ping.php:322 ../../include/identity.php:1123 -#: ../../include/identity.php:1199 +#: ../../Zotlabs/Module/Ping.php:322 ../../include/channel.php:1123 +#: ../../include/channel.php:1199 msgid "g A l F d" msgstr "" -#: ../../Zotlabs/Module/Ping.php:345 ../../include/identity.php:1169 -#: ../../include/identity.php:1239 +#: ../../Zotlabs/Module/Ping.php:345 ../../include/channel.php:1169 +#: ../../include/channel.php:1239 msgid "[today]" msgstr "" @@ -4387,7 +4387,7 @@ msgid "View this profile" msgstr "" #: ../../Zotlabs/Module/Profiles.php:693 ../../Zotlabs/Module/Profiles.php:775 -#: ../../include/identity.php:959 +#: ../../include/channel.php:959 msgid "Edit visibility" msgstr "" @@ -4399,7 +4399,7 @@ msgstr "" msgid "Change cover photo" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:696 ../../include/identity.php:930 +#: ../../Zotlabs/Module/Profiles.php:696 ../../include/channel.php:930 msgid "Change profile photo" msgstr "" @@ -4560,11 +4560,11 @@ msgstr "" msgid "My other channels" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:771 ../../include/identity.php:955 +#: ../../Zotlabs/Module/Profiles.php:771 ../../include/channel.php:955 msgid "Profile Image" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:781 ../../include/identity.php:937 +#: ../../Zotlabs/Module/Profiles.php:781 ../../include/channel.php:937 #: ../../include/nav.php:88 msgid "Edit Profiles" msgstr "" @@ -4577,7 +4577,7 @@ msgstr "" msgid "Profile Visibility Editor" msgstr "" -#: ../../Zotlabs/Module/Profperm.php:117 ../../include/identity.php:1395 +#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1395 msgid "Profile" msgstr "" @@ -5190,7 +5190,7 @@ msgstr "" msgid "Basic Settings" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1040 ../../include/identity.php:1286 +#: ../../Zotlabs/Module/Settings.php:1040 ../../include/channel.php:1286 msgid "Full Name:" msgstr "" @@ -6952,185 +6952,185 @@ msgstr "" msgid "Room is full" msgstr "" -#: ../../include/identity.php:32 +#: ../../include/channel.php:32 msgid "Unable to obtain identity information from database" msgstr "" -#: ../../include/identity.php:66 +#: ../../include/channel.php:66 msgid "Empty name" msgstr "" -#: ../../include/identity.php:69 +#: ../../include/channel.php:69 msgid "Name too long" msgstr "" -#: ../../include/identity.php:180 +#: ../../include/channel.php:180 msgid "No account identifier" msgstr "" -#: ../../include/identity.php:192 +#: ../../include/channel.php:192 msgid "Nickname is required." msgstr "" -#: ../../include/identity.php:206 +#: ../../include/channel.php:206 msgid "Reserved nickname. Please choose another." msgstr "" -#: ../../include/identity.php:211 +#: ../../include/channel.php:211 msgid "" "Nickname has unsupported characters or is already being used on this site." msgstr "" -#: ../../include/identity.php:287 +#: ../../include/channel.php:287 msgid "Unable to retrieve created identity" msgstr "" -#: ../../include/identity.php:345 +#: ../../include/channel.php:345 msgid "Default Profile" msgstr "" -#: ../../include/identity.php:791 +#: ../../include/channel.php:791 msgid "Requested channel is not available." msgstr "" -#: ../../include/identity.php:938 +#: ../../include/channel.php:938 msgid "Create New Profile" msgstr "" -#: ../../include/identity.php:941 ../../include/nav.php:90 +#: ../../include/channel.php:941 ../../include/nav.php:90 msgid "Edit Profile" msgstr "" -#: ../../include/identity.php:958 +#: ../../include/channel.php:958 msgid "Visible to everybody" msgstr "" -#: ../../include/identity.php:1033 ../../include/identity.php:1288 +#: ../../include/channel.php:1033 ../../include/channel.php:1288 msgid "Gender:" msgstr "" -#: ../../include/identity.php:1034 ../../include/identity.php:1332 +#: ../../include/channel.php:1034 ../../include/channel.php:1332 msgid "Status:" msgstr "" -#: ../../include/identity.php:1035 ../../include/identity.php:1343 +#: ../../include/channel.php:1035 ../../include/channel.php:1343 msgid "Homepage:" msgstr "" -#: ../../include/identity.php:1036 +#: ../../include/channel.php:1036 msgid "Online Now" msgstr "" -#: ../../include/identity.php:1124 ../../include/identity.php:1200 +#: ../../include/channel.php:1124 ../../include/channel.php:1200 msgid "F d" msgstr "" -#: ../../include/identity.php:1180 +#: ../../include/channel.php:1180 msgid "Birthday Reminders" msgstr "" -#: ../../include/identity.php:1181 +#: ../../include/channel.php:1181 msgid "Birthdays this week:" msgstr "" -#: ../../include/identity.php:1232 +#: ../../include/channel.php:1232 msgid "[No description]" msgstr "" -#: ../../include/identity.php:1250 +#: ../../include/channel.php:1250 msgid "Event Reminders" msgstr "" -#: ../../include/identity.php:1251 +#: ../../include/channel.php:1251 msgid "Events this week:" msgstr "" -#: ../../include/identity.php:1293 +#: ../../include/channel.php:1293 msgid "Like this channel" msgstr "" -#: ../../include/identity.php:1317 +#: ../../include/channel.php:1317 msgid "j F, Y" msgstr "" -#: ../../include/identity.php:1318 +#: ../../include/channel.php:1318 msgid "j F" msgstr "" -#: ../../include/identity.php:1325 +#: ../../include/channel.php:1325 msgid "Birthday:" msgstr "" -#: ../../include/identity.php:1338 +#: ../../include/channel.php:1338 #, php-format msgid "for %1$d %2$s" msgstr "" -#: ../../include/identity.php:1341 +#: ../../include/channel.php:1341 msgid "Sexual Preference:" msgstr "" -#: ../../include/identity.php:1347 +#: ../../include/channel.php:1347 msgid "Tags:" msgstr "" -#: ../../include/identity.php:1349 +#: ../../include/channel.php:1349 msgid "Political Views:" msgstr "" -#: ../../include/identity.php:1351 +#: ../../include/channel.php:1351 msgid "Religion:" msgstr "" -#: ../../include/identity.php:1355 +#: ../../include/channel.php:1355 msgid "Hobbies/Interests:" msgstr "" -#: ../../include/identity.php:1357 +#: ../../include/channel.php:1357 msgid "Likes:" msgstr "" -#: ../../include/identity.php:1359 +#: ../../include/channel.php:1359 msgid "Dislikes:" msgstr "" -#: ../../include/identity.php:1361 +#: ../../include/channel.php:1361 msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/identity.php:1363 +#: ../../include/channel.php:1363 msgid "My other channels:" msgstr "" -#: ../../include/identity.php:1365 +#: ../../include/channel.php:1365 msgid "Musical interests:" msgstr "" -#: ../../include/identity.php:1367 +#: ../../include/channel.php:1367 msgid "Books, literature:" msgstr "" -#: ../../include/identity.php:1369 +#: ../../include/channel.php:1369 msgid "Television:" msgstr "" -#: ../../include/identity.php:1371 +#: ../../include/channel.php:1371 msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/identity.php:1373 +#: ../../include/channel.php:1373 msgid "Love/Romance:" msgstr "" -#: ../../include/identity.php:1375 +#: ../../include/channel.php:1375 msgid "Work/employment:" msgstr "" -#: ../../include/identity.php:1377 +#: ../../include/channel.php:1377 msgid "School/education:" msgstr "" -#: ../../include/identity.php:1397 +#: ../../include/channel.php:1397 msgid "Like this thing" msgstr "" diff --git a/util/messages.po b/util/messages.po index f3c9782f3..dd847e9e0 100644 --- a/util/messages.po +++ b/util/messages.po @@ -1023,7 +1023,7 @@ msgstr "" #: ../../include/widgets.php:136 ../../include/widgets.php:175 #: ../../include/Contact.php:107 ../../include/conversation.php:956 -#: ../../include/identity.php:956 ../../mod/directory.php:316 +#: ../../include/channel.php:956 ../../mod/directory.php:316 #: ../../mod/match.php:64 ../../mod/suggest.php:52 msgid "Connect" msgstr "" @@ -1088,8 +1088,8 @@ msgstr "" msgid "Family" msgstr "" -#: ../../include/widgets.php:431 ../../include/identity.php:394 -#: ../../include/identity.php:395 ../../include/identity.php:402 +#: ../../include/widgets.php:431 ../../include/channel.php:394 +#: ../../include/channel.php:395 ../../include/channel.php:402 #: ../../include/profile_selectors.php:80 ../../mod/settings.php:345 #: ../../mod/settings.php:349 ../../mod/settings.php:350 #: ../../mod/settings.php:353 ../../mod/settings.php:364 @@ -1206,7 +1206,7 @@ msgid "Finishes:" msgstr "" #: ../../include/event.php:50 ../../include/bb2diaspora.php:481 -#: ../../include/identity.php:1007 ../../mod/directory.php:302 +#: ../../include/channel.php:1007 ../../mod/directory.php:302 #: ../../mod/events.php:684 msgid "Location:" msgstr "" @@ -1523,7 +1523,7 @@ msgid "View all" msgstr "" #: ../../include/ItemObject.php:179 ../../include/taxonomy.php:396 -#: ../../include/conversation.php:1712 ../../include/identity.php:1266 +#: ../../include/conversation.php:1712 ../../include/channel.php:1266 #: ../../mod/photos.php:1019 msgctxt "noun" msgid "Like" @@ -1775,7 +1775,7 @@ msgstr "" msgid "Manage/Edit profiles" msgstr "" -#: ../../include/nav.php:95 ../../include/identity.php:979 +#: ../../include/nav.php:95 ../../include/channel.php:979 msgid "Edit Profile" msgstr "" @@ -3279,48 +3279,48 @@ msgstr "" msgid "database storage failed." msgstr "" -#: ../../include/identity.php:33 +#: ../../include/channel.php:33 msgid "Unable to obtain identity information from database" msgstr "" -#: ../../include/identity.php:67 +#: ../../include/channel.php:67 msgid "Empty name" msgstr "" -#: ../../include/identity.php:70 +#: ../../include/channel.php:70 msgid "Name too long" msgstr "" -#: ../../include/identity.php:186 +#: ../../include/channel.php:186 msgid "No account identifier" msgstr "" -#: ../../include/identity.php:198 +#: ../../include/channel.php:198 msgid "Nickname is required." msgstr "" -#: ../../include/identity.php:212 +#: ../../include/channel.php:212 msgid "Reserved nickname. Please choose another." msgstr "" -#: ../../include/identity.php:217 ../../include/dimport.php:34 +#: ../../include/channel.php:217 ../../include/dimport.php:34 msgid "" "Nickname has unsupported characters or is already being used on this site." msgstr "" -#: ../../include/identity.php:292 +#: ../../include/channel.php:292 msgid "Unable to retrieve created identity" msgstr "" -#: ../../include/identity.php:350 +#: ../../include/channel.php:350 msgid "Default Profile" msgstr "" -#: ../../include/identity.php:759 +#: ../../include/channel.php:759 msgid "Requested channel is not available." msgstr "" -#: ../../include/identity.php:806 ../../mod/profile.php:16 +#: ../../include/channel.php:806 ../../mod/profile.php:16 #: ../../mod/achievements.php:11 ../../mod/webpages.php:29 #: ../../mod/connect.php:13 ../../mod/hcard.php:8 ../../mod/blocks.php:29 #: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28 @@ -3329,193 +3329,193 @@ msgstr "" msgid "Requested profile is not available." msgstr "" -#: ../../include/identity.php:969 ../../mod/profiles.php:774 +#: ../../include/channel.php:969 ../../mod/profiles.php:774 msgid "Change profile photo" msgstr "" -#: ../../include/identity.php:975 +#: ../../include/channel.php:975 msgid "Profiles" msgstr "" -#: ../../include/identity.php:975 +#: ../../include/channel.php:975 msgid "Manage/edit profiles" msgstr "" -#: ../../include/identity.php:976 ../../mod/profiles.php:775 +#: ../../include/channel.php:976 ../../mod/profiles.php:775 msgid "Create New Profile" msgstr "" -#: ../../include/identity.php:991 ../../mod/profiles.php:786 +#: ../../include/channel.php:991 ../../mod/profiles.php:786 msgid "Profile Image" msgstr "" -#: ../../include/identity.php:994 +#: ../../include/channel.php:994 msgid "visible to everybody" msgstr "" -#: ../../include/identity.php:995 ../../mod/profiles.php:669 +#: ../../include/channel.php:995 ../../mod/profiles.php:669 #: ../../mod/profiles.php:790 msgid "Edit visibility" msgstr "" -#: ../../include/identity.php:1011 ../../include/identity.php:1250 +#: ../../include/channel.php:1011 ../../include/channel.php:1250 msgid "Gender:" msgstr "" -#: ../../include/identity.php:1012 ../../include/identity.php:1294 +#: ../../include/channel.php:1012 ../../include/channel.php:1294 msgid "Status:" msgstr "" -#: ../../include/identity.php:1013 ../../include/identity.php:1305 +#: ../../include/channel.php:1013 ../../include/channel.php:1305 msgid "Homepage:" msgstr "" -#: ../../include/identity.php:1014 +#: ../../include/channel.php:1014 msgid "Online Now" msgstr "" -#: ../../include/identity.php:1097 ../../include/identity.php:1175 +#: ../../include/channel.php:1097 ../../include/channel.php:1175 #: ../../mod/ping.php:324 msgid "g A l F d" msgstr "" -#: ../../include/identity.php:1098 ../../include/identity.php:1176 +#: ../../include/channel.php:1098 ../../include/channel.php:1176 msgid "F d" msgstr "" -#: ../../include/identity.php:1143 ../../include/identity.php:1215 +#: ../../include/channel.php:1143 ../../include/channel.php:1215 #: ../../mod/ping.php:346 msgid "[today]" msgstr "" -#: ../../include/identity.php:1154 +#: ../../include/channel.php:1154 msgid "Birthday Reminders" msgstr "" -#: ../../include/identity.php:1155 +#: ../../include/channel.php:1155 msgid "Birthdays this week:" msgstr "" -#: ../../include/identity.php:1208 +#: ../../include/channel.php:1208 msgid "[No description]" msgstr "" -#: ../../include/identity.php:1226 +#: ../../include/channel.php:1226 msgid "Event Reminders" msgstr "" -#: ../../include/identity.php:1227 +#: ../../include/channel.php:1227 msgid "Events this week:" msgstr "" -#: ../../include/identity.php:1240 ../../include/identity.php:1357 +#: ../../include/channel.php:1240 ../../include/channel.php:1357 #: ../../include/apps.php:138 ../../mod/profperm.php:112 msgid "Profile" msgstr "" -#: ../../include/identity.php:1248 ../../mod/settings.php:1056 +#: ../../include/channel.php:1248 ../../mod/settings.php:1056 msgid "Full Name:" msgstr "" -#: ../../include/identity.php:1255 +#: ../../include/channel.php:1255 msgid "Like this channel" msgstr "" -#: ../../include/identity.php:1279 +#: ../../include/channel.php:1279 msgid "j F, Y" msgstr "" -#: ../../include/identity.php:1280 +#: ../../include/channel.php:1280 msgid "j F" msgstr "" -#: ../../include/identity.php:1287 +#: ../../include/channel.php:1287 msgid "Birthday:" msgstr "" -#: ../../include/identity.php:1291 ../../mod/directory.php:297 +#: ../../include/channel.php:1291 ../../mod/directory.php:297 msgid "Age:" msgstr "" -#: ../../include/identity.php:1300 +#: ../../include/channel.php:1300 #, php-format msgid "for %1$d %2$s" msgstr "" -#: ../../include/identity.php:1303 ../../mod/profiles.php:691 +#: ../../include/channel.php:1303 ../../mod/profiles.php:691 msgid "Sexual Preference:" msgstr "" -#: ../../include/identity.php:1307 ../../mod/directory.php:313 +#: ../../include/channel.php:1307 ../../mod/directory.php:313 #: ../../mod/profiles.php:693 msgid "Hometown:" msgstr "" -#: ../../include/identity.php:1309 +#: ../../include/channel.php:1309 msgid "Tags:" msgstr "" -#: ../../include/identity.php:1311 ../../mod/profiles.php:694 +#: ../../include/channel.php:1311 ../../mod/profiles.php:694 msgid "Political Views:" msgstr "" -#: ../../include/identity.php:1313 +#: ../../include/channel.php:1313 msgid "Religion:" msgstr "" -#: ../../include/identity.php:1315 ../../mod/directory.php:315 +#: ../../include/channel.php:1315 ../../mod/directory.php:315 msgid "About:" msgstr "" -#: ../../include/identity.php:1317 +#: ../../include/channel.php:1317 msgid "Hobbies/Interests:" msgstr "" -#: ../../include/identity.php:1319 ../../mod/profiles.php:697 +#: ../../include/channel.php:1319 ../../mod/profiles.php:697 msgid "Likes:" msgstr "" -#: ../../include/identity.php:1321 ../../mod/profiles.php:698 +#: ../../include/channel.php:1321 ../../mod/profiles.php:698 msgid "Dislikes:" msgstr "" -#: ../../include/identity.php:1323 +#: ../../include/channel.php:1323 msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/identity.php:1325 +#: ../../include/channel.php:1325 msgid "My other channels:" msgstr "" -#: ../../include/identity.php:1327 +#: ../../include/channel.php:1327 msgid "Musical interests:" msgstr "" -#: ../../include/identity.php:1329 +#: ../../include/channel.php:1329 msgid "Books, literature:" msgstr "" -#: ../../include/identity.php:1331 +#: ../../include/channel.php:1331 msgid "Television:" msgstr "" -#: ../../include/identity.php:1333 +#: ../../include/channel.php:1333 msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/identity.php:1335 +#: ../../include/channel.php:1335 msgid "Love/Romance:" msgstr "" -#: ../../include/identity.php:1337 +#: ../../include/channel.php:1337 msgid "Work/employment:" msgstr "" -#: ../../include/identity.php:1339 +#: ../../include/channel.php:1339 msgid "School/education:" msgstr "" -#: ../../include/identity.php:1359 +#: ../../include/channel.php:1359 msgid "Like this thing" msgstr "" |