[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 258/323: indent
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 258/323: indent |
Date: |
Wed, 14 Mar 2018 17:39:01 -0400 (EDT) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit c05b8353b4598720d0f1e9a14d763a2c40af389d
Author: Dany De Bontridder <address@hidden>
Date: Sat Feb 24 15:19:00 2018 +0100
indent
---
include/ajax/ajax_search_operation.php | 132 +++++++++++++++++----------------
1 file changed, 68 insertions(+), 64 deletions(-)
diff --git a/include/ajax/ajax_search_operation.php
b/include/ajax/ajax_search_operation.php
index 109f4e4..8adb284 100644
--- a/include/ajax/ajax_search_operation.php
+++ b/include/ajax/ajax_search_operation.php
@@ -1,4 +1,5 @@
<?php
+
/*
* This file is part of NOALYSS.
*
@@ -15,12 +16,13 @@
* You should have received a copy of the GNU General Public License
* along with NOALYSS; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+ */
// Copyright Author Dany De Bontridder address@hidden
-/*! \file
+/* ! \file
* \brief Search module
*/
-if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
+if (!defined('ALLOWED'))
+ die('Appel direct ne sont pas permis');
require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
require_once NOALYSS_INCLUDE.'/class/acc_ledger_search.class.php';
@@ -32,104 +34,106 @@ require_once NOALYSS_INCLUDE.'/lib/database.class.php';
/* Admin. Dossier */
$cn=Dossier::connect();
-require_once NOALYSS_INCLUDE.'/class/user.class.php';
+require_once NOALYSS_INCLUDE.'/class/user.class.php';
// display a search box
$base=basename($_SERVER['SCRIPT_NAME']);
$inside=false;
-$tiers=$http->get("tiers","string","");
+$tiers=$http->get("tiers", "string", "");
// With the amount id, we find the amount in a html elt
if (isset($_GET['amount_id']))
{
- put_global(array(
- array("key"=>'amount_min','value'=>$_GET['amount_id']),
- array("key"=>'amount_max','value'=>$_GET['amount_id'])
- ));
+ put_global(array(
+ array("key"=>'amount_min', 'value'=>$_GET['amount_id']),
+ array("key"=>'amount_max', 'value'=>$_GET['amount_id'])
+ ));
}
-$target=$http->get("target","string","");
-$ledger=new Acc_Ledger_Search('ALL',1,$target);
+$target=$http->get("target", "string", "");
+$ledger=new Acc_Ledger_Search('ALL', 1, $target);
-if ($base == 'recherche.php' || $base == 'do.php')
- {
- echo '<div class="content" >';
- echo '<form method="GET">';
- }
- else
- {
- $action="";
- $callback="";
- echo HtmlInput::title_box(_('Recherche'), $target);
- echo '<form name="search_form_ajx" id="search_form_ajx"
onsubmit="search_operation(this);return false">';
- echo HtmlInput::get_to_hidden(array('ctlc','ledger'));
- echo HtmlInput::hidden("target",$target);
- $inside=true;
- }
-echo HtmlInput::hidden("tiers",$tiers);
+if ($base=='recherche.php'||$base=='do.php')
+{
+ echo '<div class="content" >';
+ echo '<form method="GET">';
+}
+else
+{
+ $action="";
+ $callback="";
+ echo HtmlInput::title_box(_('Recherche'), $target);
+ echo '<form name="search_form_ajx" id="search_form_ajx"
onsubmit="search_operation(this);return false">';
+ echo HtmlInput::get_to_hidden(array('ctlc', 'ledger'));
+ echo HtmlInput::hidden("target", $target);
+ $inside=true;
+}
+echo HtmlInput::hidden("tiers", $tiers);
echo $ledger->search_form();
-echo HtmlInput::submit("viewsearch",_("Recherche"));
+echo HtmlInput::submit("viewsearch", _("Recherche"));
echo HtmlInput::button_close($target);
echo '</form>';
-if ( isset ($_GET['amount_min'])&& isset($_GET['amount_max'])&&
($_GET['amount_max']!=0 ||$_GET['amount_min']!=0 ))
+if
(isset($_GET['amount_min'])&&isset($_GET['amount_max'])&&($_GET['amount_max']!=0||$_GET['amount_min']!=0
))
{
- $_GET['viewsearch']=1;
- put_global(
- array
- (
- array('key'=>'ledger_type','value'=>'ALL')
- )
-
- );
-
+ $_GET['viewsearch']=1;
+ put_global(
+ array
+ (
+ array('key'=>'ledger_type', 'value'=>'ALL')
+ )
+ );
}
//-----------------------------------------------------
// Display search result
//-----------------------------------------------------
-if ( isset ($_GET['viewsearch']) )
+if (isset($_GET['viewsearch']))
{
// Navigation bar
$step=MAX_RECONCILE;
$page=(isset($_GET['offset']))?$_GET['page']:1;
$offset=(isset($_GET['offset']))?$_GET['offset']:0;
- if (count ($_GET) == 0)
+ if (count($_GET)==0)
$array=null;
else
$array=$_GET;
$array['p_action']='ALL';
- if ( ! isset ($array['date_start']) || ! isset ($array['date_end']))
+ if (!isset($array['date_start'])||!isset($array['date_end']))
{
- // get first date of current exercice
-
list($array['date_start'],$array['date_end'])=$g_user->get_limit_current_exercice();
+ // get first date of current exercice
+ list($array['date_start'],
$array['date_end'])=$g_user->get_limit_current_exercice();
}
- list($sql,$where)=$ledger->build_search_sql($array);
+ list($sql, $where)=$ledger->build_search_sql($array);
// Count nb of line
$max_line=$cn->count_sql($sql);
$target=$http->get("target");
- list($count,$content)=$ledger->list_operation_to_reconcile($sql,$target);
- $bar=navigation_bar($offset,$max_line,$step,$page);
+ list($count, $content)=$ledger->list_operation_to_reconcile($sql, $target);
+ $bar=navigation_bar($offset, $max_line, $step, $page);
- if (! $inside ) {
- echo $bar;
-
- } else
- {
- if ($step<$max_line ) echo '<h2 class="notice">'._('Liste limitée à
').$step._(' enregistrements. Le nombre d\'enregistrements trouvés est de ')
.$max_line.'</h2>';
- }
- echo '<form method="get" onsubmit="set_reconcile(this);return false">';
- echo HtmlInput::hidden("tiers",$tiers);
- echo HtmlInput::submit("upd_rec",_("Mettre à jour"));
- echo HtmlInput::get_to_hidden(array('ctlc','amount_id','ledger'));
- echo
HtmlInput::get_to_hidden(array('l','date_start','date_end','desc','amount_min','amount_max','qcodesearch_op','accounting','unpaid','gDossier','ledger_type'));
- echo $content;
- echo HtmlInput::submit("upd_rec",_("Mettre à jour"));
- if (! $inside )echo $bar;
+ if (!$inside)
+ {
+ echo $bar;
+ }
+ else
+ {
+ if ($step<$max_line)
+ echo '<h2 class="notice">'._('Liste limitée à ').$step._('
enregistrements. Le nombre d\'enregistrements trouvés est de
').$max_line.'</h2>';
+ }
+ echo '<form method="get" onsubmit="set_reconcile(this);return false">';
+ echo HtmlInput::hidden("tiers", $tiers);
+ echo HtmlInput::submit("upd_rec", _("Mettre à jour"));
+ echo HtmlInput::get_to_hidden(array('ctlc', 'amount_id', 'ledger'));
+ echo HtmlInput::get_to_hidden(array('l', 'date_start', 'date_end', 'desc',
'amount_min', 'amount_max', 'qcodesearch_op',
+ 'accounting', 'unpaid', 'gDossier', 'ledger_type'));
+ echo $content;
+ echo HtmlInput::submit("upd_rec", _("Mettre à jour"));
+ if (!$inside)
+ echo $bar;
- if (isset($_GET[$op.'r_jrn'])) {
- foreach ($_GET[$op.'r_jrn'] as $k=>$v)
- echo HtmlInput::hidden($op.'r_jrn['.$k.']',$v);
+ if (isset($_GET[$op.'r_jrn']))
+ {
+ foreach ($_GET[$op.'r_jrn'] as $k=> $v) echo
HtmlInput::hidden($op.'r_jrn['.$k.']', $v);
}
echo '</form>';
}
- [Noalyss-commit] [noalyss] 278/323: New Favicon, (continued)
- [Noalyss-commit] [noalyss] 278/323: New Favicon, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 282/323: CSS : color in selected cell, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 251/323: InPlaceEdit : cosmetic, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 279/323: Suivi : autres action: box déplacée vers la droite, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 272/323: CSS : change selected cell, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 274/323: COSMETIC : hightlight result, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 295/323: install plugin : cosmétique, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 301/323: Some dialog must be fixed, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 294/323: Bug : install plugin, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 250/323: Manage_Table_SQL : fix when not value is selected, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 258/323: indent,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 263/323: Gestion : block search on the current card, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 245/323: Remove obsolete hardcoded sort, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 291/323: Fix position calc for other CSS Sheet, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 308/323: CSS Cosmetic : button with border, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 315/323: Correct bug : Dashboard , zoom action failed, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 319/323: UpgradeCore improve, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 179/323: Documentation INum->prec, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 243/323: ajax_card : warning if there is no category of cards, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 265/323: CSS : table menu use the font SansationLight, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 281/323: FIN : hide disable ledger, Dany De Bontridder, 2018/03/14