Changeset 485

Timestamp:

Aug 14, 2014 8:29:47 AM (10 years ago)

Author:

anonymous

Message:

Small bugs fixed while doing SBImedia

Location:

trunk

Files:

• bin/module_maker/form_template.cli.php (modified) (7 diffs)
• css/codebase.inc.css (modified) (1 diff)
• css/utilities.inc.css (modified) (1 diff)
• docs/version.txt (modified) (1 diff)
• lib/Navigation.inc.php (modified) (4 diffs)
• lib/Upload.inc.php (modified) (4 diffs)
• lib/Utilities.inc.php (modified) (1 diff)

trunk/bin/module_maker/form_template.cli.php

@@ -5 +5 @@
  * For details visit the project site: <http://trac.strangecode.com/codebase/>
  * Copyright 2001-2012 Strangecode, LLC
- * 
+ *
  * This file is part of The Strangecode Codebase.
  *
@@ -12 +12 @@
  * Free Software Foundation, either version 3 of the License, or (at your option)
  * any later version.
- * 
+ *
  * The Strangecode Codebase is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along with
  * The Strangecode Codebase. If not, see <http://www.gnu.org/licenses/>.
@@ -82 +82 @@
         if (preg_match('/.*_id$/i', $field)) {
             $output[$field] = <<<E_O_F
-            
+
 <div class="sc-form-row<\x3fphp \$fv->err('$field'); \x3f>">
     <label for="$field"><\x3fphp echo _("$title"); \x3f></label>
@@ -101 +101 @@
     <input type="file" name="$field" id="$field" />
     <\x3fphp if ('' != \$upload->getFilenameGlob(getFormData('$primary_key') . '_*') && getFormData('op') == 'edit' || getFormData('op') == 'update') { \x3f>
-        <div class="sc-help"><\x3fphp printf(_("The current file <a href=\"%s/%2\\\$s\"><strong>%2\\\$s</strong></a> will be deleted if a new file is selected for upload."), '/_db_files/__///__', \$upload->getFilenameGlob(getFormData('$primary_key') . '_*')) \x3f></div>
+        <div class="sc-help"><\x3fphp printf(_("The current file <a href=\"%s/%2\\$s\"><strong>%2\\$s</strong></a> will be deleted if a new file is selected for upload."), '/_db_files/__///__', \$upload->getFilenameGlob(getFormData('$primary_key') . '_*')) \x3f></div>
     <\x3fphp } \x3f>
     <div class="sc-help"><\x3fphp printf(_("Allowed file types: %s."), join(', ', \$upload->getParam('valid_file_extensions'))) \x3f></div>
@@ -157 +157 @@
 
         // Textarea small
+        case 'tinytiny' :
         case 'text' :
         case 'tinyblob' :
@@ -164 +165 @@
 <div class="sc-form-row<\x3fphp \$fv->err('$field'); \x3f>">
     <label for="$field"><\x3fphp echo _("$title"); \x3f></label>
-    <textarea name="$field" id="$field" rows="8" cols="40" class="sc-short sc-medium"><\x3fphp echo oTxt(\$frm['$field']); \x3f></textarea>
+    <textarea name="$field" id="$field" rows="8" cols="40" class="sc-tall sc-medium"><\x3fphp echo oTxt(\$frm['$field']); \x3f></textarea>
 </div>
 E_O_F;
@@ -178 +179 @@
 <div class="sc-form-row<\x3fphp \$fv->err('$field'); \x3f>">
     <label for="$field"><\x3fphp echo _("$title"); \x3f></label>
-    <textarea name="$field" id="$field" rows="8" cols="40" class="sc-short sc-medium"><\x3fphp echo oTxt(\$frm['$field']); \x3f></textarea>
+    <textarea name="$field" id="$field" rows="8" cols="40" class="sc-fullscreen sc-medium"><\x3fphp echo oTxt(\$frm['$field']); \x3f></textarea>
 </div>
 E_O_F;

trunk/css/codebase.inc.css

@@ -12 +12 @@
     z-index: 2000000000;  /* Close to the maximum of a 32-bit integer. */
     margin: 1em 0;
-    padding: .6em .6em .3em;
-    border: 1px solid #ddd;
     background: #fafafa;
+    padding: 0;
+    border: none;
 }
