xingcheng
/
FreshRSS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Suite gestion plus fine de l'historique

Browse Source
pull/340/head
Alexandre Alapetite 11 years ago
parent 7e6d2eb6f4
commit a4b890b67f
4 changed files with 39 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      app/Controllers/configureController.php
  2. 2
      app/Models/FeedDAO.php
  3. 37
      app/views/configure/display.phtml
  4. 12
      app/views/configure/feed.phtml

7
app/Controllers/configureController.php
Unescape View File

@ -97,18 +97,13 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
$description = sanitizeHTML(Minz_Request::param('description', '', true));
$website = Minz_Request::param('website', '');
$url = Minz_Request::param('url', '');
$hist = Minz_Request::param ('keep_history', 'no');
$keep_history = intval(Minz_Request::param ('keep_history', 0));
$cat = Minz_Request::param ('category', 0);
$path = Minz_Request::param ('path_entries', '');
$priority = Minz_Request::param ('priority', 0);
$user = Minz_Request::param ('http_user', '');
$pass = Minz_Request::param ('http_pass', '');
$keep_history = false;
if ($hist == 'yes') {
$keep_history = true;
}
$httpAuth = '';
if ($user != '' || $pass != '') {
$httpAuth = $user . ':' . $pass;

2
app/Models/FeedDAO.php
Unescape View File

@ -193,7 +193,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
}
public function listFeedsOrderUpdate () {
$sql = 'SELECT id, url, pathEntries, httpAuth, keep_history FROM `' . $this->prefix . 'feed` ORDER BY lastUpdate';
$sql = 'SELECT id, name, url, pathEntries, httpAuth, keep_history FROM `' . $this->prefix . 'feed` ORDER BY lastUpdate';
$stm = $this->bd->prepare ($sql);
$stm->execute ();

37
app/views/configure/display.phtml
Unescape View File

@ -53,6 +53,13 @@
</div>
</div>
<div class="form-group form-actions">
<div class="group-controls">
<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
<button type="reset" class="btn"><?php echo Minz_Translate::t ('cancel'); ?></button>
</div>
</div>
<legend><?php echo Minz_Translate::t ('archiving_configuration'); ?></legend>
<div class="form-group">
@ -73,6 +80,13 @@
</div>
</div>
<div class="form-group form-actions">
<div class="group-controls">
<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
<button type="reset" class="btn"><?php echo Minz_Translate::t ('cancel'); ?></button>
</div>
</div>
<legend><?php echo Minz_Translate::t ('reading_configuration'); ?></legend>
<div class="form-group">
@ -173,6 +187,13 @@
</div>
</div>
<div class="form-group form-actions">
<div class="group-controls">
<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
<button type="reset" class="btn"><?php echo Minz_Translate::t ('cancel'); ?></button>
</div>
</div>
<legend><?php echo Minz_Translate::t ('reading_icons'); ?></legend>
<div class="form-group">
<table>
@ -206,7 +227,14 @@
<td><input type="checkbox" name="bottomline_link" value="yes"<?php echo $this->conf->bottomlineLink () ? ' checked="checked"' : ''; ?> /></td>
</tr>
</tbody>
</table>
</table><br />
</div>
<div class="form-group form-actions">
<div class="group-controls">
<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
<button type="reset" class="btn"><?php echo Minz_Translate::t ('cancel'); ?></button>
</div>
</div>
<legend><?php echo Minz_Translate::t ('advanced'); ?></legend>
@ -220,12 +248,5 @@
<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t('optimize_todo_sometimes'); ?>
</div>
</div>
<div class="form-group form-actions">
<div class="group-controls">
<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
<button type="reset" class="btn"><?php echo Minz_Translate::t ('cancel'); ?></button>
</div>
</div>
</form>
</div>

12
app/views/configure/feed.phtml
Unescape View File

@ -52,6 +52,12 @@
</select>
</div>
</div>
<div class="form-group form-actions">
<div class="group-controls">
<button class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
<button class="btn btn-attention confirm" formmethod="post" formaction="<?php echo Minz_Url::display (array ('c' => 'feed', 'a' => 'delete', 'params' => array ('id' => $this->flux->id ()))); ?>"><?php echo Minz_Translate::t ('delete'); ?></button>
</div>
</div>
<legend><?php echo Minz_Translate::t ('archiving_configuration'); ?></legend>
@ -84,9 +90,9 @@
<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t ('keep_history_help'); ?>
</div>
</div>
<div class="form-group">
<label class="group-name"></label>
<div class="form-group form-actions">
<div class="group-controls">
<button class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
<button class="btn btn-attention confirm" formmethod="post" formaction="<?php echo Minz_Url::display (array ('c' => 'feed', 'a' => 'truncate', 'params' => array ('id' => $this->flux->id ()))); ?>"><?php echo Minz_Translate::t ('truncate'); ?></button>
</div>
</div>
@ -123,11 +129,9 @@
</div>
</div>
<div class="form-group form-actions">
<div class="group-controls">
<button class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
<button class="btn btn-attention confirm" formmethod="post" formaction="<?php echo Minz_Url::display (array ('c' => 'feed', 'a' => 'delete', 'params' => array ('id' => $this->flux->id ()))); ?>"><?php echo Minz_Translate::t ('delete'); ?></button>
</div>
</div>
</form>

Write Preview
Loading…
Cancel
Save