- Cambios

- Web on-line

git-svn-id: https://192.168.0.254/svn/Proyectos.FundacionLQDVI_Web/trunk@49 77ab8c26-3d69-2c4d-86f2-786f4ba54905

db/migracion.sql

@@ -1,8 +1,10 @@
-UPDATE wp_options SET option_value = replace(option_value, 'http://www.loquedeverdadimporta.org/web', 'http://localhost/lqdvi') WHERE option_name = 'home' OR option_name = 'siteurl';
+UPDATE wp_options SET option_value = replace(option_value, 'http://www.loquedeverdadimporta.org/web', 'http://www.loquedeverdadimporta.org');
-UPDATE wp_posts SET guid = replace(guid, 'http://www.loquedeverdadimporta.org/web','http://localhost/lqdvi');
+UPDATE wp_posts SET guid = replace(guid, 'http://www.loquedeverdadimporta.org/web','http://www.loquedeverdadimporta.org');
-UPDATE wp_posts SET post_content = replace(post_content, 'http://www.loquedeverdadimporta.org/web', 'http://localhost/lqdvi');
+UPDATE wp_posts SET post_content = replace(post_content, 'http://www.loquedeverdadimporta.org/web', 'http://www.loquedeverdadimporta.org');
-UPDATE wp_contact_form_7 SET additional_settings  = replace(additional_settings , 'http://www.loquedeverdadimporta.org/web', 'http://localhost/lqdvi');
+UPDATE wp_postmeta SET meta_value = replace(meta_value, 'http://www.loquedeverdadimporta.org/web', 'http://www.loquedeverdadimporta.org');
-UPDATE wp_facethumb SET url = replace(url, 'http://www.loquedeverdadimporta.org/web', 'http://localhost/lqdvi');
+
-UPDATE wp_options SET option_value = replace(option_value, 'http://www.loquedeverdadimporta.org/web', 'http://localhost/lqdvi');
+UPDATE wp_contact_form_7 SET additional_settings  = replace(additional_settings , 'http://www.loquedeverdadimporta.org/web', 'http://www.loquedeverdadimporta.org');
-UPDATE wp_postmeta SET meta_value = replace(meta_value, 'http://www.loquedeverdadimporta.org/web', 'http://localhost/lqdvi');
+UPDATE wp_facethumb SET url = replace(url, 'http://www.loquedeverdadimporta.org/web', 'http://www.loquedeverdadimporta.org');
-UPDATE wp_rg_lead SET source_url = replace(source_url, 'http://www.loquedeverdadimporta.org/web', 'http://localhost/lqdvi');
+UPDATE wp_options SET option_value = replace(option_value, 'http://www.loquedeverdadimporta.org/web', 'http://www.loquedeverdadimporta.org');
+UPDATE wp_rg_lead SET source_url = replace(source_url, 'http://www.loquedeverdadimporta.org/web', 'http://www.loquedeverdadimporta.org');
+UPDATE wp_bannerize_b SET filename = replace(filename, 'http://www.loquedeverdadimporta.org/web', 'http://www.loquedeverdadimporta.org');

src/webcam/getwebcamdata.php

