set_baseurl issue, more cleanup

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 803fd00f8..1d0a2950e 100644
--- a/images/red.png
+++ b/images/red.png
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>