Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dmi3yy
Dmi3yy committed Jul 19, 2017
2 parents d744a3a + 065836d commit 724de67
Show file tree
Hide file tree
Showing 25 changed files with 1,136 additions and 392 deletions.
38 changes: 38 additions & 0 deletions assets/docs/changelog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,44 @@
This file shows the changes in recent releases of MODX. The most current release is usually the
development release, and is only shown to give an idea of what's currently in the pipeline.

Evolution CMS 1.3.0(Jul 10, 2017)
* [GitHub:#3dda520a] - [R] update sortables list delete mootools sortables (64j)
* [GitHub:#9cafe6db] - [F] fix toggle menu (64j)
* [GitHub:#6c316c18] - [I] Update DocLister add DLmenu (dmi3yy)
* [GitHub:#fd23c498] - [I] Update FormLister to 1.7.3 (dmi3yy)
* [GitHub:#30a552fd] - [F] fix autoloader paths (Pathologic)
* [GitHub:#21ec58cf] - [F] fix show icon dragndrop (Serg)
* [GitHub:#56f57ec1] - [F] fix for OnManagerNodePrerender (dmi3yy)
* [GitHub:#aa04955b] - [F] fix issues #60 (Serg)
* [GitHub:#14503447] - [F] fix issues #62 (Serg)
* [GitHub:#c316e0d7] - [F] update tv rank (64j)
* [GitHub:#534deada] - [F] fix width logo in IE (64j)
* [GitHub:#0c3f8780] - [R] update plugins priority (64j)
* [GitHub:#aee4c3ed] - [R] format code style logs (64j)
* [GitHub:#8777bbf3] - [F] fix file managment (64j)
* [GitHub:#eaaaf777] - [R] upd actions buttons managment files (64j)
* [GitHub:#16cbb4f1] - [F] fix showChildren in tree (64j)
* [GitHub:#9258c4be] - [R] update actionbuttons (64j)
* [GitHub:#92f954fa] - [F] fixed issues #15 (64j)
* [GitHub:#328ad309] - [F] fix #12 (dmi3yy)
* [GitHub:#2bcc9874] - [F] change home ico from modx to home ) (dmi3yy)
* [GitHub:#626b416f] - [F] fix bkmanager header error (dmi3yy)
* [GitHub:#c43f140e] - [F] fix #9 (dmi3yy)
* [GitHub:#9da575f7] - [F] add favicon (64j)
* [GitHub:#2ff3f724] - [R] update loader (64j)
* [GitHub:#8df7c747] - [F] for update from older version (from security-fix) (dmi3yy)
* [GitHub:#f17a35ab] - [R] ajaxSearch 1.11.0 no use index-ajax.php for ajax (dmi3yy)
* [GitHub:#78e656e6] - [I] add updater plugin in core (dmi3yy)
* [GitHub:#8bbe38ae] - [F] Error : Undefined property (Serg)
* [GitHub:#ca775306] - [R] min php version set to 5.4 (dmi3yy)
* [GitHub:#95ea0349] - [F] update lang (dmi3yy)
* [GitHub:#e6224f43] - [С] rename modx to EVO (dmi3yy)
* [GitHub:#9e319a67] - [F] fix file path (dmi3yy)
* [GitHub:#524052e3] - [С] move new file from theme to core (dmi3yy)
* [GitHub:#1af46a1c] - [С] change logos, delete old theme, rename new theme to default (dmi3yy)
* [GitHub:#14d2a8f2] - [F] fix mysql_info (dmi3yy)


MODX Evolution 1.2.2(Jul 10, 2017)
* [GitHub:#99d1b62cd] - [F] fix properties for instal snippet,modules,plugins (dmi3yy)
* [GitHub:#e18d5d373] - [F] mm multiplefields for php 7 (dmi3yy)
Expand Down
33 changes: 22 additions & 11 deletions assets/snippets/DocLister/core/controller/onetable.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,15 @@ public function _render($tpl = '')
"dl") . '.iteration'] = $i; //[+iteration+] - Number element. Starting from zero

$date = $this->getCFGDef('dateSource', 'pub_date');
$date = isset($item[$date]) ? $item[$date] + $this->modx->config['server_offset_time'] : '';
if ($date != '' && $this->getCFGDef('dateFormat', '%d.%b.%y %H:%M') != '') {
$item[$this->getCFGDef("sysKey", "dl") . '.date'] = strftime($this->getCFGDef('dateFormat',
'%d.%b.%y %H:%M'), $date);
if (isset($item[$date])) {
$_date = is_numeric($item[$date]) && $item[$date] == (int)$item[$date] ? $item[$date] : strtotime($item[$date]);
if ($_date !== false) {
$_date = $_date + $this->modx->config['server_offset_time'];
$dateFormat = $this->getCFGDef('dateFormat', '%d.%b.%y %H:%M');
if ($dateFormat) {
$item['date'] = strftime($dateFormat, $_date);
}
}
}

$findTpl = $this->renderTPL;
Expand Down Expand Up @@ -163,18 +168,24 @@ public function getJSON($data, $fields, $array = array())
*/
$extE = $this->getExtender('e', true, true);

foreach ($data as $num => $item) {
$row = $item;
foreach ($data as $num => $row) {

switch (true) {
case ((array('1') == $fields || in_array('summary', $fields)) && $extSummary):
$row['summary'] = $this->getSummary($this->_docs[$num], $extSummary, 'introtext');
$row['summary'] = $this->getSummary($row, $extSummary, 'introtext');
//without break
case ((array('1') == $fields || in_array('date', $fields)) && $date != 'date'):
$tmp = (isset($this->_docs[$num][$date]) && $date != 'createdon' && $this->_docs[$num][$date] != 0 && $this->_docs[$num][$date] == (int)$this->_docs[$num][$date]) ? $this->_docs[$num][$date] : $this->_docs[$num]['createdon'];
$row['date'] = strftime($this->getCFGDef('dateFormat', '%d.%b.%y %H:%M'),
$tmp + $this->modx->config['server_offset_time']);
// no break
if (isset($row[$date])) {
$_date = is_numeric($row[$date]) && $row[$date] == (int)$row[$date] ? $row[$date] : strtotime($row[$date]);
if ($_date !== false) {
$_date = $_date + $this->modx->config['server_offset_time'];
$dateFormat = $this->getCFGDef('dateFormat', '%d.%b.%y %H:%M');
if ($dateFormat) {
$row['date'] = strftime($dateFormat, $_date);
}
}
}
//nobreak
}

if ($extE && $tmp = $extE->init($this, array('data' => $row))) {
Expand Down
6 changes: 3 additions & 3 deletions assets/snippets/DocLister/core/controller/shopkeeper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ public function getChildrenCount()
if (trim($where) == 'WHERE') {
$where = '';
}
$group = $this->getGroupSQL($this->getCFGDef('groupBy', 'c.id'));
$group = $this->getGroupSQL($this->getCFGDef('groupBy', ''));
$sort = $this->SortOrderSQL("c.createdon");
list($from) = $this->injectSortByTV($from, $sort);

Expand Down Expand Up @@ -251,7 +251,7 @@ protected function getDocList()


$fields = $this->getCFGDef('selectFields', 'c.*');
$group = $this->getGroupSQL($this->getCFGDef('groupBy', 'c.id'));
$group = $this->getGroupSQL($this->getCFGDef('groupBy', ''));
$sort = $this->SortOrderSQL("c.createdon");
list($tbl_site_content, $sort) = $this->injectSortByTV($tbl_site_content . ' ' . $this->_filters['join'],
$sort);
Expand Down Expand Up @@ -363,7 +363,7 @@ protected function getChildrenList()
$where = '';
}
$fields = $this->getCFGDef('selectFields', 'c.*');
$group = $this->getGroupSQL($this->getCFGDef('groupBy', 'c.id'));
$group = $this->getGroupSQL($this->getCFGDef('groupBy', ''));
if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {
$sql = $this->dbQuery("SELECT {$fields} FROM " . $from . " " . $where . " " .
$group . " " .
Expand Down
36 changes: 22 additions & 14 deletions assets/snippets/DocLister/core/controller/site_content.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,15 @@ public function _render($tpl = '')
}

if (isset($item[$date])) {
if (!$item[$date] && $date == 'pub_date' && isset($item['createdon'])) {
$date = 'createdon';
}
$_date = is_numeric($item[$date]) && $item[$date] == (int)$item[$date] ? $item[$date] : strtotime($item[$date]);
if ($_date !== false) {
$_date = $_date + $this->modx->config['server_offset_time'];
if ($this->getCFGDef('dateFormat', '%d.%b.%y %H:%M') != '') {
$item['date'] = strftime($this->getCFGDef('dateFormat', '%d.%b.%y %H:%M'), $_date);
$dateFormat = $this->getCFGDef('dateFormat', '%d.%b.%y %H:%M');
if ($dateFormat) {
$item['date'] = strftime($dateFormat, $_date);
}
}
}
Expand Down Expand Up @@ -205,7 +209,6 @@ public function getJSON($data, $fields, $array = array())
$out = array();
$fields = is_array($fields) ? $fields : explode(",", $fields);
$date = $this->getCFGDef('dateSource', 'pub_date');

/**
* @var $extSummary summary_DL_Extender
*/
Expand All @@ -221,22 +224,27 @@ public function getJSON($data, $fields, $array = array())
*/
$extE = $this->getExtender('e', true, true);

foreach ($data as $num => $item) {
$row = $item;
foreach ($data as $num => $row) {
if ((array('1') == $fields || in_array('summary', $fields)) && $extSummary) {
$row['summary'] = $this->getSummary($this->_docs[$num], $extSummary, 'introtext', 'content');
$row['summary'] = $this->getSummary($row, $extSummary, 'introtext', 'content');
}

if (array('1') == $fields || in_array('date', $fields)) {
if (isset($this->_docs[$num][$date])) {
$_date = is_numeric($this->_docs[$num][$date]) && $this->_docs[$num][$date] == (int)$this->_docs[$num][$date] ? $this->_docs[$num][$date] : strtotime($this->_docs[$num][$date]);
if (isset($row[$date])) {
if (!$row[$date] && $date == 'pub_date' && isset($row['createdon'])) {
$date = 'createdon';
}
$_date = is_numeric($row[$date]) && $row[$date] == (int)$row[$date] ? $row[$date] : strtotime($row[$date]);
if ($_date !== false) {
$_date = $_date + $this->modx->config['server_offset_time'];
if ($this->getCFGDef('dateFormat', '%d.%b.%y %H:%M') != '') {
$row['date'] = strftime($this->getCFGDef('dateFormat', '%d.%b.%y %H:%M'), $_date);
$dateFormat = $this->getCFGDef('dateFormat', '%d.%b.%y %H:%M');
if ($dateFormat) {
$row['date'] = strftime($dateFormat, $_date);
}
}
}
}

if (array('1') == $fields || in_array(array('menutitle', 'pagetitle'), $fields)) {
$row['title'] = ($row['menutitle'] == '' ? $row['pagetitle'] : $row['menutitle']);
}
Expand Down Expand Up @@ -340,11 +348,11 @@ public function getChildrenCount()
if (trim($where) == 'WHERE') {
$where = '';
}
$group = $this->getGroupSQL($this->getCFGDef('groupBy', 'c.id'));
$group = $this->getGroupSQL($this->getCFGDef('groupBy', ''));
$sort = $this->SortOrderSQL("if(c.pub_date=0,c.createdon,c.pub_date)");
list($from) = $this->injectSortByTV($from, $sort);

$q_true = $q_true ? $q_true : $group != 'GROUP BY c.id';
$q_true = $q_true ? $q_true : $group != '';

if ( $q_true ){
$rs = $this->dbQuery("SELECT count(*) FROM (SELECT count(*) FROM {$from} {$where} {$group}) as `tmp`");
Expand Down Expand Up @@ -395,7 +403,7 @@ protected function getDocList()


$fields = $this->getCFGDef('selectFields', 'c.*');
$group = $this->getGroupSQL($this->getCFGDef('groupBy', 'c.id'));
$group = $this->getGroupSQL($this->getCFGDef('groupBy', ''));
$sort = $this->SortOrderSQL("if(c.pub_date=0,c.createdon,c.pub_date)");
list($tbl_site_content, $sort) = $this->injectSortByTV($tbl_site_content . ' ' . $this->_filters['join'],
$sort);
Expand Down Expand Up @@ -520,7 +528,7 @@ protected function getChildrenList()
$where = '';
}
$fields = $this->getCFGDef('selectFields', 'c.*');
$group = $this->getGroupSQL($this->getCFGDef('groupBy', 'c.id'));
$group = $this->getGroupSQL($this->getCFGDef('groupBy', ''));

if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {
$sql = $this->dbQuery("SELECT {$fields} FROM " . $from . " " . $where . " " .
Expand Down
Loading

0 comments on commit 724de67

Please sign in to comment.