@@ -1,114 +1,114 @@
-<?php echo 
+<?php echo 
-        print_r($_POST);
+        print_r($_POST);
-	$pixels = $_POST["pixels"];	
+	$pixels = $_POST["pixels"];	
-	if(is_null($pixels))
+	if(is_null($pixels))
-	{
+	{
-		$pixels = "";		
+		$pixels = "";		
-	}
+	}
-
+
-	$width = $_POST["width"];
+	$width = $_POST["width"];
-	if(is_null($width))
+	if(is_null($width))
-	{
+	{
-		$width = 250;
+		$width = 250;
-	}
+	}
-	
+	
-	$height  = $_POST["height"];
+	$height  = $_POST["height"];
-	if(is_null($height))
+	if(is_null($height))
-	{
+	{
-		$height = 250;
+		$height = 250;
-	}
+	}
-	
+	
-	// Generate New File Name
+	// Generate New File Name
-        if (!isset($_POST['guid']) || trim($_POST['guid']) == "") {
+        if (!isset($_POST['guid']) || trim($_POST['guid']) == "") {
-            die ('ERROR: Enter GUID');
+            die ('ERROR: Enter GUID');
-        }
+        }
-        else {
+        else {
-            $guid =$_POST['guid'];
+            $guid =$_POST['guid'];
-            //sanitize for illegal characters
+            //sanitize for illegal characters
-            $guid = mysql_escape_string(stripslashes($guid));
+            $guid = mysql_escape_string(stripslashes($guid));
-            $fileName = "images/".$guid.".jpg";
+            $fileName = "images/".$guid.".jpg";
-        }
+        }
-        echo $fileName;
+        echo $fileName;
-        
+        
-	/// Get Pixel Data and generate new Bitmap Data
+	/// Get Pixel Data and generate new Bitmap Data
-        /// Then save to server 
+        /// Then save to server 
-	/// <param name="pixels">pixelData from swf</param>
+	/// <param name="pixels">pixelData from swf</param>
-        /// <param name="fileName">Image Save Path</param>
+        /// <param name="fileName">Image Save Path</param>
-        /// <param name="width">Image Width</param>
+        /// <param name="width">Image Width</param>
-	/// <param name="height">Image Height</param>
+	/// <param name="height">Image Height</param>
-        if ((!is_null($height)) && (!is_null($width)) &&
+        if ((!is_null($height)) && (!is_null($width)) &&
-            (!is_null($guid)) && (!is_null($pixels))) {
+            (!is_null($guid)) && (!is_null($pixels))) {
-            GetPixelAndSave($fileName, $pixels, $width, $height);
+            GetPixelAndSave($fileName, $pixels, $width, $height);
-        } else {
+        } else {
-            die ('ERROR');
+            die ('ERROR');
-        }
+        }
-	
+	
-
+
-function GetPixelAndSave($fileName, $pixels, $width, $height)
+function GetPixelAndSave($fileName, $pixels, $width, $height)
-{
+{
-	$pixelsLen = strlen($pixels);
+	$pixelsLen = strlen($pixels);
-	$x = 0;
+	$x = 0;
-        $y = 0;
+        $y = 0;
-	
+	
-	$im = imagecreatetruecolor($width, $height);
+	$im = imagecreatetruecolor($width, $height);
-
+
-	for ($i = 0; $i < $pixelsLen / 6; $i++) {
+	for ($i = 0; $i < $pixelsLen / 6; $i++) {
-		$curPixelColor = substr($pixels, $i * 6, 6);
+		$curPixelColor = substr($pixels, $i * 6, 6);
-		$rgb_arr = html2rgb ("#".$curPixelColor);
+		$rgb_arr = html2rgb ("#".$curPixelColor);
-		$color = imagecolorallocate( $im, $rgb_arr[0], $rgb_arr[1], $rgb_arr[2] );
+		$color = imagecolorallocate( $im, $rgb_arr[0], $rgb_arr[1], $rgb_arr[2] );
-		imagesetpixel( $im, $x, $y, $color );
+		imagesetpixel( $im, $x, $y, $color );
-		
+		
-		if ($x == $width - 1)
+		if ($x == $width - 1)
-		{
+		{
-			$x = 0;
+			$x = 0;
-			$y++;
+			$y++;
-		}
+		}
-		else
+		else
-		{
+		{
-			$x++;
+			$x++;
-		}
+		}
-	}
+	}
-
+
-	// start buffering
+	// start buffering
-	ob_start();
+	ob_start();
-	// output jpeg (or any other chosen) format & quality
+	// output jpeg (or any other chosen) format & quality
-	imagejpeg($im, NULL, 85);
+	imagejpeg($im, NULL, 85);
-	// capture output to string
+	// capture output to string
-	$contents = ob_get_contents();
+	$contents = ob_get_contents();
-	// end capture
+	// end capture
-	ob_end_clean();	
+	ob_end_clean();	
-	// free up memory
+	// free up memory
-	imagedestroy($im);
+	imagedestroy($im);
-
+
-	if(($fh = fopen($fileName,'w')) === FALSE) {
+	if(($fh = fopen($fileName,'w')) === FALSE) {
-            die('Failed to open file for writing!');
+            die('Failed to open file for writing!');
-        }
+        }
-        fwrite( $fh, $contents );
+        fwrite( $fh, $contents );
-	fclose( $fh );
+	fclose( $fh );
-	
+	
-	//$fh = fopen("images/cap-test.jpg", "w" );
+	//$fh = fopen("images/cap-test.jpg", "w" );
-        //fwrite( $fh, $contents );
+        //fwrite( $fh, $contents );
-	//fclose( $fh );
+	//fclose( $fh );
-	
+	
-}
+}
-
+
-function html2rgb($color)
+function html2rgb($color)
-{
+{
-    if ($color[0] == '#')
+    if ($color[0] == '#')
-        $color = substr($color, 1);
+        $color = substr($color, 1);
-
+
-    if (strlen($color) == 6)
+    if (strlen($color) == 6)
-        list($r, $g, $b) = array($color[0].$color[1],
+        list($r, $g, $b) = array($color[0].$color[1],
-                                 $color[2].$color[3],
+                                 $color[2].$color[3],
-                                 $color[4].$color[5]);
+                                 $color[4].$color[5]);
-    elseif (strlen($color) == 3)
+    elseif (strlen($color) == 3)
-        list($r, $g, $b) = array($color[0].$color[0], $color[1].$color[1], $color[2].$color[2]);
+        list($r, $g, $b) = array($color[0].$color[0], $color[1].$color[1], $color[2].$color[2]);
-    else
+    else
-        return false;
+        return false;
-
+
-    $r = hexdec($r); $g = hexdec($g); $b = hexdec($b);
+    $r = hexdec($r); $g = hexdec($g); $b = hexdec($b);
-
+
-    return array($r, $g, $b);
+    return array($r, $g, $b);
-}
+}
-
+
 ?>

