Changeset 424

Timestamp:

Sep 27, 2013 1:13:02 AM (11 years ago)

Author:

anonymous

Message:

Added error checking for invalid email header arguments; cleaned up HTML in lock message.

Location:

trunk/lib

Files:

• Email.inc.php (modified) (1 diff)
• Lock.inc.php (modified) (1 diff)

trunk/lib/Email.inc.php

@@ -308 +308 @@
         $final_headers = array();
         foreach ($headers as $key => $val) {
+            if (empty($key) || empty($val) || !is_string($key) || !is_string($val)) {
+                $app->logMsg(sprintf('Broken headers provided: %s=%s', $key, $val), LOG_WARNING, __FILE__, __LINE__);
+            }
             $final_headers[] = sprintf('%s: %s', $key, $val);
         }

trunk/lib/Lock.inc.php

@@ -387 +387 @@
         ?>
         <form method="post" action="<?php echo oTxt($_SERVER['PHP_SELF']); ?>">
-        <?php $app->printHiddenSession() ?>
-        <input type="hidden" name="lock_id" value="<?php echo $this->getID(); ?>" />
-
-        <p><?php
-        printf(_("The record %s is currently being edited by %s (%d minutes elapsed). You cannot modify the record while it is locked by another user."),
-            $this->getTitle(),
-            $this->getEditor(),
-            date('i', $this->getSecondsElapsed() + 60)
-        );
-        ?></p>
-
-        <?php if ($this->getSecondsElapsed() >= $this->getParam('timeout')) { ?>
-        <p><?php printf(_("You can forcibly unlock the record if you believe the editing session has expired. You might want to confirm with %s before doing this."), $this->getEditor()) ?></p>
-        <input type="submit" name="unlock" value="<?php echo _("Unlock"); ?>" />
-        <?php } ?>
-
-        <input type="submit" name="cancel" value="<?php echo _("Cancel"); ?>" />
+            <?php $app->printHiddenSession() ?>
+            <input type="hidden" name="lock_id" value="<?php echo $this->getID(); ?>" />
+            <div id="sc-msg" class="sc-msg">
+                <div class="sc-msg-notice">
+                <?php printf(_("The record %s is currently being edited by %s (%d minutes elapsed). You cannot modify the record while it is locked by another user."),
+                    $this->getTitle(),
+                    $this->getEditor(),
+                    date('i', $this->getSecondsElapsed() + 60)
+                ); ?>
+                </div>
+                <?php if ($this->getSecondsElapsed() >= $this->getParam('timeout')) { ?>
+                    <div class="sc-msg-notice"><?php printf(_("You can forcibly unlock the record if you believe the editing session has expired. You might want to confirm with %s before doing this."), $this->getEditor()) ?></div>
+                    <div class="sc-msg-notice">
+                        <input type="submit" name="unlock" value="<?php echo _("Unlock"); ?>" />
+                        <input type="submit" name="cancel" value="<?php echo _("Cancel"); ?>" />
+                    </div>
+                <?php } else { ?>
+                    <div class="sc-msg-notice">
+                        <input type="submit" name="cancel" value="<?php echo _("Cancel"); ?>" />
+                    </div>
+                <?php } ?>
+            </div>
         </form>
         <?php