Name Fix

wp-cloud · Mar 15, 2017 · 37dd425 · 37dd425
1 parent d523cc2
commit 37dd425
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/Library/Command/Server.php b/Library/Command/Server.php
@@ -448,7 +448,7 @@ function search($server, $port, $search, $level = false, $more = false)
                     } else {
                         # Detail level
                         if ($level == 'full') {
-                            $items[] = $item[1] . ' : [' . str_pad(Library_Data_Analysis::byteResize($item[2]), 7, ' ', STR_PAD_LEFT) . 'b, Expire : ' . (($item[3] == $infinite) ? '&#8734;' : Library_Data_Analysis::uptime($item[3] - time(), true)) . ']';
+                            $items[] = $item[1] . ' : [' . trim(Library_Data_Analysis::byteResize($item[2])) . 'b, expire in ' . (($item[3] == $infinite) ? '&#8734;' : Library_Data_Analysis::uptime($item[3] - time(), true)) . ']';
                         } else {
                             $items[] = $item[1];
                         }

diff --git a/View/Commands/Commands.phtml b/View/Commands/Commands.phtml
@@ -164,8 +164,8 @@
                         <span class="left">Detail Level</span>
                         <span class="right">
                             <select id="search_level">
-                                <option value="keys">Show Keys</option>
                                 <option value="full">Show Keys, Expiration & Size</option>
+                                <option value="keys">Show Keys</option>
                             </select>
                         </span>
                     </div>
@@ -174,7 +174,7 @@
                         <span class="right">
                             <select id="search_more">
                                 <option value="show">Search & Show Keys</option>
-                                <option value="delete">Search & Deleted Keys</option>
+                                <option value="delete">Search & Delete Keys</option>
                             </select>
                         </span>
                     </div>

diff --git a/View/Footer.phtml b/View/Footer.phtml
@@ -7,7 +7,7 @@ if(Library_Data_Version::check())
 <?php
 } else { ?>
 			<div class="sub-header corner full-size padding" style="float:left; text-align:center; margin-top:10px;">
-                <a href="https://github.com/elijaa/phpmemcacheadmin" target="_blank">PHPMemcachedAdmin on GitHub</a> -
+                <a href="https://github.com/elijaa/phpmemcachedadmin" target="_blank">PHPMemcachedAdmin on GitHub</a> -
                 <a href="https://blog.elijaa.org" target="_blank">PHPMemcachedAdmin Blog</a> -
                 <a href="http://memcached.org" target="_blank">Memcached.org</a>
 <?php

diff --git a/View/Header.phtml b/View/Header.phtml
@@ -2,14 +2,14 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
-    <title>phpMemcachedAdmin <?php echo CURRENT_VERSION; ?></title>
+    <title>PHPMemcachedAdmin <?php echo CURRENT_VERSION; ?></title>
     <link rel="stylesheet" type="text/css" href="Public/Styles/Style.css"/>
     <script type="text/javascript" src="Public/Scripts/Highcharts/highcharts.js"></script>
     <script type="text/javascript" src="Public/Scripts/script.js"></script>
 </head>
 <body>
 <div style="margin:0pt auto; width:1000px; clear:both;">
-        <div style="font-weight:bold;font-size:1.2em;">phpMemcachedAdmin <sup><?php echo CURRENT_VERSION; ?></sup>
+        <div style="font-weight:bold;font-size:1.2em;">PHPMemcachedAdmin <sup><?php echo CURRENT_VERSION; ?></sup>
         </div>
         <div class="header corner full-size padding" style="text-align:center;margin-top:5px;">
 <?php
@@ -64,16 +64,16 @@ if (is_writable($_ini->get('file_path')) === false) {
     </div>
 <?php
 }
-if (file_exists($_ini->path()) === false) {
+if (is_writable($_ini->path()) === false) {
 ?>
     <div class="header corner full-size padding" style="margin-top:10px;">
-        Error : Configuration file '<em><?php echo realpath(__DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . $_ini->path()) ?></em>' is missing, please fix this error and try again.
+        Error : Configuration file '<em><?php echo realpath(__DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . $_ini->path()) ?></em>' is not writable, please fix this error and try again.
     </div>
 <?php
-} elseif (is_writable($_ini->path()) === false) {
+} elseif (file_exists($_ini->path()) === false) {
 ?>
     <div class="header corner full-size padding" style="margin-top:10px;">
-        Error : Configuration file '<em><?php echo realpath(__DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . $_ini->path()) ?></em>' is not writable, please fix this error and try again.
+        Error : Configuration file '<em><?php echo realpath(__DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . $_ini->path()) ?></em>' is missing, please fix this error and try again.
     </div>
 <?php
 } ?>