[phpws-comm-commits] modules/mailinglists/class mailinglists.php, 1.39, 1.40

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/phpwebsite-comm/modules/mailinglists/class
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2064/class

Modified Files:
	mailinglists.php 
Log Message:
Notice fixes

Index: mailinglists.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/mailinglists/class/mailinglists.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** mailinglists.php	12 Sep 2005 03:25:32 -0000	1.39
--- mailinglists.php	2 Jan 2008 20:25:36 -0000	1.40
***************
*** 10,19 ****
   * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
!  * 
   * This program is distributed in the hope that it will be useful,
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   * GNU General Public License for more details.
!  * 
   * You should have received a copy of the GNU General Public License
   * along with this program; if not, write to the Free Software
--- 10,19 ----
   * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
!  *
   * This program is distributed in the hope that it will be useful,
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   * GNU General Public License for more details.
!  *
   * You should have received a copy of the GNU General Public License
   * along with this program; if not, write to the Free Software
***************
*** 61,65 ****
      $tags['STATUS_LABEL'] = $_SESSION['translate']->it('Status');
      $tags['LIST_ITEMS'] = '';
!     
      $result = $GLOBALS['core']->sqlSelect('mod_mailinglists_lists', NULL, NULL, 'name');
      if($result != NULL) {
--- 61,65 ----
      $tags['STATUS_LABEL'] = $_SESSION['translate']->it('Status');
      $tags['LIST_ITEMS'] = '';
! 
      $result = $GLOBALS['core']->sqlSelect('mod_mailinglists_lists', NULL, NULL, 'name');
      if($result != NULL) {
***************
*** 79,83 ****
  	  }
  	}
! 	
  	$countResult2 = $GLOBALS['core']->sqlSelect('mod_mailinglists_anon_subscribers', 'listID', $id);
          if($countResult2 != NULL) {
--- 79,83 ----
  	  }
  	}
! 
  	$countResult2 = $GLOBALS['core']->sqlSelect('mod_mailinglists_anon_subscribers', 'listID', $id);
          if($countResult2 != NULL) {
***************
*** 182,194 ****
        $tags['OPTINMESSAGE_LABEL'] = $_SESSION['translate']->it('Double Opt-in Confirmation Email');
        $tags['OPTINMESSAGE'] = PHPWS_Form::formTextArea('optInMessage', $optInMessage, 10, 60);
!       
        $tags['SMESSAGE_HELP'] = $_SESSION['OBJ_help']->show_link('mailinglists', 'sMessage');
        $tags['SMESSAGE_LABEL'] = $_SESSION['translate']->it('Subscribe Email');
        $tags['SMESSAGE'] = PHPWS_Form::formTextArea('subscribeMessage', $subscribeMessage, 10, 60);
!       
        $tags['UMESSAGE_HELP'] = $_SESSION['OBJ_help']->show_link('mailinglists', 'uMessage');
        $tags['UMESSAGE_LABEL'] = $_SESSION['translate']->it('Unsubscribe Email');
        $tags['UMESSAGE'] = PHPWS_Form::formTextArea('unsubscribeMessage', $unsubscribeMessage, 10, 60);
!       
        $tags['SUBJECTPREFIX_HELP'] = $_SESSION['OBJ_help']->show_link('mailinglists', 'subjectPrefix');
        $tags['SUBJECTPREFIX_LABEL'] = $_SESSION['translate']->it('Subject Prefix');
--- 182,194 ----
        $tags['OPTINMESSAGE_LABEL'] = $_SESSION['translate']->it('Double Opt-in Confirmation Email');
        $tags['OPTINMESSAGE'] = PHPWS_Form::formTextArea('optInMessage', $optInMessage, 10, 60);
! 
        $tags['SMESSAGE_HELP'] = $_SESSION['OBJ_help']->show_link('mailinglists', 'sMessage');
        $tags['SMESSAGE_LABEL'] = $_SESSION['translate']->it('Subscribe Email');
        $tags['SMESSAGE'] = PHPWS_Form::formTextArea('subscribeMessage', $subscribeMessage, 10, 60);
! 
        $tags['UMESSAGE_HELP'] = $_SESSION['OBJ_help']->show_link('mailinglists', 'uMessage');
        $tags['UMESSAGE_LABEL'] = $_SESSION['translate']->it('Unsubscribe Email');
        $tags['UMESSAGE'] = PHPWS_Form::formTextArea('unsubscribeMessage', $unsubscribeMessage, 10, 60);
! 
        $tags['SUBJECTPREFIX_HELP'] = $_SESSION['OBJ_help']->show_link('mailinglists', 'subjectPrefix');
        $tags['SUBJECTPREFIX_LABEL'] = $_SESSION['translate']->it('Subject Prefix');
***************
*** 323,327 ****
    }// END FUNC showSavedEmails
  
