diff --git a/.eslintrc b/.eslintrc
new file mode 100644
index 00000000..9e203a54
--- /dev/null
+++ b/.eslintrc
@@ -0,0 +1,5 @@
+// Use this file as a starting point for your project's .eslintrc.
+// Copy this file, and add rule overrides as needed.
+{
+ "extends": "airbnb"
+}
diff --git a/.gitignore b/.gitignore
index 8e0da66e..a12cc9be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,8 @@ keys.dev.pub
/app/icehrm.key
/app/data/*.*
/app/data/keys/*
+!/app/data/index.php
+!/app/data/.htaccess
icehrm.key
cache.properties
node_modules/*
diff --git a/app/data/.htaccess b/app/data/.htaccess
new file mode 100644
index 00000000..ff2beb84
--- /dev/null
+++ b/app/data/.htaccess
@@ -0,0 +1,2 @@
+order deny,allow
+deny from all
diff --git a/app/data/index.php b/app/data/index.php
new file mode 100644
index 00000000..b3d9bbc7
--- /dev/null
+++ b/app/data/index.php
@@ -0,0 +1 @@
+
+
+ $user->user_level,
+ 'components' => [
+ 'employeeCount' => [
+ 'isIceHrmPro' => $isIceHrmPro,
+ 'count' => $employeeCount,
+ 'allowed' => $isIceHrmPro ? intval($data['employees']) : 'N/A',
+ 'validUntil' => $data['licenseActivated'],
+ 'licenseId' => $data['key'],
+ ],
+ 'systemData' => [
+ 'data' => $connectionService->getSystemReport(),
+ 'issues' => $connectionService->getSystemErrors(),
+ ],
+ ]
+];
+?>
+
+
+
diff --git a/core/admin/connection/meta.json b/core/admin/connection/meta.json
new file mode 100644
index 00000000..68c5a049
--- /dev/null
+++ b/core/admin/connection/meta.json
@@ -0,0 +1,12 @@
+{
+ "label": "Ice Connect",
+ "menu": "System",
+ "order": "9",
+ "icon": "fa-wifi",
+ "user_levels": [
+ "Admin"
+ ],
+ "permissions": [],
+ "model_namespace": "\\Connection\\Common\\Model",
+ "manager": "\\Connection\\Admin\\Api\\ConnectionAdminManager"
+}
\ No newline at end of file
diff --git a/core/admin/fieldnames/index.php b/core/admin/fieldnames/index.php
index cd78f8fe..b72473a5 100644
--- a/core/admin/fieldnames/index.php
+++ b/core/admin/fieldnames/index.php
@@ -19,6 +19,9 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
diff --git a/core/admin/settings/index.php b/core/admin/settings/index.php
index fbb6a90f..1dc4ae79 100644
--- a/core/admin/settings/index.php
+++ b/core/admin/settings/index.php
@@ -6,6 +6,7 @@
use Classes\ModuleBuilder\ModuleBuilder;
use Classes\ModuleBuilder\ModuleTab;
+use Classes\UIManager;
$moduleName = 'settings';
$moduleGroup = 'admin';
@@ -32,7 +33,7 @@ if ( $notCloud ) {
'EmailSetting', 'Setting', 'Email', 'SettingAdapter', '{"category":"Email"}', 'name', false, $options1
));
}
-if(!defined('LEAVE_ENABLED') || LDAP_ENABLED == true) {
+if(defined('LEAVE_ENABLED') && LEAVE_ENABLED == true) {
$moduleBuilder->addModuleOrGroup(new ModuleTab(
'LeaveSetting', 'Setting', 'Leave', 'SettingAdapter', '{"category":"Leave"}', 'name', false, $options1
));
@@ -58,7 +59,7 @@ if(!defined('SAML_ENABLED') || SAML_ENABLED == true){
$moduleBuilder->addModuleOrGroup(new ModuleTab(
'OtherSetting','Setting','Other','SettingAdapter','{"category":["Projects","Recruitment","Notifications","Expense","Travel","Api","Overtime"]}','name',false,$options1
));
-echo \Classes\UIManager::getInstance()->renderModule($moduleBuilder);
+echo UIManager::getInstance()->renderModule($moduleBuilder);
?>
-
+
diff --git a/core/lib/composer/vendor/gettext/gettext/CONTRIBUTING.md b/core/lib/composer/vendor/gettext/gettext/CONTRIBUTING.md
index 0c1b5433..eda824f9 100644
--- a/core/lib/composer/vendor/gettext/gettext/CONTRIBUTING.md
+++ b/core/lib/composer/vendor/gettext/gettext/CONTRIBUTING.md
@@ -1,17 +1,17 @@
-Contributing to Gettext
-=======================
-
-Looking to contribute something to this library? Here's how you can help.
-
-## Bugs
-
-A bug is a demonstrable problem that is caused by the code in the repository. Good bug reports are extremely helpful – thank you!
-
-Please try to be as detailed as possible in your report. Include specific information about the environment – version of PHP, version of gettext, etc, and steps required to reproduce the issue.
-
-## Pull Requests
-
-Good pull requests – patches, improvements, new features – are a fantastic help. New extractors or generator are welcome. Before create a pull request, please follow these instructions:
-
-* The code must be PSR-2 compliant
-* Write some tests
+Contributing to Gettext
+=======================
+
+Looking to contribute something to this library? Here's how you can help.
+
+## Bugs
+
+A bug is a demonstrable problem that is caused by the code in the repository. Good bug reports are extremely helpful – thank you!
+
+Please try to be as detailed as possible in your report. Include specific information about the environment – version of PHP, version of gettext, etc, and steps required to reproduce the issue.
+
+## Pull Requests
+
+Good pull requests – patches, improvements, new features – are a fantastic help. New extractors or generator are welcome. Before create a pull request, please follow these instructions:
+
+* The code must be PSR-2 compliant
+* Write some tests
diff --git a/core/lib/composer/vendor/phpmd/phpmd/src/bin/phpmd.bat b/core/lib/composer/vendor/phpmd/phpmd/src/bin/phpmd.bat
index e52d7954..f1bbad7c 100644
--- a/core/lib/composer/vendor/phpmd/phpmd/src/bin/phpmd.bat
+++ b/core/lib/composer/vendor/phpmd/phpmd/src/bin/phpmd.bat
@@ -1,45 +1,45 @@
-@echo off
-REM This file is part of PHP Mess Detector.
-REM
-REM Copyright (c) 2008-2012, Manuel Pichler