Просмотр исходного кода

#2397 More descriptive error message when ACL action is limited by time

Alex Trofimov 6 лет назад
Родитель
Сommit
28815b1a68

+ 3 - 0
inc/classes/BxDolAcl.php

@@ -33,6 +33,7 @@ define('CHECK_ACTION_LANG_FILE_PERIOD', 4);
 define('CHECK_ACTION_LANG_FILE_AFTER', 5);
 define('CHECK_ACTION_LANG_FILE_BEFORE', 6);
 define('CHECK_ACTION_LANG_FILE_SITE_EMAIL',	7);
+define('CHECK_ACTION_LANG_FILE_PERIOD_RESTART_AT', 8);
 
 /**
  * Standard membership ID's
@@ -243,6 +244,7 @@ class BxDolAcl extends BxDolFactory implements iBxDolSingleton
      *
      * 		$arg0[CHECK_ACTION_LANG_FILE_LIMIT]		= limit on number of actions allowed for the profile
      * 		$arg0[CHECK_ACTION_LANG_FILE_PERIOD]	= period that the limit is set for (in hours, 0 if unlimited)
+     * 		$arg0[CHECK_ACTION_LANG_FILE_PERIOD_RESTART_AT]	= time when new period begins, so counter will be reset
      *
      * 	CHECK_ACTION_RESULT_NOT_ALLOWED_BEFORE:
      *
@@ -363,6 +365,7 @@ class BxDolAcl extends BxDolFactory implements iBxDolSingleton
             if($iActionsLeft <= 0){
                 $aLangFileParams[CHECK_ACTION_LANG_FILE_LIMIT] = $iAllowedCnt;
                 $aLangFileParams[CHECK_ACTION_LANG_FILE_PERIOD] = $iPeriodLen;
+                $aLangFileParams[CHECK_ACTION_LANG_FILE_PERIOD_RESTART_AT] = bx_time_js($iPeriodEnd);
 
                 $aResult[CHECK_ACTION_RESULT] = CHECK_ACTION_RESULT_LIMIT_REACHED;
                 $aResult[CHECK_ACTION_MESSAGE] = '<div class="bx-acl-err-msg">' . _t_ext(CHECK_ACTION_MESSAGE_LIMIT_REACHED, $aLangFileParams) . ($iPeriodLen > 0 ? _t_ext(CHECK_ACTION_MESSAGE_MESSAGE_EVERY_PERIOD, $aLangFileParams) : '') . '.</div>';

+ 1 - 1
modules/boonex/english/data/langs/system/en.xml

@@ -1732,7 +1732,7 @@
 	<string name="_sys_acl_action_create_account_desc"><![CDATA[It make sense for guests only, you can temporary disable it or set limit by time for example.]]></string>
 	<string name="_sys_acl_action_delete_account"><![CDATA[Delete Account]]></string>
 	<string name="_sys_acl_action_delete_account_desc"><![CDATA[Delete account also deletes account's content.]]></string>
-	<string name="_sys_acl_action_every_period"><![CDATA[ every {4} hours]]></string>
+	<string name="_sys_acl_action_every_period"><![CDATA[ every {4} hours, new period begins {8}]]></string>
 	<string name="_sys_acl_action_favorite"><![CDATA[Favorite]]></string>
 	<string name="_sys_acl_action_favorite_view"><![CDATA[View favorites]]></string>
 	<string name="_sys_acl_action_feature"><![CDATA[Feature]]></string>

+ 1 - 1
modules/boonex/russian/data/langs/system/ru.xml

@@ -1718,7 +1718,7 @@
 	<string name="_sys_acl_action_create_account_desc"><![CDATA[Это имеет смысл только для гостей. Например, Вы можете временно отключить или задать лимит по времени для этого пункта.]]></string>
 	<string name="_sys_acl_action_delete_account"><![CDATA[Удалить Аккаунт]]></string>
 	<string name="_sys_acl_action_delete_account_desc"><![CDATA[Удалить аккаунт, также удалить содержимое аккаунта.]]></string>
-	<string name="_sys_acl_action_every_period"><![CDATA[ каждые {4} часа]]></string>
+	<string name="_sys_acl_action_every_period"><![CDATA[ каждые {4} часа, новый период начнется {8}]]></string>
 	<string name="_sys_acl_action_favorite"><![CDATA[Избранное - Добавлять]]></string>
 	<string name="_sys_acl_action_favorite_view"><![CDATA[Избранное - Просматривать]]></string>
 	<string name="_sys_acl_action_feature"><![CDATA[Продвинутое - Добавлять]]></string>