mambax7 / smartobject

include/common.php

Indentation +6 added lines, -6 removed lines

@@ -14,22 +14,22 @@
  * SmartObject library path
  */
 if (!defined('SMARTOBJECT_URL')) {
-    define('SMARTOBJECT_URL', XOOPS_URL . '/modules/smartobject/');
+	define('SMARTOBJECT_URL', XOOPS_URL . '/modules/smartobject/');
 }
 if (!defined('SMARTOBJECT_ROOT_PATH')) {
-    define('SMARTOBJECT_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/smartobject/');
+	define('SMARTOBJECT_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/smartobject/');
 }
 if (!defined('SMARTOBJECT_IMAGES_URL')) {
-    define('SMARTOBJECT_IMAGES_URL', SMARTOBJECT_URL . 'assets/images/');
+	define('SMARTOBJECT_IMAGES_URL', SMARTOBJECT_URL . 'assets/images/');
 }
 if (!defined('SMARTOBJECT_IMAGES_ROOT_PATH')) {
-    define('SMARTOBJECT_IMAGES_ROOT_PATH', SMARTOBJECT_ROOT_PATH . 'assets/images/');
+	define('SMARTOBJECT_IMAGES_ROOT_PATH', SMARTOBJECT_ROOT_PATH . 'assets/images/');
 }
 if (!defined('SMARTOBJECT_IMAGES_ACTIONS_URL')) {
-    define('SMARTOBJECT_IMAGES_ACTIONS_URL', SMARTOBJECT_URL . 'assets/images/actions/');
+	define('SMARTOBJECT_IMAGES_ACTIONS_URL', SMARTOBJECT_URL . 'assets/images/actions/');
 }
 if (!defined('SMARTOBJECT_IMAGES_ACTIONS_ROOT_PATH')) {
-    define('SMARTOBJECT_IMAGES_ACTIONS_ROOT_PATH', SMARTOBJECT_ROOT_PATH . 'assets/images/actions/');
+	define('SMARTOBJECT_IMAGES_ACTIONS_ROOT_PATH', SMARTOBJECT_ROOT_PATH . 'assets/images/actions/');
 }
 
 /**

Spacing +10 added lines, -10 removed lines

@@ -14,30 +14,30 @@ 
  * SmartObject library path
  */
 if (!defined('SMARTOBJECT_URL')) {
-    define('SMARTOBJECT_URL', XOOPS_URL . '/modules/smartobject/');
+    define('SMARTOBJECT_URL', XOOPS_URL.'/modules/smartobject/');
 }
 if (!defined('SMARTOBJECT_ROOT_PATH')) {
-    define('SMARTOBJECT_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/smartobject/');
+    define('SMARTOBJECT_ROOT_PATH', XOOPS_ROOT_PATH.'/modules/smartobject/');
 }
 if (!defined('SMARTOBJECT_IMAGES_URL')) {
-    define('SMARTOBJECT_IMAGES_URL', SMARTOBJECT_URL . 'assets/images/');
+    define('SMARTOBJECT_IMAGES_URL', SMARTOBJECT_URL.'assets/images/');
 }
 if (!defined('SMARTOBJECT_IMAGES_ROOT_PATH')) {
-    define('SMARTOBJECT_IMAGES_ROOT_PATH', SMARTOBJECT_ROOT_PATH . 'assets/images/');
+    define('SMARTOBJECT_IMAGES_ROOT_PATH', SMARTOBJECT_ROOT_PATH.'assets/images/');
 }
 if (!defined('SMARTOBJECT_IMAGES_ACTIONS_URL')) {
-    define('SMARTOBJECT_IMAGES_ACTIONS_URL', SMARTOBJECT_URL . 'assets/images/actions/');
+    define('SMARTOBJECT_IMAGES_ACTIONS_URL', SMARTOBJECT_URL.'assets/images/actions/');
 }
 if (!defined('SMARTOBJECT_IMAGES_ACTIONS_ROOT_PATH')) {
-    define('SMARTOBJECT_IMAGES_ACTIONS_ROOT_PATH', SMARTOBJECT_ROOT_PATH . 'assets/images/actions/');
+    define('SMARTOBJECT_IMAGES_ACTIONS_ROOT_PATH', SMARTOBJECT_ROOT_PATH.'assets/images/actions/');
 }
 
 /**
  * Version of the SmartObject Framework
  */
