Merge pull request #4011 from YetiForceCompany/developer

YetiForce CRM ver. 4.0.0

Author: mariuszkrzaczkowski

.gitignore

@@ -2,7 +2,9 @@
 /.settings
 /.project
 /.buildpath
+/_private
 README.md
+/user_privileges/cron.php
 /cache/templates_c
 /config/csrf_secret.php
 /config/config_override.php
@@ -13,4 +15,12 @@ README.md
 /libraries/mPDF/
 /modules/OSSMail/roundcube/
 /libraries/PHPExcel/
-/libraries/AJAXChat/
+/libraries/AJAXChat/
+/libraries/gantt/
+/vendor/rmccue/
+/vendor/smarty/
+/vendor/phpmailer/
+/vendor/ezyang/
+/vendor/symfony/
+/vendor/doctrine/
+/vendor/simshaun/

.htaccess

@@ -10,7 +10,7 @@ RedirectMatch 403 (?i).*\.log$
 	RewriteRule ^favicon.ico layouts/basic/skins/images/favicon.ico [L,NC]
 	RewriteRule ^api/webservice/(.*)/(.*)/(.*)$ api/webservice.php?module=$1&action=$2&record=$3 [QSA,NC,L]
 	RewriteRule ^api/webservice/(.*)/(.*)$ api/webservice.php?module=$1&action=$2 [QSA,NC,L]
-	RewriteRule ^api/webservice/(.*)$ api/webservice.php?module=$1 [QSA,NC,L]
+	RewriteRule ^api/webservice/(.*)$ api/webservice.php?action=$1 [QSA,NC,L]
 
 	RewriteRule ^\.well-known/carddav /api/dav.php/addressbooks/ [R]
 	RewriteRule ^\.well-known/caldav /api/dav.php/calendars/ [R]
@@ -19,23 +19,27 @@ RedirectMatch 403 (?i).*\.log$
 	RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]
 </ifModule>
 <IfModule mod_php5.c>
-	php_flag	log_errors					Off
+	#Error: 337 ,Error + Warning: 5111
+	#php_flag	error_reporting				337
+	php_flag	log_errors					On
 	php_flag	display_errors				Off
+	php_value	error_log					cache/logs/phpError.log
 	php_value	memory_limit				512M
 	php_flag	output_buffering			On
 	php_flag    zlib.output_compression		Off
 	php_flag	file_uploads				On
+	php_value   upload_max_filesize			100M
+	php_value   post_max_size				50M
 
 	#php_value	max_execution_time			600
-	#php_value	max_input_time				600
-
-	php_flag	magic_quotes_gpc			Off
-	php_flag	magic_quotes_runtime        Off
+	php_value	max_input_time				600
 
 	php_value	suhosin.request.max_vars	5000
 	php_value	suhosin.post.max_vars		5000
 	php_flag	suhosin.session.encrypt		Off
 
+	php_flag	session.cookie_httponly		On
+	#php_flag	session.cookie_secure		On
 	php_flag	session.auto_start			Off
 	# 86400 = 3600*24
 	php_value	session.gc_maxlifetime		86400 
@@ -44,13 +48,6 @@ RedirectMatch 403 (?i).*\.log$
 	php_value	session.gc_divisor			500
 	php_value	session.gc_probability		1
 	php_value	session.save_path			cache/session
-	php_value	error_log					cache/logs/phpError.log
-</IfModule>
-<IfModule fcgid_module.c>
-	FcgidIOTimeout 600
-	FcgidConnectTimeout 600
-	FcgidBusyTimeout 600
-	FcgidIdleTimeout 600
 </IfModule>
 ########################
 # <FilesMatch "\.(inc|php|php3|php4|php5|php6|phtml|phps)$">

.travis.yml

@@ -1,17 +1,22 @@
 language: php
 
 php:
-  - 5.6
+  - 7.1
   - 7.0
-  - hhvm
+  - 5.6
   - nightly
+  - hhvm
 
 matrix:
   fast_finish: true
   allow_failures:
     - php: hhvm
     - php: nightly
 
+branches:
+  only:
+    - developer
+   
 services:
   - mysql
 
