XOOPS / XoopsCore25

htdocs/class/auth/auth_ads.php

Spacing +2 added lines, -2 removed lines

@@ -92,7 +92,7 @@ 
                     return false;
                 }
             } else {
-                $this->setErrors(ldap_errno($this->_ds), ldap_err2str(ldap_errno($this->_ds)) . '(' . $userUPN . ')');
+                $this->setErrors(ldap_errno($this->_ds), ldap_err2str(ldap_errno($this->_ds)).'('.$userUPN.')');
             }
         } else {
             $this->setErrors(0, _AUTH_LDAP_SERVER_NOT_FOUND);
@@ -114,7 +114,7 @@ 
      */
     public function getUPN($uname)
     {
-        $userDN = $uname . '@' . $this->ldap_domain_name;
+        $userDN = $uname.'@'.$this->ldap_domain_name;
 
         return $userDN;
     }

htdocs/class/auth/auth_ldap.php

Spacing +6 added lines, -6 removed lines

@@ -31,7 +31,7 @@ 
 }
 
 if (!class_exists('XoopsAuthProvisionning')) {
-    trigger_error('Required class XoopsAuthProvisionning was not found at line ' . __FILE__ . ' at line ' . __LINE__, E_USER_WARNING);
+    trigger_error('Required class XoopsAuthProvisionning was not found at line '.__FILE__.' at line '.__LINE__, E_USER_WARNING);
 
     return false;
 }
@@ -237,7 +237,7 @@ 
                 // We load the Xoops User database
                 return $this->loadXoopsUser($userDN, $uname, $pwd);
             } else {
-                $this->setErrors(ldap_errno($this->_ds), ldap_err2str(ldap_errno($this->_ds)) . '(' . $userDN . ')');
+                $this->setErrors(ldap_errno($this->_ds), ldap_err2str(ldap_errno($this->_ds)).'('.$userDN.')');
             }
         } else {
             $this->setErrors(0, _AUTH_LDAP_SERVER_NOT_FOUND);
@@ -259,7 +259,7 @@ 
         if (!$this->ldap_loginname_asdn) {
             // Bind with the manager
             if (!ldap_bind($this->_ds, $this->ldap_manager_dn, stripslashes($this->ldap_manager_pass))) {
-                $this->setErrors(ldap_errno($this->_ds), ldap_err2str(ldap_errno($this->_ds)) . '(' . $this->ldap_manager_dn . ')');
+                $this->setErrors(ldap_errno($this->_ds), ldap_err2str(ldap_errno($this->_ds)).'('.$this->ldap_manager_dn.')');
 
                 return false;
             }
@@ -272,7 +272,7 @@ 
                 $this->setErrors(0, sprintf(_AUTH_LDAP_USER_NOT_FOUND, $uname, $filter, $this->ldap_base_dn));
             }
         } else {
-            $userDN = $this->ldap_loginldap_attr . '=' . $uname . ',' . $this->ldap_base_dn;
+            $userDN = $this->ldap_loginldap_attr.'='.$uname.','.$this->ldap_base_dn;
         }
 
         return $userDN;
@@ -290,7 +290,7 @@ 
         if ($this->ldap_filter_person != '') {
             $filter = str_replace('@@loginname@@', $uname, $this->ldap_filter_person);
         } else {
-            $filter = $this->ldap_loginldap_attr . '=' . $uname;
+            $filter = $this->ldap_loginldap_attr.'='.$uname;
         }
 
         return $filter;
@@ -312,7 +312,7 @@ 
         if ($entries['count'] > 0) {
             $xoopsUser = $provisHandler->sync($entries[0], $uname, $pwd);
         } else {
-            $this->setErrors(0, sprintf('loadXoopsUser - ' . _AUTH_LDAP_CANT_READ_ENTRY, $userdn));
+            $this->setErrors(0, sprintf('loadXoopsUser - '._AUTH_LDAP_CANT_READ_ENTRY, $userdn));
         }
 
         return $xoopsUser;

htdocs/class/auth/authfactory.php

Spacing +2 added lines, -2 removed lines

@@ -61,12 +61,12 @@
                 $xoops_auth_method = 'xoops';
             }
 
-            $ret = include_once $GLOBALS['xoops']->path('class/auth/auth_' . $xoops_auth_method . '.php');
+            $ret = include_once $GLOBALS['xoops']->path('class/auth/auth_'.$xoops_auth_method.'.php');
             if ($ret == false) {
                 return false;
             }
 
-            $class = 'XoopsAuth' . ucfirst($xoops_auth_method);
+            $class = 'XoopsAuth'.ucfirst($xoops_auth_method);
             if (!class_exists($class)) {
                 $GLOBALS['xoopsLogger']->triggerError($class, _XO_ER_CLASSNOTFOUND, __FILE__, __LINE__, E_USER_ERROR);
 

htdocs/class/auth/auth_provisionning.php

Spacing +2 added lines, -2 removed lines

@@ -151,7 +151,7 @@ 
 
             return $newuser;
         } else {
-            redirect_header(XOOPS_URL . '/user.php', 5, $newuser->getHtmlErrors());
+            redirect_header(XOOPS_URL.'/user.php', 5, $newuser->getHtmlErrors());
         }
 
         return $ret;
@@ -182,7 +182,7 @@ 
         if ($member_handler->insertUser($xoopsUser)) {
             return $xoopsUser;
         } else {
-            redirect_header(XOOPS_URL . '/user.php', 5, $xoopsUser->getHtmlErrors());
+            redirect_header(XOOPS_URL.'/user.php', 5, $xoopsUser->getHtmlErrors());
         }
 
         return $ret;

