diff options
author | friendica <info@friendica.com> | 2013-09-09 04:55:38 -0700 |
---|---|---|
committer | friendica <info@friendica.com> | 2013-09-09 04:55:38 -0700 |
commit | 147483f259af3bdc2d34eac3638c576012734100 (patch) | |
tree | 56403e3a09e896d7c9ceb18fd0b746c4d60f1cd2 | |
parent | 25a5a5ff4dd457398d762f0ff92f01b134b92eaa (diff) | |
parent | f9e6e1c3d21b3503ed723de40a953d48ceb4ca32 (diff) | |
download | volse-hubzilla-147483f259af3bdc2d34eac3638c576012734100.tar.gz volse-hubzilla-147483f259af3bdc2d34eac3638c576012734100.tar.bz2 volse-hubzilla-147483f259af3bdc2d34eac3638c576012734100.zip |
Merge pull request #122 from MicMee/master
just a typo
-rwxr-xr-x | boot.php | 11 | ||||
-rw-r--r-- | include/zot.php | 2 |
2 files changed, 12 insertions, 1 deletions
@@ -346,6 +346,17 @@ define ( 'XCHAN_FLAGS_HIDDEN', 0x0001); define ( 'XCHAN_FLAGS_ORPHAN', 0x0002); +/* + * Traficlights for Administration of HubLoc + * to detect problems in inter server communication + */ +define ('HUBLOC_NOTUSED', 0x0000); +define ('HUBLOC_SEND_ERROR', 0x0001); +define ('HUBLOC_RECEIVE_ERROR', 0x0002); +define ('HUBLOC_WORKS', 0x0004); +define ('HUBLOC_OFFLINE', 0x0008); + + /** * Tag/term types */ diff --git a/include/zot.php b/include/zot.php index 88a7f4529..e9084496c 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1538,7 +1538,7 @@ function import_site($arr,$pubkey) { } } else { - $r = q("insert into site ( site_url, site_acccess, site_flags, site_update, site_directory, site_register ) + $r = q("insert into site ( site_url, site_access, site_flags, site_update, site_directory, site_register ) values ( '%s', %d, %d, '%s', '%s', %d )", dbesc(htmlentities($arr['url'],ENT_COMPAT,'UTF-8',false)), intval($site_directory), |