From 893ba371a90a8f304e4e1707d40cbcc3295a43b2 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 19 Dec 2012 16:48:17 -0800
Subject: [PATCH] set_baseurl issue, more cleanup

---
 boot.php                   |   4 ++--
 images/red.png             | Bin 4032 -> 4909 bytes
 include/zot.php            |   2 +-
 mod/ping.php               |  17 ++++-------------
 version.inc                |   2 +-
 view/tpl/profile_photo.tpl |  13 ++++++++-----
 6 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/boot.php b/boot.php
index 0736502b0..653a0ed59 100644
--- a/boot.php
+++ b/boot.php
@@ -638,7 +638,7 @@ if(! class_exists('App')) {
                         $scheme = 'http';
                 }
             }
-
+			
             $this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
             return $this->baseurl;
 		}
@@ -647,7 +647,7 @@ if(! class_exists('App')) {
 
 			if(is_array($this->config) && array_key_exists('system',$this->config) &&
 				array_key_exists('baseurl',$this->config['system']) && strlen($this->config['system']['baseurl'])) {
-				$url = $a->config['system']['baseurl'];
+				$url = $this->config['system']['baseurl'];
 			}
 
             $parsed = @parse_url($url);
diff --git a/images/red.png b/images/red.png
index 803fd00f861e46e4a37c4a05c7e9be2cded9bb13..1d0a2950e871f955a766e8d93cf36978a49b4231 100644
GIT binary patch
delta 2222
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

delta 1338
zcmV-A1;zTUCcq!Cm<oRp1Oy#~9;yxi00jt1L_t(o!|j$^Y?M_H$A5Fay|v3O2n94y
zp&(*>Fhm5wL_iecEm8^vf}{_kU^G!;ynrP{VnFc{pNz!Bh-qSC5DP*YA{2cvARs{^
zMs8lHfJy<o?zX$z?>lFF*rgWILif!?COKbn&Y5rKKesaj*XV!$PSVritPz!LIr$r(
zEu3F5C{{K@!r?L#3V}%9q^jb4ANBqA)A?M}!jC^mmjnP{>%I598BZpj_sYr<0qtVf
zKG>v%uPQ-D2kq(f@<*D#TGwX)8%Ex^G!cugH)UmL5TMQ$^s4sJuL2^7F^KVS`5bK>
z+3LkDr?y<q8tQ-P|LmF5^%{w4C|)iif~ppjch?{IXkZKaJP*R*OU)8f@SG}sI-~i(
zUj_6HKzraSv01{_BF3PqsB;LAbxNXU4pr6F#0K=IGnXf-O3Svb{Mpbz)CdX%>qT(Z
z5%`^wQAYPU1ZzE`Nx)N3BcO^{hd*&54}bb8Rh5+h?5TgRr>(7x2i|=bfWJ~HnrdtL
zd&ds&Od$-;5r~k2)Jp3HT&~OX1i%6TU<I60oKy6n2br*F5hI2V@8Uc7)>|A~{~msE
zKcIhq#@5tOv1k$2I-FAikuG^XQ7-@lix40LB4maPp>E6PoI7}scZ^|cT^+40E!?nj
zB{!{kjX!^mAE&9Vj(0@Z-`GfPLj#d9V~WZPa%?XJcV!O%fwhc({dMA=$DQ@{v;%I^
zB$}#cb9B`zzF)DN=J^Y#m^~XGn6P360Mpm6r_)+&QI0L;9e7zh?N>yX2bSeJNQA?P
z2z#5F*u7vOetUbNIsg$tVo~nd+{hg>W}vEw2<v}h<w$2I0q{4Z)~W4d4u}wl!HFR{
z_7;+n2tPOP;)5yE$e#F#j&vG};EFsJ!SBeDK5~Q)r%va@&Sn6HOqf6*1}g^J%PZPr
z83sU5Ec#@{K;Eye;nyvVm}oh}rcS{b4|n;CXbi2toTT;eVK&U1LI3IZG9;PAqFv!E
zF$sSS0fzS0^DNo?8BZKL#)#Uvl#d!k-US53`-{tWj(F8bqSK~Q`|SZ<Y~D%k`~?CG
z7E@Xh2Kw*%>*$Z<tfgwq7@lbOi1L03;-hcAgeOqQ4<1T+d7NiAZDic|+X47>@7_yz
zO7uX%ZGvInh6Vsm?%U5t^X4-7r56}JcMgB;kqDV^n8eKcxO@4FY<~PP4)6LBRQYb>
zCM?>mqDm~oiy^QQX4|soQDDdFHINv@kwb@g<keT0{NxfQFI~dCH`kH5aDmXk>-l2!
z8W3UQ(x*|0;CF?fgfd(#QH^&)rwYUGn#66-JjLB}YA6d8a(DUQVWhKJ-cFq*=7oPy
zVE5K->{<H;r@q<OH9lB`3@-Jdb`B_^3Jl&w00Jj>?<L)Oo^cZ=QdTt*fGN){<J9lJ
z6Y~mUF0}l{&KF+h+|lERm~QfvpqCKzcsie`O&}&hv9oo%%aP^QX)_r&dlvnM4kne(
z5X$B_)c84vzuZoYvVRAo;@1aK=(&H5<OlZ&!2LwNx(+iXj)>RW)P=(pTZ|!u^qfvu
zAcJZfZqs%;Yp)96QDPh*7&{8@NF34VCC)639FRvfgX$0Xm1l8ha#sN$Kn$ozA~SCx
zv^t3y=3Qxc?A1eHQQFX7ejr$pL%&uyUu-XWr4V>P1n37OfT6%3APK~a0K+mxKGV(E
w0Puk<kSX*ZT7f@{`z+8|<h@4M=)Xh%0K7&sDrcrJw*UYD07*qoM6N<$f*~@4-~a#s

diff --git a/include/zot.php b/include/zot.php
index 31f0e8771..049cf004b 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -284,7 +284,7 @@ function zot_refresh($them,$channel = null) {
 					intval($default_perms),
 					dbesc(datetime_convert()),
 					dbesc(datetime_convert()),
-					intval(($default_perms) ? 0 : ABOOK_FLAG_BLOCKED|ABOOK_FLAG_IGNORED|ABOOK_FLAG_PENDING)
+					intval(($default_perms) ? 0 : ABOOK_FLAG_PENDING)
 				);
 				if($y) {
 					logger("New introduction received for {$channel['channel_name']}");
diff --git a/mod/ping.php b/mod/ping.php
index f32384952..9b29eacf7 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -180,24 +180,15 @@ function ping_init(&$a) {
 
 	$t2 = dba_timer();
 
-	$intros1 = q("SELECT  `intro`.`id`, `intro`.`datetime`, 
-		`fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo` 
-		FROM `intro` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
-		WHERE `intro`.`uid` = %d  AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`fid`!=0",
+	$intr = q("select count(abook_id) as total from abook where (abook_flags & %d) and abook_channel = %d",
+		intval(ABOOK_FLAG_PENDING),
 		intval(local_user())
 	);
 
 	$t3 = dba_timer();
 
-	$intros2 = q("SELECT `intro`.`id`, `intro`.`datetime`, 
-		`contact`.`name`, `contact`.`url`, `contact`.`photo` 
-		FROM `intro` LEFT JOIN `contact` ON `intro`.`contact-id` = `contact`.`id`
-		WHERE `intro`.`uid` = %d  AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`contact-id`!=0",
-		intval(local_user())
-	);
-
-	$intros = count($intros1) + count($intros2);
-	$result['intros'] = intval($intros);
+	if($intr)
+		$result['intros'] = intval($intr[0]['total']);
 
 	$t4 = dba_timer();
 	$channel = get_app()->get_channel();
diff --git a/version.inc b/version.inc
index bdbdd882b..94a1bafa8 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2012-12-18.173
+2012-12-19.174
diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl
index 04ee8f916..282e890c8 100644
--- a/view/tpl/profile_photo.tpl
+++ b/view/tpl/profile_photo.tpl
@@ -4,20 +4,23 @@
 <input type='hidden' name='form_security_token' value='$form_security_token'>
 
 <div id="profile-photo-upload-wrapper">
-<label id="profile-photo-upload-label" for="profile-photo-upload">$lbl_upfile </label>
-<input name="userfile" type="file" id="profile-photo-upload" size="48" />
-</div>
 
-<label id="profile-photo-profiles-label" for="profile-photo-profiles">$lbl_profiles </label>
-<select name="profile" id="profile-photo-profiles" />
+<label id="profile-photo-upload-label" class="form-label" for="profile-photo-upload">$lbl_upfile</label>
+<input name="userfile" class="form-input" type="file" id="profile-photo-upload" size="48" />
+<div class="clear"></div>
+
+<label id="profile-photo-profiles-label" class="form-label" for="profile-photo-profiles">$lbl_profiles</label>
+<select name="profile" id="profile-photo-profiles" class="form-input" >
 {{ for $profiles as $p }}
 <option value="$p.id" {{ if $p.default }}selected="selected"{{ endif }}>$p.name</option>
 {{ endfor }}
 </select>
+<div class="clear"></div>
 
 <div id="profile-photo-submit-wrapper">
 <input type="submit" name="submit" id="profile-photo-submit" value="$submit">
 </div>
+</div>
 
 </form>