Notice removal, small bug fixes

e107_admin/cache.php

@@ -9,9 +9,9 @@
  * Cache Administration Area
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/cache.php,v $
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
- * $Date: 2009-11-18 01:04:25 $
+ * $Date: 2010-01-04 21:35:37 $
- * $Author: e107coders $
+ * $Author: e107steved $
  *
 */
 require_once("../class2.php");
@@ -84,8 +84,8 @@ if (isset($_POST['empty_cache']))
 
 
 
-$syscache_files = glob($e107->file_path.$CACHE_DIRECTORY."S_*.*");
+$syscache_files = glob(e_CACHE."S_*.*");
-$cache_files = glob($e107->file_path.$CACHE_DIRECTORY."C_*.*");
+$cache_files = glob(e_CACHE."C_*.*");
 
 $syscache_files_num = count($syscache_files);
 $cache_files_num = count($cache_files);

e107_admin/cpage.php

@@ -2,31 +2,41 @@
 /*
  * e107 website system
  *
- * Copyright (C) 2008-2009 e107 Inc (e107.org)
+ * Copyright (C) 2008-2010 e107 Inc (e107.org)
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
  * Custom Menus/Pages Administration
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/cpage.php,v $
- * $Revision: 1.33 $
+ * $Revision: 1.34 $
- * $Date: 2010-01-03 12:14:06 $
+ * $Date: 2010-01-04 21:35:37 $
  * $Author: e107steved $
  *
 */
 
-require_once("../class2.php");
+/**
+ * 
+ * @package     e107
+ * @subpackage	admin
+ * @version     $Revision: 1.34 $
+ * @author      $Author: e107steved $
 
-if (!getperms("5|J")) { header("location:".e_BASE."index.php"); exit; }
+ *	Admin-related functions for custom page and menu creation
+*/
+
+require_once('../class2.php');
+
+if (!getperms("5|J")) { header('location:'.e_BASE.'index.php'); exit; }
 
 include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
 
 $e_sub_cat = 'custom';
 
-require_once("auth.php");
+require_once('auth.php');
-require_once(e_HANDLER."userclass_class.php");
+require_once(e_HANDLER.'userclass_class.php');
-require_once(e_HANDLER."message_handler.php");
+require_once(e_HANDLER.'message_handler.php');
-require_once(e_HANDLER."form_handler.php");
+require_once(e_HANDLER.'form_handler.php');
 $frm = new e_form(true);
 $emessage = &eMessage::getInstance();
 $page = new page;
@@ -93,7 +103,7 @@ if (isset($_POST['saveOptions']))
 
 if(!e_QUERY)
 {
-	if(getperms("5"))
+	if(getperms('5'))
 	{
 		$page->showExistingPages();
 	}
@@ -103,7 +113,7 @@ if(!e_QUERY)
 	}
 
 }
-elseif($_GET['action']=='edit')
+elseif(varset($_GET['action'],'')=='edit')
 {
 	$action = 'create';
 	$sub_action = 'edit';
@@ -118,11 +128,11 @@ elseif(vartrue($_GET['menus']))
 }
 else
 {
-	$function = $action."Page";
+	$function = $action.'Page';
 	$page->$function();
 }
 
-require_once(e_ADMIN."footer.php");
+require_once(e_ADMIN.'footer.php');
 
 class page
 {
@@ -282,8 +292,14 @@ class page
 				$menu_name					  = $tp->toForm($row['page_theme']);
 			}
 		}
+		else
+		{
+			$menu_name = '';
+			$page_title = '';
+			$data = '';
+		}
 
-		$e_qry = ($mode) ? "menus=1" : "";
+		$e_qry = ($mode) ? 'menus=1' : '';
 
 		$text = "
 			<form method='post' action='".e_SELF."?".$e_qry."' id='dataform' enctype='multipart/form-data'>
