Refactorisation

src/manual/invoice.inc.php

@@ -0,0 +1,27 @@
+<?php
+
+if (isset($_GET['emailsent'])) {
+	// Facture avec email envpyé mais pas marqué envoyé par email
+	$sql = 'SELECT DISTINCT a.fk_element
+		FROM '.DB_D_PREFIX.'facture f
+		INNER JOIN '.DB_D_PREFIX.'facture_extrafields f2 ON f2.fk_object=f.rowid
+		INNER JOIN '.DB_D_PREFIX.'actioncomm a ON a.elementtype="invoice" AND a.fk_element=f.rowid
+		WHERE a.code="AC_BILL_SENTBYMAIL" AND (f2.emailsent IS NULL OR f2.emailsent=0)';
+		pre_sql($sql);
+	$q = db::d_select($sql);
+	var_dump($q);
+	while($r=$q->fetch_assoc()) {
+		var_dump($r);	
+	}
+
+	// Facture avec email envpyé mais pas marqué envoyé par email
+	$sql = 'UPDATE '.DB_D_PREFIX.'facture f
+		INNER JOIN '.DB_D_PREFIX.'facture_extrafields f2 ON f2.fk_object=f.rowid
+		INNER JOIN '.DB_D_PREFIX.'actioncomm a ON a.elementtype="invoice" AND a.fk_element=f.rowid
+		SET f2.emailsent=1
+		WHERE a.code="AC_BILL_SENTBYMAIL" AND (f2.emailsent IS NULL OR f2.emailsent=0)';
+	pre_sql($sql);
+	if (isset($_GET['go'])) {
+		db::d_update($sql);
+	}
+}

web/clean.php

@@ -2,16 +2,6 @@
 
 require_once "bootstrap.inc.php";
 
-$options = ['product', 'product_attribute', 'product_lot', 'product_pack', 'supplier_price', 'stock'];
-
-echo '<p>';
-foreach($options as $option)
-	echo '<a href="?t='.$option.'">'.$option.'</a> | ';
-echo '</p>';
-
-if (empty($_GET['t']))
-	die('param t required');
-
-if (in_array($_GET['t'], $options))
-	require_once('../src/clean/'.$_GET['t'].'.inc.php');
-
+$inc_context = 'clean';
+$inc_options = ['product', 'product_attribute', 'product_lot', 'product_pack', 'supplier_price', 'stock'];
+require_once "context_include.inc.php";

web/context_include.inc.php

@@ -0,0 +1,21 @@
+<?php
+
+if (empty($inc_context) || empty($inc_options))
+	die();
+
+echo '<p>';
+foreach($inc_options as $option)
+	echo '<a href="?t='.$option.'">'.$option.'</a> | ';
+echo '</p>';
+
+if (empty($_GET['t']))
+	die('param t : required');
+if (!is_string($_GET['t']))
+	die('param t : string required');
+if (!in_array($_GET['t'], $inc_options))
+	die('param t : bad value');
+if (!file_exists($filename='../src/'.$inc_context.'/'.$_GET['t'].'.inc.php'))
+	die('File "'.$filename.'" does not exists');
+
+require_once($filename);
+	

web/install.php

@@ -2,16 +2,6 @@
 
 require_once "bootstrap.inc.php";
 
-$options = ['supplier', 'product', 'img', 'product_lot', 'supplier_price', 'customer', 'address', 'order', 'payment'];
-
-echo '<p>';
-foreach($options as $option)
-	echo '<a href="?t='.$option.'">'.$option.'</a> | ';
-echo '</p>';
-
-if (empty($_GET['t']))
-	die('param t required');
-	
-if (in_array($_GET['t'], $options))
-	require_once('../src/install/'.$_GET['t'].'.inc.php');
-
+$inc_context = 'install';
+$inc_options = ['supplier', 'product', 'img', 'product_lot', 'supplier_price', 'customer', 'address', 'order', 'payment'];
+require_once "context_include.inc.php";

web/list.php

@@ -2,16 +2,6 @@
 
 require_once "bootstrap.inc.php";
 
-$options = ['products', 'product_lot'];
-
-echo '<p>';
-foreach($options as $option)
-	echo '<a href="?t='.$option.'">'.$option.'</a> | ';
-echo '</p>';
-
-if (empty($_GET['t']))
-	die('param t required');
-	
-if (in_array($_GET['t'], $options))
-	require_once('../src/list/'.$_GET['t'].'.inc.php');
-
+$inc_context = 'list';
+$inc_options = ['products', 'product_lot'];
+require_once "context_include.inc.php";

web/manual.php

@@ -2,16 +2,6 @@
 
 require_once "bootstrap.inc.php";
 