-include_once(SMARTOBJECT_ROOT_PATH . 'include/version.php');
-include_once(SMARTOBJECT_ROOT_PATH . 'include/functions.php');
-include_once(SMARTOBJECT_ROOT_PATH . 'include/xoops_core_common_functions.php');
+include_once(SMARTOBJECT_ROOT_PATH.'include/version.php');
+include_once(SMARTOBJECT_ROOT_PATH.'include/functions.php');
+include_once(SMARTOBJECT_ROOT_PATH.'include/xoops_core_common_functions.php');
 
 /**
  * Some constants used by the SmartObjects
@@ -66,4 +66,4 @@ 
 // get previous page
 $smart_previous_page = smart_getenv('HTTP_REFERER');
 
-include_once(SMARTOBJECT_ROOT_PATH . 'class/smartloader.php');
+include_once(SMARTOBJECT_ROOT_PATH.'class/smartloader.php');

include/adsense.php

Indentation +7 added lines, -7 removed lines

@@ -10,16 +10,16 @@
 
 function smart_adsense_initiate_smartytags()
 {
-    global $xoopsTpl, $smartobjectAdsenseHandler;
-    if (is_object($xoopsTpl)) {
-        foreach ($smartobjectAdsenseHandler->objects as $k => $v) {
-            $xoopsTpl->assign('adsense_' . $k, $v->render());
-        }
-    }
+	global $xoopsTpl, $smartobjectAdsenseHandler;
+	if (is_object($xoopsTpl)) {
+		foreach ($smartobjectAdsenseHandler->objects as $k => $v) {
+			$xoopsTpl->assign('adsense_' . $k, $v->render());
+		}
+	}
 }
 
 if (!defined('SMARTOBJECT_URL')) {
-    include_once(XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php');
+	include_once(XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php');
 }
 
 include_once XOOPS_ROOT_PATH . '/modules/smartobject/include/functions.php';

Spacing +5 added lines, -5 removed lines

@@ -13,17 +13,17 @@
     global $xoopsTpl, $smartobjectAdsenseHandler;
     if (is_object($xoopsTpl)) {
         foreach ($smartobjectAdsenseHandler->objects as $k => $v) {
-            $xoopsTpl->assign('adsense_' . $k, $v->render());
+            $xoopsTpl->assign('adsense_'.$k, $v->render());
         }
     }
 }
 
 if (!defined('SMARTOBJECT_URL')) {
-    include_once(XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php');
+    include_once(XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php');
 }
 
-include_once XOOPS_ROOT_PATH . '/modules/smartobject/include/functions.php';
-include_once(SMARTOBJECT_ROOT_PATH . 'class/adsense.php');
+include_once XOOPS_ROOT_PATH.'/modules/smartobject/include/functions.php';
+include_once(SMARTOBJECT_ROOT_PATH.'class/adsense.php');
 
 $smartobjectAdsenseHandler = xoops_getModuleHandler('adsense', 'smartobject');
-$smartobjectAdsensesObj     = $smartobjectAdsenseHandler->getAdsensesByTag();
+$smartobjectAdsensesObj = $smartobjectAdsenseHandler->getAdsensesByTag();

include/projax_/classes/JavaScript.php

Indentation +75 added lines, -75 removed lines

@@ -15,90 +15,90 @@
  */
 class JavaScript
 {
-    /**
-     * @param       $name
-     * @param  null $function
-     * @return string
-     */
-    public function button_to_function($name, $function = null)
-    {
-        return '<input type="button" value="' . $name . '" onclick="' . $function . '" />';
-    }
+	/**
+	 * @param       $name
+	 * @param  null $function
+	 * @return string
+	 */
+	public function button_to_function($name, $function = null)
+	{
+		return '<input type="button" value="' . $name . '" onclick="' . $function . '" />';
+	}
 
-    /**
-     * @param $javascript
-     * @return mixed|string
-     */
-    public function escape($javascript)
-    {
-        $javascript = addslashes($javascript);
-        $javascript = str_replace(array("\r\n", "\n", "\r"), array("\n"), $javascript);
+	/**
+	 * @param $javascript
+	 * @return mixed|string
+	 */
+	public function escape($javascript)
+	{
+		$javascript = addslashes($javascript);
+		$javascript = str_replace(array("\r\n", "\n", "\r"), array("\n"), $javascript);
 
-        return $javascript;
-    }
+		return $javascript;
+	}
 
-    /**
-     * @param $content
-     * @return string
-     */
-    public function tag($content)
-    {
-        return '<script type="text/javascript">' . $content . '</script>';
-    }
+	/**
+	 * @param $content
+	 * @return string
+	 */
+	public function tag($content)
+	{
+		return '<script type="text/javascript">' . $content . '</script>';
+	}
 
-    /**
-     * @param       $name
-     * @param       $function
-     * @param  null $html_options
-     * @return string
-     */
-    public function link_to_function($name, $function, $html_options = null)
-    {
-        return '<a href="' . (isset($html_options['href']) ? $html_options['href'] : '#') . '" onclick="' . (isset($html_options['onclick']) ? $html_options['onclick'] . ';' : '') . $function . '; return false;" />' . $name . '</a>';
-    }
+	/**
+	 * @param       $name
+	 * @param       $function
+	 * @param  null $html_options
+	 * @return string
+	 */
+	public function link_to_function($name, $function, $html_options = null)
+	{
+		return '<a href="' . (isset($html_options['href']) ? $html_options['href'] : '#') . '" onclick="' . (isset($html_options['onclick']) ? $html_options['onclick'] . ';' : '') . $function . '; return false;" />' . $name . '</a>';
+	}
 
-    /////////////////////////////////////////////////////////////////////////////////////
-    //                             Private functions
-    /////////////////////////////////////////////////////////////////////////////////////
+	/////////////////////////////////////////////////////////////////////////////////////
+	//                             Private functions
+	/////////////////////////////////////////////////////////////////////////////////////
 
-    /**
-     * @param $option
-     * @return string
-     */
-    public function _array_or_string_for_javascript($option)
-    {
-        $return_val = '';
-        if (is_array($option)) {
-            foreach ($option as $value) {
-                if (!empty($return_val)) {
-                    $ret_val .= ', ';
-                }
-                $return_val .= $value;
-            }
+	/**
+	 * @param $option
+	 * @return string
+	 */
+	public function _array_or_string_for_javascript($option)
+	{
+		$return_val = '';
+		if (is_array($option)) {
+			foreach ($option as $value) {
+				if (!empty($return_val)) {
+					$ret_val .= ', ';
+				}
+				$return_val .= $value;
+			}
 
-            return '[' . $return_val . ']';
-        }
+			return '[' . $return_val . ']';
+		}
 
-        return "'$option'";
-    }
+		return "'$option'";
+	}
 
-    /**
-     * @param $options
-     * @return string
-     */
-    public function _options_for_javascript($options)
-    {
-        $return_val = '';
+	/**
+	 * @param $options
+	 * @return string
+	 */
+	public function _options_for_javascript($options)
+	{
+		$return_val = '';
 
-        if (is_array($options)) {
-            foreach ($options as $var => $val) {
-                if (!empty($return_val)) {
-                    $return_val .= ', ';
-                }
-                $return_val .= "$var:$val";
-            }
-        }
+		if (is_array($options)) {
+			foreach ($options as $var => $val) {
+				if (!empty($return_val)) {
+					$return_val .= ', ';
+				}
+				$return_val .= "$var:$val";
+			}
+		}
 
-        return '{' . $return_val . '}';
-    }
+		return '{' . $return_val . '}';
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -22,7 +22,7 @@ 
      */
     public function button_to_function($name, $function = null)
     {
-        return '<input type="button" value="' . $name . '" onclick="' . $function . '" />';
+        return '<input type="button" value="'.$name.'" onclick="'.$function.'" />';
     }
 
     /**
@@ -43,7 +43,7 @@ 
      */
     public function tag($content)
     {
-        return '<script type="text/javascript">' . $content . '</script>';
+        return '<script type="text/javascript">'.$content.'</script>';
     }
 
     /**
@@ -54,7 +54,7 @@ 
      */
     public function link_to_function($name, $function, $html_options = null)
     {
-        return '<a href="' . (isset($html_options['href']) ? $html_options['href'] : '#') . '" onclick="' . (isset($html_options['onclick']) ? $html_options['onclick'] . ';' : '') . $function . '; return false;" />' . $name . '</a>';
+        return '<a href="'.(isset($html_options['href']) ? $html_options['href'] : '#').'" onclick="'.(isset($html_options['onclick']) ? $html_options['onclick'].';' : '').$function.'; return false;" />'.$name.'</a>';
     }
 
     /////////////////////////////////////////////////////////////////////////////////////
@@ -76,7 +76,7 @@ 
                 $return_val .= $value;
             }
 
-            return '[' . $return_val . ']';
+            return '['.$return_val.']';
         }
 
         return "'$option'";
@@ -99,6 +99,6 @@ 
             }
         }
 
-        return '{' . $return_val . '}';
+        return '{'.$return_val.'}';
     }
 }

Doc Comments +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 
     /**
      * @param $javascript
-     * @return mixed|string
+     * @return string
      */
     public function escape($javascript)
     {
@@ -48,7 +48,7 @@ 
 
     /**
      * @param       $name
-     * @param       $function
+     * @param       string $function
      * @param  null $html_options
      * @return string
      */

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);
+	}
 }

