evolution-cms /
evolution
@@ -1,20 +1,20 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
| 4 | 4 | } |
| 5 | -if(!$modx->hasPermission('edit_document')) { |
|
| 5 | +if (!$modx->hasPermission('edit_document')) { |
|
| 6 | 6 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
| 7 | 7 | } |
| 8 | 8 | |
| 9 | -$newParentID = isset($_REQUEST['new_parent']) ? (int)$_REQUEST['new_parent'] : 0; |
|
| 10 | -$documentID = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0; |
|
| 9 | +$newParentID = isset($_REQUEST['new_parent']) ? (int) $_REQUEST['new_parent'] : 0; |
|
| 10 | +$documentID = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0; |
|
| 11 | 11 | |
| 12 | 12 | // ok, two things to check. |
| 13 | 13 | // first, document cannot be moved to itself |
| 14 | 14 | // second, new parent must be a folder. If not, set it to folder. |
| 15 | -if($documentID==$newParentID) $modx->webAlertAndQuit($_lang["error_movedocument1"]); |
|
| 16 | -if($documentID <= 0) $modx->webAlertAndQuit($_lang["error_movedocument2"]); |
|
| 17 | -if($newParentID < 0) $modx->webAlertAndQuit($_lang["error_movedocument2"]); |
|
| 15 | +if ($documentID == $newParentID) $modx->webAlertAndQuit($_lang["error_movedocument1"]); |
|
| 16 | +if ($documentID <= 0) $modx->webAlertAndQuit($_lang["error_movedocument2"]); |
|
| 17 | +if ($newParentID < 0) $modx->webAlertAndQuit($_lang["error_movedocument2"]); |
|
| 18 | 18 | |
| 19 | 19 | $parents = $modx->getParentIds($newParentID); |
| 20 | 20 | if (in_array($documentID, $parents)) $modx->webAlertAndQuit($_lang["error_movedocument2"]); |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | |
| 27 | 27 | if ($use_udperms == 1) { |
| 28 | 28 | if ($oldparent != $newParentID) { |
| 29 | - include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php"; |
|
| 29 | + include_once MODX_MANAGER_PATH."processors/user_documents_permissions.class.php"; |
|
| 30 | 30 | $udperms = new udperms(); |
| 31 | 31 | $udperms->user = $modx->getLoginUserID(); |
| 32 | 32 | $udperms->document = $newParentID; |
@@ -42,28 +42,28 @@ discard block |
||
| 42 | 42 | * @param int $currDocID |
| 43 | 43 | * @return array |
| 44 | 44 | */ |
| 45 | -function allChildren($currDocID) { |
|
| 45 | +function allChildren($currDocID){ |
|
| 46 | 46 | $modx = evolutionCMS(); |
| 47 | - $children= array(); |
|
| 47 | + $children = array(); |
|
| 48 | 48 | $currDocID = $modx->db->escape($currDocID); |
| 49 | 49 | $rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent = '{$currDocID}'"); |
| 50 | - while ($child= $modx->db->getRow($rs)) { |
|
| 51 | - $children[]= $child['id']; |
|
| 52 | - $children= array_merge($children, allChildren($child['id'])); |
|
| 50 | + while ($child = $modx->db->getRow($rs)) { |
|
| 51 | + $children[] = $child['id']; |
|
| 52 | + $children = array_merge($children, allChildren($child['id'])); |
|
| 53 | 53 | } |
| 54 | 54 | return $children; |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | -$evtOut = $modx->invokeEvent("onBeforeMoveDocument", array ( |
|
| 57 | +$evtOut = $modx->invokeEvent("onBeforeMoveDocument", array( |
|
| 58 | 58 | "id_document" => $documentID, |
| 59 | 59 | "old_parent" => $oldparent, |
| 60 | 60 | "new_parent" => $newParentID |
| 61 | 61 | )); |
| 62 | -if (is_array($evtOut) && count($evtOut) > 0){ |
|
| 62 | +if (is_array($evtOut) && count($evtOut) > 0) { |
|
| 63 | 63 | $newParent = array_pop($evtOut); |
| 64 | - if($newParent == $oldparent) { |
|
| 64 | + if ($newParent == $oldparent) { |
|
| 65 | 65 | $modx->webAlertAndQuit($_lang["error_movedocument2"]); |
| 66 | - }else{ |
|
| 66 | + } else { |
|
| 67 | 67 | $newParentID = $newParent; |
| 68 | 68 | } |
| 69 | 69 | } |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | $rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('site_content'), "parent='{$oldparent}'"); |
| 85 | 85 | $limit = $modx->db->getValue($rs); |
| 86 | 86 | |
| 87 | - if(!$limit>0) { |
|
| 87 | + if (!$limit > 0) { |
|
| 88 | 88 | $modx->db->update(array( |
| 89 | 89 | 'isfolder' => 0, |
| 90 | 90 | ), $modx->getFullTableName('site_content'), "id='{$oldparent}'"); |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | $pagetitle = $modx->db->getValue($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "id='{$documentID}'")); |
| 94 | 94 | $_SESSION['itemname'] = $pagetitle; |
| 95 | 95 | |
| 96 | - $modx->invokeEvent("onAfterMoveDocument", array ( |
|
| 96 | + $modx->invokeEvent("onAfterMoveDocument", array( |
|
| 97 | 97 | "id_document" => $documentID, |
| 98 | 98 | "old_parent" => $oldparent, |
| 99 | 99 | "new_parent" => $newParentID |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | // empty cache & sync site |
| 103 | 103 | $modx->clearCache('full'); |
| 104 | 104 | |
| 105 | - $header="Location: index.php?a=3&id={$documentID}&r=9"; |
|
| 105 | + $header = "Location: index.php?a=3&id={$documentID}&r=9"; |
|
| 106 | 106 | header($header); |
| 107 | 107 | } else { |
| 108 | 108 | $modx->webAlertAndQuit("You cannot move a document to a child document!"); |
@@ -1,27 +1,27 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
| 4 | 4 | } |
| 5 | -if(!$modx->hasPermission('new_document') || !$modx->hasPermission('save_document')) { |
|
| 5 | +if (!$modx->hasPermission('new_document') || !$modx->hasPermission('save_document')) { |
|
| 6 | 6 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
| 7 | 7 | } |
| 8 | 8 | |
| 9 | -$id = isset($_GET['id'])? (int)$_GET['id'] : 0; |
|
| 10 | -if($id==0) { |
|
| 9 | +$id = isset($_GET['id']) ? (int) $_GET['id'] : 0; |
|
| 10 | +if ($id == 0) { |
|
| 11 | 11 | $modx->webAlertAndQuit($_lang["error_no_id"]); |
| 12 | 12 | } |
| 13 | 13 | |
| 14 | 14 | $children = array(); |
| 15 | 15 | |
| 16 | 16 | // check permissions on the document |
| 17 | -include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php"; |
|
| 17 | +include_once MODX_MANAGER_PATH."processors/user_documents_permissions.class.php"; |
|
| 18 | 18 | $udperms = new udperms(); |
| 19 | 19 | $udperms->user = $modx->getLoginUserID(); |
| 20 | 20 | $udperms->document = $id; |
| 21 | 21 | $udperms->role = $_SESSION['mgrRole']; |
| 22 | 22 | $udperms->duplicateDoc = true; |
| 23 | 23 | |
| 24 | -if(!$udperms->checkPermissions()) { |
|
| 24 | +if (!$udperms->checkPermissions()) { |
|
| 25 | 25 | $modx->webAlertAndQuit($_lang["access_permission_denied"]); |
| 26 | 26 | } |
| 27 | 27 | |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | $_SESSION['itemname'] = $name; |
| 34 | 34 | |
| 35 | 35 | // finish cloning - redirect |
| 36 | -$header="Location: index.php?r=1&a=3&id=$id"; |
|
| 36 | +$header = "Location: index.php?r=1&a=3&id=$id"; |
|
| 37 | 37 | header($header); |
| 38 | 38 | |
| 39 | 39 | /** |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | * @param int $_toplevel |
| 43 | 43 | * @return int |
| 44 | 44 | */ |
| 45 | -function duplicateDocument($docid, $parent=null, $_toplevel=0) { |
|
| 45 | +function duplicateDocument($docid, $parent = null, $_toplevel = 0){ |
|
| 46 | 46 | $modx = evolutionCMS(); global $_lang; |
| 47 | 47 | |
| 48 | 48 | // invoke OnBeforeDocDuplicate event |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | $content = $modx->db->getRow($rs); |
| 64 | 64 | |
| 65 | 65 | // Handle incremental ID |
| 66 | - switch($modx->config['docid_incrmnt_method']) |
|
| 66 | + switch ($modx->config['docid_incrmnt_method']) |
|
| 67 | 67 | { |
| 68 | 68 | case '1': |
| 69 | 69 | $from = "{$tblsc} AS T0 LEFT JOIN {$tblsc} AS T1 ON T0.id + 1 = T1.id"; |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | $content['id'] = $modx->db->getValue($rs); |
| 72 | 72 | break; |
| 73 | 73 | case '2': |
| 74 | - $rs = $modx->db->select('MAX(id)+1',$tblsc); |
|
| 74 | + $rs = $modx->db->select('MAX(id)+1', $tblsc); |
|
| 75 | 75 | $content['id'] = $modx->db->getValue($rs); |
| 76 | 76 | break; |
| 77 | 77 | |
@@ -85,12 +85,12 @@ discard block |
||
| 85 | 85 | $pagetitle = $modx->db->getValue($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "id='{$docid}'")); |
| 86 | 86 | $pagetitle = $modx->db->escape($pagetitle); |
| 87 | 87 | $count = $modx->db->getRecordCount($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "pagetitle LIKE '{$pagetitle} Duplicate%'")); |
| 88 | - if($count>=1) $count = ' '.($count+1); |
|
| 88 | + if ($count >= 1) $count = ' '.($count + 1); |
|
| 89 | 89 | else $count = ''; |
| 90 | 90 | |
| 91 | 91 | $content['pagetitle'] = $_lang['duplicated_el_suffix'].$count.' '.$content['pagetitle']; |
| 92 | 92 | $content['alias'] = null; |
| 93 | - } elseif($modx->config['friendly_urls'] == 0 || $modx->config['allow_duplicate_alias'] == 0) { |
|
| 93 | + } elseif ($modx->config['friendly_urls'] == 0 || $modx->config['allow_duplicate_alias'] == 0) { |
|
| 94 | 94 | $content['alias'] = null; |
| 95 | 95 | } |
| 96 | 96 | |
@@ -153,8 +153,8 @@ discard block |
||
| 153 | 153 | |
| 154 | 154 | $tbltvc = $modx->getFullTableName('site_tmplvar_contentvalues'); |
| 155 | 155 | |
| 156 | - $newid = (int)$newid; |
|
| 157 | - $oldid = (int)$oldid; |
|
| 156 | + $newid = (int) $newid; |
|
| 157 | + $oldid = (int) $oldid; |
|
| 158 | 158 | |
| 159 | 159 | $modx->db->insert( |
| 160 | 160 | array('contentid'=>'', 'tmplvarid'=>'', 'value'=>''), $tbltvc, // Insert into |
@@ -173,8 +173,8 @@ discard block |
||
| 173 | 173 | |
| 174 | 174 | $tbldg = $modx->getFullTableName('document_groups'); |
| 175 | 175 | |
| 176 | - $newid = (int)$newid; |
|
| 177 | - $oldid = (int)$oldid; |
|
| 176 | + $newid = (int) $newid; |
|
| 177 | + $oldid = (int) $oldid; |
|
| 178 | 178 | |
| 179 | 179 | $modx->db->insert( |
| 180 | 180 | array('document'=>'', 'document_group'=>''), $tbldg, // Insert into |
@@ -4,14 +4,14 @@ discard block |
||
| 4 | 4 | $site_sessionname = genEvoSessionName(); // For legacy extras not using startCMSSession |
| 5 | 5 | |
| 6 | 6 | |
| 7 | -if( ! function_exists('evolutionCMS')) {
|
|
| 7 | +if (!function_exists('evolutionCMS')) {
|
|
| 8 | 8 | /** |
| 9 | 9 | * @return DocumentParser |
| 10 | 10 | */ |
| 11 | 11 | function evolutionCMS() |
| 12 | 12 | {
|
| 13 | - if( ! defined('MODX_CLASS')) {
|
|
| 14 | - if( ! class_exists('DocumentParser')) {
|
|
| 13 | + if (!defined('MODX_CLASS')) {
|
|
| 14 | + if (!class_exists('DocumentParser')) {
|
|
| 15 | 15 | throw new RuntimeException('MODX_CLASS not defined and DocumentParser class not exists');
|
| 16 | 16 | } |
| 17 | 17 | define('MODX_CLASS', 'DocumentParser');
|
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | $_ = crc32(__FILE__); |
| 30 | 30 | $_ = sprintf('%u', $_);
|
| 31 | 31 | |
| 32 | - return 'evo' . base_convert($_, 10, 36); |
|
| 32 | + return 'evo'.base_convert($_, 10, 36); |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | /** |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | function startCMSSession() |
| 39 | 39 | {
|
| 40 | 40 | global $site_sessionname, $https_port, $session_cookie_path, $session_cookie_domain; |
| 41 | - if(MODX_CLI) return; |
|
| 41 | + if (MODX_CLI) return; |
|
| 42 | 42 | |
| 43 | 43 | session_name($site_sessionname); |
| 44 | 44 | removeInvalidCmsSessionIds($site_sessionname); |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | session_start(); |
| 51 | 51 | $key = "modx.mgr.session.cookie.lifetime"; |
| 52 | 52 | if (isset($_SESSION[$key]) && is_numeric($_SESSION[$key])) {
|
| 53 | - $cookieLifetime = (int)$_SESSION[$key]; |
|
| 53 | + $cookieLifetime = (int) $_SESSION[$key]; |
|
| 54 | 54 | if ($cookieLifetime) {
|
| 55 | 55 | $cookieExpiration = $_SERVER['REQUEST_TIME'] + $cookieLifetime; |
| 56 | 56 | } |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | */ |
| 80 | 80 | function removeInvalidCmsSessionIds($session_name) |
| 81 | 81 | {
|
| 82 | - if(MODX_CLI) return; |
|
| 82 | + if (MODX_CLI) return; |
|
| 83 | 83 | // session ids is invalid iff it is empty string |
| 84 | 84 | // storage priorioty can see in PHP source ext/session/session.c |
| 85 | 85 | removeInvalidCmsSessionFromStorage($_COOKIE, $session_name); |
@@ -1,8 +1,8 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | // Determine upgradeability |
| 3 | 3 | $upgradeable = 0; |
| 4 | -if (is_file($base_path . MGR_DIR . '/includes/config.inc.php')) { // Include the file so we can test its validity |
|
| 5 | - include_once $base_path . MGR_DIR . '/includes/config.inc.php'; |
|
| 4 | +if (is_file($base_path.MGR_DIR.'/includes/config.inc.php')) { // Include the file so we can test its validity |
|
| 5 | + include_once $base_path.MGR_DIR.'/includes/config.inc.php'; |
|
| 6 | 6 | // We need to have all connection settings - tho prefix may be empty so we have to ignore it |
| 7 | 7 | if (isset($dbase)) { |
| 8 | 8 | if (!$conn = @mysqli_connect($database_server, $database_user, $database_password)) |
@@ -17,16 +17,16 @@ discard block |
||
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | $ph['moduleName'] = $moduleName; |
| 20 | -$ph['displayNew'] = ($upgradeable!=0) ? 'display:none;' : ''; |
|
| 21 | -$ph['displayUpg'] = ($upgradeable==0) ? 'display:none;' : ''; |
|
| 20 | +$ph['displayNew'] = ($upgradeable != 0) ? 'display:none;' : ''; |
|
| 21 | +$ph['displayUpg'] = ($upgradeable == 0) ? 'display:none;' : ''; |
|
| 22 | 22 | $ph['displayAdvUpg'] = $ph['displayUpg']; |
| 23 | -$ph['checkedNew'] = !$upgradeable ? 'checked' : ''; |
|
| 24 | -$ph['checkedUpg'] = ($_POST['installmode']==1 || $upgradeable==1) ? 'checked' : ''; |
|
| 25 | -$ph['checkedAdvUpg'] = ($_POST['installmode']==2 || $upgradeable==2) ? 'checked' : ''; |
|
| 23 | +$ph['checkedNew'] = !$upgradeable ? 'checked' : ''; |
|
| 24 | +$ph['checkedUpg'] = ($_POST['installmode'] == 1 || $upgradeable == 1) ? 'checked' : ''; |
|
| 25 | +$ph['checkedAdvUpg'] = ($_POST['installmode'] == 2 || $upgradeable == 2) ? 'checked' : ''; |
|
| 26 | 26 | $ph['install_language'] = $install_language; |
| 27 | -$ph['disabledUpg'] = ($upgradeable!=1) ? 'disabled' : ''; |
|
| 28 | -$ph['disabledAdvUpg'] = ($upgradeable==0) ? 'disabled' : ''; |
|
| 27 | +$ph['disabledUpg'] = ($upgradeable != 1) ? 'disabled' : ''; |
|
| 28 | +$ph['disabledAdvUpg'] = ($upgradeable == 0) ? 'disabled' : ''; |
|
| 29 | 29 | |
| 30 | -$tpl = file_get_contents($base_path . 'install/actions/tpl_mode.html'); |
|
| 30 | +$tpl = file_get_contents($base_path.'install/actions/tpl_mode.html'); |
|
| 31 | 31 | $content = parse($tpl, $ph); |
| 32 | -echo parse($content, $_lang,'[%','%]'); |
|
| 32 | +echo parse($content, $_lang, '[%', '%]'); |
|
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | case 'new' : |
| 279 | 279 | |
| 280 | 280 | // invoke OnBeforeDocFormSave event |
| 281 | - switch($modx->config['docid_incrmnt_method']) |
|
| 281 | + switch ($modx->config['docid_incrmnt_method']) |
|
| 282 | 282 | { |
| 283 | 283 | case '1': |
| 284 | 284 | $from = "{$tbl_site_content} AS T0 LEFT JOIN {$tbl_site_content} AS T1 ON T0.id + 1 = T1.id"; |
@@ -489,7 +489,7 @@ discard block |
||
| 489 | 489 | if (!$was_published && $published) { |
| 490 | 490 | $publishedon = $currentdate; |
| 491 | 491 | $publishedby = $modx->getLoginUserID(); |
| 492 | - }elseif ((!empty($pub_date)&& $pub_date<=$currentdate && $published)) { |
|
| 492 | + }elseif ((!empty($pub_date) && $pub_date <= $currentdate && $published)) { |
|
| 493 | 493 | $publishedon = $pub_date; |
| 494 | 494 | $publishedby = $modx->getLoginUserID(); |
| 495 | 495 | }elseif ($was_published && !$published) { |
@@ -501,7 +501,7 @@ discard block |
||
| 501 | 501 | } |
| 502 | 502 | |
| 503 | 503 | // invoke OnBeforeDocFormSave event |
| 504 | - $modx->invokeEvent("OnBeforeDocFormSave", array ( |
|
| 504 | + $modx->invokeEvent("OnBeforeDocFormSave", array( |
|
| 505 | 505 | "mode" => "upd", |
| 506 | 506 | "id" => $id |
| 507 | 507 | )); |
@@ -526,7 +526,7 @@ discard block |
||
| 526 | 526 | . "menuindex={$menuindex}, " |
| 527 | 527 | . "searchable={$searchable}, " |
| 528 | 528 | . "cacheable={$cacheable}, " |
| 529 | - . "editedby=" . $modx->getLoginUserID() . ", " |
|
| 529 | + . "editedby=".$modx->getLoginUserID().", " |
|
| 530 | 530 | . "editedon={$currentdate}, " |
| 531 | 531 | . "publishedon={$publishedon}, " |
| 532 | 532 | . "publishedby={$publishedby}, " |
@@ -540,7 +540,7 @@ discard block |
||
| 540 | 540 | |
| 541 | 541 | // update template variables |
| 542 | 542 | $rs = $modx->db->select('id, tmplvarid', $tbl_site_tmplvar_contentvalues, "contentid='{$id}'"); |
| 543 | - $tvIds = array (); |
|
| 543 | + $tvIds = array(); |
|
| 544 | 544 | while ($row = $modx->db->getRow($rs)) { |
| 545 | 545 | $tvIds[$row['tmplvarid']] = $row['id']; |
| 546 | 546 | } |
@@ -593,7 +593,7 @@ discard block |
||
| 593 | 593 | 'groups.id, groups.document_group', |
| 594 | 594 | "{$tbl_document_groups} AS groups |
| 595 | 595 | LEFT JOIN {$tbl_documentgroup_names} AS dgn ON dgn.id = groups.document_group", |
| 596 | - "((1=".(int)$isManager." AND dgn.private_memgroup) OR (1=".(int)$isWeb." AND dgn.private_webgroup)) AND groups.document = '{$id}'" |
|
| 596 | + "((1=".(int) $isManager." AND dgn.private_memgroup) OR (1=".(int) $isWeb." AND dgn.private_webgroup)) AND groups.document = '{$id}'" |
|
| 597 | 597 | ); |
| 598 | 598 | $old_groups = array(); |
| 599 | 599 | while ($row = $modx->db->getRow($rs)) $old_groups[$row['document_group']] = $row['id']; |
@@ -605,7 +605,7 @@ discard block |
||
| 605 | 605 | unset($old_groups[$group]); |
| 606 | 606 | continue; |
| 607 | 607 | } elseif ($link_id == 'new') { |
| 608 | - $insertions[] = '('.(int)$group.','.$id.')'; |
|
| 608 | + $insertions[] = '('.(int) $group.','.$id.')'; |
|
| 609 | 609 | } |
| 610 | 610 | } |
| 611 | 611 | if (!empty($insertions)) { |
@@ -637,17 +637,17 @@ discard block |
||
| 637 | 637 | |
| 638 | 638 | |
| 639 | 639 | // invoke OnDocFormSave event |
| 640 | - $modx->invokeEvent("OnDocFormSave", array ( |
|
| 640 | + $modx->invokeEvent("OnDocFormSave", array( |
|
| 641 | 641 | "mode" => "upd", |
| 642 | 642 | "id" => $id |
| 643 | 643 | )); |
| 644 | 644 | |
| 645 | 645 | // secure web documents - flag as private |
| 646 | - include MODX_MANAGER_PATH . "includes/secure_web_documents.inc.php"; |
|
| 646 | + include MODX_MANAGER_PATH."includes/secure_web_documents.inc.php"; |
|
| 647 | 647 | secureWebDocument($id); |
| 648 | 648 | |
| 649 | 649 | // secure manager documents - flag as private |
| 650 | - include MODX_MANAGER_PATH . "includes/secure_mgr_documents.inc.php"; |
|
| 650 | + include MODX_MANAGER_PATH."includes/secure_mgr_documents.inc.php"; |
|
| 651 | 651 | secureMgrDocument($id); |
| 652 | 652 | |
| 653 | 653 | // Set the item name for logger |
@@ -673,13 +673,13 @@ discard block |
||
| 673 | 673 | // document |
| 674 | 674 | $a = ($_POST['stay'] == '2') ? "27&id=$id" : "4&pid=$parent"; |
| 675 | 675 | } |
| 676 | - $header = "Location: index.php?a=" . $a . "&r=1&stay=" . $_POST['stay'].$add_path; |
|
| 676 | + $header = "Location: index.php?a=".$a."&r=1&stay=".$_POST['stay'].$add_path; |
|
| 677 | 677 | } else { |
| 678 | 678 | $header = "Location: index.php?a=3&id=$id&r=1".$add_path; |
| 679 | 679 | } |
| 680 | 680 | } |
| 681 | 681 | if (headers_sent()) { |
| 682 | - $header = str_replace('Location: ','',$header); |
|
| 682 | + $header = str_replace('Location: ', '', $header); |
|
| 683 | 683 | echo "<script>document.location.href='$header';</script>\n"; |
| 684 | 684 | } else { |
| 685 | 685 | header($header); |
@@ -1,5 +1,5 @@ |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
| 4 | 4 | } |
| 5 | 5 | ?> |
@@ -1,5 +1,5 @@ |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
| 4 | 4 | } |
| 5 | 5 | ?> |
@@ -1,5 +1,5 @@ |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
| 4 | 4 | } |
| 5 | 5 | ?> |
@@ -5,8 +5,8 @@ discard block |
||
| 5 | 5 | */ |
| 6 | 6 | |
| 7 | 7 | $self = 'install/cli-install.php'; |
| 8 | -$path = dirname(__FILE__) . '/'; |
|
| 9 | -$base_path = str_replace($self,'',str_replace('\\','/', __FILE__)); |
|
| 8 | +$path = dirname(__FILE__).'/'; |
|
| 9 | +$base_path = str_replace($self, '', str_replace('\\', '/', __FILE__)); |
|
| 10 | 10 | define('MODX_API_MODE', true); |
| 11 | 11 | define('MODX_BASE_PATH', $base_path); |
| 12 | 12 | define('MODX_SITE_URL', '/'); |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | if (is_file($base_path."assets/cache/siteManager.php")) { |
| 20 | 20 | include_once($base_path."assets/cache/siteManager.php"); |
| 21 | 21 | } |
| 22 | -if(!defined('MGR_DIR') && is_dir($base_path."manager")) { |
|
| 22 | +if (!defined('MGR_DIR') && is_dir($base_path."manager")) { |
|
| 23 | 23 | define('MGR_DIR', 'manager'); |
| 24 | 24 | } |
| 25 | 25 | |
@@ -33,43 +33,43 @@ discard block |
||
| 33 | 33 | $moduleSQLDataFile = $path."setup.data.sql"; |
| 34 | 34 | $moduleSQLResetFile = $path."setup.data.reset.sql"; |
| 35 | 35 | |
| 36 | -$moduleChunks = array (); // chunks - array : name, description, type - 0:file or 1:content, file or content |
|
| 37 | -$moduleTemplates = array (); // templates - array : name, description, type - 0:file or 1:content, file or content |
|
| 38 | -$moduleSnippets = array (); // snippets - array : name, description, type - 0:file or 1:content, file or content,properties |
|
| 39 | -$modulePlugins = array (); // plugins - array : name, description, type - 0:file or 1:content, file or content,properties, events,guid |
|
| 40 | -$moduleModules = array (); // modules - array : name, description, type - 0:file or 1:content, file or content,properties, guid |
|
| 41 | -$moduleTemplates = array (); // templates - array : name, description, type - 0:file or 1:content, file or content,properties |
|
| 42 | -$moduleTVs = array (); // template variables - array : name, description, type - 0:file or 1:content, file or content,properties |
|
| 36 | +$moduleChunks = array(); // chunks - array : name, description, type - 0:file or 1:content, file or content |
|
| 37 | +$moduleTemplates = array(); // templates - array : name, description, type - 0:file or 1:content, file or content |
|
| 38 | +$moduleSnippets = array(); // snippets - array : name, description, type - 0:file or 1:content, file or content,properties |
|
| 39 | +$modulePlugins = array(); // plugins - array : name, description, type - 0:file or 1:content, file or content,properties, events,guid |
|
| 40 | +$moduleModules = array(); // modules - array : name, description, type - 0:file or 1:content, file or content,properties, guid |
|
| 41 | +$moduleTemplates = array(); // templates - array : name, description, type - 0:file or 1:content, file or content,properties |
|
| 42 | +$moduleTVs = array(); // template variables - array : name, description, type - 0:file or 1:content, file or content,properties |
|
| 43 | 43 | $moduleDependencies = array(); // module depedencies - array : module, table, column, type, name |
| 44 | -$errors= 0; |
|
| 44 | +$errors = 0; |
|
| 45 | 45 | |
| 46 | 46 | |
| 47 | -$installMode= 0; |
|
| 47 | +$installMode = 0; |
|
| 48 | 48 | $installData = 0; |
| 49 | 49 | $tableprefixauto = base_convert(rand(10, 20), 10, 36).substr(str_shuffle('0123456789abcdefghijklmnopqrstuvwxyz'), rand(0, 33), 3).'_'; |
| 50 | 50 | |
| 51 | 51 | $args = array_slice($argv, 1); |
| 52 | 52 | |
| 53 | -if ( empty($args) ){ |
|
| 53 | +if (empty($args)) { |
|
| 54 | 54 | echo 'Install Evolution CMS'.PHP_EOL; |
| 55 | 55 | //$installYes = readline("Type 'y' to continue: "); |
| 56 | 56 | //if ($installYes != 'y') return; |
| 57 | 57 | |
| 58 | 58 | //set param manual |
| 59 | - $databasehost = readline($_lang['connection_screen_database_host']. ' [localhost] '); |
|
| 60 | - $databaseloginname = readline($_lang['connection_screen_database_login']. ' '); |
|
| 61 | - $databaseloginpassword = readline($_lang['connection_screen_database_pass']. ' '); |
|
| 62 | - $database_name = readline($_lang['connection_screen_database_name']. ' '); |
|
| 63 | - $tableprefix = readline($_lang['connection_screen_table_prefix']. ' ['.$tableprefixauto.'] '); |
|
| 64 | - $database_connection_method = readline($_lang['connection_screen_connection_method']. ' [SET CHARACTER SET] '); |
|
| 65 | - $database_collation = readline($_lang['connection_screen_collation']. ' [utf8_general_ci] '); |
|
| 66 | - $cmsadmin = readline($_lang['connection_screen_default_admin_login']. ' [admin] '); |
|
| 67 | - $cmsadminemail = readline($_lang['connection_screen_default_admin_email']. ' '); |
|
| 68 | - $cmspassword = readline($_lang['connection_screen_default_admin_password']. ' '); |
|
| 69 | - $managerlanguage = readline('Мanager language:' . ' [en] '); |
|
| 70 | - $installData = readline('Instal demo-site (y/n):' . ' [n] '); |
|
| 59 | + $databasehost = readline($_lang['connection_screen_database_host'].' [localhost] '); |
|
| 60 | + $databaseloginname = readline($_lang['connection_screen_database_login'].' '); |
|
| 61 | + $databaseloginpassword = readline($_lang['connection_screen_database_pass'].' '); |
|
| 62 | + $database_name = readline($_lang['connection_screen_database_name'].' '); |
|
| 63 | + $tableprefix = readline($_lang['connection_screen_table_prefix'].' ['.$tableprefixauto.'] '); |
|
| 64 | + $database_connection_method = readline($_lang['connection_screen_connection_method'].' [SET CHARACTER SET] '); |
|
| 65 | + $database_collation = readline($_lang['connection_screen_collation'].' [utf8_general_ci] '); |
|
| 66 | + $cmsadmin = readline($_lang['connection_screen_default_admin_login'].' [admin] '); |
|
| 67 | + $cmsadminemail = readline($_lang['connection_screen_default_admin_email'].' '); |
|
| 68 | + $cmspassword = readline($_lang['connection_screen_default_admin_password'].' '); |
|
| 69 | + $managerlanguage = readline('Мanager language:'.' [en] '); |
|
| 70 | + $installData = readline('Instal demo-site (y/n):'.' [n] '); |
|
| 71 | 71 | |
| 72 | -}else{ |
|
| 72 | +} else { |
|
| 73 | 73 | |
| 74 | 74 | $cli_variables = []; |
| 75 | 75 | foreach ($args as $arg) { |
@@ -100,14 +100,14 @@ discard block |
||
| 100 | 100 | } |
| 101 | 101 | |
| 102 | 102 | |
| 103 | -if ($databasehost == '') { $databasehost= 'localhost'; } |
|
| 104 | -if ($tableprefix == ''){ $tableprefix = $tableprefixauto; } |
|
| 103 | +if ($databasehost == '') { $databasehost = 'localhost'; } |
|
| 104 | +if ($tableprefix == '') { $tableprefix = $tableprefixauto; } |
|
| 105 | 105 | if ($database_connection_method == '') { $database_connection_method = 'SET CHARACTER SET'; } |
| 106 | 106 | if ($database_collation == '') { $database_collation = 'utf8_general_ci'; } |
| 107 | -if ($cmsadmin == ''){ $cmsadmin = 'admin'; } |
|
| 107 | +if ($cmsadmin == '') { $cmsadmin = 'admin'; } |
|
| 108 | 108 | if ($managerlanguage == '') { $managerlanguage = 'en'; } |
| 109 | -if ($installData == 'y') { $installData = 1;} |
|
| 110 | -if ($mode == 'upgrade') { $installMode = 1;} |
|
| 109 | +if ($installData == 'y') { $installData = 1; } |
|
| 110 | +if ($mode == 'upgrade') { $installMode = 1; } |
|
| 111 | 111 | |
| 112 | 112 | //добавить обработку языка |
| 113 | 113 | |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | ////////////////////////////////////////////////////////////////////////////////////// |
| 126 | -if( ! function_exists('f_owc')){ |
|
| 126 | +if (!function_exists('f_owc')) { |
|
| 127 | 127 | /** |
| 128 | 128 | * @param $path |
| 129 | 129 | * @param $data |
@@ -136,8 +136,8 @@ discard block |
||
| 136 | 136 | fwrite($hnd, $data); |
| 137 | 137 | fclose($hnd); |
| 138 | 138 | |
| 139 | - if(null !== $mode) chmod($path, $mode); |
|
| 140 | - }catch(Exception $e){ |
|
| 139 | + if (null !== $mode) chmod($path, $mode); |
|
| 140 | + } catch (Exception $e) { |
|
| 141 | 141 | // Nothing, this is NOT normal |
| 142 | 142 | unset($e); |
| 143 | 143 | } |
@@ -147,24 +147,24 @@ discard block |
||
| 147 | 147 | // check PHP version |
| 148 | 148 | define('PHP_MIN_VERSION', '5.4.0'); |
| 149 | 149 | $phpMinVersion = PHP_MIN_VERSION; // Maybe not necessary. For backward compatibility |
| 150 | -echo PHP_EOL . $_lang['checking_php_version']; |
|
| 150 | +echo PHP_EOL.$_lang['checking_php_version']; |
|
| 151 | 151 | // -1 if left is less, 0 if equal, +1 if left is higher |
| 152 | 152 | if (version_compare(phpversion(), PHP_MIN_VERSION) < 0) { |
| 153 | 153 | $errors++; |
| 154 | - $tmp = $_lang['you_running_php'] . phpversion() . str_replace('[+min_version+]', PHP_MIN_VERSION, $_lang["modx_requires_php"]); |
|
| 155 | - echo $_lang['failed'] . ' ' . $tmp . PHP_EOL; |
|
| 154 | + $tmp = $_lang['you_running_php'].phpversion().str_replace('[+min_version+]', PHP_MIN_VERSION, $_lang["modx_requires_php"]); |
|
| 155 | + echo $_lang['failed'].' '.$tmp.PHP_EOL; |
|
| 156 | 156 | } else { |
| 157 | - echo $_lang['ok'] . PHP_EOL; |
|
| 157 | + echo $_lang['ok'].PHP_EOL; |
|
| 158 | 158 | } |
| 159 | 159 | |
| 160 | 160 | // check directories |
| 161 | 161 | // cache exists? |
| 162 | 162 | echo strip_tags($_lang['checking_if_cache_exist']); |
| 163 | 163 | if (!file_exists($path."../assets/cache") || !file_exists($path."../assets/cache/rss")) { |
| 164 | - echo $_lang['failed'] . PHP_EOL; |
|
| 164 | + echo $_lang['failed'].PHP_EOL; |
|
| 165 | 165 | $errors++; |
| 166 | 166 | } else { |
| 167 | - echo $_lang['ok'] . PHP_EOL; |
|
| 167 | + echo $_lang['ok'].PHP_EOL; |
|
| 168 | 168 | } |
| 169 | 169 | |
| 170 | 170 | |
@@ -172,82 +172,82 @@ discard block |
||
| 172 | 172 | echo strip_tags($_lang['checking_if_cache_writable']); |
| 173 | 173 | if (!is_writable($path."../assets/cache")) { |
| 174 | 174 | $errors++; |
| 175 | - echo $_lang['failed'] . PHP_EOL; |
|
| 175 | + echo $_lang['failed'].PHP_EOL; |
|
| 176 | 176 | } else { |
| 177 | - echo $_lang['ok'] . PHP_EOL; |
|
| 177 | + echo $_lang['ok'].PHP_EOL; |
|
| 178 | 178 | } |
| 179 | 179 | |
| 180 | 180 | |
| 181 | 181 | // cache files writable? |
| 182 | 182 | echo strip_tags($_lang['checking_if_cache_file_writable']); |
| 183 | 183 | $tmp = $path."../assets/cache/siteCache.idx.php"; |
| 184 | -if ( ! file_exists($tmp)) { |
|
| 184 | +if (!file_exists($tmp)) { |
|
| 185 | 185 | f_owc($tmp, "<?php //EVO site cache file ?>"); |
| 186 | 186 | } |
| 187 | -if ( ! is_writable($tmp)) { |
|
| 187 | +if (!is_writable($tmp)) { |
|
| 188 | 188 | $errors++; |
| 189 | - echo $_lang['failed'] . PHP_EOL; |
|
| 189 | + echo $_lang['failed'].PHP_EOL; |
|
| 190 | 190 | } else { |
| 191 | - echo $_lang['ok'] . PHP_EOL; |
|
| 191 | + echo $_lang['ok'].PHP_EOL; |
|
| 192 | 192 | } |
| 193 | 193 | |
| 194 | 194 | |
| 195 | 195 | echo strip_tags($_lang['checking_if_cache_file2_writable']); |
| 196 | -if ( ! is_writable($path."../assets/cache/sitePublishing.idx.php")) { |
|
| 196 | +if (!is_writable($path."../assets/cache/sitePublishing.idx.php")) { |
|
| 197 | 197 | $errors++; |
| 198 | - echo $_lang['failed'] . PHP_EOL; |
|
| 198 | + echo $_lang['failed'].PHP_EOL; |
|
| 199 | 199 | } else { |
| 200 | - echo $_lang['ok'] . PHP_EOL; |
|
| 200 | + echo $_lang['ok'].PHP_EOL; |
|
| 201 | 201 | } |
| 202 | 202 | |
| 203 | 203 | |
| 204 | 204 | // File Browser directories exists? |
| 205 | 205 | echo strip_tags($_lang['checking_if_images_exist']); |
| 206 | -switch(true){ |
|
| 206 | +switch (true) { |
|
| 207 | 207 | case !file_exists($path."../assets/images"): |
| 208 | 208 | case !file_exists($path."../assets/files"): |
| 209 | 209 | case !file_exists($path."../assets/backup"): |
| 210 | 210 | //case !file_exists("../assets/.thumbs"): |
| 211 | 211 | $errors++; |
| 212 | - echo $_lang['failed'] . PHP_EOL; |
|
| 212 | + echo $_lang['failed'].PHP_EOL; |
|
| 213 | 213 | break; |
| 214 | 214 | default: |
| 215 | - echo $_lang['ok'] . PHP_EOL; |
|
| 215 | + echo $_lang['ok'].PHP_EOL; |
|
| 216 | 216 | } |
| 217 | 217 | |
| 218 | 218 | |
| 219 | 219 | // File Browser directories writable? |
| 220 | 220 | echo strip_tags($_lang['checking_if_images_writable']); |
| 221 | -switch(true){ |
|
| 221 | +switch (true) { |
|
| 222 | 222 | case !is_writable($path."../assets/images"): |
| 223 | 223 | case !is_writable($path."../assets/files"): |
| 224 | 224 | case !is_writable($path."../assets/backup"): |
| 225 | 225 | //case !is_writable("../assets/.thumbs"): |
| 226 | 226 | $errors++; |
| 227 | - echo $_lang['failed'] . PHP_EOL; |
|
| 227 | + echo $_lang['failed'].PHP_EOL; |
|
| 228 | 228 | break; |
| 229 | 229 | default: |
| 230 | - echo $_lang['ok'] . PHP_EOL; |
|
| 230 | + echo $_lang['ok'].PHP_EOL; |
|
| 231 | 231 | } |
| 232 | 232 | |
| 233 | 233 | |
| 234 | 234 | // export exists? |
| 235 | 235 | echo strip_tags($_lang['checking_if_export_exists']); |
| 236 | 236 | if (!file_exists($path."../assets/export")) { |
| 237 | - echo $_lang['failed'] . PHP_EOL; |
|
| 237 | + echo $_lang['failed'].PHP_EOL; |
|
| 238 | 238 | $errors++; |
| 239 | 239 | } else { |
| 240 | - echo $_lang['ok'] . PHP_EOL; |
|
| 240 | + echo $_lang['ok'].PHP_EOL; |
|
| 241 | 241 | } |
| 242 | 242 | |
| 243 | 243 | |
| 244 | 244 | // export writable? |
| 245 | 245 | echo strip_tags($_lang['checking_if_export_writable']); |
| 246 | 246 | if (!is_writable($path."../assets/export")) { |
| 247 | - echo $_lang['failed'] . PHP_EOL; |
|
| 247 | + echo $_lang['failed'].PHP_EOL; |
|
| 248 | 248 | $errors++; |
| 249 | 249 | } else { |
| 250 | - echo $_lang['ok'] . PHP_EOL; |
|
| 250 | + echo $_lang['ok'].PHP_EOL; |
|
| 251 | 251 | } |
| 252 | 252 | |
| 253 | 253 | |
@@ -262,9 +262,9 @@ discard block |
||
| 262 | 262 | $isWriteable = is_writable($tmp); |
| 263 | 263 | if (!$isWriteable) { |
| 264 | 264 | $errors++; |
| 265 | - echo $_lang['failed'] . PHP_EOL; |
|
| 265 | + echo $_lang['failed'].PHP_EOL; |
|
| 266 | 266 | } else { |
| 267 | - echo $_lang['ok'] . PHP_EOL; |
|
| 267 | + echo $_lang['ok'].PHP_EOL; |
|
| 268 | 268 | } |
| 269 | 269 | |
| 270 | 270 | |
@@ -280,7 +280,7 @@ discard block |
||
| 280 | 280 | $database_charset = substr($database_collation, 0, strpos($database_collation, '_') - 1); |
| 281 | 281 | $database_connection_charset = $database_collation; |
| 282 | 282 | $database_connection_method = $database_connection_method; |
| 283 | - $dbase = '`' . $database_name . '`'; |
|
| 283 | + $dbase = '`'.$database_name.'`'; |
|
| 284 | 284 | $table_prefix = $tableprefix; |
| 285 | 285 | } |
| 286 | 286 | echo $_lang['creating_database_connection']; |
@@ -320,33 +320,33 @@ discard block |
||
| 320 | 320 | |
| 321 | 321 | // check table prefix |
| 322 | 322 | if ($conn && $installMode == 0) { |
| 323 | - echo $_lang['checking_table_prefix'] . $table_prefix . '`: '; |
|
| 324 | - if ($rs= mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`" . $table_prefix . "site_content`")) { |
|
| 325 | - echo $_lang['failed'] . ' ' . $_lang['table_prefix_already_inuse_note'] . PHP_EOL; |
|
| 323 | + echo $_lang['checking_table_prefix'].$table_prefix.'`: '; |
|
| 324 | + if ($rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`".$table_prefix."site_content`")) { |
|
| 325 | + echo $_lang['failed'].' '.$_lang['table_prefix_already_inuse_note'].PHP_EOL; |
|
| 326 | 326 | $errors++; |
| 327 | 327 | |
| 328 | 328 | } else { |
| 329 | - echo $_lang['ok'] . PHP_EOL; |
|
| 329 | + echo $_lang['ok'].PHP_EOL; |
|
| 330 | 330 | } |
| 331 | 331 | } elseif ($conn && $installMode == 2) { |
| 332 | - echo $_lang['checking_table_prefix'] . $table_prefix . '`: '; |
|
| 333 | - if (!$rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`" . $table_prefix . "site_content`")) { |
|
| 334 | - echo $_lang['failed'] . ' ' . $_lang['table_prefix_not_exist'] . PHP_EOL; |
|
| 332 | + echo $_lang['checking_table_prefix'].$table_prefix.'`: '; |
|
| 333 | + if (!$rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`".$table_prefix."site_content`")) { |
|
| 334 | + echo $_lang['failed'].' '.$_lang['table_prefix_not_exist'].PHP_EOL; |
|
| 335 | 335 | $errors++; |
| 336 | 336 | |
| 337 | 337 | } else { |
| 338 | - echo $_lang['ok'] . PHP_EOL; |
|
| 338 | + echo $_lang['ok'].PHP_EOL; |
|
| 339 | 339 | } |
| 340 | 340 | } |
| 341 | 341 | |
| 342 | 342 | // check mysql version |
| 343 | 343 | if ($conn) { |
| 344 | 344 | echo $_lang['checking_mysql_version']; |
| 345 | - if ( version_compare(mysqli_get_server_info($conn), '5.0.51', '=') ) { |
|
| 346 | - echo $_lang['warning'] . ' ' . $_lang['mysql_5051'] . PHP_EOL; |
|
| 347 | - echo $_lang['mysql_5051_warning'] . PHP_EOL; |
|
| 345 | + if (version_compare(mysqli_get_server_info($conn), '5.0.51', '=')) { |
|
| 346 | + echo $_lang['warning'].' '.$_lang['mysql_5051'].PHP_EOL; |
|
| 347 | + echo $_lang['mysql_5051_warning'].PHP_EOL; |
|
| 348 | 348 | } else { |
| 349 | - echo $_lang['ok'] . ' ' . $_lang['mysql_version_is'] . mysqli_get_server_info($conn) . PHP_EOL; |
|
| 349 | + echo $_lang['ok'].' '.$_lang['mysql_version_is'].mysqli_get_server_info($conn).PHP_EOL; |
|
| 350 | 350 | } |
| 351 | 351 | } |
| 352 | 352 | |
@@ -354,20 +354,20 @@ discard block |
||
| 354 | 354 | if ($conn) { |
| 355 | 355 | echo $_lang['checking_mysql_strict_mode']; |
| 356 | 356 | $mysqlmode = mysqli_query($conn, "SELECT @@global.sql_mode"); |
| 357 | - if (mysqli_num_rows($mysqlmode) > 0){ |
|
| 357 | + if (mysqli_num_rows($mysqlmode) > 0) { |
|
| 358 | 358 | $modes = mysqli_fetch_array($mysqlmode, MYSQLI_NUM); |
| 359 | 359 | //$modes = array("STRICT_TRANS_TABLES"); // for testing |
| 360 | 360 | // print_r($modes); |
| 361 | 361 | foreach ($modes as $mode) { |
| 362 | 362 | if (stristr($mode, "STRICT_TRANS_TABLES") !== false || stristr($mode, "STRICT_ALL_TABLES") !== false) { |
| 363 | - echo $_lang['warning'] . ' ' . $_lang['strict_mode'] . PHP_EOL; |
|
| 364 | - echo $_lang['strict_mode_error'] . PHP_EOL; |
|
| 363 | + echo $_lang['warning'].' '.$_lang['strict_mode'].PHP_EOL; |
|
| 364 | + echo $_lang['strict_mode_error'].PHP_EOL; |
|
| 365 | 365 | } else { |
| 366 | - echo $_lang['ok'] . PHP_EOL; |
|
| 366 | + echo $_lang['ok'].PHP_EOL; |
|
| 367 | 367 | } |
| 368 | 368 | } |
| 369 | 369 | } else { |
| 370 | - echo $_lang['ok'] . PHP_EOL; |
|
| 370 | + echo $_lang['ok'].PHP_EOL; |
|
| 371 | 371 | } |
| 372 | 372 | } |
| 373 | 373 | // Version and strict mode check end |
@@ -383,17 +383,17 @@ discard block |
||
| 383 | 383 | f_owc($path."../assets/cache/installProc.inc.php", '<?php $installStartTime = '.time().'; ?>'); |
| 384 | 384 | } |
| 385 | 385 | |
| 386 | -if($installMode > 0 && $_POST['installdata'] == "1") { |
|
| 387 | - echo $_lang['sample_web_site'] . ': ' . $_lang['sample_web_site_note'] . PHP_EOL; |
|
| 386 | +if ($installMode > 0 && $_POST['installdata'] == "1") { |
|
| 387 | + echo $_lang['sample_web_site'].': '.$_lang['sample_web_site_note'].PHP_EOL; |
|
| 388 | 388 | } |
| 389 | 389 | |
| 390 | 390 | if ($errors > 0) { |
| 391 | - echo $_lang['setup_cannot_continue'] . ' '; |
|
| 391 | + echo $_lang['setup_cannot_continue'].' '; |
|
| 392 | 392 | |
| 393 | - if($errors > 1){ |
|
| 394 | - echo $errors . " " . $_lang['errors'] . $_lang['please_correct_errors'] . $_lang['and_try_again_plural']; |
|
| 395 | - }else{ |
|
| 396 | - echo $_lang['error'] . $_lang['please_correct_error'] . $_lang['and_try_again']. PHP_EOL; |
|
| 393 | + if ($errors > 1) { |
|
| 394 | + echo $errors." ".$_lang['errors'].$_lang['please_correct_errors'].$_lang['and_try_again_plural']; |
|
| 395 | + } else { |
|
| 396 | + echo $_lang['error'].$_lang['please_correct_error'].$_lang['and_try_again'].PHP_EOL; |
|
| 397 | 397 | } |
| 398 | 398 | |
| 399 | 399 | die(); |
@@ -422,7 +422,7 @@ discard block |
||
| 422 | 422 | $database_charset = substr($database_collation, 0, strpos($database_collation, '_')); |
| 423 | 423 | $database_connection_charset = $database_charset; |
| 424 | 424 | $database_connection_method = $database_connection_method; |
| 425 | - $dbase = "`" .$database_name. "`"; |
|
| 425 | + $dbase = "`".$database_name."`"; |
|
| 426 | 426 | $table_prefix = $tableprefix; |
| 427 | 427 | $adminname = $cmsadmin; |
| 428 | 428 | $adminemail = $cmsadminemail; |
@@ -433,7 +433,7 @@ discard block |
||
| 433 | 433 | |
| 434 | 434 | // set session name variable |
| 435 | 435 | if (!isset ($site_sessionname)) { |
| 436 | - $site_sessionname = 'SN' . uniqid(''); |
|
| 436 | + $site_sessionname = 'SN'.uniqid(''); |
|
| 437 | 437 | } |
| 438 | 438 | |
| 439 | 439 | // get base path and url |
@@ -447,8 +447,8 @@ discard block |
||
| 447 | 447 | array_pop($a); |
| 448 | 448 | $pth = implode("install", $a); |
| 449 | 449 | unset ($a); |
| 450 | -$base_url = $url . (substr($url, -1) != "/" ? "/" : ""); |
|
| 451 | -$base_path = $pth . (substr($pth, -1) != "/" ? "/" : ""); |
|
| 450 | +$base_url = $url.(substr($url, -1) != "/" ? "/" : ""); |
|
| 451 | +$base_path = $pth.(substr($pth, -1) != "/" ? "/" : ""); |
|
| 452 | 452 | |
| 453 | 453 | // connect to the database |
| 454 | 454 | echo $_lang['setup_database_create_connection'].': '; |
@@ -460,7 +460,7 @@ discard block |
||
| 460 | 460 | } |
| 461 | 461 | |
| 462 | 462 | // select database |
| 463 | -echo $_lang['setup_database_selection']. str_replace("`", "", $dbase) . "`: "; |
|
| 463 | +echo $_lang['setup_database_selection'].str_replace("`", "", $dbase)."`: "; |
|
| 464 | 464 | if (!mysqli_select_db($conn, str_replace("`", "", $dbase))) { |
| 465 | 465 | echo $_lang['setup_database_selection_failed']." ".$_lang['setup_database_selection_failed_note'].PHP_EOL; |
| 466 | 466 | $create = true; |
@@ -472,16 +472,16 @@ discard block |
||
| 472 | 472 | |
| 473 | 473 | // try to create the database |
| 474 | 474 | if ($create) { |
| 475 | - echo $_lang['setup_database_creation']. str_replace("`", "", $dbase) . "`: "; |
|
| 475 | + echo $_lang['setup_database_creation'].str_replace("`", "", $dbase)."`: "; |
|
| 476 | 476 | // if(!@mysqli_create_db(str_replace("`","",$dbase), $conn)) { |
| 477 | - if (! mysqli_query($conn, "CREATE DATABASE $dbase DEFAULT CHARACTER SET $database_charset COLLATE $database_collation")) { |
|
| 477 | + if (!mysqli_query($conn, "CREATE DATABASE $dbase DEFAULT CHARACTER SET $database_charset COLLATE $database_collation")) { |
|
| 478 | 478 | echo $_lang['setup_database_creation_failed']." ".$_lang['setup_database_creation_failed_note'].PHP_EOL; |
| 479 | 479 | $errors += 1; |
| 480 | 480 | |
| 481 | - echo 'database charset: ' . $database_charset . PHP_EOL; |
|
| 482 | - echo 'database collation: ' . $database_collation . PHP_EOL; |
|
| 481 | + echo 'database charset: '.$database_charset.PHP_EOL; |
|
| 482 | + echo 'database collation: '.$database_collation.PHP_EOL; |
|
| 483 | 483 | |
| 484 | - echo $_lang['setup_database_creation_failed_note2'] . PHP_EOL; |
|
| 484 | + echo $_lang['setup_database_creation_failed_note2'].PHP_EOL; |
|
| 485 | 485 | |
| 486 | 486 | die(); |
| 487 | 487 | |
@@ -492,18 +492,18 @@ discard block |
||
| 492 | 492 | |
| 493 | 493 | // check table prefix |
| 494 | 494 | if ($installMode == 0) { |
| 495 | - echo $_lang['checking_table_prefix'] . $table_prefix . "`: "; |
|
| 496 | - if (@ $rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`" . $table_prefix . "site_content`")) { |
|
| 497 | - echo $_lang['failed'] . " " . $_lang['table_prefix_already_inuse'] . PHP_EOL; |
|
| 495 | + echo $_lang['checking_table_prefix'].$table_prefix."`: "; |
|
| 496 | + if (@ $rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`".$table_prefix."site_content`")) { |
|
| 497 | + echo $_lang['failed']." ".$_lang['table_prefix_already_inuse'].PHP_EOL; |
|
| 498 | 498 | $errors += 1; |
| 499 | - echo $_lang['table_prefix_already_inuse_note'] . PHP_EOL; |
|
| 499 | + echo $_lang['table_prefix_already_inuse_note'].PHP_EOL; |
|
| 500 | 500 | return; |
| 501 | 501 | } else { |
| 502 | 502 | echo $_lang['ok'].PHP_EOL; |
| 503 | 503 | } |
| 504 | 504 | } |
| 505 | 505 | |
| 506 | -if(!function_exists('parseProperties')) { |
|
| 506 | +if (!function_exists('parseProperties')) { |
|
| 507 | 507 | /** |
| 508 | 508 | * parses a resource property string and returns the result as an array |
| 509 | 509 | * duplicate of method in documentParser class |
@@ -511,20 +511,20 @@ discard block |
||
| 511 | 511 | * @param string $propertyString |
| 512 | 512 | * @return array |
| 513 | 513 | */ |
| 514 | - function parseProperties($propertyString) { |
|
| 515 | - $parameter= array (); |
|
| 514 | + function parseProperties($propertyString){ |
|
| 515 | + $parameter = array(); |
|
| 516 | 516 | if (!empty ($propertyString)) { |
| 517 | - $tmpParams= explode("&", $propertyString); |
|
| 517 | + $tmpParams = explode("&", $propertyString); |
|
| 518 | 518 | $countParams = count($tmpParams); |
| 519 | - for ($x= 0; $x < $countParams; $x++) { |
|
| 519 | + for ($x = 0; $x < $countParams; $x++) { |
|
| 520 | 520 | if (strpos($tmpParams[$x], '=', 0)) { |
| 521 | - $pTmp= explode("=", $tmpParams[$x]); |
|
| 522 | - $pvTmp= explode(";", trim($pTmp[1])); |
|
| 521 | + $pTmp = explode("=", $tmpParams[$x]); |
|
| 522 | + $pvTmp = explode(";", trim($pTmp[1])); |
|
| 523 | 523 | if ($pvTmp[1] == 'list' && $pvTmp[3] != "") |
| 524 | - $parameter[trim($pTmp[0])]= $pvTmp[3]; //list default |
|
| 524 | + $parameter[trim($pTmp[0])] = $pvTmp[3]; //list default |
|
| 525 | 525 | else |
| 526 | 526 | if ($pvTmp[1] != 'list' && $pvTmp[2] != "") |
| 527 | - $parameter[trim($pTmp[0])]= $pvTmp[2]; |
|
| 527 | + $parameter[trim($pTmp[0])] = $pvTmp[2]; |
|
| 528 | 528 | } |
| 529 | 529 | } |
| 530 | 530 | } |
@@ -535,20 +535,20 @@ discard block |
||
| 535 | 535 | // check status of Inherit Parent Template plugin |
| 536 | 536 | $auto_template_logic = 'parent'; |
| 537 | 537 | if ($installMode != 0) { |
| 538 | - $rs = mysqli_query($conn, "SELECT properties, disabled FROM $dbase.`" . $table_prefix . "site_plugins` WHERE name='Inherit Parent Template'"); |
|
| 538 | + $rs = mysqli_query($conn, "SELECT properties, disabled FROM $dbase.`".$table_prefix."site_plugins` WHERE name='Inherit Parent Template'"); |
|
| 539 | 539 | $row = mysqli_fetch_row($rs); |
| 540 | - if(!$row) { |
|
| 540 | + if (!$row) { |
|
| 541 | 541 | // not installed |
| 542 | 542 | $auto_template_logic = 'system'; |
| 543 | 543 | } else { |
| 544 | - if($row[1] == 1) { |
|
| 544 | + if ($row[1] == 1) { |
|
| 545 | 545 | // installed but disabled |
| 546 | 546 | $auto_template_logic = 'system'; |
| 547 | 547 | } else { |
| 548 | 548 | // installed, enabled .. see how it's configured |
| 549 | 549 | $properties = parseProperties($row[0]); |
| 550 | - if(isset($properties['inheritTemplate'])) { |
|
| 551 | - if($properties['inheritTemplate'] == 'From First Sibling') { |
|
| 550 | + if (isset($properties['inheritTemplate'])) { |
|
| 551 | + if ($properties['inheritTemplate'] == 'From First Sibling') { |
|
| 552 | 552 | $auto_template_logic = 'sibling'; |
| 553 | 553 | } |
| 554 | 554 | } |
@@ -570,17 +570,16 @@ discard block |
||
| 570 | 570 | |
| 571 | 571 | // setup Template template files - array : name, description, type - 0:file or 1:content, parameters, category |
| 572 | 572 | $mt = &$moduleTemplates; |
| 573 | -if(is_dir($templatePath) && is_readable($templatePath)) { |
|
| 573 | +if (is_dir($templatePath) && is_readable($templatePath)) { |
|
| 574 | 574 | $d = dir($templatePath); |
| 575 | 575 | while (false !== ($tplfile = $d->read())) |
| 576 | 576 | { |
| 577 | - if(substr($tplfile, -4) != '.tpl') continue; |
|
| 577 | + if (substr($tplfile, -4) != '.tpl') continue; |
|
| 578 | 578 | $params = parse_docblock($templatePath, $tplfile); |
| 579 | - if(is_array($params) && (count($params)>0)) |
|
| 579 | + if (is_array($params) && (count($params) > 0)) |
|
| 580 | 580 | { |
| 581 | 581 | $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}"; |
| 582 | - $mt[] = array |
|
| 583 | - ( |
|
| 582 | + $mt[] = array( |
|
| 584 | 583 | $params['name'], |
| 585 | 584 | $description, |
| 586 | 585 | // Don't think this is gonna be used ... but adding it just in case 'type' |
@@ -598,12 +597,12 @@ discard block |
||
| 598 | 597 | |
| 599 | 598 | // setup Template Variable template files |
| 600 | 599 | $mtv = &$moduleTVs; |
| 601 | -if(is_dir($tvPath) && is_readable($tvPath)) { |
|
| 600 | +if (is_dir($tvPath) && is_readable($tvPath)) { |
|
| 602 | 601 | $d = dir($tvPath); |
| 603 | 602 | while (false !== ($tplfile = $d->read())) { |
| 604 | - if(substr($tplfile, -4) != '.tpl') continue; |
|
| 603 | + if (substr($tplfile, -4) != '.tpl') continue; |
|
| 605 | 604 | $params = parse_docblock($tvPath, $tplfile); |
| 606 | - if(is_array($params) && (count($params)>0)) { |
|
| 605 | + if (is_array($params) && (count($params) > 0)) { |
|
| 607 | 606 | $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}"; |
| 608 | 607 | $mtv[] = array( |
| 609 | 608 | $params['name'], |
@@ -615,9 +614,9 @@ discard block |
||
| 615 | 614 | $params['output_widget'], |
| 616 | 615 | $params['output_widget_params'], |
| 617 | 616 | "$templatePath/{$params['filename']}", /* not currently used */ |
| 618 | - $params['template_assignments']!="*"?$params['template_assignments']:implode(",",array_map(create_function('$v','return $v[0];'),$mt)), /* comma-separated list of template names */ |
|
| 617 | + $params['template_assignments'] != "*" ? $params['template_assignments'] : implode(",", array_map(create_function('$v', 'return $v[0];'), $mt)), /* comma-separated list of template names */ |
|
| 619 | 618 | $params['modx_category'], |
| 620 | - $params['lock_tv'], /* value should be 1 or 0 */ |
|
| 619 | + $params['lock_tv'], /* value should be 1 or 0 */ |
|
| 621 | 620 | array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false |
| 622 | 621 | ); |
| 623 | 622 | } |
@@ -627,14 +626,14 @@ discard block |
||
| 627 | 626 | |
| 628 | 627 | // setup chunks template files - array : name, description, type - 0:file or 1:content, file or content |
| 629 | 628 | $mc = &$moduleChunks; |
| 630 | -if(is_dir($chunkPath) && is_readable($chunkPath)) { |
|
| 629 | +if (is_dir($chunkPath) && is_readable($chunkPath)) { |
|
| 631 | 630 | $d = dir($chunkPath); |
| 632 | 631 | while (false !== ($tplfile = $d->read())) { |
| 633 | - if(substr($tplfile, -4) != '.tpl') { |
|
| 632 | + if (substr($tplfile, -4) != '.tpl') { |
|
| 634 | 633 | continue; |
| 635 | 634 | } |
| 636 | 635 | $params = parse_docblock($chunkPath, $tplfile); |
| 637 | - if(is_array($params) && count($params) > 0) { |
|
| 636 | + if (is_array($params) && count($params) > 0) { |
|
| 638 | 637 | $mc[] = array( |
| 639 | 638 | $params['name'], |
| 640 | 639 | $params['description'], |
@@ -650,14 +649,14 @@ discard block |
||
| 650 | 649 | |
| 651 | 650 | // setup snippets template files - array : name, description, type - 0:file or 1:content, file or content,properties |
| 652 | 651 | $ms = &$moduleSnippets; |
| 653 | -if(is_dir($snippetPath) && is_readable($snippetPath)) { |
|
| 652 | +if (is_dir($snippetPath) && is_readable($snippetPath)) { |
|
| 654 | 653 | $d = dir($snippetPath); |
| 655 | 654 | while (false !== ($tplfile = $d->read())) { |
| 656 | - if(substr($tplfile, -4) != '.tpl') { |
|
| 655 | + if (substr($tplfile, -4) != '.tpl') { |
|
| 657 | 656 | continue; |
| 658 | 657 | } |
| 659 | 658 | $params = parse_docblock($snippetPath, $tplfile); |
| 660 | - if(is_array($params) && count($params) > 0) { |
|
| 659 | + if (is_array($params) && count($params) > 0) { |
|
| 661 | 660 | $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}"; |
| 662 | 661 | $ms[] = array( |
| 663 | 662 | $params['name'], |
@@ -674,14 +673,14 @@ discard block |
||
| 674 | 673 | |
| 675 | 674 | // setup plugins template files - array : name, description, type - 0:file or 1:content, file or content,properties |
| 676 | 675 | $mp = &$modulePlugins; |
| 677 | -if(is_dir($pluginPath) && is_readable($pluginPath)) { |
|
| 676 | +if (is_dir($pluginPath) && is_readable($pluginPath)) { |
|
| 678 | 677 | $d = dir($pluginPath); |
| 679 | 678 | while (false !== ($tplfile = $d->read())) { |
| 680 | - if(substr($tplfile, -4) != '.tpl') { |
|
| 679 | + if (substr($tplfile, -4) != '.tpl') { |
|
| 681 | 680 | continue; |
| 682 | 681 | } |
| 683 | 682 | $params = parse_docblock($pluginPath, $tplfile); |
| 684 | - if(is_array($params) && count($params) > 0) { |
|
| 683 | + if (is_array($params) && count($params) > 0) { |
|
| 685 | 684 | $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}"; |
| 686 | 685 | $mp[] = array( |
| 687 | 686 | $params['name'], |
@@ -693,7 +692,7 @@ discard block |
||
| 693 | 692 | $params['modx_category'], |
| 694 | 693 | $params['legacy_names'], |
| 695 | 694 | array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false, |
| 696 | - (int)$params['disabled'] |
|
| 695 | + (int) $params['disabled'] |
|
| 697 | 696 | ); |
| 698 | 697 | } |
| 699 | 698 | } |
@@ -703,14 +702,14 @@ discard block |
||
| 703 | 702 | // setup modules - array : name, description, type - 0:file or 1:content, file or content,properties, guid,enable_sharedparams |
| 704 | 703 | $mm = &$moduleModules; |
| 705 | 704 | $mdp = &$moduleDependencies; |
| 706 | -if(is_dir($modulePath) && is_readable($modulePath)) { |
|
| 705 | +if (is_dir($modulePath) && is_readable($modulePath)) { |
|
| 707 | 706 | $d = dir($modulePath); |
| 708 | 707 | while (false !== ($tplfile = $d->read())) { |
| 709 | - if(substr($tplfile, -4) != '.tpl') { |
|
| 708 | + if (substr($tplfile, -4) != '.tpl') { |
|
| 710 | 709 | continue; |
| 711 | 710 | } |
| 712 | 711 | $params = parse_docblock($modulePath, $tplfile); |
| 713 | - if(is_array($params) && count($params) > 0) { |
|
| 712 | + if (is_array($params) && count($params) > 0) { |
|
| 714 | 713 | $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}"; |
| 715 | 714 | $mm[] = array( |
| 716 | 715 | $params['name'], |
@@ -718,12 +717,12 @@ discard block |
||
| 718 | 717 | "$modulePath/{$params['filename']}", |
| 719 | 718 | $params['properties'], |
| 720 | 719 | $params['guid'], |
| 721 | - (int)$params['shareparams'], |
|
| 720 | + (int) $params['shareparams'], |
|
| 722 | 721 | $params['modx_category'], |
| 723 | 722 | array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false |
| 724 | 723 | ); |
| 725 | 724 | } |
| 726 | - if ((int)$params['shareparams'] || !empty($params['dependencies'])) { |
|
| 725 | + if ((int) $params['shareparams'] || !empty($params['dependencies'])) { |
|
| 727 | 726 | $dependencies = explode(',', $params['dependencies']); |
| 728 | 727 | foreach ($dependencies as $dependency) { |
| 729 | 728 | $dependency = explode(':', $dependency); |
@@ -794,103 +793,103 @@ discard block |
||
| 794 | 793 | // setup callback function |
| 795 | 794 | $callBackFnc = "clean_up"; |
| 796 | 795 | |
| 797 | -function clean_up($sqlParser) { |
|
| 796 | +function clean_up($sqlParser){ |
|
| 798 | 797 | $ids = array(); |
| 799 | 798 | |
| 800 | 799 | // secure web documents - privateweb |
| 801 | - mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 0 WHERE privateweb = 1"); |
|
| 802 | - $sql = "SELECT DISTINCT sc.id |
|
| 800 | + mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 0 WHERE privateweb = 1"); |
|
| 801 | + $sql = "SELECT DISTINCT sc.id |
|
| 803 | 802 | FROM `".$sqlParser->prefix."site_content` sc |
| 804 | 803 | LEFT JOIN `".$sqlParser->prefix."document_groups` dg ON dg.document = sc.id |
| 805 | 804 | LEFT JOIN `".$sqlParser->prefix."webgroup_access` wga ON wga.documentgroup = dg.document_group |
| 806 | 805 | WHERE wga.id>0"; |
| 807 | - $ds = mysqli_query($sqlParser->conn,$sql); |
|
| 808 | - if(!$ds) { |
|
| 806 | + $ds = mysqli_query($sqlParser->conn, $sql); |
|
| 807 | + if (!$ds) { |
|
| 809 | 808 | echo "An error occurred while executing a query: ".mysqli_error($sqlParser->conn); |
| 810 | 809 | } |
| 811 | 810 | else { |
| 812 | - while($r = mysqli_fetch_assoc($ds)) $ids[]=$r["id"]; |
|
| 813 | - if(count($ids)>0) { |
|
| 814 | - mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 1 WHERE id IN (".implode(", ",$ids).")"); |
|
| 811 | + while ($r = mysqli_fetch_assoc($ds)) $ids[] = $r["id"]; |
|
| 812 | + if (count($ids) > 0) { |
|
| 813 | + mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 1 WHERE id IN (".implode(", ", $ids).")"); |
|
| 815 | 814 | unset($ids); |
| 816 | 815 | } |
| 817 | 816 | } |
| 818 | 817 | |
| 819 | 818 | // secure manager documents privatemgr |
| 820 | - mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 0 WHERE privatemgr = 1"); |
|
| 821 | - $sql = "SELECT DISTINCT sc.id |
|
| 819 | + mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 0 WHERE privatemgr = 1"); |
|
| 820 | + $sql = "SELECT DISTINCT sc.id |
|
| 822 | 821 | FROM `".$sqlParser->prefix."site_content` sc |
| 823 | 822 | LEFT JOIN `".$sqlParser->prefix."document_groups` dg ON dg.document = sc.id |
| 824 | 823 | LEFT JOIN `".$sqlParser->prefix."membergroup_access` mga ON mga.documentgroup = dg.document_group |
| 825 | 824 | WHERE mga.id>0"; |
| 826 | - $ds = mysqli_query($sqlParser->conn,$sql); |
|
| 827 | - if(!$ds) { |
|
| 825 | + $ds = mysqli_query($sqlParser->conn, $sql); |
|
| 826 | + if (!$ds) { |
|
| 828 | 827 | echo "An error occurred while executing a query: ".mysqli_error($sqlParser->conn); |
| 829 | 828 | } |
| 830 | 829 | else { |
| 831 | - while($r = mysqli_fetch_assoc($ds)) $ids[]=$r["id"]; |
|
| 832 | - if(count($ids)>0) { |
|
| 833 | - mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 1 WHERE id IN (".implode(", ",$ids).")"); |
|
| 830 | + while ($r = mysqli_fetch_assoc($ds)) $ids[] = $r["id"]; |
|
| 831 | + if (count($ids) > 0) { |
|
| 832 | + mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 1 WHERE id IN (".implode(", ", $ids).")"); |
|
| 834 | 833 | unset($ids); |
| 835 | 834 | } |
| 836 | 835 | } |
| 837 | 836 | } |
| 838 | 837 | |
| 839 | -function parse_docblock($element_dir, $filename) { |
|
| 838 | +function parse_docblock($element_dir, $filename){ |
|
| 840 | 839 | $params = array(); |
| 841 | - $fullpath = $element_dir . '/' . $filename; |
|
| 842 | - if(is_readable($fullpath)) { |
|
| 840 | + $fullpath = $element_dir.'/'.$filename; |
|
| 841 | + if (is_readable($fullpath)) { |
|
| 843 | 842 | $tpl = @fopen($fullpath, "r"); |
| 844 | - if($tpl) { |
|
| 843 | + if ($tpl) { |
|
| 845 | 844 | $params['filename'] = $filename; |
| 846 | 845 | $docblock_start_found = false; |
| 847 | 846 | $name_found = false; |
| 848 | 847 | $description_found = false; |
| 849 | 848 | |
| 850 | - while(!feof($tpl)) { |
|
| 849 | + while (!feof($tpl)) { |
|
| 851 | 850 | $line = fgets($tpl); |
| 852 | - if(!$docblock_start_found) { |
|
| 851 | + if (!$docblock_start_found) { |
|
| 853 | 852 | // find docblock start |
| 854 | - if(strpos($line, '/**') !== false) { |
|
| 853 | + if (strpos($line, '/**') !== false) { |
|
| 855 | 854 | $docblock_start_found = true; |
| 856 | 855 | } |
| 857 | 856 | continue; |
| 858 | - } elseif(!$name_found) { |
|
| 857 | + } elseif (!$name_found) { |
|
| 859 | 858 | // find name |
| 860 | 859 | $ma = null; |
| 861 | - if(preg_match("/^\s+\*\s+(.+)/", $line, $ma)) { |
|
| 860 | + if (preg_match("/^\s+\*\s+(.+)/", $line, $ma)) { |
|
| 862 | 861 | $params['name'] = trim($ma[1]); |
| 863 | 862 | $name_found = !empty($params['name']); |
| 864 | 863 | } |
| 865 | 864 | continue; |
| 866 | - } elseif(!$description_found) { |
|
| 865 | + } elseif (!$description_found) { |
|
| 867 | 866 | // find description |
| 868 | 867 | $ma = null; |
| 869 | - if(preg_match("/^\s+\*\s+(.+)/", $line, $ma)) { |
|
| 868 | + if (preg_match("/^\s+\*\s+(.+)/", $line, $ma)) { |
|
| 870 | 869 | $params['description'] = trim($ma[1]); |
| 871 | 870 | $description_found = !empty($params['description']); |
| 872 | 871 | } |
| 873 | 872 | continue; |
| 874 | 873 | } else { |
| 875 | 874 | $ma = null; |
| 876 | - if(preg_match("/^\s+\*\s+\@([^\s]+)\s+(.+)/", $line, $ma)) { |
|
| 875 | + if (preg_match("/^\s+\*\s+\@([^\s]+)\s+(.+)/", $line, $ma)) { |
|
| 877 | 876 | $param = trim($ma[1]); |
| 878 | 877 | $val = trim($ma[2]); |
| 879 | - if(!empty($param) && !empty($val)) { |
|
| 880 | - if($param == 'internal') { |
|
| 878 | + if (!empty($param) && !empty($val)) { |
|
| 879 | + if ($param == 'internal') { |
|
| 881 | 880 | $ma = null; |
| 882 | - if(preg_match("/\@([^\s]+)\s+(.+)/", $val, $ma)) { |
|
| 881 | + if (preg_match("/\@([^\s]+)\s+(.+)/", $val, $ma)) { |
|
| 883 | 882 | $param = trim($ma[1]); |
| 884 | 883 | $val = trim($ma[2]); |
| 885 | 884 | } |
| 886 | 885 | //if($val !== '0' && (empty($param) || empty($val))) { |
| 887 | - if(empty($param)) { |
|
| 886 | + if (empty($param)) { |
|
| 888 | 887 | continue; |
| 889 | 888 | } |
| 890 | 889 | } |
| 891 | 890 | $params[$param] = $val; |
| 892 | 891 | } |
| 893 | - } elseif(preg_match("/^\s*\*\/\s*$/", $line)) { |
|
| 892 | + } elseif (preg_match("/^\s*\*\/\s*$/", $line)) { |
|
| 894 | 893 | break; |
| 895 | 894 | } |
| 896 | 895 | } |
@@ -921,13 +920,13 @@ discard block |
||
| 921 | 920 | // display database results |
| 922 | 921 | if ($sqlParser->installFailed == true) { |
| 923 | 922 | $errors += 1; |
| 924 | - echo $_lang['database_alerts'] . PHP_EOL; |
|
| 925 | - echo $_lang['setup_couldnt_install'] . PHP_EOL; |
|
| 926 | - echo $_lang['installation_error_occured'] . PHP_EOL; |
|
| 923 | + echo $_lang['database_alerts'].PHP_EOL; |
|
| 924 | + echo $_lang['setup_couldnt_install'].PHP_EOL; |
|
| 925 | + echo $_lang['installation_error_occured'].PHP_EOL; |
|
| 927 | 926 | for ($i = 0; $i < count($sqlParser->mysqlErrors); $i++) { |
| 928 | - echo $sqlParser->mysqlErrors[$i]["error"] . " " . $_lang['during_execution_of_sql'] . " " . strip_tags($sqlParser->mysqlErrors[$i]["sql"]) . PHP_EOL; |
|
| 927 | + echo $sqlParser->mysqlErrors[$i]["error"]." ".$_lang['during_execution_of_sql']." ".strip_tags($sqlParser->mysqlErrors[$i]["sql"]).PHP_EOL; |
|
| 929 | 928 | } |
| 930 | - echo $_lang['some_tables_not_updated'] . PHP_EOL; |
|
| 929 | + echo $_lang['some_tables_not_updated'].PHP_EOL; |
|
| 931 | 930 | die(); |
| 932 | 931 | } else { |
| 933 | 932 | echo $_lang['ok'].PHP_EOL; |
@@ -937,7 +936,7 @@ discard block |
||
| 937 | 936 | // custom or not |
| 938 | 937 | if (file_exists($path."../assets/cache/siteManager.php")) { |
| 939 | 938 | $mgrdir = 'include_once(dirname(__FILE__)."/../../assets/cache/siteManager.php");'; |
| 940 | -}else{ |
|
| 939 | +} else { |
|
| 941 | 940 | $mgrdir = 'define(\'MGR_DIR\', \'manager\');'; |
| 942 | 941 | } |
| 943 | 942 | |
@@ -974,16 +973,16 @@ discard block |
||
| 974 | 973 | $chmodSuccess = @chmod($filename, 0404); |
| 975 | 974 | |
| 976 | 975 | if ($configFileFailed == true) { |
| 977 | - echo $_lang['failed'] . PHP_EOL; |
|
| 976 | + echo $_lang['failed'].PHP_EOL; |
|
| 978 | 977 | $errors += 1; |
| 979 | 978 | |
| 980 | - echo $_lang['cant_write_config_file'] . ' ' . MGR_DIR .'/includes/config.inc.php' .PHP_EOL; |
|
| 979 | + echo $_lang['cant_write_config_file'].' '.MGR_DIR.'/includes/config.inc.php'.PHP_EOL; |
|
| 981 | 980 | echo ' '.PHP_EOL; |
| 982 | 981 | echo ' '.PHP_EOL; |
| 983 | 982 | echo $configString; |
| 984 | 983 | echo ' '.PHP_EOL; |
| 985 | 984 | echo ' '.PHP_EOL; |
| 986 | - echo $_lang['cant_write_config_file_note'] . PHP_EOL; |
|
| 985 | + echo $_lang['cant_write_config_file_note'].PHP_EOL; |
|
| 987 | 986 | die(); |
| 988 | 987 | |
| 989 | 988 | } else { |
@@ -993,16 +992,16 @@ discard block |
||
| 993 | 992 | // generate new site_id and set manager theme to default |
| 994 | 993 | if ($installMode == 0) { |
| 995 | 994 | $siteid = uniqid(''); |
| 996 | - mysqli_query($sqlParser->conn, "REPLACE INTO $dbase.`" . $table_prefix . "system_settings` (setting_name,setting_value) VALUES('site_id','$siteid'),('manager_theme','default')"); |
|
| 995 | + mysqli_query($sqlParser->conn, "REPLACE INTO $dbase.`".$table_prefix."system_settings` (setting_name,setting_value) VALUES('site_id','$siteid'),('manager_theme','default')"); |
|
| 997 | 996 | } else { |
| 998 | 997 | // update site_id if missing |
| 999 | - $ds = mysqli_query($sqlParser->conn, "SELECT setting_name,setting_value FROM $dbase.`" . $table_prefix . "system_settings` WHERE setting_name='site_id'"); |
|
| 998 | + $ds = mysqli_query($sqlParser->conn, "SELECT setting_name,setting_value FROM $dbase.`".$table_prefix."system_settings` WHERE setting_name='site_id'"); |
|
| 1000 | 999 | if ($ds) { |
| 1001 | 1000 | $r = mysqli_fetch_assoc($ds); |
| 1002 | 1001 | $siteid = $r['setting_value']; |
| 1003 | 1002 | if ($siteid == '' || $siteid = 'MzGeQ2faT4Dw06+U49x3') { |
| 1004 | 1003 | $siteid = uniqid(''); |
| 1005 | - mysqli_query($sqlParser->conn, "REPLACE INTO $dbase.`" . $table_prefix . "system_settings` (setting_name,setting_value) VALUES('site_id','$siteid')"); |
|
| 1004 | + mysqli_query($sqlParser->conn, "REPLACE INTO $dbase.`".$table_prefix."system_settings` (setting_name,setting_value) VALUES('site_id','$siteid')"); |
|
| 1006 | 1005 | } |
| 1007 | 1006 | } |
| 1008 | 1007 | } |
@@ -1014,29 +1013,29 @@ discard block |
||
| 1014 | 1013 | // display database results |
| 1015 | 1014 | if ($sqlParser->installFailed == true) { |
| 1016 | 1015 | $errors += 1; |
| 1017 | - echo $_lang['database_alerts'] . PHP_EOL; |
|
| 1018 | - echo $_lang['setup_couldnt_install'] . PHP_EOL; |
|
| 1019 | - echo $_lang['installation_error_occured'] . PHP_EOL . PHP_EOL; |
|
| 1016 | + echo $_lang['database_alerts'].PHP_EOL; |
|
| 1017 | + echo $_lang['setup_couldnt_install'].PHP_EOL; |
|
| 1018 | + echo $_lang['installation_error_occured'].PHP_EOL.PHP_EOL; |
|
| 1020 | 1019 | /* |
| 1021 | 1020 | for ($i = 0; $i < count($sqlParser->mysqlErrors); $i++) { |
| 1022 | 1021 | echo "<em>" . $sqlParser->mysqlErrors[$i]["error"] . "</em>" . $_lang['during_execution_of_sql'] . "<span class='mono'>" . strip_tags($sqlParser->mysqlErrors[$i]["sql"]) . "</span>.<hr />"; |
| 1023 | 1022 | } |
| 1024 | 1023 | echo "</p>";*/ |
| 1025 | - echo $_lang['some_tables_not_updated'] . PHP_EOL; |
|
| 1024 | + echo $_lang['some_tables_not_updated'].PHP_EOL; |
|
| 1026 | 1025 | die(); |
| 1027 | 1026 | } else { |
| 1028 | - echo $_lang['ok'] . PHP_EOL; |
|
| 1027 | + echo $_lang['ok'].PHP_EOL; |
|
| 1029 | 1028 | } |
| 1030 | 1029 | } |
| 1031 | 1030 | |
| 1032 | 1031 | // Install Templates |
| 1033 | 1032 | $moduleTemplate = $mt; |
| 1034 | 1033 | if (!empty($moduleTemplate) || $installData) { |
| 1035 | - echo PHP_EOL . $_lang['templates'] . ":" . PHP_EOL; |
|
| 1034 | + echo PHP_EOL.$_lang['templates'].":".PHP_EOL; |
|
| 1036 | 1035 | //$selTemplates = $_POST['template']; |
| 1037 | 1036 | foreach ($moduleTemplates as $k=>$moduleTemplate) { |
| 1038 | 1037 | $installSample = in_array('sample', $moduleTemplate[6]) && $installData == 1; |
| 1039 | - if($installSample || is_array($moduleTemplate)) { |
|
| 1038 | + if ($installSample || is_array($moduleTemplate)) { |
|
| 1040 | 1039 | $name = mysqli_real_escape_string($conn, $moduleTemplate[0]); |
| 1041 | 1040 | $desc = mysqli_real_escape_string($conn, $moduleTemplate[1]); |
| 1042 | 1041 | $category = mysqli_real_escape_string($conn, $moduleTemplate[4]); |
@@ -1044,7 +1043,7 @@ discard block |
||
| 1044 | 1043 | $filecontent = $moduleTemplate[3]; |
| 1045 | 1044 | $save_sql_id_as = $moduleTemplate[7]; // Nessecary for demo-site |
| 1046 | 1045 | if (!file_exists($filecontent)) { |
| 1047 | - echo " $name: " . $_lang['unable_install_template'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL; |
|
| 1046 | + echo " $name: ".$_lang['unable_install_template']." '$filecontent' ".$_lang['not_found'].PHP_EOL; |
|
| 1048 | 1047 | } else { |
| 1049 | 1048 | // Create the category if it does not already exist |
| 1050 | 1049 | $category_id = getCreateDbCategory($category, $sqlParser); |
@@ -1054,31 +1053,31 @@ discard block |
||
| 1054 | 1053 | $template = mysqli_real_escape_string($conn, $template); |
| 1055 | 1054 | |
| 1056 | 1055 | // See if the template already exists |
| 1057 | - $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_templates` WHERE templatename='$name'"); |
|
| 1056 | + $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_templates` WHERE templatename='$name'"); |
|
| 1058 | 1057 | |
| 1059 | 1058 | if (mysqli_num_rows($rs)) { |
| 1060 | - if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_templates` SET content='$template', description='$desc', category=$category_id, locked='$locked' WHERE templatename='$name' LIMIT 1;")) { |
|
| 1059 | + if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_templates` SET content='$template', description='$desc', category=$category_id, locked='$locked' WHERE templatename='$name' LIMIT 1;")) { |
|
| 1061 | 1060 | $errors += 1; |
| 1062 | - echo mysqli_error($sqlParser->conn) . PHP_EOL; |
|
| 1061 | + echo mysqli_error($sqlParser->conn).PHP_EOL; |
|
| 1063 | 1062 | return; |
| 1064 | 1063 | } |
| 1065 | - if(!is_null($save_sql_id_as)) { |
|
| 1064 | + if (!is_null($save_sql_id_as)) { |
|
| 1066 | 1065 | $sql_id = @mysqli_insert_id($sqlParser->conn); |
| 1067 | - if(!$sql_id) { |
|
| 1068 | - $idQuery = mysqli_fetch_assoc(mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`" . $table_prefix . "site_templates` WHERE templatename='$name' LIMIT 1;")); |
|
| 1066 | + if (!$sql_id) { |
|
| 1067 | + $idQuery = mysqli_fetch_assoc(mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_templates` WHERE templatename='$name' LIMIT 1;")); |
|
| 1069 | 1068 | $sql_id = $idQuery['id']; |
| 1070 | 1069 | } |
| 1071 | 1070 | $custom_placeholders[$save_sql_id_as] = $sql_id; |
| 1072 | 1071 | } |
| 1073 | - echo " $name: " . $_lang['upgraded'] . PHP_EOL; |
|
| 1072 | + echo " $name: ".$_lang['upgraded'].PHP_EOL; |
|
| 1074 | 1073 | } else { |
| 1075 | - if (!@ mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_templates` (templatename,description,content,category,locked) VALUES('$name','$desc','$template',$category_id,'$locked');")) { |
|
| 1074 | + if (!@ mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_templates` (templatename,description,content,category,locked) VALUES('$name','$desc','$template',$category_id,'$locked');")) { |
|
| 1076 | 1075 | $errors += 1; |
| 1077 | - echo mysqli_error($sqlParser->conn) . PHP_EOL; |
|
| 1076 | + echo mysqli_error($sqlParser->conn).PHP_EOL; |
|
| 1078 | 1077 | die(); |
| 1079 | 1078 | } |
| 1080 | - if(!is_null($save_sql_id_as)) $custom_placeholders[$save_sql_id_as] = @mysqli_insert_id($sqlParser->conn); |
|
| 1081 | - echo " $name: " . $_lang['installed'] . PHP_EOL; |
|
| 1079 | + if (!is_null($save_sql_id_as)) $custom_placeholders[$save_sql_id_as] = @mysqli_insert_id($sqlParser->conn); |
|
| 1080 | + echo " $name: ".$_lang['installed'].PHP_EOL; |
|
| 1082 | 1081 | } |
| 1083 | 1082 | } |
| 1084 | 1083 | } |
@@ -1088,11 +1087,11 @@ discard block |
||
| 1088 | 1087 | // Install Template Variables |
| 1089 | 1088 | $moduleTVs = $mtv; |
| 1090 | 1089 | if (is_array($moduleTVs) || $installData) { |
| 1091 | - echo PHP_EOL . $_lang['tvs'].': '.PHP_EOL; |
|
| 1090 | + echo PHP_EOL.$_lang['tvs'].': '.PHP_EOL; |
|
| 1092 | 1091 | //$selTVs = $_POST['tv']; |
| 1093 | 1092 | foreach ($moduleTVs as $k=>$moduleTV) { |
| 1094 | 1093 | $installSample = in_array('sample', $moduleTV[12]) && $installData == 1; |
| 1095 | - if($installSample || is_array($moduleTVs)) { |
|
| 1094 | + if ($installSample || is_array($moduleTVs)) { |
|
| 1096 | 1095 | $name = mysqli_real_escape_string($conn, $moduleTV[0]); |
| 1097 | 1096 | $caption = mysqli_real_escape_string($conn, $moduleTV[1]); |
| 1098 | 1097 | $desc = mysqli_real_escape_string($conn, $moduleTV[2]); |
@@ -1110,24 +1109,24 @@ discard block |
||
| 1110 | 1109 | // Create the category if it does not already exist |
| 1111 | 1110 | $category = getCreateDbCategory($category, $sqlParser); |
| 1112 | 1111 | |
| 1113 | - $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_tmplvars` WHERE name='$name'"); |
|
| 1112 | + $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_tmplvars` WHERE name='$name'"); |
|
| 1114 | 1113 | if (mysqli_num_rows($rs)) { |
| 1115 | 1114 | $insert = true; |
| 1116 | - while($row = mysqli_fetch_assoc($rs)) { |
|
| 1117 | - if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_tmplvars` SET type='$input_type', caption='$caption', description='$desc', category=$category, locked=$locked, elements='$input_options', display='$output_widget', display_params='$output_widget_params', default_text='$input_default' WHERE id={$row['id']};")) { |
|
| 1118 | - echo mysqli_error($sqlParser->conn) . PHP_EOL; |
|
| 1115 | + while ($row = mysqli_fetch_assoc($rs)) { |
|
| 1116 | + if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_tmplvars` SET type='$input_type', caption='$caption', description='$desc', category=$category, locked=$locked, elements='$input_options', display='$output_widget', display_params='$output_widget_params', default_text='$input_default' WHERE id={$row['id']};")) { |
|
| 1117 | + echo mysqli_error($sqlParser->conn).PHP_EOL; |
|
| 1119 | 1118 | return; |
| 1120 | 1119 | } |
| 1121 | 1120 | $insert = false; |
| 1122 | 1121 | } |
| 1123 | - echo " $name: " . $_lang['upgraded'] . PHP_EOL; |
|
| 1122 | + echo " $name: ".$_lang['upgraded'].PHP_EOL; |
|
| 1124 | 1123 | } else { |
| 1125 | - $q = "INSERT INTO $dbase.`" . $table_prefix . "site_tmplvars` (type,name,caption,description,category,locked,elements,display,display_params,default_text) VALUES('$input_type','$name','$caption','$desc',$category,$locked,'$input_options','$output_widget','$output_widget_params','$input_default');"; |
|
| 1124 | + $q = "INSERT INTO $dbase.`".$table_prefix."site_tmplvars` (type,name,caption,description,category,locked,elements,display,display_params,default_text) VALUES('$input_type','$name','$caption','$desc',$category,$locked,'$input_options','$output_widget','$output_widget_params','$input_default');"; |
|
| 1126 | 1125 | if (!mysqli_query($sqlParser->conn, $q)) { |
| 1127 | - echo mysqli_error($sqlParser->conn) . PHP_EOL; |
|
| 1126 | + echo mysqli_error($sqlParser->conn).PHP_EOL; |
|
| 1128 | 1127 | return; |
| 1129 | 1128 | } |
| 1130 | - echo " $name: " . $_lang['installed'] . PHP_EOL; |
|
| 1129 | + echo " $name: ".$_lang['installed'].PHP_EOL; |
|
| 1131 | 1130 | } |
| 1132 | 1131 | |
| 1133 | 1132 | // add template assignments |
@@ -1136,10 +1135,10 @@ discard block |
||
| 1136 | 1135 | if (count($assignments) > 0) { |
| 1137 | 1136 | |
| 1138 | 1137 | // remove existing tv -> template assignments |
| 1139 | - $ds=mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_tmplvars` WHERE name='$name' AND description='$desc';"); |
|
| 1138 | + $ds = mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_tmplvars` WHERE name='$name' AND description='$desc';"); |
|
| 1140 | 1139 | $row = mysqli_fetch_assoc($ds); |
| 1141 | 1140 | $id = $row["id"]; |
| 1142 | - mysqli_query($sqlParser->conn, 'DELETE FROM ' . $dbase . '.`' . $table_prefix . 'site_tmplvar_templates` WHERE tmplvarid = \'' . $id . '\''); |
|
| 1141 | + mysqli_query($sqlParser->conn, 'DELETE FROM '.$dbase.'.`'.$table_prefix.'site_tmplvar_templates` WHERE tmplvarid = \''.$id.'\''); |
|
| 1143 | 1142 | |
| 1144 | 1143 | // add tv -> template assignments |
| 1145 | 1144 | foreach ($assignments as $assignment) { |
@@ -1148,7 +1147,7 @@ discard block |
||
| 1148 | 1147 | if ($ds && $ts) { |
| 1149 | 1148 | $tRow = mysqli_fetch_assoc($ts); |
| 1150 | 1149 | $templateId = $tRow['id']; |
| 1151 | - mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_tmplvar_templates` (tmplvarid, templateid) VALUES($id, $templateId)"); |
|
| 1150 | + mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_tmplvar_templates` (tmplvarid, templateid) VALUES($id, $templateId)"); |
|
| 1152 | 1151 | } |
| 1153 | 1152 | } |
| 1154 | 1153 | } |
@@ -1159,12 +1158,12 @@ discard block |
||
| 1159 | 1158 | |
| 1160 | 1159 | $moduleChunks = $mc; |
| 1161 | 1160 | // Install Chunks |
| 1162 | -if (is_array ($moduleChunks) || $installData) { |
|
| 1163 | - echo PHP_EOL . $_lang['chunks'] . ": " . PHP_EOL; |
|
| 1161 | +if (is_array($moduleChunks) || $installData) { |
|
| 1162 | + echo PHP_EOL.$_lang['chunks'].": ".PHP_EOL; |
|
| 1164 | 1163 | foreach ($moduleChunks as $k=>$moduleChunk) { |
| 1165 | 1164 | $installSample = in_array('sample', $moduleChunk[5]) && $installData == 1; |
| 1166 | 1165 | $count_new_name = 0; |
| 1167 | - if($installSample || is_array ($moduleChunks)) { |
|
| 1166 | + if ($installSample || is_array($moduleChunks)) { |
|
| 1168 | 1167 | |
| 1169 | 1168 | $name = mysqli_real_escape_string($conn, $moduleChunk[0]); |
| 1170 | 1169 | $desc = mysqli_real_escape_string($conn, $moduleChunk[1]); |
@@ -1173,7 +1172,7 @@ discard block |
||
| 1173 | 1172 | $filecontent = $moduleChunk[2]; |
| 1174 | 1173 | |
| 1175 | 1174 | if (!file_exists($filecontent)) |
| 1176 | - echo " $name: " . $_lang['unable_install_chunk'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL; |
|
| 1175 | + echo " $name: ".$_lang['unable_install_chunk']." '$filecontent' ".$_lang['not_found'].PHP_EOL; |
|
| 1177 | 1176 | else { |
| 1178 | 1177 | |
| 1179 | 1178 | // Create the category if it does not already exist |
@@ -1181,31 +1180,31 @@ discard block |
||
| 1181 | 1180 | |
| 1182 | 1181 | $chunk = preg_replace("/^.*?\/\*\*.*?\*\/\s+/s", '', file_get_contents($filecontent), 1); |
| 1183 | 1182 | $chunk = mysqli_real_escape_string($conn, $chunk); |
| 1184 | - $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_htmlsnippets` WHERE name='$name'"); |
|
| 1183 | + $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_htmlsnippets` WHERE name='$name'"); |
|
| 1185 | 1184 | $count_original_name = mysqli_num_rows($rs); |
| 1186 | - if($overwrite == 'false') { |
|
| 1187 | - $newname = $name . '-' . str_replace('.', '_', $modx_version); |
|
| 1188 | - $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_htmlsnippets` WHERE name='$newname'"); |
|
| 1185 | + if ($overwrite == 'false') { |
|
| 1186 | + $newname = $name.'-'.str_replace('.', '_', $modx_version); |
|
| 1187 | + $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_htmlsnippets` WHERE name='$newname'"); |
|
| 1189 | 1188 | $count_new_name = mysqli_num_rows($rs); |
| 1190 | 1189 | } |
| 1191 | 1190 | $update = $count_original_name > 0 && $overwrite == 'true'; |
| 1192 | 1191 | if ($update) { |
| 1193 | - if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_htmlsnippets` SET snippet='$chunk', description='$desc', category=$category_id WHERE name='$name';")) { |
|
| 1192 | + if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_htmlsnippets` SET snippet='$chunk', description='$desc', category=$category_id WHERE name='$name';")) { |
|
| 1194 | 1193 | $errors += 1; |
| 1195 | - echo mysqli_error($sqlParser->conn) . PHP_EOL; |
|
| 1194 | + echo mysqli_error($sqlParser->conn).PHP_EOL; |
|
| 1196 | 1195 | return; |
| 1197 | 1196 | } |
| 1198 | - echo " $name: " . $_lang['upgraded'] . PHP_EOL; |
|
| 1199 | - } elseif($count_new_name == 0) { |
|
| 1200 | - if($count_original_name > 0 && $overwrite == 'false') { |
|
| 1197 | + echo " $name: ".$_lang['upgraded'].PHP_EOL; |
|
| 1198 | + } elseif ($count_new_name == 0) { |
|
| 1199 | + if ($count_original_name > 0 && $overwrite == 'false') { |
|
| 1201 | 1200 | $name = $newname; |
| 1202 | 1201 | } |
| 1203 | - if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_htmlsnippets` (name,description,snippet,category) VALUES('$name','$desc','$chunk',$category_id);")) { |
|
| 1202 | + if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_htmlsnippets` (name,description,snippet,category) VALUES('$name','$desc','$chunk',$category_id);")) { |
|
| 1204 | 1203 | $errors += 1; |
| 1205 | - echo mysqli_error($sqlParser->conn) . PHP_EOL; |
|
| 1204 | + echo mysqli_error($sqlParser->conn).PHP_EOL; |
|
| 1206 | 1205 | return; |
| 1207 | 1206 | } |
| 1208 | - echo " $name: " . $_lang['installed'] . PHP_EOL; |
|
| 1207 | + echo " $name: ".$_lang['installed'].PHP_EOL; |
|
| 1209 | 1208 | } |
| 1210 | 1209 | } |
| 1211 | 1210 | } |
@@ -1215,11 +1214,11 @@ discard block |
||
| 1215 | 1214 | // Install Modules |
| 1216 | 1215 | $moduleModules = $mm; |
| 1217 | 1216 | if (is_array($moduleModules) || $installData) { |
| 1218 | - echo PHP_EOL . $_lang['modules'] . ":" . PHP_EOL; |
|
| 1217 | + echo PHP_EOL.$_lang['modules'].":".PHP_EOL; |
|
| 1219 | 1218 | //$selModules = $_POST['module']; |
| 1220 | 1219 | foreach ($moduleModules as $k=>$moduleModule) { |
| 1221 | 1220 | $installSample = in_array('sample', $moduleModule[7]) && $installData == 1; |
| 1222 | - if($installSample || is_array($moduleModules)) { |
|
| 1221 | + if ($installSample || is_array($moduleModules)) { |
|
| 1223 | 1222 | $name = mysqli_real_escape_string($conn, $moduleModule[0]); |
| 1224 | 1223 | $desc = mysqli_real_escape_string($conn, $moduleModule[1]); |
| 1225 | 1224 | $filecontent = $moduleModule[2]; |
@@ -1228,7 +1227,7 @@ discard block |
||
| 1228 | 1227 | $shared = mysqli_real_escape_string($conn, $moduleModule[5]); |
| 1229 | 1228 | $category = mysqli_real_escape_string($conn, $moduleModule[6]); |
| 1230 | 1229 | if (!file_exists($filecontent)) |
| 1231 | - echo " $name: " . $_lang['unable_install_module'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL; |
|
| 1230 | + echo " $name: ".$_lang['unable_install_module']." '$filecontent' ".$_lang['not_found'].PHP_EOL; |
|
| 1232 | 1231 | else { |
| 1233 | 1232 | |
| 1234 | 1233 | // Create the category if it does not already exist |
@@ -1237,24 +1236,24 @@ discard block |
||
| 1237 | 1236 | $module = end(preg_split("/(\/\/)?\s*\<\?php/", file_get_contents($filecontent), 2)); |
| 1238 | 1237 | // $module = removeDocblock($module, 'module'); // Modules have no fileBinding, keep docblock for info-tab |
| 1239 | 1238 | $module = mysqli_real_escape_string($conn, $module); |
| 1240 | - $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_modules` WHERE name='$name'"); |
|
| 1239 | + $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_modules` WHERE name='$name'"); |
|
| 1241 | 1240 | if (mysqli_num_rows($rs)) { |
| 1242 | 1241 | $row = mysqli_fetch_assoc($rs); |
| 1243 | - $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties'])); |
|
| 1244 | - if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_modules` SET modulecode='$module', description='$desc', properties='$props', enable_sharedparams='$shared' WHERE name='$name';")) { |
|
| 1245 | - echo mysqli_error($sqlParser->conn) . PHP_EOL; |
|
| 1242 | + $props = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties'])); |
|
| 1243 | + if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_modules` SET modulecode='$module', description='$desc', properties='$props', enable_sharedparams='$shared' WHERE name='$name';")) { |
|
| 1244 | + echo mysqli_error($sqlParser->conn).PHP_EOL; |
|
| 1246 | 1245 | return; |
| 1247 | 1246 | } |
| 1248 | - echo " $name: " . $_lang['upgraded'] . PHP_EOL; |
|
| 1247 | + echo " $name: ".$_lang['upgraded'].PHP_EOL; |
|
| 1249 | 1248 | } else { |
| 1250 | - if ($properties != NULL ){ |
|
| 1249 | + if ($properties != NULL) { |
|
| 1251 | 1250 | $properties = mysqli_real_escape_string($conn, parseProperties($properties, true)); |
| 1252 | 1251 | } |
| 1253 | - if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_modules` (name,description,modulecode,properties,guid,enable_sharedparams,category) VALUES('$name','$desc','$module','$properties','$guid','$shared', $category);")) { |
|
| 1254 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 1252 | + if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_modules` (name,description,modulecode,properties,guid,enable_sharedparams,category) VALUES('$name','$desc','$module','$properties','$guid','$shared', $category);")) { |
|
| 1253 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 1255 | 1254 | return; |
| 1256 | 1255 | } |
| 1257 | - echo " $name: " . $_lang['installed'] . PHP_EOL; |
|
| 1256 | + echo " $name: ".$_lang['installed'].PHP_EOL; |
|
| 1258 | 1257 | } |
| 1259 | 1258 | } |
| 1260 | 1259 | } |
@@ -1264,11 +1263,11 @@ discard block |
||
| 1264 | 1263 | // Install Plugins |
| 1265 | 1264 | $modulePlugins = $mp; |
| 1266 | 1265 | if (is_array($modulePlugins) || $installData) { |
| 1267 | - echo PHP_EOL . $_lang['plugins'] . ":" . PHP_EOL; |
|
| 1266 | + echo PHP_EOL.$_lang['plugins'].":".PHP_EOL; |
|
| 1268 | 1267 | $selPlugs = $_POST['plugin']; |
| 1269 | 1268 | foreach ($modulePlugins as $k=>$modulePlugin) { |
| 1270 | 1269 | //$installSample = in_array('sample', $modulePlugin[8]) && $installData == 1; |
| 1271 | - if($installSample || is_array($modulePlugins)) { |
|
| 1270 | + if ($installSample || is_array($modulePlugins)) { |
|
| 1272 | 1271 | $name = mysqli_real_escape_string($conn, $modulePlugin[0]); |
| 1273 | 1272 | $desc = mysqli_real_escape_string($conn, $modulePlugin[1]); |
| 1274 | 1273 | $filecontent = $modulePlugin[2]; |
@@ -1278,17 +1277,17 @@ discard block |
||
| 1278 | 1277 | $category = mysqli_real_escape_string($conn, $modulePlugin[6]); |
| 1279 | 1278 | $leg_names = ''; |
| 1280 | 1279 | $disabled = $modulePlugin[9]; |
| 1281 | - if(array_key_exists(7, $modulePlugin)) { |
|
| 1280 | + if (array_key_exists(7, $modulePlugin)) { |
|
| 1282 | 1281 | // parse comma-separated legacy names and prepare them for sql IN clause |
| 1283 | - $leg_names = "'" . implode("','", preg_split('/\s*,\s*/', mysqli_real_escape_string($conn, $modulePlugin[7]))) . "'"; |
|
| 1282 | + $leg_names = "'".implode("','", preg_split('/\s*,\s*/', mysqli_real_escape_string($conn, $modulePlugin[7])))."'"; |
|
| 1284 | 1283 | } |
| 1285 | 1284 | if (!file_exists($filecontent)) |
| 1286 | - echo " $name: " . $_lang['unable_install_plugin'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL; |
|
| 1285 | + echo " $name: ".$_lang['unable_install_plugin']." '$filecontent' ".$_lang['not_found'].PHP_EOL; |
|
| 1287 | 1286 | else { |
| 1288 | 1287 | |
| 1289 | 1288 | // disable legacy versions based on legacy_names provided |
| 1290 | - if(!empty($leg_names)) { |
|
| 1291 | - $update_query = "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE name IN ($leg_names);"; |
|
| 1289 | + if (!empty($leg_names)) { |
|
| 1290 | + $update_query = "UPDATE $dbase.`".$table_prefix."site_plugins` SET disabled='1' WHERE name IN ($leg_names);"; |
|
| 1292 | 1291 | $rs = mysqli_query($sqlParser->conn, $update_query); |
| 1293 | 1292 | } |
| 1294 | 1293 | |
@@ -1298,52 +1297,52 @@ discard block |
||
| 1298 | 1297 | $plugin = end(preg_split("/(\/\/)?\s*\<\?php/", file_get_contents($filecontent), 2)); |
| 1299 | 1298 | $plugin = removeDocblock($plugin, 'plugin'); |
| 1300 | 1299 | $plugin = mysqli_real_escape_string($conn, $plugin); |
| 1301 | - $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_plugins` WHERE name='$name'"); |
|
| 1300 | + $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_plugins` WHERE name='$name'"); |
|
| 1302 | 1301 | if (mysqli_num_rows($rs)) { |
| 1303 | 1302 | $insert = true; |
| 1304 | - while($row = mysqli_fetch_assoc($rs)) { |
|
| 1305 | - $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties'])); |
|
| 1306 | - if($row['description'] == $desc){ |
|
| 1307 | - if (! mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};")) { |
|
| 1308 | - echo mysqli_error($sqlParser->conn) . PHP_EOL; |
|
| 1303 | + while ($row = mysqli_fetch_assoc($rs)) { |
|
| 1304 | + $props = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties'])); |
|
| 1305 | + if ($row['description'] == $desc) { |
|
| 1306 | + if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};")) { |
|
| 1307 | + echo mysqli_error($sqlParser->conn).PHP_EOL; |
|
| 1309 | 1308 | return; |
| 1310 | 1309 | } |
| 1311 | 1310 | $insert = false; |
| 1312 | 1311 | } else { |
| 1313 | - if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE id={$row['id']};")) { |
|
| 1312 | + if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_plugins` SET disabled='1' WHERE id={$row['id']};")) { |
|
| 1314 | 1313 | echo mysqli_error($sqlParser->conn).PHP_EOL; |
| 1315 | 1314 | return; |
| 1316 | 1315 | } |
| 1317 | 1316 | } |
| 1318 | 1317 | } |
| 1319 | - if($insert === true) { |
|
| 1320 | - $properties = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties'])); |
|
| 1321 | - if(!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_plugins` (name,description,plugincode,properties,moduleguid,disabled,category) VALUES('$name','$desc','$plugin','$properties','$guid','0',$category);")) { |
|
| 1318 | + if ($insert === true) { |
|
| 1319 | + $properties = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties'])); |
|
| 1320 | + if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_plugins` (name,description,plugincode,properties,moduleguid,disabled,category) VALUES('$name','$desc','$plugin','$properties','$guid','0',$category);")) { |
|
| 1322 | 1321 | echo mysqli_error($sqlParser->conn).PHP_EOL; |
| 1323 | 1322 | return; |
| 1324 | 1323 | } |
| 1325 | 1324 | } |
| 1326 | - echo " $name: " . $_lang['upgraded'] . PHP_EOL; |
|
| 1325 | + echo " $name: ".$_lang['upgraded'].PHP_EOL; |
|
| 1327 | 1326 | } else { |
| 1328 | - if ($properties != NULL ){ |
|
| 1327 | + if ($properties != NULL) { |
|
| 1329 | 1328 | $properties = mysqli_real_escape_string($conn, parseProperties($properties, true)); |
| 1330 | 1329 | } |
| 1331 | - if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_plugins` (name,description,plugincode,properties,moduleguid,category,disabled) VALUES('$name','$desc','$plugin','$properties','$guid',$category,$disabled);")) { |
|
| 1332 | - echo mysqli_error($sqlParser->conn) . PHP_EOL; |
|
| 1330 | + if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_plugins` (name,description,plugincode,properties,moduleguid,category,disabled) VALUES('$name','$desc','$plugin','$properties','$guid',$category,$disabled);")) { |
|
| 1331 | + echo mysqli_error($sqlParser->conn).PHP_EOL; |
|
| 1333 | 1332 | return; |
| 1334 | 1333 | } |
| 1335 | - echo " $name: " . $_lang['installed'] . PHP_EOL; |
|
| 1334 | + echo " $name: ".$_lang['installed'].PHP_EOL; |
|
| 1336 | 1335 | } |
| 1337 | 1336 | // add system events |
| 1338 | 1337 | if (count($events) > 0) { |
| 1339 | - $ds=mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_plugins` WHERE name='$name' AND description='$desc';"); |
|
| 1338 | + $ds = mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_plugins` WHERE name='$name' AND description='$desc';"); |
|
| 1340 | 1339 | if ($ds) { |
| 1341 | 1340 | $row = mysqli_fetch_assoc($ds); |
| 1342 | 1341 | $id = $row["id"]; |
| 1343 | 1342 | // remove existing events |
| 1344 | - mysqli_query($sqlParser->conn, 'DELETE FROM ' . $dbase . '.`' . $table_prefix . 'site_plugin_events` WHERE pluginid = \'' . $id . '\''); |
|
| 1343 | + mysqli_query($sqlParser->conn, 'DELETE FROM '.$dbase.'.`'.$table_prefix.'site_plugin_events` WHERE pluginid = \''.$id.'\''); |
|
| 1345 | 1344 | // add new events |
| 1346 | - mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_plugin_events` (pluginid, evtid) SELECT '$id' as 'pluginid',se.id as 'evtid' FROM $dbase.`" . $table_prefix . "system_eventnames` se WHERE name IN ('" . implode("','", $events) . "')"); |
|
| 1345 | + mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_plugin_events` (pluginid, evtid) SELECT '$id' as 'pluginid',se.id as 'evtid' FROM $dbase.`".$table_prefix."system_eventnames` se WHERE name IN ('".implode("','", $events)."')"); |
|
| 1347 | 1346 | } |
| 1348 | 1347 | } |
| 1349 | 1348 | } |
@@ -1354,18 +1353,18 @@ discard block |
||
| 1354 | 1353 | // Install Snippets |
| 1355 | 1354 | $moduleSnippet = $ms; |
| 1356 | 1355 | if (is_array($moduleSnippet) || $installData) { |
| 1357 | - echo PHP_EOL . $_lang['snippets'] . ":" . PHP_EOL; |
|
| 1356 | + echo PHP_EOL.$_lang['snippets'].":".PHP_EOL; |
|
| 1358 | 1357 | //$selSnips = $_POST['snippet']; |
| 1359 | 1358 | foreach ($moduleSnippets as $k=>$moduleSnippet) { |
| 1360 | 1359 | $installSample = in_array('sample', $moduleSnippet[5]) && $installData == 1; |
| 1361 | - if($installSample || is_array($moduleSnippet)) { |
|
| 1360 | + if ($installSample || is_array($moduleSnippet)) { |
|
| 1362 | 1361 | $name = mysqli_real_escape_string($conn, $moduleSnippet[0]); |
| 1363 | 1362 | $desc = mysqli_real_escape_string($conn, $moduleSnippet[1]); |
| 1364 | 1363 | $filecontent = $moduleSnippet[2]; |
| 1365 | 1364 | $properties = $moduleSnippet[3]; |
| 1366 | 1365 | $category = mysqli_real_escape_string($conn, $moduleSnippet[4]); |
| 1367 | 1366 | if (!file_exists($filecontent)) |
| 1368 | - echo " $name: " . $_lang['unable_install_snippet'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL; |
|
| 1367 | + echo " $name: ".$_lang['unable_install_snippet']." '$filecontent' ".$_lang['not_found'].PHP_EOL; |
|
| 1369 | 1368 | else { |
| 1370 | 1369 | |
| 1371 | 1370 | // Create the category if it does not already exist |
@@ -1374,24 +1373,24 @@ discard block |
||
| 1374 | 1373 | $snippet = end(preg_split("/(\/\/)?\s*\<\?php/", file_get_contents($filecontent))); |
| 1375 | 1374 | $snippet = removeDocblock($snippet, 'snippet'); |
| 1376 | 1375 | $snippet = mysqli_real_escape_string($conn, $snippet); |
| 1377 | - $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_snippets` WHERE name='$name'"); |
|
| 1376 | + $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_snippets` WHERE name='$name'"); |
|
| 1378 | 1377 | if (mysqli_num_rows($rs)) { |
| 1379 | 1378 | $row = mysqli_fetch_assoc($rs); |
| 1380 | - $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties'])); |
|
| 1381 | - if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_snippets` SET snippet='$snippet', description='$desc', properties='$props' WHERE name='$name';")) { |
|
| 1382 | - echo mysqli_error($sqlParser->conn) . PHP_EOL; |
|
| 1379 | + $props = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties'])); |
|
| 1380 | + if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_snippets` SET snippet='$snippet', description='$desc', properties='$props' WHERE name='$name';")) { |
|
| 1381 | + echo mysqli_error($sqlParser->conn).PHP_EOL; |
|
| 1383 | 1382 | return; |
| 1384 | 1383 | } |
| 1385 | - echo " $name: " . $_lang['upgraded'] . PHP_EOL; |
|
| 1384 | + echo " $name: ".$_lang['upgraded'].PHP_EOL; |
|
| 1386 | 1385 | } else { |
| 1387 | - if ($properties != NULL ){ |
|
| 1386 | + if ($properties != NULL) { |
|
| 1388 | 1387 | $properties = mysqli_real_escape_string($conn, parseProperties($properties, true)); |
| 1389 | 1388 | } |
| 1390 | - if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_snippets` (name,description,snippet,properties,category) VALUES('$name','$desc','$snippet','$properties',$category);")) { |
|
| 1391 | - echo mysqli_error($sqlParser->conn) . PHP_EOL; |
|
| 1389 | + if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_snippets` (name,description,snippet,properties,category) VALUES('$name','$desc','$snippet','$properties',$category);")) { |
|
| 1390 | + echo mysqli_error($sqlParser->conn).PHP_EOL; |
|
| 1392 | 1391 | return; |
| 1393 | 1392 | } |
| 1394 | - echo " $name: " . $_lang['installed'] . PHP_EOL; |
|
| 1393 | + echo " $name: ".$_lang['installed'].PHP_EOL; |
|
| 1395 | 1394 | } |
| 1396 | 1395 | } |
| 1397 | 1396 | } |
@@ -1400,24 +1399,24 @@ discard block |
||
| 1400 | 1399 | |
| 1401 | 1400 | // Install demo-site |
| 1402 | 1401 | if ($installData && $moduleSQLDataFile) { |
| 1403 | - echo PHP_EOL . $_lang['installing_demo_site']; |
|
| 1402 | + echo PHP_EOL.$_lang['installing_demo_site']; |
|
| 1404 | 1403 | $sqlParser->process($moduleSQLDataFile); |
| 1405 | 1404 | // display database results |
| 1406 | 1405 | if ($sqlParser->installFailed == true) { |
| 1407 | 1406 | $errors += 1; |
| 1408 | - echo $_lang['database_alerts'] . PHP_EOL; |
|
| 1409 | - echo $_lang['setup_couldnt_install'] . PHP_EOL; |
|
| 1410 | - echo $_lang['installation_error_occured'] . PHP_EOL . PHP_EOL; |
|
| 1407 | + echo $_lang['database_alerts'].PHP_EOL; |
|
| 1408 | + echo $_lang['setup_couldnt_install'].PHP_EOL; |
|
| 1409 | + echo $_lang['installation_error_occured'].PHP_EOL.PHP_EOL; |
|
| 1411 | 1410 | for ($i = 0; $i < count($sqlParser->mysqlErrors); $i++) { |
| 1412 | - echo $sqlParser->mysqlErrors[$i]["error"] . " " . $_lang['during_execution_of_sql'] . " " . strip_tags($sqlParser->mysqlErrors[$i]["sql"]) . PHP_EOL; |
|
| 1411 | + echo $sqlParser->mysqlErrors[$i]["error"]." ".$_lang['during_execution_of_sql']." ".strip_tags($sqlParser->mysqlErrors[$i]["sql"]).PHP_EOL; |
|
| 1413 | 1412 | } |
| 1414 | 1413 | |
| 1415 | - echo $_lang['some_tables_not_updated'] . PHP_EOL; |
|
| 1414 | + echo $_lang['some_tables_not_updated'].PHP_EOL; |
|
| 1416 | 1415 | return; |
| 1417 | 1416 | } else { |
| 1418 | 1417 | $sql = sprintf("SELECT id FROM `%ssite_templates` WHERE templatename='EVO startup - Bootstrap'", $sqlParser->prefix); |
| 1419 | 1418 | $rs = mysqli_query($sqlParser->conn, $sql); |
| 1420 | - if(mysqli_num_rows($rs)) { |
|
| 1419 | + if (mysqli_num_rows($rs)) { |
|
| 1421 | 1420 | $row = mysqli_fetch_assoc($rs); |
| 1422 | 1421 | $sql = sprintf('UPDATE `%ssite_content` SET template=%s WHERE template=4', $sqlParser->prefix, $row['id']); |
| 1423 | 1422 | mysqli_query($sqlParser->conn, $sql); |
@@ -1429,9 +1428,9 @@ discard block |
||
| 1429 | 1428 | // Install Dependencies |
| 1430 | 1429 | $moduleDependencies = $mdp; |
| 1431 | 1430 | foreach ($moduleDependencies as $dependency) { |
| 1432 | - $ds = mysqli_query($sqlParser->conn, 'SELECT id, guid FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_modules` WHERE name="' . $dependency['module'] . '"'); |
|
| 1431 | + $ds = mysqli_query($sqlParser->conn, 'SELECT id, guid FROM '.$dbase.'`'.$sqlParser->prefix.'site_modules` WHERE name="'.$dependency['module'].'"'); |
|
| 1433 | 1432 | if (!$ds) { |
| 1434 | - echo mysqli_error($sqlParser->conn) . PHP_EOL; |
|
| 1433 | + echo mysqli_error($sqlParser->conn).PHP_EOL; |
|
| 1435 | 1434 | return; |
| 1436 | 1435 | } else { |
| 1437 | 1436 | $row = mysqli_fetch_assoc($ds); |
@@ -1439,37 +1438,37 @@ discard block |
||
| 1439 | 1438 | $moduleGuid = $row["guid"]; |
| 1440 | 1439 | } |
| 1441 | 1440 | // get extra id |
| 1442 | - $ds = mysqli_query($sqlParser->conn, 'SELECT id FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` WHERE ' . $dependency['column'] . '="' . $dependency['name'] . '"'); |
|
| 1441 | + $ds = mysqli_query($sqlParser->conn, 'SELECT id FROM '.$dbase.'`'.$sqlParser->prefix.'site_'.$dependency['table'].'` WHERE '.$dependency['column'].'="'.$dependency['name'].'"'); |
|
| 1443 | 1442 | if (!$ds) { |
| 1444 | - echo mysqli_error($sqlParser->conn) . PHP_EOL; |
|
| 1443 | + echo mysqli_error($sqlParser->conn).PHP_EOL; |
|
| 1445 | 1444 | return; |
| 1446 | 1445 | } else { |
| 1447 | 1446 | $row = mysqli_fetch_assoc($ds); |
| 1448 | 1447 | $extraId = $row["id"]; |
| 1449 | 1448 | } |
| 1450 | 1449 | // setup extra as module dependency |
| 1451 | - $ds = mysqli_query($sqlParser->conn, 'SELECT module FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` WHERE module=' . $moduleId . ' AND resource=' . $extraId . ' AND type=' . $dependency['type'] . ' LIMIT 1'); |
|
| 1450 | + $ds = mysqli_query($sqlParser->conn, 'SELECT module FROM '.$dbase.'`'.$sqlParser->prefix.'site_module_depobj` WHERE module='.$moduleId.' AND resource='.$extraId.' AND type='.$dependency['type'].' LIMIT 1'); |
|
| 1452 | 1451 | if (!$ds) { |
| 1453 | - echo mysqli_error($sqlParser->conn) . PHP_EOL; |
|
| 1452 | + echo mysqli_error($sqlParser->conn).PHP_EOL; |
|
| 1454 | 1453 | return; |
| 1455 | 1454 | } else { |
| 1456 | 1455 | if (mysqli_num_rows($ds) === 0) { |
| 1457 | - mysqli_query($sqlParser->conn, 'INSERT INTO ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` (module, resource, type) VALUES(' . $moduleId . ',' . $extraId . ',' . $dependency['type'] . ')'); |
|
| 1458 | - echo $dependency['module'] . ' Module: ' . $_lang['depedency_create'] . PHP_EOL; |
|
| 1456 | + mysqli_query($sqlParser->conn, 'INSERT INTO '.$dbase.'`'.$sqlParser->prefix.'site_module_depobj` (module, resource, type) VALUES('.$moduleId.','.$extraId.','.$dependency['type'].')'); |
|
| 1457 | + echo $dependency['module'].' Module: '.$_lang['depedency_create'].PHP_EOL; |
|
| 1459 | 1458 | } else { |
| 1460 | - mysqli_query($sqlParser->conn, 'UPDATE ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` SET module = ' . $moduleId . ', resource = ' . $extraId . ', type = ' . $dependency['type'] . ' WHERE module=' . $moduleId . ' AND resource=' . $extraId . ' AND type=' . $dependency['type']); |
|
| 1461 | - echo $dependency['module'] . ' Module: ' . $_lang['depedency_update'] . PHP_EOL; |
|
| 1459 | + mysqli_query($sqlParser->conn, 'UPDATE '.$dbase.'`'.$sqlParser->prefix.'site_module_depobj` SET module = '.$moduleId.', resource = '.$extraId.', type = '.$dependency['type'].' WHERE module='.$moduleId.' AND resource='.$extraId.' AND type='.$dependency['type']); |
|
| 1460 | + echo $dependency['module'].' Module: '.$_lang['depedency_update'].PHP_EOL; |
|
| 1462 | 1461 | } |
| 1463 | 1462 | if ($dependency['type'] == 30 || $dependency['type'] == 40) { |
| 1464 | 1463 | // set extra guid for plugins and snippets |
| 1465 | - $ds = mysqli_query($sqlParser->conn, 'SELECT id FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` WHERE id=' . $extraId . ' LIMIT 1'); |
|
| 1464 | + $ds = mysqli_query($sqlParser->conn, 'SELECT id FROM '.$dbase.'`'.$sqlParser->prefix.'site_'.$dependency['table'].'` WHERE id='.$extraId.' LIMIT 1'); |
|
| 1466 | 1465 | if (!$ds) { |
| 1467 | - echo mysqli_error($sqlParser->conn) . PHP_EOL; |
|
| 1466 | + echo mysqli_error($sqlParser->conn).PHP_EOL; |
|
| 1468 | 1467 | return; |
| 1469 | 1468 | } else { |
| 1470 | 1469 | if (mysqli_num_rows($ds) != 0) { |
| 1471 | - mysqli_query($sqlParser->conn, 'UPDATE ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` SET moduleguid = ' . $moduleGuid . ' WHERE id=' . $extraId); |
|
| 1472 | - echo $dependency['name'] . ': ' . $_lang['guid_set'] . PHP_EOL; |
|
| 1470 | + mysqli_query($sqlParser->conn, 'UPDATE '.$dbase.'`'.$sqlParser->prefix.'site_'.$dependency['table'].'` SET moduleguid = '.$moduleGuid.' WHERE id='.$extraId); |
|
| 1471 | + echo $dependency['name'].': '.$_lang['guid_set'].PHP_EOL; |
|
| 1473 | 1472 | } |
| 1474 | 1473 | } |
| 1475 | 1474 | } |
@@ -1478,7 +1477,7 @@ discard block |
||
| 1478 | 1477 | |
| 1479 | 1478 | // call back function |
| 1480 | 1479 | if ($callBackFnc != "") |
| 1481 | - $callBackFnc ($sqlParser); |
|
| 1480 | + $callBackFnc($sqlParser); |
|
| 1482 | 1481 | |
| 1483 | 1482 | // Setup the MODX API -- needed for the cache processor |
| 1484 | 1483 | if (!defined('MODX_MANAGER_PATH')) define('MODX_MANAGER_PATH', $base_path.MGR_DIR.'/'); |
@@ -1511,17 +1510,17 @@ discard block |
||
| 1511 | 1510 | } |
| 1512 | 1511 | |
| 1513 | 1512 | // setup completed! |
| 1514 | -echo PHP_EOL . $_lang['installation_successful'] . PHP_EOL . PHP_EOL; |
|
| 1513 | +echo PHP_EOL.$_lang['installation_successful'].PHP_EOL.PHP_EOL; |
|
| 1515 | 1514 | //echo "<p>" . $_lang['to_log_into_content_manager'] . "</p>"; |
| 1516 | 1515 | if ($installMode == 0) { |
| 1517 | - echo strip_tags($_lang['installation_note']) . PHP_EOL; |
|
| 1516 | + echo strip_tags($_lang['installation_note']).PHP_EOL; |
|
| 1518 | 1517 | } else { |
| 1519 | - echo strip_tags($_lang['upgrade_note']) . PHP_EOL; |
|
| 1518 | + echo strip_tags($_lang['upgrade_note']).PHP_EOL; |
|
| 1520 | 1519 | } |
| 1521 | 1520 | |
| 1522 | 1521 | |
| 1523 | -if ( empty($args) ){ |
|
| 1524 | - echo PHP_EOL . 'Remove install folder?'.PHP_EOL; |
|
| 1522 | +if (empty($args)) { |
|
| 1523 | + echo PHP_EOL.'Remove install folder?'.PHP_EOL; |
|
| 1525 | 1524 | $removeInstall = readline("Type 'y' or 'n' to continue: "); |
| 1526 | 1525 | } |
| 1527 | 1526 | //remove installFolder |
@@ -1529,7 +1528,7 @@ discard block |
||
| 1529 | 1528 | removeFolder($path); |
| 1530 | 1529 | removeFolder($base_path.'.tx'); |
| 1531 | 1530 | unlink($base_path.'README.md'); |
| 1532 | - echo 'Install folder deleted!'. PHP_EOL . PHP_EOL; |
|
| 1531 | + echo 'Install folder deleted!'.PHP_EOL.PHP_EOL; |
|
| 1533 | 1532 | } |
| 1534 | 1533 | |
| 1535 | 1534 | /** |
@@ -1568,11 +1567,11 @@ discard block |
||
| 1568 | 1567 | * @param string $old |
| 1569 | 1568 | * @return string |
| 1570 | 1569 | */ |
| 1571 | -function propUpdate($new,$old){ |
|
| 1570 | +function propUpdate($new, $old){ |
|
| 1572 | 1571 | $newArr = parseProperties($new); |
| 1573 | 1572 | $oldArr = parseProperties($old); |
| 1574 | - foreach ($oldArr as $k => $v){ |
|
| 1575 | - if (isset($v['0']['options'])){ |
|
| 1573 | + foreach ($oldArr as $k => $v) { |
|
| 1574 | + if (isset($v['0']['options'])) { |
|
| 1576 | 1575 | $oldArr[$k]['0']['options'] = $newArr[$k]['0']['options']; |
| 1577 | 1576 | } |
| 1578 | 1577 | } |
@@ -1587,30 +1586,30 @@ discard block |
||
| 1587 | 1586 | * @param bool|mixed $json |
| 1588 | 1587 | * @return string |
| 1589 | 1588 | */ |
| 1590 | -function parseProperties($propertyString, $json=false) { |
|
| 1591 | - $propertyString = str_replace('{}', '', $propertyString ); |
|
| 1592 | - $propertyString = str_replace('} {', ',', $propertyString ); |
|
| 1589 | +function parseProperties($propertyString, $json = false){ |
|
| 1590 | + $propertyString = str_replace('{}', '', $propertyString); |
|
| 1591 | + $propertyString = str_replace('} {', ',', $propertyString); |
|
| 1593 | 1592 | |
| 1594 | - if(empty($propertyString)) return array(); |
|
| 1595 | - if($propertyString=='{}' || $propertyString=='[]') return array(); |
|
| 1593 | + if (empty($propertyString)) return array(); |
|
| 1594 | + if ($propertyString == '{}' || $propertyString == '[]') return array(); |
|
| 1596 | 1595 | |
| 1597 | 1596 | $jsonFormat = isJson($propertyString, true); |
| 1598 | 1597 | $property = array(); |
| 1599 | 1598 | // old format |
| 1600 | - if ( $jsonFormat === false) { |
|
| 1601 | - $props= explode('&', $propertyString); |
|
| 1599 | + if ($jsonFormat === false) { |
|
| 1600 | + $props = explode('&', $propertyString); |
|
| 1602 | 1601 | foreach ($props as $prop) { |
| 1603 | 1602 | $prop = trim($prop); |
| 1604 | - if($prop === '') { |
|
| 1603 | + if ($prop === '') { |
|
| 1605 | 1604 | continue; |
| 1606 | 1605 | } |
| 1607 | 1606 | |
| 1608 | 1607 | $arr = explode(';', $prop); |
| 1609 | - if( ! is_array($arr)) { |
|
| 1608 | + if (!is_array($arr)) { |
|
| 1610 | 1609 | $arr = array(); |
| 1611 | 1610 | } |
| 1612 | 1611 | $key = explode('=', isset($arr[0]) ? $arr[0] : ''); |
| 1613 | - if( ! is_array($key) || empty($key[0])) { |
|
| 1612 | + if (!is_array($key) || empty($key[0])) { |
|
| 1614 | 1613 | continue; |
| 1615 | 1614 | } |
| 1616 | 1615 | |
@@ -1634,7 +1633,7 @@ discard block |
||
| 1634 | 1633 | |
| 1635 | 1634 | } |
| 1636 | 1635 | // new json-format |
| 1637 | - } else if(!empty($jsonFormat)){ |
|
| 1636 | + } else if (!empty($jsonFormat)) { |
|
| 1638 | 1637 | $property = $jsonFormat; |
| 1639 | 1638 | } |
| 1640 | 1639 | if ($json) { |
@@ -1649,7 +1648,7 @@ discard block |
||
| 1649 | 1648 | * @param bool $returnData |
| 1650 | 1649 | * @return bool|mixed |
| 1651 | 1650 | */ |
| 1652 | -function isJson($string, $returnData=false) { |
|
| 1651 | +function isJson($string, $returnData = false){ |
|
| 1653 | 1652 | $data = json_decode($string, true); |
| 1654 | 1653 | return (json_last_error() == JSON_ERROR_NONE) ? ($returnData ? $data : true) : false; |
| 1655 | 1654 | } |
@@ -1659,20 +1658,20 @@ discard block |
||
| 1659 | 1658 | * @param SqlParser $sqlParser |
| 1660 | 1659 | * @return int |
| 1661 | 1660 | */ |
| 1662 | -function getCreateDbCategory($category, $sqlParser) { |
|
| 1661 | +function getCreateDbCategory($category, $sqlParser){ |
|
| 1663 | 1662 | $dbase = $sqlParser->dbname; |
| 1664 | - $dbase = '`' . trim($dbase,'`') . '`'; |
|
| 1663 | + $dbase = '`'.trim($dbase, '`').'`'; |
|
| 1665 | 1664 | $table_prefix = $sqlParser->prefix; |
| 1666 | 1665 | $category_id = 0; |
| 1667 | - if(!empty($category)) { |
|
| 1666 | + if (!empty($category)) { |
|
| 1668 | 1667 | $category = mysqli_real_escape_string($sqlParser->conn, $category); |
| 1669 | 1668 | $rs = mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."categories` WHERE category = '".$category."'"); |
| 1670 | - if(mysqli_num_rows($rs) && ($row = mysqli_fetch_assoc($rs))) { |
|
| 1669 | + if (mysqli_num_rows($rs) && ($row = mysqli_fetch_assoc($rs))) { |
|
| 1671 | 1670 | $category_id = $row['id']; |
| 1672 | 1671 | } else { |
| 1673 | 1672 | $q = "INSERT INTO $dbase.`".$table_prefix."categories` (`category`) VALUES ('{$category}');"; |
| 1674 | 1673 | $rs = mysqli_query($sqlParser->conn, $q); |
| 1675 | - if($rs) { |
|
| 1674 | + if ($rs) { |
|
| 1676 | 1675 | $category_id = mysqli_insert_id($sqlParser->conn); |
| 1677 | 1676 | } |
| 1678 | 1677 | } |
@@ -1687,12 +1686,12 @@ discard block |
||
| 1687 | 1686 | * @param string $type |
| 1688 | 1687 | * @return string |
| 1689 | 1688 | */ |
| 1690 | -function removeDocblock($code, $type) { |
|
| 1689 | +function removeDocblock($code, $type){ |
|
| 1691 | 1690 | |
| 1692 | 1691 | $cleaned = preg_replace("/^.*?\/\*\*.*?\*\/\s+/s", '', $code, 1); |
| 1693 | 1692 | |
| 1694 | 1693 | // Procedure taken from plugin.filesource.php |
| 1695 | - switch($type) { |
|
| 1694 | + switch ($type) { |
|
| 1696 | 1695 | case 'snippet': |
| 1697 | 1696 | $elm_name = 'snippets'; |
| 1698 | 1697 | $include = 'return require'; |
@@ -1708,7 +1707,7 @@ discard block |
||
| 1708 | 1707 | default: |
| 1709 | 1708 | return $cleaned; |
| 1710 | 1709 | }; |
| 1711 | - if(substr(trim($cleaned),0,$count) == $include.' MODX_BASE_PATH.\'assets/'.$elm_name.'/') |
|
| 1710 | + if (substr(trim($cleaned), 0, $count) == $include.' MODX_BASE_PATH.\'assets/'.$elm_name.'/') |
|
| 1712 | 1711 | return $cleaned; |
| 1713 | 1712 | |
| 1714 | 1713 | // fileBinding not found - return code incl docblock |
