Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
D
drupal
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Custom Issue Tracker
Custom Issue Tracker
Labels
Merge Requests
222
Merge Requests
222
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
project
drupal
Commits
e08abdd2
Commit
e08abdd2
authored
Dec 23, 2007
by
Gábor Hojtsy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#194946
by dmitrig01, Pasqualle: christmas cleanup (some code style issues fixed)
parent
0d89694e
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
51 additions
and
53 deletions
+51
-53
includes/theme.inc
includes/theme.inc
+1
-1
includes/xmlrpc.inc
includes/xmlrpc.inc
+7
-6
modules/aggregator/aggregator.module
modules/aggregator/aggregator.module
+4
-17
modules/color/color.module
modules/color/color.module
+5
-3
modules/profile/profile.module
modules/profile/profile.module
+9
-7
modules/user/user.admin.inc
modules/user/user.admin.inc
+25
-19
No files found.
includes/theme.inc
View file @
e08abdd2
...
...
@@ -754,7 +754,7 @@ function drupal_find_theme_functions($cache, $prefixes) {
function
drupal_find_theme_templates
(
$cache
,
$extension
,
$path
)
{
$templates
=
array
();
// Escape the
dot
s in the extension.
// Escape the
period
s in the extension.
$regex
=
str_replace
(
'.'
,
'\.'
,
$extension
)
.
'$'
;
// Because drupal_system_listing works the way it does, we check for real
...
...
includes/xmlrpc.inc
View file @
e08abdd2
<?php
// $Id$
/*
Drupal XML-RPC library. Based on the IXR - The Incutio XML-RPC Library - (c) Incutio Ltd 2002-2005
Version 1.7 (beta) - Simon Willison, 23rd May 2005
Site: http://scripts.incutio.com/xmlrpc/
Manual: http://scripts.incutio.com/xmlrpc/manual.php
This version is made available under the GNU GPL License
/**
* @file
* Drupal XML-RPC library. Based on the IXR - The Incutio XML-RPC Library - (c) Incutio Ltd 2002-2005
* Version 1.7 (beta) - Simon Willison, 23rd May 2005
* Site: http://scripts.incutio.com/xmlrpc/
* Manual: http://scripts.incutio.com/xmlrpc/manual.php
* This version is made available under the GNU GPL License
*/
/**
...
...
modules/aggregator/aggregator.module
View file @
e08abdd2
...
...
@@ -606,21 +606,14 @@ function aggregator_refresh($feed) {
case
307
:
// Filter the input data:
if
(
aggregator_parse_feed
(
$result
->
data
,
$feed
))
{
$modified
=
empty
(
$result
->
headers
[
'Last-Modified'
])
?
0
:
strtotime
(
$result
->
headers
[
'Last-Modified'
]);
/*
** Prepare the channel data:
*/
// Prepare the channel data.
foreach
(
$channel
as
$key
=>
$value
)
{
$channel
[
$key
]
=
trim
(
$value
);
}
/*
** Prepare the image data (if any):
*/
// Prepare the image data (if any).
foreach
(
$image
as
$key
=>
$value
)
{
$image
[
$key
]
=
trim
(
$value
);
}
...
...
@@ -634,16 +627,10 @@ function aggregator_refresh($feed) {
}
$etag
=
empty
(
$result
->
headers
[
'ETag'
])
?
''
:
$result
->
headers
[
'ETag'
];
/*
** Update the feed data:
*/
// Update the feed data.
db_query
(
"UPDATE
{
aggregator_feed
}
SET url = '%s', checked = %d, link = '%s', description = '%s', image = '%s', etag = '%s', modified = %d WHERE fid = %d"
,
$feed
[
'url'
],
time
(),
$channel
[
'LINK'
],
$channel
[
'DESCRIPTION'
],
$image
,
$etag
,
$modified
,
$feed
[
'fid'
]);
/*
** Clear the cache:
*/
// Clear the cache.
cache_clear_all
();
watchdog
(
'aggregator'
,
'There is new syndicated content from %site.'
,
array
(
'%site'
=>
$feed
[
'title'
]));
...
...
modules/color/color.module
View file @
e08abdd2
...
...
@@ -627,9 +627,11 @@ function _color_hsl2rgb($hsl) {
$l
=
$hsl
[
2
];
$m2
=
(
$l
<=
0.5
)
?
$l
*
(
$s
+
1
)
:
$l
+
$s
-
$l
*
$s
;
$m1
=
$l
*
2
-
$m2
;
return
array
(
_color_hue2rgb
(
$m1
,
$m2
,
$h
+
0.33333
),
_color_hue2rgb
(
$m1
,
$m2
,
$h
),
_color_hue2rgb
(
$m1
,
$m2
,
$h
-
0.33333
));
return
array
(
_color_hue2rgb
(
$m1
,
$m2
,
$h
+
0.33333
),
_color_hue2rgb
(
$m1
,
$m2
,
$h
),
_color_hue2rgb
(
$m1
,
$m2
,
$h
-
0.33333
),
);
}
/**
...
...
modules/profile/profile.module
View file @
e08abdd2
...
...
@@ -266,13 +266,15 @@ function profile_view_field($user, $field) {
// Note: Avoid PHP's date() because it does not handle dates before
// 1970 on Windows. This would make the date field useless for e.g.
// birthdays.
$replace
=
array
(
'd'
=>
sprintf
(
'%02d'
,
$value
[
'day'
]),
'j'
=>
$value
[
'day'
],
'm'
=>
sprintf
(
'%02d'
,
$value
[
'month'
]),
'M'
=>
map_month
(
$value
[
'month'
]),
'Y'
=>
$value
[
'year'
],
'H:i'
=>
NULL
,
'g:ia'
=>
NULL
);
$replace
=
array
(
'd'
=>
sprintf
(
'%02d'
,
$value
[
'day'
]),
'j'
=>
$value
[
'day'
],
'm'
=>
sprintf
(
'%02d'
,
$value
[
'month'
]),
'M'
=>
map_month
(
$value
[
'month'
]),
'Y'
=>
$value
[
'year'
],
'H:i'
=>
NULL
,
'g:ia'
=>
NULL
,
);
return
strtr
(
$format
,
$replace
);
case
'list'
:
$values
=
split
(
"[,
\n\r
]"
,
$value
);
...
...
modules/user/user.admin.inc
View file @
e08abdd2
...
...
@@ -44,10 +44,11 @@ function user_filter_form() {
$filters
=
user_filters
();
$i
=
0
;
$form
[
'filters'
]
=
array
(
'#type'
=>
'fieldset'
,
'#title'
=>
t
(
'Show only users where'
),
'#theme'
=>
'user_filters'
,
);
$form
[
'filters'
]
=
array
(
'#type'
=>
'fieldset'
,
'#title'
=>
t
(
'Show only users where'
),
'#theme'
=>
'user_filters'
,
);
foreach
(
$session
as
$filter
)
{
list
(
$type
,
$value
)
=
$filter
;
// Merge an array of arrays into one if necessary.
...
...
@@ -63,24 +64,29 @@ function user_filter_form() {
foreach
(
$filters
as
$key
=>
$filter
)
{
$names
[
$key
]
=
$filter
[
'title'
];
$form
[
'filters'
][
'status'
][
$key
]
=
array
(
'#type'
=>
'select'
,
'#options'
=>
$filter
[
'options'
],
);
$form
[
'filters'
][
'status'
][
$key
]
=
array
(
'#type'
=>
'select'
,
'#options'
=>
$filter
[
'options'
],
);
}
$form
[
'filters'
][
'filter'
]
=
array
(
'#type'
=>
'radios'
,
'#options'
=>
$names
,
);
$form
[
'filters'
][
'buttons'
][
'submit'
]
=
array
(
'#type'
=>
'submit'
,
'#value'
=>
(
count
(
$session
)
?
t
(
'Refine'
)
:
t
(
'Filter'
))
);
$form
[
'filters'
][
'filter'
]
=
array
(
'#type'
=>
'radios'
,
'#options'
=>
$names
,
);
$form
[
'filters'
][
'buttons'
][
'submit'
]
=
array
(
'#type'
=>
'submit'
,
'#value'
=>
(
count
(
$session
)
?
t
(
'Refine'
)
:
t
(
'Filter'
)),
);
if
(
count
(
$session
))
{
$form
[
'filters'
][
'buttons'
][
'undo'
]
=
array
(
'#type'
=>
'submit'
,
'#value'
=>
t
(
'Undo'
)
);
$form
[
'filters'
][
'buttons'
][
'reset'
]
=
array
(
'#type'
=>
'submit'
,
'#value'
=>
t
(
'Reset'
)
);
$form
[
'filters'
][
'buttons'
][
'undo'
]
=
array
(
'#type'
=>
'submit'
,
'#value'
=>
t
(
'Undo'
),
);
$form
[
'filters'
][
'buttons'
][
'reset'
]
=
array
(
'#type'
=>
'submit'
,
'#value'
=>
t
(
'Reset'
),
);
}
drupal_add_js
(
'misc/form.js'
,
'core'
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment