mambax7 / smartobject

include/projax_/classes/Prototype.php

Indentation +448 added lines, -448 removed lines

@@ -15,452 +15,452 @@
  */
 class Prototype extends JavaScript
 {
-    public $CALLBACKS = array(
-        'uninitialized',
-        'loading',
-        'loaded',
-        'interactive',
-        'complete',
-        'failure',
-        'success'
-    );
-
-    public $AJAX_OPTIONS = array(
-        '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 = array();
-        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) : array();
-
-        if (isset($options['type']) && $option['type'] === 'synchronous') {
-            $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(array($id), (is_array($options_for_render) ? $options_for_render : array($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(array($id), (is_array($options_for_render) ? $options_for_render : array($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(array($id), (is_array($options_for_render) ? $options_for_render : array($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 = array(
+		'uninitialized',
+		'loading',
+		'loaded',
+		'interactive',
+		'complete',
+		'failure',
+		'success'
+	);
+
+	public $AJAX_OPTIONS = array(
+		'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 = array();
+		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) : array();
+
+		if (isset($options['type']) && $option['type'] === 'synchronous') {
+			$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(array($id), (is_array($options_for_render) ? $options_for_render : array($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(array($id), (is_array($options_for_render) ? $options_for_render : array($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(array($id), (is_array($options_for_render) ? $options_for_render : array($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/update.php

Indentation +182 added lines, -182 removed lines

@@ -28,26 +28,26 @@ 
  */
 function xoops_module_update_smartobject(XoopsModule $module)
 {
-    ob_start();
+	ob_start();
 
-    $dbVersion = smart_GetMeta('version', 'smartobject');
-    if (!$dbVersion) {
-        $dbVersion = 0;
-    }
+	$dbVersion = smart_GetMeta('version', 'smartobject');
+	if (!$dbVersion) {
+		$dbVersion = 0;
+	}
 
-    $dbupdater = new SmartobjectDbupdater();
+	$dbupdater = new SmartobjectDbupdater();
 
-    echo '<code>' . _SDU_UPDATE_UPDATING_DATABASE . '<br>';
+	echo '<code>' . _SDU_UPDATE_UPDATING_DATABASE . '<br>';
 
-    // db migrate version = 1
-    $newDbVersion = 1;
-    if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br>';
+	// db migrate version = 1
+	$newDbVersion = 1;
+	if ($dbVersion < $newDbVersion) {
+		echo 'Database migrate to version ' . $newDbVersion . '<br>';
 
-        // Create table smartobject_link
-        $table = new SmartDbTable('smartobject_link');
-        if (!$table->exists()) {
-            $table->setStructure("CREATE TABLE %s (
+		// Create table smartobject_link
+		$table = new SmartDbTable('smartobject_link');
+		if (!$table->exists()) {
+			$table->setStructure("CREATE TABLE %s (
               `linkid` int(11) NOT NULL auto_increment,
               `from_uid` int(11) NOT NULL default '0',
               `from_email` varchar(255) NOT NULL default '',
@@ -64,63 +64,63 @@ 
               PRIMARY KEY  (`linkid`)
             ) ENGINE=MyISAM COMMENT='SmartObject by The SmartFactory <www.smartfactory.ca>' AUTO_INCREMENT=1 ;");
 
-            if (!$dbupdater->updateTable($table)) {
-                /**
-                 * @todo trap the errors
-                 */
-            }
-        }
-        unset($table);
-        // Create table smartobject_link
-        $table = new SmartDbTable('smartobject_link');
-        if (!$table->fieldExists('date')) {
-            $table->addNewField('date', "int(11) NOT NULL default '0'");
-            if (!$dbupdater->updateTable($table)) {
-                /**
-                 * @todo trap the errors
-                 */
-            }
-        }
-        unset($table);
-
-        // Create table smartobject_tag
-        $table = new SmartDbTable('smartobject_tag');
-        if (!$table->exists()) {
-            $table->setStructure("CREATE TABLE %s (
+			if (!$dbupdater->updateTable($table)) {
+				/**
+				 * @todo trap the errors
+				 */
+			}
+		}
+		unset($table);
+		// Create table smartobject_link
+		$table = new SmartDbTable('smartobject_link');
+		if (!$table->fieldExists('date')) {
+			$table->addNewField('date', "int(11) NOT NULL default '0'");
+			if (!$dbupdater->updateTable($table)) {
+				/**
+				 * @todo trap the errors
+				 */
+			}
+		}
+		unset($table);
+
+		// Create table smartobject_tag
+		$table = new SmartDbTable('smartobject_tag');
+		if (!$table->exists()) {
+			$table->setStructure("CREATE TABLE %s (
               `tagid` int(11) NOT NULL auto_increment,
               `name` varchar(255) NOT NULL default '',
               `description` TEXT NOT NULL,
               PRIMARY KEY  (`id`)
             ) ENGINE=MyISAM COMMENT='SmartObject by The SmartFactory <www.smartfactory.ca>' AUTO_INCREMENT=1 ;");
 
-            if (!$dbupdater->updateTable($table)) {
-                /**
-                 * @todo trap the errors
-                 */
-            }
-        }
-
-        // Create table smartobject_tag_text
-        $table = new SmartDbTable('smartobject_tag_text');
-        if (!$table->exists()) {
-            $table->setStructure("CREATE TABLE %s (
+			if (!$dbupdater->updateTable($table)) {
+				/**
+				 * @todo trap the errors
+				 */
+			}
+		}
+
+		// Create table smartobject_tag_text
+		$table = new SmartDbTable('smartobject_tag_text');
+		if (!$table->exists()) {
+			$table->setStructure("CREATE TABLE %s (
               `tagid` int(11) NOT NULL default 0,
               `language` varchar(255) NOT NULL default '',
               `value` TEXT NOT NULL,
               PRIMARY KEY  (`id`, `language`)
             ) ENGINE=MyISAM COMMENT='SmartObject by The SmartFactory <www.smartfactory.ca>' AUTO_INCREMENT=1 ;");
 
-            if (!$dbupdater->updateTable($table)) {
-                /**
-                 * @todo trap the errors
-                 */
-            }
-        }
-
-        // Create table smartobject_adsense
-        $table = new SmartDbTable('smartobject_adsense');
-        if (!$table->exists()) {
-            $table->setStructure("
+			if (!$dbupdater->updateTable($table)) {
+				/**
+				 * @todo trap the errors
+				 */
+			}
+		}
+
+		// Create table smartobject_adsense
+		$table = new SmartDbTable('smartobject_adsense');
+		if (!$table->exists()) {
+			$table->setStructure("
   `adsenseid` int(11) NOT NULL auto_increment,
   `format` VARCHAR(100) NOT NULL,
   `description` TEXT NOT NULL,
@@ -134,23 +134,23 @@ 
   `tag` varchar(50) NOT NULL default '',
   PRIMARY KEY  (`adsenseid`)
             ");
-        }
-
-        if (!$dbupdater->updateTable($table)) {
-            /**
-             * @todo trap the errors
-             */
-        }
-    }
-    // db migrate version = 2
-    $newDbVersion = 2;
-    if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br>';
-
-        // Create table smartobject_rating
-        $table = new SmartDbTable('smartobject_rating');
-        if (!$table->exists()) {
-            $table->setStructure('
+		}
+
+		if (!$dbupdater->updateTable($table)) {
+			/**
+			 * @todo trap the errors
+			 */
+		}
+	}
+	// db migrate version = 2
+	$newDbVersion = 2;
+	if ($dbVersion < $newDbVersion) {
+		echo 'Database migrate to version ' . $newDbVersion . '<br>';
+
+		// Create table smartobject_rating
+		$table = new SmartDbTable('smartobject_rating');
+		if (!$table->exists()) {
+			$table->setStructure('
   `ratingid` int(11) NOT NULL auto_increment,
   `dirname` VARCHAR(255) NOT NULL,
   `item` VARCHAR(255) NOT NULL,
@@ -161,36 +161,36 @@ 
   PRIMARY KEY  (`ratingid`),
   UNIQUE (`dirname`, `item`, `itemid`, `uid`)
             ');
-        }
-
-        if (!$dbupdater->updateTable($table)) {
-            /**
-             * @todo trap the errors
-             */
-        }
-
-        // Create table smartobject_currency
-        $table = new SmartDbTable('smartobject_currency');
-        $table->setData("2, 'EUR', 'Euro', '�', 0.65, 0");
-        $table->setData("3, 'USD', 'American dollar', '$', 0.9, 0");
-        $table->setData("1, 'CAD', 'Canadian dollar', '$', 1, 1");
-
-        if (!$dbupdater->updateTable($table)) {
-            /**
-             * @todo trap the errors
-             */
-        }
-    }
-
-    // db migrate version = 3
-    $newDbVersion = 3;
-    if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br>';
-
-        // Create table smartobject_customtag
-        $table = new SmartDbTable('smartobject_customtag');
-        if (!$table->exists()) {
-            $table->setStructure('
+		}
+
+		if (!$dbupdater->updateTable($table)) {
+			/**
+			 * @todo trap the errors
+			 */
+		}
+
+		// Create table smartobject_currency
+		$table = new SmartDbTable('smartobject_currency');
+		$table->setData("2, 'EUR', 'Euro', '�', 0.65, 0");
+		$table->setData("3, 'USD', 'American dollar', '$', 0.9, 0");
+		$table->setData("1, 'CAD', 'Canadian dollar', '$', 1, 1");
+
+		if (!$dbupdater->updateTable($table)) {
+			/**
+			 * @todo trap the errors
+			 */
+		}
+	}
+
+	// db migrate version = 3
+	$newDbVersion = 3;
+	if ($dbVersion < $newDbVersion) {
+		echo 'Database migrate to version ' . $newDbVersion . '<br>';
+
+		// Create table smartobject_customtag
+		$table = new SmartDbTable('smartobject_customtag');
+		if (!$table->exists()) {
+			$table->setStructure('
               `customtagid` int(11) NOT NULL auto_increment,
               `name` VARCHAR(255) NOT NULL,
               `description` TEXT NOT NULL,
@@ -198,24 +198,24 @@ 
               `language` TEXT NOT NULL,
               PRIMARY KEY  (`customtagid`)
             ');
-        }
-
-        if (!$dbupdater->updateTable($table)) {
-            /**
-             * @todo trap the errors
-             */
-        }
-    }
-
-    // db migrate version = 4
-    $newDbVersion = 4;
-    if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br>';
-
-        // Create table smartobject_currency
-        $table = new SmartDbTable('smartobject_currency');
-        if (!$table->exists()) {
-            $table->setStructure('
+		}
+
+		if (!$dbupdater->updateTable($table)) {
+			/**
+			 * @todo trap the errors
+			 */
+		}
+	}
+
+	// db migrate version = 4
+	$newDbVersion = 4;
+	if ($dbVersion < $newDbVersion) {
+		echo 'Database migrate to version ' . $newDbVersion . '<br>';
+
+		// Create table smartobject_currency
+		$table = new SmartDbTable('smartobject_currency');
+		if (!$table->exists()) {
+			$table->setStructure('
               `currencyid` int(11) NOT NULL auto_increment,
               `iso4217` VARCHAR(5) NOT NULL,
               `name` VARCHAR(255) NOT NULL,
@@ -224,46 +224,46 @@ 
               `default_currency` int(1) NOT NULL,
               PRIMARY KEY  (`currencyid`)
             ');
-        }
-
-        if (!$dbupdater->updateTable($table)) {
-            /**
-             * @todo trap the errors
-             */
-        }
-    }
-
-    // db migrate version = 6
-    $newDbVersion = 6;
-    if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br>';
-    }
-
-    $newDbVersion = 7;
-    if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br>';
-
-        // Create table smartobject_file
-        $table = new SmartDbTable('smartobject_file');
-        if (!$table->exists()) {
-            $table->setStructure('
+		}
+
+		if (!$dbupdater->updateTable($table)) {
+			/**
+			 * @todo trap the errors
+			 */
+		}
+	}
+
+	// db migrate version = 6
+	$newDbVersion = 6;
+	if ($dbVersion < $newDbVersion) {
+		echo 'Database migrate to version ' . $newDbVersion . '<br>';
+	}
+
+	$newDbVersion = 7;
+	if ($dbVersion < $newDbVersion) {
+		echo 'Database migrate to version ' . $newDbVersion . '<br>';
+
+		// Create table smartobject_file
+		$table = new SmartDbTable('smartobject_file');
+		if (!$table->exists()) {
+			$table->setStructure('
               `fileid` int(11) NOT NULL auto_increment,
               `caption` varchar(255) collate latin1_general_ci NOT NULL,
               `url` varchar(255) collate latin1_general_ci NOT NULL,
               `description` text collate latin1_general_ci NOT NULL,
                PRIMARY KEY  (`fileid`)
             ');
-            if (!$dbupdater->updateTable($table)) {
-                /**
-                 * @todo trap the errors
-                 */
-            }
-        }
-        unset($table);
-        // Create table smartobject_urllink
-        $table = new SmartDbTable('smartobject_urllink');
-        if (!$table->exists()) {
-            $table->setStructure('
+			if (!$dbupdater->updateTable($table)) {
+				/**
+				 * @todo trap the errors
+				 */
+			}
+		}
+		unset($table);
+		// Create table smartobject_urllink
+		$table = new SmartDbTable('smartobject_urllink');
+		if (!$table->exists()) {
+			$table->setStructure('
               `urllinkid` int(11) NOT NULL auto_increment,
               `caption` varchar(255) collate latin1_general_ci NOT NULL,
               `url` varchar(255) collate latin1_general_ci NOT NULL,
@@ -271,25 +271,25 @@ 
               `target` varchar(10) collate latin1_general_ci NOT NULL,
                 PRIMARY KEY  (`urllinkid`)
             ');
-            if (!$dbupdater->updateTable($table)) {
-                /**
-                 * @todo trap the errors
-                 */
-            }
-        }
-        unset($table);
-    }
-    echo '</code>';
-
-    $feedback = ob_get_clean();
-    if (method_exists($module, 'setMessage')) {
-        $module->setMessage($feedback);
-    } else {
-        echo $feedback;
-    }
-    smart_SetMeta('version', $newDbVersion, 'smartobject'); //Set meta version to current
-
-    return true;
+			if (!$dbupdater->updateTable($table)) {
+				/**
+				 * @todo trap the errors
+				 */
+			}
+		}
+		unset($table);
+	}
+	echo '</code>';
+
+	$feedback = ob_get_clean();
+	if (method_exists($module, 'setMessage')) {
+		$module->setMessage($feedback);
+	} else {
+		echo $feedback;
+	}
+	smart_SetMeta('version', $newDbVersion, 'smartobject'); //Set meta version to current
+
+	return true;
 }
 
 /**
@@ -298,10 +298,10 @@ 
  */
 function xoops_module_install_smartobject(XoopsModule $module)
 {
-    ob_start();
+	ob_start();
 
-    echo 'Using the ImpressCMS onInstall event';
-    $feedback = ob_get_clean();
+	echo 'Using the ImpressCMS onInstall event';
+	$feedback = ob_get_clean();
 
-    return $feedback;
+	return $feedback;
 }

plugins/smartband.php

Indentation +10 added lines, -10 removed lines

@@ -9,17 +9,17 @@
 
 function smartobject_plugin_smartband()
 {
-    global $xoopsConfig;
-    require_once XOOPS_ROOT_PATH . '/modules/smartband/language/' . $xoopsConfig['language'] . '/main.php';
+	global $xoopsConfig;
+	require_once XOOPS_ROOT_PATH . '/modules/smartband/language/' . $xoopsConfig['language'] . '/main.php';
 
-    $pluginInfo                             = array();
-    $pluginInfo['items']['item']['caption'] = _MD_ARTALBUM_ITEM_CAP;
-    $pluginInfo['items']['item']['url']     = 'item.php?itemid=%u';
-    $pluginInfo['items']['item']['request'] = 'itemid';
+	$pluginInfo                             = array();
+	$pluginInfo['items']['item']['caption'] = _MD_ARTALBUM_ITEM_CAP;
+	$pluginInfo['items']['item']['url']     = 'item.php?itemid=%u';
+	$pluginInfo['items']['item']['request'] = 'itemid';
 
-    $pluginInfo['items']['category']['caption'] = _MD_ARTALBUM_CATEGORY;
-    $pluginInfo['items']['category']['url']     = 'category.php?categoryid=%u';
-    $pluginInfo['items']['category']['request'] = 'categoryid';
+	$pluginInfo['items']['category']['caption'] = _MD_ARTALBUM_CATEGORY;
+	$pluginInfo['items']['category']['url']     = 'category.php?categoryid=%u';
+	$pluginInfo['items']['category']['request'] = 'categoryid';
 
-    return $pluginInfo;
+	return $pluginInfo;
 }

xoops_version.php

Indentation +3 added lines, -3 removed lines

@@ -66,10 +66,10 @@
 global $xoopsConfig;
 $common_file = XOOPS_ROOT_PATH . '/modules/smartobject/language/' . $xoopsConfig['language'] . '/common.php';
 if (file_exists($common_file)) {
-    $flag_common = true;
-    require_once $common_file;
+	$flag_common = true;
+	require_once $common_file;
 } else {
-    require_once XOOPS_ROOT_PATH . '/modules/smartobject/language/english/common.php';
+	require_once XOOPS_ROOT_PATH . '/modules/smartobject/language/english/common.php';
 }
 // -----