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

List:       kde-commits
Subject:    www/apps/konqueror/banking
From:       Chris Howells <howells () kde ! org>
Date:       2004-07-04 15:22:41
Message-ID: 20040704152241.6BFBE1265F () office ! kde ! org
[Download RAW message or body]

CVS commit by howells: 

lots of fixes


  M +2 -5      admin.php   1.2
  M +18 -0     common.inc   1.2
  M +5 -5      index.php   1.2


--- www/apps/konqueror/banking/admin.php  #1.1:1.2
@@ -8,5 +8,4 @@
 
 <?php
-
         include_once("common.inc");
 
@@ -14,6 +13,4 @@
 
         $sql = "SELECT banks.country, banks.url, banks.name, compat.comment, \
compat.kde30, compat.kde31 FROM banks, compat WHERE banks.id = '$id' AND compat.bank \
                = '$id'";
-        //echo "sql is " . $sql;
-
         $query = mysql_query($sql) or die("MySQL error: " . mysql_error());
 
@@ -31,5 +28,5 @@
 </td>
 <td>
-<input type="text" name="name" value="<?php echo $row['name'] ?>" />
+<input type="text" name="name" value="<?php echo stripslashes($row['name']) ?>" />
 </td>
 </tr>
@@ -47,5 +44,5 @@
 </td>
 <td>
-<textarea cols="70" rows="5" name="comment"><?php echo $row['comment'] ?></textarea>
+<textarea cols="70" rows="5" name="comment"><?php echo stripslashes($row['comment']) \
?></textarea>  </td>
 </tr>

--- www/apps/konqueror/banking/common.inc  #1.1:1.2
@@ -34,3 +34,21 @@
 }
 
+function country($string)
+{
+        $country = addslashes($string);
+        if (ereg("^[A-Z]{2}$", $string))
+        {
+                $sql = "SELECT name FROM country WHERE iso = '$country'";
+                $query = mysql_query($sql);
+                $value = mysql_fetch_array($query);
+                return $value['name'];
+        }
+        else
+        {
+                $sql = "SELECT iso FROM country WHERE name = '$country'";
+                $query = mysql_query($sql);
+                $value = mysql_fetch_array($query);
+                return $value['iso'];
+        }
+}
 ?>

--- www/apps/konqueror/banking/index.php  #1.1:1.2
@@ -19,9 +19,9 @@
 <option value="all">All</option>
 <?php
-$sql = "SELECT DISTINCT country FROM banks ORDER BY country";
+$sql = "SELECT name FROM country ORDER BY name";
 $query = mysql_query($sql);
 while ($row = mysql_fetch_array($query))
 {
-        echo "<option value=\"" . $row['country'] . "\">" . $row['country']. \
"</option>"; +        echo "<option value=\"" . country($row['name']) . "\">" . \
$row['name']. "</option>\n";  }
 ?>
@@ -110,5 +110,5 @@
         {
                 $country = $row['country'];
-                echo "<tr><td colspan=\"4\"><h1>" . $row['country'] . \
"</h1></td></tr>"; +                echo "<tr><td colspan=\"4\"><h1>" . \
                country($row['country']) . "</h1></td></tr>";
                 echo "<tr><td>Bank</td><td>Comment</td><td>KDE 3.0</td><td>KDE \
3.1</td></tr>";  $sql2 = "SELECT banks.country, banks.url, banks.name, \
compat.comment, compat.kde30, compat.kde31 FROM banks, compat WHERE banks.id = \
compat.bank AND country = '$country' ORDER BY banks.name"; @@ -117,6 +117,6 @@
                 {
                         echo "<tr>\n";
-                        echo "<td valign=\"top\"><a href=\"" . $row2['url'] ."\">" . \
                $row2['name'] . "</a></td>";
-                        echo "<td>" . $row2['comment'] . "</td>";
+                        echo "<td valign=\"top\"><a href=\"" . $row2['url'] ."\">" . \
stripslashes($row2['name']) . "</a></td>"; +                        echo "<td>" . \
                stripslashes($row2['comment']) . "</td>";
                         echo "<td>" . parseCompat($row2['kde30']) . "</td>";
                         echo "<td>" . parsecompat($row2['kde31']) . "</td>";


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