изменение системных файлов добавление снипетов

Author: Dmi3yy

Diff for: README

@@ -13,8 +13,14 @@
 
 
 -------Изменение системных файлов----------------
+-поправил robot.txt
 -транслитерация файлов в менеджере картинко и файлов
 -wait.static.php - ускоряем переход на главную при сохранении
+-jot обновил шаблоны
+-правка managermanager - глюк тв параметра с картинкой mm_widget_showimagetvs
+-ditto отключение пагинации если 1 страничка (ditto.class.inc.php)
+-ditto замена ?=& при работе с @CODE на |xq|','|xe|','|xa| (template.class.inc.php)
+-transalias - правильная транслитерация по умолчанию
 
 
 ------------------------Шаблоны----------------
@@ -33,20 +39,51 @@
 -MultiFiles 1.11
 -MultiPhotos 1.22
 -TvTable 1.1
+-aDate  - вывод русской даты
+-GetField 1.3
+-parentTitle - получаем pagetitle парента
+-sitemap.xml 1.0.8
+-splitPagination 2.0 - красивая пагинация для Ditto 
+-YouTube 0.1 
 
 
 ------------------------Плагины----------------
 -добавил плагин seo_strict_urls
 -добавил codemirror (подсветка кода)
 -TvTable 1.11
--MultiFiles 1.01
+-MultiFiles 1.01 
 -MultiPhotos 1.23
+-customTemplate 0.1
+-devStat 1.0
+-PHx 2.1.4
+
 
 
 -------------------------Модули----------------
 -добавил Модуль doc finder
 -добавил Модуль mass redirect
 
+
+----------------Экстендеры для Ditto---------
+-customsort
+-distinct
+-jotcount
+-tvFilter
+-glossaryFilter
+
+--------------setup.sql----------------------
+-Default admin account -> admin
+-My MODx site -> MODx Site By Dmi3yy
+-Шаблон по умолчанию СОСЕДНИЙ
+-Опубликованно по умолчанию
+-Дружественные урлы ВКЛ с вложенностью
+-капча 0,1,2,3,4,5,6,7,8,9
+-запоминать вкладки ДА
+
+
+
+
+
 
 
 своя сборка modx 

Diff for: assets/plugins/managermanager/widgets/showimagetvs/showimagetvs.php

@@ -79,7 +79,8 @@ function mm_widget_showimagetvs($tvs='', $w=300, $h=100, $thumbnailerUrl='', $ro
 																 });
 				}
 				
-			}); // Trigger a change event on load
+			$j.data(this,"lastvalue", $j(this).val());
+            }).trigger("load"); // Trigger a change event on load
 	
 			
 			';	
@@ -94,7 +95,7 @@ function mm_widget_showimagetvs($tvs='', $w=300, $h=100, $thumbnailerUrl='', $ro
 					$j(".imageField").each( function() {
 						var $this = $j(this);
 						if ($this.val() != $this.data("lastvalue") ) {
-							$this.trigger("change").data("lastvalue", $this.val());
+							$this.trigger("change");
 						}						
 					});
 			}	

Diff for: assets/plugins/phx/docs/install.txt

@@ -0,0 +1,31 @@
+Quick Installation and Setup quide: 
+-------------------------------------
+
+New Install:
+
+1) Download and extract the archive. 
+2) Create a directory called "phx" in your [MODx Directory]/assets/plugins directory
+3) FTP or copy the files into [MODx Directory]/assets/plugins/phx
+4) Create a new plugin in the manager called "PHx" and copy/paste the contents of phx.plugin.txt into the code field.
+5) Check "OnParseDocument" at the System Events tab
+
+Update:
+
+1) Download and extract the archive. 
+2) Backup and delete the contents of [MODx Directory]/assets/snippets/phx
+3) Create a directory called "phx" in your [MODx Directory]/assets/plugins directory
+4) FTP or copy the files into [MODx Directory]/assets/plugins/phx
+5) Update the "PHx" plugin in the manager and copy/paste the contents of phx.plugin.txt into the code field.
+6) Check "OnParseDocument" at the System Events tab
+
+Optional steps (as of 2.0):
+
+On the Configuration tab -> Plugin configuration enter: 
+
+&phxdebug=Debug;int;0 &phxmaxpass=Max. Passes;int;50
+
+
+
+
+
+

Diff for: assets/plugins/phx/modifiers/7bit.phx.php

@@ -0,0 +1,12 @@
+<?php
+
+/* Retrieved from http://wiki.modxcms.com/index.php/PHx/CustomModifiers
+    * description: returns the 7bit representation of a string
+    * usage: [+string:7bit+] 
+*/
+
+$text = mb_convert_encoding($output,'HTML-ENTITIES',mb_detect_encoding($output));
+$text = preg_replace(array('/&szlig;/','/&(..)lig;/','/&([aouAOU])uml;/','/&(.)[^;]*;/'),array('ss',"$1","$1".'e',"$1"),$text);
+return $text;
+
+?>

Diff for: assets/plugins/phx/modifiers/bbcode.phx.php

@@ -0,0 +1,24 @@
+<?php
+
+// Retrieved from http://wiki.modxcms.com/index.php/PHx/CustomModifiers
+// description: parse bb code (also escapes all html and MODx tags characters)
+// usage: [+variable:bbcode+] 
+ 
+$string = preg_replace("/&amp;(#[0-9]+|[a-z]+);/i", "&$1;", htmlspecialchars($output));
+$string = preg_replace('~\[b\](.+?)\[/b\]~is', '<b>\1</b>', $string);
+$string = preg_replace('~\[i\](.+?)\[/i\]~is', '<i>\1</i>', $string);
+$string = preg_replace('~\[u\](.+?)\[/u\]~is', '<u>\1</u>', $string);
+$string = preg_replace('~\[link\]www.(.+?)\[/link\]~is', '<a href="http://www.\1">www.\1</a>', $string);
+$string = preg_replace('~\[link\](.+?)\[/link\]~is', '<a href="\1">\1</a>', $string);
+$string = preg_replace('~\[link=(.+?)\](.+?)\[/link\]~is', '<a href="\1">\2</a>', $string);
+$string = preg_replace('~\[url\]www.(.+?)\[/url\]~is', '<a href="http://www.\1">www.\1</a>', $string);
+$string = preg_replace('~\[url\](.+?)\[/url\]~is', '<a href="\1">\1</a>', $string);
+$string = preg_replace('~\[url=(.+?)\](.+?)\[/url\]~is', '<a href="\1">\2</a>', $string);
+$string = preg_replace('~\[img\](.+?)\[/img\]~is', '<img src="\1" alt="[image]" style="margin: 5px 0px 5px 0px" />', $string);
+$string = preg_replace('~\[img-l\](.+?)\[/img\]~is', '<img src="\1" alt="[image]" style="border: thin solid #DFE5F2; FLOAT: left; MARGIN-RIGHT: 20px" />', $string);
+$string = preg_replace('~\[img-r\](.+?)\[/img\]~is', '<img src="\1" alt="[image]" style="border: thin solid #DFE5F2; FLOAT: right; MARGIN-LEFT: 20px;" />', $string);
+$string = str_replace(array("[","]","`"),array("&#91;","&#93;","&#96;"),$string);
+return $string;
+
+
+?>

Diff for: assets/plugins/phx/modifiers/get.phx.php

@@ -0,0 +1,10 @@
+<?php
+
+// Returns the GET parameter which has been posted as a query string
+// It takes the paramater name as an argument
+// e.g. a page with URL of http://www.whatever.com/modx?paramname=rckt
+// [*phx:get=`paramname`*] returns "rckt"
+
+return $_GET[$options];
+
+?>

Diff for: assets/plugins/phx/modifiers/ifnotempty.phx.php

@@ -0,0 +1,10 @@
+<?php
+/*
+    * description: The opposite of the native PHX "isempty" function. Returns the option value ONLY if the input value is empty (excluding whitespace)
+    * usage: [+string:ifnotempty=`String to return if not empty`+] 
+	*/
+	
+if (trim($output) != '') {
+return $options;
+}
+?>

Diff for: assets/plugins/phx/modifiers/nohttp.phx.php

@@ -0,0 +1,12 @@
+<?php
+
+/*
+Retrieved from http://wiki.modxcms.com/index.php/PHx/CustomModifiers
+    *  description: Removes the http:// from a URL, to create a display-friendly web address
+    * usage: [+string:nohttp+] 
+	
+	*/
+	
+$url = str_replace('http://', '', $output);
+return $url;
+?>

Diff for: assets/plugins/phx/modifiers/parent.phx.php

@@ -0,0 +1,13 @@
+<?php
+
+/* Retrived from http://wiki.modxcms.com/index.php/PHx/CustomModifiers
+    * description: get specified document field from parent document (id)
+    * usage: [+variable:parent=`field`+]
+    * defaults to pagetitle 
+*/	
+	
+$field = (strlen($options)>0) ? $options : 'pagetitle';
+$parent = $modx->getParent($output,1,$field);
+return $parent[$field];
+
+?>

Diff for: assets/plugins/phx/modifiers/post.phx.php

@@ -0,0 +1,9 @@
+<?php
+
+// Returns the POST parameter which has been posted
+// It takes the paramater name as an argument
+// [*phx:post=`paramname`*] 
+
+return $_POST[$options];
+
+?>

Diff for: assets/plugins/phx/modifiers/tidyword.phx.php

@@ -0,0 +1,79 @@
+<?php
+// Get the Word infested input
+$text = $output;
+
+// Remove font tags
+$text = strip_selected_tags($text, "<font>");
+
+// Remove weird quotes and accents
+// http://uk3.php.net/manual/en/function.preg-replace.php#64828
+$text = preg_replace('/([\xc0-\xdf].)/se', "'&#' . ((ord(substr('$1', 0, 1)) - 192) * 64 + (ord(substr('$1', 1, 1)) - 128)) . ';'", $text);
+$text = preg_replace('/([\xe0-\xef]..)/se', "'&#' . ((ord(substr('$1', 0, 1)) - 224) * 4096 + (ord(substr('$1', 1, 1)) - 128) * 64 + (ord(substr('$1', 2, 1)) - 128)) . ';'", $text);
+
+// Strip inline styles
+$text = strip_styles($text);
+
+// Remove  class="MsoNormal"
+$text = str_replace('class="MsoNormal"', '', $text);
+
+// Return it
+return $text;
+
+
+
+/**
+* strip_selected_tags ( string str [, string strip_tags[, strip_content flag]] )
+* ---------------------------------------------------------------------
+* Like strip_tags() but inverse; the strip_tags tags will be stripped, not kept.
+* strip_tags: string with tags to strip, ex: "<a><p><quote>" etc.
+* strip_content flag: TRUE will also strip everything between open and closed tag
+* http://uk3.php.net/manual/en/function.preg-replace.php#71266
+*/
+function strip_selected_tags($str, $tags = "", $stripContent = false)
+{
+    preg_match_all("/<([^>]+)>/i", $tags, $allTags, PREG_PATTERN_ORDER);
+    foreach ($allTags[1] as $tag) {
+    $replace = "%(<$tag.*?>)(.*?)(<\/$tag.*?>)%is";
+        if ($stripContent) {
+            $str = preg_replace($replace,'',$str);
+        }
+            $str = preg_replace($replace,'${2}',$str);
+    }
+    return $str;
+}
+
+
+
+
+// Remove styles
+// http://uk3.php.net/manual/en/function.preg-replace.php#63219
+
+function strip_styles($source=NULL) {
+  $exceptions = str_replace(',', '|', 'text-align');
+
+  /* First we want to fix anything that might potentially break the styler stripper, sow e try and replace
+   * in-text instances of : with its html entity replacement.
+   */
+
+  function Replacer($text) {
+    $check = array (
+        '@:@s',
+    );
+    $replace = array(
+        '&#58;',
+    );
+
+    return preg_replace($check, $replace, $text[0]);
+  }
+
+  $source = preg_replace_callback('@>(.*)<@Us', 'Replacer', $source);
+  $regexp = '@([^;"]+)?(?<!'. $exceptions. ')(?<!\>\w):(?!\/\/(.+?)\/|<|>)((.*?)[^;"]+)(;)?@is';
+  $source = preg_replace($regexp, '', $source);
+  $source = preg_replace('@[a-z]*=""@is', '', $source);
+
+  return $source;
+}
+
+
+?>
+?>