src/wp-content/themes/lqdvi/fields/page.fields.php

@@ -28,10 +28,10 @@ $page_postmetas =
 		/*
 			Begin Page custom fields
 		*/
-		array("section" => "Page Style", "id" => "page_style", "type" => "select", "title" => "Select Page style (Right Sidebar style will include wiget on the right side)", "items" => array("Right Sidebar", "Left Sidebar", "Full Width")),
+		array("section" => "Page Style", "id" => "page_style", "type" => "select", "title" => "Select Page style (Right Sidebar style will include wiget on the right side)", "items" => array("Full Width", "Right Sidebar", "Left Sidebar")),
 		array("section" => "Page Style", "id" => "page_desc", "type" => "text", "title" => "Enter page description."),
 		
-		array("section" => "Caption Style", "id" => "caption_style", "type" => "select", "title" => "Select Caption style", "items" => array("Title Only", "Description Only", "Title & Description")),
+		array("section" => "Caption Style", "id" => "caption_style", "type" => "select", "title" => "Select Caption style", "items" => array("Description Only", "Title Only", "Title & Description")),
 		
 		array("section" => "Select Sidebar", "id" => "page_sidebar", "type" => "select", "title" => "Select this page's sidebar to display", "items" => $theme_sidebar),
 		/*

src/wp-content/themes/lqdvi/pasarela_tpv.php

@@ -1,72 +1,12 @@
 <?php
 
-add_filter('gform_confirmation', 'build_confirmation', 10, 4);
+add_filter('gform_confirmation', 'build_confirmation_1', 10, 4);
 
-function build_confirmation($confirmation, $form, $entry, $ajax) {
+function build_confirmation_1($confirmation, $form, $entry, $ajax) {   
-    if ($form['id'] == 1) { // Socio
+    $confirmation = llamar_pasarela_socio($entry);
-        $confirmation = llamar_pasarela_socio($entry);
-    }
-    
-    if ($form['id'] == 2) { // Amigo
-        $confirmation = llamar_pasarela_amigo($entry);
-    }
     return $confirmation; 
 }
 
-function llamar_pasarela_amigo($entry) {
-    
-    /*$file = fopen("tpv.log", "w");
-    fwrite ($file, "AMIGO\n");
-    foreach($entry as $k => $v) {
-        fwrite($file, "$k ==> $v\n");
-    }
-    fclose($file);    */
-    
-    $datos = array();
-    $datos['titular'] = $entry[1] . ' ' . $entry[2];
-    $datos['url_tpvv'] = 'https://sis-t.sermepa.es:25443/sis/realizarPago';
-    $datos['clave'] = 'qwertyasdf0123456789';
-    $datos['nombre_comercio'] = 'Fundacion Lo que de verdad importa';
-    $datos['url_comercio'] = 'http://www.loquedeverdadimporta.org';
-    $datos['code'] = '322204298';
-    $datos['terminal'] = '1';
-    $datos['num_orden'] = date('ymdHis');
-    $datos['moneda'] = '978'; //euros
-    $datos['transaction_type'] = '0';
-    $datos['producto'] = 'Aportacion LQDVI';
-    $datos['URLOK'] = $datos['url_comercio'].'/web/quieres-ser-amigo/gracias-por-ser-nuestro-amigo/';
-    $datos['URLKO'] = $datos['url_comercio'].'/web/se-ha-producido-un-error/';
-          
-    // Convertir la cantidad
-    $datos['cantidad'] = ereg_replace("[^0-9]", "", $entry[19]);
-    
-    // Calcular firma
-    $datos['mensaje'] = $datos['cantidad'].$datos['num_orden'].$datos['code'].$datos['moneda'].$datos['transaction_type'].$datos['url_comercio'].$datos['clave'];
-    $datos['firma'] = strtoupper(sha1($datos['mensaje']));
-    
-    $confirmation = "<div id='gforms_confirmation_message' style='text-align:center; padding: 10px;'>";
-    $confirmation .= "Conectando con pasarela de pago...";    
-    $confirmation .= "<form method='post' action='".$datos['url_tpvv']."' name='form_to_tpv' id='form_to_tpv'>";
-    $confirmation .= "<input type='hidden' name='Ds_Merchant_Amount' value='".$datos['cantidad']."'/>";
-    $confirmation .= "<input type='hidden' name='Ds_Merchant_Currency' value='".$datos['moneda']."'/>";
-    $confirmation .= "<input type='hidden' name='Ds_Merchant_Order' value='".$datos['num_orden']."'/>";
-    $confirmation .= "<input type='hidden' name='Ds_Merchant_MerchantCode' value='".$datos['code']."'/>";
-    $confirmation .= "<input type='hidden' name='Ds_Merchant_Terminal' value='".$datos['terminal']."'/>";
-    $confirmation .= "<input type='hidden' name='Ds_Merchant_TransactionType' value='".$datos['transaction_type']."'/>";
-    $confirmation .= "<input type='hidden' name='Ds_Merchant_MerchantURL' value='".$datos['url_comercio']."'/>";
-    $confirmation .= "<input type='hidden' name='Ds_Merchant_MerchantSignature' value='".$datos['firma']."'/>";
-    $confirmation .= "<input type='hidden' name='Ds_Merchant_ProductDescription' value='".$datos['producto']."'/>";    
-    $confirmation .= "<input type='hidden' name='Ds_Merchant_UrlOK' value='".$datos['URLOK']."'/>";
-    $confirmation .= "<input type='hidden' name='Ds_Merchant_UrlKO' value='".$datos['URLKO']."'/>";
-    $confirmation .= "</form>";
-    $confirmation .= "</div>";    
-    $confirmation .= "<script type='text/javascript'>";
-    $confirmation .= "document.getElementById('form_to_tpv').submit();";
-    $confirmation .= "</script>";
-    
-    return $confirmation;
-}
-
 function llamar_pasarela_socio($entry) {
     
     /*$file = fopen("tpv.log", "w");
@@ -75,7 +15,10 @@ function llamar_pasarela_socio($entry) {
         fwrite($file, "$k ==> $v\n");
     }
     fwrite ($file, "DATOS\n");*/
-    
+    $nombre_cuotas = array('12' => 'mensual',
+                    '4' => 'trimestral',
+                    '2' => 'semestral',
+                    '1' => 'anual');
     
     $datos = array();
     $datos['titular'] = $entry[1] . ' ' . $entry[2];
@@ -95,27 +38,38 @@ function llamar_pasarela_socio($entry) {
     $datos['frecuencia_ano'] = $cuota[0];
     
     if ($datos['frecuencia_ano'] != 1) { // Es una cuota
-        $datos['frecuencia_dias'] = round(365/$datos['frecuencia_ano']);
+        //$datos['frecuencia_dias'] = round(365/$datos['frecuencia_ano']);
-        $datos['frecuencia_fecha_limite'] = date("Y-m-d", strtotime('+10 Year')); // Mantener las cuotas 10 años a partir de hoy
+        //$datos['frecuencia_fecha_limite'] = date("Y-m-d", strtotime('+10 Year')); // Mantener las cuotas 10 años a partir de hoy
         $datos['cantidad'] = $cuota[1] * 100;
         
-        $datos['suma_total'] = $datos['cantidad'] * ($datos['frecuencia_ano']*10); // Calcular el total de cuotas en 10 años
+        /* Método de pago:
+         * T: significa pago con tarjeta.
+         * D: significa pago por domiciliación bancaria.
+         * R: significa pago por transferencia.
+         */        
+        $datos['metodo_pago'] = 'D'; // <- Domiciliación
         
-        $datos['producto'] = 'Aportacion LQDVI';
+        //$datos['suma_total'] = $datos['cantidad'] * ($datos['frecuencia_ano']*10); // Calcular el total de cuotas en 10 años
-        $datos['transaction_type'] = '5'; // <- Transacción recurrente
+
+        $datos['producto'] = 'Cuota ' . $nombre_cuotas[$datos['frecuencia_ano']] . ' LQDVI';
+        $datos['transaction_type'] = '0'; // <- Autoriación ('5' <- Transacción recurrente)
     } else { // Es una aportación puntual
         $datos['cantidad'] = ereg_replace("[^0-9]", "", $entry[19]);
-        $datos['producto'] = 'Cuota LQDVI';
+        $datos['metodo_pago'] = 'T'; // <- Tarjeta
+        $datos['producto'] = 'Aportacion LQDVI';
         $datos['transaction_type'] = '0'; // <- Autorización
     }
    
     // Calcular firma
-    if ($datos['frecuencia_ano'] != 1) { // Es una cuota
+    /* if ($datos['frecuencia_ano'] != 1) { // Es una cuota
-        $datos['mensaje'] = $datos['cantidad'].$datos['num_orden'].$datos['code'].$datos['moneda'].$datos['suma_total'].$datos['transaction_type'].$datos['url_comercio'].$datos['clave'];
+     *   $datos['mensaje'] = $datos['cantidad'].$datos['num_orden'].$datos['code'].$datos['moneda'].$datos['suma_total'].$datos['transaction_type'].$datos['url_comercio'].$datos['clave'];
-    } else { // Es una aportación puntual
+     *} else { // Es una aportación puntual
-        $datos['mensaje'] = $datos['cantidad'].$datos['num_orden'].$datos['code'].$datos['moneda'].$datos['transaction_type'].$datos['url_comercio'].$datos['clave'];
+     *   $datos['mensaje'] = $datos['cantidad'].$datos['num_orden'].$datos['code'].$datos['moneda'].$datos['transaction_type'].$datos['url_comercio'].$datos['clave'];
-    }
+     *}
-    
+     */
+
+    // Calcular firma    
+    $datos['mensaje'] = $datos['cantidad'].$datos['num_orden'].$datos['code'].$datos['moneda'].$datos['transaction_type'].$datos['url_comercio'].$datos['clave'];    
     $datos['firma'] = strtoupper(sha1($datos['mensaje']));
 
     /*foreach($datos as $k => $v) 
@@ -124,6 +78,7 @@ function llamar_pasarela_socio($entry) {
     $confirmation = "<div id='gforms_confirmation_message' style='text-align:center; padding: 10px;'>";
     $confirmation .= "Conectando con pasarela de pago...";    
     $confirmation .= "<form method='post' action='".$datos['url_tpvv']."' name='form_to_tpv' id='form_to_tpv'>";
+    $confirmation .= "<input type='hidden' name='Ds_Merchant_Titular' value='".$datos['titular']."'/>";
     $confirmation .= "<input type='hidden' name='Ds_Merchant_Amount' value='".$datos['cantidad']."'/>";
     $confirmation .= "<input type='hidden' name='Ds_Merchant_Currency' value='".$datos['moneda']."'/>";
     $confirmation .= "<input type='hidden' name='Ds_Merchant_Order' value='".$datos['num_orden']."'/>";
@@ -136,12 +91,14 @@ function llamar_pasarela_socio($entry) {
     $confirmation .= "<input type='hidden' name='Ds_Merchant_UrlOK' value='".$datos['URLOK']."'/>";
     $confirmation .= "<input type='hidden' name='Ds_Merchant_UrlKO' value='".$datos['URLKO']."'/>";
     
-    if ($datos['frecuencia_ano'] != 1) {
+    /* if ($datos['frecuencia_ano'] != 1) { // Es una cuota
-        $confirmation .= "<input type='hidden' name='Ds_Merchant_DateFrecuency' value='".$datos['frecuencia_dias']."'/>";
+     *  $confirmation .= "<input type='hidden' name='Ds_Merchant_DateFrecuency' value='".$datos['frecuencia_dias']."'/>";
-        $confirmation .= "<input type='hidden' name='Ds_Merchant_ChargeExpiryDate' value='".$datos['frecuencia_fecha_limite']."'/>";        
+     *  $confirmation .= "<input type='hidden' name='Ds_Merchant_ChargeExpiryDate' value='".$datos['frecuencia_fecha_limite']."'/>";        
-        $confirmation .= "<input type='hidden' name='Ds_Merchant_SumTotal' value='".$datos['suma_total']."'/>";        
+     *  $confirmation .= "<input type='hidden' name='Ds_Merchant_SumTotal' value='".$datos['suma_total']."'/>";        
-    }
+     *}
+     */
     
+    $confirmation .= "<input type='hidden' name='Ds_Merchant_PayMethods' value='".$datos['metodo_pago']."'/>";        
     $confirmation .= "</form>";
     $confirmation .= "</div>";
     $confirmation .= "<script type='text/javascript'>";