!   
   /**
   * Displays the user block that contains their Mailing Lists information
--- 323,327 ----
    }// END FUNC showSavedEmails
  
! 
   /**
   * Displays the user block that contains their Mailing Lists information
***************
*** 556,561 ****
      }
    }// END FUNC showDeleteList
!   
!   
    /**
   * Asks the admin if they REALLY want to add all users to the selected list.
--- 556,561 ----
      }
    }// END FUNC showDeleteList
! 
! 
    /**
   * Asks the admin if they REALLY want to add all users to the selected list.
***************
*** 623,627 ****
      $title = $_SESSION['translate']->it('Mailing Lists Administration') . ': ';
      $title .= $_SESSION['translate']->it('Send Email');
!     
      if($mladmin) {
        $menutags['HREF'] = './index.php?module=mailinglists&amp;op=admin';
--- 623,627 ----
      $title = $_SESSION['translate']->it('Mailing Lists Administration') . ': ';
      $title .= $_SESSION['translate']->it('Send Email');
! 
      if($mladmin) {
        $menutags['HREF'] = './index.php?module=mailinglists&amp;op=admin';
***************
*** 633,637 ****
        $menutags['HELP'] = $_SESSION['OBJ_help']->show_link('mailinglists', 'loadSaved');
        $tags['MENU'] .= PHPWS_Template::processTemplate($menutags, 'mailinglists', 'tab/inactive.tpl');
!       
        $menutags['HREF'] = './index.php?module=mailinglists&amp;op=showImport&amp;list=' . $list;
        $menutags['TITLE'] = $_SESSION['translate']->it('Import Message From Module');
--- 633,637 ----
        $menutags['HELP'] = $_SESSION['OBJ_help']->show_link('mailinglists', 'loadSaved');
        $tags['MENU'] .= PHPWS_Template::processTemplate($menutags, 'mailinglists', 'tab/inactive.tpl');
! 
        $menutags['HREF'] = './index.php?module=mailinglists&amp;op=showImport&amp;list=' . $list;
        $menutags['TITLE'] = $_SESSION['translate']->it('Import Message From Module');
***************
*** 645,649 ****
      }
      $tags['EMAILING'] = $_SESSION['translate']->it('Emailing');
!     
      $countResult = $GLOBALS['core']->sqlSelect('mod_mailinglists_subscribers', array('listID'=>$list, 'active'=>1));
      $numberTotal = sizeof($countResult);
--- 645,649 ----
      }
      $tags['EMAILING'] = $_SESSION['translate']->it('Emailing');
! 
      $countResult = $GLOBALS['core']->sqlSelect('mod_mailinglists_subscribers', array('listID'=>$list, 'active'=>1));
      $numberTotal = sizeof($countResult);
***************
*** 700,709 ****
                                   $htmlMessage);
      }
!     else if($_POST['doSendEmail']) {
        $htmlMessage = stripslashes($_REQUEST['htmlMessage']);
        $message = stripslashes($_REQUEST['message']);
        $tags['MSG'] = $_SESSION['translate']->it('Please provide an Email Subject');
      }
!     else if($_POST['preview']) {
        $name = stripslashes($_REQUEST['emailSubject']);
        $htmlMessage = stripslashes($_REQUEST['htmlMessage']);
--- 700,709 ----
                                   $htmlMessage);
      }
!     else if(isset($_POST['doSendEmail'])) {
        $htmlMessage = stripslashes($_REQUEST['htmlMessage']);
        $message = stripslashes($_REQUEST['message']);
        $tags['MSG'] = $_SESSION['translate']->it('Please provide an Email Subject');
      }
!     else if(isset($_POST['preview'])) {
        $name = stripslashes($_REQUEST['emailSubject']);
        $htmlMessage = stripslashes($_REQUEST['htmlMessage']);
***************
*** 711,719 ****
        $tags['PREVIEW'] = nl2br($htmlMessage);
      }
!     else if($_POST['convert']) {
        $htmlMessage = stripslashes($htmlMessage);
        $message = strip_tags($htmlMessage);
      }
!     
      $tags['FORM_BEGIN'] = '<form action="index.php" method="post" name="mailinglists_sendemail">';
      $tags['FORM_BEGIN'] .= PHPWS_Form::formHidden('module', 'mailinglists');
--- 711,719 ----
        $tags['PREVIEW'] = nl2br($htmlMessage);
      }
!     else if(isset($_POST['convert'])) {
        $htmlMessage = stripslashes($htmlMessage);
        $message = strip_tags($htmlMessage);
      }
! 
      $tags['FORM_BEGIN'] = '<form action="index.php" method="post" name="mailinglists_sendemail">';
      $tags['FORM_BEGIN'] .= PHPWS_Form::formHidden('module', 'mailinglists');
***************
*** 909,913 ****
        $sender = $_SESSION['OBJ_user']->username;
      }
!     
      if($_POST['message'] == NULL) {
        $_POST['message'] = strip_tags($_POST['htmlMessage']);
--- 909,913 ----
        $sender = $_SESSION['OBJ_user']->username;
      }
! 
      if($_POST['message'] == NULL) {
        $_POST['message'] = strip_tags($_POST['htmlMessage']);
***************
*** 940,944 ****
        $fromEmail = $result[0]['fromEmail'];
      }
!     
      if($conf[0]['subjectPrefix']) {
        $theSubject = $result[0]['subjectPrefix'] . ' ' . stripslashes($_POST['emailSubject']);
--- 940,944 ----
        $fromEmail = $result[0]['fromEmail'];
      }
! 
      if($conf[0]['subjectPrefix']) {
        $theSubject = $result[0]['subjectPrefix'] . ' ' . stripslashes($_POST['emailSubject']);
***************
*** 986,990 ****
        }
      }
!     
      $result = $GLOBALS['core']->sqlSelect('mod_mailinglists_anon_subscribers', array('listID'=>$list, 'active'=>1));
      $numberTotal += sizeof($result);
--- 986,990 ----
        }
      }
! 
      $result = $GLOBALS['core']->sqlSelect('mod_mailinglists_anon_subscribers', array('listID'=>$list, 'active'=>1));
      $numberTotal += sizeof($result);
***************
*** 1263,1267 ****
      $tags['FOOTER_YES'] = PHPWS_Form::formRadio('footer', 1, $footer, NULL, $_SESSION['translate']->it('Yes')) . ' ';
      $tags['FOOTER_NO'] = PHPWS_Form::formRadio('footer', 0, $footer, NULL, $_SESSION['translate']->it('No'));
!     
      $tags['USERSEND_HELP'] = $_SESSION['OBJ_help']->show_link('mailinglists', 'userSend');
      $tags['USERSEND_LABEL'] = $_SESSION['translate']->it('Allow registered website users send messages');
--- 1263,1267 ----
      $tags['FOOTER_YES'] = PHPWS_Form::formRadio('footer', 1, $footer, NULL, $_SESSION['translate']->it('Yes')) . ' ';
      $tags['FOOTER_NO'] = PHPWS_Form::formRadio('footer', 0, $footer, NULL, $_SESSION['translate']->it('No'));
! 
      $tags['USERSEND_HELP'] = $_SESSION['OBJ_help']->show_link('mailinglists', 'userSend');
      $tags['USERSEND_LABEL'] = $_SESSION['translate']->it('Allow registered website users send messages');
***************
*** 1269,1278 ****
      $tags['USERSEND_YES_WA'] = PHPWS_Form::formRadio('userSend', 1, $userSend, NULL, $_SESSION['translate']->it('Yes, approval required')) . ' ';
      $tags['USERSEND_NO'] = PHPWS_Form::formRadio('userSend', 0, $userSend, NULL, $_SESSION['translate']->it('No'));
!     
      $tags['ANONSUBSCRIBE_HELP'] = $_SESSION['OBJ_help']->show_link('mailinglists', 'anonSubscribe');
      $tags['ANONSUBSCRIBE_LABEL'] = $_SESSION['translate']->it('Allow anonymous users to subscribe to lists');
      $tags['ANONSUBSCRIBE_YES'] = PHPWS_Form::formRadio('anonSubscribe', 1, $anonSubscribe, NULL, $_SESSION['translate']->it('Yes')) . ' ';
      $tags['ANONSUBSCRIBE_NO'] = PHPWS_Form::formRadio('anonSubscribe', 0, $anonSubscribe, NULL, $_SESSION['translate']->it('No'));
!     
      $tags['SUBJECTPREFIX_HELP'] = $_SESSION['OBJ_help']->show_link('mailinglists', 'subPrefix');
      $tags['SUBJECTPREFIX_LABEL'] = $_SESSION['translate']->it('Attach a subject prefix to list messages');
--- 1269,1278 ----
      $tags['USERSEND_YES_WA'] = PHPWS_Form::formRadio('userSend', 1, $userSend, NULL, $_SESSION['translate']->it('Yes, approval required')) . ' ';
      $tags['USERSEND_NO'] = PHPWS_Form::formRadio('userSend', 0, $userSend, NULL, $_SESSION['translate']->it('No'));
! 
      $tags['ANONSUBSCRIBE_HELP'] = $_SESSION['OBJ_help']->show_link('mailinglists', 'anonSubscribe');
      $tags['ANONSUBSCRIBE_LABEL'] = $_SESSION['translate']->it('Allow anonymous users to subscribe to lists');
      $tags['ANONSUBSCRIBE_YES'] = PHPWS_Form::formRadio('anonSubscribe', 1, $anonSubscribe, NULL, $_SESSION['translate']->it('Yes')) . ' ';
      $tags['ANONSUBSCRIBE_NO'] = PHPWS_Form::formRadio('anonSubscribe', 0, $anonSubscribe, NULL, $_SESSION['translate']->it('No'));
! 
      $tags['SUBJECTPREFIX_HELP'] = $_SESSION['OBJ_help']->show_link('mailinglists', 'subPrefix');
      $tags['SUBJECTPREFIX_LABEL'] = $_SESSION['translate']->it('Attach a subject prefix to list messages');
***************
*** 1412,1417 ****
  
    }// END FUNC getUserOptions
!   
!   
   /**
   * Shows subscriber admin for a mailing list
--- 1412,1417 ----
  
    }// END FUNC getUserOptions
! 
! 
   /**
   * Shows subscriber admin for a mailing list
***************
*** 1423,1431 ****
      $title = $_SESSION['translate']->it('Mailing Lists Administration');
      $content = $this->adminNavBar();
!     
      if($msg != NULL) {
        $content .= '<br /><b>' . $msg . '</b><br />';
      }
!     
      $content .= '<br />';
  
--- 1423,1431 ----
      $title = $_SESSION['translate']->it('Mailing Lists Administration');
      $content = $this->adminNavBar();
! 
      if($msg != NULL) {
        $content .= '<br /><b>' . $msg . '</b><br />';
      }
! 
      $content .= '<br />';
  
***************
*** 1433,1442 ****
        $result = $GLOBALS['core']->sqlSelect('mod_mailinglists_lists', 'id', $list);
        $tags['LISTNAME'] = $_SESSION['translate']->it('Subscriber Admin') . ': ' . $result[0]['name'];
!       
        $tags['FORM'] = '<form name="mailinglists_subscriberAdmin" action="index.php" method="post">';
        $tags['FORM'] .= PHPWS_Form::formHidden('module', 'mailinglists');
        $tags['FORM'] .= PHPWS_Form::formHidden('op', 'subscriberAdmin');
        $tags['FORM'] .= PHPWS_Form::formHidden('list', $list);
!       
        $tags['MEMBER_LABEL'] = $_SESSION['translate']->it('Web Site Members');
        $tags['USER_HELP'] = $_SESSION['OBJ_help']->show_link('mailinglists', 'subscriberAdmin');
--- 1433,1442 ----
        $result = $GLOBALS['core']->sqlSelect('mod_mailinglists_lists', 'id', $list);
        $tags['LISTNAME'] = $_SESSION['translate']->it('Subscriber Admin') . ': ' . $result[0]['name'];
! 
        $tags['FORM'] = '<form name="mailinglists_subscriberAdmin" action="index.php" method="post">';
        $tags['FORM'] .= PHPWS_Form::formHidden('module', 'mailinglists');
        $tags['FORM'] .= PHPWS_Form::formHidden('op', 'subscriberAdmin');
        $tags['FORM'] .= PHPWS_Form::formHidden('list', $list);
! 
        $tags['MEMBER_LABEL'] = $_SESSION['translate']->it('Web Site Members');
        $tags['USER_HELP'] = $_SESSION['OBJ_help']->show_link('mailinglists', 'subscriberAdmin');
***************
*** 1444,1448 ****
        $tags['ADD_BUTTON'] = PHPWS_Form::formSubmit($_SESSION['translate']->it('Subscribe'), 'subscribe');
        $tags['REMOVE_BUTTON'] = PHPWS_Form::formSubmit($_SESSION['translate']->it('Unsubscribe'), 'unsubscribe');
!       
        $tags['ANON_LABEL'] = $_SESSION['translate']->it('Other Users');
        $tags['ANON_HELP'] = $_SESSION['OBJ_help']->show_link('mailinglists', 'anonAdmin');
--- 1444,1448 ----
        $tags['ADD_BUTTON'] = PHPWS_Form::formSubmit($_SESSION['translate']->it('Subscribe'), 'subscribe');
        $tags['REMOVE_BUTTON'] = PHPWS_Form::formSubmit($_SESSION['translate']->it('Unsubscribe'), 'unsubscribe');
! 
        $tags['ANON_LABEL'] = $_SESSION['translate']->it('Other Users');
        $tags['ANON_HELP'] = $_SESSION['OBJ_help']->show_link('mailinglists', 'anonAdmin');
***************
*** 1452,1456 ****
  
        $tags['ENDFORM'] = '</form>';
!       
        if(!isset($PAGER_section)) {
          unset($_SESSION['Pager']);
--- 1452,1456 ----
  
        $tags['ENDFORM'] = '</form>';
! 
        if(!isset($PAGER_section)) {
          unset($_SESSION['Pager']);
***************
*** 1463,1467 ****
  
        $tags['LISTINGTITLE'] = $_SESSION['translate']->it('Subscribed Users');
!     
        $data = array();
        if($result != NULL) {
--- 1463,1467 ----
  
        $tags['LISTINGTITLE'] = $_SESSION['translate']->it('Subscribed Users');
! 
        $data = array();
        if($result != NULL) {
***************
*** 1475,1479 ****
  	    $tags_row['EMAIL'] = $row['email'];
  	    $tags_row['DATE'] = $row['dateSubscribed'];
! 	      
  	    if($row['active']) {
  	      $tags_row['ACTIVE'] = $_SESSION['translate']->it('Yes');
--- 1475,1479 ----
  	    $tags_row['EMAIL'] = $row['email'];
  	    $tags_row['DATE'] = $row['dateSubscribed'];
! 
  	    if($row['active']) {
  	      $tags_row['ACTIVE'] = $_SESSION['translate']->it('Yes');
***************
*** 1499,1503 ****
  	    $tags_row['EMAIL'] = $row['email'];
  	    $tags_row['DATE'] = $row['dateSubscribed'];
! 	      
  	    if($row['active']) {
  	      $tags_row['ACTIVE'] = $_SESSION['translate']->it('Yes');
--- 1499,1503 ----
  	    $tags_row['EMAIL'] = $row['email'];
  	    $tags_row['DATE'] = $row['dateSubscribed'];
! 
  	    if($row['active']) {
  	      $tags_row['ACTIVE'] = $_SESSION['translate']->it('Yes');
***************
*** 1520,1524 ****
        }
  
!       if($_SESSION['Pager']) {
          $_SESSION['Pager']->pageData();
  
--- 1520,1524 ----
        }
  
!       if(isset($_SESSION['Pager'])) {
          $_SESSION['Pager']->pageData();
  
***************
*** 1627,1632 ****
      }
    }// END FUNC showAnonBlock
!   
!   
    /**
   * Adds an anonymous user to a mailing list
--- 1627,1632 ----
      }
    }// END FUNC showAnonBlock
! 
! 
    /**
   * Adds an anonymous user to a mailing list
***************
*** 1638,1644 ****
    function subscribeAnon($admin = NULL) {
      $title = $_SESSION['translate']->it('Mailing Lists');
!     
      $result = $GLOBALS['core']->sqlSelect('mod_mailinglists_lists', 'id', $_REQUEST['list']);
!     
      if((PHPWS_Text::isValidInput($_REQUEST['emailAddress'], 'email')) && ($result != NULL)) {
        $userResult = $GLOBALS['core']->sqlSelect('mod_users', 'email', $_REQUEST['emailAddress']);
--- 1638,1644 ----
    function subscribeAnon($admin = NULL) {
      $title = $_SESSION['translate']->it('Mailing Lists');
! 
      $result = $GLOBALS['core']->sqlSelect('mod_mailinglists_lists', 'id', $_REQUEST['list']);
! 
      if((PHPWS_Text::isValidInput($_REQUEST['emailAddress'], 'email')) && ($result != NULL)) {
        $userResult = $GLOBALS['core']->sqlSelect('mod_users', 'email', $_REQUEST['emailAddress']);
***************
*** 1653,1657 ****
          else {
            $GLOBALS['core']->sqlInsert(array('email'=>$_REQUEST['emailAddress'],'html'=>$_REQUEST['format'],'listID'=>$_REQUEST['list'],'active'=>0,'activeKey'=>$key,'dateSubscribed'=>date('Y-m-d')), 'mod_mailinglists_anon_subscribers');
!         
            $fromName = $result[0]['fromName'];
            $fromEmail = $result[0]['fromEmail'];
--- 1653,1657 ----
          else {
            $GLOBALS['core']->sqlInsert(array('email'=>$_REQUEST['emailAddress'],'html'=>$_REQUEST['format'],'listID'=>$_REQUEST['list'],'active'=>0,'activeKey'=>$key,'dateSubscribed'=>date('Y-m-d')), 'mod_mailinglists_anon_subscribers');
! 
            $fromName = $result[0]['fromName'];
            $fromEmail = $result[0]['fromEmail'];
***************
*** 1664,1668 ****
            $emailSubject = $_SESSION['translate']->it('Confirmation Email') . ': ' . $result[0]['name'];
            mail($_REQUEST['emailAddress'], $emailSubject, $message, $headers);
!       
            $content = $_SESSION['translate']->it('Please check your email to confirm your subscription.');
          }
--- 1664,1668 ----
            $emailSubject = $_SESSION['translate']->it('Confirmation Email') . ': ' . $result[0]['name'];
            mail($_REQUEST['emailAddress'], $emailSubject, $message, $headers);
! 
            $content = $_SESSION['translate']->it('Please check your email to confirm your subscription.');
          }
***************
*** 1675,1679 ****
        $content = $_SESSION['translate']->it('Error! The email address you submitted is malformed. Please click the back button and try again.');
      }
!     
      if($admin) {
        $this->subscriberAdmin($_REQUEST['list'], $content);
--- 1675,1679 ----
        $content = $_SESSION['translate']->it('Error! The email address you submitted is malformed. Please click the back button and try again.');
      }
! 
      if($admin) {
        $this->subscriberAdmin($_REQUEST['list'], $content);
***************
*** 1684,1689 ****
      }
    }// END FUNC subscribeAnon
!   
!   
    /**
   * Echos a single email
--- 1684,1689 ----
      }
    }// END FUNC subscribeAnon
! 
! 
    /**
   * Echos a single email
***************
*** 1702,1707 ****
      }
    }// END FUNC viewLimbo
!   
!   
    /**
   * Rejects an email from being sent
--- 1702,1707 ----
      }
    }// END FUNC viewLimbo
! 
! 
    /**
   * Rejects an email from being sent
***************
*** 1714,1719 ****
      $GLOBALS['core']->sqlDelete('mod_mailinglists_limbo', id, $id);
    }// END FUNC refuse
!   
!   
    /**
   * Calls send function after email approved.
--- 1714,1719 ----
      $GLOBALS['core']->sqlDelete('mod_mailinglists_limbo', id, $id);
    }// END FUNC refuse
! 
! 
    /**
   * Calls send function after email approved.
***************
*** 1730,1735 ****
      PHPWS_mailinglists::doSendEmail($result[0]['listID'], $result[0]['sentBy'], 0);
    }// END FUNC approve
!   
!   
   /**
   * Lists the items that can be imported
--- 1730,1735 ----
      PHPWS_mailinglists::doSendEmail($result[0]['listID'], $result[0]['sentBy'], 0);
    }// END FUNC approve
! 
! 
   /**
   * Lists the items that can be imported
***************
*** 1750,1754 ****
  
        $tags['TEXT'] = $_SESSION['translate']->it('Select an item to import');
!       
        if($GLOBALS['core']->moduleExists('article')) {
          $tags['ARTICLE_LABEL'] = $_SESSION['translate']->it('Articles');
--- 1750,1754 ----
  
        $tags['TEXT'] = $_SESSION['translate']->it('Select an item to import');
! 
        if($GLOBALS['core']->moduleExists('article')) {
          $tags['ARTICLE_LABEL'] = $_SESSION['translate']->it('Articles');
***************
*** 1809,1813 ****
  	    $tags_row['TITLE'] = '<a href="index.php?module=mailinglists&amp;op=doImport&amp;list=';
  	    $tags_row['TITLE'] .= $list . '&amp;mod=calendar&amp;id=' . $row['id'] . '">' . $row['title'] . '</a>';
! 	    
  	    if ($row['startTime'] == 9999){
                $hour = 12;
--- 1809,1813 ----
  	    $tags_row['TITLE'] = '<a href="index.php?module=mailinglists&amp;op=doImport&amp;list=';
  	    $tags_row['TITLE'] .= $list . '&amp;mod=calendar&amp;id=' . $row['id'] . '">' . $row['title'] . '</a>';
! 
  	    if ($row['startTime'] == 9999){
                $hour = 12;