Spacing +23 added lines, -23 removed lines

@@ -63,7 +63,7 @@ 
     {
         $options['form'] = true;
 
-        return '<form action="' . $options['url'] . '" onsubmit="' . $this->remote_function($options) . '; return false;" method="' . (isset($options['method']) ? $options['method'] : 'post') . '"  >';
+        return '<form action="'.$options['url'].'" onsubmit="'.$this->remote_function($options).'; return false;" method="'.(isset($options['method']) ? $options['method'] : 'post').'"  >';
     }
 
     /**
@@ -112,7 +112,7 @@ 
     public function periodically_call_remote($options = null)
     {
         $frequency = isset($options['frequency']) ? $options['frequency'] : 10;
-        $code      = 'new PeriodicalExecuter(function() {' . $this->remote_function($options) . '},' . $frequency . ')';
+        $code      = 'new PeriodicalExecuter(function() {'.$this->remote_function($options).'},'.$frequency.')';
 
         return $code;
     }
@@ -128,22 +128,22 @@ 
         $update = '';
 
         if (isset($options['update']) && is_array($options['update'])) {
-            $update = isset($options['update']['success']) ? 'success: ' . $options['update']['success'] : '';
+            $update = isset($options['update']['success']) ? 'success: '.$options['update']['success'] : '';
             $update .= empty($update) ? '' : ',';
-            $update .= isset($options['update']['failure']) ? 'failure: ' . $options['update']['failure'] : '';
+            $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 = empty($update) ? 'new Ajax.Request(' : 'new Ajax.Updater(\''.$update.'\',';
 
-        $ajax_function .= "'" . $options['url'] . "'";
-        $ajax_function .= ',' . $javascript_options . ')';
+        $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;
+        $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;
     }
@@ -160,7 +160,7 @@ 
             $options['with'] = 'Form.serialize(this.form)';
         }
 
-        return '<input type="button" onclick="' . $this->remote_function($options) . '" name="' . $name . '" value ="' . $value . '" />';
+        return '<input type="button" onclick="'.$this->remote_function($options).'" name="'.$name.'" value ="'.$value.'" />';
     }
 
     /**
@@ -203,8 +203,8 @@ 
         $callbacks = array();
         foreach ($options as $callback => $code) {
             if (in_array($callback, $this->CALLBACKS)) {
-                $name             = 'on' . ucfirst($callback);
-                $callbacks[$name] = 'function(request){' . $code . '}';
+                $name             = 'on'.ucfirst($callback);
+                $callbacks[$name] = 'function(request){'.$code.'}';
             }
         }
 
@@ -220,7 +220,7 @@ 
     public function _build_observer($klass, $name, $options = null)
     {
         if (isset($options['with']) && false === strpos($options['with'], '=')) {
-            $options['with'] = '\'' . $options['with'] . '=\' + value';
+            $options['with'] = '\''.$options['with'].'=\' + value';
         } elseif (isset($options['with']) && isset($options['update'])) {
             $options['with'] = 'value';
         }
@@ -228,10 +228,10 @@ 
         $callback = $options['function'] ?: $this->remote_function($options);
 
         $javascript = "new $klass('$name', ";
-        $javascript .= isset($options['frequency']) ? $options['frequency'] . ', ' : '';
+        $javascript .= isset($options['frequency']) ? $options['frequency'].', ' : '';
         $javascript .= 'function (element,value) { ';
         $javascript .= $callback;
-        $javascript .= isset($options['on']) ? ', ' . $options['on'] : '';
+        $javascript .= isset($options['on']) ? ', '.$options['on'] : '';
         $javascript .= '})';
 
         return $javascript;
@@ -263,7 +263,7 @@ 
         }
 
         if (isset($options['position'])) {
-            $js_options['insertion'] = 'Insertion.' . ucfirst($options['position']);
+            $js_options['insertion'] = 'Insertion.'.ucfirst($options['position']);
         }
 
         $js_options['evalScripts'] = isset($options['script']) ? $options['script'] : 'true';
@@ -271,7 +271,7 @@ 
         if (isset($options['form'])) {
             $js_options['parameters'] = 'Form.serialize(this)';
         } elseif (isset($options['parameters'])) {
-            $js_options['parameters'] = 'Form.serialize(\'' . $options['submit'] . '\')';
+            $js_options['parameters'] = 'Form.serialize(\''.$options['submit'].'\')';
         } elseif (isset($options['with'])) {
             $js_options['parameters'] = $options['with'];
         }
@@ -298,7 +298,7 @@ 
      */
     public function ID($id, $extend = null)
     {
-        return "$('$id')" . (!empty($extend)) ? '.' . $extend . '()' : '';
+        return "$('$id')".(!empty($extend)) ? '.'.$extend.'()' : '';
     }
 
     /**
@@ -357,7 +357,7 @@ 
      */
     public function delay($seconds = 1, $script = '')
     {
-        return "setTimeout( function() { $script } , " . ($seconds * 1000) . ' )';
+        return "setTimeout( function() { $script } , ".($seconds * 1000).' )';
     }
 
     /**
@@ -379,7 +379,7 @@ 
     {
         $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);
+        return $this->call('new Insertion.'.ucfirst($position), $args);
     }
 
     /**
@@ -443,7 +443,7 @@ 
      */
     public function select($pattern, $extend = null)
     {
-        return "$$('$pattern')" . (!empty($extend)) ? '.' . $extend : '';
+        return "$$('$pattern')".(!empty($extend)) ? '.'.$extend : '';
     }
 
     /**

Doc Comments +3 added lines, -3 removed lines

@@ -212,7 +212,7 @@ 
     }
 
     /**
-     * @param       $klass
+     * @param       string $klass
      * @param       $name
      * @param  null $options
      * @return string
@@ -311,7 +311,7 @@ 
     }
 
     /**
-     * @param $variable
+     * @param string $variable
      * @param $value
      * @return string
      */
@@ -321,7 +321,7 @@ 
     }
 
     /**
-     * @param       $function
+     * @param       string $function
      * @param  null $args
      * @return string
      */

include/projax_/classes/Scriptaculous.php

Indentation +302 added lines, -302 removed lines

