include/Webservices/ConvertLead.php

@@ -8,11 +8,11 @@
  * All Rights Reserved.
  ******************************************************************************** */
 
+require_once 'vendor/autoload.php';
 require_once 'include/Webservices/Retrieve.php';
 require_once 'include/Webservices/Create.php';
 require_once 'include/Webservices/Delete.php';
 require_once 'include/Webservices/DescribeObject.php';
-require_once 'includes/Loader.php';
 vimport ('includes.runtime.Globals');
 vimport ('includes.runtime.BaseModel');
 

include/Webservices/ConvertPotential.php

@@ -12,7 +12,7 @@ require_once 'include/Webservices/Retrieve.php';
 require_once 'include/Webservices/Create.php';
 require_once 'include/Webservices/Delete.php';
 require_once 'include/Webservices/DescribeObject.php';
-require_once 'includes/Loader.php';
+require_once 'vendor/autoload.php';
 vimport('includes.runtime.Globals');
 vimport('includes.runtime.BaseModel');
 

include/fields/DateTimeField.php

@@ -109,8 +109,11 @@ class DateTimeField {
      */
     public static function __convertToDBFormat($date, $format)
     {
-        $dbDate = '';
-        if (empty($format)) {
+	$dbDate = '';
+	if (4 === strpos($date, '-')) {
+	    // adjust format based on date value (could happen during edit-save)
+	    $format = "yyyy-mm-dd";
+	} else if (empty($format)) {
             if (false === strpos($date, '-')) {
                 if(false === strpos($date, '.')){
                     $format = 'dd/mm/yyyy';
@@ -119,8 +122,8 @@ class DateTimeField {
                 }
             } else {
                 $format = 'dd-mm-yyyy';
-            }
-        }
+	    }
+	}
         switch ($format) {
             case 'dd.mm.yyyy':
                 list($d, $m, $y) = explode('.', $date);

includes/main/WebUI.php

@@ -8,10 +8,10 @@
  * All Rights Reserved.
  ************************************************************************************/
 
+require_once 'vendor/autoload.php';
 require_once 'include/utils/utils.php';
 require_once 'include/utils/CommonUtils.php';
 
-require_once 'includes/Loader.php';
 vimport ('includes.runtime.EntryPoint');
 
 class Vtiger_WebUI extends Vtiger_EntryPoint {

modules/Emails/actions/TrackAccess.php

@@ -16,7 +16,7 @@ header('Cache-Control: private', false);
 //Opensource fix for tracking email access count
 chdir(dirname(__FILE__). '/../../../');
 
-require_once 'includes/Loader.php';
+require_once 'vendor/autoload.php';
 require_once 'include/utils/utils.php';
 
 vimport('includes.http.Request');

modules/Users/actions/ForgotPassword.php

@@ -9,9 +9,9 @@
  *************************************************************************************/
 chdir(dirname(__FILE__)."/../../../");
 
+include_once "vendor/autoload.php";
 include_once "include/utils/VtlibUtils.php";
 include_once "include/utils/CommonUtils.php";
-include_once "includes/Loader.php";
 include_once 'includes/runtime/BaseModel.php';
 include_once 'includes/runtime/Viewer.php';
 include_once "includes/http/Request.php";

modules/Vtiger/dashboards/MiniList.php

@@ -10,7 +10,8 @@
 
 class Vtiger_MiniList_Dashboard extends Vtiger_IndexAjax_View {
 
-	public function process(Vtiger_Request $request, $widget=NULL) {
+	public function process(Vtiger_Request $request) {
+		$widget = null;
 		$currentUser = Users_Record_Model::getCurrentUserModel();
 		$viewer = $this->getViewer($request);
 		$moduleName = $request->getModule();

modules/Vtiger/dashboards/Notebook.php

@@ -10,7 +10,8 @@
 
 class Vtiger_Notebook_Dashboard extends Vtiger_IndexAjax_View {
 	
-	public function process(Vtiger_Request $request, $widget=NULL) {
+	public function process(Vtiger_Request $request) {
+		$widget = null;
 		$viewer = $this->getViewer($request);
 		$moduleName = $request->getModule();
 		
@@ -70,4 +71,4 @@ class Vtiger_Notebook_Dashboard extends Vtiger_IndexAjax_View {
 		return $metriclists;
 	}
 	
-}
\ No newline at end of file
+}

modules/Vtiger/views/ShowWidget.php

@@ -46,7 +46,8 @@ class Vtiger_ShowWidget_View extends Vtiger_IndexAjax_View {
 					if ($request->has('data')) {
 						$widget->set('data', $request->get('data'));
 					}
-					$widget->add();
+		    		$widget->add();
+		    		$request->set('widgetid', $widget->get('id'));
 				}
 				
 				//Date conversion from user format to database format
@@ -67,7 +68,7 @@ class Vtiger_ShowWidget_View extends Vtiger_IndexAjax_View {
 				$currentUserPrivilegeModel = Users_Privileges_Model::getCurrentUserPrivilegesModel();
 				if($currentUserPrivilegeModel->hasModulePermission(getTabid($moduleName)) && !Vtiger_Runtime::isRestricted('modules', $moduleName)){
 					$classInstance = new $className();
-					$classInstance->process($request, $widget);
+					$classInstance->process($request);
 				}else{
 					throw new AppException(vtranslate('LBL_PERMISSION_DENIED'));
 				}
@@ -83,4 +84,4 @@ class Vtiger_ShowWidget_View extends Vtiger_IndexAjax_View {
     public function validateRequest(Vtiger_Request $request) {
         $request->validateWriteAccess();
     }
-}
\ No newline at end of file
+}