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

Fixed a variable conflict in mod/xchan.php.

Browse Source 
A variable $rr inside the foreachs was used twice.
Add translation to mod/xchan.php.
This commit is contained in:
Klaus Weidenbach 2014-11-14 00:45:25 +01:00
parent e4859d4bd7
commit e8b77fbdff
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -950,7 +950,7 @@ class App {
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'];

19
mod/xchan.php
View File

@ -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 .= 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>';
$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;
}
}
}