mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 00:55:19 +00:00
strings
This commit is contained in:
parent
9c177e7477
commit
26bc1bef1d
3 changed files with 1373 additions and 1336 deletions
2
boot.php
2
boot.php
|
@ -16,7 +16,7 @@ use Zotlabs\Daemon\Master;
|
|||
* @brief This file defines some global constants and includes the central App class.
|
||||
*/
|
||||
|
||||
define ( 'STD_VERSION', '20.05.06' );
|
||||
define ( 'STD_VERSION', '20.05.12' );
|
||||
define ( 'ZOT_REVISION', '6.0' );
|
||||
|
||||
define ( 'DB_UPDATE_VERSION', 1239 );
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
* @brief Channel related functions.
|
||||
*/
|
||||
|
||||
use App;
|
||||
|
||||
use Zotlabs\Lib\Libzot;
|
||||
use Zotlabs\Lib\Libsync;
|
||||
use Zotlabs\Lib\AccessList;
|
||||
|
@ -1835,15 +1835,19 @@ function get_zcard_embed($channel, $observer_hash = '', $args = array()) {
|
|||
* - array with channel entry
|
||||
* - false if no channel with $nick was found
|
||||
*/
|
||||
|
||||
function channelx_by_nick($nick) {
|
||||
|
||||
// If we are provided a Unicode nickname convert to IDN
|
||||
|
||||
$nick = punify($nick);
|
||||
|
||||
// return a cached copy if there is a cached copy and it's a match
|
||||
// return a cached copy if there is a cached copy and it's a match.
|
||||
// Also check that there is an xchan_hash to validate the App::$channel data is complete
|
||||
// and that columns from both joined tables are present
|
||||
|
||||
if (App::$channel && is_array(App::$channel) && array_key_exists('channel_address',App::$channel) && App::$channel['channel_address'] === $nick) {
|
||||
if (App::$channel && is_array(App::$channel) && array_key_exists('channel_address',App::$channel)
|
||||
&& array_key_exists('xchan_hash',App::$channel) && App::$channel['channel_address'] === $nick) {
|
||||
return App::$channel;
|
||||
}
|
||||
|
||||
|
@ -1851,7 +1855,7 @@ function channelx_by_nick($nick) {
|
|||
dbesc($nick)
|
||||
);
|
||||
|
||||
return(($r) ? $r[0] : false);
|
||||
return(($r) ? array_shift($r) : false);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -1860,18 +1864,19 @@ function channelx_by_nick($nick) {
|
|||
* @param string $hash
|
||||
* @return array|boolean false if channel ID not found, otherwise the channel array
|
||||
*/
|
||||
|
||||
function channelx_by_hash($hash) {
|
||||
|
||||
if (App::$channel && is_array(App::$channel) && array_key_exists('channel_hash',App::$channel) && App::$channel['channel_hash'] === $hash) {
|
||||
if (App::$channel && is_array(App::$channel) && array_key_exists('channel_hash',App::$channel)
|
||||
&& array_key_exists('xchan_hash',App::$channel) && App::$channel['channel_hash'] === $hash) {
|
||||
return App::$channel;
|
||||
}
|
||||
|
||||
|
||||
$r = q("SELECT * FROM channel left join xchan on channel_hash = xchan_hash WHERE channel_hash = '%s' and channel_removed = 0 LIMIT 1",
|
||||
dbesc($hash)
|
||||
);
|
||||
|
||||
return(($r) ? $r[0] : false);
|
||||
return(($r) ? array_shift($r) : false);
|
||||
}
|
||||
|
||||
|
||||
|
@ -1881,18 +1886,19 @@ function channelx_by_hash($hash) {
|
|||
* @param int $id A channel ID
|
||||
* @return array|boolean false if channel ID not found, otherwise the channel array
|
||||
*/
|
||||
|
||||
function channelx_by_n($id) {
|
||||
|
||||
if (App::$channel && is_array(App::$channel) && array_key_exists('channel_id',App::$channel) && intval(App::$channel['channel_id']) === intval($id)) {
|
||||
if (App::$channel && is_array(App::$channel) && array_key_exists('channel_id',App::$channel)
|
||||
&& array_key_exists('xchan_hash',App::$channel) && intval(App::$channel['channel_id']) === intval($id)) {
|
||||
return App::$channel;
|
||||
}
|
||||
|
||||
|
||||
$r = q("SELECT * FROM channel LEFT JOIN xchan ON channel_hash = xchan_hash WHERE channel_id = %d AND channel_removed = 0 LIMIT 1",
|
||||
dbesc($id)
|
||||
);
|
||||
|
||||
return(($r) ? $r[0] : false);
|
||||
return(($r) ? array_shift($r) : false);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -1901,6 +1907,7 @@ function channelx_by_n($id) {
|
|||
* @param array $channel
|
||||
* @return string
|
||||
*/
|
||||
|
||||
function channel_reddress($channel) {
|
||||
if(! ($channel && array_key_exists('channel_address', $channel)))
|
||||
return '';
|
||||
|
@ -1918,12 +1925,10 @@ function channel_reddress($channel) {
|
|||
* @param int $channel_id
|
||||
* @return int
|
||||
*/
|
||||
|
||||
function channel_manual_conv_update($channel_id) {
|
||||
|
||||
$x = get_pconfig($channel_id, 'system', 'manual_conversation_update');
|
||||
if($x === false)
|
||||
$x = get_config('system', 'manual_conversation_update', 1);
|
||||
|
||||
$x = get_pconfig($channel_id, 'system', 'manual_conversation_update', get_config('system', 'manual_conversation_update', 1));
|
||||
return intval($x);
|
||||
}
|
||||
|
||||
|
@ -2047,6 +2052,7 @@ function profile_store_lowlevel($arr) {
|
|||
* @param boolean $unset_session (optional) default true
|
||||
* @return boolean|array
|
||||
*/
|
||||
|
||||
function account_remove($account_id, $local = true, $unset_session = true) {
|
||||
|
||||
logger('account_remove: ' . $account_id);
|
||||
|
@ -2110,6 +2116,7 @@ function account_remove($account_id, $local = true, $unset_session = true) {
|
|||
* @param boolean $local default true
|
||||
* @param boolean $unset_session default false
|
||||
*/
|
||||
|
||||
function channel_remove($channel_id, $local = true, $unset_session = false) {
|
||||
|
||||
if (! $channel_id) {
|
||||
|
@ -2368,10 +2375,12 @@ function anon_identity_init($reqvars) {
|
|||
return $x[0];
|
||||
}
|
||||
|
||||
|
||||
function channel_url($channel) {
|
||||
if(! is_array($channel))
|
||||
|
||||
// data validation - if this is wrong, log the call stack so we can find the issue
|
||||
if (! is_array($channel)) {
|
||||
btlogger('not a channel array');
|
||||
}
|
||||
|
||||
return (($channel) ? z_root() . '/channel/' . $channel['channel_address'] : z_root());
|
||||
}
|
||||
|
|
2664
util/messages.po
2664
util/messages.po
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue