aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-11-13 17:23:50 -0800
committerfriendica <info@friendica.com>2014-11-13 17:23:50 -0800
commitd543652002669bc94c1307605ddc7de5a4e0b701 (patch)
tree5031fd92c5ee10f37ecf465a85523f663dba4eec
parentedda931197c9e4d2642c60ab5ec2f1a80ce0e910 (diff)
parent71237860c935fadcd82c914b3119447c73f8d883 (diff)
downloadvolse-hubzilla-d543652002669bc94c1307605ddc7de5a4e0b701.tar.gz
volse-hubzilla-d543652002669bc94c1307605ddc7de5a4e0b701.tar.bz2
volse-hubzilla-d543652002669bc94c1307605ddc7de5a4e0b701.zip
Merge https://github.com/friendica/red into pending_merge
-rwxr-xr-xboot.php43
-rw-r--r--mod/xchan.php19
2 files changed, 33 insertions, 29 deletions
diff --git a/boot.php b/boot.php
index e19a3d5ec..7758d1933 100755
--- a/boot.php
+++ b/boot.php
@@ -76,7 +76,7 @@ $DIRECTORY_FALLBACK_SERVERS = array(
'https://redmatrix.nl',
'https://whogotzot.com',
'https://red.zottel.red',
- 'https://red.pixelbits.de'
+ 'https://red.pixelbits.de'
);
@@ -637,7 +637,7 @@ class App {
private $perms = null; // observer permissions
private $widgets = array(); // widgets for this page
- private $widgetlist = null; // widget ordering and inclusion directives
+ //private $widgetlist = null; // widget ordering and inclusion directives
public $groups;
public $language;
@@ -714,13 +714,6 @@ class App {
private $hostname;
private $baseurl;
private $path;
- private $db;
-
- private $curl_code;
- private $curl_headers;
-
- private $cached_profile_image;
- private $cached_profile_picdate;
function __construct() {
@@ -849,12 +842,14 @@ class App {
&& array_key_exists('baseurl',$this->config['system'])
&& strlen($this->config['system']['baseurl'])) {
$url = $this->config['system']['baseurl'];
+
return $url;
}
$scheme = $this->scheme;
$this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
+
return $this->baseurl;
}
@@ -881,7 +876,6 @@ class App {
if(x($parsed,'path'))
$this->path = trim($parsed['path'],'\\/');
}
-
}
function get_hostname() {
@@ -955,9 +949,10 @@ class App {
function get_widgets($location = '') {
if($location && count($this->widgets)) {
$ret = array();
- foreach($widgets as $w)
- if($w['location'] == $location)
+ foreach($this->widgets as $w) {
+ if ($w['location'] == $location)
$ret[] = $w;
+ }
$arr = array('location' => $location, 'widgets' => $ret);
call_hooks('get_widgets', $arr);
return $arr['widgets'];
@@ -1009,7 +1004,6 @@ class App {
// always put main.js at the end
$this->page['htmlhead'] .= head_get_main_js();
-
}
/**
@@ -1019,11 +1013,11 @@ class App {
* @param string $name
*/
function register_template_engine($class, $name = '') {
- if ($name===""){
+ if ($name === ""){
$v = get_class_vars( $class );
- if(x($v,"name")) $name = $v['name'];
+ if(x($v, "name")) $name = $v['name'];
}
- if ($name===""){
+ if ($name === ""){
echo "template engine <tt>$class</tt> cannot be registered without a name.\n";
killme();
}
@@ -1034,11 +1028,11 @@ class App {
* return template engine instance. If $name is not defined,
* return engine defined by theme, or default
*
- * @param strin $name Template engine name
+ * @param string $name Template engine name
* @return object Template Engine instance
*/
function template_engine($name = ''){
- if ($name!=="") {
+ if ($name !== "") {
$template_engine = $name;
} else {
$template_engine = 'smarty3';
@@ -1888,6 +1882,17 @@ function curPageURL() {
return $pageURL;
}
+/**
+ * @brief Returns a custom navigation by name???
+ *
+ * If no $navname provided load default page['nav']
+ *
+ * @todo not fully implemented yet
+ *
+ * @param App $a global application object
+ * @param string $navname
+ * @return mixed
+ */
function get_custom_nav(&$a, $navname) {
if(! $navname)
return $a->page['nav'];
@@ -1942,7 +1947,7 @@ function construct_page(&$a) {
if($comanche) {
if($a->layout['nav']) {
- $a->page['nav'] = get_custom_nav($a->layout['nav']);
+ $a->page['nav'] = get_custom_nav($a, $a->layout['nav']);
}
}
diff --git a/mod/xchan.php b/mod/xchan.php
index 714603f6e..69fbdb77d 100644
--- a/mod/xchan.php
+++ b/mod/xchan.php
@@ -3,16 +3,15 @@
function xchan_content(&$a) {
-
- $o .= '<h3>Xchan Lookup</h3>';
+ $o = '<h3>' . t('Xchan Lookup') . '</h3>';
$o .= '<form action="xchan" method="get">';
- $o .= 'Lookup xchan beginning with (or webbie): <input type="text" style="width: 250px;" name="addr" value="' . $_GET['addr'] .'" />';
- $o .= '<input type="submit" name="submit" value="Submit" /></form>';
-
- $o .= '<br /><br />';
+ $o .= t('Lookup xchan beginning with (or webbie): ');
+ $o .= '<input type="text" style="width:250px;" name="addr" value="' . $_GET['addr'] .'">';
+ $o .= '<input type="submit" name="submit" value="' . t('Submit') .'"></form>';
+ $o .= '<br><br>';
- if(x($_GET,'addr')) {
+ if(x($_GET, 'addr')) {
$addr = trim($_GET['addr']);
$r = q("select * from xchan where xchan_hash like '%s%%' or xchan_addr = '%s' group by xchan_hash",
@@ -22,15 +21,15 @@ function xchan_content(&$a) {
if($r) {
foreach($r as $rr) {
- $o .= str_replace(array("\n"," "),array("<br/>","&nbsp;"),print_r($rr,true)) . EOL;
+ $o .= str_replace(array("\n", " "), array("<br>", "&nbsp;"), print_r($rr, true)) . EOL;
$s = q("select * from hubloc where hubloc_hash like '%s'",
dbesc($r[0]['xchan_hash'])
);
if($s) {
- foreach($s as $rr)
- $o .= str_replace(array("\n"," "),array("<br/>","&nbsp;"),print_r($rr,true)) . EOL;
+ foreach($s as $rrr)
+ $o .= str_replace(array("\n", " "), array("<br>", "&nbsp;"), print_r($rrr, true)) . EOL;
}
}
}