Little mods

application/helpers/navigation_helper.php

@@ -82,9 +82,8 @@ function get_tree_navigation($items, $id = NULL, $class = NULL, $first_class = N
 				$tree .= '<li'.$class.'><a'.$class.' href="' . (($page['has_url'] != 0) ? $page['absolute_url'] : '#') . '">'.$title. '</a>';
 
 				if (!empty($page['children']))
-					 $tree .= get_tree_navigation($page['children']);
-
-
+					$tree .= get_tree_navigation($page['children']);
+
 				if (!empty($page['articles']))
 				{
 					$tree .= '<ul' . $id . $class . '>';

application/language/en/form_lang.php

@@ -118,6 +118,7 @@
 $lang['mail_user_contact_subject'] = "Thank you for your message to %s";
 $lang['mail_user_contact_intro'] = "Dear %s,";
 $lang['mail_user_contact_message'] = "Thank you for your message.<br/>We will answer you very quickly.";
+$lang['mail_user_contact_posted_data'] = "Here are the data you submit with the form.";
 
 // Message about automatic message
 $lang['mail_automatic_message_warning'] = "This message was automatically generated. Please do not answer.";

application/libraries/MY_Email.php

@@ -103,7 +103,7 @@ public function send_form_emails($form, $data = array())
 
 				if ( ! $result)
 				{
-					log_message('error', 'Error : MY_Email::send_form_emails() : Email was not sent.');
+					log_message('error', 'Error : MY_Email::send_form_emails() : Email was not sent. Possible reason : Email settings not complete, check your website sending email.');
 				}
 			}
 			else

application/libraries/Tagmanager/Page.php

@@ -314,6 +314,26 @@ public static function get_page_by_code($page_code)
 	// ------------------------------------------------------------------------
 
 
+	public static function get_relative_parent_page($page, $rel = -1, $include_hiddens = FALSE)
+	{
+		$parent = array();
+
+		$p_arr = $include_hiddens ? explode('/', $page['full_path_ids']) : explode('/', $page['path_ids']);
+
+		$idx = count($p_arr) -1 + $rel;
+
+		if (isset($p_arr[$idx]))
+		{
+			$parent = self::get_page_by_id($p_arr[$idx]);
+		}
+
+		return $parent;
+	}
+
+
+	// ------------------------------------------------------------------------
+
+
 	/**
 	 * Get one page from its URL
 	 *
@@ -741,8 +761,10 @@ public static function tag_pages(FTL_Binding $tag)
 
 		if ( ! is_null($parent))
 		{
-			if (strval((int)$parent) == (string) $parent)
+			if (strval(abs((int)$parent)) == (string)$parent)
 				$parent_page = self::get_page_by_id($parent);
+			else if(substr($parent, 0, 1) == '-')
+				$parent_page = self::get_relative_parent_page(self::registry('page'), $parent, $display_hidden);
 			else if($parent == 'this')
 				$parent_page = self::registry('page');
 			else

themes/admin/views/setting/technical.php

@@ -107,7 +107,7 @@
 							<input name="media_thumb_size" id="media_thumb_size" class="inputtext w40" type="text" value="<?php echo Settings::get('media_thumb_size'); ?>"/>
 						</dd>
 					</dl>
-					
+
 					<dl class="small">
 						<dt>
 							<label for="media_thumb_unsharp"><?php echo lang('ionize_label_thumb_unsharp'); ?></label>
@@ -748,7 +748,9 @@
 
 
 <script type="text/javascript">
-
+
+
+	var mailpath = '<?php echo $mailpath ?>';
 
 	// Panel toolbox
 	ION.initToolbox('empty_toolbox');
@@ -828,6 +830,9 @@ function()
 		}
 		else if (protocol == 'sendmail')
 		{
+			if (mailpath == '')
+				$('mailpath').value = '/usr/sbin/sendmail';
+
 			$('emailSMTPDetails').hide();
 			$('emailSendmailDetails').show();
 		}