replacing "&&" by "and" in if conditions

git-svn-id: http://piwigo.org/svn/trunk@31 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
z0rglub 2003-07-21 21:42:11 +00:00
parent 701b143151
commit ea4bf112f9

View file

@ -21,7 +21,7 @@ include_once( './include/init.inc.php' );
//-------------------------------------------------- access authorization check //-------------------------------------------------- access authorization check
check_cat_id( $_GET['cat'] ); check_cat_id( $_GET['cat'] );
check_login_authorization(); check_login_authorization();
if ( isset( $page['cat'] ) && is_numeric( $page['cat'] ) ) if ( isset( $page['cat'] ) and is_numeric( $page['cat'] ) )
{ {
check_restrictions( $page['cat'] ); check_restrictions( $page['cat'] );
} }
@ -432,7 +432,7 @@ if ( $page['cat'] == 'fav' )
$vtp->closeSession( $handle, 'favorite' ); $vtp->closeSession( $handle, 'favorite' );
} }
//------------------------------------ admin link for information modifications //------------------------------------ admin link for information modifications
if ( $user['status'] == "admin" && is_numeric( $page['cat'] ) ) if ( $user['status'] == "admin" and is_numeric( $page['cat'] ) )
{ {
$vtp->addSession( $handle, 'modification' ); $vtp->addSession( $handle, 'modification' );
$url = './admin/admin.php?page=infos_images&cat_id='.$page['cat']; $url = './admin/admin.php?page=infos_images&cat_id='.$page['cat'];
@ -511,7 +511,7 @@ if ( $conf['show_comments'] )
{ {
$vtp->addSession( $handle, 'comments' ); $vtp->addSession( $handle, 'comments' );
// comment registeration // comment registeration
if ( isset( $_POST['content'] ) && $_POST['content'] != '' ) if ( isset( $_POST['content'] ) and $_POST['content'] != '' )
{ {
$author = $user['username']; $author = $user['username'];
if ( $_POST['author'] != '' ) if ( $_POST['author'] != '' )
@ -539,8 +539,8 @@ if ( $conf['show_comments'] )
} }
// comment deletion // comment deletion
if ( isset( $_GET['del'] ) if ( isset( $_GET['del'] )
&& is_numeric( $_GET['del'] ) and is_numeric( $_GET['del'] )
&& $user['status'] == 'admin' ) and $user['status'] == 'admin' )
{ {
$query = 'DELETE FROM '.PREFIX_TABLE.'comments'; $query = 'DELETE FROM '.PREFIX_TABLE.'comments';
$query.= ' WHERE id = '.$_GET['del'].';'; $query.= ' WHERE id = '.$_GET['del'].';';