htdocs/class/commentrenderer.php

Spacing +32 added lines, -32 removed lines

@@ -58,9 +58,9 @@ 
         /* @var $this->_memberHandler XoopsMemberHandler  */
         $this->_memberHandler = xoops_getHandler('member');
         $this->_statusText    = array(
-            XOOPS_COMMENT_PENDING => '<span style="text-decoration: none; font-weight: bold; color: #00ff00;">' . _CM_PENDING . '</span>',
-            XOOPS_COMMENT_ACTIVE  => '<span style="text-decoration: none; font-weight: bold; color: #ff0000;">' . _CM_ACTIVE . '</span>',
-            XOOPS_COMMENT_HIDDEN  => '<span style="text-decoration: none; font-weight: bold; color: #0000ff;">' . _CM_HIDDEN . '</span>');
+            XOOPS_COMMENT_PENDING => '<span style="text-decoration: none; font-weight: bold; color: #00ff00;">'._CM_PENDING.'</span>',
+            XOOPS_COMMENT_ACTIVE  => '<span style="text-decoration: none; font-weight: bold; color: #ff0000;">'._CM_ACTIVE.'</span>',
+            XOOPS_COMMENT_HIDDEN  => '<span style="text-decoration: none; font-weight: bold; color: #0000ff;">'._CM_HIDDEN.'</span>');
     }
 
     /**
@@ -91,7 +91,7 @@ 
         if (isset($this->_comments)) {
             unset($this->_comments);
         }
-        $this->_comments =& $comments_arr;
+        $this->_comments = & $comments_arr;
     }
 
     /**
@@ -104,7 +104,7 @@ 
         $count = count($this->_comments);
         for ($i = 0; $i < $count; ++$i) {
             if (false !== $this->_useIcons) {
-                $title = $this->_getTitleIcon($this->_comments[$i]->getVar('com_icon')) . '&nbsp;' . $this->_comments[$i]->getVar('com_title');
+                $title = $this->_getTitleIcon($this->_comments[$i]->getVar('com_icon')).'&nbsp;'.$this->_comments[$i]->getVar('com_title');
             } else {
                 $title = $this->_comments[$i]->getVar('com_title');
             }
@@ -114,10 +114,10 @@ 
                 $com_email = $this->_comments[$i]->getVar('com_email');
                 $text      = $this->_comments[$i]->getVar('com_text');
                 $text .= '<div style="text-align:right; margin-top: 2px; margin-bottom: 0; margin-right: 2px;">';
-                $text .= _CM_STATUS . ': ' . $this->_statusText[$this->_comments[$i]->getVar('com_status')] . '<br>';
-                $text .= 'IP: <span style="font-weight: bold;">' . $this->_comments[$i]->getVar('com_ip') . '</span>';
+                $text .= _CM_STATUS.': '.$this->_statusText[$this->_comments[$i]->getVar('com_status')].'<br>';
+                $text .= 'IP: <span style="font-weight: bold;">'.$this->_comments[$i]->getVar('com_ip').'</span>';
                 if (!empty($com_email)) {
-                    $text .= '<br>' . _CM_EMAIL . ' :<span style="font-weight: bold;"><a href="mailto:' . $com_email . '" title="' . $com_email . '">' . $com_email . '</a></span>';
+                    $text .= '<br>'._CM_EMAIL.' :<span style="font-weight: bold;"><a href="mailto:'.$com_email.'" title="'.$com_email.'">'.$com_email.'</a></span>';
                 }
                 $text .= '</div>';
             } else {
@@ -154,10 +154,10 @@ 
         include_once $GLOBALS['xoops']->path('class/tree.php');
         // construct comment tree
         $xot  = new XoopsObjectTree($this->_comments, 'com_id', 'com_pid', 'com_rootid');
-        $tree =& $xot->getTree();
+        $tree = & $xot->getTree();
 
         if (false !== $this->_useIcons) {
-            $title = $this->_getTitleIcon($tree[$comment_id]['obj']->getVar('com_icon')) . '&nbsp;' . $tree[$comment_id]['obj']->getVar('com_title');
+            $title = $this->_getTitleIcon($tree[$comment_id]['obj']->getVar('com_icon')).'&nbsp;'.$tree[$comment_id]['obj']->getVar('com_title');
         } else {
             $title = $tree[$comment_id]['obj']->getVar('com_title');
         }
@@ -174,10 +174,10 @@ 
             $com_email = $tree[$comment_id]['obj']->getVar('com_email');
             $text      = $tree[$comment_id]['obj']->getVar('com_text');
             $text .= '<div style="text-align:right; margin-top: 2px; margin-bottom: 0; margin-right: 2px;">';
-            $text .= _CM_STATUS . ': ' . $this->_statusText[$tree[$comment_id]['obj']->getVar('com_status')] . '<br>';
-            $text .= 'IP: <span style="font-weight: bold;">' . $tree[$comment_id]['obj']->getVar('com_ip') . '</span>';
+            $text .= _CM_STATUS.': '.$this->_statusText[$tree[$comment_id]['obj']->getVar('com_status')].'<br>';
+            $text .= 'IP: <span style="font-weight: bold;">'.$tree[$comment_id]['obj']->getVar('com_ip').'</span>';
             if (!empty($com_email)) {
-                $text .= '<br>' . _CM_EMAIL . ' :<span style="font-weight: bold;"><a href="mailto:' . $com_email . '" title="' . $com_email . '">' . $com_email . '</a></span>';
+                $text .= '<br>'._CM_EMAIL.' :<span style="font-weight: bold;"><a href="mailto:'.$com_email.'" title="'.$com_email.'">'.$com_email.'</a></span>';
             }
             $text .= '</div>';
         } else {
@@ -197,7 +197,7 @@ 
         }
         $replies = array();
         $this->_renderThreadReplies($tree, $comment_id, $replies, '&nbsp;&nbsp;', $admin_view);
-        $show_replies = (count($replies) > 0);// ? true : false;
+        $show_replies = (count($replies) > 0); // ? true : false;
         // Start edit by voltan
         $this->_tpl->append('comments', array(
             'pid'           => $tree[$comment_id]['obj']->getVar('com_pid'),
@@ -231,11 +231,11 @@ 
         $admin_view = (bool)$admin_view;
         if ($depth > 0) {
             if (false !== $this->_useIcons) {
-                $title = $this->_getTitleIcon($thread[$key]['obj']->getVar('com_icon')) . '&nbsp;' . $thread[$key]['obj']->getVar('com_title');
+                $title = $this->_getTitleIcon($thread[$key]['obj']->getVar('com_icon')).'&nbsp;'.$thread[$key]['obj']->getVar('com_title');
             } else {
                 $title = $thread[$key]['obj']->getVar('com_title');
             }
-            $title = (false !== $admin_view) ? $title . ' ' . $this->_statusText[$thread[$key]['obj']->getVar('com_status')] : $title;
+            $title = (false !== $admin_view) ? $title.' '.$this->_statusText[$thread[$key]['obj']->getVar('com_status')] : $title;
             // Start edit by voltan
             $replies[] = array(
                 'id'          => $key,
@@ -278,9 +278,9 @@ 
     {
         include_once $GLOBALS['xoops']->path('class/tree.php');
         $xot  = new XoopsObjectTree($this->_comments, 'com_id', 'com_pid', 'com_rootid');
-        $tree =& $xot->getTree();
+        $tree = & $xot->getTree();
         if (false !== $this->_useIcons) {
-            $title = $this->_getTitleIcon($tree[$comment_id]['obj']->getVar('com_icon')) . '&nbsp;' . $tree[$comment_id]['obj']->getVar('com_title');
+            $title = $this->_getTitleIcon($tree[$comment_id]['obj']->getVar('com_icon')).'&nbsp;'.$tree[$comment_id]['obj']->getVar('com_title');
         } else {
             $title = $tree[$comment_id]['obj']->getVar('com_title');
         }
@@ -289,10 +289,10 @@ 
             $com_email = $tree[$comment_id]['obj']->getVar('com_email');
             $text      = $tree[$comment_id]['obj']->getVar('com_text');
             $text .= '<div style="text-align:right; margin-top: 2px; margin-bottom: 0; margin-right: 2px;">';
-            $text .= _CM_STATUS . ': ' . $this->_statusText[$tree[$comment_id]['obj']->getVar('com_status')] . '<br>';
-            $text .= 'IP: <span style="font-weight: bold;">' . $tree[$comment_id]['obj']->getVar('com_ip') . '</span>';
+            $text .= _CM_STATUS.': '.$this->_statusText[$tree[$comment_id]['obj']->getVar('com_status')].'<br>';
+            $text .= 'IP: <span style="font-weight: bold;">'.$tree[$comment_id]['obj']->getVar('com_ip').'</span>';
             if (!empty($com_email)) {
-                $text .= '<br>' . _CM_EMAIL . ' :<span style="font-weight: bold;"><a href="mailto:' . $com_email . '" title="' . $com_email . '">' . $com_email . '</a></span>';
+                $text .= '<br>'._CM_EMAIL.' :<span style="font-weight: bold;"><a href="mailto:'.$com_email.'" title="'.$com_email.'">'.$com_email.'</a></span>';
             }
             $text .= '</div>';
         } else {
@@ -342,12 +342,12 @@ 
     {
         if ($depth > 0) {
             if (false !== $this->_useIcons) {
-                $title = $this->_getTitleIcon($thread[$key]['obj']->getVar('com_icon')) . '&nbsp;' . $thread[$key]['obj']->getVar('com_title');
+                $title = $this->_getTitleIcon($thread[$key]['obj']->getVar('com_icon')).'&nbsp;'.$thread[$key]['obj']->getVar('com_title');
             } else {
                 $title = $thread[$key]['obj']->getVar('com_title');
             }
             $admin_view = (bool)$admin_view;
-            $text = (false !== $admin_view) ? $thread[$key]['obj']->getVar('com_text') . '<div style="text-align:right; margin-top: 2px; margin-right: 2px;">' . _CM_STATUS . ': ' . $this->_statusText[$thread[$key]['obj']->getVar('com_status')] . '<br>IP: <span style="font-weight: bold;">' . $thread[$key]['obj']->getVar('com_ip') . '</span><br>' . _CM_EMAIL . ' :<span style="font-weight: bold;">' . $thread[$key]['obj']->getVar('com_email') . '</span></div>' : $thread[$key]['obj']->getVar('com_text');
+            $text = (false !== $admin_view) ? $thread[$key]['obj']->getVar('com_text').'<div style="text-align:right; margin-top: 2px; margin-right: 2px;">'._CM_STATUS.': '.$this->_statusText[$thread[$key]['obj']->getVar('com_status')].'<br>IP: <span style="font-weight: bold;">'.$thread[$key]['obj']->getVar('com_ip').'</span><br>'._CM_EMAIL.' :<span style="font-weight: bold;">'.$thread[$key]['obj']->getVar('com_email').'</span></div>' : $thread[$key]['obj']->getVar('com_text');
             // Start edit by voltan
             $replies[] = array(
                 'id'            => $key,
@@ -396,12 +396,12 @@ 
         if ($poster['id'] > 0) {
             $com_poster = $this->_memberHandler->getUser($poster_id);
             if (is_object($com_poster)) {
-                $poster['uname'] = '<a href="' . XOOPS_URL . '/userinfo.php?uid=' . $poster['id'] . '">' . $com_poster->getVar('uname') . '</a>';
+                $poster['uname'] = '<a href="'.XOOPS_URL.'/userinfo.php?uid='.$poster['id'].'">'.$com_poster->getVar('uname').'</a>';
             }
         } elseif ($poster['id'] == 0 && $poster_user != '') {
             $poster['id'] = 0; // to cope with deleted user accounts
             if (!empty($poster_website)) {
-                $poster['uname'] = '<a href="' . $poster_website . '">' . $poster_user . '</a>';
+                $poster['uname'] = '<a href="'.$poster_website.'">'.$poster_user.'</a>';
             } else {
                 $poster['uname'] = $poster_user;
             }
@@ -431,7 +431,7 @@ 
             /* @var  $com_poster XoopsUser */
             $com_poster = $this->_memberHandler->getUser($poster['id']);
             if (is_object($com_poster)) {
-                $poster['uname']      = '<a href="' . XOOPS_URL . '/userinfo.php?uid=' . $poster['id'] . '">' . $com_poster->getVar('uname') . '</a>';
+                $poster['uname']      = '<a href="'.XOOPS_URL.'/userinfo.php?uid='.$poster['id'].'">'.$com_poster->getVar('uname').'</a>';
                 $poster_rank          = $com_poster->rank();
                 $poster['rank_image'] = ($poster_rank['image'] != '') ? $poster_rank['image'] : 'blank.gif';
                 $poster['rank_title'] = $poster_rank['title'];
@@ -443,7 +443,7 @@ 
             }
         } elseif ($poster['id'] == 0 && $poster_user != '') {
             if (!empty($poster_website)) {
-                $poster['uname'] = '<a href="' . $poster_website . '">' . $poster_user . '</a>';
+                $poster['uname'] = '<a href="'.$poster_website.'">'.$poster_user.'</a>';
             } else {
                 $poster['uname'] = $poster_user;
             }
@@ -481,16 +481,16 @@ 
         $icon_image = htmlspecialchars(trim($icon_image));
         if ($icon_image != '') {
             if (false !== $this->_doIconCheck) {
-                if (!file_exists($GLOBALS['xoops']->path('images/subject/' . $icon_image))) {
-                    return '<img src="' . XOOPS_URL . '/images/icons/no_posticon.gif" alt="" />';
+                if (!file_exists($GLOBALS['xoops']->path('images/subject/'.$icon_image))) {
+                    return '<img src="'.XOOPS_URL.'/images/icons/no_posticon.gif" alt="" />';
                 } else {
-                    return '<img src="' . XOOPS_URL . '/images/subject/' . $icon_image . '" alt="" />';
+                    return '<img src="'.XOOPS_URL.'/images/subject/'.$icon_image.'" alt="" />';
                 }
             } else {
-                return '<img src="' . XOOPS_URL . '/images/subject/' . $icon_image . '" alt="" />';
+                return '<img src="'.XOOPS_URL.'/images/subject/'.$icon_image.'" alt="" />';
             }
         }
 
-        return '<img src="' . XOOPS_URL . '/images/icons/no_posticon.gif" alt="" />';
+        return '<img src="'.XOOPS_URL.'/images/icons/no_posticon.gif" alt="" />';
     }
 }

