[Noalyss-commit] [noalyss] 115/219: Correct indentation

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 25d873d0829f9a2a18004c1f7a58ac057a1f1791
Author: Dany De Bontridder <address@hidden>
Date:   Tue Oct 31 22:48:09 2017 +0100

    Correct indentation
---
 include/opening.inc.php | 360 ++++++++++++++++++++++++------------------------
 1 file changed, 182 insertions(+), 178 deletions(-)

diff --git a/include/opening.inc.php b/include/opening.inc.php
index 8e4763c..217d254 100644
--- a/include/opening.inc.php
+++ b/include/opening.inc.php
@@ -19,7 +19,7 @@
  */
 
 // Copyright Author Dany De Bontridder address@hidden
-/**\file
+/* * \file
  * \brief The opening of the exercices. it takes the saldo of the
  * choosen foolder / exercice and import it as a misc operation in the
  * current folder
@@ -28,14 +28,14 @@
  *
  *
  */
-if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
+if (!defined('ALLOWED'))
+    die('Appel direct ne sont pas permis');
 require_once NOALYSS_INCLUDE.'/lib/iselect.class.php';
 require_once NOALYSS_INCLUDE.'/class/acc_ledger.class.php';
 $http=new HttpInput();
 $p_mesg="";
 
-$sa=$http->request("sa","string","");
-$sa = (isset($_REQUEST['sa'])) ? $_REQUEST['sa'] : '';
+$sa=$http->request("sa", "string", "");
 $g_user->Check();
 
 require_once NOALYSS_INCLUDE.'/lib/user_menu.php';
@@ -44,225 +44,229 @@ require_once NOALYSS_INCLUDE.'/lib/user_menu.php';
 if (isset($_POST['correct']))
 {
     $p_jrn=$http->request("p_jrn", "number");
-    $ledger = new Acc_Ledger($cn, $p_jrn);
-       require_once NOALYSS_INCLUDE.'/operation_ods_new.inc.php';
-       return;
+    $ledger=new Acc_Ledger($cn, $p_jrn);
+    require_once NOALYSS_INCLUDE.'/operation_ods_new.inc.php';
+    return;
 }
 
 // confirm before saving
