[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    www/media/includes
From:       Ingo Malchow <ingomalchow () googlemail ! com>
Date:       2010-12-16 23:39:10
Message-ID: 20101216233910.90792AC8A8 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1207097 by imalchow:

revert latest changes

 M  +1 -1      classes/class_teaser.inc  
 M  +12 -12    dotandapps.inc  
 M  +5 -5      functions.inc  
 M  +9 -9      rss2.inc  


--- trunk/www/media/includes/classes/class_teaser.inc #1207096:1207097
@@ -112,7 +112,7 @@
 			foreach (array_diff(scandir("{$document_root}/images/teaser"), array('.','..')) as $file)
 			{
 				// If it is a jpg file
-				if (is_file("{$document_root}/images/teaser/{$file}") && preg_match('jpg|jpeg|png|gif$', \
$file)) +				if (is_file("{$document_root}/images/teaser/{$file}") && ereg('jpg|jpeg|png|gif$', \
$file))  {
 					// Append the file to the array
 					$fileList[] = $file; 
--- trunk/www/media/includes/dotandapps.inc #1207096:1207097
@@ -46,14 +46,14 @@
 
     for($x=1;$x<=$rdf_items;$x++)
     {
-      preg_match("<title>(.*)</title>",$rdf_pieces[$x],$title );
-      preg_match("<link>(.*)</link>",$rdf_pieces[$x],$links );
-      preg_match("<pubDate>(.*)</pubDate>",$rdf_pieces[$x],$date );
+      ereg("<title>(.*)</title>",$rdf_pieces[$x],$title );
+      ereg("<link>(.*)</link>",$rdf_pieces[$x],$links );
+      ereg("<pubDate>(.*)</pubDate>",$rdf_pieces[$x],$date );
 
       $title[1] = utf8_encode($title[1]);
 
       // Cut down the month to three letters format day and month to DD MMM
-      $printDate2 = \
preg_replace("[a-zA-Z]+,[[:blank:]]*([0-9]+)[[:blank:]]+([a-zA-Z][a-zA-Z][a-zA-Z]).*$", \
"\\1&nbsp;\\2", $date[1]); +      $printDate2 = \
ereg_replace("[a-zA-Z]+,[[:blank:]]*([0-9]+)[[:blank:]]+([a-zA-Z][a-zA-Z][a-zA-Z]).*$", \
"\\1&nbsp;\\2", $date[1]);  
       $entry = "<tr>\n" . 
         "<td valign=\"top\" class=\"cell_date\"><b>$printDate2</b></td>\n" . 
@@ -104,14 +104,14 @@
     $prevDate = "";
     for($x=1;$x<$rdf_items;$x++)
     {
-      preg_match("<title>(.*)</title>",$rdf_pieces[$x],$title );
-      preg_match("<program>(.*)</program>",$rdf_pieces[$x],$app );
-      preg_match("<version>(.*)</version>",$rdf_pieces[$x],$version );
-      preg_match("<date>(.*)</date>",$rdf_pieces[$x],$date );
-      preg_match("<link>(.*)</link>",$rdf_pieces[$x],$links );
-      preg_match("<KDEversion>(.*)</KDEversion>",$rdf_pieces[$x],$KDEversion );
-      preg_match("<description>(.*)</description>",$rdf_pieces[$x],$desc );
-      preg_match("<category>(.*)</category>",$rdf_pieces[$x],$category );
+      ereg("<title>(.*)</title>",$rdf_pieces[$x],$title );
+      ereg("<program>(.*)</program>",$rdf_pieces[$x],$app );
+      ereg("<version>(.*)</version>",$rdf_pieces[$x],$version );
+      ereg("<date>(.*)</date>",$rdf_pieces[$x],$date );
+      ereg("<link>(.*)</link>",$rdf_pieces[$x],$links );
+      ereg("<KDEversion>(.*)</KDEversion>",$rdf_pieces[$x],$KDEversion );
+      ereg("<description>(.*)</description>",$rdf_pieces[$x],$desc );
+      ereg("<category>(.*)</category>",$rdf_pieces[$x],$category );
 
       // no valid date string around !
       if (strlen ($date[1]) < 31)
--- trunk/www/media/includes/functions.inc #1207096:1207097
@@ -118,9 +118,9 @@
       {
         $color = "newsbox2";
       }
-      preg_match('<title>(.*)</title>', $rdf_pieces[$x], $title);
-      preg_match('<date>(.*)</date>', $rdf_pieces[$x], $date);
-      preg_match('<fullstory>(.*)</fullstory>', $rdf_pieces[$x], $fullstory);
+      ereg("<title>(.*)</title>", $rdf_pieces[$x], $title);
+      ereg("<date>(.*)</date>", $rdf_pieces[$x], $date);
+      ereg("<fullstory>(.*)</fullstory>", $rdf_pieces[$x], $fullstory);
       print "<tr>\n";
 
       $printDate = $date[1];
@@ -130,12 +130,12 @@
       if ($summaryonly)
       {
         print "<td valign=\"top\" class=\"$color\">".(($printDate == $prevDate) ? "&nbsp;" : \
                "<b>$printDate</b>")."</td>\n";
-        print "<td class=\"$color\"><a href=\"news.php#item" . preg_replace("[^a-zA-Z0-9]", \
"", $title[1]) . "\">$title[1]</a></td>\n"; +        print "<td class=\"$color\"><a \
href=\"news.php#item" . ereg_replace("[^a-zA-Z0-9]", "", $title[1]) . \
"\">$title[1]</a></td>\n";  $prevDate = $printDate;
       }
       else
       {
-        print "<td class=\"newsbox2\"><h3><a name=\"item" . preg_replace("[^a-zA-Z0-9]", "", \
$title[1]) . "\">$printDate: $title[1]</a></h3></td>\n"; +        print "<td \
class=\"newsbox2\"><h3><a name=\"item" . ereg_replace("[^a-zA-Z0-9]", "", $title[1]) . \
"\">$printDate: $title[1]</a></h3></td>\n";  print "</tr><tr><td \
class=\"newsbox2\">$fullstory[1]</td>\n";  }
 
--- trunk/www/media/includes/rss2.inc #1207096:1207097
@@ -68,10 +68,10 @@
     
     for($x=1;$x<=$rdf_items;$x++)
     {
-      preg_match("<title>(.*)</title>", $rdf_pieces[$x], $title);
-      preg_match("<link>(.*)</link>",$rdf_pieces[$x], $links);
-      preg_match("<pubDate>(.*)</pubDate>", $rdf_pieces[$x], $date);
-      preg_match("<description>(.*)</description>", $rdf_pieces[$x], $description);
+      ereg("<title>(.*)</title>", $rdf_pieces[$x], $title);
+      ereg("<link>(.*)</link>",$rdf_pieces[$x], $links);
+      ereg("<pubDate>(.*)</pubDate>", $rdf_pieces[$x], $date);
+      ereg("<description>(.*)</description>", $rdf_pieces[$x], $description);
       print "<tr>\n";
 
       $parsedDate = strtotime( $date[1] );
@@ -89,17 +89,17 @@
       {
         print "<td valign=\"top\">".(($cookedDate == $prevDate) ? "&nbsp;" : \
                "<b>$cookedDate</b>")."</td>\n";
         if ($useexternallinks) print "<td><a href=\"$links[1]\">$title[1]</a></td>\n";
-        else print "<td><a href=\"news.php#item" . preg_replace("[^a-zA-Z0-9]", "", $title[1]) \
. "\">$title[1]</a></td>\n"; +        else print "<td><a href=\"news.php#item" . \
ereg_replace("[^a-zA-Z0-9]", "", $title[1]) . "\">$title[1]</a></td>\n";  \
$prevDate=$cookedDate;  }
       else
       {
         // We need to unescape the XML/HTML character references in the <description>
         $desc = $description[1];
-        $desc = preg_replace("&lt;","<", $desc);
-        $desc = preg_replace("&gt;",">", $desc);
-        $desc = preg_replace("&amp;","&", $desc);
-        print "<td><h3><a name=\"item" . preg_replace("[^a-zA-Z0-9]", "", $title[1]) . \
"\">$cookedDate: $title[1]</a></h3></td>\n"; +        $desc = ereg_replace("&lt;","<", $desc);
+        $desc = ereg_replace("&gt;",">", $desc);
+        $desc = ereg_replace("&amp;","&", $desc);
+        print "<td><h3><a name=\"item" . ereg_replace("[^a-zA-Z0-9]", "", $title[1]) . \
"\">$cookedDate: $title[1]</a></h3></td>\n";  print "</tr><tr><td>$desc</td>\n";
       }
       print "</tr>\n";


[prev in list] [next in list] [prev in thread] [next in thread]