add($row[$e],"number");
- break;
- default:
- $csv->add($row[$e]);
- }
- }
- $csv->write();
- }
- }
- /**
- * @brief Find all lob and remove those which are not used by any tables
- *
- */
- function clean_orphan_lob()
- {
- // find all columns of type lob
- $sql ="
- select table_schema,table_name,column_name
- from
- information_schema.columns
- where table_schema not in ('information_schema','pg_catalog')
- and data_type='oid'";
- $all_lob= "
- select oid,'N' as used from pg_largeobject_metadata
- ";
- $a_table= $this->get_array($sql);
- $a_lob = $this->get_array($all_lob);
- if ( $a_table == false || $a_lob == false ) return;
- // for each lob
- $nb_lob=count($a_lob);
- $nb_table=count($a_table);
- for ($i=0;$i < $nb_lob;$i++)
- {
- $lob=$a_lob[$i]['oid'];
- if ( $a_lob[$i]['used']=='Y') continue;
- for ($j=0;$j < $nb_table;$j++)
- {
- if ( $a_lob[$i]['used']=='Y') continue;
- $check = $this->get_value(" select count(*) from ".
- $a_table[$j]['table_schema'].".".$a_table[$j]['table_name'].
- " where ".
- $a_table[$j]['column_name']."=$1",array($lob));
- if ( $check != 0 )
- $a_lob[$i]['used']='Y';
-
- }
- }
- for ($i=0;$i < $nb_lob;$i++)
- {
- if ( $a_lob[$i]['used']=='Y') continue;
- $this->lo_unlink($a_lob[$i]['oid']);
- }
- }
- /**
- * Check if a prepared statement already exists or not
- * @param string $query_name name of the prepared query
- * @return boolean false is not yet prepared
- */
- function is_prepare($query_name)
- {
- $nb_prepared=$this->get_value("select count(*) from pg_prepared_statements where name=$1",[$query_name]);
- if ( $nb_prepared==0)return FALSE;
- return TRUE;
- }
-
-}
-
-/* test::test_me(); */
diff --git a/include/lib/database_core.class.php b/include/lib/database_core.class.php
new file mode 100644
index 000000000..ff42ea6bd
--- /dev/null
+++ b/include/lib/database_core.class.php
@@ -0,0 +1,951 @@
+db = pg_connect("dbname=$p_dbname host='$p_host' user='$p_user'
+ password='$p_password' port=$p_port");
+ if ($this->db == false) {
+ if (DEBUG) {
+
+ echo ''._('Impossible de se connecter à postgreSql').'
';
+ echo '';
+ echo _("Vos paramètres sont incorrectes").":
";
+ echo "
";
+ printf (_("base de donnée = %s"), $p_dbname)."
";
+ printf (_("Port %s"),$p_port )."
";
+ printf ( _("Utilisateur : %s"),$p_user )."
";
+ echo '
';
+
+ die();
+ } else {
+ echo '' . _('Erreur de connexion !') . '
';
+ $this->is_open = false;
+ throw new Exception(_('Erreur Connexion'));
+ }
+ }
+
+ $this->is_open = TRUE;
+
+ }
+
+ public function verify()
+ {
+ // Verify that the elt we want to add is correct
+ }
+
+ function set_encoding($p_charset)
+ {
+ pg_set_client_encoding($this->db, $p_charset);
+ }
+
+ function get_encoding()
+ {
+ return pg_client_encoding($this->db);
+ }
+
+
+ /**
+ * @return mixed
+ */
+ public function get_db()
+ {
+ return $this->db;
+ }
+
+ /**
+ * @param mixed $db
+ */
+ public function set_db($db)
+ {
+ $this->db = $db;
+ }
+
+ /**
+ * @return mixed
+ */
+ public function get_ret()
+ {
+ return $this->ret;
+ }
+
+ /**
+ * @param mixed $ret
+ */
+ public function set_ret($ret)
+ {
+ $this->ret = $ret;
+ }
+
+ /**
+ * @return mixed
+ */
+ public function get_is_open()
+ {
+ return $this->is_open;
+ }
+
+ /**
+ * @param mixed $is_open
+ */
+ public function set_is_open($is_open)
+ {
+ $this->is_open = $is_open;
+ }
+
+ /**
+ * \brief send a sql string to the database
+ * \param $p_string sql string
+ * \param $p_array array for the SQL string (see pg_query_params)
+ * \return the result of the query, a resource or false if an
+ * error occured
+ */
+
+ function exec_sql($p_string, $p_array = null)
+ {
+ try {
+ if (!$this->is_open) throw new Exception(' Database is closed');
+ $this->sql = $p_string;
+ $this->array = $p_array;
+
+ if ($p_array == null) {
+ if (!DEBUG)
+ $this->ret = pg_query($this->db, $p_string);
+ else
+ $this->ret = @pg_query($this->db, $p_string);
+ } else {
+ $a = is_array($p_array);
+ if (!is_array($p_array)) {
+ throw new Exception("Erreur : exec_sql attend un array");
+ }
+ if (!DEBUG)
+ $this->ret = pg_query_params($this->db, $p_string, $p_array);
+ else
+ $this->ret = @pg_query_params($this->db, $p_string, $p_array);
+ }
+ if (!$this->ret) {
+ $str_error = pg_last_error($this->db) . pg_result_error($this->ret);
+ throw new Exception(" SQL ERROR $p_string " . $str_error, 1);
+ }
+ } catch (Exception $a) {
+ if (DEBUG) {
+ print_r($p_string);
+ print_r($p_array);
+ echo $a->getMessage();
+ echo $a->getTraceAsString();
+ echo pg_last_error($this->db);
+ }
+ record_log($a->getTraceAsString());
+ $this->rollback();
+
+ throw ($a);
+ }
+
+ return $this->ret;
+ }
+
+ /**
+ * \brief Count the number of row returned by a sql statement
+ *
+ * \param $p_sql sql string
+ * \param $p_array if not null we use the safer pg_query_params
+ */
+
+ function count_sql($p_sql, $p_array = null)
+ {
+ $r_sql = $this->exec_sql($p_sql, $p_array);
+ return pg_NumRows($r_sql);
+ }
+
+ /**
+ * \brief get the current sequence value
+ */
+
+ function get_current_seq($p_seq)
+ {
+ $Res = $this->get_value("select currval('$p_seq') as seq");
+ return $Res;
+ }
+
+ /**
+ * \brief get the next sequence value
+ */
+
+ function get_next_seq($p_seq)
+ {
+ $Res = $this->exec_sql("select nextval('$p_seq') as seq");
+ $seq = pg_fetch_array($Res, 0);
+ return $seq['seq'];
+ }
+
+ /**
+ * @brief : start a transaction
+ *
+ */
+ function start()
+ {
+ $Res = $this->exec_sql("start transaction");
+ }
+
+ /**
+ * Commit the transaction
+ *
+ */
+ function commit()
+ {
+ if (!$this->is_open) return;
+ $Res = $this->exec_sql("commit");
+ }
+
+ /**
+ * rollback the current transaction
+ */
+ function rollback()
+ {
+ if (!$this->is_open) return;
+ $Res = $this->exec_sql("rollback");
+ }
+
+ /**
+ * @brief alter the sequence value
+ * @param $p_name name of the sequence
+ * @param $min the start value of the sequence
+ */
+ function alter_seq($p_name, $min)
+ {
+ if ($min < 1)
+ $min = 1;
+ $Res = $this->exec_sql("alter sequence $p_name restart $min");
+ }
+
+ /**
+ * \brief Execute a sql script
+ * \param $script script name
+ */
+
+ function execute_script($script)
+ {
+
+ if (!DEBUG) {
+ ob_start();
+ } else {
+ $debug = fopen("/tmp/debug.log", "w+");
+ }
+ $hf = fopen($script, 'r');
+ if ($hf == false) {
+ throw new Exception ('Ne peut ouvrir ' . $script);
+ }
+ $sql = "";
+ $flag_function = false;
+ while (!feof($hf)) {
+ $buffer = fgets($hf);
+ $buffer = str_replace('$BODY$', '$_$', $buffer);
+ print $buffer . "
";
+ // comment are not execute
+ if (substr($buffer, 0, 2) == "--") {
+ //echo "comment $buffer";
+ continue;
+ }
+ // Blank Lines Are Skipped
+ If (Strlen($buffer) == 0) {
+ //echo "Blank $buffer";
+ Continue;
+ }
+ if (strpos(strtolower($buffer), "create function") === 0) {
+ echo "found a function";
+ $flag_function = true;
+ $sql = $buffer;
+ continue;
+ }
+ if (strpos(strtolower($buffer), "create or replace function") === 0) {
+ echo "found a function";
+ $flag_function = true;
+ $sql = $buffer;
+ continue;
+ }
+ // No semi colon -> multiline command
+ if ($flag_function == false && strpos($buffer, ';') == false) {
+ $sql .= $buffer;
+ continue;
+ }
+ if ($flag_function) {
+ if (strpos(strtolower($buffer), "$$;") === false &&
+ strpos(strtolower($buffer), '$_$;') === false &&
+ strpos(strtolower($buffer), '$function$;') === false &&
+ strpos(strtolower($buffer), 'language plpgsql;') === false &&
+ strpos(strtolower($buffer), 'language plpgsql ;') === false
+ ) {
+ $sql .= $buffer;
+ continue;
+ }
+ } else {
+ // cut the semi colon
+ $buffer = str_replace(';', '', $buffer);
+ }
+ $sql .= $buffer;
+ if (DEBUG) fwrite($debug, $sql);
+ if ($this->exec_sql($sql) == false) {
+
+ $this->rollback();
+ if (!DEBUG)
+ ob_end_clean();
+ print "ERROR : $sql";
+ throw new Exception("ERROR : $sql");
+ }
+ $sql = "";
+ $flag_function = false;
+ print "
";
+ } // while (feof)
+ fclose($hf);
+ if (!DEBUG)
+ ob_end_clean();
+ }
+
+
+ /**
+ * @brief fetch the $p_indice array from the last query
+ * @param $p_indice index
+ *
+ */
+ function fetch($p_indice)
+ {
+ if ($this->ret == false)
+ throw new Exception('this->ret is empty');
+ return pg_fetch_array($this->ret, $p_indice);
+ }
+
+ /**
+ *
+ * @brief return the number of rows found by the last query, or the number
+ * of rows from $p_ret
+ * @param $p_ret is the result of a query, the default value is null, in that case
+ * it is related to the last query
+ * @note synomym for count()
+ */
+
+ function size($p_ret = null)
+ {
+ if ($p_ret == null)
+ return pg_NumRows($this->ret);
+ else
+ return pg_NumRows($p_ret);
+ }
+
+ /**
+ * @brief synomym for size()
+ */
+
+ function count($p_ret = null)
+ {
+ return $this->size($p_ret);
+ }
+
+
+ /**
+ *
+ * \brief return the value of the sql, the sql will return only one value
+ * with the value
+ * \param $p_sql the sql stmt example :select s_value from
+ * document_state where s_id=2
+ * \param $p_array if array is not null we use the ExecSqlParm (safer)
+ * \see exec_sql
+ * \note print a warning if several value are found, if only the first value is needed
+ * consider using a LIMIT clause
+ * \return only the first value or an empty string if nothing is found
+ */
+
+ function get_value($p_sql, $p_array = null)
+ {
+ try {
+ $this->ret = $this->exec_sql($p_sql, $p_array);
+ $r = pg_NumRows($this->ret);
+ if ($r == 0)
+ return "";
+ if ($r > 1) {
+ $array = pg_fetch_all($this->ret);
+ throw new Exception("Attention $p_sql retourne " . pg_NumRows($this->ret) . " valeurs " .
+ var_export($p_array, true) . " values=" . var_export($array, true));
+ }
+ $r = pg_fetch_row($this->ret, 0);
+ return $r[0];
+
+ } catch (Exception $ex) {
+ throw($ex);
+ }
+ }
+
+ /**
+ * @brief return the number of rows affected by the previous query
+ */
+ function get_affected()
+ {
+ return Database::num_row($this->ret);
+ }
+
+ /**
+ * \brief purpose return the result of a sql statment
+ * in a array
+ * \param $p_sql sql query
+ * \param $p_array if not null we use ExecSqlParam
+ * \return false if nothing is found
+ */
+
+ function get_array($p_sql, $p_array = null)
+ {
+ $r = $this->exec_sql($p_sql, $p_array);
+
+ if (pg_NumRows($r) == 0)
+ return array();
+ $array = pg_fetch_all($r);
+ return $array;
+ }
+
+ /**
+ * Returns only one row from a query
+ * @param string $p_sql
+ * @param array $p_array
+ * @return array , idx = column of the table or null if nothing is found
+ * @throws Exception if too many rows are found code 100
+ */
+ function get_row($p_sql, $p_array = NULL)
+ {
+ $array = $this->get_array($p_sql, $p_array);
+ if (empty($array)) return null;
+ if (count($array) == 1) return $array[0];
+ throw new Exception(_("Database:get_row retourne trop de lignes"), 100);
+ }
+
+ /**
+ * @brief Create a sequence
+ * @param string $p_name Sequence Name
+ * @param int $min starting value
+ */
+ function create_sequence($p_name, $min = 1)
+ {
+ if ($min < 1)
+ $min = 1;
+ $sql = "create sequence " . $p_name . " minvalue $min";
+ $this->exec_sql($sql);
+ }
+
+ /**
+ * \brief test if a sequence exist */
+ /* \return true if the seq. exist otherwise false
+ */
+
+ function exist_sequence($p_name)
+ {
+ $r = $this->count_sql("select relname from pg_class where relname=lower($1)", array($p_name));
+ if ($r == 0)
+ return false;
+ return true;
+ }
+
+ /**
+ * \brief test if a table exist
+ * \param $p_name table name
+ * \param $schema name of the schema default public
+ * \return true if a table exist otherwise false
+ */
+
+ function exist_table($p_name, $p_schema = 'public')
+ {
+ $r = $this->count_sql("select table_name from information_schema.tables where table_schema=$1 and table_name=lower($2)", array($p_schema, $p_name));
+ if ($r == 0)
+ return false;
+ return true;
+ }
+
+ /**
+ * Check if a column exists in a table
+ * @param $col : column name
+ * @param $table :table name
+ * @param $schema :schema name, default public
+ * @return true or false
+ */
+ function exist_column($col, $table, $schema)
+ {
+ $r = $this->get_value('select count(*) from information_schema.columns where table_name=lower($1) and column_name=lower($2) and table_schema=lower($3)', array($col, $table, $schema));
+ if ($r > 0)
+ return true;
+ return false;
+ }
+
+
+ /**
+ * Count the database name in a system view
+ * @param $p_name string database name
+ * @return number of database found (normally 0 or 1)
+ */
+ function exist_database($p_name)
+ {
+ $database_exist = $this->get_value('select count(*)
+ from pg_catalog.pg_database where datname = lower($1)', array($p_name));
+ return $database_exist;
+ }
+
+ /**
+ * @brief check if the large object exists
+ * @param $p_oid of the large object
+ * @return return true if the large obj exist or false if not
+ */
+ function exist_blob($p_oid)
+ {
+ $r = $this->get_value('select count(*) from pg_largeobject_metadata where oid=$1'
+ , array($p_oid));
+ if ($r > 0)
+ return true;
+ else
+ return false;
+ }
+
+ /*
+ *!\brief test if a view exist
+ * \return true if the view. exist otherwise false
+ */
+
+ function exist_view($p_name)
+ {
+ $r = $this->count_sql("select viewname from pg_views where viewname=lower($1)", array($p_name));
+ if ($r == 0)
+ return false;
+ return true;
+ }
+
+ /*
+ *!\brief test if a schema exists
+ * \return true if the schemas exists otherwise false
+ */
+
+ function exist_schema($p_name)
+ {
+ $r = $this->count_sql("select nspname from pg_namespace where nspname=lower($1)", array($p_name));
+ if ($r == 0)
+ return false;
+ return true;
+ }
+
+ /**
+ * \brief create a string containing the value separated by comma
+ * for use in a SQL in statement
+ * \return the string or empty if nothing is found
+ * \see fid_card.php
+ */
+
+ function make_list($sql, $p_array = null)
+ {
+ if ($p_array == null) {
+ $aArray = $this->get_array($sql);
+ } else {
+ $aArray = $this->get_array($sql, $p_array);
+ }
+ if (empty($aArray))
+ return "";
+ $aIdx = array_keys($aArray[0]);
+ $idx = $aIdx[0];
+ $ret = "";
+ $f = "";
+ for ($i = 0; $i < count($aArray); $i++) {
+ $row = $aArray[$i];
+ $ret .= $f . $aArray[$i][$idx];
+ $f = ',';
+ }
+ $ret = trim($ret, ',');
+ return $ret;
+ }
+
+ /**
+ * \brief make a array with the sql.
+ *
+ * \param $p_sql sql statement, only the first two column will be returned in
+ * an array. The first col. is the label and the second the value
+ * \param $p_null if the array start with a null value
+ * \param $p_array is the array with the bind value
+ * \note this function is used with ISelect when it is needed to have a list of
+ * options.
+ * \return: a double array like
+ * \verbatim
+ * Array
+ * (
+ * [0] => Array
+ * (
+ * [value] => 1
+ * [label] => Marchandise A
+ * )
+ *
+ * [1] => Array
+ * (
+ * [value] => 2
+ * [label] => Marchandise B
+ * )
+ *
+ * [2] => Array
+ * (
+ * [value] => 3
+ * [label] => Marchandise C
+ * )
+ * )
+ * \endverbatim
+ * \see ISelect
+ */
+
+ function make_array($p_sql, $p_null = 0, $p_array = null)
+ {
+ $a = $this->exec_sql($p_sql, $p_array);
+ $max = pg_NumRows($a);
+ if ($max == 0 && $p_null == 0)
+ return null;
+ for ($i = 0; $i < $max; $i++) {
+ $row = pg_fetch_row($a);
+ $r[$i]['value'] = $row[0];
+ $r[$i]['label'] = h($row[1]);
+ }
+ // add a blank item ?
+ if ($p_null == 1) {
+ for ($i = $max; $i != 0; $i--) {
+ $r[$i]['value'] = $r[$i - 1]['value'];
+ $r[$i]['label'] = h($r[$i - 1]['label']);
+ }
+ $r[0]['value'] = -1;
+ $r[0]['label'] = " ";
+ } // if ( $p_null == 1 )
+
+ return $r;
+ }
+
+ /***
+ * \brief Save a document into the database , it just puts the file in the database
+ * and returns the corresponding OID , the mimetype , size ... of the document
+ * must be set in the calling function.
+ *
+ * \param name of the variable in $_FILES
+ * \return $oid of the lob file if success
+ * false if a error occurs or if there is no file to upload
+ *
+ */
+
+ function upload($p_name)
+ {
+ /* there is no file to upload */
+ if ($_FILES[$p_name]["error"] == UPLOAD_ERR_NO_FILE) {
+ return false;
+ }
+
+ $new_name = tempnam($_ENV['TMP'], $p_name);
+ if ($_FILES[$p_name]["error"] > 0) {
+ print_r($_FILES);
+ echo_error(__FILE__ . ":" . __LINE__ . "Error: " . $_FILES[$p_name]["error"]);
+ return false;
+ }
+ if (strlen($_FILES[$p_name]['tmp_name']) != 0) {
+ if (move_uploaded_file($_FILES[$p_name]['tmp_name'], $new_name)) {
+ // echo "Image saved";
+ $oid = pg_lo_import($this->db, $new_name);
+ if ($oid == false) {
+ echo_error(__FILE__, __LINE__, "cannot upload document");
+ $this->rollback();
+ return false;
+ }
+ return $oid;
+ } else {
+ echo "Error
";
+ $this->rollback();
+ return false;
+ }
+ }
+ return false;
+ }
+
+ /**\brief wrapper for the function pg_NumRows
+ * \param $ret is the result of a exec_sql
+ * \return number of line affected
+ */
+
+ static function num_row($ret)
+ {
+ return pg_NumRows($ret);
+ }
+
+ /**\brief wrapper for the function pg_fetch_array
+ * \param $ret is the result of a pg_exec
+ * \param $p_indice is the index
+ * \return $array of column
+ */
+
+ static function fetch_array($ret, $p_indice = 0)
+ {
+ return pg_fetch_array($ret, $p_indice);
+ }
+
+ /**\brief wrapper for the function pg_fetch_all
+ * \param $ret is the result of pg_exec (exec_sql)
+ * \return double array (row x col )
+ */
+
+ static function fetch_all($ret)
+ {
+ return pg_fetch_all($ret);
+ }
+
+ /**\brief wrapper for the function pg_fetch_all
+ * \param $ret is the result of pg_exec (exec_sql)
+ * \param $p_row is the indice of the row
+ * \param $p_col is the indice of the col
+ * \return a string or an integer
+ */
+
+ static function fetch_result($ret, $p_row = 0, $p_col = 0)
+ {
+ return pg_fetch_result($ret, $p_row, $p_col);
+ }
+
+ /**
+ * \brief wrapper for the function pg_fetch_row
+ * \param $ret is the result of pg_exec (exec_sql)
+ * \param $p_row is the indice of the row
+ * \return an array indexed from 0
+ */
+ static function fetch_row($ret, $p_row)
+ {
+ return pg_fetch_row($ret, $p_row);
+ }
+
+ /**\brief wrapper for the function pg_lo_unlink
+ * \param $p_oid is the of oid
+ * \return return the result of the operation
+ */
+
+ function lo_unlink($p_oid)
+ {
+ if (!$this->exist_blob($p_oid)) return;
+ return pg_lo_unlink($this->db, $p_oid);
+ }
+
+ /**\brief wrapper for the function pg_prepare
+ * \param $p_string string name for pg_prepare function
+ * \param $p_sql is the sql to prepare
+ * \return return the result of the operation
+ */
+
+ function prepare($p_string, $p_sql)
+ {
+ return pg_prepare($this->db, $p_string, $p_sql);
+ }
+
+ /**
+ * \brief wrapper for the function pg_execute
+ * \param $p_string string name of the stmt given in pg_prepare function
+ * \param $p_array contains the variables
+ * \note set this->ret to the return of pg_execute
+ * \return return the result of the operation,
+ */
+
+ function execute($p_string, $p_array)
+ {
+ $this->ret = pg_execute($this->db, $p_string, $p_array);
+ return $this->ret;
+ }
+
+ /**
+ * \brief wrapper for the function pg_lo_export
+ * \param $p_oid is the oid of the log
+ * \param $tmp is the file
+ * \return result of the operation
+ */
+
+ function lo_export($p_oid, $tmp)
+ {
+ return pg_lo_export($this->db, $p_oid, $tmp);
+ }
+
+ /**\brief wrapper for the function pg_lo_export
+ * \param $p_oid is the filename
+ * \param $tmp is the file
+ * \return result of the operation
+ */
+
+ function lo_import($p_oid)
+ {
+ return pg_lo_import($this->db, $p_oid);
+ }
+
+ /**\brief wrapper for the function pg_escape_string
+ * \param $p_string is the string to escape
+ * \return escaped string
+ */
+
+ static function escape_string($p_string)
+ {
+ return pg_escape_string($p_string);
+ }
+
+ /**\brief wrapper for the function pg_close
+ */
+
+ function close()
+ {
+ if ($this->is_open) pg_close($this->db);
+ $this->is_open = FALSE;
+ }
+
+ /**\brief
+ * \param
+ * \return
+ * \note
+ * \see
+ */
+
+ function __toString()
+ {
+ return "database ";
+ }
+
+ static function test_me()
+ {
+
+ }
+
+ function status()
+ {
+ return pg_transaction_status($this->db);
+ }
+
+
+ /**
+ * @brief Find all lob and remove those which are not used by any tables
+ *
+ */
+ function clean_orphan_lob()
+ {
+ // find all columns of type lob
+ $sql = "
+ select table_schema,table_name,column_name
+ from
+ information_schema.columns
+ where table_schema not in ('information_schema','pg_catalog')
+ and data_type='oid'";
+ $all_lob = "
+ select oid,'N' as used from pg_largeobject_metadata
+ ";
+ $a_table = $this->get_array($sql);
+ $a_lob = $this->get_array($all_lob);
+ if ($a_table == false || $a_lob == false) return;
+ // for each lob
+ $nb_lob = count($a_lob);
+ $nb_table = count($a_table);
+ for ($i = 0; $i < $nb_lob; $i++) {
+ $lob = $a_lob[$i]['oid'];
+ if ($a_lob[$i]['used'] == 'Y') continue;
+ for ($j = 0; $j < $nb_table; $j++) {
+ if ($a_lob[$i]['used'] == 'Y') continue;
+ $check = $this->get_value(" select count(*) from " .
+ $a_table[$j]['table_schema'] . "." . $a_table[$j]['table_name'] .
+ " where " .
+ $a_table[$j]['column_name'] . "=$1", array($lob));
+ if ($check != 0)
+ $a_lob[$i]['used'] = 'Y';
+
+ }
+ }
+ for ($i = 0; $i < $nb_lob; $i++) {
+ if ($a_lob[$i]['used'] == 'Y') continue;
+ $this->lo_unlink($a_lob[$i]['oid']);
+ }
+ }
+
+ /**
+ * Check if a prepared statement already exists or not
+ * @param string $query_name name of the prepared query
+ * @return boolean false is not yet prepared
+ */
+ function is_prepare($query_name)
+ {
+ $nb_prepared = $this->get_value("select count(*) from pg_prepared_statements where name=$1", [$query_name]);
+ if ($nb_prepared == 0) return FALSE;
+ return TRUE;
+ }
+
+ /**
+ * with the handle of a successull query, echo each row into CSV and
+ * send it directly
+ * @param type $ret handle to a query
+ * @param type $aheader double array, each item of the array contains
+ * a key type (num) and a key title
+ */
+ function query_to_csv($ret, $aheader)
+ {
+ $csv = new Noalyss_Csv("db-query");
+ $a_header = [];
+ for ($i = 0; $i < count($aheader); $i++) {
+ $a_header[] = $aheader[$i]['title'];
+ }
+ $csv->write_header($a_header);
+
+ // fetch all the rows
+ for ($i = 0; $i < Database::num_row($ret); $i++) {
+ $row = Database::fetch_array($ret, $i);
+ // for each rows, for each value
+ for ($e = 0; $e < count($row) / 2; $e++) {
+ switch ($aheader[$e]['type']) {
+ case 'num':
+ $csv->add($row[$e], "number");
+ break;
+ default:
+ $csv->add($row[$e]);
+ }
+ }
+ $csv->write();
+ }
+ }
+}
+
+/* test::test_me(); */
diff --git a/include/lib/filetosend.class.php b/include/lib/filetosend.class.php
index fa9b4e3be..fc7479940 100644
--- a/include/lib/filetosend.class.php
+++ b/include/lib/filetosend.class.php
@@ -16,19 +16,19 @@
* 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 danydb@aevalys.eu
+// Copyright Author Dany De Bontridder danydb@noalyss.eu
/**
*@file
* @brief file to add to a message
*
- * @see Sendmail
+ * @see Sendmail_Core
* @author dany
*/
/**
* @brief file to add to a message
*
- * @see Sendmail
+ * @see Sendmail_Core
* @author dany
*/
diff --git a/include/lib/html_input.class.php b/include/lib/html_input.class.php
index 10426dc42..8785d2607 100755
--- a/include/lib/html_input.class.php
+++ b/include/lib/html_input.class.php
@@ -22,11 +22,11 @@ require_once NOALYSS_INCLUDE.'/lib/icon_action.class.php';
// Copyright Author Dany De Bontridder danydb@aevalys.eu
-/* ! \file
+/*! \file
* \brief This class is used to create all the HTML INPUT TYPE
*/
-/* !
+/*!
* \brief class widget This class is used to create all the HTML INPUT TYPE
* and some specials which works with javascript like
* js_search.
@@ -55,20 +55,20 @@ require_once NOALYSS_INCLUDE.'/lib/icon_action.class.php';
class HtmlInput
{
- var $type; /* !< $type type of the widget */
- var $name; /* !< $name field NAME of the INPUT */
- var $value; /* !< $value what the INPUT contains */
- var $readOnly; /* !< $readonly true : we cannot change value */
- var $size; /* !< $size size of the input */
- var $selected; /* !< $selected for SELECT RADIO and CHECKBOX the selected value */
- var $table; /* !< $table =1 add the table tag */
- var $label; /* !< $label the question before the input */
- var $disabled; /* !< $disabled poss. value == true or nothing, to disable INPUT */
- var $extra; /* !< $extra different usage, it depends of the $type */
- var $extra2; /* !< $extra2 different usage,
+ var $type; /*!< $type type of the widget */
+ var $name; /*!< $name field NAME of the INPUT */
+ var $value; /*!< $value what the INPUT contains */
+ var $readOnly; /*!< $readonly true : we cannot change value */
+ var $size; /*!< $size size of the input */
+ var $selected; /*!< $selected for SELECT RADIO and CHECKBOX the selected value */
+ var $table; /*!< $table =1 add the table tag */
+ var $label; /*!< $label the question before the input */
+ var $disabled; /*!< $disabled poss. value == true or nothing, to disable INPUT */
+ var $extra; /*!< $extra different usage, it depends of the $type */
+ var $extra2; /*!< $extra2 different usage,
it depends of the $type */
- var $javascript; /* !< $javascript is the javascript to add to the widget */
- var $ctrl; /* !<$ctrl is the control to update (see js_search_card_control) */
+ var $javascript; /*!< $javascript is the javascript to add to the widget */
+ var $ctrl; /*!<$ctrl is the control to update (see js_search_card_control) */
var $tabindex;
function __construct($p_name="", $p_value="", $p_id="")
@@ -94,7 +94,7 @@ class HtmlInput
$this->readOnly=$p_read;
}
- /* !\brief set the extra javascript property for the INPUT field
+ /*!\brief set the extra javascript property for the INPUT field
* \param $p_name name of the parameter
* \param $p_value default value of this parameter
*/
@@ -229,7 +229,7 @@ class HtmlInput
return self::hidden('plugin_code', $_REQUEST['plugin_code']);
}
- /* !\brief create a button with a ref
+ /*!\brief create a button with a ref
* \param $p_label the text
* \param $p_value the location of the window,
* \param $p_name the id of the span
diff --git a/include/lib/http_input.class.php b/include/lib/http_input.class.php
index 77b3e1287..68d9648d1 100644
--- a/include/lib/http_input.class.php
+++ b/include/lib/http_input.class.php
@@ -8,7 +8,7 @@
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * PhpCompta is distributed in the hope that it will be useful,
+ * NOALYSS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/include/lib/icon_action.class.php b/include/lib/icon_action.class.php
index 070a2014b..7c59fef75 100644
--- a/include/lib/icon_action.class.php
+++ b/include/lib/icon_action.class.php
@@ -8,7 +8,7 @@
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * PhpCompta is distributed in the hope that it will be useful,
+ * NOALYSS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/include/lib/idate.class.php b/include/lib/idate.class.php
index b3a466b81..f61901f71 100644
--- a/include/lib/idate.class.php
+++ b/include/lib/idate.class.php
@@ -47,7 +47,7 @@ class IDate extends HtmlInput
$this->autofocus=false;
}
- /* !\brief show the html input of the widget */
+ /*!\brief show the html input of the widget */
public function input($p_name=null, $p_value=null)
{
@@ -90,7 +90,7 @@ class IDate extends HtmlInput
return $r;
}
- /* !\brief print in html the readonly value of the widget */
+ /*!\brief print in html the readonly value of the widget */
public function display()
{
diff --git a/include/lib/inplace_switch.class.php b/include/lib/inplace_switch.class.php
index 8120a8f9e..77d395331 100644
--- a/include/lib/inplace_switch.class.php
+++ b/include/lib/inplace_switch.class.php
@@ -8,7 +8,7 @@
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * PhpCompta is distributed in the hope that it will be useful,
+ * NOALYSS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/include/lib/inum.class.php b/include/lib/inum.class.php
index 489ccef13..f17e857d5 100644
--- a/include/lib/inum.class.php
+++ b/include/lib/inum.class.php
@@ -20,11 +20,11 @@
// Copyright Author Dany De Bontridder danydb@aevalys.eu
-/* !\file
+/*!\file
* \brief for the numeric input text field
*/
require_once NOALYSS_INCLUDE.'/lib/itext.class.php';
-/* !\brief
+/*!\brief
* This class handles only the numeric input, the input will
* call a javascript
* to change comma to period and will round it (2 decimal), the precision is given by
@@ -51,7 +51,7 @@ class INum extends IText
$this->javascript='onchange="format_number(this,2);"';
}
- /* !\brief print in html the readonly value of the widget */
+ /*!\brief print in html the readonly value of the widget */
public function display()
{
@@ -73,7 +73,7 @@ class INum extends IText
return $r;
}
- /* !\brief show the html input of the widget */
+ /*!\brief show the html input of the widget */
public function input($p_name=null, $p_value=null)
{
diff --git a/include/lib/pdf.class.php b/include/lib/pdf.class.php
deleted file mode 100644
index 42efcaa8d..000000000
--- a/include/lib/pdf.class.php
+++ /dev/null
@@ -1,438 +0,0 @@
-width=$w ;
- $this->height=$h ;
- $this->text=$txt;
- $this->border=$border;
- $this->new_line=$ln;
- $this->align=$align;
- $this->fill=$fill;
- $this->link=$link;
- $this->type=$type;
- return $this;
- }
-}
-class PDF extends TFPDF
-{
-
- var $cn = null;
- var $own = null;
- var $soc = "";
- var $dossier = "n/a";
- var $date = "";
- private $cells=array();
-
- public function __construct ($p_cn = null, $orientation = 'P', $unit = 'mm', $format = 'A4')
- {
- $this->bigger=0;
- if($p_cn == null) die("No database connection. Abort.");
-
- parent::__construct($orientation, $unit, $format);
- $this->AddFont('DejaVu','','DejaVuSans.ttf',true);
- $this->AddFont('DejaVu','B','DejaVuSans-Bold.ttf',true);
- $this->AddFont('DejaVu','BI','DejaVuSans-BoldOblique.ttf',true);
- $this->AddFont('DejaVuCond','','DejaVuSansCondensed.ttf',true);
- $this->AddFont('DejaVuCond','B','DejaVuSansCondensed-Bold.ttf',true);
- $this->AddFont('DejaVuCond','I','DejaVuSansCondensed-Oblique.ttf',true);
- date_default_timezone_set ('Europe/Paris');
-
- $this->cn = $p_cn;
- $this->own = new Noalyss_Parameter_Folder($this->cn);
- $this->soc = $this->own->MY_NAME;
- $this->date = date('d.m.Y');
- $this->cells=array();
- }
-
- function setDossierInfo($dossier = "n/a")
- {
- $this->dossier = dossier::name()." ".$dossier;
- }
-
- function Header()
- {
- //Arial bold 12
- $this->SetFont('DejaVu', 'B', 12);
- //Title
- parent::Cell(0,10,$this->dossier, 'B', 0, 'C');
- //Line break
- parent::Ln(20);
- }
- function Footer()
- {
- //Position at 2 cm from bottom
- $this->SetY(-20);
- //Arial italic 8
- $this->SetFont('Arial', '', 8);
- //Page number
- parent::Cell(0,8,'Date '.$this->date." - Page ".$this->PageNo().'/{nb}',0,0,'C');
- parent::Ln(3);
- // Created by NOALYSS
- parent::Cell(0,8,'Created by NOALYSS, online on http://www.noalyss.eu',0,0,'C',false,'http://www.noalyss.eu');
- }
- /**
- * Count the number of rows a p_text will take for a multicell
- * @param $p_text String
- * @param $p_colSize size of the column in User Unit
- */
- private function count_nb_row($p_text,$p_colSize)
- {
- // If colSize is bigger than the size of the string then it takes 1 line
- if ( $this->GetStringWidth($p_text) <= $p_colSize) return 1;
- $nRow=0;
- $aWords=explode(' ',$p_text);
- $nb_words=count($aWords);
- $string="";
-
- for ($i=0;$i < $nb_words;$i++){
- // Concatenate String with current word + a space
- $string.=$aWords[$i];
-
- // if there is a word after add a space
- if ( $i+1 < $nb_words) $string.=" ";
-
- // Compute new size and compare to the colSize
- if ( $this->GetStringWidth($string) >= $p_colSize) {
- // If the size of the string if bigger than we add a row, the current
- // word is the first word of the next line
- $nRow++;
- $string=$aWords[$i];
- }
- }
- $nRow++;
- return $nRow;
-
-
-
- }
- /**
- * Check if a page must be added due a MultiCell
- * @return boolean
- */
- private function check_page_add()
- {
- // break on page
- $size=count($this->cells);
- for ($i=0;$i < $size ; $i++)
- {
- if ($this->cells[$i]->type == 'M' )
- {
- /**
- * On doit calculer si le texte dépasse la texte et compter le
- * nombre de lignes que le texte prendrait. Ensuite il faut
- * faire un saut de page (renvoit true) si dépasse
- */
-
- $sizetext=$this->GetStringWidth($this->cells[$i]->text);
-
- // if text bigger than column width then check
-
- $y=$this->GetY();
- $nb_row=$this->count_nb_row($this->cells[$i]->text, $this->cells[$i]->width);
- $height=$this->cells[$i]->height*$nb_row;
-
- // If the text is bigger than a sheet of paper then return false
- if ($height >= $this->h) return false;
-
- if ( $y + $height > ($this->h - $this->bMargin -7 ))
- return true;
-
- }
- }
- return false;
- }
- private function print_row()
- {
- static $e=0;
- $e++;
- if ( $this->check_page_add() == true ) $this->AddPage ();
- $this->bigger=0;
- $size=count($this->cells);
- $cell=$this->cells;
- if ($size == 0 )return;
- for ($i=0;$i < $size ; $i++)
- {
- $a=$cell[$i];
- $a->text= str_replace("\\", "", $a->text);
- switch ($a->type)
- {
- case "M":
- $x_m=$this->GetX();
- $y_m=$this->GetY();
- parent::MultiCell(
- $a->width,
- $a->height,
- $a->text,
- $a->border,
- $a->align,
- $a->fill
- );
- $x_m=$x_m+$a->width;
- $tmp=$this->GetY()-$y_m;
- if ( $tmp > $this->bigger) $this->bigger=$tmp;
- $this->SetXY($x_m,$y_m);
- break;
-
- case "C":
-
- parent::Cell( $a->width,
- $a->height,
- $a->text,
- $a->border,
- $a->new_line,
- $a->align,
- $a->fill,
- $a->link);
- break;
-
- default:
- break;
- }
- }
- $this->cells=array();
- }
- private function add_cell(Cellule $Ce)
- {
- $size=count($this->cells);
- $this->cells[$size]=$Ce;
-
- }
- function write_cell ($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='')
- {
- $this->add_cell(new Cellule($w,$h,$txt,$border,$ln,$align,$fill,$link,'C'));
-
- }
- function LongLine($w,$h,$txt,$border=0,$align='',$fill=false)
- {
- $this->add_cell(new Cellule($w,$h,$txt,$border,0,$align,$fill,'','M'));
-
- }
- /**
- * Print all the cell stored and call Ln (new line)
- * @param int $p_step
- */
- function line_new($p_step=null){
- $this->print_row();
- if ( $this->bigger==0)
- parent::Ln($p_step);
- else
- parent::Ln($this->bigger);
- $this->bigger=0;
- }
- /**
- * If the step is even then return 1 and set the backgroup color to blue , otherwise
- * returns 0, and set the background color to white
- * It is use to compute alternated colored row , it the parameter fill in write_cell and
- * cell
- * @see PDF:write_cell
- * @see TPDF:cell
- *
- */
- function is_fill($p_step)
- {
- if ($p_step % 2 == 0) {
- $pdf->SetFillColor(220, 221, 255);
- $fill = 1;
- } else {
- $pdf->SetFillColor(0, 0, 0);
- $fill = 0;
- }
- return $p_step;
- }
- /**
- *@brief retrieve the client name and quick_code
- *@param $p_jr_id jrn.jr_id
- *@param $p_jrn_type ledger type ACH VEN FIN
- *@return array (0=>qcode,1=>name) or for FIN 0=>customer qc 1=>customer name 2=>bank qc 3=>bank name
- *@see class_print_ledger_simple, class_print_ledger_simple_without_vat
- */
- function get_tiers($p_jr_id,$p_jrn_type)
- {
- if ( $p_jrn_type=='ACH' )
- {
- $array=$this->cn->get_array('SELECT
- jrnx.j_grpt,
- quant_purchase.qp_supplier,
- quant_purchase.qp_internal,
- jrn.jr_internal
- FROM
- public.quant_purchase,
- public.jrnx,
- public.jrn
- WHERE
- quant_purchase.j_id = jrnx.j_id AND
- jrnx.j_grpt = jrn.jr_grpt_id and jr_id=$1',array($p_jr_id));
- if (count($array)==0) return array("ERREUR $p_jr_id",'');
- $customer_id=$array[0]['qp_supplier'];
- $fiche=new Fiche($this->cn,$customer_id);
- $customer_qc=$fiche->get_quick_code($customer_id);
- $customer_name=$fiche->getName();
- return array($customer_qc,$customer_name);
- }
- if ( $p_jrn_type=='VEN' )
- {
- $array=$this->cn->get_array('SELECT
- quant_sold.qs_client
- FROM
- public.quant_sold,
- public.jrnx,
- public.jrn
- WHERE
- quant_sold.j_id = jrnx.j_id AND
- jrnx.j_grpt = jrn.jr_grpt_id and jr_id=$1',array($p_jr_id));
- if (count($array)==0) return array("ERREUR $p_jr_id",'');
- $customer_id=$array[0]['qs_client'];
- $fiche=new Fiche($this->cn,$customer_id);
- $customer_qc=$fiche->get_quick_code($customer_id);
- $customer_name=$fiche->getName();
- return array($customer_qc,$customer_name);
- }
- if ( $p_jrn_type=='FIN' )
- {
- $array=$this->cn->get_array('SELECT
- qf_other,qf_bank
- FROM
- public.quant_fin
- WHERE
- quant_fin.jr_id =$1',array($p_jr_id));
- if (count($array)==0) return array("ERREUR $p_jr_id",'','','');
- $customer_id=$array[0]['qf_other'];
- $fiche=new Fiche($this->cn,$customer_id);
- $customer_qc=$fiche->get_quick_code($customer_id);
- $customer_name=$fiche->getName();
-
- $bank_id=$array[0]['qf_bank'];
- $fiche=new Fiche($this->cn,$bank_id);
- $bank_qc=$fiche->get_quick_code($bank_id);
- $bank_name=$fiche->getName();
-
- return array($customer_qc,$customer_name,$bank_qc,$bank_name);
- }
- }
-
-
-}
-
-class PDFLand extends PDF
-{
-
- public function __construct ($p_cn = null, $orientation = 'P', $unit = 'mm', $format = 'A4')
- {
-
- if($p_cn == null) die("No database connection. Abort.");
- $this->bigger=0;
-
- parent::__construct($p_cn,'L', $unit, $format);
- date_default_timezone_set ('Europe/Paris');
- $this->AddFont('DejaVu','','DejaVuSans.ttf',true);
- $this->AddFont('DejaVu','B','DejaVuSans-Bold.ttf',true);
- $this->AddFont('DejaVu','BI','DejaVuSans-BoldOblique.ttf',true);
- $this->AddFont('DejaVuCond','','DejaVuSansCondensed.ttf',true);
- $this->AddFont('DejaVuCond','B','DejaVuSansCondensed-Bold.ttf',true);
- $this->AddFont('DejaVuCond','I','DejaVuSansCondensed-Oblique.ttf',true);
-
- $this->cn = $p_cn;
- $this->own = new Noalyss_Parameter_Folder($this->cn);
- $this->soc = $this->own->MY_NAME;
- $this->date = date('d.m.Y');
- }
- function Header()
- {
- //Arial bold 12
- $this->SetFont('DejaVu', 'B', 10);
- //Title
- $this->Cell(0,10,$this->dossier, 'B', 0, 'C');
- //Line break
- $this->Ln(20);
- }
- function Footer()
- {
- //Position at 2 cm from bottom
- $this->SetY(-20);
- //Arial italic 8
- $this->SetFont('DejaVuCond', 'I', 8);
- //Page number
- $this->Cell(0,8,'Date '.$this->date." - Page ".$this->PageNo().'/{nb}',0,0,'C');
- $this->Ln(3);
- // Created by NOALYSS
- $this->Cell(0,8,'Created by NOALYSS, online on http://www.noalyss.eu',0,0,'C',false,'http://www.noalyss.eu');
-
- }
-}
-
-class PDFBalance_simple extends PDF
-{
- /**
- *@brief set_info(dossier,from poste,to poste, from periode, to periode)
- *@param $p_from_poste start = poste
- *@param $p_to_poste end = poste
- *@param $p_from periode start
- *@param $p_to periode end
- */
- function set_info($p_from_poste,$to_poste,$p_from,$p_to)
- {
- $this->dossier='Balance simple '.dossier::name();
- $this->from_poste=$p_from_poste;
- $this->to_poste=$to_poste;
- $this->from=$p_from;
- $this->to=$p_to;
- }
- function Header()
- {
- parent::Header();
- $this->SetFont('DejaVu','B',8);
- $titre=sprintf("Balance simple poste %s %s date %s %s",
- $this->from_poste,
- $this->to_poste,
- $this->from,
- $this->to);
- $this->Cell(0,7,$titre,1,0,'C');
-
- $this->Ln();
- $this->SetFont('DejaVu','',6);
-
- $this->Cell(110,7,'Poste Comptable','B');
- $this->Cell(20,7,'Débit','B',0,'L');
- $this->Cell(20,7,'Crédit','B',0,'L');
- $this->Cell(20,7,'Solde','B',0,'L');
- $this->Cell(20,7,'D/C','B',0,'L');
- $this->Ln();
-
- }
-}
diff --git a/include/lib/pdf_core.class.php b/include/lib/pdf_core.class.php
new file mode 100644
index 000000000..91c76723b
--- /dev/null
+++ b/include/lib/pdf_core.class.php
@@ -0,0 +1,251 @@
+width=$w ;
+ $this->height=$h ;
+ $this->text=$txt;
+ $this->border=$border;
+ $this->new_line=$ln;
+ $this->align=$align;
+ $this->fill=$fill;
+ $this->link=$link;
+ $this->type=$type;
+ return $this;
+ }
+}
+class PDF_Core extends TFPDF
+{
+
+
+
+ private $cells=array();
+
+ public function __construct ( $orientation = 'P', $unit = 'mm', $format = 'A4')
+ {
+ $this->bigger=0;
+
+ parent::__construct($orientation, $unit, $format);
+ $this->AddFont('DejaVu','','DejaVuSans.ttf',true);
+ $this->AddFont('DejaVu','B','DejaVuSans-Bold.ttf',true);
+ $this->AddFont('DejaVu','BI','DejaVuSans-BoldOblique.ttf',true);
+ $this->AddFont('DejaVuCond','','DejaVuSansCondensed.ttf',true);
+ $this->AddFont('DejaVuCond','B','DejaVuSansCondensed-Bold.ttf',true);
+ $this->AddFont('DejaVuCond','I','DejaVuSansCondensed-Oblique.ttf',true);
+
+
+
+ $this->cells=array();
+ }
+
+
+ /**
+ * Count the number of rows a p_text will take for a multicell
+ * @param $p_text String
+ * @param $p_colSize size of the column in User Unit
+ */
+ private function count_nb_row($p_text,$p_colSize)
+ {
+ // If colSize is bigger than the size of the string then it takes 1 line
+ if ( $this->GetStringWidth($p_text) <= $p_colSize) return 1;
+ $nRow=0;
+ $aWords=explode(' ',$p_text);
+ $nb_words=count($aWords);
+ $string="";
+
+ for ($i=0;$i < $nb_words;$i++){
+ // Concatenate String with current word + a space
+ $string.=$aWords[$i];
+
+ // if there is a word after add a space
+ if ( $i+1 < $nb_words) $string.=" ";
+
+ // Compute new size and compare to the colSize
+ if ( $this->GetStringWidth($string) >= $p_colSize) {
+ // If the size of the string if bigger than we add a row, the current
+ // word is the first word of the next line
+ $nRow++;
+ $string=$aWords[$i];
+ }
+ }
+ $nRow++;
+ return $nRow;
+
+
+
+ }
+ /**
+ * Check if a page must be added due a MultiCell
+ * @return boolean
+ */
+ private function check_page_add()
+ {
+ // break on page
+ $size=count($this->cells);
+ for ($i=0;$i < $size ; $i++)
+ {
+ if ($this->cells[$i]->type == 'M' )
+ {
+ /**
+ * On doit calculer si le texte dépasse la texte et compter le
+ * nombre de lignes que le texte prendrait. Ensuite il faut
+ * faire un saut de page (renvoit true) si dépasse
+ */
+
+ $sizetext=$this->GetStringWidth($this->cells[$i]->text);
+
+ // if text bigger than column width then check
+
+ $y=$this->GetY();
+ $nb_row=$this->count_nb_row($this->cells[$i]->text, $this->cells[$i]->width);
+ $height=$this->cells[$i]->height*$nb_row;
+
+ // If the text is bigger than a sheet of paper then return false
+ if ($height >= $this->h) return false;
+
+ if ( $y + $height > ($this->h - $this->bMargin -7 ))
+ return true;
+
+ }
+ }
+ return false;
+ }
+ private function print_row()
+ {
+ static $e=0;
+ $e++;
+ if ( $this->check_page_add() == true ) $this->AddPage ();
+ $this->bigger=0;
+ $size=count($this->cells);
+ $cell=$this->cells;
+ if ($size == 0 )return;
+ for ($i=0;$i < $size ; $i++)
+ {
+ $a=$cell[$i];
+ $a->text= str_replace("\\", "", $a->text);
+ switch ($a->type)
+ {
+ case "M":
+ $x_m=$this->GetX();
+ $y_m=$this->GetY();
+ parent::MultiCell(
+ $a->width,
+ $a->height,
+ $a->text,
+ $a->border,
+ $a->align,
+ $a->fill
+ );
+ $x_m=$x_m+$a->width;
+ $tmp=$this->GetY()-$y_m;
+ if ( $tmp > $this->bigger) $this->bigger=$tmp;
+ $this->SetXY($x_m,$y_m);
+ break;
+
+ case "C":
+
+ parent::Cell( $a->width,
+ $a->height,
+ $a->text,
+ $a->border,
+ $a->new_line,
+ $a->align,
+ $a->fill,
+ $a->link);
+ break;
+
+ default:
+ break;
+ }
+ }
+ $this->cells=array();
+ }
+ private function add_cell(Cellule $Ce)
+ {
+ $size=count($this->cells);
+ $this->cells[$size]=$Ce;
+
+ }
+ function write_cell ($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='')
+ {
+ $this->add_cell(new Cellule($w,$h,$txt,$border,$ln,$align,$fill,$link,'C'));
+
+ }
+ function LongLine($w,$h,$txt,$border=0,$align='',$fill=false)
+ {
+ $this->add_cell(new Cellule($w,$h,$txt,$border,0,$align,$fill,'','M'));
+
+ }
+ /**
+ * Print all the cell stored and call Ln (new line)
+ * @param int $p_step
+ */
+
+ function line_new($p_step=null){
+ $this->print_row();
+ if ( $this->bigger==0)
+ parent::Ln($p_step);
+ else
+ parent::Ln($this->bigger);
+ $this->bigger=0;
+ }
+ /**
+ * If the step is even then return 1 and set the backgroup color to blue , otherwise
+ * returns 0, and set the background color to white
+ * It is use to compute alternated colored row , it the parameter fill in write_cell and
+ * cell
+ * @see PDF:write_cell
+ * @see TPDF:cell
+ *
+ */
+ function is_fill($p_step)
+ {
+ if ($p_step % 2 == 0) {
+ $pdf->SetFillColor(220, 221, 255);
+ $fill = 1;
+ } else {
+ $pdf->SetFillColor(0, 0, 0);
+ $fill = 0;
+ }
+ return $p_step;
+ }
+
+
+
+}
+
diff --git a/include/lib/sendmail.class.php b/include/lib/sendmail_core.class.php
similarity index 58%
rename from include/lib/sendmail.class.php
rename to include/lib/sendmail_core.class.php
index c0fbed4af..43a71e283 100644
--- a/include/lib/sendmail.class.php
+++ b/include/lib/sendmail_core.class.php
@@ -29,9 +29,8 @@
* @author dany
*/
require_once NOALYSS_INCLUDE.'/lib/filetosend.class.php';
-require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
-class Sendmail
+class Sendmail_Core
{
private $mailto;
@@ -42,6 +41,10 @@ class Sendmail
private $content;
private $header;
+ function __construct()
+ {
+ }
+
/**
* set the from
* @param $p_from has the form name
@@ -109,8 +112,8 @@ class Sendmail
function compose()
{
$this->verify();
- $this->header="";
- $this->content="";
+ $this->header="";
+ $this->content="";
// a random hash will be necessary to send mixed content
$separator = md5(time());
@@ -152,104 +155,23 @@ class Sendmail
$this->content .= "--" . $separator . "--";
}
+
/**
- * Send the message
+ * Send email
* @throws Exception
*/
function send()
{
- if ( $this->can_send() == false ) throw new Exception(_('Email non envoyé'),EMAIL_LIMIT);
+ try {
+ $this->verify();
- if (!mail($this->mailto, $this->subject, $this->content,$this->header))
+ } catch (Exception $e) {
+ throw $e;
+ }
+
+ if (!mail($this->mailto, $this->subject, $this->content,$this->header))
{
throw new Exception('send failed');
}
- // Increment email amount
- $repo =new Database();
- $date=date('Ymd');
- $http=new HttpInput();
- $dossier=$http->request("gDossier","string", -1);
- $this->increment_mail($repo,$dossier,$date);
}
- /**
- * Check if email can be sent from a folder
- * @return boolean
- */
- function can_send() {
- /**
- * if send from a dossier , then check limit of this dossier
- * otherwise send true
- */
- $http=new HttpInput();
- $dossier=$http->request("gDossier","string", -1);
- if ($dossier == -1 ) return true;
-
- /**
- * Compare max value in repo
- */
- $repo =new Database();
- $date=date('Ymd');
- // get max email
- $max_email = $this->get_max_email($repo,$dossier);
- //
- // This folder cannot send email
- if ($max_email == 0 ) return false;
- //
- // This folder has unlimited email
- if ($max_email == -1 ) return true;
-
- // get email sent today from account_repository
- $email_sent = $this->get_email_sent($repo,$dossier , $date);
- //
- if ( $email_sent >= $max_email) return false;
-
- return true;
- }
- /**
- * return max email the folder can send
- * @param $p_repo Database
- * @param $p_dossier_id int
- */
- function get_max_email(Database $p_repo,$p_dossier_id)
- {
- $max_email = $p_repo->get_value("select dos_email from ac_dossier where dos_id=$1",
- array($p_dossier_id));
- return $max_email;
- }
- /**
- * Return the amount of send emails for the date (YYYYMMDD)
- * @param Database $p_repo
- * @param $p_dossier_id int
- * @param $p_date string YYYYMMDD
- */
- function get_email_sent(Database $p_repo,$p_dossier_id,$p_date)
- {
-
- $email_sent = $p_repo->get_value ('select de_sent_email from dossier_sent_email where dos_id = $1 and de_date=$2',
- array($p_dossier_id,$p_date));
- return $email_sent;
-
-
- }
- /**
- * Add $p_amount_email to email sent
- * @param $p_repo Database
- * @param $p_dossier int id of the folder (dossier.dos_id)
- * @param $p_date string (YYYYMMDD)
- */
- function increment_mail(Database $p_repo,$p_dossier,$p_date)
- {
- if ( $p_dossier == -1) return ;
- $email_sent = $this->get_email_sent($p_repo,$p_dossier,$p_date);
- if ( $email_sent == 0 ){
- $p_repo->exec_sql("insert into public.dossier_sent_email(de_sent_email,dos_id,de_date) values($1,$2,$3)",
- array(1,$p_dossier,$p_date));
- return;
- } else {
- // update + sp_emaoun_email
- $p_repo->exec_sql("update dossier_sent_email set de_sent_email=de_sent_email+1 where dos_id=$1 and de_date=$2",
- array($p_dossier,$p_date));
- }
- }
-
}
diff --git a/include/lib/single_record.class.php b/include/lib/single_record.class.php
index 0405ed313..a807ba918 100644
--- a/include/lib/single_record.class.php
+++ b/include/lib/single_record.class.php
@@ -23,7 +23,7 @@
*/
// Copyright Author Dany De Bontridder danydb@aevalys.eu
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
define ('CODE_EXCP_DUPLICATE',901);
/**
* @brief Objec to check a double insert into the database, this duplicate occurs after
diff --git a/include/lib/user_common.php b/include/lib/user_common.php
index c3166e7be..5c77c616c 100644
--- a/include/lib/user_common.php
+++ b/include/lib/user_common.php
@@ -23,7 +23,7 @@
// Copyright Author Dany De Bontridder danydb@aevalys.eu
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
require_once NOALYSS_INCLUDE.'/lib/icheckbox.class.php';
require_once NOALYSS_INCLUDE.'/lib/ihidden.class.php';
require_once NOALYSS_INCLUDE.'/class/document.class.php';
diff --git a/include/param_pcmn.inc.php b/include/param_pcmn.inc.php
index 73b2a442e..d9dc4e593 100644
--- a/include/param_pcmn.inc.php
+++ b/include/param_pcmn.inc.php
@@ -29,7 +29,7 @@ require_once NOALYSS_INCLUDE.'/lib/function_javascript.php';
$http=new HttpInput();
$gDossier=dossier::id();
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
/* Admin. Dossier */
$cn=Dossier::connect();
diff --git a/include/param_sec.inc.php b/include/param_sec.inc.php
index 43d7af706..244769209 100644
--- a/include/param_sec.inc.php
+++ b/include/param_sec.inc.php
@@ -27,7 +27,7 @@ require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
require_once NOALYSS_INCLUDE.'/lib/iselect.class.php';
require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
require_once NOALYSS_INCLUDE.'/class/user.class.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
require_once NOALYSS_INCLUDE.'/lib/sort_table.class.php';
require_once NOALYSS_INCLUDE.'/lib/inplace_edit.class.php';
require_once NOALYSS_INCLUDE.'/lib/inplace_switch.class.php';
diff --git a/include/periode.inc.php b/include/periode.inc.php
index 3feaad465..36791c454 100644
--- a/include/periode.inc.php
+++ b/include/periode.inc.php
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
// Copyright Author Dany De Bontridder danydb@aevalys.eu
-/* ! \file
+/*! \file
* \brief add, modify, close or delete a period
*/
if (!defined('ALLOWED'))
diff --git a/include/preod.inc.php b/include/preod.inc.php
index 81a5a9c99..f0bff977f 100644
--- a/include/preod.inc.php
+++ b/include/preod.inc.php
@@ -26,7 +26,7 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
require_once NOALYSS_INCLUDE.'/lib/iselect.class.php';
require_once NOALYSS_INCLUDE.'/lib/icheckbox.class.php';
require_once NOALYSS_INCLUDE.'/lib/ihidden.class.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
require_once NOALYSS_INCLUDE.'/class/pre_operation.class.php';
global $http;
diff --git a/include/recover.php b/include/recover.php
index a1eaaa4eb..ec082d1fc 100644
--- a/include/recover.php
+++ b/include/recover.php
@@ -63,8 +63,8 @@ if ($action=="") :
set_from(ADMIN_WEB);
$mail->mailto($user_email);
$mail->set_subject("NOALYSS : Réinitialisation de mot de passe");
+ $noalyss_url=NOALYSS_URL;
$message=<<request("req","string", "");
if (strlen(trim($request_id))==SIZE_REQUEST) :
- require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+ require_once NOALYSS_INCLUDE.'/class/database.class.php';
$cn=new Database(0);
$value=$cn->get_value("select password from recover_pass where request=$1 and created_on > now() - interval '12 hours' and recover_on is null", array($request_id));
diff --git a/include/report.inc.php b/include/report.inc.php
index 143444d56..fc5212654 100644
--- a/include/report.inc.php
+++ b/include/report.inc.php
@@ -29,7 +29,7 @@ require_once NOALYSS_INCLUDE.'/lib/ifile.class.php';
require_once NOALYSS_INCLUDE.'/lib/ibutton.class.php';
require_once NOALYSS_INCLUDE.'/class/acc_report.class.php';
require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
require_once NOALYSS_INCLUDE.'/class/user.class.php';
require_once NOALYSS_INCLUDE.'/lib/ipopup.class.php';
global $http;
diff --git a/include/template/acc_ledger_history_financial_oneline.php b/include/template/acc_ledger_history_financial_oneline.php
index 10d2c81bd..42f820ab7 100644
--- a/include/template/acc_ledger_history_financial_oneline.php
+++ b/include/template/acc_ledger_history_financial_oneline.php
@@ -7,7 +7,7 @@
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * PhpCompta is distributed in the hope that it will be useful,
+ * NOALYSS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/include/template/acc_ledger_history_purchase_detail.php b/include/template/acc_ledger_history_purchase_detail.php
index d563af211..02d4fae07 100644
--- a/include/template/acc_ledger_history_purchase_detail.php
+++ b/include/template/acc_ledger_history_purchase_detail.php
@@ -8,7 +8,7 @@
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * PhpCompta is distributed in the hope that it will be useful,
+ * NOALYSS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/include/template/acc_ledger_history_purchase_extended.php b/include/template/acc_ledger_history_purchase_extended.php
index a009428de..f229d5c3f 100644
--- a/include/template/acc_ledger_history_purchase_extended.php
+++ b/include/template/acc_ledger_history_purchase_extended.php
@@ -8,7 +8,7 @@
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * PhpCompta is distributed in the hope that it will be useful,
+ * NOALYSS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/include/template/acc_ledger_history_purchase_oneline.php b/include/template/acc_ledger_history_purchase_oneline.php
index 8b941abbf..da9c5b460 100644
--- a/include/template/acc_ledger_history_purchase_oneline.php
+++ b/include/template/acc_ledger_history_purchase_oneline.php
@@ -8,7 +8,7 @@
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * PhpCompta is distributed in the hope that it will be useful,
+ * NOALYSS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/include/template/acc_ledger_history_sale_detail.php b/include/template/acc_ledger_history_sale_detail.php
index e747884a3..320632115 100644
--- a/include/template/acc_ledger_history_sale_detail.php
+++ b/include/template/acc_ledger_history_sale_detail.php
@@ -8,7 +8,7 @@
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * PhpCompta is distributed in the hope that it will be useful,
+ * NOALYSS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/include/template/acc_ledger_history_sale_extended.php b/include/template/acc_ledger_history_sale_extended.php
index a9a76c6c6..97157fd0b 100644
--- a/include/template/acc_ledger_history_sale_extended.php
+++ b/include/template/acc_ledger_history_sale_extended.php
@@ -8,7 +8,7 @@
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * PhpCompta is distributed in the hope that it will be useful,
+ * NOALYSS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/include/upgrade-core.php b/include/upgrade-core.php
index 8ccd967fd..7ff0e5284 100644
--- a/include/upgrade-core.php
+++ b/include/upgrade-core.php
@@ -8,7 +8,7 @@
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * PhpCompta is distributed in the hope that it will be useful,
+ * NOALYSS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/include/upgrade-plugin.php b/include/upgrade-plugin.php
index d557e7cdf..099db9f73 100644
--- a/include/upgrade-plugin.php
+++ b/include/upgrade-plugin.php
@@ -7,7 +7,7 @@
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * PhpCompta is distributed in the hope that it will be useful,
+ * NOALYSS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/include/upgrade-template.php b/include/upgrade-template.php
index 3176d32fc..95eea01f1 100644
--- a/include/upgrade-template.php
+++ b/include/upgrade-template.php
@@ -7,7 +7,7 @@
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * PhpCompta is distributed in the hope that it will be useful,
+ * NOALYSS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/include/user_detail.inc.php b/include/user_detail.inc.php
index 8a37b1e40..8740238c8 100644
--- a/include/user_detail.inc.php
+++ b/include/user_detail.inc.php
@@ -22,7 +22,7 @@
*/
if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
require_once NOALYSS_INCLUDE.'/lib/user_menu.php';
require_once NOALYSS_INCLUDE.'/class/user.class.php';
require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';
diff --git a/scenario/FicheTest.php b/scenario/FicheTest.php
index 6e5c651da..b1970ec93 100644
--- a/scenario/FicheTest.php
+++ b/scenario/FicheTest.php
@@ -8,7 +8,7 @@
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * PhpCompta is distributed in the hope that it will be useful,
+ * NOALYSS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/scenario/acc_ledger_AccountTest.php b/scenario/acc_ledger_AccountTest.php
index cc09e95c9..02be61717 100644
--- a/scenario/acc_ledger_AccountTest.php
+++ b/scenario/acc_ledger_AccountTest.php
@@ -8,7 +8,7 @@
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * PhpCompta is distributed in the hope that it will be useful,
+ * NOALYSS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/scenario/acc_ledger_historyTest.php b/scenario/acc_ledger_historyTest.php
index 7337b8ca6..62dd95791 100644
--- a/scenario/acc_ledger_historyTest.php
+++ b/scenario/acc_ledger_historyTest.php
@@ -8,7 +8,7 @@
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * PhpCompta is distributed in the hope that it will be useful,
+ * NOALYSS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/scenario/ajax_acc_plan_mtable.php b/scenario/ajax_acc_plan_mtable.php
index 935bde297..c782969ca 100644
--- a/scenario/ajax_acc_plan_mtable.php
+++ b/scenario/ajax_acc_plan_mtable.php
@@ -8,7 +8,7 @@
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * PhpCompta is distributed in the hope that it will be useful,
+ * NOALYSS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/scenario/ajax_manage_table_sql.php b/scenario/ajax_manage_table_sql.php
index 83c1b4714..d7401060b 100644
--- a/scenario/ajax_manage_table_sql.php
+++ b/scenario/ajax_manage_table_sql.php
@@ -8,7 +8,7 @@
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * PhpCompta is distributed in the hope that it will be useful,
+ * NOALYSS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/scenario/create-database.php b/scenario/create-database.php
index 6cd9b482f..02d2307af 100644
--- a/scenario/create-database.php
+++ b/scenario/create-database.php
@@ -8,7 +8,7 @@
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * PhpCompta is distributed in the hope that it will be useful,
+ * NOALYSS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/scenario/html_tab.test.php b/scenario/html_tab.test.php
index f47ebd6bc..f629ef7ba 100644
--- a/scenario/html_tab.test.php
+++ b/scenario/html_tab.test.php
@@ -8,7 +8,7 @@
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * PhpCompta is distributed in the hope that it will be useful,
+ * NOALYSS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/scenario/package_repository.test.php b/scenario/package_repository.test.php
index 5c14014b5..870015437 100644
--- a/scenario/package_repository.test.php
+++ b/scenario/package_repository.test.php
@@ -8,7 +8,7 @@
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * PhpCompta is distributed in the hope that it will be useful,
+ * NOALYSS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/scenario/test_acc_plan_mtable.php b/scenario/test_acc_plan_mtable.php
index 383f63260..6c3840fd1 100644
--- a/scenario/test_acc_plan_mtable.php
+++ b/scenario/test_acc_plan_mtable.php
@@ -8,7 +8,7 @@
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * PhpCompta is distributed in the hope that it will be useful,
+ * NOALYSS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/scenario/test_manage_table_sql.php b/scenario/test_manage_table_sql.php
index b342606cc..bfc4ae8ed 100644
--- a/scenario/test_manage_table_sql.php
+++ b/scenario/test_manage_table_sql.php
@@ -8,7 +8,7 @@
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * PhpCompta is distributed in the hope that it will be useful,
+ * NOALYSS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/scenario/tva_parameter.php b/scenario/tva_parameter.php
index d721c5116..72154e8be 100644
--- a/scenario/tva_parameter.php
+++ b/scenario/tva_parameter.php
@@ -8,7 +8,7 @@
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * PhpCompta is distributed in the hope that it will be useful,
+ * NOALYSS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/unit-test/README b/unit-test/README
index 119aedde6..0aa553d9c 100644
--- a/unit-test/README
+++ b/unit-test/README
@@ -27,3 +27,11 @@ Permet de voir les lignes de code qui ont été testées
php /phpunit.phar --coverage-html html --bootstrap bootstrap.php include
exemple depuis NETBEANS "/usr/bin/php" "/home/dany/Program/phpunit-skelgen.phar" "--ansi" "generate-test" "--bootstrap=/home/dany/developpement/phpcompta/noalyss/unit-test/bootstrap.php" "View_SQL" "/home/dany/developpement/phpcompta/noalyss/include/lib/view_sql.class.php" "View_SQLTest" "/home/dany/developpement/phpcompta/noalyss/unit-test/include/lib/view_sql.classTest.php"
+
+Pour avoir tous les fichiers à inclure
+=========================================
+Depuis ici, faites
+
+cd ../include
+
+find class lib -type f | awk '{print "require_once NOALYSS_INCLUDE.--""--;";}'|sed -e 's/--/"/g' >> ../unit-test/bootstrap.php
diff --git a/unit-test/bootstrap.php.example b/unit-test/bootstrap.php.example
index 2d4bb8a12..fc3f769a8 100644
--- a/unit-test/bootstrap.php.example
+++ b/unit-test/bootstrap.php.example
@@ -150,3 +150,167 @@ require_once NOALYSS_INCLUDE.'/class/class_user.php';
require_once NOALYSS_INCLUDE.'/lib/class_zip_extended.php';
+require_once NOALYSS_INCLUDE."class/package_repository.class.php";
+require_once NOALYSS_INCLUDE."class/acc_compute.class.php";
+require_once NOALYSS_INCLUDE."class/sendmail.class.php";
+require_once NOALYSS_INCLUDE."class/fiche_attr.class.php";
+require_once NOALYSS_INCLUDE."class/acc_report.class.php";
+require_once NOALYSS_INCLUDE."class/database.class.php";
+require_once NOALYSS_INCLUDE."class/gestion_table.class.php";
+require_once NOALYSS_INCLUDE."class/acc_report_row.class.php";
+require_once NOALYSS_INCLUDE."class/package_core.class.php";
+require_once NOALYSS_INCLUDE."class/print_ledger.class.php";
+require_once NOALYSS_INCLUDE."class/pre_op_ods.class.php";
+require_once NOALYSS_INCLUDE."class/anc_table.class.php";
+require_once NOALYSS_INCLUDE."class/pdfbalance_simple.class.php";
+require_once NOALYSS_INCLUDE."class/tag.class.php";
+require_once NOALYSS_INCLUDE."class/acc_ledger_purchase.class.php";
+require_once NOALYSS_INCLUDE."class/lettering.class.php";
+require_once NOALYSS_INCLUDE."class/profile_menu.class.php";
+require_once NOALYSS_INCLUDE."class/forecast_cat.class.php";
+require_once NOALYSS_INCLUDE."class/anc_operation.class.php";
+require_once NOALYSS_INCLUDE."class/print_ledger_fin.class.php";
+require_once NOALYSS_INCLUDE."class/acc_bilan.class.php";
+require_once NOALYSS_INCLUDE."class/pre_op_ach.class.php";
+require_once NOALYSS_INCLUDE."class/exercice.class.php";
+require_once NOALYSS_INCLUDE."class/document_export.class.php";
+require_once NOALYSS_INCLUDE."class/admin.class.php";
+require_once NOALYSS_INCLUDE."class/class_print_ledger_misc.php.rej";
+require_once NOALYSS_INCLUDE."class/acc_payment.class.php";
+require_once NOALYSS_INCLUDE."class/acc_reconciliation.class.php";
+require_once NOALYSS_INCLUDE."class/acc_ledger_history_generic.class.php";
+require_once NOALYSS_INCLUDE."class/template_card_category.class.php";
+require_once NOALYSS_INCLUDE."class/print_ledger_simple.class.php";
+require_once NOALYSS_INCLUDE."class/anc_account_table.class.php";
+require_once NOALYSS_INCLUDE."class/todo_list.class.php";
+require_once NOALYSS_INCLUDE."class/supplier.class.php";
+require_once NOALYSS_INCLUDE."class/document.class.php";
+require_once NOALYSS_INCLUDE."class/periode.class.php";
+require_once NOALYSS_INCLUDE."class/fiche_def_ref.class.php";
+require_once NOALYSS_INCLUDE."class/anc_acc_link.class.php";
+require_once NOALYSS_INCLUDE."class/noalyss_parameter_folder.class.php";
+require_once NOALYSS_INCLUDE."class/extension.class.php";
+require_once NOALYSS_INCLUDE."class/pre_op_fin.class.php";
+require_once NOALYSS_INCLUDE."class/forecast_item.class.php";
+require_once NOALYSS_INCLUDE."class/manager.class.php";
+require_once NOALYSS_INCLUDE."class/anc_group_operation.class.php";
+require_once NOALYSS_INCLUDE."class/user.class.php";
+require_once NOALYSS_INCLUDE."class/menu_ref.class.php";
+require_once NOALYSS_INCLUDE."class/print_ledger_detail_item.class.php";
+require_once NOALYSS_INCLUDE."class/anc_plan.class.php";
+require_once NOALYSS_INCLUDE."class/anc_key.class.php";
+require_once NOALYSS_INCLUDE."class/gestion_purchase.class.php";
+require_once NOALYSS_INCLUDE."class/stock_goods.class.php";
+require_once NOALYSS_INCLUDE."class/anc_balance_double.class.php";
+require_once NOALYSS_INCLUDE."class/acc_account.class.php";
+require_once NOALYSS_INCLUDE."class/default_menu.class.php";
+require_once NOALYSS_INCLUDE."class/follow_up.class.php";
+require_once NOALYSS_INCLUDE."class/pre_operation.class.php";
+require_once NOALYSS_INCLUDE."class/class_acc_ledger.php.orig";
+require_once NOALYSS_INCLUDE."class/acc_balance.class.php";
+require_once NOALYSS_INCLUDE."class/anc_balance_simple.class.php";
+require_once NOALYSS_INCLUDE."class/anc_acc_list.class.php";
+require_once NOALYSS_INCLUDE."class/dossier.class.php";
+require_once NOALYSS_INCLUDE."class/anc_print.class.php";
+require_once NOALYSS_INCLUDE."class/print_ledger_simple_without_vat.class.php";
+require_once NOALYSS_INCLUDE."class/gestion_sold.class.php";
+require_once NOALYSS_INCLUDE."class/balance_age.class.php";
+require_once NOALYSS_INCLUDE."class/anc_group.class.php";
+require_once NOALYSS_INCLUDE."class/print_ledger_misc.class.php";
+require_once NOALYSS_INCLUDE."class/periode_ledger_table.class.php";
+require_once NOALYSS_INCLUDE."class/package_noalyss.class.php";
+require_once NOALYSS_INCLUDE."class/calendar.class.php";
+require_once NOALYSS_INCLUDE."class/forecast.class.php";
+require_once NOALYSS_INCLUDE."class/pdf.class.php";
+require_once NOALYSS_INCLUDE."class/package_template.class.php";
+require_once NOALYSS_INCLUDE."class/class_periode.php.orig";
+require_once NOALYSS_INCLUDE."class/package_plugin.class.php";
+require_once NOALYSS_INCLUDE."class/acc_ledger.class.php";
+require_once NOALYSS_INCLUDE."class/tva_rate_mtable.class.php";
+require_once NOALYSS_INCLUDE."class/acc_ledger_fin.class.php";
+require_once NOALYSS_INCLUDE."class/print_ledger_detail.class.php";
+require_once NOALYSS_INCLUDE."class/acc_ledger_history_financial.class.php";
+require_once NOALYSS_INCLUDE."class/stock.class.php";
+require_once NOALYSS_INCLUDE."class/anc_listing.class.php";
+require_once NOALYSS_INCLUDE."class/anc_grandlivre.class.php";
+require_once NOALYSS_INCLUDE."class/acc_ledger_history.class.php";
+require_once NOALYSS_INCLUDE."class/customer.class.php";
+require_once NOALYSS_INCLUDE."class/fiche.class.php";
+require_once NOALYSS_INCLUDE."class/acc_ledger_info.class.php";
+require_once NOALYSS_INCLUDE."class/Acc_Account_LedgerTest.php";
+require_once NOALYSS_INCLUDE."class/class_print_ledger_misc.php.orig";
+require_once NOALYSS_INCLUDE."class/class_acc_ledger.php.rej";
+require_once NOALYSS_INCLUDE."class/package_contrib.class.php";
+require_once NOALYSS_INCLUDE."class/acc_parm_code.class.php";
+require_once NOALYSS_INCLUDE."class/acc_plan_mtable.class.php";
+require_once NOALYSS_INCLUDE."class/acc_ledger_history_sale.class.php";
+require_once NOALYSS_INCLUDE."class/pdf_operation.class.php";
+require_once NOALYSS_INCLUDE."class/periode_ledger.class.php";
+require_once NOALYSS_INCLUDE."class/contact.class.php";
+require_once NOALYSS_INCLUDE."class/pre_op_advanced.class.php";
+require_once NOALYSS_INCLUDE."class/document_type.class.php";
+require_once NOALYSS_INCLUDE."class/bank.class.php";
+require_once NOALYSS_INCLUDE."class/fiche_def.class.php";
+require_once NOALYSS_INCLUDE."class/acc_tva.class.php";
+require_once NOALYSS_INCLUDE."class/acc_operation.class.php";
+require_once NOALYSS_INCLUDE."class/acc_ledger_sold.class.php";
+require_once NOALYSS_INCLUDE."class/pdf_land.class.php";
+require_once NOALYSS_INCLUDE."class/pre_op_ven.class.php";
+require_once NOALYSS_INCLUDE."class/acc_account_ledger.class.php";
+require_once NOALYSS_INCLUDE."class/follow_up_detail.class.php";
+require_once NOALYSS_INCLUDE."class/class_periode.php.rej";
+require_once NOALYSS_INCLUDE."class/acc_ledger_history_purchase.class.php";
+require_once NOALYSS_INCLUDE."class/anticipation.class.php";
+require_once NOALYSS_INCLUDE."class/document_modele.class.php";
+require_once NOALYSS_INCLUDE."class/acc_ledger_search.class.php";
+require_once NOALYSS_INCLUDE."lib/irelated_action.class.php";
+require_once NOALYSS_INCLUDE."lib/http_input.class.php";
+require_once NOALYSS_INCLUDE."lib/zip_extended.class.php";
+require_once NOALYSS_INCLUDE."lib/sendmail_core.class.php";
+require_once NOALYSS_INCLUDE."lib/iperiod.class.php";
+require_once NOALYSS_INCLUDE."lib/single_record.class.php";
+require_once NOALYSS_INCLUDE."lib/icard.class.php";
+require_once NOALYSS_INCLUDE."lib/data_sql.class.php";
+require_once NOALYSS_INCLUDE."lib/ac_common.php";
+require_once NOALYSS_INCLUDE."lib/inplace_edit.class.php";
+require_once NOALYSS_INCLUDE."lib/noalyss_sql.class.php";
+require_once NOALYSS_INCLUDE."lib/iselect.class.php.orig";
+require_once NOALYSS_INCLUDE."lib/ibutton.class.php";
+require_once NOALYSS_INCLUDE."lib/user_common.php";
+require_once NOALYSS_INCLUDE."lib/icon_action.class.php";
+require_once NOALYSS_INCLUDE."lib/sort_table.class.php";
+require_once NOALYSS_INCLUDE."lib/ac_common.php.orig";
+require_once NOALYSS_INCLUDE."lib/iradio.class.php";
+require_once NOALYSS_INCLUDE."lib/ianccard.class.php";
+require_once NOALYSS_INCLUDE."lib/ispan.class.php";
+require_once NOALYSS_INCLUDE."lib/message_javascript.php";
+require_once NOALYSS_INCLUDE."lib/iconcerned.class.php";
+require_once NOALYSS_INCLUDE."lib/itva_popup.class.php";
+require_once NOALYSS_INCLUDE."lib/html_table.class.php";
+require_once NOALYSS_INCLUDE."lib/inplace_switch.class.php";
+require_once NOALYSS_INCLUDE."lib/noalyss_csv.class.php";
+require_once NOALYSS_INCLUDE."lib/database_core.class.php";
+require_once NOALYSS_INCLUDE."lib/html_input.class.php";
+require_once NOALYSS_INCLUDE."lib/function_javascript.php";
+require_once NOALYSS_INCLUDE."lib/iselect.class.php";
+require_once NOALYSS_INCLUDE."lib/iposte.class.php";
+require_once NOALYSS_INCLUDE."lib/select_box.class.php";
+require_once NOALYSS_INCLUDE."lib/ifile.class.php";
+require_once NOALYSS_INCLUDE."lib/output_html_tab.class.php";
+require_once NOALYSS_INCLUDE."lib/user_menu.php";
+require_once NOALYSS_INCLUDE."lib/html_tab.class.php";
+require_once NOALYSS_INCLUDE."lib/idate.class.php";
+require_once NOALYSS_INCLUDE."lib/itext.class.php";
+require_once NOALYSS_INCLUDE."lib/ac_common.php.rej";
+require_once NOALYSS_INCLUDE."lib/pdf_core.class.php";
+require_once NOALYSS_INCLUDE."lib/progress_bar.class.php";
+require_once NOALYSS_INCLUDE."lib/config_file.php";
+require_once NOALYSS_INCLUDE."lib/impress.class.php";
+require_once NOALYSS_INCLUDE."lib/iaction.class.php";
+require_once NOALYSS_INCLUDE."lib/inum.class.php";
+require_once NOALYSS_INCLUDE."lib/ipopup.class.php";
+require_once NOALYSS_INCLUDE."lib/icheckbox.class.php";
+require_once NOALYSS_INCLUDE."lib/itextarea.class.php";
+require_once NOALYSS_INCLUDE."lib/filetosend.class.php";
+require_once NOALYSS_INCLUDE."lib/ihidden.class.php";
+require_once NOALYSS_INCLUDE."lib/manage_table_sql.class.php";