Commit de006771 authored by redmatrix's avatar redmatrix
Browse files

renamed include files identity.php (channel.php) and Contact.php (connections.php)

parent 2fdd1485
......@@ -21,7 +21,6 @@ class Cron_weekly {
require_once('include/hubloc.php');
prune_hub_reinstalls();
require_once('include/Contact.php');
mark_orphan_hubsxchans();
......
......@@ -3,7 +3,7 @@
namespace Zotlabs\Daemon;
require_once('include/zot.php');
require_once('include/identity.php');
require_once('include/channel.php');
class Externals {
......
......@@ -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 {
......
......@@ -4,7 +4,7 @@ namespace Zotlabs\Daemon;
require_once('include/zot.php');
require_once('include/socgraph.php');
require_once('include/Contact.php');
class Onepoll {
......
......@@ -12,7 +12,6 @@ class Ratenotif {
require_once("datetime.php");
require_once('include/items.php');
require_once('include/Contact.php');
if($argc < 3)
return;
......
......@@ -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;
......
......@@ -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);
......
<?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');
......
......@@ -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 {
......
<?php
namespace Zotlabs\Module;
require_once('include/Contact.php');
require_once('include/zot.php');
class Chanview extends \Zotlabs\Web\Controller {
function get() {
......
......@@ -2,7 +2,7 @@
namespace Zotlabs\Module; /** @file */
require_once('include/Contact.php');
require_once('include/contact_widgets.php');
require_once('include/items.php');
......
<?php
namespace Zotlabs\Module;
require_once('include/Contact.php');
require_once('include/socgraph.php');
require_once('include/selectors.php');
require_once('include/group.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).
......
......@@ -8,7 +8,7 @@ namespace Zotlabs\Module;
*/
require_once('include/photo/photo_driver.php');
require_once('include/identity.php');
require_once('include/channel.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'];
......
<?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');
......
<?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');
......
<?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');
......
......@@ -21,7 +21,6 @@ namespace Zotlabs\Module;
require_once('include/Contact.php');
require_once('include/attach.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');
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment