Changeset 44

Timestamp:

Dec 19, 2005 7:10:45 AM (18 years ago)

Author:

scdev

Message:

${1}

Location:

trunk

Files:

• bin/module_maker/form_template.cli.php (modified) (4 diffs)
• bin/module_maker/list_template.cli.php (modified) (1 diff)
• bin/module_maker/sql.cli.php (modified) (1 diff)
• lib/App.inc.php (modified) (4 diffs)
• lib/Nav.inc.php (modified) (1 diff)
• lib/SessionCache.inc.php (modified) (1 diff)
• lib/SortOrder.inc.php (modified) (2 diffs)

trunk/bin/module_maker/form_template.cli.php

@@ -34 +34 @@
 
 $exclude = array('added_by_user_id', 'added_datetime', 'hit_count', 'modified_datetime', 'modified_by_user_id');
-$primary_key_field = '';
+$primary_key = '<##>';
 $output = array();
 
@@ -46 +46 @@
         $type = preg_replace('/^(\w+).*$/', '\\1', $col[1]);
         if ('PRI' == $col[3]) {
-            $primary_key_field = $field;
+            $primary_key = $field;
         }
 
@@ -54 +54 @@
         }
 
-        if (in_array($field, $exclude) || $primary_key_field == $field) {
+        if (in_array($field, $exclude) || $primary_key == $field) {
             // Don't add a field for this column.
             continue;
@@ -87 +87 @@
         <td>
             <input type="file" name="$field" />
-            <\x3fphp if ('' != \$upload->getFilenameGlob(getFormData('$primary_key_field') . '_*') && getFormData('op') == 'edit' || getFormData('op') == 'update') { \x3f>
-            <div class="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_field') . '_*')) \x3f></div>
+            <\x3fphp if ('' != \$upload->getFilenameGlob(getFormData('$primary_key') . '_*') && getFormData('op') == 'edit' || getFormData('op') == 'update') { \x3f>
+            <div class="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="help"><\x3fphp printf(_("File to upload must have one of the following file-name extensions: %s."), join(', ', \$upload->getParam('valid_file_extensions'))) \x3f></div>

trunk/bin/module_maker/list_template.cli.php

@@ -45 +45 @@
     $cols[] = $row;
 }
+
+$primary_key = '<##>';
 
 // Loop through columns

trunk/bin/module_maker/sql.cli.php

@@ -52 +52 @@
 
 $sort_columns = '';
+$primary_key = '<##>';
 
 // Loop through columns

trunk/lib/App.inc.php

@@ -367 +367 @@
 
         // Save message in session under unique key to avoid duplicate messages.
-        $_SESSION[$this->app]['messages'][md5($type . $message . $file . $line)] = array(
+        $msg_id = md5($type . $message . $file . $line);
+        $_SESSION[$this->app]['messages'][$msg_id] = array(
             'type'    => $type,
             'message' => $message,
             'file'    => $file,
-            'line'    => $line
+            'line'    => $line,
+            'count'   => (isset($_SESSION[$this->app]['messages'][$msg_id]['count']) ? (1 + $_SESSION[$this->app]['messages'][$msg_id]['count']) : 1)
         );
 
@@ -425 +427 @@
 
     /**
-     * Logs a message to a user defined log file. Additional actions to take for
-     * different types of message types can be specified (ERROR, NOTICE, etc).
+     * Logs messages to defined channels: file, email, sms, and screen. Repeated messages are
+     * not repeated but printed once with count.
      *
      * @access public
-     *
      * @param string $message   The text description of the message.
      * @param int    $priority  The type of message priority (in descending order):
@@ -445 +446 @@
     function logMsg($message, $priority=LOG_INFO, $file=null, $line=null)
     {
+        static $previous_events = array();
+
         if (!isset($this) || !is_a($this, 'App')) {
             $this =& App::getInstance();
@@ -466 +469 @@
         setlocale(LC_TIME, 'C');
 
+        // Strip HTML tags except any with more than 7 characters because that's probably not a HTML tag, e.g. <email@address.com>.
+        preg_match_all('/(<[^>\s]{7,})[^>]*>/', $message, $strip_tags_allow);
+        $message = strip_tags(preg_replace('/\s+/', ' ', $message), (!empty($strip_tags_allow[1]) ? join('> ', $strip_tags_allow[1]) . '>' : null));
+
+        // Store this event under a unique key, counting each time it occurs so that it only gets reported a limited number of times.
+        $msg_id = md5($message . $priority . $file . $line);
+        if (isset($previous_events[$msg_id])) {
+            $previous_events[$msg_id]++;
+            if ($previous_events[$msg_id] == 2) {
+                $this->logMsg(sprintf('%s (Event repeated more than %s times)', $message, $previous_events[$msg_id]), $priority, $file, $line);
+            }
+            return false;
+        } else {
+            $previous_events[$msg_id] = 1;
+        }
+        
         // Data to be stored for a log event.
-        $event = array();
-        $event['date'] = date('Y-m-d H:i:s');
-        $event['remote ip'] = getRemoteAddr();
-        if (substr(PHP_OS, 0, 3) != 'WIN') {
-            $event['pid'] = posix_getpid();
-        }
-        $event['type'] = $this->logPriorityToString($priority);
-        $event['file:line'] = "$file : $line";
-        preg_match_all('/(<[^>\s]{7,})[^>]*>/', $message, $strip_tags_allow); // <...> with lots of chars maybe we don't want stripped.
-        $event['message'] = strip_tags(preg_replace('/\s+/', ' ', $message), (!empty($strip_tags_allow[1]) ? join('> ', $strip_tags_allow[1]) . '>' : null));
-        $event_str = '[' . join('] [', $event) . ']';
+        $event = array(
+            'date'      => date('Y-m-d H:i:s'),
+            'remote ip' => getRemoteAddr(),
+            'pid'       => (substr(PHP_OS, 0, 3) != 'WIN' ? posix_getpid() : ''),
+            'type'      => $this->logPriorityToString($priority),
+            'file:line' => "$file : $line",
+            'message'   => $message
+        );
 
         // FILE ACTION
         if ($this->getParam('log_file_priority') && $priority <= $this->getParam('log_file_priority')) {
+            $event_str = '[' . join('] [', $event) . ']';
             error_log($event_str . "\n", 3, $this->getParam('log_directory') . '/' . $this->getParam('log_filename'));
         }

trunk/lib/Nav.inc.php

@@ -261 +261 @@
      * @access  public
      *
-     * @param   mixed   $page   The URI of the page to query.
+     * @param   mixed   $page   The URI of the page to query, with PREG express markup, if needed.
      * @param   mixed   $return The value to return if the current page matches the page queried.
      *
-     * @return  bool    True on success, false on failure.
+     * @return  mixed   The value set for $return, TRUE by default.
      */
     function currentPage($page_uri, $return=true)
     {
-        if (preg_match('/^' . preg_quote($page_uri, '/') . '/i', $_SERVER['PHP_SELF'])) {
+        $page_uri = str_replace('/', '\/', $page_uri);
+        if (preg_match('/^' . $page_uri . '/i', $_SERVER['PHP_SELF'])) {
             return $return;
         }

trunk/lib/SessionCache.inc.php

@@ -100 +100 @@
 
         if (!$this->getParam('enabled')) {
+            App::logMsg(sprintf('SessionCache not enabled, not saving data.', null), LOG_DEBUG, __FILE__, __LINE__);
             return false;
         }

trunk/lib/SortOrder.inc.php

@@ -106 +106 @@
 
     /**
-     * Set sort and order values. This is how you set new sort values after
+     * Forcibly set sort and order values. This is how you set new sort values after
      * already declaring a SortOrder object. This will ignore getFormData values.
      *
-     * @param string $col            The database column to sort by.
-     * @param string $col_name       The human-readable title of the column.
-     * @param string $default_order  The default order for this column (ASC,
+     * @param string $sort           The sort by name.
+     * @param string $order          The order direction (ASC,
      *                               for example, for an alphabetical sort)
      */
@@ -144 +143 @@
 
         if (!empty($this->_columns[strtolower($this->sort_by)][strtolower($this->order)])) {
-            return ' ORDER BY ' . addslashes($this->_columns[strtolower($this->sort_by)][strtolower($this->order)]);
+            return sprintf(' ORDER BY %s ', addslashes($this->_columns[strtolower($this->sort_by)][strtolower($this->order)]));
         } else {
             App::logMsg(sprintf('Could not find SQL to sort by %s %s.', $this->sort_by, $this->order), LOG_WARNING, __FILE__, __LINE__);