Changeset 9345

Show
Ignore:
Timestamp:
03/20/10 12:19:59 (3 years ago)
Author:
mickecarlsson
Message:

Re #4150, unset empty variables, will update more fields after I have done some more testing

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • contributed_modules/modules/bulkextensions/CHANGES

    r8600 r9345  
    66   Copy table.csv to i18n/<language>/LC_MESSAGE/, translate the text in the file. 
    77   Note: Translate only the text, not labels. All labels in position 1 must remain as they are. 
     8Fixed bug when setting one entry in a field in the csv file all fields that where empty got an empty line in the config files 
    89    
    910    

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

    r8916 r9345  
    242242 
    243243        if ($aFields["devinfo_channel"][0]) { 
    244           $vars["devinfo_channel"] = trim($aInfo[$aFields["devinfo_channel"][1]]); 
     244              if (!isset($aInfo[$aFields["devinfo_channel"][1]]) || ($aInfo[$aFields["devinfo_channel"][1]] == "")){ 
     245                unset($vars["devinfo_channel"]); 
     246            } 
     247              else { 
     248            $vars["devinfo_channel"] = trim($aInfo[$aFields["devinfo_channel"][1]]); 
     249            } 
    245250        } 
    246251 
    …… 
    250255 
    251256        if ($aFields["devinfo_notransfer"][0]) { 
    252           $vars["devinfo_notransfer"] = trim($aInfo[$aFields["devinfo_notransfer"][1]]); 
     257            if (!isset($aInfo[$aFields["devinfo_notransfer"][1]]) || ($aInfo[$aFields["devinfo_notransfer"][1]] == "")){ 
     258                unset($vars["devinfo_notransfer"]); 
     259            } 
     260              else { 
     261            $vars["devinfo_notransfer"] = trim($aInfo[$aFields["devinfo_notransfer"][1]]); 
     262            } 
    253263        } 
    254264 
    …… 
    266276 
    267277        if ($aFields["devinfo_immediate"][0]) { 
    268           $vars["devinfo_immediate"] = trim($aInfo[$aFields["devinfo_immediate"][1]]); 
     278            if (!isset($aInfo[$aFields["devinfo_immediate"][1]]) || ($aInfo[$aFields["devinfo_immediate"][1]] == "")){ 
     279                unset($vars["devinfo_immediate"]); 
     280            } 
     281              else { 
     282            $vars["devinfo_immediate"] = trim($aInfo[$aFields["devinfo_immediate"][1]]); 
     283            } 
    269284        } 
    270285 
    271286        if ($aFields["devinfo_signalling"][0]) { 
    272           $vars["devinfo_signalling"] = trim($aInfo[$aFields["devinfo_signalling"][1]]); 
     287            if (!isset($aInfo[$aFields["devinfo_signalling"][1]]) || ($aInfo[$aFields["devinfo_signalling"][1]] == "")){ 
     288                unset($vars["devinfo_signalling"]); 
     289            } 
     290              else { 
     291            $vars["devinfo_signalling"] = trim($aInfo[$aFields["devinfo_signalling"][1]]); 
     292            } 
    273293        } 
    274294 
    275295        if ($aFields["devinfo_echocancel"][0]) { 
    276           $vars["devinfo_echocancel"] = trim($aInfo[$aFields["devinfo_echocancel"][1]]); 
     296            if (!isset($aInfo[$aFields["devinfo_echocancel"][1]]) || ($aInfo[$aFields["devinfo_echocancel"][1]] == "")){ 
     297                unset($vars["devinfo_echocancel"]); 
     298            } 
     299              else { 
     300            $vars["devinfo_echocancel"] = trim($aInfo[$aFields["devinfo_echocancel"][1]]); 
     301            } 
    277302        } 
    278303 
    279304        if ($aFields["devinfo_echocancelwhenbridged"][0]) { 
    280           $vars["devinfo_echocancelwhenbridged"] = trim($aInfo[$aFields["devinfo_echocancelwhenbridged"][1]]); 
     305            if (!isset($aInfo[$aFields["devinfo_echocancelwhenbridged"][1]]) || ($aInfo[$aFields["devinfo_echocancelwhenbridged"][1]] == "")){ 
     306                unset($vars["devinfo_echocancelwhenbridged"]); 
     307            } 
     308              else { 
     309            $vars["devinfo_echocancelwhenbridged"] = trim($aInfo[$aFields["devinfo_echocancelwhenbridged"][1]]); 
     310            } 
    281311        } 
    282312 
    283313        if ($aFields["devinfo_echotraining"][0]) { 
    284           $vars["devinfo_echotraining"] = trim($aInfo[$aFields["devinfo_echotraining"][1]]); 
     314            if (!isset($aInfo[$aFields["devinfo_echotraining"][1]]) || ($aInfo[$aFields["devinfo_echotraining"][1]] == "")){ 
     315                unset($vars["devinfo_echotraining"]); 
     316            } 
     317              else { 
     318            $vars["devinfo_echotraining"] = trim($aInfo[$aFields["devinfo_echotraining"][1]]); 
     319            } 
    285320        } 
    286321 
    287322        if ($aFields["devinfo_busydetect"][0]) { 
    288           $vars["devinfo_busydetect"] = trim($aInfo[$aFields["devinfo_busydetect"][1]]); 
     323            if (!isset($aInfo[$aFields["devinfo_busydetect"][1]]) || ($aInfo[$aFields["devinfo_busydetect"][1]] == "")){ 
     324                unset($vars["devinfo_busydetect"]); 
     325            } 
     326              else { 
     327            $vars["devinfo_busydetect"] = trim($aInfo[$aFields["devinfo_busydetect"][1]]); 
     328            } 
    289329        } 
    290330 
    291331        if ($aFields["devinfo_busycount"][0]) { 
    292           $vars["devinfo_busycount"] = trim($aInfo[$aFields["devinfo_busycount"][1]]); 
     332            if (!isset($aInfo[$aFields["devinfo_busycount"][1]]) || ($aInfo[$aFields["devinfo_busycount"][1]] == "")){ 
     333                unset($vars["devinfo_busycount"]); 
     334            } 
     335              else { 
     336            $vars["devinfo_busycount"] = trim($aInfo[$aFields["devinfo_busycount"][1]]); 
     337            } 
    293338        } 
    294339 
    295340        if ($aFields["devinfo_callprogress"][0]) { 
    296           $vars["devinfo_callprogress"] = trim($aInfo[$aFields["devinfo_callprogress"][1]]); 
     341            if (!isset($aInfo[$aFields["devinfo_callprogress"][1]]) || ($aInfo[$aFields["devinfo_callprogress"][1]] == "")){ 
     342                unset($vars["devinfo_callprogress"]); 
     343            } 
     344              else { 
     345            $vars["devinfo_callprogress"] = trim($aInfo[$aFields["devinfo_callprogress"][1]]); 
     346            } 
    297347        } 
    298348 
    …… 
    318368 
    319369        if ($aFields["devinfo_callgroup"][0]) { 
    320           $vars["devinfo_callgroup"] = trim($aInfo[$aFields["devinfo_callgroup"][1]]); 
     370              if (!isset($aInfo[$aFields["devinfo_callgroup"][1]]) || ($aInfo[$aFields["devinfo_callgroup"][1]] == "")){ 
     371                unset($vars["devinfo_callgroup"]); 
     372            } 
     373              else { 
     374            $vars["devinfo_callgroup"] = trim($aInfo[$aFields["devinfo_callgroup"][1]]); 
     375            } 
    321376        } 
    322377 
    323378        if ($aFields["devinfo_pickupgroup"][0]) { 
    324           $vars["devinfo_pickupgroup"] = trim($aInfo[$aFields["devinfo_pickupgroup"][1]]); 
     379              if (!isset($aInfo[$aFields["devinfo_pickupgroup"][1]]) || ($aInfo[$aFields["devinfo_pickupgroup"][1]] == "")){ 
     380              unset($vars["devinfo_pickupgroup"]); 
     381              } 
     382              else { 
     383                   $vars["devinfo_pickupgroup"] = trim($aInfo[$aFields["devinfo_pickupgroup"][1]]); 
     384                   } 
    325385        } 
    326386 
    …… 
    338398 
    339399        if ($aFields["devinfo_accountcode"][0]) { 
    340           $vars["devinfo_accountcode"] = trim($aInfo[$aFields["devinfo_accountcode"][1]]); 
     400              if (!isset($aInfo[$aFields["devinfo_accountcode"][1]]) || ($aInfo[$aFields["devinfo_accountcode"][1]] == "")){ 
     401                unset($vars["devinfo_accountcode"]); 
     402            } 
     403              else { 
     404            $vars["devinfo_accountcode"] = trim($aInfo[$aFields["devinfo_accountcode"][1]]); 
     405            } 
    341406        } 
    342407 
    …… 
    345410        } 
    346411 
    347           if ($aFields["devinfo_deny"][0]) { 
     412              if ($aFields["devinfo_deny"][0]) { 
    348413          $vars["devinfo_deny"] = trim($aInfo[$aFields["devinfo_deny"][1]]); 
    349414        } 
    350415 
    351          if ($aFields["devinfo_permit"][0]) { 
     416       if ($aFields["devinfo_permit"][0]) { 
    352417          $vars["devinfo_permit"] = trim($aInfo[$aFields["devinfo_permit"][1]]); 
    353418        } 
    …… 
    530595        } 
    531596 
    532         // If deny and permit are empty fill in default 0.0.0.0/0.0.0.0 
    533         if (!isset($vars["devinfo_deny"]) || ($vars["devinfo_deny"] == "")){ 
    534             $vars["devinfo_deny"] = "0.0.0.0/0.0.0.0";  // default value 
    535             } 
    536    
    537         if (!isset($vars["devinfo_permit"]) || ($vars["devinfo_permit"] == "")){ 
    538             $vars["devinfo_permit"] = "0.0.0.0/0.0.0.0";  // default value 
    539             } 
    540              
     597              if ($aFields["devinfo_deny"][0]) { 
     598        // If field is empty fill in default 0.0.0.0/0.0.0.0 
     599                if (!isset($aInfo[$aFields["devinfo_deny"][1]]) || ($aInfo[$aFields["devinfo_deny"][1]] == "")){ 
     600          $vars["devinfo_deny"] = "0.0.0.0/0.0.0.0";  // default value 
     601          } 
     602          else { 
     603              $vars["devinfo_deny"] = trim($aInfo[$aFields["devinfo_deny"][1]]); 
     604            } 
     605        } 
     606 
     607              if ($aFields["devinfo_permit"][0]) { 
     608        // If field is empty fill in default 0.0.0.0/0.0.0.0               
     609              if (!isset($aInfo[$aFields["devinfo_deny"][1]]) || ($aInfo[$aFields["devinfo_permit"][1]] == "")){ 
     610          $vars["devinfo_permit"] = "0.0.0.0/0.0.0.0"; // default value 
     611          } 
     612          else { 
     613              $vars["devinfo_permit"] = trim($aInfo[$aFields["devinfo_permit"][1]]); 
     614              } 
     615        } 
     616          
    541617        /* Needed fields for creating a Follow Me are account (aka grpnum), strategy, grptime, */ 
    542618        /* grplist and pre_ring.                     */