Merge branch 'fabrixxm-master'

mod/photos.php

@@ -915,6 +915,7 @@ function photos_content(&$a) {
 		if($can_post && ($ph[0]['uid'] == $owner_uid)) {
 			$o .= '<div id="photo-edit-link-wrap" ><a id="photo-edit-link" href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $datum . '/edit' . '">' . t('Edit photo') . '</a>';
 			
+			$o .= ' - <a id="photo-toprofile-link" href="' . $a->get_baseurl() . '/profile_photo/use/'.$ph[0]['resource-id'].'">'.t('Use as profile photo').'</a>';
 			// lock
 			$o .= ( ( ($ph[0]['uid'] == local_user()) && (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid']) 
 					|| strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])) ) 

mod/profile_photo.php

@@ -123,7 +123,95 @@ function profile_photo_post(&$a) {
 	}
 
 	@unlink($src);
+	return profile_photo_crop_ui_head($a, $ph);
 	
+}
+
+
+if(! function_exists('profile_photo_content')) {
+function profile_photo_content(&$a) {
+
+	if(! local_user()) {
+		notice( t('Permission denied.') . EOL );
+		return;
+	}
+	
+	if( $a->argv[1]=='use'){
+		if ($a->argc<3){
+			notice( t('Permission denied.') . EOL );
+			return;
+		};
+			
+		$resource_id = $a->argv[2];
+		//die(":".local_user());
+		$r=q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' ORDER BY `scale` ASC",
+			intval(local_user()),
+			dbesc($resource_id)
+			);
+		if (!count($r)){
+			notice( t('Permission denied.') . EOL );
+			return;
+		}
+		// set an already uloaded photo as profile photo
+		// if photo is in 'Profile Photos', change it in db
+		if ($r[0]['album']== t('Profile Photos')){
+			$r=q("UPDATE `photo` SET `profile`=0 WHERE `profile`=1 AND `uid`=%d",
+				intval(local_user()));
+			
+			$r=q("UPDATE `photo` SET `profile`=1 WHERE `uid` = %d AND `resource-id` = '%s'",
+				intval(local_user()),
+				dbesc($resource_id)
+				);
+			
+			$r = q("UPDATE `contact` SET `avatar-date` = '%s' WHERE `self` = 1 AND `uid` = %d LIMIT 1",
+				dbesc(datetime_convert()),
+				intval(local_user())
+			);
+			
+			// Update global directory in background
+			$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
+			$url = $_SESSION['my_url'];
+			if($url && strlen(get_config('system','directory_submit_url')))
+				//proc_close(proc_open("\"$php_path\" \"include/directory.php\" \"$url\" &",array(),$foo));
+				proc_run($php_path,"include/directory.php","$url");
+			
+			goaway($a->get_baseurl() . '/profiles');
+			return; // NOTREACHED
+		}
+		$ph = new Photo($r[0]['data']);
+		profile_photo_crop_ui_head($a, $ph);
+		// go ahead as we have jus uploaded a new photo to crop
+	}
+
+	if(! x($a->config,'imagecrop')) {
+	
+		$tpl = load_view_file('view/profile_photo.tpl');
+
+		$o .= replace_macros($tpl,array(
+			'$user' => $a->user['nickname']
+		));
+
+		return $o;
+	}
+	else {
+		$filename = $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'] . '.jpg';
+		$resolution = $a->config['imagecrop_resolution'];
+		$tpl = load_view_file("view/cropbody.tpl");
+		$o .= replace_macros($tpl,array(
+			'$filename' => $filename,
+			'$resource' => $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'],
+			'$image_url' => $a->get_baseurl() . '/photo/' . $filename
+			));
+
+		return $o;
+	}
+
+	return; // NOTREACHED
+}}
+
+
+if(! function_exists('_crop_ui_head')) {
+function profile_photo_crop_ui_head(&$a, $ph){
 	$width = $ph->getWidth();
 	$height = $ph->getHeight();
 
@@ -159,39 +247,5 @@ function profile_photo_post(&$a) {
 	$a->config['imagecrop_resolution'] = $smallest;
 	$a->page['htmlhead'] .= load_view_file("view/crophead.tpl");
 	return;
-}
-
-
-if(! function_exists('profile_photo_content')) {
-function profile_photo_content(&$a) {
-
-	if(! local_user()) {
-		notice( t('Permission denied.') . EOL );
-		return;
-	}
-
-	if(! x($a->config,'imagecrop')) {
-	
-		$tpl = load_view_file('view/profile_photo.tpl');
-
-		$o .= replace_macros($tpl,array(
-
-		));
-
-		return $o;
-	}
-	else {
-		$filename = $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'] . '.jpg';
-		$resolution = $a->config['imagecrop_resolution'];
-		$tpl = load_view_file("view/cropbody.tpl");
-		$o .= replace_macros($tpl,array(
-			'$filename' => $filename,
-			'$resource' => $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'],
-			'$image_url' => $a->get_baseurl() . '/photo/' . $filename
-			));
-
-		return $o;
-	}
-
-	return; // NOTREACHED
 }}
+

view/de/profile_photo.tpl

@@ -12,3 +12,7 @@
 </div>
 
 </form>
+
+<div id="profile-photo-link-select-wrapper">
+or <a href='photos/$user'>select a photo from albums</a>
+</div>

view/en/profile_photo.tpl

@@ -12,3 +12,7 @@
 </div>
 
 </form>
+
+<div id="profile-photo-link-select-wrapper">
+or <a href='photos/$user'>select a photo from albums</a>
+</div>

view/fr/profile_photo.tpl

@@ -12,3 +12,7 @@
 </div>
 
 </form>
+
+<div id="profile-photo-link-select-wrapper">
+or <a href='photos/$user'>select a photo from albums</a>
+</div>

view/theme/default/style.css

@@ -734,6 +734,10 @@ input#dfrn-url {
 	margin-bottom: 20px;
 }
 
+#profile-photo-link-select-wrapper {
+	margin-top: 2em;
+}
+
 #profile-edit-profile-name-label,
 #profile-edit-name-label,
 #profile-edit-pdesc-label,

view/theme/duepuntozero/style.css

@@ -602,6 +602,10 @@ input#dfrn-url {
 	margin-bottom: 20px;
 }
 
+#profile-photo-link-select-wrapper {
+	margin-top: 2em;
+}
+
 #profile-edit-profile-name-label,
 #profile-edit-name-label,
 #profile-edit-pdesc-label,
@@ -1853,8 +1857,6 @@ a.mail-list-link {
 	margin-bottom: 25px;
 }
 
-
-
 /* end from defautlt */