- Timestamp:
- Sep 16, 2012, 6:22:00 PM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/UserAdvManager/trunk/include/functions.inc.php
r17944 r17946 140 140 // ------------------------------------------------------------------------------------------------------------- 141 141 SetUnvalidated($register_user['id']); 142 143 // This is to send the validation key by email to admins for their manual validation without having to connect the gallery 144 // ----------------------------------------------------------------------------------------------------------------------- 145 SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], true); 142 146 } 143 147 // Sending registration confirmation by email … … 609 613 WHERE user_id = '.$user_id.' 610 614 AND ( 611 group_id = "'.$conf_UAM[2].'"615 group_id = '.$conf_UAM[2].' 612 616 OR 613 group_id = "'.$conf_UAM[3].'"617 group_id = '.$conf_UAM[3].' 614 618 ) 615 619 ;'; … … 971 975 break; 972 976 973 case 2: // Confirmation email on user profile update - With information email if checked977 case 2: // Confirmation email on user profile update - With information email if modification done in user profile 974 978 if (isset($conf_UAM[41]) and $conf_UAM[41] <> '') 975 979 { … … 1096 1100 } 1097 1101 1098 if (isset($conf_UAM[1]) and $conf_UAM[1] == 'true'and $confirm) // Add confirmation link ?1102 if (isset($conf_UAM[1]) and ($conf_UAM[1] == 'true' or $conf_UAM[1] == 'local') and $confirm) // Add confirmation link ? 1099 1103 { 1100 1104 $infos2 = array … … 1131 1135 // Sending the email with subject and contents 1132 1136 // ------------------------------------------- 1133 pwg_mail($email, array( 1134 'subject' => $subject, 1135 'content' => (isset($infos1) ? $infos1_perso.l10n_args($infos1)."\n\n" : "").(isset($infos2) ? $infos2_perso.l10n_args($infos2)."\n\n" : "").get_absolute_root_url(), 1136 )); 1137 1137 if (isset($conf_UAM[1]) and $conf_UAM[1] == 'local') 1138 { 1139 pwg_mail(get_webmaster_mail_address(), array( 1140 'subject' => $subject, 1141 'content' => (isset($infos1) ? $infos1_perso.l10n_args($infos1)."\n\n" : "").(isset($infos2) ? $infos2_perso.l10n_args($infos2)."\n\n" : "").get_absolute_root_url(), 1142 )); 1143 } 1144 else 1145 { 1146 pwg_mail($email, array( 1147 'subject' => $subject, 1148 'content' => (isset($infos1) ? $infos1_perso.l10n_args($infos1)."\n\n" : "").(isset($infos2) ? $infos2_perso.l10n_args($infos2)."\n\n" : "").get_absolute_root_url(), 1149 )); 1150 } 1138 1151 // Switching back to default language 1139 1152 // ---------------------------------- … … 1658 1671 WHERE user_id = '.$user_id.' 1659 1672 AND ( 1660 group_id = "'.$conf_UAM[2].'"1673 group_id = '.$conf_UAM[2].' 1661 1674 OR 1662 group_id = "'.$conf_UAM[3].'"1675 group_id = '.$conf_UAM[3].' 1663 1676 ) 1664 1677 ;'; … … 1685 1698 (user_id, group_id) 1686 1699 VALUES 1687 ('.$user_id.', "'.$conf_UAM[2].'")1700 ('.$user_id.', '.$conf_UAM[2].') 1688 1701 ;'; 1689 1702 pwg_query($query); … … 1730 1743 WHERE user_id = '.$user_id.' 1731 1744 AND ( 1732 group_id = "'.$conf_UAM[2].'"1745 group_id = '.$conf_UAM[2].' 1733 1746 OR 1734 group_id = "'.$conf_UAM[3].'"1747 group_id = '.$conf_UAM[3].' 1735 1748 ) 1736 1749 ;'; … … 1753 1766 (user_id, group_id) 1754 1767 VALUES 1755 ('.$user_id.', "'.$conf_UAM[2].'")1768 ('.$user_id.', '.$conf_UAM[2].') 1756 1769 ;'; 1757 1770 pwg_query($query); … … 1909 1922 SELECT COUNT(*) 1910 1923 FROM '.USER_CONFIRM_MAIL_TABLE.' 1911 WHERE id = '.$id.'1924 WHERE id = "'.$id.'" 1912 1925 ;'; 1913 1926 list($count) = pwg_db_fetch_row(pwg_query($query)); … … 1918 1931 SELECT user_id, status, date_check 1919 1932 FROM '.USER_CONFIRM_MAIL_TABLE.' 1920 WHERE id = '.$id.'1933 WHERE id = "'.$id.'" 1921 1934 ;'; 1922 1935 $data = pwg_db_fetch_assoc(pwg_query($query)); … … 1982 1995 DELETE FROM '.USER_GROUP_TABLE.' 1983 1996 WHERE user_id = '.$data['user_id'].' 1984 AND group_id = "'.$conf_UAM[2].'"1997 AND group_id = '.$conf_UAM[2].' 1985 1998 ;'; 1986 1999 pwg_query($query); … … 1993 2006 (user_id, group_id) 1994 2007 VALUES 1995 ('.$data['user_id'].', "'.$conf_UAM[3].'")2008 ('.$data['user_id'].', '.$conf_UAM[3].') 1996 2009 ;'; 1997 2010 pwg_query($query); 1998 2011 } 1999 2012 2000 if ( ($conf_UAM[4] <> -1 or isset($data['status']))) // Change user's status2013 if ($conf_UAM[4] <> -1) // Change user's status 2001 2014 { 2002 2015 $query = ' 2003 2016 UPDATE '.USER_INFOS_TABLE.' 2004 SET status = "'. (isset($data['status']) ? $data['status'] : $conf_UAM[4]).'"2017 SET status = "'.$conf_UAM[4].'" 2005 2018 WHERE user_id = '.$data['user_id'].' 2006 2019 ;'; … … 2008 2021 } 2009 2022 2010 if ( ($conf_UAM[36] <> -1 or isset($data['level']))) // Change user's privacy level2023 if ($conf_UAM[36] <> -1) // Change user's privacy level 2011 2024 { 2012 2025 $query = ' 2013 2026 UPDATE '.USER_INFOS_TABLE.' 2014 SET level = "'. (isset($data['level']) ? $data['level'] : $conf_UAM[36]).'"2027 SET level = "'.$conf_UAM[36].'" 2015 2028 WHERE user_id = '.$data['user_id'].' 2016 2029 ;'; 2017 2030 pwg_query($query); 2018 2031 } 2032 2033 // Set UAM_validated field to True in #_users table 2034 $query = ' 2035 UPDATE '.USERS_TABLE.' 2036 SET UAM_validated = "true" 2037 WHERE id = '.$data['user_id'].' 2038 ;'; 2039 pwg_query($query); 2019 2040 2020 2041 // Refresh user's category cache … … 2059 2080 DELETE FROM '.USER_GROUP_TABLE.' 2060 2081 WHERE user_id = '.$data['user_id'].' 2061 AND group_id = "'.$conf_UAM[2].'"2082 AND group_id = '.$conf_UAM[2].' 2062 2083 ;'; 2063 2084 pwg_query($query); … … 2069 2090 DELETE FROM '.USER_GROUP_TABLE.' 2070 2091 WHERE user_id = '.$data['user_id'].' 2071 AND group_id = "'.$conf_UAM[3].'"2092 AND group_id = '.$conf_UAM[3].' 2072 2093 ;'; 2073 2094 pwg_query($query); … … 2077 2098 (user_id, group_id) 2078 2099 VALUES 2079 ('.$data['user_id'].', "'.$conf_UAM[3].'")2100 ('.$data['user_id'].', '.$conf_UAM[3].') 2080 2101 ;'; 2081 2102 pwg_query($query); 2082 2103 } 2083 2104 2084 if ( ($conf_UAM[4] <> -1 or isset($data['status']))) // Change user's status2105 if ($conf_UAM[4] <> -1) // Change user's status 2085 2106 { 2086 2107 $query = ' 2087 2108 UPDATE '.USER_INFOS_TABLE.' 2088 SET status = "'. (isset($data['status']) ? $data['status'] : $conf_UAM[4]).'"2109 SET status = "'.$conf_UAM[4].'" 2089 2110 WHERE user_id = '.$data['user_id'].' 2090 2111 ;'; … … 2092 2113 } 2093 2114 2094 if ( ($conf_UAM[36] <> -1 or isset($data['level']))) // Change user's privacy level2115 if ($conf_UAM[36] <> -1) // Change user's privacy level 2095 2116 { 2096 2117 $query = ' 2097 2118 UPDATE '.USER_INFOS_TABLE.' 2098 SET level = "'. (isset($data['level']) ? $data['level'] : $conf_UAM[36]).'"2119 SET level = "'.$conf_UAM[36].'" 2099 2120 WHERE user_id = '.$data['user_id'].' 2100 2121 ;'; 2101 2122 pwg_query($query); 2102 2123 } 2124 2125 // Set UAM_validated field to True in #_users table 2126 $query = ' 2127 UPDATE '.USERS_TABLE.' 2128 SET UAM_validated = "true" 2129 WHERE id = '.$data['user_id'].' 2130 ;'; 2131 pwg_query($query); 2103 2132 2104 2133 // Refresh user's category cache … … 2149 2178 DELETE FROM '.USER_GROUP_TABLE.' 2150 2179 WHERE user_id = '.$id.' 2151 AND group_id = "'.$conf_UAM[2].'"2180 AND group_id = '.$conf_UAM[2].' 2152 2181 ;'; 2153 2182 pwg_query($query); … … 2159 2188 DELETE FROM '.USER_GROUP_TABLE.' 2160 2189 WHERE user_id = '.$id.' 2161 AND group_id = "'.$conf_UAM[3].'"2190 AND group_id = '.$conf_UAM[3].' 2162 2191 ;'; 2163 2192 pwg_query($query); … … 2167 2196 (user_id, group_id) 2168 2197 VALUES 2169 ('.$id.', "'.$conf_UAM[3].'")2198 ('.$id.', '.$conf_UAM[3].') 2170 2199 ;'; 2171 2200 pwg_query($query);
Note: See TracChangeset
for help on using the changeset viewer.