Commit: 9512c85d6c6b5f6c1c18267b2488dc0cb478ff0d - xoopscubelegacy (git)

XOOPS Cube Legacy base repository

Commit MetaInfo

• Revisão: 9512c85d6c6b5f6c1c18267b2488dc0cb478ff0d (tree)
• Hora: 2013-04-12 17:03:45
• Autor: HIKAWA Kilica <kilica.hikawa@gmai...>
• Commiter: HIKAWA Kilica

Mensagem de Log

Merge pull request #72 from naao/xoopscube_message_default

Add message module's personal settings to preferences for default.

Mudança Sumário

• modified: extras/extra_languages/fr_utf8/modules/message/language/fr_utf8/modinfo.php
• modified: extras/extra_languages/french/modules/message/language/french/modinfo.php
• modified: extras/extra_languages/ja_utf8/modules/message/language/ja_utf8/modinfo.php
• modified: extras/extra_languages/japanese/modules/message/language/japanese/modinfo.php
• modified: extras/extra_languages/ko_utf8/html/modules/message/language/ko_utf8/modinfo.php
• modified: extras/extra_languages/korean/modules/message/language/korean/modinfo.php
• modified: extras/extra_languages/portuguese/modules/message/language/portuguese/modinfo.php
• modified: extras/extra_languages/pt_utf8/modules/message/language/pt_utf8/modinfo.php
• modified: html/modules/message/README.txt
• modified: html/modules/message/class/handler/Settings.class.php
• modified: html/modules/message/xoops_version.php

Diff

--- a/extras/extra_languages/fr_utf8/modules/message/language/fr_utf8/modinfo.php
+++ b/extras/extra_languages/fr_utf8/modules/message/language/fr_utf8/modinfo.php
@@ -17,6 +17,12 @@ define('_MI_MESSAGE_USERINFO', 'Remplacer la page user_userinfo.html?');
 define('_MI_MESSAGE_USERINFO_DESC', 'Changer le template du profil utilisateur user_userinfo.html par celui de ce module?');
 define('_MI_MESSAGE_DELTYPE', 'Purger les messages non-lus?');
 define('_MI_MESSAGE_DELTYPE_DESC', 'Avec cette option les messages seront automatiquement supprimés pendant le processus de purge.');
+define('_MI_MESSAGE_DEFAULT_USEPM', 'Par défaut: message privé dutilisation');
+define('_MI_MESSAGE_DEFAULT_USEPM_DESC', 'Mettre en place "Message privé demploi" pour la personne qui nest pas définie.');
+define('_MI_MESSAGE_DEFAULT_TOMAIL', 'Par défaut : vers lavant à lemail');
+define('_MI_MESSAGE_DEFAULT_TOMAIL_DESC', 'Mettre en place "Forward to email" pour la personne qui nest pas définie.');
+define('_MI_MESSAGE_DEFAULT_VIEWMSM', 'Par défaut : le corps du message saffiche dans le courrier');
+define('_MI_MESSAGE_DEFAULT_VIEWMSM_DESC', 'Mettre en place "le message est affiché dans le courrier" pour la personne qui nest pas définie.');
 
 define('_MI_MESSAGE_BLOCK_NAME', 'Nouveaux Messages');
 define('_MI_INQUIRY_INSTALL_ERROR', 'Ce module fonctionne uniquement avec la version PHP5.');

--- a/extras/extra_languages/french/modules/message/language/french/modinfo.php
+++ b/extras/extra_languages/french/modules/message/language/french/modinfo.php
@@ -17,6 +17,12 @@ define('_MI_MESSAGE_USERINFO', 'Remplacer user_userinfo.html?');
 define('_MI_MESSAGE_USERINFO_DESC', 'Changer le template du profil utilisateur (user_userinfo.html) par celui de ce module?');
 define('_MI_MESSAGE_DELTYPE', 'Purger les messages non-lus?');
 define('_MI_MESSAGE_DELTYPE_DESC', 'Les messages non-lus sont automatiquement supprim駸 durant le processus de purge.');
