redirect to profile photo upload on very first login

2 files changed, 16 insertions, 2 deletions

diff --git a/mod/openid.php b/mod/openid.php
index 68d7c3fd2..c3c6c11e9 100644
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -70,9 +70,18 @@ function openid_content(&$a) {
 			$_SESSION['page_flags'] = $r[0]['page-flags'];
 			$_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $r[0]['nickname'];
 
-			notice( sprintf( t("Welcome back "), $r[0]['username']) . EOL);
 			$a->user = $r[0];
 
+			if($a->user['login_date'] === '0000-00-00 00:00:00') {
+				$_SESSION['return_url'] = 'profile_photo/new';
+				$a->module = 'profile_photo';
+				notice( t("Welcome ") . $a->user['username'] . EOL);
+				notice( t('Please upload a profile photo.') . EOL);
+			}
+			else
+				notice( t("Welcome back ") . $a->user['username'] . EOL);
+
+
 			if(strlen($a->user['timezone'])) {
 				date_default_timezone_set($a->user['timezone']);
 				$a->timezone = $a->user['timezone'];
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index fe4da3baf..e9008ab29 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -134,6 +134,11 @@ function profile_photo_content(&$a) {
 		return;
 	}
 	
+	$newuser = false;
+
+	if($a->argc == 2 && $a->argv[1] === 'new')
+		$newuser = true;
+
 	if( $a->argv[1]=='use'){
 		if ($a->argc<3){
 			notice( t('Permission denied.') . EOL );
@@ -188,7 +193,7 @@ function profile_photo_content(&$a) {
 			'$lbl_upfile' => t('Upload File:'),
 			'$title' => t('Upload Profile Photo'),
 			'$submit' => t('Upload'),
-			'$select' => sprintf('%s %s', t('or'), '<a href="'. $a->get_baseurl() . '/photos/' . $a->user['nickname'] . '">' . t('select a photo from your photo albums') . '</a>')
+			'$select' => sprintf('%s %s', t('or'), ($newuser) ? '<a href="' . $a->get_baseurl() . '">' . t('skip this step') . '</a>' : '<a href="'. $a->get_baseurl() . '/photos/' . $a->user['nickname'] . '">' . t('select a photo from your photo albums') . '</a>')
 		));
 
 		return $o;