Mercurial > defr > drupal > core

comparison modules/aggregator/aggregator.admin.inc @ 7:fff6d4c8c043 6.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Drupal 6.3
author Franck Deroche <webmaster@defr.org>
date Tue, 23 Dec 2008 14:30:28 +0100
parents c1f4ac30525a
children
comparison
equal deleted inserted replaced
6:2cfdc3c92142 7:fff6d4c8c043
1 <?php 1 <?php
2 // $Id: aggregator.admin.inc,v 1.7 2008/01/10 22:47:17 goba Exp $ 2 // $Id: aggregator.admin.inc,v 1.7.2.1 2008/04/25 21:11:57 goba Exp $
3 3
4 /** 4 /**
5 * @file 5 * @file
6 * Admin page callbacks for the aggregator module. 6 * Admin page callbacks for the aggregator module.
7 */ 7 */
115 if (!valid_url($form_state['values']['url'], TRUE)) { 115 if (!valid_url($form_state['values']['url'], TRUE)) {
116 form_set_error('url', t('The URL %url is invalid. Please enter a fully-qualified URL, such as http://www.example.com/feed.xml.', array('%url' => $form_state['values']['url']))); 116 form_set_error('url', t('The URL %url is invalid. Please enter a fully-qualified URL, such as http://www.example.com/feed.xml.', array('%url' => $form_state['values']['url'])));
117 } 117 }
118 // Check for duplicate titles. 118 // Check for duplicate titles.
119 if (isset($form_state['values']['fid'])) { 119 if (isset($form_state['values']['fid'])) {
120 $result = db_query("SELECT title, url FROM {aggregator_feed} WHERE (title = '%s' OR url='%s') AND fid != %d", $form_state['values']['title'], $form_state['values']['url'], $form_state['values']['fid']); 120 $result = db_query("SELECT title, url FROM {aggregator_feed} WHERE (title = '%s' OR url = '%s') AND fid <> %d", $form_state['values']['title'], $form_state['values']['url'], $form_state['values']['fid']);
121 } 121 }
122 else { 122 else {
123 $result = db_query("SELECT title, url FROM {aggregator_feed} WHERE title = '%s' OR url='%s'", $form_state['values']['title'], $form_state['values']['url']); 123 $result = db_query("SELECT title, url FROM {aggregator_feed} WHERE title = '%s' OR url = '%s'", $form_state['values']['title'], $form_state['values']['url']);
124 } 124 }
125 while ($feed = db_fetch_object($result)) { 125 while ($feed = db_fetch_object($result)) {
126 if (strcasecmp($feed->title, $form_state['values']['title']) == 0) { 126 if (strcasecmp($feed->title, $form_state['values']['title']) == 0) {
127 form_set_error('title', t('A feed named %feed already exists. Please enter a unique title.', array('%feed' => $form_state['values']['title']))); 127 form_set_error('title', t('A feed named %feed already exists. Please enter a unique title.', array('%feed' => $form_state['values']['title'])));
128 } 128 }
284 */ 284 */
285 function aggregator_form_category_validate($form, &$form_state) { 285 function aggregator_form_category_validate($form, &$form_state) {
286 if ($form_state['values']['op'] == t('Save')) { 286 if ($form_state['values']['op'] == t('Save')) {
287 // Check for duplicate titles 287 // Check for duplicate titles
288 if (isset($form_state['values']['cid'])) { 288 if (isset($form_state['values']['cid'])) {
289 $category = db_fetch_object(db_query("SELECT cid FROM {aggregator_category} WHERE title = '%s' AND cid != %d", $form_state['values']['title'], $form_state['values']['cid'])); 289 $category = db_fetch_object(db_query("SELECT cid FROM {aggregator_category} WHERE title = '%s' AND cid <> %d", $form_state['values']['title'], $form_state['values']['cid']));
290 } 290 }
291 else { 291 else {
292 $category = db_fetch_object(db_query("SELECT cid FROM {aggregator_category} WHERE title = '%s'", $form_state['values']['title'])); 292 $category = db_fetch_object(db_query("SELECT cid FROM {aggregator_category} WHERE title = '%s'", $form_state['values']['title']));
293 } 293 }
294 if ($category) { 294 if ($category) {