diff --git a/modules/Users/models/Record.php b/modules/Users/models/Record.php index b6a0c43c692bcef3638059411d8c76c9ad1e9a3b..04330f22bd7fd58efc1efb882c5bb4ab1e478766 100644 --- a/modules/Users/models/Record.php +++ b/modules/Users/models/Record.php @@ -653,7 +653,7 @@ class Users_Record_Model extends Vtiger_Record_Model { * @return string */ function getCurrentUserActivityReminderInSeconds() { - $activityReminder = $this->reminder_interval; + $activityReminder = isset($this->reminder_interval) ? $this->reminder_interval : 0; $activityReminderInSeconds = ''; if($activityReminder != 'None') { preg_match('/([0-9]+)[\s]([a-zA-Z]+)/', $activityReminder, $matches); diff --git a/modules/Users/views/Login.php b/modules/Users/views/Login.php index 9a022777d257d90868065a20f1bae151d374288f..c9e17e87dba993e901dec4bba879f6a2c20eae40 100644 --- a/modules/Users/views/Login.php +++ b/modules/Users/views/Login.php @@ -20,6 +20,8 @@ class Users_Login_View extends Vtiger_View_Controller { } function preProcess(Vtiger_Request $request, $display = true) { + global $current_user; + $viewer = $this->getViewer($request); $viewer->assign('PAGETITLE', $this->getPageTitle($request)); $viewer->assign('SCRIPTS', $this->getHeaderScripts($request)); @@ -27,6 +29,16 @@ class Users_Login_View extends Vtiger_View_Controller { $viewer->assign('MODULE', $request->getModule()); $viewer->assign('VIEW', $request->get('view')); $viewer->assign('LANGUAGE_STRINGS', array()); + + $viewer->assign('INVENTORY_MODULES', array()); + $viewer->assign('SELECTED_MENU_CATEGORY', ''); + $viewer->assign('QUALIFIED_MODULE', ''); + $viewer->assign('PARENT_MODULE', ''); + $viewer->assign('NOTIFIER_URL', ''); + $viewer->assign('EXTENSION_MODULE', ''); + $viewer->assign('CURRENT_USER_MODEL', $current_user); + $viewer->assign('LANGUAGE', ''); + if ($display) { $this->preProcessDisplay($request); } @@ -37,8 +49,9 @@ class Users_Login_View extends Vtiger_View_Controller { $modelInstance = Settings_ExtensionStore_Extension_Model::getInstance(); $news = $modelInstance->getNews(); + $jsonData = array(); - if ($news && $news['result']) { + if ($news && isset($news['result'])) { $jsonData = $news['result']; $oldTextLength = vglobal('listview_max_textlength'); foreach ($jsonData as $blockData) {