Fix Version handling after debug

Author: FlorianDubath

api.php

@@ -425,7 +425,7 @@ function sendRawTransaction($rawtx,$gethRPC){
                 $amount = hexdec(substr($tr_info,-64));
 
                 // get the infos 
-                $status = getAccountStatus(array($from_add, $to_add), $contract)  
+                $status = getAccountStatus(array($from_add, $to_add), $contract);  
                 $from_status = $status[$from_add];
                 $to_status = $status[$to_add];
 
@@ -493,7 +493,7 @@ function sendRawTransaction($rawtx,$gethRPC){
             if (in_my_array($funct_address, $transfert_functs)) {
 
 
-                $status = getAccountStatus(array($sender, $dest), $contract)  
+                $status = getAccountStatus(array($sender, $dest), $contract);  
                 $from_status = $status[$sender];
                 $to_status = $status[$dest];
 
@@ -593,14 +593,14 @@ function sendRawTransaction($rawtx,$gethRPC){
                 // We have a pledge:
                 $trans_type = 'Pledge';
                 $from_add = 'Admin';
-                $to_add = $dest;  
+                $to_add = $dest;
 
-                $acctype = getAccType($sender, $contract);
-                $status = getAccountStatus(array($sender), $contract)[$sender];
-                
-                $need_pending = $acctype==2 && $status==1;
+                $acctype = getAccType($sender, $contract); 
+                $status = getAccountStatus(array($sender), $contract);
+                $curr_stat= $status[$sender];
+
+                $need_pending = $acctype==2 && $curr_stat==1;
             }
-                 
         }
 
 

checkAdmin.php

@@ -107,36 +107,31 @@ function isActive($address, $contract){
 
     return substr($data,-1);
 }
-
-
+ 
 function getVersion( $contract){
-    $url   = getServerAddress()."/api.php";  
-    $ch = curl_init();
-    $ethCall = ['to' =>$contract, 
-                'data' => '0x54fd4d50'
-               ];
-    $fields = ['ethCall'=>$ethCall];
-    $fields_string = http_build_query($fields);
-    
-    curl_setopt($ch, CURLOPT_URL, $url);
-    // Set so curl_exec returns the result instead of outputting it.
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-    curl_setopt($ch, CURLOPT_POST, count($fields));
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-    
-    // Get the response and close the channel.
-    $response = curl_exec($ch);
-    curl_close($ch);
-    
-    $json = json_decode($response);
-    $data= $json->{'data'}; 
-    
-    return pack("H*", $data);
-}
-
-
-
+     $url   = getServerAddress()."/api.php";
+     $ch = curl_init();
+     $ethCall = ['to' =>$contract,
+                 'data' => '0x54fd4d50'
+                ];
+     $fields = ['ethCall'=>$ethCall];
+     $fields_string = http_build_query($fields);
+ 
+     curl_setopt($ch, CURLOPT_URL, $url);
+     // Set so curl_exec returns the result instead of outputting it.
+     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+     curl_setopt($ch, CURLOPT_POST, count($fields));
+     curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+     curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+ 
+     // Get the response and close the channel.
+     $response = curl_exec($ch);
+     curl_close($ch);
+ 
+     $json = json_decode($response);
+     $data= $json->{'data'};
+ 
+     return $data; 
 
 function getNumber($address, $contract, $function){
     $url   = getServerAddress()."/api.php";  
@@ -225,23 +220,25 @@ function checkSign($dat, $signature, $caller){
   return $caller==personal_ecRecover($dat, $signature);
 }
 
-
 function getAccountStatus($addresses, $contract) {
-    $version = getVersion($contract);
-    $result= array($add_1=0,$add_2=0);
-    if (strlen($version)>0) {
-        // New Contract use isActive
-        foreach ( $addresses as $add) {
-            $result[$add] = isActive($add, $contract);
-        }
-    } else {
-        // Old contract fallback on getAccStatus
-        foreach ( $addresses as $add) {
-            $result[$add] = getAccStatus($add, $contract);
-        }
-    }
-    
-    return $result;
+     $version = getVersion($contract);
+     $result= array();
+     foreach ( $addresses as $add) {
+             $result[$add] = 0;
+     }
+     if (strlen(strval($version))>2) {
+         // New Contract use isActive
+         foreach ( $addresses as $add) {
+             $result[$add] = isActive($add, $contract);
+         }
+     } else {
+         // Old contract fallback on getAccStatus
+         foreach ( $addresses as $add) {
+             $result[$add] = getAccStatus($add, $contract);
+         }
+     }
+ 
+     return $result;
 }