X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=634cf28c9284e6f4b423e785312ea119f45f87c3;hb=abb9fecf0954e883f19b3cf16279dfa2d8c20271;hp=6e3f8c0b50b512bc366be527fa4ae0103f34d337;hpb=8600afafe29051425e775d56166124f12020e191;p=friendica.git diff --git a/boot.php b/boot.php index 6e3f8c0b50..634cf28c92 100644 --- a/boot.php +++ b/boot.php @@ -9,9 +9,9 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1338' ); +define ( 'FRIENDICA_VERSION', '3.0.1353' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1143 ); +define ( 'DB_UPDATE_VERSION', 1144 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -123,6 +123,8 @@ define ( 'NETWORK_XMPP', 'xmpp'); // XMPP define ( 'NETWORK_MYSPACE', 'mysp'); // MySpace define ( 'NETWORK_GPLUS', 'goog'); // Google+ +define ( 'NETWORK_PHANTOM', 'unkn'); // Place holder + /** * These numbers are used in stored permissions * and existing allocations MUST NEVER BE CHANGED @@ -142,6 +144,8 @@ $netgroup_ids = array( NETWORK_XMPP => (-10), NETWORK_MYSPACE => (-11), NETWORK_GPLUS => (-12), + + NETWORK_PHANTOM => (-127), ); @@ -507,6 +511,7 @@ if(! class_exists('App')) { $tpl = file_get_contents('view/head.tpl'); $this->page['htmlhead'] = replace_macros($tpl,array( '$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!! + '$local_user' => local_user(), '$generator' => 'Friendica' . ' ' . FRIENDICA_VERSION, '$delitem' => t('Delete this item?'), '$comment' => t('Comment'), @@ -1319,6 +1324,25 @@ if(! function_exists('proc_run')) { $a = get_app(); $args = func_get_args(); + + $newargs = array(); + if(! count($args)) + return; + + // expand any arrays + + foreach($args as $arg) { + if(is_array($arg)) { + foreach($arg as $n) { + $newargs[] = $n; + } + } + else + $newargs[] = $arg; + } + + $args = $newargs; + $arr = array('args' => $args, 'run_cmd' => true); call_hooks("proc_run", $arr);