[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 01/16: Move Admin_repo to include , add setup
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 01/16: Move Admin_repo to include , add setup.php for redirecting Move user_menu to include/lib |
Date: |
Tue, 20 Oct 2015 14:26:26 +0000 |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 5c0d01a82fa28c3f76cab7b949eb65cb70b428e2
Author: Dany De Bontridder <address@hidden>
Date: Sun Oct 18 19:13:20 2015 +0200
Move Admin_repo to include , add setup.php for redirecting
Move user_menu to include/lib
---
html/setup.php | 35 +++++++++++++++++++++++++++++++++++
html/user_login.php | 3 ++-
{html => include}/admin_repo.php | 12 +++++++-----
include/cfgfiche.inc.php | 2 +-
include/cfgledger.inc.php | 2 +-
include/dashboard.inc.php | 2 +-
include/{ => lib}/user_menu.php | 0
include/opening.inc.php | 2 +-
include/param_pcmn.inc.php | 2 +-
include/param_sec.inc.php | 2 +-
include/report.inc.php | 3 +--
include/user_detail.inc.php | 2 +-
12 files changed, 52 insertions(+), 15 deletions(-)
diff --git a/html/setup.php b/html/setup.php
new file mode 100644
index 0000000..5145600
--- /dev/null
+++ b/html/setup.php
@@ -0,0 +1,35 @@
+<?php
+/*
+ * This file is part of PhpCompta.
+ *
+ * PhpCompta is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * 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,
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with PhpCompta; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+// Copyright (2014) Author Dany De Bontridder <address@hidden>
+
+
+/**
+ * @file
+ * @brief This file is used for the first installation or redirect to
+ * include/admin.inc.php
+ */
+if (file_exists("../include/config.inc.php") ) {
+ /* if the file exists it means that NOALYSS is already
+ * installed
+ */
+ define ('ALLOWED',1);
+ require_once '../include/constant.php';
+ require_once NOALYSS_INCLUDE.'/admin.inc.php';
+}
+?>
diff --git a/html/user_login.php b/html/user_login.php
index bf759e4..bb355e4 100644
--- a/html/user_login.php
+++ b/html/user_login.php
@@ -98,7 +98,8 @@ if ( $User->Admin() == 1)
}
}
-include_once("user_menu.php");
+include_once NOALYSS_INCLUDE."/lib/user_menu.php";
+
$priv=($User->admin==1)?_("Administrateur"):_("Utilisateur");
load_all_script();
if ( isset ($_POST['set_preference'])) {
diff --git a/html/admin_repo.php b/include/admin_repo.php
similarity index 90%
rename from html/admin_repo.php
rename to include/admin_repo.php
index 84ea1c3..8833990 100644
--- a/html/admin_repo.php
+++ b/include/admin_repo.php
@@ -21,11 +21,13 @@
* \brief Administration of the repository : creation of user, folder,
security,
* templates... Accessible only by the administrator
*/
-require_once '../include/constant.php';
-require_once("lib/user_common.php");
-include_once("lib/ac_common.php");
-require_once('lib/class_database.php');
-include_once("user_menu.php");
+if ( ! defined ('ALLOWED')) { die ('Non autorisé');}
+
+require_once NOALYSS_INCLUDE."/lib/user_common.php";
+include_once NOALYSS_INCLUDE."/lib/ac_common.php";
+require_once NOALYSS_INCLUDE.'/lib/class_database.php';
+require_once NOALYSS_INCLUDE."/lib/user_menu.php";
+
$rep=new Database();
include_once ("class/class_user.php");
$User=new User($rep);
diff --git a/include/cfgfiche.inc.php b/include/cfgfiche.inc.php
index 675124d..5d30d62 100644
--- a/include/cfgfiche.inc.php
+++ b/include/cfgfiche.inc.php
@@ -26,7 +26,7 @@ require_once NOALYSS_INCLUDE.'/lib/class_itext.php';
require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php';
require_once NOALYSS_INCLUDE.'/class/class_fiche.php';
require_once NOALYSS_INCLUDE.'/lib/class_database.php';
-require_once NOALYSS_INCLUDE.'/user_menu.php';
+require_once NOALYSS_INCLUDE.'/lib/user_menu.php';
require_once NOALYSS_INCLUDE.'/class/class_dossier.php';
require_once NOALYSS_INCLUDE.'/lib/class_sort_table.php';
require_once NOALYSS_INCLUDE.'/class/class_fiche_def.php';
diff --git a/include/cfgledger.inc.php b/include/cfgledger.inc.php
index 90f0d1f..d0a239c 100644
--- a/include/cfgledger.inc.php
+++ b/include/cfgledger.inc.php
@@ -31,7 +31,7 @@ require_once NOALYSS_INCLUDE.'/class/class_dossier.php';
require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
require_once NOALYSS_INCLUDE.'/lib/class_database.php';
require_once NOALYSS_INCLUDE.'/class/class_user.php';
-require_once NOALYSS_INCLUDE.'/user_menu.php';
+require_once NOALYSS_INCLUDE.'/lib/user_menu.php';
require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php';
$gDossier=dossier::id();
diff --git a/include/dashboard.inc.php b/include/dashboard.inc.php
index bd56d91..01dbd45 100644
--- a/include/dashboard.inc.php
+++ b/include/dashboard.inc.php
@@ -7,7 +7,7 @@ require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
require_once NOALYSS_INCLUDE.'/class/class_user.php';
require_once NOALYSS_INCLUDE.'/class/class_acc_report.php';
require_once NOALYSS_INCLUDE.'/class/class_periode.php';
-require_once NOALYSS_INCLUDE.'/user_menu.php';
+require_once NOALYSS_INCLUDE.'/lib/user_menu.php';
require_once NOALYSS_INCLUDE.'/class/class_dossier.php';
require_once NOALYSS_INCLUDE.'/class/class_todo_list.php';
require_once NOALYSS_INCLUDE.'/lib/class_itextarea.php';
diff --git a/include/user_menu.php b/include/lib/user_menu.php
similarity index 100%
rename from include/user_menu.php
rename to include/lib/user_menu.php
diff --git a/include/opening.inc.php b/include/opening.inc.php
index f1ffc2c..543d0ff 100644
--- a/include/opening.inc.php
+++ b/include/opening.inc.php
@@ -37,7 +37,7 @@ $p_mesg="";
$sa = (isset($_REQUEST['sa'])) ? $_REQUEST['sa'] : '';
$g_user->Check();
-require_once NOALYSS_INCLUDE.'/user_menu.php';
+require_once NOALYSS_INCLUDE.'/lib/user_menu.php';
// Correct (last step)
if (isset($_POST['correct']))
diff --git a/include/param_pcmn.inc.php b/include/param_pcmn.inc.php
index d4df67c..9f0e8be 100644
--- a/include/param_pcmn.inc.php
+++ b/include/param_pcmn.inc.php
@@ -36,7 +36,7 @@ $cn=Dossier::connect();
require_once NOALYSS_INCLUDE.'/class/class_user.php';
-require_once NOALYSS_INCLUDE.'/user_menu.php';
+require_once NOALYSS_INCLUDE.'/lib/user_menu.php';
echo '<div id="acc_update" class="inner_box"
style="display:none;position:absolute;text-align:left;z-index:1"></div>';
/* Store the p_start parameter */
diff --git a/include/param_sec.inc.php b/include/param_sec.inc.php
index 033c710..675e478 100644
--- a/include/param_sec.inc.php
+++ b/include/param_sec.inc.php
@@ -39,7 +39,7 @@ global $g_user;
$g_user->Check();
$g_user->check_dossier($gDossier);
-require_once NOALYSS_INCLUDE.'/user_menu.php';
+require_once NOALYSS_INCLUDE.'/lib/user_menu.php';
/////////////////////////////////////////////////////////////////////////
// List users
diff --git a/include/report.inc.php b/include/report.inc.php
index 43dcf5d..d72aaf3 100644
--- a/include/report.inc.php
+++ b/include/report.inc.php
@@ -24,14 +24,13 @@
if (!defined('ALLOWED'))
die('Appel direct ne sont pas permis');
require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
-require_once NOALYSS_INCLUDE.'/user_menu.php';
+require_once NOALYSS_INCLUDE.'/lib/user_menu.php';
require_once NOALYSS_INCLUDE.'/lib/class_ifile.php';
require_once NOALYSS_INCLUDE.'/lib/class_ibutton.php';
require_once NOALYSS_INCLUDE.'/class/class_acc_report.php';
require_once NOALYSS_INCLUDE.'/class/class_dossier.php';
require_once NOALYSS_INCLUDE.'/lib/class_database.php';
require_once NOALYSS_INCLUDE.'/class/class_user.php';
-require_once NOALYSS_INCLUDE.'/user_menu.php';
require_once NOALYSS_INCLUDE.'/lib/class_ipopup.php';
diff --git a/include/user_detail.inc.php b/include/user_detail.inc.php
index 0ea2630..ef386e6 100644
--- a/include/user_detail.inc.php
+++ b/include/user_detail.inc.php
@@ -23,7 +23,7 @@
if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
require_once NOALYSS_INCLUDE.'/lib/class_database.php';
-require_once NOALYSS_INCLUDE.'/user_menu.php';
+require_once NOALYSS_INCLUDE.'/lib/user_menu.php';
require_once NOALYSS_INCLUDE.'/class/class_user.php';
$rep = new Database();
- [Noalyss-commit] [noalyss] branch master updated (659cbc6 -> 02d8767), Dany De Bontridder, 2015/10/20
- [Noalyss-commit] [noalyss] 02/16: Rename file admin_repo by admin_repo.inc, Dany De Bontridder, 2015/10/20
- [Noalyss-commit] [noalyss] 05/16: Administration : add information about system, Dany De Bontridder, 2015/10/20
- [Noalyss-commit] [noalyss] 01/16: Move Admin_repo to include , add setup.php for redirecting Move user_menu to include/lib,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 06/16: System information : display variable from config.inc.php, Dany De Bontridder, 2015/10/20
- [Noalyss-commit] [noalyss] 08/16: Administration : add information about system update all the databases + account_repository, Dany De Bontridder, 2015/10/20
- [Noalyss-commit] [noalyss] 11/16: Force the login in lower case in table where it is used, Dany De Bontridder, 2015/10/20
- [Noalyss-commit] [noalyss] 09/16: System information : display variable from config.inc.php, Dany De Bontridder, 2015/10/20
- [Noalyss-commit] [noalyss] 07/16: Administration : add information about system update all the databases + account_repository, Dany De Bontridder, 2015/10/20
- [Noalyss-commit] [noalyss] 04/16: Restructure file , remove html/admin/sql , backup ..., Dany De Bontridder, 2015/10/20
- [Noalyss-commit] [noalyss] 10/16: Administration : update MULTI, Dany De Bontridder, 2015/10/20
- [Noalyss-commit] [noalyss] 14/16: remove obsolete file, Dany De Bontridder, 2015/10/20
- [Noalyss-commit] [noalyss] 15/16: Improve installation system, Dany De Bontridder, 2015/10/20
- [Noalyss-commit] [noalyss] 12/16: force login user to lower case for ACTION_GESTION, Dany De Bontridder, 2015/10/20