diff --git a/bin/system_info.php b/bin/system_info.php index 8c3ae59..e31108c 100644 --- a/bin/system_info.php +++ b/bin/system_info.php @@ -49,6 +49,7 @@ require_once('../config/dmsDefaults.php'); global $default; $default->log->debug('System information collection script starting...'); +$cache_file = $default->cacheDirectory . '/system_info'; // Get installation guid function getGuid() @@ -166,11 +167,44 @@ function sendForm($data) curl_close($ch); } +// Check the last time the call home executed +function checkRunTime($cache_file) +{ + if(!file_exists($cache_file)){ + return true; + } + + $run_time = trim(file_get_contents($cache_file)); + $now = time(); + + if($run_time < $now){ + return true; + } + + return false; +} + +// update the time of the last call home execution +function updateRunTime($cache_file) +{ + // Generate the time for the next call + $now = time(); + $period = rand(12, 36); + $next = $now + (60*60*$period); + + file_put_contents($cache_file, $next); +} + +if(!checkRunTime($cache_file)){ + exit(0); +} + $post_str = getGuid() .'|'. getUserCnt() .'|'. getDocCnt() .'|'. getKTVersion() .'|'. getKTEdition() .'|'. getOSInfo(); $data['system_info'] = $post_str; sendForm($data); +updateRunTime($cache_file); $default->log->debug('System information collection script finishing.'); exit(0); -?> +?> \ No newline at end of file diff --git a/plugins/ktcore/KTWidgets.php b/plugins/ktcore/KTWidgets.php index 6594580..a88aedb 100755 --- a/plugins/ktcore/KTWidgets.php +++ b/plugins/ktcore/KTWidgets.php @@ -944,8 +944,17 @@ class KTCoreTextAreaWidget extends KTWidget { $global_required_default = true; $this->bRequired = (KTUtil::arrayGet($aOptions, 'required', $global_required_default, false) == true); - $this->aOptions['cols'] = KTUtil::arrayGet($aOptions, 'cols', 60); - $this->aOptions['rows'] = KTUtil::arrayGet($aOptions, 'rows', 3); + // Part of the space on the mce editor is taken up by the toolbars, so make the plain text field slightly smaller (if using the default size) + $default_rows = 20; + if(isset($this->aOptions['field'])){ + $oField = $this->aOptions['field']; + if(!$oField->getIsHTML()){ + $default_rows = 15; + } + } + + $this->aOptions['cols'] = KTUtil::arrayGet($aOptions, 'cols', 80); + $this->aOptions['rows'] = KTUtil::arrayGet($aOptions, 'rows', $default_rows); $this->aOptions['field'] = KTUtil::arrayGet($aOptions, 'field'); } diff --git a/plugins/multiselect/js/hidelink.js b/plugins/multiselect/js/hidelink.js index 5d307e3..250c286 100644 --- a/plugins/multiselect/js/hidelink.js +++ b/plugins/multiselect/js/hidelink.js @@ -1,20 +1,20 @@ //To hide the link for existing bulk upload link -JQ(document).ready(function(){ - var elems = JQ("ul.actionlist").find("a"); +jQuery(document).ready(function(){ + var elems = jQuery("ul.actionlist").find("a"); for (i = 0; i < elems.length; i++) { if(elems[i].href.search("kt_path_info=ktcore.actions.folder.bulkUpload") > -1 || elems[i].href.search("kt_path_info=inetfoldermetadata.actions.folder.bulkUpload") > -1) { - JQ(elems[i]).parent("li").hide(); + jQuery(elems[i]).parent("li").hide(); } } }); // added by SL:2009-03-04 -JQ(document).ready(function(){ - var elems = JQ("ul.actionlist").find("a"); +jQuery(document).ready(function(){ + var elems = jQuery("ul.actionlist").find("a"); for (i = 0; i < elems.length; i++) { if(elems[i].href.search("kt_path_info=ktcore.actions.folder.bulkImport") > -1 || elems[i].href.search("kt_path_info=inetfoldermetadata.actions.folder.bulkUpload") > -1) { - JQ(elems[i]).parent("li").hide(); + jQuery(elems[i]).parent("li").hide(); } } -}); \ No newline at end of file +}); diff --git a/sql/mysql/upgrade/3.7.0/call_home_task.sql b/sql/mysql/upgrade/3.7.0/call_home_task.sql index 0ba0234..8bde4b0 100644 --- a/sql/mysql/upgrade/3.7.0/call_home_task.sql +++ b/sql/mysql/upgrade/3.7.0/call_home_task.sql @@ -1,2 +1,2 @@ -INSERT INTO `scheduler_tasks` (task, script_url, frequency, run_time, status) -VALUES ('Call Home','bin/system_info.php','daily','2009-10-01','system'); \ No newline at end of file +INSERT INTO `scheduler_tasks` (task, script_url, is_complete, frequency, run_time, status) +VALUES ('Call Home','bin/system_info.php', 1, 'half_hourly','2009-10-01','system'); \ No newline at end of file diff --git a/templates/ktcore/principals/about.smarty b/templates/ktcore/principals/about.smarty index dcbb1b3..dfd95a8 100644 --- a/templates/ktcore/principals/about.smarty +++ b/templates/ktcore/principals/about.smarty @@ -10,15 +10,15 @@
{if ($smallVersion == 'Community Edition')} {i18n}This program is free software and published under the GNU General Public License version 3{/i18n}

