geekwright / XoopsCore

htdocs/class/xoopseditor/tinymce4/include/xoopsmlcontent.php

Spacing +1 added lines, -1 removed lines

@@ -1,1 +1,1 @@
-<?php

/**
 *  TinyMCE adapter for XOOPS
 *
 * @copyright       XOOPS Project (http://xoops.org)
 * @license         GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
 * @package         class
 * @subpackage      editor
 * @since           2.3.0
 * @author          Laurent JEN <dugris@frxoops.org>
 * @version         $Id: xoopsmlcontent.php 8066 2011-11-06 05:09:33Z beckmi $
 */

// Xlanguage
if ( $GLOBALS["module_handler"]->getByDirname("xlanguage") && defined("XLANGUAGE_LANG_TAG") ) {
    return true;
}

// Easiest Multi-Language Hack (EMLH)
if ( defined('EASIESTML_LANGS') && defined('EASIESTML_LANGNAMES') ) {
    return true;
}

return false;

\ No newline at end of file
+<?php

/**
 *  TinyMCE adapter for XOOPS
 *
 * @copyright       XOOPS Project (http://xoops.org)
 * @license         GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
 * @package         class
 * @subpackage      editor
 * @since           2.3.0
 * @author          Laurent JEN <dugris@frxoops.org>
 * @version         $Id: xoopsmlcontent.php 8066 2011-11-06 05:09:33Z beckmi $
 */

// Xlanguage
if ($GLOBALS["module_handler"]->getByDirname("xlanguage") && defined("XLANGUAGE_LANG_TAG")) {
    return true; }

// Easiest Multi-Language Hack (EMLH)
if (defined('EASIESTML_LANGS') && defined('EASIESTML_LANGNAMES')) {
    return true; }

return false;

\ No newline at end of file

htdocs/class/xoopseditor/tinymce4/include/xoopsemotions.php

Spacing +1 added lines, -1 removed lines

@@ -1,1 +1,1 @@
-<?php
/**
 *  TinyMCE adapter for XOOPS
 *
 * @copyright       XOOPS Project (http://xoops.org)
 * @license         GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
 * @package         class
 * @subpackage      editor
 * @since           2.3.0
 * @author          Laurent JEN <dugris@frxoops.org>
 * @version         $Id: xoopsemotions.php 8066 2011-11-06 05:09:33Z beckmi $
 */

include_once \XoopsBaseConfig::get('root-path') . "/modules/system/constants.php";
// Add your code here to check acces by groups
return true;

\ No newline at end of file
+<?php
/**
 *  TinyMCE adapter for XOOPS
 *
 * @copyright       XOOPS Project (http://xoops.org)
 * @license         GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
 * @package         class
 * @subpackage      editor
 * @since           2.3.0
 * @author          Laurent JEN <dugris@frxoops.org>
 * @version         $Id: xoopsemotions.php 8066 2011-11-06 05:09:33Z beckmi $
 */

include_once \XoopsBaseConfig::get('root-path')."/modules/system/constants.php"; // Add your code here to check acces by groups
return true;

\ No newline at end of file

htdocs/class/xoopseditor/tinymce4/language/english.php

Spacing +3 added lines, -3 removed lines

@@ -14,12 +14,12 @@
  * Assocated with editor_registry.php
  */
 // Name of the editor
-define("_XOOPS_EDITOR_TINYMCE4","TinyMCE4");
+define("_XOOPS_EDITOR_TINYMCE4", "TinyMCE4");
 
 // The value must be the same as /tinymce/jscripts/langs/your_language_code, for example, "en" for English, "fr" for French
 // For details, check http://tinymce.moxiecode.com/download_i18n.php
-define("_XOOPS_EDITOR_TINYMCE4_LANGUAGE","en");
+define("_XOOPS_EDITOR_TINYMCE4_LANGUAGE", "en");
 
 // FONT LIST, FORMAT: "Name=value1,value2;Name=value"
 
-define("_XOOPS_EDITOR_TINYMCE4_FONTS","Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;WingDings=wingdings");
+define("_XOOPS_EDITOR_TINYMCE4_FONTS", "Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;WingDings=wingdings");

htdocs/class/xoopseditor/tinymce4/language/french.php

Spacing +3 added lines, -3 removed lines

@@ -14,11 +14,11 @@
  * Assocated with editor_registry.php
  */
 // Name of the editor
