galads/icehrm
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Refactor project structure

Browse Source
This commit is contained in:
Thilina Hasantha
2018-04-29 17:46:42 +02:00
parent 889baf124c
commit e3a7e18d9c
5513 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/config.sample.php
View File

@@ -8,7 +8,7 @@ define('TWITTER_URL', 'Ice Hrm');
define('CLIENT_NAME', '_CLIENT_');
define('APP_BASE_PATH', '_APP_BASE_PATH_');
define('CLIENT_BASE_PATH', '_CLIENT_BASE_PATH_');
define('BASE_URL','_BASE_URL_');
define('BASE_URL','_BASE_URL_web/');
define('CLIENT_BASE_URL','_CLIENTBASE_URL_');
define('APP_DB', '_APP_DB_');

2
app/install/config.php
View File

@@ -3,6 +3,6 @@ error_reporting(E_ERROR);
ini_set("error_log", "../data/icehrm_install.log");
define('CURRENT_PATH',dirname(__FILE__));
define('CLIENT_APP_PATH',realpath(dirname(__FILE__)."/..")."/");
define('APP_PATH',realpath(dirname(__FILE__)."/../..")."/");
define('APP_PATH',realpath(dirname(__FILE__)."/../..")."/core/");
define('APP_NAME',"IceHrm");
define('APP_ID',"icehrm");

10
app/install/index.php
View File

@@ -67,14 +67,14 @@ if(!$isDataFolderExists){
<!-- Le styles -->
<link href="bootstrap/css/bootstrap.css" rel="stylesheet">
<script type="text/javascript" src="../../js/jquery.js"></script>
<script type="text/javascript" src="../../web/js/jquery.js"></script>
<script src="bootstrap/js/bootstrap.js"></script>
<link href="bootstrap/css/bootstrap-responsive.css" rel="stylesheet">
<link href="styles.css?v=2" rel="stylesheet">
<script type="text/javascript" src="../../js/date.js"></script>
<script type="text/javascript" src="../../js/json2.js"></script>
<script type="text/javascript" src="../../js/CrockfordInheritance.v0.1.js"></script>
<script type="text/javascript" src="../../web/js/date.js"></script>
<script type="text/javascript" src="../../web/js/json2.js"></script>
<script type="text/javascript" src="../../web/js/CrockfordInheritance.v0.1.js"></script>
<!-- Le fav and touch icons -->
<link rel="shortcut icon" href="bootstrap/ico/favicon.ico">
@@ -253,4 +253,4 @@ if(!$isDataFolderExists){
</div>
</div>
</body>
</html>
</html>

6
app/install/submit.php
View File

@@ -1,6 +1,6 @@
<?php
include dirname(__FILE__).'/config.php';
include(CLIENT_APP_PATH.'../lib/adodb512/adodb.inc.php');
include(CLIENT_APP_PATH.'../core/lib/adodb512/adodb.inc.php');
$isConfigFileExists = file_exists(CLIENT_APP_PATH."config.php");
$configData = file_get_contents(CLIENT_APP_PATH."config.php");
@@ -94,7 +94,7 @@ if($action == "TEST_DB"){
//Run create table script
$insql = file_get_contents(CLIENT_APP_PATH."../scripts/".APP_ID."db.sql");
$insql = file_get_contents(CLIENT_APP_PATH."../core/scripts/".APP_ID."db.sql");
$sql_list = preg_split('/;/',$insql);
foreach($sql_list as $sql){
if (preg_match('/^\s+$/', $sql) || $sql == '') { # skip empty lines
@@ -104,7 +104,7 @@ if($action == "TEST_DB"){
}
//Run create table script
$insql = file_get_contents(CLIENT_APP_PATH."../scripts/".APP_ID."_master_data.sql");
$insql = file_get_contents(CLIENT_APP_PATH."../core/scripts/".APP_ID."_master_data.sql");
$sql_list = preg_split('/;/',$insql);
foreach($sql_list as $sql){
if (preg_match('/^\s+$/', $sql) || $sql == '') { # skip empty lines