@@ -21,30 +26,35 @@ mysql:
   encoding: utf8
 
 before_script:
-- if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-add tests/travis.php.ini; fi
-- if [[ $TRAVIS_PHP_VERSION = hhvm ]]; then cat tests/travis.php.ini >> /etc/hhvm/php.ini; fi
+- composer install
 - sudo wget https://phar.phpunit.de/phpunit.phar
 - sudo chmod +x phpunit.phar
 - sudo mv phpunit.phar /usr/local/bin/phpunit
 - phpunit --version
+- sudo wget https://scrutinizer-ci.com/ocular.phar
+- sudo chmod +x ocular.phar
+- sudo mv ocular.phar /usr/local/bin/ocular
 - mysql -e "SET GLOBAL sql_mode = 'NO_ENGINE_SUBSTITUTION'"
 - mysql -e "create database IF NOT EXISTS yetiforce;" -uroot
-- cp tests/copy/config.inc.php config/config.inc.php
-- cp tests/copy/debug.php config/debug.php
+- cp tests/config.inc.txt config/config.inc.php
+- cp tests/debug.txt config/debug.php
+- cp tests/developer.txt config/developer.php
 - cp tests/.htaccess .htaccess
 
 script:
 - cd tests
 - phpunit --debug --verbose --coverage-text --coverage-clover=coverage.clover
 
