Use ternary operator where applicable

Aleksander Machniak

2015-11-16 8271597836eeb9b6f50062c1ce6d685cb61e0e72

 program/steps/addressbook/func.inc

@@ -234,7 +234,7 @@
        if ($source['class_name'])
            $class_name .= ' ' . $source['class_name'];

        $name = !empty($source['name']) ? $source['name'] : $id;
        $name = $source['name'] ?: $id;
        $out .= sprintf($line_templ,
            rcube_utils::html_identifier($id, true),
            $class_name,
@@ -292,7 +292,7 @@
            rcube_utils::html_identifier('S'.$id, true),
            join(' ', $classes),
            $id,
            $js_id, (!empty($source['name']) ? rcube::Q($source['name']) : rcube::Q($id))
            $js_id, rcube::Q($source['name'] ?: $id)
        );
    }

@@ -385,7 +385,7 @@

        $source_id  = $OUTPUT->get_env('source');
        $a_row_cols = array();
        $classes    = array($row['_type'] ? $row['_type'] : 'person');
        $classes    = array($row['_type'] ?: 'person');

        // build contact ID with source ID
        if (isset($row['sourceid'])) {
@@ -485,7 +485,7 @@
        $out = $RCMAIL->gettext('nocontactsfound');
    else
        $out = $RCMAIL->gettext(array(
            'name'  => $_SESSION['contactcountdisplay'] ? $_SESSION['contactcountdisplay'] : 'contactsfromto',
            'name'  => $_SESSION['contactcountdisplay'] ?: 'contactsfromto',
            'vars'  => array(
            'from'  => $result->first + 1,
            'to'    => min($result->count, $result->first + $PAGE_SIZE),
@@ -660,7 +660,7 @@
                        }
                    }
                    else {
                        $values = $record[$fullkey] ? $record[$fullkey] : $record[$field];
                        $values   = $record[$fullkey] ?: $record[$field];
                        $subtypes = null;
                    }
                }
@@ -687,7 +687,7 @@
                        $template = $RCMAIL->config->get($col . '_template', '{'.join('} {', array_keys($colprop['childs'])).'}');
                        foreach ($colprop['childs'] as $childcol => $cp) {
                            if (!empty($val) && is_array($val)) {
                                $childvalue = $val[$childcol] ? $val[$childcol] : $val[$j];
                                $childvalue = $val[$childcol] ?: $val[$j];
                            }
                            else {
                                $childvalue = '';