@@ -15,307 +15,307 @@ 
  */
 class Scriptaculous extends Prototype
 {
-    public $TOGGLE_EFFECTS = array('toggle_appear', 'toggle_slide', 'toggle_blind');
-
-    /**
-     * Scriptaculous constructor.
-     */
-    public function __construct()
-    {
-    }
-
-    /**
-     * @param      $element_id
-     * @param null $options
-     * @return string
-     */
-    public function dragable_element($element_id, $options = null)
-    {
-        return $this->tag($this->_dragable_element_js($element_id, $options));
-    }
-
-    /**
-     * @param      $element_id
-     * @param null $options
-     * @return string
-     */
-    public function drop_receiving_element($element_id, $options = null)
-    {
-        return $this->tag($this->_drop_receiving_element($element_id, $options));
-    }
-
-    /**
-     * @param      $name
-     * @param bool $element_id
-     * @param null $js_options
-     * @return string
-     */
-    public function visual_effect($name, $element_id = false, $js_options = null)
-    {
-        $element = $element_id ? "'$element_id'" : 'element';
-
-        $js_queue = '';
-        if (isset($js_options) && is_array($js_options['queue'])) {
-        } elseif (isset($js_options)) {
-            $js_queue = "'$js_options'";
-        }
-
-        if (in_array($name, $this->TOGGLE_EFFECTS)) {
-            return "Effect.toggle($element,'" . str_replace('toggle_', '', $name) . "'," . $this->_options_for_javascript($js_options) . ')';
-        } else {
-            return 'new Effect.' . ucwords($name) . "($element," . $this->_options_for_javascript($js_options) . ')';
-        }
-    }
-
-    /**
-     * @param      $element_id
-     * @param null $options
-     * @return string
-     */
-    public function sortabe_element($element_id, $options = null)
-    {
-        return $this->tag($this->_sortabe_element($element_id, $options));
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////
-    //                             Private functions
-    /////////////////////////////////////////////////////////////////////////////////////
-
-    /**
-     * @param $element_id
-     * @param $options
-     * @return string
-     */
-    public function _sortabe_element($element_id, $options)
-    {
-        //if (isset($options['with'])) {
-        $options['with'] = "Sortable.serialize('$element_id')";
-        //    }
-
-        //if (isset($option['onUpdate'])) {
-        $options['onUpdate'] = 'function(){' . $this->remote_function($options) . '}';
-        //}
-
-        foreach ($options as $var => $val) {
-            if (in_array($var, $this->AJAX_OPTIONS)) {
-                unset($options[$var]);
-            }
-        }
-
-        $arr = array('tag', 'overlap', 'contraint', 'handle');
-
-        foreach ($arr as $var) {
-            if (isset($options[$var])) {
-                $options[$var] = "'" . $options[$var] . "'";
-            }
-        }
-
-        if (isset($options['containment'])) {
-            $options['containment'] = $this->_array_or_string_for_javascript($options['containment']);
-        }
-
-        if (isset($options['only'])) {
-            $options['only'] = $this->_array_or_string_for_javascript($options['only']);
-        }
-
-        return "Sortable.create('$element_id'," . $this->_options_for_javascript($options) . ')';
-    }
-
-    /**
-     * @param $element_id
-     * @param $options
-     * @return string
-     */
-    public function _dragable_element_js($element_id, $options)
-    {
-        return 'new Draggable(\'' . $element_id . '\',' . $this->_options_for_javascript($options) . ')';
-    }
-
-    /**
-     * @param $element_id
-     * @param $options
-     * @return string
-     */
-    public function _drop_receiving_element($element_id, $options)
-    {
-
-        //if (isset($options['with'])) {
-        $options['with'] = '\'id=\' + encodeURIComponent(element.id)';
-        //    }
-
-        //if (isset($option['onDrop']))
-
-        {
-            $options['onDrop'] = 'function(element){' . $this->remote_function($options) . '}';
-        }
-
-        if (is_array($options)) {
-            foreach ($options as $var => $val) {
-                if (in_array($var, $this->AJAX_OPTIONS)) {
-                    unset($options[$var]);
-                }
-            }
-        }
-
-        if (isset($options['accept'])) {
-            $options['accept'] = $this->_array_or_string_for_javascript($options['accept']);
-        }
-
-        if (isset($options['hoverclass'])) {
-            $options['hoverclass'] = "'" . $options['hoverclass'] . "'";
-        }
-
-        return 'Droppables.add(\'' . $element_id . '\',' . $this->_options_for_javascript($options) . ')';
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////
-    //                            Merged Javascript macro
-    /////////////////////////////////////////////////////////////////////////////////////
-
-    /**
-     * @param      $field_id
-     * @param      $options
-     * @param bool $tag
-     * @return string
-     */
-    public function in_place_editor($field_id, $options, $tag = true)
-    {
-        $function = 'new Ajax.InPlaceEditor(';
-        $function .= "'$field_id', ";
-        $function .= "'" . $options['url'] . "'";
-
-        $js_options = array();
-        if (isset($options['cancel_text'])) {
-            $js_options['cancelText'] = $options['cancel_text'];
-        }
-        if (isset($options['save_text'])) {
-            $js_options['okText'] = $options['save_text'];
-        }
-        if (isset($options['loading_text'])) {
-            $js_options['loadingText'] = $options['loading_text'];
-        }
-        if (isset($options['rows'])) {
-            $js_options['rows'] = $options['rows'];
-        }
-        if (isset($options['cols'])) {
-            $js_options['cols'] = $options['cols'];
-        }
-        if (isset($options['size'])) {
-            $js_options['size'] = $options['size'];
-        }
-        if (isset($options['external_control'])) {
-            $js_options['externalControl'] = "'" . $options['external_control'] . "'";
-        }
-        if (isset($options['load_text_url'])) {
-            $js_options['loadTextURL'] = "'" . $options['load_text_url'] . "'";
-        }
-        if (isset($options['options'])) {
-            $js_options['ajaxOptions'] = $options['options'];
-        }
-        if (isset($options['script'])) {
-            $js_options['evalScripts'] = $options['script'];
-        }
-        if (isset($options['with'])) {
-            $js_options['callback'] = 'function(form) { return ' . $options['with'] . ' }';
-        }
-
-        $function .= ', ' . $this->_options_for_javascript($js_options) . ' )';
-        if ($tag) {
-            return $this->tag($function);
-        } else {
-            return $function;
-        }
-    }
-
-    /**
-     * @param      $object
-     * @param null $tag_options
-     * @param null $in_place_editor_options
-     * @return string
-     */
-    public function in_place_editor_field($object, $tag_options = null, $in_place_editor_options = null)
-    {
-        $ret_val = '';
-        $ret_val .= '<span id="' . $object . '" class="in_place_editor_field">' . (isset($tag_options['value']) ? $tag_options['value'] : '') . '</span>';
-        $ret_val .= $this->in_place_editor($object, $in_place_editor_options);
-
-        return $ret_val;
-    }
-
-    /**
-     * @param $field_id
-     * @param $options
-     * @return mixed
-     */
-    public function auto_complete_field($field_id, $options)
-    {
-        $function = "var $field_id" . '_auto_completer = new Ajax.Autocompleter(';
-        $function .= "'$field_id', ";
-        $function .= "'" . (isset($options['update']) ? $options['update'] : $field_id . '_auto_complete') . "', ";
-        $function .= "'" . $options['url'] . "'";
-
-        $js_options = array();
-        if (isset($options['tokens'])) {
-            $js_options['tokens'] = $this->javascript->_array_or_string_for_javascript($options['tokens']);
-        }
-        if (isset($options['with'])) {
-            $js_options['callback'] = 'function(element, value) { return ' . $options['with'] . ' }';
-        }
-        if (isset($options['indicator'])) {
-            $js_options['indicator'] = "'" . $options['indicator'] . "'";
-        }
-        if (isset($options['select'])) {
-            $js_options['select'] = "'" . $options['select'] . "'";
-        }
-
-        foreach (array('on_show' => 'onShow', 'on_hide' => 'onHide', 'min_chars' => 'min_chars') as $var => $val) {
-            if (isset($options[$var])) {
-                $js_options['$val'] = $options['var'];
-            }
-        }
-
-        $function .= ', ' . $this->_options_for_javascript($js_options) . ' )';
-
-        return $this->tag($function);
-    }
-
-    /**
-     * @param      $entries
-     * @param      $field
-     * @param null $phrase
-     */
-    public function auto_complete_results($entries, $field, $phrase = null)
-    {
-        if (!is_array($entries)) {
-            return;
-        }
-        $ret_val = '<ul>';
-        //  Complete this function
-    }
-
-    /**
-     * @param      $object
-     * @param null $tag_options
-     * @param null $completion_options
-     * @return string
-     */
-    public function text_field_with_auto_complete($object, $tag_options = null, $completion_options = null)
-    {
-        $ret_val = isset($completion_options['skip_style']) ? '' : $this->_auto_complete_stylesheet();
-        $ret_val .= '<input autocomplete="off" id="' . $object . '" name="' . $object . '" size="' . (isset($tag_options['size']) ? $tag_options['size'] : 30) . '" type="text" value="' . (isset($tag_options['size']) ? $tag_options['value'] : '') . '" ' . (isset($tag_options['class']) ? 'class = "' . $tag_options['class'] . '" ' : '') . '/>';
-
-        $ret_val .= '<div id="' . $object . '_auto_complete" class="auto_complete"></div>';
-        $ret_val .= $this->auto_complete_field($object, $completion_options);
-
-        return $ret_val;
-    }
-
-    /**
-     * @return string
-     */
-    public function _auto_complete_stylesheet()
-    {
-        return '<style> div.auto_complete {
+	public $TOGGLE_EFFECTS = array('toggle_appear', 'toggle_slide', 'toggle_blind');
+
+	/**
+	 * Scriptaculous constructor.
+	 */
+	public function __construct()
+	{
+	}
+
+	/**
+	 * @param      $element_id
+	 * @param null $options
+	 * @return string
+	 */
+	public function dragable_element($element_id, $options = null)
+	{
+		return $this->tag($this->_dragable_element_js($element_id, $options));
+	}
+
+	/**
+	 * @param      $element_id
+	 * @param null $options
+	 * @return string
+	 */
+	public function drop_receiving_element($element_id, $options = null)
+	{
+		return $this->tag($this->_drop_receiving_element($element_id, $options));
+	}
+
+	/**
+	 * @param      $name
+	 * @param bool $element_id
+	 * @param null $js_options
+	 * @return string
+	 */
+	public function visual_effect($name, $element_id = false, $js_options = null)
+	{
+		$element = $element_id ? "'$element_id'" : 'element';
+
+		$js_queue = '';
+		if (isset($js_options) && is_array($js_options['queue'])) {
+		} elseif (isset($js_options)) {
+			$js_queue = "'$js_options'";
+		}
+
+		if (in_array($name, $this->TOGGLE_EFFECTS)) {
+			return "Effect.toggle($element,'" . str_replace('toggle_', '', $name) . "'," . $this->_options_for_javascript($js_options) . ')';
+		} else {
+			return 'new Effect.' . ucwords($name) . "($element," . $this->_options_for_javascript($js_options) . ')';
+		}
+	}
+
+	/**
+	 * @param      $element_id
+	 * @param null $options
+	 * @return string
+	 */
+	public function sortabe_element($element_id, $options = null)
+	{
+		return $this->tag($this->_sortabe_element($element_id, $options));
+	}
+
+	/////////////////////////////////////////////////////////////////////////////////////
+	//                             Private functions
+	/////////////////////////////////////////////////////////////////////////////////////
+
+	/**
+	 * @param $element_id
+	 * @param $options
+	 * @return string
+	 */
+	public function _sortabe_element($element_id, $options)
+	{
+		//if (isset($options['with'])) {
+		$options['with'] = "Sortable.serialize('$element_id')";
+		//    }
+
+		//if (isset($option['onUpdate'])) {
+		$options['onUpdate'] = 'function(){' . $this->remote_function($options) . '}';
+		//}
+
+		foreach ($options as $var => $val) {
+			if (in_array($var, $this->AJAX_OPTIONS)) {
+				unset($options[$var]);
+			}
+		}
+
+		$arr = array('tag', 'overlap', 'contraint', 'handle');
+
+		foreach ($arr as $var) {
+			if (isset($options[$var])) {
+				$options[$var] = "'" . $options[$var] . "'";
+			}
+		}
+
+		if (isset($options['containment'])) {
+			$options['containment'] = $this->_array_or_string_for_javascript($options['containment']);
+		}
+
+		if (isset($options['only'])) {
+			$options['only'] = $this->_array_or_string_for_javascript($options['only']);
+		}
+
+		return "Sortable.create('$element_id'," . $this->_options_for_javascript($options) . ')';
+	}
+
+	/**
+	 * @param $element_id
+	 * @param $options
+	 * @return string
+	 */
+	public function _dragable_element_js($element_id, $options)
+	{
+		return 'new Draggable(\'' . $element_id . '\',' . $this->_options_for_javascript($options) . ')';
+	}
+
+	/**
+	 * @param $element_id
+	 * @param $options
+	 * @return string
+	 */
+	public function _drop_receiving_element($element_id, $options)
+	{
+
+		//if (isset($options['with'])) {
+		$options['with'] = '\'id=\' + encodeURIComponent(element.id)';
+		//    }
+
+		//if (isset($option['onDrop']))
+
+		{
+			$options['onDrop'] = 'function(element){' . $this->remote_function($options) . '}';
+		}
+
+		if (is_array($options)) {
+			foreach ($options as $var => $val) {
+				if (in_array($var, $this->AJAX_OPTIONS)) {
+					unset($options[$var]);
+				}
+			}
+		}
+
+		if (isset($options['accept'])) {
+			$options['accept'] = $this->_array_or_string_for_javascript($options['accept']);
+		}
+
+		if (isset($options['hoverclass'])) {
+			$options['hoverclass'] = "'" . $options['hoverclass'] . "'";
+		}
+
+		return 'Droppables.add(\'' . $element_id . '\',' . $this->_options_for_javascript($options) . ')';
+	}
+
+	/////////////////////////////////////////////////////////////////////////////////////
+	//                            Merged Javascript macro
+	/////////////////////////////////////////////////////////////////////////////////////
+
+	/**
+	 * @param      $field_id
+	 * @param      $options
+	 * @param bool $tag
+	 * @return string
+	 */
+	public function in_place_editor($field_id, $options, $tag = true)
+	{
+		$function = 'new Ajax.InPlaceEditor(';
+		$function .= "'$field_id', ";
+		$function .= "'" . $options['url'] . "'";
+
+		$js_options = array();
+		if (isset($options['cancel_text'])) {
+			$js_options['cancelText'] = $options['cancel_text'];
+		}
+		if (isset($options['save_text'])) {
+			$js_options['okText'] = $options['save_text'];
+		}
+		if (isset($options['loading_text'])) {
+			$js_options['loadingText'] = $options['loading_text'];
+		}
+		if (isset($options['rows'])) {
+			$js_options['rows'] = $options['rows'];
+		}
+		if (isset($options['cols'])) {
+			$js_options['cols'] = $options['cols'];
+		}
+		if (isset($options['size'])) {
+			$js_options['size'] = $options['size'];
+		}
+		if (isset($options['external_control'])) {
+			$js_options['externalControl'] = "'" . $options['external_control'] . "'";
+		}
+		if (isset($options['load_text_url'])) {
+			$js_options['loadTextURL'] = "'" . $options['load_text_url'] . "'";
+		}
+		if (isset($options['options'])) {
+			$js_options['ajaxOptions'] = $options['options'];
+		}
+		if (isset($options['script'])) {
+			$js_options['evalScripts'] = $options['script'];
+		}
+		if (isset($options['with'])) {
+			$js_options['callback'] = 'function(form) { return ' . $options['with'] . ' }';
+		}
+
+		$function .= ', ' . $this->_options_for_javascript($js_options) . ' )';
+		if ($tag) {
+			return $this->tag($function);
+		} else {
+			return $function;
+		}
+	}
+
+	/**
+	 * @param      $object
+	 * @param null $tag_options
+	 * @param null $in_place_editor_options
+	 * @return string
+	 */
+	public function in_place_editor_field($object, $tag_options = null, $in_place_editor_options = null)
+	{
+		$ret_val = '';
+		$ret_val .= '<span id="' . $object . '" class="in_place_editor_field">' . (isset($tag_options['value']) ? $tag_options['value'] : '') . '</span>';
+		$ret_val .= $this->in_place_editor($object, $in_place_editor_options);
+
+		return $ret_val;
+	}
+
+	/**
+	 * @param $field_id
+	 * @param $options
+	 * @return mixed
+	 */
+	public function auto_complete_field($field_id, $options)
+	{
+		$function = "var $field_id" . '_auto_completer = new Ajax.Autocompleter(';
+		$function .= "'$field_id', ";
+		$function .= "'" . (isset($options['update']) ? $options['update'] : $field_id . '_auto_complete') . "', ";
+		$function .= "'" . $options['url'] . "'";
+
+		$js_options = array();
+		if (isset($options['tokens'])) {
+			$js_options['tokens'] = $this->javascript->_array_or_string_for_javascript($options['tokens']);
+		}
+		if (isset($options['with'])) {
+			$js_options['callback'] = 'function(element, value) { return ' . $options['with'] . ' }';
+		}
+		if (isset($options['indicator'])) {
+			$js_options['indicator'] = "'" . $options['indicator'] . "'";
+		}
+		if (isset($options['select'])) {
+			$js_options['select'] = "'" . $options['select'] . "'";
+		}
+
+		foreach (array('on_show' => 'onShow', 'on_hide' => 'onHide', 'min_chars' => 'min_chars') as $var => $val) {
+			if (isset($options[$var])) {
+				$js_options['$val'] = $options['var'];
+			}
+		}
+
+		$function .= ', ' . $this->_options_for_javascript($js_options) . ' )';
+
+		return $this->tag($function);
+	}
+
+	/**
+	 * @param      $entries
+	 * @param      $field
+	 * @param null $phrase
+	 */
+	public function auto_complete_results($entries, $field, $phrase = null)
+	{
+		if (!is_array($entries)) {
+			return;
+		}
+		$ret_val = '<ul>';
+		//  Complete this function
+	}
+
+	/**
+	 * @param      $object
+	 * @param null $tag_options
+	 * @param null $completion_options
+	 * @return string
+	 */
+	public function text_field_with_auto_complete($object, $tag_options = null, $completion_options = null)
+	{
+		$ret_val = isset($completion_options['skip_style']) ? '' : $this->_auto_complete_stylesheet();
+		$ret_val .= '<input autocomplete="off" id="' . $object . '" name="' . $object . '" size="' . (isset($tag_options['size']) ? $tag_options['size'] : 30) . '" type="text" value="' . (isset($tag_options['size']) ? $tag_options['value'] : '') . '" ' . (isset($tag_options['class']) ? 'class = "' . $tag_options['class'] . '" ' : '') . '/>';
+
+		$ret_val .= '<div id="' . $object . '_auto_complete" class="auto_complete"></div>';
+		$ret_val .= $this->auto_complete_field($object, $completion_options);
+
+		return $ret_val;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function _auto_complete_stylesheet()
+	{
+		return '<style> div.auto_complete {
                   width: 350px;
                   background: #fff;
                  }
@@ -339,5 +339,5 @@ 
                    padding:0;
                  }
                  </style>';
-    }
+	}
 }

Spacing +24 added lines, -24 removed lines

@@ -61,9 +61,9 @@ 
         }
 
         if (in_array($name, $this->TOGGLE_EFFECTS)) {
-            return "Effect.toggle($element,'" . str_replace('toggle_', '', $name) . "'," . $this->_options_for_javascript($js_options) . ')';
+            return "Effect.toggle($element,'".str_replace('toggle_', '', $name)."',".$this->_options_for_javascript($js_options).')';
         } else {
-            return 'new Effect.' . ucwords($name) . "($element," . $this->_options_for_javascript($js_options) . ')';
+            return 'new Effect.'.ucwords($name)."($element,".$this->_options_for_javascript($js_options).')';
         }
     }
 
