[Noalyss-commit] [noalyss] 03/17: restructure files and folders

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 1f1b2179c2b351f98626af15ea1d90e6e0cc7ad6
Author: Dany De Bontridder <address@hidden>
Date:   Tue Sep 15 07:28:51 2015 +0200

    restructure files and folders
---
 include/ajax/ajax_add_concerned_card.php   |    2 +-
 include/ajax/ajax_admin.php                |    2 +-
 include/ajax/ajax_create_menu.php          |    2 +-
 include/ajax/ajax_pcmn_update.php          |    2 +-
 include/ajax/ajax_tag_detail.php           |    2 +-
 include/class/class_acc_reconciliation.php |    2 +-
 include/class/class_anc_key.php            |    4 ++--
 include/class/class_balance_age.php        |    8 ++++----
 include/class/class_follow_up.php          |    4 ++--
 include/class/class_lettering.php          |    8 ++++----
 include/class/class_todo_list.php          |    4 ++--
 include/impress_jrn.inc.php                |    8 ++++----
 include/lib/ac_common.php                  |    2 +-
 include/param_sec.inc.php                  |    2 +-
 14 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/include/ajax/ajax_add_concerned_card.php 
b/include/ajax/ajax_add_concerned_card.php
index 7f6e22a..2518160 100644
--- a/include/ajax/ajax_add_concerned_card.php
+++ b/include/ajax/ajax_add_concerned_card.php
@@ -66,7 +66,7 @@ for ($i=0; $i<count($a); $i++)
 
 
 echo $r;
-require_once('template/card_result.php');
+require_once(NOALYSS_INCLUDE.'/template/card_result.php');
 $response=ob_get_contents();
 ob_end_clean();
 
diff --git a/include/ajax/ajax_admin.php b/include/ajax/ajax_admin.php
index 195ddd6..ff4e989 100644
--- a/include/ajax/ajax_admin.php
+++ b/include/ajax/ajax_admin.php
@@ -144,7 +144,7 @@ if ($op=='folder_display') // operation
             ?>
         </p>
         <?php
-        require 'template/folder_display.php';
+        require NOALYSS_INCLUDE.'/template/folder_display.php';
         $content=ob_get_clean();
         $status='OK';
     }
diff --git a/include/ajax/ajax_create_menu.php 
b/include/ajax/ajax_create_menu.php
index 856c1b3..2c3784d 100644
--- a/include/ajax/ajax_create_menu.php
+++ b/include/ajax/ajax_create_menu.php
@@ -8,7 +8,7 @@ $msg=_("Création");
 $m=new Menu_Ref($cn);
 echo '<form method="POST" id="ajax_create_menu_frm" onsubmit="return 
confirm_box(this,\''._('Vous confirmez ?').'\')">';
 echo HtmlInput::hidden('create_menu', 1);
-require_once 'template/menu_detail.php';
+require_once NOALYSS_INCLUDE.'/template/menu_detail.php';
 echo HtmlInput::submit('create_menubt',_('Sauver'));
 echo HtmlInput::button_close('divmenu');
 echo '</form>';
diff --git a/include/ajax/ajax_pcmn_update.php 
b/include/ajax/ajax_pcmn_update.php
index de4d80d..4f4a949 100644
--- a/include/ajax/ajax_pcmn_update.php
+++ b/include/ajax/ajax_pcmn_update.php
@@ -76,7 +76,7 @@ if ( $pcmn_val != "")
             
 }
 
-require 'template/pcmn_update.php';
+require NOALYSS_INCLUDE.'/template/pcmn_update.php';
 $response = ob_get_clean();
 $html = escape_xml($response);
 if ( headers_sent() ) {
diff --git a/include/ajax/ajax_tag_detail.php b/include/ajax/ajax_tag_detail.php
index cd451fd..d04f1ee 100644
--- a/include/ajax/ajax_tag_detail.php
+++ b/include/ajax/ajax_tag_detail.php
@@ -32,7 +32,7 @@ else :
     echo HtmlInput::hidden('t_id', $_GET['tag']);
     echo HtmlInput::hidden('ac',$_GET['ac']);
     $data=$tag->data;
-    require_once 'template/tag_detail.php';
+    require_once NOALYSS_INCLUDE.'/template/tag_detail.php';
     echo HtmlInput::submit("save_tag_sb", "Valider");
     ?>
 </form>
diff --git a/include/class/class_acc_reconciliation.php 
b/include/class/class_acc_reconciliation.php
index 412bde1..7131e5a 100644
--- a/include/class/class_acc_reconciliation.php
+++ b/include/class/class_acc_reconciliation.php
@@ -417,7 +417,7 @@ j1.j_poste as poste
             echo '<tr class="odd">';
             echo '<td></td>';
             echo '<td colspan="5" style="border:1px solid black;width:auto">';
-            include 'template/impress_reconciliation_detail.php';
+            include 
NOALYSS_INCLUDE.'/template/impress_reconciliation_detail.php';
             echo '</td>';
             echo '</tr>';
         }
