push serveur prod

classes/CMSCategory.php

@@ -360,6 +360,18 @@ class CMSCategoryCore extends ObjectModel
 		ORDER BY cl.`name`');
     }
 
+    public static function getNameStatic($id_category)
+    {
+        $id_lang = $context = Context::getContext()->language->id;
+
+        return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
+        SELECT cl.`title`
+        FROM `'._DB_PREFIX_.'cmsps_categories` c
+        LEFT JOIN `'._DB_PREFIX_.'cmsps_categories_lang` cl ON (c.`id_category` = cl.`id_category`)
+        WHERE cl.`id_lang` = '.(int)$id_lang.'
+        AND c.id_category = '. $id_category);
+    }
+
     /**
      * Return current CMSCategory childs
      *

config.user.php

@@ -1,168 +0,0 @@
-<?php
-/*! pimpmylog - 1.7.9 - 10b502eaf17be208850be61febb044c2fdb86207*/
-/*
- * pimpmylog
- * http://pimpmylog.com
- *
- * Copyright (c) 2015 Potsky, contributors
- * Licensed under the GPLv3 license.
- */
-?>
-<?php if(realpath(__FILE__)===realpath($_SERVER["SCRIPT_FILENAME"])){header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found');die();}?>
-{
-	"globals": {
-		"_remove_me_to_set_AUTH_LOG_FILE_COUNT"         : 100,
-		"_remove_me_to_set_AUTO_UPGRADE"                : false,
-		"_remove_me_to_set_CHECK_UPGRADE"               : true,
-		"_remove_me_to_set_EXPORT"                      : true,
-		"_remove_me_to_set_FILE_SELECTOR"               : "bs",
-		"_remove_me_to_set_FOOTER"                      : "&copy; <a href=\"http:\/\/www.potsky.com\" target=\"doc\">Potsky<\/a> 2007-' . YEAR . ' - <a href=\"http:\/\/pimpmylog.com\" target=\"doc\">Pimp my Log<\/a>",
-		"_remove_me_to_set_FORGOTTEN_YOUR_PASSWORD_URL" : "http:\/\/support.pimpmylog.com\/kb\/misc\/forgotten-your-password",
-		"_remove_me_to_set_GEOIP_URL"                   : "http:\/\/www.geoiptool.com\/en\/?IP=%p",
-		"_remove_me_to_set_GOOGLE_ANALYTICS"            : "UA-XXXXX-X",
-		"_remove_me_to_set_HELP_URL"                    : "http:\/\/pimpmylog.com",
-		"_remove_me_to_set_LOCALE"                      : "gb_GB",
-		"_remove_me_to_set_LOGS_MAX"                    : 50,
-		"_remove_me_to_set_LOGS_REFRESH"                : 0,
-		"_remove_me_to_set_MAX_SEARCH_LOG_TIME"         : 5,
-		"_remove_me_to_set_NAV_TITLE"                   : "",
-		"_remove_me_to_set_NOTIFICATION"                : true,
-		"_remove_me_to_set_NOTIFICATION_TITLE"          : "New logs [%f]",
-		"_remove_me_to_set_PIMPMYLOG_ISSUE_LINK"        : "https:\/\/github.com\/potsky\/PimpMyLog\/issues\/",
-		"_remove_me_to_set_PIMPMYLOG_VERSION_URL"       : "http:\/\/demo.pimpmylog.com\/version.js",
-		"_remove_me_to_set_PULL_TO_REFRESH"             : true,
-		"_remove_me_to_set_SORT_LOG_FILES"              : "default",
-		"_remove_me_to_set_TAG_DISPLAY_LOG_FILES_COUNT" : true,
-		"_remove_me_to_set_TAG_NOT_TAGGED_FILES_ON_TOP" : true,
-		"_remove_me_to_set_TAG_SORT_TAG"                : "default | display-asc | display-insensitive | display-desc | display-insensitive-desc",
-		"_remove_me_to_set_TITLE"                       : "Pimp my Log",
-		"_remove_me_to_set_TITLE_FILE"                  : "Pimp my Log [%f]",
-		"_remove_me_to_set_UPGRADE_MANUALLY_URL"        : "http:\/\/pimpmylog.com\/getting-started\/#update",
-		"_remove_me_to_set_USER_CONFIGURATION_DIR"      : "config.user.d",
-		"_remove_me_to_set_USER_TIME_ZONE"              : "Europe\/Paris"
-	},
-
-	"badges": {
-		"severity": {
-			"debug"       : "success",
-			"info"        : "success",
-			"notice"      : "default",
-			"Notice"      : "info",
-			"warn"        : "warning",
-			"error"       : "danger",
-			"crit"        : "danger",
-			"alert"       : "danger",
-			"emerg"       : "danger",
-			"Notice"      : "info",
-			"fatal error" : "danger",
-			"parse error" : "danger",
-			"Warning"     : "warning"
-		},
-		"http": {
-			"1" : "info",
-			"2" : "success",
-			"3" : "default",
-			"4" : "warning",
-			"5" : "danger"
-		}
-	},
-
-	"files": {
-		"apache1": {
-			"display" : "Apache Error #1",
-			"path"    : "C:\/wamp\/logs\/apache_error.log",
-			"refresh" : 5,
-			"max"     : 10,
-			"notify"  : true,
-			"format"  : {
-				"type"         : "HTTPD 2.2",
-				"regex"        : "|^\\[(.*)\\] \\[(.*)\\] (\\[client (.*)\\] )*((?!\\[client ).*)(, referer: (.*))*$|U",
-				"export_title" : "Log",
-				"match"        : {
-					"Date"     : 1,
-					"IP"       : 4,
-					"Log"      : 5,
-					"Severity" : 2,
-					"Referer"  : 7
-				},
-				"types": {
-					"Date"     : "date:H:i:s",
-					"IP"       : "ip:http",
-					"Log"      : "preformatted",
-					"Severity" : "badge:severity",
-					"Referer"  : "link"
-				},
-				"exclude": {
-					"Log": ["\/PHP Stack trace:\/", "\/PHP *[0-9]*\\. \/"]
-				}
-			}
-		},
-		"apache2": {
-			"display" : "Apache Access #2",
-			"path"    : "C:\/wamp\/logs\/access.log",
-			"refresh" : 0,
-			"max"     : 10,
-			"notify"  : false,
-			"format"  : {
-				"type"         : "NCSA",
-				"regex"        : "|^((\\S*) )*(\\S*) (\\S*) (\\S*) \\[(.*)\\] \"(\\S*) (.*) (\\S*)\" ([0-9]*) (.*)( \"(.*)\" \"(.*)\"( [0-9]*/([0-9]*))*)*$|U",
-				"export_title" : "URL",
-				"match"        : {
-					"Date"    : 6,
-					"IP"      : 3,
-					"CMD"     : 7,
-					"URL"     : 8,
-					"Code"    : 10,
-					"Size"    : 11,
-					"Referer" : 13,
-					"UA"      : 14,
-					"User"    : 5,
-					"\u03bcs" : 16
-				},
-				"types": {
-					"Date"    : "date:H:i:s",
-					"IP"      : "ip:geo",
-					"URL"     : "txt",
-					"Code"    : "badge:http",
-					"Size"    : "numeral:0b",
-					"Referer" : "link",
-					"UA"      : "ua:{os.name} {os.version} | {browser.name} {browser.version}\/100",
-					"\u03bcs" : "numeral:0,0"
-				},
-				"exclude": {
-					"URL": ["\/favicon.ico\/", "\/\\.pml\\.php.*$\/"],
-					"CMD": ["\/OPTIONS\/"]
-				}
-			}
-		},
-	"php3": {
-		"display" : "PHP Error #3",
-		"path"    : "c:\/wamp\/logs\\php_error.log",
-		"refresh" : 5,
-		"max"     : 10,
-		"notify"  : true,
-		"format"    : {
-			"type"         : "PHP",
-			"regex"        : "@^\\[(.*)-(.*)-(.*) (.*):(.*):(.*)( (.*))*\\] ((PHP (.*):  (.*) in (.*) on line (.*))|(.*))$@U",
-			"export_title" : "Error",
-			"match"        : {
-				"Date"     : [ 2 , " " , 1 , " " , 4 , ":" , 5 , ":" , 6 , " " , 3 ],
-				"Severity" : 11,
-				"Error"    : [ 12 , 15 ],
-				"File"     : 13,
-				"Line"     : 14
-			},
-			"types"    : {
-				"Date"     : "date:H:i:s",
-				"Severity" : "badge:severity",
-				"File"     : "pre:\/-69",
-				"Line"     : "numeral",
-				"Error"    : "pre"
-			},
-			"exclude": {
-				"Log": ["\\/PHP Stack trace:\\/", "\\/PHP *[0-9]*\\. \\/"]
-			}
-		}
-	}
-	}
-}

config/defines.inc.php

@@ -26,7 +26,17 @@
 
 /* Debug only */
 if (!defined('_PS_MODE_DEV_'))
+	define('_PS_MODE_DEV_', false);
+
+
+$authorized_ip = array(
+	'90.63.178.63',
+	'88.120.248.124'
+);
+if(in_array($_SERVER['REMOTE_ADDR'], $authorized_ip)) {
 	define('_PS_MODE_DEV_', true);
+}
+
 /* Compatibility warning */
 define('_PS_DISPLAY_COMPATIBILITY_WARNING_', true);
 if (_PS_MODE_DEV_ === true)

controllers/admin/AdminImportController.php

@@ -2515,9 +2515,9 @@ class AdminImportControllerCore extends AdminController
 
             AdminImportController::arrayWalk($info, array('AdminImportController', 'fillInfo'), $customer);
 
-            if ($customer->passwd) {
+            // if ($customer->passwd) {
-                $customer->passwd = Tools::encrypt($customer->passwd);
+            //     $customer->passwd = Tools::encrypt($customer->passwd);
-            }
+            // }
 
             $id_shop_list = explode($this->multiple_value_separator, $customer->id_shop);
             $customers_shop = array();

controllers/front/PostCmsController.php

@@ -70,6 +70,8 @@ class PostCmsControllerCore extends FrontController
 				'---ASAVOIR---',
 				'---ANOTER---',
 				'---FIN---',
+				'---VIDEO---',
+				'---AMAZON---',
 			),
 			array('h2', '</h2>',
 				'<div class="info warning"><h5>Attention</h5>',
@@ -84,6 +86,8 @@ class PostCmsControllerCore extends FrontController
 				'<div class="info asavoir"><h5>A savoir</h5>',
 				'<div class="info anoter"><h5>A noter</h5>',
 				'</div>',
+				'',
+				'',
 			),
 			$article->content);
 		return $article;