@@ -538,7 +554,20 @@ class page
 		{	// New page/menu
 			$menuname = ($type ? $tp->toDB($_POST['menu_name']) : "");
 
-			$pid = admin_update($sql->db_Insert("page", "0, '{$page_title}', '{$page_text}', '{$pauthor}', '".time()."', '".intval($_POST['page_rating_flag'])."', '".intval($_POST['page_comment_flag'])."', '".$_POST['page_password']."', '".$_POST['page_class']."', '', '".$menuname."', '".$_POST['page_template']."'"), 'insert', CUSLAN_27, LAN_CREATED_FAILED, false);
+			$info = array(
+				'page_title' => $page_title,
+				'page_text' => $page_text,
+				'page_author' => $pauthor,
+				'page_datestamp' => time(),
+				'page_rating_flag' => varset($_POST['page_rating_flag'],0),
+				'page_comment_flag' => varset($_POST['page_comment_flag'], ''),
+				'page_password' => varset($_POST['page_password'], ''),
+				'page_class' => varset($_POST['page_class'],e_UC_PUBLIC),
+				'page_ip_restrict' => '',
+				'page_theme' => $menuname,
+				'page_template' => varset($_POST['page_template'],'')
+				);
+			$pid = admin_update($sql->db_Insert('page', $info), 'insert', CUSLAN_27, LAN_CREATED_FAILED, false);
 			$admin_log->log_event('CPAGE_01',$menuname.'[!br!]'.$page_title.'[!br!]'.$pauthor,E_LOG_INFORMATIVE,'');
 
 			if($type)
@@ -546,9 +575,9 @@ class page
 				$sql->db_Insert("menus", "0, '{$menuname}', '0', '0', '0', '', '".$pid."' ");
 			}
 
