Merge branch 'develop' into feature/reports

README.md

@@ -47,3 +47,20 @@ Create your own fork of the project and use
 [git-flow](https://github.com/nvie/gitflow) to create a new feature. Once
 the feature is published in your fork, send a pull request to begin the
 conversation of integrating your new feature into osTicket.
+
+License
+-------
+osTicket is released under the GPL2 license. See the included LICENSE.txt
+file for the gory details of the General Public License.
+
+osTicket is supported by several magical open source projects including:
+
+  * [HTMLawed](http://www.bioinformatics.org/phplabware/internal_utilities/htmLawed)
+  * [PasswordHash](http://www.openwall.com/phpass/)
+  * [PEAR](http://pear.php.net/package/PEAR)
+  * [PEAR/Auth_SASL](http://pear.php.net/package/Auth_SASL)
+  * [PEAR/Mail](http://pear.php.net/package/mail)
+  * [PEAR/Net_SMTP](http://pear.php.net/package/Net_SMTP)
+  * [PEAR/Net_Socket](http://pear.php.net/package/Net_Socket)
+  * [PEAR/Serivces_JSON](http://pear.php.net/package/Services_JSON)
+  * [phplint](http://antirez.com/page/phplint.html) 

WHATSNEW.md

+New stuff in 1.7-dpr3
+======================
+
+
 New stuff in 1.7-dpr2
 ======================
 

assets/default/css/theme.css

@@ -254,6 +254,9 @@ body {
   height: 20px;
   background: url('../images/nav_bg.png') top left repeat-x;
   border-top: 1px solid #aaa;
+  box-shadow:0 3px 2px rgba(0, 0, 0, 0.4);
+  -moz-box-shadow:0 3px 2px rgba(0, 0, 0, 0.4);
+  -webkit-box-shadow:0 3px 2px rgba(0, 0, 0, 0.4);
 }
 #nav li {
   margin: 0;
@@ -304,19 +307,11 @@ body {
 #content {
   padding: 20px 0;
   margin: 0 20px;
-  background: url('../images/content_bg.png') top left repeat-x;
-}
-
-#cnbg {
-  padding: 5px 0;
-  margin: 0 20px;
   height: auto !important;
   height: 350px;
   min-height: 350px;
-  background: none;
 }
 
-
 #footer {
   text-align: center;
   font-size: 11px;
@@ -384,19 +379,33 @@ body {
   font-size: 15px;
   margin-left: 0;
   padding-left: 0;
+  border-top:1px solid #ddd;
 }
 #faq ol li {
   list-style: none;
-  margin: 0 0 10px 0;
+  margin: 0;
+  padding:0;
   color: #999;
 }
 #faq ol li a {
-  display: block;
-  height: 16px;
+  display:block;
+  padding:5px 0;
+  height:auto !important;
+  overflow:hidden;
+  margin:0;
+  border-bottom:1px solid #ddd;
   line-height: 16px;
   padding-left: 24px;
   background: url('../images/icons/page.png?1319579499') 0 50% no-repeat;
 }
+#faq ol li a:hover {
+  background-color:#e9f5ff;
+}
+
+.article-meta {
+  padding:5px;
+  background:#fafafa;
+}
 
 /* Knowledgebase */
 #kb {
@@ -406,12 +415,21 @@ body {
 }
 
 #kb > li {
-  margin: 0 0 5px 0;
-  padding: 10px;
-  width: auto;
-  float: left;
-  clear: both;
-  list-style: none;
+  padding:10px;
+  height:auto !important;
+  overflow:hidden;
+  margin:0;
+  background:url(../images/kb_category_bg.png) bottom left repeat-x;
+  border-bottom:1px solid #ddd;
+}
+
+#kb li i {
+  display:block;
+  width:32px;
+  height:32px;
+  float:left;
+  margin-right:6px;
+  background:url(../images/kb_large_folder.png) top left no-repeat;
 }
 
 #kb > li h4 {
@@ -425,10 +443,51 @@ body {
 
 #kb > li h4 a {
   font-size: 14px;
-  padding-left: 24px; 
-  background: url('../images/icons/page.png?1319579499') 0 50% no-repeat;
 }
 
+#kb-search {
+    padding:10px 0;
+    overflow:hidden;
+}
+
+#kb-search div {
+    clear:both;
+    overflow:hidden;
+    padding-top:5px;
+}
+
+#kb-search #query {
+    margin:0;
+    display:inline-block;
+    float:left;
+    width:200px;
+    margin-right:5px;
+}
+
+#kb-search #cid {
+    margin:0;
+    display:inline-block;
+    float:left;
+    width:200px;
+    margin-right:5px;
+    position:relative;
+    top:2px;
+}
+
+#kb-search #topic-id {
+    margin:0;
+    display:inline-block;
+    float:left;
+    width:410px;
+}
+
+#kb-search #searchSubmit {
+    margin:0;
+    display:inline-block;
+    float:left;
+    position:relative;
+    top:2px;
+}
 
 #breadcrumbs {
   color: #333;
@@ -649,6 +708,13 @@ a.refresh {
   font-size: 12px;
   padding: 5px;
 }
+
+#ticketThread table th span {
+    font-weight:normal;
+    color:#888;
+    padding-left:20px;
+}
+
 #ticketThread table td {
   padding: 5px;
 }
@@ -707,3 +773,35 @@ a.refresh {
   margin-right: 20px;
   background: url('../images/icons/file.gif') 0 50% no-repeat;
 }
+
+.button, .button:visited {
+    background: #222;
+    display: inline-block;
+    font-size: 16px;
+    padding: 8px 16px 6px 16px;
+    width:160px;
+    text-align:center;
+    color: #fff;
+    font-weight:bold;
+    text-decoration: none;
+    border-radius: 5px;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+    box-shadow: 0 1px 3px rgba(0,0,0,0.5);
+    -moz-box-shadow: 0 1px 3px rgba(0,0,0,0.5);
+    -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5);
+    text-shadow: 0 -1px 1px rgba(0,0,0,0.25);
+    border-bottom: 1px solid rgba(0,0,0,0.25);
+    position: relative;
+    cursor: pointer;
+    font-family:helvetica, arial, sans-serif;
+}
+
+.button:hover                          { background-color: #111; color: #fff; }
+.button:active                         { top: 1px; box-shadow:none; -moz-box-shadow:none; -webkit-box-shadow:none; }
+.button, .button:visited,
+.green.button, .green.button:visited      { background-color: #91bd09; }
+.green.button:hover                        { background-color: #749a02; }
+.blue.button, .blue.button:visited        { background-color: #00AEEF; }
+.blue.button:hover                         { background-color: #0299d2; }
+

client.inc.php

@@ -28,21 +28,12 @@ define('OSTCLIENTINC',TRUE);
 
 define('ASSETS_PATH',ROOT_PATH.'assets/default/');
 
-
 //Check the status of the HelpDesk.
-if(!is_object($cfg) || !$cfg->getId() || $cfg->isHelpDeskOffline()) {
+if(!is_object($cfg) || !$cfg->getId() || $cfg->isHelpDeskOffline() || $cfg->isUpgradePending()) {
     include('./offline.php');
     exit;
 }
 
-//Forced upgrade? Version mismatch.
-if(defined('THIS_VERSION') && strcasecmp($cfg->getVersion(),THIS_VERSION)) {
-    die('System is offline for an upgrade.');
-    exit;
-}
-
-
-
 /* include what is needed on client stuff */
 require_once(INCLUDE_DIR.'class.client.php');
 require_once(INCLUDE_DIR.'class.ticket.php');