google05aa0268138e5c56.html

@@ -0,0 +1 @@
+google-site-verification: google05aa0268138e5c56.html

google101961860538784e.html

@@ -0,0 +1 @@
+google-site-verification: google101961860538784e.html

mails/fr/commentaire.html

@@ -0,0 +1,96 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
+		<title>Message de {shop_name}</title>
+		
+		
+		<style>	@media only screen and (max-width: 300px){ 
+				body {
+					width:218px !important;
+					margin:auto !important;
+				}
+				.table {width:195px !important;margin:auto !important;}
+				.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}		
+				span.title{font-size:20px !important;line-height: 23px !important}
+				span.subtitle{font-size: 14px !important;line-height: 18px !important;padding-top:10px !important;display:block !important;}		
+				td.box p{font-size: 12px !important;font-weight: bold !important;}
+				.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr { 
+					display: block !important; 
+				}
+				.table-recap{width: 200px!important;}
+				.table-recap tr td, .conf_body td{text-align:center !important;}	
+				.address{display: block !important;margin-bottom: 10px !important;}
+				.space_address{display: none !important;}	
+			}
+	@media only screen and (min-width: 301px) and (max-width: 500px) { 
+				body {width:308px!important;margin:auto!important;}
+				.table {width:285px!important;margin:auto!important;}	
+				.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}	
+				.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr { 
+					display: block !important; 
+				}
+				.table-recap{width: 295px !important;}
+				.table-recap tr td, .conf_body td{text-align:center !important;}
+				
+			}
+	@media only screen and (min-width: 501px) and (max-width: 768px) {
+				body {width:478px!important;margin:auto!important;}
+				.table {width:450px!important;margin:auto!important;}	
+				.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}			
+			}
+	@media only screen and (max-device-width: 480px) { 
+				body {width:308px!important;margin:auto!important;}
+				.table {width:285px;margin:auto!important;}	
+				.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
+				
+				.table-recap{width: 295px!important;}
+				.table-recap tr td, .conf_body td{text-align:center!important;}	
+				.address{display: block !important;margin-bottom: 10px !important;}
+				.space_address{display: none !important;}	
+			}
+</style>
+
+	</head>
+	<body style="-webkit-text-size-adjust:none;background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
+		<table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
+			<tr>
+				<td class="space" style="width:20px;padding:7px 0">&nbsp;</td>
+				<td align="center" style="padding:7px 0">
+					<table class="table" bgcolor="#ffffff" style="width:100%">
+						<tr>
+							<td align="center" class="logo" style="border-bottom:4px solid #333333;padding:7px 0">
+								<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
+									<img src="{shop_logo}" alt="{shop_name}" />
+								</a>
+							</td>
+						</tr>
+
+<tr>
+	<td class="space_footer" style="padding:0!important">&nbsp;</td>
+</tr>
+<tr>
+	<td class="box" style="border:1px solid #D6D4D4;background-color:#f8f8f8;padding:7px 0">
+		<table class="table" style="width:100%">
+			<tr>
+				<td width="10" style="padding:7px 0">&nbsp;</td>
+				<td style="padding:7px 0">
+					<font size="2" face="Open-sans, sans-serif" color="#555454">
+						<p style="border-bottom:1px solid #D6D4D4;margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;padding-bottom:10px">Nouveau commentaire de {name} ({email}) :</p>
+						<p>{title}</p>
+						<p>{comments}</p>
+					</font>
+				</td>
+				<td width="10" style="padding:7px 0">&nbsp;</td>
+			</tr>
+		</table>
+	</td>
+</tr>
+					</table>
+				</td>
+				<td class="space" style="width:20px;padding:7px 0">&nbsp;</td>
+			</tr>
+		</table>
+	</body>
+</html>

