Changeset 1063 for trunk

Timestamp:

11/24/09 19:42:51 (2 years ago)

Author:

bogdan2412

Message:

Replace tabs with spaces in non-external files.

Location:

trunk

Files:

• common/external_libs/simple_html_dom.php (modified) (1 diff)
• www/controllers/user.php (modified) (1 diff)
• www/format/pager.php (modified) (1 diff)
• www/macros/macro_calendar.php (modified) (1 diff)
• www/views/user.php (modified) (1 diff)
• www/wiki/latex.php (modified) (1 diff)

trunk/common/external_libs/simple_html_dom.php

@@ -269 +269 @@
         // return nth-element or array
         if (is_null($idx)) return $found;
-                else if ($idx<0) $idx = count($found) + $idx;
+        else if ($idx<0) $idx = count($found) + $idx;
         return (isset($found[$idx])) ? $found[$idx] : null;
     }

trunk/www/controllers/user.php

@@ -20 +20 @@
         'title' => $user['full_name'].' ('.$user['username'].')',
         'page_name' => $page_name,
-            'revision' => $revision,
+        'revision' => $revision,
         'revision_count' => textblock_get_revision_count($page_name),
         'action' => $action,

trunk/www/format/pager.php

@@ -9 +9 @@
 //  * url_args              : Base arguments for the url function. Defaults to _GET.
 //  * param_prefix          : Prefix for url parameters.
-//  * show_count                : Show number of entries. true / false
+//  * show_count            : Show number of entries. true / false
 //  * show_display_entries  : Shows "results per page" links
 //

trunk/www/macros/macro_calendar.php

@@ -6 +6 @@
     $forumurl = url_forum();
 
