Changeset 310 for branches/1.1dev

Timestamp:

Jan 31, 2008 9:54:13 AM (16 years ago)

Author:

quinn

Message:

Minor bugfixing. Added some admin css tweaks to 1.1dev.

Location:

branches/1.1dev

Files:

• config/boot.inc.php (modified) (2 diffs)
• css/admin.inc.css (modified) (2 diffs)
• css/utilities.inc.css (modified) (1 diff)
• lib/Email.inc.php (modified) (1 diff)
• lib/Upload.inc.php (modified) (1 diff)

branches/1.1dev/config/boot.inc.php

@@ -92 +92 @@
         die;
     }
-    
+
     /**
      * A wrapper for mysql_query. Allows us to set the database link_identifier,
@@ -126 +126 @@
         return $qid;
     }
+    
+    $mysql_character_sets = array(
+        'utf-8' => 'utf8',
+        'iso-8859-1' => 'latin1',
+    );
+    
+    // Tell MySQL what character set we're useing. Available only on MySQL verions > 4.01.01.
+    if ('' != $CFG->character_set && isset($mysql_character_sets[strtolower($CFG->character_set)])) {
+        dbQuery("/*!40101 SET NAMES '" . $mysql_character_sets[strtolower($CFG->character_set)] . "' */");
+    } else {
+        logMsg(sprintf('%s is not a known character_set.', $CFG->character_set), LOG_ERR, __FILE__, __LINE__);
+    }
 
 } // End enable MySQL._________________________________________________________

branches/1.1dev/css/admin.inc.css

@@ -122 +122 @@
 
 /*_____________________ NAVIGATION ____________________*/
-#leftnav
-{
+#leftnav {
     float: left;
     width: 9em;
-    margin: 0;
-    border-right: 1px solid gray;
+    margin: 0 0 10px 0;
+/*     border-right: 1px solid gray; */
     padding: 0;
     background-color: #EEE;
 }
 
-#leftnav ul
-{
+#leftnav ul {
     padding: 0;
     margin: 0;
@@ -139 +137 @@
 }
 
-#leftnav #navlist li
-{
+#leftnav #navlist li {
     list-style: none;
     margin: 0;
-    border-bottom: 1px solid gray;
+    border-bottom: 1px solid #ccc;
     margin-left: 0em;
     padding: 1px 0 2px 6px;
-    font: bold 60% Verdana, sans-serif;
-}
-
-#leftnav #navlist li a
-{
+    font-size: 70%;
+    font-weight: bold;
+}
+
+#leftnav #navlist li a {
     text-decoration: none;
     padding: 1px;
 }
 
-#leftnav #navlist li a:link, #navlist li a:visited
-{
-    color: #336;
-}
-
-#leftnav #navlist li a:hover, #navlist li a:active
-{
+#leftnav #navlist li.label {
+    color: #999;
+    padding-top: 15px;
+    font-size: 90%;
+    font-weight: bold;
+}
+
+#leftnav a.addlink {
+    margin-left: 0.5em;
+    font-weight: normal;
+}
+
+#leftnav #navlist li a:link, #navlist li a:visited {
+    color: #336;
+}
+
+#leftnav #navlist li a:hover, #navlist li a:active {
     color: #C00;
-}
-
-#leftnav a.addlink
-{
-    margin-left: 0.5em;
 }
 

branches/1.1dev/css/utilities.inc.css

@@ -65 +65 @@
     width: 121px;
     /*  125 minus 4 to account for the 4px padding on the right  */
+}
+
+input.texttiny, textarea.texttiny
+{
+    width: 71px;
+    /*  75 minus 4 to account for the 4px padding on the right  */
 }
 

branches/1.1dev/lib/Email.inc.php

@@ -260 +260 @@
         // Ensure all placeholders have been replaced. Find anything with {...} characters.
         if (preg_match('/({[^}]+})/', $final_body, $unreplaced_match)) {
-            logMsg(sprintf('Cannot send email. Variables left unreplaced in template: %s', (isset($unreplaced_match[1]) ? $unreplaced_match[1] : '')), LOG_ERR, __FILE__, __LINE__);
+            logMsg(sprintf('Cannot send email. At least one variable left unreplaced in template: %s', (isset($unreplaced_match[1]) ? $unreplaced_match[1] : '')), LOG_ERR, __FILE__, __LINE__);
             return false;
         }

branches/1.1dev/lib/Upload.inc.php

@@ -561 +561 @@
         $file_name = trim($file_name);
         $file_name = strtr($file_name, $bad, $good);
-        $file_name = preg_replace('/[^-\w.,~_=+\(\)]/', '_', $file_name);
+        $file_name = preg_replace('/[^-\w.,~_=+]+/', '_', $file_name);
         $file_name = substr($file_name, 0, 250);
         return $file_name;