From 8eac2653c54e80f8280727650d96297b1da498ce Mon Sep 17 00:00:00 2001 From: Harshvardhan Malpani <2611741+harshvardhanmalpani@users.noreply.github.com> Date: Fri, 31 May 2019 19:16:29 +0530 Subject: [PATCH 1/7] removes Query string from img url to get file name --- app/lib/classes/class.upload.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/app/lib/classes/class.upload.php b/app/lib/classes/class.upload.php index 07c53fc..9438a7d 100644 --- a/app/lib/classes/class.upload.php +++ b/app/lib/classes/class.upload.php @@ -92,7 +92,7 @@ class Upload { } // Save the source name - $this->source_name = G\get_filename_without_extension($this->type == "url" ? $this->source : $this->source["name"]); + $this->source_name = G\get_filename_without_extension($this->type == "url" ? $this->getNameFromURL($this->source) : $this->source["name"]); // Set file extension $this->extension = $this->source_image_fileinfo["extension"]; @@ -183,7 +183,17 @@ class Upload { $formats = Settings::get('upload_available_image_formats'); return explode(',', $formats); } - + + //remove query string from url to get correct image name + public function getNameFromURL() + { + $source_url=$this->source; + if(strpos($source_url,"?")) + return substr($source_url,0,strpos($source_url,"?")); + else + return $source_url; + } + // Failover since v3.8.12 public static function getEnabledImageFormats() { return Image::getEnabledImageFormats(); From 8a5957b62e016536e35af4fcab2663966a5ae202 Mon Sep 17 00:00:00 2001 From: Harshvardhan Malpani <2611741+harshvardhanmalpani@users.noreply.github.com> Date: Mon, 3 Jun 2019 09:31:47 +0530 Subject: [PATCH 2/7] PHP notice fixed when $join undefined --- lib/G/classes/class.db.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/G/classes/class.db.php b/lib/G/classes/class.db.php index 93e97dc..14b31b5 100644 --- a/lib/G/classes/class.db.php +++ b/lib/G/classes/class.db.php @@ -318,7 +318,7 @@ class DB { $query = 'SELECT * FROM '.$table; - if($join) { + if(isset($join) && $join) { $query .= ' ' . $join . ' '; } @@ -544,4 +544,4 @@ class DB { } // DB class own Exception -class DBException extends Exception {} \ No newline at end of file +class DBException extends Exception {} From 4d8064af284314c94f3ce6c8554d4068bab9283b Mon Sep 17 00:00:00 2001 From: Harshvardhan Malpani <2611741+harshvardhanmalpani@users.noreply.github.com> Date: Mon, 3 Jun 2019 10:56:29 +0530 Subject: [PATCH 3/7] + getLatestImage - returns latest image of a user --- app/lib/functions.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/lib/functions.php b/app/lib/functions.php index 180e137..a981d06 100644 --- a/app/lib/functions.php +++ b/app/lib/functions.php @@ -463,6 +463,17 @@ function get_users_image_url($filename) { return get_content_url('images/users/'.$filename); } +function getLatestImage($user) +{ + + $db = DB::getInstance(); + $db->query('select image_name,image_extension,image_date FROM '.DB::getTable('images').' where `image_user_id`='.$user.' order by image_date desc limit 1'); + $user_images = $db->fetchAll(); + $st=strtotime($user_images[0]['image_date']); + $dloc='/'.getSetting('upload_image_path').date("/Y/m/d/",$st); + return array($user_images[0]['image_name'],$dloc.$user_images[0]['image_name'].'.'.$user_images[0]['image_extension']); +} + /** * Some G\ overrides */ From ae58d2ca46a7a571cb7581cbbe202040bdd2d069 Mon Sep 17 00:00:00 2001 From: Harshvardhan Malpani <2611741+harshvardhanmalpani@users.noreply.github.com> Date: Mon, 3 Jun 2019 10:59:07 +0530 Subject: [PATCH 4/7] instead of blank avatar, latest image is returned --- app/lib/classes/class.user.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/lib/classes/class.user.php b/app/lib/classes/class.user.php index cf0b5bc..c8cc2a9 100644 --- a/app/lib/classes/class.user.php +++ b/app/lib/classes/class.user.php @@ -555,6 +555,13 @@ class User { ); } } + else + { + $user['avatar'] = array( + 'filename' => getLatestImage($user['id'])[0], + 'url' => getLatestImage($user['id'])[1] + ); + } unset($user['avatar_filename']); if($user['background_filename']) { From 3d18d745675273c391a62486be227715fc801cb4 Mon Sep 17 00:00:00 2001 From: Rodolfo Berrios Date: Mon, 30 Sep 2019 14:26:24 -0300 Subject: [PATCH 5/7] Update class.upload.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ✨ --- app/lib/classes/class.upload.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/lib/classes/class.upload.php b/app/lib/classes/class.upload.php index 9438a7d..1ab1046 100644 --- a/app/lib/classes/class.upload.php +++ b/app/lib/classes/class.upload.php @@ -185,13 +185,13 @@ class Upload { } //remove query string from url to get correct image name - public function getNameFromURL() + protected function getNameFromURL() { - $source_url=$this->source; - if(strpos($source_url,"?")) - return substr($source_url,0,strpos($source_url,"?")); - else - return $source_url; + if(strpos($this->source, '?')) { + return substr($this->source, 0, strpos($this->source, '?')); + } else { + return $this->source; + } } // Failover since v3.8.12 From 395ede243c4811300524150562fcbe7f80661069 Mon Sep 17 00:00:00 2001 From: Rodolfo Berrios Date: Mon, 30 Sep 2019 14:51:02 -0300 Subject: [PATCH 6/7] Update class.user.php A change like this requires feedback from the community. --- app/lib/classes/class.user.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/app/lib/classes/class.user.php b/app/lib/classes/class.user.php index c8cc2a9..cf0b5bc 100644 --- a/app/lib/classes/class.user.php +++ b/app/lib/classes/class.user.php @@ -555,13 +555,6 @@ class User { ); } } - else - { - $user['avatar'] = array( - 'filename' => getLatestImage($user['id'])[0], - 'url' => getLatestImage($user['id'])[1] - ); - } unset($user['avatar_filename']); if($user['background_filename']) { From a43ab0b008ea66e4db7d31ad277c53c4dfad36f0 Mon Sep 17 00:00:00 2001 From: Rodolfo Berrios Date: Mon, 30 Sep 2019 14:52:04 -0300 Subject: [PATCH 7/7] Update functions.php See previous comment. --- app/lib/functions.php | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/app/lib/functions.php b/app/lib/functions.php index a981d06..180e137 100644 --- a/app/lib/functions.php +++ b/app/lib/functions.php @@ -463,17 +463,6 @@ function get_users_image_url($filename) { return get_content_url('images/users/'.$filename); } -function getLatestImage($user) -{ - - $db = DB::getInstance(); - $db->query('select image_name,image_extension,image_date FROM '.DB::getTable('images').' where `image_user_id`='.$user.' order by image_date desc limit 1'); - $user_images = $db->fetchAll(); - $st=strtotime($user_images[0]['image_date']); - $dloc='/'.getSetting('upload_image_path').date("/Y/m/d/",$st); - return array($user_images[0]['image_name'],$dloc.$user_images[0]['image_name'].'.'.$user_images[0]['image_extension']); -} - /** * Some G\ overrides */