htdocs/class/captcha/xoopscaptcha.php

Spacing +19 added lines, -19 removed lines

@@ -44,8 +44,8 @@ 
     {
         xoops_loadLanguage('captcha');
         // Load static configurations
-        $this->path_basic  = XOOPS_ROOT_PATH . '/class/captcha';
-        $this->path_plugin = XOOPS_ROOT_PATH . '/Frameworks/captcha';
+        $this->path_basic  = XOOPS_ROOT_PATH.'/class/captcha';
+        $this->path_plugin = XOOPS_ROOT_PATH.'/Frameworks/captcha';
         $this->config      = $this->loadConfig();
         $this->name        = $this->config['name'];
     }
@@ -76,11 +76,11 @@ 
     {
         $basic_config  = array();
         $plugin_config = array();
-        $filename      = empty($filename) ? 'config.php' : 'config.' . $filename . '.php';
-        if (file_exists($file = $this->path_basic . '/' . $filename)) {
+        $filename      = empty($filename) ? 'config.php' : 'config.'.$filename.'.php';
+        if (file_exists($file = $this->path_basic.'/'.$filename)) {
             $basic_config = include $file;
         }
-        if (file_exists($file = $this->path_plugin . '/' . $filename)) {
+        if (file_exists($file = $this->path_plugin.'/'.$filename)) {
             $plugin_config = include $file;
         }
 
@@ -129,22 +129,22 @@ 
     public function loadHandler($name = null)
     {
         $name  = !empty($name) ? $name : (empty($this->config['mode']) ? 'text' : $this->config['mode']);
-        $class = 'XoopsCaptcha' . ucfirst($name);
+        $class = 'XoopsCaptcha'.ucfirst($name);
         if (!empty($this->handler) && get_class($this->handler) == $class) {
             return $this->handler;
         }
         $this->handler = null;
-        if (file_exists($file = $this->path_basic . '/' . $name . '.php')) {
+        if (file_exists($file = $this->path_basic.'/'.$name.'.php')) {
             require_once $file;
         } else {
-            if (file_exists($file = $this->path_plugin . '/' . $name . '.php')) {
+            if (file_exists($file = $this->path_plugin.'/'.$name.'.php')) {
                 require_once $file;
             }
         }
 
         if (!class_exists($class)) {
             $class = 'XoopsCaptchaText';
-            require_once $this->path_basic . '/text.php';
+            require_once $this->path_basic.'/text.php';
         }
         $handler = new $class($this);
         if ($handler->isActive()) {
@@ -267,10 +267,10 @@ 
             $this->handler->destroyGarbage();
         }
         if ($clearSession) {
-            $_SESSION[$this->name . '_name']        = null;
-            $_SESSION[$this->name . '_skipmember']  = null;
-            $_SESSION[$this->name . '_code']        = null;
-            $_SESSION[$this->name . '_maxattempts'] = null;
+            $_SESSION[$this->name.'_name']        = null;
+            $_SESSION[$this->name.'_skipmember']  = null;
+            $_SESSION[$this->name.'_code']        = null;
+            $_SESSION[$this->name.'_maxattempts'] = null;
         }
 
         return true;
@@ -283,17 +283,17 @@ 
      */
     public function render()
     {
-        $_SESSION[$this->name . '_name']       = $this->name;
-        $_SESSION[$this->name . '_skipmember'] = $this->config['skipmember'];
+        $_SESSION[$this->name.'_name']       = $this->name;
+        $_SESSION[$this->name.'_skipmember'] = $this->config['skipmember'];
         $form                                  = '';
         if (!$this->active || empty($this->config['name'])) {
             return $form;
         }
 
         $maxAttempts                            = $this->config['maxattempts'];
-        $_SESSION[$this->name . '_maxattempts'] = $maxAttempts;
-        $attempt                                = isset($_SESSION[$this->name . '_attempt']) ? $_SESSION[$this->name . '_attempt'] : 0;
-        $_SESSION[$this->name . '_attempt']     = $attempt;
+        $_SESSION[$this->name.'_maxattempts'] = $maxAttempts;
+        $attempt                                = isset($_SESSION[$this->name.'_attempt']) ? $_SESSION[$this->name.'_attempt'] : 0;
+        $_SESSION[$this->name.'_attempt']     = $attempt;
 
         // Failure on too many attempts
         if (!empty($maxAttempts) && $attempt > $maxAttempts) {
@@ -330,7 +330,7 @@ 
     {
         $code = ($code === null) ? $this->handler->getCode() : $code;
         if (!empty($code)) {
-            $_SESSION[$this->name . '_code'] = $code;
+            $_SESSION[$this->name.'_code'] = $code;
 
             return true;
         }

htdocs/class/captcha/config.php

Spacing +5 added lines, -5 removed lines

@@ -24,9 +24,9 @@
  * the actual XOOPS config then we should do this. (Who said this? You are right!)
  */
 return $config = array(
-    'disabled'    => false,  // Disable CAPTCHA
-    'mode'        => 'text',  // default mode, you can choose 'text', 'image', 'recaptcha'(requires api key), 'recaptcha2'(requires api key)
-    'name'        => 'xoopscaptcha',  // captcha name
-    'skipmember'  => true,  // Skip CAPTCHA check for members
-    'maxattempts' => 10,  // Maximum attempts for each session
+    'disabled'    => false, // Disable CAPTCHA
+    'mode'        => 'text', // default mode, you can choose 'text', 'image', 'recaptcha'(requires api key), 'recaptcha2'(requires api key)
+    'name'        => 'xoopscaptcha', // captcha name
+    'skipmember'  => true, // Skip CAPTCHA check for members
+    'maxattempts' => 10, // Maximum attempts for each session
 );

htdocs/class/captcha/recaptcha2.php

Spacing +4 added lines, -4 removed lines

@@ -49,7 +49,7 @@ 
     {
         $form = '<script src="https://www.google.com/recaptcha/api.js"></script>';
         $form .= '<div class="form-group"><div class="g-recaptcha" data-sitekey="'
-            . $this->config['website_key'] . '"></div></div>';
+            . $this->config['website_key'].'"></div></div>';
         return $form;
     }
 
@@ -64,10 +64,10 @@ 
     {
         $isValid = false;
         $recaptchaResponse = Request::getString('g-recaptcha-response', '');
-        $recaptchaVerifyURL = 'https://www.google.com/recaptcha/api/siteverify?secret=' . $this->config['secret_key']
-            . '&response=' .  $recaptchaResponse . '&remoteip=' . IPAddress::fromRequest()->asReadable();
+        $recaptchaVerifyURL = 'https://www.google.com/recaptcha/api/siteverify?secret='.$this->config['secret_key']
+            . '&response='.$recaptchaResponse.'&remoteip='.IPAddress::fromRequest()->asReadable();
         $usedCurl = false;
-        if (function_exists('curl_init') && false !== ($curlHandle  = curl_init())) {
+        if (function_exists('curl_init') && false !== ($curlHandle = curl_init())) {
             curl_setopt($curlHandle, CURLOPT_URL, $recaptchaVerifyURL);
             curl_setopt($curlHandle, CURLOPT_FAILONERROR, true);
             curl_setopt($curlHandle, CURLOPT_RETURNTRANSFER, 1);

htdocs/class/captcha/recaptcha/recaptchalib.php

Indentation +59 added lines, -60 removed lines

@@ -100,16 +100,15 @@ 
  * @param string $pubkey A public key for reCAPTCHA
  * @param string $error The error given by reCAPTCHA (optional, default is null)
  * @param boolean $use_ssl Should the request be made over ssl? (optional, default is true)
-
  * @return string - The HTML to be embedded in the user's form.
  */
 function recaptcha_get_html ($pubkey, $error = null, $use_ssl = true)
 {
-	if ($pubkey == null || $pubkey == '') {
-		die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
-	}
+    if ($pubkey == null || $pubkey == '') {
+        die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
+    }
 
-	if ($use_ssl) {
+    if ($use_ssl) {
                 $server = RECAPTCHA_API_SECURE_SERVER;
         } else {
                 $server = RECAPTCHA_API_SERVER;
@@ -117,7 +116,7 @@ 
 
         $errorpart = "";
         if ($error) {
-           $errorpart = "&amp;error=" . $error;
+            $errorpart = "&amp;error=" . $error;
         }
         return '<script type="text/javascript" src="'. $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
 
@@ -141,23 +140,23 @@ 
 
 
 /**
-  * Calls an HTTP POST function to verify if the user's guess was correct
-  * @param string $privkey
-  * @param string $remoteip
-  * @param string $challenge
-  * @param string $response
-  * @param array $extra_params an array of extra variables to post to the server
-  * @return ReCaptchaResponse
-  */
+ * Calls an HTTP POST function to verify if the user's guess was correct
+ * @param string $privkey
+ * @param string $remoteip
+ * @param string $challenge
+ * @param string $response
+ * @param array $extra_params an array of extra variables to post to the server
+ * @return ReCaptchaResponse
+ */
 function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $extra_params = array())
 {
-	if ($privkey == null || $privkey == '') {
-		die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
-	}
+    if ($privkey == null || $privkey == '') {
+        die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
+    }
 
-	if ($remoteip == null || $remoteip == '') {
-		die ("For security reasons, you must pass the remote ip to reCAPTCHA");
-	}
+    if ($remoteip == null || $remoteip == '') {
+        die ("For security reasons, you must pass the remote ip to reCAPTCHA");
+    }
 
 
 
@@ -170,13 +169,13 @@ 
         }
 
         $response = _recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify",
-                                          array (
-                                                 'privatekey' => $privkey,
-                                                 'remoteip' => $remoteip,
-                                                 'challenge' => $challenge,
-                                                 'response' => $response
-                                                 ) + $extra_params
-                                          );
+                                            array (
+                                                    'privatekey' => $privkey,
+                                                    'remoteip' => $remoteip,
+                                                    'challenge' => $challenge,
+                                                    'response' => $response
+                                                    ) + $extra_params
+                                            );
 
         $answers = explode ("\n", $response [1]);
         $recaptcha_response = new ReCaptchaResponse();
@@ -200,44 +199,44 @@ 
  * @param string $appname The name of your application
  */
 function recaptcha_get_signup_url ($domain = null, $appname = null) {
-	return "https://www.google.com/recaptcha/admin/create?" .  _recaptcha_qsencode (array ('domains' => $domain, 'app' => $appname));
+    return "https://www.google.com/recaptcha/admin/create?" .  _recaptcha_qsencode (array ('domains' => $domain, 'app' => $appname));
 }
 
 function _recaptcha_aes_pad($val) {
-	$block_size = 16;
-	$numpad = $block_size - (strlen ($val) % $block_size);
-	return str_pad($val, strlen ($val) + $numpad, chr($numpad));
+    $block_size = 16;
+    $numpad = $block_size - (strlen ($val) % $block_size);
+    return str_pad($val, strlen ($val) + $numpad, chr($numpad));
 }
 
 /* Mailhide related code */
 
 function _recaptcha_aes_encrypt($val,$ky) {
-	if (! function_exists ("mcrypt_encrypt")) {
-		die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed.");
-	}
-	$mode=MCRYPT_MODE_CBC;
-	$enc=MCRYPT_RIJNDAEL_128;
-	$val=_recaptcha_aes_pad($val);
-	return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
+    if (! function_exists ("mcrypt_encrypt")) {
+        die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed.");
+    }
+    $mode=MCRYPT_MODE_CBC;
+    $enc=MCRYPT_RIJNDAEL_128;
+    $val=_recaptcha_aes_pad($val);
+    return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
 }
 
 
 function _recaptcha_mailhide_urlbase64 ($x) {
-	return strtr(base64_encode ($x), '+/', '-_');
+    return strtr(base64_encode ($x), '+/', '-_');
 }
 
 /* gets the reCAPTCHA Mailhide url for a given email, public key and private key */
 function recaptcha_mailhide_url($pubkey, $privkey, $email) {
-	if ($pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null) {
-		die ("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " .
-		     "you can do so at <a href='http://www.google.com/recaptcha/mailhide/apikey'>http://www.google.com/recaptcha/mailhide/apikey</a>");
-	}
+    if ($pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null) {
+        die ("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " .
+                "you can do so at <a href='http://www.google.com/recaptcha/mailhide/apikey'>http://www.google.com/recaptcha/mailhide/apikey</a>");
+    }
 
 
-	$ky = pack('H*', $privkey);
-	$cryptmail = _recaptcha_aes_encrypt ($email, $ky);
+    $ky = pack('H*', $privkey);
+    $cryptmail = _recaptcha_aes_encrypt ($email, $ky);
 
-	return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail);
+    return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail);
 }
 
 /**
@@ -246,16 +245,16 @@ 
  * the email is then displayed as john...@example.com
  */
 function _recaptcha_mailhide_email_parts ($email) {
-	$arr = preg_split("/@/", $email );
-
-	if (strlen ($arr[0]) <= 4) {
-		$arr[0] = substr ($arr[0], 0, 1);
-	} else if (strlen ($arr[0]) <= 6) {
-		$arr[0] = substr ($arr[0], 0, 3);
-	} else {
-		$arr[0] = substr ($arr[0], 0, 4);
-	}
-	return $arr;
+    $arr = preg_split("/@/", $email );
+
+    if (strlen ($arr[0]) <= 4) {
+        $arr[0] = substr ($arr[0], 0, 1);
+    } else if (strlen ($arr[0]) <= 6) {
+        $arr[0] = substr ($arr[0], 0, 3);
+    } else {
+        $arr[0] = substr ($arr[0], 0, 4);
+    }
+    return $arr;
 }
 
 /**
@@ -265,11 +264,11 @@ 
  * http://www.google.com/recaptcha/mailhide/apikey
  */
 function recaptcha_mailhide_html($pubkey, $privkey, $email) {
-	$emailparts = _recaptcha_mailhide_email_parts ($email);
-	$url = recaptcha_mailhide_url ($pubkey, $privkey, $email);
+    $emailparts = _recaptcha_mailhide_email_parts ($email);
+    $url = recaptcha_mailhide_url ($pubkey, $privkey, $email);
 
-	return htmlentities($emailparts[0]) . "<a href='" . htmlentities ($url) .
-		"' onclick=\"window.open('" . htmlentities ($url) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities ($emailparts [1]);
+    return htmlentities($emailparts[0]) . "<a href='" . htmlentities ($url) .
+        "' onclick=\"window.open('" . htmlentities ($url) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities ($emailparts [1]);
 
 }
 

Spacing +42 added lines, -42 removed lines

@@ -44,13 +44,13 @@ 
  * @param $data - array of string elements to be encoded
  * @return string - encoded request
  */
-function _recaptcha_qsencode ($data) {
+function _recaptcha_qsencode($data) {
         $req = "";
-        foreach ( $data as $key => $value )
-                $req .= $key . '=' . urlencode( stripslashes($value) ) . '&';
+        foreach ($data as $key => $value)
+                $req .= $key.'='.urlencode(stripslashes($value)).'&';
 
         // Cut the last '&'
-        $req=substr($req,0,strlen($req)-1);
+        $req = substr($req, 0, strlen($req) - 1);
         return $req;
 }
 
@@ -66,24 +66,24 @@ 
  */
 function _recaptcha_http_post($host, $path, $data, $port = 80) {
 
-        $req = _recaptcha_qsencode ($data);
+        $req = _recaptcha_qsencode($data);
 
         $http_request  = "POST $path HTTP/1.0\r\n";
         $http_request .= "Host: $host\r\n";
         $http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n";
-        $http_request .= "Content-Length: " . strlen($req) . "\r\n";
+        $http_request .= "Content-Length: ".strlen($req)."\r\n";
         $http_request .= "User-Agent: reCAPTCHA/PHP\r\n";
         $http_request .= "\r\n";
         $http_request .= $req;
 
         $response = '';
-        if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) {
+        if (false == ($fs = @fsockopen($host, $port, $errno, $errstr, 10))) {
                 die ('Could not open socket');
         }
 
         fwrite($fs, $http_request);
 
-        while ( !feof($fs) )
+        while (!feof($fs))
                 $response .= fgets($fs, 1160); // One TCP-IP packet
         fclose($fs);
         $response = explode("\r\n\r\n", $response, 2);
@@ -103,7 +103,7 @@ 
 
  * @return string - The HTML to be embedded in the user's form.
  */
-function recaptcha_get_html ($pubkey, $error = null, $use_ssl = true)
+function recaptcha_get_html($pubkey, $error = null, $use_ssl = true)
 {
 	if ($pubkey == null || $pubkey == '') {
 		die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
@@ -117,12 +117,12 @@ 
 
         $errorpart = "";
         if ($error) {
-           $errorpart = "&amp;error=" . $error;
+           $errorpart = "&amp;error=".$error;
         }
-        return '<script type="text/javascript" src="'. $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
+        return '<script type="text/javascript" src="'.$server.'/challenge?k='.$pubkey.$errorpart.'"></script>
 
 	<noscript>
-  		<iframe src="'. $server . '/noscript?k=' . $pubkey . $errorpart . '" height="300" width="500" frameborder="0"></iframe><br/>
+  		<iframe src="'. $server.'/noscript?k='.$pubkey.$errorpart.'" height="300" width="500" frameborder="0"></iframe><br/>
   		<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
   		<input type="hidden" name="recaptcha_response_field" value="manual_challenge"/>
 	</noscript>';
@@ -149,7 +149,7 @@ 
   * @param array $extra_params an array of extra variables to post to the server
   * @return ReCaptchaResponse
   */
-function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $extra_params = array())
+function recaptcha_check_answer($privkey, $remoteip, $challenge, $response, $extra_params = array())
 {
 	if ($privkey == null || $privkey == '') {
 		die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
@@ -169,8 +169,8 @@ 
                 return $recaptcha_response;
         }
 
-        $response = _recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify",
-                                          array (
+        $response = _recaptcha_http_post(RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify",
+                                          array(
                                                  'privatekey' => $privkey,
                                                  'remoteip' => $remoteip,
                                                  'challenge' => $challenge,
@@ -178,10 +178,10 @@ 
                                                  ) + $extra_params
                                           );
 
-        $answers = explode ("\n", $response [1]);
+        $answers = explode("\n", $response [1]);
         $recaptcha_response = new ReCaptchaResponse();
 
-        if (trim ($answers [0]) == 'true') {
+        if (trim($answers [0]) == 'true') {
                 $recaptcha_response->is_valid = true;
         }
         else {
@@ -199,45 +199,45 @@ 
  * @param string $domain The domain where the page is hosted
  * @param string $appname The name of your application
  */
-function recaptcha_get_signup_url ($domain = null, $appname = null) {
-	return "https://www.google.com/recaptcha/admin/create?" .  _recaptcha_qsencode (array ('domains' => $domain, 'app' => $appname));
+function recaptcha_get_signup_url($domain = null, $appname = null) {
+	return "https://www.google.com/recaptcha/admin/create?"._recaptcha_qsencode(array('domains' => $domain, 'app' => $appname));
 }
 
 function _recaptcha_aes_pad($val) {
 	$block_size = 16;
-	$numpad = $block_size - (strlen ($val) % $block_size);
-	return str_pad($val, strlen ($val) + $numpad, chr($numpad));
+	$numpad = $block_size - (strlen($val) % $block_size);
+	return str_pad($val, strlen($val) + $numpad, chr($numpad));
 }
 
 /* Mailhide related code */
 
-function _recaptcha_aes_encrypt($val,$ky) {
-	if (! function_exists ("mcrypt_encrypt")) {
+function _recaptcha_aes_encrypt($val, $ky) {
+	if (!function_exists("mcrypt_encrypt")) {
 		die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed.");
 	}
-	$mode=MCRYPT_MODE_CBC;
-	$enc=MCRYPT_RIJNDAEL_128;
-	$val=_recaptcha_aes_pad($val);
+	$mode = MCRYPT_MODE_CBC;
+	$enc = MCRYPT_RIJNDAEL_128;
+	$val = _recaptcha_aes_pad($val);
 	return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
 }
 
 
-function _recaptcha_mailhide_urlbase64 ($x) {
-	return strtr(base64_encode ($x), '+/', '-_');
+function _recaptcha_mailhide_urlbase64($x) {
+	return strtr(base64_encode($x), '+/', '-_');
 }
 
 /* gets the reCAPTCHA Mailhide url for a given email, public key and private key */
 function recaptcha_mailhide_url($pubkey, $privkey, $email) {
 	if ($pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null) {
-		die ("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " .
+		die ("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, ".
 		     "you can do so at <a href='http://www.google.com/recaptcha/mailhide/apikey'>http://www.google.com/recaptcha/mailhide/apikey</a>");
 	}
 
 
 	$ky = pack('H*', $privkey);
-	$cryptmail = _recaptcha_aes_encrypt ($email, $ky);
+	$cryptmail = _recaptcha_aes_encrypt($email, $ky);
 
-	return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail);
+	return "http://www.google.com/recaptcha/mailhide/d?k=".$pubkey."&c="._recaptcha_mailhide_urlbase64($cryptmail);
 }
 
 /**
@@ -245,15 +245,15 @@ 
  * eg, given johndoe@example,com return ["john", "example.com"].
  * the email is then displayed as john...@example.com
  */
-function _recaptcha_mailhide_email_parts ($email) {
-	$arr = preg_split("/@/", $email );
+function _recaptcha_mailhide_email_parts($email) {
+	$arr = preg_split("/@/", $email);
 
-	if (strlen ($arr[0]) <= 4) {
-		$arr[0] = substr ($arr[0], 0, 1);
-	} else if (strlen ($arr[0]) <= 6) {
-		$arr[0] = substr ($arr[0], 0, 3);
+	if (strlen($arr[0]) <= 4) {
+		$arr[0] = substr($arr[0], 0, 1);
+	} else if (strlen($arr[0]) <= 6) {
+		$arr[0] = substr($arr[0], 0, 3);
 	} else {
-		$arr[0] = substr ($arr[0], 0, 4);
+		$arr[0] = substr($arr[0], 0, 4);
 	}
 	return $arr;
 }
@@ -265,11 +265,11 @@ 
  * http://www.google.com/recaptcha/mailhide/apikey
  */
 function recaptcha_mailhide_html($pubkey, $privkey, $email) {
-	$emailparts = _recaptcha_mailhide_email_parts ($email);
-	$url = recaptcha_mailhide_url ($pubkey, $privkey, $email);
+	$emailparts = _recaptcha_mailhide_email_parts($email);
+	$url = recaptcha_mailhide_url($pubkey, $privkey, $email);
 
-	return htmlentities($emailparts[0]) . "<a href='" . htmlentities ($url) .
-		"' onclick=\"window.open('" . htmlentities ($url) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities ($emailparts [1]);
+	return htmlentities($emailparts[0])."<a href='".htmlentities($url).
+		"' onclick=\"window.open('".htmlentities($url)."', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@".htmlentities($emailparts [1]);
 
 }
 

Braces +8 added lines, -6 removed lines

@@ -46,8 +46,9 @@ 
  */
 function _recaptcha_qsencode ($data) {
         $req = "";
-        foreach ( $data as $key => $value )
-                $req .= $key . '=' . urlencode( stripslashes($value) ) . '&';
+        foreach ( $data as $key => $value ) {
+                        $req .= $key . '=' . urlencode( stripslashes($value) ) . '&';
+        }
 
         // Cut the last '&'
         $req=substr($req,0,strlen($req)-1);
@@ -83,8 +84,10 @@ 
 
         fwrite($fs, $http_request);
 
-        while ( !feof($fs) )
-                $response .= fgets($fs, 1160); // One TCP-IP packet
+        while ( !feof($fs) ) {
+                        $response .= fgets($fs, 1160);
+        }
+        // One TCP-IP packet
         fclose($fs);
         $response = explode("\r\n\r\n", $response, 2);
 
@@ -183,8 +186,7 @@ 
 
         if (trim ($answers [0]) == 'true') {
                 $recaptcha_response->is_valid = true;
-        }
-        else {
+        } else {
                 $recaptcha_response->is_valid = false;
                 $recaptcha_response->error = $answers [1];
         }