-        // Find all events which are happening in the near future that the member can see.
-        $result = db_fetch_all("
-                SELECT
-                        cal.ID_EVENT, cal.startDate, cal.endDate, cal.title, cal.ID_MEMBER, cal.ID_TOPIC,
-                        cal.ID_BOARD, t.ID_FIRST_MSG
-                FROM ia_smf_calendar AS cal
-                        LEFT JOIN ia_smf_boards AS b ON (b.ID_BOARD = cal.ID_BOARD)
-                        LEFT JOIN ia_smf_topics AS t ON (t.ID_TOPIC = cal.ID_TOPIC)
-                WHERE cal.endDate >= '" . strftime('%Y-%m-%d', time()) . "' AND
+    // Find all events which are happening in the near future that the member can see.
+    $result = db_fetch_all("
+        SELECT
+            cal.ID_EVENT, cal.startDate, cal.endDate, cal.title, cal.ID_MEMBER, cal.ID_TOPIC,
+            cal.ID_BOARD, t.ID_FIRST_MSG
+        FROM ia_smf_calendar AS cal
+            LEFT JOIN ia_smf_boards AS b ON (b.ID_BOARD = cal.ID_BOARD)
+            LEFT JOIN ia_smf_topics AS t ON (t.ID_TOPIC = cal.ID_TOPIC)
+        WHERE cal.endDate >= '" . strftime('%Y-%m-%d', time()) . "' AND
         cal.startDate <= DATE_ADD(NOW(), INTERVAL 7 DAY)
-                ORDER BY cal.startDate
-                LIMIT $max_events");
-        $return = array();
-        $duplicates = array();
+        ORDER BY cal.startDate
+        LIMIT $max_events");
+    $return = array();
+    $duplicates = array();
     setlocale(LC_TIME, 'ro_RO.utf8');
     foreach ($result as $row)
-        {
-                // Check if we've already come by an event linked to this same topic with the same title... and don't display it if we have.
-                if (!empty($duplicates[$row['title'] . $row['ID_TOPIC']]))
-                        continue;
+    {
+        // Check if we've already come by an event linked to this same topic with the same title... and don't display it if we have.
+        if (!empty($duplicates[$row['title'] . $row['ID_TOPIC']]))
+            continue;
 
-                if ($row['startDate'] < strftime('%Y-%m-%d', time()))
-                        $date = strftime('%Y-%m-%d', time());
-                else
-                        $date = $row['startDate'];
+        if ($row['startDate'] < strftime('%Y-%m-%d', time()))
+            $date = strftime('%Y-%m-%d', time());
+        else
+            $date = $row['startDate'];
 
-                $return[$date][] = array(
-                        'id' => $row['ID_EVENT'],
-                        'title' => $row['title'],
-                        'modify_href' => $forumurl . '?action=' . ($row['ID_BOARD'] == 0 ? 'calendar;sa=post;' : 'post;msg=' . $row['ID_FIRST_MSG'] . ';topic=' . $row['ID_TOPIC'] . '.0;calendar;') . 'eventid=' . $row['ID_EVENT'],
-                        'href' => $row['ID_BOARD'] == 0 ? '' : $forumurl . '?topic=' . $row['ID_TOPIC'] . '.0',
-                        'link' => $row['ID_BOARD'] == 0 ? $row['title'] : '<a href="' . $forumurl . '?topic=' . $row['ID_TOPIC'] . '.0">' . $row['title'] . '</a>',
-                        'start_date' => $row['startDate'],
-                        'end_date' => $row['endDate'],
-                        'is_last' => false
-                );
+        $return[$date][] = array(
+            'id' => $row['ID_EVENT'],
+            'title' => $row['title'],
+            'modify_href' => $forumurl . '?action=' . ($row['ID_BOARD'] == 0 ? 'calendar;sa=post;' : 'post;msg=' . $row['ID_FIRST_MSG'] . ';topic=' . $row['ID_TOPIC'] . '.0;calendar;') . 'eventid=' . $row['ID_EVENT'],
+            'href' => $row['ID_BOARD'] == 0 ? '' : $forumurl . '?topic=' . $row['ID_TOPIC'] . '.0',
+            'link' => $row['ID_BOARD'] == 0 ? $row['title'] : '<a href="' . $forumurl . '?topic=' . $row['ID_TOPIC'] . '.0">' . $row['title'] . '</a>',
+            'start_date' => $row['startDate'],
+            'end_date' => $row['endDate'],
+            'is_last' => false
+        );
 
-                // Let's not show this one again, huh?
-                $duplicates[$row['title'] . $row['ID_TOPIC']] = true;
-        }
+        // Let's not show this one again, huh?
+        $duplicates[$row['title'] . $row['ID_TOPIC']] = true;
+    }
 
-        foreach ($return as $mday => $array)
-                $return[$mday][count($array) - 1]['is_last'] = true;
+    foreach ($return as $mday => $array)
+        $return[$mday][count($array) - 1]['is_last'] = true;
 
     $html = '<div class="calendar">';
     $html .= '<div class="header">';
     $html .= '<a href="'.IA_URL.'forum?action=calendar">In curand...</a></div>';
-        foreach ($return as $mday => $array)
+    foreach ($return as $mday => $array)
     {
         $html .= '<div class="date">'.strftime("%A, %d %b %Y", strtotime($mday)).'</div>';
-                foreach ($array as $event)
-                {
+        foreach ($array as $event)
+        {
             $html .= '<div class="event">';
             $html .= '&raquo;';
-                        $html .=  $event['link'];
+            $html .=  $event['link'];
             $html .= '</div>';
-                }
+        }
     }
     $html .= '</div>';

trunk/www/views/user.php

@@ -33 +33 @@
     // FIXME: duplicated code (see views/textblock_view.php)
     if (getattr($view, 'revision')) {
-            include('revision_warning.php');
+        include('revision_warning.php');
     }
 

trunk/www/wiki/latex.php

@@ -23 +23 @@
  * Revised by Steve Mayer
  * This file can be included in many PHP programs by using something like (see example.php to see how it can be used)
- *              include_once('/full_path_here_to/latexrender/latex.php');
- *              $text_to_be_converted=latex_content($text_to_be_converted);
+ *      include_once('/full_path_here_to/latexrender/latex.php');
+ *      $text_to_be_converted=latex_content($text_to_be_converted);
  * $text_to_be_converted will then contain the link to the appropriate image
  * or an error code as follows (the values can be altered in class.latexrender.php):
- *      0 OK
- *      1 Formula longer than 10000 characters
- *      2 Includes a blacklisted tag
- *      3 Latex rendering failed
- *      4 Cannot create DVI file
- *      5 Picture larger than 800 x 600 followed by x x y dimensions
- *      6 Cannot copy image to latex directory
+ *      0 OK
+ *      1 Formula longer than 10000 characters
+ *      2 Includes a blacklisted tag
+ *      3 Latex rendering failed
+ *      4 Cannot create DVI file
+ *      5 Picture larger than 800 x 600 followed by x x y dimensions
+ *      6 Cannot copy image to latex directory
  * 
  * This version includes Mike Boyle's modifications to allow vertical offset of LaTeX formulae