-$options = ['supplier', 'product', 'product_lot', 'supplier_price', 'customer', 'address', 'order'];
-
-echo '<p>';
-foreach($options as $option)
-	echo '<a href="?t='.$option.'">'.$option.'</a> | ';
-echo '</p>';
-
-if (empty($_GET['t']))
-	die('param t required');
-	
-if (in_array($_GET['t'], $options))
-	require_once('../src/manual/'.$_GET['t'].'.inc.php');
-
+$inc_context = 'manual';
+$inc_options = ['supplier', 'product', 'product_lot', 'supplier_price', 'customer', 'address', 'order', 'invoice'];
+require_once "context_include.inc.php";

web/repair.php

@@ -2,16 +2,8 @@
 
 require_once "bootstrap.inc.php";
 
-$options = ['supplier', 'product', 'img', 'product_lot', 'supplier_price', 'order', 'customer', 'address', 'shipping', 'invoice'];
-
-echo '<p>';
-foreach($options as $option)
-	echo '<a href="?t='.$option.'">'.$option.'</a> | ';
-echo '</p>';
-
-if (empty($_GET['t']))
-	die('param t required');
-	
-if (in_array($_GET['t'], $options))
-	require_once('../src/repair/'.$_GET['t'].'.inc.php');
+$inc_context = 'repair';
+$inc_options = ['supplier', 'product', 'img', 'product_lot', 'supplier_price', 'order', 'customer', 'address', 'shipping', 'invoice'];
+require_once "context_include.inc.php";
 
+$options = ['supplier', 'product', 'img', 'product_lot', 'supplier_price', 'order', 'customer', 'address', 'shipping', 'invoice'];

web/resync.php

@@ -2,16 +2,6 @@
 
 require_once "bootstrap.inc.php";
 
-$options = ['auto', 'supplier', 'product', 'product2', 'img', 'product_lot', 'supplier_price', 'order', 'customer', 'address', 'stock', 'payment'];
-
-echo '<p>';
-foreach($options as $option)
-	echo '<a href="?t='.$option.'">'.$option.'</a> | ';
-echo '</p>';
-
-if (empty($_GET['t']))
-	die('param t required');
-	
-if (in_array($_GET['t'], $options) && file_exists($filename='../src/resync/'.$_GET['t'].'.inc.php'))
-	require_once($filename);
-
+$inc_context = 'resync';
+$inc_options = ['auto', 'supplier', 'product', 'product2', 'img', 'product_lot', 'supplier_price', 'order', 'customer', 'address', 'stock', 'payment'];
+require_once "context_include.inc.php";

web/send.php

@@ -2,16 +2,6 @@
 
 require_once "bootstrap.inc.php";
 
-$options = ['devis_form', 'facebook_devis', 'facebook_webhook'];
-
-echo '<p>';
-foreach($options as $option)
-	echo '<a href="?t='.$option.'">'.$option.'</a> | ';
-echo '</p>';
-
-if (empty($_GET['t']))
-	die('param t required');
-	
-if (in_array($_GET['t'], $options))
-	require_once('../src/send/'.$_GET['t'].'.inc.php');
-
+$inc_context = 'send';
+$inc_options = ['devis_form', 'facebook_devis', 'facebook_webhook'];
+require_once "context_include.inc.php";

web/update.php

@@ -2,16 +2,6 @@
 
 require_once "bootstrap.inc.php";
 
-$options = ['supplier', 'product', 'img', 'product_lot', 'supplier_price', 'order', 'customer', 'address'];
-
-echo '<p>';
-foreach($options as $option)
-	echo '<a href="?t='.$option.'">'.$option.'</a> | ';
-echo '</p>';
-
-if (empty($_GET['t']))
-	die('param t required');
-	
-if (in_array($_GET['t'], $options))
-	require_once('../src/update/'.$_GET['t'].'.inc.php');
-
+$inc_context = 'update';
+$inc_options = ['supplier', 'product', 'img', 'product_lot', 'supplier_price', 'order', 'customer', 'address'];
+require_once "context_include.inc.php";

web/verif.php

@@ -2,16 +2,6 @@
 
 require_once "bootstrap.inc.php";
 
-$options = ['supplier', 'product', 'img', 'product_lot', 'stock', 'supplier_price', 'order', 'customer', 'address'];
-
-echo '<p>';
-foreach($options as $option)
-	echo '<a href="?t='.$option.'">'.$option.'</a> | ';
-echo '</p>';
-
-if (empty($_GET['t']))
-	die('param t required');
-	
-if (in_array($_GET['t'], $options))
-	require_once('../src/verif/'.$_GET['t'].'.inc.php');
-
+$inc_context = 'verif';
+$inc_options = ['supplier', 'product', 'img', 'product_lot', 'stock', 'supplier_price', 'order', 'customer', 'address'];
+require_once "context_include.inc.php";