aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-01-03 15:52:05 -0800
committerfriendica <info@friendica.com>2013-01-03 15:52:05 -0800
commitf8bd476b882e95b8bdb589ae74645d030ef198fd (patch)
tree421266d618694160c7d8b088e1e78d74807cea70
parent7df33bb96366714116f8986f4a0a7d22f26729bf (diff)
downloadvolse-hubzilla-f8bd476b882e95b8bdb589ae74645d030ef198fd.tar.gz
volse-hubzilla-f8bd476b882e95b8bdb589ae74645d030ef198fd.tar.bz2
volse-hubzilla-f8bd476b882e95b8bdb589ae74645d030ef198fd.zip
import the toggle_mobile stuff to shut up some warnings
-rw-r--r--boot.php16
-rw-r--r--index.php4
-rw-r--r--mod/profile.php2
-rw-r--r--mod/toggle_mobile.php17
-rw-r--r--version.inc2
-rw-r--r--view/tpl/toggle_mobile_footer.tpl2
6 files changed, 39 insertions, 4 deletions
diff --git a/boot.php b/boot.php
index d86b48436..fc93879e7 100644
--- a/boot.php
+++ b/boot.php
@@ -1924,3 +1924,19 @@ function dba_timer() {
return microtime(true);
}
+/**
+* Returns the complete URL of the current page, e.g.: http(s)://something.com/network
+*
+* Taken from http://webcheatsheet.com/php/get_current_page_url.php
+*/
+function curPageURL() {
+ $pageURL = 'http';
+ if ($_SERVER["HTTPS"] == "on") {$pageURL .= "s";}
+ $pageURL .= "://";
+ if ($_SERVER["SERVER_PORT"] != "80" && $_SERVER["SERVER_PORT"] != "443") {
+ $pageURL .= $_SERVER["SERVER_NAME"].":".$_SERVER["SERVER_PORT"].$_SERVER["REQUEST_URI"];
+ } else {
+ $pageURL .= $_SERVER["SERVER_NAME"].$_SERVER["REQUEST_URI"];
+ }
+ return $pageURL;
+}
diff --git a/index.php b/index.php
index a4e8899d9..f718850a8 100644
--- a/index.php
+++ b/index.php
@@ -389,10 +389,10 @@ if(count($arr)) {
if($a->is_mobile || $a->is_tablet) {
if(isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {
- $link = $a->get_baseurl() . '/toggle_mobile?address=' . curPageURL();
+ $link = $a->get_baseurl() . '/toggle_mobile?f=&address=' . curPageURL();
}
else {
- $link = $a->get_baseurl() . '/toggle_mobile?off=1&address=' . curPageURL();
+ $link = $a->get_baseurl() . '/toggle_mobile?f=&off=1&address=' . curPageURL();
}
$a->page['footer'] .= replace_macros(get_markup_template("toggle_mobile_footer.tpl"), array(
'$toggle_link' => $link,
diff --git a/mod/profile.php b/mod/profile.php
index 1865d69fc..549536931 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -29,7 +29,7 @@ function profile_aside(&$a) {
}
- $x = q("select uid as profile_uid from channel where address = '%s' limit 1",
+ $x = q("select channel_id as profile_uid from channel where channel_address = '%s' limit 1",
dbesc(argv(1))
);
if($x) {
diff --git a/mod/toggle_mobile.php b/mod/toggle_mobile.php
new file mode 100644
index 000000000..00991e44c
--- /dev/null
+++ b/mod/toggle_mobile.php
@@ -0,0 +1,17 @@
+<?php
+
+function toggle_mobile_init(&$a) {
+
+ if(isset($_GET['off']))
+ $_SESSION['show-mobile'] = false;
+ else
+ $_SESSION['show-mobile'] = true;
+
+ if(isset($_GET['address']))
+ $address = $_GET['address'];
+ else
+ $address = $a->get_baseurl();
+
+ goaway($address);
+}
+
diff --git a/version.inc b/version.inc
index f3645eb72..46bcb3bea 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2013-01-02.188
+2013-01-03.189
diff --git a/view/tpl/toggle_mobile_footer.tpl b/view/tpl/toggle_mobile_footer.tpl
new file mode 100644
index 000000000..58695f4df
--- /dev/null
+++ b/view/tpl/toggle_mobile_footer.tpl
@@ -0,0 +1,2 @@
+<a id="toggle_mobile_link" href="$toggle_link">$toggle_text</a>
+