Index: uc_turkish_banks.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/uc_turkish_banks/uc_turkish_banks.install,v
retrieving revision 1.1
diff -u -r1.1 uc_turkish_banks.install
--- uc_turkish_banks.install	22 Jun 2008 08:50:09 -0000	1.1
+++ uc_turkish_banks.install	22 Jun 2008 12:41:54 -0000
@@ -1,43 +1,50 @@
 <?php
+// $Id$
+
 /**
- * Ubercart uc_turkish_banks.module schema
+ * Implementation of hook_install().
  */
 function uc_turkish_banks_install() {
   switch ($GLOBALS['db_type']) {
     case 'mysql':
     case 'mysqli':
-      db_query("CREATE TABLE IF NOT EXISTS {uc_turkish_banks} (
-                  {cid} int(10) unsigned NOT NULL AUTO_INCREMENT,
-                  {bankname} varchar(45) NOT NULL,
-                  {valid_until} int(11) unsigned NOT NULL,
-                  {clientid} varchar(10) NOT NULL,
-                  {username} varchar(20) NOT NULL,
-                  {password} varchar(20) NOT NULL,
-                  {storekey} varchar(20) NOT NULL,
-                  {cardname} varchar(100) NOT NULL,
-                  {processtype} varchar(10) NOT NULL,
-                  {bankurl} varchar(100) NOT NULL,
-                PRIMARY KEY ({cid},{bankname})) /*!40100 DEFAULT CHARACTER SET UTF8 */;");
-				
-			db_query("CREATE TABLE IF NOT EXISTS {uc_turkish_banks_orders} (
-                {cuid} int(11) NOT NULL auto_increment,
-                {cid} int(11) NOT NULL,
-                {oid} int(11) NOT NULL default '0',
-                PRIMARY KEY  (`cuid`)) /*!40100 DEFAULT CHARACTER SET UTF8 */;");
+      db_query("CREATE TABLE {uc_turkish_banks} (
+        cid int(10) unsigned NOT NULL AUTO_INCREMENT,
+        bankname varchar(45) NOT NULL,
+        valid_until int(11) unsigned NOT NULL,
+        clientid varchar(10) NOT NULL,
+        username varchar(20) NOT NULL,
+        password varchar(20) NOT NULL,
+        storekey varchar(20) NOT NULL,
+        cardname varchar(100) NOT NULL,
+        processtype varchar(10) NOT NULL,
+        bankurl varchar(100) NOT NULL,
+        PRIMARY KEY (cid, bankname)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+			db_query("CREATE TABLE {uc_turkish_banks_orders} (
+        cuid int(11) NOT NULL auto_increment,
+        cid int(11) NOT NULL,
+        oid int(11) NOT NULL default '0',
+        PRIMARY KEY (cuid)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
                 
       db_query("CREATE TABLE {uc_turkish_banks_instalments} (
-                {cid} int(10) UNSIGNED NOT NULL,
-                {instalment} VARCHAR(45) NOT NULL,
-                {instalment_ratio} decimal(4,2) NOT NULL,
-                {valid_until} INTEGER NOT NULL
-                )  /*!40100 DEFAULT CHARACTER SET UTF8 */;");
-	  break;
-	  }
+        cid int(10) UNSIGNED NOT NULL,
+        instalment VARCHAR(45) NOT NULL,
+        instalment_ratio decimal(4,2) NOT NULL,
+        valid_until INTEGER NOT NULL
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+	    break;
+	}
 }
 
+/**
+ * Implementation of hook_uninstall().
+ */
 function uc_turkish_banks_uninstall() {
   db_query("DROP TABLE {uc_turkish_banks}");
   db_query("DROP TABLE {uc_turkish_banks_orders}");
   db_query("DROP TABLE {uc_turkish_banks_instalments}");   
-  drupal_set_message("uc_turkish_banks successfully uninstalled.");
-}
\ No newline at end of file
+  drupal_set_message(t("uc_turkish_banks successfully uninstalled."));
+}
Index: uc_turkish_banks.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/uc_turkish_banks/uc_turkish_banks.module,v
retrieving revision 1.1
diff -u -r1.1 uc_turkish_banks.module
--- uc_turkish_banks.module	22 Jun 2008 08:50:09 -0000	1.1
+++ uc_turkish_banks.module	22 Jun 2008 12:41:58 -0000
@@ -3,27 +3,31 @@
 
 /**
  * @file
- * A module used for Bank payment gateway .
+ * A module used for Bank payment gateway.
  *
- * A module used to process payments using Banks in Turkey. Currently uses the EST e-secure payment service. This module currently supports instalments and as a paymant method uses 3D Secure OOS PAY.
+ * A module used to process payments using Banks in Turkey. Currently uses the
+ * EST e-secure payment service. This module currently supports instalments
+ * and as a paymant method uses 3D Secure OOS PAY.
  *
- *T�rk Bankalari i�in �deme eklentisidir. EST G�venli e-�deme servisi kullanmaktadir. Taksitli satisi desteklemektedir. Satis y�ntemi olarak 3D Secure OOS PAY metodunu kullanmaktadir.
+ * Türk Bankalari için ödeme eklentisidir. EST Güvenli e-ödeme servisini
+ * kullanmaktadir. Taksitli satisi desteklemektedir. Satis yöntemi olarak
+ * 3D Secure OOS PAY metodunu kullanmaktadir.
  *
- *Support the following banks/ Asagidaki bankalar desteklenmektedir.
+ * Supports the following banks / Asagidaki bankalar desteklenmektedir.
  *
- * 1. Is Bankasi
- * 2. Akbank
- * 3. Garanti
- * 4. HSBC
- * 5. Finansbank
- * 6. TEB
- * 7. Fortis
- * 8. Halkbank
- * 9. Anadolubank
+ *  1. Is Bankasi
+ *  2. Akbank
+ *  3. Garanti
+ *  4. HSBC
+ *  5. Finansbank
+ *  6. TEB
+ *  7. Fortis
+ *  8. Halkbank
+ *  9. Anadolubank
  * 10. Denizbank
  */
