Changeset 82 for img

Timestamp:

03/19/10 00:13:22 (6 months ago)

Author:

daniel

Message:

- Added: UTF-8 wordwrap function
- Fixed: Set UTF-8 for htmlentities encoding
- Fixed: wordwrap doesn't break html escaped strings anymore

Location:

img/trunk

Files:

• browse.php (modified) (5 diffs)
• image.php (modified) (5 diffs)
• lib/functions.php (modified) (2 diffs)
• login.php (modified) (2 diffs)
• search.php (modified) (2 diffs)
• tags.php (modified) (1 diff)

img/trunk/browse.php

@@ -63 +63 @@
                 
                 $preview = dirname($row['name']) . '/preview/' . basename($row['name']);
-                $images .= '<div class="previewimage"><a href="' . $row['name'] . '" class="lightbox" rel="lightbox"><img src="' . $preview . '" alt="' . htmlentities($row['original_name']) . '" /></a><br />' . "\n";
+                $images .= '<div class="previewimage"><a href="' . $row['name'] . '" class="lightbox" rel="lightbox"><img src="' . $preview . '" alt="' . htmlentities($row['original_name'], ENT_QUOTES, 'UTF-8') . '" /></a><br />' . "\n";
                 $images .= '<a href="image.php?i=' . urlnumber_encode($row['id']) . '">Show</a></div>' . "\n";
         }
@@ -88 +88 @@
         $pages = substr($pages, 0, -10) . '</p>';
         
