diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2014-03-08 15:56:54 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2014-03-08 15:56:54 +0100 |
| commit | faa9a74324942e9be4682067208e1ef3a8f332a7 (patch) | |
| tree | afbeafd9ae85211015873e2aa64c19f3a25358e2 | |
| parent | 859290ec1f79840db031da3af10f25792e98623d (diff) | |
| parent | 20ebf987b4383921be5f3b7a0222a212aad138b9 (diff) | |
Merge pull request #447 from aledeg/share
Sharing optimization
| -rw-r--r-- | app/Models/Configuration.php | 15 | ||||
| -rw-r--r-- | app/Models/Share.php | 3 | ||||
| -rw-r--r-- | app/views/configure/sharing.phtml | 2 | ||||
| -rw-r--r-- | app/views/helpers/view/normal_view.phtml | 2 |
4 files changed, 13 insertions, 9 deletions
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php index 827a1d166..80031369e 100644 --- a/app/Models/Configuration.php +++ b/app/Models/Configuration.php @@ -193,7 +193,9 @@ class FreshRSS_Configuration { if (!is_array($value)) { continue; } - if (array_key_exists('url', $value)) { + + // Verify URL and add default value when needed + if (isset($value['url'])) { $is_url = ( filter_var ($value['url'], FILTER_VALIDATE_URL) || (version_compare(PHP_VERSION, '5.3.3', '<') && @@ -203,10 +205,15 @@ class FreshRSS_Configuration { if (!$is_url) { continue; } - if (!array_key_exists('name', $value) || strcmp($value['name'], '') === 0) { - $value['name'] = $value['type']; - } + } else { + $value['url'] = null; } + + // Add a default name + if (empty($value['name'])) { + $value['name'] = $value['type']; + } + $this->data['sharing'][] = $value; } } diff --git a/app/Models/Share.php b/app/Models/Share.php index 887fcef05..b146db722 100644 --- a/app/Models/Share.php +++ b/app/Models/Share.php @@ -3,9 +3,6 @@ class FreshRSS_Share { static public function generateUrl($options, $selected, $link, $title) { - if (!array_key_exists('url', $selected)) { - $selected['url'] = ''; - } $share = $options[$selected['type']]; $matches = array( '~URL~', diff --git a/app/views/configure/sharing.phtml b/app/views/configure/sharing.phtml index b50e6ddc4..ddb404ef5 100644 --- a/app/views/configure/sharing.phtml +++ b/app/views/configure/sharing.phtml @@ -35,7 +35,7 @@ <a href='#' class='share add'><?php echo FreshRSS_Themes::icon('add'); ?></a> <select> <?php foreach($this->conf->shares as $key => $params):?> - <option value='<?php echo $key?>' data-form='<?php echo $params['form']?>' data-help='<?php echo $params['help']?>'><?php echo Minz_Translate::t($key) ?></option> + <option value='<?php echo $key?>' data-form='<?php echo $params['form']?>' data-help='<?php if (!empty($params['help'])) {echo $params['help'];}?>'><?php echo Minz_Translate::t($key) ?></option> <?php endforeach; ?> </select> </div> diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml index ff535c60a..9fd06ebae 100644 --- a/app/views/helpers/view/normal_view.phtml +++ b/app/views/helpers/view/normal_view.phtml @@ -138,7 +138,7 @@ if (!empty($this->entries)) { <?php foreach ($sharing as $share) :?> <li class="item share"> <a target="_blank" href="<?php echo FreshRSS_Share::generateUrl($this->conf->shares, $share, $item->link(), $item->title() . ' . ' . $feed->name())?>"> - <?php echo array_key_exists('name', $share) ? $share['name'] : Minz_Translate::t ($share['type']);?> + <?php echo Minz_Translate::t ($share['name']);?> </a> </li> <?php endforeach;?> |