-			if($_POST['page_link'])
+			if(vartrue($_POST['page_link']))
 			{
-				$link = "page.php?".$pid;
+				$link = 'page.php?'.$pid;
 				if (!$sql->db_Select("links", "link_id", "link_name='".$tp->toDB($_POST['page_link'])."'"))
 				{
 					$linkname = $tp->toDB($_POST['page_link']);

e107_admin/cron.php

@@ -3,7 +3,7 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     Copyright (C) 2008-2009 e107 Inc
+|     Copyright (C) 2008-2010 e107 Inc
 |     http://e107.org/
 |
 |
@@ -11,12 +11,22 @@
 |     GNU General Public License (http://gnu.org/).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/cron.php,v $
-|     $Revision: 1.25 $
+|     $Revision: 1.26 $
-|     $Date: 2009-12-24 09:59:21 $
+|     $Date: 2010-01-04 21:35:37 $
-|     $Author: e107coders $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 
+/**
+ * 
+ * @package     e107
+ * @subpackage	admin
+ * @version     $Revision: 1.26 $
+ * @author      $Author: e107steved $
+
+ *	Admin-related functions for cron (Scheduler) management
+*/
+
 require_once('../class2.php');
 if (!getperms('U'))
 {
@@ -181,20 +191,21 @@ function cronName($classname,$method)
 	
 	function cronExecute($class_func)
 	{
+		echo "Execute: {$class_func}<br />";
 		//TODO LANs
 		list($class_name,$method_name) = explode("__",$class_func);
 		$mes = e107::getMessage();
 		
 		$taskName = $class_name;
-		if($class_name =='_system_cron')
+		if($class_name =='_system')
 		{
 			require_once(e_HANDLER.'cron_class.php');
 		}
 		else
 		{
 			require_once(e_PLUGIN.$class_name.'/e_cron.php');
-			$class_name .= '_cron';
 		}
+		$class_name .= '_cron';
 		$status =  $this->cronExecuteMethod($class_name,$method_name) ? E_MESSAGE_SUCCESS : E_MESSAGE_ERROR;
 		$mes->add("Running <b>".$this->cronName($taskName,$method_name)."</b>", $status); 	
 

e107_handlers/e107_class.php

@@ -2,24 +2,31 @@
 /*
  * e107 website system
  *
- * Copyright (C) 2008-2009 e107 Inc (e107.org)
+ * Copyright (C) 2008-2010 e107 Inc (e107.org)
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
  * e107 Main
  *
  * $Source: /cvs_backup/e107_0.8/e107_handlers/e107_class.php,v $
- * $Revision: 1.98 $
+ * $Revision: 1.99 $
- * $Date: 2009-12-27 13:56:14 $
+ * $Date: 2010-01-04 21:35:38 $
- * $Author: e107coders $
+ * $Author: e107steved $
 */
 
 if (!defined('e107_INIT')) { exit; }
 
+
 /**
- * e107 class
+ * 
+ * @package     e107
+ * @subpackage	e107_handlers
+ * @version     $Revision: 1.99 $
+ * @author      $Author: e107steved $
  *
+ *	e107_class - core class with many system-related methods
  */
+
 class e107
 {
 	/**
@@ -1704,11 +1711,11 @@ class e107
 	//	define("e_ROOT", realpath(dirname(__FILE__)."/../")."/");
 	
 		$e_ROOT = realpath(dirname(__FILE__)."/../"); // Works in Windows, fails on Linux. 
-		if(substr($e_ROOT,-1) != '/')
+		if ((substr($e_ROOT,-1) != '/') && (substr($e_ROOT,-1) != '\\'))
 		{
-			$e_ROOT .= "/";	
+			$e_ROOT .= '/';
 		}
-		define("e_ROOT", $e_ROOT);			// Specified format gives trailing slash already (at least on Windows)
+		define('e_ROOT', $e_ROOT);			// Specified format gives trailing slash already (at least on Windows)
 
 		$this->relative_base_path = (!isset($_E107['cli'])) ? $path : e_ROOT;
 		$this->http_path = "http://{$_SERVER['HTTP_HOST']}{$this->server_path}";

e107_handlers/mail_manager_class.php

@@ -2,15 +2,15 @@
 /*
  * e107 website system
  *
- * Copyright (C) 2008-2009 e107 Inc (e107.org)
+ * Copyright (C) 2008-2010 e107 Inc (e107.org)
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
  * e107 Mailout - mail database API and utility routines
  *
  * $Source: /cvs_backup/e107_0.8/e107_handlers/mail_manager_class.php,v $
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
- * $Date: 2009-12-28 17:53:10 $
+ * $Date: 2010-01-04 21:35:38 $
  * $Author: e107steved $
 */
 
@@ -18,7 +18,7 @@
  * 
  * @package     e107
  * @subpackage	e107_handlers
- * @version     $Revision: 1.11 $
+ * @version     $Revision: 1.12 $
  * @author      $Author: e107steved $
 
 
@@ -887,7 +887,7 @@ class e107MailManager
 	 *                 'dup' if duplicate of existing email
 	 *                 integer - number of email recipient in DB
 	 */
-	public function mailAddNoDup($handle, $mailRecip, $initStatus = MAIL_STATUS_TEMP, $priority = E107_EMAIL_PRIORITY_LOW)
+	public function mailAddNoDup($handle, $mailRecip, $initStatus = MAIL_STATUS_TEMP, $priority = self::E107_EMAIL_PRIORITY_LOW)
 	{
 		if (($handle <= 0) || !is_numeric($handle)) return FALSE;
 		if (!isset($this->mailCounters[$handle])) return 'nocounter';

e107_handlers/mailout_admin_class.php

@@ -2,21 +2,27 @@
 /*
  * e107 website system
  *
- * Copyright (C) 2008-2009 e107 Inc (e107.org)
+ * Copyright (C) 2008-2010 e107 Inc (e107.org)
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
  * Administration - Site Maintenance
  *
  * $Source: /cvs_backup/e107_0.8/e107_handlers/mailout_admin_class.php,v $
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
- * $Date: 2009-12-01 20:05:53 $
+ * $Date: 2010-01-04 21:35:38 $
  * $Author: e107steved $
  *
 */
 
-/*
+/**
-Various admin-related mailout functions, mostly to do with creating and handling forms. 
+ * 
+ * @package     e107
+ * @subpackage	e107_handlers
+ * @version     $Revision: 1.10 $
+ * @author      $Author: e107steved $
+
+ *	Various admin-related mailout functions, mostly to do with creating and handling forms. 
 */
 
 
@@ -218,7 +224,7 @@ class mailoutAdminClass extends e107MailManager
 		$curTable = $this->tasks[$this->mode]['defaultTable'];
 		if ($curTable)
 		{
-			if (is_array($user_pref['admin_mailout_columns'][$mode]))
+			if (isset($user_pref['admin_mailout_columns'][$mode]) && is_array($user_pref['admin_mailout_columns'][$mode]))
 			{	// Use saved list of fields to view if it exists
 				$this->fieldPref = $user_pref['admin_mailout_columns'][$mode];
 			}
@@ -352,7 +358,7 @@ class mailoutAdminClass extends e107MailManager
 			print_a($mailData);
 			return 'Error';
 		}
-		$text .= "<select name='mailaction[{$mailData['mail_source_id']}]' onchange='this.form.submit()' class='tbox' style='width:90%'>\n
+		$text = "<select name='mailaction[{$mailData['mail_source_id']}]' onchange='this.form.submit()' class='tbox' style='width:90%'>\n
 				<option selected='selected' value=''>&nbsp;</option>\n";
 		foreach ($this->modeOptions[$mode] as $key => $val)
 		{
@@ -379,7 +385,7 @@ class mailoutAdminClass extends e107MailManager
 			print_a($targetData);
 			return 'Error';
 		}
-		$text .= "<select name='targetaction[{$targetData['mail_target_id']}]' onchange='this.form.submit()' class='tbox' style='width:90%'>\n
+		$text = "<select name='targetaction[{$targetData['mail_target_id']}]' onchange='this.form.submit()' class='tbox' style='width:90%'>\n
 				<option selected='selected' value=''>&nbsp;</option>\n";
 		foreach ($this->modeOptions[$mode] as $key => $val)
 		{
@@ -552,7 +558,7 @@ class mailoutAdminClass extends e107MailManager
 
 		foreach ($ue->fieldDefinitions as $fd)
 		{
-			if ($v['user_extended_struct_text'] != '_system_')
+			if ($fd['user_extended_struct_text'] != '_system_')
 			{
 				$value = 'ue.user_'.$fd['user_extended_struct_name'];
 				$selected = ($value == $curval) ? " selected='selected'" : '';
@@ -1177,7 +1183,7 @@ class mailoutAdminClass extends e107MailManager
 		$text = "<div style='text-align:center'>";
 
 		$text .= "
-			<form action='".e_SELF.'?mode=marksend&amp;m='.$mailMainID.'&amp;savepage='.$nextPage."' id='email_send' method='post'>
+			<form action='".e_SELF.'?mode=marksend&amp;m='.$mailMainID."' id='email_send' method='post'>
 			<fieldset id='email-send'>
 			<table cellpadding='0' cellspacing='0' class='adminlist'>
 			<colgroup span='2'>
@@ -1192,14 +1198,14 @@ class mailoutAdminClass extends e107MailManager
 		// Add in core and any plugin selectors here
 		foreach ($this->mailHandlers as $m)
 		{
-			if ($m->mailer_enabled)
+			if ($m->mailerEnabled)
 			{
-				$text .= '<tr><td>'.LAN_MAILOUT_180.'<br />'.$m->mailer_name.'</td><td>'.$m->show_select(FALSE).'</td></tr>';
+				$text .= '<tr><td>'.LAN_MAILOUT_180.'<br />'.$m->mailerName.'</td><td>'.$m->showSelect(FALSE).'</td></tr>';
 			}
 		}
 
 		// Figures - number of emails to send, number of duplicates stripped
-		$text .= '<tr><td>'.LAN_MAILOUT_173.'</td><td>'.($mailData['mail_togo_count'])."<input type='hidden' name='mailIDConf' value='{$mailID}' /></td></tr>";
+		$text .= '<tr><td>'.LAN_MAILOUT_173.'</td><td>'.($mailData['mail_togo_count'])."<input type='hidden' name='mailIDConf' value='{$mailMainID}' /></td></tr>";
 		$text .= '<tr><td>'.LAN_MAILOUT_71.'</td><td> '.$counters['add'].' '.LAN_MAILOUT_69.$counters['dups'].LAN_MAILOUT_70.'</td></tr>';
 		$text .= "</tbody></table>\n</fieldset>";
 

e107_plugins/pm/pm_class.php

@@ -9,8 +9,8 @@
  *	PM plugin - base class API
  *
  * $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm_class.php,v $
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
- * $Date: 2009-12-18 20:49:55 $
+ * $Date: 2010-01-04 21:35:38 $
  * $Author: e107steved $
  */
 
@@ -20,7 +20,7 @@
  *
  *	@package	e107_plugins
  *	@subpackage	pm
- *	@version 	$Id: pm_class.php,v 1.12 2009-12-18 20:49:55 e107steved Exp $;
+ *	@version 	$Id: pm_class.php,v 1.13 2010-01-04 21:35:38 e107steved Exp $;
  */
 
 if (!defined('e107_INIT')) { exit; }
@@ -213,7 +213,7 @@ class private_message
 		$newvals = '';
 		if($this->e107->sql->db_Select('private_msg', '*', 'pm_id = '.$pmid.' AND (pm_from = '.USERID.' OR pm_to = '.USERID.')'))
 		{
-			$row = $sql->db_Fetch();
+			$row = $this->e107->sql->db_Fetch();
 			if($row['pm_to'] == USERID)
 			{
 				$newvals = 'pm_read_del = 1';
@@ -259,7 +259,7 @@ class private_message
 
 
 
-	/*
+	/**
 	 *	Send an email to notify of a PM
 	 *
 	 *	@param int $uid - not used
@@ -286,7 +286,7 @@ class private_message
 	}
 
 
-	/*
+	/**
 	 *	Send PM read receipt
 	 *
 	 *	@param array $pmInfo - PM details
@@ -357,8 +357,6 @@ class private_message
 	 *	@param int $to - user doing the blocking
 	 *
 	 *	@return string result message
-	 *
-	 *	@todo change db access to use arrays
 	 */
 	function block_add($from, $to = USERID)
 	{
@@ -373,7 +371,11 @@ class private_message
 		  
 			if(!$this->e107->sql->db_Count('private_msg_block', '(*)', 'WHERE pm_block_from = '.$from." AND pm_block_to = '".$this->e107->tp->toDB($to)."'"))
 			{
-				if($this->e107->sql->db_Insert('private_msg_block', "0, '".$from."', '".$this->e107->tp -> toDB($to)."', '".time()."', '0'"))
+				if($this->e107->sql->db_Insert('private_msg_block', array(
+						'pm_block_from' => $from,
+						'pm_block_to' => $to,
+						'pm_block_datestamp' => time()
+					)))
 				{
 					return str_replace('{UNAME}', $uinfo['user_name'], LAN_PM_47);
 				}

e107_plugins/pm/pm_conf.php

@@ -9,8 +9,8 @@
  * PM Plugin - administration
  *
  * $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm_conf.php,v $
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
- * $Date: 2009-12-17 22:47:20 $
+ * $Date: 2010-01-04 21:35:38 $
  * $Author: e107steved $
  */
 
@@ -20,20 +20,19 @@
  *
  *	@package	e107_plugins
  *	@subpackage	pm
- *	@version 	$Id: pm_conf.php,v 1.11 2009-12-17 22:47:20 e107steved Exp $;
+ *	@version 	$Id: pm_conf.php,v 1.12 2010-01-04 21:35:38 e107steved Exp $;
  */
 
 
 /*
 TODO:
 1. Limits page needs some lines round the table
-2. Limits page - test
+2. Prefs - use new get method
 3. Maintenance page - to be tested
-4. Check operation of user dropdown/popup bit
+4. Put prefs into plugin.xml
 5. User option to enable/disable email notification of PMs
 6. Cron-triggered bulk send.
 7. What are implications of 'anyone but' userclasses?
-8. Put prefs into plugin.xml
 */
 
 
@@ -110,8 +109,7 @@ if ($savePMP)
 }
 
 
-//$lan_file = e_PLUGIN.'pm/languages/admin/'.e_LANGUAGE.'.php';
+//include_lan(e_PLUGIN.'pm/languages/admin/'.e_LANGUAGE.'.php');
-// include_once(is_readable($lan_file) ? $lan_file : e_PLUGIN."pm/languages/admin/English.php");
 	
 if (isset($_POST['update_prefs'])) 
 {