Fixed profile image

mgp25 · mgp25 · commit fea70662812c · 2014-12-14T00:41:44.000+01:00
diff --git a/src/func.php b/src/func.php
@@ -75,16 +75,30 @@ function wa_pbkdf2($algorithm, $password, $salt, $count, $key_length, $raw_outpu
 function preprocessProfilePicture($path)
 {
     list($width, $height) = getimagesize($path);
-    if ($width != $height) {
-        throw new Exception("Profile picture needs to be square (image is $width x $height)");
-    }
-    if ($width > 640) {
-        throw new Exception("Profile picture maximum size of 640 x 640 (image is $width x $height)");
+    if ($width > $height) {
+      $y = 0;
+      $x = ($width - $height) / 2;
+      $smallestSide = $height;
+    } else {
+      $x = 0;
+      $y = ($height - $width) / 2;
+      $smallestSide = $width;
     }
-    $img = imagecreatefromjpeg($path);
-    unlink($path);
-    imagejpeg($img, $path, 50);
+
+    $size = 639;
+    $image = imagecreatetruecolor($size, $size);
+    $img = imagecreatefromstring(file_get_contents($path));
+
+    imagecopyresampled($image, $img, 0, 0, $x, $y, $size, $size, $smallestSide, $smallestSide);
+    ob_start();
+    imagejpeg($image);
+    $i = ob_get_contents();
+    ob_end_clean();
+
+    imagedestroy($image);
     imagedestroy($img);
+
+    return $i;
 }
 
 function createIcon($file)
diff --git a/src/whatsprot.class.php b/src/whatsprot.class.php
@@ -46,8 +46,8 @@ class WhatsProt
     const WHATSAPP_SERVER = 's.whatsapp.net';               // The hostname used to login/send messages.
     const WHATSAPP_UPLOAD_HOST = 'https://mms.whatsapp.net/client/iphone/upload.php'; // The upload host.
     const WHATSAPP_DEVICE = 'Android';                      // The device name.
-    const WHATSAPP_VER = '2.11.471';                // The WhatsApp version.
-    const WHATSAPP_USER_AGENT = 'WhatsApp/2.11.471 Android/4.3 Device/GalaxyS3'; // User agent used in request/registration code.
+    const WHATSAPP_VER = '2.11.473';                // The WhatsApp version.
+    const WHATSAPP_USER_AGENT = 'WhatsApp/2.11.473 Android/4.3 Device/GalaxyS3'; // User agent used in request/registration code.
     const WHATSAPP_VER_CHECKER = 'https://coderus.openrepos.net/whitesoft/whatsapp_version'; // Check WhatsApp version
 
     /**
@@ -3775,35 +3775,22 @@ protected function sendRequestFileUpload($b64hash, $type, $size, $filepath, $to,
      */
     protected function sendSetPicture($jid, $filepath)
     {
-        if(stripos($filepath, 'http')!== false && !preg_match('/\s/',$filepath)){
-          $extension = end(explode(".", $filepath));
-          $newImageName = rand(0, 100000);
-          $imagePath = static::PICTURES_FOLDER."/".$newImageName.".jpg";
-            if($extension == 'jpg'){
-              copy($filepath, $imagePath);
-              $filepath = $imagePath;
-		        }
-        }
-        preprocessProfilePicture($filepath);
-        $fp = @fopen($filepath, "r");
-        if ($fp) {
-            $data = fread($fp, filesize($filepath));
-            if ($data) {
-                //this is where the fun starts
-                $picture = new ProtocolNode("picture", array("type" => "image"), null, $data);
-
-                $hash = array();
-                $nodeID = $this->createMsgId("setphoto");
-                $hash["id"] = $nodeID;
-                $hash["to"] = $this->getJID($jid);
-                $hash["type"] = "set";
-                $hash["xmlns"] = "w:profile:picture";
-                $node = new ProtocolNode("iq", $hash, array($picture), null);
-
-                $this->sendNode($node);
-                $this->waitForServer($nodeID);
-            }
-        }
+        $data = preprocessProfilePicture($filepath);
+        $preview = createIconGD($filepath, 96, true);
+
+        $picture = new ProtocolNode("picture", array("type" => "image"), null, $data);
+        $preview = new ProtocolNode("picture", array("type" => "preview"), null, $preview);
+
+        $hash = array();
+        $nodeID = $this->createMsgId("setphoto");
+        $hash["id"] = $nodeID;
+        $hash["to"] = $this->getJID($jid);
+        $hash["type"] = "set";
+        $hash["xmlns"] = "w:profile:picture";
+        $node = new ProtocolNode("iq", $hash, array($picture, $preview), null);
+
+        $this->sendNode($node);
+        $this->waitForServer($nodeID);
     }
     /**
      * Parse the message text for emojis
