Changeset 873 for trunk/Modules/FinanceBankAPI

Timestamp:

Apr 6, 2020, 11:17:40 PM (5 years ago)

Author:

chronos

Message:

• Modified: Improved code format.

Location:

trunk/Modules/FinanceBankAPI

Files:

• FileImport.php (modified) (9 diffs)
• FinanceBankAPI.php (modified) (5 diffs)
• Fio.php (modified) (5 diffs)
• FioAPI.php (modified) (6 diffs)
• FioDemo.php (modified) (2 diffs)
• GPC.php (modified) (3 diffs)
• ImportFio.php (modified) (3 diffs)
• ImportPS.php (modified) (5 diffs)

trunk/Modules/FinanceBankAPI/FileImport.php

@@ -26 +26 @@
   {
     $DbResult = $this->Database->select('FinanceBankImport', '*', 'FinanceOperation IS NULL');
-    while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
     {
-      if(is_numeric($DbRow['VariableSymbol']))
+      if (is_numeric($DbRow['VariableSymbol']))
       {
         $DbResult2 = $this->Database->select('Subject', 'Id', 'Id='.$DbRow['VariableSymbol']);
-        if($DbResult2->num_rows == 1)
+        if ($DbResult2->num_rows == 1)
         {
           $DbRow2 = $DbResult2->fetch_assoc();
-          if($DbRow['Value'] >= 0) {
+          if ($DbRow['Value'] >= 0) {
             $FinanceGroup = $this->System->Modules['Finance']->GetFinanceGroupById(OPERATION_GROUP_ACCOUNT_IN, 'FinanceOperationGroup');
           } else {
@@ -51 +51 @@
           $Form->SetClass('FinanceOperation');
           $Form->LoadValuesFromDatabase($Id);
-          if(array_key_exists('AfterInsert', $Form->Definition))
+          if (array_key_exists('AfterInsert', $Form->Definition))
           {
             $Class = $Form->Definition['AfterInsert'][0];
@@ -80 +80 @@
     $Output .= 'Účet: '.$BankAccount['Number'].'/'.$Bank['Code'].' ('.$Bank['Name'].')'."\n";
 
-    if($Bank['Code'] == '2010') $Import = new ImportFio($this->System);
-      else if($Bank['Code'] == '0300') $Import = new ImportPS($this->System);
+    if ($Bank['Code'] == '2010') $Import = new ImportFio($this->System);
+      else if ($Bank['Code'] == '0300') $Import = new ImportPS($this->System);
       else $Output = $this->SystemMessage('Nepodporované API', 'Pro zvolenou banku není import podporován');
-    if(isset($Import))
+    if (isset($Import))
     {
       $Import->BankAccount = $BankAccount;
@@ -89 +89 @@
       $Import->PairOperations();
     }
-    return($Output);
+    return ($Output);
   }
 
   function Show()
   {
-    if(!$this->System->User->CheckPermission('Finance', 'SubjectList'))
-      return('Nemáte oprávnění');
+    if (!$this->System->User->CheckPermission('Finance', 'SubjectList'))
+      return ('Nemáte oprávnění');
 
     $Output = $this->Import($_GET['i']);
-    return($Output);
+    return ($Output);
   }
 }
@@ -111 +111 @@
   {
     $Output = '';
-    if(!$this->System->User->CheckPermission('Finance', 'SubjectList')) return('Nemáte oprávnění');
-    if(array_key_exists('Operation', $_GET))
+    if (!$this->System->User->CheckPermission('Finance', 'SubjectList')) return ('Nemáte oprávnění');
+    if (array_key_exists('Operation', $_GET))
     {
-      if($_GET['Operation'] == 'prepare') $Output .= $this->Prepare();
-      else if($_GET['Operation'] == 'insert') $Output .= $this->Insert();
+      if ($_GET['Operation'] == 'prepare') $Output .= $this->Prepare();
+      else if ($_GET['Operation'] == 'insert') $Output .= $this->Insert();
       else $Output .= 'Neplatná akce';
     } else $Output .= $this->ShowForm();
-    return($Output);
+    return ($Output);
   }
 
@@ -128 +128 @@
     $Form->Values['BankAccount'] = $_GET['id'];
     $Output = $Form->ShowEditForm();
-    return($Output);
+    return ($Output);
   }
 
@@ -147 +147 @@
     $Output .= 'Účet: '.$BankAccount['Number'].'/'.$Bank['Code'].' ('.$Bank['Name'].')';
 
-    if($Bank['Code'] == '2010') $Import = new ImportFio($this->System);
-      else if($Bank['Code'] == '0300') $Import = new ImportPS($this->System);
+    if ($Bank['Code'] == '2010') $Import = new ImportFio($this->System);
+      else if ($Bank['Code'] == '0300') $Import = new ImportPS($this->System);
       else $Output = $this->SystemMessage('Nepodporované API', 'Pro zvolenou banku není import podporován');
     $Import->BankAccount = $BankAccount;
     $Output .= $Import->ImportFile($File->GetContent(), $File->GetExt());
 
-    return($Output);
+    return ($Output);
   }
 
@@ -171 +171 @@
     $Output = '';
 
-    for($I = $_POST['ItemCount'] - 1; $I >= 0 ; $I--)
+    for ($I = $_POST['ItemCount'] - 1; $I >= 0 ; $I--)
     {
-      if($_POST['Money'.$I] >= 0) {
+      if ($_POST['Money'.$I] >= 0) {
         $FinanceGroup = $Finance->GetFinanceGroupById(OPERATION_GROUP_ACCOUNT_IN,
           'FinanceOperationGroup');
@@ -187 +187 @@
       $this->System->ModuleManager->Modules['Log']->NewRecord('Finance', 'NewPaymentInserted');
     }
-    return($Output);
+    return ($Output);
   }
 }

trunk/Modules/FinanceBankAPI/FinanceBankAPI.php

@@ -76 +76 @@
     $DbRow = $DbResult->fetch_row();
     $Output = 'Nezpárovaných plateb: '.$DbRow['0'].'<br/>';
-    return($Output);
+    return ($Output);
   }
 
@@ -82 +82 @@
   {
     $Preset = array();
-    if($Item['Value'] < 0) $OperationGroupId = OPERATION_GROUP_ACCOUNT_OUT;
+    if ($Item['Value'] < 0) $OperationGroupId = OPERATION_GROUP_ACCOUNT_OUT;
        else $OperationGroupId = OPERATION_GROUP_ACCOUNT_IN;
     $FinanceGroup = $this->System->Modules['Finance']->GetFinanceGroupById($OperationGroupId, 'FinanceOperationGroup');
@@ -94 +94 @@
       'presetBankAccount' => $Item['BankAccount'],
       'presetGroup' => $FinanceGroup['Id']);
-    return($Preset);
+    return ($Preset);
   }
 }
