update from bugfix

.gitattributes

@@ -0,0 +1,2 @@
+.gitattributes export-ignore
+.tx export-ignore

.tx/config

@@ -0,0 +1,65 @@
+[main]
+host = https://www.transifex.com
+lang_map = bg: bulgarian, cs: czech, da: danish, de: german, es: spanish-utf8, fa: persian, fi: finnish, fr: francais-utf8, he: hebrew, it: italian, ja: japanese-utf8, nl: nederlands-utf8, no: norsk, pl: polish-utf8, pt_BR: portuguese-br-utf8, pt: portuguese, ru: russian-UTF8, sv: svenska-utf8, zh: chinese
+
+[modx-evolution.installer]
+file_filter = install/lang/<lang>.inc.php
+source_file = install/lang/english.inc.php
+source_lang = en
+type = PHP_ALT_ARRAY
+lang_map = bg: bulgarian, cs: czech, da: danish, de: german, es: spanish-utf8, fa: persian, fi: finnish-utf8, fr: francais-utf8, he: hebrew, it: italian, ja: japanese-utf8, nl: nederlands-utf8, no: norwegian, pl: polish-utf8, pt_BR: portuguese-br-utf8, pt: portuguese, ru: russian-UTF8, sv: svenska, zh: chinese
+
+[modx-evolution.countrylist]
+file_filter = manager/includes/lang/country/<lang>_country.inc.php
+source_file = manager/includes/lang/country/english_country.inc.php
+source_lang = en
+type = PHP_ALT_ARRAY
+
+[modx-evolution.manager]
+file_filter = manager/includes/lang/<lang>.inc.php
+source_file = manager/includes/lang/english.inc.php
+source_lang = en
+type = PHP_ALT_ARRAY
+
+[modx-evolution.ditto]
+file_filter = assets/snippets/ditto/lang/<lang>.inc.php
+source_file = assets/snippets/ditto/lang/english.inc.php
+source_lang = en
+type = PHP_ALT_ARRAY
+lang_map = bg: bulgarian-utf8, cs: czech, da: danish, de: german, es: spanish, fa: persian, fi: finnish, fr: francais-utf8, he: hebrew, it: italian, ja: japanese-utf8, nl: nederlands, no: norwegian, pl: polish-utf8, pt_BR: portuguese-br, pt: portuguese, ru: russian-UTF8, sv: svenska-utf8, zh: chinese
+
+[modx-evolution.eform]
+file_filter = assets/snippets/eform/lang/<lang>.inc.php
+source_file = assets/snippets/eform/lang/english.inc.php
+source_lang = en
+type = PHP_ALT_ARRAY
+lang_map = bg: bulgarian, cs: czech, da: danish, de: german, es: spanish-utf8, fa: persian, fi: finnish, fr: francais-utf8, he: hebrew, it: italian, ja: japanese-utf8, nl: nederlands-utf8, no: norwegian, pl: polish, pt_BR: portuguese-br, pt: portuguese, ru: russian-UTF8, sv: svenska-utf8, zh: chinese
+
+[modx-evolution.docmanager]
+file_filter = assets/modules/docmanager/lang/<lang>.inc.php
+source_file = assets/modules/docmanager/lang/english.inc.php
+source_lang = en
+type = PHP_ALT_ARRAY
+lang_map = bg: bulgarian, cs: czech, da: danish, de: german, es: spanish-utf8, fa: persian, fi: finnish, fr: francais-utf8, he: hebrew, it: italian, ja: japanese-utf8, nl: nederlands-utf8, no: norwegian, pl: polish-utf8, pt_BR: portuguese-br, pt: portuguese, ru: russian-UTF8, sv: svenska-utf8, zh: chinese
+
+[modx-evolution.ajaxsearch]
+file_filter = assets/snippets/ajaxSearch/lang/<lang>.inc.php
+source_file = assets/snippets/ajaxSearch/lang/english-utf8.inc.php
+source_lang = en
+type = PHP_ALT_ARRAY
+lang_map = bg: bulgarian, cs: czech, da: danish, de: german, es: spanish-utf8, fa: persian, fi: finnish, fr: francais-utf8, he: hebrew, it: italian, ja: japanese-utf8, nl: nederlands-utf8, no: norsk-utf8, pl: polish-utf8, pt_BR: portuguese-br, pt: portuguese, ru: russian-UTF8, sv: svenska-utf8, zh: chinese
+
+[modx-evolution.filesource]
+file_filter = assets/plugins/filesource/lang/<lang>.inc.php
+source_file = assets/plugins/filesource/lang/english.inc.php
+source_lang = en
+type = PHP_ALT_ARRAY
+lang_map = bg: bulgarian, cs: czech, da: danish, de: german, es: spanish-utf8, fa: persian, fi: finnish, fr: francais-utf8, he: hebrew, it: italian, ja: japanese-utf8, nl: nederlands-utf8, no: norwegian, pl: polish-utf8, pt_BR: portuguese-br, pt: portuguese, ru: russian-UTF8, sv: svenska-utf8, zh: chinese
+
+[modx-evolution.tinymce]
+file_filter = assets/plugins/tinymce/lang/<lang>.inc.php
+source_file = assets/plugins/tinymce/lang/english.inc.php
+source_lang = en
+type = PHP_ALT_ARRAY
+lang_map = bg: bulgarian, cs: czech, da: danish, de: german, es: spanish-utf8, fa: persian, fi: finnish, fr: francais-utf8, he: hebrew, it: italian, ja: japanese-utf8, nl: nederlands-utf8, no: norwegian, pl: polish-utf8, pt_BR: portuguese-br, pt: portuguese, ru: russian-UTF8, sv: svenska-utf8, zh: chinese
+