Diff for: assets/plugins/phx/phx.parser.class.inc.php

@@ -0,0 +1,26 @@
+//<?php
+/**
+ * phx 
+ * 
+ * (Placeholders Xtended) Adds the capability of output modifiers when using placeholders, template variables and settings tags
+ *
+ * @category    plugin
+ * @version     2.1.4
+ * @author		Armand "bS" Pondman (apondman@zerobarrier.nl)
+ * @internal    @properties &phxdebug=Log events;int;0 &phxmaxpass=Max. Passes;int;50
+ * @internal    @events OnParseDocument
+ * @internal    @modx_category Manager and Admin
+ */
+
+include_once $modx->config['rb_base_dir'] . "plugins/phx/phx.parser.class.inc.php";
+
+$e = &$modx->Event;
+
+$PHx = new PHxParser($phxdebug,$phxmaxpass);
+
+switch($e->name) {
+	case 'OnParseDocument':
+		$PHx->OnParseDocument();
+		break;
+
+}

Diff for: assets/plugins/phx/phx.plugin.txt

@@ -1131,14 +1131,17 @@ function paginate($start, $stop, $total, $summarize, $tplPaginateNext, $tplPagin
 				$pages .= $this->template->replace(array('page'=>$display),$tplPaginateCurrentPage);
 			}
 		}
-		$modx->setPlaceholder($dittoID."next", $nextplaceholder);
-		$modx->setPlaceholder($dittoID."previous", $previousplaceholder);
+		
+		if ($totalpages>1){
+                    $modx->setPlaceholder($dittoID."next", $nextplaceholder);
+                    $modx->setPlaceholder($dittoID."previous", $previousplaceholder);
+                    $modx->setPlaceholder($dittoID."pages", $pages);
+        }
 		$modx->setPlaceholder($dittoID."splitter", $split);
 		$modx->setPlaceholder($dittoID."start", $start +1);
 		$modx->setPlaceholder($dittoID."urlStart", $start);
 		$modx->setPlaceholder($dittoID."stop", $limiter);
 		$modx->setPlaceholder($dittoID."total", $total);
-		$modx->setPlaceholder($dittoID."pages", $pages);
 		$modx->setPlaceholder($dittoID."perPage", $summarize);
 		$modx->setPlaceholder($dittoID."totalPages", $totalpages);
 		$modx->setPlaceholder($dittoID."ditto_pagination_set", true);

Diff for: assets/snippets/ditto/classes/ditto.class.inc.php