@@ -93,7 +93,7 @@ 
         //    }
 
         //if (isset($option['onUpdate'])) {
-        $options['onUpdate'] = 'function(){' . $this->remote_function($options) . '}';
+        $options['onUpdate'] = 'function(){'.$this->remote_function($options).'}';
         //}
 
         foreach ($options as $var => $val) {
@@ -106,7 +106,7 @@ 
 
         foreach ($arr as $var) {
             if (isset($options[$var])) {
-                $options[$var] = "'" . $options[$var] . "'";
+                $options[$var] = "'".$options[$var]."'";
             }
         }
 
@@ -118,7 +118,7 @@ 
             $options['only'] = $this->_array_or_string_for_javascript($options['only']);
         }
 
-        return "Sortable.create('$element_id'," . $this->_options_for_javascript($options) . ')';
+        return "Sortable.create('$element_id',".$this->_options_for_javascript($options).')';
     }
 
     /**
@@ -128,7 +128,7 @@ 
      */
     public function _dragable_element_js($element_id, $options)
     {
-        return 'new Draggable(\'' . $element_id . '\',' . $this->_options_for_javascript($options) . ')';
+        return 'new Draggable(\''.$element_id.'\','.$this->_options_for_javascript($options).')';
     }
 
     /**
@@ -146,7 +146,7 @@ 
         //if (isset($option['onDrop']))
 
         {
-            $options['onDrop'] = 'function(element){' . $this->remote_function($options) . '}';
+            $options['onDrop'] = 'function(element){'.$this->remote_function($options).'}';
         }
 
         if (is_array($options)) {
@@ -162,10 +162,10 @@ 
         }
 
         if (isset($options['hoverclass'])) {
-            $options['hoverclass'] = "'" . $options['hoverclass'] . "'";
+            $options['hoverclass'] = "'".$options['hoverclass']."'";
         }
 
-        return 'Droppables.add(\'' . $element_id . '\',' . $this->_options_for_javascript($options) . ')';
+        return 'Droppables.add(\''.$element_id.'\','.$this->_options_for_javascript($options).')';
     }
 
     /////////////////////////////////////////////////////////////////////////////////////
@@ -182,7 +182,7 @@ 
     {
         $function = 'new Ajax.InPlaceEditor(';
         $function .= "'$field_id', ";
-        $function .= "'" . $options['url'] . "'";
+        $function .= "'".$options['url']."'";
 
         $js_options = array();
         if (isset($options['cancel_text'])) {
@@ -204,10 +204,10 @@ 
             $js_options['size'] = $options['size'];
         }
         if (isset($options['external_control'])) {
-            $js_options['externalControl'] = "'" . $options['external_control'] . "'";
+            $js_options['externalControl'] = "'".$options['external_control']."'";
         }
         if (isset($options['load_text_url'])) {
-            $js_options['loadTextURL'] = "'" . $options['load_text_url'] . "'";
+            $js_options['loadTextURL'] = "'".$options['load_text_url']."'";
         }
         if (isset($options['options'])) {
             $js_options['ajaxOptions'] = $options['options'];
@@ -216,10 +216,10 @@ 
             $js_options['evalScripts'] = $options['script'];
         }
         if (isset($options['with'])) {
-            $js_options['callback'] = 'function(form) { return ' . $options['with'] . ' }';
+            $js_options['callback'] = 'function(form) { return '.$options['with'].' }';
         }
 
-        $function .= ', ' . $this->_options_for_javascript($js_options) . ' )';
+        $function .= ', '.$this->_options_for_javascript($js_options).' )';
         if ($tag) {
             return $this->tag($function);
         } else {
@@ -236,7 +236,7 @@ 
     public function in_place_editor_field($object, $tag_options = null, $in_place_editor_options = null)
     {
         $ret_val = '';
-        $ret_val .= '<span id="' . $object . '" class="in_place_editor_field">' . (isset($tag_options['value']) ? $tag_options['value'] : '') . '</span>';
+        $ret_val .= '<span id="'.$object.'" class="in_place_editor_field">'.(isset($tag_options['value']) ? $tag_options['value'] : '').'</span>';
         $ret_val .= $this->in_place_editor($object, $in_place_editor_options);
 
         return $ret_val;
@@ -249,23 +249,23 @@ 
      */
     public function auto_complete_field($field_id, $options)
     {
-        $function = "var $field_id" . '_auto_completer = new Ajax.Autocompleter(';
+        $function = "var $field_id".'_auto_completer = new Ajax.Autocompleter(';
         $function .= "'$field_id', ";
-        $function .= "'" . (isset($options['update']) ? $options['update'] : $field_id . '_auto_complete') . "', ";
-        $function .= "'" . $options['url'] . "'";
+        $function .= "'".(isset($options['update']) ? $options['update'] : $field_id.'_auto_complete')."', ";
+        $function .= "'".$options['url']."'";
 
         $js_options = array();
         if (isset($options['tokens'])) {
             $js_options['tokens'] = $this->javascript->_array_or_string_for_javascript($options['tokens']);
         }
         if (isset($options['with'])) {
-            $js_options['callback'] = 'function(element, value) { return ' . $options['with'] . ' }';
+            $js_options['callback'] = 'function(element, value) { return '.$options['with'].' }';
         }
         if (isset($options['indicator'])) {
-            $js_options['indicator'] = "'" . $options['indicator'] . "'";
+            $js_options['indicator'] = "'".$options['indicator']."'";
         }
         if (isset($options['select'])) {
-            $js_options['select'] = "'" . $options['select'] . "'";
+            $js_options['select'] = "'".$options['select']."'";
         }
 
         foreach (array('on_show' => 'onShow', 'on_hide' => 'onHide', 'min_chars' => 'min_chars') as $var => $val) {
@@ -274,7 +274,7 @@ 
             }
         }
 