-        outputHTML('<h2>' . one_wordwrap(htmlentities($tag_text), 5, '&shy;') . '</h2>' . $images . '<br style="clear: both;" />' . $pages, array('title' => 'Tag: ' . htmlentities($tag_text), 'lightbox' => true));
+        outputHTML('<h2>' . htmlentities(one_wordwrap($tag_text, 5, '&shy;'), ENT_QUOTES, 'UTF-8', false) . '</h2>' . $images . '<br style="clear: both;" />' . $pages, array('title' => 'Tag: ' . htmlentities($tag_text, ENT_QUOTES, 'UTF-8'), 'lightbox' => true));
 
 } elseif(isset($_GET['user'])) {
@@ -114 +114 @@
         while ($row = $db->fetch($res)) {
                 $preview = dirname($row['name']) . '/preview/' . basename($row['name']);
-                $images .= '<div class="previewimage"><a href="' . $row['name'] . '" class="lightbox" rel="lightbox"><img src="' . $preview . '" alt="' . htmlentities($row['original_name']) . '" /></a><br />' . "\n";
+                $images .= '<div class="previewimage"><a href="' . $row['name'] . '" class="lightbox" rel="lightbox"><img src="' . $preview . '" alt="' . htmlentities($row['original_name'], ENT_QUOTES, 'UTF-8') . '" /></a><br />' . "\n";
                 $images .= '<a href="image.php?i=' . urlnumber_encode($row['id']) . '">Show</a></div>' . "\n";
         }
@@ -135 +135 @@
         $pages = substr($pages, 0, -10) . '</p>';
         
-        outputHTML('<h2>' . one_wordwrap(htmlentities(urldecode($_GET['user'])), 5, '&shy;') . '</h2>' . $images . '<br style="clear: both;" />' . $pages, array('title' => 'Tag: ' . htmlentities($_GET['user']), 'lightbox' => true));
+        outputHTML('<h2>' . htmlentities(one_wordwrap(urldecode($_GET['user']), 5, '&shy;'), ENT_QUOTES, 'UTF-8', false) . '</h2>' . $images . '<br style="clear: both;" />' . $pages, array('title' => 'Tag: ' . htmlentities($_GET['user'], ENT_QUOTES, 'UTF-8'), 'lightbox' => true));
         
 } else {
 
         // Get tags from db
-        $sql = "SELECT tag, text, count FROM tags ORDER BY count DESC";
+        $sql = "SELECT tag, text, count FROM tags ORDER BY count DESC, ROWID DESC";
         $sql .= (isset($_GET['tags']) && $_GET['tags'] == 'all') ? ';' : ' LIMIT 100;';
-        
+
         $res = $db->query($sql);
         $tags = array();
@@ -148 +148 @@
         while ($row = $db->fetch($res)) {
                 $tags[$row['tag']] = $row['count'];
-                $texts[$row['tag']] = htmlentities($row['text']);
+                $texts[$row['tag']] = htmlentities($row['text'], ENT_QUOTES, 'UTF-8');
         }
         

img/trunk/image.php

@@ -44 +44 @@
 $name = $row['location'];
 $preview = dirname($name) . '/preview/' . basename($name);
-$original_name = htmlentities($row['original_name']);
+$original_name = $row['original_name'];
 $user = $row['user'];
 
@@ -51 +51 @@
 $tags = '';
 while ($row = $db->fetch($res)) {
-        $tags .= '<a href="browse.php?tag=' . urlencode($row['tag']) . '">' . htmlentities($row['text']) . '</a>, ';
+        $tags .= '<a href="browse.php?tag=' . urlencode($row['tag']) . '">' . htmlentities($row['text'], ENT_QUOTES, 'UTF-8') . '</a>, ';
 }
 $tags = substr($tags, 0, -2);
 
 // Generate HTML and code snippets for inserting the image
-$output = '<h2 id="imagename"><a href="' . $name . '">' . one_wordwrap($original_name, 5, '&shy;') . '</a></h2>
+$output = '<h2 id="imagename"><a href="' . $name . '">' . htmlentities(one_wordwrap($original_name, 5, '&shy;'), ENT_QUOTES, 'UTF-8', false) . '</a></h2>
                         <a id="preview" href="' . $name . '" rel="lightbox" ><img src="' . $preview . '" alt="" /></a>
                         <p id="tags">Tags: ' . $tags . '<br /></p>
@@ -72 +72 @@
                                                 <td>Preview</td>
                                                 <td><input onclick="this.select()" type="text" size="15" readonly="readonly" value="' . url() . $name . '" /></td>
-                                                <td><input onclick="this.select()" type="text" size="15" readonly="readonly" value="&lt;a href=&quot;' . url() . $name . '&quot;&gt;&lt;img src=&quot;' . url() . $preview . '&quot; alt=&quot;' . $original_name . ' - img.pew.cc&quot; /&gt;&lt;/a&gt;" /></td>
+                                                <td><input onclick="this.select()" type="text" size="15" readonly="readonly" value="&lt;a href=&quot;' . url() . $name . '&quot;&gt;&lt;img src=&quot;' . url() . $preview . '&quot; alt=&quot;' . htmlentities($original_name, ENT_QUOTES, 'UTF-8') . ' - img.pew.cc&quot; /&gt;&lt;/a&gt;" /></td>
                                                 <td><input onclick="this.select()" type="text" size="15" readonly="readonly" value="[URL=' . url() . $name . '][IMG]' . url() . $preview . '[/IMG][/URL]" /></td>
                                         </tr>
@@ -78 +78 @@
                                                 <td>Full</td>
                                                 <td><input onclick="this.select()" type="text" size="15" readonly="readonly" value="' .  url() . $name . '" /></td>
-                                                <td><input onclick="this.select()" type="text" size="15" readonly="readonly" value="&lt;img src=&quot;' . url() . $name . '&quot; alt=&quot;' . $original_name . ' - img.pew.cc&quot; /&gt;" /></td>
+                                                <td><input onclick="this.select()" type="text" size="15" readonly="readonly" value="&lt;img src=&quot;' . url() . $name . '&quot; alt=&quot;' . htmlentities($original_name, ENT_QUOTES, 'UTF-8') . ' - img.pew.cc&quot; /&gt;" /></td>
                                                 <td><input onclick="this.select()" type="text" size="15" readonly="readonly" value="[IMG]' . url() . $name . '[/IMG]" /></td>
                                         </tr>
@@ -92 +92 @@
 }
 
-outputHTML($output, array('title' => 'Image: ' . $original_name, 'lightbox' => true, 'header' => $header));
+outputHTML($output, array('title' => 'Image: ' . htmlentities($original_name, ENT_QUOTES, 'UTF-8'), 'lightbox' => true, 'header' => $header));
 
 ?>

img/trunk/lib/functions.php

