Skip to content

Commit

Permalink
Fix FirePHP inclusion.
Browse files Browse the repository at this point in the history
Fix MemCache is active

Initial changes for Nov 17 request
  • Loading branch information
vlad88sv committed Nov 21, 2017
1 parent 517b297 commit d5def5a
Show file tree
Hide file tree
Showing 46 changed files with 6,013 additions and 296 deletions.
582 changes: 315 additions & 267 deletions .idea/workspace.xml

Large diffs are not rendered by default.

19 changes: 12 additions & 7 deletions CSS/estilo.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
@font-face {
font-family: 'KGTenThousandReasons'; /*a name to be used later*/
src: url('../estatico/KGTenThousandReasons.ttf'); /*URL to font*/
}

@font-face {
font-family: 'KGTenThousandReasonsAlt'; /*a name to be used later*/
src: url('../estatico/KGTenThousandReasonsAlt.ttf'); /*URL to font*/
}

html,body
{
border:0;
Expand All @@ -9,17 +19,12 @@ html,body

body
{
background:url(../IMG/stock/fondo-valentine.png) top repeat;
font-family:Arial, sans-serif;
background: white;
font-family:KGTenThousandReasonsAlt, Arial, sans-serif;
font-size:10px;
text-align:center;
}

/*prueba*/
body{background:url('../IMG/stock/fondo-valentine.png') #FFFFFF top repeat !important;}
h1{background-color:#FFF;color:#af3a30;}
h2 {background-color:#be2618;color:#FFF;}

#btn_comprar_ahora {background-color:#af3a30;}

ul.dropdown, ul.dropdown li ul {background-color:#be2618 !important;}
Expand Down
4 changes: 2 additions & 2 deletions cePOSa/PHP/cabeza.condolencias.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php if (!isset($_GET['sin_cabeza'])): ?>
<div style="text-align:center;z-index:1000;position:absolute;height: 100px;width: 100%;">
<div style="width:1000px;margin:auto;position: relative;">
<a href="http://flor360.com" style="position:absolute;left:20px;top:29px;"><img src="/IMG/portada/pestana_flor360.png" /></a>
<a href="http://flor360.com" style="position:absolute;left:20px;top:29px;"><img src="<?php echo PROY_URL_ESTATICA; ?>/IMG/portada/pestana_flor360.png" /></a>
<a href="/">
<img style="position:absolute;left:195px;top:29px;" src="/IMG/portada/pestana_grande.png" />
<img style="position:absolute;left:195px;top:29px;" src="<?php echo PROY_URL_ESTATICA; ?>/IMG/portada/pestana_grande.png" />
<img style="position:absolute;left:203px;top:43px;" src="/IMG/portada/logo_condolencias.png" alt="Condolencias Logo"/>
</a>

Expand Down
18 changes: 1 addition & 17 deletions cePOSa/PHP/cabeza.php
Original file line number Diff line number Diff line change
@@ -1,17 +1 @@
<?php if (!isset($_GET['sin_cabeza'])): ?>
<div style="text-align:center;z-index:9999;position:absolute;height: 100px;width: 100%;">
<div style="width:1000px;margin:auto;position: relative;">
<a href="/">
<img style="position:absolute;left:20px;top:29px;" src="/IMG/portada/pestana_grande.png" />
<img style="position:absolute;left:30px;top:40px;" src="IMG/portada/logo.png" alt="Flor360.com Logo"/>
</a>
<a href="http://condolencias.com.sv" style="position:absolute;left:200px;top:29px;"><img src="/IMG/portada/pestana_condolencias.png" /></a>
</div>
</div>
<div style="background-color:#f1f1f1;border-bottom:1px #979da9 solid;text-align:center;width:100%;height:62px;">
<div style="width:1000px;height:100%;margin:auto;position: relative;">
<a style="position:absolute;right:0px;" href="<?php echo PROY_URL ?>contactanos"><img src="<?php echo PROY_URL_ESTATICA; ?>IMG/portada/info_derecha.png" alt="Telefono de contacto de Flor360.com" /><br /></a>
<div style="position:absolute;right:180px;bottom:0px;"><span style="color:#525451;font-weight:bold; font-style: italic;">Like Us Today!</span>&nbsp;&nbsp;&nbsp;<div class="fb-like" data-href="<?php echo PROY_URL_LIKE; ?>" data-send="false" data-layout="button_count" data-width="90" data-show-faces="false"></div></div>
</div>
</div>
<?php endif; ?>
<?php //vacío segun actualización de Nov 2017
7 changes: 5 additions & 2 deletions cePOSa/PHP/memcache.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
<?php
$memcache = new Memcached();
$memcache -> addServer('127.0.0.1', 11211);
$memcache = null;

if (MEMCACHE_ACTIVO) {
$memcache = new Memcached();
$memcache -> addServer('127.0.0.1', 11211);
}
// Usar solamente en scripts que no procesen post
function memcache_iniciar($contexto,$discriminador='')
{
Expand Down
2 changes: 2 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{
}
54 changes: 54 additions & 0 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added estatico/KGTenThousandReasons.ttf
Binary file not shown.
Binary file added estatico/KGTenThousandReasonsAlt.ttf
Binary file not shown.
2 changes: 1 addition & 1 deletion index.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
$__BENCH__['start'] = microtime(true);

require_once('/usr/share/php/FirePHPCore/FirePHP.class.php');
require_once('vendor/autoload.php');
$firephp = FirePHP::getInstance(true);
$firephp->registerErrorHandler($throwErrorExceptions=false);
$firephp->registerExceptionHandler();
Expand Down
7 changes: 7 additions & 0 deletions vendor/autoload.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?php

// autoload.php @generated by Composer

require_once __DIR__ . '/composer/autoload_real.php';

return ComposerAutoloaderInite976956c0c5c4fcce3974811940ff96f::getLoader();
Loading

0 comments on commit d5def5a

Please sign in to comment.