Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[29815] branches/6.x/lib

[Pascal K. <pa...@ku...>]

Yes Stephane !

It was really really strange before..... but my code has the same behaviour
as before ....believe me !

The indenting was very wrong before and was a trap for coders.....

I agree with you....if our rules are not ok, let's see them .....

pkdille

2010/10/6 Stephane Casset <se...@lo...>

> Le Tue, Oct 05, 2010 at 09:07:52PM +0000, pk...@us...écrivait :
> > Revision: 29815
> >
> http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=29815&view=rev
> > Author:   pkdille
> > Date:     2010-10-05 21:07:52 +0000 (Tue, 05 Oct 2010)
> >
> > Log Message:
> > -----------
> > some code cleanup (zend rules) - seen on quality.tw.o
>
> These indenting errors are unproductive and prone to BIG mistakes see
> below !
>
> I think we should dump these Zend rule from quality, that adds nothing
> to the code quality...
>
> >
> > Modified Paths:
> > --------------
> >     branches/6.x/lib/articles/artlib.php
> >     branches/6.x/lib/auth/ldap.php
> >     branches/6.x/lib/banners/bannerlib.php
> >     branches/6.x/lib/blogs/bloglib.php
> >
> > Modified: branches/6.x/lib/articles/artlib.php
> > ===================================================================
> > --- branches/6.x/lib/articles/artlib.php      2010-10-05 21:00:38 UTC
> (rev 29814)
> > +++ branches/6.x/lib/articles/artlib.php      2010-10-05 21:07:52 UTC
> (rev 29815)
> > @@ -159,11 +159,12 @@
> >                               $machine = $tikilib->httpPrefix( true ).
> $foo['path'];
> >                               $smarty->assign('mail_machine', $machine);
> >                               $parts = explode('/', $foo['path']);
> > -                             if (count($parts) > 1)
> > +                             if (count($parts) > 1) {
> >                                       unset ($parts[count($parts) - 1]);
> > -                                     $smarty->assign('mail_machine_raw',
> $tikilib->httpPrefix( true ) . implode('/', $parts));
> > -                                     sendEmailNotification($nots,
> 'watch', 'user_watch_article_post_subject.tpl', $_SERVER['SERVER_NAME'],
> 'user_watch_article_post.tpl');
> >                               }
> > +                             $smarty->assign('mail_machine_raw',
> $tikilib->httpPrefix( true ) . implode('/', $parts));
> > +                             sendEmailNotification($nots, 'watch',
> 'user_watch_article_post_subject.tpl', $_SERVER['SERVER_NAME'],
> 'user_watch_article_post.tpl');
> > +                     }
>
> Hum seems wrong no ?
> if (count($parts) > 1)
>  unset ($parts[count($parts) - 1]);
>  $smarty->assign('mail_machine_raw', $tikilib->httpPrefix( true) .
> implode('/', $parts));
>  sendEmailNotification($nots, 'watch',
> 'user_watch_article_post_subject.tpl', $_SERVER['SERVER_NAME'],
> 'user_watch_article_post.tpl');
>
> is NOT AT ALL the same as :
> if (count($parts) > 1) {
>  unset ($parts[count($parts) - 1]);
>  $smarty->assign('mail_machine_raw', $tikilib->httpPrefix( true) .
> implode('/', $parts));
>  sendEmailNotification($nots, 'watch',
> 'user_watch_article_post_subject.tpl', $_SERVER['SERVER_NAME'],
> 'user_watch_article_post.tpl');
> }
>
> But more
> if (count($parts) > 1) {
>  unset ($parts[count($parts) - 1]);
> }
>  $smarty->assign('mail_machine_raw', $tikilib->httpPrefix( true) .
> implode('/', $parts));
>  sendEmailNotification($nots, 'watch',
> 'user_watch_article_post_subject.tpl', $_SERVER['SERVER_NAME'],
> 'user_watch_article_post.tpl');
>
> >
> >                       return true;
> >               }
> > @@ -565,18 +566,19 @@
> >                       $machine = $tikilib->httpPrefix( true ).
> $foo['path'];
> >                       $smarty->assign('mail_machine', $machine);
> >                       $parts = explode('/', $foo['path']);
>
> This seems suspect too ! :(
>
> > -                     if (count($parts) > 1)
> > +                     if (count($parts) > 1) {
> >                               unset ($parts[count($parts) - 1]);
> > -                             $smarty->assign('mail_machine_raw',
> $tikilib->httpPrefix( true ). implode('/', $parts));
> > -                             sendEmailNotification($nots, 'watch',
> 'user_watch_article_post_subject.tpl', $_SERVER['SERVER_NAME'],
> 'user_watch_article_post.tpl');
> > -                             if (is_array($emails) && !empty($from) &&
> $from != $prefs['sender_email']) {
> > -                                     $nots = array();
> > -                                     foreach ($emails as $n) {
> > -                                             $nots[] = array('email' =>
> $n);
> > -                                     }
> > -                                     sendEmailNotification($nots,
> 'watch', 'user_watch_article_post_subject.tpl', $_SERVER['SERVER_NAME'],
> 'user_watch_article_post.tpl', $from);
> > -                             }
> >                       }
> > +                     $smarty->assign('mail_machine_raw',
> $tikilib->httpPrefix( true ). implode('/', $parts));
> > +                     sendEmailNotification($nots, 'watch',
> 'user_watch_article_post_subject.tpl', $_SERVER['SERVER_NAME'],
> 'user_watch_article_post.tpl');
> > +                     if (is_array($emails) && !empty($from) && $from !=
> $prefs['sender_email']) {
> > +                             $nots = array();
> > +                             foreach ($emails as $n) {
> > +                                     $nots[] = array('email' => $n);
> > +                             }
> > +                             sendEmailNotification($nots, 'watch',
> 'user_watch_article_post_subject.tpl', $_SERVER['SERVER_NAME'],
> 'user_watch_article_post.tpl', $from);
> > +                     }
> > +             }
> >
> >
> >               if ( $prefs['feature_search'] == 'y' &&
> $prefs['feature_search_fulltext'] != 'y' &&
> $prefs['search_refresh_index_mode'] == 'normal' ) {
> > @@ -737,25 +739,119 @@
> >
>     , $creator_edit
> >
>     )
> >       {
> > -             if ($use_ratings == 'on') {$use_ratings = 'y';} else
> {$use_ratings = 'n';}
> > -             if ($show_pre_publ == 'on') {$show_pre_publ = 'y';} else
> {$show_pre_publ = 'n';}
> > -             if ($show_post_expire == 'on') {$show_post_expire = 'y';}
> else {$show_post_expire = 'n';}
> > -             if ($heading_only == 'on') {$heading_only = 'y';} else
> {$heading_only = 'n';}
> > -             if ($allow_comments == 'on') {$allow_comments = 'y';} else
> {$allow_comments = 'n';}
> > -             if ($comment_can_rate_article == 'on')
> {$comment_can_rate_article = 'y';} else {$comment_can_rate_article = 'n';}
> > -             if ($show_image == 'on') {$show_image = 'y';} else
> {$show_image = 'n';}
> > -             if ($show_avatar == 'on') {$show_avatar = 'y';} else
> {$show_avatar = 'n';}
> > -             if ($show_author == 'on') {$show_author = 'y';} else
> {$show_author = 'n';}
> > -             if ($show_pubdate == 'on') {$show_pubdate = 'y';} else
> {$show_pubdate = 'n';}
> > -             if ($show_expdate == 'on') {$show_expdate = 'y';} else
> {$show_expdate = 'n';}
> > -             if ($show_reads == 'on') {$show_reads = 'y';} else
> {$show_reads = 'n';}
> > -             if ($show_size == 'on') {$show_size = 'y';} else
> {$show_size = 'n';}
> > -             if ($show_topline == 'on') {$show_topline = 'y';} else
> {$show_topline = 'n';}
> > -             if ($show_subtitle == 'on') {$show_subtitle = 'y';} else
> {$show_subtitle = 'n';}
> > -             if ($show_linkto == 'on') {$show_linkto = 'y';} else
> {$show_linkto = 'n';}
> > -             if ($show_image_caption == 'on') {$show_image_caption =
> 'y';} else {$show_image_caption = 'n';}
> > -             if ($show_lang == 'on') {$show_lang = 'y';} else
> {$show_lang = 'n';}
> > -             if ($creator_edit == 'on') {$creator_edit = 'y';} else
> {$creator_edit = 'n';}
>
> Why not something like :
>  $creator_edit = $creator_edit === 'on' ? 'y' : 'n';
>
>
> > +             if ($use_ratings == 'on') {
> > +                     $use_ratings = 'y';
> > +             } else {
> > +                     $use_ratings = 'n';
> > +             }
> > +
> > +             if ($show_pre_publ == 'on') {
> > +                     $show_pre_publ = 'y';
> > +             } else {
> > +                     $show_pre_publ = 'n';
> > +             }
> > +
> > +             if ($show_post_expire == 'on') {
> > +                     $show_post_expire = 'y';
> > +             } else {
> > +                     $show_post_expire = 'n';
> > +             }
> > +
> > +             if ($heading_only == 'on') {
> > +                     $heading_only = 'y';
> > +             } else {
> > +                     $heading_only = 'n';
> > +             }
> > +
> > +             if ($allow_comments == 'on') {
> > +                     $allow_comments = 'y';
> > +             } else {
> > +                     $allow_comments = 'n';
> > +             }
> > +
> > +             if ($comment_can_rate_article == 'on') {
> > +                     $comment_can_rate_article = 'y';
> > +             } else {
> > +                     $comment_can_rate_article = 'n';
> > +             }
> > +
> > +             if ($show_image == 'on') {
> > +                     $show_image = 'y';
> > +             } else {
> > +                     $show_image = 'n';
> > +             }
> > +
> > +             if ($show_avatar == 'on') {
> > +                     $show_avatar = 'y';
> > +             } else {
> > +                     $show_avatar = 'n';
> > +             }
> > +
> > +             if ($show_author == 'on') {
> > +                     $show_author = 'y';
> > +             } else {
> > +                     $show_author = 'n';
> > +             }
> > +
> > +             if ($show_pubdate == 'on') {
> > +                     $show_pubdate = 'y';
> > +             } else {
> > +                     $show_pubdate = 'n';
> > +             }
> > +
> > +             if ($show_expdate == 'on') {
> > +                     $show_expdate = 'y';
> > +             } else {
> > +                     $show_expdate = 'n';
> > +             }
> > +
> > +             if ($show_reads == 'on') {
> > +                     $show_reads = 'y';
> > +             } else {
> > +                     $show_reads = 'n';
> > +             }
> > +
> > +             if ($show_size == 'on') {
> > +                     $show_size = 'y';
> > +             } else {
> > +                     $show_size = 'n';
> > +             }
> > +
> > +             if ($show_topline == 'on') {
> > +                     $show_topline = 'y';
> > +             } else {
> > +                     $show_topline = 'n';
> > +             }
> > +             if ($show_subtitle == 'on')
> > +             {
> > +                     $show_subtitle = 'y';
> > +             } else {
> > +                     $show_subtitle = 'n';
> > +             }
> > +
> > +             if ($show_linkto == 'on') {
> > +                     $show_linkto = 'y';
> > +             } else {
> > +                     $show_linkto = 'n';
> > +             }
> > +
> > +             if ($show_image_caption == 'on') {
> > +                     $show_image_caption = 'y';
> > +             } else {
> > +                     $show_image_caption = 'n';
> > +             }
> > +
> > +             if ($show_lang == 'on') {
> > +                     $show_lang = 'y';
> > +             } else {
> > +                     $show_lang = 'n';
> > +             }
> > +
> > +             if ($creator_edit == 'on') {
> > +                     $creator_edit = 'y';
> > +             } else {
> > +                     $creator_edit = 'n';
> > +             }
> >               $query = "update `tiki_article_types` set
> >                       `use_ratings` = ?,
> >                       `show_pre_publ` = ?,
> > @@ -969,22 +1065,24 @@
> >               switch ($image_type) {
> >                       case 'article':
> >                               $image_cache_prefix = 'article';
> > -                             break;
> > +                                                     break;
> >                       case 'submission':
> >                               $image_cache_prefix = 'article_submission';
> > -                             break;
> > +                                                     break;
> >                       case 'preview':
> >                               $image_cache_prefix = 'article_preview';
> > -                             break;
> > +                                                     break;
> >                       default:
> >                               return false;
> >               }
> >               $article_image_cache = $prefs['tmpDir'];
> > -             if ($tikidomain) { $article_image_cache.= "/$tikidomain"; }
> > +             if ($tikidomain) {
> > +                     $article_image_cache .= "/$tikidomain";
> > +             }
> >               $article_image_cache .= "/$image_cache_prefix.".$imageId;
> >               if ( @unlink($article_image_cache) ) {
> >                       return true;
> > -             }else{
> > +             } else {
> >                       return false;
> >               }
> >       }
> >
> > Modified: branches/6.x/lib/auth/ldap.php
> > ===================================================================
> > --- branches/6.x/lib/auth/ldap.php    2010-10-05 21:00:38 UTC (rev 29814)
> > +++ branches/6.x/lib/auth/ldap.php    2010-10-05 21:07:52 UTC (rev 29815)
> > @@ -53,7 +53,7 @@
> >               'debug' => false
> >       );
> >
> > -     protected $logslib=NULL;
> > +     protected $logslib = NULL;
> >
> >       /**
> >        * @var array The user attributes
> > @@ -61,72 +61,72 @@
> >       protected $user_attributes = null;
> >
> >       // Constructor
> > -     public function __construct($options) {
> > -
> > +     public function __construct($options)
> > +     {
> >               // debug setting
> >               global $logslib;
> > -             if(isset($options['debug']) && ($options['debug']===true ||
> $options['debug']=='y' )&& ($logslib instanceof LogsLib)) {
> > -                     $this->options['debug']=true;
> > -                     $this->logslib=&$logslib;
> > +             if (isset($options['debug']) && ($options['debug']===true
> || $options['debug']=='y' )&& ($logslib instanceof LogsLib)) {
> > +                     $this->options['debug'] = true;
> > +                     $this->logslib = &$logslib;
> >               }
> >               // Configure the connection
> > -
> > +
> >               // host can be a list of hostnames.
> >               // It is easier to create URIs because if we use ssl, we
> have to create a URI
> > -             if(isset($options['host']) && !empty($options['host'])) {
> > -                     $h=$options['host'];
> > +             if (isset($options['host']) && !empty($options['host'])) {
> > +                     $h = $options['host'];
> >               } else { // use default
> > -                     $h=$this->options['host'];
> > +                     $h = $this->options['host'];
> >               }
> > -
> > +
> >               $t=preg_split('#[\s,]#',$h);
> > -             if(isset($options['ssl']) && ($options['ssl']=='y' ||
> $options['ssl']===true)) {
> > -                     $prefix='ldaps://';
> > -                     $port=636;
> > +             if (isset($options['ssl']) && ($options['ssl']=='y' ||
> $options['ssl']===true)) {
> > +                     $prefix = 'ldaps://';
> > +                     $port = 636;
> >               } else {
> > -                     $prefix='ldap://';
> > -                     $port=389;
> > +                     $prefix = 'ldap://';
> > +                     $port = 389;
> >               }
> > -             if(isset($options['port']) && !empty($options['port'])) {
> > +             if (isset($options['port']) && !empty($options['port'])) {
> >                       $port=intval($options['port']);
> >               }
> > -             $this->options['port']=NULL; // its save to set port in URI
> > +             $this->options['port'] = NULL; // its save to set port in
> URI
> >
> > -             $this->options['host']=array();
> > +             $this->options['host'] = array();
> >               foreach($t as $h) {
> > -                     if(preg_match('#^ldaps?://#',$h)) { // entry is
> already URI
> > -                             $this->options['host'][]=$h;
> > +                     if (preg_match('#^ldaps?://#',$h)) { // entry is
> already URI
> > +                             $this->options['host'][] = $h;
> >                       } else {
> > -
> $this->options['host'][]=$prefix.$h.':'.$port;
> > +                             $this->options['host'][] = $prefix . $h .
> ':' . $port;
> >                       }
> >               }
> > -
> > -             if(isset($options['version']) &&
> !empty($options['version'])) {
> > -
> $this->options['version']=intval($options['version']);
> > +
> > +             if (isset($options['version']) &&
> !empty($options['version'])) {
> > +                     $this->options['version'] =
> intval($options['version']);
> >               }
> >
> > -             if(isset($options['startls']) &&
> !empty($options['startls'])) {
> > -
> $this->options['startls']=($options['startls']===true ||
> $options['startls']=='y');
> > +             if (isset($options['startls']) &&
> !empty($options['startls'])) {
> > +                     $this->options['startls'] =
> ($options['startls']===true || $options['startls']=='y');
> >               }
> >
> > -             if(isset($options['groupmemberisdn']) &&
> !empty($options['groupmemberisdn'])) {
> > -
> $this->options['groupmemberisdn']=($options['groupmemberisdn']===true ||
> $options['groupmemberisdn']=='y');
> > +             if (isset($options['groupmemberisdn']) &&
> !empty($options['groupmemberisdn'])) {
> > +                     $this->options['groupmemberisdn'] =
> ($options['groupmemberisdn']===true || $options['groupmemberisdn']=='y');
> >               }
> >
> >               // only string checking fo these ones
> > -
> foreach(array('basedn','username','password','userdn','useroc','userattr',
> > -
> 'fullnameattr','emailattr','groupdn','groupattr','groupoc','groupnameattr',
> > -
> 'groupdescattr','groupmemberattr','usergroupattr','groupgroupattr') as $n) {
> > -                     if(isset($options[$n]) && !empty($options[$n]) &&
> preg_match('#\s#',$options[$n])==0) {
> > +             foreach(array('basedn', 'username', 'password', 'userdn',
> 'useroc', 'userattr',
> > +                             'fullnameattr', 'emailattr', 'groupdn',
> 'groupattr', 'groupoc', 'groupnameattr',
> > +                             'groupdescattr', 'groupmemberattr',
> 'usergroupattr', 'groupgroupattr') as $n) {
> > +                     if (isset($options[$n]) && !empty($options[$n]) &&
> preg_match('#\s#', $options[$n])==0) {
> >                               $this->options[$n] = $options[$n];
> >                       }
> >               }
> >
> > -             if(empty($this->options['groupgroupattr']))
> $this->options['groupgroupattr']=$this->options['usergroupattr'];
> > -
> > -             if(isset($options['password'])) $this->options['bindpw'] =
> $options['password'];
> > +             if (empty($this->options['groupgroupattr']))
> $this->options['groupgroupattr']=$this->options['usergroupattr'];
> >
> > -             if(isset($options['scope']) && !empty($options['scope'])) {
> > +             if (isset($options['password'])) $this->options['bindpw'] =
> $options['password'];
> > +
> > +             if (isset($options['scope']) && !empty($options['scope']))
> {
> >                       switch($options['scope']) {
> >                               case 'sub':
> >                               case 'one':
> > @@ -138,7 +138,7 @@
> >                       }
> >               }
> >
> > -             if(isset($options['bind_type']) &&
> !empty($options['bind_type'])) {
> > +             if (isset($options['bind_type']) &&
> !empty($options['bind_type'])) {
> >                       switch($options['bind_type']) {
> >                               case 'ad':
> >                               case 'ol':
> > @@ -153,15 +153,17 @@
> >       }
> >       // End public function TikiLdapLib($options)
> >
> > -     public function __destruct() {
> > +     public function __destruct()
> > +     {
> >               unset($this->ldaplink);
> >       }
> >
> >       // Do a ldap bind
> > -     public function bind( $reconnect = false ) {
> > +     public function bind( $reconnect = false )
> > +     {
> >               global $prefs;
> > -
> > -             // Force the reconnection
> > +
> > +             // Force the reconnection
> >               if ($this->ldaplink instanceof Net_LDAP2) {
> >                               if ($reconnect === true) {
> >
> $this->ldaplink->disconnect();
> > @@ -169,21 +171,21 @@
> >                                               return (true); // do not
> try to reconnect since this may lead to huge timeouts
> >                               }
> >               }
> > -
> > -             // Set the bindnpw with the options['password']
> > +
> > +             // Set the bindnpw with the options['password']
> >               $this->options['bindpw'] = $this->options['password'];
> >
> > -             $user=$this->options['username'];
> > +             $user = $this->options['username'];
> >               switch ($this->options['bind_type']) {
> >                       case 'ad': // active directory
> > -
> preg_match_all('/\s*,?dc=\s*([^,]+)/i',$this->options['basedn'],$t);
> > +
> preg_match_all('/\s*,?dc=\s*([^,]+)/i',$this->options['basedn'], $t);
> >                               $this->options['binddn'] = $user.'@';
> > -                             if(isset($t[1]) && is_array($t[1])) {
> > +                             if (isset($t[1]) && is_array($t[1])) {
> >                                       foreach($t[1] as $domainpart) {
> >                                               $this->options['binddn'] .=
> $domainpart.'.';
> >                                       }
> >                                       // cut trailing dot
> > -
> $this->options['binddn']=substr($this->options['binddn'],0,-1);
> > +
> $this->options['binddn']=substr($this->options['binddn'], 0, -1);
> >                               }
> >                               // set referrals to 0 to avoid
> LDAP_OPERATIONS_ERROR
> >
> $this->options['options']['LDAP_OPT_REFERRALS']=0;
> > @@ -198,12 +200,12 @@
> >                               $this->options['binddn'] =
> 'cn='.$user.','.$prefs['auth_ldap_basedn'];
> >                               break;
> >                       case 'default':
> > -                             // Anonymous binding
> > +                             // Anonymous binding
> >                               $this->options['binddn'] = '';
> >                               $this->options['bindpw'] = '';
> >                               break;
> >                       default:
> > -                             $this->add_log('ldap','Error: Invalid
> "bind_type" value "'.$this->options['bind_type'].'".');
> > +                             $this->add_log('ldap', 'Error: Invalid
> "bind_type" value "' . $this->options['bind_type'] . '".');
> >                               die;
> >               }
> >
> > @@ -216,67 +218,68 @@
> >  */
> >
> >
> > -             $this->add_log('ldap','Connect Host:
> '.implode($this->options['host']).'. Binddn: '.
> > +             $this->add_log('ldap', 'Connect Host:
> '.implode($this->options['host']).'. Binddn: '.
> >                                       $this->options['binddn'].' at line
> '.__LINE__.' in '.__FILE__);
> >               //create options array to handle it to Net_LDAP2
> > -
> foreach(array('host','port','version','starttls','basedn','filter','scope','binddn','bindpw','options')
> > +             foreach(array('host', 'port', 'version', 'starttls',
> 'basedn', 'filter', 'scope', 'binddn', 'bindpw', 'options')
> >                               as $o) {
> > -                     if(isset($this->options[$o])) {
> > +                     if (isset($this->options[$o])) {
> >                               $options[$o] = $this->options[$o];
> >                       }
> >               }
> > -
> > +
> >               $this->ldaplink= Net_LDAP2::connect($options);
> > -             if(Net_LDAP2::isError($this->ldaplink)) {
> > -                     $this->add_log('ldap','Error:
> '.$this->ldaplink->getMessage().' at line '.__LINE__.' in '.__FILE__);
> > +             if (Net_LDAP2::isError($this->ldaplink)) {
> > +                     $this->add_log('ldap', 'Error: ' .
> $this->ldaplink->getMessage() . ' at line ' . __LINE__ . ' in ' . __FILE__);
> >                       // return Net_LDAP2 Error codes. No need to
> redefine this.
> >                       return($this->ldaplink->getCode());
> >               }
> > -
> > +
> >               return 'LDAP_SUCCESS';
> >       } // End bind()
> >
> > -
> >
> > +
> >       // return information about user attributes
> > -     public function get_user_attributes() {
> > -
> > -             if(!empty($this->user_attributes)) { //been there, done
> that
> > +     public function get_user_attributes()
> > +     {
> > +
> > +             if (!empty($this->user_attributes)) { //been there, done
> that
> >                       return($this->user_attributes);
> >               }
> >
> > -             $userdn=$this->user_dn();
> > +             $userdn = $this->user_dn();
> >               // ensure we have a connection to the ldap server
> > -              if(!$this->bind()) {
> > -                     $this->add_log('ldap','Reuse of ldap connection
> failed: '.$this->ldaplink->getMessage().' at line '.__LINE__.' in
> '.__FILE__);
> > +              if (!$this->bind()) {
> > +                     $this->add_log('ldap','Reuse of ldap connection
> failed: ' . $this->ldaplink->getMessage() . ' at line ' . __LINE__ . ' in '
> . __FILE__);
> >                       return false;
> >               }
> >
> >               // todo: only fetch needed attributes
> >
> >               $entry = $this->ldaplink->getEntry($userdn);
> > -             if(Net_LDAP2::isError($entry)) { // wrong userdn. So we
> have to search
> > +             if (Net_LDAP2::isError($entry)) { // wrong userdn. So we
> have to search
> >                       // prepare Search Filter
> > -
> $filter=Net_LDAP2_Filter::create($this->options['userattr'],'equals',$this->options['username']);
> > +                     $filter =
> Net_LDAP2_Filter::create($this->options['userattr'], 'equals',
> $this->options['username']);
> >                       $searchoptions=array('scope' =>
> $this->options['scope']);
> > -                     $this->add_log('ldap','Searching for user
> information with filter: '.$filter->asString().' at line '.__LINE__.' in
> '.__FILE__);
> > -                     $searchresult =
> $this->ldaplink->search($this->userbase_dn(),$filter,$searchoptions);
> > -                     if(Net_LDAP2::isError($searchresult)) {
> > -                             $this->add_log('ldap','Search failed:
> '.$searchresult->getMessage().' at line '.__LINE__.' in '.__FILE__);
> > +                     $this->add_log('ldap', 'Searching for user
> information with filter: '.$filter->asString().' at line '.__LINE__.' in
> '.__FILE__);
> > +                     $searchresult =
> $this->ldaplink->search($this->userbase_dn(), $filter, $searchoptions);
> > +                     if (Net_LDAP2::isError($searchresult)) {
> > +                             $this->add_log('ldap', 'Search failed: ' .
> $searchresult->getMessage() . ' at line ' . __LINE__ . ' in ' . __FILE__);
> >                               return false;
> >                       }
> > -                     if($searchresult->count()!=1) {
> > -                             $this->add_log('ldap','Error: Search
> returned '.$searchresult->count().' entries'.' at line '.__LINE__.' in
> '.__FILE__);
> > +                     if ($searchresult->count() != 1) {
> > +                             $this->add_log('ldap', 'Error: Search
> returned ' . $searchresult->count() . ' entries' . ' at line ' . __LINE__ .
> ' in ' . __FILE__);
> >                               return false;
> >                       }
> >                       // get first entry
> > -                     $entry=$searchresult->shiftEntry();
> > +                     $entry = $searchresult->shiftEntry();
> >
> >               }
> >               $this->user_attributes = $entry->getValues();
> >               $this->user_attributes['dn'] = $entry->dn();
> >               if (Net_LDAP2::isError($this->user_attributes)) {
> > -                     $this->add_log('ldap','Error fetching user
> attributes: '.$this->user_attributes->getMessage().' at line '.__LINE__.' in
> '.__FILE__);
> > +                     $this->add_log('ldap', 'Error fetching user
> attributes: ' . $this->user_attributes->getMessage() . ' at line ' .
> __LINE__ . ' in ' . __FILE__);
> >                       return false;
> >               }
> >
> > @@ -288,80 +291,81 @@
> >
> >
> >       // return dn of all groups a user belongs to
> > -     public function get_groups() {
> > -             if(empty($this->user_attributes))
> $this->get_user_attributes();
> > +     public function get_groups()
> > +     {
> > +             if (empty($this->user_attributes))
> > +                     $this->get_user_attributes();
> > +             // ensure we have a connection to the ldap server
> > +             if (!$this->bind()) {
> > +                     $this->add_log('ldap', 'Reuse of ldap connection
> failed: ' . $this->ldaplink->getMessage() . ' at line ' . __LINE__ . ' in '
> . __FILE__);
> > +                     return false;
> > +             }
> >
> > -                // ensure we have a connection to the ldap server
> > -                 if(!$this->bind()) {
> > -                        $this->add_log('ldap','Reuse of ldap connection
> failed: '.$this->ldaplink->getMessage().' at line '.__LINE__.' in
> '.__FILE__);
> > -                        return false;
> > -                }
> >
> > +             $filter1 = Net_LDAP2_Filter::create('objectClass',
> 'equals', $this->options['groupoc']);
> >
> > -
> $filter1=Net_LDAP2_Filter::create('objectClass','equals',$this->options['groupoc']);
> > -
> > -             if(!empty($this->options['groupmemberattr'])) {
> > +             if (!empty($this->options['groupmemberattr'])) {
> >                       // get membership from group information
> > -                     if($this->options['groupmemberisdn']) {
> > -
> $filter2=Net_LDAP2_Filter::create($this->options['groupmemberattr'],'equals',$this->user_dn());
> > +                     if ($this->options['groupmemberisdn']) {
> > +                             $filter2 =
> Net_LDAP2_Filter::create($this->options['groupmemberattr'], 'equals',
> $this->user_dn());
> >                       } else {
> > -
> $filter2=Net_LDAP2_Filter::create($this->options['groupmemberattr'],'equals',$this->options['username']);
> > +                             $filter2 =
> Net_LDAP2_Filter::create($this->options['groupmemberattr'], 'equals',
> $this->options['username']);
> >                       }
> > -
> $filter=Net_LDAP2_Filter::combine('and',array($filter1,$filter2));
> > +                     $filter = Net_LDAP2_Filter::combine('and',
> array($filter1, $filter2));
> >
> > -             } else if(!empty($this->options['usergroupattr'])) {
> > +             } else if (!empty($this->options['usergroupattr'])) {
> >                       // get membership from user information
> > -
> > -
> $ugi=&$this->user_attributes[$this->options['usergroupattr']];
> > -                     if(!empty($ugi)) {
> > -
> > -                             if(!is_array($ugi)) {
> > -                                     $ugi=array($ugi);
> > +
> > +                     $ugi =
> &$this->user_attributes[$this->options['usergroupattr']];
> > +                     if (!empty($ugi)) {
> > +
> > +                             if (!is_array($ugi)) {
> > +                                     $ugi = array($ugi);
> >                               }
> >
> > -                             if(count($ugi)==1) { // one gid
> > -
> $filter3=Net_LDAP2_Filter::create($this->options['groupgroupattr'],'equals',$ugi[0]);
> > +                             if (count($ugi) == 1) { // one gid
> > +                                     $filter3 =
> Net_LDAP2_Filter::create($this->options['groupgroupattr'], 'equals',
> $ugi[0]);
> >                               } else { // mor gids
> > -                                     $filtertmp=array();
> > -                                     foreach($ugi as $g) {
> > -
> $filtertmp[]=Net_LDAP2_Filter::create($this->options['groupgroupattr'],'equals',$g);
> > +                                     $filtertmp = array();
> > +                                     foreach ($ugi as $g) {
> > +                                             $filtertmp[] =
> Net_LDAP2_Filter::create($this->options['groupgroupattr'], 'equals', $g);
> >                                       }
> > -
> $filter3=Net_LDAP2_Filter::combine('or',$filtertmp);
> > +                                     $filter3 =
> Net_LDAP2_Filter::combine('or', $filtertmp);
> >                               }
> >
> > -
> $filter=Net_LDAP2_Filter::combine('and',array($filter1,$filter3));
> > +                             $filter = Net_LDAP2_Filter::combine('and',
> array($filter1, $filter3));
> >                       } else { // User has no group
> > -                             $filter=NULL;
> > +                             $filter = NULL;
> >                       }
> >               } else {
> >                       // not possible to get groups - return empty array
> >                       return(array());
> >               }
> > -
> > -             if(Net_LDAP2::isError($filter)) {
> > -                     $this->add_log('ldap','LDAP Filter creation error:
> '.$filter->getMessage().' at line '.__LINE__.' in '.__FILE__);
> > +
> > +             if (Net_LDAP2::isError($filter)) {
> > +                     $this->add_log('ldap', 'LDAP Filter creation error:
> ' . $filter->getMessage() . ' at line ' . __LINE__ . ' in ' . __FILE__);
> >                       return false;
> >               }
> >
> > -             $this->add_log('ldap','Searching for group entries with
> filter: '.$filter->asString().' base '.$this->groupbase_dn().'at line
> '.__LINE__.' in '.__FILE__);
> > -             $searchoptions=array('scope' => $this->options['scope']);
> > -             $searchresult =
> $this->ldaplink->search($this->groupbase_dn(),$filter,$searchoptions);
> > +             $this->add_log('ldap', 'Searching for group entries with
> filter: ' . $filter->asString() . ' base ' . $this->groupbase_dn() . 'at
> line ' . __LINE__ . ' in ' . __FILE__);
> > +             $searchoptions = array('scope' => $this->options['scope']);
> > +             $searchresult =
> $this->ldaplink->search($this->groupbase_dn(), $filter, $searchoptions);
> >
> > -             if(Net_LDAP2::isError($searchresult)) {
> > -                     $this->add_log('ldap','Search failed:
> '.$searchresult->getMessage().' at line '.__LINE__.' in '.__FILE__);
> > +             if (Net_LDAP2::isError($searchresult)) {
> > +                     $this->add_log('ldap' , 'Search failed: ' .
> $searchresult->getMessage() . ' at line ' . __LINE__ . ' in ' . __FILE__);
> >                       return false;
> >               }
> > -             $this->add_log('ldap','Found '.$searchresult->count().'
> entries. Extracting entries now.');
> > -
> > +             $this->add_log('ldap', 'Found ' . $searchresult->count() .
> ' entries. Extracting entries now.');
> > +
> >               $this->groups = array();
> > -             while($entry=$searchresult->shiftEntry()) {
> > +             while ($entry = $searchresult->shiftEntry()) {
> >                       if (Net_LDAP2::isError($entry)) {
> > -                             $this->add_log('ldap','Error fetching group
> entries: '.$entry->getMessage().' at line '.__LINE__.' in '.__FILE__);
> > +                             $this->add_log('ldap', 'Error fetching
> group entries: ' . $entry->getMessage() . ' at line ' . __LINE__ . ' in ' .
> __FILE__);
> >                               return false;
> >                       }
> > -                     $this->groups[$entry->dn()]=$entry->getValues(); //
> no error checking necessary here
> > +                     $this->groups[$entry->dn()] = $entry->getValues();
> // no error checking necessary here
> >               }
> > -             $this->add_log('ldap',count($this->groups).' groups found
> at line '.__LINE__.' in '.__FILE__);
> > +             $this->add_log('ldap', count($this->groups) . ' groups
> found at line ' . __LINE__ . ' in ' . __FILE__);
> >
> >               return($this->groups);
> >
> > @@ -370,35 +374,39 @@
> >
> >
> >
> > -     // helper funtions
> > -     private function userbase_dn() {
> > -             if(empty($this->options['userdn']))
> > +     // helper functions
> > +     private function userbase_dn()
> > +     {
> > +             if (empty($this->options['userdn']))
> >                       return($this->options['basedn']);
> > -
> return($this->options['userdn'].','.$this->options['basedn']);
> > +             return($this->options['userdn'] . ',' .
> $this->options['basedn']);
> >       }
> >
> > -     private function user_dn() {
> > -             if(isset($this->user_attributes['dn'])) {
> > +     private function user_dn()
> > +     {
> > +             if (isset($this->user_attributes['dn'])) {
> >                       // we did already fetch user attributes and have
> the real dn now
> >                       return($this->user_attributes['dn']);
> >               }
> > -             if(empty($this->options['userattr'])) {
> > -                     $ua='cn=';
> > +             if (empty($this->options['userattr'])) {
> > +                     $ua = 'cn=';
> >               } else {
> > -                     $ua=$this->options['userattr'].'=';
> > -             }
> > -
> return($ua.$this->options['username'].','.$this->userbase_dn());
> > +                     $ua = $this->options['userattr'] . '=';
> > +             }
> > +             return($ua.$this->options['username'] . ',' .
> $this->userbase_dn());
> >       }
> >
> > -     private function groupbase_dn() {
> > -             if(empty($this->options['groupdn']))
> > +     private function groupbase_dn()
> > +     {
> > +             if (empty($this->options['groupdn']))
> >                       return($this->options['basedn']);
> > -
> return($this->options['groupdn'].','.$this->options['basedn']);
> > +             return($this->options['groupdn'] . ',' .
> $this->options['basedn']);
> >       }
> >
> > -     private function add_log($facility,$message) {
> > -             if($this->options['debug'])
> > -                     $this->logslib->add_log($facility,$message);
> > +     private function add_log($facility, $message)
> > +     {
> > +             if ($this->options['debug'])
> > +                     $this->logslib->add_log($facility, $message);
> >       }
> >
> >       /**
> > @@ -408,7 +416,8 @@
> >        * @return void
> >        * @throw Exception
> >        */
> > -     public function setOption ($name, $value = null) {
> > +     public function setOption ($name, $value = null)
> > +     {
> >               try {
> >                       if (isset($this->options[$name])) {
> >                               $this->options[$name] = $value;
> > @@ -424,7 +433,8 @@
> >        * @return mixed
> >        * @throw Exception
> >        */
> > -     public function getUserAttribute ($name) {
> > +     public function getUserAttribute ($name)
> > +     {
> >               $value = '';
> >               try {
> >                       $values = self::get_user_attributes();
> > @@ -433,7 +443,7 @@
> >                       } else {
> >                               throw new Exception(sprintf("Undefined
> attribute %s \n", $name), E_USER_WARNING);
> >                       }
> > -             } catch (Exception $e) {}
> > -             return $value;
> > +             } catch (Exception $e) {}
> > +             return $value;
> >       }
> >  }
> >
> > Modified: branches/6.x/lib/banners/bannerlib.php
> > ===================================================================
> > --- branches/6.x/lib/banners/bannerlib.php    2010-10-05 21:00:38 UTC
> (rev 29814)
> > +++ branches/6.x/lib/banners/bannerlib.php    2010-10-05 21:07:52 UTC
> (rev 29815)
> > @@ -14,7 +14,8 @@
> >  class BannerLib extends TikiLib
> >  {
> >
> > -     function select_banner_id($zone) {
> > +     function select_banner_id($zone)
> > +     {
> >               $map = array(0=>'sun', 1=>'mon', 2=>'tue', 3=>'wed',
> 4=>'thu', 5=>'fri', 6=>'sat');
> >               $dw = $map[$this->date_format("%w")];
> >
> > @@ -57,7 +58,8 @@
> >       }
> >
> >
> > -     function select_banner($zone, $target='_blank', $id='') {
> > +     function select_banner($zone, $target='_blank', $id='')
> > +     {
> >               global $prefs, $tikilib;
> >
> >               // Things to check
> > @@ -78,21 +80,24 @@
> >               case 'useHTML':
> >                       $raw = $res["HTMLData"];
> >
> > -                     break;
> > +                                             break;
> >               case 'useFlash':
> >                       if ($prefs['javascript_enabled'] == 'y') {
> >                               global $headerlib;
> include_once('lib/headerlib.php');
> >                               $headerlib->add_jsfile(
> 'lib/swfobject/swfobject.js' );
> >                       }
> >                       $raw =
> $tikilib->embed_flash(unserialize($res['HTMLData']));
> > -                     break;
> > +                                             break;
> >
> >
> >               case 'useImage':
> >                       $raw
> > -                             = "<div class='banner $class'><a
> target='$target' href='banner_click.php?id=" . $res["bannerId"] .
> "&amp;url=" . urlencode($res["url"]). "'><img alt='banner' border='0'
> src=\"banner_image.php?id=" . $res["bannerId"] . "\" /></a></div>";
> > +                             = "<div class='banner $class'><a
> target='$target' href='banner_click.php?id="
> > +                                             . $res["bannerId"] .
> "&amp;url=" . urlencode($res["url"])
> > +                                             . "'><img alt='banner'
> border='0' src=\"banner_image.php?id="
> > +                                             . $res["bannerId"] . "\"
> /></a></div>";
> >
> > -                     break;
> > +                                             break;
> >
> >               case 'useFixedURL':
> >                       @$fp = fopen($res["fixedURLData"], "r");
> > @@ -106,13 +111,14 @@
> >                               fclose ($fp);
> >                       }
> >
> > -                     break;
> > +                                             break;
> >
> >               case 'useText':
> > -                     $raw = "<a target='$target' class='bannertext'
> href='banner_click.php?id=" . $res["bannerId"] . "&amp;url=" . urlencode(
> > -                             $res["url"]). "'>" . $res["textData"] .
> "</a>";
> > +                     $raw = "<a target='$target' class='bannertext'
> href='banner_click.php?id=" . $res["bannerId"]
> > +                                                     . "&amp;url=" .
> urlencode($res["url"]) . "'>"
> > +                                                     . $res["textData"]
> . "</a>";
> >
> > -                     break;
> > +                                             break;
> >               }
> >
> >               // Increment banner impressions done in select_banner_id()
> > @@ -131,13 +137,15 @@
> >               return $raw;
> >       }
> >
> > -     function add_click($bannerId) {
> > +     function add_click($bannerId)
> > +     {
> >               $query = "update `tiki_banners` set `clicks` = `clicks` + 1
> where `bannerId`=?";
> >
> >               $result = $this->query($query,array((int)$bannerId));
> >       }
> >
> > -     function list_banners($offset = 0, $maxRecords = -1, $sort_mode =
> 'created_desc', $find = '', $user) {
> > +     function list_banners($offset = 0, $maxRecords = -1, $sort_mode =
> 'created_desc', $find = '', $user)
> > +     {
> >               if ($user == 'admin') {
> >                       $mid = '';
> >                       $bindvars=array();
> > @@ -174,7 +182,8 @@
> >               return $retval;
> >       }
> >
> > -     function list_zones() {
> > +     function list_zones()
> > +     {
> >               $query = "select `zone` from `tiki_zones`";
> >
> >               $query_cant = "select count(*) from `tiki_zones`";
> > @@ -192,13 +201,15 @@
> >               return $retval;
> >       }
> >
> > -     function remove_banner($bannerId) {
> > +     function remove_banner($bannerId)
> > +     {
> >               $query = "delete from `tiki_banners` where `bannerId`=?";
> >
> >               $result = $this->query($query,array($bannerId));
> >       }
> >
> > -     function get_banner($bannerId) {
> > +     function get_banner($bannerId)
> > +     {
> >               $query = "select * from `tiki_banners` where `bannerId`=?";
> >
> >               $result = $this->query($query,array($bannerId));
> > @@ -211,8 +222,9 @@
> >       }
> >
> >       function replace_banner($bannerId, $client, $url, $title = '', $alt
> = '', $use, $imageData, $imageType, $imageName, $HTMLData,
> > -             $fixedURLData, $textData, $fromDate, $toDate, $useDates,
> $mon, $tue, $wed, $thu, $fri, $sat, $sun, $hourFrom, $hourTo,
> > -             $maxImpressions, $maxClicks,$zone,$maxUserImpressions=-1) {
> > +                                     $fixedURLData, $textData,
> $fromDate, $toDate, $useDates, $mon, $tue, $wed, $thu, $fri, $sat, $sun,
> $hourFrom, $hourTo,
> > +                                     $maxImpressions,
> $maxClicks,$zone,$maxUserImpressions=-1
> > +     )       {
> >               $imageData = urldecode($imageData);
> >               //$imageData = '';
> >
> > @@ -248,7 +260,9 @@
> >                               /* invalid cache */
> >                               global $tikilib, $tikidomain, $prefs;
> >                               $bannercachefile = $prefs['tmpDir'];
> > -                             if ($tikidomain) { $bannercachefile.=
> "/$tikidomain"; }
> > +                             if ($tikidomain) {
> > +                                     $bannercachefile .= "/$tikidomain";
> > +                             }
> >                               $bannercachefile.=
> "/banner.".(int)$bannerId;
> >                               unlink($bannercachefile);
> >               } else {
> > @@ -272,7 +286,8 @@
> >               return $bannerId;
> >       }
> >
> > -     function banner_add_zone($zone) {
> > +     function banner_add_zone($zone)
> > +     {
> >               $query = "delete from `tiki_zones` where `zone`=?";
> >               $this->query($query,array($zone),-1,-1,false);
> >               $query = "insert into `tiki_zones`(`zone`) values(?)";
> > @@ -280,7 +295,8 @@
> >               return true;
> >       }
> >
> > -     function banner_get_zones() {
> > +     function banner_get_zones()
> > +     {
> >               $query = "select * from `tiki_zones`";
> >
> >               $result = $this->query($query,array());
> > @@ -293,7 +309,8 @@
> >               return $ret;
> >       }
> >
> > -     function banner_remove_zone($zone) {
> > +     function banner_remove_zone($zone)
> > +     {
> >               $query = "delete from `tiki_zones` where `zone`=?";
> >
> >               $result = $this->query($query,array($zone));
> >
> > Modified: branches/6.x/lib/blogs/bloglib.php
> > ===================================================================
> > --- branches/6.x/lib/blogs/bloglib.php        2010-10-05 21:00:38 UTC
> (rev 29814)
> > +++ branches/6.x/lib/blogs/bloglib.php        2010-10-05 21:07:52 UTC
> (rev 29815)
> > @@ -34,7 +34,8 @@
> >        *
> >        * @return array
> >        */
> > -     function list_blogs($offset = 0, $maxRecords = -1, $sort_mode =
> 'created_desc', $find = '', $ref='', $with = '') {
> > +     function list_blogs($offset = 0, $maxRecords = -1, $sort_mode =
> 'created_desc', $find = '', $ref='', $with = '')
> > +     {
> >               global $tikilib, $categlib;
> >               if (!$categlib) require_once 'lib/categories/categlib.php';
> >               $bindvars = array();
> > @@ -51,7 +52,7 @@
> >                       $bindvars = array_merge($bindvars, array($findesc,
> $findesc));
> >               }
> >               if (isset($with['showlastpost'])) {
> > -                     $query = "SELECT tb.*, tbp.`postId`, tbp.`created`
> as postCreated,  tbp.`user` as postUser, tbp.`title` as postTitle,
> tbp.`data` as postData FROM `tiki_blogs` tb, `tiki_blog_posts` tbp  $join
> where tb.`blogId` = tbp.`blogId` and tbp.`created` = (select max(`created`)
> from `tiki_blog_posts` tbp2 where tbp2.`blogId`=tb.`blogId` order by
> `created` desc) $where order by tb.".$this->convertSortMode($sort_mode);
> > +                     $query = "SELECT tb.*, tbp.`postId`, tbp.`created`
> as postCreated, tbp.`user` as postUser, tbp.`title` as postTitle, tbp.`data`
> as postData FROM `tiki_blogs` tb, `tiki_blog_posts` tbp $join where
> tb.`blogId` = tbp.`blogId` and tbp.`created` = (select max(`created`) from
> `tiki_blog_posts` tbp2 where tbp2.`blogId`=tb.`blogId` order by `created`
> desc) $where order by tb.".$this->convertSortMode($sort_mode);
> >               } else {
> >                       $query = "select * from `tiki_blogs` $join WHERE
> 1=1 $where order by `tiki_blogs`." . $this->convertSortMode($sort_mode);
> >               }
> > @@ -66,13 +67,13 @@
> >                       global $user;
> >                       if ($objperm =
> $tikilib->get_perm_object($res['blogId'], 'blog', '', false)) {
> >                               if ( $objperm['tiki_p_read_blog'] == 'y' ||
> ($ref == 'post' && $objperm['tiki_p_blog_post_view_ref'] == 'y') || ($ref ==
> 'blog' && $objperm['tiki_p_blog_view_ref'] == 'y')) {
> > -                               ++$cant;
> > -                               if ($maxRecords == - 1 || ($i >= $offset
> && $nb < $maxRecords)) {
> > -                                     $ret[] = $res;
> > -                                     ++$nb;
> > -                               }
> > -                             ++$i;
> > -                       }
> > +                                     ++$cant;
> > +                                     if ($maxRecords == - 1 || ($i >=
> $offset && $nb < $maxRecords)) {
> > +                                             $ret[] = $res;
> > +                                             ++$nb;
> > +                                     }
> > +                                     ++$i;
> > +                             }
> >                       }
> >               }
> >               $retval = array();
> > @@ -88,7 +89,8 @@
> >        * @param int $blogId
> >        * @return array
> >        */
> > -     function get_blog($blogId) {
> > +     function get_blog($blogId)
> > +     {
> >               global $tikilib, $prefs, $user, $categlib; if (!$categlib)
> require_once 'lib/categories/categlib.php';
> >
> >               $bindvars = array();
> > @@ -123,7 +125,8 @@
> >        * @param string $blogTitle
> >        * @return array or false if no blog is found
> >        */
> > -     function get_blog_by_title($blogTitle) {
> > +     function get_blog_by_title($blogTitle)
> > +     {
> >               global $prefs, $user;
> >
> >               // Avoiding select by name so as to avoid SQL injection
> problems.
> > @@ -149,7 +152,8 @@
> >        * @param bool $include_public wheter or include public blogs (that
> belongs to other users)
> >        * @return array
> >        */
> > -     function list_user_blogs($user, $include_public = false) {
> > +     function list_user_blogs($user, $include_public = false)
> > +     {
> >               global $tikilib;
> >
> >               $query = "select * from `tiki_blogs` where `user`=? ";
> > @@ -176,7 +180,8 @@
> >        *
> >        * @return array
> >        */
> > -     function list_blogs_user_can_post() {
> > +     function list_blogs_user_can_post()
> > +     {
> >               global $tikilib, $tiki_p_blog_admin, $user;
> >               $query = "select * from `tiki_blogs` order by `title` asc";
> >               $result = $this->fetchAll($query);
> > @@ -204,7 +209,8 @@
> >        * @param int $data_max
> >        * @return array
> >        */
> > -     function list_posts($offset = 0, $maxRecords = -1, $sort_mode =
> 'created_desc', $find = '', $filterByBlogId = -1, $author='', $ref='',
> $date_min = 0, $date_max = 0) {
> > +     function list_posts($offset = 0, $maxRecords = -1, $sort_mode =
> 'created_desc', $find = '', $filterByBlogId = -1, $author='', $ref='',
> $date_min = 0, $date_max = 0)
> > +     {
> >               global $tikilib;
> >
> >               $authorized_blogs = $this->list_blogs(0, -1,
> 'created_desc', '', $ref);
> > @@ -269,7 +275,7 @@
> >                       if ( ! in_array($blogId, $permit_blogs) ) {
> >                               continue;
> >                       }
> > -                     $query = "select `title`  from `tiki_blogs` where
> `blogId`=?";
> > +                     $query = "select `title` from `tiki_blogs` where
> `blogId`=?";
> >                       $cant_com = $this->getOne("select count(*) from
> >                                       `tiki_comments` where `object`=?
> and `objectType` = ?",
> >                                       array((string)
> $res["postId"],'blog'));
> > @@ -291,7 +297,8 @@
> >        * @access public
> >        * @return int number of pages
> >        */
> > -     function get_number_of_pages($data) {
> > +     function get_number_of_pages($data)
> > +     {
> >               $parts = explode("...page...", $data);
> >               return count($parts);
> >       }
> > @@ -304,7 +311,8 @@
> >        * @access public
> >        * @return string the page $i of the post
> >        */
> > -     function get_page($data, $i) {
> > +     function get_page($data, $i)
> > +     {
> >               $parts = explode("...page...", $data);
> >
> >               $ret = $parts[$i - 1];
> > @@ -321,7 +329,8 @@
> >        * @access public
> >        * @return boolean unconditionnal true
> >        */
> > -     function add_blog_hit($blogId) {
> > +     function add_blog_hit($blogId)
> > +     {
> >               global $prefs, $user;
> >               if ($prefs['count_admin_pvs'] == 'y' || $user != 'admin') {
> >                       $query = "update `tiki_blogs` set `hits` = `hits`+1
> where `blogId`=?";
> > @@ -337,7 +346,8 @@
> >        * @access public
> >        * @return array all fields that are associated with an image in
> tiki_blog_post_images database table
> >        */
> > -     function get_post_image($imgId) {
> > +     function get_post_image($imgId)
> > +     {
> >               $query = "select * from `tiki_blog_posts_images` where
> `imgId`=?";
> >               $result = $this->query($query, array($imgId));
> >               $res = $result->fetchRow();
> > @@ -351,7 +361,8 @@
> >        * @access public
> >        * @return array with the permalink and the absolute link for each
> image
> >        */
> > -     function get_post_images($postId) {
> > +     function get_post_images($postId)
> > +     {
> >               global $tikilib;
> >               $query = "select `postId`,`filename`,`filesize`,`imgId`
> from `tiki_blog_posts_images` where `postId`=?";
> >
> > @@ -377,7 +388,8 @@
> >        * @access public
> >        * @return void
> >        */
> > -     function remove_post_image($imgId) {
> > +     function remove_post_image($imgId)
> > +     {
> >               $query = "delete from `tiki_blog_posts_images` where
> `imgId`=?";
> >
> >               $this->query($query, array($imgId));
> > @@ -408,7 +420,11 @@
> >        * @access public
> >        * @return int blogId
> >        */
> > -     function replace_blog($title, $description, $user, $public,
> $maxPosts, $blogId, $heading, $use_title, $use_title_in_post,
> $use_description, $use_breadcrumbs, $use_author, $add_date, $use_find,
> $allow_comments, $show_avatar, $alwaysOwner, $post_heading, $show_related,
> $related_max, $use_excerpt) {
> > +     function replace_blog($title, $description, $user, $public,
> $maxPosts, $blogId,
> > +                                             $heading, $use_title,
> $use_title_in_post, $use_description, $use_breadcrumbs,
> > +                                             $use_author, $add_date,
> $use_find, $allow_comments, $show_avatar, $alwaysOwner,
> > +                                             $post_heading,
> $show_related, $related_max, $use_excerpt
> > +     )  {
> >               //TODO: all the display parameters can be one single array
> parameter
> >               global $tikilib, $prefs;
> >               if ($blogId) {
> > @@ -451,7 +467,10 @@
> >        * @access public
> >        * @return array posts
> >        */
> > -     function list_blog_posts($blogId = 0, $allowDrafts = false, $offset
> = 0, $maxRecords = -1, $sort_mode = 'created_desc', $find = '', $date_min =
> '', $date_max = '', $approved = 'y') {
> > +     function list_blog_posts($blogId = 0, $allowDrafts = false, $offset
> = 0,
> > +                                                     $maxRecords = -1,
> $sort_mode = 'created_desc', $find = '',
> > +                                                     $date_min = '',
> $date_max = '', $approved = 'y'
> > +     )  {
> >               global $tikilib, $tiki_p_admin_comments, $tiki_p_admin,
> $tiki_p_blog_admin, $tiki_p_blog_post, $user;
> >
> >               $mid = array();
> > @@ -548,7 +567,8 @@
> >        * @access public
> >        * @return void
> >        */
> > -     function list_blog_post_comments($approved = 'y', $maxRecords = -1)
> {
> > +     function list_blog_post_comments($approved = 'y', $maxRecords = -1)
> > +     {
> >               global $user, $tikilib, $userlib, $tiki_p_admin,
> $tiki_p_blog_admin, $tiki_p_blog_post;
> >
> >               // TODO: use commentslib instead of querying database
> directly
> > @@ -604,7 +624,8 @@
> >        * @access public
> >        * @return void
> >        */
> > -     function list_all_blog_posts($offset = 0, $maxRecords = -1,
> $sort_mode = 'created_desc', $find = '', $date = '') {
> > +     function list_all_blog_posts($offset = 0, $maxRecords = -1,
> $sort_mode = 'created_desc', $find = '', $date = '')
> > +     {
> >
> >               if ($find) {
> >                       $findesc = '%' . $find . '%';
> > @@ -661,7 +682,8 @@
> >        * @access public
> >        * @return int postId
> >        */
> > -     function blog_post($blogId, $data, $excerpt, $user, $title = '',
> $contributions = '', $priv = 'n', $created = 0, $is_wysiwyg=FALSE) {
> > +     function blog_post($blogId, $data, $excerpt, $user, $title = '',
> $contributions = '', $priv = 'n', $created = 0, $is_wysiwyg=FALSE)
> > +     {
> >               // update tiki_blogs and call activity functions
> >               global $smarty, $tikilib, $prefs, $reportslib;
> >
> > @@ -743,7 +765,8 @@
> >        * @access public
> >        * @return boolean unconditionnal true
> >        */
> > -     function remove_blog($blogId) {
> > +     function remove_blog($blogId)
> > +     {
> >               global $tikilib;
> >
> >               $query = "delete from `tiki_blogs` where `blogId`=?";
> > @@ -763,7 +786,8 @@
> >        * @access public
> >        * @return boolean inconditionnal true
> >        */
> > -     function remove_post($postId) {
> > +     function remove_post($postId)
> > +     {
> >               global $tikilib;
> >               global $objectlib; require_once('lib/objectlib.php');
> >
> > @@ -817,7 +841,8 @@
> >        * @access public
> >        * @return The post
> >        */
> > -     function get_post($postId, $adjacent = false) {
> > +     function get_post($postId, $adjacent = false)
> > +     {
> >               global $tikilib;
> >
> >               $query = "select * from `tiki_blog_posts` where
> `postId`=?"...
 
[truncated message content]