assets/.thumbs/index.html

@@ -1,2 +1,2 @@
-<h2>Un authorized access</h2>
+<h2>Unauthorized access</h2>
 You're not allowed to access file folder

assets/backup/index.html

@@ -1,2 +1,2 @@
-<h2>Un authorized access</h2>
+<h2>Unauthorized access</h2>
 You're not allowed to access file folder

assets/cache/siteManager.php

@@ -1,2 +1,2 @@
 <?php
-define("MGR_DIR", "manager");
+define('MGR_DIR', 'manager');

assets/files/index.html

@@ -1,2 +1,2 @@
-<h2>Un authorized access</h2>
+<h2>Unauthorized access</h2>
 You're not allowed to access file folder

assets/index.html

@@ -1,2 +1,2 @@
-<h2>Un authorized access</h2>
+<h2>Unauthorized access</h2>
 You're not allowed to access file folder

assets/libs/document.class.inc.php

@@ -7,7 +7,7 @@
   e-mail: ur001@mail.ru
 
   Example of use:
-	require_once('assets/libs/docmanager/document.class.inc.php');
+	require_once('assets/libs/document.class.inc.php');
 	$doc = new Document();
 	$doc->Set('parent',$folder);
 	$doc->Set('alias','post'.time());
@@ -71,21 +71,17 @@ function Document($id=0,$fields="*"){
 	function Save($clearcache=1){
 		global $modx;
 		$tablename=$modx->getFullTableName('site_content');
+		$fields = $modx->db->escape($this->fields);
 		if($this->isNew){
-			$this->fields['id']=$modx->db->insert($this->fields, $tablename);
+			$this->fields['id']=$modx->db->insert($fields, $tablename);
 			$this->isNew = false;
 		} else {
 			$id=$this->fields['id'];
-			$modx->db->update($this->fields, $tablename, "id=$id");
+			$modx->db->update($fields, $tablename, "id='{$id}'");
 		}
 		if(is_array($this->tvs)) $this->saveTVs();
     if ($clearcache == 1) {
-      $modx->clearCache();
-      include_once (MODX_MANAGER_PATH . '/processors/cache_sync.class.processor.php');
-      $sync = new synccache();
-      $sync->setCachepath(MODX_BASE_PATH . "assets/cache/");
-      $sync->setReport(false);
-      $sync->emptyCache();
+      $modx->clearCache('full');
     }
 	}
 
@@ -154,8 +150,7 @@ function SetTemplate($tpl){
 		global $modx;
 		// Retrieve id of template if name is given
 		if(!is_numeric($tpl)) {
-			$tablename=$modx->getFullTableName('site_templates');
-			$tpl = $modx->db->getValue("SELECT id FROM $tablename WHERE templatename='$tpl' LIMIT 1");
+			$tpl = $modx->db->getValue($modx->db->select('id', $modx->getFullTableName('site_templates'), "templatename='{$tpl}'", '', 1));
 			if(empty($tpl)) return false;
 		}
 
@@ -170,8 +165,8 @@ function Delete(){
 		if($this->isNew) return;
 		global $modx;
 		$id=$this->fields['id'];
-		$modx->db->delete($modx->getFullTableName('site_content'),"id=$id");
-		$modx->db->delete($modx->getFullTableName('site_tmplvar_contentvalues'),"contentid=$id");
+		$modx->db->delete($modx->getFullTableName('site_content'),"id='{$id}'");
+		$modx->db->delete($modx->getFullTableName('site_tmplvar_contentvalues'),"contentid='{$id}'");
 		$this->isNew=true;
 	}
 
@@ -202,17 +197,20 @@ function saveTVs(){
 			$this->oldTVs = array();
 
 		$tvc = $modx->getFullTableName('site_tmplvar_contentvalues');
-		$id=$this->fields['id'];
 		foreach($this->tvs as $tv=>$value)
 		if(isset($this->tvNames[$tv])){
-			$tmplvarid=$this->tvNames[$tv];		
+			$fields = array(
+				'tmplvarid' => $this->tvNames[$tv],
+				'contentid' => $this->fields['id'],
+				'value'     => $value,
+				);
+			$fields = $modx->db->escape($fields);
 			if(isset($this->oldTVs[$tv])){
 				if($this->oldTVs[$tv]==$this->tvNames[$tv]) continue;
-				$sql="UPDATE $tvc SET value='$value' WHERE tmplvarid=$tmplvarid AND contentid=$id";
+				$modx->db->update($fields, $tvc, "tmplvarid='{$fields['tmplvarid']}' AND contentid='{$fields['contentid']}'");
 			}
 			else
-				$sql="INSERT INTO $tvc (tmplvarid,value,contentid) VALUES ($tmplvarid,'$value',$id)";
-			$modx->db->query($sql);
+				$modx->db->insert($fields, $tvc);
 		}
 	}
 
@@ -227,12 +225,13 @@ function fillOldTVValues(){
     }
 		$tvc = $modx->getFullTableName('site_tmplvar_contentvalues');
 		$tvs = $modx->getFullTableName('site_tmplvars');
-		$sql = 'SeLECT tvs.name as name, tvc.value as value '.
-		       "FROM $tvc tvc INNER JOIN $tvs tvs ".
-			   'ON tvs.id=tvc.tmplvarid WHERE tvc.contentid ='.$this->fields['id'];
-		$result = $modx->db->query($sql);
+		$result = $modx->db->select(
+			'tvs.name as name, tvc.value as value',
+			$modx->getFullTableName('site_tmplvar_contentvalues')." tvc
+				INNER JOIN ".$modx->getFullTableName('site_tmplvars')." tvs  ON tvs.id=tvc.tmplvarid WHERE tvc.contentid =".$this->fields['id'].""
+			);
 		$TVs = array();
-		while ($row = mysql_fetch_assoc($result)) $TVs[$row['name']] = $row['value'];
+		while ($row = $modx->db->getRow($result)) $TVs[$row['name']] = $row['value'];
 		return $TVs;
 	}
 
@@ -243,7 +242,7 @@ function fillTVNames(){
 		global $modx;
 		$this->tvNames = array();
 		$result = $modx->db->select('id, name', $modx->getFullTableName('site_tmplvars'));
-		while ($row = mysql_fetch_assoc($result)) $this->tvNames[$row['name']] = $row['id'];
+		while ($row = $modx->db->getRow($result)) $this->tvNames[$row['name']] = $row['id'];
 	}
 
   function setAlias ($alias = '') {

assets/libs/resourse.php

@@ -60,15 +60,15 @@ class resourse {
 	private $tvid = array();
 	private $log = array();
 	private $edit = 0;
-	private $dafeult_field ;
+	private $default_field ;
 	private $table=array('"'=>'_',"'"=>'_',' '=>'_','.'=>'_',','=>'_','а'=>'a','б'=>'b','в'=>'v',
 		'г'=>'g','д'=>'d','е'=>'e','ё'=>'e','ж'=>'zh','з'=>'z','и'=>'i','й'=>'y','к'=>'k',
 		'л'=>'l','м'=>'m','н'=>'n','о'=>'o','п'=>'p','р'=>'r','с'=>'s','т'=>'t','у'=>'u',
 		'ф'=>'f','х'=>'h','ц'=>'c','ч'=>'ch','ш'=>'sh','щ'=>'sch','ь'=>'','ы'=>'y','ъ'=>'',
 		'э'=>'e','ю'=>'yu','я'=>'ya','А'=>'A','Б'=>'B','В'=>'V','Г'=>'G','Д'=>'D','Е'=>'E',
 		'Ё'=>'E','Ж'=>'Zh','З'=>'Z','И'=>'I','Й'=>'Y','К'=>'K','Л'=>'L','М'=>'M','Н'=>'N',
 		'О'=>'O','П'=>'P','Р'=>'R','С'=>'S','Т'=>'T','У'=>'U','Ф'=>'F','Х'=>'H','Ц'=>'C',
-		'Ч'=>'Ch','Ш'=>'Sh','Щ'=>'Sch','Ь'=>'','Ы'=>'Y','Ъ'=>'','Э'=>'E','Ю'=>'Yu','Я'=>'Ya',
+		'Ч'=>'Ch','Ш'=>'Sh','Щ'=>'Sch','Ь'=>'','Ы'=>'Y','Ъ'=>'','Э'=>'E','Ю'=>'Yu','Я'=>'Ya','/'=>'-',
 	);
 
 	private $set;	
@@ -153,13 +153,13 @@ private function makeTable(){
 	}
 
 	private function Uset($key){
-		if(!isset($this->field[$key])){ 
-			$this->set[]= "{$key}=''";
-			$this->log[] =  '{$key} is empty';
+		if(!isset($this->field[$key])){
+			$this->set[$key]= "";
+			$this->log[] =  "{$key} is empty";
 		} else {
 			try{
 				if(is_scalar($this->field[$key])){
-					$this->set[]= "{$key}='{$this->field[$key]}'";
+					$this->set[$key]= $this->field[$key];
 				} else throw new Exception("{$key} is not scalar <pre>".print_r($this->field[$key],true)."</pre>");
 			}catch(Exception $e){ die($e->getMessage()); }
 		}
@@ -175,12 +175,7 @@ private function invokeEvent($name,$data=array(),$flag=false){
 	}
 
 	public function clearCache($fire_events = null){
-		$this->modx->clearCache();
-		include_once (MODX_MANAGER_PATH . '/processors/cache_sync.class.processor.php');
-		$sync = new synccache();
-		$sync->setCachepath(MODX_BASE_PATH . "assets/cache/");
-		$sync->setReport(false);
-		$sync->emptyCache();
+		$this->modx->clearCache('full');
 		$this->invokeEvent('OnSiteRefresh',array(),$fire_events);
 	}
 
@@ -213,9 +208,8 @@ private function setTemplate($tpl) {
 		if(!is_numeric($tpl) || $tpl != (int) $tpl) {
 			try{
 				if(is_scalar($tpl)){
-					$sql = "SELECT id FROM {$this->_table['site_templates']} WHERE templatename = '{$tpl}'";
-					$rs = $this->query($sql);
-					if(!$rs || $this->modx->db->getRecordCount($rs) <= 0) throw new Exception("Template {$tpl} is not exists");
+					$rs = $this->modx->db->select('id', $this->_table['site_templates'], "templatename = '{$tpl}'");
+					if($this->modx->db->getRecordCount($rs) <= 0) throw new Exception("Template {$tpl} is not exists");
 					$tpl = $this->modx->db->getValue($rs);
 				} else throw new Exception("Invalid template name: ".print_r($tpl,1));
 			}catch(Exception $e){
@@ -243,13 +237,9 @@ private function getAlias(){
 		return $this->checkAlias($alias);
 	}
 
-	private function query($SQL){
-		return $this->modx->db->query($SQL);
-	}
-
 	public function get_TV(){
-		$result = $this->query('SELECT id,name FROM '.$this->_table['site_tmplvars']);
-		while($row = $this->modx->db->GetRow($result)) {
+		$result = $this->modx->db->select('id,name', $this->_table['site_tmplvars']);
+		while($row = $this->modx->db->getRow($result)) {
 			$this->tv[$row['name']] = $row['id'];
 			$this->tvid[$row['id']] = $row['name'];
 		}
@@ -263,10 +253,10 @@ public function fromArray($data){
 	public function edit($id){
 		if(!$this->flag) $this->document($id);
 
-		$result = $this->query("SELECT * from {$this->_table['site_content']} where id=".(int)$id);
+		$result = $this->modx->db->select('*', $this->_table['site_content'], "id=".(int)$id);
 		$this->fromArray($this->modx->db->getRow($result));
 
-		$result = $this->query("SELECT * from {$this->_table['site_tmplvar_contentvalues']} where contentid=".(int)$id);
+		$result = $this->modx->db->select('*', $this->_table['site_tmplvar_contentvalues'], "contentid=".(int)$id);
 		while ($row = $this->modx->db->getRow($result)){
 			$this->set($this->tvid[$row['tmplvarid']], $row['value']);
 		}
@@ -282,7 +272,7 @@ private function systemID(){
 			(int)$this->modx->config['unauthorized_page'],
 			(int)$this->modx->config['site_unavailable_page']
 		);
-		$data = $this->query("SELECT DISTINCT setting_value FROM {$this->_table['web_user_settings']} WHERE setting_name='login_home' AND setting_value!=''");
+		$data = $this->modx->db->select('DISTINCT setting_value', $this->_table['web_user_settings'], "setting_name='login_home' AND setting_value!=''");
 		$data = $this->modx->db->makeArray($data);
 		foreach($data as $item){
 			$ignore[]=(int)$item['setting_value'];
@@ -302,8 +292,8 @@ public function delete($ids,$fire_events = null){
 				),$fire_events);
 
 				$id = $this->sanitarIn($_ids);
-				$this->query("DELETE from {$this->_table['site_content']} where id IN ({$id})");
-				$this->query("DELETE from {$this->_table['site_tmplvar_contentvalues']} where contentid IN ({$id})");
+				$this->modx->db->delete($this->_table['site_content'], "id IN ({$id})");
+				$this->modx->db->delete($this->_table['site_tmplvar_contentvalues'], "contentid IN ({$id})");
 
 				$this->invokeEvent('OnEmptyTrash',array(
 					"ids"=>$_ids
@@ -349,10 +339,7 @@ final protected function sanitarIn($data,$sep=','){
 		if(!is_array($data)){
 			$data=explode($sep,$data);
 		}
-		$out=array();
-		foreach($data as $item){
-			$out[]=$this->modx->db->escape($item);
-		}
+		$out = $this->modx->db->escape($data);
 		$out="'".implode("','",$out)."'";
 		return $out;
 	}
@@ -410,9 +397,9 @@ private function checkAlias($alias){
 			$flag = false;
 			$_alias = $this->modx->db->escape($alias);
 			if(!$this->modx->config['allow_duplicate_alias'] || ($this->modx->config['allow_duplicate_alias'] && $this->modx->conifg['use_alias_path'])){
-				$flag = $this->modx->db->getValue($this->query("SELECT id FROM {$this->_table['site_content']} WHERE alias='{$_alias}' AND parent={$this->get('parent')} LIMIT 1"));
+				$flag = $this->modx->db->getValue($this->modx->db->select('id', $this->_table['site_content'], "alias='{$_alias}' AND parent={$this->get('parent')}", '', 1));
 			} else {
-				$flag = $this->modx->db->getValue($this->query("SELECT id FROM {$this->_table['site_content']} WHERE alias='{$_alias}' LIMIT 1"));
+				$flag = $this->modx->db->getValue($this->modx->db->select('id', $this->_table['site_content'], "alias='{$_alias}'", '',  1));
 			}
 			if(($flag && $this->newDoc) || (!$this->newDoc && $flag && $this->id != $flag)){
 				$suffix = substr($alias, -2);
@@ -451,31 +438,34 @@ public function save($fire_events = null,$clearCache = false){
 			if ($this->newDoc && $this->get($key) == '' && $this->get($key)!==$value){
 				$this->set($key,$value);
 			}
-			$this->Uset($key);
+			$this->Uset($key,$value);
 			unset($fld[$key]);
 		}
 		if (!empty($this->set)){
 			if($this->newDoc){
-				$SQL = "INSERT into {$this->_table['site_content']} SET ".implode(', ', $this->set);
+				$this->modx->db->insert($this->set, $this->_table['site_content']);
 			}else{
-				$SQL = "UPDATE {$this->_table['site_content']} SET ".implode(', ', $this->set)." WHERE id = ".$this->id;
+				$this->modx->db->update($this->set, $this->_table['site_content'], "id = '{$this->id}'");
 			}
-			$this->query($SQL);
 		}
 
 		if($this->newDoc) $this->id = $this->modx->db->getInsertId();
 
 		foreach($fld as $key=>$value){
 			if ($value=='') continue;
  			if ($this->tv[$key]!=''){
-				$rc = $this->query("SELECT value FROM {$this->_table['site_tmplvar_contentvalues']} WHERE `contentid` = '{$this->id}' AND `tmplvarid` = '{$this->tv[$key]}';");
-				$row = mysql_fetch_assoc($rc);
-				if (is_array($row)) {
-					if ($row[0] != $value) {
-						$result = $this->query("UPDATE {$this->_table['site_tmplvar_contentvalues']} SET `value` = '{$value}' WHERE `contentid` = '{$this->id}' AND `tmplvarid` = '{$this->tv[$key]}';");
+				$fields = array(
+					'tmplvarid' => $this->tv[$key],
+					'contentid' => $this->id,
+					'value'     => $this->modx->db->escape($value),
+					);
+				$rc = $this->modx->db->select('value', $this->_table['site_tmplvar_contentvalues'], "contentid = '{$fields['contentid']}' AND tmplvarid = '{$fields['tmplvarid']}'");
+				if ($row = $this->modx->db->getRow($rs)) {
+					if ($row['value'] != $value) {
+						$this->modx->db->update($fields, $this->_table['site_tmplvar_contentvalues'], "contentid = '{$fields['contentid']}' AND tmplvarid = '{$fields['tmplvarid']}'");
 				    }
 				}else{	
-					$result = $this->query("INSERT into {$this->_table['site_tmplvar_contentvalues']} SET `contentid` = {$this->id},`tmplvarid` = {$this->tv[$key]},`value` = '{$value}';");
+					$this->modx->db->insert($fields, $this->_table['site_tmplvar_contentvalues']);
 				}
 			}
 		}