0.7 -> 0.8 upgrade fixes

class2.php

@@ -9,8 +9,8 @@
 * General purpose file
 *
 * $Source: /cvs_backup/e107_0.8/class2.php,v $
-* $Revision: 1.159 $
+* $Revision: 1.160 $
-* $Date: 2009-11-18 01:04:24 $
+* $Date: 2009-11-19 10:07:28 $
 * $Author: e107coders $
 *
 */
@@ -773,6 +773,12 @@ if(isset($pref['notify']) && $pref['notify'] == true)
 $sql -> db_Mark_Time('Start: Init session');
 init_session();
 
+//DEPRECATED but necessary. BC Fix. 
+function getip() 
+{
+	return e107::ipDecode(USERIP);
+}
+
 // for multi-language these definitions needs to come after the language loaded.
 define('SITENAME', trim($tp->toHTML($pref['sitename'], '', 'emotes_off, defs, no_make_clickable')));
 define('SITEBUTTON', $tp->replaceConstants($pref['sitebutton']));

e107_admin/update_routines.php

@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/update_routines.php,v $
-|     $Revision: 1.60 $
+|     $Revision: 1.61 $
-|     $Date: 2009-11-18 01:04:26 $
+|     $Date: 2009-11-19 10:07:29 $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
@@ -274,6 +274,23 @@ function update_706_to_800($type='')
 								'links_page' => 'links_page',
 								'poll' => 'polls'
 								);
+								
+	$setCorePrefs = array( //modified prefs during upgrade. 
+		'adminstyle' => 'infopanel',
+		'admintheme' => 'jayya'
+	);
+	
+
+	
+	
+	
+	$do_save = TRUE;	
+	
+	foreach($setCorePrefs as $k=>$v)
+	{
+		$pref[$k] = $v;		
+	}
+	
 		
 	// List of changed menu locations. 						
 	$changeMenuPaths = array(
@@ -309,6 +326,22 @@ function update_706_to_800($type='')
 	$just_check = $type == 'do' ? FALSE : TRUE;		// TRUE if we're just seeing whether an update is needed
 
 
+
+	// Check that custompages have been imported from current theme.php file
+	if(!varset($pref['sitetheme_custompages']))
+	{
+		$th = e107::getSingleton('themeHandler');
+		$tmp = $th->getThemeInfo($pref['sitetheme']);
+		if(is_array($tmp['custompages']))
+		{
+			if ($just_check) return update_needed();
+			$pref['sitetheme_custompages'] = $tmp['custompages'];
+			$do_save = TRUE;
+		}
+	}
+
+
+
 	// Check notify prefs
 	global $sysprefs, $eArrayStorage, $tp;
 	$notify_prefs = $sysprefs -> get('notify_prefs');

e107_files/shortcode/wmessage.php

@@ -1,6 +1,6 @@
 <?php
 
-// $Id: wmessage.php,v 1.3 2009-11-11 16:02:40 e107coders Exp $
+// $Id: wmessage.php,v 1.4 2009-11-19 10:07:30 e107coders Exp $
 
 function wmessage_shortcode($parm)
 {
@@ -70,7 +70,7 @@ function wmessage_shortcode($parm)
 				ob_start();
 				if ($pref['wm_enclose'])
 				{
-				 //	$ns->tablerender($wmcaption, $wmessage, 'wm');
+				 	$ns->tablerender($wmcaption, implode("<br />",$wmessage), 'wm');
 				}
 				else
 				{

e107_handlers/e107_class.php

@@ -9,9 +9,9 @@
  * e107 Main
  *
  * $Source: /cvs_backup/e107_0.8/e107_handlers/e107_class.php,v $
- * $Revision: 1.74 $
+ * $Revision: 1.75 $
- * $Date: 2009-11-18 20:45:18 $
+ * $Date: 2009-11-19 10:07:31 $
- * $Author: e107steved $
+ * $Author: e107coders $
 */
 
 if (!defined('e107_INIT')) { exit; }
@@ -1207,6 +1207,12 @@ class e107
 //
 // HTTP relative paths
 //
+
+			if(!varset($MEDIA_DIRECTORY)) // BC/Upgrade Fix. 
+			{
+				$MEDIA_DIRECTORY = 'e107_media/'; 		
+			}
+
 			define("e_ADMIN", e_BASE.$ADMIN_DIRECTORY);
 			define("e_IMAGE", e_BASE.$IMAGES_DIRECTORY);
 			define("e_THEME", e_BASE.$THEMES_DIRECTORY);
@@ -1626,6 +1632,7 @@ class e107
 			}
 			$ret = implode('.',$z);
 		}
+
 		return $ret;
 	}
 	

e107_handlers/form_handler.php

@@ -9,9 +9,9 @@
  * Form Handler
  *
  * $Source: /cvs_backup/e107_0.8/e107_handlers/form_handler.php,v $
- * $Revision: 1.86 $
+ * $Revision: 1.87 $
- * $Date: 2009-11-18 19:57:07 $
+ * $Date: 2009-11-19 10:07:32 $
- * $Author: secretr $
+ * $Author: e107coders $
  *
 */
 
@@ -118,6 +118,7 @@ class e_form
 	}
 	
 	// FIXME - better GUI, {IMAGESELECTOR} rewrite, flexibility, thumbnails, tooltip image preivew, etc.
+	//FIXME - use the media-manager as an image selector. 
 	function imagepicker($name, $default, $label = '', $sc_parameters = '')
 	{
 		if(is_string($sc_parameters)) parse_str($sc_parameters, $sc_parameters);

e107_handlers/mail.php

@@ -9,8 +9,8 @@
  * e107 Main
  *
  * $Source: /cvs_backup/e107_0.8/e107_handlers/mail.php,v $
- * $Revision: 1.17 $
+ * $Revision: 1.18 $
- * $Date: 2009-11-18 01:04:43 $
+ * $Date: 2009-11-19 10:07:32 $
  * $Author: e107coders $
 */
 
@@ -859,7 +859,8 @@ function sendemail($send_to, $subject, $message, $to_name, $send_from='', $from_
 
 	if (varsettrue($mailheader_e107id)) $mail->AddCustomHeader("X-e107-id: {$mailheader_e107id}");
 
-	$mail->makeBody($message);				// Add body, with conversion if required
+	//Legacy required - \n must be converted to <br /> in HTML version of email. 
+	$mail->makeBodyLegacy($message);				// Add body, with conversion if required
 
 	if($Cc) $mail->AddAddressList('cc', $Cc);
 

e107_handlers/theme_handler.php

@@ -9,8 +9,8 @@
  * e107 Admin Theme Handler
  *
  * $Source: /cvs_backup/e107_0.8/e107_handlers/theme_handler.php,v $
- * $Revision: 1.66 $
+ * $Revision: 1.67 $
- * $Date: 2009-11-18 01:04:43 $
+ * $Date: 2009-11-19 10:07:32 $
  * $Author: e107coders $
  */
 
@@ -1082,7 +1082,7 @@ class themeHandler
 			//TODO LANs
 			$emessage->add(TPVLAN_3." <b>'".$name." v".$version."'</b>", E_MESSAGE_SUCCESS);
 			$emessage->add("Default Layout: ".$deflayout, E_MESSAGE_SUCCESS);
-			$emessage->add("Custom Pages: ".$customPages, E_MESSAGE_SUCCESS);
+			$emessage->add("Custom Pages: ".implode(" ",$customPages), E_MESSAGE_SUCCESS);
 			
 			$this->theme_adminlog('01', $name.', style.css');
 			return TRUE;