fix from Evolution 05.03.2015

Dmi3yy · Mar 5, 2015 · 41e771f · 41e771f
1 parent 9ef82a8
commit 41e771f
Show file tree

Hide file tree

Showing 8 changed files with 135 additions and 78 deletions.
diff --git a/assets/plugins/codemirror/codemirror.plugin.php b/assets/plugins/codemirror/codemirror.plugin.php
@@ -9,7 +9,7 @@
  * @required    MODX 0.9.6.3+
  *              CodeMirror  3.13 : pl
  *
- * @confirmed   MODX Evolution 1.10.0
+ * @confirmed   MODX Evolution 1.0.15
  *
  * @author      Mihanik71 
  *

diff --git a/assets/plugins/codemirror/codemirror.plugin.tpl b/assets/plugins/codemirror/codemirror.plugin.tpl
@@ -1,7 +1,7 @@
 /**
  * CodeMirror
  *
- * JavaScript library that can be used to create a relatively pleasant editor interface based on CodeMirrir 3.13
+ * JavaScript library that can be used to create a relatively pleasant editor interface based on CodeMirror 3.13
  *
  * @events:
  * - OnDocFormRender

diff --git a/ht.access b/ht.access
@@ -26,7 +26,7 @@ RewriteRule .* - [F,L]
 #RewriteCond %{HTTP_HOST} !^example\.com [NC]
 #RewriteRule (.*) http://example.com/$1 [R=301,L]
 
-# without www  all domian
+# without www all domains
 #RewriteCond %{HTTP_HOST} .
 #RewriteCond %{HTTP_HOST} ^www.(.*)$ [NC]
 #RewriteRule ^(.*)$ http://%1/$1 [R=301,L]

diff --git a/manager/frames/1.php b/manager/frames/1.php
@@ -3,7 +3,7 @@
 $_SESSION['browser'] = (strpos($_SERVER['HTTP_USER_AGENT'],'MSIE 1')!==false) ? 'legacy_IE' : 'modern';
 $mxla = $modx_lang_attribute ? $modx_lang_attribute : 'en';
 if(!isset($modx->config['manager_menu_height'])) $modx->config['manager_menu_height'] = '70';
-if(!isset($modx->config['manager_tree_width']))  $modx->config['manager_tree_width']  = '260';
+if(!isset($modx->config['manager_tree_width']))  $modx->config['manager_tree_width']  = '300';
 $modx->invokeEvent('OnManagerPreFrameLoader',array('action'=>$action));
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">

diff --git a/manager/includes/document.parser.class.inc.php b/manager/includes/document.parser.class.inc.php
@@ -470,7 +470,7 @@ function cleanDocumentIdentifier($qOrig) {
         if ($this->config['use_alias_path'] == 1) {
             $this->virtualDir= dirname($q);
             $this->virtualDir= ($this->virtualDir == '.' ? '' : $this->virtualDir);
-            $q= basename($q);
+            $q = preg_replace('/.*[\/\\\]/', '', $q);
         } else {
             $this->virtualDir= '';
         }
@@ -2361,7 +2361,7 @@ function clearCache($type='', $report=false) {
 			$files = glob(MODX_BASE_PATH . $this->getCacheFolder().'*');
 			$deletedfiles = array();
 			while ($file = array_shift($files)) {
-				$name = basename($file);
+				$name = preg_replace('/.*[\/\\\]/', '', $file);
 				if (preg_match('/\.pageCache/',$name) && !in_array($name, $deletedfiles)) {
 					$deletedfiles[] = $name;
 					unlink($file);

diff --git a/manager/includes/session_keepalive.php b/manager/includes/session_keepalive.php
@@ -4,6 +4,7 @@
  *
  * This page is requested once in awhile to keep the session alive and kicking.
  */
+include_once(dirname(__FILE__).'/../../assets/cache/siteManager.php');
 require_once(dirname(__FILE__).'/protect.inc.php');
 
 $ok = false;

diff --git a/manager/media/style/MODxRE/login.tpl b/manager/media/style/MODxRE/login.tpl
@@ -13,7 +13,7 @@
 		}
 		#login {
 			background: #eeeeee url('media/style/[+theme+]/images/body.jpg');
-			margin: 12% 0 0;
+			margin: 7% 0 0;
 		}
 		#mx_loginbox {
 			width: 309px;
@@ -32,7 +32,9 @@
 			border-radius: 5px;
 		}
 		.logo {
-			margin: 0 0 0 14px;
+      display: block;
+			text-align: center;
+
 		}
 		.logo img{
 			border: 0 none;
@@ -44,7 +46,9 @@
 			font: 14px Arial;
 			margin: 0 0 11px;
 		}
-		.sectionBody .text {
+		.sectionBody input[type="text"],
+		.sectionBody input[type="password"]
+    {
 			width: 261px;
 			height: 33px;
 			border: 1px solid #E5E5E5;
@@ -58,7 +62,9 @@
 			-moz-box-shadow:    0 0 5px rgba(188, 188, 188, 0.2);
 			box-shadow:         0 0 5px rgba(188, 188, 188, 0.2);
 		}
-		.sectionBody .text:focus {
+		.sectionBody input[type="text"]:focus,
+		.sectionBody input[type="password"]:focus
+    {
 			border: 1px solid #DECBA5;
 			-webkit-box-shadow: 0 0 5px rgba(222, 203, 165, 0.5);
 			-moz-box-shadow:    0 0 5px rgba(222, 203, 165, 0.5);
@@ -164,9 +170,12 @@
 			margin: 0.5em auto;
 			font-size: 80%;
 		}
-        .gpl a, .loginLicense a {
+    .gpl a, .loginLicense a {
 			color: #B2B2B2;
 		}
+    .caption {font-size: 11px; color: #666; padding-right: 25px;}
+    .clear {clear: both;}
+    .form-footer {padding-top: 15px; padding-bottom: 10px;}
     </style>
 
     <script src="media/script/mootools/mootools.js" type="text/javascript"></script>
@@ -227,18 +236,30 @@
 			</a>
 		</div>
         <div class="sectionBody">
+
             <!--<p class="loginMessage">[+login_message+]</p>-->
+
             <label for="username">[+username+]</label>
             <input type="text" class="text" name="username" id="username" tabindex="1" value="[+uid+]" />
+
             <label for="password">[+password+]</label>
             <input type="password" class="text" name="password" id="password" tabindex="2" value="" />
+
             <p class="caption">[+login_captcha_message+]</p>
-            <div>[+captcha_image+]</div>
+
+            <p>[+captcha_image+]</p>
             [+captcha_input+]
-            <input type="checkbox" id="rememberme" name="rememberme" tabindex="4" value="1" class="checkbox" [+remember_me+] />
-			<label for="rememberme" style="cursor:pointer" class="remtext">[+remember_username+]</label>
-            <input type="submit" class="login" id="submitButton" value="[+login_button+]" />
-            <!-- anything to output before the login box via a plugin ... like the forgot password link? -->
+
+            <div class="clear"></div>
+
+            <div class="form-footer">
+              <input type="checkbox" id="rememberme" name="rememberme" tabindex="4" value="1" class="checkbox" [+remember_me+] />
+              <label for="rememberme" style="cursor:pointer" class="remtext">[+remember_username+]</label>
+              <input type="submit" class="login" id="submitButton" value="[+login_button+]" />
+              <!-- anything to output before the login box via a plugin ... like the forgot password link? -->
+              <div class="clear"></div>
+            </div>
+
             [+OnManagerLoginFormRender+]
         </div>
     </form>