diff --git a/include/class/class_anc_key.php b/include/class/class_anc_key.php
index d79bfbe..803f359 100644
--- a/include/class/class_anc_key.php
+++ b/include/class/class_anc_key.php
@@ -83,7 +83,7 @@ class Anc_Key
             echo _('Aucune clef disponible');
             echo _('Allez dans ANCKEY pour en ajouter pour ce journal');
         }
-        include 'template/anc_key_display_choice.php';
+        include NOALYSS_INCLUDE.'/template/anc_key_display_choice.php';
     }
 
     /**
@@ -100,7 +100,7 @@ class Anc_Key
         {
             echo _('Aucune clef disponible');
         }
-        include 'template/anc_key_display_list.php';
+        include NOALYSS_INCLUDE.'/template/anc_key_display_list.php';
     }
 
     /**
diff --git a/include/class/class_balance_age.php 
b/include/class/class_balance_age.php
index 563bfd0..a356623 100644
--- a/include/class/class_balance_age.php
+++ b/include/class/class_balance_age.php
@@ -91,7 +91,7 @@ class Balance_Age
         $this->get_array_card('U', $p_fiche);
         $a_fiche=$this->afiche;
         $nb_fiche=count($a_fiche);
-        require 'template/balance_aged_result.php';
+        require NOALYSS_INCLUDE.'/template/balance_aged_result.php';
     }
 
     function display_category($p_date_start, $p_cat, $p_let)
@@ -101,7 +101,7 @@ class Balance_Age
         $this->get_array_card('X', $p_cat);
         $a_fiche=$this->afiche;
         $nb_fiche=count($a_fiche);
-        require 'template/balance_aged_result.php';
+        require NOALYSS_INCLUDE.'/template/balance_aged_result.php';
     }
 
     /**
@@ -115,7 +115,7 @@ class Balance_Age
         $this->get_array_card('F');
         $a_fiche=$this->afiche;
         $nb_fiche=count($a_fiche);
-        require 'template/balance_aged_result.php';
+        require NOALYSS_INCLUDE.'/template/balance_aged_result.php';
     }
 
     /**
@@ -129,7 +129,7 @@ class Balance_Age
         $this->get_array_card('C');
         $a_fiche=$this->afiche;
         $nb_fiche=count($a_fiche);
-        require 'template/balance_aged_result.php';
+        require NOALYSS_INCLUDE.'/template/balance_aged_result.php';
     }
 
     function export_csv($p_date_start, $p_let)
diff --git a/include/class/class_follow_up.php 
b/include/class/class_follow_up.php
index 86c6cca..4b007e8 100644
--- a/include/class/class_follow_up.php
+++ b/include/class/class_follow_up.php
@@ -541,7 +541,7 @@ class Follow_Up
         $menu=new Default_Menu();
         /* get template */
         ob_start();
-        require 'template/detail-action.php';
+        require NOALYSS_INCLUDE.'/template/detail-action.php';
         $content=ob_get_contents();
         ob_end_clean();
         $r.=$content;