-.sc-msg-success { color: #090; }
-.sc-msg-notice { color: #C60; }
-.sc-msg-warning,
-.sc-msg-error { color: #f00; }
+form .sc-msg-success label { color: #76B15B; font-weight: bold; }
+form .sc-msg-notice label { color: #B19332; font-weight: bold; }
+form .sc-msg-warning label { color: #9200AE; font-weight: bold; }
+form .sc-msg-error label { color: #b34; font-weight: bold; }
+.sc-msg > .sc-msg-success { color: #76B15B; font-weight: bold; }
+.sc-msg > .sc-msg-notice { color: #B19332; font-weight: bold; }
+.sc-msg > .sc-msg-warning { color: #9200AE; font-weight: bold; }
+.sc-msg > .sc-msg-error { color: #b34; font-weight: bold; }
 .sc-msg > .sc-msg-success,
 .sc-msg > .sc-msg-notice,
 .sc-msg > .sc-msg-warning,
 .sc-msg > .sc-msg-error {
-    background: #fafafa;
-    padding: 0;
-    margin: .5em 0;
+    padding: .25em .5em;
+    margin: 5px 0;
+    color: #fff;
 }
+.sc-msg > .sc-msg-success a,
+.sc-msg > .sc-msg-notice a,
+.sc-msg > .sc-msg-warning a,
+.sc-msg > .sc-msg-error a {
+    color: #fff;
+}
+.sc-msg > .sc-msg-success { background-color: #76B15B; }
+.sc-msg > .sc-msg-notice { background-color: #B19332; }
+.sc-msg > .sc-msg-warning { background-color: #9200AE; }
+.sc-msg > .sc-msg-error { background-color: #b34; }
 
 /* PEdit.inc.php ---------------------------------------------------- */

trunk/css/utilities.inc.css

@@ -40 +40 @@
 .sc-clearboth { clear: both; }
 .sc-help { color: #999; font-weight: normal; }
-.sc-hidden { display: none; visibility: hidden; }
+.sc-hidden { display: none; }
 .sc-monospaced { font-family: monospace; }
 .sc-padleft { padding-left: 10px; }
 .sc-padright { padding-right: 10px; }
+.sc-marginleft { margin-left: 10px; }
+.sc-marginright { margin-right: 10px; }
 .sc-right { text-align: right; }
 .sc-normal { font-weight: normal; }
 .sc-nowrap { white-space: nowrap; }
 .sc-dim {
-    filter:alpha(opacity=25);
-    -moz-opacity:.25;
-    opacity:.25;
+    filter:alpha(opacity=33);
+    -moz-opacity:.33;
+    opacity:.33;
 }
 .sc-note:hover { cursor: help; }

trunk/docs/version.txt

@@ -1 @@
-2.1.7dev
+2.1.8dev

trunk/lib/Navigation.inc.php

@@ -198 +198 @@
 
     /**
+     * Returns the path from root up to the current page as an array.
+     *
+     * @access  public
+     * @param   string   $key   Which value to use in the path (usually head_title or body_title or just title).
+     * @return  mixed           Path (string) or false if path param is not set.
+     */
+    public function getPathArray($key='title')
+    {
+        $path = array();
+        if ($this->getParam('path')) {
+            foreach ($this->pages as $page) {
+                $path[] = strip_tags($page[$key]);
+            }
+        }
+        return $path;
+    }
+
+    /**
      * Returns the text path from root up to the current page, separated by the
      * path_delimiter.
@@ -207 +225 @@
     public function getPath($key='title')
     {
-        if ($this->getParam('path')) {
-            $path = '';
-            $pathmark = '';
+
+        $path = $this->getPathArray();
+        return empty($path) ? '' : join(oTxt($this->getParam('path_delimiter'), true), $path);
+    }
+
+    /**
+     * Returns the breadcrumbs from the root page to the current page.
+     * Breadcrumbs are the text path with pages titles linked to that page.
+     *
+     * @access  public
+     * @return  string   Breadcrumbs or empty string if breadcrumbs param not set.
+     */
+    public function getBreadcrumbsArray()
+    {
+        $app =& App::getInstance();
+
+        if ($this->getParam('breadcrumbs')) {
+            $breadcrumbs = array();
+            $crumb_count = sizeof($this->pages);
             foreach ($this->pages as $page) {
-                $path .= oTxt($pathmark . strip_tags($page[$key]), true);
-                $pathmark = $this->getParam('path_delimiter');
-            }
-            return $path;
+                if ($crumb_count <= $this->getParam('chop_breadcrumbs')) {
+                    // Stop gathering crumbs.
+                    break;
+                }
+                if ($crumb_count <= 1) {
+                    // The last crumb.
+                    if ('' == trim($page['url']) || $crumb_count <= $this->getParam('chop_breadcrumb_links')) {
+                        // A crumb with no link.
+                        $breadcrumbs[] = array(
+                            'url' => false,
+                            'title' => sprintf($this->getParam('last_crumb_format'), $page['title'])
+                        );
+                    } else if ($crumb_count > $this->getParam('chop_breadcrumb_links')) {
+                        // A normal linked crumb.
+                        $breadcrumbs[] = array(
+                            'url' => $page['url'],
+                            'title' => sprintf($this->getParam('last_crumb_format'), $page['title'])
+                        );
+                    }
+                } else {
+                    if ('' == trim($page['url'])) {
+                        // A crumb with no link.
+                        $breadcrumbs[] = array(
+                            'url' => false,
+                            'title' => $page['title']
+                        );
+                    } else {
+                        // A normal linked crumb.
+                        $breadcrumbs[] = array(
+                            'url' => $page['url'],
+                            'title' => $page['title']
+                        );
+                    }
+                }
+                $crumb_count--;
+            }
+            return $breadcrumbs;
         } else {
-            return false;
+            return array();
         }
     }
@@ -247 +314 @@
                     } else if ($crumb_count > $this->getParam('chop_breadcrumb_links')) {
                         // A normal linked crumb.
-                        $breadcrumbs[] =  '<a href="' . $app->oHREF($page['url']) . '">' . sprintf($this->getParam('last_crumb_format'), oTxt($page['title'], true)) . '</a>';
+                        $breadcrumbs[] =  '<a href="' . $page['url'] . '">' . sprintf($this->getParam('last_crumb_format'), oTxt($page['title'], true)) . '</a>';
                     }
                 } else {
@@ -255 +322 @@
                     } else {
                         // A normal linked crumb.
-                        $breadcrumbs[] = '<a href="' . $app->oHREF($page['url']) . '">' . oTxt($page['title'], true) . '</a>';
+                        $breadcrumbs[] = '<a href="' . $page['url'] . '">' . oTxt($page['title'], true) . '</a>';
                     }
                 }

trunk/lib/Upload.inc.php

@@ -82 +82 @@
             // Enforce valid upload_path parameter.
             if (isset($params['upload_path'])) {
-                $params['upload_path'] = realpath($params['upload_path']);
+                $upload_path = realpath($params['upload_path']);
                 // Source must be directory.
-                if (!is_dir($params['upload_path'])) {
-                    $app->logMsg(sprintf('Attempting to auto-create upload directory: %s', $params['upload_path']), LOG_NOTICE, __FILE__, __LINE__);
+                if (!is_dir($upload_path)) {
+                    $app->logMsg(sprintf('Attempting to auto-create upload directory: %s', $upload_path), LOG_NOTICE, __FILE__, __LINE__);
                     if (version_compare(PHP_VERSION, '5.0.0', '>=')) {
                         // Recursive.
-                        mkdir($params['upload_path'], isset($params['dest_dir_perms']) ? $params['dest_dir_perms'] : $this->getParam('dest_dir_perms'), true);
+                        mkdir($upload_path, isset($params['dest_dir_perms']) ? $params['dest_dir_perms'] : $this->getParam('dest_dir_perms'), true);
                     } else {
-                        mkdir($params['upload_path'], isset($params['dest_dir_perms']) ? $params['dest_dir_perms'] : $this->getParam('dest_dir_perms'));
+                        mkdir($upload_path, isset($params['dest_dir_perms']) ? $params['dest_dir_perms'] : $this->getParam('dest_dir_perms'));
                     }
-                    if (!is_dir($params['upload_path'])) {
+                    if (!is_dir($upload_path)) {
                         $app->logMsg(sprintf('Upload directory invalid: %s', $params['upload_path']), LOG_ERR, __FILE__, __LINE__);
                         trigger_error(sprintf('Upload directory invalid: %s', $params['upload_path']), E_USER_ERROR);
@@ -98 +98 @@
                 }
                 // Source must be writable.
-                if (!is_writable($params['upload_path'])) {
+                if (!is_writable($upload_path)) {
                     $app->logMsg(sprintf('Upload directory not writable: %s', $params['upload_path']), LOG_ERR, __FILE__, __LINE__);
                     trigger_error(sprintf('Upload directory not writable: %s', $params['upload_path']), E_USER_ERROR);
@@ -197 +197 @@
                     if (is_array($custom_file_name) && sizeof($custom_file_name) == 1) {
                         // Is an array, but just one value. Pull it out.
-                        $custom_file_name = current($custom_file_name);
+                        $file_name = current($custom_file_name);
                         $this->_raiseMsg(sprintf(_("The file %s has been renamed to %s."), $files['name'][$i], $file_name), MSG_NOTICE, __FILE__, __LINE__);
                         $app->logMsg(sprintf('Using custom file name: %s', $file_name), LOG_DEBUG, __FILE__, __LINE__);
@@ -520 +520 @@
         $app =& App::getInstance();
 
-        if ($this->getParam('display_messages') === true || (is_int($this->getParam('display_messages')) && $this->getParam('display_messages') & $type > 0)) {
+        if ($this->getParam('display_messages') === true || (is_int($this->getParam('display_messages')) && ($this->getParam('display_messages') & $type) > 0)) {
             $app->raiseMsg($message, $type, $file, $line);
         }

trunk/lib/Utilities.inc.php

@@ -139 +139 @@
  * @param  string $text             Text to clean.
  * @param  bool   $preserve_html    If set to true, oTxt will not translate <, >, ", or '
- *                                  characters into HTML entities. This allows HTML to pass through unmunged.
- * @return string                   Cleaned text.
+ *                                  characters into HTML entities. This allows HTML to pass through undisturbed.
+ * @return string                   HTML-safe text.
  */
 function oTxt($text, $preserve_html=false)