From 047ebb2185e1c9953bcf11e440c23ea71439c5a6 Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Thu, 27 Feb 2014 18:22:43 -0700
Subject: [PATCH] Fix Error Class

---
 public/include/pages/account/confirm.inc.php | 2 +-
 public/include/pages/admin/templates.inc.php | 2 +-
 public/include/version.inc.php               | 4 ++--
 public/templates/compile/README.md           | 3 +--
 4 files changed, 5 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 public/include/pages/account/confirm.inc.php
 mode change 100644 => 100755 public/include/pages/admin/templates.inc.php
 mode change 100644 => 100755 public/include/version.inc.php

diff --git a/public/include/pages/account/confirm.inc.php b/public/include/pages/account/confirm.inc.php
old mode 100644
new mode 100755
index f3059b7d..61d741e7
--- a/public/include/pages/account/confirm.inc.php
+++ b/public/include/pages/account/confirm.inc.php
@@ -3,7 +3,7 @@ $defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1;
 
 // Confirm an account by token
 if (!isset($_GET['token']) || empty($_GET['token'])) {
-  $_SESSION['POPUP'][] = array('CONTENT' => 'Missing token', 'TYPE' => 'errormsg');
+  $_SESSION['POPUP'][] = array('CONTENT' => 'Missing token', 'TYPE' => 'danger');
 } else if (!$aToken = $oToken->getToken($_GET['token'], 'confirm_email')) {
   $_SESSION['POPUP'][] = array('CONTENT' => 'Unable to activate your account. Invalid token.', 'TYPE' => 'alert alert-danger');
 } else {
diff --git a/public/include/pages/admin/templates.inc.php b/public/include/pages/admin/templates.inc.php
old mode 100644
new mode 100755
index d8b146c3..2272b9c1
--- a/public/include/pages/admin/templates.inc.php
+++ b/public/include/pages/admin/templates.inc.php
@@ -36,7 +36,7 @@ if (@$_REQUEST['do'] == 'save') {
 $oDatabaseTemplate = $template->getEntry($sTemplate);
 
 if ( $oDatabaseTemplate === false ) {
-  $_SESSION['POPUP'][] = array('CONTENT' => 'Can\'t fetch template from Database. Have you created `templates` table? Run 005_create_templates_table.sql from sql folder', 'TYPE' => 'errormsg');
+  $_SESSION['POPUP'][] = array('CONTENT' => 'Can\'t fetch template from Database. Have you created `templates` table? Run 005_create_templates_table.sql from sql folder', 'TYPE' => 'danger');
 }
 
 $smarty->assign("TEMPLATES", $aTemplates);
diff --git a/public/include/version.inc.php b/public/include/version.inc.php
old mode 100644
new mode 100755
index e39b701f..f6176806
--- a/public/include/version.inc.php
+++ b/public/include/version.inc.php
@@ -9,9 +9,9 @@ define('CONFIG_VERSION', '0.0.7');
 $db_version = $setting->getValue('DB_VERSION');
 if ($db_version != DB_VERSION) {
   // Notify admins via error popup
-  $_SESSION['POPUP'][] = array('CONTENT' => 'Database version mismatch (Installed: ' . $db_version . ', Current: ' . DB_VERSION . '). Database update required, please import any new SQL files. Cronjobs have been halted.', 'TYPE' => 'errormsg');
+  $_SESSION['POPUP'][] = array('CONTENT' => 'Database version mismatch (Installed: ' . $db_version . ', Current: ' . DB_VERSION . '). Database update required, please import any new SQL files. Cronjobs have been halted.', 'TYPE' => 'alert alert-danger');
 }
 if (@$config['version'] !== CONFIG_VERSION) {
   // Notify admins via error popup
-  $_SESSION['POPUP'][] = array('CONTENT' => 'Configuration file version mismatch (Installed: ' . @$config['version'] . ', Current: ' . CONFIG_VERSION . '). Configuration update required, please check dist config for changes. Cronjobs have been halted.', 'TYPE' => 'errormsg');
+  $_SESSION['POPUP'][] = array('CONTENT' => 'Configuration file version mismatch (Installed: ' . @$config['version'] . ', Current: ' . CONFIG_VERSION . '). Configuration update required, please check dist config for changes. Cronjobs have been halted.', 'TYPE' => 'alert alert-danger');
 }
diff --git a/public/templates/compile/README.md b/public/templates/compile/README.md
index 5ea7e839..9a2278f5 100644
--- a/public/templates/compile/README.md
+++ b/public/templates/compile/README.md
@@ -1,2 +1 @@
-Please ensure the webserver has access to this folder to write the
-compiled templates.
+Please ensure the webserver has access to this folder to write the compiled templates.