-after_success:
-- cat LoginPage.txt
-- cat DetailView.txt
-- cat ListView.txt
-- cat EditView.txt
+after_script:
+- cd ..
+- cat tests/LoginPage.txt
+- cat tests/DetailView.txt
+- cat tests/ListView.txt
+- cat tests/EditView.txt
+- cat tests/records.log
+- cat cache/logs/request.log
+- cat cache/logs/phpError.log
+- cat cache/logs/system.log
+- cat cache/logs/Importer.log
+- php ocular code-coverage:upload --format=php-clover coverage.clover
 - bash <(curl -s https://codecov.io/bash) 
-- codecov
-
-branches:
-  only:
-    - developer

README.md

@@ -1,5 +1,7 @@
 
-## YetiForceCRM [![Build Status](https://travis-ci.org/YetiForceCompany/YetiForceCRM.svg?branch=developer)](https://travis-ci.org/YetiForceCompany/YetiForceCRM) [![HHVM Status](https://img.shields.io/badge/hhvm-tested-green.svg)](https://travis-ci.org/YetiForceCompany/YetiForceCRM) [![Analytics](https://ga-beacon.appspot.com/UA-81376231-1/welcome-page)](https://github.com/igrigorik/ga-beacon) [![SensioLabsInsight](https://insight.sensiolabs.com/projects/995e8799-f471-4d45-9e06-6d6691480b17/mini.png)](https://insight.sensiolabs.com/projects/995e8799-f471-4d45-9e06-6d6691480b17) [![Scrutinizer](https://scrutinizer-ci.com/g/YetiForceCompany/YetiForceCRM/badges/quality-score.png?b=developer)](https://scrutinizer-ci.com/g/YetiForceCompany/YetiForceCRM/) 
+## YetiForceCRM 
+[![Build Status](https://travis-ci.org/YetiForceCompany/YetiForceCRM.svg?branch=developer)](https://travis-ci.org/YetiForceCompany/YetiForceCRM) [![HHVM Status](https://img.shields.io/badge/hhvm-tested-green.svg)](https://travis-ci.org/YetiForceCompany/YetiForceCRM) [![Analytics](https://ga-beacon.appspot.com/UA-81376231-1/welcome-page)](https://github.com/igrigorik/ga-beacon) [![SensioLabsInsight](https://insight.sensiolabs.com/projects/189f9068-d777-44a7-9164-9242e81df88c/mini.png)](https://insight.sensiolabs.com/projects/189f9068-d777-44a7-9164-9242e81df88c) [![Scrutinizer](https://scrutinizer-ci.com/g/YetiForceCompany/YetiForceCRM/badges/quality-score.png?b=developer)](https://scrutinizer-ci.com/g/YetiForceCompany/YetiForceCRM/)  [![codecov](https://codecov.io/gh/YetiForceCompany/YetiForceCRM/branch/developer/graph/badge.svg)](https://codecov.io/gh/YetiForceCompany/YetiForceCRM)
+
 
 We design an innovative CRM system that is dedicated for large and medium sized companies. We dedicate it to everyone who values open source software, security and innovation. YetiForce was built on a rock-solid Vtiger foundation, but has hundreds of changes that help to accomplish even the most challenging tasks in the simplest way. Every function within the system was thought through and automated to ensure that all of them work together seamlessly and form a coherent integrity. We looked at the entire sales process and consequently refined the system, module by module. We have years of experience creating tailor made CRM software for a variety of different companies. Download it and have a first-hand experience.
 
@@ -12,22 +14,30 @@ Read the [documentation] (https://yetiforce.com/en/documentation.html) to learn
 
 Join our [LinkedIn group] (https://www.linkedin.com/groups/8177576) and connect with other users and community members to discuss topics surrounding CRM and YetiForce.
 
-Follow us on [Twitter](https://twitter.com/YetiForceEN) to get real-time info about new articles and functionalities. 
+Follow us on [Twitter](https://twitter.com/YetiForceEN) or like on [FaceBook] (https://www.facebook.com/YetiForce-CRM-158646854306054/?ref=aymt_homepage_panel) to get real-time info about new articles and functionalities. 
 
-YetiForce CRM was orginally forked from Vtiger CRM and has mechanisms that allow to easily migrate from Vtiger to YetiForce.
+Visit our [online store] (https://shop.yetiforce.com/en/) with commercial modules and support packages.
 
-Gallery:
+Where else can you find YetiForce?
+- [Sourceforge] (https://sourceforge.net/projects/yetiforce/)
+- [Softaculous] (http://www.softaculous.com/apps/erp/YetiForce)  
 
-![](https://yetiforce.com/images/yeti/Home_page_1.png)
+1. The lists of changes for previous versions of YetiForce CRM are available at [our website] (https://yetiforce.com/en/developer-documentation/changes.html).
+2. Check Milestone to verify release due date
+https://github.com/YetiForceCompany/YetiForceCRM/milestones
+3. Update PKG link.
+https://github.com/YetiForceCompany/UpdatePackages
+
+YetiForce CRM was orginally forked from Vtiger CRM and has mechanisms that allow to easily migrate from Vtiger to YetiForce.
 
-![](https://yetiforce.com/images/yeti/Home_page_3.png)
+![](https://yetiforce.com/images/yeti/1_Home_page.png)
 
-![](https://yetiforce.com/images/yeti/Calendar_2.png)
+![](https://yetiforce.com/images/yeti/3_Home_page.png)
 
-![](https://yetiforce.com/images/yeti/List_Accounts.png)
+![](https://yetiforce.com/images/yeti/4_Calendar.png)
 
-![](https://yetiforce.com/images/yeti/Detail_Accounts.png)
+![](https://yetiforce.com/images/yeti/8_List_Accounts.png)
 
-![](https://yetiforce.com/images/yeti/Detail_Projects_Gantt_Months.png)
+![](https://yetiforce.com/images/yeti/9_Detail_Accounts.png)
 
-The lists of changes for previous versions of YetiForce CRM are available at [our website] (https://yetiforce.com/en/developer-documentation/changes.html).
+![](https://yetiforce.com/images/yeti/24_Detail_Projects_Gantt_Months.png)

api.php

@@ -1,59 +1,40 @@
 <?php
-/*+*******************************************************************************
+/* +*******************************************************************************
  * The contents of this file are subject to the vtiger CRM Public License Version 1.0
  * ("License"); You may not use this file except in compliance with the License
  * The Original Code is:  vtiger CRM Open Source
  * The Initial Developer of the Original Code is vtiger.
  * Portions created by vtiger are Copyright (C) vtiger.
  * All Rights Reserved.
  * Contributor(s): YetiForce.com
- ********************************************************************************/
+ * ****************************************************************************** */
 require_once 'config/api.php';
-$service = $_REQUEST['service'];
+$service = strip_tags($_REQUEST['service']);
 
-if(isset($service))
-{
-	if(!in_array($service,$enabledServices)){
-		echo $service.' - Service is not active';
+if (isset($service)) {
+	if (!in_array($service, $enabledServices)) {
+		echo "$service - Service is not active";
 		return;
-	}	
-	if($service == "customerportal")
-	{
-		include("api/customerportal.php");
-	}	
-	elseif($service == "mobile")	
-	{		
-		include("api/mobile.php");
 	}
-	elseif($service == "yetiportal")	
-	{		
-		include("api/yetiportal.php");
-	}
-	elseif($service == "firefox")
-	{
-		include("api/firefoxtoolbar.php");
-	}
-	elseif($service == "wordplugin")
-	{
-		include("api/wordplugin.php");
-	}
-	elseif($service == "thunderbird")
-	{
-		include("api/thunderbirdplugin.php");
-	}
-	else
-	{
-		echo "No Service Configured for ". strip_tags($service);
+
+	if ($service == "firefox") {
+		include('api/firefoxtoolbar.php');
+	} elseif ($service == "wordplugin") {
+		include('api/wordplugin.php');
+	} elseif ($service == "thunderbird") {
+		include('api/thunderbirdplugin.php');
+	} else {
+		echo "No Service Configured for $service";
 	}
-}
-else
-{
-	echo "<h1>YetiForceCRM API Services</h1>";
-	echo "<li>YetiForceCRM Yeti Portal EndPoint URL -- Click <a href='api.php?service=yetiportal'>here</a></li>";
-	echo "<li>YetiForceCRM Outlook Plugin EndPoint URL -- Click <a href='api.php?service=outlook'>here</a></li>";
-	echo "<li>YetiForceCRM Word Plugin EndPoint URL -- Click <a href='api.php?service=wordplugin'>here</a></li>";
-	echo "<li>YetiForceCRM ThunderBird Extenstion EndPoint URL -- Click <a href='api.php?service=thunderbird'>here</a></li>";
-	echo "<li>YetiForceCRM Customer Portal EndPoint URL -- Click <a href='api.php?service=customerportal'>here</a></li>";
-	echo "<li>YetiForceCRM WebForm EndPoint URL -- Click <a href='api.php?service=webforms'>here</a></li>";
-	echo "<li>YetiForceCRM FireFox Extension EndPoint URL -- Click <a href='api.php?service=firefox'>here</a></li>";
+} else {
+	/*
+	  echo "<h1>YetiForceCRM API Services</h1>";
+	  echo "<li>YetiForceCRM Yeti Portal EndPoint URL -- Click <a href='api.php?service=yetiportal'>here</a></li>";
+	  echo "<li>YetiForceCRM Outlook Plugin EndPoint URL -- Click <a href='api.php?service=outlook'>here</a></li>";
+	  echo "<li>YetiForceCRM Word Plugin EndPoint URL -- Click <a href='api.php?service=wordplugin'>here</a></li>";
+	  echo "<li>YetiForceCRM ThunderBird Extenstion EndPoint URL -- Click <a href='api.php?service=thunderbird'>here</a></li>";
+	  echo "<li>YetiForceCRM Customer Portal EndPoint URL -- Click <a href='api.php?service=customerportal'>here</a></li>";
+	  echo "<li>YetiForceCRM WebForm EndPoint URL -- Click <a href='api.php?service=webforms'>here</a></li>";
+	  echo "<li>YetiForceCRM FireFox Extension EndPoint URL -- Click <a href='api.php?service=firefox'>here</a></li>";
+	 */
 }

api/.htaccess

@@ -14,12 +14,13 @@
 	</IfModule>
 </Files>
 <IfModule mod_php5.c>
-	php_flag	display_errors	Off
+	#php_flag	display_errors	Off
 </IfModule>
 <Files webservice.php>
 	<IfModule mod_rewrite.c>
 		RewriteEngine On
 		RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]
-		RewriteRule (.*) webservice.php [L]
+		RewriteRule .* - [E=HTTP_CONTENT_TYPE:%{HTTP:Content-Type},L]
+		RewriteRule (.*) webservice.php [QSA,NC,L]
 	</IfModule>
 </Files>