mambax7 / smartobject

include/projax/classes/Prototype.php

Indentation +448 added lines, -448 removed lines

@@ -15,452 +15,452 @@
  */
 class Prototype extends JavaScript
 {
-    public $CALLBACKS = [
-        'uninitialized',
-        'loading',
-        'loaded',
-        'interactive',
-        'complete',
-        'failure',
-        'success'
-    ];
-
-    public $AJAX_OPTIONS = [
-        'before',
-        'after',
-        'condition',
-        'url',
-        'asynchronous',
-        'method',
-        'insertion',
-        'position',
-        'form',
-        'with',
-        'update',
-        'script',
-        'uninitialized',
-        'loading',
-        'loaded',
-        'interactive',
-        'complete',
-        'failure',
-        'success'
-    ];
-
-    /**
-     * @return string
-     */
-    public function evaluate_remote_response()
-    {
-        return 'eval(request.responseText)';
-    }
-
-    /**
-     * @param $options
-     * @return string
-     */
-    public function form_remote_tag($options)
-    {
-        $options['form'] = true;
-
-        return '<form action="' . $options['url'] . '" onsubmit="' . $this->remote_function($options) . '; return false;" method="' . (isset($options['method']) ? $options['method'] : 'post') . '"  >';
-    }
-
-    /**
-     * @param         $name
-     * @param  null   $options
-     * @param  null   $html_options
-     * @return string
-     */
-    public function link_to_remote($name, $options = null, $html_options = null)
-    {
-        return $this->link_to_function($name, $this->remote_function($options), $html_options);
-    }
-
-    /**
-     * @param         $field_id
-     * @param  null   $options
-     * @return string
-     */
-    public function observe_field($field_id, $options = null)
-    {
-        if (isset($options['frequency']) && $options['frequency'] > 0) {
-            return $this->_build_observer('Form.Element.Observer', $field_id, $options);
-        } else {
-            return $this->_build_observer('Form.Element.EventObserver', $field_id, $options);
-        }
-    }
-
-    /**
-     * @param         $form_id
-     * @param  null   $options
-     * @return string
-     */
-    public function observe_form($form_id, $options = null)
-    {
-        if (isset($options['frequency'])) {
-            return $this->_build_observer('Form.Observer', $form_id, $options);
-        } else {
-            return $this->_build_observer('Form.EventObserver', $form_id, $options);
-        }
-    }
-
-    /**
-     * @param  null $options
-     * @return string
-     */
-    public function periodically_call_remote($options = null)
-    {
-        $frequency = isset($options['frequency']) ? $options['frequency'] : 10;
-        $code      = 'new PeriodicalExecuter(function() {' . $this->remote_function($options) . '},' . $frequency . ')';
-
-        return $code;
-    }
-
-    /**
-     * @param $options
-     * @return string
-     */
-    public function remote_function($options)
-    {
-        $javascript_options = $this->_options_for_ajax($options);
-
-        $update = '';
-
-        if (isset($options['update']) && is_array($options['update'])) {
-            $update = isset($options['update']['success']) ? 'success: ' . $options['update']['success'] : '';
-            $update .= empty($update) ? '' : ',';
-            $update .= isset($options['update']['failure']) ? 'failure: ' . $options['update']['failure'] : '';
-        } else {
-            $update .= isset($options['update']) ? $options['update'] : '';
-        }
-
-        $ajax_function = empty($update) ? 'new Ajax.Request(' : 'new Ajax.Updater(\'' . $update . '\',';
-
-        $ajax_function .= "'" . $options['url'] . "'";
-        $ajax_function .= ',' . $javascript_options . ')';
-
-        $ajax_function = isset($options['before']) ? $options['before'] . ';' . $ajax_function : $ajax_function;
-        $ajax_function = isset($options['after']) ? $ajax_function . ';' . $options['after'] : $ajax_function;
-        $ajax_function = isset($options['condition']) ? 'if (' . $options['condition'] . ') {' . $ajax_function . '}' : $ajax_function;
-        $ajax_function = isset($options['confirm']) ? 'if ( confirm(\'' . $options['confirm'] . '\' ) ) { ' . $ajax_function . ' } ' : $ajax_function;
-
-        return $ajax_function;
-    }
-
-    /**
-     * @param $name
-     * @param $value
-     * @param $options
-     * @return string
-     */
-    public function submit_to_remote($name, $value, $options)
-    {
-        if (isset($options['with'])) {
-            $options['with'] = 'Form.serialize(this.form)';
-        }
-
-        return '<input type="button" onclick="' . $this->remote_function($options) . '" name="' . $name . '" value ="' . $value . '">';
-    }
-
-    /**
-     * @param      $element_id
-     * @param null $options
-     * @param      $block
-     */
-    public function update_element_function($element_id, $options = null, $block)
-    {
-        $content = isset($options['content']) ? $options['content'] : '';
-        $content = $this->escape($content);
-    }
-
-    /**
-     * @param $block
-     */
-    public function update_page($block)
-    {
-    }
-
-    /**
-     * @param $block
-     * @return string
-     */
-    public function update_page_tag(& $block)
-    {
-        return $this->tag($block);
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////
-    //                             Private functions
-    /////////////////////////////////////////////////////////////////////////////////////
-
-    /**
-     * @param $options
-     * @return array
-     */
-    public function _build_callbacks($options)
-    {
-        $callbacks = [];
-        foreach ($options as $callback => $code) {
-            if (in_array($callback, $this->CALLBACKS)) {
-                $name             = 'on' . ucfirst($callback);
-                $callbacks[$name] = 'function(request){' . $code . '}';
-            }
-        }
-
-        return $callbacks;
-    }
-
-    /**
-     * @param         $klass
-     * @param         $name
-     * @param  null   $options
-     * @return string
-     */
-    public function _build_observer($klass, $name, $options = null)
-    {
-        if (isset($options['with']) && false === strpos($options['with'], '=')) {
-            $options['with'] = '\'' . $options['with'] . '=\' + value';
-        } elseif (isset($options['with']) && isset($options['update'])) {
-            $options['with'] = 'value';
-        }
-
-        $callback = $options['function'] ?: $this->remote_function($options);
-
-        $javascript = "new $klass('$name', ";
-        $javascript .= isset($options['frequency']) ? $options['frequency'] . ', ' : '';
-        $javascript .= 'function (element,value) { ';
-        $javascript .= $callback;
-        $javascript .= isset($options['on']) ? ', ' . $options['on'] : '';
-        $javascript .= '})';
-
-        return $javascript;
-    }
-
-    /**
-     * @param $method
-     * @return string
-     */
-    public function _method_option_to_s($method)
-    {
-        return strstr($method, "'") ? $method : "'$method'";
-    }
-
-    /**
-     * @param $options
-     * @return string
-     */
-    public function _options_for_ajax($options)
-    {
-        $js_options = is_array($options) ? $this->_build_callbacks($options) : [];
-
-        if (isset($options['type']) && 'synchronous' === $option['type']) {
-            $js_options['asynchronous'] = 'false';
-        }
-
-        if (isset($options['method'])) {
-            $js_options['method'] = $this->_method_option_to_s($options['method']);
-        }
-
-        if (isset($options['position'])) {
-            $js_options['insertion'] = 'Insertion.' . ucfirst($options['position']);
-        }
-
-        $js_options['evalScripts'] = isset($options['script']) ? $options['script'] : 'true';
-
-        if (isset($options['form'])) {
-            $js_options['parameters'] = 'Form.serialize(this)';
-        } elseif (isset($options['parameters'])) {
-            $js_options['parameters'] = 'Form.serialize(\'' . $options['submit'] . '\')';
-        } elseif (isset($options['with'])) {
-            $js_options['parameters'] = $options['with'];
-        }
-
-        return $this->_options_for_javascript($js_options);
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////
-    //                            Mergerd Javascript Generator helpers
-    /////////////////////////////////////////////////////////////////////////////////////
-
-    /**
-     * @param $javascript
-     */
-    public function dump($javascript)
-    {
-        echo $javascript;
-    }
-
-    /**
-     * @param         $id
-     * @param  null   $extend
-     * @return string
-     */
-    public function ID($id, $extend = null)
-    {
-        return "$('$id')" . (!empty($extend)) ? '.' . $extend . '()' : '';
-    }
-
-    /**
-     * @param $message
-     * @return string
-     */
-    public function alert($message)
-    {
-        return $this->call('alert', $message);
-    }
-
-    /**
-     * @param $variable
-     * @param $value
-     * @return string
-     */
-    public function assign($variable, $value)
-    {
-        return "$variable = $value;";
-    }
-
-    /**
-     * @param         $function
-     * @param  null   $args
-     * @return string
-     */
-    public function call($function, $args = null)
-    {
-        $arg_str = '';
-        if (is_array($args)) {
-            foreach ($args as $arg) {
-                if (!empty($arg_str)) {
-                    $arg_str .= ', ';
-                }
-                if (is_string($arg)) {
-                    $arg_str .= "'$arg'";
-                } else {
-                    $arg_str .= $arg;
-                }
-            }
-        } else {
-            if (is_string($args)) {
-                $arg_str .= "'$args'";
-            } else {
-                $arg_str .= $args;
-            }
-        }
-
-        return "$function($arg_str)";
-    }
-
-    /**
-     * @param  int    $seconds
-     * @param  string $script
-     * @return string
-     */
-    public function delay($seconds = 1, $script = '')
-    {
-        return "setTimeout( function() { $script } , " . ($seconds * 1000) . ' )';
-    }
-
-    /**
-     * @param $id
-     * @return string
-     */
-    public function hide($id)
-    {
-        return $this->call('Element.hide', $id);
-    }
-
-    /**
-     * @param         $position
-     * @param         $id
-     * @param  null   $options_for_render
-     * @return string
-     */
-    public function insert_html($position, $id, $options_for_render = null)
-    {
-        $args = array_merge([$id], (is_array($options_for_render) ? $options_for_render : [$options_for_render]));
-
-        return $this->call('new Insertion.' . ucfirst($position), $args);
-    }
-
-    /**
-     * @param $location
-     * @return string
-     */
-    public function redirect_to($location)
-    {
-        return $this->assign('window.location.href', $location);
-    }
-
-    /**
-     * @param $id
-     * @return string
-     */
-    public function remove($id)
-    {
-        if (is_array($id)) {
-            $arr_str = '';
-            foreach ($id as $obj) {
-                if (!empty($arg_str)) {
-                    $arg_str .= ', ';
-                }
-                $arg_str .= "'$arg'";
-            }
-
-            return "$A[$arg_str].each(Element.remove)";
-        } else {
-            return "Element.remove('$id')";
-        }
-    }
-
-    /**
-     * @param $id
-     * @param $options_for_render
-     * @return string
-     */
-    public function replace($id, $options_for_render)
-    {
-        $args = array_merge([$id], (is_array($options_for_render) ? $options_for_render : [$options_for_render]));
-
-        return $this->call('Element.replace', $args);
-    }
-
-    /**
-     * @param $id
-     * @param $options_for_render
-     * @return string
-     */
-    public function replace_html($id, $options_for_render)
-    {
-        $args = array_merge([$id], (is_array($options_for_render) ? $options_for_render : [$options_for_render]));
-
-        return $this->call('Element.update', $args);
-    }
-
-    /**
-     * @param         $pattern
-     * @param  null   $extend
-     * @return string
-     */
-    public function select($pattern, $extend = null)
-    {
-        return "$$('$pattern')" . (!empty($extend)) ? '.' . $extend : '';
-    }
-
-    /**
-     * @param $id
-     * @return string
-     */
-    public function show($id)
-    {
-        return $this->call('Element.show', $id);
-    }
-
-    /**
-     * @param $id
-     * @return string
-     */
-    public function toggle($id)
-    {
-        return $this->call('Element.toggle', $id);
-    }
+	public $CALLBACKS = [
+		'uninitialized',
+		'loading',
+		'loaded',
+		'interactive',
+		'complete',
+		'failure',
+		'success'
+	];
+
+	public $AJAX_OPTIONS = [
+		'before',
+		'after',
+		'condition',
+		'url',
+		'asynchronous',
+		'method',
+		'insertion',
+		'position',
+		'form',
+		'with',
+		'update',
+		'script',
+		'uninitialized',
+		'loading',
+		'loaded',
+		'interactive',
+		'complete',
+		'failure',
+		'success'
+	];
+
+	/**
+	 * @return string
+	 */
+	public function evaluate_remote_response()
+	{
+		return 'eval(request.responseText)';
+	}
+
+	/**
+	 * @param $options
+	 * @return string
+	 */
+	public function form_remote_tag($options)
+	{
+		$options['form'] = true;
+
+		return '<form action="' . $options['url'] . '" onsubmit="' . $this->remote_function($options) . '; return false;" method="' . (isset($options['method']) ? $options['method'] : 'post') . '"  >';
+	}
+
+	/**
+	 * @param         $name
+	 * @param  null   $options
+	 * @param  null   $html_options
+	 * @return string
+	 */
+	public function link_to_remote($name, $options = null, $html_options = null)
+	{
+		return $this->link_to_function($name, $this->remote_function($options), $html_options);
+	}
+
+	/**
+	 * @param         $field_id
+	 * @param  null   $options
+	 * @return string
+	 */
+	public function observe_field($field_id, $options = null)
+	{
+		if (isset($options['frequency']) && $options['frequency'] > 0) {
+			return $this->_build_observer('Form.Element.Observer', $field_id, $options);
+		} else {
+			return $this->_build_observer('Form.Element.EventObserver', $field_id, $options);
+		}
+	}
+
+	/**
+	 * @param         $form_id
+	 * @param  null   $options
+	 * @return string
+	 */
+	public function observe_form($form_id, $options = null)
+	{
+		if (isset($options['frequency'])) {
+			return $this->_build_observer('Form.Observer', $form_id, $options);
+		} else {
+			return $this->_build_observer('Form.EventObserver', $form_id, $options);
+		}
+	}
+
+	/**
+	 * @param  null $options
+	 * @return string
+	 */
+	public function periodically_call_remote($options = null)
+	{
+		$frequency = isset($options['frequency']) ? $options['frequency'] : 10;
+		$code      = 'new PeriodicalExecuter(function() {' . $this->remote_function($options) . '},' . $frequency . ')';
+
+		return $code;
+	}
+
+	/**
+	 * @param $options
+	 * @return string
+	 */
+	public function remote_function($options)
+	{
+		$javascript_options = $this->_options_for_ajax($options);
+
+		$update = '';
+
+		if (isset($options['update']) && is_array($options['update'])) {
+			$update = isset($options['update']['success']) ? 'success: ' . $options['update']['success'] : '';
+			$update .= empty($update) ? '' : ',';
+			$update .= isset($options['update']['failure']) ? 'failure: ' . $options['update']['failure'] : '';
+		} else {
+			$update .= isset($options['update']) ? $options['update'] : '';
+		}
+
+		$ajax_function = empty($update) ? 'new Ajax.Request(' : 'new Ajax.Updater(\'' . $update . '\',';
+
+		$ajax_function .= "'" . $options['url'] . "'";
+		$ajax_function .= ',' . $javascript_options . ')';
+
+		$ajax_function = isset($options['before']) ? $options['before'] . ';' . $ajax_function : $ajax_function;
+		$ajax_function = isset($options['after']) ? $ajax_function . ';' . $options['after'] : $ajax_function;
+		$ajax_function = isset($options['condition']) ? 'if (' . $options['condition'] . ') {' . $ajax_function . '}' : $ajax_function;
+		$ajax_function = isset($options['confirm']) ? 'if ( confirm(\'' . $options['confirm'] . '\' ) ) { ' . $ajax_function . ' } ' : $ajax_function;
+
+		return $ajax_function;
+	}
+
+	/**
+	 * @param $name
+	 * @param $value
+	 * @param $options
+	 * @return string
+	 */
+	public function submit_to_remote($name, $value, $options)
+	{
+		if (isset($options['with'])) {
+			$options['with'] = 'Form.serialize(this.form)';
+		}
+
+		return '<input type="button" onclick="' . $this->remote_function($options) . '" name="' . $name . '" value ="' . $value . '">';
+	}
+
+	/**
+	 * @param      $element_id
+	 * @param null $options
+	 * @param      $block
+	 */
+	public function update_element_function($element_id, $options = null, $block)
+	{
+		$content = isset($options['content']) ? $options['content'] : '';
+		$content = $this->escape($content);
+	}
+
+	/**
+	 * @param $block
+	 */
+	public function update_page($block)
+	{
+	}
+
+	/**
+	 * @param $block
+	 * @return string
+	 */
+	public function update_page_tag(& $block)
+	{
+		return $this->tag($block);
+	}
+
+	/////////////////////////////////////////////////////////////////////////////////////
+	//                             Private functions
+	/////////////////////////////////////////////////////////////////////////////////////
+
+	/**
+	 * @param $options
+	 * @return array
+	 */
+	public function _build_callbacks($options)
+	{
+		$callbacks = [];
+		foreach ($options as $callback => $code) {
+			if (in_array($callback, $this->CALLBACKS)) {
+				$name             = 'on' . ucfirst($callback);
+				$callbacks[$name] = 'function(request){' . $code . '}';
+			}
+		}
+
+		return $callbacks;
+	}
+
+	/**
+	 * @param         $klass
+	 * @param         $name
+	 * @param  null   $options
+	 * @return string
+	 */
+	public function _build_observer($klass, $name, $options = null)
+	{
+		if (isset($options['with']) && false === strpos($options['with'], '=')) {
+			$options['with'] = '\'' . $options['with'] . '=\' + value';
+		} elseif (isset($options['with']) && isset($options['update'])) {
+			$options['with'] = 'value';
+		}
+
+		$callback = $options['function'] ?: $this->remote_function($options);
+
+		$javascript = "new $klass('$name', ";
+		$javascript .= isset($options['frequency']) ? $options['frequency'] . ', ' : '';
+		$javascript .= 'function (element,value) { ';
+		$javascript .= $callback;
+		$javascript .= isset($options['on']) ? ', ' . $options['on'] : '';
+		$javascript .= '})';
+
+		return $javascript;
+	}
+
+	/**
+	 * @param $method
+	 * @return string
+	 */
+	public function _method_option_to_s($method)
+	{
+		return strstr($method, "'") ? $method : "'$method'";
+	}
+
+	/**
+	 * @param $options
+	 * @return string
+	 */
+	public function _options_for_ajax($options)
+	{
+		$js_options = is_array($options) ? $this->_build_callbacks($options) : [];
+
+		if (isset($options['type']) && 'synchronous' === $option['type']) {
+			$js_options['asynchronous'] = 'false';
+		}
+
+		if (isset($options['method'])) {
+			$js_options['method'] = $this->_method_option_to_s($options['method']);
+		}
+
+		if (isset($options['position'])) {
+			$js_options['insertion'] = 'Insertion.' . ucfirst($options['position']);
+		}
+
+		$js_options['evalScripts'] = isset($options['script']) ? $options['script'] : 'true';
+
+		if (isset($options['form'])) {
+			$js_options['parameters'] = 'Form.serialize(this)';
+		} elseif (isset($options['parameters'])) {
+			$js_options['parameters'] = 'Form.serialize(\'' . $options['submit'] . '\')';
+		} elseif (isset($options['with'])) {
+			$js_options['parameters'] = $options['with'];
+		}
+
+		return $this->_options_for_javascript($js_options);
+	}
+
+	/////////////////////////////////////////////////////////////////////////////////////
+	//                            Mergerd Javascript Generator helpers
+	/////////////////////////////////////////////////////////////////////////////////////
+
+	/**
+	 * @param $javascript
+	 */
+	public function dump($javascript)
+	{
+		echo $javascript;
+	}
+
+	/**
+	 * @param         $id
+	 * @param  null   $extend
+	 * @return string
+	 */
+	public function ID($id, $extend = null)
+	{
+		return "$('$id')" . (!empty($extend)) ? '.' . $extend . '()' : '';
+	}
+
+	/**
+	 * @param $message
+	 * @return string
+	 */
+	public function alert($message)
+	{
+		return $this->call('alert', $message);
+	}
+
+	/**
+	 * @param $variable
+	 * @param $value
+	 * @return string
+	 */
+	public function assign($variable, $value)
+	{
+		return "$variable = $value;";
+	}
+
+	/**
+	 * @param         $function
+	 * @param  null   $args
+	 * @return string
+	 */
+	public function call($function, $args = null)
+	{
+		$arg_str = '';
+		if (is_array($args)) {
+			foreach ($args as $arg) {
+				if (!empty($arg_str)) {
+					$arg_str .= ', ';
+				}
+				if (is_string($arg)) {
+					$arg_str .= "'$arg'";
+				} else {
+					$arg_str .= $arg;
+				}
+			}
+		} else {
+			if (is_string($args)) {
+				$arg_str .= "'$args'";
+			} else {
+				$arg_str .= $args;
+			}
+		}
+
+		return "$function($arg_str)";
+	}
+
+	/**
+	 * @param  int    $seconds
+	 * @param  string $script
+	 * @return string
+	 */
+	public function delay($seconds = 1, $script = '')
+	{
+		return "setTimeout( function() { $script } , " . ($seconds * 1000) . ' )';
+	}
+
+	/**
+	 * @param $id
+	 * @return string
+	 */
+	public function hide($id)
+	{
+		return $this->call('Element.hide', $id);
+	}
+
+	/**
+	 * @param         $position
+	 * @param         $id
+	 * @param  null   $options_for_render
+	 * @return string
+	 */
+	public function insert_html($position, $id, $options_for_render = null)
+	{
+		$args = array_merge([$id], (is_array($options_for_render) ? $options_for_render : [$options_for_render]));
+
+		return $this->call('new Insertion.' . ucfirst($position), $args);
+	}
+
+	/**
+	 * @param $location
+	 * @return string
+	 */
+	public function redirect_to($location)
+	{
+		return $this->assign('window.location.href', $location);
+	}
+
+	/**
+	 * @param $id
+	 * @return string
+	 */
+	public function remove($id)
+	{
+		if (is_array($id)) {
+			$arr_str = '';
+			foreach ($id as $obj) {
+				if (!empty($arg_str)) {
+					$arg_str .= ', ';
+				}
+				$arg_str .= "'$arg'";
+			}
+
+			return "$A[$arg_str].each(Element.remove)";
+		} else {
+			return "Element.remove('$id')";
+		}
+	}
+
+	/**
+	 * @param $id
+	 * @param $options_for_render
+	 * @return string
+	 */
+	public function replace($id, $options_for_render)
+	{
+		$args = array_merge([$id], (is_array($options_for_render) ? $options_for_render : [$options_for_render]));
+
+		return $this->call('Element.replace', $args);
+	}
+
+	/**
+	 * @param $id
+	 * @param $options_for_render
+	 * @return string
+	 */
+	public function replace_html($id, $options_for_render)
+	{
+		$args = array_merge([$id], (is_array($options_for_render) ? $options_for_render : [$options_for_render]));
+
+		return $this->call('Element.update', $args);
+	}
+
+	/**
+	 * @param         $pattern
+	 * @param  null   $extend
+	 * @return string
+	 */
+	public function select($pattern, $extend = null)
+	{
+		return "$$('$pattern')" . (!empty($extend)) ? '.' . $extend : '';
+	}
+
+	/**
+	 * @param $id
+	 * @return string
+	 */
+	public function show($id)
+	{
+		return $this->call('Element.show', $id);
+	}
+
+	/**
+	 * @param $id
+	 * @return string
+	 */
+	public function toggle($id)
+	{
+		return $this->call('Element.toggle', $id);
+	}
 }

include/functions.php

Indentation +710 added lines, -710 removed lines

@@ -11,9 +11,9 @@ 
 
 function smart_get_css_link($cssfile)
 {
-    $ret = '<link rel="stylesheet" type="text/css" href="' . $cssfile . '">';
+	$ret = '<link rel="stylesheet" type="text/css" href="' . $cssfile . '">';
 
-    return $ret;
+	return $ret;
 }
 
 /**
@@ -21,9 +21,9 @@ 
  */
 function smart_get_page_before_form()
 {
-    global $smart_previous_page;
+	global $smart_previous_page;
 
-    return isset($_POST['smart_page_before_form']) ? $_POST['smart_page_before_form'] : $smart_previous_page;
+	return isset($_POST['smart_page_before_form']) ? $_POST['smart_page_before_form'] : $smart_previous_page;
 }
 
 /**
@@ -34,29 +34,29 @@ 
  */
 function smart_userIsAdmin($module = false)
 {
-    global $xoopsUser;
-    static $smart_isAdmin;
-    if (!$module) {
-        global $xoopsModule;
-        $module = $xoopsModule->getVar('dirname');
-    }
-    if (isset($smart_isAdmin[$module])) {
-        return $smart_isAdmin[$module];
-    }
-    if (!$xoopsUser) {
-        $smart_isAdmin[$module] = false;
-
-        return $smart_isAdmin[$module];
-    }
-    $smart_isAdmin[$module] = false;
-    $smartModule            = smart_getModuleInfo($module);
-    if (!is_object($smartModule)) {
-        return false;
-    }
-    $module_id              = $smartModule->getVar('mid');
-    $smart_isAdmin[$module] = $xoopsUser->isAdmin($module_id);
-
-    return $smart_isAdmin[$module];
+	global $xoopsUser;
+	static $smart_isAdmin;
+	if (!$module) {
+		global $xoopsModule;
+		$module = $xoopsModule->getVar('dirname');
+	}
+	if (isset($smart_isAdmin[$module])) {
+		return $smart_isAdmin[$module];
+	}
+	if (!$xoopsUser) {
+		$smart_isAdmin[$module] = false;
+
+		return $smart_isAdmin[$module];
+	}
+	$smart_isAdmin[$module] = false;
+	$smartModule            = smart_getModuleInfo($module);
+	if (!is_object($smartModule)) {
+		return false;
+	}
+	$module_id              = $smartModule->getVar('mid');
+	$smart_isAdmin[$module] = $xoopsUser->isAdmin($module_id);
+
+	return $smart_isAdmin[$module];
 }
 
 /**
@@ -64,13 +64,13 @@ 
  */
 function smart_isXoops22()
 {
-    $xoops22 = false;
-    $xv      = str_replace('XOOPS ', '', XOOPS_VERSION);
-    if ('2' == substr($xv, 2, 1)) {
-        $xoops22 = true;
-    }
+	$xoops22 = false;
+	$xv      = str_replace('XOOPS ', '', XOOPS_VERSION);
+	if ('2' == substr($xv, 2, 1)) {
+		$xoops22 = true;
+	}
 
-    return $xoops22;
+	return $xoops22;
 }
 
 /**
@@ -81,36 +81,36 @@ 
  */
 function smart_getModuleName($withLink = true, $forBreadCrumb = false, $moduleName = false)
 {
-    if (!$moduleName) {
-        global $xoopsModule;
-        $moduleName = $xoopsModule->getVar('dirname');
-    }
-    $smartModule       = smart_getModuleInfo($moduleName);
-    $smartModuleConfig = smart_getModuleConfig($moduleName);
-    if (!isset($smartModule)) {
-        return '';
-    }
-
-    if ($forBreadCrumb
-        && (isset($smartModuleConfig['show_mod_name_breadcrumb'])
-            && !$smartModuleConfig['show_mod_name_breadcrumb'])) {
-        return '';
-    }
-    if (!$withLink) {
-        return $smartModule->getVar('name');
-    } else {
-        $seoMode = smart_getModuleModeSEO($moduleName);
-        if ('rewrite' === $seoMode) {
-            $seoModuleName = smart_getModuleNameForSEO($moduleName);
-            $ret           = XOOPS_URL . '/' . $seoModuleName . '/';
-        } elseif ('pathinfo' === $seoMode) {
-            $ret = XOOPS_URL . '/modules/' . $moduleName . '/seo.php/' . $seoModuleName . '/';
-        } else {
-            $ret = XOOPS_URL . '/modules/' . $moduleName . '/';
-        }
-
-        return '<a href="' . $ret . '">' . $smartModule->getVar('name') . '</a>';
-    }
+	if (!$moduleName) {
+		global $xoopsModule;
+		$moduleName = $xoopsModule->getVar('dirname');
+	}
+	$smartModule       = smart_getModuleInfo($moduleName);
+	$smartModuleConfig = smart_getModuleConfig($moduleName);
+	if (!isset($smartModule)) {
+		return '';
+	}
+
+	if ($forBreadCrumb
+		&& (isset($smartModuleConfig['show_mod_name_breadcrumb'])
+			&& !$smartModuleConfig['show_mod_name_breadcrumb'])) {
+		return '';
+	}
+	if (!$withLink) {
+		return $smartModule->getVar('name');
+	} else {
+		$seoMode = smart_getModuleModeSEO($moduleName);
+		if ('rewrite' === $seoMode) {
+			$seoModuleName = smart_getModuleNameForSEO($moduleName);
+			$ret           = XOOPS_URL . '/' . $seoModuleName . '/';
+		} elseif ('pathinfo' === $seoMode) {
+			$ret = XOOPS_URL . '/modules/' . $moduleName . '/seo.php/' . $seoModuleName . '/';
+		} else {
+			$ret = XOOPS_URL . '/modules/' . $moduleName . '/';
+		}
+
+		return '<a href="' . $ret . '">' . $smartModule->getVar('name') . '</a>';
+	}
 }
 
 /**
@@ -119,14 +119,14 @@ 
  */
 function smart_getModuleNameForSEO($moduleName = false)
 {
-    $smartModule       = smart_getModuleInfo($moduleName);
-    $smartModuleConfig = smart_getModuleConfig($moduleName);
-    if (isset($smartModuleConfig['seo_module_name'])) {
-        return $smartModuleConfig['seo_module_name'];
-    }
-    $ret = smart_getModuleName(false, false, $moduleName);
-
-    return strtolower($ret);
+	$smartModule       = smart_getModuleInfo($moduleName);
+	$smartModuleConfig = smart_getModuleConfig($moduleName);
+	if (isset($smartModuleConfig['seo_module_name'])) {
+		return $smartModuleConfig['seo_module_name'];
+	}
+	$ret = smart_getModuleName(false, false, $moduleName);
+
+	return strtolower($ret);
 }
 
 /**
@@ -135,10 +135,10 @@ 
  */
 function smart_getModuleModeSEO($moduleName = false)
 {
-    $smartModule       = smart_getModuleInfo($moduleName);
-    $smartModuleConfig = smart_getModuleConfig($moduleName);
+	$smartModule       = smart_getModuleInfo($moduleName);
+	$smartModuleConfig = smart_getModuleConfig($moduleName);
 
-    return isset($smartModuleConfig['seo_mode']) ? $smartModuleConfig['seo_mode'] : false;
+	return isset($smartModuleConfig['seo_mode']) ? $smartModuleConfig['seo_mode'] : false;
 }
 
 /**
@@ -147,10 +147,10 @@ 
  */
 function smart_getModuleIncludeIdSEO($moduleName = false)
 {
-    $smartModule       = smart_getModuleInfo($moduleName);
-    $smartModuleConfig = smart_getModuleConfig($moduleName);
+	$smartModule       = smart_getModuleInfo($moduleName);
+	$smartModuleConfig = smart_getModuleConfig($moduleName);
 
-    return !empty($smartModuleConfig['seo_inc_id']);
+	return !empty($smartModuleConfig['seo_inc_id']);
 }
 
 /**
@@ -159,25 +159,25 @@ 
  */
 function smart_getenv($key)
 {
-    $ret = '';
-    $ret = isset($_SERVER[$key]) ? $_SERVER[$key] : (isset($_ENV[$key]) ? $_ENV[$key] : '');
+	$ret = '';
+	$ret = isset($_SERVER[$key]) ? $_SERVER[$key] : (isset($_ENV[$key]) ? $_ENV[$key] : '');
 
-    return $ret;
+	return $ret;
 }
 
 function smart_xoops_cp_header()
 {
-    xoops_cp_header();
-    global $xoopsModule, $xoopsConfig;
-    /**
-     * include SmartObject admin language file
-     */
-    $fileName = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php';
-    if (file_exists($fileName)) {
-        require_once $fileName;
-    } else {
-        require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/admin.php';
-    } ?>
+	xoops_cp_header();
+	global $xoopsModule, $xoopsConfig;
+	/**
+	 * include SmartObject admin language file
+	 */
+	$fileName = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php';
+	if (file_exists($fileName)) {
+		require_once $fileName;
+	} else {
+		require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/admin.php';
+	} ?>
     <script type='text/javascript'>
         <!--
         var smart_url = '<?php echo SMARTOBJECT_URL ?>';
@@ -190,14 +190,14 @@ 
             src='<?php echo SMARTOBJECT_URL ?>include/smart.js'></script>
     <?php
 
-    /**
-     * Include the admin language constants for the SmartObject Framework
-     */
-    $admin_file = SMARTOBJECT_ROOT_PATH . 'language/' . $xoopsConfig['language'] . '/admin.php';
-    if (!file_exists($admin_file)) {
-        $admin_file = SMARTOBJECT_ROOT_PATH . 'language/english/admin.php';
-    }
-    require_once $admin_file;
+	/**
+	 * Include the admin language constants for the SmartObject Framework
+	 */
+	$admin_file = SMARTOBJECT_ROOT_PATH . 'language/' . $xoopsConfig['language'] . '/admin.php';
+	if (!file_exists($admin_file)) {
+		$admin_file = SMARTOBJECT_ROOT_PATH . 'language/english/admin.php';
+	}
+	require_once $admin_file;
 }
 
 /**
@@ -211,21 +211,21 @@ 
  */
 function smart_TableExists($table)
 {
-    $bRetVal = false;
-    //Verifies that a MySQL table exists
-    $xoopsDB  = XoopsDatabaseFactory::getDatabaseConnection();
-    $realname = $xoopsDB->prefix($table);
-    $sql      = 'SHOW TABLES FROM ' . XOOPS_DB_NAME;
-    $ret      = $xoopsDB->queryF($sql);
-    while (list($m_table) = $xoopsDB->fetchRow($ret)) {
-        if ($m_table == $realname) {
-            $bRetVal = true;
-            break;
-        }
-    }
-    $xoopsDB->freeRecordSet($ret);
-
-    return $bRetVal;
+	$bRetVal = false;
+	//Verifies that a MySQL table exists
+	$xoopsDB  = XoopsDatabaseFactory::getDatabaseConnection();
+	$realname = $xoopsDB->prefix($table);
+	$sql      = 'SHOW TABLES FROM ' . XOOPS_DB_NAME;
+	$ret      = $xoopsDB->queryF($sql);
+	while (list($m_table) = $xoopsDB->fetchRow($ret)) {
+		if ($m_table == $realname) {
+			$bRetVal = true;
+			break;
+		}
+	}
+	$xoopsDB->freeRecordSet($ret);
+
+	return $bRetVal;
 }
 
 /**
@@ -240,19 +240,19 @@ 
  */
 function smart_GetMeta($key, $moduleName = false)
 {
-    if (!$moduleName) {
-        $moduleName = smart_getCurrentModuleName();
-    }
-    $xoopsDB = XoopsDatabaseFactory::getDatabaseConnection();
-    $sql     = sprintf('SELECT metavalue FROM %s WHERE metakey=%s', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($key));
-    $ret     = $xoopsDB->query($sql);
-    if (!$ret) {
-        $value = false;
-    } else {
-        list($value) = $xoopsDB->fetchRow($ret);
-    }
-
-    return $value;
+	if (!$moduleName) {
+		$moduleName = smart_getCurrentModuleName();
+	}
+	$xoopsDB = XoopsDatabaseFactory::getDatabaseConnection();
+	$sql     = sprintf('SELECT metavalue FROM %s WHERE metakey=%s', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($key));
+	$ret     = $xoopsDB->query($sql);
+	if (!$ret) {
+		$value = false;
+	} else {
+		list($value) = $xoopsDB->fetchRow($ret);
+	}
+
+	return $value;
 }
 
 /**
@@ -260,12 +260,12 @@ 
  */
 function smart_getCurrentModuleName()
 {
-    global $xoopsModule;
-    if (is_object($xoopsModule)) {
-        return $xoopsModule->getVar('dirname');
-    } else {
-        return false;
-    }
+	global $xoopsModule;
+	if (is_object($xoopsModule)) {
+		return $xoopsModule->getVar('dirname');
+	} else {
+		return false;
+	}
 }
 
 /**
@@ -281,22 +281,22 @@ 
  */
 function smart_SetMeta($key, $value, $moduleName = false)
 {
-    if (!$moduleName) {
-        $moduleName = smart_getCurrentModuleName();
-    }
-    $xoopsDB = XoopsDatabaseFactory::getDatabaseConnection();
-    $ret     = smart_GetMeta($key, $moduleName);
-    if ('0' === $ret || $ret > 0) {
-        $sql = sprintf('UPDATE %s SET metavalue = %s WHERE metakey = %s', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($value), $xoopsDB->quoteString($key));
-    } else {
-        $sql = sprintf('INSERT INTO %s (metakey, metavalue) VALUES (%s, %s)', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($key), $xoopsDB->quoteString($value));
-    }
-    $ret = $xoopsDB->queryF($sql);
-    if (!$ret) {
-        return false;
-    }
-
-    return true;
+	if (!$moduleName) {
+		$moduleName = smart_getCurrentModuleName();
+	}
+	$xoopsDB = XoopsDatabaseFactory::getDatabaseConnection();
+	$ret     = smart_GetMeta($key, $moduleName);
+	if ('0' === $ret || $ret > 0) {
+		$sql = sprintf('UPDATE %s SET metavalue = %s WHERE metakey = %s', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($value), $xoopsDB->quoteString($key));
+	} else {
+		$sql = sprintf('INSERT INTO %s (metakey, metavalue) VALUES (%s, %s)', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($key), $xoopsDB->quoteString($value));
+	}
+	$ret = $xoopsDB->queryF($sql);
+	if (!$ret) {
+		return false;
+	}
+
+	return true;
 }
 
 // Thanks to Mithrandir:-)
@@ -309,20 +309,20 @@ 
  */
 function smart_substr($str, $start, $length, $trimmarker = '...')
 {
-    // if the string is empty, let's get out ;-)
-    if ('' === $str) {
-        return $str;
-    }
-    // reverse a string that is shortened with '' as trimmarker
-    $reversed_string = strrev(xoops_substr($str, $start, $length, ''));
-    // find first space in reversed string
-    $position_of_space = strpos($reversed_string, ' ', 0);
-    // truncate the original string to a length of $length
-    // minus the position of the last space
-    // plus the length of the $trimmarker
-    $truncated_string = xoops_substr($str, $start, $length - $position_of_space + strlen($trimmarker), $trimmarker);
-
-    return $truncated_string;
+	// if the string is empty, let's get out ;-)
+	if ('' === $str) {
+		return $str;
+	}
+	// reverse a string that is shortened with '' as trimmarker
+	$reversed_string = strrev(xoops_substr($str, $start, $length, ''));
+	// find first space in reversed string
+	$position_of_space = strpos($reversed_string, ' ', 0);
+	// truncate the original string to a length of $length
+	// minus the position of the last space
+	// plus the length of the $trimmarker
+	$truncated_string = xoops_substr($str, $start, $length - $position_of_space + strlen($trimmarker), $trimmarker);
+
+	return $truncated_string;
 }
 
 /**
@@ -333,19 +333,19 @@ 
  */
 function smart_getConfig($key, $moduleName = false, $default = 'default_is_undefined')
 {
-    if (!$moduleName) {
-        $moduleName = smart_getCurrentModuleName();
-    }
-    $configs = smart_getModuleConfig($moduleName);
-    if (isset($configs[$key])) {
-        return $configs[$key];
-    } else {
-        if ('default_is_undefined' === $default) {
-            return null;
-        } else {
-            return $default;
-        }
-    }
+	if (!$moduleName) {
+		$moduleName = smart_getCurrentModuleName();
+	}
+	$configs = smart_getModuleConfig($moduleName);
+	if (isset($configs[$key])) {
+		return $configs[$key];
+	} else {
+		if ('default_is_undefined' === $default) {
+			return null;
+		} else {
+			return $default;
+		}
+	}
 }
 
 /**
@@ -358,32 +358,32 @@ 
  */
 function smart_copyr($source, $dest)
 {
-    // Simple copy for a file
-    if (is_file($source)) {
-        return copy($source, $dest);
-    }
-    // Make destination directory
-    if (!is_dir($dest)) {
-        mkdir($dest);
-    }
-    // Loop through the folder
-    $dir = dir($source);
-    while (false !== $entry = $dir->read()) {
-        // Skip pointers
-        if ('.' === $entry || '..' === $entry) {
-            continue;
-        }
-        // Deep copy directories
-        if (is_dir("$source/$entry") && ("$source/$entry" !== $dest)) {
-            copyr("$source/$entry", "$dest/$entry");
-        } else {
-            copy("$source/$entry", "$dest/$entry");
-        }
-    }
-    // Clean up
-    $dir->close();
-
-    return true;
+	// Simple copy for a file
+	if (is_file($source)) {
+		return copy($source, $dest);
+	}
+	// Make destination directory
+	if (!is_dir($dest)) {
+		mkdir($dest);
+	}
+	// Loop through the folder
+	$dir = dir($source);
+	while (false !== $entry = $dir->read()) {
+		// Skip pointers
+		if ('.' === $entry || '..' === $entry) {
+			continue;
+		}
+		// Deep copy directories
+		if (is_dir("$source/$entry") && ("$source/$entry" !== $dest)) {
+			copyr("$source/$entry", "$dest/$entry");
+		} else {
+			copy("$source/$entry", "$dest/$entry");
+		}
+	}
+	// Clean up
+	$dir->close();
+
+	return true;
 }
 
 /**
@@ -393,26 +393,26 @@ 
  */
 function smart_admin_mkdir($target)
 {
-    // http://www.php.net/manual/en/function.mkdir.php
-    // saint at corenova.com
-    // bart at cdasites dot com
-    if (is_dir($target) || empty($target)) {
-        return true; // best case check first
-    }
-    if (file_exists($target) && !is_dir($target)) {
-        return false;
-    }
-    if (smart_admin_mkdir(substr($target, 0, strrpos($target, '/')))) {
-        if (!file_exists($target)) {
-            $res = mkdir($target, 0777); // crawl back up & create dir tree
-            smart_admin_chmod($target);
-
-            return $res;
-        }
-    }
-    $res = is_dir($target);
-
-    return $res;
+	// http://www.php.net/manual/en/function.mkdir.php
+	// saint at corenova.com
+	// bart at cdasites dot com
+	if (is_dir($target) || empty($target)) {
+		return true; // best case check first
+	}
+	if (file_exists($target) && !is_dir($target)) {
+		return false;
+	}
+	if (smart_admin_mkdir(substr($target, 0, strrpos($target, '/')))) {
+		if (!file_exists($target)) {
+			$res = mkdir($target, 0777); // crawl back up & create dir tree
+			smart_admin_chmod($target);
+
+			return $res;
+		}
+	}
+	$res = is_dir($target);
+
+	return $res;
 }
 
 /**
@@ -423,7 +423,7 @@ 
  */
 function smart_admin_chmod($target, $mode = 0777)
 {
-    return @ chmod($target, $mode);
+	return @ chmod($target, $mode);
 }
 
 /**
@@ -434,31 +434,31 @@ 
  */
 function smart_imageResize($src, $maxWidth, $maxHeight)
 {
-    $width  = '';
-    $height = '';
-    $type   = '';
-    $attr   = '';
-    if (file_exists($src)) {
-        list($width, $height, $type, $attr) = getimagesize($src);
-        if ($width > $maxWidth) {
-            $originalWidth = $width;
-            $width         = $maxWidth;
-            $height        = $width * $height / $originalWidth;
-        }
-        if ($height > $maxHeight) {
-            $originalHeight = $height;
-            $height         = $maxHeight;
-            $width          = $height * $width / $originalHeight;
-        }
-        $attr = " width='$width' height='$height'";
-    }
-
-    return [
-        $width,
-        $height,
-        $type,
-        $attr
-    ];
+	$width  = '';
+	$height = '';
+	$type   = '';
+	$attr   = '';
+	if (file_exists($src)) {
+		list($width, $height, $type, $attr) = getimagesize($src);
+		if ($width > $maxWidth) {
+			$originalWidth = $width;
+			$width         = $maxWidth;
+			$height        = $width * $height / $originalWidth;
+		}
+		if ($height > $maxHeight) {
+			$originalHeight = $height;
+			$height         = $maxHeight;
+			$width          = $height * $width / $originalHeight;
+		}
+		$attr = " width='$width' height='$height'";
+	}
+
+	return [
+		$width,
+		$height,
+		$type,
+		$attr
+	];
 }
 
 /**
@@ -467,34 +467,34 @@ 
  */
 function smart_getModuleInfo($moduleName = false)
 {
-    static $smartModules;
-    if (isset($smartModules[$moduleName])) {
-        $ret =& $smartModules[$moduleName];
-
-        return $ret;
-    }
-    global $xoopsModule;
-    if (!$moduleName) {
-        if (isset($xoopsModule) && is_object($xoopsModule)) {
-            $smartModules[$xoopsModule->getVar('dirname')] = $xoopsModule;
-
-            return $smartModules[$xoopsModule->getVar('dirname')];
-        }
-    }
-    if (!isset($smartModules[$moduleName])) {
-        if (isset($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $moduleName) {
-            $smartModules[$moduleName] = $xoopsModule;
-        } else {
-            $hModule = xoops_getHandler('module');
-            if ('xoops' !== $moduleName) {
-                $smartModules[$moduleName] = $hModule->getByDirname($moduleName);
-            } else {
-                $smartModules[$moduleName] = $hModule->getByDirname('system');
-            }
-        }
-    }
-
-    return $smartModules[$moduleName];
+	static $smartModules;
+	if (isset($smartModules[$moduleName])) {
+		$ret =& $smartModules[$moduleName];
+
+		return $ret;
+	}
+	global $xoopsModule;
+	if (!$moduleName) {
+		if (isset($xoopsModule) && is_object($xoopsModule)) {
+			$smartModules[$xoopsModule->getVar('dirname')] = $xoopsModule;
+
+			return $smartModules[$xoopsModule->getVar('dirname')];
+		}
+	}
+	if (!isset($smartModules[$moduleName])) {
+		if (isset($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $moduleName) {
+			$smartModules[$moduleName] = $xoopsModule;
+		} else {
+			$hModule = xoops_getHandler('module');
+			if ('xoops' !== $moduleName) {
+				$smartModules[$moduleName] = $hModule->getByDirname($moduleName);
+			} else {
+				$smartModules[$moduleName] = $hModule->getByDirname('system');
+			}
+		}
+	}
+
+	return $smartModules[$moduleName];
 }
 
 /**
@@ -503,40 +503,40 @@ 
  */
 function smart_getModuleConfig($moduleName = false)
 {
-    static $smartConfigs;
-    if (isset($smartConfigs[$moduleName])) {
-        $ret =& $smartConfigs[$moduleName];
-
-        return $ret;
-    }
-    global $xoopsModule, $xoopsModuleConfig;
-    if (!$moduleName) {
-        if (isset($xoopsModule) && is_object($xoopsModule)) {
-            $smartConfigs[$xoopsModule->getVar('dirname')] = $xoopsModuleConfig;
-
-            return $smartConfigs[$xoopsModule->getVar('dirname')];
-        }
-    }
-    // if we still did not found the xoopsModule, this is because there is none
-    if (!$moduleName) {
-        $ret = false;
-
-        return $ret;
-    }
-    if (isset($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $moduleName) {
-        $smartConfigs[$moduleName] = $xoopsModuleConfig;
-    } else {
-        $module = smart_getModuleInfo($moduleName);
-        if (!is_object($module)) {
-            $ret = false;
-
-            return $ret;
-        }
-        $hModConfig                = xoops_getHandler('config');
-        $smartConfigs[$moduleName] =& $hModConfig->getConfigsByCat(0, $module->getVar('mid'));
-    }
-
-    return $smartConfigs[$moduleName];
+	static $smartConfigs;
+	if (isset($smartConfigs[$moduleName])) {
+		$ret =& $smartConfigs[$moduleName];
+
+		return $ret;
+	}
+	global $xoopsModule, $xoopsModuleConfig;
+	if (!$moduleName) {
+		if (isset($xoopsModule) && is_object($xoopsModule)) {
+			$smartConfigs[$xoopsModule->getVar('dirname')] = $xoopsModuleConfig;
+
+			return $smartConfigs[$xoopsModule->getVar('dirname')];
+		}
+	}
+	// if we still did not found the xoopsModule, this is because there is none
+	if (!$moduleName) {
+		$ret = false;
+
+		return $ret;
+	}
+	if (isset($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $moduleName) {
+		$smartConfigs[$moduleName] = $xoopsModuleConfig;
+	} else {
+		$module = smart_getModuleInfo($moduleName);
+		if (!is_object($module)) {
+			$ret = false;
+
+			return $ret;
+		}
+		$hModConfig                = xoops_getHandler('config');
+		$smartConfigs[$moduleName] =& $hModConfig->getConfigsByCat(0, $module->getVar('mid'));
+	}
+
+	return $smartConfigs[$moduleName];
 }
 
 /**
@@ -545,10 +545,10 @@ 
  */
 function smart_deleteFile($dirname)
 {
-    // Simple delete for a file
-    if (is_file($dirname)) {
-        return unlink($dirname);
-    }
+	// Simple delete for a file
+	if (is_file($dirname)) {
+		return unlink($dirname);
+	}
 }
 
 /**
@@ -557,12 +557,12 @@ 
  */
 function smart_formatErrors($errors = [])
 {
-    $ret = '';
-    foreach ($errors as $key => $value) {
-        $ret .= '<br> - ' . $value;
-    }
+	$ret = '';
+	foreach ($errors as $key => $value) {
+		$ret .= '<br> - ' . $value;
+	}
 
-    return $ret;
+	return $ret;
 }
 
 /**
@@ -576,46 +576,46 @@ 
  */
 function smart_getLinkedUnameFromId($userid = 0, $name = 0, $users = [], $withContact = false)
 {
-    if (!is_numeric($userid)) {
-        return $userid;
-    }
-    $userid = (int)$userid;
-    if ($userid > 0) {
-        if ($users == []) {
-            //fetching users
-            $memberHandler = xoops_getHandler('member');
-            $user          =& $memberHandler->getUser($userid);
-        } else {
-            if (!isset($users[$userid])) {
-                return $GLOBALS['xoopsConfig']['anonymous'];
-            }
-            $user =& $users[$userid];
-        }
-        if (is_object($user)) {
-            $ts        = MyTextSanitizer:: getInstance();
-            $username  = $user->getVar('uname');
-            $fullname  = '';
-            $fullname2 = $user->getVar('name');
-            if ($name && !empty($fullname2)) {
-                $fullname = $user->getVar('name');
-            }
-            if (!empty($fullname)) {
-                $linkeduser = "$fullname [<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . $ts->htmlSpecialChars($username) . '</a>]';
-            } else {
-                $linkeduser = "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . ucwords($ts->htmlSpecialChars($username)) . '</a>';
-            }
-            // add contact info: email + PM
-            if ($withContact) {
-                $linkeduser .= ' <a href="mailto:' . $user->getVar('email') . '"><img style="vertical-align: middle;" src="' . XOOPS_URL . '/images/icons/email.gif' . '" alt="' . _CO_SOBJECT_SEND_EMAIL . '" title="' . _CO_SOBJECT_SEND_EMAIL . '"></a>';
-                $js         = "javascript:openWithSelfMain('" . XOOPS_URL . '/pmlite.php?send2=1&to_userid=' . $userid . "', 'pmlite',450,370);";
-                $linkeduser .= ' <a href="' . $js . '"><img style="vertical-align: middle;" src="' . XOOPS_URL . '/images/icons/pm.gif' . '" alt="' . _CO_SOBJECT_SEND_PM . '" title="' . _CO_SOBJECT_SEND_PM . '"></a>';
-            }
-
-            return $linkeduser;
-        }
-    }
-
-    return $GLOBALS['xoopsConfig']['anonymous'];
+	if (!is_numeric($userid)) {
+		return $userid;
+	}
+	$userid = (int)$userid;
+	if ($userid > 0) {
+		if ($users == []) {
+			//fetching users
+			$memberHandler = xoops_getHandler('member');
+			$user          =& $memberHandler->getUser($userid);
+		} else {
+			if (!isset($users[$userid])) {
+				return $GLOBALS['xoopsConfig']['anonymous'];
+			}
+			$user =& $users[$userid];
+		}
+		if (is_object($user)) {
+			$ts        = MyTextSanitizer:: getInstance();
+			$username  = $user->getVar('uname');
+			$fullname  = '';
+			$fullname2 = $user->getVar('name');
+			if ($name && !empty($fullname2)) {
+				$fullname = $user->getVar('name');
+			}
+			if (!empty($fullname)) {
+				$linkeduser = "$fullname [<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . $ts->htmlSpecialChars($username) . '</a>]';
+			} else {
+				$linkeduser = "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . ucwords($ts->htmlSpecialChars($username)) . '</a>';
+			}
+			// add contact info: email + PM
+			if ($withContact) {
+				$linkeduser .= ' <a href="mailto:' . $user->getVar('email') . '"><img style="vertical-align: middle;" src="' . XOOPS_URL . '/images/icons/email.gif' . '" alt="' . _CO_SOBJECT_SEND_EMAIL . '" title="' . _CO_SOBJECT_SEND_EMAIL . '"></a>';
+				$js         = "javascript:openWithSelfMain('" . XOOPS_URL . '/pmlite.php?send2=1&to_userid=' . $userid . "', 'pmlite',450,370);";
+				$linkeduser .= ' <a href="' . $js . '"><img style="vertical-align: middle;" src="' . XOOPS_URL . '/images/icons/pm.gif' . '" alt="' . _CO_SOBJECT_SEND_PM . '" title="' . _CO_SOBJECT_SEND_PM . '"></a>';
+			}
+
+			return $linkeduser;
+		}
+	}
+
+	return $GLOBALS['xoopsConfig']['anonymous'];
 }
 
 /**
@@ -626,33 +626,33 @@ 
  */
 function smart_adminMenu($currentoption = 0, $breadcrumb = '', $submenus = false, $currentsub = -1)
 {
-    global $xoopsModule, $xoopsConfig;
-    require_once XOOPS_ROOT_PATH . '/class/template.php';
-    if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/modinfo.php')) {
-        require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/modinfo.php';
-    } else {
-        require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/modinfo.php';
-    }
-    if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php')) {
-        require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php';
-    } else {
-        require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/admin.php';
-    }
-    $headermenu  = [];
-    $adminObject = [];
-    include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/menu.php';
-    $tpl = new XoopsTpl();
-    $tpl->assign([
-                     'headermenu'      => $headermenu,
-                     'adminmenu'       => $adminObject,
-                     'current'         => $currentoption,
-                     'breadcrumb'      => $breadcrumb,
-                     'headermenucount' => count($headermenu),
-                     'submenus'        => $submenus,
-                     'currentsub'      => $currentsub,
-                     'submenuscount'   => count($submenus)
-                 ]);
-    $tpl->display('db:smartobject_admin_menu.tpl');
+	global $xoopsModule, $xoopsConfig;
+	require_once XOOPS_ROOT_PATH . '/class/template.php';
+	if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/modinfo.php')) {
+		require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/modinfo.php';
+	} else {
+		require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/modinfo.php';
+	}
+	if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php')) {
+		require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php';
+	} else {
+		require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/admin.php';
+	}
+	$headermenu  = [];
+	$adminObject = [];
+	include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/menu.php';
+	$tpl = new XoopsTpl();
+	$tpl->assign([
+					 'headermenu'      => $headermenu,
+					 'adminmenu'       => $adminObject,
+					 'current'         => $currentoption,
+					 'breadcrumb'      => $breadcrumb,
+					 'headermenucount' => count($headermenu),
+					 'submenus'        => $submenus,
+					 'currentsub'      => $currentsub,
+					 'submenuscount'   => count($submenus)
+				 ]);
+	$tpl->display('db:smartobject_admin_menu.tpl');
 }
 
 /**
@@ -662,13 +662,13 @@ 
  */
 function smart_collapsableBar($id = '', $title = '', $dsc = '')
 {
-    global $xoopsModule;
-    echo "<h3 style=\"color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; \"><a href='javascript:;' onclick=\"togglecollapse('" . $id . "'); toggleIcon('" . $id . "_icon')\";>";
-    echo "<img id='" . $id . "_icon' src=" . SMARTOBJECT_URL . "assets/images/close12.gif alt=''></a>&nbsp;" . $title . '</h3>';
-    echo "<div id='" . $id . "'>";
-    if ('' !== $dsc) {
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . $dsc . '</span>';
-    }
+	global $xoopsModule;
+	echo "<h3 style=\"color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; \"><a href='javascript:;' onclick=\"togglecollapse('" . $id . "'); toggleIcon('" . $id . "_icon')\";>";
+	echo "<img id='" . $id . "_icon' src=" . SMARTOBJECT_URL . "assets/images/close12.gif alt=''></a>&nbsp;" . $title . '</h3>';
+	echo "<div id='" . $id . "'>";
+	if ('' !== $dsc) {
+		echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . $dsc . '</span>';
+	}
 }
 
 /**
@@ -678,15 +678,15 @@ 
  */
 function smart_ajaxCollapsableBar($id = '', $title = '', $dsc = '')
 {
-    global $xoopsModule;
-    $onClick = "ajaxtogglecollapse('$id')";
-    //$onClick = "togglecollapse('$id'); toggleIcon('" . $id . "_icon')";
-    echo '<h3 style="border: 1px solid; color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; " onclick="' . $onClick . '">';
-    echo "<img id='" . $id . "_icon' src=" . SMARTOBJECT_URL . "assets/images/close12.gif alt=''></a>&nbsp;" . $title . '</h3>';
-    echo "<div id='" . $id . "'>";
-    if ('' !== $dsc) {
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . $dsc . '</span>';
-    }
+	global $xoopsModule;
+	$onClick = "ajaxtogglecollapse('$id')";
+	//$onClick = "togglecollapse('$id'); toggleIcon('" . $id . "_icon')";
+	echo '<h3 style="border: 1px solid; color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; " onclick="' . $onClick . '">';
+	echo "<img id='" . $id . "_icon' src=" . SMARTOBJECT_URL . "assets/images/close12.gif alt=''></a>&nbsp;" . $title . '</h3>';
+	echo "<div id='" . $id . "'>";
+	if ('' !== $dsc) {
+		echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . $dsc . '</span>';
+	}
 }
 
 /**
@@ -713,20 +713,20 @@ 
  */
 function smart_openclose_collapsable($name)
 {
-    $urls        = smart_getCurrentUrls();
-    $path        = $urls['phpself'];
-    $cookie_name = $path . '_smart_collaps_' . $name;
-    $cookie_name = str_replace('.', '_', $cookie_name);
-    $cookie      = smart_getCookieVar($cookie_name, '');
-    if ('none' === $cookie) {
-        echo '
+	$urls        = smart_getCurrentUrls();
+	$path        = $urls['phpself'];
+	$cookie_name = $path . '_smart_collaps_' . $name;
+	$cookie_name = str_replace('.', '_', $cookie_name);
+	$cookie      = smart_getCookieVar($cookie_name, '');
+	if ('none' === $cookie) {
+		echo '
                 <script type="text/javascript"><!--
                 togglecollapse("' . $name . '"); toggleIcon("' . $name . '_icon");
                     //-->
                 </script>
                 ';
-    }
-    /*  if ($cookie == 'none') {
+	}
+	/*  if ($cookie == 'none') {
      echo '
      <script type="text/javascript"><!--
      hideElement("' . $name . '");
@@ -742,9 +742,9 @@ 
  */
 function smart_close_collapsable($name)
 {
-    echo '</div>';
-    smart_openclose_collapsable($name);
-    echo '<br>';
+	echo '</div>';
+	smart_openclose_collapsable($name);
+	echo '<br>';
 }
 
 /**
@@ -754,11 +754,11 @@ 
  */
 function smart_setCookieVar($name, $value, $time = 0)
 {
-    if (0 == $time) {
-        $time = time() + 3600 * 24 * 365;
-        //$time = '';
-    }
-    setcookie($name, $value, $time, '/');
+	if (0 == $time) {
+		$time = time() + 3600 * 24 * 365;
+		//$time = '';
+	}
+	setcookie($name, $value, $time, '/');
 }
 
 /**
@@ -768,12 +768,12 @@ 
  */
 function smart_getCookieVar($name, $default = '')
 {
-    $name = str_replace('.', '_', $name);
-    if (isset($_COOKIE[$name]) && ($_COOKIE[$name] > '')) {
-        return $_COOKIE[$name];
-    } else {
-        return $default;
-    }
+	$name = str_replace('.', '_', $name);
+	if (isset($_COOKIE[$name]) && ($_COOKIE[$name] > '')) {
+		return $_COOKIE[$name];
+	} else {
+		return $default;
+	}
 }
 
 /**
@@ -781,25 +781,25 @@ 
  */
 function smart_getCurrentUrls()
 {
-    $urls        = [];
-    $http        = (false === strpos(XOOPS_URL, 'https://')) ? 'http://' : 'https://';
-    $phpself     = $_SERVER['PHP_SELF'];
-    $httphost    = $_SERVER['HTTP_HOST'];
-    $querystring = $_SERVER['QUERY_STRING'];
-    if ('' !== $querystring) {
-        $querystring = '?' . $querystring;
-    }
-    $currenturl           = $http . $httphost . $phpself . $querystring;
-    $urls                 = [];
-    $urls['http']         = $http;
-    $urls['httphost']     = $httphost;
-    $urls['phpself']      = $phpself;
-    $urls['querystring']  = $querystring;
-    $urls['full_phpself'] = $http . $httphost . $phpself;
-    $urls['full']         = $currenturl;
-    $urls['isHomePage']   = (XOOPS_URL . '/index.php') == ($http . $httphost . $phpself);
-
-    return $urls;
+	$urls        = [];
+	$http        = (false === strpos(XOOPS_URL, 'https://')) ? 'http://' : 'https://';
+	$phpself     = $_SERVER['PHP_SELF'];
+	$httphost    = $_SERVER['HTTP_HOST'];
+	$querystring = $_SERVER['QUERY_STRING'];
+	if ('' !== $querystring) {
+		$querystring = '?' . $querystring;
+	}
+	$currenturl           = $http . $httphost . $phpself . $querystring;
+	$urls                 = [];
+	$urls['http']         = $http;
+	$urls['httphost']     = $httphost;
+	$urls['phpself']      = $phpself;
+	$urls['querystring']  = $querystring;
+	$urls['full_phpself'] = $http . $httphost . $phpself;
+	$urls['full']         = $currenturl;
+	$urls['isHomePage']   = (XOOPS_URL . '/index.php') == ($http . $httphost . $phpself);
+
+	return $urls;
 }
 
 /**
@@ -807,9 +807,9 @@ 
  */
 function smart_getCurrentPage()
 {
-    $urls = smart_getCurrentUrls();
+	$urls = smart_getCurrentUrls();
 
-    return $urls['full'];
+	return $urls['full'];
 }
 
 /**
@@ -872,29 +872,29 @@ 
  */
 function smart_modFooter()
 {
-    global $xoopsConfig, $xoopsModule, $xoopsModuleConfig;
-
-    require_once XOOPS_ROOT_PATH . '/class/template.php';
-    $tpl = new XoopsTpl();
-
-    $hModule      = xoops_getHandler('module');
-    $versioninfo  =& $hModule->get($xoopsModule->getVar('mid'));
-    $modfootertxt = 'Module ' . $versioninfo->getInfo('name') . ' - Version ' . $versioninfo->getInfo('version') . '';
-    $modfooter    = "<a href='" . $versioninfo->getInfo('support_site_url') . "' target='_blank'><img src='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/assets/images/cssbutton.gif' title='" . $modfootertxt . "' alt='" . $modfootertxt . "'></a>";
-    $tpl->assign('modfooter', $modfooter);
-
-    if (!defined('_AM_SOBJECT_XOOPS_PRO')) {
-        define('_AM_SOBJECT_XOOPS_PRO', 'Do you need help with this module ?<br>Do you need new features not yet available?');
-    }
-    $smartobjectConfig = smart_getModuleConfig('smartobject');
-    $tpl->assign('smartobject_enable_admin_footer', $smartobjectConfig['enable_admin_footer']);
-    $tpl->display(SMARTOBJECT_ROOT_PATH . 'templates/smartobject_admin_footer.tpl');
+	global $xoopsConfig, $xoopsModule, $xoopsModuleConfig;
+
+	require_once XOOPS_ROOT_PATH . '/class/template.php';
+	$tpl = new XoopsTpl();
+
+	$hModule      = xoops_getHandler('module');
+	$versioninfo  =& $hModule->get($xoopsModule->getVar('mid'));
+	$modfootertxt = 'Module ' . $versioninfo->getInfo('name') . ' - Version ' . $versioninfo->getInfo('version') . '';
+	$modfooter    = "<a href='" . $versioninfo->getInfo('support_site_url') . "' target='_blank'><img src='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/assets/images/cssbutton.gif' title='" . $modfootertxt . "' alt='" . $modfootertxt . "'></a>";
+	$tpl->assign('modfooter', $modfooter);
+
+	if (!defined('_AM_SOBJECT_XOOPS_PRO')) {
+		define('_AM_SOBJECT_XOOPS_PRO', 'Do you need help with this module ?<br>Do you need new features not yet available?');
+	}
+	$smartobjectConfig = smart_getModuleConfig('smartobject');
+	$tpl->assign('smartobject_enable_admin_footer', $smartobjectConfig['enable_admin_footer']);
+	$tpl->display(SMARTOBJECT_ROOT_PATH . 'templates/smartobject_admin_footer.tpl');
 }
 
 function smart_xoops_cp_footer()
 {
-    smart_modFooter();
-    xoops_cp_footer();
+	smart_modFooter();
+	xoops_cp_footer();
 }
 
 /**
@@ -903,11 +903,11 @@ 
  */
 function smart_sanitizeForCommonTags($text)
 {
-    global $xoopsConfig;
-    $text = str_replace('{X_SITENAME}', $xoopsConfig['sitename'], $text);
-    $text = str_replace('{X_ADMINMAIL}', $xoopsConfig['adminmail'], $text);
+	global $xoopsConfig;
+	$text = str_replace('{X_SITENAME}', $xoopsConfig['sitename'], $text);
+	$text = str_replace('{X_ADMINMAIL}', $xoopsConfig['adminmail'], $text);
 
-    return $text;
+	return $text;
 }
 
 /**
@@ -915,7 +915,7 @@ 
  */
 function smart_addScript($src)
 {
-    echo '<script src="' . $src . '" type="text/javascript"></script>';
+	echo '<script src="' . $src . '" type="text/javascript"></script>';
 }
 
 /**
@@ -923,17 +923,17 @@ 
  */
 function smart_addStyle($src)
 {
-    if ('smartobject' === $src) {
-        $src = SMARTOBJECT_URL . 'assets/css/module.css';
-    }
-    echo smart_get_css_link($src);
+	if ('smartobject' === $src) {
+		$src = SMARTOBJECT_URL . 'assets/css/module.css';
+	}
+	echo smart_get_css_link($src);
 }
 
 function smart_addAdminAjaxSupport()
 {
-    smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/lib/prototype.js');
-    smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/scriptaculous.js');
-    smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/smart.js');
+	smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/lib/prototype.js');
+	smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/scriptaculous.js');
+	smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/smart.js');
 }
 
 /**
@@ -942,11 +942,11 @@ 
  */
 function smart_sanitizeForSmartpopupLink($text)
 {
-    $patterns[]     = "/\[smartpopup=(['\"]?)([^\"'<>]*)\\1](.*)\[\/smartpopup\]/sU";
-    $replacements[] = "<a href=\"javascript:openWithSelfMain('\\2', 'smartpopup', 700, 519);\">\\3</a>";
-    $ret            = preg_replace($patterns, $replacements, $text);
+	$patterns[]     = "/\[smartpopup=(['\"]?)([^\"'<>]*)\\1](.*)\[\/smartpopup\]/sU";
+	$replacements[] = "<a href=\"javascript:openWithSelfMain('\\2', 'smartpopup', 700, 519);\">\\3</a>";
+	$ret            = preg_replace($patterns, $replacements, $text);
 
-    return $ret;
+	return $ret;
 }
 
 /**
@@ -961,25 +961,25 @@ 
  */
 function smart_getImageSize($url, & $width, & $height)
 {
-    if (empty($width) || empty($height)) {
-        if (!$dimension = @ getimagesize($url)) {
-            return false;
-        }
-        if (!empty($width)) {
-            $height = $dimension[1] * $width / $dimension[0];
-        } elseif (!empty($height)) {
-            $width = $dimension[0] * $height / $dimension[1];
-        } else {
-            list($width, $height) = [
-                $dimension[0],
-                $dimension[1]
-            ];
-        }
-
-        return true;
-    } else {
-        return true;
-    }
+	if (empty($width) || empty($height)) {
+		if (!$dimension = @ getimagesize($url)) {
+			return false;
+		}
+		if (!empty($width)) {
+			$height = $dimension[1] * $width / $dimension[0];
+		} elseif (!empty($height)) {
+			$width = $dimension[0] * $height / $dimension[1];
+		} else {
+			list($width, $height) = [
+				$dimension[0],
+				$dimension[1]
+			];
+		}
+
+		return true;
+	} else {
+		return true;
+	}
 }
 
 /**
@@ -992,10 +992,10 @@ 
  */
 function smart_htmlnumericentities($str)
 {
-    //    return preg_replace('/[^!-%\x27-;=?-~ ]/e', '"&#".ord("$0").chr(59)', $str);
-    return preg_replace_callback('/[^!-%\x27-;=?-~ ]/', function ($m) {
-        return '&#' . ord($m[0]) . chr(59);
-    }, $str);
+	//    return preg_replace('/[^!-%\x27-;=?-~ ]/e', '"&#".ord("$0").chr(59)', $str);
+	return preg_replace_callback('/[^!-%\x27-;=?-~ ]/', function ($m) {
+		return '&#' . ord($m[0]) . chr(59);
+	}, $str);
 }
 
 /**
@@ -1005,24 +1005,24 @@ 
  */
 function smart_getcorehandler($name, $optional = false)
 {
-    static $handlers;
-    $name = strtolower(trim($name));
-    if (!isset($handlers[$name])) {
-        if (file_exists($hnd_file = XOOPS_ROOT_PATH . '/kernel/' . $name . '.php')) {
-            require_once $hnd_file;
-        }
-        $class = 'Xoops' . ucfirst($name) . 'Handler';
-        if (class_exists($class)) {
-            $handlers[$name] = new $class($GLOBALS['xoopsDB'], 'xoops');
-        }
-    }
-    if (!isset($handlers[$name]) && !$optional) {
-        trigger_error('Class <b>' . $class . '</b> does not exist<br>Handler Name: ' . $name, E_USER_ERROR);
-    }
-    if (isset($handlers[$name])) {
-        return $handlers[$name];
-    }
-    $inst = false;
+	static $handlers;
+	$name = strtolower(trim($name));
+	if (!isset($handlers[$name])) {
+		if (file_exists($hnd_file = XOOPS_ROOT_PATH . '/kernel/' . $name . '.php')) {
+			require_once $hnd_file;
+		}
+		$class = 'Xoops' . ucfirst($name) . 'Handler';
+		if (class_exists($class)) {
+			$handlers[$name] = new $class($GLOBALS['xoopsDB'], 'xoops');
+		}
+	}
+	if (!isset($handlers[$name]) && !$optional) {
+		trigger_error('Class <b>' . $class . '</b> does not exist<br>Handler Name: ' . $name, E_USER_ERROR);
+	}
+	if (isset($handlers[$name])) {
+		return $handlers[$name];
+	}
+	$inst = false;
 }
 
 /**
@@ -1031,15 +1031,15 @@ 
  */
 function smart_sanitizeAdsenses_callback($matches)
 {
-    global $smartobjectAdsenseHandler;
-    if (isset($smartobjectAdsenseHandler->objects[$matches[1]])) {
-        $adsenseObj = $smartobjectAdsenseHandler->objects[$matches[1]];
-        $ret        = $adsenseObj->render();
-
-        return $ret;
-    } else {
-        return '';
-    }
+	global $smartobjectAdsenseHandler;
+	if (isset($smartobjectAdsenseHandler->objects[$matches[1]])) {
+		$adsenseObj = $smartobjectAdsenseHandler->objects[$matches[1]];
+		$ret        = $adsenseObj->render();
+
+		return $ret;
+	} else {
+		return '';
+	}
 }
 
 /**
@@ -1048,13 +1048,13 @@ 
  */
 function smart_sanitizeAdsenses($text)
 {
-    $patterns     = [];
-    $replacements = [];
+	$patterns     = [];
+	$replacements = [];
 
-    $patterns[] = "/\[adsense](.*)\[\/adsense\]/sU";
-    $text       = preg_replace_callback($patterns, 'smart_sanitizeAdsenses_callback', $text);
+	$patterns[] = "/\[adsense](.*)\[\/adsense\]/sU";
+	$text       = preg_replace_callback($patterns, 'smart_sanitizeAdsenses_callback', $text);
 
-    return $text;
+	return $text;
 }
 
 /**
@@ -1063,15 +1063,15 @@ 
  */
 function smart_sanitizeCustomtags_callback($matches)
 {
-    global $smartobjectCustomtagHandler;
-    if (isset($smartobjectCustomtagHandler->objects[$matches[1]])) {
-        $customObj = $smartobjectCustomtagHandler->objects[$matches[1]];
-        $ret       = $customObj->renderWithPhp();
-
-        return $ret;
-    } else {
-        return '';
-    }
+	global $smartobjectCustomtagHandler;
+	if (isset($smartobjectCustomtagHandler->objects[$matches[1]])) {
+		$customObj = $smartobjectCustomtagHandler->objects[$matches[1]];
+		$ret       = $customObj->renderWithPhp();
+
+		return $ret;
+	} else {
+		return '';
+	}
 }
 
 /**
@@ -1080,13 +1080,13 @@ 
  */
 function smart_sanitizeCustomtags($text)
 {
-    $patterns     = [];
-    $replacements = [];
+	$patterns     = [];
+	$replacements = [];
 
-    $patterns[] = "/\[customtag](.*)\[\/customtag\]/sU";
-    $text       = preg_replace_callback($patterns, 'smart_sanitizeCustomtags_callback', $text);
+	$patterns[] = "/\[customtag](.*)\[\/customtag\]/sU";
+	$text       = preg_replace_callback($patterns, 'smart_sanitizeCustomtags_callback', $text);
 
-    return $text;
+	return $text;
 }
 
 /**
@@ -1095,20 +1095,20 @@ 
  */
 function smart_loadLanguageFile($module, $file)
 {
-    global $xoopsConfig;
-
-    $filename = XOOPS_ROOT_PATH . '/modules/' . $module . '/language/' . $xoopsConfig['language'] . '/' . $file . '.php';
-    if (!file_exists($filename)) {
-        $filename = XOOPS_ROOT_PATH . '/modules/' . $module . '/language/english/' . $file . '.php';
-    }
-    if (file_exists($filename)) {
-        require_once $filename;
-    }
+	global $xoopsConfig;
+
+	$filename = XOOPS_ROOT_PATH . '/modules/' . $module . '/language/' . $xoopsConfig['language'] . '/' . $file . '.php';
+	if (!file_exists($filename)) {
+		$filename = XOOPS_ROOT_PATH . '/modules/' . $module . '/language/english/' . $file . '.php';
+	}
+	if (file_exists($filename)) {
+		require_once $filename;
+	}
 }
 
 function smart_loadCommonLanguageFile()
 {
-    smart_loadLanguageFile('smartobject', 'common');
+	smart_loadLanguageFile('smartobject', 'common');
 }
 
 /**
@@ -1118,35 +1118,35 @@ 
  */
 function smart_purifyText($text, $keyword = false)
 {
-    global $myts;
-    $text = str_replace('&nbsp;', ' ', $text);
-    $text = str_replace('<br>', ' ', $text);
-    $text = str_replace('<br>', ' ', $text);
-    $text = str_replace('<br', ' ', $text);
-    $text = strip_tags($text);
-    $text = html_entity_decode($text);
-    $text = $myts->undoHtmlSpecialChars($text);
-    $text = str_replace(')', ' ', $text);
-    $text = str_replace('(', ' ', $text);
-    $text = str_replace(':', ' ', $text);
-    $text = str_replace('&euro', ' euro ', $text);
-    $text = str_replace('&hellip', '...', $text);
-    $text = str_replace('&rsquo', ' ', $text);
-    $text = str_replace('!', ' ', $text);
-    $text = str_replace('?', ' ', $text);
-    $text = str_replace('"', ' ', $text);
-    $text = str_replace('-', ' ', $text);
-    $text = str_replace('\n', ' ', $text);
-    $text = str_replace('&#8213;', ' ', $text);
-
-    if ($keyword) {
-        $text = str_replace('.', ' ', $text);
-        $text = str_replace(',', ' ', $text);
-        $text = str_replace('\'', ' ', $text);
-    }
-    $text = str_replace(';', ' ', $text);
-
-    return $text;
+	global $myts;
+	$text = str_replace('&nbsp;', ' ', $text);
+	$text = str_replace('<br>', ' ', $text);
+	$text = str_replace('<br>', ' ', $text);
+	$text = str_replace('<br', ' ', $text);
+	$text = strip_tags($text);
+	$text = html_entity_decode($text);
+	$text = $myts->undoHtmlSpecialChars($text);
+	$text = str_replace(')', ' ', $text);
+	$text = str_replace('(', ' ', $text);
+	$text = str_replace(':', ' ', $text);
+	$text = str_replace('&euro', ' euro ', $text);
+	$text = str_replace('&hellip', '...', $text);
+	$text = str_replace('&rsquo', ' ', $text);
+	$text = str_replace('!', ' ', $text);
+	$text = str_replace('?', ' ', $text);
+	$text = str_replace('"', ' ', $text);
+	$text = str_replace('-', ' ', $text);
+	$text = str_replace('\n', ' ', $text);
+	$text = str_replace('&#8213;', ' ', $text);
+
+	if ($keyword) {
+		$text = str_replace('.', ' ', $text);
+		$text = str_replace(',', ' ', $text);
+		$text = str_replace('\'', ' ', $text);
+	}
+	$text = str_replace(';', ' ', $text);
+
+	return $text;
 }
 
 /**
@@ -1155,51 +1155,51 @@ 
  */
 function smart_html2text($document)
 {
-    // PHP Manual:: function preg_replace
-    // $document should contain an HTML document.
-    // This will remove HTML tags, javascript sections
-    // and white space. It will also convert some
-    // common HTML entities to their text equivalent.
-    // Credits: newbb2
-    $search = [
-        "'<script[^>]*?>.*?</script>'si", // Strip out javascript
-        "'<img.*?>'si", // Strip out img tags
-        "'<[\/\!]*?[^<>]*?>'si", // Strip out HTML tags
-        "'([\r\n])[\s]+'", // Strip out white space
-        "'&(quot|#34);'i", // Replace HTML entities
-        "'&(amp|#38);'i",
-        "'&(lt|#60);'i",
-        "'&(gt|#62);'i",
-        "'&(nbsp|#160);'i",
-        "'&(iexcl|#161);'i",
-        "'&(cent|#162);'i",
-        "'&(pound|#163);'i",
-        "'&(copy|#169);'i"
-    ]; // evaluate as php
-
-    $replace = [
-        '',
-        '',
-        '',
-        "\\1",
-        "\"",
-        '&',
-        '<',
-        '>',
-        ' ',
-        chr(161),
-        chr(162),
-        chr(163),
-        chr(169),
-    ];
-
-    $text = preg_replace($search, $replace, $document);
-
-    preg_replace_callback('/&#(\d+);/', function ($matches) {
-        return chr($matches[1]);
-    }, $document);
-
-    return $text;
+	// PHP Manual:: function preg_replace
+	// $document should contain an HTML document.
+	// This will remove HTML tags, javascript sections
+	// and white space. It will also convert some
+	// common HTML entities to their text equivalent.
+	// Credits: newbb2
+	$search = [
+		"'<script[^>]*?>.*?</script>'si", // Strip out javascript
+		"'<img.*?>'si", // Strip out img tags
+		"'<[\/\!]*?[^<>]*?>'si", // Strip out HTML tags
+		"'([\r\n])[\s]+'", // Strip out white space
+		"'&(quot|#34);'i", // Replace HTML entities
+		"'&(amp|#38);'i",
+		"'&(lt|#60);'i",
+		"'&(gt|#62);'i",
+		"'&(nbsp|#160);'i",
+		"'&(iexcl|#161);'i",
+		"'&(cent|#162);'i",
+		"'&(pound|#163);'i",
+		"'&(copy|#169);'i"
+	]; // evaluate as php
+
+	$replace = [
+		'',
+		'',
+		'',
+		"\\1",
+		"\"",
+		'&',
+		'<',
+		'>',
+		' ',
+		chr(161),
+		chr(162),
+		chr(163),
+		chr(169),
+	];
+
+	$text = preg_replace($search, $replace, $document);
+
+	preg_replace_callback('/&#(\d+);/', function ($matches) {
+		return chr($matches[1]);
+	}, $document);
+
+	return $text;
 }
 
 /**
@@ -1213,32 +1213,32 @@ 
  */
 function smart_getfloat($str, $set = false)
 {
-    if (preg_match("/([0-9\.,-]+)/", $str, $match)) {
-        // Found number in $str, so set $str that number
-        $str = $match[0];
-        if (false !== strpos($str, ',')) {
-            // A comma exists, that makes it easy, cos we assume it separates the decimal part.
-            $str = str_replace('.', '', $str);    // Erase thousand seps
-            $str = str_replace(',', '.', $str);    // Convert , to . for floatval command
-
-            return (float)$str;
-        } else {
-            // No comma exists, so we have to decide, how a single dot shall be treated
-            if (true === preg_match("/^[0-9\-]*[\.]{1}[0-9-]+$/", $str) && true === $set['single_dot_as_decimal']) {
-                // Treat single dot as decimal separator
-                return (float)$str;
-            } else {
-                //echo "str: ".$str; echo "ret: ".str_replace('.', '', $str); echo "<br><br> ";
-                // Else, treat all dots as thousand seps
-                $str = str_replace('.', '', $str);    // Erase thousand seps
-
-                return (float)$str;
-            }
-        }
-    } else {
-        // No number found, return zero
-        return 0;
-    }
+	if (preg_match("/([0-9\.,-]+)/", $str, $match)) {
+		// Found number in $str, so set $str that number
+		$str = $match[0];
+		if (false !== strpos($str, ',')) {
+			// A comma exists, that makes it easy, cos we assume it separates the decimal part.
+			$str = str_replace('.', '', $str);    // Erase thousand seps
+			$str = str_replace(',', '.', $str);    // Convert , to . for floatval command
+
+			return (float)$str;
+		} else {
+			// No comma exists, so we have to decide, how a single dot shall be treated
+			if (true === preg_match("/^[0-9\-]*[\.]{1}[0-9-]+$/", $str) && true === $set['single_dot_as_decimal']) {
+				// Treat single dot as decimal separator
+				return (float)$str;
+			} else {
+				//echo "str: ".$str; echo "ret: ".str_replace('.', '', $str); echo "<br><br> ";
+				// Else, treat all dots as thousand seps
+				$str = str_replace('.', '', $str);    // Erase thousand seps
+
+				return (float)$str;
+			}
+		}
+	} else {
+		// No number found, return zero
+		return 0;
+	}
 }
 
 /**
@@ -1248,26 +1248,26 @@ 
  */
 function smart_currency($var, $currencyObj = false)
 {
-    $ret = smart_getfloat($var, ['single_dot_as_decimal' => true]);
-    $ret = round($ret, 2);
-    // make sur we have at least .00 in the $var
-    $decimal_section_original = strstr($ret, '.');
-    $decimal_section          = $decimal_section_original;
-    if ($decimal_section) {
-        if (1 == strlen($decimal_section)) {
-            $decimal_section = '.00';
-        } elseif (2 == strlen($decimal_section)) {
-            $decimal_section .= '0';
-        }
-        $ret = str_replace($decimal_section_original, $decimal_section, $ret);
-    } else {
-        $ret .= '.00';
-    }
-    if ($currencyObj) {
-        $ret = $ret . ' ' . $currencyObj->getCode();
-    }
-
-    return $ret;
+	$ret = smart_getfloat($var, ['single_dot_as_decimal' => true]);
+	$ret = round($ret, 2);
+	// make sur we have at least .00 in the $var
+	$decimal_section_original = strstr($ret, '.');
+	$decimal_section          = $decimal_section_original;
+	if ($decimal_section) {
+		if (1 == strlen($decimal_section)) {
+			$decimal_section = '.00';
+		} elseif (2 == strlen($decimal_section)) {
+			$decimal_section .= '0';
+		}
+		$ret = str_replace($decimal_section_original, $decimal_section, $ret);
+	} else {
+		$ret .= '.00';
+	}
+	if ($currencyObj) {
+		$ret = $ret . ' ' . $currencyObj->getCode();
+	}
+
+	return $ret;
 }
 
 /**
@@ -1276,7 +1276,7 @@ 
  */
 function smart_float($var)
 {
-    return smart_currency($var);
+	return smart_currency($var);
 }
 
 /**
@@ -1285,16 +1285,16 @@ 
  */
 function smart_getModuleAdminLink($moduleName = false)
 {
-    global $xoopsModule;
-    if (!$moduleName && (isset($xoopsModule) && is_object($xoopsModule))) {
-        $moduleName = $xoopsModule->getVar('dirname');
-    }
-    $ret = '';
-    if ($moduleName) {
-        $ret = "<a href='" . XOOPS_URL . "/modules/$moduleName/admin/index.php'>" . _CO_SOBJECT_ADMIN_PAGE . '</a>';
-    }
-
-    return $ret;
+	global $xoopsModule;
+	if (!$moduleName && (isset($xoopsModule) && is_object($xoopsModule))) {
+		$moduleName = $xoopsModule->getVar('dirname');
+	}
+	$ret = '';
+	if ($moduleName) {
+		$ret = "<a href='" . XOOPS_URL . "/modules/$moduleName/admin/index.php'>" . _CO_SOBJECT_ADMIN_PAGE . '</a>';
+	}
+
+	return $ret;
 }
 
 /**
@@ -1302,19 +1302,19 @@ 
  */
 function smart_getEditors()
 {
-    $filename = XOOPS_ROOT_PATH . '/class/xoopseditor/xoopseditor.php';
-    if (!file_exists($filename)) {
-        return false;
-    }
-    require_once $filename;
-    $xoopseditorHandler = XoopsEditorHandler::getInstance();
-    $aList              = $xoopseditorHandler->getList();
-    $ret                = [];
-    foreach ($aList as $k => $v) {
-        $ret[$v] = $k;
-    }
-
-    return $ret;
+	$filename = XOOPS_ROOT_PATH . '/class/xoopseditor/xoopseditor.php';
+	if (!file_exists($filename)) {
+		return false;
+	}
+	require_once $filename;
+	$xoopseditorHandler = XoopsEditorHandler::getInstance();
+	$aList              = $xoopseditorHandler->getList();
+	$ret                = [];
+	foreach ($aList as $k => $v) {
+		$ret[$v] = $k;
+	}
+
+	return $ret;
 }
 
 /**
@@ -1324,11 +1324,11 @@ 
  */
 function smart_getTablesArray($moduleName, $items)
 {
-    $ret = [];
-    foreach ($items as $item) {
-        $ret[] = $moduleName . '_' . $item;
-    }
-    $ret[] = $moduleName . '_meta';
+	$ret = [];
+	foreach ($items as $item) {
+		$ret[] = $moduleName . '_' . $item;
+	}
+	$ret[] = $moduleName . '_meta';
 
-    return $ret;
+	return $ret;
 }

Spacing +76 added lines, -76 removed lines

@@ -11,7 +11,7 @@ 
 
 function smart_get_css_link($cssfile)
 {
-    $ret = '<link rel="stylesheet" type="text/css" href="' . $cssfile . '">';
+    $ret = '<link rel="stylesheet" type="text/css" href="'.$cssfile.'">';
 
     return $ret;
 }
@@ -102,14 +102,14 @@ 
         $seoMode = smart_getModuleModeSEO($moduleName);
         if ('rewrite' === $seoMode) {
             $seoModuleName = smart_getModuleNameForSEO($moduleName);
-            $ret           = XOOPS_URL . '/' . $seoModuleName . '/';
+            $ret           = XOOPS_URL.'/'.$seoModuleName.'/';
         } elseif ('pathinfo' === $seoMode) {
-            $ret = XOOPS_URL . '/modules/' . $moduleName . '/seo.php/' . $seoModuleName . '/';
+            $ret = XOOPS_URL.'/modules/'.$moduleName.'/seo.php/'.$seoModuleName.'/';
         } else {
-            $ret = XOOPS_URL . '/modules/' . $moduleName . '/';
+            $ret = XOOPS_URL.'/modules/'.$moduleName.'/';
         }
 
-        return '<a href="' . $ret . '">' . $smartModule->getVar('name') . '</a>';
+        return '<a href="'.$ret.'">'.$smartModule->getVar('name').'</a>';
     }
 }
 
@@ -172,11 +172,11 @@ 
     /**
      * include SmartObject admin language file
      */
-    $fileName = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php';
+    $fileName = XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/'.$xoopsConfig['language'].'/admin.php';
     if (file_exists($fileName)) {
         require_once $fileName;
     } else {
-        require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/admin.php';
+        require_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/english/admin.php';
     } ?>
     <script type='text/javascript'>
         <!--
@@ -193,9 +193,9 @@ 
     /**
      * Include the admin language constants for the SmartObject Framework
      */
-    $admin_file = SMARTOBJECT_ROOT_PATH . 'language/' . $xoopsConfig['language'] . '/admin.php';
+    $admin_file = SMARTOBJECT_ROOT_PATH.'language/'.$xoopsConfig['language'].'/admin.php';
     if (!file_exists($admin_file)) {
-        $admin_file = SMARTOBJECT_ROOT_PATH . 'language/english/admin.php';
+        $admin_file = SMARTOBJECT_ROOT_PATH.'language/english/admin.php';
     }
     require_once $admin_file;
 }
@@ -215,7 +215,7 @@ 
     //Verifies that a MySQL table exists
     $xoopsDB  = XoopsDatabaseFactory::getDatabaseConnection();
     $realname = $xoopsDB->prefix($table);
-    $sql      = 'SHOW TABLES FROM ' . XOOPS_DB_NAME;
+    $sql      = 'SHOW TABLES FROM '.XOOPS_DB_NAME;
     $ret      = $xoopsDB->queryF($sql);
     while (list($m_table) = $xoopsDB->fetchRow($ret)) {
         if ($m_table == $realname) {
@@ -244,7 +244,7 @@ 
         $moduleName = smart_getCurrentModuleName();
     }
     $xoopsDB = XoopsDatabaseFactory::getDatabaseConnection();
-    $sql     = sprintf('SELECT metavalue FROM %s WHERE metakey=%s', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($key));
+    $sql     = sprintf('SELECT metavalue FROM %s WHERE metakey=%s', $xoopsDB->prefix($moduleName.'_meta'), $xoopsDB->quoteString($key));
     $ret     = $xoopsDB->query($sql);
     if (!$ret) {
         $value = false;
@@ -287,9 +287,9 @@ 
     $xoopsDB = XoopsDatabaseFactory::getDatabaseConnection();
     $ret     = smart_GetMeta($key, $moduleName);
     if ('0' === $ret || $ret > 0) {
-        $sql = sprintf('UPDATE %s SET metavalue = %s WHERE metakey = %s', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($value), $xoopsDB->quoteString($key));
+        $sql = sprintf('UPDATE %s SET metavalue = %s WHERE metakey = %s', $xoopsDB->prefix($moduleName.'_meta'), $xoopsDB->quoteString($value), $xoopsDB->quoteString($key));
     } else {
-        $sql = sprintf('INSERT INTO %s (metakey, metavalue) VALUES (%s, %s)', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($key), $xoopsDB->quoteString($value));
+        $sql = sprintf('INSERT INTO %s (metakey, metavalue) VALUES (%s, %s)', $xoopsDB->prefix($moduleName.'_meta'), $xoopsDB->quoteString($key), $xoopsDB->quoteString($value));
     }
     $ret = $xoopsDB->queryF($sql);
     if (!$ret) {
@@ -469,7 +469,7 @@ 
 {
     static $smartModules;
     if (isset($smartModules[$moduleName])) {
-        $ret =& $smartModules[$moduleName];
+        $ret = & $smartModules[$moduleName];
 
         return $ret;
     }
@@ -505,7 +505,7 @@ 
 {
     static $smartConfigs;
     if (isset($smartConfigs[$moduleName])) {
-        $ret =& $smartConfigs[$moduleName];
+        $ret = & $smartConfigs[$moduleName];
 
         return $ret;
     }
@@ -533,7 +533,7 @@ 
             return $ret;
         }
         $hModConfig                = xoops_getHandler('config');
-        $smartConfigs[$moduleName] =& $hModConfig->getConfigsByCat(0, $module->getVar('mid'));
+        $smartConfigs[$moduleName] = & $hModConfig->getConfigsByCat(0, $module->getVar('mid'));
     }
 
     return $smartConfigs[$moduleName];
@@ -559,7 +559,7 @@ 
 {
     $ret = '';
     foreach ($errors as $key => $value) {
-        $ret .= '<br> - ' . $value;
+        $ret .= '<br> - '.$value;
     }
 
     return $ret;
@@ -579,17 +579,17 @@ 
     if (!is_numeric($userid)) {
         return $userid;
     }
-    $userid = (int)$userid;
+    $userid = (int) $userid;
     if ($userid > 0) {
         if ($users == []) {
             //fetching users
             $memberHandler = xoops_getHandler('member');
-            $user          =& $memberHandler->getUser($userid);
+            $user          = & $memberHandler->getUser($userid);
         } else {
             if (!isset($users[$userid])) {
                 return $GLOBALS['xoopsConfig']['anonymous'];
             }
-            $user =& $users[$userid];
+            $user = & $users[$userid];
         }
         if (is_object($user)) {
             $ts        = MyTextSanitizer:: getInstance();
@@ -600,15 +600,15 @@ 
                 $fullname = $user->getVar('name');
             }
             if (!empty($fullname)) {
-                $linkeduser = "$fullname [<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . $ts->htmlSpecialChars($username) . '</a>]';
+                $linkeduser = "$fullname [<a href='".XOOPS_URL.'/userinfo.php?uid='.$userid."'>".$ts->htmlSpecialChars($username).'</a>]';
             } else {
-                $linkeduser = "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . ucwords($ts->htmlSpecialChars($username)) . '</a>';
+                $linkeduser = "<a href='".XOOPS_URL.'/userinfo.php?uid='.$userid."'>".ucwords($ts->htmlSpecialChars($username)).'</a>';
             }
             // add contact info: email + PM
             if ($withContact) {
-                $linkeduser .= ' <a href="mailto:' . $user->getVar('email') . '"><img style="vertical-align: middle;" src="' . XOOPS_URL . '/images/icons/email.gif' . '" alt="' . _CO_SOBJECT_SEND_EMAIL . '" title="' . _CO_SOBJECT_SEND_EMAIL . '"></a>';
-                $js         = "javascript:openWithSelfMain('" . XOOPS_URL . '/pmlite.php?send2=1&to_userid=' . $userid . "', 'pmlite',450,370);";
-                $linkeduser .= ' <a href="' . $js . '"><img style="vertical-align: middle;" src="' . XOOPS_URL . '/images/icons/pm.gif' . '" alt="' . _CO_SOBJECT_SEND_PM . '" title="' . _CO_SOBJECT_SEND_PM . '"></a>';
+                $linkeduser .= ' <a href="mailto:'.$user->getVar('email').'"><img style="vertical-align: middle;" src="'.XOOPS_URL.'/images/icons/email.gif'.'" alt="'._CO_SOBJECT_SEND_EMAIL.'" title="'._CO_SOBJECT_SEND_EMAIL.'"></a>';
+                $js = "javascript:openWithSelfMain('".XOOPS_URL.'/pmlite.php?send2=1&to_userid='.$userid."', 'pmlite',450,370);";
+                $linkeduser .= ' <a href="'.$js.'"><img style="vertical-align: middle;" src="'.XOOPS_URL.'/images/icons/pm.gif'.'" alt="'._CO_SOBJECT_SEND_PM.'" title="'._CO_SOBJECT_SEND_PM.'"></a>';
             }
 
             return $linkeduser;
@@ -627,20 +627,20 @@ 
 function smart_adminMenu($currentoption = 0, $breadcrumb = '', $submenus = false, $currentsub = -1)
 {
     global $xoopsModule, $xoopsConfig;
-    require_once XOOPS_ROOT_PATH . '/class/template.php';
-    if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/modinfo.php')) {
-        require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/modinfo.php';
+    require_once XOOPS_ROOT_PATH.'/class/template.php';
+    if (file_exists(XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/'.$xoopsConfig['language'].'/modinfo.php')) {
+        require_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/'.$xoopsConfig['language'].'/modinfo.php';
     } else {
-        require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/modinfo.php';
+        require_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/english/modinfo.php';
     }
-    if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php')) {
-        require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php';
+    if (file_exists(XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/'.$xoopsConfig['language'].'/admin.php')) {
+        require_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/'.$xoopsConfig['language'].'/admin.php';
     } else {
-        require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/admin.php';
+        require_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/english/admin.php';
     }
     $headermenu  = [];
     $adminObject = [];
-    include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/menu.php';
+    include XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/admin/menu.php';
     $tpl = new XoopsTpl();
     $tpl->assign([
                      'headermenu'      => $headermenu,
@@ -663,11 +663,11 @@ 
 function smart_collapsableBar($id = '', $title = '', $dsc = '')
 {
     global $xoopsModule;
-    echo "<h3 style=\"color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; \"><a href='javascript:;' onclick=\"togglecollapse('" . $id . "'); toggleIcon('" . $id . "_icon')\";>";
-    echo "<img id='" . $id . "_icon' src=" . SMARTOBJECT_URL . "assets/images/close12.gif alt=''></a>&nbsp;" . $title . '</h3>';
-    echo "<div id='" . $id . "'>";
+    echo "<h3 style=\"color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; \"><a href='javascript:;' onclick=\"togglecollapse('".$id."'); toggleIcon('".$id."_icon')\";>";
+    echo "<img id='".$id."_icon' src=".SMARTOBJECT_URL."assets/images/close12.gif alt=''></a>&nbsp;".$title.'</h3>';
+    echo "<div id='".$id."'>";
     if ('' !== $dsc) {
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . $dsc . '</span>';
+        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">".$dsc.'</span>';
     }
 }
 
@@ -681,11 +681,11 @@ 
     global $xoopsModule;
     $onClick = "ajaxtogglecollapse('$id')";
     //$onClick = "togglecollapse('$id'); toggleIcon('" . $id . "_icon')";
-    echo '<h3 style="border: 1px solid; color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; " onclick="' . $onClick . '">';
-    echo "<img id='" . $id . "_icon' src=" . SMARTOBJECT_URL . "assets/images/close12.gif alt=''></a>&nbsp;" . $title . '</h3>';
-    echo "<div id='" . $id . "'>";
+    echo '<h3 style="border: 1px solid; color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; " onclick="'.$onClick.'">';
+    echo "<img id='".$id."_icon' src=".SMARTOBJECT_URL."assets/images/close12.gif alt=''></a>&nbsp;".$title.'</h3>';
+    echo "<div id='".$id."'>";
     if ('' !== $dsc) {
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . $dsc . '</span>';
+        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">".$dsc.'</span>';
     }
 }
 
@@ -715,13 +715,13 @@ 
 {
     $urls        = smart_getCurrentUrls();
     $path        = $urls['phpself'];
-    $cookie_name = $path . '_smart_collaps_' . $name;
+    $cookie_name = $path.'_smart_collaps_'.$name;
     $cookie_name = str_replace('.', '_', $cookie_name);
     $cookie      = smart_getCookieVar($cookie_name, '');
     if ('none' === $cookie) {
         echo '
                 <script type="text/javascript"><!--
-                togglecollapse("' . $name . '"); toggleIcon("' . $name . '_icon");
+                togglecollapse("' . $name.'"); toggleIcon("'.$name.'_icon");
                     //-->
                 </script>
                 ';
@@ -787,17 +787,17 @@ 
     $httphost    = $_SERVER['HTTP_HOST'];
     $querystring = $_SERVER['QUERY_STRING'];
     if ('' !== $querystring) {
-        $querystring = '?' . $querystring;
+        $querystring = '?'.$querystring;
     }
-    $currenturl           = $http . $httphost . $phpself . $querystring;
+    $currenturl           = $http.$httphost.$phpself.$querystring;
     $urls                 = [];
     $urls['http']         = $http;
     $urls['httphost']     = $httphost;
     $urls['phpself']      = $phpself;
     $urls['querystring']  = $querystring;
-    $urls['full_phpself'] = $http . $httphost . $phpself;
+    $urls['full_phpself'] = $http.$httphost.$phpself;
     $urls['full']         = $currenturl;
-    $urls['isHomePage']   = (XOOPS_URL . '/index.php') == ($http . $httphost . $phpself);
+    $urls['isHomePage']   = (XOOPS_URL.'/index.php') == ($http.$httphost.$phpself);
 
     return $urls;
 }
@@ -874,13 +874,13 @@ 
 {
     global $xoopsConfig, $xoopsModule, $xoopsModuleConfig;
 
-    require_once XOOPS_ROOT_PATH . '/class/template.php';
+    require_once XOOPS_ROOT_PATH.'/class/template.php';
     $tpl = new XoopsTpl();
 
     $hModule      = xoops_getHandler('module');
-    $versioninfo  =& $hModule->get($xoopsModule->getVar('mid'));
-    $modfootertxt = 'Module ' . $versioninfo->getInfo('name') . ' - Version ' . $versioninfo->getInfo('version') . '';
-    $modfooter    = "<a href='" . $versioninfo->getInfo('support_site_url') . "' target='_blank'><img src='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/assets/images/cssbutton.gif' title='" . $modfootertxt . "' alt='" . $modfootertxt . "'></a>";
+    $versioninfo  = & $hModule->get($xoopsModule->getVar('mid'));
+    $modfootertxt = 'Module '.$versioninfo->getInfo('name').' - Version '.$versioninfo->getInfo('version').'';
+    $modfooter    = "<a href='".$versioninfo->getInfo('support_site_url')."' target='_blank'><img src='".XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/assets/images/cssbutton.gif' title='".$modfootertxt."' alt='".$modfootertxt."'></a>";
     $tpl->assign('modfooter', $modfooter);
 
     if (!defined('_AM_SOBJECT_XOOPS_PRO')) {
@@ -888,7 +888,7 @@ 
     }
     $smartobjectConfig = smart_getModuleConfig('smartobject');
     $tpl->assign('smartobject_enable_admin_footer', $smartobjectConfig['enable_admin_footer']);
-    $tpl->display(SMARTOBJECT_ROOT_PATH . 'templates/smartobject_admin_footer.tpl');
+    $tpl->display(SMARTOBJECT_ROOT_PATH.'templates/smartobject_admin_footer.tpl');
 }
 
 function smart_xoops_cp_footer()
@@ -915,7 +915,7 @@ 
  */
 function smart_addScript($src)
 {
-    echo '<script src="' . $src . '" type="text/javascript"></script>';
+    echo '<script src="'.$src.'" type="text/javascript"></script>';
 }
 
 /**
@@ -924,16 +924,16 @@ 
 function smart_addStyle($src)
 {
     if ('smartobject' === $src) {
-        $src = SMARTOBJECT_URL . 'assets/css/module.css';
+        $src = SMARTOBJECT_URL.'assets/css/module.css';
     }
     echo smart_get_css_link($src);
 }
 
 function smart_addAdminAjaxSupport()
 {
-    smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/lib/prototype.js');
-    smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/scriptaculous.js');
-    smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/smart.js');
+    smart_addScript(SMARTOBJECT_URL.'include/scriptaculous/lib/prototype.js');
+    smart_addScript(SMARTOBJECT_URL.'include/scriptaculous/src/scriptaculous.js');
+    smart_addScript(SMARTOBJECT_URL.'include/scriptaculous/src/smart.js');
 }
 
 /**
@@ -993,8 +993,8 @@ 
 function smart_htmlnumericentities($str)
 {
     //    return preg_replace('/[^!-%\x27-;=?-~ ]/e', '"&#".ord("$0").chr(59)', $str);
-    return preg_replace_callback('/[^!-%\x27-;=?-~ ]/', function ($m) {
-        return '&#' . ord($m[0]) . chr(59);
+    return preg_replace_callback('/[^!-%\x27-;=?-~ ]/', function($m) {
+        return '&#'.ord($m[0]).chr(59);
     }, $str);
 }
 
@@ -1008,16 +1008,16 @@ 
     static $handlers;
     $name = strtolower(trim($name));
     if (!isset($handlers[$name])) {
-        if (file_exists($hnd_file = XOOPS_ROOT_PATH . '/kernel/' . $name . '.php')) {
+        if (file_exists($hnd_file = XOOPS_ROOT_PATH.'/kernel/'.$name.'.php')) {
             require_once $hnd_file;
         }
-        $class = 'Xoops' . ucfirst($name) . 'Handler';
+        $class = 'Xoops'.ucfirst($name).'Handler';
         if (class_exists($class)) {
             $handlers[$name] = new $class($GLOBALS['xoopsDB'], 'xoops');
         }
     }
     if (!isset($handlers[$name]) && !$optional) {
-        trigger_error('Class <b>' . $class . '</b> does not exist<br>Handler Name: ' . $name, E_USER_ERROR);
+        trigger_error('Class <b>'.$class.'</b> does not exist<br>Handler Name: '.$name, E_USER_ERROR);
     }
     if (isset($handlers[$name])) {
         return $handlers[$name];
@@ -1097,9 +1097,9 @@ 
 {
     global $xoopsConfig;
 
-    $filename = XOOPS_ROOT_PATH . '/modules/' . $module . '/language/' . $xoopsConfig['language'] . '/' . $file . '.php';
+    $filename = XOOPS_ROOT_PATH.'/modules/'.$module.'/language/'.$xoopsConfig['language'].'/'.$file.'.php';
     if (!file_exists($filename)) {
-        $filename = XOOPS_ROOT_PATH . '/modules/' . $module . '/language/english/' . $file . '.php';
+        $filename = XOOPS_ROOT_PATH.'/modules/'.$module.'/language/english/'.$file.'.php';
     }
     if (file_exists($filename)) {
         require_once $filename;
@@ -1195,7 +1195,7 @@ 
 
     $text = preg_replace($search, $replace, $document);
 
-    preg_replace_callback('/&#(\d+);/', function ($matches) {
+    preg_replace_callback('/&#(\d+);/', function($matches) {
         return chr($matches[1]);
     }, $document);
 
@@ -1218,21 +1218,21 @@ 
         $str = $match[0];
         if (false !== strpos($str, ',')) {
             // A comma exists, that makes it easy, cos we assume it separates the decimal part.
-            $str = str_replace('.', '', $str);    // Erase thousand seps
-            $str = str_replace(',', '.', $str);    // Convert , to . for floatval command
+            $str = str_replace('.', '', $str); // Erase thousand seps
+            $str = str_replace(',', '.', $str); // Convert , to . for floatval command
 
-            return (float)$str;
+            return (float) $str;
         } else {
             // No comma exists, so we have to decide, how a single dot shall be treated
             if (true === preg_match("/^[0-9\-]*[\.]{1}[0-9-]+$/", $str) && true === $set['single_dot_as_decimal']) {
                 // Treat single dot as decimal separator
-                return (float)$str;
+                return (float) $str;
             } else {
                 //echo "str: ".$str; echo "ret: ".str_replace('.', '', $str); echo "<br><br> ";
                 // Else, treat all dots as thousand seps
-                $str = str_replace('.', '', $str);    // Erase thousand seps
+                $str = str_replace('.', '', $str); // Erase thousand seps
 
-                return (float)$str;
+                return (float) $str;
             }
         }
     } else {
@@ -1264,7 +1264,7 @@ 
         $ret .= '.00';
     }
     if ($currencyObj) {
-        $ret = $ret . ' ' . $currencyObj->getCode();
+        $ret = $ret.' '.$currencyObj->getCode();
     }
 
     return $ret;
@@ -1291,7 +1291,7 @@ 
     }
     $ret = '';
     if ($moduleName) {
-        $ret = "<a href='" . XOOPS_URL . "/modules/$moduleName/admin/index.php'>" . _CO_SOBJECT_ADMIN_PAGE . '</a>';
+        $ret = "<a href='".XOOPS_URL."/modules/$moduleName/admin/index.php'>"._CO_SOBJECT_ADMIN_PAGE.'</a>';
     }
 
     return $ret;
@@ -1302,7 +1302,7 @@ 
  */
 function smart_getEditors()
 {
-    $filename = XOOPS_ROOT_PATH . '/class/xoopseditor/xoopseditor.php';
+    $filename = XOOPS_ROOT_PATH.'/class/xoopseditor/xoopseditor.php';
     if (!file_exists($filename)) {
         return false;
     }
@@ -1326,9 +1326,9 @@ 
 {
     $ret = [];
     foreach ($items as $item) {
-        $ret[] = $moduleName . '_' . $item;
+        $ret[] = $moduleName.'_'.$item;
     }
-    $ret[] = $moduleName . '_meta';
+    $ret[] = $moduleName.'_meta';
 
     return $ret;
 }

include/captcha/scripts/img.php

Indentation +412 added lines, -412 removed lines

@@ -10,7 +10,7 @@ 
 $xoopsLogger->activated = false;
 
 if (empty($_SERVER['HTTP_REFERER']) || !preg_match('/^' . preg_quote(XOOPS_URL, '/') . '/', $_SERVER['HTTP_REFERER'])) {
-    exit();
+	exit();
 }
 
 /**
@@ -18,192 +18,192 @@ 
  */
 class XoopsCaptchaImageHandler
 {
-    public $config = [];
-    //var $mode = "gd"; // GD or bmp
-    public $code;
-    public $invalid = false;
-
-    public $font;
-    public $spacing;
-    public $width;
-    public $height;
-
-    /**
-     * XoopsCaptchaImageHandler constructor.
-     */
-    public function __construct()
-    {
-        if (empty($_SESSION['XoopsCaptcha_name'])) {
-            $this->invalid = true;
-        }
-
-        if (!extension_loaded('gd')) {
-            $this->mode = 'bmp';
-        } else {
-            $required_functions = [
-                'imagecreatetruecolor',
-                'imagecolorallocate',
-                'imagefilledrectangle',
-                'imagejpeg',
-                'imagedestroy',
-                'imageftbbox'
-            ];
-            foreach ($required_functions as $func) {
-                if (!function_exists($func)) {
-                    $this->mode = 'bmp';
-                    break;
-                }
-            }
-        }
-    }
-
-    /**
-     * Loading configs from CAPTCHA class
-     * @param array $config
-     */
-    public function setConfig($config = [])
-    {
-        // Loading default preferences
-        $this->config = $config;
-    }
-
-    public function loadImage()
-    {
-        $this->createCode();
-        $this->setCode();
-        $this->createImage();
-    }
-
-    /**
-     * Create Code
-     */
-    public function createCode()
-    {
-        if ($this->invalid) {
-            return;
-        }
-
-        if ('bmp' === $this->mode) {
-            $this->config['num_chars'] = 4;
-            $this->code                = mt_rand(pow(10, $this->config['num_chars'] - 1), (int)str_pad('9', $this->config['num_chars'], '9'));
-        } else {
-            $this->code = substr(md5(uniqid(mt_rand(), 1)), 0, $this->config['num_chars']);
-            if (!$this->config['casesensitive']) {
-                $this->code = strtoupper($this->code);
-            }
-        }
-    }
-
-    public function setCode()
-    {
-        if ($this->invalid) {
-            return;
-        }
-
-        $_SESSION['XoopsCaptcha_sessioncode'] = (string)$this->code;
-        $maxAttempts                          = (int)(@$_SESSION['XoopsCaptcha_maxattempts']);
-
-        // Increase the attempt records on refresh
-        if (!empty($maxAttempts)) {
-            $_SESSION['XoopsCaptcha_attempt_' . $_SESSION['XoopsCaptcha_name']]++;
-            if ($_SESSION['XoopsCaptcha_attempt_' . $_SESSION['XoopsCaptcha_name']] > $maxAttempts) {
-                $this->invalid = true;
-            }
-        }
-    }
-
-    /**
-     * @param  string $file
-     * @return string|void
-     */
-    public function createImage($file = '')
-    {
-        if ($this->invalid) {
-            header('Content-type: image/gif');
-            readfile(XOOPS_ROOT_PATH . '/images/subject/icon2.gif');
-
-            return;
-        }
-
-        if ('bmp' === $this->mode) {
-            return $this->createImageBmp();
-        } else {
-            return $this->createImageGd();
-        }
-    }
-
-    /**
-     *  Create CAPTCHA iamge with GD
-     *  Originated from DuGris' SecurityImage
-     * @param string $file
-     */
-    //  --------------------------------------------------------------------------- //
-    // Class: SecurityImage 1.5                                                    //
-    // Author: DuGris aka L. Jen <http://www.dugris.info>                           //
-    // Email: DuGris@wanadoo.fr                                                    //
-    // Licence: GNU                                                                 //
-    // Project: XOOPS Project                                                   //
-    //  --------------------------------------------------------------------------- //
-    public function createImageGd($file = '')
-    {
-        $this->loadFont();
-        $this->setImageSize();
-
-        $this->oImage = imagecreatetruecolor($this->width, $this->height);
-        $background   = imagecolorallocate($this->oImage, 255, 255, 255);
-        imagefilledrectangle($this->oImage, 0, 0, $this->width, $this->height, $background);
-
-        switch ($this->config['background_type']) {
-            default:
-            case 0:
-                $this->drawBars();
-                break;
-
-            case 1:
-                $this->drawCircles();
-                break;
-
-            case 2:
-                $this->drawLines();
-                break;
-
-            case 3:
-                $this->drawRectangles();
-                break;
-
-            case 4:
-                $this->drawEllipses();
-                break;
-
-            case 5:
-                $this->drawPolygons();
-                break;
-
-            case 100:
-                $this->createFromFile();
-                break;
-        }
-        $this->drawBorder();
-        $this->drawCode();
-
-        if (empty($file)) {
-            header('Content-type: image/jpeg');
-            imagejpeg($this->oImage);
-        } else {
-            imagejpeg($this->oImage, XOOPS_ROOT_PATH . '/' . $this->config['imagepath'] . '/' . $file . '.jpg');
-        }
-        imagedestroy($this->oImage);
-    }
-
-    /**
-     * @param         $name
-     * @param  string $extension
-     * @return array
-     */
-    public function _getList($name, $extension = '')
-    {
-        $items = [];
-        /*
+	public $config = [];
+	//var $mode = "gd"; // GD or bmp
+	public $code;
+	public $invalid = false;
+
+	public $font;
+	public $spacing;
+	public $width;
+	public $height;
+
+	/**
+	 * XoopsCaptchaImageHandler constructor.
+	 */
+	public function __construct()
+	{
+		if (empty($_SESSION['XoopsCaptcha_name'])) {
+			$this->invalid = true;
+		}
+
+		if (!extension_loaded('gd')) {
+			$this->mode = 'bmp';
+		} else {
+			$required_functions = [
+				'imagecreatetruecolor',
+				'imagecolorallocate',
+				'imagefilledrectangle',
+				'imagejpeg',
+				'imagedestroy',
+				'imageftbbox'
+			];
+			foreach ($required_functions as $func) {
+				if (!function_exists($func)) {
+					$this->mode = 'bmp';
+					break;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Loading configs from CAPTCHA class
+	 * @param array $config
+	 */
+	public function setConfig($config = [])
+	{
+		// Loading default preferences
+		$this->config = $config;
+	}
+
+	public function loadImage()
+	{
+		$this->createCode();
+		$this->setCode();
+		$this->createImage();
+	}
+
+	/**
+	 * Create Code
+	 */
+	public function createCode()
+	{
+		if ($this->invalid) {
+			return;
+		}
+
+		if ('bmp' === $this->mode) {
+			$this->config['num_chars'] = 4;
+			$this->code                = mt_rand(pow(10, $this->config['num_chars'] - 1), (int)str_pad('9', $this->config['num_chars'], '9'));
+		} else {
+			$this->code = substr(md5(uniqid(mt_rand(), 1)), 0, $this->config['num_chars']);
+			if (!$this->config['casesensitive']) {
+				$this->code = strtoupper($this->code);
+			}
+		}
+	}
+
+	public function setCode()
+	{
+		if ($this->invalid) {
+			return;
+		}
+
+		$_SESSION['XoopsCaptcha_sessioncode'] = (string)$this->code;
+		$maxAttempts                          = (int)(@$_SESSION['XoopsCaptcha_maxattempts']);
+
+		// Increase the attempt records on refresh
+		if (!empty($maxAttempts)) {
+			$_SESSION['XoopsCaptcha_attempt_' . $_SESSION['XoopsCaptcha_name']]++;
+			if ($_SESSION['XoopsCaptcha_attempt_' . $_SESSION['XoopsCaptcha_name']] > $maxAttempts) {
+				$this->invalid = true;
+			}
+		}
+	}
+
+	/**
+	 * @param  string $file
+	 * @return string|void
+	 */
+	public function createImage($file = '')
+	{
+		if ($this->invalid) {
+			header('Content-type: image/gif');
+			readfile(XOOPS_ROOT_PATH . '/images/subject/icon2.gif');
+
+			return;
+		}
+
+		if ('bmp' === $this->mode) {
+			return $this->createImageBmp();
+		} else {
+			return $this->createImageGd();
+		}
+	}
+
+	/**
+	 *  Create CAPTCHA iamge with GD
+	 *  Originated from DuGris' SecurityImage
+	 * @param string $file
+	 */
+	//  --------------------------------------------------------------------------- //
+	// Class: SecurityImage 1.5                                                    //
+	// Author: DuGris aka L. Jen <http://www.dugris.info>                           //
+	// Email: DuGris@wanadoo.fr                                                    //
+	// Licence: GNU                                                                 //
+	// Project: XOOPS Project                                                   //
+	//  --------------------------------------------------------------------------- //
+	public function createImageGd($file = '')
+	{
+		$this->loadFont();
+		$this->setImageSize();
+
+		$this->oImage = imagecreatetruecolor($this->width, $this->height);
+		$background   = imagecolorallocate($this->oImage, 255, 255, 255);
+		imagefilledrectangle($this->oImage, 0, 0, $this->width, $this->height, $background);
+
+		switch ($this->config['background_type']) {
+			default:
+			case 0:
+				$this->drawBars();
+				break;
+
+			case 1:
+				$this->drawCircles();
+				break;
+
+			case 2:
+				$this->drawLines();
+				break;
+
+			case 3:
+				$this->drawRectangles();
+				break;
+
+			case 4:
+				$this->drawEllipses();
+				break;
+
+			case 5:
+				$this->drawPolygons();
+				break;
+
+			case 100:
+				$this->createFromFile();
+				break;
+		}
+		$this->drawBorder();
+		$this->drawCode();
+
+		if (empty($file)) {
+			header('Content-type: image/jpeg');
+			imagejpeg($this->oImage);
+		} else {
+			imagejpeg($this->oImage, XOOPS_ROOT_PATH . '/' . $this->config['imagepath'] . '/' . $file . '.jpg');
+		}
+		imagedestroy($this->oImage);
+	}
+
+	/**
+	 * @param         $name
+	 * @param  string $extension
+	 * @return array
+	 */
+	public function _getList($name, $extension = '')
+	{
+		$items = [];
+		/*
          if (@ require_once XOOPS_ROOT_PATH."/Frameworks/art/functions.ini.php") {
          load_functions("cache");
          if ($items = mod_loadCacheFile("captcha_{$name}", "captcha")) {
@@ -211,231 +211,231 @@ 
          }
          }
          */
-        require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
-        $file_path = $this->config['rootpath'] . "/{$name}";
-        $files     = XoopsLists::getFileListAsArray($file_path);
-        foreach ($files as $item) {
-            if (empty($extension) || preg_match("/(\.{$extension})$/i", $item)) {
-                $items[] = $item;
-            }
-        }
-        if (function_exists('mod_createCacheFile')) {
-            mod_createCacheFile($items, "captcha_{$name}", 'captcha');
-        }
-
-        return $items;
-    }
-
-    public function loadFont()
-    {
-        $fonts      = $this->_getList('fonts', 'ttf');
-        $this->font = $this->config['rootpath'] . '/fonts/' . $fonts[array_rand($fonts)];
-    }
-
-    public function setImageSize()
-    {
-        $MaxCharWidth  = 0;
-        $MaxCharHeight = 0;
-        $oImage        = imagecreatetruecolor(100, 100);
-        $text_color    = imagecolorallocate($oImage, mt_rand(0, 100), mt_rand(0, 100), mt_rand(0, 100));
-        $FontSize      = $this->config['fontsize_max'];
-        for ($Angle = -30; $Angle <= 30; ++$Angle) {
-            for ($i = 65; $i <= 90; ++$i) {
-                $CharDetails   = imageftbbox($FontSize, $Angle, $this->font, chr($i), []);
-                $_MaxCharWidth = abs($CharDetails[0] + $CharDetails[2]);
-                if ($_MaxCharWidth > $MaxCharWidth) {
-                    $MaxCharWidth = $_MaxCharWidth;
-                }
-                $_MaxCharHeight = abs($CharDetails[1] + $CharDetails[5]);
-                if ($_MaxCharHeight > $MaxCharHeight) {
-                    $MaxCharHeight = $_MaxCharHeight;
-                }
-            }
-        }
-        imagedestroy($oImage);
-
-        $this->height  = $MaxCharHeight + 2;
-        $this->spacing = (int)(($this->config['num_chars'] * $MaxCharWidth) / $this->config['num_chars']);
-        $this->width   = ($this->config['num_chars'] * $MaxCharWidth) + ($this->spacing / 2);
-    }
-
-    /**
-     * Return random background
-     *
-     * @return array
-     */
-    public function loadBackground()
-    {
-        $RandBackground = null;
-        if ($backgrounds = $this->_getList('backgrounds', '(gif|jpg|png)')) {
-            $RandBackground = $this->config['rootpath'] . '/backgrounds/' . $backgrounds[array_rand($backgrounds)];
-        }
-
-        return $RandBackground;
-    }
-
-    /**
-     * Draw Image background
-     */
-    public function createFromFile()
-    {
-        if ($RandImage = $this->loadBackground()) {
-            $ImageType = @getimagesize($RandImage);
-            switch (@$ImageType[2]) {
-                case 1:
-                    $BackgroundImage = imagecreatefromgif($RandImage);
-                    break;
-
-                case 2:
-                    $BackgroundImage = imagecreatefromjpeg($RandImage);
-                    break;
-
-                case 3:
-                    $BackgroundImage = imagecreatefrompng($RandImage);
-                    break;
-            }
-        }
-        if (!empty($BackgroundImage)) {
-            imagecopyresized($this->oImage, $BackgroundImage, 0, 0, 0, 0, imagesx($this->oImage), imagesy($this->oImage), imagesx($BackgroundImage), imagesy($BackgroundImage));
-            imagedestroy($BackgroundImage);
-        } else {
-            $this->drawBars();
-        }
-    }
-
-    /**
-     * Draw Code
-     */
-    public function drawCode()
-    {
-        for ($i = 0; $i < $this->config['num_chars']; ++$i) {
-            // select random greyscale colour
-            $text_color = imagecolorallocate($this->oImage, mt_rand(0, 100), mt_rand(0, 100), mt_rand(0, 100));
-
-            // write text to image
-            $Angle = mt_rand(10, 30);
-            if ($i % 2) {
-                $Angle = mt_rand(-10, -30);
-            }
-
-            // select random font size
-            $FontSize = mt_rand($this->config['fontsize_min'], $this->config['fontsize_max']);
-
-            $CharDetails = imageftbbox($FontSize, $Angle, $this->font, $this->code[$i], []);
-            $CharHeight  = abs($CharDetails[1] + $CharDetails[5]);
-
-            // calculate character starting coordinates
-            $posX = ($this->spacing / 2) + ($i * $this->spacing);
-            $posY = 2 + ($this->height / 2) + ($CharHeight / 4);
-
-            imagefttext($this->oImage, $FontSize, $Angle, $posX, $posY, $text_color, $this->font, $this->code[$i], []);
-        }
-    }
-
-    /**
-     * Draw Border
-     */
-    public function drawBorder()
-    {
-        $rgb          = mt_rand(50, 150);
-        $border_color = imagecolorallocate($this->oImage, $rgb, $rgb, $rgb);
-        imagerectangle($this->oImage, 0, 0, $this->width - 1, $this->height - 1, $border_color);
-    }
-
-    /**
-     * Draw Circles background
-     */
-    public function drawCircles()
-    {
-        for ($i = 1; $i <= $this->config['background_num']; ++$i) {
-            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
-            imagefilledellipse($this->oImage, mt_rand(0, $this->width - 10), mt_rand(0, $this->height - 3), mt_rand(10, 20), mt_rand(20, 30), $randomcolor);
-        }
-    }
-
-    /**
-     * Draw Lines background
-     */
-    public function drawLines()
-    {
-        for ($i = 0; $i < $this->config['background_num']; ++$i) {
-            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
-            imageline($this->oImage, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $randomcolor);
-        }
-    }
-
-    /**
-     * Draw Rectangles background
-     */
-    public function drawRectangles()
-    {
-        for ($i = 1; $i <= $this->config['background_num']; ++$i) {
-            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
-            imagefilledrectangle($this->oImage, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $randomcolor);
-        }
-    }
-
-    /**
-     * Draw Bars background
-     */
-    public function drawBars()
-    {
-        for ($i = 0; $i <= $this->height;) {
-            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
-            imageline($this->oImage, 0, $i, $this->width, $i, $randomcolor);
-            $i += 2.5;
-        }
-        for ($i = 0; $i <= $this->width;) {
-            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
-            imageline($this->oImage, $i, 0, $i, $this->height, $randomcolor);
-            $i += 2.5;
-        }
-    }
-
-    /**
-     * Draw Ellipses background
-     */
-    public function drawEllipses()
-    {
-        for ($i = 1; $i <= $this->config['background_num']; ++$i) {
-            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
-            imageellipse($this->oImage, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $randomcolor);
-        }
-    }
-
-    /**
-     * Draw polygons background
-     */
-    public function drawPolygons()
-    {
-        for ($i = 1; $i <= $this->config['background_num']; ++$i) {
-            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
-            $coords      = [];
-            for ($j = 1; $j <= $this->config['polygon_point']; ++$j) {
-                $coords[] = mt_rand(0, $this->width);
-                $coords[] = mt_rand(0, $this->height);
-            }
-            imagefilledpolygon($this->oImage, $coords, $this->config['polygon_point'], $randomcolor);
-        }
-    }
-
-    /**
-     *  Create CAPTCHA iamge with BMP
-     *  TODO
-     * @param  string $file
-     * @return string
-     */
-    public function createImageBmp($file = '')
-    {
-        $image = '';
-
-        if (empty($file)) {
-            header('Content-type: image/bmp');
-            echo $image;
-        } else {
-            return $image;
-        }
-    }
+		require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
+		$file_path = $this->config['rootpath'] . "/{$name}";
+		$files     = XoopsLists::getFileListAsArray($file_path);
+		foreach ($files as $item) {
+			if (empty($extension) || preg_match("/(\.{$extension})$/i", $item)) {
+				$items[] = $item;
+			}
+		}
+		if (function_exists('mod_createCacheFile')) {
+			mod_createCacheFile($items, "captcha_{$name}", 'captcha');
+		}
+
+		return $items;
+	}
+
+	public function loadFont()
+	{
+		$fonts      = $this->_getList('fonts', 'ttf');
+		$this->font = $this->config['rootpath'] . '/fonts/' . $fonts[array_rand($fonts)];
+	}
+
+	public function setImageSize()
+	{
+		$MaxCharWidth  = 0;
+		$MaxCharHeight = 0;
+		$oImage        = imagecreatetruecolor(100, 100);
+		$text_color    = imagecolorallocate($oImage, mt_rand(0, 100), mt_rand(0, 100), mt_rand(0, 100));
+		$FontSize      = $this->config['fontsize_max'];
+		for ($Angle = -30; $Angle <= 30; ++$Angle) {
+			for ($i = 65; $i <= 90; ++$i) {
+				$CharDetails   = imageftbbox($FontSize, $Angle, $this->font, chr($i), []);
+				$_MaxCharWidth = abs($CharDetails[0] + $CharDetails[2]);
+				if ($_MaxCharWidth > $MaxCharWidth) {
+					$MaxCharWidth = $_MaxCharWidth;
+				}
+				$_MaxCharHeight = abs($CharDetails[1] + $CharDetails[5]);
+				if ($_MaxCharHeight > $MaxCharHeight) {
+					$MaxCharHeight = $_MaxCharHeight;
+				}
+			}
+		}
+		imagedestroy($oImage);
+
+		$this->height  = $MaxCharHeight + 2;
+		$this->spacing = (int)(($this->config['num_chars'] * $MaxCharWidth) / $this->config['num_chars']);
+		$this->width   = ($this->config['num_chars'] * $MaxCharWidth) + ($this->spacing / 2);
+	}
+
+	/**
+	 * Return random background
+	 *
+	 * @return array
+	 */
+	public function loadBackground()
+	{
+		$RandBackground = null;
+		if ($backgrounds = $this->_getList('backgrounds', '(gif|jpg|png)')) {
+			$RandBackground = $this->config['rootpath'] . '/backgrounds/' . $backgrounds[array_rand($backgrounds)];
+		}
+
+		return $RandBackground;
+	}
+
+	/**
+	 * Draw Image background
+	 */
+	public function createFromFile()
+	{
+		if ($RandImage = $this->loadBackground()) {
+			$ImageType = @getimagesize($RandImage);
+			switch (@$ImageType[2]) {
+				case 1:
+					$BackgroundImage = imagecreatefromgif($RandImage);
+					break;
+
+				case 2:
+					$BackgroundImage = imagecreatefromjpeg($RandImage);
+					break;
+
+				case 3:
+					$BackgroundImage = imagecreatefrompng($RandImage);
+					break;
+			}
+		}
+		if (!empty($BackgroundImage)) {
+			imagecopyresized($this->oImage, $BackgroundImage, 0, 0, 0, 0, imagesx($this->oImage), imagesy($this->oImage), imagesx($BackgroundImage), imagesy($BackgroundImage));
+			imagedestroy($BackgroundImage);
+		} else {
+			$this->drawBars();
+		}
+	}
+
+	/**
+	 * Draw Code
+	 */
+	public function drawCode()
+	{
+		for ($i = 0; $i < $this->config['num_chars']; ++$i) {
+			// select random greyscale colour
+			$text_color = imagecolorallocate($this->oImage, mt_rand(0, 100), mt_rand(0, 100), mt_rand(0, 100));
+
+			// write text to image
+			$Angle = mt_rand(10, 30);
+			if ($i % 2) {
+				$Angle = mt_rand(-10, -30);
+			}
+
+			// select random font size
+			$FontSize = mt_rand($this->config['fontsize_min'], $this->config['fontsize_max']);
+
+			$CharDetails = imageftbbox($FontSize, $Angle, $this->font, $this->code[$i], []);
+			$CharHeight  = abs($CharDetails[1] + $CharDetails[5]);
+
+			// calculate character starting coordinates
+			$posX = ($this->spacing / 2) + ($i * $this->spacing);
+			$posY = 2 + ($this->height / 2) + ($CharHeight / 4);
+
+			imagefttext($this->oImage, $FontSize, $Angle, $posX, $posY, $text_color, $this->font, $this->code[$i], []);
+		}
+	}
+
+	/**
+	 * Draw Border
+	 */
+	public function drawBorder()
+	{
+		$rgb          = mt_rand(50, 150);
+		$border_color = imagecolorallocate($this->oImage, $rgb, $rgb, $rgb);
+		imagerectangle($this->oImage, 0, 0, $this->width - 1, $this->height - 1, $border_color);
+	}
+
+	/**
+	 * Draw Circles background
+	 */
+	public function drawCircles()
+	{
+		for ($i = 1; $i <= $this->config['background_num']; ++$i) {
+			$randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
+			imagefilledellipse($this->oImage, mt_rand(0, $this->width - 10), mt_rand(0, $this->height - 3), mt_rand(10, 20), mt_rand(20, 30), $randomcolor);
+		}
+	}
+
+	/**
+	 * Draw Lines background
+	 */
+	public function drawLines()
+	{
+		for ($i = 0; $i < $this->config['background_num']; ++$i) {
+			$randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
+			imageline($this->oImage, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $randomcolor);
+		}
+	}
+
+	/**
+	 * Draw Rectangles background
+	 */
+	public function drawRectangles()
+	{
+		for ($i = 1; $i <= $this->config['background_num']; ++$i) {
+			$randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
+			imagefilledrectangle($this->oImage, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $randomcolor);
+		}
+	}
+
+	/**
+	 * Draw Bars background
+	 */
+	public function drawBars()
+	{
+		for ($i = 0; $i <= $this->height;) {
+			$randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
+			imageline($this->oImage, 0, $i, $this->width, $i, $randomcolor);
+			$i += 2.5;
+		}
+		for ($i = 0; $i <= $this->width;) {
+			$randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
+			imageline($this->oImage, $i, 0, $i, $this->height, $randomcolor);
+			$i += 2.5;
+		}
+	}
+
+	/**
+	 * Draw Ellipses background
+	 */
+	public function drawEllipses()
+	{
+		for ($i = 1; $i <= $this->config['background_num']; ++$i) {
+			$randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
+			imageellipse($this->oImage, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $randomcolor);
+		}
+	}
+
+	/**
+	 * Draw polygons background
+	 */
+	public function drawPolygons()
+	{
+		for ($i = 1; $i <= $this->config['background_num']; ++$i) {
+			$randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
+			$coords      = [];
+			for ($j = 1; $j <= $this->config['polygon_point']; ++$j) {
+				$coords[] = mt_rand(0, $this->width);
+				$coords[] = mt_rand(0, $this->height);
+			}
+			imagefilledpolygon($this->oImage, $coords, $this->config['polygon_point'], $randomcolor);
+		}
+	}
+
+	/**
+	 *  Create CAPTCHA iamge with BMP
+	 *  TODO
+	 * @param  string $file
+	 * @return string
+	 */
+	public function createImageBmp($file = '')
+	{
+		$image = '';
+
+		if (empty($file)) {
+			header('Content-type: image/bmp');
+			echo $image;
+		} else {
+			return $image;
+		}
+	}
 }
 
 $config       = @include __DIR__ . '/../config.php';

Spacing +15 added lines, -15 removed lines

@@ -5,11 +5,11 @@ 
  * D.J.
  */
 
-include dirname(dirname(dirname(dirname(dirname(__DIR__))))) . '/mainfile.php';
+include dirname(dirname(dirname(dirname(dirname(__DIR__))))).'/mainfile.php';
 error_reporting(0);
 $xoopsLogger->activated = false;
 
-if (empty($_SERVER['HTTP_REFERER']) || !preg_match('/^' . preg_quote(XOOPS_URL, '/') . '/', $_SERVER['HTTP_REFERER'])) {
+if (empty($_SERVER['HTTP_REFERER']) || !preg_match('/^'.preg_quote(XOOPS_URL, '/').'/', $_SERVER['HTTP_REFERER'])) {
     exit();
 }
 
@@ -85,7 +85,7 @@ 
 
         if ('bmp' === $this->mode) {
             $this->config['num_chars'] = 4;
-            $this->code                = mt_rand(pow(10, $this->config['num_chars'] - 1), (int)str_pad('9', $this->config['num_chars'], '9'));
+            $this->code                = mt_rand(pow(10, $this->config['num_chars'] - 1), (int) str_pad('9', $this->config['num_chars'], '9'));
         } else {
             $this->code = substr(md5(uniqid(mt_rand(), 1)), 0, $this->config['num_chars']);
             if (!$this->config['casesensitive']) {
@@ -100,13 +100,13 @@ 
             return;
         }
 
-        $_SESSION['XoopsCaptcha_sessioncode'] = (string)$this->code;
-        $maxAttempts                          = (int)(@$_SESSION['XoopsCaptcha_maxattempts']);
+        $_SESSION['XoopsCaptcha_sessioncode'] = (string) $this->code;
+        $maxAttempts                          = (int) (@$_SESSION['XoopsCaptcha_maxattempts']);
 
         // Increase the attempt records on refresh
         if (!empty($maxAttempts)) {
-            $_SESSION['XoopsCaptcha_attempt_' . $_SESSION['XoopsCaptcha_name']]++;
-            if ($_SESSION['XoopsCaptcha_attempt_' . $_SESSION['XoopsCaptcha_name']] > $maxAttempts) {
+            $_SESSION['XoopsCaptcha_attempt_'.$_SESSION['XoopsCaptcha_name']]++;
+            if ($_SESSION['XoopsCaptcha_attempt_'.$_SESSION['XoopsCaptcha_name']] > $maxAttempts) {
                 $this->invalid = true;
             }
         }
@@ -120,7 +120,7 @@ 
     {
         if ($this->invalid) {
             header('Content-type: image/gif');
-            readfile(XOOPS_ROOT_PATH . '/images/subject/icon2.gif');
+            readfile(XOOPS_ROOT_PATH.'/images/subject/icon2.gif');
 
             return;
         }
@@ -190,7 +190,7 @@ 
             header('Content-type: image/jpeg');
             imagejpeg($this->oImage);
         } else {
-            imagejpeg($this->oImage, XOOPS_ROOT_PATH . '/' . $this->config['imagepath'] . '/' . $file . '.jpg');
+            imagejpeg($this->oImage, XOOPS_ROOT_PATH.'/'.$this->config['imagepath'].'/'.$file.'.jpg');
         }
         imagedestroy($this->oImage);
     }
@@ -211,8 +211,8 @@ 
          }
          }
          */
-        require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
-        $file_path = $this->config['rootpath'] . "/{$name}";
+        require_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
+        $file_path = $this->config['rootpath']."/{$name}";
         $files     = XoopsLists::getFileListAsArray($file_path);
         foreach ($files as $item) {
             if (empty($extension) || preg_match("/(\.{$extension})$/i", $item)) {
@@ -229,7 +229,7 @@ 
     public function loadFont()
     {
         $fonts      = $this->_getList('fonts', 'ttf');
-        $this->font = $this->config['rootpath'] . '/fonts/' . $fonts[array_rand($fonts)];
+        $this->font = $this->config['rootpath'].'/fonts/'.$fonts[array_rand($fonts)];
     }
 
     public function setImageSize()
@@ -255,7 +255,7 @@ 
         imagedestroy($oImage);
 
         $this->height  = $MaxCharHeight + 2;
-        $this->spacing = (int)(($this->config['num_chars'] * $MaxCharWidth) / $this->config['num_chars']);
+        $this->spacing = (int) (($this->config['num_chars'] * $MaxCharWidth) / $this->config['num_chars']);
         $this->width   = ($this->config['num_chars'] * $MaxCharWidth) + ($this->spacing / 2);
     }
 
@@ -268,7 +268,7 @@ 
     {
         $RandBackground = null;
         if ($backgrounds = $this->_getList('backgrounds', '(gif|jpg|png)')) {
-            $RandBackground = $this->config['rootpath'] . '/backgrounds/' . $backgrounds[array_rand($backgrounds)];
+            $RandBackground = $this->config['rootpath'].'/backgrounds/'.$backgrounds[array_rand($backgrounds)];
         }
 
         return $RandBackground;
@@ -438,7 +438,7 @@ 
     }
 }
 
-$config       = @include __DIR__ . '/../config.php';
+$config       = @include __DIR__.'/../config.php';
 $imageHandler = new XoopsCaptchaImageHandler();
 $imageHandler->setConfig($config);
 $imageHandler->loadImage();

include/captcha/captcha.php

Indentation +244 added lines, -244 removed lines

@@ -13,253 +13,253 @@
  */
 class XoopsCaptcha
 {
-    public $active = true;
-    public $mode   = 'text';    // potential values: image, text
-    public $config = [];
-
-    public $message = []; // Logging error messages
-
-    /**
-     * XoopsCaptcha constructor.
-     */
-    public function __construct()
-    {
-        // Loading default preferences
-        $this->config = @include __DIR__ . '/config.php';
-
-        $this->setMode($this->config['mode']);
-    }
-
-    /**
-     * @return XoopsCaptcha
-     */
-    public static function getInstance()
-    {
-        static $instance;
-        if (null === $instance) {
-            $instance = new static();
-        }
-
-        return $instance;
-    }
-
-    /**
-     * @param $name
-     * @param $val
-     * @return bool
-     */
-    public function setConfig($name, $val)
-    {
-        if ('mode' === $name) {
-            $this->setMode($val);
-        } elseif (isset($this->$name)) {
-            $this->$name = $val;
-        } else {
-            $this->config[$name] = $val;
-        }
-
-        return true;
-    }
-
-    /**
-     * Set CAPTCHA mode
-     *
-     * For future possible modes, right now force to use text or image
-     *
-     * @param string $mode if no mode is set, just verify current mode
-     */
-    public function setMode($mode = null)
-    {
-        if (!empty($mode) && in_array($mode, ['text', 'image'])) {
-            $this->mode = $mode;
-
-            if ('image' !== $this->mode) {
-                return;
-            }
-        }
-
-        // Disable image mode
-        if (!extension_loaded('gd')) {
-            $this->mode = 'text';
-        } else {
-            $required_functions = [
-                'imagecreatetruecolor',
-                'imagecolorallocate',
-                'imagefilledrectangle',
-                'imagejpeg',
-                'imagedestroy',
-                'imageftbbox'
-            ];
-            foreach ($required_functions as $func) {
-                if (!function_exists($func)) {
-                    $this->mode = 'text';
-                    break;
-                }
-            }
-        }
-    }
-
-    /**
-     * Initializing the CAPTCHA class
-     * @param string $name
-     * @param null   $skipmember
-     * @param null   $num_chars
-     * @param null   $fontsize_min
-     * @param null   $fontsize_max
-     * @param null   $background_type
-     * @param null   $background_num
-     */
-    public function init(
-        $name = 'xoopscaptcha',
-        $skipmember = null,
-        $num_chars = null,
-        $fontsize_min = null,
-        $fontsize_max = null,
-        $background_type = null,
-        $background_num = null
-    ) {
-        // Loading RUN-TIME settings
-        foreach (array_keys($this->config) as $key) {
-            if (isset(${$key}) && null !== ${$key}) {
-                $this->config[$key] = ${$key};
-            }
-        }
-        $this->config['name'] = $name;
-
-        // Skip CAPTCHA for member if set
-        if ($this->config['skipmember'] && is_object($GLOBALS['xoopsUser'])) {
-            $this->active = false;
-        }
-    }
-
-    /**
-     * Verify user submission
-     * @param  null $skipMember
-     * @return bool
-     */
-    public function verify($skipMember = null)
-    {
-        $sessionName = @$_SESSION['XoopsCaptcha_name'];
-        $skipMember  = (null === $skipMember) ? @$_SESSION['XoopsCaptcha_skipmember'] : $skipMember;
-        $maxAttempts = (int)(@$_SESSION['XoopsCaptcha_maxattempts']);
-
-        $is_valid = false;
-
-        // Skip CAPTCHA for member if set
-        if (is_object($GLOBALS['xoopsUser']) && !empty($skipMember)) {
-            $is_valid = true;
-            // Kill too many attempts
-        } elseif (!empty($maxAttempts) && $_SESSION['XoopsCaptcha_attempt_' . $sessionName] > $maxAttempts) {
-            $this->message[] = XOOPS_CAPTCHA_TOOMANYATTEMPTS;
-
-            // Verify the code
-        } elseif (!empty($_SESSION['XoopsCaptcha_sessioncode'])) {
-            $func     = $this->config['casesensitive'] ? 'strcmp' : 'strcasecmp';
-            $is_valid = !$func(trim(@$_POST[$sessionName]), $_SESSION['XoopsCaptcha_sessioncode']);
-        }
-
-        if (!empty($maxAttempts)) {
-            if (!$is_valid) {
-                // Increase the attempt records on failure
-                $_SESSION['XoopsCaptcha_attempt_' . $sessionName]++;
-                // Log the error message
-                $this->message[] = XOOPS_CAPTCHA_INVALID_CODE;
-            } else {
-
-                // reset attempt records on success
-                $_SESSION['XoopsCaptcha_attempt_' . $sessionName] = null;
-            }
-        }
-        $this->destroyGarbage(true);
-
-        return $is_valid;
-    }
-
-    /**
-     * @return mixed|string
-     */
-    public function getCaption()
-    {
-        return defined('XOOPS_CAPTCHA_CAPTION') ? constant('XOOPS_CAPTCHA_CAPTION') : '';
-    }
-
-    /**
-     * @return string
-     */
-    public function getMessage()
-    {
-        return implode('<br>', $this->message);
-    }
-
-    /**
-     * Destory historical stuff
-     * @param  bool $clearSession
-     * @return bool
-     */
-    public function destroyGarbage($clearSession = false)
-    {
-        require_once __DIR__ . '/' . $this->mode . '.php';
-        $class          = 'XoopsCaptcha' . ucfirst($this->mode);
-        $captchaHandler = new $class();
-        if (method_exists($captchaHandler, 'destroyGarbage')) {
-            $captchaHandler->loadConfig($this->config);
-            $captchaHandler->destroyGarbage();
-        }
-
-        if ($clearSession) {
-            $_SESSION['XoopsCaptcha_name']        = null;
-            $_SESSION['XoopsCaptcha_skipmember']  = null;
-            $_SESSION['XoopsCaptcha_sessioncode'] = null;
-            $_SESSION['XoopsCaptcha_maxattempts'] = null;
-        }
-
-        return true;
-    }
-
-    /**
-     * @return mixed|string
-     */
-    public function render()
-    {
-        $form = '';
-
-        if (!$this->active || empty($this->config['name'])) {
-            return $form;
-        }
-
-        $_SESSION['XoopsCaptcha_name']        = $this->config['name'];
-        $_SESSION['XoopsCaptcha_skipmember']  = $this->config['skipmember'];
-        $maxAttempts                          = $this->config['maxattempt'];
-        $_SESSION['XoopsCaptcha_maxattempts'] = $maxAttempts;
-        /*
+	public $active = true;
+	public $mode   = 'text';    // potential values: image, text
+	public $config = [];
+
+	public $message = []; // Logging error messages
+
+	/**
+	 * XoopsCaptcha constructor.
+	 */
+	public function __construct()
+	{
+		// Loading default preferences
+		$this->config = @include __DIR__ . '/config.php';
+
+		$this->setMode($this->config['mode']);
+	}
+
+	/**
+	 * @return XoopsCaptcha
+	 */
+	public static function getInstance()
+	{
+		static $instance;
+		if (null === $instance) {
+			$instance = new static();
+		}
+
+		return $instance;
+	}
+
+	/**
+	 * @param $name
+	 * @param $val
+	 * @return bool
+	 */
+	public function setConfig($name, $val)
+	{
+		if ('mode' === $name) {
+			$this->setMode($val);
+		} elseif (isset($this->$name)) {
+			$this->$name = $val;
+		} else {
+			$this->config[$name] = $val;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Set CAPTCHA mode
+	 *
+	 * For future possible modes, right now force to use text or image
+	 *
+	 * @param string $mode if no mode is set, just verify current mode
+	 */
+	public function setMode($mode = null)
+	{
+		if (!empty($mode) && in_array($mode, ['text', 'image'])) {
+			$this->mode = $mode;
+
+			if ('image' !== $this->mode) {
+				return;
+			}
+		}
+
+		// Disable image mode
+		if (!extension_loaded('gd')) {
+			$this->mode = 'text';
+		} else {
+			$required_functions = [
+				'imagecreatetruecolor',
+				'imagecolorallocate',
+				'imagefilledrectangle',
+				'imagejpeg',
+				'imagedestroy',
+				'imageftbbox'
+			];
+			foreach ($required_functions as $func) {
+				if (!function_exists($func)) {
+					$this->mode = 'text';
+					break;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Initializing the CAPTCHA class
+	 * @param string $name
+	 * @param null   $skipmember
+	 * @param null   $num_chars
+	 * @param null   $fontsize_min
+	 * @param null   $fontsize_max
+	 * @param null   $background_type
+	 * @param null   $background_num
+	 */
+	public function init(
+		$name = 'xoopscaptcha',
+		$skipmember = null,
+		$num_chars = null,
+		$fontsize_min = null,
+		$fontsize_max = null,
+		$background_type = null,
+		$background_num = null
+	) {
+		// Loading RUN-TIME settings
+		foreach (array_keys($this->config) as $key) {
+			if (isset(${$key}) && null !== ${$key}) {
+				$this->config[$key] = ${$key};
+			}
+		}
+		$this->config['name'] = $name;
+
+		// Skip CAPTCHA for member if set
+		if ($this->config['skipmember'] && is_object($GLOBALS['xoopsUser'])) {
+			$this->active = false;
+		}
+	}
+
+	/**
+	 * Verify user submission
+	 * @param  null $skipMember
+	 * @return bool
+	 */
+	public function verify($skipMember = null)
+	{
+		$sessionName = @$_SESSION['XoopsCaptcha_name'];
+		$skipMember  = (null === $skipMember) ? @$_SESSION['XoopsCaptcha_skipmember'] : $skipMember;
+		$maxAttempts = (int)(@$_SESSION['XoopsCaptcha_maxattempts']);
+
+		$is_valid = false;
+
+		// Skip CAPTCHA for member if set
+		if (is_object($GLOBALS['xoopsUser']) && !empty($skipMember)) {
+			$is_valid = true;
+			// Kill too many attempts
+		} elseif (!empty($maxAttempts) && $_SESSION['XoopsCaptcha_attempt_' . $sessionName] > $maxAttempts) {
+			$this->message[] = XOOPS_CAPTCHA_TOOMANYATTEMPTS;
+
+			// Verify the code
+		} elseif (!empty($_SESSION['XoopsCaptcha_sessioncode'])) {
+			$func     = $this->config['casesensitive'] ? 'strcmp' : 'strcasecmp';
+			$is_valid = !$func(trim(@$_POST[$sessionName]), $_SESSION['XoopsCaptcha_sessioncode']);
+		}
+
+		if (!empty($maxAttempts)) {
+			if (!$is_valid) {
+				// Increase the attempt records on failure
+				$_SESSION['XoopsCaptcha_attempt_' . $sessionName]++;
+				// Log the error message
+				$this->message[] = XOOPS_CAPTCHA_INVALID_CODE;
+			} else {
+
+				// reset attempt records on success
+				$_SESSION['XoopsCaptcha_attempt_' . $sessionName] = null;
+			}
+		}
+		$this->destroyGarbage(true);
+
+		return $is_valid;
+	}
+
+	/**
+	 * @return mixed|string
+	 */
+	public function getCaption()
+	{
+		return defined('XOOPS_CAPTCHA_CAPTION') ? constant('XOOPS_CAPTCHA_CAPTION') : '';
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getMessage()
+	{
+		return implode('<br>', $this->message);
+	}
+
+	/**
+	 * Destory historical stuff
+	 * @param  bool $clearSession
+	 * @return bool
+	 */
+	public function destroyGarbage($clearSession = false)
+	{
+		require_once __DIR__ . '/' . $this->mode . '.php';
+		$class          = 'XoopsCaptcha' . ucfirst($this->mode);
+		$captchaHandler = new $class();
+		if (method_exists($captchaHandler, 'destroyGarbage')) {
+			$captchaHandler->loadConfig($this->config);
+			$captchaHandler->destroyGarbage();
+		}
+
+		if ($clearSession) {
+			$_SESSION['XoopsCaptcha_name']        = null;
+			$_SESSION['XoopsCaptcha_skipmember']  = null;
+			$_SESSION['XoopsCaptcha_sessioncode'] = null;
+			$_SESSION['XoopsCaptcha_maxattempts'] = null;
+		}
+
+		return true;
+	}
+
+	/**
+	 * @return mixed|string
+	 */
+	public function render()
+	{
+		$form = '';
+
+		if (!$this->active || empty($this->config['name'])) {
+			return $form;
+		}
+
+		$_SESSION['XoopsCaptcha_name']        = $this->config['name'];
+		$_SESSION['XoopsCaptcha_skipmember']  = $this->config['skipmember'];
+		$maxAttempts                          = $this->config['maxattempt'];
+		$_SESSION['XoopsCaptcha_maxattempts'] = $maxAttempts;
+		/*
          if (!empty($maxAttempts)) {
          $_SESSION['XoopsCaptcha_maxattempts_'.$_SESSION['XoopsCaptcha_name']] = $maxAttempts;
          }
          */
 
-        // Fail on too many attempts
-        if (!empty($maxAttempts) && @$_SESSION['XoopsCaptcha_attempt_' . $this->config['name']] > $maxAttempts) {
-            $form = XOOPS_CAPTCHA_TOOMANYATTEMPTS;
-            // Load the form element
-        } else {
-            $form = $this->loadForm();
-        }
-
-        return $form;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function loadForm()
-    {
-        require_once __DIR__ . '/' . $this->mode . '.php';
-        $class          = 'XoopsCaptcha' . ucfirst($this->mode);
-        $captchaHandler = new $class();
-        $captchaHandler->loadConfig($this->config);
-
-        $form = $captchaHandler->render();
-
-        return $form;
-    }
+		// Fail on too many attempts
+		if (!empty($maxAttempts) && @$_SESSION['XoopsCaptcha_attempt_' . $this->config['name']] > $maxAttempts) {
+			$form = XOOPS_CAPTCHA_TOOMANYATTEMPTS;
+			// Load the form element
+		} else {
+			$form = $this->loadForm();
+		}
+
+		return $form;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function loadForm()
+	{
+		require_once __DIR__ . '/' . $this->mode . '.php';
+		$class          = 'XoopsCaptcha' . ucfirst($this->mode);
+		$captchaHandler = new $class();
+		$captchaHandler->loadConfig($this->config);
+
+		$form = $captchaHandler->render();
+
+		return $form;
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -14,7 +14,7 @@ 
 class XoopsCaptcha
 {
     public $active = true;
-    public $mode   = 'text';    // potential values: image, text
+    public $mode   = 'text'; // potential values: image, text
     public $config = [];
 
     public $message = []; // Logging error messages
@@ -25,7 +25,7 @@ 
     public function __construct()
     {
         // Loading default preferences
-        $this->config = @include __DIR__ . '/config.php';
+        $this->config = @include __DIR__.'/config.php';
 
         $this->setMode($this->config['mode']);
     }
@@ -141,7 +141,7 @@ 
     {
         $sessionName = @$_SESSION['XoopsCaptcha_name'];
         $skipMember  = (null === $skipMember) ? @$_SESSION['XoopsCaptcha_skipmember'] : $skipMember;
-        $maxAttempts = (int)(@$_SESSION['XoopsCaptcha_maxattempts']);
+        $maxAttempts = (int) (@$_SESSION['XoopsCaptcha_maxattempts']);
 
         $is_valid = false;
 
@@ -149,7 +149,7 @@ 
         if (is_object($GLOBALS['xoopsUser']) && !empty($skipMember)) {
             $is_valid = true;
             // Kill too many attempts
-        } elseif (!empty($maxAttempts) && $_SESSION['XoopsCaptcha_attempt_' . $sessionName] > $maxAttempts) {
+        } elseif (!empty($maxAttempts) && $_SESSION['XoopsCaptcha_attempt_'.$sessionName] > $maxAttempts) {
             $this->message[] = XOOPS_CAPTCHA_TOOMANYATTEMPTS;
 
             // Verify the code
@@ -161,13 +161,13 @@ 
         if (!empty($maxAttempts)) {
             if (!$is_valid) {
                 // Increase the attempt records on failure
-                $_SESSION['XoopsCaptcha_attempt_' . $sessionName]++;
+                $_SESSION['XoopsCaptcha_attempt_'.$sessionName]++;
                 // Log the error message
                 $this->message[] = XOOPS_CAPTCHA_INVALID_CODE;
             } else {
 
                 // reset attempt records on success
-                $_SESSION['XoopsCaptcha_attempt_' . $sessionName] = null;
+                $_SESSION['XoopsCaptcha_attempt_'.$sessionName] = null;
             }
         }
         $this->destroyGarbage(true);
@@ -198,8 +198,8 @@ 
      */
     public function destroyGarbage($clearSession = false)
     {
-        require_once __DIR__ . '/' . $this->mode . '.php';
-        $class          = 'XoopsCaptcha' . ucfirst($this->mode);
+        require_once __DIR__.'/'.$this->mode.'.php';
+        $class          = 'XoopsCaptcha'.ucfirst($this->mode);
         $captchaHandler = new $class();
         if (method_exists($captchaHandler, 'destroyGarbage')) {
             $captchaHandler->loadConfig($this->config);
@@ -238,7 +238,7 @@ 
          */
 
         // Fail on too many attempts
-        if (!empty($maxAttempts) && @$_SESSION['XoopsCaptcha_attempt_' . $this->config['name']] > $maxAttempts) {
+        if (!empty($maxAttempts) && @$_SESSION['XoopsCaptcha_attempt_'.$this->config['name']] > $maxAttempts) {
             $form = XOOPS_CAPTCHA_TOOMANYATTEMPTS;
             // Load the form element
         } else {
@@ -253,8 +253,8 @@ 
      */
     public function loadForm()
     {
-        require_once __DIR__ . '/' . $this->mode . '.php';
-        $class          = 'XoopsCaptcha' . ucfirst($this->mode);
+        require_once __DIR__.'/'.$this->mode.'.php';
+        $class          = 'XoopsCaptcha'.ucfirst($this->mode);
         $captchaHandler = new $class();
         $captchaHandler->loadConfig($this->config);
 

include/projax_/classes/Prototype.php

Indentation +448 added lines, -448 removed lines

@@ -15,452 +15,452 @@
  */
 class Prototype extends JavaScript
 {
-    public $CALLBACKS = [
-        'uninitialized',
-        'loading',
-        'loaded',
-        'interactive',
-        'complete',
-        'failure',
-        'success'
-    ];
-
-    public $AJAX_OPTIONS = [
-        'before',
-        'after',
-        'condition',
-        'url',
-        'asynchronous',
-        'method',
-        'insertion',
-        'position',
-        'form',
-        'with',
-        'update',
-        'script',
-        'uninitialized',
-        'loading',
-        'loaded',
-        'interactive',
-        'complete',
-        'failure',
-        'success'
-    ];
-
-    /**
-     * @return string
-     */
-    public function evaluate_remote_response()
-    {
-        return 'eval(request.responseText)';
-    }
-
-    /**
-     * @param $options
-     * @return string
-     */
-    public function form_remote_tag($options)
-    {
-        $options['form'] = true;
-
-        return '<form action="' . $options['url'] . '" onsubmit="' . $this->remote_function($options) . '; return false;" method="' . (isset($options['method']) ? $options['method'] : 'post') . '"  >';
-    }
-
-    /**
-     * @param         $name
-     * @param  null   $options
-     * @param  null   $html_options
-     * @return string
-     */
-    public function link_to_remote($name, $options = null, $html_options = null)
-    {
-        return $this->link_to_function($name, $this->remote_function($options), $html_options);
-    }
-
-    /**
-     * @param         $field_id
-     * @param  null   $options
-     * @return string
-     */
-    public function observe_field($field_id, $options = null)
-    {
-        if (isset($options['frequency']) && $options['frequency'] > 0) {
-            return $this->_build_observer('Form.Element.Observer', $field_id, $options);
-        } else {
-            return $this->_build_observer('Form.Element.EventObserver', $field_id, $options);
-        }
-    }
-
-    /**
-     * @param         $form_id
-     * @param  null   $options
-     * @return string
-     */
-    public function observe_form($form_id, $options = null)
-    {
-        if (isset($options['frequency'])) {
-            return $this->_build_observer('Form.Observer', $form_id, $options);
-        } else {
-            return $this->_build_observer('Form.EventObserver', $form_id, $options);
-        }
-    }
-
-    /**
-     * @param  null $options
-     * @return string
-     */
-    public function periodically_call_remote($options = null)
-    {
-        $frequency = isset($options['frequency']) ? $options['frequency'] : 10;
-        $code      = 'new PeriodicalExecuter(function() {' . $this->remote_function($options) . '},' . $frequency . ')';
-
-        return $code;
-    }
-
-    /**
-     * @param $options
-     * @return string
-     */
-    public function remote_function($options)
-    {
-        $javascript_options = $this->_options_for_ajax($options);
-
-        $update = '';
-
-        if (isset($options['update']) && is_array($options['update'])) {
-            $update = isset($options['update']['success']) ? 'success: ' . $options['update']['success'] : '';
-            $update .= empty($update) ? '' : ',';
-            $update .= isset($options['update']['failure']) ? 'failure: ' . $options['update']['failure'] : '';
-        } else {
-            $update .= isset($options['update']) ? $options['update'] : '';
-        }
-
-        $ajax_function = empty($update) ? 'new Ajax.Request(' : 'new Ajax.Updater(\'' . $update . '\',';
-
-        $ajax_function .= "'" . $options['url'] . "'";
-        $ajax_function .= ',' . $javascript_options . ')';
-
-        $ajax_function = isset($options['before']) ? $options['before'] . ';' . $ajax_function : $ajax_function;
-        $ajax_function = isset($options['after']) ? $ajax_function . ';' . $options['after'] : $ajax_function;
-        $ajax_function = isset($options['condition']) ? 'if (' . $options['condition'] . ') {' . $ajax_function . '}' : $ajax_function;
-        $ajax_function = isset($options['confirm']) ? 'if ( confirm(\'' . $options['confirm'] . '\' ) ) { ' . $ajax_function . ' } ' : $ajax_function;
-
-        return $ajax_function;
-    }
-
-    /**
-     * @param $name
-     * @param $value
-     * @param $options
-     * @return string
-     */
-    public function submit_to_remote($name, $value, $options)
-    {
-        if (isset($options['with'])) {
-            $options['with'] = 'Form.serialize(this.form)';
-        }
-
-        return '<input type="button" onclick="' . $this->remote_function($options) . '" name="' . $name . '" value ="' . $value . '">';
-    }
-
-    /**
-     * @param      $element_id
-     * @param null $options
-     * @param      $block
-     */
-    public function update_element_function($element_id, $options = null, $block)
-    {
-        $content = isset($options['content']) ? $options['content'] : '';
-        $content = $this->escape($content);
-    }
-
-    /**
-     * @param $block
-     */
-    public function update_page($block)
-    {
-    }
-
-    /**
-     * @param $block
-     * @return string
-     */
-    public function update_page_tag(& $block)
-    {
-        return $this->tag($block);
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////
-    //                             Private functions
-    /////////////////////////////////////////////////////////////////////////////////////
-
-    /**
-     * @param $options
-     * @return array
-     */
-    public function _build_callbacks($options)
-    {
-        $callbacks = [];
-        foreach ($options as $callback => $code) {
-            if (in_array($callback, $this->CALLBACKS)) {
-                $name             = 'on' . ucfirst($callback);
-                $callbacks[$name] = 'function(request){' . $code . '}';
-            }
-        }
-
-        return $callbacks;
-    }
-
-    /**
-     * @param         $klass
-     * @param         $name
-     * @param  null   $options
-     * @return string
-     */
-    public function _build_observer($klass, $name, $options = null)
-    {
-        if (isset($options['with']) && false === strpos($options['with'], '=')) {
-            $options['with'] = '\'' . $options['with'] . '=\' + value';
-        } elseif (isset($options['with']) && isset($options['update'])) {
-            $options['with'] = 'value';
-        }
-
-        $callback = $options['function'] ?: $this->remote_function($options);
-
-        $javascript = "new $klass('$name', ";
-        $javascript .= isset($options['frequency']) ? $options['frequency'] . ', ' : '';
-        $javascript .= 'function (element,value) { ';
-        $javascript .= $callback;
-        $javascript .= isset($options['on']) ? ', ' . $options['on'] : '';
-        $javascript .= '})';
-
-        return $javascript;
-    }
-
-    /**
-     * @param $method
-     * @return string
-     */
-    public function _method_option_to_s($method)
-    {
-        return strstr($method, "'") ? $method : "'$method'";
-    }
-
-    /**
-     * @param $options
-     * @return string
-     */
-    public function _options_for_ajax($options)
-    {
-        $js_options = is_array($options) ? $this->_build_callbacks($options) : [];
-
-        if (isset($options['type']) && 'synchronous' === $option['type']) {
-            $js_options['asynchronous'] = 'false';
-        }
-
-        if (isset($options['method'])) {
-            $js_options['method'] = $this->_method_option_to_s($options['method']);
-        }
-
-        if (isset($options['position'])) {
-            $js_options['insertion'] = 'Insertion.' . ucfirst($options['position']);
-        }
-
-        $js_options['evalScripts'] = isset($options['script']) ? $options['script'] : 'true';
-
-        if (isset($options['form'])) {
-            $js_options['parameters'] = 'Form.serialize(this)';
-        } elseif (isset($options['parameters'])) {
-            $js_options['parameters'] = 'Form.serialize(\'' . $options['submit'] . '\')';
-        } elseif (isset($options['with'])) {
-            $js_options['parameters'] = $options['with'];
-        }
-
-        return $this->_options_for_javascript($js_options);
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////
-    //                            Mergerd Javascript Generator helpers
-    /////////////////////////////////////////////////////////////////////////////////////
-
-    /**
-     * @param $javascript
-     */
-    public function dump($javascript)
-    {
-        echo $javascript;
-    }
-
-    /**
-     * @param         $id
-     * @param  null   $extend
-     * @return string
-     */
-    public function ID($id, $extend = null)
-    {
-        return "$('$id')" . (!empty($extend)) ? '.' . $extend . '()' : '';
-    }
-
-    /**
-     * @param $message
-     * @return string
-     */
-    public function alert($message)
-    {
-        return $this->call('alert', $message);
-    }
-
-    /**
-     * @param $variable
-     * @param $value
-     * @return string
-     */
-    public function assign($variable, $value)
-    {
-        return "$variable = $value;";
-    }
-
-    /**
-     * @param         $function
-     * @param  null   $args
-     * @return string
-     */
-    public function call($function, $args = null)
-    {
-        $arg_str = '';
-        if (is_array($args)) {
-            foreach ($args as $arg) {
-                if (!empty($arg_str)) {
-                    $arg_str .= ', ';
-                }
-                if (is_string($arg)) {
-                    $arg_str .= "'$arg'";
-                } else {
-                    $arg_str .= $arg;
-                }
-            }
-        } else {
-            if (is_string($args)) {
-                $arg_str .= "'$args'";
-            } else {
-                $arg_str .= $args;
-            }
-        }
-
-        return "$function($arg_str)";
-    }
-
-    /**
-     * @param  int    $seconds
-     * @param  string $script
-     * @return string
-     */
-    public function delay($seconds = 1, $script = '')
-    {
-        return "setTimeout( function() { $script } , " . ($seconds * 1000) . ' )';
-    }
-
-    /**
-     * @param $id
-     * @return string
-     */
-    public function hide($id)
-    {
-        return $this->call('Element.hide', $id);
-    }
-
-    /**
-     * @param         $position
-     * @param         $id
-     * @param  null   $options_for_render
-     * @return string
-     */
-    public function insert_html($position, $id, $options_for_render = null)
-    {
-        $args = array_merge([$id], (is_array($options_for_render) ? $options_for_render : [$options_for_render]));
-
-        return $this->call('new Insertion.' . ucfirst($position), $args);
-    }
-
-    /**
-     * @param $location
-     * @return string
-     */
-    public function redirect_to($location)
-    {
-        return $this->assign('window.location.href', $location);
-    }
-
-    /**
-     * @param $id
-     * @return string
-     */
-    public function remove($id)
-    {
-        if (is_array($id)) {
-            $arr_str = '';
-            foreach ($id as $obj) {
-                if (!empty($arg_str)) {
-                    $arg_str .= ', ';
-                }
-                $arg_str .= "'$arg'";
-            }
-
-            return "$A[$arg_str].each(Element.remove)";
-        } else {
-            return "Element.remove('$id')";
-        }
-    }
-
-    /**
-     * @param $id
-     * @param $options_for_render
-     * @return string
-     */
-    public function replace($id, $options_for_render)
-    {
-        $args = array_merge([$id], (is_array($options_for_render) ? $options_for_render : [$options_for_render]));
-
-        return $this->call('Element.replace', $args);
-    }
-
-    /**
-     * @param $id
-     * @param $options_for_render
-     * @return string
-     */
-    public function replace_html($id, $options_for_render)
-    {
-        $args = array_merge([$id], (is_array($options_for_render) ? $options_for_render : [$options_for_render]));
-
-        return $this->call('Element.update', $args);
-    }
-
-    /**
-     * @param         $pattern
-     * @param  null   $extend
-     * @return string
-     */
-    public function select($pattern, $extend = null)
-    {
-        return "$$('$pattern')" . (!empty($extend)) ? '.' . $extend : '';
-    }
-
-    /**
-     * @param $id
-     * @return string
-     */
-    public function show($id)
-    {
-        return $this->call('Element.show', $id);
-    }
-
-    /**
-     * @param $id
-     * @return string
-     */
-    public function toggle($id)
-    {
-        return $this->call('Element.toggle', $id);
-    }
+	public $CALLBACKS = [
+		'uninitialized',
+		'loading',
+		'loaded',
+		'interactive',
+		'complete',
+		'failure',
+		'success'
+	];
+
+	public $AJAX_OPTIONS = [
+		'before',
+		'after',
+		'condition',
+		'url',
+		'asynchronous',
+		'method',
+		'insertion',
+		'position',
+		'form',
+		'with',
+		'update',
+		'script',
+		'uninitialized',
+		'loading',
+		'loaded',
+		'interactive',
+		'complete',
+		'failure',
+		'success'
+	];
+
+	/**
+	 * @return string
+	 */
+	public function evaluate_remote_response()
+	{
+		return 'eval(request.responseText)';
+	}
+
+	/**
+	 * @param $options
+	 * @return string
+	 */
+	public function form_remote_tag($options)
+	{
+		$options['form'] = true;
+
+		return '<form action="' . $options['url'] . '" onsubmit="' . $this->remote_function($options) . '; return false;" method="' . (isset($options['method']) ? $options['method'] : 'post') . '"  >';
+	}
+
+	/**
+	 * @param         $name
+	 * @param  null   $options
+	 * @param  null   $html_options
+	 * @return string
+	 */
+	public function link_to_remote($name, $options = null, $html_options = null)
+	{
+		return $this->link_to_function($name, $this->remote_function($options), $html_options);
+	}
+
+	/**
+	 * @param         $field_id
+	 * @param  null   $options
+	 * @return string
+	 */
+	public function observe_field($field_id, $options = null)
+	{
+		if (isset($options['frequency']) && $options['frequency'] > 0) {
+			return $this->_build_observer('Form.Element.Observer', $field_id, $options);
+		} else {
+			return $this->_build_observer('Form.Element.EventObserver', $field_id, $options);
+		}
+	}
+
+	/**
+	 * @param         $form_id
+	 * @param  null   $options
+	 * @return string
+	 */
+	public function observe_form($form_id, $options = null)
+	{
+		if (isset($options['frequency'])) {
+			return $this->_build_observer('Form.Observer', $form_id, $options);
+		} else {
+			return $this->_build_observer('Form.EventObserver', $form_id, $options);
+		}
+	}
+
+	/**
+	 * @param  null $options
+	 * @return string
+	 */
+	public function periodically_call_remote($options = null)
+	{
+		$frequency = isset($options['frequency']) ? $options['frequency'] : 10;
+		$code      = 'new PeriodicalExecuter(function() {' . $this->remote_function($options) . '},' . $frequency . ')';
+
+		return $code;
+	}
+
+	/**
+	 * @param $options
+	 * @return string
+	 */
+	public function remote_function($options)
+	{
+		$javascript_options = $this->_options_for_ajax($options);
+
+		$update = '';
+
+		if (isset($options['update']) && is_array($options['update'])) {
+			$update = isset($options['update']['success']) ? 'success: ' . $options['update']['success'] : '';
+			$update .= empty($update) ? '' : ',';
+			$update .= isset($options['update']['failure']) ? 'failure: ' . $options['update']['failure'] : '';
+		} else {
+			$update .= isset($options['update']) ? $options['update'] : '';
+		}
+
+		$ajax_function = empty($update) ? 'new Ajax.Request(' : 'new Ajax.Updater(\'' . $update . '\',';
+
+		$ajax_function .= "'" . $options['url'] . "'";
+		$ajax_function .= ',' . $javascript_options . ')';
+
+		$ajax_function = isset($options['before']) ? $options['before'] . ';' . $ajax_function : $ajax_function;
+		$ajax_function = isset($options['after']) ? $ajax_function . ';' . $options['after'] : $ajax_function;
+		$ajax_function = isset($options['condition']) ? 'if (' . $options['condition'] . ') {' . $ajax_function . '}' : $ajax_function;
+		$ajax_function = isset($options['confirm']) ? 'if ( confirm(\'' . $options['confirm'] . '\' ) ) { ' . $ajax_function . ' } ' : $ajax_function;
+
+		return $ajax_function;
+	}
+
+	/**
+	 * @param $name
+	 * @param $value
+	 * @param $options
+	 * @return string
+	 */
+	public function submit_to_remote($name, $value, $options)
+	{
+		if (isset($options['with'])) {
+			$options['with'] = 'Form.serialize(this.form)';
+		}
+
+		return '<input type="button" onclick="' . $this->remote_function($options) . '" name="' . $name . '" value ="' . $value . '">';
+	}
+
+	/**
+	 * @param      $element_id
+	 * @param null $options
+	 * @param      $block
+	 */
+	public function update_element_function($element_id, $options = null, $block)
+	{
+		$content = isset($options['content']) ? $options['content'] : '';
+		$content = $this->escape($content);
+	}
+
+	/**
+	 * @param $block
+	 */
+	public function update_page($block)
+	{
+	}
+
+	/**
+	 * @param $block
+	 * @return string
+	 */
+	public function update_page_tag(& $block)
+	{
+		return $this->tag($block);
+	}
+
+	/////////////////////////////////////////////////////////////////////////////////////
+	//                             Private functions
+	/////////////////////////////////////////////////////////////////////////////////////
+
+	/**
+	 * @param $options
+	 * @return array
+	 */
+	public function _build_callbacks($options)
+	{
+		$callbacks = [];
+		foreach ($options as $callback => $code) {
+			if (in_array($callback, $this->CALLBACKS)) {
+				$name             = 'on' . ucfirst($callback);
+				$callbacks[$name] = 'function(request){' . $code . '}';
+			}
+		}
+
+		return $callbacks;
+	}
+
+	/**
+	 * @param         $klass
+	 * @param         $name
+	 * @param  null   $options
+	 * @return string
+	 */
+	public function _build_observer($klass, $name, $options = null)
+	{
+		if (isset($options['with']) && false === strpos($options['with'], '=')) {
+			$options['with'] = '\'' . $options['with'] . '=\' + value';
+		} elseif (isset($options['with']) && isset($options['update'])) {
+			$options['with'] = 'value';
+		}
+
+		$callback = $options['function'] ?: $this->remote_function($options);
+
+		$javascript = "new $klass('$name', ";
+		$javascript .= isset($options['frequency']) ? $options['frequency'] . ', ' : '';
+		$javascript .= 'function (element,value) { ';
+		$javascript .= $callback;
+		$javascript .= isset($options['on']) ? ', ' . $options['on'] : '';
+		$javascript .= '})';
+
+		return $javascript;
+	}
+
+	/**
+	 * @param $method
+	 * @return string
+	 */
+	public function _method_option_to_s($method)
+	{
+		return strstr($method, "'") ? $method : "'$method'";
+	}
+
+	/**
+	 * @param $options
+	 * @return string
+	 */
+	public function _options_for_ajax($options)
+	{
+		$js_options = is_array($options) ? $this->_build_callbacks($options) : [];
+
+		if (isset($options['type']) && 'synchronous' === $option['type']) {
+			$js_options['asynchronous'] = 'false';
+		}
+
+		if (isset($options['method'])) {
+			$js_options['method'] = $this->_method_option_to_s($options['method']);
+		}
+
+		if (isset($options['position'])) {
+			$js_options['insertion'] = 'Insertion.' . ucfirst($options['position']);
+		}
+
+		$js_options['evalScripts'] = isset($options['script']) ? $options['script'] : 'true';
+
+		if (isset($options['form'])) {
+			$js_options['parameters'] = 'Form.serialize(this)';
+		} elseif (isset($options['parameters'])) {
+			$js_options['parameters'] = 'Form.serialize(\'' . $options['submit'] . '\')';
+		} elseif (isset($options['with'])) {
+			$js_options['parameters'] = $options['with'];
+		}
+
+		return $this->_options_for_javascript($js_options);
+	}
+
+	/////////////////////////////////////////////////////////////////////////////////////
+	//                            Mergerd Javascript Generator helpers
+	/////////////////////////////////////////////////////////////////////////////////////
+
+	/**
+	 * @param $javascript
+	 */
+	public function dump($javascript)
+	{
+		echo $javascript;
+	}
+
+	/**
+	 * @param         $id
+	 * @param  null   $extend
+	 * @return string
+	 */
+	public function ID($id, $extend = null)
+	{
+		return "$('$id')" . (!empty($extend)) ? '.' . $extend . '()' : '';
+	}
+
+	/**
+	 * @param $message
+	 * @return string
+	 */
+	public function alert($message)
+	{
+		return $this->call('alert', $message);
+	}
+
+	/**
+	 * @param $variable
+	 * @param $value
+	 * @return string
+	 */
+	public function assign($variable, $value)
+	{
+		return "$variable = $value;";
+	}
+
+	/**
+	 * @param         $function
+	 * @param  null   $args
+	 * @return string
+	 */
+	public function call($function, $args = null)
+	{
+		$arg_str = '';
+		if (is_array($args)) {
+			foreach ($args as $arg) {
+				if (!empty($arg_str)) {
+					$arg_str .= ', ';
+				}
+				if (is_string($arg)) {
+					$arg_str .= "'$arg'";
+				} else {
+					$arg_str .= $arg;
+				}
+			}
+		} else {
+			if (is_string($args)) {
+				$arg_str .= "'$args'";
+			} else {
+				$arg_str .= $args;
+			}
+		}
+
+		return "$function($arg_str)";
+	}
+
+	/**
+	 * @param  int    $seconds
+	 * @param  string $script
+	 * @return string
+	 */
+	public function delay($seconds = 1, $script = '')
+	{
+		return "setTimeout( function() { $script } , " . ($seconds * 1000) . ' )';
+	}
+
+	/**
+	 * @param $id
+	 * @return string
+	 */
+	public function hide($id)
+	{
+		return $this->call('Element.hide', $id);
+	}
+
+	/**
+	 * @param         $position
+	 * @param         $id
+	 * @param  null   $options_for_render
+	 * @return string
+	 */
+	public function insert_html($position, $id, $options_for_render = null)
+	{
+		$args = array_merge([$id], (is_array($options_for_render) ? $options_for_render : [$options_for_render]));
+
+		return $this->call('new Insertion.' . ucfirst($position), $args);
+	}
+
+	/**
+	 * @param $location
+	 * @return string
+	 */
+	public function redirect_to($location)
+	{
+		return $this->assign('window.location.href', $location);
+	}
+
+	/**
+	 * @param $id
+	 * @return string
+	 */
+	public function remove($id)
+	{
+		if (is_array($id)) {
+			$arr_str = '';
+			foreach ($id as $obj) {
+				if (!empty($arg_str)) {
+					$arg_str .= ', ';
+				}
+				$arg_str .= "'$arg'";
+			}
+
+			return "$A[$arg_str].each(Element.remove)";
+		} else {
+			return "Element.remove('$id')";
+		}
+	}
+
+	/**
+	 * @param $id
+	 * @param $options_for_render
+	 * @return string
+	 */
+	public function replace($id, $options_for_render)
+	{
+		$args = array_merge([$id], (is_array($options_for_render) ? $options_for_render : [$options_for_render]));
+
+		return $this->call('Element.replace', $args);
+	}
+
+	/**
+	 * @param $id
+	 * @param $options_for_render
+	 * @return string
+	 */
+	public function replace_html($id, $options_for_render)
+	{
+		$args = array_merge([$id], (is_array($options_for_render) ? $options_for_render : [$options_for_render]));
+
+		return $this->call('Element.update', $args);
+	}
+
+	/**
+	 * @param         $pattern
+	 * @param  null   $extend
+	 * @return string
+	 */
+	public function select($pattern, $extend = null)
+	{
+		return "$$('$pattern')" . (!empty($extend)) ? '.' . $extend : '';
+	}
+
+	/**
+	 * @param $id
+	 * @return string
+	 */
+	public function show($id)
+	{
+		return $this->call('Element.show', $id);
+	}
+
+	/**
+	 * @param $id
+	 * @return string
+	 */
+	public function toggle($id)
+	{
+		return $this->call('Element.toggle', $id);
+	}
 }

include/rating.rate.php

Indentation +46 added lines, -46 removed lines

@@ -9,7 +9,7 @@ 
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
 
 if (!defined('SMARTOBJECT_URL')) {
-    require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
+	require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
 }
 require_once SMARTOBJECT_ROOT_PATH . 'class/rating.php';
 require_once SMARTOBJECT_ROOT_PATH . 'include/functions.php';
@@ -23,52 +23,52 @@ 
 $smartobjectPluginHandler = new SmartPluginHandler();
 $pluginObj                = $smartobjectPluginHandler->getPlugin($module_dirname);
 if ($pluginObj) {
-    $rating_item = $pluginObj->getItem();
-    if ($rating_item) {
-        $rating_itemid = $pluginObj->getItemIdForItem($rating_item);
-        $stats         = $smartobjectRatingHandler->getRatingAverageByItemId($rating_itemid, $module_dirname, $rating_item);
-        $xoopsTpl->assign('smartobject_rating_stats_total', $stats['sum']);
-        $xoopsTpl->assign('smartobject_rating_stats_average', $stats['average']);
-        $xoopsTpl->assign('smartobject_rating_item', $rating_item);
-        if (is_object($xoopsUser)) {
-            $ratingObj = $smartobjectRatingHandler->already_rated($rating_item, $rating_itemid, $module_dirname, $xoopsUser->getVar('uid'));
-            $xoopsTpl->assign('smartobject_user_can_rate', true);
-        }
-        if (isset($ratingObj) && is_object($ratingObj)) {
-            $xoopsTpl->assign('smartobject_user_rate', $ratingObj->getVar('rate'));
-            $xoopsTpl->assign('smartobject_rated', true);
-        } else {
-            $xoopsTpl->assign('smartobject_rating_dirname', $module_dirname);
-            $xoopsTpl->assign('smartobject_rating_itemid', $rating_itemid);
-            $urls = smart_getCurrentUrls();
-            $xoopsTpl->assign('smartobject_rating_current_page', $urls['full']);
-            if (isset($xoTheme) && is_object($xoTheme)) {
-                $xoTheme->addStylesheet(SMARTOBJECT_URL . 'assets/css/module.css');
-            } else {
-                //probleme d'inclusion de css apres le flashplayer. Style plac� dans css du theme
-                //$xoopsTpl->assign('smartobject_css',"<link rel='stylesheet' type='text/css' href='".XOOPS_URL."/modules/smartobject/assets/css/module.css'>");
-            }
-        }
-    }
+	$rating_item = $pluginObj->getItem();
+	if ($rating_item) {
+		$rating_itemid = $pluginObj->getItemIdForItem($rating_item);
+		$stats         = $smartobjectRatingHandler->getRatingAverageByItemId($rating_itemid, $module_dirname, $rating_item);
+		$xoopsTpl->assign('smartobject_rating_stats_total', $stats['sum']);
+		$xoopsTpl->assign('smartobject_rating_stats_average', $stats['average']);
+		$xoopsTpl->assign('smartobject_rating_item', $rating_item);
+		if (is_object($xoopsUser)) {
+			$ratingObj = $smartobjectRatingHandler->already_rated($rating_item, $rating_itemid, $module_dirname, $xoopsUser->getVar('uid'));
+			$xoopsTpl->assign('smartobject_user_can_rate', true);
+		}
+		if (isset($ratingObj) && is_object($ratingObj)) {
+			$xoopsTpl->assign('smartobject_user_rate', $ratingObj->getVar('rate'));
+			$xoopsTpl->assign('smartobject_rated', true);
+		} else {
+			$xoopsTpl->assign('smartobject_rating_dirname', $module_dirname);
+			$xoopsTpl->assign('smartobject_rating_itemid', $rating_itemid);
+			$urls = smart_getCurrentUrls();
+			$xoopsTpl->assign('smartobject_rating_current_page', $urls['full']);
+			if (isset($xoTheme) && is_object($xoTheme)) {
+				$xoTheme->addStylesheet(SMARTOBJECT_URL . 'assets/css/module.css');
+			} else {
+				//probleme d'inclusion de css apres le flashplayer. Style plac� dans css du theme
+				//$xoopsTpl->assign('smartobject_css',"<link rel='stylesheet' type='text/css' href='".XOOPS_URL."/modules/smartobject/assets/css/module.css'>");
+			}
+		}
+	}
 }
 
 if (isset($_POST['smartobject_rating_submit'])) {
-    // The rating form has just been posted. Let's save the info
-    $ratingObj = $smartobjectRatingHandler->create();
-    $ratingObj->setVar('dirname', $module_dirname);
-    $ratingObj->setVar('item', $rating_item);
-    $ratingObj->setVar('itemid', $rating_itemid);
-    $ratingObj->setVar('uid', $xoopsUser->getVar('uid'));
-    $ratingObj->setVar('date', time());
-    $ratingObj->setVar('rate', $_POST['smartobject_rating_value']);
-    if (!$smartobjectRatingHandler->insert($ratingObj)) {
-        if (1062 == $xoopsDB->errno()) {
-            $message = _SOBJECT_RATING_DUPLICATE_ENTRY;
-        } else {
-            $message = _SOBJECT_RATING_ERROR;
-        }
-    } else {
-        $message = _SOBJECT_RATING_SUCCESS;
-    }
-    redirect_header('', 3, $message);
+	// The rating form has just been posted. Let's save the info
+	$ratingObj = $smartobjectRatingHandler->create();
+	$ratingObj->setVar('dirname', $module_dirname);
+	$ratingObj->setVar('item', $rating_item);
+	$ratingObj->setVar('itemid', $rating_itemid);
+	$ratingObj->setVar('uid', $xoopsUser->getVar('uid'));
+	$ratingObj->setVar('date', time());
+	$ratingObj->setVar('rate', $_POST['smartobject_rating_value']);
+	if (!$smartobjectRatingHandler->insert($ratingObj)) {
+		if (1062 == $xoopsDB->errno()) {
+			$message = _SOBJECT_RATING_DUPLICATE_ENTRY;
+		} else {
+			$message = _SOBJECT_RATING_ERROR;
+		}
+	} else {
+		$message = _SOBJECT_RATING_SUCCESS;
+	}
+	redirect_header('', 3, $message);
 }

class/smartmetagen.php

Indentation +378 added lines, -378 removed lines

@@ -18,350 +18,350 @@ 
  */
 class SmartMetaGen
 {
-    public $_myts;
-
-    public $_title;
-    public $_original_title;
-    public $_keywords;
-    public $_meta_description;
-    public $_categoryPath;
-    public $_description;
-    public $_minChar = 4;
-
-    /**
-     * SmartMetaGen constructor.
-     * @param      $title
-     * @param bool $keywords
-     * @param bool $description
-     * @param bool $categoryPath
-     */
-    public function __construct($title, $keywords = false, $description = false, $categoryPath = false)
-    {
-        $this->_myts = MyTextSanitizer::getInstance();
-        $this->setCategoryPath($categoryPath);
-        $this->setTitle($title);
-        $this->setDescription($description);
-
-        if (!$keywords) {
-            $keywords = $this->createMetaKeywords();
-        }
-
-        /*      $myts = MyTextSanitizer::getInstance();
+	public $_myts;
+
+	public $_title;
+	public $_original_title;
+	public $_keywords;
+	public $_meta_description;
+	public $_categoryPath;
+	public $_description;
+	public $_minChar = 4;
+
+	/**
+	 * SmartMetaGen constructor.
+	 * @param      $title
+	 * @param bool $keywords
+	 * @param bool $description
+	 * @param bool $categoryPath
+	 */
+	public function __construct($title, $keywords = false, $description = false, $categoryPath = false)
+	{
+		$this->_myts = MyTextSanitizer::getInstance();
+		$this->setCategoryPath($categoryPath);
+		$this->setTitle($title);
+		$this->setDescription($description);
+
+		if (!$keywords) {
+			$keywords = $this->createMetaKeywords();
+		}
+
+		/*      $myts = MyTextSanitizer::getInstance();
          if (method_exists($myts, 'formatForML')) {
          $keywords = $myts->formatForML($keywords);
          $description = $myts->formatForML($description);
          }
          */
-        $this->setKeywords($keywords);
-    }
-
-    /**
-     * Return true if the string is length > 0
-     *
-     * @credit psylove
-     *
-     * @var    string $string Chaine de caract�re
-     * @return boolean
-     */
-    public function emptyString($var)
-    {
-        return (strlen($var) > 0);
-    }
-
-    /**
-     * Create a title for the short_url field of an article
-     *
-     * @credit psylove
-     *
-     * @var    string      $title title of the article
-     * @param  bool|string $withExt
-     * @return string      sort_url for the article
-     */
-    public function generateSeoTitle($title = '', $withExt = true)
-    {
-        // Transformation de la chaine en minuscule
-        // Codage de la chaine afin d'éviter les erreurs 500 en cas de caractères imprévus
-        $title = rawurlencode(strtolower($title));
-
-        // Transformation des ponctuations
-        $pattern = [
-            '/%09/', // Tab
-            '/%20/', // Space
-            '/%21/', // !
-            '/%22/', // "
-            '/%23/', // #
-            '/%25/', // %
-            '/%26/', // &
-            '/%27/', // '
-            '/%28/', // (
-            '/%29/', // )
-            '/%2C/', // ,
-            '/%2F/', // /
-            '/%3A/', // :
-            '/%3B/', // ;
-            '/%3C/', // <
-            '/%3D/', // =
-            '/%3E/', // >
-            '/%3F/', // ?
-            '/%40/', // @
-            '/%5B/', // [
-            '/%5C/', // \
-            '/%5D/', // ]
-            '/%5E/', // ^
-            '/%7B/', // {
-            '/%7C/', // |
-            '/%7D/', // }
-            '/%7E/', // ~
-            "/\./" // .
-        ];
-        $rep_pat = [
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-100',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-at-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-'
-        ];
-        $title   = preg_replace($pattern, $rep_pat, $title);
-
-        // Transformation des caractères accentués
-        $pattern = [
-            '/%B0/', // °
-            '/%E8/', // è
-            '/%E9/', // é
-            '/%EA/', // ê
-            '/%EB/', // ë
-            '/%E7/', // ç
-            '/%E0/', // à
-            '/%E2/', // â
-            '/%E4/', // ä
-            '/%EE/', // î
-            '/%EF/', // ï
-            '/%F9/', // ù
-            '/%FC/', // ü
-            '/%FB/', // û
-            '/%F4/', // ô
-            '/%F6/', // ö
-        ];
-        $rep_pat = ['-', 'e', 'e', 'e', 'e', 'c', 'a', 'a', 'a', 'i', 'i', 'u', 'u', 'u', 'o', 'o'];
-        $title   = preg_replace($pattern, $rep_pat, $title);
-
-        $tableau = explode('-', $title); // Transforme la chaine de caract�res en tableau
-        $tableau = array_filter($tableau, [$this, 'emptyString']); // Supprime les chaines vides du tableau
-        $title   = implode('-', $tableau); // Transforme un tableau en chaine de caract�res s�par� par un tiret
-
-        if (count($title) > 0) {
-            if ($withExt) {
-                $title .= '.html';
-            }
-
-            return $title;
-        } else {
-            return '';
-        }
-    }
-
-    /**
-     * @param $document
-     * @return mixed
-     */
-    public function html2text($document)
-    {
-        return smart_html2text($document);
-    }
-
-    /**
-     * @param $title
-     */
-    public function setTitle($title)
-    {
-        global $xoopsModule, $xoopsModuleConfig;
-        $this->_title          = $this->html2text($title);
-        $this->_title          = $this->purifyText($this->_title);
-        $this->_original_title = $this->_title;
-
-        $moduleName = $xoopsModule->getVar('name');
-
-        $titleTag = [];
-
-        $show_mod_name_breadcrumb = isset($xoopsModuleConfig['show_mod_name_breadcrumb']) ? $xoopsModuleConfig['show_mod_name_breadcrumb'] : true;
-
-        if ($moduleName && $show_mod_name_breadcrumb) {
-            $titleTag['module'] = $moduleName;
-        }
-
-        if (isset($this->_title) && ('' !== $this->_title) && (strtoupper($this->_title) != strtoupper($moduleName))) {
-            $titleTag['title'] = $this->_title;
-        }
-
-        if (isset($this->_categoryPath) && ('' !== $this->_categoryPath)) {
-            $titleTag['category'] = $this->_categoryPath;
-        }
-
-        $ret = isset($titleTag['title']) ? $titleTag['title'] : '';
-
-        if (isset($titleTag['category']) && '' !== $titleTag['category']) {
-            if ('' !== $ret) {
-                $ret .= ' - ';
-            }
-            $ret .= $titleTag['category'];
-        }
-        if (isset($titleTag['module']) && '' !== $titleTag['module']) {
-            if ('' !== $ret) {
-                $ret .= ' - ';
-            }
-            $ret .= $titleTag['module'];
-        }
-        $this->_title = $ret;
-    }
-
-    /**
-     * @param $keywords
-     */
-    public function setKeywords($keywords)
-    {
-        $this->_keywords = $keywords;
-    }
-
-    /**
-     * @param $categoryPath
-     */
-    public function setCategoryPath($categoryPath)
-    {
-        $categoryPath        = $this->html2text($categoryPath);
-        $this->_categoryPath = $categoryPath;
-    }
-
-    /**
-     * @param $description
-     */
-    public function setDescription($description)
-    {
-        if (!$description) {
-            global $xoopsModuleConfig;
-            if (isset($xoopsModuleConfig['module_meta_description'])) {
-                $description = $xoopsModuleConfig['module_meta_description'];
-            }
-        }
-
-        $description = $this->html2text($description);
-        $description = $this->purifyText($description);
-
-        $description = preg_replace("/([^\r\n])\r\n([^\r\n])/", "\\1 \\2", $description);
-        $description = preg_replace("/[\r\n]*\r\n[\r\n]*/", "\r\n\r\n", $description);
-        $description = preg_replace('/[ ]* [ ]*/', ' ', $description);
-        $description = stripslashes($description);
-
-        $this->_description      = $description;
-        $this->_meta_description = $this->createMetaDescription();
-    }
-
-    public function createTitleTag()
-    {
-    }
-
-    /**
-     * @param               $text
-     * @param  bool         $keyword
-     * @return mixed|string
-     */
-    public function purifyText($text, $keyword = false)
-    {
-        return smart_purifyText($text, $keyword);
-    }
-
-    /**
-     * @param  int $maxWords
-     * @return string
-     */
-    public function createMetaDescription($maxWords = 100)
-    {
-        $words = [];
-        $words = explode(' ', $this->_description);
-
-        // Only keep $maxWords words
-        $newWords = [];
-        $i        = 0;
-
-        while ($i < $maxWords - 1 && $i < count($words)) {
-            $newWords[] = $words[$i];
-            ++$i;
-        }
-        $ret = implode(' ', $newWords);
-
-        return $ret;
-    }
-
-    /**
-     * @param $text
-     * @param $minChar
-     * @return array
-     */
-    public function findMetaKeywords($text, $minChar)
-    {
-        $keywords = [];
-
-        $text = $this->purifyText($text);
-        $text = $this->html2text($text);
-
-        $text = preg_replace("/([^\r\n])\r\n([^\r\n])/", "\\1 \\2", $text);
-        $text = preg_replace("/[\r\n]*\r\n[\r\n]*/", "\r\n\r\n", $text);
-        $text = preg_replace('/[ ]* [ ]*/', ' ', $text);
-        $text = stripslashes($text);
-        $text =
-
-        $originalKeywords = preg_split('/[^a-zA-Z\'"-]+/', $text, -1, PREG_SPLIT_NO_EMPTY);
-
-        foreach ($originalKeywords as $originalKeyword) {
-            $secondRoundKeywords = explode("'", $originalKeyword);
-            foreach ($secondRoundKeywords as $secondRoundKeyword) {
-                if (strlen($secondRoundKeyword) >= $minChar) {
-                    if (!in_array($secondRoundKeyword, $keywords)) {
-                        $keywords[] = trim($secondRoundKeyword);
-                    }
-                }
-            }
-        }
-
-        return $keywords;
-    }
-
-    /**
-     * @return string
-     */
-    public function createMetaKeywords()
-    {
-        global $xoopsModuleConfig;
-        $keywords = $this->findMetaKeywords($this->_original_title . ' ' . $this->_description, $this->_minChar);
-        if (isset($xoopsModuleConfig) && isset($xoopsModuleConfig['moduleMetaKeywords'])
-            && '' !== $xoopsModuleConfig['moduleMetaKeywords']) {
-            $moduleKeywords = explode(',', $xoopsModuleConfig['moduleMetaKeywords']);
-            $keywords       = array_merge($keywords, $moduleKeywords);
-        }
-
-        /* Commenting this out as it may cause problem on XOOPS ML websites
+		$this->setKeywords($keywords);
+	}
+
+	/**
+	 * Return true if the string is length > 0
+	 *
+	 * @credit psylove
+	 *
+	 * @var    string $string Chaine de caract�re
+	 * @return boolean
+	 */
+	public function emptyString($var)
+	{
+		return (strlen($var) > 0);
+	}
+
+	/**
+	 * Create a title for the short_url field of an article
+	 *
+	 * @credit psylove
+	 *
+	 * @var    string      $title title of the article
+	 * @param  bool|string $withExt
+	 * @return string      sort_url for the article
+	 */
+	public function generateSeoTitle($title = '', $withExt = true)
+	{
+		// Transformation de la chaine en minuscule
+		// Codage de la chaine afin d'éviter les erreurs 500 en cas de caractères imprévus
+		$title = rawurlencode(strtolower($title));
+
+		// Transformation des ponctuations
+		$pattern = [
+			'/%09/', // Tab
+			'/%20/', // Space
+			'/%21/', // !
+			'/%22/', // "
+			'/%23/', // #
+			'/%25/', // %
+			'/%26/', // &
+			'/%27/', // '
+			'/%28/', // (
+			'/%29/', // )
+			'/%2C/', // ,
+			'/%2F/', // /
+			'/%3A/', // :
+			'/%3B/', // ;
+			'/%3C/', // <
+			'/%3D/', // =
+			'/%3E/', // >
+			'/%3F/', // ?
+			'/%40/', // @
+			'/%5B/', // [
+			'/%5C/', // \
+			'/%5D/', // ]
+			'/%5E/', // ^
+			'/%7B/', // {
+			'/%7C/', // |
+			'/%7D/', // }
+			'/%7E/', // ~
+			"/\./" // .
+		];
+		$rep_pat = [
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-100',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-at-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-'
+		];
+		$title   = preg_replace($pattern, $rep_pat, $title);
+
+		// Transformation des caractères accentués
+		$pattern = [
+			'/%B0/', // °
+			'/%E8/', // è
+			'/%E9/', // é
+			'/%EA/', // ê
+			'/%EB/', // ë
+			'/%E7/', // ç
+			'/%E0/', // à
+			'/%E2/', // â
+			'/%E4/', // ä
+			'/%EE/', // î
+			'/%EF/', // ï
+			'/%F9/', // ù
+			'/%FC/', // ü
+			'/%FB/', // û
+			'/%F4/', // ô
+			'/%F6/', // ö
+		];
+		$rep_pat = ['-', 'e', 'e', 'e', 'e', 'c', 'a', 'a', 'a', 'i', 'i', 'u', 'u', 'u', 'o', 'o'];
+		$title   = preg_replace($pattern, $rep_pat, $title);
+
+		$tableau = explode('-', $title); // Transforme la chaine de caract�res en tableau
+		$tableau = array_filter($tableau, [$this, 'emptyString']); // Supprime les chaines vides du tableau
+		$title   = implode('-', $tableau); // Transforme un tableau en chaine de caract�res s�par� par un tiret
+
+		if (count($title) > 0) {
+			if ($withExt) {
+				$title .= '.html';
+			}
+
+			return $title;
+		} else {
+			return '';
+		}
+	}
+
+	/**
+	 * @param $document
+	 * @return mixed
+	 */
+	public function html2text($document)
+	{
+		return smart_html2text($document);
+	}
+
+	/**
+	 * @param $title
+	 */
+	public function setTitle($title)
+	{
+		global $xoopsModule, $xoopsModuleConfig;
+		$this->_title          = $this->html2text($title);
+		$this->_title          = $this->purifyText($this->_title);
+		$this->_original_title = $this->_title;
+
+		$moduleName = $xoopsModule->getVar('name');
+
+		$titleTag = [];
+
+		$show_mod_name_breadcrumb = isset($xoopsModuleConfig['show_mod_name_breadcrumb']) ? $xoopsModuleConfig['show_mod_name_breadcrumb'] : true;
+
+		if ($moduleName && $show_mod_name_breadcrumb) {
+			$titleTag['module'] = $moduleName;
+		}
+
+		if (isset($this->_title) && ('' !== $this->_title) && (strtoupper($this->_title) != strtoupper($moduleName))) {
+			$titleTag['title'] = $this->_title;
+		}
+
+		if (isset($this->_categoryPath) && ('' !== $this->_categoryPath)) {
+			$titleTag['category'] = $this->_categoryPath;
+		}
+
+		$ret = isset($titleTag['title']) ? $titleTag['title'] : '';
+
+		if (isset($titleTag['category']) && '' !== $titleTag['category']) {
+			if ('' !== $ret) {
+				$ret .= ' - ';
+			}
+			$ret .= $titleTag['category'];
+		}
+		if (isset($titleTag['module']) && '' !== $titleTag['module']) {
+			if ('' !== $ret) {
+				$ret .= ' - ';
+			}
+			$ret .= $titleTag['module'];
+		}
+		$this->_title = $ret;
+	}
+
+	/**
+	 * @param $keywords
+	 */
+	public function setKeywords($keywords)
+	{
+		$this->_keywords = $keywords;
+	}
+
+	/**
+	 * @param $categoryPath
+	 */
+	public function setCategoryPath($categoryPath)
+	{
+		$categoryPath        = $this->html2text($categoryPath);
+		$this->_categoryPath = $categoryPath;
+	}
+
+	/**
+	 * @param $description
+	 */
+	public function setDescription($description)
+	{
+		if (!$description) {
+			global $xoopsModuleConfig;
+			if (isset($xoopsModuleConfig['module_meta_description'])) {
+				$description = $xoopsModuleConfig['module_meta_description'];
+			}
+		}
+
+		$description = $this->html2text($description);
+		$description = $this->purifyText($description);
+
+		$description = preg_replace("/([^\r\n])\r\n([^\r\n])/", "\\1 \\2", $description);
+		$description = preg_replace("/[\r\n]*\r\n[\r\n]*/", "\r\n\r\n", $description);
+		$description = preg_replace('/[ ]* [ ]*/', ' ', $description);
+		$description = stripslashes($description);
+
+		$this->_description      = $description;
+		$this->_meta_description = $this->createMetaDescription();
+	}
+
+	public function createTitleTag()
+	{
+	}
+
+	/**
+	 * @param               $text
+	 * @param  bool         $keyword
+	 * @return mixed|string
+	 */
+	public function purifyText($text, $keyword = false)
+	{
+		return smart_purifyText($text, $keyword);
+	}
+
+	/**
+	 * @param  int $maxWords
+	 * @return string
+	 */
+	public function createMetaDescription($maxWords = 100)
+	{
+		$words = [];
+		$words = explode(' ', $this->_description);
+
+		// Only keep $maxWords words
+		$newWords = [];
+		$i        = 0;
+
+		while ($i < $maxWords - 1 && $i < count($words)) {
+			$newWords[] = $words[$i];
+			++$i;
+		}
+		$ret = implode(' ', $newWords);
+
+		return $ret;
+	}
+
+	/**
+	 * @param $text
+	 * @param $minChar
+	 * @return array
+	 */
+	public function findMetaKeywords($text, $minChar)
+	{
+		$keywords = [];
+
+		$text = $this->purifyText($text);
+		$text = $this->html2text($text);
+
+		$text = preg_replace("/([^\r\n])\r\n([^\r\n])/", "\\1 \\2", $text);
+		$text = preg_replace("/[\r\n]*\r\n[\r\n]*/", "\r\n\r\n", $text);
+		$text = preg_replace('/[ ]* [ ]*/', ' ', $text);
+		$text = stripslashes($text);
+		$text =
+
+		$originalKeywords = preg_split('/[^a-zA-Z\'"-]+/', $text, -1, PREG_SPLIT_NO_EMPTY);
+
+		foreach ($originalKeywords as $originalKeyword) {
+			$secondRoundKeywords = explode("'", $originalKeyword);
+			foreach ($secondRoundKeywords as $secondRoundKeyword) {
+				if (strlen($secondRoundKeyword) >= $minChar) {
+					if (!in_array($secondRoundKeyword, $keywords)) {
+						$keywords[] = trim($secondRoundKeyword);
+					}
+				}
+			}
+		}
+
+		return $keywords;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function createMetaKeywords()
+	{
+		global $xoopsModuleConfig;
+		$keywords = $this->findMetaKeywords($this->_original_title . ' ' . $this->_description, $this->_minChar);
+		if (isset($xoopsModuleConfig) && isset($xoopsModuleConfig['moduleMetaKeywords'])
+			&& '' !== $xoopsModuleConfig['moduleMetaKeywords']) {
+			$moduleKeywords = explode(',', $xoopsModuleConfig['moduleMetaKeywords']);
+			$keywords       = array_merge($keywords, $moduleKeywords);
+		}
+
+		/* Commenting this out as it may cause problem on XOOPS ML websites
          $return_keywords = array();
 
          // Cleaning for duplicate keywords
@@ -371,43 +371,43 @@ 
          }
          }*/
 
-        // Only take the first 90 keywords
-        $newKeywords = [];
-        $i           = 0;
-        while ($i < 90 - 1 && isset($keywords[$i])) {
-            $newKeywords[] = $keywords[$i];
-            ++$i;
-        }
-        $ret = implode(', ', $newKeywords);
-
-        return $ret;
-    }
-
-    public function autoBuildMeta_keywords()
-    {
-    }
-
-    public function buildAutoMetaTags()
-    {
-        global $xoopsModule, $xoopsModuleConfig;
-
-        $this->_keywords         = $this->createMetaKeywords();
-        $this->_meta_description = $this->createMetaDescription();
-        $this->_title            = $this->createTitleTag();
-    }
-
-    public function createMetaTags()
-    {
-        global $xoopsTpl, $xoTheme;
-
-        if (is_object($xoTheme)) {
-            $xoTheme->addMeta('meta', 'keywords', $this->_keywords);
-            $xoTheme->addMeta('meta', 'description', $this->_description);
-            $xoTheme->addMeta('meta', 'title', $this->_title);
-        } else {
-            $xoopsTpl->assign('xoops_meta_keywords', $this->_keywords);
-            $xoopsTpl->assign('xoops_meta_description', $this->_description);
-        }
-        $xoopsTpl->assign('xoops_pagetitle', $this->_title);
-    }
+		// Only take the first 90 keywords
+		$newKeywords = [];
+		$i           = 0;
+		while ($i < 90 - 1 && isset($keywords[$i])) {
+			$newKeywords[] = $keywords[$i];
+			++$i;
+		}
+		$ret = implode(', ', $newKeywords);
+
+		return $ret;
+	}
+
+	public function autoBuildMeta_keywords()
+	{
+	}
+
+	public function buildAutoMetaTags()
+	{
+		global $xoopsModule, $xoopsModuleConfig;
+
+		$this->_keywords         = $this->createMetaKeywords();
+		$this->_meta_description = $this->createMetaDescription();
+		$this->_title            = $this->createTitleTag();
+	}
+
+	public function createMetaTags()
+	{
+		global $xoopsTpl, $xoTheme;
+
+		if (is_object($xoTheme)) {
+			$xoTheme->addMeta('meta', 'keywords', $this->_keywords);
+			$xoTheme->addMeta('meta', 'description', $this->_description);
+			$xoTheme->addMeta('meta', 'title', $this->_title);
+		} else {
+			$xoopsTpl->assign('xoops_meta_keywords', $this->_keywords);
+			$xoopsTpl->assign('xoops_meta_description', $this->_description);
+		}
+		$xoopsTpl->assign('xoops_pagetitle', $this->_title);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -354,7 +354,7 @@
     public function createMetaKeywords()
     {
         global $xoopsModuleConfig;
-        $keywords = $this->findMetaKeywords($this->_original_title . ' ' . $this->_description, $this->_minChar);
+        $keywords = $this->findMetaKeywords($this->_original_title.' '.$this->_description, $this->_minChar);
         if (isset($xoopsModuleConfig) && isset($xoopsModuleConfig['moduleMetaKeywords'])
             && '' !== $xoopsModuleConfig['moduleMetaKeywords']) {
             $moduleKeywords = explode(',', $xoopsModuleConfig['moduleMetaKeywords']);

class/smartdbupdater.php

Indentation +817 added lines, -817 removed lines

@@ -18,7 +18,7 @@ 
  */
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
 if (!defined('SMARTOBJECT_ROOT_PATH')) {
-    require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
+	require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
 }
 /**
  * Include the language constants for the SmartObjectDBUpdater
@@ -26,7 +26,7 @@ 
 global $xoopsConfig;
 $common_file = SMARTOBJECT_ROOT_PATH . 'language/' . $xoopsConfig['language'] . '/smartdbupdater.php';
 if (!file_exists($common_file)) {
-    $common_file = SMARTOBJECT_ROOT_PATH . 'language/english/smartdbupdater.php';
+	$common_file = SMARTOBJECT_ROOT_PATH . 'language/english/smartdbupdater.php';
 }
 include $common_file;
 
@@ -35,503 +35,503 @@ 
  */
 class SmartDbTable
 {
-    /**
-     * @var string $_name name of the table
-     */
-    public $_name;
-    /**
-     * @var string $_structure structure of the table
-     */
-    public $_structure;
-
-    /**
-     * @var array $_data containing valued of each records to be added
-     */
-    public $_data;
-
-    /**
-     * @var array $_alteredFields containing fields to be altered
-     */
-    public $_alteredFields;
-
-    /**
-     * @var array $_newFields containing new fields to be added
-     */
-    public $_newFields;
-
-    /**
-     * @var array $_droppedFields containing fields to be dropped
-     */
-    public $_droppedFields;
-
-    /**
-     * @var array $_flagForDrop flag table to drop it
-     */
-    public $_flagForDrop = false;
-
-    /**
-     * @var array $_updatedFields containing fields which values will be updated
-     */
-    public $_updatedFields;
-
-    /**
-     * @var array $_updatedFields containing fields which values will be updated
-     */ //felix
-    public $_updatedWhere;
-
-    public $_existingFieldsArray = false;
-
-    /**
-     * Constructor
-     *
-     * @param string $name name of the table
-     *
-     */
-    public function __construct($name)
-    {
-        $this->_name = $name;
-        $this->_data = [];
-    }
-
-    /**
-     * Return the table name, prefixed with site table prefix
-     *
-     * @return string table name
-     *
-     */
-    public function name()
-    {
-        global $xoopsDB;
-
-        return $xoopsDB->prefix($this->_name);
-    }
-
-    /**
-     * Checks if the table already exists in the database
-     *
-     * @return bool TRUE if it exists, FALSE if not
-     *
-     */
-    public function exists()
-    {
-        return smart_TableExists($this->_name);
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getExistingFieldsArray()
-    {
-        global $xoopsDB;
-        $result = $xoopsDB->query('SHOW COLUMNS FROM ' . $this->name());
-        while ($existing_field = $xoopsDB->fetchArray($result)) {
-            $fields[$existing_field['Field']] = $existing_field['Type'];
-            if ('YES' !== $existing_field['Null']) {
-                $fields[$existing_field['Field']] .= ' NOT NULL';
-            }
-            if ($existing_field['Extra']) {
-                $fields[$existing_field['Field']] .= ' ' . $existing_field['Extra'];
-            }
-            if (!(null === $existing_field['Default'])
-                && ($existing_field['Default']
-                    || '' === $existing_field['Default']
-                    || 0 == $existing_field['Default'])) {
-                $fields[$existing_field['Field']] .= " default '" . $existing_field['Default'] . "'";
-            }
-        }
-
-        return $fields;
-    }
-
-    /**
-     * @param $field
-     * @return bool
-     */
-    public function fieldExists($field)
-    {
-        $existingFields = $this->getExistingFieldsArray();
-
-        return isset($existingFields[$field]);
-    }
-
-    /**
-     * Set the table structure
-     *
-     * Example:
-     *
-     *      $table->setStructure("`transactionid` int(11) NOT NULL auto_increment,
-     *                `date` int(11) NOT NULL default '0',
-     *                `status` int(1) NOT NULL default '-1',
-     *                `itemid` int(11) NOT NULL default '0',
-     *                `uid` int(11) NOT NULL default '0',
-     *                `price` float NOT NULL default '0',
-     *                `currency` varchar(100) NOT NULL default '',
-     *                PRIMARY KEY  (`transactionid`)");
-     *
-     * @param string $structure table structure
-     *
-     */
-    public function setStructure($structure)
-    {
-        $this->_structure = $structure;
-    }
-
-    /**
-     * Return the table structure
-     *
-     * @return string table structure
-     *
-     */
-    public function getStructure()
-    {
-        return sprintf($this->_structure, $this->name());
-    }
-
-    /**
-     * Add values of a record to be added
-     *
-     * @param string $data values of a record
-     *
-     */
-    public function setData($data)
-    {
-        $this->_data[] = $data;
-    }
-
-    /**
-     * Get the data array
-     *
-     * @return array containing the records values to be added
-     *
-     */
-    public function getData()
-    {
-        return $this->_data;
-    }
-
-    /**
-     * Use to insert data in a table
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */
-    public function addData()
-    {
-        global $xoopsDB;
-        foreach ($this->getData() as $data) {
-            $query = sprintf('INSERT INTO %s VALUES (%s)', $this->name(), $data);
-            $ret   = $xoopsDB->query($query);
-            if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_ADD_DATA_ERR, $this->name()) . '<br>';
-            } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_ADD_DATA, $this->name()) . '<br>';
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Add a field to be added
-     *
-     * @param string $name       name of the field
-     * @param string $properties properties of the field
-     * @param bool   $newname
-     * @param bool   $showerror
-     */
-    public function addAlteredField($name, $properties, $newname = false, $showerror = true)
-    {
-        $field['name']          = $name;
-        $field['properties']    = $properties;
-        $field['showerror']     = $showerror;
-        $field['newname']       = $newname;
-        $this->_alteredFields[] = $field;
-    }
-    /**
-     * Invert values 0 to 1 and 1 to 0
-     *
-     * @param string $name name of the field
-     * @param        $newValue
-     * @param        $oldValue
-     * @internal param string $old old propertie
-     * @internal param string $new new propertie
-     */ //felix
-    public function addUpdatedWhere($name, $newValue, $oldValue)
-    {
-        $field['name']         = $name;
-        $field['value']        = $newValue;
-        $field['where']        = $oldValue;
-        $this->_updatedWhere[] = $field;
-    }
-
-    /**
-     * Add new field of a record to be added
-     *
-     * @param string $name       name of the field
-     * @param string $properties properties of the field
-     *
-     */
-    public function addNewField($name, $properties)
-    {
-        $field['name']       = $name;
-        $field['properties'] = $properties;
-        $this->_newFields[]  = $field;
-    }
-
-    /**
-     * Get fields that need to be altered
-     *
-     * @return array fields that need to be altered
-     *
-     */
-    public function getAlteredFields()
-    {
-        return $this->_alteredFields;
-    }
-
-    /**
-     * Add field for which the value will be updated
-     *
-     * @param string $name  name of the field
-     * @param string $value value to be set
-     *
-     */
-    public function addUpdatedField($name, $value)
-    {
-        $field['name']          = $name;
-        $field['value']         = $value;
-        $this->_updatedFields[] = $field;
-    }
-
-    /**
-     * Get new fields to be added
-     *
-     * @return array fields to be added
-     *
-     */
-    public function getNewFields()
-    {
-        return $this->_newFields;
-    }
-
-    /**
-     * Get fields which values need to be updated
-     *
-     * @return array fields which values need to be updated
-     *
-     */
-    public function getUpdatedFields()
-    {
-        return $this->_updatedFields;
-    }
-    /**
-     * Get fields which values need to be updated
-     *
-     * @return array fields which values need to be updated
-     *
-     */ //felix
-    public function getUpdatedWhere()
-    {
-        return $this->_updatedWhere;
-    }
-
-    /**
-     * Add values of a record to be added
-     *
-     * @param string $name name of the field
-     *
-     */
-    public function addDroppedField($name)
-    {
-        $this->_droppedFields[] = $name;
-    }
-
-    /**
-     * Get fields that need to be dropped
-     *
-     * @return array fields that need to be dropped
-     *
-     */
-    public function getDroppedFields()
-    {
-        return $this->_droppedFields;
-    }
-
-    /**
-     * Set the flag to drop the table
-     *
-     */
-    public function setFlagForDrop()
-    {
-        $this->_flagForDrop = true;
-    }
-
-    /**
-     * Use to create a table
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */
-    public function createTable()
-    {
-        global $xoopsDB;
-        $query = $this->getStructure();
-        $query = 'CREATE TABLE `' . $this->name() . '` (' . $query . ") ENGINE=MyISAM COMMENT='The SmartFactory <www.smartfactory.ca>'";
-        //xoops_debug($query);
-        $ret = $xoopsDB->query($query);
-        if (!$ret) {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CREATE_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
-        } else {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CREATE_TABLE, $this->name()) . '<br>';
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Use to drop a table
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */
-    public function dropTable()
-    {
-        global $xoopsDB;
-        $query = sprintf('DROP TABLE %s', $this->name());
-        $ret   = $xoopsDB->query($query);
-        if (!$ret) {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROP_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
-
-            return false;
-        } else {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROP_TABLE, $this->name()) . '<br>';
-
-            return true;
-        }
-    }
-
-    /**
-     * Use to alter a table
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */
-    public function alterTable()
-    {
-        global $xoopsDB;
-        $ret = true;
-
-        foreach ($this->getAlteredFields() as $alteredField) {
-            if (!$alteredField['newname']) {
-                $alteredField['newname'] = $alteredField['name'];
-            }
-
-            $query = sprintf('ALTER TABLE `%s` CHANGE `%s` `%s` %s', $this->name(), $alteredField['name'], $alteredField['newname'], $alteredField['properties']);
-            $ret   = $ret && $xoopsDB->query($query);
-            if ($alteredField['showerror']) {
-                if (!$ret) {
-                    echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CHGFIELD_ERR, $alteredField['name'], $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
-                } else {
-                    echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CHGFIELD, $alteredField['name'], $this->name()) . '<br>';
-                }
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Use to add new fileds in the table
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */
-    public function addNewFields()
-    {
-        global $xoopsDB;
-        $ret = true;
-        foreach ($this->getNewFields() as $newField) {
-            $query = sprintf('ALTER TABLE `%s` ADD `%s` %s', $this->name(), $newField['name'], $newField['properties']);
-            //echo $query;
-            $ret = $ret && $xoopsDB->query($query);
-            if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_NEWFIELD_ERR, $newField['name'], $this->name()) . '<br>';
-            } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_NEWFIELD, $newField['name'], $this->name()) . '<br>';
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Use to update fields values
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */
-    public function updateFieldsValues()
-    {
-        global $xoopsDB;
-        $ret = true;
-        foreach ($this->getUpdatedFields() as $updatedField) {
-            $query = sprintf('UPDATE %s SET %s = %s', $this->name(), $updatedField['name'], $updatedField['value']);
-            $ret   = $ret && $xoopsDB->query($query);
-            if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
-            } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . '<br>';
-            }
-        }
-
-        return $ret;
-    }
-    /**
-     * Use to update fields values
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */ //felix
-    public function updateWhereValues()
-    {
-        global $xoopsDB;
-        $ret = true;
-        foreach ($this->getUpdatedWhere() as $updatedWhere) {
-            $query = sprintf('UPDATE %s SET %s = %s WHERE %s  %s', $this->name(), $updatedWhere['name'], $updatedWhere['value'], $updatedWhere['name'], $updatedWhere['where']);
-            //echo $query."<br>";
-            $ret = $ret && $xoopsDB->query($query);
-            if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
-            } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . '<br>';
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Use to drop fields
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */
-    public function dropFields()
-    {
-        global $xoopsDB;
-        $ret = true;
-        foreach ($this->getDroppedFields() as $droppedField) {
-            $query = sprintf('ALTER TABLE %s DROP %s', $this->name(), $droppedField);
-            $ret   = $ret && $xoopsDB->query($query);
-            if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROPFIELD_ERR, $droppedField, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
-            } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROPFIELD, $droppedField, $this->name()) . '<br>';
-            }
-        }
-
-        return $ret;
-    }
+	/**
+	 * @var string $_name name of the table
+	 */
+	public $_name;
+	/**
+	 * @var string $_structure structure of the table
+	 */
+	public $_structure;
+
+	/**
+	 * @var array $_data containing valued of each records to be added
+	 */
+	public $_data;
+
+	/**
+	 * @var array $_alteredFields containing fields to be altered
+	 */
+	public $_alteredFields;
+
+	/**
+	 * @var array $_newFields containing new fields to be added
+	 */
+	public $_newFields;
+
+	/**
+	 * @var array $_droppedFields containing fields to be dropped
+	 */
+	public $_droppedFields;
+
+	/**
+	 * @var array $_flagForDrop flag table to drop it
+	 */
+	public $_flagForDrop = false;
+
+	/**
+	 * @var array $_updatedFields containing fields which values will be updated
+	 */
+	public $_updatedFields;
+
+	/**
+	 * @var array $_updatedFields containing fields which values will be updated
+	 */ //felix
+	public $_updatedWhere;
+
+	public $_existingFieldsArray = false;
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $name name of the table
+	 *
+	 */
+	public function __construct($name)
+	{
+		$this->_name = $name;
+		$this->_data = [];
+	}
+
+	/**
+	 * Return the table name, prefixed with site table prefix
+	 *
+	 * @return string table name
+	 *
+	 */
+	public function name()
+	{
+		global $xoopsDB;
+
+		return $xoopsDB->prefix($this->_name);
+	}
+
+	/**
+	 * Checks if the table already exists in the database
+	 *
+	 * @return bool TRUE if it exists, FALSE if not
+	 *
+	 */
+	public function exists()
+	{
+		return smart_TableExists($this->_name);
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getExistingFieldsArray()
+	{
+		global $xoopsDB;
+		$result = $xoopsDB->query('SHOW COLUMNS FROM ' . $this->name());
+		while ($existing_field = $xoopsDB->fetchArray($result)) {
+			$fields[$existing_field['Field']] = $existing_field['Type'];
+			if ('YES' !== $existing_field['Null']) {
+				$fields[$existing_field['Field']] .= ' NOT NULL';
+			}
+			if ($existing_field['Extra']) {
+				$fields[$existing_field['Field']] .= ' ' . $existing_field['Extra'];
+			}
+			if (!(null === $existing_field['Default'])
+				&& ($existing_field['Default']
+					|| '' === $existing_field['Default']
+					|| 0 == $existing_field['Default'])) {
+				$fields[$existing_field['Field']] .= " default '" . $existing_field['Default'] . "'";
+			}
+		}
+
+		return $fields;
+	}
+
+	/**
+	 * @param $field
+	 * @return bool
+	 */
+	public function fieldExists($field)
+	{
+		$existingFields = $this->getExistingFieldsArray();
+
+		return isset($existingFields[$field]);
+	}
+
+	/**
+	 * Set the table structure
+	 *
+	 * Example:
+	 *
+	 *      $table->setStructure("`transactionid` int(11) NOT NULL auto_increment,
+	 *                `date` int(11) NOT NULL default '0',
+	 *                `status` int(1) NOT NULL default '-1',
+	 *                `itemid` int(11) NOT NULL default '0',
+	 *                `uid` int(11) NOT NULL default '0',
+	 *                `price` float NOT NULL default '0',
+	 *                `currency` varchar(100) NOT NULL default '',
+	 *                PRIMARY KEY  (`transactionid`)");
+	 *
+	 * @param string $structure table structure
+	 *
+	 */
+	public function setStructure($structure)
+	{
+		$this->_structure = $structure;
+	}
+
+	/**
+	 * Return the table structure
+	 *
+	 * @return string table structure
+	 *
+	 */
+	public function getStructure()
+	{
+		return sprintf($this->_structure, $this->name());
+	}
+
+	/**
+	 * Add values of a record to be added
+	 *
+	 * @param string $data values of a record
+	 *
+	 */
+	public function setData($data)
+	{
+		$this->_data[] = $data;
+	}
+
+	/**
+	 * Get the data array
+	 *
+	 * @return array containing the records values to be added
+	 *
+	 */
+	public function getData()
+	{
+		return $this->_data;
+	}
+
+	/**
+	 * Use to insert data in a table
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */
+	public function addData()
+	{
+		global $xoopsDB;
+		foreach ($this->getData() as $data) {
+			$query = sprintf('INSERT INTO %s VALUES (%s)', $this->name(), $data);
+			$ret   = $xoopsDB->query($query);
+			if (!$ret) {
+				echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_ADD_DATA_ERR, $this->name()) . '<br>';
+			} else {
+				echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_ADD_DATA, $this->name()) . '<br>';
+			}
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Add a field to be added
+	 *
+	 * @param string $name       name of the field
+	 * @param string $properties properties of the field
+	 * @param bool   $newname
+	 * @param bool   $showerror
+	 */
+	public function addAlteredField($name, $properties, $newname = false, $showerror = true)
+	{
+		$field['name']          = $name;
+		$field['properties']    = $properties;
+		$field['showerror']     = $showerror;
+		$field['newname']       = $newname;
+		$this->_alteredFields[] = $field;
+	}
+	/**
+	 * Invert values 0 to 1 and 1 to 0
+	 *
+	 * @param string $name name of the field
+	 * @param        $newValue
+	 * @param        $oldValue
+	 * @internal param string $old old propertie
+	 * @internal param string $new new propertie
+	 */ //felix
+	public function addUpdatedWhere($name, $newValue, $oldValue)
+	{
+		$field['name']         = $name;
+		$field['value']        = $newValue;
+		$field['where']        = $oldValue;
+		$this->_updatedWhere[] = $field;
+	}
+
+	/**
+	 * Add new field of a record to be added
+	 *
+	 * @param string $name       name of the field
+	 * @param string $properties properties of the field
+	 *
+	 */
+	public function addNewField($name, $properties)
+	{
+		$field['name']       = $name;
+		$field['properties'] = $properties;
+		$this->_newFields[]  = $field;
+	}
+
+	/**
+	 * Get fields that need to be altered
+	 *
+	 * @return array fields that need to be altered
+	 *
+	 */
+	public function getAlteredFields()
+	{
+		return $this->_alteredFields;
+	}
+
+	/**
+	 * Add field for which the value will be updated
+	 *
+	 * @param string $name  name of the field
+	 * @param string $value value to be set
+	 *
+	 */
+	public function addUpdatedField($name, $value)
+	{
+		$field['name']          = $name;
+		$field['value']         = $value;
+		$this->_updatedFields[] = $field;
+	}
+
+	/**
+	 * Get new fields to be added
+	 *
+	 * @return array fields to be added
+	 *
+	 */
+	public function getNewFields()
+	{
+		return $this->_newFields;
+	}
+
+	/**
+	 * Get fields which values need to be updated
+	 *
+	 * @return array fields which values need to be updated
+	 *
+	 */
+	public function getUpdatedFields()
+	{
+		return $this->_updatedFields;
+	}
+	/**
+	 * Get fields which values need to be updated
+	 *
+	 * @return array fields which values need to be updated
+	 *
+	 */ //felix
+	public function getUpdatedWhere()
+	{
+		return $this->_updatedWhere;
+	}
+
+	/**
+	 * Add values of a record to be added
+	 *
+	 * @param string $name name of the field
+	 *
+	 */
+	public function addDroppedField($name)
+	{
+		$this->_droppedFields[] = $name;
+	}
+
+	/**
+	 * Get fields that need to be dropped
+	 *
+	 * @return array fields that need to be dropped
+	 *
+	 */
+	public function getDroppedFields()
+	{
+		return $this->_droppedFields;
+	}
+
+	/**
+	 * Set the flag to drop the table
+	 *
+	 */
+	public function setFlagForDrop()
+	{
+		$this->_flagForDrop = true;
+	}
+
+	/**
+	 * Use to create a table
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */
+	public function createTable()
+	{
+		global $xoopsDB;
+		$query = $this->getStructure();
+		$query = 'CREATE TABLE `' . $this->name() . '` (' . $query . ") ENGINE=MyISAM COMMENT='The SmartFactory <www.smartfactory.ca>'";
+		//xoops_debug($query);
+		$ret = $xoopsDB->query($query);
+		if (!$ret) {
+			echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CREATE_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+		} else {
+			echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CREATE_TABLE, $this->name()) . '<br>';
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Use to drop a table
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */
+	public function dropTable()
+	{
+		global $xoopsDB;
+		$query = sprintf('DROP TABLE %s', $this->name());
+		$ret   = $xoopsDB->query($query);
+		if (!$ret) {
+			echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROP_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+
+			return false;
+		} else {
+			echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROP_TABLE, $this->name()) . '<br>';
+
+			return true;
+		}
+	}
+
+	/**
+	 * Use to alter a table
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */
+	public function alterTable()
+	{
+		global $xoopsDB;
+		$ret = true;
+
+		foreach ($this->getAlteredFields() as $alteredField) {
+			if (!$alteredField['newname']) {
+				$alteredField['newname'] = $alteredField['name'];
+			}
+
+			$query = sprintf('ALTER TABLE `%s` CHANGE `%s` `%s` %s', $this->name(), $alteredField['name'], $alteredField['newname'], $alteredField['properties']);
+			$ret   = $ret && $xoopsDB->query($query);
+			if ($alteredField['showerror']) {
+				if (!$ret) {
+					echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CHGFIELD_ERR, $alteredField['name'], $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+				} else {
+					echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CHGFIELD, $alteredField['name'], $this->name()) . '<br>';
+				}
+			}
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Use to add new fileds in the table
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */
+	public function addNewFields()
+	{
+		global $xoopsDB;
+		$ret = true;
+		foreach ($this->getNewFields() as $newField) {
+			$query = sprintf('ALTER TABLE `%s` ADD `%s` %s', $this->name(), $newField['name'], $newField['properties']);
+			//echo $query;
+			$ret = $ret && $xoopsDB->query($query);
+			if (!$ret) {
+				echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_NEWFIELD_ERR, $newField['name'], $this->name()) . '<br>';
+			} else {
+				echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_NEWFIELD, $newField['name'], $this->name()) . '<br>';
+			}
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Use to update fields values
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */
+	public function updateFieldsValues()
+	{
+		global $xoopsDB;
+		$ret = true;
+		foreach ($this->getUpdatedFields() as $updatedField) {
+			$query = sprintf('UPDATE %s SET %s = %s', $this->name(), $updatedField['name'], $updatedField['value']);
+			$ret   = $ret && $xoopsDB->query($query);
+			if (!$ret) {
+				echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+			} else {
+				echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . '<br>';
+			}
+		}
+
+		return $ret;
+	}
+	/**
+	 * Use to update fields values
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */ //felix
+	public function updateWhereValues()
+	{
+		global $xoopsDB;
+		$ret = true;
+		foreach ($this->getUpdatedWhere() as $updatedWhere) {
+			$query = sprintf('UPDATE %s SET %s = %s WHERE %s  %s', $this->name(), $updatedWhere['name'], $updatedWhere['value'], $updatedWhere['name'], $updatedWhere['where']);
+			//echo $query."<br>";
+			$ret = $ret && $xoopsDB->query($query);
+			if (!$ret) {
+				echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+			} else {
+				echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . '<br>';
+			}
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Use to drop fields
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */
+	public function dropFields()
+	{
+		global $xoopsDB;
+		$ret = true;
+		foreach ($this->getDroppedFields() as $droppedField) {
+			$query = sprintf('ALTER TABLE %s DROP %s', $this->name(), $droppedField);
+			$ret   = $ret && $xoopsDB->query($query);
+			if (!$ret) {
+				echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROPFIELD_ERR, $droppedField, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+			} else {
+				echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROPFIELD, $droppedField, $this->name()) . '<br>';
+			}
+		}
+
+		return $ret;
+	}
 }
 
 /**
@@ -545,328 +545,328 @@ 
  */
 class SmartobjectDbupdater
 {
-    public $_dbTypesArray;
-
-    /**
-     * SmartobjectDbupdater constructor.
-     */
-    public function __construct()
-    {
-        $this->_dbTypesArray[XOBJ_DTYPE_TXTBOX]       = 'varchar(255)';
-        $this->_dbTypesArray[XOBJ_DTYPE_TXTAREA]      = 'text';
-        $this->_dbTypesArray[XOBJ_DTYPE_INT]          = 'int(11)';
-        $this->_dbTypesArray[XOBJ_DTYPE_URL]          = 'varchar(255)';
-        $this->_dbTypesArray[XOBJ_DTYPE_EMAIL]        = 'varchar(255)';
-        $this->_dbTypesArray[XOBJ_DTYPE_ARRAY]        = 'text';
-        $this->_dbTypesArray[XOBJ_DTYPE_OTHER]        = 'text';
-        $this->_dbTypesArray[XOBJ_DTYPE_SOURCE]       = 'text';
-        $this->_dbTypesArray[XOBJ_DTYPE_STIME]        = 'int(11)';
-        $this->_dbTypesArray[XOBJ_DTYPE_MTIME]        = 'int(11)';
-        $this->_dbTypesArray[XOBJ_DTYPE_LTIME]        = 'int(11)';
-        $this->_dbTypesArray[XOBJ_DTYPE_SIMPLE_ARRAY] = 'text';
-        $this->_dbTypesArray[XOBJ_DTYPE_CURRENCY]     = 'text';
-        $this->_dbTypesArray[XOBJ_DTYPE_FLOAT]        = 'float';
-        $this->_dbTypesArray[XOBJ_DTYPE_TIME_ONLY]    = 'int(11)';
-        $this->_dbTypesArray[XOBJ_DTYPE_URLLINK]      = 'int(11)';
-        $this->_dbTypesArray[XOBJ_DTYPE_FILE]         = 'int(11)';
-        $this->_dbTypesArray[XOBJ_DTYPE_IMAGE]        = 'varchar(255)';
-    }
-
-    /**
-     * Use to execute a general query
-     *
-     * @param string $query   query that will be executed
-     * @param string $goodmsg message displayed on success
-     * @param string $badmsg  message displayed on error
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */
-    public function runQuery($query, $goodmsg, $badmsg)
-    {
-        global $xoopsDB;
-        $ret = $xoopsDB->query($query);
-        if (!$ret) {
-            echo "&nbsp;&nbsp;$badmsg<br>";
-
-            return false;
-        } else {
-            echo "&nbsp;&nbsp;$goodmsg<br>";
-
-            return true;
-        }
-    }
-
-    /**
-     * Use to rename a table
-     *
-     * @param string $from name of the table to rename
-     * @param string $to   new name of the renamed table
-     *
-     * @return bool true if success, false if an error occured
-     */
-    public function renameTable($from, $to)
-    {
-        global $xoopsDB;
-        $from  = $xoopsDB->prefix($from);
-        $to    = $xoopsDB->prefix($to);
-        $query = sprintf('ALTER TABLE %s RENAME %s', $from, $to);
-        $ret   = $xoopsDB->query($query);
-        if (!$ret) {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_RENAME_TABLE_ERR, $from) . '<br>';
-
-            return false;
-        } else {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_RENAME_TABLE, $from, $to) . '<br>';
-
-            return true;
-        }
-    }
-
-    /**
-     * Use to update a table
-     *
-     * @param object $table {@link SmartDbTable} that will be updated
-     *
-     * @see SmartDbTable
-     *
-     * @return bool true if success, false if an error occured
-     */
-    public function updateTable($table)
-    {
-        global $xoopsDB;
-        $ret = true;
-        // If table has a structure, create the table
-        if ($table->getStructure()) {
-            $ret = $table->createTable() && $ret;
-        }
-        // If table is flag for drop, drop it
-        if ($table->_flagForDrop) {
-            $ret = $table->dropTable() && $ret;
-        }
-        // If table has data, insert it
-        if ($table->getData()) {
-            $ret = $table->addData() && $ret;
-        }
-        // If table has new fields to be added, add them
-        if ($table->getNewFields()) {
-            $ret = $table->addNewFields() && $ret;
-        }
-        // If table has altered field, alter the table
-        if ($table->getAlteredFields()) {
-            $ret = $table->alterTable() && $ret;
-        }
-        // If table has updated field values, update the table
-        if ($table->getUpdatedFields()) {
-            $ret = $table->updateFieldsValues($table) && $ret;
-        }
-        // If table has dropped field, alter the table
-        if ($table->getDroppedFields()) {
-            $ret = $table->dropFields($table) && $ret;
-        }
-        //felix
-        // If table has updated field values, update the table
-        if ($table->getUpdatedWhere()) {
-            $ret = $table->UpdateWhereValues($table) && $ret;
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @param $module
-     * @param $item
-     */
-    public function automaticUpgrade($module, $item)
-    {
-        if (is_array($item)) {
-            foreach ($item as $v) {
-                $this->upgradeObjectItem($module, $v);
-            }
-        } else {
-            $this->upgradeObjectItem($module, $item);
-        }
-    }
-
-    /**
-     * @param $var
-     * @return string
-     */
-    public function getFieldTypeFromVar($var)
-    {
-        $ret = isset($this->_dbTypesArray[$var['data_type']]) ? $this->_dbTypesArray[$var['data_type']] : 'text';
-
-        return $ret;
-    }
-
-    /**
-     * @param         $var
-     * @param  bool   $key
-     * @return string
-     */
-    public function getFieldDefaultFromVar($var, $key = false)
-    {
-        if ($var['value']) {
-            return $var['value'];
-        } else {
-            if (in_array($var['data_type'], [
-                XOBJ_DTYPE_INT,
-                XOBJ_DTYPE_STIME,
-                XOBJ_DTYPE_MTIME,
-                XOBJ_DTYPE_LTIME,
-                XOBJ_DTYPE_TIME_ONLY,
-                XOBJ_DTYPE_URLLINK,
-                XOBJ_DTYPE_FILE
-            ])) {
-                return '0';
-            } else {
-                return '';
-            }
-        }
-    }
-
-    /**
-     * @param $module
-     * @param $item
-     * @return bool
-     */
-    public function upgradeObjectItem($module, $item)
-    {
-        $moduleHandler = xoops_getModuleHandler($item, $module);
-        if (!$moduleHandler) {
-            return false;
-        }
-
-        $table      = new SmartDbTable($module . '_' . $item);
-        $object     = $moduleHandler->create();
-        $objectVars = $object->getVars();
-
-        if (!$table->exists()) {
-            // table was never created, let's do it
-            $structure = '';
-            foreach ($objectVars as $key => $var) {
-                if ($var['persistent']) {
-                    $type = $this->getFieldTypeFromVar($var);
-                    if ($key == $moduleHandler->keyName) {
-                        $extra = 'auto_increment';
-                    } else {
-                        $default = $this->getFieldDefaultFromVar($var);
-                        $extra   = "default '$default'
+	public $_dbTypesArray;
+
+	/**
+	 * SmartobjectDbupdater constructor.
+	 */
+	public function __construct()
+	{
+		$this->_dbTypesArray[XOBJ_DTYPE_TXTBOX]       = 'varchar(255)';
+		$this->_dbTypesArray[XOBJ_DTYPE_TXTAREA]      = 'text';
+		$this->_dbTypesArray[XOBJ_DTYPE_INT]          = 'int(11)';
+		$this->_dbTypesArray[XOBJ_DTYPE_URL]          = 'varchar(255)';
+		$this->_dbTypesArray[XOBJ_DTYPE_EMAIL]        = 'varchar(255)';
+		$this->_dbTypesArray[XOBJ_DTYPE_ARRAY]        = 'text';
+		$this->_dbTypesArray[XOBJ_DTYPE_OTHER]        = 'text';
+		$this->_dbTypesArray[XOBJ_DTYPE_SOURCE]       = 'text';
+		$this->_dbTypesArray[XOBJ_DTYPE_STIME]        = 'int(11)';
+		$this->_dbTypesArray[XOBJ_DTYPE_MTIME]        = 'int(11)';
+		$this->_dbTypesArray[XOBJ_DTYPE_LTIME]        = 'int(11)';
+		$this->_dbTypesArray[XOBJ_DTYPE_SIMPLE_ARRAY] = 'text';
+		$this->_dbTypesArray[XOBJ_DTYPE_CURRENCY]     = 'text';
+		$this->_dbTypesArray[XOBJ_DTYPE_FLOAT]        = 'float';
+		$this->_dbTypesArray[XOBJ_DTYPE_TIME_ONLY]    = 'int(11)';
+		$this->_dbTypesArray[XOBJ_DTYPE_URLLINK]      = 'int(11)';
+		$this->_dbTypesArray[XOBJ_DTYPE_FILE]         = 'int(11)';
+		$this->_dbTypesArray[XOBJ_DTYPE_IMAGE]        = 'varchar(255)';
+	}
+
+	/**
+	 * Use to execute a general query
+	 *
+	 * @param string $query   query that will be executed
+	 * @param string $goodmsg message displayed on success
+	 * @param string $badmsg  message displayed on error
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */
+	public function runQuery($query, $goodmsg, $badmsg)
+	{
+		global $xoopsDB;
+		$ret = $xoopsDB->query($query);
+		if (!$ret) {
+			echo "&nbsp;&nbsp;$badmsg<br>";
+
+			return false;
+		} else {
+			echo "&nbsp;&nbsp;$goodmsg<br>";
+
+			return true;
+		}
+	}
+
+	/**
+	 * Use to rename a table
+	 *
+	 * @param string $from name of the table to rename
+	 * @param string $to   new name of the renamed table
+	 *
+	 * @return bool true if success, false if an error occured
+	 */
+	public function renameTable($from, $to)
+	{
+		global $xoopsDB;
+		$from  = $xoopsDB->prefix($from);
+		$to    = $xoopsDB->prefix($to);
+		$query = sprintf('ALTER TABLE %s RENAME %s', $from, $to);
+		$ret   = $xoopsDB->query($query);
+		if (!$ret) {
+			echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_RENAME_TABLE_ERR, $from) . '<br>';
+
+			return false;
+		} else {
+			echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_RENAME_TABLE, $from, $to) . '<br>';
+
+			return true;
+		}
+	}
+
+	/**
+	 * Use to update a table
+	 *
+	 * @param object $table {@link SmartDbTable} that will be updated
+	 *
+	 * @see SmartDbTable
+	 *
+	 * @return bool true if success, false if an error occured
+	 */
+	public function updateTable($table)
+	{
+		global $xoopsDB;
+		$ret = true;
+		// If table has a structure, create the table
+		if ($table->getStructure()) {
+			$ret = $table->createTable() && $ret;
+		}
+		// If table is flag for drop, drop it
+		if ($table->_flagForDrop) {
+			$ret = $table->dropTable() && $ret;
+		}
+		// If table has data, insert it
+		if ($table->getData()) {
+			$ret = $table->addData() && $ret;
+		}
+		// If table has new fields to be added, add them
+		if ($table->getNewFields()) {
+			$ret = $table->addNewFields() && $ret;
+		}
+		// If table has altered field, alter the table
+		if ($table->getAlteredFields()) {
+			$ret = $table->alterTable() && $ret;
+		}
+		// If table has updated field values, update the table
+		if ($table->getUpdatedFields()) {
+			$ret = $table->updateFieldsValues($table) && $ret;
+		}
+		// If table has dropped field, alter the table
+		if ($table->getDroppedFields()) {
+			$ret = $table->dropFields($table) && $ret;
+		}
+		//felix
+		// If table has updated field values, update the table
+		if ($table->getUpdatedWhere()) {
+			$ret = $table->UpdateWhereValues($table) && $ret;
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @param $module
+	 * @param $item
+	 */
+	public function automaticUpgrade($module, $item)
+	{
+		if (is_array($item)) {
+			foreach ($item as $v) {
+				$this->upgradeObjectItem($module, $v);
+			}
+		} else {
+			$this->upgradeObjectItem($module, $item);
+		}
+	}
+
+	/**
+	 * @param $var
+	 * @return string
+	 */
+	public function getFieldTypeFromVar($var)
+	{
+		$ret = isset($this->_dbTypesArray[$var['data_type']]) ? $this->_dbTypesArray[$var['data_type']] : 'text';
+
+		return $ret;
+	}
+
+	/**
+	 * @param         $var
+	 * @param  bool   $key
+	 * @return string
+	 */
+	public function getFieldDefaultFromVar($var, $key = false)
+	{
+		if ($var['value']) {
+			return $var['value'];
+		} else {
+			if (in_array($var['data_type'], [
+				XOBJ_DTYPE_INT,
+				XOBJ_DTYPE_STIME,
+				XOBJ_DTYPE_MTIME,
+				XOBJ_DTYPE_LTIME,
+				XOBJ_DTYPE_TIME_ONLY,
+				XOBJ_DTYPE_URLLINK,
+				XOBJ_DTYPE_FILE
+			])) {
+				return '0';
+			} else {
+				return '';
+			}
+		}
+	}
+
+	/**
+	 * @param $module
+	 * @param $item
+	 * @return bool
+	 */
+	public function upgradeObjectItem($module, $item)
+	{
+		$moduleHandler = xoops_getModuleHandler($item, $module);
+		if (!$moduleHandler) {
+			return false;
+		}
+
+		$table      = new SmartDbTable($module . '_' . $item);
+		$object     = $moduleHandler->create();
+		$objectVars = $object->getVars();
+
+		if (!$table->exists()) {
+			// table was never created, let's do it
+			$structure = '';
+			foreach ($objectVars as $key => $var) {
+				if ($var['persistent']) {
+					$type = $this->getFieldTypeFromVar($var);
+					if ($key == $moduleHandler->keyName) {
+						$extra = 'auto_increment';
+					} else {
+						$default = $this->getFieldDefaultFromVar($var);
+						$extra   = "default '$default'
 ";
-                    }
-                    $structure .= "`$key` $type not null $extra,
+					}
+					$structure .= "`$key` $type not null $extra,
 ";
-                }
-            }
-            $structure .= 'PRIMARY KEY  (`' . $moduleHandler->keyName . '`)
+				}
+			}
+			$structure .= 'PRIMARY KEY  (`' . $moduleHandler->keyName . '`)
 ';
-            $table->setStructure($structure);
-            if (!$this->updateTable($table)) {
-                /**
-                 * @todo trap the errors
-                 */
-            }
-        } else {
-            $existingFieldsArray = $table->getExistingFieldsArray();
-            foreach ($objectVars as $key => $var) {
-                if ($var['persistent']) {
-                    if (!isset($existingFieldsArray[$key])) {
-                        // the fiels does not exist, let's create it
-                        $type    = $this->getFieldTypeFromVar($var);
-                        $default = $this->getFieldDefaultFromVar($var);
-                        $table->addNewField($key, "$type not null default '$default'");
-                    } else {
-                        // if field already exists, let's check if the definition is correct
-                        $definition = strtolower($existingFieldsArray[$key]);
-                        $type       = $this->getFieldTypeFromVar($var);
-                        if ($key == $moduleHandler->keyName) {
-                            $extra = 'auto_increment';
-                        } else {
-                            $default = $this->getFieldDefaultFromVar($var, $key);
-                            $extra   = "default '$default'";
-                        }
-                        $actual_definition = "$type not null $extra";
-                        if ($definition != $actual_definition) {
-                            $table->addAlteredField($key, $actual_definition);
-                        }
-                    }
-                }
-            }
-
-            // check to see if there are some unused fields left in the table
-            foreach ($existingFieldsArray as $key => $v) {
-                if (!isset($objectVars[$key]) || !$objectVars[$key]['persistent']) {
-                    $table->addDroppedField($key);
-                }
-            }
-
-            if (!$this->updateTable($table)) {
-                /**
-                 * @todo trap the errors
-                 */
-            }
-        }
-    }
-
-    /**
-     * @param $module
-     * @return bool
-     */
-    public function moduleUpgrade(XoopsModule $module)
-    {
-        $dirname = $module->getVar('dirname');
-
-        ob_start();
-
-        $table = new SmartDbTable($dirname . '_meta');
-        if (!$table->exists()) {
-            $table->setStructure("
+			$table->setStructure($structure);
+			if (!$this->updateTable($table)) {
+				/**
+				 * @todo trap the errors
+				 */
+			}
+		} else {
+			$existingFieldsArray = $table->getExistingFieldsArray();
+			foreach ($objectVars as $key => $var) {
+				if ($var['persistent']) {
+					if (!isset($existingFieldsArray[$key])) {
+						// the fiels does not exist, let's create it
+						$type    = $this->getFieldTypeFromVar($var);
+						$default = $this->getFieldDefaultFromVar($var);
+						$table->addNewField($key, "$type not null default '$default'");
+					} else {
+						// if field already exists, let's check if the definition is correct
+						$definition = strtolower($existingFieldsArray[$key]);
+						$type       = $this->getFieldTypeFromVar($var);
+						if ($key == $moduleHandler->keyName) {
+							$extra = 'auto_increment';
+						} else {
+							$default = $this->getFieldDefaultFromVar($var, $key);
+							$extra   = "default '$default'";
+						}
+						$actual_definition = "$type not null $extra";
+						if ($definition != $actual_definition) {
+							$table->addAlteredField($key, $actual_definition);
+						}
+					}
+				}
+			}
+
+			// check to see if there are some unused fields left in the table
+			foreach ($existingFieldsArray as $key => $v) {
+				if (!isset($objectVars[$key]) || !$objectVars[$key]['persistent']) {
+					$table->addDroppedField($key);
+				}
+			}
+
+			if (!$this->updateTable($table)) {
+				/**
+				 * @todo trap the errors
+				 */
+			}
+		}
+	}
+
+	/**
+	 * @param $module
+	 * @return bool
+	 */
+	public function moduleUpgrade(XoopsModule $module)
+	{
+		$dirname = $module->getVar('dirname');
+
+		ob_start();
+
+		$table = new SmartDbTable($dirname . '_meta');
+		if (!$table->exists()) {
+			$table->setStructure("
               `metakey` varchar(50) NOT NULL default '',
               `metavalue` varchar(255) NOT NULL default '',
               PRIMARY KEY (`metakey`)");
-            $table->setData("'version',0");
-            if (!$this->updateTable($table)) {
-                /**
-                 * @todo trap the errors
-                 */
-            }
-        }
-
-        $dbVersion = smart_GetMeta('version', $dirname);
-        if (!$dbVersion) {
-            $dbVersion = 0;
-        }
-        $newDbVersion = constant(strtoupper($dirname . '_db_version')) ?: 0;
-        echo 'Database version: ' . $dbVersion . '<br>';
-        echo 'New database version: ' . $newDbVersion . '<br>';
-
-        if ($newDbVersion > $dbVersion) {
-            for ($i = $dbVersion + 1; $i <= $newDbVersion; ++$i) {
-                $upgrade_function = $dirname . '_db_upgrade_' . $i;
-                if (function_exists($upgrade_function)) {
-                    $upgrade_function();
-                }
-            }
-        }
-
-        echo '<code>' . _SDU_UPDATE_UPDATING_DATABASE . '<br>';
-
-        // if there is a function to execute for this DB version, let's do it
-        //$function_
-
-        $module_info = smart_getModuleInfo($dirname);
-        $this->automaticUpgrade($dirname, $module_info->modinfo['object_items']);
-
-        echo '</code>';
-
-        $feedback = ob_get_clean();
-        if (method_exists($module, 'setMessage')) {
-            $module->setMessage($feedback);
-        } else {
-            echo $feedback;
-        }
-        smart_SetMeta('version', $newDbVersion, $dirname); //Set meta version to current
-
-        return true;
-    }
+			$table->setData("'version',0");
+			if (!$this->updateTable($table)) {
+				/**
+				 * @todo trap the errors
+				 */
+			}
+		}
+
+		$dbVersion = smart_GetMeta('version', $dirname);
+		if (!$dbVersion) {
+			$dbVersion = 0;
+		}
+		$newDbVersion = constant(strtoupper($dirname . '_db_version')) ?: 0;
+		echo 'Database version: ' . $dbVersion . '<br>';
+		echo 'New database version: ' . $newDbVersion . '<br>';
+
+		if ($newDbVersion > $dbVersion) {
+			for ($i = $dbVersion + 1; $i <= $newDbVersion; ++$i) {
+				$upgrade_function = $dirname . '_db_upgrade_' . $i;
+				if (function_exists($upgrade_function)) {
+					$upgrade_function();
+				}
+			}
+		}
+
+		echo '<code>' . _SDU_UPDATE_UPDATING_DATABASE . '<br>';
+
+		// if there is a function to execute for this DB version, let's do it
+		//$function_
+
+		$module_info = smart_getModuleInfo($dirname);
+		$this->automaticUpgrade($dirname, $module_info->modinfo['object_items']);
+
+		echo '</code>';
+
+		$feedback = ob_get_clean();
+		if (method_exists($module, 'setMessage')) {
+			$module->setMessage($feedback);
+		} else {
+			echo $feedback;
+		}
+		smart_SetMeta('version', $newDbVersion, $dirname); //Set meta version to current
+
+		return true;
+	}
 }

Spacing +33 added lines, -33 removed lines

@@ -18,15 +18,15 @@ 
  */
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
 if (!defined('SMARTOBJECT_ROOT_PATH')) {
-    require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
+    require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php';
 }
 /**
  * Include the language constants for the SmartObjectDBUpdater
  */
 global $xoopsConfig;
-$common_file = SMARTOBJECT_ROOT_PATH . 'language/' . $xoopsConfig['language'] . '/smartdbupdater.php';
+$common_file = SMARTOBJECT_ROOT_PATH.'language/'.$xoopsConfig['language'].'/smartdbupdater.php';
 if (!file_exists($common_file)) {
-    $common_file = SMARTOBJECT_ROOT_PATH . 'language/english/smartdbupdater.php';
+    $common_file = SMARTOBJECT_ROOT_PATH.'language/english/smartdbupdater.php';
 }
 include $common_file;
 
@@ -123,20 +123,20 @@ 
     public function getExistingFieldsArray()
     {
         global $xoopsDB;
-        $result = $xoopsDB->query('SHOW COLUMNS FROM ' . $this->name());
+        $result = $xoopsDB->query('SHOW COLUMNS FROM '.$this->name());
         while ($existing_field = $xoopsDB->fetchArray($result)) {
             $fields[$existing_field['Field']] = $existing_field['Type'];
             if ('YES' !== $existing_field['Null']) {
                 $fields[$existing_field['Field']] .= ' NOT NULL';
             }
             if ($existing_field['Extra']) {
-                $fields[$existing_field['Field']] .= ' ' . $existing_field['Extra'];
+                $fields[$existing_field['Field']] .= ' '.$existing_field['Extra'];
             }
             if (!(null === $existing_field['Default'])
                 && ($existing_field['Default']
                     || '' === $existing_field['Default']
                     || 0 == $existing_field['Default'])) {
-                $fields[$existing_field['Field']] .= " default '" . $existing_field['Default'] . "'";
+                $fields[$existing_field['Field']] .= " default '".$existing_field['Default']."'";
             }
         }
 
@@ -222,9 +222,9 @@ 
             $query = sprintf('INSERT INTO %s VALUES (%s)', $this->name(), $data);
             $ret   = $xoopsDB->query($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_ADD_DATA_ERR, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_ADD_DATA_ERR, $this->name()).'<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_ADD_DATA, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_ADD_DATA, $this->name()).'<br>';
             }
         }
 
@@ -376,13 +376,13 @@ 
     {
         global $xoopsDB;
         $query = $this->getStructure();
-        $query = 'CREATE TABLE `' . $this->name() . '` (' . $query . ") ENGINE=MyISAM COMMENT='The SmartFactory <www.smartfactory.ca>'";
+        $query = 'CREATE TABLE `'.$this->name().'` ('.$query.") ENGINE=MyISAM COMMENT='The SmartFactory <www.smartfactory.ca>'";
         //xoops_debug($query);
         $ret = $xoopsDB->query($query);
         if (!$ret) {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CREATE_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CREATE_TABLE_ERR, $this->name()).' ('.$xoopsDB->error().')<br>';
         } else {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CREATE_TABLE, $this->name()) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CREATE_TABLE, $this->name()).'<br>';
         }
 
         return $ret;
@@ -400,11 +400,11 @@ 
         $query = sprintf('DROP TABLE %s', $this->name());
         $ret   = $xoopsDB->query($query);
         if (!$ret) {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROP_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROP_TABLE_ERR, $this->name()).' ('.$xoopsDB->error().')<br>';
 
             return false;
         } else {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROP_TABLE, $this->name()) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROP_TABLE, $this->name()).'<br>';
 
             return true;
         }
@@ -430,9 +430,9 @@ 
             $ret   = $ret && $xoopsDB->query($query);
             if ($alteredField['showerror']) {
                 if (!$ret) {
-                    echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CHGFIELD_ERR, $alteredField['name'], $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+                    echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CHGFIELD_ERR, $alteredField['name'], $this->name()).' ('.$xoopsDB->error().')<br>';
                 } else {
-                    echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CHGFIELD, $alteredField['name'], $this->name()) . '<br>';
+                    echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CHGFIELD, $alteredField['name'], $this->name()).'<br>';
                 }
             }
         }
@@ -455,9 +455,9 @@ 
             //echo $query;
             $ret = $ret && $xoopsDB->query($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_NEWFIELD_ERR, $newField['name'], $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_NEWFIELD_ERR, $newField['name'], $this->name()).'<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_NEWFIELD, $newField['name'], $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_NEWFIELD, $newField['name'], $this->name()).'<br>';
             }
         }
 
@@ -478,9 +478,9 @@ 
             $query = sprintf('UPDATE %s SET %s = %s', $this->name(), $updatedField['name'], $updatedField['value']);
             $ret   = $ret && $xoopsDB->query($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()).' ('.$xoopsDB->error().')<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()).'<br>';
             }
         }
 
@@ -501,9 +501,9 @@ 
             //echo $query."<br>";
             $ret = $ret && $xoopsDB->query($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()).' ('.$xoopsDB->error().')<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()).'<br>';
             }
         }
 
@@ -524,9 +524,9 @@ 
             $query = sprintf('ALTER TABLE %s DROP %s', $this->name(), $droppedField);
             $ret   = $ret && $xoopsDB->query($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROPFIELD_ERR, $droppedField, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROPFIELD_ERR, $droppedField, $this->name()).' ('.$xoopsDB->error().')<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROPFIELD, $droppedField, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROPFIELD, $droppedField, $this->name()).'<br>';
             }
         }
 
@@ -613,11 +613,11 @@ 
         $query = sprintf('ALTER TABLE %s RENAME %s', $from, $to);
         $ret   = $xoopsDB->query($query);
         if (!$ret) {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_RENAME_TABLE_ERR, $from) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_RENAME_TABLE_ERR, $from).'<br>';
 
             return false;
         } else {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_RENAME_TABLE, $from, $to) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_RENAME_TABLE, $from, $to).'<br>';
 
             return true;
         }
@@ -737,7 +737,7 @@ 
             return false;
         }
 
-        $table      = new SmartDbTable($module . '_' . $item);
+        $table      = new SmartDbTable($module.'_'.$item);
         $object     = $moduleHandler->create();
         $objectVars = $object->getVars();
 
@@ -758,7 +758,7 @@ 
 ";
                 }
             }
-            $structure .= 'PRIMARY KEY  (`' . $moduleHandler->keyName . '`)
+            $structure .= 'PRIMARY KEY  (`'.$moduleHandler->keyName.'`)
 ';
             $table->setStructure($structure);
             if (!$this->updateTable($table)) {
@@ -818,7 +818,7 @@ 
 
         ob_start();
 
-        $table = new SmartDbTable($dirname . '_meta');
+        $table = new SmartDbTable($dirname.'_meta');
         if (!$table->exists()) {
             $table->setStructure("
               `metakey` varchar(50) NOT NULL default '',
@@ -836,20 +836,20 @@ 
         if (!$dbVersion) {
             $dbVersion = 0;
         }
-        $newDbVersion = constant(strtoupper($dirname . '_db_version')) ?: 0;
-        echo 'Database version: ' . $dbVersion . '<br>';
-        echo 'New database version: ' . $newDbVersion . '<br>';
+        $newDbVersion = constant(strtoupper($dirname.'_db_version')) ?: 0;
+        echo 'Database version: '.$dbVersion.'<br>';
+        echo 'New database version: '.$newDbVersion.'<br>';
 
         if ($newDbVersion > $dbVersion) {
             for ($i = $dbVersion + 1; $i <= $newDbVersion; ++$i) {
-                $upgrade_function = $dirname . '_db_upgrade_' . $i;
+                $upgrade_function = $dirname.'_db_upgrade_'.$i;
                 if (function_exists($upgrade_function)) {
                     $upgrade_function();
                 }
             }
         }
 
-        echo '<code>' . _SDU_UPDATE_UPDATING_DATABASE . '<br>';
+        echo '<code>'._SDU_UPDATE_UPDATING_DATABASE.'<br>';
 
         // if there is a function to execute for this DB version, let's do it
         //$function_

class/utility.php

Indentation +138 added lines, -138 removed lines

@@ -5,149 +5,149 @@
  */
 class SmartObjectUtility extends XoopsObject
 {
-    /**
-     * Function responsible for checking if a directory exists, we can also write in and create an index.html file
-     *
-     * @param string $folder The full path of the directory to check
-     *
-     * @return void
-     */
-    public static function createFolder($folder)
-    {
-        //        try {
-        //            if (!mkdir($folder) && !is_dir($folder)) {
-        //                throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
-        //            } else {
-        //                file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
-        //            }
-        //        }
-        //        catch (Exception $e) {
-        //            echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
-        //        }
-        try {
-            if (!file_exists($folder)) {
-                if (!mkdir($folder) && !is_dir($folder)) {
-                    throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
-                } else {
-                    file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
-                }
-            }
-        } catch (Exception $e) {
-            echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
-        }
-    }
+	/**
+	 * Function responsible for checking if a directory exists, we can also write in and create an index.html file
+	 *
+	 * @param string $folder The full path of the directory to check
+	 *
+	 * @return void
+	 */
+	public static function createFolder($folder)
+	{
+		//        try {
+		//            if (!mkdir($folder) && !is_dir($folder)) {
+		//                throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
+		//            } else {
+		//                file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
+		//            }
+		//        }
+		//        catch (Exception $e) {
+		//            echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
+		//        }
+		try {
+			if (!file_exists($folder)) {
+				if (!mkdir($folder) && !is_dir($folder)) {
+					throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
+				} else {
+					file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
+				}
+			}
+		} catch (Exception $e) {
+			echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
+		}
+	}
 
-    /**
-     * @param $file
-     * @param $folder
-     * @return bool
-     */
-    public static function copyFile($file, $folder)
-    {
-        return copy($file, $folder);
-        //        try {
-        //            if (!is_dir($folder)) {
-        //                throw new \RuntimeException(sprintf('Unable to copy file as: %s ', $folder));
-        //            } else {
-        //                return copy($file, $folder);
-        //            }
-        //        } catch (Exception $e) {
-        //            echo 'Caught exception: ', $e->getMessage(), "\n", "<br>";
-        //        }
-        //        return false;
-    }
+	/**
+	 * @param $file
+	 * @param $folder
+	 * @return bool
+	 */
+	public static function copyFile($file, $folder)
+	{
+		return copy($file, $folder);
+		//        try {
+		//            if (!is_dir($folder)) {
+		//                throw new \RuntimeException(sprintf('Unable to copy file as: %s ', $folder));
+		//            } else {
+		//                return copy($file, $folder);
+		//            }
+		//        } catch (Exception $e) {
+		//            echo 'Caught exception: ', $e->getMessage(), "\n", "<br>";
+		//        }
+		//        return false;
+	}
 
-    /**
-     * @param $src
-     * @param $dst
-     */
-    public static function recurseCopy($src, $dst)
-    {
-        $dir = opendir($src);
-        //    @mkdir($dst);
-        while (false !== ($file = readdir($dir))) {
-            if (('.' !== $file) && ('..' !== $file)) {
-                if (is_dir($src . '/' . $file)) {
-                    self::recurseCopy($src . '/' . $file, $dst . '/' . $file);
-                } else {
-                    copy($src . '/' . $file, $dst . '/' . $file);
-                }
-            }
-        }
-        closedir($dir);
-    }
+	/**
+	 * @param $src
+	 * @param $dst
+	 */
+	public static function recurseCopy($src, $dst)
+	{
+		$dir = opendir($src);
+		//    @mkdir($dst);
+		while (false !== ($file = readdir($dir))) {
+			if (('.' !== $file) && ('..' !== $file)) {
+				if (is_dir($src . '/' . $file)) {
+					self::recurseCopy($src . '/' . $file, $dst . '/' . $file);
+				} else {
+					copy($src . '/' . $file, $dst . '/' . $file);
+				}
+			}
+		}
+		closedir($dir);
+	}
 
-    /**
-     *
-     * Verifies XOOPS version meets minimum requirements for this module
-     * @static
-     * @param XoopsModule $module
-     *
-     * @param null|string $requiredVer
-     * @return bool true if meets requirements, false if not
-     */
-    public static function checkVerXoops(XoopsModule $module = null, $requiredVer = null)
-    {
-        $moduleDirName = basename(dirname(__DIR__));
-        if (null === $module) {
-            $module = XoopsModule::getByDirname($moduleDirName);
-        }
-        xoops_loadLanguage('admin', $moduleDirName);
-        //check for minimum XOOPS version
-        $currentVer = substr(XOOPS_VERSION, 6); // get the numeric part of string
-        $currArray  = explode('.', $currentVer);
-        if (null === $requiredVer) {
-            $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
-        }
-        $reqArray = explode('.', $requiredVer);
-        $success  = true;
-        foreach ($reqArray as $k => $v) {
-            if (isset($currArray[$k])) {
-                if ($currArray[$k] > $v) {
-                    break;
-                } elseif ($currArray[$k] == $v) {
-                    continue;
-                } else {
-                    $success = false;
-                    break;
-                }
-            } else {
-                if ((int)$v > 0) { // handles versions like x.x.x.0_RC2
-                    $success = false;
-                    break;
-                }
-            }
-        }
+	/**
+	 *
+	 * Verifies XOOPS version meets minimum requirements for this module
+	 * @static
+	 * @param XoopsModule $module
+	 *
+	 * @param null|string $requiredVer
+	 * @return bool true if meets requirements, false if not
+	 */
+	public static function checkVerXoops(XoopsModule $module = null, $requiredVer = null)
+	{
+		$moduleDirName = basename(dirname(__DIR__));
+		if (null === $module) {
+			$module = XoopsModule::getByDirname($moduleDirName);
+		}
+		xoops_loadLanguage('admin', $moduleDirName);
+		//check for minimum XOOPS version
+		$currentVer = substr(XOOPS_VERSION, 6); // get the numeric part of string
+		$currArray  = explode('.', $currentVer);
+		if (null === $requiredVer) {
+			$requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
+		}
+		$reqArray = explode('.', $requiredVer);
+		$success  = true;
+		foreach ($reqArray as $k => $v) {
+			if (isset($currArray[$k])) {
+				if ($currArray[$k] > $v) {
+					break;
+				} elseif ($currArray[$k] == $v) {
+					continue;
+				} else {
+					$success = false;
+					break;
+				}
+			} else {
+				if ((int)$v > 0) { // handles versions like x.x.x.0_RC2
+					$success = false;
+					break;
+				}
+			}
+		}
 
-        if (false === $success) {
-            $module->setErrors(sprintf(_AM_SOBJECT_ERROR_BAD_XOOPS, $requiredVer, $currentVer));
-        }
+		if (false === $success) {
+			$module->setErrors(sprintf(_AM_SOBJECT_ERROR_BAD_XOOPS, $requiredVer, $currentVer));
+		}
 
-        return $success;
-    }
+		return $success;
+	}
 
-    /**
-     *
-     * Verifies PHP version meets minimum requirements for this module
-     * @static
-     * @param XoopsModule $module
-     *
-     * @return bool true if meets requirements, false if not
-     */
-    public static function checkVerPhp(XoopsModule $module)
-    {
-        xoops_loadLanguage('admin', $module->dirname());
-        // check for minimum PHP version
-        $success = true;
-        $verNum  = PHP_VERSION;
-        $reqVer  = $module->getInfo('min_php');
-        if (false !== $reqVer && '' !== $reqVer) {
-            if (version_compare($verNum, $reqVer, '<')) {
-                $module->setErrors(sprintf(_AM_SOBJECT_ERROR_BAD_PHP, $reqVer, $verNum));
-                $success = false;
-            }
-        }
+	/**
+	 *
+	 * Verifies PHP version meets minimum requirements for this module
+	 * @static
+	 * @param XoopsModule $module
+	 *
+	 * @return bool true if meets requirements, false if not
+	 */
+	public static function checkVerPhp(XoopsModule $module)
+	{
+		xoops_loadLanguage('admin', $module->dirname());
+		// check for minimum PHP version
+		$success = true;
+		$verNum  = PHP_VERSION;
+		$reqVer  = $module->getInfo('min_php');
+		if (false !== $reqVer && '' !== $reqVer) {
+			if (version_compare($verNum, $reqVer, '<')) {
+				$module->setErrors(sprintf(_AM_SOBJECT_ERROR_BAD_PHP, $reqVer, $verNum));
+				$success = false;
+			}
+		}
 
-        return $success;
-    }
+		return $success;
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -29,7 +29,7 @@ 
                 if (!mkdir($folder) && !is_dir($folder)) {
                     throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
                 } else {
-                    file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
+                    file_put_contents($folder.'/index.html', '<script>history.go(-1);</script>');
                 }
             }
         } catch (Exception $e) {
@@ -67,10 +67,10 @@ 
         //    @mkdir($dst);
         while (false !== ($file = readdir($dir))) {
             if (('.' !== $file) && ('..' !== $file)) {
-                if (is_dir($src . '/' . $file)) {
-                    self::recurseCopy($src . '/' . $file, $dst . '/' . $file);
+                if (is_dir($src.'/'.$file)) {
+                    self::recurseCopy($src.'/'.$file, $dst.'/'.$file);
                 } else {
-                    copy($src . '/' . $file, $dst . '/' . $file);
+                    copy($src.'/'.$file, $dst.'/'.$file);
                 }
             }
         }
@@ -97,7 +97,7 @@ 
         $currentVer = substr(XOOPS_VERSION, 6); // get the numeric part of string
         $currArray  = explode('.', $currentVer);
         if (null === $requiredVer) {
-            $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
+            $requiredVer = ''.$module->getInfo('min_xoops'); //making sure it's a string
         }
         $reqArray = explode('.', $requiredVer);
         $success  = true;
@@ -112,7 +112,7 @@ 
                     break;
                 }
             } else {
-                if ((int)$v > 0) { // handles versions like x.x.x.0_RC2
+                if ((int) $v > 0) { // handles versions like x.x.x.0_RC2
                     $success = false;
                     break;
                 }