X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FMailing%2FInfo.php;h=9457998717b618cd46099f47c5de100101649c01;hb=ad7abea28f5ba077971be9e8e4b40b1caada2a35;hp=4b2ecf00d52e1c0976c4cc620b00cd4184bbd6d6;hpb=30a3791ac318f4fb2e57a4d7b46f353ee93118c2;p=civicrm-core.git

diff --git a/CRM/Mailing/Info.php b/CRM/Mailing/Info.php
index 4b2ecf00d5..9457998717 100644
--- a/CRM/Mailing/Info.php
+++ b/CRM/Mailing/Info.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -37,12 +37,14 @@
  */
 class CRM_Mailing_Info extends CRM_Core_Component_Info {
 
-  // docs inherited from interface
+  /**
+   * @inheritDoc
+   */
   protected $keyword = 'mailing';
 
 
-  // docs inherited from interface
   /**
+   * @inheritDoc
    * @return array
    */
   public function getInfo() {
@@ -60,32 +62,35 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
     $result['crmMailing'] = array(
       'ext' => 'civicrm',
       'js' => array(
-        'js/angular-Mailing.js' ,
-        'js/angularsanitize.js' ,
-        'packages/ckeditor/ckeditor.js'
-       ),
-    );
-    $result['crmMailing2'] = array(
-      'ext' => 'civicrm',
-      'js' => array('js/angular-crmMailing2.js', 'js/angular-crmMailing2-directives.js'),
+        'js/angular-crmMailing.js',
+        'js/angular-crmMailing/*.js',
+      ),
+      'css' => array('css/angular-crmMailing.css'),
+      'partials' => array('partials/crmMailing'),
     );
     $result['crmMailingAB'] = array(
       'ext' => 'civicrm',
       'js' => array(
         'js/angular-crmMailingAB.js',
-        'js/angular-crmMailingAB-ReportCtrl.js',
-        'js/d3.min.js',
-        'js/angular-sanitize.js',
-        'packages/ckeditor/ckeditor.js',
+        'js/angular-crmMailingAB/*.js',
       ),
       'css' => array('css/angular-crmMailingAB.css'),
+      'partials' => array('partials/crmMailingAB'),
+    );
+    $result['crmD3'] = array(
+      'ext' => 'civicrm',
+      'js' => array(
+        'js/angular-crmD3.js',
+        'bower_components/d3/d3.min.js',
+      ),
     );
 
+    $config = CRM_Core_Config::singleton();
     $session = CRM_Core_Session::singleton();
     $contactID = $session->get('userID');
     $civiMails = civicrm_api3('Mailing', 'get', array());
     $campNames = civicrm_api3('Campaign', 'get', array());
-    $mailingabNames = civicrm_api3('MailingAB','get',array());
+    $mailingabNames = civicrm_api3('MailingAB', 'get', array());
     $mailStatus = civicrm_api3('MailingJob', 'get', array());
     $groupNames = civicrm_api3('Group', 'get', array());
     $headerfooterList = civicrm_api3('MailingComponent', 'get', array());
@@ -96,23 +101,25 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
       $emailAdd = civicrm_api3('Email', 'get', array());
       $mesTemplate = civicrm_api3('MessageTemplate', 'get', array(
         'sequential' => 1,
-        'return' => array("msg_html", "id", "msg_title","msg_subject"),
+        'return' => array("msg_html", "id", "msg_title", "msg_subject"),
         'id' => array('>' => 58),
       ));
-    } else {
+    }
+    else {
       // CiviMail UI
       $emailAdd = civicrm_api3('Email', 'get', array(
         'sequential' => 1,
         'return' => "email",
         'contact_id' => $contactID,
       ));
-      $mesTemplate = civicrm_api3('MessageTemplate', 'get', array(  'sequential' => 1,
-        'return' => array("msg_html", "id", "msg_title", "msg_subject"),
+      $mesTemplate = civicrm_api3('MessageTemplate', 'get', array(
+        'sequential' => 1,
+        'return' => array("msg_html", "id", "msg_title", "msg_subject", "msg_text"),
         'workflow_id' => array('IS NULL' => ""),
       ));
     }
-    $mailGrp = civicrm_api3('MailingGroup','get', array());
-    $mailTokens = civicrm_api3('Mailing', 'get_token', array( 'usage' => 'Mailing'));
+    $mailGrp = civicrm_api3('MailingGroup', 'get', array());
+    $mailTokens = civicrm_api3('Mailing', 'get_token', array('usage' => 'Mailing'));
     $fromAddress = civicrm_api3('OptionGroup', 'get', array(
       'sequential' => 1,
       'name' => "from_email_address",
@@ -120,7 +127,7 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
     ));
     CRM_Core_Resources::singleton()->addSetting(array(
       'crmMailing' => array(
-        'mailingabNames'=>array_values($mailingabNames['values']),
+        'mailingabNames' => array_values($mailingabNames['values']),
         'civiMails' => array_values($civiMails['values']),
         'campNames' => array_values($campNames['values']),
         'mailStatus' => array_values($mailStatus['values']),
@@ -131,10 +138,15 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
         'mailGrp' => array_values($mailGrp['values']),
         'mailTokens' => array_values($mailTokens),
         'contactid' => $contactID,
+        'enableReplyTo' => isset($config->replyTo) ? $config->replyTo : 0,
         'fromAddress' => array_values($fromAddress['values'][0]['api.OptionValue.get']['values']),
+        'defaultTestEmail' => civicrm_api3('Contact', 'getvalue', array(
+            'id' => 'user_contact_id',
+            'return' => 'email',
+          )),
         'visibility' => array(
-            array('value' => 'Public Pages', 'label' => ts('Public Pages')),
-            array('value' => 'User and User Admin Only', 'label' => ts('User and User Admin Only')),
+          array('value' => 'Public Pages', 'label' => ts('Public Pages')),
+          array('value' => 'User and User Admin Only', 'label' => ts('User and User Admin Only')),
         ),
       ),
     ));
@@ -145,7 +157,7 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
   /**
    * @return bool
    */
-  static function workflowEnabled() {
+  public static function workflowEnabled() {
     $config = CRM_Core_Config::singleton();
 
     // early exit, since not true for most
@@ -170,8 +182,8 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
     ) ? TRUE : FALSE;
   }
 
-  // docs inherited from interface
   /**
+   * @inheritDoc
    * @param bool $getAllUnconditionally
    *
    * @return array
@@ -194,8 +206,8 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
   }
 
 
-  // docs inherited from interface
   /**
+   * @inheritDoc
    * @return null
    */
   public function getUserDashboardElement() {
@@ -211,8 +223,8 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
     return NULL;
   }
 
-  // docs inherited from interface
   /**
+   * @inheritDoc
    * @return array
    */
   public function registerTab() {
@@ -224,28 +236,29 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
     );
   }
 
-  // docs inherited from interface
   /**
+   * @inheritDoc
    * @return array
    */
   public function registerAdvancedSearchPane() {
-    return array('title' => ts('Mailings'),
+    return array(
+      'title' => ts('Mailings'),
       'weight' => 20,
     );
   }
 
-  // docs inherited from interface
   /**
+   * @inheritDoc
    * @return null
    */
   public function getActivityTypes() {
     return NULL;
   }
 
-  // add shortcut to Create New
   /**
+   * add shortcut to Create New
    * @param $shortCuts
    */
-  public function creatNewShortcut(&$shortCuts) {}
+  public function creatNewShortcut(&$shortCuts) {
+  }
 }
-