- Custom Pages front-end almost completely rewritten, backend fixes, SEF URL support, introducing page batch shortcodes and templates (available per page), compatibility stylesheet added (core css and jayya theme), tagwords plugin links proper to new pages URLs;

- Large number of system stability fixes and obsolete code replacement

e107_core/shortcodes/batch/page_shortcodes.php

@@ -0,0 +1,163 @@
+<?php
+/*
+* Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
+* $Id$
+*
+* Custom Pages shortcode batch
+*/
+
+if (!defined('e107_INIT')) { exit; }
+
+/**
+ *	@package    e107
+ *	@subpackage	shortcodes
+ *	@version 	$Id$
+ *
+ *	Shortcodes for custom page display
+ */
+class page_shortcodes extends e_shortcode
+{
+
+	function sc_cpagetitle()
+	{
+		return e107::getParser()->toHTML($this->getParserVars()->title, true, 'TITLE');
+	}
+	
+	function sc_cpagesubtitle()
+	{
+		$subtitle = $this->getParserVars()->sub_title;
+		return $subtitle ? e107::getParser()->toHTML($subtitle, true, 'TITLE') : '';
+	}
+
+
+	function sc_cpagebody()
+	{
+		// already parsed
+		return $this->getParserVars()->text;
+	}
+
+	function sc_cpageauthor($parm)
+	{
+		$parms = eHelper::scParams($parm);
+		$author = '';
+		$url = e107::getUrl()->create('user/profile/view', array('name' => $this->page['user_name'], 'id' => $this->page['user_id']));
+		
+		if(isset($parms['url']))
+		{
+			return $url;
+		}
+		
+		if($this->page['page_author'])
+		{
+			// currently this field used as Real Name, no matter what the db name says
+			if($this->page['user_login'] && !isset($parms['user'])) $author = $this->page['user_login'];
+			elseif($this->page['user_name']) $author = preg_replace('/[^\w\pL\s]+/u', ' ', $this->page['user_name']);
+		}
+		
+		if(empty($author)) return '';
+		
+		
+		
+		if(isset($parms['nolink']))
+		{
+			return $author;
+		}
+		//TODO title lan
+		return '<a class="cpage-author" href="'.$url.'" title="">'.$author.'</a>';
+	}
+
+	function sc_cpagedate($parm)
+	{
+		if(empty($parm))
+		{
+			return e107::getDateConvert()->convert_date($this->page['page_datestamp'], 'long');
+		}
+		return e107::getDateConvert()->convert_date($this->page['page_datestamp'], $parm);
+	}
+
+	function sc_cpageid()
+	{
+		return $this->page['page_id'];
+	}
+
+	// Not a shortcode really, as it shouldn't be cached at all :/
+	function cpagecomments()
+	{
+		$com = $this->getParserVars()->comments;
+		//if($parm && isset($com[$parm])) return $com[$parm];
+		return $com['comment'].$com['comment_form'];
+	}
+	
+	function sc_cpagenav()
+	{
+		return $this->getParserVars()->np;
+	}
+	
+	function sc_cpagerating()
+	{
+		return $this->getParserVars()->rating;
+	}
+	
+	function sc_cpagemessage()
+	{
+		return e107::getMessage()->render();
+	}
+
+	/**
+	 * Auto-thumbnailing now allowed.
+	 * New sc parameter standards
+	 * Exampes: 
+	 * - {CPAGETHUMBNAIL=e_MEDIA/images/someimage.jpg|type=tag&w=200} render link with thumbnail max width 200px
+	 * - {CPAGETHUMBNAIL=images/someimage.jpg|w=200} same as above
+	 * - {CPAGETHUMBNAIL=images/someimage.jpg|type=src&aw=200&ah=200} return thumb link only, size forced to 200px X 200px (smart thumbnailing close to how Facebook is doing it)
+	 * 
+	 * @see eHelper::scDualParams()
+	 * @see eHelper::scParams()
+	 */
+	function sc_cpagehumbnail($parm = '')
+	{
+		$parms = eHelper::scDualParams($parm);
+		if(empty($parms[1])) return '';
+		
+		$tp = e107::getParser();
+		$path = rawurldecode($parms[1]);
+		
+		if(substr($path, 0, 2) === 'e_') $path = str_replace($tp->getUrlConstants('raw'), $tp->getUrlConstants('sc'), $path);
+		elseif($path[0] !== '{') $path = '{e_MEDIA}'.$path;
+		
+		$thumb = $tp->thumbUrl($path);
+		$type = varset($parms[2]['type'], 'tag');
+
+		switch($type)
+		{
+			case 'src':
+				return $thumb;
+			break;
+
+			case 'link':
+				return '<a href="'.$tp->replaceConstants($path, 'abs').'" class="cpage-image" rel="external image"><img class="cpage-image" src="'.$src.'" alt="'.varset($parms[1]['alt']).'" /></a>';
+			break;
+
+			case 'tag':
+			default:
+				return '<img class="cpage-image" src="'.$thumb.'" alt="'.varset($parms[1]['alt']).'" />';
+			break;
+		}
+	}
+
+	function sc_cpagelink($parm)
+	{
+		$url = $this->sc_cpageurl();
+		
+		if($parm == 'href' || !$url)
+		{
+			return $url;
+		}
+		return '<a class="cpage" href="'.$url.'">'.$this->sc_cpagetitle().'</a>';
+	}
+
+	function sc_cpageurl()
+	{
+		return e107::getUrl()->create('page/view', $this->page, array('allow' => 'page_sef,page_title,page_id'));
+	}
+}

