X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FCampaign%2FForm%2FSurvey.php;h=a3357b49a34607ef36c0e47934dfee7cf040b8d0;hb=f212d37d5ee36a991eb5529211b692dee29378c0;hp=07f7274774dcef5b7549371a1ffe03d08bb2d71e;hpb=e913987d303f2c51e60be23820fc8d1031e7eadd;p=civicrm-core.git

diff --git a/CRM/Campaign/Form/Survey.php b/CRM/Campaign/Form/Survey.php
index 07f7274774..a3357b49a3 100644
--- a/CRM/Campaign/Form/Survey.php
+++ b/CRM/Campaign/Form/Survey.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -47,14 +47,14 @@ class CRM_Campaign_Form_Survey extends CRM_Core_Form {
   protected $_surveyId;
 
   /**
-   * action
+   * Action
    *
    * @var int
    */
   protected $_action;
 
   /**
-   * surveyTitle
+   * SurveyTitle
    *
    * @var string
    */
@@ -90,12 +90,11 @@ class CRM_Campaign_Form_Survey extends CRM_Core_Form {
   }
 
   /**
-   * Function to actually build the form
+   * Build the form object
    *
    * @param null
    *
    * @return void
-   * @access public
    */
   public function buildQuickForm() {
     $session = CRM_Core_Session::singleton();
@@ -123,7 +122,7 @@ class CRM_Campaign_Form_Survey extends CRM_Core_Form {
       $buttons = array(
         array(
           'type' => 'upload',
-          'name' => ts('Continue >>'),
+          'name' => ts('Continue'),
           'spacing' => '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;',
           'isDefault' => TRUE,
         ),
@@ -140,7 +139,7 @@ class CRM_Campaign_Form_Survey extends CRM_Core_Form {
     $session->replaceUserContext($url);
   }
 
-  function endPostProcess() {
+  public function endPostProcess() {
     // make submit buttons keep the current working tab opened.
     if ($this->_action & (CRM_Core_Action::UPDATE | CRM_Core_Action::ADD)) {
       $tabTitle = $className = CRM_Utils_String::getClassName($this->_name);
@@ -159,7 +158,7 @@ class CRM_Campaign_Form_Survey extends CRM_Core_Form {
       if ($this->controller->getButtonName('submit') == "_qf_{$className}_upload_done") {
         CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm/campaign', 'reset=1&subPage=survey'));
       }
-      else if ($this->controller->getButtonName('submit') == "_qf_{$className}_upload_next") {
+      elseif ($this->controller->getButtonName('submit') == "_qf_{$className}_upload_next") {
         $subPage = CRM_Campaign_Form_Survey_TabHeader::getNextTab($this);
         CRM_Utils_System::redirect(CRM_Utils_System::url("civicrm/survey/configure/{$subPage}",
                                                          "action=update&reset=1&id={$this->_surveyId}"));
@@ -174,8 +173,8 @@ class CRM_Campaign_Form_Survey extends CRM_Core_Form {
   /**
    * @return string
    */
-  function getTemplateFileName() {
-    if ($this->controller->getPrint() || $this->getVar('_surveyId') <= 0 ) {
+  public function getTemplateFileName() {
+    if ($this->controller->getPrint() || $this->getVar('_surveyId') <= 0) {
       return parent::getTemplateFileName();
     }
     else {
@@ -185,4 +184,3 @@ class CRM_Campaign_Form_Survey extends CRM_Core_Form {
     }
   }
 }
-