Merge branch 'master' of https://github.com/unaio/una

inc/classes/BxDolForm.php

@@ -1417,8 +1417,10 @@ class BxDolFormCheckerHelper
     {
         return self::checkPreg ($s, '#^\d+\-\d+\-\d+$#');
     }
-    static public function checkDateRange ($s, $iMin, $iMax)
+    static public function checkDateRange ($s, $iMin, $iMax, $bRequired = false)
     {
+        if (!$bRequired && (empty($s) || '0000-00-00' == $s))
+            return true;   
         if (self::checkPreg ($s, '#^\d+\-\d+\-\d+$#')){
             $dDate = new DateTime($s);
             $dDateMax = new DateTime("-" . $iMin . " years");

modules/boonex/english/data/langs/system/en.xml

@@ -2166,6 +2166,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_menu_item_title_cmts_item_reply"><![CDATA[]]></string>
 	<string name="_sys_menu_item_title_cmts_item_score"><![CDATA[]]></string>
 	<string name="_sys_menu_item_title_cmts_item_vote"><![CDATA[]]></string>
+	<string name="_sys_menu_item_title_cmts_item_more"><![CDATA[]]></string>
 	<string name="_sys_menu_item_title_dashboard"><![CDATA[Dash]]></string>
 	<string name="_sys_menu_item_title_home"><![CDATA[Home]]></string>
 	<string name="_sys_menu_item_title_logout"><![CDATA[Sign out]]></string>

modules/boonex/events/classes/BxEventsModule.php

@@ -79,8 +79,8 @@ class BxEventsModule extends BxBaseModGroupsModule
 
         $o = new BxTemplCalendar(array(
             'eventSources' => array (
-                'url' => BX_DOL_URL_ROOT . $this->_oConfig->getBaseUri() . 'calendar_data',
-                'data' => $aData,
+                BX_DOL_URL_ROOT . $this->_oConfig->getBaseUri() . 'calendar_data',
+                $aData,
             ),
         ), $this->_oTemplate);
         return $o->display($sTemplate);

modules/boonex/persons/install/sql/install.sql

@@ -207,7 +207,7 @@ INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `ch
 ('bx_person', 'bx_persons', 'cover', 'a:1:{i:0;s:21:"bx_persons_cover_crop";}', 'a:1:{s:21:"bx_persons_cover_crop";s:24:"_sys_uploader_crop_title";}', 0, 'files', '_bx_persons_form_profile_input_sys_cover', '_bx_persons_form_profile_input_cover', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_person', 'bx_persons', 'picture', 'a:1:{i:0;s:23:"bx_persons_picture_crop";}', 'a:1:{s:23:"bx_persons_picture_crop";s:24:"_sys_uploader_crop_title";}', 0, 'files', '_bx_persons_form_profile_input_sys_picture', '_bx_persons_form_profile_input_picture', '', 0, 0, 0, '', '', '', '', '', '_bx_persons_form_profile_input_picture_err', '', '', 1, 0),
 ('bx_person', 'bx_persons', 'location', '', '', 0, 'location', '_sys_form_input_sys_location', '_sys_form_input_location', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
-('bx_person', 'bx_persons', 'birthday', '0', '', 0, 'datepicker', '_bx_persons_form_profile_input_sys_birthday', '_bx_persons_form_profile_input_birthday', '', 0, 0, 0, '', '', '', 'date_range', 'a:2:{s:3:"min";i:18;s:3:"max";i:99;}', '_bx_persons_form_profile_input_birthday_err', 'Date', '', 1, 0),
+('bx_person', 'bx_persons', 'birthday', '0', '', 0, 'datepicker', '_bx_persons_form_profile_input_sys_birthday', '_bx_persons_form_profile_input_birthday', '', 1, 0, 0, '', '', '', 'date_range', 'a:2:{s:3:"min";i:18;s:3:"max";i:99;}', '_bx_persons_form_profile_input_birthday_err', 'Date', '', 1, 0),
 ('bx_person', 'bx_persons', 'gender', '', '#!Sex', 0, 'select', '_bx_persons_form_profile_input_sys_gender', '_bx_persons_form_profile_input_gender', '', 0, 0, 0, '', '', '', '', '', '', 'Xss', '', 1, 0),
 ('bx_person', 'bx_persons', 'profile_email', '', '', 0, 'text', '_bx_persons_form_profile_input_sys_profile_email', '_bx_persons_form_profile_input_profile_email', '', 0, 0, 0, '', '', '', '', '', '', 'Xss', '', 1, 0),
 ('bx_person', 'bx_persons', 'profile_status', '', '', 0, 'text', '_bx_persons_form_profile_input_sys_profile_status', '_bx_persons_form_profile_input_profile_status', '', 0, 0, 0, '', '', '', '', '', '', 'Xss', '', 1, 0),