- {i18n}KnowledgeTree Community Edition is supplied with no support, - no maintenance, + {i18n}KnowledgeTree Community Edition is supplied with no support, + no maintenance, and no warranty.{/i18n}
{i18n}Please contact the KnowledgeTree Sales team should you wish to learn more about commercially supported editions of KnowledgeTree.{/i18n}
{else}
{i18n}This is a professionally supported edition of KnowledgeTree.{/i18n}
{i18n}Please refer to the documentation provided to you at subscription to learn more about how to access KnowledgeTree's professional support team.{/i18n}
- + {/if}


@@ -28,7 +28,7 @@
  • Forums: Discuss KnowledgeTree with expert community users and developers
  • Wiki: Search the knowledge base of user and developer topics
  • Issues: Log a bug or suggest a new feature
    • -
  • Blogs: See what the KnowledgeTree team have to say
    • +
  • Blogs: See what the KnowledgeTree team have to say

    • @@ -63,12 +63,12 @@

  • Kenny Horan -
    • +
  • Artur Kiwa
  • - Michael Knight + Michael Knight
  • Jeongkyu Kim @@ -77,7 +77,7 @@ Rogerio Kohler
  • - Piotr Krawiecki + Piotr Krawiecki
  • Ola Larsson @@ -86,7 +86,7 @@ Pavel Lastovicka
  • - Michel Loiseleur + Michel Loiseleur
  • Renat Lumpau @@ -143,13 +143,13 @@ Phillip Steinbachs
  • - Tahir Tahang + Tahir Tahang
  • Paul Trgina
  • - Harry Tsio + Harry Tsio
  • Bjarte Kalstveit Vebjørnsen @@ -161,13 +161,19 @@ Jaime Zarate
  • + RATP +
    • +
  • + NXC +
    • +
  • And all the KnowledgeTree staff that "dogfood" KnowledgeTree every day.
    • - +

    [If you feel you should be here too, please let us know at contributions@knowledgetree.com]

    -

    This software utilizes third-party software from Pear, PHPMailer, Smarty Template Engine, JSCalendar, Mochikit, Moxiecode Systems, Yahoo Developer Network.

    - +

    This software utilizes third-party software from Pear, PHPMailer, Smarty Template Engine, Apache Tika, Mochikit, Moxiecode Systems, ExtJS, Yahoo Developer Network.

    +