harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #691 from dawnbreak/master

Browse Source 
Changed two strange looking places in boot.php.
This commit is contained in:
RedMatrix 2014-11-14 12:22:25 +11:00
commit 71237860c9
2 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
boot.php
View File

@ -637,7 +637,7 @@ class App {
private $perms = null; // observer permissions private $perms = null; // observer permissions
private $widgets = array(); // widgets for this page 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 $groups;
public $language; public $language;
@ -714,13 +714,6 @@ class App {
private $hostname; private $hostname;
private $baseurl; private $baseurl;
private $path; private $path;
private $db;
private $curl_code;
private $curl_headers;
private $cached_profile_image;
private $cached_profile_picdate;
function __construct() { function __construct() {
@ -849,12 +842,14 @@ class App {
&& array_key_exists('baseurl',$this->config['system']) && array_key_exists('baseurl',$this->config['system'])
&& strlen($this->config['system']['baseurl'])) { && strlen($this->config['system']['baseurl'])) {
$url = $this->config['system']['baseurl']; $url = $this->config['system']['baseurl'];
return $url; return $url;
} }
$scheme = $this->scheme; $scheme = $this->scheme;
$this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' ); $this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
return $this->baseurl; return $this->baseurl;
} }
@ -881,7 +876,6 @@ class App {
if(x($parsed,'path')) if(x($parsed,'path'))
$this->path = trim($parsed['path'],'\\/'); $this->path = trim($parsed['path'],'\\/');
} }
} }
function get_hostname() { function get_hostname() {
@ -955,9 +949,10 @@ class App {
function get_widgets($location = '') { function get_widgets($location = '') {
if($location && count($this->widgets)) { if($location && count($this->widgets)) {
$ret = array(); $ret = array();
foreach($widgets as $w) foreach($this->widgets as $w) {
if($w['location'] == $location) if ($w['location'] == $location)
$ret[] = $w; $ret[] = $w;
}
$arr = array('location' => $location, 'widgets' => $ret); $arr = array('location' => $location, 'widgets' => $ret);
call_hooks('get_widgets', $arr); call_hooks('get_widgets', $arr);
return $arr['widgets']; return $arr['widgets'];
@ -1009,7 +1004,6 @@ class App {
// always put main.js at the end // always put main.js at the end
$this->page['htmlhead'] .= head_get_main_js(); $this->page['htmlhead'] .= head_get_main_js();
} }
/** /**
@ -1019,11 +1013,11 @@ class App {
* @param string $name * @param string $name
*/ */
function register_template_engine($class, $name = '') { function register_template_engine($class, $name = '') {
if ($name===""){ if ($name === ""){
$v = get_class_vars( $class ); $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"; echo "template engine <tt>$class</tt> cannot be registered without a name.\n";
killme(); killme();
} }
@ -1034,11 +1028,11 @@ class App {
* return template engine instance. If $name is not defined, * return template engine instance. If $name is not defined,
* return engine defined by theme, or default * return engine defined by theme, or default
* *
* @param strin $name Template engine name * @param string $name Template engine name
* @return object Template Engine instance * @return object Template Engine instance
*/ */
function template_engine($name = ''){ function template_engine($name = ''){
if ($name!=="") { if ($name !== "") {
$template_engine = $name; $template_engine = $name;
} else { } else {
$template_engine = 'smarty3'; $template_engine = 'smarty3';
@ -1888,6 +1882,17 @@ function curPageURL() {
return $pageURL; 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) { function get_custom_nav(&$a, $navname) {
if(! $navname) if(! $navname)
return $a->page['nav']; return $a->page['nav'];
@ -1942,7 +1947,7 @@ function construct_page(&$a) {
if($comanche) { if($comanche) {
if($a->layout['nav']) { if($a->layout['nav']) {
$a->page['nav'] = get_custom_nav($a->layout['nav']); $a->page['nav'] = get_custom_nav($a, $a->layout['nav']);
} }
} }

19
mod/xchan.php
View File

@ -3,16 +3,15 @@
function xchan_content(&$a) { function xchan_content(&$a) {
$o = '<h3>' . t('Xchan Lookup') . '</h3>';
$o .= '<h3>Xchan Lookup</h3>';
$o .= '<form action="xchan" method="get">'; $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 .= t('Lookup xchan beginning with (or webbie): ');
$o .= '<input type="submit" name="submit" value="Submit" /></form>'; $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>';
$o .= '<br /><br />'; if(x($_GET, 'addr')) {
if(x($_GET,'addr')) {
$addr = trim($_GET['addr']); $addr = trim($_GET['addr']);
$r = q("select * from xchan where xchan_hash like '%s%%' or xchan_addr = '%s' group by xchan_hash", $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) { if($r) {
foreach($r as $rr) { 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'", $s = q("select * from hubloc where hubloc_hash like '%s'",
dbesc($r[0]['xchan_hash']) dbesc($r[0]['xchan_hash'])
); );
if($s) { if($s) {
foreach($s as $rr) foreach($s as $rrr)
$o .= str_replace(array("\n"," "),array("<br/>","&nbsp;"),print_r($rr,true)) . EOL; $o .= str_replace(array("\n", " "), array("<br>", "&nbsp;"), print_r($rrr, true)) . EOL;
} }
} }
} }