Changeset 413

Timestamp:

Oct 2, 2012 1:57:05 PM (12 years ago)

Author:

anonymous

Message:

Added header and footer to docs/examples. Updated message printing methods to include before, after, and gotohash options. Minor other fixes.

Location:

trunk

Files:

• bin/module_maker/module.cli.php (modified) (1 diff)
• docs/examples/contact_form/contact.php (modified) (3 diffs)
• docs/examples/contact_form/footer.ihtml (added)
• docs/examples/contact_form/header.ihtml (added)
• lib/App.inc.php (modified) (3 diffs)
• lib/FormValidator.inc.php (modified) (2 diffs)

trunk/bin/module_maker/module.cli.php

@@ -136 +136 @@
 }
 
-// Ensure essential directories exist.
-if (!is_dir("$admin_dir")) {
-    die(basename($_SERVER['argv'][0]) . " Error: admin_dir '$admin_dir' directory not found.\n");
-}
-if (!is_dir("$admin_tpl_dir")) {
-    die(basename($_SERVER['argv'][0]) . " Error: admin_tpl_dir '$admin_tpl_dir' directory not found.\n");
-}
-if (!is_dir("$public_dir")) {
-    die(basename($_SERVER['argv'][0]) . " Error: public_dir '$public_dir' directory not found.\n");
-}
-if (!is_dir("$public_tpl_dir")) {
-    die(basename($_SERVER['argv'][0]) . " Error: public_tpl_dir '$public_tpl_dir' directory not found.\n");
+if (!isset($_SERVER['argv'][4]) || 'var' != $_SERVER['argv'][4]) {
+    // Ensure essential directories exist, except for 'var' op.
+    if (!is_dir("$admin_dir")) {
+        die(basename($_SERVER['argv'][0]) . " Error: admin_dir '$admin_dir' directory not found.\n");
+    }
+    if (!is_dir("$admin_tpl_dir")) {
+        die(basename($_SERVER['argv'][0]) . " Error: admin_tpl_dir '$admin_tpl_dir' directory not found.\n");
+    }
+    if (!is_dir("$public_dir")) {
+        die(basename($_SERVER['argv'][0]) . " Error: public_dir '$public_dir' directory not found.\n");
+    }
+    if (!is_dir("$public_tpl_dir")) {
+        die(basename($_SERVER['argv'][0]) . " Error: public_tpl_dir '$public_tpl_dir' directory not found.\n");
+    }    
 }
 

trunk/docs/examples/contact_form/contact.php

@@ -51 +51 @@
 if (!empty($_POST)) {
     // Validate submitted data.
-    $fv->notEmpty('name', sprintf(_("%s cannot be blank."), _("Name")));
-    $fv->stringLength('name', 0, 255, sprintf(_("%s must be %d-to-%d characters in length."), _("Name"), 0, 255));
-    
-    $fv->notEmpty('email', sprintf(_("%s cannot be blank."), _("Email")));
-    $fv->stringLength('email', 0, 255, sprintf(_("%s must be %d-to-%d characters in length."), _("Email"), 0, 255));
-    $fv->validateEmail('email');
-    
-    $fv->notEmpty('message', sprintf(_("%s cannot be blank."), _("Message")));
-    $fv->stringLength('message', 0, 32000, sprintf(_("%s must be %d-to-%d characters in length."), _("Message"), 0, 32000));
-        
+    validateInput();
     if ($fv->anyErrors()) {
         // Re-populate form values with the user data so they can make corrections.
@@ -68 +59 @@
         $email = new Email(array(
             'to' => $email_to,
-            'from' => sprintf('%s <%s>', $frm['name'], $frm['email']),
+            'from' => sprintf('%s <%s>', getFormData('name'), getFormData('email')),
             'subject' => 'Contact form email',
         ));
         $email->setTemplate('contact.eml');
         $email->replace(array(
-            'name' => $frm['name'],
-            'email' => $frm['email'],
-            'message' => $frm['question'],
+            'name' => getFormData('name'),
+            'email' => getFormData('email'),
+            'message' => getFormData('message'),
         ));
         // Send email!
@@ -113 +104 @@
 }
 
+function validateInput()
+{
+    global $fv;
+
+    $fv->notEmpty('name', sprintf(_("%s cannot be blank."), _("Name")));
+    $fv->stringLength('name', 0, 255, sprintf(_("%s must be %d-to-%d characters in length."), _("Name"), 0, 255));
+    
+    $fv->notEmpty('email', sprintf(_("%s cannot be blank."), _("Email")));
+    $fv->stringLength('email', 0, 255, sprintf(_("%s must be %d-to-%d characters in length."), _("Email"), 0, 255));
+    $fv->validateEmail('email');
+    
+    $fv->notEmpty('message', sprintf(_("%s cannot be blank."), _("Message")));
+    $fv->stringLength('message', 0, 32000, sprintf(_("%s must be %d-to-%d characters in length."), _("Message"), 0, 32000));
+}
+
 ?>

trunk/lib/App.inc.php

@@ -492 +492 @@
      * Prints the HTML for displaying raised messages.
      *
+     * @param   string  $above    Additional message to print above error messages (e.g. "Oops!").
+     * @param   string  $below    Additional message to print below error messages (e.g. "Please fix and resubmit").
+     * @param   string  $print_gotohash_js  Print a line of javascript that scrolls the browser window down to view any error messages.
+     * @param   string  $hash     The #hashtag to scroll to.
      * @access  public
      * @author  Quinn Comendant <quinn@strangecode.com>
      * @since   15 Jul 2005 01:39:14
      */
-    function printRaisedMessages()
+    function printRaisedMessages($above='', $below='', $print_gotohash_js=false, $hash='sc-msg')
     {
         if (!$this->running) {
@@ -506 +510 @@
         if (!empty($messages)) {
             ?><div id="sc-msg" class="sc-msg"><?php
+            if ('' != $above) {
+                ?><div class="sc-above"><?php echo oTxt($above); ?></div><?php
+            }
             foreach ($messages as $m) {
                 if (error_reporting() > 0 && $this->getParam('display_errors') && isset($m['file']) && isset($m['line'])) {
@@ -530 +537 @@
                 }
             }
+            if ('' != $below) {
+                ?><div class="sc-below"><?php echo oTxt($below); ?></div><?php
+            }
             ?></div><?php
+            if ($print_gotohash_js) {
+                ?>
+                <script type="text/javascript">
+                /* <![CDATA[ */
+                window.location.hash = '#<?php echo urlencode($hash); ?>';
+                /* ]]> */
+                </script>
+                <?php
+            }
         }
         $this->clearRaisedMessages();

trunk/lib/FormValidator.inc.php

@@ -176 +176 @@
      * @param   string  $above    Additional message to print above error messages (e.g. "Oops!").
      * @param   string  $below    Additional message to print below error messages (e.g. "Please fix and resubmit").
+     * @param   string  $print_gotohash_js  Print a line of javascript that scrolls the browser window down to view any error messages.
+     * @param   string  $hash     The #hashtag to scroll to.
      * @access  public
      * @author  Quinn Comendant <quinn@strangecode.com>
      * @since   15 Jul 2005 01:39:14
      */
-    function printErrorMessages($above='', $below='')
+    function printErrorMessages($above='', $below='', $print_gotohash_js=false, $hash='sc-msg-formvalidator')
     {
         $app =& App::getInstance();
@@ -217 +219 @@
             }
             ?></div><?php
+            if ($print_gotohash_js) {
+                ?>
+                <script type="text/javascript">
+                /* <![CDATA[ */
+                window.location.hash = '#<?php echo urlencode($hash); ?>';
+                /* ]]> */
+                </script>
+                <?php
+            }
         }
     }