-define("_XOOPS_EDITOR_TINYMCE4","TinyMCE4");
+define("_XOOPS_EDITOR_TINYMCE4", "TinyMCE4");
 
 // The value must be the same as /tinymce/jscripts/langs/your_language_code, for example, "en" for English, "fr" for French
 // For details, check http://tinymce.moxiecode.com/download_i18n.php
-define("_XOOPS_EDITOR_TINYMCE4_LANGUAGE","fr_FR");
+define("_XOOPS_EDITOR_TINYMCE4_LANGUAGE", "fr_FR");
 
 // FONT LIST, FORMAT: "Name=value1,value2;Name=value"
-define("_XOOPS_EDITOR_TINYMCE4_FONTS","Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;WingDings=wingdings");
+define("_XOOPS_EDITOR_TINYMCE4_FONTS", "Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;WingDings=wingdings");

htdocs/class/xoopseditor/tinymce4/tinymce.php

Indentation +4 added lines, -4 removed lines

@@ -216,10 +216,10 @@
     }
 
     /**
-      * loadPlugins - load all plugins execpt the plugins in setting["exclude_plugins"]
-      *
-      * @return array plugins
-      */
+     * loadPlugins - load all plugins execpt the plugins in setting["exclude_plugins"]
+     *
+     * @return array plugins
+     */
     public function loadPlugins()
     {
         $plugins = array();

Spacing +36 added lines, -36 removed lines

@@ -37,7 +37,7 @@ 
     public function __construct($config)
     {
         $this->setConfig($config);
-        $this->rootpath = $this->config["rootpath"] . "/tinymce/js/tinymce";
+        $this->rootpath = $this->config["rootpath"]."/tinymce/js/tinymce";
     }
 
     /**
@@ -80,11 +80,11 @@ 
 
         // Load default settings
         if (!($this->setting = @include($GLOBALS['xoops']->path("var/configs/tinymce.php")))) {
-            $this->setting = include __DIR__ . "/settings.php";
+            $this->setting = include __DIR__."/settings.php";
         }
 
         // get editor language (from ...)
-        if (is_readable(\XoopsBaseConfig::get('root-path') . $this->rootpath . '/langs/' . $this->config["language"] . '.js')) {
+        if (is_readable(\XoopsBaseConfig::get('root-path').$this->rootpath.'/langs/'.$this->config["language"].'.js')) {
             $this->setting["language"] = $this->config["language"];
             $configured[] = "language";
         }
@@ -93,7 +93,7 @@ 
         $configured[] = "content_css";
 
         if (!empty($this->config["theme"])
-            && is_dir(\XoopsBaseConfig::get('root-path') . $this->rootpath . "/themes/" . $this->config["theme"])
+            && is_dir(\XoopsBaseConfig::get('root-path').$this->rootpath."/themes/".$this->config["theme"])
         ) {
             $this->setting["theme"] = $this->config["theme"];
             $configured[] = "theme";
@@ -127,63 +127,63 @@ 
             foreach ($this->config["buttons"] as $button) {
                 $i++;
                 if (isset($button["before"])) {
-                    $this->setting["theme_" . $this->setting["theme"] . "_buttons{$i}_add_before"] = $button["before"];
+                    $this->setting["theme_".$this->setting["theme"]."_buttons{$i}_add_before"] = $button["before"];
                 }
                 if (isset($button["add"])) {
-                    $this->setting["theme_" . $this->setting["theme"] . "_buttons{$i}_add"] = $button["add"];
+                    $this->setting["theme_".$this->setting["theme"]."_buttons{$i}_add"] = $button["add"];
                 }
                 if (isset($button[""])) {
-                    $this->setting["theme_" . $this->setting["theme"] . "_buttons{$i}"] = $button[""];
+                    $this->setting["theme_".$this->setting["theme"]."_buttons{$i}"] = $button[""];
                 }
             }
             $configured[] = "buttons";
 
             if (isset($this->config["toolbar_location"])) {
-                $this->setting["theme_" . $this->setting["theme"] . "_toolbar_location"]
+                $this->setting["theme_".$this->setting["theme"]."_toolbar_location"]
                     = $this->config["toolbar_location"];
                 $configured[] = "toolbar_location";
             } else {
-                $this->setting["theme_" . $this->setting["theme"] . "_toolbar_location"] = "top";
+                $this->setting["theme_".$this->setting["theme"]."_toolbar_location"] = "top";
             }
 
             if (isset($this->config["toolbar_align"])) {
-                $this->setting["theme_" . $this->setting["theme"] . "_toolbar_align"] = $this->config["toolbar_align"];
+                $this->setting["theme_".$this->setting["theme"]."_toolbar_align"] = $this->config["toolbar_align"];
                 $configured[] = "toolbar_align";
             } else {
-                $this->setting["theme_" . $this->setting["theme"] . "_toolbar_align"] = "left";
+                $this->setting["theme_".$this->setting["theme"]."_toolbar_align"] = "left";
             }
 
             if (isset($this->config["statusbar_location"])) {
-                $this->setting["theme_" . $this->setting["theme"] . "_statusbar_location"]
+                $this->setting["theme_".$this->setting["theme"]."_statusbar_location"]
                     = $this->config["statusbar_location"];
                 $configured[] = "statusbar_location";
             }
 
             if (isset($this->config["path_location"])) {
-                $this->setting["theme_" . $this->setting["theme"] . "_path_location"] = $this->config["path_location"];
+                $this->setting["theme_".$this->setting["theme"]."_path_location"] = $this->config["path_location"];
                 $configured[] = "path_location";
             }
 
             if (isset($this->config["resize_horizontal"])) {
-                $this->setting["theme_" . $this->setting["theme"] . "_resize_horizontal"]
+                $this->setting["theme_".$this->setting["theme"]."_resize_horizontal"]
                     = $this->config["resize_horizontal"];
                 $configured[] = "resize_horizontal";
             }
 
             if (isset($this->config["resizing"])) {
-                $this->setting["theme_" . $this->setting["theme"] . "_resizing"] = $this->config["resizing"];
+                $this->setting["theme_".$this->setting["theme"]."_resizing"] = $this->config["resizing"];
                 $configured[] = "resizing";
             }
 
             if (!empty($this->config["fonts"])) {
-                $this->setting["theme_" . $this->setting["theme"] . "_fonts"] = $this->config["fonts"];
+                $this->setting["theme_".$this->setting["theme"]."_fonts"] = $this->config["fonts"];
                 $configured[] = "fonts";
             }
 
-            for ($i=1; $i <= 4; $i++) {
+            for ($i = 1; $i <= 4; $i++) {
                 $buttons = array();
-                if (isset($this->setting["theme_" . $this->setting["theme"] . "_buttons{$i}"])) {
-                    $checklist = explode(",", $this->setting["theme_" . $this->setting["theme"] . "_buttons{$i}"]);
+                if (isset($this->setting["theme_".$this->setting["theme"]."_buttons{$i}"])) {
+                    $checklist = explode(",", $this->setting["theme_".$this->setting["theme"]."_buttons{$i}"]);
                     foreach ($checklist as $plugin) {
                         if (strpos(strtolower($plugin), "xoops") !== false) {
                             if (in_array($plugin, $this->xoopsPlugins)) {
@@ -193,7 +193,7 @@ 
                             $buttons[] = $plugin;
                         }
                     }
-                    $this->setting["theme_" . $this->setting["theme"] . "_buttons{$i}"] = implode(",", $buttons);
+                    $this->setting["theme_".$this->setting["theme"]."_buttons{$i}"] = implode(",", $buttons);
                 }
             }
         }
@@ -206,7 +206,7 @@ 
             $this->setting[$key] = $val;
         }
 
-        if (!is_dir(\XoopsBaseConfig::get('root-path') . $this->rootpath . "/themes/" . $this->setting["theme"] . '/docs/' . $this->setting["language"] . '/')) {
+        if (!is_dir(\XoopsBaseConfig::get('root-path').$this->rootpath."/themes/".$this->setting["theme"].'/docs/'.$this->setting["language"].'/')) {
             $this->setting["docs_language"] = "en";
         }
 
@@ -223,7 +223,7 @@ 
     public function loadPlugins()
     {
         $plugins = array();
-        $plugins_list = XoopsLists::getDirListAsArray(\XoopsBaseConfig::get('root-path') . $this->rootpath . "/plugins");
+        $plugins_list = XoopsLists::getDirListAsArray(\XoopsBaseConfig::get('root-path').$this->rootpath."/plugins");
         if (empty($this->setting["plugins"])) {
             $plugins = $plugins_list;
         } else {
@@ -248,11 +248,11 @@ 
     {
         $xoopsPlugins = array();
         $xoops_root_path = \XoopsBaseConfig::get('root-path');
-        $allplugins = XoopsLists::getDirListAsArray ($xoops_root_path . $this->rootpath . "/plugins");
+        $allplugins = XoopsLists::getDirListAsArray($xoops_root_path.$this->rootpath."/plugins");
         foreach ($allplugins as $plugin) {
             if (strpos(strtolower($plugin), "xoops") !== false
-                && file_exists($xoops_root_path . $this->config["rootpath"] . "/include/$plugin.php")) {
-                if ($right = @include $xoops_root_path . $this->config["rootpath"] . "/include/$plugin.php") {
+                && file_exists($xoops_root_path.$this->config["rootpath"]."/include/$plugin.php")) {
+                if ($right = @include $xoops_root_path.$this->config["rootpath"]."/include/$plugin.php") {
                     $xoopsPlugins[$plugin] = $plugin;
                 }
             }
@@ -271,8 +271,8 @@ 
         }
 
         $css = array();
-        $css[] = $css_url . '/' . $css_file;
-        $css_content = file_get_contents($css_path . '/' . $css_file);
+        $css[] = $css_url.'/'.$css_file;
+        $css_content = file_get_contents($css_path.'/'.$css_file);
 
         // get all import css files
         if (preg_match_all("~\@import url\((.*\.css)\);~sUi", $css_content, $matches, PREG_PATTERN_ORDER)) {
@@ -307,15 +307,15 @@ 
             $callback = "";
         }
 
-        $ret = '<script language="javascript" type="text/javascript" src="' . \XoopsBaseConfig::get('url') . $this->rootpath . '/tinymce.min.js"></script>';
+        $ret = '<script language="javascript" type="text/javascript" src="'.\XoopsBaseConfig::get('url').$this->rootpath.'/tinymce.min.js"></script>';
         $ret .= '<script language="javascript" type="text/javascript">
                 tinyMCE.init({
             ';
 
         foreach ($this->setting as $key => $val) {
-            $ret .= $key . ":";
+            $ret .= $key.":";
             if ($val === true) {
-                $ret.= "true,";
+                $ret .= "true,";
             } elseif ($val === false) {
                 $ret .= "false,";
             } else {
@@ -326,14 +326,14 @@ 
 
         //	 Ajout alain01 tinymce v4
 
-        $chemin_array=parse_url(\XoopsBaseConfig::get('url'));
-        $chemin_scheme =  $chemin_array["scheme"]; // http
-        $chemin_host =  $chemin_array["host"]; // www.example.com  or // localhost
+        $chemin_array = parse_url(\XoopsBaseConfig::get('url'));
+        $chemin_scheme = $chemin_array["scheme"]; // http
+        $chemin_host = $chemin_array["host"]; // www.example.com  or // localhost
         //$chemin_path =  $chemin_array["path"]; // /myweb1
         if (!isset($chemin_array['path'])) {
             $chemin_path = '';
         } else {
-            $chemin_path =  $chemin_array["path"];
+            $chemin_path = $chemin_array["path"];
         }
 
         //$ret .='language_url : "'.$chemin_path.'/class/xoopseditor/tinymce4/tinymce/js/tinymce/langs/fr_FR.js",';
@@ -369,7 +369,7 @@ 
         $ret .= '"external_filemanager_path": "'.$chemin_path.'/class/xoopseditor/tinymce4/external_plugins/filemanager/",';
         $ret .= "\n";
 
-        $ret .='templates: "'.$chemin_path.'/uploads/filemanager/templates/liste-templates.js",';
+        $ret .= 'templates: "'.$chemin_path.'/uploads/filemanager/templates/liste-templates.js",';
         $ret .= "\n";
         // fin ajout alain01
 
@@ -387,6 +387,6 @@ 
                 </script>
             ';
 
-        return $ret ;
+        return $ret;
     }
 }

htdocs/class/xoopseditor/textarea/editor_registry.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 
 return $config = array(
     "class"  => "FormTextArea",
-    "file"   => \XoopsBaseConfig::get('root-path') . "/class/xoopseditor/textarea/textarea.php",
+    "file"   => \XoopsBaseConfig::get('root-path')."/class/xoopseditor/textarea/textarea.php",
     "title"  => _XOOPS_EDITOR_TEXTAREA, // display to end user
     "order"  => 1, // 0 will disable the editor
     "nohtml" => 1 // For forms that have "dohtml" disabled

htdocs/class/captcha/xoopscaptcha.php

Indentation +2 added lines, -2 removed lines

@@ -73,8 +73,8 @@
     protected function __construct()
     {
         // Load static configurations
-		$xoops_root_path = \XoopsBaseConfig::get('root-path');
-		$xoops_var_path = \XoopsBaseConfig::get('var-path');
+        $xoops_root_path = \XoopsBaseConfig::get('root-path');
+        $xoops_var_path = \XoopsBaseConfig::get('var-path');
         $this->path_basic = $xoops_root_path . '/class/captcha';
         $this->path_plugin = $xoops_root_path . '/Frameworks/captcha';
         $this->configPath = $xoops_var_path . '/configs/';

Spacing +27 added lines, -27 removed lines

@@ -75,9 +75,9 @@ 
         // Load static configurations
 		$xoops_root_path = \XoopsBaseConfig::get('root-path');
 		$xoops_var_path = \XoopsBaseConfig::get('var-path');
-        $this->path_basic = $xoops_root_path . '/class/captcha';
-        $this->path_plugin = $xoops_root_path . '/Frameworks/captcha';
-        $this->configPath = $xoops_var_path . '/configs/';
+        $this->path_basic = $xoops_root_path.'/class/captcha';
+        $this->path_plugin = $xoops_root_path.'/Frameworks/captcha';
+        $this->configPath = $xoops_var_path.'/configs/';
         $this->config = $this->loadConfig();
         $this->name = $this->config['name'];
     }
@@ -104,15 +104,15 @@ 
      *
      * @return array
      */
-    function loadConfig( $name = 'config') {
-        if ( $name === 'config' ) {
+    function loadConfig($name = 'config') {
+        if ($name === 'config') {
             $filename = 'captcha.config';
         } else {
-            $filename = 'captcha.config.' . $name;
+            $filename = 'captcha.config.'.$name;
         }
-        if ( !$config = $this->readConfig($filename) ) {
-            $config = $this->loadBasicConfig( $name );
-            $this->writeConfig($filename, $config );
+        if (!$config = $this->readConfig($filename)) {
+            $config = $this->loadBasicConfig($name);
+            $this->writeConfig($filename, $config);
         }
 
         return $config;
@@ -129,11 +129,11 @@ 
     {
         $basic_config = array();
         $plugin_config = array();
-        $filename = ($filename === 'config') ? 'config.php' : 'config.' . $filename . '.php';
-        if (XoopsLoad::fileExists($file = $this->path_basic . '/' . $filename)) {
+        $filename = ($filename === 'config') ? 'config.php' : 'config.'.$filename.'.php';
+        if (XoopsLoad::fileExists($file = $this->path_basic.'/'.$filename)) {
             $basic_config = include $file;
         }
-        if (XoopsLoad::fileExists($file = $this->path_plugin . '/' . $filename)) {
+        if (XoopsLoad::fileExists($file = $this->path_plugin.'/'.$filename)) {
             $plugin_config = include $file;
         }
 
@@ -150,7 +150,7 @@ 
      */
     function readConfig($filename = 'config')
     {
-        $path_file = $this->configPath . $filename . '.php';
+        $path_file = $this->configPath.$filename.'.php';
         $file = XoopsFile::getHandler('file', $path_file);
         return eval(@$file->read());
     }
@@ -165,9 +165,9 @@ 
      */
     function writeConfig($filename = 'config', $config)
     {
-        $path_file = $this->configPath . $filename . '.php';
+        $path_file = $this->configPath.$filename.'.php';
         $file = XoopsFile::getHandler('file', $path_file);
-        return $file->write( 'return ' . var_export($config, true) . ';');
+        return $file->write('return '.var_export($config, true).';');
     }
 
     /**
@@ -207,22 +207,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 (XoopsLoad::fileExists($file = $this->path_basic . '/' . $name . '.php')) {
+        if (XoopsLoad::fileExists($file = $this->path_basic.'/'.$name.'.php')) {
             require_once $file;
         } else {
-            if (XoopsLoad::fileExists($file = $this->path_plugin . '/' . $name . '.php')) {
+            if (XoopsLoad::fileExists($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';
         }
         /* @var $handler XoopsCaptchaMethod */
         $handler = new $class($this);
@@ -348,8 +348,8 @@ 
         $this->handler->destroyGarbage();
 
         if ($clearSession) {
-            foreach ($this->config as $k => $config ) {
-                $_SESSION[$this->name . '_' . $k] = null;
+            foreach ($this->config as $k => $config) {
+                $_SESSION[$this->name.'_'.$k] = null;
             }
         }
         return true;
@@ -363,9 +363,9 @@ 
     public function render()
     {
         $sessionName = $this->config['name'];
-        $_SESSION[$sessionName . '_name'] = $sessionName;
-        foreach ($this->config as $k => $config ) {
-            $_SESSION[$sessionName . '_' . $k] = $config;
+        $_SESSION[$sessionName.'_name'] = $sessionName;
+        foreach ($this->config as $k => $config) {
+            $_SESSION[$sessionName.'_'.$k] = $config;
         }
         $form = '';
         if (!$this->active || empty($this->config['name'])) {
@@ -373,8 +373,8 @@ 
         }
 
         $maxAttempts = $this->config['maxattempts'];
-        $attempt = isset($_SESSION[$sessionName . '_attempt']) ? $_SESSION[$sessionName . '_attempt'] : 0;
-        $_SESSION[$sessionName . '_attempt'] = $attempt;
+        $attempt = isset($_SESSION[$sessionName.'_attempt']) ? $_SESSION[$sessionName.'_attempt'] : 0;
+        $_SESSION[$sessionName.'_attempt'] = $attempt;
 
         // Failure on too many attempts
         if (!empty($maxAttempts) && $attempt > $maxAttempts) {
@@ -410,7 +410,7 @@ 
     {
         $code = ($code === null) ? $this->handler->getCode() : $code;
         if (!empty($code)) {
-            $_SESSION[$this->name . '_code'] = $code;
+            $_SESSION[$this->name.'_code'] = $code;
             return true;
         }
         return false;

htdocs/class/captcha/xoopscaptchamethod.php

Braces +5 added lines, -4 removed lines

@@ -75,12 +75,13 @@
      */
     public function loadConfig($name = '')
     {
-        if (!is_object($this->handler))
-            $this->config = array();
-        else
-            $this->config = empty($name)
+        if (!is_object($this->handler)) {
+                    $this->config = array();
+        } else {
+                    $this->config = empty($name)
                 ? $this->handler->config
                 : array_merge($this->handler->config, $this->handler->loadConfig($name));
+        }
     }
 
     /**

htdocs/class/captcha/recaptcha/recaptchalib.php

Indentation +7 added lines, -8 removed lines

@@ -105,7 +105,6 @@ 
  * @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 false)
-
  * @return string - The HTML to be embedded in the user's form.
  */
 function recaptcha_get_html($pubkey, $error = null, $use_ssl = false)
@@ -172,13 +171,13 @@ 
     }
 
     $response = _recaptcha_http_post(RECAPTCHA_VERIFY_SERVER,
-		"/recaptcha/api/verify",
-		array(
-			   'privatekey' => $privkey,
-			   'remoteip' => $remoteip,
-			   'challenge' => $challenge,
-			   'response' => $response
-		   ) + $extra_params);
+        "/recaptcha/api/verify",
+        array(
+                'privatekey' => $privkey,
+                'remoteip' => $remoteip,
+                'challenge' => $challenge,
+                'response' => $response
+            ) + $extra_params);
 
     $answers = explode("\n", $response [1]);
     $recaptcha_response = new ReCaptchaResponse();

Spacing +9 added lines, -9 removed lines

@@ -50,7 +50,7 @@ 
 {
     $req = "";
     foreach ($data as $key => $value) {
-        $req .= $key . '=' . urlencode(stripslashes($value)) . '&';
+        $req .= $key.'='.urlencode(stripslashes($value)).'&';
     }
 
     // Cut the last '&'
@@ -76,7 +76,7 @@ 
     $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;
@@ -122,12 +122,12 @@ 
 
     $errorpart = "";
     if ($error) {
-        $errorpart = "&error=" . $error;
+        $errorpart = "&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>';
@@ -203,7 +203,7 @@ 
  */
 function recaptcha_get_signup_url($domain = null, $appname = null)
 {
-    return "https://www.google.com/recaptcha/admin/create?" . _recaptcha_qsencode(
+    return "https://www.google.com/recaptcha/admin/create?"._recaptcha_qsencode(
         array('domains' => $domain, 'app' => $appname));
 }
 
@@ -256,13 +256,13 @@ 
 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>");
+        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);
 
-    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);
 }
 
 /**
@@ -305,5 +305,5 @@ 
     $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]);
 }