@@ -1771,7 +1771,7 @@ class Follow_Up
     function display_short()
     {
         $cn=$this->db;
-        include 'template/action_display_short.php'; 
+        include NOALYSS_INCLUDE.'/template/action_display_short.php'; 
     }
     /**
      * Add an event , with the minimum of informations, 
diff --git a/include/class/class_lettering.php 
b/include/class/class_lettering.php
index ccfd202..659da38 100644
--- a/include/class/class_lettering.php
+++ b/include/class/class_lettering.php
@@ -258,7 +258,7 @@ class Lettering
         $this->get_all();
         $r="";
         ob_start();
-        include('template/letter_all.php');
+        include(NOALYSS_INCLUDE.'/template/letter_all.php');
         $r=ob_get_contents();
         ob_end_clean();
         return $r;
@@ -286,7 +286,7 @@ class Lettering
         $this->get_letter();
         $r="";
         ob_start();
-        include('template/letter_all.php');
+        include(NOALYSS_INCLUDE.'/template/letter_all.php');
         $r=ob_get_contents();
         ob_end_clean();
         return $r;
@@ -300,7 +300,7 @@ class Lettering
         $this->get_letter_diff();
         $r="";
         ob_start();
-        include('template/letter_all.php');
+        include(NOALYSS_INCLUDE.'/template/letter_all.php');
         $r=ob_get_contents();
         ob_end_clean();
         return $r;
@@ -316,7 +316,7 @@ class Lettering
         $this->get_unletter();
         $r="";
         ob_start();
-        include('template/letter_all.php');
+        include(NOALYSS_INCLUDE.'/template/letter_all.php');
         $r=ob_get_contents();
         ob_end_clean();
         return $r;
diff --git a/include/class/class_todo_list.php 
b/include/class/class_todo_list.php
index 222531a..9c32c4c 100644
--- a/include/class/class_todo_list.php
+++ b/include/class/class_todo_list.php
@@ -292,7 +292,7 @@ class Todo_List
     {
         ob_start();
         $this->load();
-        include 'template/todo_list_display.php';
+        include NOALYSS_INCLUDE.'/template/todo_list_display.php';
         $ret=ob_get_clean();
         
         return $ret;
@@ -373,7 +373,7 @@ class Todo_List
         // Get array of user
         $p_array=User::get_list(Dossier::id());
         $dossier=Dossier::id();
-        include 'template/todo_list_list_user.php';
+        include NOALYSS_INCLUDE.'/template/todo_list_list_user.php';
         
     }
     /**
diff --git a/include/impress_jrn.inc.php b/include/impress_jrn.inc.php
index fbfcc51..56ad9c2 100644
--- a/include/impress_jrn.inc.php
+++ b/include/impress_jrn.inc.php
@@ -379,16 +379,16 @@ if (isset($_REQUEST['bt_html']))
                        switch ($obj->signature)
                        {
                                case 'FIN':
-                                       require 
'template/operation_detail_fin.php';
+                                       require 
NOALYSS_INCLUDE.'/template/operation_detail_fin.php';
                                        break;
                                case 'ACH':
-                                       require 
'template/operation_detail_ach.php';
+                                       require 
NOALYSS_INCLUDE.'/template/operation_detail_ach.php';
                                        break;
                                case 'VEN':
-                                       require 
'template/operation_detail_ven.php';
+                                       require 
NOALYSS_INCLUDE.'/template/operation_detail_ven.php';
                                        break;
                                case 'ODS':
-                                       require 
'template/operation_detail_misc.php';
+                                       require 
NOALYSS_INCLUDE.'/template/operation_detail_misc.php';
                                        break;
                                default:
                                        die("unknown type of ledger");
diff --git a/include/lib/ac_common.php b/include/lib/ac_common.php
index 6a9f4b6..7bb89db 100644
--- a/include/lib/ac_common.php
+++ b/include/lib/ac_common.php
@@ -1006,7 +1006,7 @@ function show_menu($module)
         else {
             $style_menu=$a_style_menu[$level];
         }
-               require 'template/menu.php';
+               require NOALYSS_INCLUDE.'/template/menu.php';
     } // there is only one submenu so we include the code or javascript 
       // or we show the submenu
     elseif (count($amenu) == 1)
diff --git a/include/param_sec.inc.php b/include/param_sec.inc.php
index 06ed9ba..bc8b52e 100644
--- a/include/param_sec.inc.php
+++ b/include/param_sec.inc.php
@@ -308,7 +308,7 @@ if ( $action == "view" )
     // Show Priv. for actions
     //**********************************************************************
     echo '<fieldset> <legend>Actions </legend>';
-    include('template/security_list_action.php');
+    include(NOALYSS_INCLUDE.'/template/security_list_action.php');
     echo '</fieldset>';
     echo 
HtmlInput::button('Imprime','imprime',"onclick=\"window.open('".$sHref."');\"");
     echo HtmlInput::submit('ok','Sauve');