diff --git a/class2.php b/class2.php index 56ed925b2..44c758c81 100644 --- a/class2.php +++ b/class2.php @@ -9,8 +9,8 @@ * General purpose file * * $Source: /cvs_backup/e107_0.8/class2.php,v $ -* $Revision: 1.159 $ -* $Date: 2009-11-18 01:04:24 $ +* $Revision: 1.160 $ +* $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'])); diff --git a/e107_admin/update_routines.php b/e107_admin/update_routines.php index 0f19946b2..6c06ba941 100644 --- a/e107_admin/update_routines.php +++ b/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 $ -| $Date: 2009-11-18 01:04:26 $ +| $Revision: 1.61 $ +| $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'); diff --git a/e107_files/shortcode/wmessage.php b/e107_files/shortcode/wmessage.php index 7e6d5ca56..c37aa13d6 100644 --- a/e107_files/shortcode/wmessage.php +++ b/e107_files/shortcode/wmessage.php @@ -1,6 +1,6 @@ tablerender($wmcaption, $wmessage, 'wm'); + $ns->tablerender($wmcaption, implode("
",$wmessage), 'wm'); } else { diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php index 95e3cfe03..76371fa0e 100644 --- a/e107_handlers/e107_class.php +++ b/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 $ - * $Date: 2009-11-18 20:45:18 $ - * $Author: e107steved $ + * $Revision: 1.75 $ + * $Date: 2009-11-19 10:07:31 $ + * $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; } diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index c88878918..ceb741a28 100644 --- a/e107_handlers/form_handler.php +++ b/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 $ - * $Date: 2009-11-18 19:57:07 $ - * $Author: secretr $ + * $Revision: 1.87 $ + * $Date: 2009-11-19 10:07:32 $ + * $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); diff --git a/e107_handlers/mail.php b/e107_handlers/mail.php index 09c0b8e08..fb6513a87 100644 --- a/e107_handlers/mail.php +++ b/e107_handlers/mail.php @@ -9,8 +9,8 @@ * e107 Main * * $Source: /cvs_backup/e107_0.8/e107_handlers/mail.php,v $ - * $Revision: 1.17 $ - * $Date: 2009-11-18 01:04:43 $ + * $Revision: 1.18 $ + * $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
in HTML version of email. + $mail->makeBodyLegacy($message); // Add body, with conversion if required if($Cc) $mail->AddAddressList('cc', $Cc); diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php index 321b75d3b..868743415 100644 --- a/e107_handlers/theme_handler.php +++ b/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 $ - * $Date: 2009-11-18 01:04:43 $ + * $Revision: 1.67 $ + * $Date: 2009-11-19 10:07:32 $ * $Author: e107coders $ */ @@ -1082,7 +1082,7 @@ class themeHandler //TODO LANs $emessage->add(TPVLAN_3." '".$name." v".$version."'", 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;