e107_core/shortcodes/single/nextprev.php

@@ -43,6 +43,8 @@
  * - plugin (string) [optional]: plugin name used for template loading
  * - tmpl_prefix (string) [optional]: template keys prefix; core supported are 'default' and 'dropdown', default depends on 'old_np' pref
  * - navcount (integer) [optional]: number of navigation items to be shown, minimal allowed value is 4, default is 10
+ * - nonavcount (no value) [optional]: if is set it'll disable navigation counting (navcount will be ignored)
+ * - bullet (string) [optional]: currently it should contain the markup to be prepended to the navigation item title
  *
  * WARNING: You have to do rawuldecode() on url, caption and title parameter values (before passing them to the shortcode)
  * or you'll break the whole script
@@ -134,15 +136,24 @@ function nextprev_shortcode($parm = '')
 		if($total_pages <= 1) {	return ''; }
 
 		// urldecoded once by parse_str()
-		if(substr($parm['url'], 0, 5) == 'url::')
+		if(substr($parm['url'], 0, 7) == 'route::')
 		{
 			// New - use URL assembling engine
-			// Format is: url::route::params::options
+			// Format is: route::module/controller/action::urlParams::urlOptions
 			// Example: url::news/list/category::id=xxx&name=yyy&page=--PAGE--::full=1
 			// WARNING - url parameter string have to be rawurlencode-ed BEFORE passed to the shortcode, or it'll break everything
 			$urlParms = explode('::', $parm['url']);
 			$url = str_replace(array('--FROM--', '--AMP--'), array('[FROM]', '&amp;'), $e107->url->create($urlParms[1], $urlParms[2], varset($urlParms[3])));
 		}
+		elseif(substr($parm['url'], 0, 5) == 'url::')
+		{
+			// New - use URL assembling engine
+			// Format is: url::module/controller/action?id=xxx&name=yyy&page=--PAGE--::full=1
+			// WARNING - url parameter string have to be rawurlencode-ed BEFORE passed to the shortcode, or it'll break everything
+			$urlParms = explode('::', $parm['url']);
+			$url = str_replace(array('--FROM--', '--AMP--'), array('[FROM]', '&amp;'), $e107->url->create($urlParms[1], array(), varset($urlParms[2])));
+		}
+		// just regular full or absolute URL
 		else $url = str_replace(array('--FROM--', '--AMP--'), array('[FROM]', '&amp;'), $parm['url']);
 
 		// Simple parser vars
@@ -161,11 +172,24 @@ function nextprev_shortcode($parm = '')
 
 		// urldecoded by parse_str()
 		$pagetitle = explode('|',$parm['pagetitle']);
+		
+		// new - bullet support
+		$bullet = vartrue($parm['bullet'], '');
 
-		// navigation number settings
-		$navcount = abs(intval(vartrue($parm['navcount'], 10))); // prevent infinite loop!
-		if($navcount < 4) $navcount = 4;
-		$navmid = floor($navcount/2);
+		// no navigation counter
+		if(isset($parm['nonavcount']))
+		{
+			$navcount = $total_pages;
+			$navmid = 0;
+		}
+		else
+		{
+			// navigation number settings
+			$navcount = abs(intval(vartrue($parm['navcount'], 10))); // prevent infinite loop!
+			if($navcount < 4) $navcount = 4;
+			$navmid = floor($navcount/2);
+		}
+		
 
 		// get template - nextprev_template.php, support for plugin template locations - myplug/templates/nextprev_template.php
 		$tmpl = e107::getTemplate(varset($parm['plugin'], null), 'nextprev');
@@ -173,9 +197,9 @@ function nextprev_shortcode($parm = '')
 		// init advanced navigation visibility
 		$show_first = $show_prev = ($current_page != 1);
 		$show_last = $show_next = ($current_page != $total_pages);
-
+		
 		// Render
-		// XXX - parseTemplate vs simpleParse ??? Currently can't find a reason why we should parse via parseTemplate
+		// Parse via simpleParse()
 		$tp = e107::getParser();
 
 		// Nextprev navigation start
@@ -248,6 +272,7 @@ function nextprev_shortcode($parm = '')
 		}
 
 		$e_vars_loop = new e_vars();
+		$e_vars_loop->bullet = $bullet;
 		$ret_items = array();
 		for($c = $loop_start; $c < $loop_end; $c++)
 		{