@@ -194,24 +194,28 @@ function determine($templates,$x,$start,$stop,$id) {
 	// 
 	// http://modxcms.com/forums/index.php/topic,5344.msg41096.html#msg41096
 	// ---------------------------------------------------
-	function fetch($tpl){
-		global $modx;
-		$template = "";
-		if ($modx->getChunk($tpl) != "") {
-			$template = $modx->getChunk($tpl);
-		} else if(substr($tpl, 0, 6) == "@FILE:") {
-			$template = $this->get_file_contents(substr($tpl, 6));
-		} else if(substr($tpl, 0, 6) == "@CODE:") {
-			$template = substr($tpl, 6);
-		} else if(substr($tpl, 0, 5) == "@FILE") {
-			$template = $this->get_file_contents(trim(substr($tpl, 5)));
-		} else if(substr($tpl, 0, 5) == "@CODE") {
-			$template = trim(substr($tpl, 5));
-		} else {
-			$template = $this->language['missing_placeholders_tpl'];
-		}
-			return $template;
-	}
+	   function fetch($tpl){
+      global $modx;
+      $template = "";
+      if ($modx->getChunk($tpl) != "") {
+         $template = $modx->getChunk($tpl);
+      } else if(substr($tpl, 0, 6) == "@FILE:") {
+         $template = $this->get_file_contents(substr($tpl, 6));
+      } else if(substr($tpl, 0, 6) == "@CODE:") {
+         $template = substr($tpl, 6);
+//Taken from feedx snippe
+        $template =  str_replace(array('|xq|','|xe|','|xa|'), array('?','=','&'), $template);
+      } else if(substr($tpl, 0, 5) == "@FILE") {
+         $template = $this->get_file_contents(trim(substr($tpl, 5)));
+      } else if(substr($tpl, 0, 5) == "@CODE") {
+         $template = trim(substr($tpl, 5));
+//Taken from feedx snippet
+         $template =  str_replace(array('|xq|','|xe|','|xa|'), array('?','=','&'), $template);
+      } else {
+         $template = $this->language['missing_placeholders_tpl'];
+      }
+         return $template;
+   }
 
 	// ---------------------------------------------------
 	// Function: get_file_contents

Diff for: assets/snippets/ditto/classes/template.class.inc.php

@@ -0,0 +1,22 @@
+<?php
+
+if (!function_exists('customsort'))
+{
+function customsort($a, $b)
+{
+$pos_a=array_search($a['id'],$GLOBALS['documents']);
+$pos_b=array_search($b['id'],$GLOBALS['documents']);
+
+if ($pos_a == $pos_b)
+{
+return 0;
+}
+return ($pos_a < $pos_b)?-1:1;
+}
+}
+
+$GLOBALS['documents']=explode(',',$documents);
+$orderBy["custom"][] = array ("id", "customsort");
+$ditto->advSort = true;
+
+?>

Diff for: assets/snippets/ditto/extenders/customsort.extender.inc.php

@@ -0,0 +1,79 @@
+<?php
+
+/*
+ * Title: Distinct
+ * Purpose:
+ *  	Return only distinct / unique results, based on a fieldname supplied as &distinct parameter
+ * Version: 1.0.1
+ * Author: Nick Crossland (ncrossland)
+ * Installation: Put file "distinct.extender.inc.php" into /assets/snippets/ditto/extenders
+ * Usage: In the Ditto call, add "distinct" to the extenders param, and specify the &distinct parameter with the name(s) of the field which you would like to be unique.
+ *        If you would like to make the combined values of more than one field unique, separate them with commas
+ * e.g. [[Ditto? &tpl=`myTemplate` &extenders=`distinct` &distinct=`pagetitle`]] -- will return only unique page titles.
+ * e.g. [[Ditto? &tpl=`myTemplate` &extenders=`distinct` &distinct=`pagetitle,pub_date`]] -- will return only unique page titles for each date.
+ *
+ * Changelog:
+ * 1.0: initial release
+ * 1.0.1: Bugfixes only
+*/
+
+
+$distinct = isset($distinct) ? $distinct : false;
+/*
+	Param: distinct
+
+	Purpose:
+ 	What field should we search for being distinct?
+
+	Options:
+	Fieldname
+	
+	Default:
+	"default"
+*/
+
+
+// If no fieldname value has been supplied, don't do anything else
+if ($distinct === false) {
+	return false;	
+}
+
+// It would be nice if this was class based, so it doesn't pollute the global namespace
+// But - create an array of document values we've seen, and the fieldnames we're making distinct
+global $seen;
+global $distinct_fieldname;
+$distinct_fieldname = explode(',',$distinct); 
+
+// Remove any extra spaces from the fieldnames (in case they have been supplied with commas and spaces)
+$distinct_fieldname = array_map('trim', $distinct_fieldname);	
+
+
+// The filter function
+if (!function_exists("makeDistinct")) {
+	
+	function makeDistinct($resource) {
+		global $seen;
+		global $distinct_fieldname;
+		
+		// Make a unique string based on the fieldname and value of each field we've been asked to make distinct
+		$distinct_string = '';
+		foreach ($distinct_fieldname as $f) {
+			$distinct_string .= '~'. $f.'|'.$resource[$f];
+		}
+			
+		// Check if this string has been seen yet -- if it has, don't include it in the results
+		if (isset($seen[$distinct_string]) && ($seen[$distinct_string])==true ) {	// If this value of the fieldname has been seen before, remove it from the list
+			return false;
+		} else {
+			$seen[$distinct_string] = true;	// Otherwise, remember the value has been seen, and allow it in the list (this time)
+			return true;
+		}	
+		
+	}
+}
+
+// Add the custom function
+$filters["custom"]["distinct"] =  array(implode(',',$distinct_fieldname) ,"makeDistinct"); 
+
+
+?>

Diff for: assets/snippets/ditto/extenders/distinct.extender.inc.php

@@ -0,0 +1,54 @@
+<?php
+/*
+ * Ditto Extender: glossaryFilter - advanced filtering of documents
+ * Released under the terms of General Public License
+ * Copyright (c) 2010 Aleksander Maksymiuk, http://setpro.pl/
+
+ * Last modified: 2010-08-30, 23:53
+
+ * Parameters:
+ *   filterVar - optional; documents attribute or template variable used for matching (default: pagetitle)
+ *      notice: you should rather avoid to use content field for this purpose
+ *   filterMode - optional; specifies how matching should be performed
+ *      possible values are:
+ *         class (default) - match with RegExp /^[...]/i where ... is substituted with the value of filterBy parameter
+ *         custom - match with full-fledged RegExp provided with filterBy parameter
+ *         chunk - match with full-fledged RegExp privided with a chunk whose name is kept within filterBy parameter
+ *   filterBy - optional, however, you SHOULD specify at least this one parameter, otherwise extender does no filtering
+ *   forceUTF8 - optional; specifies whether filterBy value should be treated as UTF-8 string or not
+ *      it affects extender's behavior while running in class mode 
+ *      possible values are: 0, 1 (default: 0)
+ * Example:
+ *   fetch documents within 3, 4, and 5 containers whose pagetitles start with A, B, C, or D
+ *      [[Ditto? &parents=`3,4,5` &depth=`0` &display=`all` &extenders=`glossaryFilter` &filterBy=`A-D` &tpl=`...` ...]]
+ *   fetch documents within 3, 4, and 5 containers whose aliases do not start with numeric
+ *      [[Ditto? &parents=`3,4,5` &depth=`0` &display=`all` &extenders=`glossaryFilter` &filterVar=`alias` &filterBy=`^0-9` &tpl=`...` ...]]
+ * Full article, sample implementations, downloading latest version:
+ *   http://setpro.pl/software/ditto-stuff/glossary-extender
+ */
+
+$GLOBALS['filterVar'] = isset($filterVar) ? $filterVar : 'pagetitle';
+$GLOBALS['filterMode'] = isset($filterMode) && preg_match('/^(chunk|class|custom)$/', $filterMode) ? $filterMode : 'class';
+$GLOBALS['filterBy'] = isset($filterBy) ? $filterBy : '';
+$GLOBALS['forceUTF8'] = isset($forceUTF8) ? $forceUTF8 : 0;
+if ($GLOBALS['filterMode'] == 'chunk') {
+    $GLOBALS['filterBy'] = $modx->getChunk($GLOBALS['filterBy']);
+}
+$GLOBALS['forceUTF8'] = $GLOBALS['forceUTF8'] ? 'u' : '';
+
+$filters['custom']['glossaryFilter'] = array($GLOBALS['filterVar'], 'glossaryFilter');
+
+if (!function_exists('glossaryFilter')) {
+	function glossaryFilter($resource) {
+		if (!$GLOBALS['filterBy']) {
+			# do nothing (simply leave document within final dataset)
+			return 1;
+		}
+        $regExpBegin = preg_match('/^(chunk|custom)$/', $GLOBALS['filterMode']) ? '' : '/^[';
+        $regExpEnd = preg_match('/^(chunk|custom)$/', $GLOBALS['filterMode']) ? '' : ']/i' . $GLOBALS['forceUTF8'];
+        # do filtering
+        return preg_match($regExpBegin . $GLOBALS['filterBy'] . $regExpEnd, $resource[$GLOBALS['filterVar']]) ? 1 : 0;
+	}
+}
+
+?>

Diff for: assets/snippets/ditto/extenders/glossaryFilter.extender.inc.php

@@ -0,0 +1,23 @@
+<?php
+// çàïðàøèâàåì êîììåíòàðèè èç áàçû, ïîïóòíî ñ÷èòàÿ èõ êîëè÷åñòâî ÷åðåç COUNT(*) (óäàëåííûå è íåîïóáëèêîâàííûå íå ñ÷èòàåì)
+$result = $modx->db->select('uparent, COUNT(*)', $modx->getFullTableName("jot_content"), 'published=1 AND deleted=0 GROUP BY uparent', 'COUNT(*) DESC');
+$counts = $modx->db->makeArray( $result );
+
+// ïðèâîäèì ìàññèâ â âèä document_id => comments_count
+$jotcount = array();
+foreach($counts as $k=>$v) $jotcount[$v['uparent']] = $v['COUNT(*)'];
+// íåêðàñèâî "ãëîáàëèçóåì" ìàññèâ äëÿ âûçîâà èç ôóíêöèè jotph()
+$GLOBALS['jotcount'] = $jotcount;
+
+// äîáàâëÿåì îáðàáîò÷èê ïëåéñõîëäåðà [+jotcount+] â ditto
+$placeholders['jotcount'] = array(array("id","*"),"jotph","id");
+
+// ôóêíöèÿ, çàïîëíÿþùàÿ [+jotcount+] äëÿ âûâîäà â øàáëîíå &tpl
+if(!function_exists("jotph")) {
+  function jotph($resource) {
+    global $jotcount;
+    if(!$r = $jotcount[$resource['id']]) $r = 0;
+    return $r;
+  }
+}
+?>

Diff for: assets/snippets/ditto/extenders/jotcount.extender.inc.php

@@ -0,0 +1,36 @@
+<?php
+/*
+ * Ditto Extender: tvFilter
+ * Filters out documents by TV assignment
+ * Copyright (c) 2009-2010 Aleksander Maksymiuk, http://setpro.net.pl/
+ * Parameters:
+ *   tvFilterBy - TV name to filter by (required)
+ *   tvFilterMode
+ *   	1: excludes document if it has the requested TV assigned (default)
+ *   	0: excludes document if it has not the requested TV assigned
+ * Example: display all documents within 3, 4, and 5 containers that are not linked with dummy TV
+ * 		[[Ditto? &parents=`3,4,5` &display=`all` &tpl=`...` &extenders=`tvFilter` &tvFilerBy=`dummy` tvFilterMode=`0`]]
+ */
+
+$GLOBALS['tvFilterBy'] = isset($tvFilterBy) ? $tvFilterBy : '';
+$GLOBALS['tvFilterMode'] = isset($tvFilterMode) ? $tvFilterMode : 1;
+
+$filters['custom']['tvFilter'] = array('template', 'tvFilter');
+
+if (!function_exists('tvFilter')) {
+	function tvFilter($resource) {
+		global $modx;
+		if (!$GLOBALS['tvFilterBy']) {
+			# do nothing (leave document within result set)
+			return 1;
+		}
+		$sql = "SELECT " . $modx->getFullTableName('site_tmplvars') . ".id " .
+		    "FROM " . $modx->getFullTableName('site_tmplvars') . " " .
+			"INNER JOIN " . $modx->getFullTableName('site_tmplvar_templates') . " " .
+				"ON " . $modx->getFullTableName('site_tmplvars') . ".id = " . $modx->getFullTableName('site_tmplvar_templates') . ".tmplvarid " .
+			"WHERE (" . $modx->getFullTableName('site_tmplvars') . ".name = '" . $GLOBALS['tvFilterBy'] . "') AND (" . $modx->getFullTableName('site_tmplvar_templates') . ".templateid = '" . $resource['template'] . "')";
+		return $GLOBALS['tvFilterMode'] ? !mysql_numrows(mysql_query($sql)) : mysql_numrows(mysql_query($sql));
+	}
+}
+
+?>

Diff for: assets/snippets/ditto/extenders/tvFilter.extender.inc.php

@@ -0,0 +1,71 @@
+<?php
+/*
+==================================================
+	GetField
+==================================================
+
+Returns any document field or template variable from any document or any of its parents.
+
+Author: Grzegorz Adamiak [grad]
+Version: 1.3 beta @2006-11-08 14:40:04
+License: LGPL
+MODx: 0.9.2.1+
+
+See GetField.txt for instructions and version history.
+--------------------------------------------------
+*/
+
+/* Parameters
+----------------------------------------------- */
+
+# $docid [ int ]
+# ID of the document for which to get a field content.
+# Default: current document
+
+$gfIntDocId = (isset($docid)) ? $docid : $modx->documentIdentifier;
+
+# $field [ string ]
+# Name of the field for which to get the content:
+# - any of the document object fields (http://modxcms.com/the-document-object.html)
+# - template variable
+# Default: 'pagetitle'
+
+$gfStrDocField = (isset($field)) ? trim($field) : 'pagetitle';
+
+# $parent [ 0 | 1 ]
+# If set to 1, the snippet will return value for the document parent.
+# Default: 0
+
+$gfBoolParent = (isset($parent)) ? $parent : 0;
+
+# $parentLevel [ int ]
+# Specifies how high in the document tree to search for the parent of the document:
+# - $parentLevel = 0 - returns the ultimate parent (right under site root)
+# - $parentLevel = 1 - returns the direct parent
+# Default: 0
+
+$gfIntParentLevel = (isset($parentLevel) && is_int((int) $parentLevel)) ? $parentLevel : 0;
+
+# $topid [ int ]
+# Id of the topmost document in the document tree under which to search for a parent. Used only with $parent set to 1.
+# Default: 0
+
+$gfIntTopDocId = (isset($topid) && is_int((int) $topid)) ? $topid : 0;
+
+/* Do not edit the code below!
+----------------------------------------------- */
+
+# Include logic
+include_once('assets/snippets/getfield/getfield.inc.php');
+
+# Get parent document ID
+if ($gfBoolParent)
+	$gfIntDocId = gfGetParentId($modx, $gfIntDocId, $gfIntTopDocId, $gfIntParentLevel);
+
+# Get content of the field
+$output = gfGetFieldContent($modx,$gfIntDocId,$gfStrDocField);
+
+unset($gfIntDocId, $gfStrDocField, $gfBoolParent, $gfIntParentLevel, $gfIntTopDocId);
+
+return $output;
+?>

Diff for: assets/snippets/getfield/GetField.tpl

@@ -0,0 +1,107 @@
+<?php
+/*
+==================================================
+	GetField
+==================================================
+
+Returns any document field or template variable from any document or any of its parents.
+
+Author: Grzegorz Adamiak [grad]
+Version: 1.3 beta @2006-11-08 14:40:04
+License: LGPL
+MODx: 0.9.2.1+
+
+See GetField.txt for instructions and version history.
+--------------------------------------------------
+*/
+
+unset($docid, $field, $parent, $parentLevel, $topid);
+
+# GetField functions
+# ---------------------------------------------
+
+# gfGetFieldContent
+# Returns the inherited value of any content field
+if (!function_exists(gfGetFieldContent))
+{
+	function gfGetFieldContent($modx,$gfIntDocId,$gfStrDocField)
+	{
+	/* apparently in 0.9.2.1 the getTemplateVarOutput function doesn't work as expected and doesn't return INHERITED value; this is probably to be fixed for next release; see http://modxcms.com/bugs/task/464
+		$gfArrTV = $modx->getTemplateVarOutput($gfStrDocField,$gfIntDocId);
+		return $gfArrTV[$gfStrDocField];
+	*/
+
+		while ($gfArrParent = $modx->getDocument($gfIntDocId,'parent'))
+		{
+			$gfArrTV = $modx->getTemplateVar($gfStrDocField,'*',$gfIntDocId);
+			if (($gfArrTV['value'] && substr($gfArrTV['value'],0,8) != '@INHERIT') or !$gfArrTV['value']) // tv default value is overriden (including empty)
+			{
+				$output = $modx->getTemplateVarOutput($gfStrDocField,$gfIntDocId);
+				$output = $output[$gfStrDocField];
+				break;
+			}
+			else // there is no parent with default value overriden
+			{
+				$output = trim(substr($gfArrTV['value'],8));
+			}
+			$gfIntDocId = $gfArrParent['parent']; // move up one document in document tree
+		} // end while
+
+		return $output;
+	}
+}
+
+# gfGetParentId
+# Returns the parent document ID
+if (!function_exists(gfGetParentId))
+{
+	function gfGetParentId($modx, $gfIntDocId, $gfIntTopDocId, $gfIntParentLevel)
+	{
+		# build an array of document ancestors IDs
+		$gfArrParentIds = array (); // initialize;
+		$gfArrParentIds[] = $gfIntDocId; // add the specified document ID on first place
+
+		// get IDs of all parents back to root of the document tree
+		while (($gfArrParent = $modx->getDocument($gfIntDocId,'parent')) && ($gfArrParent['parent'] != 0))
+		{
+			$gfIntDocId = $gfArrParent['parent']; // move up one document in the document tree
+			$gfArrParentIds[] = $gfIntDocId; // add parent ID to the array
+		} // end while
+		unset($gfIntDocId, $gfArrParent);
+
+		$gfIntParentsCount = count($gfArrParentIds); // number of the parents
+
+		# determine the ID of the specified parent
+		switch ($gfIntTopDocId)
+		{
+			case 0: // not set or set to the root of the document tree
+
+				($gfIntParentLevel && ($gfIntParentLevel < $gfIntParentsCount)) ?
+					($gfIntDocId = $gfArrParentIds[$gfIntParentLevel]) : // find parent in specified levels up
+					($gfIntDocId = $gfArrParentIds[$gfIntParentsCount - 1]); // if not set return the topmost (ultimate) parent
+
+				break;
+
+			default: // set to any other document
+
+				$gfIntParentKey = array_search($gfIntTopDocId, $gfArrParentIds); // find the index of parent
+				switch ($gfIntParentKey)
+				{
+					case 0: // not an ancestor or the document itself
+
+						$gfIntDocId = 0;
+						break;
+
+					default: // parent is above the document in document tree
+
+						($gfIntParentLevel && ($gfIntParentLevel < $gfIntParentKey)) ?
+							($gfIntDocId = $gfArrParentIds[$gfIntParentLevel]) : // find parent in specified levels up
+							($gfIntDocId = $gfArrParentIds[$gfIntParentKey - 1]);
+				} // end switch
+		} // end switch
+		unset($gfIntTopDocId, $gfIntParentLevel, $gfIntParentsCount, $gfIntParentKey, $gfArrParentIds);
+
+		return $gfIntDocId;
+	}
+}
+?>

Diff for: assets/snippets/getfield/getfield.inc.php

@@ -0,0 +1,51 @@
+<div class="comment [+comment.createdby:isnt=`0`:then=`adminn`+]" style="padding-left:[+comment.depth+]0pt; ">
+	<a name="jc[+jot.link.id+][+comment.id+]"></a><a name="[+comment.createdon+]"></a>
+<div class="content">[+comment.content:wordwrap:esc:nl2br+]
+<!---
+
+[+comment.title:isnt=`new comment`:then=`
+ <br /><br /><strong>Админ:</strong>[+comment.title:wordwrap:esc:nl2br+]
+`+]
+--->
+
+
+ <div class="aboutpost" style="margin:5px 0 0 0;">
+ [+comment.createdby:isnt=`0`:then=`<b>`+][+comment.createdby:userinfo=`fulname`:ifempty=`[+comment.custom.name:ifempty=`[+jot.guestname+]`:esc+]`+][+comment.createdby:isnt=`0`:then=`</b>`+]
+<!--- [+comment.createdon:date=`%d.%m.%Y в %H.%M`+] --->
+ 
+ </div>
+ 
+ 
+ <!--[+jot.moderation.enabled:is=`1`:then=`
+
+  
+ 
+  <a href="[+jot.link.delete:esc+][+jot.querykey.id+]=[+comment.id+]#jotmod[+jot.link.id+]" onclick="return confirm('Действительно хотите удалить комментарий?')" title="Delete Comment"><img src="[(base_url)]manager/media/style/MODxCarbon/images/icons/event3.png" width="16" height="16" alt="Удалить" border="0" /></a>
+  `:strip+]
+  [+jot.user.canedit:is=`1`:and:if=`[+comment.createdby+]`:is=`[+jot.user.id+]`:or:if=`[+jot.moderation.enabled+]`:is=`1`:then=`
+  <a href="[+jot.link.edit:esc+][+jot.querykey.id+]=[+comment.id+]#jf[+jot.link.id+]" onclick="return confirm('Вы хотите отредактировать этот комментарий?')" title="Отредактировать комментарий"><img src="[(base_url)]manager/media/style/MODxCarbon/images/icons/logging.gif" width="16" height="16" alt="Отредактировать комментарий" border="0" /></a>
+  `:strip+] -->
+   <div class="jot-mod">
+			 [+jot.moderation.enabled:is=`1`:then=`
+				<a href="[+jot.link.delete:esc+][+jot.querykey.id+]=[+comment.id+]#jotmod[+jot.link.id+]" onclick="return confirm('Are you sure you wish to delete this comment?')" title="Delete Comment"><img src="[(base_url)]assets/snippets/jot/templates/delete.gif" width="16" height="16" alt="Delete Comment" border="0" /></a>
+				[+comment.published:is=`0`:then=`
+				<a href="[+jot.link.publish:esc+][+jot.querykey.id+]=[+comment.id+]#jotmod[+jot.link.id+]" onclick="return confirm('Are you sure you wish to publish this comment?')" title="Publish Comment"><img src="[(base_url)]assets/snippets/jot/templates/publish.png" width="16" height="16" alt="Publish Comment" border="0" /></a>
+				`+]
+				[+comment.published:is=`1`:then=`
+				<a href="[+jot.link.unpublish:esc+][+jot.querykey.id+]=[+comment.id+]#jotmod[+jot.link.id+]" onclick="return confirm('Are you sure you wish to unpublish this comment?')" title="Unpublish Comment"><img src="[(base_url)]assets/snippets/jot/templates/unpublish.png" width="16" height="16" alt="Unpublish Comment" border="0" /></a>
+				`+]
+			 `:strip+]
+			 [+jot.user.canedit:is=`1`:and:if=`[+comment.createdby+]`:is=`[+jot.user.id+]`:or:if=`[+jot.moderation.enabled+]`:is=`1`:then=`
+				 <a href="[+jot.link.edit:esc+][+jot.querykey.id+]=[+comment.id+]#jf[+jot.link.id+]" onclick="return confirm('Are you sure you wish to edit this comment?')" title="Edit Comment"><img src="[(base_url)]assets/snippets/jot/templates/edit.gif" width="16" height="16" alt="Edit Comment" border="0" /></a>
+   		 `:strip+]
+			 </div>	
+  
+  </div> 
+[+comment.title:isnt=`new comment`:then=`
+<div class="adminn">
+[+comment.title:wordwrap:esc:nl2br+]
+ </div>`+]
+ 
+
+
+</div>

Diff for: assets/snippets/jot/templates/chunk.comment.faq.inc.html

@@ -0,0 +1,47 @@
+	<a name="jc[+jot.link.id+][+comment.id+]"></a>
+	<div class="jot-row [+chunk.rowclass+] [+comment.published:is=`0`:then=`jot-row-up`+]">
+	 <div class="jot-comment">
+ 		 
+		 <div class="jot-user">
+		 [+comment.createdby:isnt=`0`:then=`<b>`+][+comment.createdby:userinfo=`username`:ifempty=`[+comment.custom.name:ifempty=`[+jot.guestname+]`:esc+]`+][+comment.createdby:isnt=`0`:then=`</b>`+]
+		 <br />Posts: [+comment.userpostcount+]
+		 </div> 
+		
+		 <div class="jot-content">
+			 
+			 <div class="jot-posticon">
+					[+phx:userinfo=`lastlogin`:ifempty=`9999999999`:lt=`[+comment.createdon+]`:then=`
+				 <img src="[(base_url)]assets/snippets/jot/templates/comment.gif" width="16" height="16" alt="New comment" border="0" />
+				 `:else=`
+				 <img src="[(base_url)]assets/snippets/jot/templates/comment_trans.gif" width="16" height="16" alt="Comment" border="0" />
+				 `:strip+]
+			 </div>		 
+			 
+			 <div class="jot-mod">
+			 [+jot.moderation.enabled:is=`1`:then=`
+				<a href="[+jot.link.delete:esc+][+jot.querykey.id+]=[+comment.id+]#jotmod[+jot.link.id+]" onclick="return confirm('Are you sure you wish to delete this comment?')" title="Delete Comment"><img src="[(base_url)]assets/snippets/jot/templates/delete.gif" width="16" height="16" alt="Delete Comment" border="0" /></a>
+				[+comment.published:is=`0`:then=`
+				<a href="[+jot.link.publish:esc+][+jot.querykey.id+]=[+comment.id+]#jotmod[+jot.link.id+]" onclick="return confirm('Are you sure you wish to publish this comment?')" title="Publish Comment"><img src="[(base_url)]assets/snippets/jot/templates/publish.png" width="16" height="16" alt="Publish Comment" border="0" /></a>
+				`+]
+				[+comment.published:is=`1`:then=`
+				<a href="[+jot.link.unpublish:esc+][+jot.querykey.id+]=[+comment.id+]#jotmod[+jot.link.id+]" onclick="return confirm('Are you sure you wish to unpublish this comment?')" title="Unpublish Comment"><img src="[(base_url)]assets/snippets/jot/templates/unpublish.png" width="16" height="16" alt="Unpublish Comment" border="0" /></a>
+				`+]
+			 `:strip+]
+			 [+jot.user.canedit:is=`1`:and:if=`[+comment.createdby+]`:is=`[+jot.user.id+]`:or:if=`[+jot.moderation.enabled+]`:is=`1`:then=`
+				 <a href="[+jot.link.edit:esc+][+jot.querykey.id+]=[+comment.id+]#jf[+jot.link.id+]" onclick="return confirm('Are you sure you wish to edit this comment?')" title="Edit Comment"><img src="[(base_url)]assets/snippets/jot/templates/edit.gif" width="16" height="16" alt="Edit Comment" border="0" /></a>
+   		 `:strip+]
+			 </div>	
+			  
+			 <span class="jot-subject">[+comment.title:limit:esc+]</span><br />
+			 <span class="jot-poster"><b>Reply #[+comment.postnumber+] on :</b> [+comment.createdon:date=`%a %B %d, %Y, %H:%M:%S`+]</span>
+			 <hr />
+			 <div class="jot-message">[+comment.content:wordwrap:esc:nl2br+]</div>
+			 <div class="jot-extra">
+			 [+comment.editedon:isnt=`0`:then=`
+			  <span class="jot-editby">Last Edit: [+comment.editedon:date=`%B %d, %Y, %H:%M:%S`+] by [+comment.editedby:userinfo=`username`:ifempty=` * `+]</span>
+			  &nbsp;`+] [+jot.moderation.enabled:is=`1`:then=`<a target="_blank" href="http://www.ripe.net/perl/whois?searchtext=[+comment.secip+]">[+comment.secip+]</a>`+]</div>
+		 </div>
+		 
+	 </div>
+	
+	</div>

Diff for: assets/snippets/jot/templates/chunk.comment.inc.eng.html

@@ -1,44 +1,44 @@
-	<a name="jc[+jot.link.id+][+comment.id+]"></a>
+	<a name="jc[+jot.link.id+][+comment.id+]"></a>
 	<div class="jot-row [+chunk.rowclass+] [+comment.published:is=`0`:then=`jot-row-up`+]">
 	 <div class="jot-comment">
 
 		 <div class="jot-user">
 		 [+comment.createdby:isnt=`0`:then=`<b>`+][+comment.createdby:userinfo=`username`:ifempty=`[+comment.custom.name:ifempty=`[+jot.guestname+]`:esc+]`+][+comment.createdby:isnt=`0`:then=`</b>`+]
-		 <br />Posts: [+comment.userpostcount+]
+		 <br />Ответов: [+comment.userpostcount+]
 		 </div> 
 
 		 <div class="jot-content">
 
 			 <div class="jot-posticon">
 					[+phx:userinfo=`lastlogin`:ifempty=`9999999999`:lt=`[+comment.createdon+]`:then=`
-				 <img src="[(base_url)]assets/snippets/jot/templates/comment.gif" width="16" height="16" alt="New comment" border="0" />
+				 <img src="[(base_url)]manager/media/style/MODx/images/icons/folder_page_add.gif" width="18" height="18" alt="Новый комментарий" border="0" />
 				 `:else=`
-				 <img src="[(base_url)]assets/snippets/jot/templates/comment_trans.gif" width="16" height="16" alt="Comment" border="0" />
+				 <img src="[(base_url)]manager/media/style/MODx/images/icons/newdoc.gif" width="16" height="16" alt="Комментарий" border="0" />
 				 `:strip+]
 			 </div>		 
 
 			 <div class="jot-mod">
 			 [+jot.moderation.enabled:is=`1`:then=`
-				<a href="[+jot.link.delete:esc+][+jot.querykey.id+]=[+comment.id+]#jotmod[+jot.link.id+]" onclick="return confirm('Are you sure you wish to delete this comment?')" title="Delete Comment"><img src="[(base_url)]assets/snippets/jot/templates/delete.gif" width="16" height="16" alt="Delete Comment" border="0" /></a>
+				<a href="[+jot.link.delete:esc+][+jot.querykey.id+]=[+comment.id+]#jotmod[+jot.link.id+]" onclick="return confirm('Действительно хотите удалить комментарий?')" title="Delete Comment"><img src="[(base_url)]manager/media/style/MODxCarbon/images/icons/event3.gif" width="16" height="16" alt="Удалить" border="0" /></a>
 				[+comment.published:is=`0`:then=`
-				<a href="[+jot.link.publish:esc+][+jot.querykey.id+]=[+comment.id+]#jotmod[+jot.link.id+]" onclick="return confirm('Are you sure you wish to publish this comment?')" title="Publish Comment"><img src="[(base_url)]assets/snippets/jot/templates/publish.png" width="16" height="16" alt="Publish Comment" border="0" /></a>
+				<a href="[+jot.link.publish:esc+][+jot.querykey.id+]=[+comment.id+]#jotmod[+jot.link.id+]" onclick="return confirm('Если разрешить комментарий он будет доступен для просмотра пользователям, уверены, что хотите этого?')" title="Publish Comment"><img src="[(base_url)]manager/media/style/MODxCarbon/images/icons/add.png" width="16" height="16" alt="Опубликовать" border="0" /></a>
 				`+]
 				[+comment.published:is=`1`:then=`
-				<a href="[+jot.link.unpublish:esc+][+jot.querykey.id+]=[+comment.id+]#jotmod[+jot.link.id+]" onclick="return confirm('Are you sure you wish to unpublish this comment?')" title="Unpublish Comment"><img src="[(base_url)]assets/snippets/jot/templates/unpublish.png" width="16" height="16" alt="Unpublish Comment" border="0" /></a>
+				<a href="[+jot.link.unpublish:esc+][+jot.querykey.id+]=[+comment.id+]#jotmod[+jot.link.id+]" onclick="return confirm('Если запретить комментарий он не будет доступен для просмотра пользователями, уверены, что хотите этого?')" title="Unpublish Comment"><img src="[(base_url)]manager/media/style/MODxCarbon/images/icons/delete.png" width="16" height="16" alt="Запретить" border="0" /></a>
 				`+]
 			 `:strip+]
 			 [+jot.user.canedit:is=`1`:and:if=`[+comment.createdby+]`:is=`[+jot.user.id+]`:or:if=`[+jot.moderation.enabled+]`:is=`1`:then=`
-				 <a href="[+jot.link.edit:esc+][+jot.querykey.id+]=[+comment.id+]#jf[+jot.link.id+]" onclick="return confirm('Are you sure you wish to edit this comment?')" title="Edit Comment"><img src="[(base_url)]assets/snippets/jot/templates/edit.gif" width="16" height="16" alt="Edit Comment" border="0" /></a>
+				 <a href="[+jot.link.edit:esc+][+jot.querykey.id+]=[+comment.id+]#jf[+jot.link.id+]" onclick="return confirm('Вы хотите отредактировать этот комментарий?')" title="Отредактировать комментарий"><img src="[(base_url)]manager/media/style/MODxCarbon/images/icons/logging.gif" width="16" height="16" alt="Отредактировать комментарий" border="0" /></a>
    		 `:strip+]
 			 </div>	
 
 			 <span class="jot-subject">[+comment.title:limit:esc+]</span><br />
-			 <span class="jot-poster"><b>Reply #[+comment.postnumber+] on :</b> [+comment.createdon:date=`%a %B %d, %Y, %H:%M:%S`+]</span>
+			 <span class="jot-poster"><b>Ответ #[+comment.postnumber+] дата :</b> [+comment.createdon:date=`%a %B %d, %Y, %H:%M:%S`+]</span>
 			 <hr />
 			 <div class="jot-message">[+comment.content:wordwrap:esc:nl2br+]</div>
 			 <div class="jot-extra">
 			 [+comment.editedon:isnt=`0`:then=`
-			  <span class="jot-editby">Last Edit: [+comment.editedon:date=`%B %d, %Y, %H:%M:%S`+] by [+comment.editedby:userinfo=`username`:ifempty=` * `+]</span>
+			  <span class="jot-editby">Последняя правка: [+comment.editedon:date=`%B %d, %Y, %H:%M:%S`+] пользователем [+comment.editedby:userinfo=`username`:ifempty=` * `+]</span>
 			  &nbsp;`+] [+jot.moderation.enabled:is=`1`:then=`<a target="_blank" href="http://www.ripe.net/perl/whois?searchtext=[+comment.secip+]">[+comment.secip+]</a>`+]</div>
 		 </div>
 

Diff for: assets/snippets/jot/templates/chunk.comment.inc.html

@@ -0,0 +1,88 @@
+<!--<a name="jf[+jot.link.id+]"></a>-->
+<h3 class=forceup>[+form.edit:is=`1`:then=`Правка`:else=`Задать вопрос`+]</h3>
+[+form.error:isnt=`0`:then=`
+<div class="jot-err">
+[+form.error:select=`
+&-3=Вы отправляете один и тот же пост - не стоит нажимать на кнопку более 1 раза.
+&-2=Ваш вопрос отвергнут.
+&-1=Ваш вопрос отправлен - ждет проверки модератора, после проверки будет опубликован.
+&1=Вы отправляете один и тот же пост - не стоит нажимать на кнопку более 1 раза.
+&2=Код на изображении не совпадает с тем, что вы указали.
+&3=Не торопитесь, ограничение на время повторного поста [+jot.postdelay+] секунд.
+&4=Ваш вопрос отвергнут.
+&5=[+form.errormsg:ifempty=`Необходимо заполнять поля помеченные знаком *`+]
+`+]
+</div>
+`:strip+]
+[+form.confirm:isnt=`0`:then=`
+<div class="jot-cfm">
+[+form.confirm:select=`
+&1=Ваш вопрос успешно добавлен.
+&2=Ваш вопрос отправлен - ждет проверки модератора, после проверки будет опубликован.
+&3=Ваш вопрос сохранен.
+`+]
+</div>
+`:strip+]
+<form method="post" action="[+form.action:esc+]#jf[+jot.link.id+]" class="jot-form">
+	<fieldset>
+	<input name="JotForm" type="hidden" value="[+jot.id+]" />
+	<input name="JotNow" type="hidden" value="[+jot.seed+]" />
+	<input name="parent" type="hidden" value="[+form.field.parent+]" />
+	
+	[+form.moderation:is=`1`:then=`
+		<div class="jot-row">
+			<b>Создан:</b> [+form.field.createdon:date=`%a %B %d, %Y at %H:%M`+]<br />
+			<b>Автор:</b> [+form.field.createdby:userinfo=`username`:ifempty=`[+jot.guestname+]`+]<br />
+			<b>IP address:</b> [+form.field.secip+]<br />
+			<b>Статус:</b> [+form.field.published:select=`0=No&1=Yes`+]<br />
+			[+form.field.publishedon:gt=`0`:then=`
+				<b>Опубликован:</b> [+form.field.publishedon:date=`%a %B %d, %Y at %H:%M`+]<br />
+				<b>Опубликовал:</b> [+form.field.publishedby:userinfo=`username`:ifempty=` - `+]<br />
+			`+]
+			[+form.field.editedon:gt=`0`:then=`
+				<b>Отредактирован:</b> [+form.field.editedon:date=`%a %B %d, %Y at %H:%M`+]<br />
+				<b>Отредактировал:</b> [+form.field.editedby:userinfo=`username`:ifempty=` -`+]<br />
+			`+]
+		</div>
+	`:strip+]
+	
+	[+form.guest:is=`1`:then=`
+		<label for="name[+jot.id+]">Имя:<span style="font-weight:bold; color:#FF0000">*</span><br />
+		<input tabindex="[+jot.seed:math=`?+1`+]" name="name" type="text" size="40" value="[+form.field.custom.name:esc+]" id="name[+jot.id+]" />
+		</label>
+		<label for="email[+jot.id+]">Email:<span style="font-weight:bold; color:#FF0000">*</span><br />
+		<input tabindex="[+jot.seed:math=`?+2`+]" name="email" type="text" size="40" value="[+form.field.custom.email:esc+]" id="email[+jot.id+]"/>
+		</label>
+	`:strip+]
+	[+form.moderation:is=`1`:then=`
+	<label for="title[+jot.id+]">Ответ:<br />
+	<textarea tabindex="[+jot.seed:math=`?+3`+]" name="title" cols="50" rows="8"  id="title[+jot.id+]"/>[+form.field.title:esc+]</textarea>
+	</label>
+	`:strip+]
+	 <!---<label for="ans[+jot.id+]">Телефон:<br />
+	<input tabindex="[+jot.seed:math=`?+9`+]" name="ans" type="text" size="40" value="[+form.field.custom.ans:esc+]" id="ans[+jot.id+]"/>
+	</label>--->
+	<label for="content[+jot.id+]">Ваш вопрос:<span style="font-weight:bold; color:#FF0000">*</span><br />
+	<textarea tabindex="[+jot.seed:math=`?+4`+]" name="content" cols="50" rows="8" id="content[+jot.id+]">[+form.field.content:esc+]</textarea>
+	</label><br />
+   <!--- [+form.moderation:is=`1`:then=`
+ 
+    <label for="title[+jot.id+]">Комментарий админа:<br />
+	<textarea tabindex="[+jot.seed:math=`?+3`+]" name="title" cols="50" rows="8"  id="title[+jot.id+]"/>[+form.field.title:esc+]</textarea>
+	
+	</label>
+   
+	  `:strip+]
+	--->
+  [+jot.captcha:is=`1`:then=`
+		<div style="width:150px;margin-top: 5px;margin-bottom: 5px;"><a href="[+jot.link.current:esc+]"><img src="[(base_url)]manager/includes/veriword.php?rand=[+jot.seed+]" width="148" height="60" alt="Если у Вас возникли проблемы с чтением кода, нажмите на картинку с кодом для нового кода." style="border: 1px solid #003399" /></a></div>
+		<label for="vericode[+jot.id+]">Для защиты от спама - введите код:<br /><input type="text" name="vericode" style="width:150px;" size="20" id="vericode[+jot.id+]" /></label>&nbsp;
+	`:strip+]
+	
+	<div style="float:right;width: 100px;"></div>
+	<input class="butti"  tabindex="[+jot.seed:math=`?+5`+]" name="submit" type="submit" value="[+form.edit:is=`1`:then=`Сохранить изменения`:else=`Отправить вопрос`+]" />
+	[+form.edit:is=`1`:then=`
+		<input tabindex="[+jot.seed:math=`?+5`+]" name="submit" type="submit" value="Отмена" onclick="history.go(-1);return false;" />
+	`+] 
+	</fieldset>
+</form>

Diff for: assets/snippets/jot/templates/chunk.form.faq.inc.html

@@ -0,0 +1,81 @@
+<a name="jf[+jot.link.id+]"></a>
+<h2>[+form.edit:is=`1`:then=`Edit comment`:else=`Write a comment`+]</h2>
+<div class="jot-list">
+<ul>
+	<li>Required fields are marked with <b>*</b>.</li>
+</ul>
+</div>
+[+form.error:isnt=`0`:then=`
+<div class="jot-err">
+[+form.error:select=`
+&-3=You are trying to re-submit the same post. You have probably clicked the submit button more than once.
+&-2=Your comment has been rejected.
+&-1=Your comment has been saved, it will first be reviewed before it is published.
+&1=You are trying to re-submit the same post. You have probably clicked the submit button more than once.
+&2=The security code you entered was incorrect.
+&3=You can only post once each [+jot.postdelay+] seconds.
+&4=Your comment has been rejected.
+&5=[+form.errormsg:ifempty=`You didn't enter all the required fields`+]
+`+]
+</div>
+`:strip+]
+[+form.confirm:isnt=`0`:then=`
+<div class="jot-cfm">
+[+form.confirm:select=`
+&1=Your comment has been published.
+&2=Your comment has been saved, it will first be reviewed before it is published.
+&3=Comment saved.
+`+]
+</div>
+`:strip+]
+<form method="post" action="[+form.action:esc+]#jf[+jot.link.id+]" class="jot-form">
+	<fieldset>
+	<input name="JotForm" type="hidden" value="[+jot.id+]" />
+	<input name="JotNow" type="hidden" value="[+jot.seed+]" />
+	<input name="parent" type="hidden" value="[+form.field.parent+]" />
+	
+	[+form.moderation:is=`1`:then=`
+		<div class="jot-row">
+			<b>Created on:</b> [+form.field.createdon:date=`%a %B %d, %Y at %H:%M`+]<br />
+			<b>Created by:</b> [+form.field.createdby:userinfo=`username`:ifempty=`[+jot.guestname+]`+]<br />
+			<b>IP address:</b> [+form.field.secip+]<br />
+			<b>Published:</b> [+form.field.published:select=`0=No&1=Yes`+]<br />
+			[+form.field.publishedon:gt=`0`:then=`
+				<b>Published on:</b> [+form.field.publishedon:date=`%a %B %d, %Y at %H:%M`+]<br />
+				<b>Published by:</b> [+form.field.publishedby:userinfo=`username`:ifempty=` - `+]<br />
+			`+]
+			[+form.field.editedon:gt=`0`:then=`
+				<b>Edited on:</b> [+form.field.editedon:date=`%a %B %d, %Y at %H:%M`+]<br />
+				<b>Edited by:</b> [+form.field.editedby:userinfo=`username`:ifempty=` -`+]<br />
+			`+]
+		</div>
+	`:strip+]
+	
+	[+form.guest:is=`1`:then=`
+		<label for="name[+jot.id+]">Name:<br />
+		<input tabindex="[+jot.seed:math=`?+1`+]" name="name" type="text" size="40" value="[+form.field.custom.name:esc+]" id="name[+jot.id+]" />
+		</label>
+		<label for="email[+jot.id+]">Email:<br />
+		<input tabindex="[+jot.seed:math=`?+2`+]" name="email" type="text" size="40" value="[+form.field.custom.email:esc+]" id="email[+jot.id+]"/>
+		</label>
+	`:strip+]
+	
+	<label for="title[+jot.id+]">Subject:<br />
+	<input tabindex="[+jot.seed:math=`?+3`+]" name="title" type="text" size="40" value="[+form.field.title:esc+]" id="title[+jot.id+]"/>
+	</label>
+	<label for="content[+jot.id+]">Comment: *<br />
+	<textarea tabindex="[+jot.seed:math=`?+4`+]" name="content" cols="50" rows="8" id="content[+jot.id+]">[+form.field.content:esc+]</textarea>
+	</label><br />
+	
+  [+jot.captcha:is=`1`:then=`
+		<div style="width:150px;margin-top: 5px;margin-bottom: 5px;"><a href="[+jot.link.current:esc+]"><img src="[(base_url)]manager/includes/veriword.php?rand=[+jot.seed+]" width="148" height="60" alt="If you have trouble reading the code, click on the code itself to generate a new random code." style="border: 1px solid #003399" /></a></div>
+		<label for="vericode[+jot.id+]">Help prevent spam - enter security code above:<br /><input type="text" name="vericode" style="width:150px;" size="20" id="vericode[+jot.id+]" /></label>&nbsp;
+	`:strip+]
+	
+	<div style="float:right;width: 100px;"></div>
+	<input tabindex="[+jot.seed:math=`?+5`+]" name="submit" type="submit" value="[+form.edit:is=`1`:then=`Save Comment`:else=`Post Comment`+]" />
+	[+form.edit:is=`1`:then=`
+		<input tabindex="[+jot.seed:math=`?+5`+]" name="submit" type="submit" value="Cancel" onclick="history.go(-1);return false;" />
+	`+] 
+	</fieldset>
+</form>

Diff for: assets/snippets/jot/templates/chunk.form.inc.eng.html

@@ -1,30 +1,30 @@
-<a name="jf[+jot.link.id+]"></a>
-<h2>[+form.edit:is=`1`:then=`Edit comment`:else=`Write a comment`+]</h2>
+<a name="jf[+jot.link.id+]"></a>
+<h2>[+form.edit:is=`1`:then=`Правка комментария`:else=`Написать комментарий`+]</h2>
 <div class="jot-list">
 <ul>
-	<li>Required fields are marked with <b>*</b>.</li>
+	<li>Обязательные для заполнения поля помечены знаком <span style="font-weight:bold; color:#FF0000">*</span>.</li>
 </ul>
 </div>
 [+form.error:isnt=`0`:then=`
 <div class="jot-err">
 [+form.error:select=`
-&-3=You are trying to re-submit the same post. You have probably clicked the submit button more than once.
-&-2=Your comment has been rejected.
-&-1=Your comment has been saved, it will first be reviewed before it is published.
-&1=You are trying to re-submit the same post. You have probably clicked the submit button more than once.
-&2=The security code you entered was incorrect.
-&3=You can only post once each [+jot.postdelay+] seconds.
-&4=Your comment has been rejected.
-&5=[+form.errormsg:ifempty=`You didn't enter all the required fields`+]
+&-3=Вы отправляете один и тот же пост - не стоит нажимать на кнопку более 1 раза.
+&-2=Ваш комментарий отвергнут.
+&-1=Комментарий отправлен - ждет проверки модератора, после проверки будет опубликован.
+&1=Вы отправляете один и тот же пост - не стоит нажимать на кнопку более 1 раза.
+&2=Код на изображении не совпадает с тем, что вы указали.
+&3=Не торопитесь, ограничение на время повторного поста [+jot.postdelay+] секунд.
+&4=Ваш комментарий отвергнут.
+&5=[+form.errormsg:ifempty=`Необходимо заполнять поля помеченные знаком *`+]
 `+]
 </div>
 `:strip+]
 [+form.confirm:isnt=`0`:then=`
 <div class="jot-cfm">
 [+form.confirm:select=`
-&1=Your comment has been published.
-&2=Your comment has been saved, it will first be reviewed before it is published.
-&3=Comment saved.
+&1=Ваш комментарий успешно добавлен.
+&2=Комментарий отправлен - ждет проверки модератора, после проверки будет опубликован.
+&3=Комментарий сохранен.
 `+]
 </div>
 `:strip+]
@@ -36,46 +36,46 @@ <h2>[+form.edit:is=`1`:then=`Edit comment`:else=`Write a comment`+]</h2>
 
 	[+form.moderation:is=`1`:then=`
 		<div class="jot-row">
-			<b>Created on:</b> [+form.field.createdon:date=`%a %B %d, %Y at %H:%M`+]<br />
-			<b>Created by:</b> [+form.field.createdby:userinfo=`username`:ifempty=`[+jot.guestname+]`+]<br />
+			<b>Создан:</b> [+form.field.createdon:date=`%a %B %d, %Y at %H:%M`+]<br />
+			<b>Автор:</b> [+form.field.createdby:userinfo=`username`:ifempty=`[+jot.guestname+]`+]<br />
 			<b>IP address:</b> [+form.field.secip+]<br />
-			<b>Published:</b> [+form.field.published:select=`0=No&1=Yes`+]<br />
+			<b>Статус:</b> [+form.field.published:select=`0=No&1=Yes`+]<br />
 			[+form.field.publishedon:gt=`0`:then=`
-				<b>Published on:</b> [+form.field.publishedon:date=`%a %B %d, %Y at %H:%M`+]<br />
-				<b>Published by:</b> [+form.field.publishedby:userinfo=`username`:ifempty=` - `+]<br />
+				<b>Опубликован:</b> [+form.field.publishedon:date=`%a %B %d, %Y at %H:%M`+]<br />
+				<b>Опубликовал:</b> [+form.field.publishedby:userinfo=`username`:ifempty=` - `+]<br />
 			`+]
 			[+form.field.editedon:gt=`0`:then=`
-				<b>Edited on:</b> [+form.field.editedon:date=`%a %B %d, %Y at %H:%M`+]<br />
-				<b>Edited by:</b> [+form.field.editedby:userinfo=`username`:ifempty=` -`+]<br />
+				<b>Отредактирован:</b> [+form.field.editedon:date=`%a %B %d, %Y at %H:%M`+]<br />
+				<b>Отредактировал:</b> [+form.field.editedby:userinfo=`username`:ifempty=` -`+]<br />
 			`+]
 		</div>
 	`:strip+]
 
 	[+form.guest:is=`1`:then=`
-		<label for="name[+jot.id+]">Name:<br />
+		<label for="name[+jot.id+]">Имя:<br />
 		<input tabindex="[+jot.seed:math=`?+1`+]" name="name" type="text" size="40" value="[+form.field.custom.name:esc+]" id="name[+jot.id+]" />
 		</label>
 		<label for="email[+jot.id+]">Email:<br />
 		<input tabindex="[+jot.seed:math=`?+2`+]" name="email" type="text" size="40" value="[+form.field.custom.email:esc+]" id="email[+jot.id+]"/>
 		</label>
 	`:strip+]
 
-	<label for="title[+jot.id+]">Subject:<br />
+	<label for="title[+jot.id+]">Тема:<br />
 	<input tabindex="[+jot.seed:math=`?+3`+]" name="title" type="text" size="40" value="[+form.field.title:esc+]" id="title[+jot.id+]"/>
 	</label>
-	<label for="content[+jot.id+]">Comment: *<br />
+	<label for="content[+jot.id+]">Комментарий: <span style="font-weight:bold; color:#FF0000">*</span><br />
 	<textarea tabindex="[+jot.seed:math=`?+4`+]" name="content" cols="50" rows="8" id="content[+jot.id+]">[+form.field.content:esc+]</textarea>
 	</label><br />
 
   [+jot.captcha:is=`1`:then=`
-		<div style="width:150px;margin-top: 5px;margin-bottom: 5px;"><a href="[+jot.link.current:esc+]"><img src="[(base_url)]manager/includes/veriword.php?rand=[+jot.seed+]" width="148" height="60" alt="If you have trouble reading the code, click on the code itself to generate a new random code." style="border: 1px solid #003399" /></a></div>
-		<label for="vericode[+jot.id+]">Help prevent spam - enter security code above:<br /><input type="text" name="vericode" style="width:150px;" size="20" id="vericode[+jot.id+]" /></label>&nbsp;
+		<div style="width:150px;margin-top: 5px;margin-bottom: 5px;"><a href="[+jot.link.current:esc+]"><img src="[(base_url)]manager/includes/veriword.php?rand=[+jot.seed+]" width="148" height="60" alt="Если у Вас возникли проблемы с чтением кода, нажмите на картинку с кодом для нового кода." style="border: 1px solid #003399" /></a></div>
+		<label for="vericode[+jot.id+]">Для защиты от спама - введите код:<br /><input type="text" name="vericode" style="width:150px;" size="20" id="vericode[+jot.id+]" /></label>&nbsp;
 	`:strip+]
 
 	<div style="float:right;width: 100px;"></div>
-	<input tabindex="[+jot.seed:math=`?+5`+]" name="submit" type="submit" value="[+form.edit:is=`1`:then=`Save Comment`:else=`Post Comment`+]" />
+	<input tabindex="[+jot.seed:math=`?+5`+]" name="submit" type="submit" value="[+form.edit:is=`1`:then=`Сохранить изменения`:else=`Отправить комментарий`+]" />
 	[+form.edit:is=`1`:then=`
-		<input tabindex="[+jot.seed:math=`?+5`+]" name="submit" type="submit" value="Cancel" onclick="history.go(-1);return false;" />
+		<input tabindex="[+jot.seed:math=`?+5`+]" name="submit" type="submit" value="Отмена" onclick="history.go(-1);return false;" />
 	`+] 
 	</fieldset>
 </form>

Diff for: assets/snippets/jot/templates/chunk.form.inc.html

@@ -0,0 +1,47 @@
+//<?php
+/**
+ * custom Template
+ * 
+ * Newly created Resources use the template configured in plugin 
+ *
+ * @category    plugin
+ * @version     0.1
+ * @author		Dmi3yy (dmi3yy@gmail.com)
+ * @internal    @properties &customTemplates=customTemplates;text;100,101|102,103
+ * @internal    @events OnDocFormPrerender 
+ * @internal    @modx_category Manager and Admin
+ */
+ 
+/*
+ * custom Template
+ *
+ * Written By Dmi3yy - 13 Sep 2011
+ *
+ *
+ * Configuration:
+ * check the OnDocFormPrerender event
+ * add properties &customTemplates=customTemplates;text;100,101|102,103
+ * Version 0.1
+ *
+ */
+
+global $content;
+$e = &$modx->Event;
+$cusTemp=explode('|',$customTemplates);
+switch($e->name) {
+    case 'OnDocFormPrerender':        
+      
+        
+        if ($parent = $modx->getPageInfo($_REQUEST['pid'],0,'template')) {
+
+              foreach ($cusTemp as $value) {
+                  $tpl=explode(',',$value);
+                  if ($parent['template'] == $tpl[0]){ $content['template'] = $tpl[1];} 
+              }   
+                 
+        }
+     
+        break;
+    default:
+        break;
+}

Diff for: install/assets/plugins/customTemplate.tpl

@@ -0,0 +1,43 @@
+//<?php
+
+/**
+ * devStat
+ * 
+ * Logging developer info
+ *
+ * @category plugin
+ * @version 1.0
+ * @internal @properties &alert_time=Критичное время генерации;int;3 &alert_query=Критичное число запросов;int;100
+ * @internal @events OnWebPagePrerender
+ * @internal @legacy_names devStat
+ * @author Andchir <http://wdevblog.net.ru>
+ */  
+
+$e = &$modx->Event;
+
+if ($e->name == 'OnWebPagePrerender'){
+  
+  if(!isset($alert_time)) $alert_tim = 3;
+  if(!isset($alert_query)) $alert_query = 100;
+  
+  $totalTime = ($modx->getMicroTime() - $modx->tstart);
+  $queryTime = $modx->queryTime;
+  $phpTime = $totalTime - $queryTime;
+
+  $queryTime = sprintf("%2.4f сек.", $queryTime);
+  $totalTime = sprintf("%2.4f сек.", $totalTime);
+  $phpTime = sprintf("%2.4f сек.", $phpTime);
+  $source = $modx->documentGenerated == 1 ? "базы данных" : "кэша";
+  $queries = isset ($modx->executedQueries) ? $modx->executedQueries : 0;
+  
+  if($totalTime >= $alert_time || $queries >= $alert_query){
+    $page_url = 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
+    $info_mess = '<a href="'.$page_url.'" target="_blank">'.$page_url.'</a>: ';
+    $info_mess .= "<b>MySQL</b>: $queryTime, $queries запрос(ов), <b>PHP</b>: $phpTime, <b>общее время</b>: $totalTime, документ получен из <b>$source</b>";
+    $modx->logEvent(45,1,$info_mess,"devStat: $queries / $totalTime");
+  }
+
+}
+
+
+//?>

Diff for: install/assets/plugins/devStat_plugin.tpl

@@ -0,0 +1,26 @@
+//<?php
+/**
+ * phx 
+ * 
+ * (Placeholders Xtended) Adds the capability of output modifiers when using placeholders, template variables and settings tags
+ *
+ * @category    plugin
+ * @version     2.1.4
+ * @author		Armand "bS" Pondman (apondman@zerobarrier.nl)
+ * @internal    @properties &phxdebug=Log events;int;0 &phxmaxpass=Max. Passes;int;50
+ * @internal    @events OnParseDocument
+ * @internal    @modx_category Manager and Admin
+ */
+
+include_once $modx->config['rb_base_dir'] . "plugins/phx/phx.parser.class.inc.php";
+
+$e = &$modx->Event;
+
+$PHx = new PHxParser($phxdebug,$phxmaxpass);
+
+switch($e->name) {
+	case 'OnParseDocument':
+		$PHx->OnParseDocument();
+		break;
+
+}

Diff for: install/assets/plugins/phx.tpl

@@ -10,7 +10,7 @@
  * @package     modx
  * @subpackage  modx.plugins.transalias
  * @author      Olivier B. Deland, additions by Mike Schell, rfoster
- * @internal    @properties &table_name=Trans table;list;common,russian,utf8,utf8lowercase;utf8lowercase &char_restrict=Restrict alias to;list;lowercase alphanumeric,alphanumeric,legal characters;legal characters &remove_periods=Remove Periods;list;Yes,No;No &word_separator=Word Separator;list;dash,underscore,none;dash &override_tv=Override TV name;string;
+ * @internal    @properties &table_name=Trans table;list;common,russian,utf8,utf8lowercase;russian &char_restrict=Restrict alias to;list;lowercase alphanumeric,alphanumeric,legal characters;lowercase alphanumeric &remove_periods=Remove Periods;list;Yes,No;No &word_separator=Word Separator;list;dash,underscore,none;dash &override_tv=Override TV name;string;
  * @internal    @events OnStripAlias
  * @internal    @modx_category Manager and Admin
  * @internal    @installset base, sample

Diff for: install/assets/plugins/transalias.tpl

@@ -0,0 +1,40 @@
+//<?php
+/**
+ * aDate
+ * 
+ * Вывод даты с русским названием месяца
+ *
+ * @category 	snippet
+ * @version 	0.1
+ * @license 	http://www.gnu.org/copyleft/gpl.html GNU Public License (GPL)
+ * @internal	@properties 
+ * @internal	@modx_category add
+ */
+
+//пример: [[aDate? &date=`[*createdon*]` &date2=`[*pub_date*]`]]
+
+$output = "";
+$format = "%d.%m.%Y";
+if (isset($date2) && $date2>0 ) {
+    $output = strftime($format,$date2);
+}
+else{
+    $output = strftime($format,$date);
+}
+
+$date=explode(".", $output);
+switch ($date[1]){
+case 1: $m='января'; break;
+case 2: $m='февраля'; break;
+case 3: $m='марта'; break;
+case 4: $m='апреля'; break;
+case 5: $m='мая'; break;
+case 6: $m='июня'; break;
+case 7: $m='июля'; break;
+case 8: $m='августа'; break;
+case 9: $m='сентября'; break;
+case 10: $m='октября'; break;
+case 11: $m='ноября'; break;
+case 12: $m='декабря'; break;
+}
+echo $date[0].'&nbsp;'.$m.'&nbsp;'.$date[2];

Diff for: install/assets/snippets/adate.tpl

@@ -0,0 +1,83 @@
+//<?php
+/**
+ * GetField
+ * 
+ * Берем любое поле из любого документа
+ *
+ * @category 	snippet
+ * @version 	1.3
+ * @license 	http://www.gnu.org/copyleft/gpl.html GNU Public License (GPL)
+ * @internal	@properties 
+ * @internal	@modx_category add
+ */
+
+
+/*
+==================================================
+	GetField
+==================================================
+
+Returns any document field or template variable from any document or any of its parents.
+
+Author: Grzegorz Adamiak [grad]
+Version: 1.3 beta @2006-11-08 14:40:04
+License: LGPL
+MODx: 0.9.2.1+
+
+See GetField.txt for instructions and version history.
+--------------------------------------------------
+*/
+
+/* Parameters
+----------------------------------------------- */
+
+# $docid [ int ]
+# ID of the document for which to get a field content.
+# Default: current document
+
+$gfIntDocId = (isset($docid)) ? $docid : $modx->documentIdentifier;
+
+# $field [ string ]
+# Name of the field for which to get the content:
+# - any of the document object fields (http://modxcms.com/the-document-object.html)
+# - template variable
+# Default: 'pagetitle'
+
+$gfStrDocField = (isset($field)) ? trim($field) : 'pagetitle';
+
+# $parent [ 0 | 1 ]
+# If set to 1, the snippet will return value for the document parent.
+# Default: 0
+
+$gfBoolParent = (isset($parent)) ? $parent : 0;
+
+# $parentLevel [ int ]
+# Specifies how high in the document tree to search for the parent of the document:
+# - $parentLevel = 0 - returns the ultimate parent (right under site root)
+# - $parentLevel = 1 - returns the direct parent
+# Default: 0
+
+$gfIntParentLevel = (isset($parentLevel) && is_int((int) $parentLevel)) ? $parentLevel : 0;
+
+# $topid [ int ]
+# Id of the topmost document in the document tree under which to search for a parent. Used only with $parent set to 1.
+# Default: 0
+
+$gfIntTopDocId = (isset($topid) && is_int((int) $topid)) ? $topid : 0;
+
+/* Do not edit the code below!
+----------------------------------------------- */
+
+# Include logic
+include_once('assets/snippets/getfield/getfield.inc.php');
+
+# Get parent document ID
+if ($gfBoolParent)
+	$gfIntDocId = gfGetParentId($modx, $gfIntDocId, $gfIntTopDocId, $gfIntParentLevel);
+
+# Get content of the field
+$output = gfGetFieldContent($modx,$gfIntDocId,$gfStrDocField);
+
+unset($gfIntDocId, $gfStrDocField, $gfBoolParent, $gfIntParentLevel, $gfIntTopDocId);
+
+return $output;

Diff for: install/assets/snippets/getfield.tpl

@@ -0,0 +1,26 @@
+//<?php
+/**
+ * parentTitle
+ * 
+ * Берем имя родителя
+ *
+ * @category 	snippet
+ * @version 	1.3
+ * @license 	http://www.gnu.org/copyleft/gpl.html GNU Public License (GPL)
+ * @internal	@properties 
+ * @internal	@modx_category add
+ */
+
+
+/*
+[!parentTitle? &getID = `[*parent*]`!]
+*/
+
+//specify page id you want to get data for
+$getID = $getID;
+//get content field for page id
+$tvOutput = $modx->getTemplateVarOutput('pagetitle', $getID);
+$content = $tvOutput['pagetitle'];
+
+//output the data to wherever the snippet is being called
+return $content;

Diff for: install/assets/snippets/parentTitle.tpl

@@ -0,0 +1,302 @@
+//<?php
+/**
+ * sitemap
+ * 
+ * google-sitemap.xml
+ *
+ * @category 	snippet
+ * @version 	1.0.8
+ * @license 	http://www.gnu.org/copyleft/gpl.html GNU Public License (GPL)
+ * @internal	@properties 
+ * @internal	@modx_category add
+ */
+
+
+/*
+==================================================
+	sitemap
+==================================================
+
+Outputs a machine readable site map for search
+engines and robots. Supports the following
+formats:
+
+- Sitemap Protocol used by Google Sitemaps
+  (http://www.google.com/webmasters/sitemaps/)
+
+- URL list in text format
+  (e.g. Yahoo! submission)
+
+Author: Grzegorz Adamiak [grad]
+Version: 1.0.8 @ 22-AUG-2008
+License: LGPL
+MODx: 0.9.2.1, 0.9.6.1
+
+History:
+# 1.0.8
+- excludeTemplates can now also be specified as a template ID instead of template name. 
+  Useful if you change the names of your templates frequently. (ncrossland)
+  e.g. &excludeTemplates=`myTemplateName,3,4`
+# 1.0.7
+- Unpublished and deleted documents were showing up in the sitemap. Even though they could not be viewed, 
+  they were showing up as broken links to search engines. (ncrossland)
+# 1.0.6
+- Add optional parameter (excludeWeblinks) to exclude weblinks from the sitemap, since they often point to external
+  sites (which don't belong on your sitemap), or redirecting to other internal pages (which are already
+  in the sitemap). Google Webmaster Tools generates warnings for excessive redirects.	
+  Default is false - e.g. default behaviour remains unchanged. (ncrossland)
+# 1.0.5
+- Modification about non searchable documents, as suggested by forum user JayBee
+  (http://modxcms.com/forums/index.php/topic,5754.msg99895.html#msg99895)
+# 1.0.4 (By Bert Catsburg, bert@catsburg.com)
+- Added display option 'ulli'. 
+  An <ul><li> list of all published documents.
+# 1.0.3
+- Added ability to specify the XSL URL - you don't always need one and it 
+  seems to create a lot of support confusion!
+  It is now a parameter (&xsl=``) which can take either an alias or a doc ID (ncrossland)
+- Modifications suggested by forum users Grad and Picachu incorporated
+  (http://modxcms.com/forums/index.php/topic,5754.60.html)
+# 1.0.2
+- Reworked fetching of template variable value to
+  get INHERITED value.
+# 1.0.1
+- Reworked fetching of template variable value,
+  now it gets computed value instead of nominal;
+  however, still not the inherited value.
+# 1.0
+- First public release.
+
+TODO:
+- provide output for ROR
+--------------------------------------------------
+*/
+
+/* Parameters
+----------------------------------------------- */
+
+# $startid [ int ]
+# Id of the 'root' document from which the sitemap
+# starts.
+# Default: 0
+
+$startid = (isset($startid)) ? $startid : 0;
+
+# $format [ sp | txt | ror ]
+# Which format of sitemap to use:
+# - sp <- Sitemap Protocol used by Google
+# - txt <- text file with list of URLs
+# TODO - ror <- Resource Of Resources
+# Default: sp
+
+$format = (isset($format) && ($format != 'ror')) ? $format : 'sp';
+
+# $priority [ str ]
+# Name of TV which sets the relative priority of
+# the document. If there is no such TV, this
+# parameter will not be used.
+# Default: sitemap_priority
+
+$priority = (isset($priority)) ? $priority : 'sitemap_priority';
+
+# $changefreq [ str ]
+# Name of TV which sets the change frequency. If
+# there is no such TV this parameter will not be
+# used.
+# Default: sitemap_changefreq
+
+$changefreq = (isset($changefreq)) ? $changefreq : 'sitemap_changefreq';
+
+# $excludeTemplates [ str ]
+# Documents based on which templates should not be
+# included in the sitemap. Comma separated list
+# with names of templates.
+# Default: empty
+
+$excludeTemplates = (isset($excludeTemplates)) ? $excludeTemplates : array();
+
+# $excludeTV [ str ]
+# Name of TV (boolean type) which sets document
+# exclusion form sitemap. If there is no such TV
+# this parameter will not be used.
+# Default: 'sitemap_exclude'
+
+$excludeTV = (isset($excludeTV)) ? $excludeTV : 'sitemap_exclude';
+
+# $xsl [ str ] 
+# URL to the XSL style sheet
+# or
+# $xsl [ int ]
+# doc ID of the XSL style sheet
+
+$xsl = (isset($xsl)) ? $xsl : '';
+if (is_numeric($xsl)) { $xsl = $modx->makeUrl($xsl); }
+
+
+# $excludeWeblinks [ bool ]
+# Should weblinks be excluded?
+# You may not want to include links to external sites in your sitemap,
+# and Google gives warnings about multiple redirects to pages 
+# within your site.
+# Default: false
+$excludeWeblinks = (isset($excludeWeblinks)) ? $excludeWeblinks : false;
+
+
+/* End parameters
+----------------------------------------------- */
+
+# get list of documents
+# ---------------------------------------------
+$docs = getDocs($modx,$startid,$priority,$changefreq,$excludeTV);
+
+
+# filter out documents by template or TV
+# ---------------------------------------------
+// get all templates
+$select = $modx->db->select("id, templatename", $modx->getFullTableName('site_templates'));
+while ($query = $modx->db->getRow($select)) {
+	$allTemplates[$query['id']] = $query['templatename'];
+}
+
+$remainingTemplates = $allTemplates;
+
+// get templates to exclude, and remove them from the all templates list
+if (!empty ($excludeTemplates)) {
+	
+	$excludeTemplates = explode(",", $excludeTemplates);	
+	
+	// Loop through each template we want to exclude
+	foreach ($excludeTemplates as $template) {
+		$template = trim($template);
+		
+		// If it's numeric, assume it's an ID, and remove directly from the $allTemplates array
+		if (is_numeric($template) && isset($remainingTemplates[$template])) {
+			unset($remainingTemplates[$template]);
+		} else if (trim($template) && in_array($template, $remainingTemplates)) { // If it's text, and not empty, assume it's a template name
+			unset($remainingTemplates[array_search($template, $remainingTemplates)]);			
+		}
+	} // end foreach
+}
+
+$output= array();
+// filter out documents which shouldn't be included
+foreach ($docs as $doc)
+{
+	if (isset($remainingTemplates[$doc['template']]) && !$doc[$excludeTV] && $doc['published'] && $doc['template']!=0 && $doc['searchable']) {
+		if (!$excludeWeblinks || ($excludeWeblinks && $doc['type'] != 'reference')) {
+			$output[] = $doc;		
+		}
+	}
+}
+$docs = $output;
+unset ($output, $allTemplates, $excludeTemplates);
+
+
+# build sitemap in specified format
+# ---------------------------------------------
+
+switch ($format)
+{
+	// Next case added in version 1.0.4
+	case 'ulli': // UL List
+		$output .= "<ul class=\"sitemap\">\n";
+		// TODO: Sort the array on Menu Index
+		// TODO: Make a nested ul-li based on the levels in the document tree.
+		foreach ($docs as $doc)
+		{
+			$s  = "  <li class=\"sitemap\">";
+			$s .= "<a href=\"[(site_url)][~" . $doc['id'] . "~]\" class=\"sitemap\">" . $doc['pagetitle'] . "</a>";
+			$s .= "</li>\n";
+			$output .= $s;
+		} // end foreach
+		$output .= "</ul>\n";
+		break;
+		
+	case 'txt': // plain text list of URLs
+
+		foreach ($docs as $doc)
+		{
+			$url = '[(site_url)][~'.$doc['id'].'~]';
+
+			$output .= $url."\n";
+		} // end foreach
+		break;
+
+	case 'ror': // TODO
+	default: // Sitemap Protocol
+
+	
+	$output = '<?xml version="1.0" encoding="UTF-8"?>'."\n";
+	if ($xsl != '') {
+		$output .='<?xml-stylesheet type="text/xsl" href="'.$xsl.'"?>'."\n";
+	}
+	$output .='<urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">'."\n";
+	
+	
+	foreach ($docs as $doc)	{
+		$url = '[(site_url)][~'.$doc['id'].'~]';
+		$date = $doc['editedon'];
+		$date = date("Y-m-d", $date);
+		$docPriority = ($doc[$priority]) ? $doc[$priority] : 0; // false if TV doesn't exist
+		$docChangefreq = ($doc[$changefreq]) ? $doc[$changefreq] : 0; // false if TV doesn't exist
+
+		$output .= "\t".'<url>'."\n";
+		$output .= "\t\t".'<loc>'.$url.'</loc>'."\n";
+		$output .= "\t\t".'<lastmod>'.$date.'</lastmod>'."\n";
+		$output .= ($docPriority) ? ("\t\t".'<priority>'.$docPriority.'</priority>'."\n") : ''; // don't output anything if TV doesn't exist
+		$output .= ($docChangefreq) ? ("\t\t".'<changefreq>'.$docChangefreq.'</changefreq>'."\n") : ''; // don't output anything if TV doesn't exist
+		$output .= "\t".'</url>'."\n";
+	} // end foreach
+	$output .= '</urlset>';
+
+} // end switch
+
+return $output;
+
+# functions
+# ---------------------------------------------
+
+# gets (inherited) value of template variable
+function getTV($modx,$docid,$doctv)
+{
+/* apparently in 0.9.2.1 the getTemplateVarOutput function doesn't work as expected and doesn't return INHERITED value; this is probably to be fixed for next release; see http://modxcms.com/bugs/task/464
+	$output = $modx->getTemplateVarOutput($tv,$docid);
+	return $output[$tv];
+*/
+	
+	while ($pid = $modx->getDocument($docid,'parent'))
+	{
+		$tv = $modx->getTemplateVar($doctv,'*',$docid);
+		if (($tv['value'] && substr($tv['value'],0,8) != '@INHERIT') or !$tv['value']) // tv default value is overriden (including empty)
+		{
+			$output = $tv['value'];
+			break;
+		}
+		else // there is no parent with default value overriden 
+		{
+			$output = trim(substr($tv['value'],8));
+		}
+		$docid = $pid['parent']; // move up one document in document tree
+	} // end while
+	
+	return $output;
+}
+
+# gets list of published documents with properties
+function getDocs($modx,$startid,$priority,$changefreq,$excludeTV)
+{
+	// get children documents
+	$docs = $modx->getActiveChildren($startid,'menuindex','asc','id,editedon,template,published,searchable,pagetitle,type'); 
+	// add sub-children to the list
+	foreach ($docs as $key => $doc)
+	{
+		$id = $doc['id'];
+		$docs[$key][$priority] = getTV($modx,$id,$priority); // add priority property
+		$docs[$key][$changefreq] = getTV($modx,$id,$changefreq); // add changefreq property
+		$docs[$key][$excludeTV] = getTV($modx,$id,$excludeTV); // add excludeTV property
+		
+		if ($modx->getActiveChildren($id))
+			$docs = array_merge($docs, getDocs($modx,$id,$priority,$changefreq,$excludeTV));
+	} // end foreach
+	return $docs;
+}

Diff for: install/assets/snippets/sitemap.tpl

@@ -0,0 +1,98 @@
+//<?php
+/**
+ * YouTube
+ * 
+ * YouTube на сайте
+ *
+ * @category 	snippet
+ * @version 	0.1
+ * @license 	http://www.gnu.org/copyleft/gpl.html GNU Public License (GPL)
+ * @internal	@properties 
+ * @internal	@modx_category add
+ */
+
+
+//SETTINGS
+$width = isset($width)?$width:425;
+$height = isset($height)?$height:350;
+
+// YouTube API settings
+$related = isset($related)?$related:true;
+$autoplay = isset($autoplay)?$autoplay:false;
+$loop = isset($loop)?$loop:false;
+$disablekb = isset($disablekb)?$disablekb:false;
+$egm = isset($egm)?$egm:false;
+$border = isset($border)?$border:false;
+$color1 = isset($color1)?$color1:'';
+$color2 = isset($color2)?$color2:'';
+
+// Javascript
+$js = isset($js)?$js:true;
+$swfobject_url = isset($swfobject_url)?$swfobject_url:'/assets/js/swfobject/swfobject.js';
+$swfobject_express_url = isset($swfobject_url)?$swfobject_url:'/assets/js/swfobject/expressInstall.swf';
+$missing = isset($missing)?$missing:'<p>This video requires the free Flash plugin.</p>';
+
+// If a URL is supplied, work out the ID part of it
+if (isset($url) && $ytid = (getIdFromUrl(urldecode($url))) ) {
+   // $ytid is already set
+} else if (isset($id)) {
+   $ytid =  $id;
+} else {   // No URL or ID supplied
+   return;   
+}
+
+// Ensure the "related" value is appropriate for the YouTube URL
+$related_val = ($related)?'&rel=1':'&rel=0';
+$autoplay_val = ($autoplay)?'&autoplay=1':'&autoplay=0';
+$loop_val = ($loop)?'&loop=1':'&loop=0';
+$disablekb_val = ($disablekb)?'&disablekb=1':'&disablekb=0';
+$egm_val = ($egm)?'&egm=1':'&egm=0';
+$border_val = ($border)?'&border=1':'&border=0';
+$color1_val = (!empty($color1))?'&color1='.$color1:'';
+$color2_val = (!empty($color2))?'&color2='.$color2:'';
+
+// Construct the YouTube URL
+$yturl =' http://www.youtube.com/v/'.$ytid.$related_val.$autoplay_val.$loop_val.$disablekb_val.$egm_val.$border_val.$color1_val.$color2_val.'&hl=en';
+
+// HTML template, based on cross-browser recommendation from SWFobject project
+$html = '
+   <object id="'.$ytid.'" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="'.$width.'" height="'.$height.'">
+        <param name="movie" value="'.$yturl.'" />
+        <!--[if !IE]>-->
+        <object type="application/x-shockwave-flash" data="'.$yturl.'" width="'.$width.'" height="'.$height.'">
+        <!--<![endif]-->
+          '.$missing.'
+        <!--[if !IE]>-->
+        </object>
+        <!--<![endif]-->
+      </object>
+';
+
+
+// If we want to use javascript to check Flash version, etc.
+if ($js) {
+   // Register the SWFObject script
+   $modx->regClientStartupScript($swfobject_url);
+   
+   // Activate the content with JS
+   $script = '
+   <script type="text/javascript">
+    swfobject.registerObject("'.$ytid.'", "8.0.0", "'.$swfobject_express_url.'");
+   </script>
+   ';
+   $modx->regClientStartupScript($script);
+}
+
+return $html;
+
+if(!function_exists('getIdFromUrl')) {
+  function getIdFromUrl($url) {
+    $url_parts = parse_url($url);
+    parse_str($url_parts['query']);
+    if(isset($v)) {
+      return $v;    
+    } else {
+      return false;   
+    }
+  }
+}