@@ -106 +106 @@
       '(`AutoImport`=1) AND (`TimeCreate` < NOW()) AND '.
       '((`TimeEnd` IS NULL) OR (`TimeEnd` > NOW()))');
-    while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
     {
       echo($DbRow['Comment']."\n");
@@ -112 +112 @@
       $Output .= $Page->Import($DbRow['Id']);
     }
-    return($Output);
+    return ($Output);
   }
 }

trunk/Modules/FinanceBankAPI/Fio.php

@@ -11 +11 @@
   function Import($TimeFrom, $TimeTo)
   {
-    if($this->UserName == '') throw new Exception('Missing value for UserName property.');
-    if($this->Password == '') throw new Exception('Missing value for Password property.');
-    if(!is_numeric($this->Account)) throw new Exception('Missing or not numeric value for Account property.');
+    if ($this->UserName == '') throw new Exception('Missing value for UserName property.');
+    if ($this->Password == '') throw new Exception('Missing value for Password property.');
+    if (!is_numeric($this->Account)) throw new Exception('Missing or not numeric value for Account property.');
 
     $fp = fsockopen('ssl://www.fio.cz', 443, $errno, $errstr, 30);
-    if(!$fp)
+    if (!$fp)
     {
       throw new Exception('Connection error: '.$errstr);
@@ -35 +35 @@
       // Read response
       $Response = array();
-      while(!feof($fp))
+      while (!feof($fp))
       {
         $Response[] = trim(fgets($fp, 1024));
@@ -42 +42 @@
 
       // Strip HTTP header
-      while($Response[0] != '') array_shift($Response);
+      while ($Response[0] != '') array_shift($Response);
       array_shift($Response); // Remove empty line
       //echo(implode("\n", $Response));
@@ -49 +49 @@
       $GPC = new GPC();
       $Result = array();
-      foreach($Response as $Index => $Line)
+      foreach ($Response as $Index => $Line)
       {
-        if(($Index == 0) and (substr($Line, 0, strlen(GPC_TYPE_REPORT)) != GPC_TYPE_REPORT)) $this->NoValidDataError($Response);
+        if (($Index == 0) and (substr($Line, 0, strlen(GPC_TYPE_REPORT)) != GPC_TYPE_REPORT)) $this->NoValidDataError($Response);
         $GPCLine = $GPC->ParseLine($Line);
-        if($GPCLine != NULL) $Result[] = $GPCLine;
+        if ($GPCLine != NULL) $Result[] = $GPCLine;
       }
-      return($Result);
+      return ($Result);
     }
   }
@@ -65 +65 @@
   $Response = implode('', $Response);
     $ErrorMessageStart = '<div id="oldform_warning">';
-    if(strpos($Response, $ErrorMessageStart) !== false)
+    if (strpos($Response, $ErrorMessageStart) !== false)
   {
     $Response = substr($Response, strpos($Response, $ErrorMessageStart) + strlen($ErrorMessageStart));

trunk/Modules/FinanceBankAPI/FioAPI.php

@@ -7 +7 @@
 function RemoveComma($Text)
 {
-  if((mb_strlen($Text) >= 2) and ($Text[0] == '"') and (mb_substr($Text, -1, 1) == '"')) return(mb_substr($Text, 1, -1));
-    else return($Text);
+  if ((mb_strlen($Text) >= 2) and ($Text[0] == '"') and (mb_substr($Text, -1, 1) == '"')) return (mb_substr($Text, 1, -1));
+    else return ($Text);
 }
 
@@ -25 +25 @@
   function Import($TimeFrom, $TimeTo)
   {
-    if($this->Token == '') throw new Exception('Missing value for Token property.');
+    if ($this->Token == '') throw new Exception('Missing value for Token property.');
 
     // URL format: https://www.fio.cz/ib_api/rest/periods/{token}/{datum od}/{datum do}/transactions.{format}
@@ -33 +33 @@
     $Response = '';
     $Response = @file_get_contents('https://www.fio.cz'.$RequestURL);
-    if($Response == FALSE)
+    if ($Response == FALSE)
     {
       throw new Exception('Connection error');
     } else
     {
-      if($this->Format == 'gpc') $Response = iconv('windows-1250', $this->Encoding, $Response);
+      if ($this->Format == 'gpc') $Response = iconv('windows-1250', $this->Encoding, $Response);
       $Response = explode("\n", $Response);
 
-      if($this->Format == 'gpc')
+      if ($this->Format == 'gpc')
       {
         // Parse all GPC lines
         $GPC = new GPC();
         $Result = array();
-        foreach($Response as $Index => $Line)
+        foreach ($Response as $Index => $Line)
         {
-          if(($Index == 0) and (substr($Line, 0, strlen(GPC_TYPE_REPORT)) != GPC_TYPE_REPORT)) $this->NoValidDataError($Response);
+          if (($Index == 0) and (substr($Line, 0, strlen(GPC_TYPE_REPORT)) != GPC_TYPE_REPORT)) $this->NoValidDataError($Response);
           $GPCLine = $GPC->ParseLine($Line);
-          if($GPCLine != NULL) $Result[] = $GPCLine;
+          if ($GPCLine != NULL) $Result[] = $GPCLine;
         }
       } else
-      if($this->Format == 'csv')
+      if ($this->Format == 'csv')
       {
         $Result = array(
@@ -60 +60 @@
 
         // CVS header
-        while((count($Response) > 0) and ($Response[0] != ''))
+        while ((count($Response) > 0) and ($Response[0] != ''))
         {
           $Line = explode(';', $Response[0]);
-          if($Line[0] == 'accountId') $Result['AccountNumber'] = $Line[0];
-          else if($Line[0] == 'bankId') $Result['BankId'] = $Line[0];
-          else if($Line[0] == 'currency') $Result['Currency'] = $Line[0];
-          else if($Line[0] == 'iban') $Result['IBAN'] = $Line[0];
-          else if($Line[0] == 'bic') $Result['BIC'] = $Line[0];
-          else if($Line[0] == 'openingBalance') $Result['OpeningBalance'] = $Line[0];
-          else if($Line[0] == 'closingBalance') $Result['ClosingBalance'] = $Line[0];
-          else if($Line[0] == 'dateStart') $Result['DateStart'] = $Line[0];
-          else if($Line[0] == 'dateEnd') $Result['DateEnd'] = $Line[0];
-          else if($Line[0] == 'idFrom') $Result['IdFrom'] = $Line[0];
-          else if($Line[0] == 'idTo') $Result['IdTo'] = $Line[0];
+          if ($Line[0] == 'accountId') $Result['AccountNumber'] = $Line[0];
+          else if ($Line[0] == 'bankId') $Result['BankId'] = $Line[0];
+          else if ($Line[0] == 'currency') $Result['Currency'] = $Line[0];
+          else if ($Line[0] == 'iban') $Result['IBAN'] = $Line[0];
+          else if ($Line[0] == 'bic') $Result['BIC'] = $Line[0];
+          else if ($Line[0] == 'openingBalance') $Result['OpeningBalance'] = $Line[0];
+          else if ($Line[0] == 'closingBalance') $Result['ClosingBalance'] = $Line[0];
+          else if ($Line[0] == 'dateStart') $Result['DateStart'] = $Line[0];
+          else if ($Line[0] == 'dateEnd') $Result['DateEnd'] = $Line[0];
+          else if ($Line[0] == 'idFrom') $Result['IdFrom'] = $Line[0];
+          else if ($Line[0] == 'idTo') $Result['IdTo'] = $Line[0];
           array_shift($Response);
         }
         array_shift($Response); // Remove empty line
 
-        if((count($Response) == 0) or
+        if ((count($Response) == 0) or
           ($Response[0] != 'ID pohybu;Datum;Objem;Měna;Protiúčet;Název protiúčtu;Kód banky;Název banky;KS;VS;SS;Uživatelská identifikace;Zpráva pro příjemce;Typ;Provedl;Upřesnění;Komentář;BIC;ID pokynu')
           ) throw new Exception('Unsupported CSV header');
         array_shift($Response);
         array_pop($Response);
-        foreach($Response as $Index => $Line)
+        foreach ($Response as $Index => $Line)
         {
           $Line = explode(';', $Line);
@@ -97 +97 @@
         }
       }
-      return($Result);
+      return ($Result);
     }
   }
@@ -107 +107 @@
     $Response = implode('', $Response);
     $ErrorMessageStart = '<div id="oldform_warning">';
-    if(strpos($Response, $ErrorMessageStart) !== false)
+    if (strpos($Response, $ErrorMessageStart) !== false)
     {
       $Response = substr($Response, strpos($Response, $ErrorMessageStart) + strlen($ErrorMessageStart));

trunk/Modules/FinanceBankAPI/FioDemo.php

@@ -11 +11 @@
 echo('<html><head><meta charset="utf-8"></head><body>');
 echo('<table border="1">');
-foreach($Records as $Record)
+foreach ($Records as $Record)
 {
   echo('<tr>');
-  if($Record['Type'] == GPC_TYPE_REPORT)
+  if ($Record['Type'] == GPC_TYPE_REPORT)
   {
     echo('<td>Jméno účtu: '.$Record['AccountName'].'</td>');
@@ -35 +35 @@
     echo('<th>Uživatelská identifikace</th>');
   } else
-  if($Record['Type'] == GPC_TYPE_ITEM)
+  if ($Record['Type'] == GPC_TYPE_ITEM)
   {
     echo('<td>'.date('j.n.Y', $Record['DueDate']).'</td>');

trunk/Modules/FinanceBankAPI/GPC.php

@@ -11 +11 @@
     $Type = mb_substr($Line, 1, 3);
 
-    if($Type == GPC_TYPE_REPORT)
+    if ($Type == GPC_TYPE_REPORT)
     {
       $GPCLine = array
@@ -29 +29 @@
       );
     } else
-    if($Type == GPC_TYPE_ITEM)
+    if ($Type == GPC_TYPE_ITEM)
     {
       $GPCLine = array
@@ -53 +53 @@
     $GPCLine = NULL;
 
-    return($GPCLine);
+    return ($GPCLine);
   }
 }

trunk/Modules/FinanceBankAPI/ImportFio.php

@@ -9 +9 @@
     $Fio = new FioAPI();
     $Fio->Token = $this->BankAccount['LoginName'];
-    if($this->BankAccount['LastImportDate'] == '') $PeriodStart = time();
+    if ($this->BankAccount['LastImportDate'] == '') $PeriodStart = time();
       else $PeriodStart = MysqlDateToTime($this->BankAccount['LastImportDate']);
     $PeriodEnd = time();
@@ -22 +22 @@
         //$Output .= '<td>Suma výdajů: '.$Records['DebitValue'].' Kč</td>';
       //$Output .= '</tr>';
-    foreach($Records['Items'] as $Record)
+    foreach ($Records['Items'] as $Record)
     {
       $DbResult = $this->Database->select('FinanceBankImport', 'ID', 'Identification='.$Record['ID']);
-      if($DbResult->num_rows == 0)
+      if ($DbResult->num_rows == 0)
       {
         $Output .= '<tr>';
@@ -44 +44 @@
     $this->Database->update('FinanceBankAccount', 'Id='.$this->BankAccount['Id'],
       array('LastImportDate' => TimeToMysqlDate($PeriodEnd)));
-    return($Output);
+    return ($Output);
   }
 }

trunk/Modules/FinanceBankAPI/ImportPS.php

@@ -5 +5 @@
   function ImportFile($Content, $Ext)
   {
-    if($Ext == 'txt') $this->ImportTxt($Content);
-      else if($Ext == 'cvs') $this->ImportCVS($Content);
+    if ($Ext == 'txt') $this->ImportTxt($Content);
+      else if ($Ext == 'cvs') $this->ImportCVS($Content);
   }
 
@@ -20 +20 @@
 
     $Data = explode("\n", $Content);
-    foreach($Data as $Key => $Value)
+    foreach ($Data as $Key => $Value)
     {
       $Value = str_replace('\"', '"', $Value);
       $Data[$Key] = str_getcsv($Value, ',', '"', "\\");
       //print_r($Data[$Key]);
-      foreach($Data[$Key] as $Key2 => $Value2)
+      foreach ($Data[$Key] as $Key2 => $Value2)
       {
-        if(substr($Data[$Key][$Key2], 0, 2) == '\"')
+        if (substr($Data[$Key][$Key2], 0, 2) == '\"')
           $Data[$Key][$Key2] = substr($Data[$Key][$Key2], 2, -2);
       }
@@ -46 +46 @@
     );
 
-    if($Header != $Data[0]) $Output = 'Nekompatibilní struktura CSV';
+    if ($Header != $Data[0]) $Output = 'Nekompatibilní struktura CSV';
     else
     {
@@ -54 +54 @@
       $Output = '<form action="?Operation=insert" method="post">';
       $I = 0;
-      foreach($Data as $Key => $Value)
+      foreach ($Data as $Key => $Value)
       {
-        if(count($Value) <= 1) continue;
-        if($Value[9] == '') $Value[5] = 128; // Žádný účet => Poštovní spořitelna
+        if (count($Value) <= 1) continue;
+        if ($Value[9] == '') $Value[5] = 128; // Žádný účet => Poštovní spořitelna
         $Time = explode('.', $Value[0]);
         $Time = $Time[2].'-'.$Time[1].'-'.$Time[0];
         $Money = $Value[1];
-        if(is_numeric($Value[5]))
+        if (is_numeric($Value[5]))
         {
           $Subject = $Value[5] * 1;
           $DbResult = $this->Database->query('SELECT Id FROM Subject WHERE Id='.$this->Database->real_escape_string($Subject));
-          if($DbResult->num_rows == 0) $Subject = '? ('.($Value[5] * 1).')';
+          if ($DbResult->num_rows == 0) $Subject = '? ('.($Value[5] * 1).')';
         } else
         {
           $Subject = '? ('.$Value[5].')';
         }
-        if(!is_numeric($Subject))
+        if (!is_numeric($Subject))
         {
           $Mode = 'Ručně';
@@ -80 +80 @@
         }
 
-        if($Money < 0) $Text = 'Platba převodem';
+        if ($Money < 0) $Text = 'Platba převodem';
         else $Text = 'Přijatá platba';
         $Automatic .= '<tr>'.