Changeset 5633 for extensions/NBC_UserAdvManager/trunk/ConfirmMail.php

Timestamp:

Apr 4, 2010, 4:18:52 PM (14 years ago)

Author:

Eric

Message:

[NBC_UserAdvManager]

• Bug 1571 fixed : Missing translation tag
• Bug 1572 fixed : Fix unable to read resource: "ConfirmMail.tpl"
• Bug 1574 fixed : Beautifying ConfirmMail page. Moved to a "template" folder with css file and icons.

• Bug 1576 partially fixed : Compatibility with other database systems than MySql like PostgreSql or Sqlite. Using Piwigo's pwg_db_### integrated functions. mysql_list_fields() and mysql_num_fields() are not implemented in Piwigo's database functions. This point is still under discuss on FR forum.

File:

• extensions/NBC_UserAdvManager/trunk/ConfirmMail.php (modified) (4 diffs)

extensions/NBC_UserAdvManager/trunk/ConfirmMail.php

@@ -2 +2 @@
 //----------------------------------------------------------- include
 define('PHPWG_ROOT_PATH','./../../');
+
 include_once( PHPWG_ROOT_PATH.'include/common.inc.php' );
+
 include_once (UAM_PATH.'include/constants.php');
 include_once (UAM_PATH.'include/functions.inc.php');
@@ -11 +13 @@
 //check_status(ACCESS_NONE);
 load_language('plugin.lang', UAM_PATH);
-
-if (isset($_GET['key']))
-{
-
-  global $conf;
-  
-  $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']);
-
-  if (VerifyConfirmMail($_GET['key']))
-  {
-    $template->assign(
-                        array(
-                                'CONFIRM_MAIL_MESSAGE' => $conf_UAM_ConfirmMail[5],
-                        )
-                );
-  }  
-  else
-  {  
-    $template->assign(
-                        array(
-                                'CONFIRM_MAIL_MESSAGE' => $conf_UAM_ConfirmMail[6],
-                        )
-                );
-  }
-}
 
 /**
@@ -55 +32 @@
   '/theme/'.$user['theme'].'/themeconf.inc.php');
 
-$template->set_filenames(
-  array(
-        'confirm_mail'=>UAM_PATH.'ConfirmMail.tpl',
-        )
-);
+if (isset($_GET['key']))
+{
+
+  global $conf;
+  
+  $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']);
+
+  if (VerifyConfirmMail($_GET['key']))
+  {
+    $status = true;
+    
+    $template->assign(
+                        array(
+        'STATUS'               => $status,
+                                'CONFIRM_MAIL_MESSAGE' => $conf_UAM_ConfirmMail[5],
+                        )
+                );
+  }  
+  else
+  {
+    $status = false;
+    $template->assign(
+                        array(
+        'STATUS'               => $status,
+                                'CONFIRM_MAIL_MESSAGE' => $conf_UAM_ConfirmMail[6],
+                        )
+                );
+  }
+}
+
 if (isset($lang['Theme: '.$user['theme']]))
 {
@@ -78 +80 @@
 }
 
+$template->set_filenames(
+  array(
+        'confirm_mail'=>dirname(__FILE__).'/template/ConfirmMail.tpl',
+        )
+);
 
 $template->pparse('confirm_mail');