Commit 5e5df0a8bee416bd30feabb1aba127bf3c73735b

Authored by Brad Shuttleworth
1 parent 29310da3

- make Email's always get sent as UTF-8.

- Add auto-register to core plugins, and a few essential Standard plugins.
- make the lookup-tree text more useful.


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5063 c91229c3-7414-0410-bfa2-8a42b809f60b
lib/email/Email.inc
@@ -43,6 +43,8 @@ class Email { @@ -43,6 +43,8 @@ class Email {
43 // create a new phpmailer object. 43 // create a new phpmailer object.
44 require_once(KT_DIR . '/thirdparty/phpmailer/class.phpmailer.php'); 44 require_once(KT_DIR . '/thirdparty/phpmailer/class.phpmailer.php');
45 $this->oMailer = new phpmailer(); 45 $this->oMailer = new phpmailer();
  46 + $this->oMailer->Encoding = 'base64';
  47 + $this->oMailer->CharSet = 'utf-8';
46 $this->oMailer->isSMTP(); 48 $this->oMailer->isSMTP();
47 $this->oMailer->Host = $default->emailServer; 49 $this->oMailer->Host = $default->emailServer;
48 $this->oMailer->From = (strlen($sFromEmail) == 0) ? $default->emailFrom : $sFromEmail; 50 $this->oMailer->From = (strlen($sFromEmail) == 0) ? $default->emailFrom : $sFromEmail;
lib/plugins/plugin.inc.php
@@ -32,6 +32,8 @@ class KTPlugin { @@ -32,6 +32,8 @@ class KTPlugin {
32 var $bAlwaysInclude = false; 32 var $bAlwaysInclude = false;
33 var $iVersion = 0; 33 var $iVersion = 0;
34 34
  35 + var $autoRegister = false;
  36 +
35 var $_aPortlets = array(); 37 var $_aPortlets = array();
36 var $_aTriggers = array(); 38 var $_aTriggers = array();
37 var $_aActions = array(); 39 var $_aActions = array();
@@ -227,12 +229,13 @@ class KTPlugin { @@ -227,12 +229,13 @@ class KTPlugin {
227 )); 229 ));
228 return $oEntity; 230 return $oEntity;
229 } 231 }
230 - 232 + $disabled = 1;
  233 + if ($this->bAlwaysInclude || $this->autoRegister) { $disabled = 0; }