+define('_MI_MESSAGE_DEFAULT_USEPM', 'Par d馭aut: message priv dutilisation');
+define('_MI_MESSAGE_DEFAULT_USEPM_DESC', 'Mettre en place "Message priv demploi" pour la personne qui nest pas d馭inie.');
+define('_MI_MESSAGE_DEFAULT_TOMAIL', 'Par d馭aut : vers lavant  lemail');
+define('_MI_MESSAGE_DEFAULT_TOMAIL_DESC', 'Mettre en place "Forward to email" pour la personne qui nest pas d馭inie.');
+define('_MI_MESSAGE_DEFAULT_VIEWMSM', 'Par d馭aut : le corps du message saffiche dans le courrier');
+define('_MI_MESSAGE_DEFAULT_VIEWMSM_DESC', 'Mettre en place "le message est affich dans le courrier" pour la personne qui nest pas d馭inie.');
 
 define('_MI_MESSAGE_BLOCK_NAME', 'Nouveaux Messages');
 define('_MI_INQUIRY_INSTALL_ERROR', 'Ce module ne fonctionne qu\'avec PHP5.');

--- a/extras/extra_languages/ja_utf8/modules/message/language/ja_utf8/modinfo.php
+++ b/extras/extra_languages/ja_utf8/modules/message/language/ja_utf8/modinfo.php
@@ -17,6 +17,12 @@ define('_MI_MESSAGE_USERINFO', 'user_userinfo.htmlの差替え');
 define('_MI_MESSAGE_USERINFO_DESC', 'user_userinfo.htmlをこのモジュールのものに変更するか');
 define('_MI_MESSAGE_DELTYPE', '未読メッセージの削除');
 define('_MI_MESSAGE_DELTYPE_DESC', '保存期間の過ぎた未読メッセージを自動削除するかどうか');
+define('_MI_MESSAGE_DEFAULT_USEPM', 'デフォルト設定：プライベートメッセージを使う');
+define('_MI_MESSAGE_DEFAULT_USEPM_DESC', '未設定ユーザーの「プライベートメッセージを使う」動作を規定します。');
+define('_MI_MESSAGE_DEFAULT_TOMAIL', 'デフォルト設定：メールに転送する');
+define('_MI_MESSAGE_DEFAULT_TOMAIL_DESC', '未設定ユーザーの「メールに転送する」動作を規定します。');
+define('_MI_MESSAGE_DEFAULT_VIEWMSM', 'デフォルト設定：メールに本文を表示する');
+define('_MI_MESSAGE_DEFAULT_VIEWMSM_DESC', '未設定ユーザーの「メールに本文を表示する」動作を規定します。');
 
 define('_MI_MESSAGE_BLOCK_NAME', '新着ブロック');
 define('_MI_MESSAGE_INSTALL_ERROR', 'このモジュールはPHP5.0以上でないと動作しません。');

