Skip to content
This repository was archived by the owner on Mar 8, 2021. It is now read-only.

Commit 7a3f33c

Browse files
opengeekopengeek
committed
MODX Evolution 1.0.14
Merge remote-tracking branch 'origin/bugfix'
2 parents 45962c6 + deefcdc commit 7a3f33c

File tree

212 files changed

+1246
-1906
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

212 files changed

+1246
-1906
lines changed

‎assets/libs/document.class.inc.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
e-mail: [email protected]
88
99
Example of use:
10-
require_once('assets/libs/docmanager/document.class.inc.php');
10+
require_once('assets/libs/document.class.inc.php');
1111
$doc = new Document();
1212
$doc->Set('parent',$folder);
1313
$doc->Set('alias','post'.time());
@@ -207,7 +207,7 @@ function saveTVs(){
207207
$fields = $modx->db->escape($fields);
208208
if(isset($this->oldTVs[$tv])){
209209
if($this->oldTVs[$tv]==$this->tvNames[$tv]) continue;
210-
$modx->db->update($fields, $tvc, "tmplvarid='{$fields['tmplvarid']}' AND contentid='{$fields['id']}'");
210+
$modx->db->update($fields, $tvc, "tmplvarid='{$fields['tmplvarid']}' AND contentid='{$fields['contentid']}'");
211211
}
212212
else
213213
$modx->db->insert($fields, $tvc);

‎assets/libs/resourse.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,15 @@ class resourse {
6060
private $tvid = array();
6161
private $log = array();
6262
private $edit = 0;
63-
private $dafeult_field ;
63+
private $default_field ;
6464
private $table=array('"'=>'_',"'"=>'_',' '=>'_','.'=>'_',','=>'_','а'=>'a','б'=>'b','в'=>'v',
6565
'г'=>'g','д'=>'d','е'=>'e','ё'=>'e','ж'=>'zh','з'=>'z','и'=>'i','й'=>'y','к'=>'k',
6666
'л'=>'l','м'=>'m','н'=>'n','о'=>'o','п'=>'p','р'=>'r','с'=>'s','т'=>'t','у'=>'u',
6767
'ф'=>'f','х'=>'h','ц'=>'c','ч'=>'ch','ш'=>'sh','щ'=>'sch','ь'=>'','ы'=>'y','ъ'=>'',
6868
'э'=>'e','ю'=>'yu','я'=>'ya','А'=>'A','Б'=>'B','В'=>'V','Г'=>'G','Д'=>'D','Е'=>'E',
6969
'Ё'=>'E','Ж'=>'Zh','З'=>'Z','И'=>'I','Й'=>'Y','К'=>'K','Л'=>'L','М'=>'M','Н'=>'N',
7070
'О'=>'O','П'=>'P','Р'=>'R','С'=>'S','Т'=>'T','У'=>'U','Ф'=>'F','Х'=>'H','Ц'=>'C',
71-
'Ч'=>'Ch','Ш'=>'Sh','Щ'=>'Sch','Ь'=>'','Ы'=>'Y','Ъ'=>'','Э'=>'E','Ю'=>'Yu','Я'=>'Ya',
71+
'Ч'=>'Ch','Ш'=>'Sh','Щ'=>'Sch','Ь'=>'','Ы'=>'Y','Ъ'=>'','Э'=>'E','Ю'=>'Yu','Я'=>'Ya','/'=>'-',
7272
);
7373

7474
private $set;
@@ -153,13 +153,13 @@ private function makeTable(){
153153
}
154154

155155
private function Uset($key){
156-
if(!isset($this->field[$key])){
157-
$this->set[]= "{$key}=''";
158-
$this->log[] = '{$key} is empty';
156+
if(!isset($this->field[$key])){
157+
$this->set[$key]= "";
158+
$this->log[] = "{$key} is empty";
159159
} else {
160160
try{
161161
if(is_scalar($this->field[$key])){
162-
$this->set[]= "{$key}='{$this->field[$key]}'";
162+
$this->set[$key]= $this->field[$key];
163163
} else throw new Exception("{$key} is not scalar <pre>".print_r($this->field[$key],true)."</pre>");
164164
}catch(Exception $e){ die($e->getMessage()); }
165165
}
@@ -438,7 +438,7 @@ public function save($fire_events = null,$clearCache = false){
438438
if ($this->newDoc && $this->get($key) == '' && $this->get($key)!==$value){
439439
$this->set($key,$value);
440440
}
441-
$this->Uset($key);
441+
$this->Uset($key,$value);
442442
unset($fld[$key]);
443443
}
444444
if (!empty($this->set)){

‎assets/plugins/filesource/plugin.filesource.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
if(!defined('MODX_BASE_PATH')) die('What are you doing? Get out of here!');
23
/**
34
* @name FileSource
45
* @version 0.1

‎assets/plugins/forgotmanagerlogin/plugin.forgotmanagerlogin.php

-1
Original file line numberDiff line numberDiff line change
@@ -187,4 +187,3 @@ function getErrorOutput() {
187187
}
188188

189189
$modx->Event->output($output);
190-
?>

‎assets/plugins/qm/qm.inc.php

+5-11
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,7 @@ function Run() {
5959
$manager_language = $this->modx->config['manager_language'];
6060

6161
// Individual user language setting (if set)
62-
$records = $this->modx->db->select('setting_value', $this->modx->getFullTableName('user_settings'), "setting_name='manager_language' AND user='{$_SESSION['mgrInternalKey']}'");
63-
if ($record_manager_language = $this->modx->db->getValue($records)) {
64-
$manager_language = $record_manager_language;
65-
}
62+
if (isset($_SESSION['mgrUsrConfigSet']['manager_language'])) $manager_language = $_SESSION['mgrUsrConfigSet']['manager_language'];
6663

6764
// Include_once the language file
6865
if(!isset($manager_language) || !file_exists(MODX_MANAGER_PATH."includes/lang/".$manager_language.".inc.php")) {
@@ -160,10 +157,9 @@ function Run() {
160157
$imagePreview = '';
161158

162159
// Includes
163-
$manager_path = MGR_DIR.'/';
164-
include_once($manager_path.'includes/tmplvars.inc.php');
165-
include_once($manager_path.'includes/tmplvars.commands.inc.php');
166-
include_once($manager_path.'includes/tmplvars.format.inc.php');
160+
include_once(MODX_MANAGER_PATH.'includes/tmplvars.inc.php');
161+
include_once(MODX_MANAGER_PATH.'includes/tmplvars.commands.inc.php');
162+
include_once(MODX_MANAGER_PATH.'includes/tmplvars.format.inc.php');
167163

168164
// Get save status
169165
if (isset($_POST['save'])) $save = intval($_POST['save']);
@@ -341,11 +337,9 @@ function Run() {
341337
}
342338

343339
$userID = $_SESSION['mgrInternalKey'];
344-
//$docID = $this->modx->documentIdentifier;
345-
$doc = $this->modx->getDocument($docID);
346340

347341
// Add ID
348-
$controls .= '<li class="qmId">ID: '.($this->modx->documentIdentifier).'</li>';
342+
$controls .= '<li class="qmId">ID: '.$docID.'</li>';
349343

350344
// Edit button
351345

‎assets/plugins/tinymce/js/mce_init.js.inc

+1
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,5 @@ tinyMCE.init({
8080

8181
<style type="text/css">
8282
.clearlooks2_modalBlocker {background-color:#333;}
83+
.defaultSkin table.mceToolbar, .defaultSkin tr.mceFirst .mceToolbar tr td, .defaultSkin tr.mceLast .mceToolbar tr td {border:0; margin:0; padding:0!important;}
8384
</style>

‎assets/plugins/tinymce/js/tinymce.linklist.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
$mtime = microtime();
4040
$manage_path = '../../../../'.MGR_DIR.'/';
4141
include($manage_path . 'includes/config.inc.php');
42-
include($manage_path . 'includes/document.parser.class.inc.php');
42+
include(MODX_MANAGER_PATH . 'includes/document.parser.class.inc.php');
4343
$modx = new DocumentParser;
4444
$mtime = explode(" ",$mtime);
4545
$modx->tstart = $mtime[1] + $mtime[0];;

‎assets/plugins/tinymce/lang/czech.inc.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Author: Hansek, COEX ([email protected])
77
* Date: 2014/02/01
88
* Version: 3.5.10
9-
* MODX version: 0.9.5-1.0.13
9+
* MODX version: 0.9.5-1.0.14
1010
*/
1111

1212
$_lang['mce_editor_theme_title'] = 'Téma';

‎assets/plugins/tinymce/lang/english.inc.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Author: Jeff Whitfield and yama
77
* Date: 2014/02/01
88
* Version: 3.5.10
9-
* MODX version: 0.9.5-1.0.13
9+
* MODX version: 0.9.5-1.0.14
1010
*/
1111

1212
$_lang['mce_editor_theme_title'] = 'Theme';

‎assets/plugins/tinymce/lang/finnish.inc.php

+18-18
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
* Function: Finnish language file for TinyMCE
55
* Encoding: UTF-8
66
* Author: Jeff Whitfield
7-
* Date: 2014/02/01
7+
* Date: 2014/03/31
88
* Version: 3.5.10
9-
* MODX version: 0.9.5-1.0.13
9+
* MODX version: 0.9.5-1.0.14
1010
*/
1111

1212
$_lang['mce_editor_theme_title'] = 'Teema';
@@ -19,30 +19,30 @@
1919
$_lang['mce_editor_css_selectors_message'] = 'Anna tähän css-valitsimet, joita haluat käyttää editorissa. Syötä ne näin:<br />\'näyttöNimi=valitsimenNimi;näyttöNimi2=valitsimenNimi2\'<br />Jos sinulla on esim. <b>.leipateksti</b> ja <b>.otsikko</b> valitsimina css-tiedostossasi, lisää ne listaan näin:<br />\'Leipis=leipateksti;Otsikko=otsikko\'<br />Huomaa, ettei viimeisen kohdan jälkeen le puolipistettä.';
2020
$_lang['mce_settings'] = 'TinyMCE:n asetukset';
2121
$_lang['mce_theme_simple'] = 'Yksinkertaistettu';
22-
$_lang['mce_theme_full'] = 'Full';
22+
$_lang['mce_theme_full'] = 'Täysi';
2323
$_lang['mce_theme_advanced'] = 'Edistynyt';
2424
$_lang['mce_theme_editor'] = 'Sisällönmuokkaajalle';
2525
$_lang['mce_theme_custom'] = 'Kustomoitu';
26-
$_lang['mce_theme_creative'] = 'Creative';
27-
$_lang['mce_theme_logic'] = 'xhtml';
28-
$_lang['mce_theme_legacy'] = 'legacy style';
26+
$_lang['mce_theme_creative'] = 'Luova';
27+
$_lang['mce_theme_logic'] = 'XHTML';
28+
$_lang['mce_theme_legacy'] = 'Vanha tyyli';
2929
$_lang['mce_theme_global_settings'] = 'Käytä maailmanlaajuisesti';
30-
$_lang['mce_editor_skin_title'] = 'Skin';
31-
$_lang['mce_editor_skin_message'] = 'Design of toolbar. see tinymce/tiny_mce/themes/advanced/skins/<br />';
32-
$_lang['mce_editor_entermode_title'] = 'Enter Key Mode';
33-
$_lang['mce_editor_entermode_message'] = 'Operation when the enter key is pressed is set up.';
34-
$_lang['mce_entermode_opt1'] = 'Wrap &lt;p&gt;&lt;/p&gt;';
35-
$_lang['mce_entermode_opt2'] = 'Insert &lt;br /&gt;';
30+
$_lang['mce_editor_skin_title'] = 'Ulkoasu';
31+
$_lang['mce_editor_skin_message'] = 'Työkalupalkin visuaalinen tyyli. Katso tinymce/tiny_mce/themes/advanced/skins/<br />';
32+
$_lang['mce_editor_entermode_title'] = 'Enter-näppäimen toiminto';
33+
$_lang['mce_editor_entermode_message'] = 'Valitse mitä tapahtuu kun enter-näppäintä painetaan.';
34+
$_lang['mce_entermode_opt1'] = 'Ympäröi kappale-elementillä &lt;p&gt;&lt;/p&gt;';
35+
$_lang['mce_entermode_opt2'] = 'Lisää rivivaihtoelementti &lt;br /&gt;';
3636

37-
$_lang['mce_element_format_title'] = 'Element Format';
38-
$_lang['mce_element_format_message'] = 'This option enables control if elements should be in html or xhtml mode. xhtml is the default state for this option. This means that for example &lt;br /&gt; will be &lt;br&gt; if you set this option to &quot;html&quot;.';
37+
$_lang['mce_element_format_title'] = '(X)HTML-elementtien merkintätyyli';
38+
$_lang['mce_element_format_message'] = 'Tässä voit valita muotoillaanko tyhjät elementit HTML- vai XHTML-tyylisesti. XHTML on oletusvalinta. Tämä tarkoittaa että esimerkiksi &lt;br /&gt; muutetaan muotoon &lt;br&gt;, jos tämä asetus on kohdassa &quot;HTML&quot;.';
3939
$_lang['mce_schema_title'] = 'Schema';
4040
$_lang['mce_schema_message'] = 'The schema option enables you to switch between the HTML4 and HTML5 schema. This controls the valid elements and attributes that can be placed in the HTML. This value can either be the default html4 or html5.';
4141

42-
$_lang['mce_toolbar1_msg'] = 'Default: undo,redo,|,bold,forecolor,backcolor,strikethrough,formatselect,fontsizeselect, pastetext,pasteword,code,|,fullscreen,help';
43-
$_lang['mce_toolbar2_msg'] = 'Default: image,media,link,unlink,anchor,|,justifyleft,justifycenter,justifyright,|,bullist, numlist,|,blockquote,outdent,indent,|,table,hr,|,template,visualblocks,styleprops,removeformat';
42+
$_lang['mce_toolbar1_msg'] = 'Oletus: undo,redo,|,bold,forecolor,backcolor,strikethrough,formatselect,fontsizeselect, pastetext,pasteword,code,|,fullscreen,help';
43+
$_lang['mce_toolbar2_msg'] = 'Oletus: image,media,link,unlink,anchor,|,justifyleft,justifycenter,justifyright,|,bullist, numlist,|,blockquote,outdent,indent,|,table,hr,|,template,visualblocks,styleprops,removeformat';
4444

4545
$_lang['mce_tpl_title'] = 'Template Button';
4646
$_lang['mce_tpl_msg'] = 'You could define templates on chunk or ressource base for the template button in TinyMCE (won\'t be displayed by default). The content of the chunk/of the resource will be inserted at the cursor position as html code in TinyMCE. Multiple chunk names or ressource IDs have to be separated by comma.';
47-
$_lang['mce_tpl_docid'] = 'Resource IDs';
48-
$_lang['mce_tpl_chunkname'] = 'Chunk Names';
47+
$_lang['mce_tpl_docid'] = 'Sivujen IDt';
48+
$_lang['mce_tpl_chunkname'] = 'Palasten nimet';

‎assets/plugins/tinymce/lang/francais-utf8.inc.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Author: French community
77
* Date: 2014/02/01
88
* Version: 3.5.10
9-
* MODX version: 0.9.5-1.0.13
9+
* MODX version: 0.9.5-1.0.14
1010
*/
1111

1212
$_lang['mce_editor_theme_title'] = 'Thème';

‎assets/plugins/tinymce/lang/german.inc.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Author: Jeff Whitfield, Marc Hinse & Thomas Jakobi
77
* Date: 2014/02/01
88
* Version: 3.5.10
9-
* MODX version: 0.9.5-1.0.13
9+
* MODX version: 0.9.5-1.0.14
1010
*/
1111

1212
$_lang['mce_editor_theme_title'] = 'Template';

‎assets/plugins/tinymce/lang/italian.inc.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Author: luigif
77
* Date: 2014/02/01
88
* Version: 3.5.10
9-
* MODX version: 0.9.5-1.0.13
9+
* MODX version: 0.9.5-1.0.14
1010
*/
1111

1212
$_lang['mce_editor_theme_title'] = 'Tema:';

‎assets/plugins/tinymce/lang/japanese-utf8.inc.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Author: yama
77
* Date: 2014/02/01
88
* Version: 3.5.10
9-
* MODX version: 0.9.5-1.0.13
9+
* MODX version: 0.9.5-1.0.14
1010
*/
1111

1212
$_lang['mce_editor_theme_title'] = 'テーマ';

‎assets/plugins/tinymce/lang/nederlands-utf8.inc.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Author: Jeff Whitfield and Stefan van Zanden (18-07-2009 Small changes to conform language used in the manager)
77
* Date: 2014/02/01
88
* Version: 3.5.10
9-
* MODX version: 0.9.5-1.0.13
9+
* MODX version: 0.9.5-1.0.14
1010
*/
1111

1212
$_lang['mce_editor_theme_title'] = 'Thema';

‎assets/plugins/tinymce/lang/persian.inc.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Author: Jeff Whitfield and Mohsen (MotSmart ~ www.modxcms.ir)
77
* Date: 2014/02/01
88
* Version: 3.5.10
9-
* MODX version: 0.9.5-1.0.13
9+
* MODX version: 0.9.5-1.0.14
1010
*/
1111

1212
$_lang['mce_editor_theme_title'] = 'پوسته';

‎assets/plugins/tinymce/lang/portuguese-br.inc.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Author: Jeff Whitfield and João Peixoto ([email protected])
77
* Date: 2014/02/01
88
* Version: 3.5.10
9-
* MODX version: 0.9.5-1.0.13
9+
* MODX version: 0.9.5-1.0.14
1010
*/
1111

1212
$_lang['mce_editor_theme_title'] = 'Tema';

‎assets/plugins/tinymce/lang/portuguese.inc.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Author: Jeff Whitfield - translation João Peixoto ([email protected])
77
* Date: 2014/02/01
88
* Version: 3.5.10
9-
* MODX version: 0.9.5-1.0.13
9+
* MODX version: 0.9.5-1.0.14
1010
*/
1111

1212
$_lang['mce_editor_theme_title'] = 'Tema';

‎assets/plugins/tinymce/lang/russian-UTF8.inc.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Author: Jeff Whitfield and Victor Safronovich
77
* Date: 2014/02/01
88
* Version: 3.5.10
9-
* MODX version: 0.9.5-1.0.13
9+
* MODX version: 0.9.5-1.0.14
1010
*/
1111

1212
$_lang['mce_editor_theme_title'] = 'Тема WYSIWYG-редактора';

‎assets/plugins/tinymce/lang/spanish-utf8.inc.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Author: Jeff Whitfield and Luciano A. Ferrer
77
* Date: 2014/02/01
88
* Version: 3.5.10
9-
* MODX version: 0.9.5-1.0.13
9+
* MODX version: 0.9.5-1.0.14
1010
*/
1111

1212
$_lang['mce_editor_theme_title'] = 'Tema';

‎assets/plugins/tinymce/lang/svenska-utf8.inc.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Author: Jeff Whitfield
77
* Date: 2014/02/01
88
* Version: 3.5.10
9-
* MODX version: 0.9.5-1.0.13
9+
* MODX version: 0.9.5-1.0.14
1010
*/
1111

1212
$_lang['mce_editor_theme_title'] = 'Tema';

‎assets/plugins/tinymce/tiny_mce/plugins/directionality/editor_plugin_src.js

-85
This file was deleted.

0 commit comments

Comments
 (0)