Changeset 18239 for extensions

Timestamp:

Sep 25, 2012, 7:28:33 PM (12 years ago)

Author:

Eric

Message:

using !empty($conf_UAM..) instead of $conf_UAM.. <> - Thx to flop25 for his advice ;-)

Location:

extensions/UserAdvManager/trunk

Files:

• admin/UAM_admin.php (modified) (1 diff)
• include/functions.inc.php (modified) (20 diffs)

extensions/UserAdvManager/trunk/admin/UAM_admin.php

@@ -804 +804 @@
                 $deltadays = floor($deltasecs / 86400);// Convert result from seconds to days
   
-                                                if (isset($conf_UAM[15]) and $conf_UAM[15]=='true' and $conf_UAM[16] <> '')
+                                                if (isset($conf_UAM[15]) and $conf_UAM[15]=='true' and !empty($conf_UAM[16]))
                 {
                                 if ($deltadays <= ($conf_UAM[16]/2))

extensions/UserAdvManager/trunk/include/functions.inc.php

@@ -1007 +1007 @@
       }
   
-      if (isset($conf_UAM_ConfirmMail[5]) and $conf_UAM_ConfirmMail[5] <> '')
+      if (isset($conf_UAM_ConfirmMail[5]) and !empty($conf_UAM_ConfirmMail[5]))
       {
         // Management of Extension flags ([username], [mygallery], [myurl])
@@ -1033 +1033 @@
     else
     {
-      if (isset($conf_UAM_ConfirmMail[6]) and $conf_UAM_ConfirmMail[6] <> '')
+      if (isset($conf_UAM_ConfirmMail[6]) and !empty($conf_UAM_ConfirmMail[6]))
       {
         // Management of Extension flags ([username], [mygallery], [myurl])
@@ -1139 +1139 @@
   {
     case 1: // Confirmation email on user registration - Without information email (already managed by Piwigo)
-      if (isset($conf_UAM[41]) and $conf_UAM[41] <> '')
+      if (isset($conf_UAM[41]) and !empty($conf_UAM[41]))
       {
         // Management of Extension flags ([username], [mygallery])
@@ -1158 +1158 @@
       
     case 2: // Confirmation email on user profile update - With information email if modification done in user profile
-      if (isset($conf_UAM[41]) and $conf_UAM[41] <> '')
+      if (isset($conf_UAM[41]) and !empty($conf_UAM[41]))
       {
         // Management of Extension flags ([username], [mygallery])
@@ -1174 +1174 @@
       }
 
-      $password = $password <> '' ? $password : l10n('UAM_empty_pwd');
-
-      if (isset($conf_UAM[8]) and $conf_UAM[8] <> '')
+      $password = !empty($password) ? $password : l10n('UAM_empty_pwd');
+
+      if (isset($conf_UAM[8]) and !empty($conf_UAM[8]))
       {
         // Management of Extension flags ([username], [mygallery], [myurl])
@@ -1220 +1220 @@
         
     case 3: // Only information email send to user if checked
-      if (isset($conf_UAM[43]) and $conf_UAM[43] <> '')
+      if (isset($conf_UAM[43]) and !empty($conf_UAM[43]))
       {
         // Management of Extension flags ([username], [mygallery])
@@ -1236 +1236 @@
       }
 
-      $password = $password <> '' ? $password : l10n('UAM_no_update_pwd');
-
-      if (isset($conf_UAM[8]) and $conf_UAM[8] <> '')
+      $password = !empty($password) ? $password : l10n('UAM_no_update_pwd');
+
+      if (isset($conf_UAM[8]) and !empty($conf_UAM[8]))
       {
         // Management of Extension flags ([username], [mygallery], [myurl])
@@ -1290 +1290 @@
     );
 
-    if (isset($conf_UAM[9]) and $conf_UAM[9] <> '') // Add personal text in confirmation email ?
+    if (isset($conf_UAM[9]) and !empty($conf_UAM[9])) // Add personal text in confirmation email ?
     {
       // Management of Extension flags ([username], [mygallery], [myurl], [Kdays])
@@ -1448 +1448 @@
   {
     case 1: //Generating email content for remind with a new key
-      if (isset($conf_UAM[42]) and $conf_UAM[42] <> '')
+      if (isset($conf_UAM[42]) and !empty($conf_UAM[42]))
       {
         // Management of Extension flags ([username], [mygallery])
@@ -1464 +1464 @@
       }
       
-      if (isset($conf_UAM_ConfirmMail[2]) and $conf_UAM_ConfirmMail[2] <> '' and isset($conf_UAM_ConfirmMail[3]) and $conf_UAM_ConfirmMail[3] == 'true' and $confirm)
+      if (isset($conf_UAM_ConfirmMail[2]) and !empty($conf_UAM_ConfirmMail[2]) and isset($conf_UAM_ConfirmMail[3]) and $conf_UAM_ConfirmMail[3] == 'true' and $confirm)
       {
                 // Management of Extension flags ([username], [mygallery], [myurl], [Kdays])
@@ -1506 +1506 @@
       
     case 2: //Generating email content for remind without a new key
-      if (isset($conf_UAM[42]) and $conf_UAM[42] <> '')
+      if (isset($conf_UAM[42]) and !empty($conf_UAM[42]))
       {
         // Management of Extension flags ([username], [mygallery])
@@ -1522 +1522 @@
       }
       
-      if (isset($conf_UAM_ConfirmMail[4]) and $conf_UAM_ConfirmMail[4] <> '' and isset($conf_UAM_ConfirmMail[3]) and $conf_UAM_ConfirmMail[3] == 'true' and !$confirm)
+      if (isset($conf_UAM_ConfirmMail[4]) and !empty($conf_UAM_ConfirmMail[4]) and isset($conf_UAM_ConfirmMail[3]) and $conf_UAM_ConfirmMail[3] == 'true' and !$confirm)
       {
         // Management of Extension flags ([username], [mygallery], [myurl], [Kdays])
@@ -1600 +1600 @@
   load_language('plugin.lang', UAM_PATH);
 
-  if (isset($conf_UAM[45]) and $conf_UAM[45] <> '')
+  if (isset($conf_UAM[45]) and !empty($conf_UAM[45]))
   {
     // Management of Extension flags ([username], [mygallery])
@@ -1616 +1616 @@
   }
 
-  if (isset($conf_UAM[17]) and $conf_UAM[17] <> '' and isset($conf_UAM[15]) and $conf_UAM[15] == 'true')
+  if (isset($conf_UAM[17]) and !empty($conf_UAM[17]) and isset($conf_UAM[15]) and $conf_UAM[15] == 'true')
   {
     // Management of Extension flags ([username], [mygallery], [myurl], [days])
@@ -1696 +1696 @@
   }
 
-  if (isset($conf_UAM[44]) and $conf_UAM[44] <> '')
+  if (isset($conf_UAM[44]) and !empty($conf_UAM[44]))
   {
     // Management of Extension flags ([username], [mygallery])
@@ -1712 +1712 @@
   }
       
-  if (isset($conf_UAM[24]) and $conf_UAM[24] <> '')
+  if (isset($conf_UAM[24]) and !empty($conf_UAM[24]))
   {
     // Management of Extension flags ([username], [mygallery], [myurl])
@@ -1810 +1810 @@
   $result = pwg_db_fetch_assoc(pwg_query($query));
 
-  if (isset($conf_UAM[46]) and $conf_UAM[46] <> '')
+  if (isset($conf_UAM[46]) and !empty($conf_UAM[46]))
   {
     // Management of Extension flags ([username], [mygallery])
@@ -1826 +1826 @@
   }
       
-  if (isset($conf_UAM[27]) and $conf_UAM[27] <> '')
+  if (isset($conf_UAM[27]) and !empty($conf_UAM[27]))
   {
     // Management of Extension flags ([username], [mygallery], [myurl])
@@ -2514 +2514 @@
   $conf_UAM = unserialize($conf['UserAdvManager']);
 
-  if (isset($login) and isset($conf_UAM[6]) and $conf_UAM[6] <> '')
+  if (isset($login) and isset($conf_UAM[6]) and !empty($conf_UAM[6]))
   {
     $conf_CharExclusion = preg_split("/,/",$conf_UAM[6]);
@@ -2573 +2573 @@
   $conf_UAM = unserialize($conf['UserAdvManager']);
   
-                if (isset($email) and isset($conf_UAM[11]) and $conf_UAM[11] <> '')
+                if (isset($email) and isset($conf_UAM[11]) and !empty($conf_UAM[11]))
                 {
                                 $conf_MailExclusion = preg_split("/[\s,]+/",$conf_UAM[11]);