--- a/extras/extra_languages/japanese/modules/message/language/japanese/modinfo.php
+++ b/extras/extra_languages/japanese/modules/message/language/japanese/modinfo.php
@@ -17,6 +17,12 @@ define('_MI_MESSAGE_USERINFO', 'user_userinfo.html
 define('_MI_MESSAGE_USERINFO_DESC', 'user_userinfo.htmlをこのモジュールのものに変更するか');
 define('_MI_MESSAGE_DELTYPE', '未読メッセージの削除');
 define('_MI_MESSAGE_DELTYPE_DESC', '保存期間の過ぎた未読メッセージを自動削除するかどうか');
+define('_MI_MESSAGE_DEFAULT_USEPM', 'デフォルト設定：プライベートメッセージを使う');
+define('_MI_MESSAGE_DEFAULT_USEPM_DESC', '未設定ユーザーの「プライベートメッセージを使う」動作を規定します。');
+define('_MI_MESSAGE_DEFAULT_TOMAIL', 'デフォルト設定：メールに転送する');
+define('_MI_MESSAGE_DEFAULT_TOMAIL_DESC', '未設定ユーザーの「メールに転送する」動作を規定します。');
+define('_MI_MESSAGE_DEFAULT_VIEWMSM', 'デフォルト設定：メールに本文を表示する');
+define('_MI_MESSAGE_DEFAULT_VIEWMSM_DESC', '未設定ユーザーの「メールに本文を表示する」動作を規定します。');
 
 define('_MI_MESSAGE_BLOCK_NAME', '新着ブロック');
 define('_MI_MESSAGE_INSTALL_ERROR', 'このモジュールはPHP5.0以上でないと動作しません。');

--- a/extras/extra_languages/ko_utf8/html/modules/message/language/ko_utf8/modinfo.php
+++ b/extras/extra_languages/ko_utf8/html/modules/message/language/ko_utf8/modinfo.php
@@ -18,6 +18,12 @@ define('_MI_MESSAGE_USERINFO', 'user_userinfo.html 을 교체');
 define('_MI_MESSAGE_USERINFO_DESC', 'user_userinfo.html 을 이 모듈에 포함된 것으로 교체할지 지정해 주세요.');
 define('_MI_MESSAGE_DELTYPE', '미독(읽지 않은)메세지 삭제');
 define('_MI_MESSAGE_DELTYPE_DESC', '보존 기간이 지난 미독 메세지를 자동삭제처리할지 않을지를 지정해 주세요!');
+define('_MI_MESSAGE_DEFAULT_USEPM', '기본 설정: 사용 하 여 개인 메시지');
+define('_MI_MESSAGE_DEFAULT_USEPM_DESC', '설정 되지 않은 사람을 위해 "사용 하 여 개인 메시지"를 설정 합니다.');
+define('_MI_MESSAGE_DEFAULT_TOMAIL', '기본 설정: 이메일 전달');
+define('_MI_MESSAGE_DEFAULT_TOMAIL_DESC', '설정 되지 않은 사람에 대 한 "이메일 앞으로"를 설정 합니다.');
+define('_MI_MESSAGE_DEFAULT_VIEWMSM', '기본 설정: 메일에 표시 되는 메시지 본문');
+define('_MI_MESSAGE_DEFAULT_VIEWMSM_DESC', '설정 되지 않은 사람에 대 한 "메시지를 메일 표시"를 설정 합니다.');
 
 define('_MI_MESSAGE_BLOCK_NAME', '신착 메세지 블록');
 define('_MI_INQUIRY_INSTALL_ERROR', '이 모듈은 PHP5 전용입니다.');

--- a/extras/extra_languages/korean/modules/message/language/korean/modinfo.php
+++ b/extras/extra_languages/korean/modules/message/language/korean/modinfo.php
@@ -18,6 +18,12 @@ define('_MI_MESSAGE_USERINFO', 'user_userinfo.html 
 define('_MI_MESSAGE_USERINFO_DESC', 'user_userinfo.html 聖 戚 乞汲拭 匂敗吉 依生稽 嘘端拝走 走舛背 爽室推.');
 define('_MI_MESSAGE_DELTYPE', '耕偽(石走 省精)五室走 肢薦');
 define('_MI_MESSAGE_DELTYPE_DESC', '左糎 奄娃戚 走貝 耕偽 五室走研 切疑肢薦坦軒拝走 省聖走研 走舛背 爽室推!');
+define('_MI_MESSAGE_DEFAULT_USEPM', '奄沙 竺舛: 紫遂 馬 食 鯵昔 五獣走');
+define('_MI_MESSAGE_DEFAULT_USEPM_DESC', '竺舛 鞠走 省精 紫寓聖 是背 "紫遂 馬 食 鯵昔 五獣走"研 竺舛 杯艦陥.');
+define('_MI_MESSAGE_DEFAULT_TOMAIL', '奄沙 竺舛: 戚五析 穿含');
+define('_MI_MESSAGE_DEFAULT_TOMAIL_DESC', '竺舛 鞠走 省精 紫寓拭 企 廃 "戚五析 蒋生稽"研 竺舛 杯艦陥.');
+define('_MI_MESSAGE_DEFAULT_VIEWMSM', '奄沙 竺舛: 五析拭 妊獣 鞠澗 五獣走 沙庚');
+define('_MI_MESSAGE_DEFAULT_VIEWMSM_DESC', '竺舛 鞠走 省精 紫寓拭 企 廃 "五獣走研 五析 妊獣"研 竺舛 杯艦陥.');
 
 define('_MI_MESSAGE_BLOCK_NAME', '重鐸 五室走 鷺系');
 define('_MI_INQUIRY_INSTALL_ERROR', '戚 乞汲精 PHP5 穿遂脊艦陥.');

--- a/extras/extra_languages/portuguese/modules/message/language/portuguese/modinfo.php
+++ b/extras/extra_languages/portuguese/modules/message/language/portuguese/modinfo.php
@@ -37,4 +37,11 @@ define("_MI_MESSAGE_SUB_SEND","Caixa de sa
 define("_MI_MESSAGE_SUB_SETTINGS","Configura鋏es");
 define("_MI_MESSAGE_USERINFO","Substituir o modelo HTML <q>user_userinfo.html</q>?");
 define("_MI_MESSAGE_USERINFO_DESC","Deseja alterar a interface das p疊inas dos associados (<q>template user_userinfo.html</q>) com o modelo deste m?ulo?");
+
+define('_MI_MESSAGE_DEFAULT_USEPM', 'Predefini鈬o: mensagem privada de uso');
+define('_MI_MESSAGE_DEFAULT_USEPM_DESC', 'Configurar "Mensagem privada de uso" para a pessoa que n縊 est configurada.');
+define('_MI_MESSAGE_DEFAULT_TOMAIL', 'Predefini鈬o: encaminhar para o e-mail');
+define('_MI_MESSAGE_DEFAULT_TOMAIL_DESC', 'Configurar "Frente a e-mail" para a pessoa que n縊 est configurada.');
+define('_MI_MESSAGE_DEFAULT_VIEWMSM', 'Configura鈬o padr縊: O corpo da mensagem  exibido no mail');
+define('_MI_MESSAGE_DEFAULT_VIEWMSM_DESC', 'Configurar "a mensagem  exibida no mail" para a pessoa que n縊 est configurada.');
 ?>
\ No newline at end of file

--- a/extras/extra_languages/pt_utf8/modules/message/language/pt_utf8/modinfo.php
+++ b/extras/extra_languages/pt_utf8/modules/message/language/pt_utf8/modinfo.php
@@ -37,4 +37,11 @@ define("_MI_MESSAGE_SUB_SEND","Caixa de saída");
 define("_MI_MESSAGE_SUB_SETTINGS","Configurações");
 define("_MI_MESSAGE_USERINFO","Substituir o modelo HTML <q>user_userinfo.html</q>?");
 define("_MI_MESSAGE_USERINFO_DESC","Deseja alterar a interface das páginas dos associados (<q>template user_userinfo.html</q>) com o modelo deste módulo?");
+
+define('_MI_MESSAGE_DEFAULT_USEPM', 'Predefinição: mensagem privada de uso');
+define('_MI_MESSAGE_DEFAULT_USEPM_DESC', 'Configurar "Mensagem privada de uso" para a pessoa que não está configurada.');
+define('_MI_MESSAGE_DEFAULT_TOMAIL', 'Predefinição: encaminhar para o e-mail');
+define('_MI_MESSAGE_DEFAULT_TOMAIL_DESC', 'Configurar "Frente a e-mail" para a pessoa que não está configurada.');
+define('_MI_MESSAGE_DEFAULT_VIEWMSM', 'Configuração padrão: O corpo da mensagem é exibido no mail');
+define('_MI_MESSAGE_DEFAULT_VIEWMSM_DESC', 'Configurar "a mensagem é exibida no mail" para a pessoa que não está configurada.');
 ?>
\ No newline at end of file

--- a/html/modules/message/README.txt
+++ b/html/modules/message/README.txt
@@ -74,6 +74,9 @@ ToDo:
 同報発信
 
 【更新履歴】
+Ver 1.19:プライベートメッセージ個人設定を行っていないユーザーの
+         「プライベートメッセージを使う」「メールに転送する」「メールに本文を表示する」
+         の規定値を管理画面で変更可能とした。
 Ver 1.18:pmモジュールとの互換性の向上
 Ver 1.17:削除されたユーザへの返信でエラーになっていたのを修正
 Ver 1.16:newAction.class.phpの修正

--- a/html/modules/message/class/handler/Settings.class.php
+++ b/html/modules/message/class/handler/Settings.class.php
@@ -8,10 +8,12 @@ class MessageSettingsObject extends XoopsSimpleObject
 {
   public function __construct()
   {
+    $mModuleConfig = XCube_Root::getSingleton()->mContext->mModuleConfig;
+
     $this->initVar('uid', XOBJ_DTYPE_INT, 0);
-    $this->initVar('usepm', XOBJ_DTYPE_INT, 1, true);
-    $this->initVar('tomail', XOBJ_DTYPE_INT, 0, true);
-    $this->initVar('viewmsm', XOBJ_DTYPE_INT, 0, true);
+    $this->initVar('usepm', XOBJ_DTYPE_INT, $mModuleConfig['usepm'], true);
+    $this->initVar('tomail', XOBJ_DTYPE_INT, $mModuleConfig['tomail'], true);
+    $this->initVar('viewmsm', XOBJ_DTYPE_INT, $mModuleConfig['viewmsm'], true);
     $this->initVar('pagenum', XOBJ_DTYPE_INT, 0, true);
     $this->initVar('blacklist', XOBJ_DTYPE_STRING, "");
   }

--- a/html/modules/message/xoops_version.php
+++ b/html/modules/message/xoops_version.php
@@ -9,7 +9,7 @@ $mydirpath = basename( dirname( dirname( __FILE__ ) ) ) ;
 
 $modversion['name'] = _MI_MESSAGE_NAME;
 $modversion['dirname'] = basename(dirname(__FILE__));
-$modversion['version'] = 1.18;
+$modversion['version'] = 1.19;
 $modversion['description'] = _MI_MESSAGE_DESC;
 $modversion['author'] = 'Marijuana';
 $modversion['credits'] = "XOOPS Cube Project";
@@ -85,6 +85,27 @@ $modversion['config'][4]['formtype']	= 'yesno';
 $modversion['config'][4]['valuetype']	= 'int';
 $modversion['config'][4]['default'] 	= '1';
 
+$modversion['config'][5]['name']		= 'usepm';
+$modversion['config'][5]['title']		= '_MI_MESSAGE_DEFAULT_USEPM';
+$modversion['config'][5]['description'] = '_MI_MESSAGE_DEFAULT_USEPM_DESC';
+$modversion['config'][5]['formtype']	= 'yesno';
+$modversion['config'][5]['valuetype']	= 'int';
+$modversion['config'][5]['default'] 	= '1';
+
+$modversion['config'][6]['name']		= 'tomail';
+$modversion['config'][6]['title']		= '_MI_MESSAGE_DEFAULT_TOMAIL';
+$modversion['config'][6]['description'] = '_MI_MESSAGE_DEFAULT_TOMAIL_DESC';
+$modversion['config'][6]['formtype']	= 'yesno';
+$modversion['config'][6]['valuetype']	= 'int';
+$modversion['config'][6]['default'] 	= '0';
+
+$modversion['config'][7]['name']		= 'viewmsm';
+$modversion['config'][7]['title']		= '_MI_MESSAGE_DEFAULT_VIEWMSM';
+$modversion['config'][7]['description'] = '_MI_MESSAGE_DEFAULT_VIEWMSM_DESC';
+$modversion['config'][7]['formtype']	= 'yesno';
+$modversion['config'][7]['valuetype']	= 'int';
+$modversion['config'][7]['default'] 	= '0';
+
 $modversion['blocks'][0]['file']		= 'message_block.class.php';
 $modversion['blocks'][0]['name']		= _MI_MESSAGE_BLOCK_NAME;
 $modversion['blocks'][0]['description'] = '';
@@ -93,4 +114,5 @@ $modversion['blocks'][0]['class']		= 'Block';
 $modversion['blocks'][0]['template']	= 'message_block_template.html';
 $modversion['blocks'][0]['visible'] 	= '1';
 $modversion['blocks'][0]['func_num']	= 1;
+
 ?>