aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-01 23:47:14 -0800
committerfriendica <info@friendica.com>2015-01-01 23:47:14 -0800
commitc7aa8bf1b4c2a7ca4d7bf1552aabcb0c0a54756e (patch)
tree586701bd0e5f61ddd2118f5753d37ab7ae3a60d1
parent68c612c597471404201099ecbc8b4082d152e18a (diff)
downloadvolse-hubzilla-c7aa8bf1b4c2a7ca4d7bf1552aabcb0c0a54756e.tar.gz
volse-hubzilla-c7aa8bf1b4c2a7ca4d7bf1552aabcb0c0a54756e.tar.bz2
volse-hubzilla-c7aa8bf1b4c2a7ca4d7bf1552aabcb0c0a54756e.zip
syntax issues (with some php versions?), unchecked intval
-rwxr-xr-xboot.php16
-rw-r--r--mod/profiles.php22
2 files changed, 31 insertions, 7 deletions
diff --git a/boot.php b/boot.php
index 4e266f4f1..f57a6701c 100755
--- a/boot.php
+++ b/boot.php
@@ -2183,3 +2183,19 @@ function get_poller_runtime() {
$t = get_config('system','lastpoll');
return relative_date($t);
}
+
+function z_get_upload_dir() {
+ $upload_dir = get_config('system','uploaddir');
+ if(! $upload_dir)
+ $upload_dir = ini_get('upload_tmp_dir');
+ if(! $upload_dir)
+ $upload_dir = sys_get_temp_dir();
+ return $upload_dir;
+}
+
+function z_get_temp_dir() {
+ $temp_dir = get_config('system','tempdir');
+ if(! $temp_dir)
+ $temp_dir = sys_get_temp_dir();
+ return $upload_dir;
+} \ No newline at end of file
diff --git a/mod/profiles.php b/mod/profiles.php
index 6bdc7f11a..fa6a6e35c 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -11,7 +11,7 @@ function profiles_init(&$a) {
if((argc() > 2) && (argv(1) === "drop") && intval(argv(2))) {
$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d AND `is_default` = 0 LIMIT 1",
- intval($a->argv[2]),
+ intval(argv(2)),
intval(local_user())
);
if(! count($r)) {
@@ -159,9 +159,13 @@ function profiles_init(&$a) {
if(((argc() > 1) && (intval(argv(1)))) || !feature_enabled(local_user(),'multi_profiles')) {
if(feature_enabled(local_user(),'multi_profiles'))
$id = $a->argv[1];
- else
- $id = q("select id from profile where uid = %d and is_default = 1",local_user())[0]['id'];
-
+ else {
+ $x = q("select id from profile where uid = %d and is_default = 1",
+ intval(local_user())
+ );
+ if($x)
+ $id = $x[0]['id'];
+ }
$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($id),
intval(local_user())
@@ -564,9 +568,13 @@ function profiles_content(&$a) {
if(((argc() > 1) && (intval(argv(1)))) || !feature_enabled(local_user(),'multi_profiles')) {
if(feature_enabled(local_user(),'multi_profiles'))
$id = $a->argv[1];
- else
- $id = q("select id from profile where uid = %d and is_default = 1",local_user())[0]['id'];
-
+ else {
+ $x = q("select id from profile where uid = %d and is_default = 1",
+ intval(local_user())
+ );
+ if($x)
+ $id = $x[0]['id'];
+ }
$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($id),
intval(local_user())