Merge branch 'dev'

.travis.yml

@@ -3,14 +3,13 @@ services:
 before_script:
   - echo "USE mysql;\nUPDATE user SET password=PASSWORD('dev') WHERE user='root';\nFLUSH PRIVILEGES;\n" | mysql -u root
 install:
-  - rm $TRAVIS_BUILD_DIR/tools/phpunit
-  - composer require --dev phpunit/phpunit ^5.7
-  - $TRAVIS_BUILD_DIR/vendor/bin/phpunit --version
-  - cp $TRAVIS_BUILD_DIR/vendor/bin/phpunit $TRAVIS_BUILD_DIR/tools
+  #- rm $TRAVIS_BUILD_DIR/tools/phpunit
+  #- composer require --dev phpunit/phpunit ~6.5.5
+  #- $TRAVIS_BUILD_DIR/vendor/bin/phpunit --version
+  #- cp $TRAVIS_BUILD_DIR/vendor/bin/phpunit $TRAVIS_BUILD_DIR/tools
 script: ant build-ci
 language: php
 php:
-  - '5.6'
   - '7.0'
   - '7.1'
 after_failure: "cat /tmp/icehrm.test.log"

admin/settings/index.php

@@ -37,9 +37,11 @@
 $moduleBuilder->addModuleOrGroup(new \Classes\ModuleBuilder\ModuleTab(
     'SystemSetting','Setting','System','SettingAdapter','{"name":["System:"]}','name',false,$options1
 ));
-$moduleBuilder->addModuleOrGroup(new \Classes\ModuleBuilder\ModuleTab(
-    'EmailSetting','Setting','Email','SettingAdapter','{"name":["Email:"]}','name',false,$options1
-));
+if (!defined('CLOUD_INSTALLATION')) {
+    $moduleBuilder->addModuleOrGroup(new \Classes\ModuleBuilder\ModuleTab(
+        'EmailSetting', 'Setting', 'Email', 'SettingAdapter', '{"name":["Email:"]}', 'name', false, $options1
+    ));
+}
 $moduleBuilder->addModuleOrGroup(new \Classes\ModuleBuilder\ModuleTab(
     'LeaveSetting','Setting','Leave / PTO','SettingAdapter','{"name":["Leave:"]}','name',false,$options1
 ));

api/Base.js

@@ -2461,9 +2461,10 @@ IceHRMBase.method('clearFileElement', function (elementName) {
 
 IceHRMBase.method('fixJSON', function (json) {
 	if(this.noJSONRequests == "1"){
-		json = json.replace(/"/g,'|');
+		json = window.btoa(json);
 	}
 	return json;
+
 });
 
 

build.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="icehrm-opensource" default="build">
+<project name="icehrm-pro" default="build">
  <!-- By default, we assume all tools to be on the $PATH -->
  <property name="toolsdir" value="${basedir}/tools/"/>
  <property name="destination" value="${basedir}/build/app"/>

config.base.php

@@ -13,10 +13,10 @@
 }
 
 //Version
-define('VERSION', '20.3.0.OS');
-define('CACHE_VALUE', '20.3.0.OS');
-define('VERSION_NUMBER', '2030');
-define('VERSION_DATE', '26/11/2017');
+define('VERSION', '21.0.0.PRO');
+define('CACHE_VALUE', '21.0.0.OS');
+define('VERSION_NUMBER', '2100');
+define('VERSION_DATE', '02/02/2018');
 
 if(!defined('CONTACT_EMAIL')){define('CONTACT_EMAIL','icehrm@gamonoid.com');}
 if(!defined('KEY_PREFIX')){define('KEY_PREFIX','IceHrm');}

header.php

@@ -20,7 +20,9 @@
 Original work Copyright (c) 2012 [Gamonoid Media Pvt. Ltd]
 Developer: Thilina Hasantha (thilina.hasantha[at]gmail.com / facebook.com/thilinah)
  */
-
+if (!defined('MODULE_NAME')) {
+    define('MODULE_NAME', $moduleName);
+}
 include 'includes.inc.php';
 if(empty($user)){
     $actual_link = "http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]";

lib/composer/composer.json

@@ -5,11 +5,13 @@
         "gettext/gettext": "4.0.0",
         "consolidation/robo": "~1",
         "filp/whoops": "~2.1",
-        "swiftmailer/swiftmailer": "^6.0"
+        "swiftmailer/swiftmailer": "^6.0",
+		"pear/net_smtp": "^1.7",
+		"pear/mail": "^1.4"
     },
     "require-dev": {
-      "phpunit/phpunit": "5.5.*"
-    },
+      "phpunit/phpunit": "~6"
+	},
     "autoload": {
       "psr-4": {
         "": "../../src"