-if ( isset($_POST['summary']))
+if (isset($_POST['summary']))
 {
-       try {
-            $p_jrn=$http->request("p_jrn", "number");
-               $ledger = new Acc_Ledger($cn, $p_jrn);
-               $ledger->with_concerned=false;
-                       $ledger->verify($_POST);
-                       require_once 
NOALYSS_INCLUDE.'/operation_ods_confirm.inc.php';
-       } catch (Exception $e)
-       {
-               echo alert($e->getMessage());
-               require(NOALYSS_INCLUDE.'/operation_ods_new.inc.php');
-
-       }
-       return;
+    try
+    {
+        $p_jrn=$http->request("p_jrn", "number");
+        $ledger=new Acc_Ledger($cn, $p_jrn);
+        $ledger->with_concerned=false;
+        $ledger->verify($_POST);
+        require_once NOALYSS_INCLUDE.'/operation_ods_confirm.inc.php';
+    }
+    catch (Exception $e)
+    {
+        echo alert($e->getMessage());
+        require(NOALYSS_INCLUDE.'/operation_ods_new.inc.php');
+    }
+    return;
 }
 
 // record
 if (isset($_POST['save']))
 {
-        $p_jrn=$http->request("p_jrn", "number");
-       $array = $_POST;
-       $ledger = new Acc_Ledger($cn, $p_jrn);
-       $ledger->with_concerned=false;
-       try
-       {
-               $ledger->save($array);
-               $jr_id = $cn->get_value('select jr_id from jrn where 
jr_internal=$1', array($ledger->internal));
+    $p_jrn=$http->request("p_jrn", "number");
+    $array=$_POST;
+    $ledger=new Acc_Ledger($cn, $p_jrn);
+    $ledger->with_concerned=false;
+    try
+    {
+        $ledger->save($array);
+        $jr_id=$cn->get_value('select jr_id from jrn where jr_internal=$1',
+                array($ledger->internal));
 
-               echo '<h2>'._("Opération enregistrée")." "._("Piece ") . 
h($ledger->pj) . '</h2>';
-               if (strcmp($ledger->pj, $_POST['e_pj']) != 0)
-               {
-                       echo '<h3 class="notice">' . _('Attention numéro pièce 
existante, elle a du être adaptée') . '</h3>';
-               }
-               printf('<a class="detail" style="display:inline" 
href="javascript:modifyOperation(%d,%d)">%s</a><hr>', $jr_id, dossier::id(), 
$ledger->internal);
+        echo '<h2>'._("Opération enregistrée")." "._("Piece 
").h($ledger->pj).'</h2>';
+        if (strcmp($ledger->pj, $_POST['e_pj'])!=0)
+        {
+            echo '<h3 class="notice">'._('Attention numéro pièce existante, 
elle a du être adaptée').'</h3>';
+        }
+        printf('<a class="detail" style="display:inline" 
href="javascript:modifyOperation(%d,%d)">%s</a><hr>',
+                $jr_id, dossier::id(), $ledger->internal);
 
-               // show feedback
-               echo '<div id="jrn_name_div">'; echo '<h2 id="jrn_name" 
style="display:inline">' . $ledger->get_name() . '</h2>'; echo '</div>';
-               echo $ledger->confirm($_POST, true);
-       }
-       catch (Exception $e)
-       {
-               require(NOALYSS_INCLUDE.'/operation_ods_new.inc.php');
-               alert($e->getMessage());
-       }
-       return;
+        // show feedback
+        echo '<div id="jrn_name_div">'; echo '<h2 id="jrn_name" 
style="display:inline">'.$ledger->get_name().'</h2>'; echo '</div>';
+        echo $ledger->confirm($_POST, true);
+    }
+    catch (Exception $e)
+    {
+        require(NOALYSS_INCLUDE.'/operation_ods_new.inc.php');
+        alert($e->getMessage());
+    }
+    return;
 }
 
 
 /* --------------------------------------------------
  * step 1 if nothing is asked we show the available folders
  */
-if ($sa == '')
+if ($sa=='')
 {
-       echo '<div class="content">';
-        
-       echo '<h1 class="legend"> Etape 1 </h1>';
+    echo '<div class="content">';
+
+    echo '<h1 class="legend"> Etape 1 </h1>';
 
-       echo _('Choisissez le dossier où sont les soldes à importer');
-       $avail = $g_user->get_available_folder();
+    echo _('Choisissez le dossier où sont les soldes à importer');
+    $avail=$g_user->get_available_folder();
 
-       if (empty($avail))
-       {
-               echo '*** '._("Aucun dossier").' ***';
-               return;
-       }
-       echo '<form class="print" method="post">';
-       echo HtmlInput::hidden('ac', $_REQUEST['ac']);
-       echo HtmlInput::hidden('sa', 'step2');
-       echo dossier::hidden();
-       $wAvail = new ISelect();
-       /* compute select list */
-       $array = array();
-       $i = 0;
-       foreach ($avail as $r)
-       {
-               $array[$i]['value'] = $r['dos_id'];
-               $array[$i]['label'] = $r['dos_name'];
-               $i++;
-       }
+    if (empty($avail))
+    {
+        echo '*** '._("Aucun dossier").' ***';
+        return;
+    }
+    echo '<form class="print" method="post">';
+    echo HtmlInput::hidden('ac', $_REQUEST['ac']);
+    echo HtmlInput::hidden('sa', 'step2');
+    echo dossier::hidden();
+    $wAvail=new ISelect();
+    /* compute select list */
+    $array=array();
+    $i=0;
+    foreach ($avail as $r)
+    {
+        $array[$i]['value']=$r['dos_id'];
+        $array[$i]['label']=$r['dos_name'];
+        $i++;
+    }
 
-       $wAvail->value = $array;
-       echo 'Choix du dossier :' . $wAvail->input('f');
-       echo HtmlInput::submit('ok', _('Continuer'));
+    $wAvail->value=$array;
+    echo 'Choix du dossier :'.$wAvail->input('f');
+    echo HtmlInput::submit('ok', _('Continuer'));
 
-       echo '</form>';
-       echo '</div>';
-       echo '</div>';
-       return;
+    echo '</form>';
+    echo '</div>';
+    echo '</div>';
+    return;
 }
 /* --------------------------------------------------
  * Step 2 choose now the exercice of this folder
  */
-$back = 'do.php?ac=' . $http->request("ac"). '&' . dossier::get();
-if ($sa == 'step2')
+$back='do.php?ac='.$http->request("ac").'&'.dossier::get();
+if ($sa=='step2')
 {
-       echo '<div class="content">' .
-       '<div><h1 class="legend">Etape 2</h1>' .
-       '<h2 class="info">' . dossier::name($_REQUEST['f']) . '</h2>' .
-       '<form class="print" method="post">' .
-       _("Choisissez l'exercice du dossier à reporter pour les a-nouveaux");
-       echo dossier::hidden();
-       echo HtmlInput::hidden('ac', $_REQUEST['ac']);
-       echo HtmlInput::hidden('sa', 'step3');
-       echo HtmlInput::hidden('f', $_REQUEST['f']);
-       $cn = new Database($_REQUEST['f']);
-       $periode = $cn->make_array("select distinct p_exercice,p_exercice from 
parm_periode order by p_exercice");
-       $w = new ISelect();
-       $w->table = 0;
-       $w->label = 'Periode';
-       $w->readonly = false;
-       $w->value = $periode;
-       $w->name = "p_periode";
-       echo _('Période').' : ' . $w->input();
-       echo HtmlInput::submit('ok', _('Continuer'));
-       echo dossier::hidden();
-       echo "</form>";
-       echo HtmlInput::button_anchor(_('Retour'), $back);
-       exit(0);
+    echo '<div class="content">'.
+    '<div><h1 class="legend">Etape 2</h1>'.
+    '<h2 class="info">'.dossier::name($_REQUEST['f']).'</h2>'.
+    '<form class="print" method="post">'.
+    _("Choisissez l'exercice du dossier à reporter pour les a-nouveaux");
+    echo dossier::hidden();
+    echo HtmlInput::hidden('ac', $_REQUEST['ac']);
+    echo HtmlInput::hidden('sa', 'step3');
+    echo HtmlInput::hidden('f', $_REQUEST['f']);
+    $cn=new Database($_REQUEST['f']);
+    $periode=$cn->make_array("select distinct p_exercice,p_exercice from 
parm_periode order by p_exercice");
+    $w=new ISelect();
+    $w->table=0;
+    $w->label='Periode';
+    $w->readonly=false;
+    $w->value=$periode;
+    $w->name="p_periode";
+    echo _('Période').' : '.$w->input();
+    echo HtmlInput::submit('ok', _('Continuer'));
+    echo dossier::hidden();
+    echo "</form>";
+    echo HtmlInput::button_anchor(_('Retour'), $back);
+    exit(0);
 }
 /* --------------------------------------------------
  * select the ledger where we will import the data
  */
-if ($sa == 'step3')
+if ($sa=='step3')
 {
-       echo '<div class="content">' .
-       '<div><h1 class="legend">Etape 3</h1>' .
-       '<h2 class="info">' . dossier::name($_REQUEST['f']) . '</h2>' .
-       '<form class="print" method="post">' .
-       _(" Choisissez le journal qui contiendra l'opération d'ouverture ");
-       echo dossier::hidden();
-       echo HtmlInput::hidden('p_action', 'ouv');
-       echo HtmlInput::hidden('sa', 'step4');
-       echo HtmlInput::hidden('f', $_REQUEST['f']);
-       echo HtmlInput::hidden('p_periode', $_REQUEST['p_periode']);
-       $wLedger = new ISelect();
-       $g_user = new User($cn);
-       $avail = $g_user->get_ledger('ODS');
-       /* compute select list */
-       $array = array();
-       $i = 0;
-       foreach ($avail as $r)
-       {
-               $array[$i]['value'] = $r['jrn_def_id'];
-               $array[$i]['label'] = $r['jrn_def_name'];
-               $i++;
-       }
-       $wLedger->value = $array;
-       echo $wLedger->input('p_jrn');
-       echo HtmlInput::submit('ok', 'Continuer');
-       echo HtmlInput::hidden('ac', $_REQUEST['ac']);
-       echo dossier::hidden();
-       echo "</form>";
-       echo HtmlInput::button_anchor('Retour', $back . '&sa=step2&f=' . 
$_REQUEST['f']);
-       exit(0);
+    echo '<div class="content">'.
+    '<div><h1 class="legend">Etape 3</h1>'.
+    '<h2 class="info">'.dossier::name($_REQUEST['f']).'</h2>'.
+    '<form class="print" method="post">'.
+    _(" Choisissez le journal qui contiendra l'opération d'ouverture ");
+    echo dossier::hidden();
+    echo HtmlInput::hidden('p_action', 'ouv');
+    echo HtmlInput::hidden('sa', 'step4');
+    echo HtmlInput::hidden('f', $_REQUEST['f']);
+    echo HtmlInput::hidden('p_periode', $_REQUEST['p_periode']);
+    $wLedger=new ISelect();
+    $g_user=new User($cn);
+    $avail=$g_user->get_ledger('ODS');
+    /* compute select list */
+    $array=array();
+    $i=0;
+    foreach ($avail as $r)
+    {
+        $array[$i]['value']=$r['jrn_def_id'];
+        $array[$i]['label']=$r['jrn_def_name'];
+        $i++;
+    }
+    $wLedger->value=$array;
+    echo $wLedger->input('p_jrn');
+    echo HtmlInput::submit('ok', 'Continuer');
+    echo HtmlInput::hidden('ac', $_REQUEST['ac']);
+    echo dossier::hidden();
+    echo "</form>";
+    echo HtmlInput::button_anchor('Retour',
+            $back.'&sa=step2&f='.$_REQUEST['f']);
+    exit(0);
 }
 /* --------------------------------------------------
  * Step 4 we import data from the selected folder and year and
  * transform it into a misc operation
  */
-if ($sa == 'step4')
+if ($sa=='step4')
 {
-       echo '<div class="content">';
-       echo '<div><h1 class="legend"> Dernière étape</h1>';
-       $cn_target = new Database($_REQUEST['f']);
-       $saldo = new Acc_Ledger($cn_target, 0);
-       $array = $saldo->get_saldo_exercice($_REQUEST['p_periode']);
-       /*  we need to transform the array into a Acc_Ledger array */
-       $result = array();
-       $result['desc'] = 'Ecriture d\'ouverture';
-       $result['nb_item'] = sizeof($array);
-       $result['p_jrn'] = $_REQUEST['p_jrn'];
-       $idx = 0;
+    echo '<div class="content">';
+    echo '<div><h1 class="legend"> Dernière étape</h1>';
+    $cn_target=new Database($_REQUEST['f']);
+    $saldo=new Acc_Ledger($cn_target, 0);
+    $array=$saldo->get_saldo_exercice($_REQUEST['p_periode']);
+    /*  we need to transform the array into a Acc_Ledger array */
+    $result=array();
+    $result['desc']='Ecriture d\'ouverture';
+    $result['nb_item']=sizeof($array);
+    $result['p_jrn']=$_REQUEST['p_jrn'];
+    $idx=0;
 
-       foreach ($array as $row)
-       {
-               $qcode = 'qc_' . $idx;
-               $poste = 'poste' . $idx;
-               $amount = 'amount' . $idx;
-               $ck = 'ck' . $idx;
-               $result[$qcode] = $row['j_qcode'];
-               if (trim($row['j_qcode']) == '')
-                       $result[$poste] = $row['j_poste'];
-               $result[$amount] = abs($row['solde']);
-               if ($row['solde'] > 0)
-                       $result[$ck] = 'on';
-               $idx++;
-       }
-       $cn = Dossier::connect();
+    foreach ($array as $row)
+    {
+        $qcode='qc_'.$idx;
+        $poste='poste'.$idx;
+        $amount='amount'.$idx;
+        $ck='ck'.$idx;
+        $result[$qcode]=$row['j_qcode'];
+        if (trim($row['j_qcode'])=='')
+            $result[$poste]=$row['j_poste'];
+        $result[$amount]=abs($row['solde']);
+        if ($row['solde']>0)
+            $result[$ck]='on';
+        $idx++;
+    }
+    $cn=Dossier::connect();
 
-       $jrn = new Acc_Ledger($cn, $_REQUEST['p_jrn']);
+    $jrn=new Acc_Ledger($cn, $_REQUEST['p_jrn']);
 
-       echo '<form class="print" method="post">';
-       echo HtmlInput::hidden('ac', $_REQUEST['ac']);
-       echo HtmlInput::hidden('sa', 'step5');
-       echo HtmlInput::hidden('f', $_REQUEST['f']);
-       echo HtmlInput::hidden('p_periode',$_REQUEST['p_periode']);
-       echo dossier::hidden();
-       echo HtmlInput::hidden('p_jrn', $_REQUEST['p_jrn']);
-       echo $jrn->input($result, 0);
-       echo '<hr>';
-       echo '<h2 class="notice">'._("Ne corrigez pas encore, cliquez continuer 
pour passer à l'étape suivante").'</h2>';
-       echo HtmlInput::submit('correct_it', _('Continuer'));
-       echo '</form>';
-       echo HtmlInput::button_anchor(_('Retour'), $back);
+    echo '<form class="print" method="post">';
+    echo HtmlInput::hidden('ac', $_REQUEST['ac']);
+    echo HtmlInput::hidden('sa', 'step5');
+    echo HtmlInput::hidden('f', $_REQUEST['f']);
+    echo HtmlInput::hidden('p_periode', $_REQUEST['p_periode']);
+    echo dossier::hidden();
+    echo HtmlInput::hidden('p_jrn', $_REQUEST['p_jrn']);
+    echo $jrn->input($result, 0);
+    echo '<hr>';
+    echo '<h2 class="notice">'._("Ne corrigez pas encore, cliquez continuer 
pour passer à l'étape suivante").'</h2>';
+    echo HtmlInput::submit('correct_it', _('Continuer'));
+    echo '</form>';
+    echo HtmlInput::button_anchor(_('Retour'), $back);
 
-       echo '</div>';
+    echo '</div>';
 }
 // if sa=step4 then record it
 //
-if ($_REQUEST['sa'] == 'step5')
+if ($_REQUEST['sa']=='step5')
 {
-       $ledger = new Acc_Ledger($cn, $_REQUEST['p_jrn']);
-       require_once NOALYSS_INCLUDE.'/operation_ods_new.inc.php';
+    $ledger=new Acc_Ledger($cn, $_REQUEST['p_jrn']);
+    require_once NOALYSS_INCLUDE.'/operation_ods_new.inc.php';
 }