From 78233f4b287ae12778a462e7200ff1bf2c42f285 Mon Sep 17 00:00:00 2001
From: CaMer0n <cameron@e107coders.org>
Date: Tue, 17 Nov 2009 08:16:46 +0000
Subject: [PATCH] small fixes
---
e107_handlers/phpmailer/mailout_process.php | 8 ++++----
e107_languages/English/admin/lan_admin.php | 5 ++++-
e107_plugins/calendar_menu/e_mailout.php | 8 ++++----
e107_plugins/faqs/admin_config.php | 10 +++++-----
4 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/e107_handlers/phpmailer/mailout_process.php b/e107_handlers/phpmailer/mailout_process.php
index ead29890d..7644b82d9 100644
--- a/e107_handlers/phpmailer/mailout_process.php
+++ b/e107_handlers/phpmailer/mailout_process.php
@@ -9,9 +9,9 @@
*
*
* $Source: /cvs_backup/e107_0.8/e107_handlers/phpmailer/mailout_process.php,v $
- * $Revision: 1.10 $
- * $Date: 2009-11-12 15:11:17 $
- * $Author: marj_nl_fr $
+ * $Revision: 1.11 $
+ * $Date: 2009-11-17 08:16:33 $
+ * $Author: e107coders $
|
| Modifications in hand to work with most recent mailout.php
@@ -30,7 +30,7 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE."/admin/lan_mailout.php");
// Directory for log (if enabled)
-define('MAIL_LOG_PATH',e_FILE."logs/");
+define('MAIL_LOG_PATH',e_MEDIA."logs/");
$HEADER = "";
$FOOTER = "";
diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php
index 103560223..072d527e0 100644
--- a/e107_languages/English/admin/lan_admin.php
+++ b/e107_languages/English/admin/lan_admin.php
@@ -1,7 +1,7 @@
<?php
/*
* Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
- * $Id: lan_admin.php,v 1.37 2009-11-08 13:22:02 e107coders Exp $
+ * $Id: lan_admin.php,v 1.38 2009-11-17 08:16:40 e107coders Exp $
*
* Admin Language File
*/
@@ -312,6 +312,9 @@ define("LAN_USER", "User");
define("LAN_ID", "ID");
define("LAN_TITLE", "Title");
define("LAN_DESCRIPTION", "Description");
+define("LAN_VISIBILITY", "Visibility");
+define("LAN_ICON", "Icon");
+
diff --git a/e107_plugins/calendar_menu/e_mailout.php b/e107_plugins/calendar_menu/e_mailout.php
index bdf875de6..898c66e11 100644
--- a/e107_plugins/calendar_menu/e_mailout.php
+++ b/e107_plugins/calendar_menu/e_mailout.php
@@ -9,9 +9,9 @@
* Administration - Site Maintenance
*
* $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/e_mailout.php,v $
- * $Revision: 1.1 $
- * $Date: 2009-11-15 17:44:19 $
- * $Author: e107steved $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-17 08:16:46 $
+ * $Author: e107coders $
*
*/
@@ -30,7 +30,7 @@ Allows admins to send mail to those subscribed to calendar events
$mailerIncludeWithDefault = TRUE; // Mandatory - if false, show only when mailout for this specific plugin is enabled
$mailerExcludeDefault = FALSE; // Mandatory - if TRUE, when this plugin's mailout is active, the default (core) isn't loaded
-class mailout_calendar_menu
+class mailout_calendar_menu //FIXME <-- should be calendar_menu_mailout for consistency
{
protected $mailCount = 0;
protected $mailRead = 0;
diff --git a/e107_plugins/faqs/admin_config.php b/e107_plugins/faqs/admin_config.php
index 981283e72..a996bc91d 100644
--- a/e107_plugins/faqs/admin_config.php
+++ b/e107_plugins/faqs/admin_config.php
@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/faqs/admin_config.php,v $
-| $Revision: 1.5 $
-| $Date: 2009-11-12 16:55:49 $
-| $Author: secretr $
+| $Revision: 1.6 $
+| $Date: 2009-11-17 08:16:46 $
+| $Author: e107coders $
+----------------------------------------------------------------------------+
*/
require_once("../../class2.php");
@@ -74,7 +74,7 @@ class faq_cat_ui extends e_admin_ui
'faq_info_title' => array('title'=> LAN_TITLE, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left'),
'faq_info_about' => array('title'=> LAN_DESCRIPTION, 'type' => 'bbarea', 'width' => '30%', 'readParms' => 'expand=...&truncate=50&bb=1'), // Display name
'faq_info_parent' => array('title'=> LAN_CATEGORY, 'type' => 'text', 'width' => '5%'),
- 'faq_info_class' => array('title'=> LAN_VISIBILE, 'type' => 'userclass', 'width' => 'auto', 'data' => 'int'),
+ 'faq_info_class' => array('title'=> LAN_VISIBILITY, 'type' => 'userclass', 'width' => 'auto', 'data' => 'int'),
'faq_info_order' => array('title'=> LAN_ORDER, 'type' => 'text', 'width' => '5%', 'thclass' => 'left' ),
'options' => array('title'=> LAN_OPTIONS, 'type' => null, 'width' => '10%', 'forced'=>TRUE, 'thclass' => 'center last', 'class' => 'center')
);
@@ -144,7 +144,7 @@ class faq_main_ui extends e_admin_ui
'faq_answer' => array('title'=> "Answer", 'type' => 'bbarea', 'width' => '30%', 'readParms' => 'expand=...&truncate=50&bb=1'), // Display name
'faq_parent' => array('title'=> "Category", 'type' => 'method', 'data'=> 'int','width' => '5%', 'filter'=>TRUE, 'batch'=>TRUE),
'faq_comment' => array('title'=> "Comment", 'type' => 'userclass', 'data' => 'int', 'width' => 'auto'), // User id
- 'faq_datestamp' => array('title'=> "datestamp", 'type' => 'datestamp', 'data'=> 'int','width' => 'auto'), // User date
+ 'faq_datestamp' => array('title'=> "datestamp", 'type' => 'datestamp', 'data'=> 'int','width' => 'auto', 'noedit' => TRUE), // User date
'faq_author' => array('title'=> LAN_USER, 'type' => 'user', 'data'=> 'int', 'width' => 'auto', 'thclass' => 'center', 'class'=>'center', 'writeParms' => 'currentInit=1', 'filter' => true, 'batch' => true, 'nolist' => true ), // Photo
'u.user_name' => array('title'=> "User name", 'type' => 'user', 'width' => 'auto', 'noedit' => true, 'readParms'=>'idField=faq_author&link=1'), // User name
'u.user_loginname' => array('title'=> "User login", 'type' => 'user', 'width' => 'auto', 'noedit' => true, 'readParms'=>'idField=faq_author&link=1'), // User login name