# This patch file was generated by NetBeans IDE # This patch can be applied using context Tools: Apply Diff Patch action on respective folder. # It uses platform neutral UTF-8 encoding. # Above lines and this line are ignored by the patching process. --- components/com_comprofiler/plugin/user/plug_cbfilefield/cb.filefield.php +++ components/com_comprofiler/plugin/user/plug_cbfilefield/cb.filefield.php @@ -673,22 +673,33 @@ if ( $mailTo ) { comprofilerMail( $mailFrom_email, $mailFrom_name, $mailTo, $mailSubject, $mailBody, 0, null, null, $mailAttachments ); } else { - $query = 'SELECT u.' . $_CB_database->NameQuote( 'email' ) - . "\n FROM " . $_CB_database->NameQuote( '#__users' ) . ' AS u' - . "\n INNER JOIN " . $_CB_database->NameQuote( '#__comprofiler' ) . ' AS c' - . ' ON u.' . $_CB_database->NameQuote( 'id' ) . ' = c.' . $_CB_database->NameQuote( 'id' ) - . "\n WHERE u." . $_CB_database->NameQuote( 'gid' ) . " IN (" . implode( ',', getParentGIDS( $ueConfig['imageApproverGid'] ) ) . ")" - . "\n AND u." . $_CB_database->NameQuote( 'block' ) . " = " . $_CB_database->Quote( '0' ) - . "\n AND c." . $_CB_database->NameQuote( 'confirmed' ) . " = " . $_CB_database->Quote( '1' ) - . "\n AND c." . $_CB_database->NameQuote( 'approved' ) . " = " . $_CB_database->Quote( '1' ) - . "\n AND u." . $_CB_database->NameQuote( 'sendEmail' ) . " = " . $_CB_database->Quote( '1' ) - ; - $_CB_database->setQuery( $query ); - $mods = $_CB_database->loadObjectList(); - if ( ! $_CB_database->getErrorNum() ) { - if ( $mods ) foreach ( $mods AS $mod ) { - comprofilerMail( $mailFrom_email, $mailFrom_name, $mod->email, $mailSubject, $mailBody, 0, null, null, $mailAttachments ); + $moderators = implode( ',', getParentGIDS( $ueConfig['imageApproverGid'] ) ); + + if ( $moderators ) { + $query = 'SELECT u.' . $_CB_database->NameQuote( 'email' ) + . "\n FROM " . $_CB_database->NameQuote( '#__users' ) . " AS u" + . "\n INNER JOIN " . $_CB_database->NameQuote( '#__comprofiler' ) . " AS c" + . ' ON u.' . $_CB_database->NameQuote( 'id' ) . ' = c.' . $_CB_database->NameQuote( 'id' ); + + if ( checkJversion() == 2 ) { + $query .= "\n INNER JOIN " . $_CB_database->NameQuote( '#__user_usergroup_map' ) . " AS g" + . ' ON u.' . $_CB_database->NameQuote( 'id' ) . ' = g.' . $_CB_database->NameQuote( 'user_id' ) + . "\n WHERE g." . $_CB_database->NameQuote( 'group_id' ) . " IN ( $moderators )"; + } else { + $query .= "\n WHERE u." . $_CB_database->NameQuote( 'gid' ) . " IN ( $moderators )"; } + + $query .= "\n AND u." . $_CB_database->NameQuote( 'block' ) . " = " . $_CB_database->Quote( '0' ) + . "\n AND c." . $_CB_database->NameQuote( 'confirmed' ) . " = " . $_CB_database->Quote( '1' ) + . "\n AND c." . $_CB_database->NameQuote( 'approved' ) . " = " . $_CB_database->Quote( '1' ) + . "\n AND u." . $_CB_database->NameQuote( 'sendEmail' ) . " = " . $_CB_database->Quote( '1' ); + $_CB_database->setQuery( $query ); + $mods = $_CB_database->loadObjectList(); + if ( ! $_CB_database->getErrorNum() ) { + if ( $mods ) foreach ( $mods AS $mod ) { + comprofilerMail( $mailFrom_email, $mailFrom_name, $mod->email, $mailSubject, $mailBody, 0, null, null, $mailAttachments ); + } + } \ No newline at end of file } } }