- 
- /**
+
+/**
  * Implementation of hook_menu().
  */
 function uc_turkish_banks_menu($may_cache) {
@@ -120,11 +124,9 @@
   return array('1' => 'view banks', '1' => 'manage banks');
 }
 
-
 function uc_turkish_banks_instalments_display() {
   $cid=arg(5);
-  $query = "SELECT cid,instalment,instalment_ratio,valid_until FROM {uc_turkish_banks_instalments} where cid=$cid ORDER BY instalment";
-  $result = db_query($query);
+  $result = db_query("SELECT cid, instalment, instalment_ratio, valid_until FROM {uc_turkish_banks_instalments} where cid = %d ORDER BY instalment", $cid);
   $rows = array();
   while ($row = db_fetch_object($result)) {
     if ($row->type == 'percentage') {
@@ -147,13 +149,12 @@
     $output = "<p>There are currently no instalments in the system.</p>";
   }
   $output .=  l(t('Add a new instalment'), "admin/store/settings/banks/instalments/add/$cid");
-  $output .= "<BR/>";
+  $output .= "<br/>";
   $output .=  l(t('Back to Banks'),"admin/store/settings/banks");
   return $output;
 }
 
 function uc_turkish_banks_instalments_add_form($action, $cid = null) {
-
     $form['uc_turkish_banks_instalments'] = array('#type' => 'fieldset',
       '#title' => t('Instalments'),
       '#collapsible' => true,
@@ -193,7 +194,7 @@
     );
     
     $form['cancel'] = array('#type' => 'item',
-  		'#value' => l(t('Cancel and return to instalments listing'), 'admin/store/settings/banks/instalments'.arg(0)),
+  		'#value' => l(t('Cancel and return to instalments listing'), 'admin/store/settings/banks/instalments/'.arg(0)),
   		'#weight' => 20,
     );
     $form['op'] = array('#type' => 'submit',
@@ -207,7 +208,7 @@
  * Validate the instalment
  */
 function uc_turkish_banks_instalments_add_form_validate($form_id, $form) {
-  $result = db_result(db_query("SELECT instalment FROM {uc_turkish_banks_instalments} WHERE cid = %d and instalment = %d", $form['cid'],$form['instalment']));
+  $result = db_result(db_query("SELECT instalment FROM {uc_turkish_banks_instalments} WHERE cid = %d and instalment = %d", $form['cid'], $form['instalment']));
 	if ($result) {
 		form_set_error($form['cid'], t('Instalment exist.'));
 	}
@@ -222,8 +223,8 @@
     $form['valid_until']['day'],
     $form['valid_until']['year']
    );
-  $result = db_query("INSERT INTO {uc_turkish_banks_instalments} (cid,instalment,instalment_ratio,valid_until)
-                VALUES (%d,%d,%f,%d)",$form['cid'],$form['instalment'],$form['instalment_ratio'],$valid_until);
+  $result = db_query("INSERT INTO {uc_turkish_banks_instalments} (cid, instalment, instalment_ratio, valid_until)
+    VALUES (%d, %d, %f, %d)", $form['cid'], $form['instalment'], $form['instalment_ratio'], $valid_until);
   if ($result) {
     $message = "New instalment {$form['name']} added succesfully.";
 	}              
@@ -237,8 +238,7 @@
 /**
  * Delete confirm
  */
-
-function uc_turkish_banks_instalments_delete_confirm($cid,$instalment) {
+function uc_turkish_banks_instalments_delete_confirm($cid, $instalment) {
  $form['cid'] = array('#type' => 'value', '#value' => $cid);
  $form['instalment'] = array('#type' => 'value', '#value' => $instalment);
   return confirm_form($form, 
@@ -254,10 +254,9 @@
  * Delete
  */
 function uc_turkish_banks_instalments_delete_confirm_submit($form_id, $form) {
-  $cid =$form['cid'];
-  $isntalment=$form['instalment'];
-  $query = "DELETE FROM {uc_turkish_banks_instalments} WHERE cid=$cid and instalment=$isntalment";
-	if (db_query($query)) {
+  $cid = $form['cid'];
+  $instalment = $form['instalment'];
+	if (db_query("DELETE FROM {uc_turkish_banks_instalments} WHERE cid = %d and instalment = '%s'", $cid, $instalment)) {
 		drupal_set_message("Instalment has been deleted successfully");
 	}
 	else {
@@ -269,18 +268,16 @@
 
 /**
  * Display a brief over view of system coupons
- *
  */
 function uc_turkish_banks_display() {
-	$query = "SELECT * FROM {uc_turkish_banks} ORDER BY bankname";
-  $result = db_query($query);
+  $result = db_query("SELECT * FROM {uc_turkish_banks} ORDER BY bankname");
   $rows = array();
   while ($row = db_fetch_object($result)) {
     if ($row->type == 'percentage') {
 	    $value = $row->value . '%';
 	  }
 	  else {
-	    $value = '$' . $row->value;
+	    $value = '$'. $row->value;
 	  }
     $rows[] = array($row->bankname, $row->cardname, format_date($row->valid_until, 'custom', 'd/m/Y'),l(t('Instalments'), "admin/store/settings/banks/instalments/$row->cid") . '|' . l(t('edit'), "admin/store/settings/banks/$row->cid/edit") . '|' . l(t('delete'),"admin/store/settings/banks/$row->cid/delete"));
 	}
@@ -457,7 +454,7 @@
  * Load a coupon into the form for editing
  */
 function uc_turkish_banks_load($cid) {
-  $object = db_fetch_array(db_query("SELECT * FROM {uc_turkish_banks} WHERE cid = '$cid'"));
+  $object = db_fetch_array(db_query("SELECT * FROM {uc_turkish_banks} WHERE cid = %d", $cid));
   if ($object == '') {
 	  drupal_set_message("Sorry Bank $cid does not exist.  Choose another bank to edit or compose a new one");
 	  drupal_goto('admin/store/settings/banks');
@@ -484,14 +481,12 @@
  * Delete coupon
  */
 function uc_turkish_banks_delete_confirm_submit($form_id, $form) {
-	
 	$bank_id = $form['cid'];
-	$query = "DELETE FROM uc_turkish_banks,uc_turkish_banks_instalments USING uc_turkish_banks,uc_turkish_banks_instalments WHERE uc_turkish_banks.cid = uc_turkish_banks_instalments.cid AND uc_turkish_banks.cid = $bank_id";
-  if (db_query($query)) {
-		$msg .= t('Bank and related instalments has been deleted successfully');
+  if (db_query("DELETE FROM {uc_turkish_banks}, {uc_turkish_banks_instalments} USING {uc_turkish_banks}, {uc_turkish_banks_instalments} WHERE {uc_turkish_banks}.cid = {uc_turkish_banks_instalments}.cid AND {uc_turkish_banks}.cid = %d", $bank_id)) {
+		$msg = t('Bank and related instalments has been deleted successfully');
 	}
 	else {
-		$msg .= t('Error deleting bank.');
+		$msg = t('Error deleting bank.');
 	}
 	drupal_goto('admin/store/settings/banks');
 }
@@ -618,7 +613,6 @@
  * Callback for banks payment method settings.
  */
 function uc_payment_method_banks($op, &$arg1) {
-  
   switch ($op) {
     case 'cart-details':
       $items = uc_cart_get_contents();
@@ -627,8 +621,7 @@
         $item_total = ($item->qty) ? $item->qty * $item->price : $item->price;
         $subtotal += $item_total;
       }
-      $query = "SELECT * FROM {uc_turkish_banks} where valid_until > CURDATE() ORDER BY bankname";
-      $result = db_query($query);
+      $result = db_query("SELECT * FROM {uc_turkish_banks} where valid_until > CURDATE() ORDER BY bankname");
       if (db_affected_rows() > 0) {
         $options  = array();
         $select2='<select NAME="taksit" ID="taksit" class="combobox" onChange="instalment(this)">'
@@ -644,8 +637,7 @@
             $select3OptLst .= 'group['.$outer.']['.$inner++.']=new Option("Taksitler");';
             
             $cid_ins = $row['cid']; 
-            $query_ins = "SELECT * FROM {uc_turkish_banks_instalments} where cid=$cid_ins and valid_until > CURDATE() ORDER BY instalment";
-            $result_ins = db_query($query_ins);
+            $result_ins = db_query("SELECT * FROM {uc_turkish_banks_instalments} where cid = %d and valid_until > CURDATE() ORDER BY instalment", $cid_ins);
             while ($row_ins = db_fetch_array($result_ins)) {
                   $new= $row_ins['instalment_ratio'] * $subtotal;
                   $select_text = $row_ins['instalment']. " taksit +". uc_currency_format($new);
@@ -752,13 +744,13 @@
   $clientId = $bank->clientid;      //banks tarafindan magazaya verilen isyeri numarasi
   $amount = uc_currency_format($order->order_total, FALSE, FALSE, '.');             //tutar
   $oid = $order->order_id;                    //Siparis numarasi
-  $okUrl = url('cart/banks/complete/'. uc_cart_get_id(), NULL, NULL, TRUE);      //Islem basariliysa d�n�lecek isyeri sayfasi  (3D isleminin ve �deme isleminin sonucu)
-  $failUrl = url('cart/banks/complete/'. uc_cart_get_id(), NULL, NULL, TRUE);    //Islem basarisizsa d�n�lecek isyeri sayfasi  (3D isleminin ve �deme isleminin sonucu)
-  $rnd = microtime();                    //Tarih ve zaman gibi s�rekli degisen bir deger g�venlik ama�li kullaniliyor
+  $okUrl = url('cart/banks/complete/'. uc_cart_get_id(), NULL, NULL, TRUE);      //Islem basariliysa dönülecek isyeri sayfasi  (3D isleminin ve ödeme isleminin sonucu)
+  $failUrl = url('cart/banks/complete/'. uc_cart_get_id(), NULL, NULL, TRUE);    //Islem basarisizsa dönülecek isyeri sayfasi  (3D isleminin ve ödeme isleminin sonucu)
+  $rnd = microtime();                    //Tarih ve zaman gibi sürekli degisen bir deger güvenlik amaçli kullaniliyor
   $islemtipi= $bank->processtype;					//Islem tipi
   $storekey = $bank->storekey;					//Isyeri anahtari
   
-  $hashstr = $clientId . $oid . $amount . $okUrl . $failUrl . $islemtipi . $taksit . $rnd . $storekey; //g�venlik ama�li hashli deger
+  $hashstr = $clientId . $oid . $amount . $okUrl . $failUrl . $islemtipi . $taksit . $rnd . $storekey; //güvenlik amaçli hashli deger
   $hash = base64_encode(pack('H*',sha1($hashstr)));
   
   
@@ -837,7 +829,7 @@
  
   if($paramsval != $hashparamsval || $hashparam != $hash) 
   {	
-	  uc_order_comment_save($order->order_id, 0, t('G�venlik Uyarisi. Sayisal Imza Ge�erli Degil'), 'admin');
+	  uc_order_comment_save($order->order_id, 0, t('Güvenlik Uyarisi. Sayisal Imza Geçerli Degil'), 'admin');
 	}
  
   $mdStatus = $_POST["mdStatus"];
@@ -845,7 +837,7 @@
 
   if($mdStatus == 1 || $mdStatus == 2 || $mdStatus == 3 || $mdStatus == 4)
   {
-    $comment = t('Garanti bankssi ile �deme alidi.');
+    $comment = t('Garanti bankasi ile ödeme alindi.');
     uc_payment_enter($order->order_id, 'Garanti Bank', $_POST["amount"], 0, NULL, $comment); 
     uc_order_comment_save($order->order_id, 0, t('Order created through website.'), 'admin');
     $_SESSION['do_complete'] = TRUE;
