Refactor project structure

app/config.sample.php

@@ -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_');

app/install/config.php

@@ -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");

app/install/index.php

@@ -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="../../web/js/date.js"></script>
-	<script type="text/javascript" src="../../js/json2.js"></script>
+	<script type="text/javascript" src="../../web/js/json2.js"></script>
-	<script type="text/javascript" src="../../js/CrockfordInheritance.v0.1.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">

app/install/submit.php

@@ -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

build.xml

@@ -63,7 +63,7 @@
         <apply executable="php" failonerror="true">
             <arg value="-l" />
 
-            <fileset dir="${basedir}/src">
+            <fileset dir="${basedir}/core/src">
                 <include name="**/*.php" />
                 <exclude name="composer/**"/>
                 <modified />
@@ -80,7 +80,7 @@
          description="Measure project size using PHPLOC and print human readable output. Intended for usage on the command line.">
   <exec executable="${toolsdir}phploc">
    <arg value="--count-tests" />
-   <arg path="${basedir}/src" />
+   <arg path="${basedir}/core/src" />
    <arg path="${basedir}/tests" />
   </exec>
  </target>
@@ -94,7 +94,7 @@
    <arg path="${basedir}/build/logs/phploc.csv" />
    <arg value="--log-xml" />
    <arg path="${basedir}/build/logs/phploc.xml" />
-   <arg path="${basedir}/src" />
+   <arg path="${basedir}/core/src" />
    <arg path="${basedir}/tests" />
   </exec>
  </target>
@@ -106,14 +106,14 @@
    <arg value="--jdepend-xml=${basedir}/build/logs/jdepend.xml" />
    <arg value="--jdepend-chart=${basedir}/build/pdepend/dependencies.svg" />
    <arg value="--overview-pyramid=${basedir}/build/pdepend/overview-pyramid.svg" />
-   <arg path="${basedir}/src" />
+   <arg path="${basedir}/core/src" />
   </exec>
  </target>
 
  <target name="phpmd"
          description="Perform project mess detection using PHPMD and print human readable output. Intended for usage on the command line before committing.">
   <exec executable="${toolsdir}phpmd">
-   <arg path="${basedir}/src" />
+   <arg path="${basedir}/core/src" />
    <arg value="text" />
    <arg path="${basedir}/build/phpmd.xml" />
   </exec>
@@ -123,7 +123,7 @@
          depends="prepare"
          description="Perform project mess detection using PHPMD and log result in XML format. Intended for usage within a continuous integration environment.">
   <exec executable="${toolsdir}phpmd">
-   <arg path="${basedir}/src" />
+   <arg path="${basedir}/core/src" />
    <arg value="xml" />
    <arg path="${basedir}/build/phpmd.xml" />
    <arg value="--reportfile" />
@@ -137,7 +137,7 @@
    <arg value="--standard=PSR2" />
    <arg value="--extensions=php" />
    <arg value="--ignore=autoload.php" />
-   <arg path="${basedir}/src" />
+   <arg path="${basedir}/core/src" />
    <arg path="${basedir}/test/unit" />
    <arg path="${basedir}/test/integration" />
   </exec>
@@ -152,14 +152,14 @@
    <arg value="--standard=PSR2" />
    <arg value="--extensions=php" />
    <arg value="--ignore=autoload.php" />
-   <arg path="${basedir}/src" />
+   <arg path="${basedir}/core/src" />
   </exec>
  </target>
 
  <target name="phpcpd"
          description="Find duplicate code using PHPCPD and print human readable output. Intended for usage on the command line before committing.">
   <exec executable="${toolsdir}phpcpd">
-   <arg path="${basedir}/src" />
+   <arg path="${basedir}/core/src" />
   </exec>
  </target>
 
@@ -169,7 +169,7 @@
   <exec executable="${toolsdir}phpcpd">
    <arg value="--log-pmd" />
    <arg path="${basedir}/build/logs/pmd-cpd.xml" />
-   <arg path="${basedir}/src" />
+   <arg path="${basedir}/core/src" />
   </exec>
  </target>
 
@@ -215,6 +215,11 @@
             <include name="build/**"/>
             <include name="build.xml"/>
             <include name="lib/composer/composer.phar"/>
+            <include name="keys.tags.pub"/>
+            <include name="keys.dev.pub"/>
+            <include name="cache.properties"/>
+            <include name="phpdox.xml"/>
+            <include name="phpunit.xml"/>
         </fileset>
     </delete>
 

core/entry_header.php

@@ -62,9 +62,9 @@ if(!file_exists($logoFileName)){
 
 	    <link href="<?=BASE_URL?>css/style.css?v=<?=$cssVersion?>" rel="stylesheet">
 
-	    <script type="text/javascript" src="<?=BASE_URL?>web/bower_components/tinymce/tinymce.min.js"></script>
+	    <script type="text/javascript" src="<?=BASE_URL?>bower_components/tinymce/tinymce.min.js"></script>
-	    <link href="<?=BASE_URL?>web/bower_components/simplemde/dist/simplemde.min.css" rel="stylesheet">
+	    <link href="<?=BASE_URL?>bower_components/simplemde/dist/simplemde.min.css" rel="stylesheet">
-	    <script type="text/javascript" src="<?=BASE_URL?>web/bower_components/simplemde/dist/simplemde.min.js"></script>
+	    <script type="text/javascript" src="<?=BASE_URL?>bower_components/simplemde/dist/simplemde.min.js"></script>
 	    <script type="text/javascript" src="<?=BASE_URL?>js/signature_pad.js"></script>
 	    <script type="text/javascript" src="<?=BASE_URL?>js/date.js"></script>
 		<script type="text/javascript" src="<?=BASE_URL?>js/json2.js"></script>

core/header.php

@@ -110,7 +110,7 @@ include('configureUIManager.php');
     <link href="<?=BASE_URL?>themecss/bootstrap.min.css" rel="stylesheet">
     <link href="<?=BASE_URL?>themecss/font-awesome.min.css" rel="stylesheet">
     <link href="<?=BASE_URL?>themecss/ionicons.min.css" rel="stylesheet">
-    <link href="<?=BASE_URL?>web/bower_components/material-design-icons/iconfont/material-icons.css" rel="stylesheet">
+    <link href="<?=BASE_URL?>bower_components/material-design-icons/iconfont/material-icons.css" rel="stylesheet">
 
 
 
@@ -154,9 +154,9 @@ include('configureUIManager.php');
 
     <link href="<?=BASE_URL?>css/style.css?v=<?=$cssVersion?>" rel="stylesheet">
 
-    <script type="text/javascript" src="<?=BASE_URL?>web/bower_components/tinymce/tinymce.min.js"></script>
+    <script type="text/javascript" src="<?=BASE_URL?>bower_components/tinymce/tinymce.min.js"></script>
-    <link href="<?=BASE_URL?>web/bower_components/simplemde/dist/simplemde.min.css" rel="stylesheet">
+    <link href="<?=BASE_URL?>bower_components/simplemde/dist/simplemde.min.css" rel="stylesheet">
-    <script type="text/javascript" src="<?=BASE_URL?>web/bower_components/simplemde/dist/simplemde.min.js"></script>
+    <script type="text/javascript" src="<?=BASE_URL?>bower_components/simplemde/dist/simplemde.min.js"></script>
     <script type="text/javascript" src="<?=BASE_URL?>js/signature_pad.js"></script>
     <script type="text/javascript" src="<?=BASE_URL?>js/date.js"></script>
     <script type="text/javascript" src="<?=BASE_URL?>js/json2.js"></script>