From ec8fa5f4afa4db7278f64d0ce76250f5056ba7e8 Mon Sep 17 00:00:00 2001
From: Damien GUILLEM <contact@dguillem.fr>
Date: Wed, 22 Apr 2015 11:58:24 +0200
Subject: [PATCH 1/6] * Fix Database class problems : double query execution in
"deleteContactsIn()" and "getUserFromEmail()"
---
model/DataBase.php | 6 ------
1 file changed, 6 deletions(-)
diff --git a/model/DataBase.php b/model/DataBase.php
index c6d274a..9f0385b 100755
--- a/model/DataBase.php
+++ b/model/DataBase.php
@@ -212,9 +212,6 @@
$query .= $generted_in['QUERY'];
$params = $generted_in['PARAMS'];
- $req = $this->bdd->prepare($query);
- $req->execute($params);
-
return $this->runQuery($query, $params, self::ROWCOUNT);
}
@@ -1053,9 +1050,6 @@
'email' => $email
);
- $req = $this->bdd->prepare($query);
- $req->execute($params);
-
return $this->runQuery($query, $params, self::FETCH);
}
From 86ecc7123426e8814ce5724180b815202319d7da Mon Sep 17 00:00:00 2001
From: dam09fr <contact@dguillem.fr>
Date: Mon, 27 Apr 2015 23:09:42 +0200
Subject: [PATCH 2/6] Fix wrong text.
---
model/DataBase.php | 2 +-
templates/addScheduled.php | 2 +-
templates/editScheduleds.php | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/model/DataBase.php b/model/DataBase.php
index c6d274a..e1434ac 100755
--- a/model/DataBase.php
+++ b/model/DataBase.php
@@ -621,7 +621,7 @@
/**
* Insert un sms
- * @param string $date : La date d'envoie du SMS
+ * @param string $date : La date d'envoi du SMS
* @param string $content : Le contenu du SMS
* @return int : le nombre de lignes crées
*/
diff --git a/templates/addScheduled.php b/templates/addScheduled.php
index c7213d2..71c94b1 100755
--- a/templates/addScheduled.php
+++ b/templates/addScheduled.php
@@ -43,7 +43,7 @@
<textarea name="content" class="form-control" required></textarea>
</div>
<div class="form-group">
- <label>Date d'envoie du SMS</label>
+ <label>Date d'envoi du SMS</label>
<input name="date" class="form-control form-datetime" type="text" value="<?php secho($now); ?>" readonly>
</div>
<div class="form-group">
diff --git a/templates/editScheduleds.php b/templates/editScheduleds.php
index 9deeda0..1a3e632 100755
--- a/templates/editScheduleds.php
+++ b/templates/editScheduleds.php
@@ -68,7 +68,7 @@
<textarea name="scheduleds[<?php secho($scheduled['id']); ?>][content]" class="form-control" required><?php secho($scheduled['content'], true); ?></textarea>
</div>
<div class="form-group">
- <label>Date d'envoie du SMS</label>
+ <label>Date d'envoi du SMS</label>
<input name="scheduleds[<?php secho($scheduled['id']); ?>][date]" class="form-control form-datetime" type="text" value="<?php secho($scheduled['at']); ?>" readonly>
</div>
<div class="form-group">
From 9e5466ac7147d4c66bfb0fbf1b8775bc714446ed Mon Sep 17 00:00:00 2001
From: Damien GUILLEM <contact@dguillem.fr>
Date: Mon, 27 Apr 2015 12:13:56 +0200
Subject: [PATCH 3/6] Add icon on profile delete block.
---
templates/profile.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/profile.php b/templates/profile.php
index de527ea..06b1e24 100755
--- a/templates/profile.php
+++ b/templates/profile.php
@@ -88,7 +88,7 @@
</div>
<div class="panel panel-default">
<div class="panel-heading">
- <h4 class="panel-title"><i class="fa fa-delete fa-fw"></i> Supprimer ce compte</h4>
+ <h4 class="panel-title"><i class="fa fa-trash-o fa-fw"></i> Supprimer ce compte</h4>
</div>
<div class="panel-body">
<form action="<?php echo $this->generateUrl('profile', 'delete', array('csrf' => $_SESSION['csrf'])); ?>" method="POST">
From 4891638d6b29677ed45eb8719b8e74de51487601 Mon Sep 17 00:00:00 2001
From: Damien GUILLEM <contact@dguillem.fr>
Date: Mon, 27 Apr 2015 11:29:54 +0200
Subject: [PATCH 4/6] Add space between icon and email in top navbar.
---
templates/nav.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/nav.php b/templates/nav.php
index bb860ab..85fc38d 100755
--- a/templates/nav.php
+++ b/templates/nav.php
@@ -13,7 +13,7 @@
<!-- Top Menu Items -->
<ul class="nav navbar-right top-nav">
<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-user"></i> <?php secho($email); ?> <b class="caret"></b></a>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-fw fa-user"></i> <?php secho($email); ?> <b class="caret"></b></a>
<ul class="dropdown-menu">
<li>
<a href="<?php echo $this->generateUrl('profile'); ?>"><i class="fa fa-fw fa-user"></i> Profil</a>
From 327dae6a08d3b00919875f05b565d9521bd2e3f7 Mon Sep 17 00:00:00 2001
From: dam09fr <contact@dguillem.fr>
Date: Mon, 27 Apr 2015 23:24:13 +0200
Subject: [PATCH 5/6] =?UTF-8?q?Log=20Off=20=3D>=20D=C3=A9connexion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
templates/nav.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/nav.php b/templates/nav.php
index 85fc38d..4c6354f 100755
--- a/templates/nav.php
+++ b/templates/nav.php
@@ -20,7 +20,7 @@
</li>
<li class="divider"></li>
<li>
- <a href="<?php echo $this->generateUrl('connect', 'logout'); ?>"><i class="fa fa-fw fa-power-off"></i> Log Out</a>
+ <a href="<?php echo $this->generateUrl('connect', 'logout'); ?>"><i class="fa fa-fw fa-power-off"></i> Déconnexion</a>
</li>
</ul>
</li>
From 8391dbe5a7e24b77abd7baa3c1f9d279a98b1150 Mon Sep 17 00:00:00 2001
From: dam09fr <contact@dguillem.fr>
Date: Mon, 27 Apr 2015 23:27:32 +0200
Subject: [PATCH 6/6] Improve menu display.
---
css/style.css | 5 +++++
templates/nav.php | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/css/style.css b/css/style.css
index 3474858..dea9794 100755
--- a/css/style.css
+++ b/css/style.css
@@ -76,3 +76,8 @@ footer
{
border: none;
}
+
+.side-nav>li>ul>li.active>a {
+ color: #fff;
+ background-color: #000;
+}
diff --git a/templates/nav.php b/templates/nav.php
index 4c6354f..84e78de 100755
--- a/templates/nav.php
+++ b/templates/nav.php
@@ -39,7 +39,7 @@
</li>
<li>
<a href="javascript:;" data-toggle="collapse" data-target="#repertoire"><i class="fa fa-fw fa-book"></i> Répertoire <i class="fa fa-fw fa-caret-down"></i></a>
- <ul id="repertoire" class="collapse">
+ <ul id="repertoire" class="collapse <?php echo in_array($page, array('contacts', 'groups')) ? 'in' : ''; ?>">
<li <?php echo $page == 'contacts' ? 'class="active"' : ''; ?>>
<a href="<?php echo $this->generateUrl('contacts'); ?>"><i class="fa fa-fw fa-user"></i> Contacts</a>
</li>
@@ -50,7 +50,7 @@
</li>
<li>
<a href="javascript:;" data-toggle="collapse" data-target="#logs"><i class="fa fa-fw fa-file-text"></i> Logs <i class="fa fa-fw fa-caret-down"></i></a>
- <ul id="logs" class="collapse">
+ <ul id="logs" class="collapse <?php echo in_array($page, array('sendeds', 'receiveds', 'events')) ? 'in' : ''; ?>">
<li <?php echo $page == 'sendeds' ? 'class="active"' : ''; ?>>
<a href="<?php echo $this->generateUrl('sendeds'); ?>"><i class="fa fa-fw fa-send"></i> SMS envoyés</a>
</li>