231 $oEntity = KTPluginEntity::createFromArray(array( 234 $oEntity = KTPluginEntity::createFromArray(array(
232 'namespace' => $this->sNamespace, 235 'namespace' => $this->sNamespace,
233 'path' => $this->stripKtDir($this->sFilename), 236 'path' => $this->stripKtDir($this->sFilename),
234 'version' => $this->iVersion, 237 'version' => $this->iVersion,
235 - 'disabled' => 0, 238 + 'disabled' => $disabled,
236 )); 239 ));
237 if (PEAR::isError($oEntity)) { 240 if (PEAR::isError($oEntity)) {
238 return $oEntity; 241 return $oEntity;
plugins/ktstandard/KTDiscussion.php
@@ -32,6 +32,7 @@ require_once(KT_LIB_DIR . '/discussions/DiscussionComment.inc'); @@ -32,6 +32,7 @@ require_once(KT_LIB_DIR . '/discussions/DiscussionComment.inc');
32 32
33 class KTDiscussionPlugin extends KTPlugin { 33 class KTDiscussionPlugin extends KTPlugin {
34 var $sNamespace = "ktstandard.discussion.plugin"; 34 var $sNamespace = "ktstandard.discussion.plugin";
  35 + var $autoRegister = true;
35 36
36 function setup() { 37 function setup() {
37 $this->registerAction('documentaction', 'KTDocumentDiscussionAction', 'ktcore.actions.document.discussion'); 38 $this->registerAction('documentaction', 'KTDocumentDiscussionAction', 'ktcore.actions.document.discussion');
plugins/ktstandard/KTIndexer.php
@@ -28,6 +28,7 @@ @@ -28,6 +28,7 @@
28 28
29 class KTIndexerPlugin extends KTPlugin { 29 class KTIndexerPlugin extends KTPlugin {
30 var $sNamespace = "ktstandard.indexer.plugin"; 30 var $sNamespace = "ktstandard.indexer.plugin";
  31 + var $autoRegister = true;
31 32
32 function setup() { 33 function setup() {
33 $this->registerTrigger('content', 'transform', 'KTWordIndexerTrigger', 34 $this->registerTrigger('content', 'transform', 'KTWordIndexerTrigger',
plugins/ktstandard/KTLDAPAuthenticationPlugin.php
@@ -31,6 +31,7 @@ require_once(KT_LIB_DIR . '/plugins/pluginregistry.inc.php'); @@ -31,6 +31,7 @@ require_once(KT_LIB_DIR . '/plugins/pluginregistry.inc.php');
31 31
32 class KTLDAPAuthenticationPlugin extends KTPlugin { 32 class KTLDAPAuthenticationPlugin extends KTPlugin {
33 var $sNamespace = "ktstandard.ldapauthentication.plugin"; 33 var $sNamespace = "ktstandard.ldapauthentication.plugin";
  34 + var $autoRegister = true;
34 35
35 function setup() { 36 function setup() {
36 $this->registerAuthenticationProvider('LDAP Authentication', 37 $this->registerAuthenticationProvider('LDAP Authentication',
plugins/ktstandard/KTSubscriptions.php
@@ -40,6 +40,7 @@ require_once(KT_LIB_DIR . '/actions/folderaction.inc.php'); @@ -40,6 +40,7 @@ require_once(KT_LIB_DIR . '/actions/folderaction.inc.php');
40 40
41 class KTSubscriptionPlugin extends KTPlugin { 41 class KTSubscriptionPlugin extends KTPlugin {
42 var $sNamespace = "ktstandard.subscriptions.plugin"; 42 var $sNamespace = "ktstandard.subscriptions.plugin";
  43 + var $autoRegister = true;
43 44
44 function setup() { 45 function setup() {
45 $this->registerPortlet('browse', 'KTSubscriptionPortlet', 46 $this->registerPortlet('browse', 'KTSubscriptionPortlet',
plugins/ktstandard/SearchDashletPlugin.php
@@ -31,6 +31,7 @@ require_once(KT_LIB_DIR . '/plugins/pluginregistry.inc.php'); @@ -31,6 +31,7 @@ require_once(KT_LIB_DIR . '/plugins/pluginregistry.inc.php');
31 31
32 class SearchDashletPlugin extends KTPlugin { 32 class SearchDashletPlugin extends KTPlugin {
33 var $sNamespace = "ktstandard.searchdashlet.plugin"; 33 var $sNamespace = "ktstandard.searchdashlet.plugin";
  34 + var $autoRegister = true;
34 35
35 function setup() { 36 function setup() {
36 $this->registerDashlet('SearchDashlet', 'ktstandard.searchdashlet.dashlet', 'SearchDashlet.php'); 37 $this->registerDashlet('SearchDashlet', 'ktstandard.searchdashlet.dashlet', 'SearchDashlet.php');
templates/ktcore/edit_lookuptrees.smarty
@@ -91,7 +91,7 @@ make it available.{/i18n}</p></div> @@ -91,7 +91,7 @@ make it available.{/i18n}</p></div>
91 <h2>{i18n}Preview{/i18n}</h2> 91 <h2>{i18n}Preview{/i18n}</h2>
92 <div><p class="descriptiveText"> 92 <div><p class="descriptiveText">
93 {i18n}Use the +/- arrows to open or close the tree. Bold items are metadata keywords. 93 {i18n}Use the +/- arrows to open or close the tree. Bold items are metadata keywords.
94 - To edit a category (including adding or removing keywords) click on the "edit" link.{/i18n} 94 + To edit a category (including adding or removing keywords) click on the "attach keywords" link next to it.{/i18n}
95 </p> 95 </p>
96 </div> 96 </div>
97 97