Changeset 8916

Show
Ignore:
Timestamp:
02/23/10 13:43:05 (2 years ago)
Author:
mickecarlsson
Message:

Close #4073 add check for included files, clean up some php warnings in bilkextensions

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • contributed_modules/modules/bulkextensions/functions.inc.php

    r7779 r8916  
    1616// 
    1717//    Copyright 2008 sasargen 
    18 //    Portions Copyright 2009 Mikael Carlsson, mickecamino@gmail.com 
     18//    Portions Copyright 2009, 2010 Mikael Carlsson, mickecamino@gmail.com 
    1919// 
    2020 
    2121/* functions.inc.php - functions for BulkExtensions module. */ 
    22 include_once("modules/voicemail/functions.inc.php");    // for using voicemail module functions to retrieve voicemail settings 
    23 include_once("modules/dictate/functions.inc.php");    // for using dictation services functions to retrieve dictation settings 
    24 include_once("modules/languages/functions.inc.php");    // for using languages functions to retrieve language setting 
    25 include_once("modules/findmefollow/functions.inc.php"); // for using findmefollow functions to retreive follow me settings 
     22if (file_exists("modules/voicemail/functions.inc.php")) { 
     23    include_once("modules/voicemail/functions.inc.php");  // for using voicemail module functions to retrieve voicemail settings 
     24    }; 
     25if (file_exists("modules/dictate/functions.inc.php")) { 
     26    include_once("modules/dictate/functions.inc.php");    // for using dictation services functions to retrieve dictation settings 
     27    }; 
     28if (file_exists("modules/languages/functions.inc.php")) { 
     29    include_once("modules/languages/functions.inc.php");  // for using languages functions to retrieve language setting 
     30    }; 
     31if (file_exists("modules/findmefollow/functions.inc.php")) { 
     32    include_once("modules/findmefollow/functions.inc.php"); // for using findmefollow functions to retreive follow me settings 
     33    }; 
    2634 
    2735/* Verify existence of voicemail, dictate, languages and findmefollow functions. */ 
    …… 
    320328    for ($i = 0; $i < 5; $i++) { 
    321329      if (isset($csv_data[$i])) { 
    322        $table[$k][$i] .= $csv_data[$i]; 
     330           $table[$k][$i] = $csv_data[$i]; 
    323331      } else { 
    324332        $table[$k][$i] = ""; 

  • contributed_modules/modules/bulkextensions/page.bulkextensions.php

    r7811 r8916  
    2727$change = false; 
    2828$output = ""; 
    29  
    30 if ($_REQUEST["csv_type"] == "output") { 
     29$action = isset($_REQUEST["csv_type"])?$_REQUEST["csv_type"]:''; 
     30 
     31if ($action == "output") { 
    3132  exportextensions_allusers(); 
    32 } elseif ($_REQUEST["csv_type"] == "input") { 
     33} elseif ($action == "input") { 
    3334  // Set email notification variables 
    3435  if (isset($_REQUEST["default_email"])) {