-        $function .= ', ' . $this->_options_for_javascript($js_options) . ' )';
+        $function .= ', '.$this->_options_for_javascript($js_options).' )';
 
         return $this->tag($function);
     }
@@ -302,9 +302,9 @@ 
     public function text_field_with_auto_complete($object, $tag_options = null, $completion_options = null)
     {
         $ret_val = isset($completion_options['skip_style']) ? '' : $this->_auto_complete_stylesheet();
-        $ret_val .= '<input autocomplete="off" id="' . $object . '" name="' . $object . '" size="' . (isset($tag_options['size']) ? $tag_options['size'] : 30) . '" type="text" value="' . (isset($tag_options['size']) ? $tag_options['value'] : '') . '" ' . (isset($tag_options['class']) ? 'class = "' . $tag_options['class'] . '" ' : '') . '/>';
+        $ret_val .= '<input autocomplete="off" id="'.$object.'" name="'.$object.'" size="'.(isset($tag_options['size']) ? $tag_options['size'] : 30).'" type="text" value="'.(isset($tag_options['size']) ? $tag_options['value'] : '').'" '.(isset($tag_options['class']) ? 'class = "'.$tag_options['class'].'" ' : '').'/>';
 
-        $ret_val .= '<div id="' . $object . '_auto_complete" class="auto_complete"></div>';
+        $ret_val .= '<div id="'.$object.'_auto_complete" class="auto_complete"></div>';
         $ret_val .= $this->auto_complete_field($object, $completion_options);
 
         return $ret_val;

Doc Comments +1 added lines, -1 removed lines

@@ -248,7 +248,7 @@
     /**
      * @param $field_id
      * @param $options
-     * @return mixed
+     * @return string
      */
     public function auto_complete_field($field_id, $options)
     {

include/rating.rate.php

Indentation +47 added lines, -47 removed lines

@@ -9,7 +9,7 @@ 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
 if (!defined('SMARTOBJECT_URL')) {
-    include_once(XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php');
+	include_once(XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php');
 }
 include_once(SMARTOBJECT_ROOT_PATH . 'class/rating.php');
 include_once(SMARTOBJECT_ROOT_PATH . 'include/functions.php');
@@ -23,53 +23,53 @@ 
 $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 ($xoopsDB->errno() == 1062) {
-            $message = _SOBJECT_RATING_DUPLICATE_ENTRY;
-        } else {
-            $message = _SOBJECT_RATING_ERROR;
-        }
-    } else {
-        $message = _SOBJECT_RATING_SUCCESS;
-    }
-    redirect_header('', 3, $message);
-    exit;
+	// 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 ($xoopsDB->errno() == 1062) {
+			$message = _SOBJECT_RATING_DUPLICATE_ENTRY;
+		} else {
+			$message = _SOBJECT_RATING_ERROR;
+		}
+	} else {
+		$message = _SOBJECT_RATING_SUCCESS;
+	}
+	redirect_header('', 3, $message);
+	exit;
 }