@@ -203 +203 @@
 
 /**
+ * Wordwrap an UTF-8 string
+ * Function by andrnag at yandex dot ru
+ * See http://de.php.net/manual/en/function.wordwrap.php#94452
+ *
+ * @param       sring                   $str                    Input string
+ * @param       integer                 $width                  The column width. 
+ * @param       string                  $break                  The line is broken using the optional break  parameter. 
+ * @return      string                                                  Returns the given string wrapped at the specified column. 
+ */
+function utf8_wordwrap($str, $width = 75, $break = "\n") // wordwrap() with utf-8 support
+{
+        $str =  preg_split('/([\x20\r\n\t]++|\xc2\xa0)/sSX', $str, -1, PREG_SPLIT_NO_EMPTY);
+        $len = 0;
+        $return = '';
+        foreach ($str as $val) {
+                $val .= ' ';
+                $tmp = mb_strlen($val, 'utf-8');
+                $len += $tmp;
+                if ($len >= $width) {
+                        $return .= $break . $val;
+                        $len = $tmp;
+                } else
+                        $return .= $val;
+        }
+        return $return;
+}
+
+/**
  * Inserts a wrapping string if a word is longer than $width
  *
@@ -215 +243 @@
         $new_string = '';
         foreach ($s as $k => $v) {
-                if(strlen($v) > $width) $v = wordwrap($v, $width, $wrap, true);
+                if(strlen($v) > $width) $v = utf8_wordwrap($v, $width, $wrap);
                 $new_string .= $v . ' ';
         }

img/trunk/login.php

@@ -75 +75 @@
                                         setcookie('openid_cookie', serialize(array($oid->GetIdentifier(), $cookie)), time() + 60 * 60 * 24 * 30);
                                 }
-                                errorMsg('Login successful.<br />You are now logged in as <a href="browse.php?user=' . urlencode($oid->GetIdentifier()) . '"><i>' . htmlentities($oid->GetIdentifier()) . '</i></a>', url());
+                                errorMsg('Login successful.<br />You are now logged in as <a href="browse.php?user=' . urlencode($oid->GetIdentifier()) . '"><i>' . htmlentities($oid->GetIdentifier(), ENT_QUOTES, 'UTF-8') . '</i></a>', url());
                         } else {
                                 session_destroy();
@@ -91 +91 @@
 
 if (!empty($_SESSION['openid_identity'])) {
-        outputHTML('You are logged in as <a href="browse.php?user=' . urlencode($_SESSION['openid_identity']) . '"><i>' . htmlentities($_SESSION['openid_identity']) . '</i></a><br /><br /><a href="login.php?action=logout">Logout</a>');
+        outputHTML('You are logged in as <a href="browse.php?user=' . urlencode($_SESSION['openid_identity']) . '"><i>' . htmlentities($_SESSION['openid_identity'], ENT_QUOTES, 'UTF-8') . '</i></a><br /><br /><a href="login.php?action=logout">Logout</a>');
 } else {
         $output = '<h2>OpenID Login</h2>

img/trunk/search.php

@@ -108 +108 @@
         foreach ($images as $i) {
                 $preview = dirname($full_images[$i]['location']) . '/preview/' . basename($full_images[$i]['location']);
-                $output .= '<div class="previewimage"><a href="' . $full_images[$i]['location'] . '" class="lightbox" rel="lightbox"><img src="' . $preview . '" alt="' . htmlentities($full_images[$i]['original_name']) . '" /></a><br />' . "\n";
+                $output .= '<div class="previewimage"><a href="' . $full_images[$i]['location'] . '" class="lightbox" rel="lightbox"><img src="' . $preview . '" alt="' . htmlentities($full_images[$i]['original_name'], ENT_QUOTES, 'UTF-8') . '" /></a><br />' . "\n";
                 $output .= '<a href="image.php?i=' . urlnumber_encode($i) . '">Show</a></div>' . "\n";
         }
@@ -121 +121 @@
         $pages = substr($pages, 0, -10) . '</p>';
         
-        outputHTML('<h2>' . one_wordwrap(htmlentities($_GET['q']), 5, '&shy;') . '</h2>' . $output . '<br style="clear: both;" />' . $pages, array('title' => 'Search: ' . htmlentities($_GET['q']), 'lightbox' => true));
+        outputHTML('<h2>' . htmlentities(one_wordwrap($_GET['q'], 5, '&shy;'), ENT_QUOTES, 'UTF-8', false) . '</h2>' . $output . '<br style="clear: both;" />' . $pages, array('title' => 'Search: ' . htmlentities($_GET['q'], ENT_QUOTES, 'UTF-8'), 'lightbox' => true));
         
 } else {

img/trunk/tags.php

@@ -37 +37 @@
         
         while ($row = $db->fetch($res)) {
-                $tags[] = htmlentities($row['text']);
+                $tags[] = htmlentities($row['text'], ENT_QUOTES, 'UTF-8');
         }