mails/fr/commentaire.txt

@@ -0,0 +1,9 @@
+{shop_name}
+
+Nouveau commentaire de {name} ({email}) :
+
+{title}
+
+{comments}
+ 
+	 

migration.php

@@ -1,30 +0,0 @@
-<?php
-# WINDOWS : vendor/bin/phinx.bat migrate -e local --configuration migration.php  
-# LINUX A TEST php vendor/bin/phinx migrate -e local --configuration migration.php  
-require 'config/settings.inc.php';
-
-return array(
-	"paths" => array(
-        "migrations" => "migrations"
-    ),
-    "environments" => array(
-        "default_migration_table" => "phinxlog",
-        "default_database" => "toutpratique",
-        "local" => array(
-            "adapter" => "mysql",
-            "host" => _DB_SERVER_,
-            "name" => _DB_NAME_,
-            "user" => _DB_USER_,
-            "pass" => _DB_PASSWD_,
-            "port" => 3306
-        ),
-        "dev" => array(
-            "adapter" => "mysql",
-            "host" => _DB_SERVER_,
-            "name" => 'toutpratique_dev',
-            "user" => _DB_USER_,
-            "pass" => _DB_PASSWD_,
-            "port" => 3306
-        )
-    )
-);

modules/atos/pathfile

@@ -1,5 +1,5 @@
 DEBUG!NO!
 D_LOGO!/modules/atos/img/logos/!
-F_CERTIFICATE!/var/www/toutpratiquetest/modules/atos/certif!
+F_CERTIFICATE!/home/www/toutpratique.com/www/modules/atos/certif!
-F_PARAM!/var/www/toutpratiquetest/modules/atos/parmcom!
+F_PARAM!/home/www/toutpratique.com/www/modules/atos/parmcom!
-F_DEFAULT!/var/www/toutpratiquetest/modules/atos/parmcom.elysnet!
+F_DEFAULT!/home/www/toutpratique.com/www/modules/atos/parmcom.elysnet!