Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
hubzilla
core
Commits
8d72cea2
Commit
8d72cea2
authored
Mar 14, 2017
by
Zot
Committed by
Mario
Mar 29, 2017
Browse files
get rid of some cruft in boot.php
parent
3ee4dd0d
Changes
1
Hide whitespace changes
Inline
Side-by-side
boot.php
View file @
8d72cea2
...
...
@@ -5,14 +5,13 @@
*/
/**
* Hubzilla.
*
*
Hubzilla
is an open source decentralised communications
*
This
is an open source decentralised communications
* platform combined with a decentralised identity/authentication framework
* wrapped in an extensible content management system, providing website designers
* the ability to embed fully decentralised communications and social tools
* into many traditional website designs (blogs, forums, small business
* websites, charitable organisations, etc.).
Hubzilla a
lso provides DNS mobility
* websites, charitable organisations, etc.).
A
lso provide
d i
s DNS mobility
* and internet scale privacy/access control.
*
* This allows any individual website to participate in a matrix of linked
...
...
@@ -126,7 +125,9 @@ define ( 'LANGUAGE_DETECT_MIN_CONFIDENCE', 0.01 );
* either more or less restrictive.
*/
define
(
'STORAGE_DEFAULT_PERMISSIONS'
,
0770
);
if
(
!
defined
(
'STORAGE_DEFAULT_PERMISSIONS'
))
{
define
(
'STORAGE_DEFAULT_PERMISSIONS'
,
0770
);
}
/**
...
...
@@ -148,12 +149,6 @@ define ( 'STORAGE_DEFAULT_PERMISSIONS', 0770 );
define
(
'MAX_IMAGE_LENGTH'
,
-
1
);
/**
* Not yet used
*/
define
(
'DEFAULT_DB_ENGINE'
,
'MyISAM'
);
/**
* log levels
*/
...
...
@@ -191,15 +186,6 @@ define ( 'ACCESS_PAID', 1 );
define
(
'ACCESS_FREE'
,
2
);
define
(
'ACCESS_TIERED'
,
3
);
/**
* relationship types
*/
define
(
'CONTACT_IS_FOLLOWER'
,
1
);
define
(
'CONTACT_IS_SHARING'
,
2
);
define
(
'CONTACT_IS_FRIEND'
,
3
);
/**
* DB update return values
*/
...
...
@@ -526,14 +512,6 @@ define ( 'ACTIVITY_OBJ_THING', NAMESPACE_ZOT . '/activity/thing' );
define
(
'ACTIVITY_OBJ_LOCATION'
,
NAMESPACE_ZOT
.
'/activity/location'
);
define
(
'ACTIVITY_OBJ_FILE'
,
NAMESPACE_ZOT
.
'/activity/file'
);
/**
* item weight for query ordering
*/
define
(
'GRAVITY_PARENT'
,
0
);
define
(
'GRAVITY_LIKE'
,
3
);
define
(
'GRAVITY_COMMENT'
,
6
);
/**
* Account Flags
*/
...
...
@@ -558,16 +536,16 @@ define ( 'ACCOUNT_ROLE_ADMIN', 0x1000 );
*/
define
(
'ITEM_VISIBLE'
,
0x0000
);
//
define ( 'ITEM_HIDDEN', 0x0001);
define
(
'ITEM_HIDDEN'
,
0x0001
);
define
(
'ITEM_BLOCKED'
,
0x0002
);
define
(
'ITEM_MODERATED'
,
0x0004
);
define
(
'ITEM_SPAM'
,
0x0008
);
//
define ( 'ITEM_DELETED', 0x0010);
define
(
'ITEM_DELETED'
,
0x0010
);
define
(
'ITEM_UNPUBLISHED'
,
0x0020
);
//
define ( 'ITEM_WEBPAGE', 0x0040); // is a static web page, not a conversational item
define
(
'ITEM_WEBPAGE'
,
0x0040
);
// is a static web page, not a conversational item
define
(
'ITEM_DELAYED_PUBLISH'
,
0x0080
);
define
(
'ITEM_BUILDBLOCK'
,
0x0100
);
// Named thusly to make sure nobody confuses this with ITEM_BLOCKED
//
define ( 'ITEM_PDL', 0x0200); // Page Description Language - e.g. Comanche
define
(
'ITEM_PDL'
,
0x0200
);
// Page Description Language - e.g. Comanche
define
(
'ITEM_BUG'
,
0x0400
);
// Is a bug, can be used by the internal bug tracker
define
(
'ITEM_PENDING_REMOVE'
,
0x0800
);
// deleted, notification period has lapsed
define
(
'ITEM_DOC'
,
0x1000
);
// hubzilla only, define here so that item import does the right thing
...
...
@@ -726,6 +704,7 @@ function startup() {
* which is now static (although currently constructed at startup). We are only converting
* 'system' config settings.
*/
class
miniApp
{
public
$config
=
array
(
'system'
=>
array
());
...
...
@@ -1822,18 +1801,6 @@ function local_channel() {
return
false
;
}
/**
* local_user() got deprecated and replaced by local_channel().
*
* @deprecated since v2.1, use local_channel()
* @see local_channel()
*/
function
local_user
()
{
logger
(
'local_user() is DEPRECATED, use local_channel()'
);
return
local_channel
();
}
/**
* @brief Returns a xchan_hash (visitor_id) of remote authenticated visitor
* or false.
...
...
@@ -1855,18 +1822,6 @@ function remote_channel() {
return
false
;
}
/**
* remote_user() got deprecated and replaced by remote_channel().
*
* @deprecated since v2.1, use remote_channel()
* @see remote_channel()
*/
function
remote_user
()
{
logger
(
'remote_user() is DEPRECATED, use remote_channel()'
);
return
remote_channel
();
}
/**
* Contents of $s are displayed prominently on the page the next time
* a page is loaded. Usually used for errors or alerts.
...
...
@@ -2356,7 +2311,7 @@ function construct_page(&$a) {
}
/**
* @brief Returns
Hubzilla's
root directory.
* @brief Returns
appplication
root directory.
*
* @return string
*/
...
...
@@ -2372,7 +2327,7 @@ function appdirpath() {
function
head_set_icon
(
$icon
)
{
App
::
$data
[
'pageicon'
]
=
$icon
;
// logger('head_set_icon: ' . $icon);
}
/**
...
...
@@ -2448,10 +2403,10 @@ function z_get_temp_dir() {
function
z_check_cert
()
{
if
(
strpos
(
z_root
(),
'https://'
)
!==
false
)
{
$x
=
z_fetch_url
(
z_root
()
.
'/siteinfo
/
json'
);
$x
=
z_fetch_url
(
z_root
()
.
'/siteinfo
.
json'
);
if
(
!
$x
[
'success'
])
{
$recurse
=
0
;
$y
=
z_fetch_url
(
z_root
()
.
'/siteinfo
/
json'
,
false
,
$recurse
,
array
(
'novalidate'
=>
true
));
$y
=
z_fetch_url
(
z_root
()
.
'/siteinfo
.
json'
,
false
,
$recurse
,
array
(
'novalidate'
=>
true
));
if
(
$y
[
'success'
])
cert_bad_email
();
}
...
...
@@ -2462,9 +2417,9 @@ function z_check_cert() {
/**
* @brief Send email to admin if server has an invalid certificate.
*
* If a Hubzilla hub is available over https it must have a publicly valid
* certificate.
* If a hub is available over https it must have a publicly valid certificate.
*/
function
cert_bad_email
()
{
$email_tpl
=
get_intltext_template
(
"cert_bad_eml.tpl"
);
...
...
@@ -2474,7 +2429,7 @@ function cert_bad_email() {
'$error'
=>
t
(
'Website SSL certificate is not valid. Please correct.'
)
));
$subject
=
email_header_encode
(
sprintf
(
t
(
'[
hubzilla
] Website SSL error for %s'
),
App
::
get_hostname
()));
$subject
=
email_header_encode
(
sprintf
(
t
(
'[
$Projectname
] Website SSL error for %s'
),
App
::
get_hostname
()));
mail
(
App
::
$config
[
'system'
][
'admin_email'
],
$subject
,
$email_msg
,
'From: Administrator'
.
'@'
.
App
::
get_hostname
()
.
"
\n
"
.
'Content-type: text/plain; charset=UTF-8'
.
"
\n
"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment