Version 4.7.23
This commit is contained in:
1 parent
7124a02564
commit
25ddeb65d6
1791 files changed
+76990
-44452
No files matched your search
@@ -68,6 +68,10 @@ class _SupportRequest
|
||||
{
|
||||
$fromEmail = ( \IPS\Member::loggedIn()->member_id ) ? \IPS\Member::loggedIn()->email : $values['email_address'];
|
||||
$content = $values['contact_text'];
|
||||
if ( isset( $values['contact_referrer'] ) AND $values['contact_referrer'] )
|
||||
{
|
||||
$content .= \IPS\Theme::i()->getTemplate( 'system', 'core', 'front' )->contactFormReferrer( $values['contact_referrer'] );
|
||||
}
|
||||
|
||||
$department = \IPS\nexus\Support\Department::load( \IPS\Settings::i()->contact_nexus_department );
|
||||
$member = \IPS\Member::loggedIn();
|
||||
@@ -80,7 +84,7 @@ class _SupportRequest
|
||||
$request->last_new_reply = time();
|
||||
$request->started = time();
|
||||
$request->replies = 1;
|
||||
$request->title = ( $values['contact_name'] ) ? sprintf( \IPS\Member::loggedIn()->language()->get( 'contact_nexus_title_with_name' ), $values['contact_name'] ) : \IPS\Member::loggedIn()->language()->get( 'contact_nexus_title' );
|
||||
$request->title = ( isset( $values['contact_name'] ) AND $values['contact_name'] ) ? sprintf( \IPS\Member::loggedIn()->language()->get( 'contact_nexus_title_with_name' ), $values['contact_name'] ) : \IPS\Member::loggedIn()->language()->get( 'contact_nexus_title' );
|
||||
|
||||
if ( \IPS\Member::loggedIn()->member_id)
|
||||
{
|
||||
|
||||
@@ -408,7 +408,7 @@ class _Support
|
||||
$fromName = \IPS\Settings::i()->nexus_sout_from;
|
||||
break;
|
||||
}
|
||||
$confirmationEmail->send( $member->member_id ? $member : $email->from, array(), array(), $request->department->email, $fromName, array( 'Message-Id' => "<IPS-0-SR{$request->id}.{$request->email_key}-{$request->department->email}>" ) );
|
||||
$confirmationEmail->send( $member->member_id ? $member : $email->from, [], [], $request->department->email, $fromName, [ 'Message-ID' => "<IPS-0-SR{$request->id}.{$request->email_key}-{$request->department->email}>" ] );
|
||||
}
|
||||
|
||||
/* Return */
|
||||
|
||||
@@ -88,7 +88,7 @@ class _Subscriptions
|
||||
$return = array(
|
||||
'nexus_bm_filters_subscription_pkgs' => implode( ',', $ids ),
|
||||
'nexus_bm_filters_subscription_active' => (bool) ( \in_array( "active", $post['nexus_bm_filters_subscription_type'] ) ),
|
||||
'nexus_bm_filters_subscription_canceled' => (bool) ( \in_array( "canceled", $post['nexus_bm_filters_subscription_type'] ) ),
|
||||
'nexus_bm_filters_subscription_canceled' => (bool) ( \in_array( "expired", $post['nexus_bm_filters_subscription_type'] ) ),
|
||||
);
|
||||
|
||||
if( isset( $post['nexus_bm_filters_type_expired_date'][2] ) AND $post['nexus_bm_filters_type_expired_date'][2] == 'days' )
|
||||
|
||||
@@ -59,7 +59,7 @@ class _Market extends \IPS\core\Statistics\Chart
|
||||
$this->_identifier
|
||||
);
|
||||
$chart->setExtension( $this );
|
||||
$chart->availableTypes[] = 'GeoChart';
|
||||
$chart->availableTypes = array( 'GeoChart', 'AreaChart', 'LineChart', 'ColumnChart', 'BarChart', 'PieChart' );
|
||||
$chart->where[] = array( 'i_status=? AND i_billcountry IS NOT NULL', \IPS\nexus\Invoice::STATUS_PAID );
|
||||
$chart->groupBy = 'i_billcountry';
|
||||
|
||||
|
||||
Reference in new issue
Block a user