evolution-cms /
evolution
@@ -3,7 +3,7 @@ discard block |
||
| 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 | if(!$modx->hasPermission('edit_document')) { |
| 6 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 6 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 7 | 7 | } |
| 8 | 8 | |
| 9 | 9 | $newParentID = isset($_REQUEST['new_parent']) ? (int)$_REQUEST['new_parent'] : 0; |
@@ -25,17 +25,17 @@ discard block |
||
| 25 | 25 | // check user has permission to move document to chosen location |
| 26 | 26 | |
| 27 | 27 | if ($use_udperms == 1) { |
| 28 | - if ($oldparent != $newParentID) { |
|
| 29 | - include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php"; |
|
| 30 | - $udperms = new udperms(); |
|
| 31 | - $udperms->user = $modx->getLoginUserID(); |
|
| 32 | - $udperms->document = $newParentID; |
|
| 33 | - $udperms->role = $_SESSION['mgrRole']; |
|
| 34 | - |
|
| 35 | - if (!$udperms->checkPermissions()) { |
|
| 36 | - $modx->webAlertAndQuit($_lang["access_permission_parent_denied"]); |
|
| 37 | - } |
|
| 38 | - } |
|
| 28 | + if ($oldparent != $newParentID) { |
|
| 29 | + include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php"; |
|
| 30 | + $udperms = new udperms(); |
|
| 31 | + $udperms->user = $modx->getLoginUserID(); |
|
| 32 | + $udperms->document = $newParentID; |
|
| 33 | + $udperms->role = $_SESSION['mgrRole']; |
|
| 34 | + |
|
| 35 | + if (!$udperms->checkPermissions()) { |
|
| 36 | + $modx->webAlertAndQuit($_lang["access_permission_parent_denied"]); |
|
| 37 | + } |
|
| 38 | + } |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | /** |
@@ -43,67 +43,67 @@ discard block |
||
| 43 | 43 | * @return array |
| 44 | 44 | */ |
| 45 | 45 | function allChildren($currDocID) { |
| 46 | - global $modx; |
|
| 47 | - $children= array(); |
|
| 48 | - $currDocID = $modx->db->escape($currDocID); |
|
| 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'])); |
|
| 53 | - } |
|
| 54 | - return $children; |
|
| 46 | + global $modx; |
|
| 47 | + $children= array(); |
|
| 48 | + $currDocID = $modx->db->escape($currDocID); |
|
| 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'])); |
|
| 53 | + } |
|
| 54 | + return $children; |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | $evtOut = $modx->invokeEvent("onBeforeMoveDocument", array ( |
| 58 | - "id_document" => $documentID, |
|
| 59 | - "old_parent" => $oldparent, |
|
| 60 | - "new_parent" => $newParentID |
|
| 58 | + "id_document" => $documentID, |
|
| 59 | + "old_parent" => $oldparent, |
|
| 60 | + "new_parent" => $newParentID |
|
| 61 | 61 | )); |
| 62 | 62 | if (is_array($evtOut) && count($evtOut) > 0){ |
| 63 | - $newParent = array_pop($evtOut); |
|
| 64 | - if($newParent == $oldparent) { |
|
| 65 | - $modx->webAlertAndQuit($_lang["error_movedocument2"]); |
|
| 66 | - }else{ |
|
| 67 | - $newParentID = $newParent; |
|
| 68 | - } |
|
| 63 | + $newParent = array_pop($evtOut); |
|
| 64 | + if($newParent == $oldparent) { |
|
| 65 | + $modx->webAlertAndQuit($_lang["error_movedocument2"]); |
|
| 66 | + }else{ |
|
| 67 | + $newParentID = $newParent; |
|
| 68 | + } |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | $children = allChildren($documentID); |
| 72 | 72 | if (!array_search($newParentID, $children)) { |
| 73 | - $modx->db->update(array( |
|
| 74 | - 'isfolder' => 1, |
|
| 75 | - ), $modx->getFullTableName('site_content'), "id='{$newParentID}'"); |
|
| 76 | - |
|
| 77 | - $modx->db->update(array( |
|
| 78 | - 'parent' => $newParentID, |
|
| 79 | - 'editedby' => $modx->getLoginUserID(), |
|
| 80 | - 'editedon' => time(), |
|
| 81 | - ), $modx->getFullTableName('site_content'), "id='{$documentID}'"); |
|
| 82 | - |
|
| 83 | - // finished moving the document, now check to see if the old_parent should no longer be a folder. |
|
| 84 | - $rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('site_content'), "parent='{$oldparent}'"); |
|
| 85 | - $limit = $modx->db->getValue($rs); |
|
| 86 | - |
|
| 87 | - if(!$limit>0) { |
|
| 88 | - $modx->db->update(array( |
|
| 89 | - 'isfolder' => 0, |
|
| 90 | - ), $modx->getFullTableName('site_content'), "id='{$oldparent}'"); |
|
| 91 | - } |
|
| 92 | - // Set the item name for logger |
|
| 93 | - $pagetitle = $modx->db->getValue($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "id='{$documentID}'")); |
|
| 94 | - $_SESSION['itemname'] = $pagetitle; |
|
| 95 | - |
|
| 96 | - $modx->invokeEvent("onAfterMoveDocument", array ( |
|
| 97 | - "id_document" => $documentID, |
|
| 98 | - "old_parent" => $oldparent, |
|
| 99 | - "new_parent" => $newParentID |
|
| 100 | - )); |
|
| 101 | - |
|
| 102 | - // empty cache & sync site |
|
| 103 | - $modx->clearCache('full'); |
|
| 104 | - |
|
| 105 | - $header="Location: index.php?a=3&id={$documentID}&r=9"; |
|
| 106 | - header($header); |
|
| 73 | + $modx->db->update(array( |
|
| 74 | + 'isfolder' => 1, |
|
| 75 | + ), $modx->getFullTableName('site_content'), "id='{$newParentID}'"); |
|
| 76 | + |
|
| 77 | + $modx->db->update(array( |
|
| 78 | + 'parent' => $newParentID, |
|
| 79 | + 'editedby' => $modx->getLoginUserID(), |
|
| 80 | + 'editedon' => time(), |
|
| 81 | + ), $modx->getFullTableName('site_content'), "id='{$documentID}'"); |
|
| 82 | + |
|
| 83 | + // finished moving the document, now check to see if the old_parent should no longer be a folder. |
|
| 84 | + $rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('site_content'), "parent='{$oldparent}'"); |
|
| 85 | + $limit = $modx->db->getValue($rs); |
|
| 86 | + |
|
| 87 | + if(!$limit>0) { |
|
| 88 | + $modx->db->update(array( |
|
| 89 | + 'isfolder' => 0, |
|
| 90 | + ), $modx->getFullTableName('site_content'), "id='{$oldparent}'"); |
|
| 91 | + } |
|
| 92 | + // Set the item name for logger |
|
| 93 | + $pagetitle = $modx->db->getValue($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "id='{$documentID}'")); |
|
| 94 | + $_SESSION['itemname'] = $pagetitle; |
|
| 95 | + |
|
| 96 | + $modx->invokeEvent("onAfterMoveDocument", array ( |
|
| 97 | + "id_document" => $documentID, |
|
| 98 | + "old_parent" => $oldparent, |
|
| 99 | + "new_parent" => $newParentID |
|
| 100 | + )); |
|
| 101 | + |
|
| 102 | + // empty cache & sync site |
|
| 103 | + $modx->clearCache('full'); |
|
| 104 | + |
|
| 105 | + $header="Location: index.php?a=3&id={$documentID}&r=9"; |
|
| 106 | + header($header); |
|
| 107 | 107 | } else { |
| 108 | - $modx->webAlertAndQuit("You cannot move a document to a child document!"); |
|
| 108 | + $modx->webAlertAndQuit("You cannot move a document to a child document!"); |
|
| 109 | 109 | } |
@@ -1,9 +1,9 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
| 3 | - die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
|
| 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 | if(!$modx->hasPermission('save_web_user')) { |
| 6 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 6 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 7 | 7 | } |
| 8 | 8 | |
| 9 | 9 | $tbl_web_users = $modx->getFullTableName('web_users'); |
@@ -12,10 +12,10 @@ discard block |
||
| 12 | 12 | |
| 13 | 13 | $input = $_POST; |
| 14 | 14 | foreach($input as $k => $v) { |
| 15 | - if($k !== 'comment') { |
|
| 16 | - $v = sanitize($v); |
|
| 17 | - } |
|
| 18 | - $input[$k] = $v; |
|
| 15 | + if($k !== 'comment') { |
|
| 16 | + $v = sanitize($v); |
|
| 17 | + } |
|
| 18 | + $input[$k] = $v; |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | $id = (int)$input['id']; |
@@ -51,80 +51,80 @@ discard block |
||
| 51 | 51 | |
| 52 | 52 | // verify password |
| 53 | 53 | if($passwordgenmethod == "spec" && $input['specifiedpassword'] != $input['confirmpassword']) { |
| 54 | - webAlertAndQuit("Password typed is mismatched"); |
|
| 54 | + webAlertAndQuit("Password typed is mismatched"); |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | // verify email |
| 58 | 58 | if($email == '' || !preg_match("/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,24}$/i", $email)) { |
| 59 | - webAlertAndQuit("E-mail address doesn't seem to be valid!"); |
|
| 59 | + webAlertAndQuit("E-mail address doesn't seem to be valid!"); |
|
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | switch($input['mode']) { |
| 63 | - case '87' : // new user |
|
| 64 | - // check if this user name already exist |
|
| 65 | - $rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}'"); |
|
| 66 | - $limit = $modx->db->getValue($rs); |
|
| 67 | - if($limit > 0) { |
|
| 68 | - webAlertAndQuit("User name is already in use!"); |
|
| 69 | - } |
|
| 70 | - |
|
| 71 | - // check if the email address already exist |
|
| 72 | - $rs = $modx->db->select('count(id)', $tbl_web_user_attributes, "email='{$esc_email}' AND id!='{$id}'"); |
|
| 73 | - $limit = $modx->db->getValue($rs); |
|
| 74 | - if($limit > 0) { |
|
| 75 | - webAlertAndQuit("Email is already in use!"); |
|
| 76 | - } |
|
| 77 | - |
|
| 78 | - // generate a new password for this user |
|
| 79 | - if($specifiedpassword != "" && $passwordgenmethod == "spec") { |
|
| 80 | - if(strlen($specifiedpassword) < 6) { |
|
| 81 | - webAlertAndQuit("Password is too short!"); |
|
| 82 | - } else { |
|
| 83 | - $newpassword = $specifiedpassword; |
|
| 84 | - } |
|
| 85 | - } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") { |
|
| 86 | - webAlertAndQuit("You didn't specify a password for this user!"); |
|
| 87 | - } elseif($passwordgenmethod == 'g') { |
|
| 88 | - $newpassword = generate_password(8); |
|
| 89 | - } else { |
|
| 90 | - webAlertAndQuit("No password generation method specified!"); |
|
| 91 | - } |
|
| 92 | - |
|
| 93 | - // invoke OnBeforeWUsrFormSave event |
|
| 94 | - $modx->invokeEvent("OnBeforeWUsrFormSave", array( |
|
| 95 | - "mode" => "new", |
|
| 96 | - )); |
|
| 97 | - |
|
| 98 | - // create the user account |
|
| 99 | - $field = array(); |
|
| 100 | - $field['username'] = $esc_newusername; |
|
| 101 | - $field['password'] = md5($newpassword); |
|
| 102 | - $internalKey = $modx->db->insert($field, $tbl_web_users); |
|
| 103 | - |
|
| 104 | - $field = compact('internalKey', 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter'); |
|
| 105 | - $field = $modx->db->escape($field); |
|
| 106 | - $modx->db->insert($field, $tbl_web_user_attributes); |
|
| 107 | - |
|
| 108 | - // Save User Settings |
|
| 109 | - saveUserSettings($internalKey); |
|
| 110 | - |
|
| 111 | - // Set the item name for logger |
|
| 112 | - $_SESSION['itemname'] = $newusername; |
|
| 113 | - |
|
| 114 | - /*******************************************************************************/ |
|
| 115 | - // put the user in the user_groups he/ she should be in |
|
| 116 | - // first, check that up_perms are switched on! |
|
| 117 | - if($use_udperms == 1) { |
|
| 118 | - if(!empty($user_groups)) { |
|
| 119 | - for($i = 0; $i < count($user_groups); $i++) { |
|
| 120 | - $f = array(); |
|
| 121 | - $f['webgroup'] = (int)$user_groups[$i]; |
|
| 122 | - $f['webuser'] = $internalKey; |
|
| 123 | - $modx->db->insert($f, $tbl_web_groups); |
|
| 124 | - } |
|
| 125 | - } |
|
| 126 | - } |
|
| 127 | - // end of user_groups stuff! |
|
| 63 | + case '87' : // new user |
|
| 64 | + // check if this user name already exist |
|
| 65 | + $rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}'"); |
|
| 66 | + $limit = $modx->db->getValue($rs); |
|
| 67 | + if($limit > 0) { |
|
| 68 | + webAlertAndQuit("User name is already in use!"); |
|
| 69 | + } |
|
| 70 | + |
|
| 71 | + // check if the email address already exist |
|
| 72 | + $rs = $modx->db->select('count(id)', $tbl_web_user_attributes, "email='{$esc_email}' AND id!='{$id}'"); |
|
| 73 | + $limit = $modx->db->getValue($rs); |
|
| 74 | + if($limit > 0) { |
|
| 75 | + webAlertAndQuit("Email is already in use!"); |
|
| 76 | + } |
|
| 77 | + |
|
| 78 | + // generate a new password for this user |
|
| 79 | + if($specifiedpassword != "" && $passwordgenmethod == "spec") { |
|
| 80 | + if(strlen($specifiedpassword) < 6) { |
|
| 81 | + webAlertAndQuit("Password is too short!"); |
|
| 82 | + } else { |
|
| 83 | + $newpassword = $specifiedpassword; |
|
| 84 | + } |
|
| 85 | + } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") { |
|
| 86 | + webAlertAndQuit("You didn't specify a password for this user!"); |
|
| 87 | + } elseif($passwordgenmethod == 'g') { |
|
| 88 | + $newpassword = generate_password(8); |
|
| 89 | + } else { |
|
| 90 | + webAlertAndQuit("No password generation method specified!"); |
|
| 91 | + } |
|
| 92 | + |
|
| 93 | + // invoke OnBeforeWUsrFormSave event |
|
| 94 | + $modx->invokeEvent("OnBeforeWUsrFormSave", array( |
|
| 95 | + "mode" => "new", |
|
| 96 | + )); |
|
| 97 | + |
|
| 98 | + // create the user account |
|
| 99 | + $field = array(); |
|
| 100 | + $field['username'] = $esc_newusername; |
|
| 101 | + $field['password'] = md5($newpassword); |
|
| 102 | + $internalKey = $modx->db->insert($field, $tbl_web_users); |
|
| 103 | + |
|
| 104 | + $field = compact('internalKey', 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter'); |
|
| 105 | + $field = $modx->db->escape($field); |
|
| 106 | + $modx->db->insert($field, $tbl_web_user_attributes); |
|
| 107 | + |
|
| 108 | + // Save User Settings |
|
| 109 | + saveUserSettings($internalKey); |
|
| 110 | + |
|
| 111 | + // Set the item name for logger |
|
| 112 | + $_SESSION['itemname'] = $newusername; |
|
| 113 | + |
|
| 114 | + /*******************************************************************************/ |
|
| 115 | + // put the user in the user_groups he/ she should be in |
|
| 116 | + // first, check that up_perms are switched on! |
|
| 117 | + if($use_udperms == 1) { |
|
| 118 | + if(!empty($user_groups)) { |
|
| 119 | + for($i = 0; $i < count($user_groups); $i++) { |
|
| 120 | + $f = array(); |
|
| 121 | + $f['webgroup'] = (int)$user_groups[$i]; |
|
| 122 | + $f['webuser'] = $internalKey; |
|
| 123 | + $modx->db->insert($f, $tbl_web_groups); |
|
| 124 | + } |
|
| 125 | + } |
|
| 126 | + } |
|
| 127 | + // end of user_groups stuff! |
|
| 128 | 128 | |
| 129 | 129 | // invoke OnWebSaveUser event |
| 130 | 130 | $modx->invokeEvent("OnWebSaveUser", array( |
@@ -142,26 +142,26 @@ discard block |
||
| 142 | 142 | "id" => $internalKey |
| 143 | 143 | )); |
| 144 | 144 | |
| 145 | - if($passwordnotifymethod == 'e') { |
|
| 146 | - sendMailMessage($email, $newusername, $newpassword, $fullname); |
|
| 147 | - if($input['stay'] != '') { |
|
| 148 | - $a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87"; |
|
| 149 | - $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay']; |
|
| 150 | - header($header); |
|
| 151 | - } else { |
|
| 152 | - $header = "Location: index.php?a=99&r=2"; |
|
| 153 | - header($header); |
|
| 154 | - } |
|
| 155 | - } else { |
|
| 156 | - if($input['stay'] != '') { |
|
| 157 | - $a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87"; |
|
| 158 | - $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay']; |
|
| 159 | - } else { |
|
| 160 | - $stayUrl = "index.php?a=99&r=2"; |
|
| 161 | - } |
|
| 162 | - |
|
| 163 | - include_once "header.inc.php"; |
|
| 164 | - ?> |
|
| 145 | + if($passwordnotifymethod == 'e') { |
|
| 146 | + sendMailMessage($email, $newusername, $newpassword, $fullname); |
|
| 147 | + if($input['stay'] != '') { |
|
| 148 | + $a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87"; |
|
| 149 | + $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay']; |
|
| 150 | + header($header); |
|
| 151 | + } else { |
|
| 152 | + $header = "Location: index.php?a=99&r=2"; |
|
| 153 | + header($header); |
|
| 154 | + } |
|
| 155 | + } else { |
|
| 156 | + if($input['stay'] != '') { |
|
| 157 | + $a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87"; |
|
| 158 | + $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay']; |
|
| 159 | + } else { |
|
| 160 | + $stayUrl = "index.php?a=99&r=2"; |
|
| 161 | + } |
|
| 162 | + |
|
| 163 | + include_once "header.inc.php"; |
|
| 164 | + ?> |
|
| 165 | 165 | |
| 166 | 166 | <h1><?php echo $_lang['web_user_title']; ?></h1> |
| 167 | 167 | |
@@ -183,84 +183,84 @@ discard block |
||
| 183 | 183 | </div> |
| 184 | 184 | <?php |
| 185 | 185 | |
| 186 | - include_once "footer.inc.php"; |
|
| 187 | - } |
|
| 188 | - break; |
|
| 189 | - case '88' : // edit user |
|
| 190 | - // generate a new password for this user |
|
| 191 | - if($genpassword == 1) { |
|
| 192 | - if($specifiedpassword != "" && $passwordgenmethod == "spec") { |
|
| 193 | - if(strlen($specifiedpassword) < 6) { |
|
| 194 | - webAlertAndQuit("Password is too short!"); |
|
| 195 | - } else { |
|
| 196 | - $newpassword = $specifiedpassword; |
|
| 197 | - } |
|
| 198 | - } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") { |
|
| 199 | - webAlertAndQuit("You didn't specify a password for this user!"); |
|
| 200 | - } elseif($passwordgenmethod == 'g') { |
|
| 201 | - $newpassword = generate_password(8); |
|
| 202 | - } else { |
|
| 203 | - webAlertAndQuit("No password generation method specified!"); |
|
| 204 | - } |
|
| 205 | - } |
|
| 206 | - if($passwordnotifymethod == 'e') { |
|
| 207 | - sendMailMessage($email, $newusername, $newpassword, $fullname); |
|
| 208 | - } |
|
| 209 | - |
|
| 210 | - // check if the username already exist |
|
| 211 | - $rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}' AND id!='{$id}'"); |
|
| 212 | - $limit = $modx->db->getValue($rs); |
|
| 213 | - if($limit > 0) { |
|
| 214 | - webAlertAndQuit("User name is already in use!"); |
|
| 215 | - } |
|
| 216 | - |
|
| 217 | - // check if the email address already exists |
|
| 218 | - $rs = $modx->db->select('count(internalKey)', $tbl_web_user_attributes, "email='{$esc_email}' AND internalKey!='{$id}'"); |
|
| 219 | - $limit = $modx->db->getValue($rs); |
|
| 220 | - if($limit > 0) { |
|
| 221 | - webAlertAndQuit("Email is already in use!"); |
|
| 222 | - } |
|
| 223 | - |
|
| 224 | - // invoke OnBeforeWUsrFormSave event |
|
| 225 | - $modx->invokeEvent("OnBeforeWUsrFormSave", array( |
|
| 226 | - "mode" => "upd", |
|
| 227 | - "id" => $id |
|
| 228 | - )); |
|
| 229 | - |
|
| 230 | - // update user name and password |
|
| 231 | - $field = array(); |
|
| 232 | - $field['username'] = $esc_newusername; |
|
| 233 | - if($genpassword == 1) { |
|
| 234 | - $field['password'] = md5($newpassword); |
|
| 235 | - } |
|
| 236 | - $modx->db->update($field, $tbl_web_users, "id='{$id}'"); |
|
| 237 | - $field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'failedlogincount', 'blocked', 'blockeduntil', 'blockedafter'); |
|
| 238 | - $field = $modx->db->escape($field); |
|
| 239 | - $modx->db->update($field, $tbl_web_user_attributes, "internalKey='{$id}'"); |
|
| 240 | - |
|
| 241 | - // Save User Settings |
|
| 242 | - saveUserSettings($id); |
|
| 243 | - |
|
| 244 | - // Set the item name for logger |
|
| 245 | - $_SESSION['itemname'] = $newusername; |
|
| 246 | - |
|
| 247 | - /*******************************************************************************/ |
|
| 248 | - // put the user in the user_groups he/ she should be in |
|
| 249 | - // first, check that up_perms are switched on! |
|
| 250 | - if($use_udperms == 1) { |
|
| 251 | - // as this is an existing user, delete his/ her entries in the groups before saving the new groups |
|
| 252 | - $modx->db->delete($tbl_web_groups, "webuser='{$id}'"); |
|
| 253 | - if(!empty($user_groups)) { |
|
| 254 | - for($i = 0; $i < count($user_groups); $i++) { |
|
| 255 | - $field = array(); |
|
| 256 | - $field['webgroup'] = (int)$user_groups[$i]; |
|
| 257 | - $field['webuser'] = $id; |
|
| 258 | - $modx->db->insert($field, $tbl_web_groups); |
|
| 259 | - } |
|
| 260 | - } |
|
| 261 | - } |
|
| 262 | - // end of user_groups stuff! |
|
| 263 | - /*******************************************************************************/ |
|
| 186 | + include_once "footer.inc.php"; |
|
| 187 | + } |
|
| 188 | + break; |
|
| 189 | + case '88' : // edit user |
|
| 190 | + // generate a new password for this user |
|
| 191 | + if($genpassword == 1) { |
|
| 192 | + if($specifiedpassword != "" && $passwordgenmethod == "spec") { |
|
| 193 | + if(strlen($specifiedpassword) < 6) { |
|
| 194 | + webAlertAndQuit("Password is too short!"); |
|
| 195 | + } else { |
|
| 196 | + $newpassword = $specifiedpassword; |
|
| 197 | + } |
|
| 198 | + } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") { |
|
| 199 | + webAlertAndQuit("You didn't specify a password for this user!"); |
|
| 200 | + } elseif($passwordgenmethod == 'g') { |
|
| 201 | + $newpassword = generate_password(8); |
|
| 202 | + } else { |
|
| 203 | + webAlertAndQuit("No password generation method specified!"); |
|
| 204 | + } |
|
| 205 | + } |
|
| 206 | + if($passwordnotifymethod == 'e') { |
|
| 207 | + sendMailMessage($email, $newusername, $newpassword, $fullname); |
|
| 208 | + } |
|
| 209 | + |
|
| 210 | + // check if the username already exist |
|
| 211 | + $rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}' AND id!='{$id}'"); |
|
| 212 | + $limit = $modx->db->getValue($rs); |
|
| 213 | + if($limit > 0) { |
|
| 214 | + webAlertAndQuit("User name is already in use!"); |
|
| 215 | + } |
|
| 216 | + |
|
| 217 | + // check if the email address already exists |
|
| 218 | + $rs = $modx->db->select('count(internalKey)', $tbl_web_user_attributes, "email='{$esc_email}' AND internalKey!='{$id}'"); |
|
| 219 | + $limit = $modx->db->getValue($rs); |
|
| 220 | + if($limit > 0) { |
|
| 221 | + webAlertAndQuit("Email is already in use!"); |
|
| 222 | + } |
|
| 223 | + |
|
| 224 | + // invoke OnBeforeWUsrFormSave event |
|
| 225 | + $modx->invokeEvent("OnBeforeWUsrFormSave", array( |
|
| 226 | + "mode" => "upd", |
|
| 227 | + "id" => $id |
|
| 228 | + )); |
|
| 229 | + |
|
| 230 | + // update user name and password |
|
| 231 | + $field = array(); |
|
| 232 | + $field['username'] = $esc_newusername; |
|
| 233 | + if($genpassword == 1) { |
|
| 234 | + $field['password'] = md5($newpassword); |
|
| 235 | + } |
|
| 236 | + $modx->db->update($field, $tbl_web_users, "id='{$id}'"); |
|
| 237 | + $field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'failedlogincount', 'blocked', 'blockeduntil', 'blockedafter'); |
|
| 238 | + $field = $modx->db->escape($field); |
|
| 239 | + $modx->db->update($field, $tbl_web_user_attributes, "internalKey='{$id}'"); |
|
| 240 | + |
|
| 241 | + // Save User Settings |
|
| 242 | + saveUserSettings($id); |
|
| 243 | + |
|
| 244 | + // Set the item name for logger |
|
| 245 | + $_SESSION['itemname'] = $newusername; |
|
| 246 | + |
|
| 247 | + /*******************************************************************************/ |
|
| 248 | + // put the user in the user_groups he/ she should be in |
|
| 249 | + // first, check that up_perms are switched on! |
|
| 250 | + if($use_udperms == 1) { |
|
| 251 | + // as this is an existing user, delete his/ her entries in the groups before saving the new groups |
|
| 252 | + $modx->db->delete($tbl_web_groups, "webuser='{$id}'"); |
|
| 253 | + if(!empty($user_groups)) { |
|
| 254 | + for($i = 0; $i < count($user_groups); $i++) { |
|
| 255 | + $field = array(); |
|
| 256 | + $field['webgroup'] = (int)$user_groups[$i]; |
|
| 257 | + $field['webuser'] = $id; |
|
| 258 | + $modx->db->insert($field, $tbl_web_groups); |
|
| 259 | + } |
|
| 260 | + } |
|
| 261 | + } |
|
| 262 | + // end of user_groups stuff! |
|
| 263 | + /*******************************************************************************/ |
|
| 264 | 264 | |
| 265 | 265 | // invoke OnWebSaveUser event |
| 266 | 266 | $modx->invokeEvent("OnWebSaveUser", array( |
@@ -289,16 +289,16 @@ discard block |
||
| 289 | 289 | "id" => $id |
| 290 | 290 | )); |
| 291 | 291 | |
| 292 | - if($genpassword == 1 && $passwordnotifymethod == 's') { |
|
| 293 | - if($input['stay'] != '') { |
|
| 294 | - $a = ($input['stay'] == '2') ? "88&id={$id}" : "87"; |
|
| 295 | - $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay']; |
|
| 296 | - } else { |
|
| 297 | - $stayUrl = "index.php?a=99&r=2"; |
|
| 298 | - } |
|
| 292 | + if($genpassword == 1 && $passwordnotifymethod == 's') { |
|
| 293 | + if($input['stay'] != '') { |
|
| 294 | + $a = ($input['stay'] == '2') ? "88&id={$id}" : "87"; |
|
| 295 | + $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay']; |
|
| 296 | + } else { |
|
| 297 | + $stayUrl = "index.php?a=99&r=2"; |
|
| 298 | + } |
|
| 299 | 299 | |
| 300 | - include_once "header.inc.php"; |
|
| 301 | - ?> |
|
| 300 | + include_once "header.inc.php"; |
|
| 301 | + ?> |
|
| 302 | 302 | |
| 303 | 303 | <h1><?php echo $_lang['web_user_title']; ?></h1> |
| 304 | 304 | |
@@ -318,20 +318,20 @@ discard block |
||
| 318 | 318 | </div> |
| 319 | 319 | <?php |
| 320 | 320 | |
| 321 | - include_once "footer.inc.php"; |
|
| 322 | - } else { |
|
| 323 | - if($input['stay'] != '') { |
|
| 324 | - $a = ($input['stay'] == '2') ? "88&id={$id}" : "87"; |
|
| 325 | - $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay']; |
|
| 326 | - header($header); |
|
| 327 | - } else { |
|
| 328 | - $header = "Location: index.php?a=99&r=2"; |
|
| 329 | - header($header); |
|
| 330 | - } |
|
| 331 | - } |
|
| 332 | - break; |
|
| 333 | - default : |
|
| 334 | - webAlertAndQuit("No operation set in request."); |
|
| 321 | + include_once "footer.inc.php"; |
|
| 322 | + } else { |
|
| 323 | + if($input['stay'] != '') { |
|
| 324 | + $a = ($input['stay'] == '2') ? "88&id={$id}" : "87"; |
|
| 325 | + $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay']; |
|
| 326 | + header($header); |
|
| 327 | + } else { |
|
| 328 | + $header = "Location: index.php?a=99&r=2"; |
|
| 329 | + header($header); |
|
| 330 | + } |
|
| 331 | + } |
|
| 332 | + break; |
|
| 333 | + default : |
|
| 334 | + webAlertAndQuit("No operation set in request."); |
|
| 335 | 335 | } |
| 336 | 336 | |
| 337 | 337 | /** |
@@ -341,14 +341,14 @@ discard block |
||
| 341 | 341 | * @return string |
| 342 | 342 | */ |
| 343 | 343 | function save_user_quoted_printable($string) { |
| 344 | - $crlf = "\n"; |
|
| 345 | - $string = preg_replace('!(\r\n|\r|\n)!', $crlf, $string) . $crlf; |
|
| 346 | - $f[] = '/([\000-\010\013\014\016-\037\075\177-\377])/e'; |
|
| 347 | - $r[] = "'=' . sprintf('%02X', ord('\\1'))"; |
|
| 348 | - $f[] = '/([\011\040])' . $crlf . '/e'; |
|
| 349 | - $r[] = "'=' . sprintf('%02X', ord('\\1')) . '" . $crlf . "'"; |
|
| 350 | - $string = preg_replace($f, $r, $string); |
|
| 351 | - return trim(wordwrap($string, 70, ' =' . $crlf)); |
|
| 344 | + $crlf = "\n"; |
|
| 345 | + $string = preg_replace('!(\r\n|\r|\n)!', $crlf, $string) . $crlf; |
|
| 346 | + $f[] = '/([\000-\010\013\014\016-\037\075\177-\377])/e'; |
|
| 347 | + $r[] = "'=' . sprintf('%02X', ord('\\1'))"; |
|
| 348 | + $f[] = '/([\011\040])' . $crlf . '/e'; |
|
| 349 | + $r[] = "'=' . sprintf('%02X', ord('\\1')) . '" . $crlf . "'"; |
|
| 350 | + $string = preg_replace($f, $r, $string); |
|
| 351 | + return trim(wordwrap($string, 70, ' =' . $crlf)); |
|
| 352 | 352 | } |
| 353 | 353 | |
| 354 | 354 | /** |
@@ -360,94 +360,94 @@ discard block |
||
| 360 | 360 | * @param string $ufn |
| 361 | 361 | */ |
| 362 | 362 | function sendMailMessage($email, $uid, $pwd, $ufn) { |
| 363 | - global $modx, $_lang, $websignupemail_message; |
|
| 364 | - global $emailsubject, $emailsender; |
|
| 365 | - global $site_name, $site_url; |
|
| 366 | - $message = sprintf($websignupemail_message, $uid, $pwd); // use old method |
|
| 367 | - // replace placeholders |
|
| 368 | - $message = str_replace("[+uid+]", $uid, $message); |
|
| 369 | - $message = str_replace("[+pwd+]", $pwd, $message); |
|
| 370 | - $message = str_replace("[+ufn+]", $ufn, $message); |
|
| 371 | - $message = str_replace("[+sname+]", $site_name, $message); |
|
| 372 | - $message = str_replace("[+saddr+]", $emailsender, $message); |
|
| 373 | - $message = str_replace("[+semail+]", $emailsender, $message); |
|
| 374 | - $message = str_replace("[+surl+]", $site_url, $message); |
|
| 375 | - |
|
| 376 | - $param = array(); |
|
| 377 | - $param['from'] = "{$site_name}<{$emailsender}>"; |
|
| 378 | - $param['subject'] = $emailsubject; |
|
| 379 | - $param['body'] = $message; |
|
| 380 | - $param['to'] = $email; |
|
| 381 | - $param['type'] = 'text'; |
|
| 382 | - $rs = $modx->sendmail($param); |
|
| 383 | - if(!$rs) { |
|
| 384 | - $modx->manager->saveFormValues(); |
|
| 385 | - $modx->messageQuit("{$email} - {$_lang['error_sending_email']}"); |
|
| 386 | - } |
|
| 363 | + global $modx, $_lang, $websignupemail_message; |
|
| 364 | + global $emailsubject, $emailsender; |
|
| 365 | + global $site_name, $site_url; |
|
| 366 | + $message = sprintf($websignupemail_message, $uid, $pwd); // use old method |
|
| 367 | + // replace placeholders |
|
| 368 | + $message = str_replace("[+uid+]", $uid, $message); |
|
| 369 | + $message = str_replace("[+pwd+]", $pwd, $message); |
|
| 370 | + $message = str_replace("[+ufn+]", $ufn, $message); |
|
| 371 | + $message = str_replace("[+sname+]", $site_name, $message); |
|
| 372 | + $message = str_replace("[+saddr+]", $emailsender, $message); |
|
| 373 | + $message = str_replace("[+semail+]", $emailsender, $message); |
|
| 374 | + $message = str_replace("[+surl+]", $site_url, $message); |
|
| 375 | + |
|
| 376 | + $param = array(); |
|
| 377 | + $param['from'] = "{$site_name}<{$emailsender}>"; |
|
| 378 | + $param['subject'] = $emailsubject; |
|
| 379 | + $param['body'] = $message; |
|
| 380 | + $param['to'] = $email; |
|
| 381 | + $param['type'] = 'text'; |
|
| 382 | + $rs = $modx->sendmail($param); |
|
| 383 | + if(!$rs) { |
|
| 384 | + $modx->manager->saveFormValues(); |
|
| 385 | + $modx->messageQuit("{$email} - {$_lang['error_sending_email']}"); |
|
| 386 | + } |
|
| 387 | 387 | } |
| 388 | 388 | |
| 389 | 389 | // Save User Settings |
| 390 | 390 | function saveUserSettings($id) { |
| 391 | - global $modx; |
|
| 392 | - $tbl_web_user_settings = $modx->getFullTableName('web_user_settings'); |
|
| 393 | - |
|
| 394 | - $settings = array( |
|
| 395 | - "login_home", |
|
| 396 | - "allowed_ip", |
|
| 397 | - "allowed_days" |
|
| 398 | - ); |
|
| 399 | - |
|
| 400 | - $modx->db->delete($tbl_web_user_settings, "webuser='{$id}'"); |
|
| 401 | - |
|
| 402 | - foreach($settings as $n) { |
|
| 403 | - $vl = $_POST[$n]; |
|
| 404 | - if(is_array($vl)) { |
|
| 405 | - $vl = implode(",", $vl); |
|
| 406 | - } |
|
| 407 | - if($vl != '') { |
|
| 408 | - $f = array(); |
|
| 409 | - $f['webuser'] = $id; |
|
| 410 | - $f['setting_name'] = $n; |
|
| 411 | - $f['setting_value'] = $vl; |
|
| 412 | - $f = $modx->db->escape($f); |
|
| 413 | - $modx->db->insert($f, $tbl_web_user_settings); |
|
| 414 | - } |
|
| 415 | - } |
|
| 391 | + global $modx; |
|
| 392 | + $tbl_web_user_settings = $modx->getFullTableName('web_user_settings'); |
|
| 393 | + |
|
| 394 | + $settings = array( |
|
| 395 | + "login_home", |
|
| 396 | + "allowed_ip", |
|
| 397 | + "allowed_days" |
|
| 398 | + ); |
|
| 399 | + |
|
| 400 | + $modx->db->delete($tbl_web_user_settings, "webuser='{$id}'"); |
|
| 401 | + |
|
| 402 | + foreach($settings as $n) { |
|
| 403 | + $vl = $_POST[$n]; |
|
| 404 | + if(is_array($vl)) { |
|
| 405 | + $vl = implode(",", $vl); |
|
| 406 | + } |
|
| 407 | + if($vl != '') { |
|
| 408 | + $f = array(); |
|
| 409 | + $f['webuser'] = $id; |
|
| 410 | + $f['setting_name'] = $n; |
|
| 411 | + $f['setting_value'] = $vl; |
|
| 412 | + $f = $modx->db->escape($f); |
|
| 413 | + $modx->db->insert($f, $tbl_web_user_settings); |
|
| 414 | + } |
|
| 415 | + } |
|
| 416 | 416 | } |
| 417 | 417 | |
| 418 | 418 | // Web alert - sends an alert to web browser |
| 419 | 419 | function webAlertAndQuit($msg) { |
| 420 | - global $id, $modx; |
|
| 421 | - $mode = $_POST['mode']; |
|
| 422 | - $modx->manager->saveFormValues($mode); |
|
| 423 | - $modx->webAlertAndQuit($msg, "index.php?a={$mode}" . ($mode == '88' ? "&id={$id}" : '')); |
|
| 420 | + global $id, $modx; |
|
| 421 | + $mode = $_POST['mode']; |
|
| 422 | + $modx->manager->saveFormValues($mode); |
|
| 423 | + $modx->webAlertAndQuit($msg, "index.php?a={$mode}" . ($mode == '88' ? "&id={$id}" : '')); |
|
| 424 | 424 | } |
| 425 | 425 | |
| 426 | 426 | // Generate password |
| 427 | 427 | function generate_password($length = 10) { |
| 428 | - $allowable_characters = "abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789"; |
|
| 429 | - $ps_len = strlen($allowable_characters); |
|
| 430 | - mt_srand((double) microtime() * 1000000); |
|
| 431 | - $pass = ""; |
|
| 432 | - for($i = 0; $i < $length; $i++) { |
|
| 433 | - $pass .= $allowable_characters[mt_rand(0, $ps_len - 1)]; |
|
| 434 | - } |
|
| 435 | - return $pass; |
|
| 428 | + $allowable_characters = "abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789"; |
|
| 429 | + $ps_len = strlen($allowable_characters); |
|
| 430 | + mt_srand((double) microtime() * 1000000); |
|
| 431 | + $pass = ""; |
|
| 432 | + for($i = 0; $i < $length; $i++) { |
|
| 433 | + $pass .= $allowable_characters[mt_rand(0, $ps_len - 1)]; |
|
| 434 | + } |
|
| 435 | + return $pass; |
|
| 436 | 436 | } |
| 437 | 437 | |
| 438 | 438 | function sanitize($str = '', $safecount = 0) { |
| 439 | - global $modx; |
|
| 440 | - $safecount++; |
|
| 441 | - if(1000 < $safecount) { |
|
| 442 | - exit("error too many loops '{$safecount}'"); |
|
| 443 | - } |
|
| 444 | - if(is_array($str)) { |
|
| 445 | - foreach($str as $i => $v) { |
|
| 446 | - $str[$i] = sanitize($v, $safecount); |
|
| 447 | - } |
|
| 448 | - } else { |
|
| 449 | - // $str = strip_tags($str); // LEAVE < and > intact |
|
| 450 | - $str = htmlspecialchars($str, ENT_NOQUOTES, $modx->config['modx_charset']); |
|
| 451 | - } |
|
| 452 | - return $str; |
|
| 439 | + global $modx; |
|
| 440 | + $safecount++; |
|
| 441 | + if(1000 < $safecount) { |
|
| 442 | + exit("error too many loops '{$safecount}'"); |
|
| 443 | + } |
|
| 444 | + if(is_array($str)) { |
|
| 445 | + foreach($str as $i => $v) { |
|
| 446 | + $str[$i] = sanitize($v, $safecount); |
|
| 447 | + } |
|
| 448 | + } else { |
|
| 449 | + // $str = strip_tags($str); // LEAVE < and > intact |
|
| 450 | + $str = htmlspecialchars($str, ENT_NOQUOTES, $modx->config['modx_charset']); |
|
| 451 | + } |
|
| 452 | + return $str; |
|
| 453 | 453 | } |
@@ -8,7 +8,7 @@ |
||
| 8 | 8 | |
| 9 | 9 | $load_script = file_get_contents(dirname(__FILE__).'/datepicker.tpl'); |
| 10 | 10 | if(!isset($modx->config['lang_code'])) $modx->config['lang_code'] = $this->getLangCode(); |
| 11 | - $modx->config['datetime_format_lc'] = isset($modx->config['datetime_format']) ? strtolower($modx->config['datetime_format']) : 'dd-mm-yyyy'; |
|
| 11 | + $modx->config['datetime_format_lc'] = isset($modx->config['datetime_format']) ? strtolower($modx->config['datetime_format']) : 'dd-mm-yyyy'; |
|
| 12 | 12 | return $modx->mergeSettingsContent($load_script); |
| 13 | 13 | } |
| 14 | 14 | |
@@ -492,7 +492,7 @@ |
||
| 492 | 492 | }elseif ((!empty($pub_date)&& $pub_date<=$currentdate && $published)) { |
| 493 | 493 | $publishedon = $pub_date; |
| 494 | 494 | $publishedby = $modx->getLoginUserID(); |
| 495 | - }elseif ($was_published && !$published) { |
|
| 495 | + }elseif ($was_published && !$published) { |
|
| 496 | 496 | $publishedon = 0; |
| 497 | 497 | $publishedby = 0; |
| 498 | 498 | } else { |
@@ -4,237 +4,237 @@ discard block |
||
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | 6 | $sitemenu['bars'] = array( |
| 7 | - 'bars', |
|
| 8 | - 'main', |
|
| 9 | - '<i class="fa fa-bars"></i>', |
|
| 10 | - 'javascript:;', |
|
| 11 | - $_lang['home'], |
|
| 12 | - 'modx.resizer.toggle(); return false;', |
|
| 13 | - ' return false;', |
|
| 14 | - '', |
|
| 15 | - 0, |
|
| 16 | - 10, |
|
| 17 | - '' |
|
| 7 | + 'bars', |
|
| 8 | + 'main', |
|
| 9 | + '<i class="fa fa-bars"></i>', |
|
| 10 | + 'javascript:;', |
|
| 11 | + $_lang['home'], |
|
| 12 | + 'modx.resizer.toggle(); return false;', |
|
| 13 | + ' return false;', |
|
| 14 | + '', |
|
| 15 | + 0, |
|
| 16 | + 10, |
|
| 17 | + '' |
|
| 18 | 18 | ); |
| 19 | 19 | |
| 20 | 20 | //mainMenu |
| 21 | 21 | $sitemenu['site'] = array( |
| 22 | - 'site', |
|
| 23 | - 'main', |
|
| 24 | - '<i class="fa fa-tachometer"></i>' . $_lang['home'], |
|
| 25 | - 'index.php?a=2', |
|
| 26 | - $_lang['home'], |
|
| 27 | - '', |
|
| 28 | - '', |
|
| 29 | - 'main', |
|
| 30 | - 0, |
|
| 31 | - 10, |
|
| 32 | - 'active' |
|
| 22 | + 'site', |
|
| 23 | + 'main', |
|
| 24 | + '<i class="fa fa-tachometer"></i>' . $_lang['home'], |
|
| 25 | + 'index.php?a=2', |
|
| 26 | + $_lang['home'], |
|
| 27 | + '', |
|
| 28 | + '', |
|
| 29 | + 'main', |
|
| 30 | + 0, |
|
| 31 | + 10, |
|
| 32 | + 'active' |
|
| 33 | 33 | ); |
| 34 | 34 | |
| 35 | 35 | if($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('file_manager')) {
|
| 36 | - $sitemenu['elements'] = array( |
|
| 37 | - 'elements', |
|
| 38 | - 'main', |
|
| 39 | - '<i class="fa fa-th"></i>' . $_lang['elements'], |
|
| 40 | - 'javascript:;', |
|
| 41 | - $_lang['elements'], |
|
| 42 | - ' return false;', |
|
| 43 | - '', |
|
| 44 | - '', |
|
| 45 | - 0, |
|
| 46 | - 20, |
|
| 47 | - '' |
|
| 48 | - ); |
|
| 36 | + $sitemenu['elements'] = array( |
|
| 37 | + 'elements', |
|
| 38 | + 'main', |
|
| 39 | + '<i class="fa fa-th"></i>' . $_lang['elements'], |
|
| 40 | + 'javascript:;', |
|
| 41 | + $_lang['elements'], |
|
| 42 | + ' return false;', |
|
| 43 | + '', |
|
| 44 | + '', |
|
| 45 | + 0, |
|
| 46 | + 20, |
|
| 47 | + '' |
|
| 48 | + ); |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | if($modx->hasPermission('exec_module')) {
|
| 52 | - $sitemenu['modules'] = array( |
|
| 53 | - 'modules', |
|
| 54 | - 'main', |
|
| 55 | - '<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['modules'], |
|
| 56 | - 'javascript:;', |
|
| 57 | - $_lang['modules'], |
|
| 58 | - ' return false;', |
|
| 59 | - '', |
|
| 60 | - '', |
|
| 61 | - 0, |
|
| 62 | - 30, |
|
| 63 | - '' |
|
| 64 | - ); |
|
| 52 | + $sitemenu['modules'] = array( |
|
| 53 | + 'modules', |
|
| 54 | + 'main', |
|
| 55 | + '<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['modules'], |
|
| 56 | + 'javascript:;', |
|
| 57 | + $_lang['modules'], |
|
| 58 | + ' return false;', |
|
| 59 | + '', |
|
| 60 | + '', |
|
| 61 | + 0, |
|
| 62 | + 30, |
|
| 63 | + '' |
|
| 64 | + ); |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | if($modx->hasPermission('edit_user') || $modx->hasPermission('edit_web_user') || $modx->hasPermission('edit_role') || $modx->hasPermission('access_permissions') || $modx->hasPermission('web_access_permissions')) {
|
| 68 | - $sitemenu['users'] = array( |
|
| 69 | - 'users', |
|
| 70 | - 'main', |
|
| 71 | - '<i class="fa fa-users"></i>' . $_lang['users'], |
|
| 72 | - 'javascript:;', |
|
| 73 | - $_lang['users'], |
|
| 74 | - ' return false;', |
|
| 75 | - 'edit_user', |
|
| 76 | - '', |
|
| 77 | - 0, |
|
| 78 | - 40, |
|
| 79 | - '' |
|
| 80 | - ); |
|
| 68 | + $sitemenu['users'] = array( |
|
| 69 | + 'users', |
|
| 70 | + 'main', |
|
| 71 | + '<i class="fa fa-users"></i>' . $_lang['users'], |
|
| 72 | + 'javascript:;', |
|
| 73 | + $_lang['users'], |
|
| 74 | + ' return false;', |
|
| 75 | + 'edit_user', |
|
| 76 | + '', |
|
| 77 | + 0, |
|
| 78 | + 40, |
|
| 79 | + '' |
|
| 80 | + ); |
|
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | if($modx->hasPermission('empty_cache') || $modx->hasPermission('bk_manager') || $modx->hasPermission('remove_locks') || $modx->hasPermission('import_static') || $modx->hasPermission('export_static')) {
|
| 84 | - $sitemenu['tools'] = array( |
|
| 85 | - 'tools', |
|
| 86 | - 'main', |
|
| 87 | - '<i class="fa fa-wrench"></i>' . $_lang['tools'], |
|
| 88 | - 'javascript:;', |
|
| 89 | - $_lang['tools'], |
|
| 90 | - ' return false;', |
|
| 91 | - '', |
|
| 92 | - '', |
|
| 93 | - 0, |
|
| 94 | - 50, |
|
| 95 | - '' |
|
| 96 | - ); |
|
| 84 | + $sitemenu['tools'] = array( |
|
| 85 | + 'tools', |
|
| 86 | + 'main', |
|
| 87 | + '<i class="fa fa-wrench"></i>' . $_lang['tools'], |
|
| 88 | + 'javascript:;', |
|
| 89 | + $_lang['tools'], |
|
| 90 | + ' return false;', |
|
| 91 | + '', |
|
| 92 | + '', |
|
| 93 | + 0, |
|
| 94 | + 50, |
|
| 95 | + '' |
|
| 96 | + ); |
|
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | $tab = 0; |
| 100 | 100 | if($modx->hasPermission('edit_template')) {
|
| 101 | - $sitemenu['element_templates'] = array( |
|
| 102 | - 'element_templates', |
|
| 103 | - 'elements', |
|
| 104 | - '<i class="fa fa-newspaper-o"></i>' . $_lang['manage_templates'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 105 | - 'index.php?a=76&tab=' . $tab++, |
|
| 106 | - $_lang['manage_templates'], |
|
| 107 | - '', |
|
| 108 | - 'new_template,edit_template', |
|
| 109 | - 'main', |
|
| 110 | - 0, |
|
| 111 | - 10, |
|
| 112 | - 'dropdown-toggle' |
|
| 113 | - ); |
|
| 101 | + $sitemenu['element_templates'] = array( |
|
| 102 | + 'element_templates', |
|
| 103 | + 'elements', |
|
| 104 | + '<i class="fa fa-newspaper-o"></i>' . $_lang['manage_templates'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 105 | + 'index.php?a=76&tab=' . $tab++, |
|
| 106 | + $_lang['manage_templates'], |
|
| 107 | + '', |
|
| 108 | + 'new_template,edit_template', |
|
| 109 | + 'main', |
|
| 110 | + 0, |
|
| 111 | + 10, |
|
| 112 | + 'dropdown-toggle' |
|
| 113 | + ); |
|
| 114 | 114 | } |
| 115 | 115 | if($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
|
| 116 | - $sitemenu['element_tplvars'] = array( |
|
| 117 | - 'element_tplvars', |
|
| 118 | - 'elements', |
|
| 119 | - '<i class="fa fa-list-alt"></i>' . $_lang['tmplvars'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 120 | - 'index.php?a=76&tab=' . $tab++, |
|
| 121 | - $_lang['tmplvars'], |
|
| 122 | - '', |
|
| 123 | - 'new_template,edit_template', |
|
| 124 | - 'main', |
|
| 125 | - 0, |
|
| 126 | - 20, |
|
| 127 | - 'dropdown-toggle' |
|
| 128 | - ); |
|
| 116 | + $sitemenu['element_tplvars'] = array( |
|
| 117 | + 'element_tplvars', |
|
| 118 | + 'elements', |
|
| 119 | + '<i class="fa fa-list-alt"></i>' . $_lang['tmplvars'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 120 | + 'index.php?a=76&tab=' . $tab++, |
|
| 121 | + $_lang['tmplvars'], |
|
| 122 | + '', |
|
| 123 | + 'new_template,edit_template', |
|
| 124 | + 'main', |
|
| 125 | + 0, |
|
| 126 | + 20, |
|
| 127 | + 'dropdown-toggle' |
|
| 128 | + ); |
|
| 129 | 129 | } |
| 130 | 130 | if($modx->hasPermission('edit_chunk')) {
|
| 131 | - $sitemenu['element_htmlsnippets'] = array( |
|
| 132 | - 'element_htmlsnippets', |
|
| 133 | - 'elements', |
|
| 134 | - '<i class="fa fa-th-large"></i>' . $_lang['manage_htmlsnippets'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 135 | - 'index.php?a=76&tab=' . $tab++, |
|
| 136 | - $_lang['manage_htmlsnippets'], |
|
| 137 | - '', |
|
| 138 | - 'new_chunk,edit_chunk', |
|
| 139 | - 'main', |
|
| 140 | - 0, |
|
| 141 | - 30, |
|
| 142 | - 'dropdown-toggle' |
|
| 143 | - ); |
|
| 131 | + $sitemenu['element_htmlsnippets'] = array( |
|
| 132 | + 'element_htmlsnippets', |
|
| 133 | + 'elements', |
|
| 134 | + '<i class="fa fa-th-large"></i>' . $_lang['manage_htmlsnippets'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 135 | + 'index.php?a=76&tab=' . $tab++, |
|
| 136 | + $_lang['manage_htmlsnippets'], |
|
| 137 | + '', |
|
| 138 | + 'new_chunk,edit_chunk', |
|
| 139 | + 'main', |
|
| 140 | + 0, |
|
| 141 | + 30, |
|
| 142 | + 'dropdown-toggle' |
|
| 143 | + ); |
|
| 144 | 144 | } |
| 145 | 145 | if($modx->hasPermission('edit_snippet')) {
|
| 146 | - $sitemenu['element_snippets'] = array( |
|
| 147 | - 'element_snippets', |
|
| 148 | - 'elements', |
|
| 149 | - '<i class="fa fa-code"></i>' . $_lang['manage_snippets'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 150 | - 'index.php?a=76&tab=' . $tab++, |
|
| 151 | - $_lang['manage_snippets'], |
|
| 152 | - '', |
|
| 153 | - 'new_snippet,edit_snippet', |
|
| 154 | - 'main', |
|
| 155 | - 0, |
|
| 156 | - 40, |
|
| 157 | - 'dropdown-toggle' |
|
| 158 | - ); |
|
| 146 | + $sitemenu['element_snippets'] = array( |
|
| 147 | + 'element_snippets', |
|
| 148 | + 'elements', |
|
| 149 | + '<i class="fa fa-code"></i>' . $_lang['manage_snippets'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 150 | + 'index.php?a=76&tab=' . $tab++, |
|
| 151 | + $_lang['manage_snippets'], |
|
| 152 | + '', |
|
| 153 | + 'new_snippet,edit_snippet', |
|
| 154 | + 'main', |
|
| 155 | + 0, |
|
| 156 | + 40, |
|
| 157 | + 'dropdown-toggle' |
|
| 158 | + ); |
|
| 159 | 159 | } |
| 160 | 160 | if($modx->hasPermission('edit_plugin')) {
|
| 161 | - $sitemenu['element_plugins'] = array( |
|
| 162 | - 'element_plugins', |
|
| 163 | - 'elements', |
|
| 164 | - '<i class="fa fa-plug"></i>' . $_lang['manage_plugins'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 165 | - 'index.php?a=76&tab=' . $tab++, |
|
| 166 | - $_lang['manage_plugins'], |
|
| 167 | - '', |
|
| 168 | - 'new_plugin,edit_plugin', |
|
| 169 | - 'main', |
|
| 170 | - 0, |
|
| 171 | - 50, |
|
| 172 | - 'dropdown-toggle' |
|
| 173 | - ); |
|
| 161 | + $sitemenu['element_plugins'] = array( |
|
| 162 | + 'element_plugins', |
|
| 163 | + 'elements', |
|
| 164 | + '<i class="fa fa-plug"></i>' . $_lang['manage_plugins'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 165 | + 'index.php?a=76&tab=' . $tab++, |
|
| 166 | + $_lang['manage_plugins'], |
|
| 167 | + '', |
|
| 168 | + 'new_plugin,edit_plugin', |
|
| 169 | + 'main', |
|
| 170 | + 0, |
|
| 171 | + 50, |
|
| 172 | + 'dropdown-toggle' |
|
| 173 | + ); |
|
| 174 | 174 | } |
| 175 | 175 | //$sitemenu['element_categories'] = array('element_categories','elements',$_lang['element_categories'],'index.php?a=76&tab=5',$_lang['element_categories'],'','new_template,edit_template,new_snippet,edit_snippet,new_chunk,edit_chunk,new_plugin,edit_plugin','main',1,60,'');
|
| 176 | 176 | |
| 177 | 177 | if($modx->hasPermission('file_manager')) {
|
| 178 | - $sitemenu['manage_files'] = array( |
|
| 179 | - 'manage_files', |
|
| 180 | - 'elements', |
|
| 181 | - '<i class="fa fa-folder-open-o"></i>' . $_lang['manage_files'], |
|
| 182 | - 'index.php?a=31', |
|
| 183 | - $_lang['manage_files'], |
|
| 184 | - '', |
|
| 185 | - 'file_manager', |
|
| 186 | - 'main', |
|
| 187 | - 0, |
|
| 188 | - 80, |
|
| 189 | - '' |
|
| 190 | - ); |
|
| 178 | + $sitemenu['manage_files'] = array( |
|
| 179 | + 'manage_files', |
|
| 180 | + 'elements', |
|
| 181 | + '<i class="fa fa-folder-open-o"></i>' . $_lang['manage_files'], |
|
| 182 | + 'index.php?a=31', |
|
| 183 | + $_lang['manage_files'], |
|
| 184 | + '', |
|
| 185 | + 'file_manager', |
|
| 186 | + 'main', |
|
| 187 | + 0, |
|
| 188 | + 80, |
|
| 189 | + '' |
|
| 190 | + ); |
|
| 191 | 191 | } |
| 192 | 192 | if($modx->hasPermission('category_manager')) {
|
| 193 | - $sitemenu['manage_categories'] = array( |
|
| 194 | - 'manage_categories', |
|
| 195 | - 'elements', |
|
| 196 | - '<i class="fa fa-object-group"></i>' . $_lang['manage_categories'], |
|
| 197 | - 'index.php?a=120', |
|
| 198 | - $_lang['manage_categories'], |
|
| 199 | - '', |
|
| 200 | - 'category_manager', |
|
| 201 | - 'main', |
|
| 202 | - 0, |
|
| 203 | - 70, |
|
| 204 | - '' |
|
| 205 | - ); |
|
| 193 | + $sitemenu['manage_categories'] = array( |
|
| 194 | + 'manage_categories', |
|
| 195 | + 'elements', |
|
| 196 | + '<i class="fa fa-object-group"></i>' . $_lang['manage_categories'], |
|
| 197 | + 'index.php?a=120', |
|
| 198 | + $_lang['manage_categories'], |
|
| 199 | + '', |
|
| 200 | + 'category_manager', |
|
| 201 | + 'main', |
|
| 202 | + 0, |
|
| 203 | + 70, |
|
| 204 | + '' |
|
| 205 | + ); |
|
| 206 | 206 | } |
| 207 | 207 | |
| 208 | 208 | // Modules Menu Items |
| 209 | 209 | if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('save_module')) {
|
| 210 | - $sitemenu['new_module'] = array( |
|
| 211 | - 'new_module', |
|
| 212 | - 'modules', |
|
| 213 | - '<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['module_management'], |
|
| 214 | - 'index.php?a=106', |
|
| 215 | - $_lang['module_management'], |
|
| 216 | - '', |
|
| 217 | - 'new_module,edit_module', |
|
| 218 | - 'main', |
|
| 219 | - 1, |
|
| 220 | - 0, |
|
| 221 | - '' |
|
| 222 | - ); |
|
| 210 | + $sitemenu['new_module'] = array( |
|
| 211 | + 'new_module', |
|
| 212 | + 'modules', |
|
| 213 | + '<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['module_management'], |
|
| 214 | + 'index.php?a=106', |
|
| 215 | + $_lang['module_management'], |
|
| 216 | + '', |
|
| 217 | + 'new_module,edit_module', |
|
| 218 | + 'main', |
|
| 219 | + 1, |
|
| 220 | + 0, |
|
| 221 | + '' |
|
| 222 | + ); |
|
| 223 | 223 | } |
| 224 | 224 | |
| 225 | 225 | if($modx->hasPermission('exec_module')) {
|
| 226 | - if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
|
|
| 227 | - $rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm.icon, mg.member
|
|
| 226 | + if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
|
|
| 227 | + $rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm.icon, mg.member
|
|
| 228 | 228 | FROM ' . $modx->getFullTableName('site_modules') . ' AS sm
|
| 229 | 229 | LEFT JOIN ' . $modx->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id
|
| 230 | 230 | LEFT JOIN ' . $modx->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group
|
| 231 | 231 | WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1 |
| 232 | 232 | ORDER BY sm.name'); |
| 233 | - } else {
|
|
| 234 | - $rs = $modx->db->select('*', $modx->getFullTableName('site_modules'), 'disabled != 1', 'name');
|
|
| 235 | - } |
|
| 236 | - if($modx->db->getRecordCount($rs)) {
|
|
| 237 | - while ($row = $modx->db->getRow($rs)) {
|
|
| 233 | + } else {
|
|
| 234 | + $rs = $modx->db->select('*', $modx->getFullTableName('site_modules'), 'disabled != 1', 'name');
|
|
| 235 | + } |
|
| 236 | + if($modx->db->getRecordCount($rs)) {
|
|
| 237 | + while ($row = $modx->db->getRow($rs)) {
|
|
| 238 | 238 | $sitemenu['module' . $row['id']] = array( |
| 239 | 239 | 'module' . $row['id'], |
| 240 | 240 | 'modules', |
@@ -255,83 +255,83 @@ discard block |
||
| 255 | 255 | // security menu items (users) |
| 256 | 256 | |
| 257 | 257 | if($modx->hasPermission('edit_user')) {
|
| 258 | - $sitemenu['user_management_title'] = array( |
|
| 259 | - 'user_management_title', |
|
| 260 | - 'users', |
|
| 261 | - '<i class="fa fa fa-user"></i>' . $_lang['user_management_title'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 262 | - 'index.php?a=75', |
|
| 263 | - $_lang['user_management_title'], |
|
| 264 | - '', |
|
| 265 | - 'edit_user', |
|
| 266 | - 'main', |
|
| 267 | - 0, |
|
| 268 | - 10, |
|
| 269 | - 'dropdown-toggle' |
|
| 270 | - ); |
|
| 258 | + $sitemenu['user_management_title'] = array( |
|
| 259 | + 'user_management_title', |
|
| 260 | + 'users', |
|
| 261 | + '<i class="fa fa fa-user"></i>' . $_lang['user_management_title'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 262 | + 'index.php?a=75', |
|
| 263 | + $_lang['user_management_title'], |
|
| 264 | + '', |
|
| 265 | + 'edit_user', |
|
| 266 | + 'main', |
|
| 267 | + 0, |
|
| 268 | + 10, |
|
| 269 | + 'dropdown-toggle' |
|
| 270 | + ); |
|
| 271 | 271 | } |
| 272 | 272 | |
| 273 | 273 | if($modx->hasPermission('edit_web_user')) {
|
| 274 | - $sitemenu['web_user_management_title'] = array( |
|
| 275 | - 'web_user_management_title', |
|
| 276 | - 'users', |
|
| 277 | - '<i class="fa fa-users"></i>' . $_lang['web_user_management_title'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 278 | - 'index.php?a=99', |
|
| 279 | - $_lang['web_user_management_title'], |
|
| 280 | - '', |
|
| 281 | - 'edit_web_user', |
|
| 282 | - 'main', |
|
| 283 | - 0, |
|
| 284 | - 20, |
|
| 285 | - 'dropdown-toggle' |
|
| 286 | - ); |
|
| 274 | + $sitemenu['web_user_management_title'] = array( |
|
| 275 | + 'web_user_management_title', |
|
| 276 | + 'users', |
|
| 277 | + '<i class="fa fa-users"></i>' . $_lang['web_user_management_title'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 278 | + 'index.php?a=99', |
|
| 279 | + $_lang['web_user_management_title'], |
|
| 280 | + '', |
|
| 281 | + 'edit_web_user', |
|
| 282 | + 'main', |
|
| 283 | + 0, |
|
| 284 | + 20, |
|
| 285 | + 'dropdown-toggle' |
|
| 286 | + ); |
|
| 287 | 287 | } |
| 288 | 288 | |
| 289 | 289 | if($modx->hasPermission('edit_role')) {
|
| 290 | - $sitemenu['role_management_title'] = array( |
|
| 291 | - 'role_management_title', |
|
| 292 | - 'users', |
|
| 293 | - '<i class="fa fa-legal"></i>' . $_lang['role_management_title'], |
|
| 294 | - 'index.php?a=86', |
|
| 295 | - $_lang['role_management_title'], |
|
| 296 | - '', |
|
| 297 | - 'new_role,edit_role,delete_role', |
|
| 298 | - 'main', |
|
| 299 | - 0, |
|
| 300 | - 30, |
|
| 301 | - '' |
|
| 302 | - ); |
|
| 290 | + $sitemenu['role_management_title'] = array( |
|
| 291 | + 'role_management_title', |
|
| 292 | + 'users', |
|
| 293 | + '<i class="fa fa-legal"></i>' . $_lang['role_management_title'], |
|
| 294 | + 'index.php?a=86', |
|
| 295 | + $_lang['role_management_title'], |
|
| 296 | + '', |
|
| 297 | + 'new_role,edit_role,delete_role', |
|
| 298 | + 'main', |
|
| 299 | + 0, |
|
| 300 | + 30, |
|
| 301 | + '' |
|
| 302 | + ); |
|
| 303 | 303 | } |
| 304 | 304 | |
| 305 | 305 | if($modx->hasPermission('access_permissions')) {
|
| 306 | - $sitemenu['manager_permissions'] = array( |
|
| 307 | - 'manager_permissions', |
|
| 308 | - 'users', |
|
| 309 | - '<i class="fa fa-male"></i>' . $_lang['manager_permissions'], |
|
| 310 | - 'index.php?a=40', |
|
| 311 | - $_lang['manager_permissions'], |
|
| 312 | - '', |
|
| 313 | - 'access_permissions', |
|
| 314 | - 'main', |
|
| 315 | - 0, |
|
| 316 | - 40, |
|
| 317 | - '' |
|
| 318 | - ); |
|
| 306 | + $sitemenu['manager_permissions'] = array( |
|
| 307 | + 'manager_permissions', |
|
| 308 | + 'users', |
|
| 309 | + '<i class="fa fa-male"></i>' . $_lang['manager_permissions'], |
|
| 310 | + 'index.php?a=40', |
|
| 311 | + $_lang['manager_permissions'], |
|
| 312 | + '', |
|
| 313 | + 'access_permissions', |
|
| 314 | + 'main', |
|
| 315 | + 0, |
|
| 316 | + 40, |
|
| 317 | + '' |
|
| 318 | + ); |
|
| 319 | 319 | } |
| 320 | 320 | |
| 321 | 321 | if($modx->hasPermission('web_access_permissions')) {
|
| 322 | - $sitemenu['web_permissions'] = array( |
|
| 323 | - 'web_permissions', |
|
| 324 | - 'users', |
|
| 325 | - '<i class="fa fa-universal-access"></i>' . $_lang['web_permissions'], |
|
| 326 | - 'index.php?a=91', |
|
| 327 | - $_lang['web_permissions'], |
|
| 328 | - '', |
|
| 329 | - 'web_access_permissions', |
|
| 330 | - 'main', |
|
| 331 | - 0, |
|
| 332 | - 50, |
|
| 333 | - '' |
|
| 334 | - ); |
|
| 322 | + $sitemenu['web_permissions'] = array( |
|
| 323 | + 'web_permissions', |
|
| 324 | + 'users', |
|
| 325 | + '<i class="fa fa-universal-access"></i>' . $_lang['web_permissions'], |
|
| 326 | + 'index.php?a=91', |
|
| 327 | + $_lang['web_permissions'], |
|
| 328 | + '', |
|
| 329 | + 'web_access_permissions', |
|
| 330 | + 'main', |
|
| 331 | + 0, |
|
| 332 | + 50, |
|
| 333 | + '' |
|
| 334 | + ); |
|
| 335 | 335 | } |
| 336 | 336 | |
| 337 | 337 | // Tools Menu |
@@ -361,104 +361,104 @@ discard block |
||
| 361 | 361 | ); |
| 362 | 362 | |
| 363 | 363 | $sitemenu['search'] = array( |
| 364 | - 'search', |
|
| 365 | - 'tools', |
|
| 366 | - '<i class="fa fa-search"></i>' . $_lang['search'], |
|
| 367 | - 'index.php?a=71', |
|
| 368 | - $_lang['search'], |
|
| 369 | - '', |
|
| 370 | - '', |
|
| 371 | - 'main', |
|
| 372 | - 1, |
|
| 373 | - 9, |
|
| 374 | - '' |
|
| 364 | + 'search', |
|
| 365 | + 'tools', |
|
| 366 | + '<i class="fa fa-search"></i>' . $_lang['search'], |
|
| 367 | + 'index.php?a=71', |
|
| 368 | + $_lang['search'], |
|
| 369 | + '', |
|
| 370 | + '', |
|
| 371 | + 'main', |
|
| 372 | + 1, |
|
| 373 | + 9, |
|
| 374 | + '' |
|
| 375 | 375 | ); |
| 376 | 376 | |
| 377 | 377 | if($modx->hasPermission('bk_manager')) {
|
| 378 | - $sitemenu['bk_manager'] = array( |
|
| 379 | - 'bk_manager', |
|
| 380 | - 'tools', |
|
| 381 | - '<i class="fa fa-database"></i>' . $_lang['bk_manager'], |
|
| 382 | - 'index.php?a=93', |
|
| 383 | - $_lang['bk_manager'], |
|
| 384 | - '', |
|
| 385 | - 'bk_manager', |
|
| 386 | - 'main', |
|
| 387 | - 0, |
|
| 388 | - 10, |
|
| 389 | - '' |
|
| 390 | - ); |
|
| 378 | + $sitemenu['bk_manager'] = array( |
|
| 379 | + 'bk_manager', |
|
| 380 | + 'tools', |
|
| 381 | + '<i class="fa fa-database"></i>' . $_lang['bk_manager'], |
|
| 382 | + 'index.php?a=93', |
|
| 383 | + $_lang['bk_manager'], |
|
| 384 | + '', |
|
| 385 | + 'bk_manager', |
|
| 386 | + 'main', |
|
| 387 | + 0, |
|
| 388 | + 10, |
|
| 389 | + '' |
|
| 390 | + ); |
|
| 391 | 391 | } |
| 392 | 392 | |
| 393 | 393 | if($modx->hasPermission('remove_locks')) {
|
| 394 | - $sitemenu['remove_locks'] = array( |
|
| 395 | - 'remove_locks', |
|
| 396 | - 'tools', |
|
| 397 | - '<i class="fa fa-hourglass"></i>' . $_lang['remove_locks'], |
|
| 398 | - 'javascript:modx.removeLocks();', |
|
| 399 | - $_lang['remove_locks'], |
|
| 400 | - '', |
|
| 401 | - 'remove_locks', |
|
| 402 | - '', |
|
| 403 | - 0, |
|
| 404 | - 20, |
|
| 405 | - '' |
|
| 406 | - ); |
|
| 394 | + $sitemenu['remove_locks'] = array( |
|
| 395 | + 'remove_locks', |
|
| 396 | + 'tools', |
|
| 397 | + '<i class="fa fa-hourglass"></i>' . $_lang['remove_locks'], |
|
| 398 | + 'javascript:modx.removeLocks();', |
|
| 399 | + $_lang['remove_locks'], |
|
| 400 | + '', |
|
| 401 | + 'remove_locks', |
|
| 402 | + '', |
|
| 403 | + 0, |
|
| 404 | + 20, |
|
| 405 | + '' |
|
| 406 | + ); |
|
| 407 | 407 | } |
| 408 | 408 | |
| 409 | 409 | if($modx->hasPermission('import_static')) {
|
| 410 | - $sitemenu['import_site'] = array( |
|
| 411 | - 'import_site', |
|
| 412 | - 'tools', |
|
| 413 | - '<i class="fa fa-upload"></i>' . $_lang['import_site'], |
|
| 414 | - 'index.php?a=95', |
|
| 415 | - $_lang['import_site'], |
|
| 416 | - '', |
|
| 417 | - 'import_static', |
|
| 418 | - 'main', |
|
| 419 | - 0, |
|
| 420 | - 30, |
|
| 421 | - '' |
|
| 422 | - ); |
|
| 410 | + $sitemenu['import_site'] = array( |
|
| 411 | + 'import_site', |
|
| 412 | + 'tools', |
|
| 413 | + '<i class="fa fa-upload"></i>' . $_lang['import_site'], |
|
| 414 | + 'index.php?a=95', |
|
| 415 | + $_lang['import_site'], |
|
| 416 | + '', |
|
| 417 | + 'import_static', |
|
| 418 | + 'main', |
|
| 419 | + 0, |
|
| 420 | + 30, |
|
| 421 | + '' |
|
| 422 | + ); |
|
| 423 | 423 | } |
| 424 | 424 | |
| 425 | 425 | if($modx->hasPermission('export_static')) {
|
| 426 | - $sitemenu['export_site'] = array( |
|
| 427 | - 'export_site', |
|
| 428 | - 'tools', |
|
| 429 | - '<i class="fa fa-download"></i>' . $_lang['export_site'], |
|
| 430 | - 'index.php?a=83', |
|
| 431 | - $_lang['export_site'], |
|
| 432 | - '', |
|
| 433 | - 'export_static', |
|
| 434 | - 'main', |
|
| 435 | - 1, |
|
| 436 | - 40, |
|
| 437 | - '' |
|
| 438 | - ); |
|
| 426 | + $sitemenu['export_site'] = array( |
|
| 427 | + 'export_site', |
|
| 428 | + 'tools', |
|
| 429 | + '<i class="fa fa-download"></i>' . $_lang['export_site'], |
|
| 430 | + 'index.php?a=83', |
|
| 431 | + $_lang['export_site'], |
|
| 432 | + '', |
|
| 433 | + 'export_static', |
|
| 434 | + 'main', |
|
| 435 | + 1, |
|
| 436 | + 40, |
|
| 437 | + '' |
|
| 438 | + ); |
|
| 439 | 439 | } |
| 440 | 440 | |
| 441 | 441 | $menu = $modx->invokeEvent("OnManagerMenuPrerender", array('menu' => $sitemenu));
|
| 442 | 442 | if(is_array($menu)) {
|
| 443 | - $newmenu = array(); |
|
| 444 | - foreach($menu as $item){
|
|
| 445 | - if(is_array(unserialize($item))){
|
|
| 446 | - $newmenu = array_merge($newmenu, unserialize($item)); |
|
| 447 | - } |
|
| 448 | - } |
|
| 449 | - if(count($newmenu)> 0) $sitemenu = $newmenu; |
|
| 443 | + $newmenu = array(); |
|
| 444 | + foreach($menu as $item){
|
|
| 445 | + if(is_array(unserialize($item))){
|
|
| 446 | + $newmenu = array_merge($newmenu, unserialize($item)); |
|
| 447 | + } |
|
| 448 | + } |
|
| 449 | + if(count($newmenu)> 0) $sitemenu = $newmenu; |
|
| 450 | 450 | } |
| 451 | 451 | |
| 452 | 452 | if(file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php')) {
|
| 453 | - include_once(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php'); |
|
| 453 | + include_once(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php'); |
|
| 454 | 454 | } else {
|
| 455 | - include_once(MODX_MANAGER_PATH . 'includes/menu.class.inc.php'); |
|
| 455 | + include_once(MODX_MANAGER_PATH . 'includes/menu.class.inc.php'); |
|
| 456 | 456 | } |
| 457 | 457 | $menu = new EVOmenu(); |
| 458 | 458 | $menu->Build($sitemenu, array( |
| 459 | - 'outerClass' => 'nav', |
|
| 460 | - 'innerClass' => 'dropdown-menu', |
|
| 461 | - 'parentClass' => 'dropdown', |
|
| 459 | + 'outerClass' => 'nav', |
|
| 460 | + 'innerClass' => 'dropdown-menu', |
|
| 461 | + 'parentClass' => 'dropdown', |
|
| 462 | 462 | 'parentLinkClass' => 'dropdown-toggle', |
| 463 | 463 | 'parentLinkAttr' => '', |
| 464 | 464 | 'parentLinkIn' => '' |
@@ -13,159 +13,159 @@ discard block |
||
| 13 | 13 | * @return string |
| 14 | 14 | */ |
| 15 | 15 | function renderFormElement($field_type, $field_id, $default_text = '', $field_elements = '', $field_value = '', $field_style = '', $row = array(), $tvsArray = array()) { |
| 16 | - global $modx; |
|
| 17 | - global $_style; |
|
| 18 | - global $_lang; |
|
| 19 | - global $content; |
|
| 20 | - global $which_browser; |
|
| 16 | + global $modx; |
|
| 17 | + global $_style; |
|
| 18 | + global $_lang; |
|
| 19 | + global $content; |
|
| 20 | + global $which_browser; |
|
| 21 | 21 | |
| 22 | - if(substr($default_text, 0, 6) === '@@EVAL' && $field_value === $default_text) { |
|
| 23 | - $eval_str = trim(substr($default_text, 7)); |
|
| 24 | - $default_text = eval($eval_str); |
|
| 25 | - $field_value = $default_text; |
|
| 26 | - } |
|
| 22 | + if(substr($default_text, 0, 6) === '@@EVAL' && $field_value === $default_text) { |
|
| 23 | + $eval_str = trim(substr($default_text, 7)); |
|
| 24 | + $default_text = eval($eval_str); |
|
| 25 | + $field_value = $default_text; |
|
| 26 | + } |
|
| 27 | 27 | |
| 28 | - $field_html = ''; |
|
| 29 | - $cimode = strpos($field_type, ':'); |
|
| 30 | - if($cimode === false) { |
|
| 31 | - switch($field_type) { |
|
| 28 | + $field_html = ''; |
|
| 29 | + $cimode = strpos($field_type, ':'); |
|
| 30 | + if($cimode === false) { |
|
| 31 | + switch($field_type) { |
|
| 32 | 32 | |
| 33 | - case "text": // handler for regular text boxes |
|
| 34 | - case "rawtext"; // non-htmlentity converted text boxes |
|
| 35 | - $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' tvtype="' . $field_type . '" onchange="documentDirty=true;" style="width:100%" />'; |
|
| 36 | - break; |
|
| 37 | - case "email": // handles email input fields |
|
| 38 | - $field_html .= '<input type="email" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' tvtype="' . $field_type . '" onchange="documentDirty=true;" style="width:100%"/>'; |
|
| 39 | - break; |
|
| 40 | - case "number": // handles the input of numbers |
|
| 41 | - $field_html .= '<input type="number" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' tvtype="' . $field_type . '" onchange="documentDirty=true;" style="width:100%" onkeyup="this.value=this.value.replace(/[^\d-,.+]/,\'\')"/>'; |
|
| 42 | - break; |
|
| 43 | - case "textareamini": // handler for textarea mini boxes |
|
| 44 | - $field_html .= '<textarea id="tv' . $field_id . '" name="tv' . $field_id . '" cols="40" rows="5" onchange="documentDirty=true;" style="width:100%">' . $modx->htmlspecialchars($field_value) . '</textarea>'; |
|
| 45 | - break; |
|
| 46 | - case "textarea": // handler for textarea boxes |
|
| 47 | - case "rawtextarea": // non-htmlentity convertex textarea boxes |
|
| 48 | - case "htmlarea": // handler for textarea boxes (deprecated) |
|
| 49 | - case "richtext": // handler for textarea boxes |
|
| 50 | - $field_html .= '<textarea id="tv' . $field_id . '" name="tv' . $field_id . '" cols="40" rows="15" onchange="documentDirty=true;" style="width:100%">' . $modx->htmlspecialchars($field_value) . '</textarea>'; |
|
| 51 | - break; |
|
| 52 | - case "date": |
|
| 53 | - $field_id = str_replace(array( |
|
| 54 | - '-', |
|
| 55 | - '.' |
|
| 56 | - ), '_', urldecode($field_id)); |
|
| 57 | - if($field_value == '') { |
|
| 58 | - $field_value = 0; |
|
| 59 | - } |
|
| 60 | - $field_html .= '<input id="tv' . $field_id . '" name="tv' . $field_id . '" class="DatePicker" type="text" value="' . ($field_value == 0 || !isset($field_value) ? "" : $field_value) . '" onblur="documentDirty=true;" />'; |
|
| 61 | - $field_html .= ' <a onclick="document.forms[\'mutate\'].elements[\'tv' . $field_id . '\'].value=\'\';document.forms[\'mutate\'].elements[\'tv' . $field_id . '\'].onblur(); return true;" onmouseover="window.status=\'clear the date\'; return true;" onmouseout="window.status=\'\'; return true;" style="cursor:pointer; cursor:hand"><i class="' . $_style["actions_calendar_delete"] . '"></i></a>'; |
|
| 33 | + case "text": // handler for regular text boxes |
|
| 34 | + case "rawtext"; // non-htmlentity converted text boxes |
|
| 35 | + $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' tvtype="' . $field_type . '" onchange="documentDirty=true;" style="width:100%" />'; |
|
| 36 | + break; |
|
| 37 | + case "email": // handles email input fields |
|
| 38 | + $field_html .= '<input type="email" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' tvtype="' . $field_type . '" onchange="documentDirty=true;" style="width:100%"/>'; |
|
| 39 | + break; |
|
| 40 | + case "number": // handles the input of numbers |
|
| 41 | + $field_html .= '<input type="number" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' tvtype="' . $field_type . '" onchange="documentDirty=true;" style="width:100%" onkeyup="this.value=this.value.replace(/[^\d-,.+]/,\'\')"/>'; |
|
| 42 | + break; |
|
| 43 | + case "textareamini": // handler for textarea mini boxes |
|
| 44 | + $field_html .= '<textarea id="tv' . $field_id . '" name="tv' . $field_id . '" cols="40" rows="5" onchange="documentDirty=true;" style="width:100%">' . $modx->htmlspecialchars($field_value) . '</textarea>'; |
|
| 45 | + break; |
|
| 46 | + case "textarea": // handler for textarea boxes |
|
| 47 | + case "rawtextarea": // non-htmlentity convertex textarea boxes |
|
| 48 | + case "htmlarea": // handler for textarea boxes (deprecated) |
|
| 49 | + case "richtext": // handler for textarea boxes |
|
| 50 | + $field_html .= '<textarea id="tv' . $field_id . '" name="tv' . $field_id . '" cols="40" rows="15" onchange="documentDirty=true;" style="width:100%">' . $modx->htmlspecialchars($field_value) . '</textarea>'; |
|
| 51 | + break; |
|
| 52 | + case "date": |
|
| 53 | + $field_id = str_replace(array( |
|
| 54 | + '-', |
|
| 55 | + '.' |
|
| 56 | + ), '_', urldecode($field_id)); |
|
| 57 | + if($field_value == '') { |
|
| 58 | + $field_value = 0; |
|
| 59 | + } |
|
| 60 | + $field_html .= '<input id="tv' . $field_id . '" name="tv' . $field_id . '" class="DatePicker" type="text" value="' . ($field_value == 0 || !isset($field_value) ? "" : $field_value) . '" onblur="documentDirty=true;" />'; |
|
| 61 | + $field_html .= ' <a onclick="document.forms[\'mutate\'].elements[\'tv' . $field_id . '\'].value=\'\';document.forms[\'mutate\'].elements[\'tv' . $field_id . '\'].onblur(); return true;" onmouseover="window.status=\'clear the date\'; return true;" onmouseout="window.status=\'\'; return true;" style="cursor:pointer; cursor:hand"><i class="' . $_style["actions_calendar_delete"] . '"></i></a>'; |
|
| 62 | 62 | |
| 63 | - break; |
|
| 64 | - case "dropdown": // handler for select boxes |
|
| 65 | - $field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '" size="1" onchange="documentDirty=true;">'; |
|
| 66 | - $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray)); |
|
| 67 | - while(list($item, $itemvalue) = each($index_list)) { |
|
| 68 | - list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue); |
|
| 69 | - if(strlen($itemvalue) == 0) { |
|
| 70 | - $itemvalue = $item; |
|
| 71 | - } |
|
| 72 | - $field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . ($itemvalue == $field_value ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>'; |
|
| 73 | - } |
|
| 74 | - $field_html .= "</select>"; |
|
| 75 | - break; |
|
| 76 | - case "listbox": // handler for select boxes |
|
| 77 | - $field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '" onchange="documentDirty=true;" size="8">'; |
|
| 78 | - $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray)); |
|
| 79 | - while(list($item, $itemvalue) = each($index_list)) { |
|
| 80 | - list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue); |
|
| 81 | - if(strlen($itemvalue) == 0) { |
|
| 82 | - $itemvalue = $item; |
|
| 83 | - } |
|
| 84 | - $field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . ($itemvalue == $field_value ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>'; |
|
| 85 | - } |
|
| 86 | - $field_html .= "</select>"; |
|
| 87 | - break; |
|
| 88 | - case "listbox-multiple": // handler for select boxes where you can choose multiple items |
|
| 89 | - $field_value = explode("||", $field_value); |
|
| 90 | - $field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '[]" multiple="multiple" onchange="documentDirty=true;" size="8">'; |
|
| 91 | - $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray)); |
|
| 92 | - while(list($item, $itemvalue) = each($index_list)) { |
|
| 93 | - list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue); |
|
| 94 | - if(strlen($itemvalue) == 0) { |
|
| 95 | - $itemvalue = $item; |
|
| 96 | - } |
|
| 97 | - $field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . (in_array($itemvalue, $field_value) ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>'; |
|
| 98 | - } |
|
| 99 | - $field_html .= "</select>"; |
|
| 100 | - break; |
|
| 101 | - case "url": // handles url input fields |
|
| 102 | - $urls = array( |
|
| 103 | - '' => '--', |
|
| 104 | - 'http://' => 'http://', |
|
| 105 | - 'https://' => 'https://', |
|
| 106 | - 'ftp://' => 'ftp://', |
|
| 107 | - 'mailto:' => 'mailto:' |
|
| 108 | - ); |
|
| 109 | - $field_html = '<table border="0" cellspacing="0" cellpadding="0"><tr><td><select id="tv' . $field_id . '_prefix" name="tv' . $field_id . '_prefix" onchange="documentDirty=true;">'; |
|
| 110 | - foreach($urls as $k => $v) { |
|
| 111 | - if(strpos($field_value, $v) === false) { |
|
| 112 | - $field_html .= '<option value="' . $v . '">' . $k . '</option>'; |
|
| 113 | - } else { |
|
| 114 | - $field_value = str_replace($v, '', $field_value); |
|
| 115 | - $field_html .= '<option value="' . $v . '" selected="selected">' . $k . '</option>'; |
|
| 116 | - } |
|
| 117 | - } |
|
| 118 | - $field_html .= '</select></td><td>'; |
|
| 119 | - $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" width="100" ' . $field_style . ' onchange="documentDirty=true;" /></td></tr></table>'; |
|
| 120 | - break; |
|
| 121 | - case 'checkbox': // handles check boxes |
|
| 122 | - $values = !is_array($field_value) ? explode('||', $field_value) : $field_value; |
|
| 123 | - $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray)); |
|
| 124 | - $tpl = '<label class="checkbox"><input type="checkbox" value="%s" id="tv_%s" name="tv%s[]" %s onchange="documentDirty=true;" />%s</label><br />'; |
|
| 125 | - static $i = 0; |
|
| 126 | - $_ = array(); |
|
| 127 | - foreach($index_list as $c => $item) { |
|
| 128 | - if(is_array($item)) { |
|
| 129 | - $name = trim($item[0]); |
|
| 130 | - $value = isset($item[1]) ? $item[1] : $name; |
|
| 131 | - } else { |
|
| 132 | - $item = trim($item); |
|
| 133 | - list($name, $value) = (strpos($item, '==') !== false) ? explode('==', $item, 2) : array( |
|
| 134 | - $item, |
|
| 135 | - $item |
|
| 136 | - ); |
|
| 137 | - } |
|
| 138 | - $checked = in_array($value, $values) ? ' checked="checked"' : ''; |
|
| 139 | - $param = array( |
|
| 140 | - $modx->htmlspecialchars($value), |
|
| 141 | - $i, |
|
| 142 | - $field_id, |
|
| 143 | - $checked, |
|
| 144 | - $name |
|
| 145 | - ); |
|
| 146 | - $_[] = vsprintf($tpl, $param); |
|
| 147 | - $i++; |
|
| 148 | - } |
|
| 149 | - $field_html = implode("\n", $_); |
|
| 150 | - break; |
|
| 151 | - case "option": // handles radio buttons |
|
| 152 | - $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray)); |
|
| 153 | - static $i = 0; |
|
| 154 | - while(list($item, $itemvalue) = each($index_list)) { |
|
| 155 | - list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue); |
|
| 156 | - if(strlen($itemvalue) == 0) { |
|
| 157 | - $itemvalue = $item; |
|
| 158 | - } |
|
| 159 | - $field_html .= '<input type="radio" value="' . $modx->htmlspecialchars($itemvalue) . '" id="tv_' . $i . '" name="tv' . $field_id . '" ' . ($itemvalue == $field_value ? 'checked="checked"' : '') . ' onchange="documentDirty=true;" /><label for="tv_' . $i . '" class="radio">' . $item . '</label><br />'; |
|
| 160 | - $i++; |
|
| 161 | - } |
|
| 162 | - break; |
|
| 163 | - case "image": // handles image fields using htmlarea image manager |
|
| 164 | - global $_lang; |
|
| 165 | - global $ResourceManagerLoaded; |
|
| 166 | - global $content, $use_editor, $which_editor; |
|
| 167 | - if(!$ResourceManagerLoaded && !(($content['richtext'] == 1 || $modx->manager->action == 4) && $use_editor == 1 && $which_editor == 3)) { |
|
| 168 | - $field_html .= " |
|
| 63 | + break; |
|
| 64 | + case "dropdown": // handler for select boxes |
|
| 65 | + $field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '" size="1" onchange="documentDirty=true;">'; |
|
| 66 | + $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray)); |
|
| 67 | + while(list($item, $itemvalue) = each($index_list)) { |
|
| 68 | + list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue); |
|
| 69 | + if(strlen($itemvalue) == 0) { |
|
| 70 | + $itemvalue = $item; |
|
| 71 | + } |
|
| 72 | + $field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . ($itemvalue == $field_value ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>'; |
|
| 73 | + } |
|
| 74 | + $field_html .= "</select>"; |
|
| 75 | + break; |
|
| 76 | + case "listbox": // handler for select boxes |
|
| 77 | + $field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '" onchange="documentDirty=true;" size="8">'; |
|
| 78 | + $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray)); |
|
| 79 | + while(list($item, $itemvalue) = each($index_list)) { |
|
| 80 | + list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue); |
|
| 81 | + if(strlen($itemvalue) == 0) { |
|
| 82 | + $itemvalue = $item; |
|
| 83 | + } |
|
| 84 | + $field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . ($itemvalue == $field_value ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>'; |
|
| 85 | + } |
|
| 86 | + $field_html .= "</select>"; |
|
| 87 | + break; |
|
| 88 | + case "listbox-multiple": // handler for select boxes where you can choose multiple items |
|
| 89 | + $field_value = explode("||", $field_value); |
|
| 90 | + $field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '[]" multiple="multiple" onchange="documentDirty=true;" size="8">'; |
|
| 91 | + $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray)); |
|
| 92 | + while(list($item, $itemvalue) = each($index_list)) { |
|
| 93 | + list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue); |
|
| 94 | + if(strlen($itemvalue) == 0) { |
|
| 95 | + $itemvalue = $item; |
|
| 96 | + } |
|
| 97 | + $field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . (in_array($itemvalue, $field_value) ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>'; |
|
| 98 | + } |
|
| 99 | + $field_html .= "</select>"; |
|
| 100 | + break; |
|
| 101 | + case "url": // handles url input fields |
|
| 102 | + $urls = array( |
|
| 103 | + '' => '--', |
|
| 104 | + 'http://' => 'http://', |
|
| 105 | + 'https://' => 'https://', |
|
| 106 | + 'ftp://' => 'ftp://', |
|
| 107 | + 'mailto:' => 'mailto:' |
|
| 108 | + ); |
|
| 109 | + $field_html = '<table border="0" cellspacing="0" cellpadding="0"><tr><td><select id="tv' . $field_id . '_prefix" name="tv' . $field_id . '_prefix" onchange="documentDirty=true;">'; |
|
| 110 | + foreach($urls as $k => $v) { |
|
| 111 | + if(strpos($field_value, $v) === false) { |
|
| 112 | + $field_html .= '<option value="' . $v . '">' . $k . '</option>'; |
|
| 113 | + } else { |
|
| 114 | + $field_value = str_replace($v, '', $field_value); |
|
| 115 | + $field_html .= '<option value="' . $v . '" selected="selected">' . $k . '</option>'; |
|
| 116 | + } |
|
| 117 | + } |
|
| 118 | + $field_html .= '</select></td><td>'; |
|
| 119 | + $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" width="100" ' . $field_style . ' onchange="documentDirty=true;" /></td></tr></table>'; |
|
| 120 | + break; |
|
| 121 | + case 'checkbox': // handles check boxes |
|
| 122 | + $values = !is_array($field_value) ? explode('||', $field_value) : $field_value; |
|
| 123 | + $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray)); |
|
| 124 | + $tpl = '<label class="checkbox"><input type="checkbox" value="%s" id="tv_%s" name="tv%s[]" %s onchange="documentDirty=true;" />%s</label><br />'; |
|
| 125 | + static $i = 0; |
|
| 126 | + $_ = array(); |
|
| 127 | + foreach($index_list as $c => $item) { |
|
| 128 | + if(is_array($item)) { |
|
| 129 | + $name = trim($item[0]); |
|
| 130 | + $value = isset($item[1]) ? $item[1] : $name; |
|
| 131 | + } else { |
|
| 132 | + $item = trim($item); |
|
| 133 | + list($name, $value) = (strpos($item, '==') !== false) ? explode('==', $item, 2) : array( |
|
| 134 | + $item, |
|
| 135 | + $item |
|
| 136 | + ); |
|
| 137 | + } |
|
| 138 | + $checked = in_array($value, $values) ? ' checked="checked"' : ''; |
|
| 139 | + $param = array( |
|
| 140 | + $modx->htmlspecialchars($value), |
|
| 141 | + $i, |
|
| 142 | + $field_id, |
|
| 143 | + $checked, |
|
| 144 | + $name |
|
| 145 | + ); |
|
| 146 | + $_[] = vsprintf($tpl, $param); |
|
| 147 | + $i++; |
|
| 148 | + } |
|
| 149 | + $field_html = implode("\n", $_); |
|
| 150 | + break; |
|
| 151 | + case "option": // handles radio buttons |
|
| 152 | + $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray)); |
|
| 153 | + static $i = 0; |
|
| 154 | + while(list($item, $itemvalue) = each($index_list)) { |
|
| 155 | + list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue); |
|
| 156 | + if(strlen($itemvalue) == 0) { |
|
| 157 | + $itemvalue = $item; |
|
| 158 | + } |
|
| 159 | + $field_html .= '<input type="radio" value="' . $modx->htmlspecialchars($itemvalue) . '" id="tv_' . $i . '" name="tv' . $field_id . '" ' . ($itemvalue == $field_value ? 'checked="checked"' : '') . ' onchange="documentDirty=true;" /><label for="tv_' . $i . '" class="radio">' . $item . '</label><br />'; |
|
| 160 | + $i++; |
|
| 161 | + } |
|
| 162 | + break; |
|
| 163 | + case "image": // handles image fields using htmlarea image manager |
|
| 164 | + global $_lang; |
|
| 165 | + global $ResourceManagerLoaded; |
|
| 166 | + global $content, $use_editor, $which_editor; |
|
| 167 | + if(!$ResourceManagerLoaded && !(($content['richtext'] == 1 || $modx->manager->action == 4) && $use_editor == 1 && $which_editor == 3)) { |
|
| 168 | + $field_html .= " |
|
| 169 | 169 | <script type=\"text/javascript\"> |
| 170 | 170 | /* <![CDATA[ */ |
| 171 | 171 | var lastImageCtrl; |
@@ -224,18 +224,18 @@ discard block |
||
| 224 | 224 | } |
| 225 | 225 | /* ]]> */ |
| 226 | 226 | </script>"; |
| 227 | - $ResourceManagerLoaded = true; |
|
| 228 | - } |
|
| 229 | - $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $field_value . '" ' . $field_style . ' onchange="documentDirty=true;" /><input type="button" value="' . $_lang['insert'] . '" onclick="BrowseServer(\'tv' . $field_id . '\')" />'; |
|
| 230 | - break; |
|
| 231 | - case "file": // handles the input of file uploads |
|
| 232 | - /* Modified by Timon for use with resource browser */ |
|
| 233 | - global $_lang; |
|
| 234 | - global $ResourceManagerLoaded; |
|
| 235 | - global $content, $use_editor, $which_editor; |
|
| 236 | - if(!$ResourceManagerLoaded && !(($content['richtext'] == 1 || $modx->manager->action == 4) && $use_editor == 1 && $which_editor == 3)) { |
|
| 237 | - /* I didn't understand the meaning of the condition above, so I left it untouched ;-) */ |
|
| 238 | - $field_html .= " |
|
| 227 | + $ResourceManagerLoaded = true; |
|
| 228 | + } |
|
| 229 | + $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $field_value . '" ' . $field_style . ' onchange="documentDirty=true;" /><input type="button" value="' . $_lang['insert'] . '" onclick="BrowseServer(\'tv' . $field_id . '\')" />'; |
|
| 230 | + break; |
|
| 231 | + case "file": // handles the input of file uploads |
|
| 232 | + /* Modified by Timon for use with resource browser */ |
|
| 233 | + global $_lang; |
|
| 234 | + global $ResourceManagerLoaded; |
|
| 235 | + global $content, $use_editor, $which_editor; |
|
| 236 | + if(!$ResourceManagerLoaded && !(($content['richtext'] == 1 || $modx->manager->action == 4) && $use_editor == 1 && $which_editor == 3)) { |
|
| 237 | + /* I didn't understand the meaning of the condition above, so I left it untouched ;-) */ |
|
| 238 | + $field_html .= " |
|
| 239 | 239 | <script type=\"text/javascript\"> |
| 240 | 240 | /* <![CDATA[ */ |
| 241 | 241 | var lastImageCtrl; |
@@ -294,90 +294,90 @@ discard block |
||
| 294 | 294 | } |
| 295 | 295 | /* ]]> */ |
| 296 | 296 | </script>"; |
| 297 | - $ResourceManagerLoaded = true; |
|
| 298 | - } |
|
| 299 | - $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $field_value . '" ' . $field_style . ' onchange="documentDirty=true;" /><input type="button" value="' . $_lang['insert'] . '" onclick="BrowseFileServer(\'tv' . $field_id . '\')" />'; |
|
| 297 | + $ResourceManagerLoaded = true; |
|
| 298 | + } |
|
| 299 | + $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $field_value . '" ' . $field_style . ' onchange="documentDirty=true;" /><input type="button" value="' . $_lang['insert'] . '" onclick="BrowseFileServer(\'tv' . $field_id . '\')" />'; |
|
| 300 | 300 | |
| 301 | - break; |
|
| 301 | + break; |
|
| 302 | 302 | |
| 303 | - case 'custom_tv': |
|
| 304 | - $custom_output = ''; |
|
| 305 | - /* If we are loading a file */ |
|
| 306 | - if(substr($field_elements, 0, 5) == "@FILE") { |
|
| 307 | - $file_name = MODX_BASE_PATH . trim(substr($field_elements, 6)); |
|
| 308 | - if(!file_exists($file_name)) { |
|
| 309 | - $custom_output = $file_name . ' does not exist'; |
|
| 310 | - } else { |
|
| 311 | - $custom_output = file_get_contents($file_name); |
|
| 312 | - } |
|
| 313 | - } elseif(substr($field_elements, 0, 8) == '@INCLUDE') { |
|
| 314 | - $file_name = MODX_BASE_PATH . trim(substr($field_elements, 9)); |
|
| 315 | - if(!file_exists($file_name)) { |
|
| 316 | - $custom_output = $file_name . ' does not exist'; |
|
| 317 | - } else { |
|
| 318 | - ob_start(); |
|
| 319 | - include $file_name; |
|
| 320 | - $custom_output = ob_get_contents(); |
|
| 321 | - ob_end_clean(); |
|
| 322 | - } |
|
| 323 | - } elseif(substr($field_elements, 0, 6) == "@CHUNK") { |
|
| 324 | - $chunk_name = trim(substr($field_elements, 7)); |
|
| 325 | - $chunk_body = $modx->getChunk($chunk_name); |
|
| 326 | - if($chunk_body == false) { |
|
| 327 | - $custom_output = $_lang['chunk_no_exist'] . '(' . $_lang['htmlsnippet_name'] . ':' . $chunk_name . ')'; |
|
| 328 | - } else { |
|
| 329 | - $custom_output = $chunk_body; |
|
| 330 | - } |
|
| 331 | - } elseif(substr($field_elements, 0, 5) == "@EVAL") { |
|
| 332 | - $eval_str = trim(substr($field_elements, 6)); |
|
| 333 | - $custom_output = eval($eval_str); |
|
| 334 | - } else { |
|
| 335 | - $custom_output = $field_elements; |
|
| 336 | - } |
|
| 337 | - $replacements = array( |
|
| 338 | - '[+field_type+]' => $field_type, |
|
| 339 | - '[+field_id+]' => $field_id, |
|
| 340 | - '[+default_text+]' => $default_text, |
|
| 341 | - '[+field_value+]' => $modx->htmlspecialchars($field_value), |
|
| 342 | - '[+field_style+]' => $field_style, |
|
| 343 | - ); |
|
| 344 | - $custom_output = str_replace(array_keys($replacements), $replacements, $custom_output); |
|
| 345 | - $modx->documentObject = $content; |
|
| 346 | - $modx->documentIdentifier = $content['id']; |
|
| 347 | - $custom_output = $modx->parseDocumentSource($custom_output); |
|
| 348 | - $field_html .= $custom_output; |
|
| 349 | - break; |
|
| 303 | + case 'custom_tv': |
|
| 304 | + $custom_output = ''; |
|
| 305 | + /* If we are loading a file */ |
|
| 306 | + if(substr($field_elements, 0, 5) == "@FILE") { |
|
| 307 | + $file_name = MODX_BASE_PATH . trim(substr($field_elements, 6)); |
|
| 308 | + if(!file_exists($file_name)) { |
|
| 309 | + $custom_output = $file_name . ' does not exist'; |
|
| 310 | + } else { |
|
| 311 | + $custom_output = file_get_contents($file_name); |
|
| 312 | + } |
|
| 313 | + } elseif(substr($field_elements, 0, 8) == '@INCLUDE') { |
|
| 314 | + $file_name = MODX_BASE_PATH . trim(substr($field_elements, 9)); |
|
| 315 | + if(!file_exists($file_name)) { |
|
| 316 | + $custom_output = $file_name . ' does not exist'; |
|
| 317 | + } else { |
|
| 318 | + ob_start(); |
|
| 319 | + include $file_name; |
|
| 320 | + $custom_output = ob_get_contents(); |
|
| 321 | + ob_end_clean(); |
|
| 322 | + } |
|
| 323 | + } elseif(substr($field_elements, 0, 6) == "@CHUNK") { |
|
| 324 | + $chunk_name = trim(substr($field_elements, 7)); |
|
| 325 | + $chunk_body = $modx->getChunk($chunk_name); |
|
| 326 | + if($chunk_body == false) { |
|
| 327 | + $custom_output = $_lang['chunk_no_exist'] . '(' . $_lang['htmlsnippet_name'] . ':' . $chunk_name . ')'; |
|
| 328 | + } else { |
|
| 329 | + $custom_output = $chunk_body; |
|
| 330 | + } |
|
| 331 | + } elseif(substr($field_elements, 0, 5) == "@EVAL") { |
|
| 332 | + $eval_str = trim(substr($field_elements, 6)); |
|
| 333 | + $custom_output = eval($eval_str); |
|
| 334 | + } else { |
|
| 335 | + $custom_output = $field_elements; |
|
| 336 | + } |
|
| 337 | + $replacements = array( |
|
| 338 | + '[+field_type+]' => $field_type, |
|
| 339 | + '[+field_id+]' => $field_id, |
|
| 340 | + '[+default_text+]' => $default_text, |
|
| 341 | + '[+field_value+]' => $modx->htmlspecialchars($field_value), |
|
| 342 | + '[+field_style+]' => $field_style, |
|
| 343 | + ); |
|
| 344 | + $custom_output = str_replace(array_keys($replacements), $replacements, $custom_output); |
|
| 345 | + $modx->documentObject = $content; |
|
| 346 | + $modx->documentIdentifier = $content['id']; |
|
| 347 | + $custom_output = $modx->parseDocumentSource($custom_output); |
|
| 348 | + $field_html .= $custom_output; |
|
| 349 | + break; |
|
| 350 | 350 | |
| 351 | - default: // the default handler -- for errors, mostly |
|
| 352 | - $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' onchange="documentDirty=true;" />'; |
|
| 351 | + default: // the default handler -- for errors, mostly |
|
| 352 | + $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' onchange="documentDirty=true;" />'; |
|
| 353 | 353 | |
| 354 | - } // end switch statement |
|
| 355 | - } else { |
|
| 356 | - $custom = explode(":", $field_type); |
|
| 357 | - $custom_output = ''; |
|
| 358 | - $file_name = MODX_BASE_PATH . 'assets/tvs/' . $custom['1'] . '/' . $custom['1'] . '.customtv.php'; |
|
| 359 | - if(!file_exists($file_name)) { |
|
| 360 | - $custom_output = $file_name . ' does not exist'; |
|
| 361 | - } else { |
|
| 362 | - ob_start(); |
|
| 363 | - include $file_name; |
|
| 364 | - $custom_output = ob_get_contents(); |
|
| 365 | - ob_end_clean(); |
|
| 366 | - } |
|
| 367 | - $replacements = array( |
|
| 368 | - '[+field_type+]' => $field_type, |
|
| 369 | - '[+field_id+]' => $field_id, |
|
| 370 | - '[+default_text+]' => $default_text, |
|
| 371 | - '[+field_value+]' => $modx->htmlspecialchars($field_value), |
|
| 372 | - '[+field_style+]' => $field_style, |
|
| 373 | - ); |
|
| 374 | - $custom_output = str_replace(array_keys($replacements), $replacements, $custom_output); |
|
| 375 | - $modx->documentObject = $content; |
|
| 376 | - $custom_output = $modx->parseDocumentSource($custom_output); |
|
| 377 | - $field_html .= $custom_output; |
|
| 378 | - } |
|
| 354 | + } // end switch statement |
|
| 355 | + } else { |
|
| 356 | + $custom = explode(":", $field_type); |
|
| 357 | + $custom_output = ''; |
|
| 358 | + $file_name = MODX_BASE_PATH . 'assets/tvs/' . $custom['1'] . '/' . $custom['1'] . '.customtv.php'; |
|
| 359 | + if(!file_exists($file_name)) { |
|
| 360 | + $custom_output = $file_name . ' does not exist'; |
|
| 361 | + } else { |
|
| 362 | + ob_start(); |
|
| 363 | + include $file_name; |
|
| 364 | + $custom_output = ob_get_contents(); |
|
| 365 | + ob_end_clean(); |
|
| 366 | + } |
|
| 367 | + $replacements = array( |
|
| 368 | + '[+field_type+]' => $field_type, |
|
| 369 | + '[+field_id+]' => $field_id, |
|
| 370 | + '[+default_text+]' => $default_text, |
|
| 371 | + '[+field_value+]' => $modx->htmlspecialchars($field_value), |
|
| 372 | + '[+field_style+]' => $field_style, |
|
| 373 | + ); |
|
| 374 | + $custom_output = str_replace(array_keys($replacements), $replacements, $custom_output); |
|
| 375 | + $modx->documentObject = $content; |
|
| 376 | + $custom_output = $modx->parseDocumentSource($custom_output); |
|
| 377 | + $field_html .= $custom_output; |
|
| 378 | + } |
|
| 379 | 379 | |
| 380 | - return $field_html; |
|
| 380 | + return $field_html; |
|
| 381 | 381 | } // end renderFormElement function |
| 382 | 382 | |
| 383 | 383 | /** |
@@ -385,14 +385,14 @@ discard block |
||
| 385 | 385 | * @return array |
| 386 | 386 | */ |
| 387 | 387 | function ParseIntputOptions($v) { |
| 388 | - global $modx; |
|
| 389 | - $a = array(); |
|
| 390 | - if(is_array($v)) { |
|
| 391 | - return $v; |
|
| 392 | - } else if($modx->db->isResult($v)) { |
|
| 393 | - while($cols = $modx->db->getRow($v, 'num')) $a[] = $cols; |
|
| 394 | - } else { |
|
| 395 | - $a = explode("||", $v); |
|
| 396 | - } |
|
| 397 | - return $a; |
|
| 388 | + global $modx; |
|
| 389 | + $a = array(); |
|
| 390 | + if(is_array($v)) { |
|
| 391 | + return $v; |
|
| 392 | + } else if($modx->db->isResult($v)) { |
|
| 393 | + while($cols = $modx->db->getRow($v, 'num')) $a[] = $cols; |
|
| 394 | + } else { |
|
| 395 | + $a = explode("||", $v); |
|
| 396 | + } |
|
| 397 | + return $a; |
|
| 398 | 398 | } |
@@ -339,9 +339,9 @@ discard block |
||
| 339 | 339 | echo $_lang['failed'] . ' ' . $_lang['table_prefix_not_exist'] . PHP_EOL; |
| 340 | 340 | $errors++; |
| 341 | 341 | |
| 342 | - } else { |
|
| 342 | + } else { |
|
| 343 | 343 | echo $_lang['ok'] . PHP_EOL; |
| 344 | - } |
|
| 344 | + } |
|
| 345 | 345 | } |
| 346 | 346 | |
| 347 | 347 | // check mysql version |
@@ -1162,7 +1162,7 @@ discard block |
||
| 1162 | 1162 | $tRow = mysqli_fetch_assoc($ts); |
| 1163 | 1163 | $templateId = $tRow['id']; |
| 1164 | 1164 | mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_tmplvar_templates` (tmplvarid, templateid) VALUES($id, $templateId)"); |
| 1165 | - } |
|
| 1165 | + } |
|
| 1166 | 1166 | } |
| 1167 | 1167 | } |
| 1168 | 1168 | } |
@@ -1527,9 +1527,9 @@ discard block |
||
| 1527 | 1527 | echo PHP_EOL . $_lang['installation_successful'] . PHP_EOL . PHP_EOL; |
| 1528 | 1528 | //echo "<p>" . $_lang['to_log_into_content_manager'] . "</p>"; |
| 1529 | 1529 | if ($installMode == 0) { |
| 1530 | - echo strip_tags($_lang['installation_note']) . PHP_EOL; |
|
| 1530 | + echo strip_tags($_lang['installation_note']) . PHP_EOL; |
|
| 1531 | 1531 | } else { |
| 1532 | - echo strip_tags($_lang['upgrade_note']) . PHP_EOL; |
|
| 1532 | + echo strip_tags($_lang['upgrade_note']) . PHP_EOL; |
|
| 1533 | 1533 | } |
| 1534 | 1534 | |
| 1535 | 1535 | |