Spacing +5 added lines, -5 removed lines

@@ -9,10 +9,10 @@ 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
 if (!defined('SMARTOBJECT_URL')) {
-    include_once(XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php');
+    include_once(XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php');
 }
-include_once(SMARTOBJECT_ROOT_PATH . 'class/rating.php');
-include_once(SMARTOBJECT_ROOT_PATH . 'include/functions.php');
+include_once(SMARTOBJECT_ROOT_PATH.'class/rating.php');
+include_once(SMARTOBJECT_ROOT_PATH.'include/functions.php');
 
 smart_loadLanguageFile('smartobject', 'rating');
 
@@ -21,7 +21,7 @@ 
 // Retreive the SmartObject Rating plugin for the current module if it exists
 $smartobjectRatingHandler = xoops_getModuleHandler('rating', 'smartobject');
 $smartobjectPluginHandler = new SmartPluginHandler();
-$pluginObj                  = $smartobjectPluginHandler->getPlugin($module_dirname);
+$pluginObj = $smartobjectPluginHandler->getPlugin($module_dirname);
 if ($pluginObj) {
     $rating_item = $pluginObj->getItem();
     if ($rating_item) {
@@ -43,7 +43,7 @@ 
             $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');
+                $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' />");

include/customtag.php

Indentation +7 added lines, -7 removed lines

@@ -10,16 +10,16 @@
 
 function smart_customtag_initiate()
 {
-    global $xoopsTpl, $smartobjectCustomtagHandler;
-    if (is_object($xoopsTpl)) {
-        foreach ($smartobjectCustomtagHandler->objects as $k => $v) {
-            $xoopsTpl->assign($k, $v->render());
-        }
-    }
+	global $xoopsTpl, $smartobjectCustomtagHandler;
+	if (is_object($xoopsTpl)) {
+		foreach ($smartobjectCustomtagHandler->objects as $k => $v) {
+			$xoopsTpl->assign($k, $v->render());
+		}
+	}
 }
 
 if (!defined('SMARTOBJECT_URL')) {
-    include_once(XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php');
+	include_once(XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php');
 }
 
 smart_loadLanguageFile('smartobject', 'customtag');

Spacing +4 added lines, -4 removed lines

@@ -19,13 +19,13 @@
 }
 
 if (!defined('SMARTOBJECT_URL')) {
-    include_once(XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php');
+    include_once(XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php');
 }
 
 smart_loadLanguageFile('smartobject', 'customtag');
 
-include_once XOOPS_ROOT_PATH . '/modules/smartobject/include/functions.php';
-include_once(SMARTOBJECT_ROOT_PATH . 'class/customtag.php');
+include_once XOOPS_ROOT_PATH.'/modules/smartobject/include/functions.php';
+include_once(SMARTOBJECT_ROOT_PATH.'class/customtag.php');
 
 $smartobjectCustomtagHandler = xoops_getModuleHandler('customtag', 'smartobject');
-$smartobjectCustomTagsObj     = $smartobjectCustomtagHandler->getCustomtagsByName();
+$smartobjectCustomTagsObj = $smartobjectCustomtagHandler->getCustomtagsByName();

include/projax/projax.php

Indentation +10 added lines, -10 removed lines

@@ -14,15 +14,15 @@
  */
 
 if (!class_exists('Projax')) {
-    include __DIR__ . '/classes/JavaScript.php';
-    include 'classes/Prototype.php';
-    include 'classes/Scriptaculous.php';
+	include __DIR__ . '/classes/JavaScript.php';
+	include 'classes/Prototype.php';
+	include 'classes/Scriptaculous.php';
 
-    // For $projax = new Projax();
-    /**
-     * Class projax
-     */
-    class projax extends Scriptaculous
-    {
-    }
+	// For $projax = new Projax();
+	/**
+	 * Class projax
+	 */
+	class projax extends Scriptaculous
+	{
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
  */
 
 if (!class_exists('Projax')) {
-    include __DIR__ . '/classes/JavaScript.php';
+    include __DIR__.'/classes/JavaScript.php';
     include 'classes/Prototype.php';
     include 'classes/Scriptaculous.php';
 

include/currency.php

Indentation +7 added lines, -7 removed lines

@@ -17,13 +17,13 @@
 $smartobjectCurrencyHandler = xoops_getModuleHandler('currency', 'smartobject');
 
 if (!$smartobjectCurrenciesObj) {
-    $smartobjectCurrenciesObj = $smartobjectCurrencyHandler->getCurrencies();
+	$smartobjectCurrenciesObj = $smartobjectCurrencyHandler->getCurrencies();
 }
 if (!$smartobjectCurrenciesArray) {
-    foreach ($smartobjectCurrenciesObj as $currencyid => $currencyObj) {
-        if ($currencyObj->getVar('default_currency', 'e')) {
-            $smartobjectDefaultCurrency = $currencyObj;
-        }
-        $smartobjectCurrenciesArray[$currencyid] = $currencyObj->getCode();
-    }
+	foreach ($smartobjectCurrenciesObj as $currencyid => $currencyObj) {
+		if ($currencyObj->getVar('default_currency', 'e')) {
+			$smartobjectDefaultCurrency = $currencyObj;
+		}
+		$smartobjectCurrenciesArray[$currencyid] = $currencyObj->getCode();
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 
 smart_loadCommonLanguageFile();
 
-include_once(SMARTOBJECT_ROOT_PATH . 'class/currency.php');
+include_once(SMARTOBJECT_ROOT_PATH.'class/currency.php');
 
 static $smartobjectCurrenciesObj, $smartobjectCurrenciesArray, $smartobjectDefaultCurrency;