mambax7 / smartobject

class/form/elements/smartformtimeelement.php

Indentation +19 added lines, -19 removed lines

@@ -11,23 +11,23 @@
  */
 class SmartFormTimeElement extends XoopsFormSelect
 {
-    /**
-     * SmartFormTimeElement constructor.
-     * @param string $object
-     * @param string $key
-     */
-    public function __construct($object, $key)
-    {
-        $var       = $object->vars[$key];
-        $timearray = array();
-        for ($i = 0; $i < 24; ++$i) {
-            for ($j = 0; $j < 60; $j += 10) {
-                $key_t             = ($i * 3600) + ($j * 60);
-                $timearray[$key_t] = ($j != 0) ? $i . ':' . $j : $i . ':0' . $j;
-            }
-        }
-        ksort($timearray);
-        parent::__construct($var['form_caption'], $key, $object->getVar($key, 'e'));
-        $this->addOptionArray($timearray);
-    }
+	/**
+	 * SmartFormTimeElement constructor.
+	 * @param string $object
+	 * @param string $key
+	 */
+	public function __construct($object, $key)
+	{
+		$var       = $object->vars[$key];
+		$timearray = array();
+		for ($i = 0; $i < 24; ++$i) {
+			for ($j = 0; $j < 60; $j += 10) {
+				$key_t             = ($i * 3600) + ($j * 60);
+				$timearray[$key_t] = ($j != 0) ? $i . ':' . $j : $i . ':0' . $j;
+			}
+		}
+		ksort($timearray);
+		parent::__construct($var['form_caption'], $key, $object->getVar($key, 'e'));
+		$this->addOptionArray($timearray);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
         for ($i = 0; $i < 24; ++$i) {
             for ($j = 0; $j < 60; $j += 10) {
                 $key_t             = ($i * 3600) + ($j * 60);
-                $timearray[$key_t] = ($j != 0) ? $i . ':' . $j : $i . ':0' . $j;
+                $timearray[$key_t] = ($j != 0) ? $i.':'.$j : $i.':0'.$j;
             }
         }
         ksort($timearray);

class/form/elements/smartformcheckelement.php

Indentation +38 added lines, -38 removed lines

@@ -7,41 +7,41 @@ 
  */
 class SmartFormCheckElement extends XoopsFormCheckBox
 {
-    /**
-     *
-     * /**
-     * prepare HTML for output
-     *
-     * @return string
-     */
-    public function render()
-    {
-        $ret = '';
-        if (count($this->getOptions()) > 1 && substr($this->getName(), -2, 2) !== '[]') {
-            $newname = $this->getName() . '[]';
-            $this->setName($newname);
-        }
-        foreach ($this->getOptions() as $value => $name) {
-            $ret .= "<input type='checkbox' name='" . $this->getName() . "' value='" . $value . "'";
-            if (count($this->getValue()) > 0 && in_array($value, $this->getValue())) {
-                $ret .= " checked='checked'";
-            }
-            $ret .= $this->getExtra() . ' />' . $name . '<br>';
-        }
+	/**
+	 *
+	 * /**
+	 * prepare HTML for output
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		$ret = '';
+		if (count($this->getOptions()) > 1 && substr($this->getName(), -2, 2) !== '[]') {
+			$newname = $this->getName() . '[]';
+			$this->setName($newname);
+		}
+		foreach ($this->getOptions() as $value => $name) {
+			$ret .= "<input type='checkbox' name='" . $this->getName() . "' value='" . $value . "'";
+			if (count($this->getValue()) > 0 && in_array($value, $this->getValue())) {
+				$ret .= " checked='checked'";
+			}
+			$ret .= $this->getExtra() . ' />' . $name . '<br>';
+		}
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    /**
-     * @return string
-     */
-    public function renderValidationJS()
-    {
-        $js .= 'var hasSelections = false;';
-        //sometimes, there is an implicit '[]', sometimes not
-        $eltname = $this->getName();
-        if (strpos($eltname, '[') === false) {
-            $js .= "for (var i = 0; i < myform['{$eltname}[]'].length; i++) {
+	/**
+	 * @return string
+	 */
+	public function renderValidationJS()
+	{
+		$js .= 'var hasSelections = false;';
+		//sometimes, there is an implicit '[]', sometimes not
+		$eltname = $this->getName();
+		if (strpos($eltname, '[') === false) {
+			$js .= "for (var i = 0; i < myform['{$eltname}[]'].length; i++) {
                 if (myform['{$eltname}[]'][i].checked) {
                     hasSelections = true;
                 }
@@ -49,8 +49,8 @@ 
             }
             if (hasSelections == false) {
                 window.alert(\"{$eltmsg}\"); myform['{$eltname}[]'][0].focus(); return false; }\n";
-        } else {
-            $js .= "for (var i = 0; i < myform['" . $eltname . "'].length; i++) {
+		} else {
+			$js .= "for (var i = 0; i < myform['" . $eltname . "'].length; i++) {
                 if (myform['{$eltname}'][i].checked) {
                     hasSelections = true;
                 }
@@ -58,8 +58,8 @@ 
             }
             if (hasSelections == false) {
                 window.alert(\"{$eltmsg}\"); myform['{$eltname}'][0].focus(); return false; }\n";
-        }
+		}
 
-        return $js;
-    }
+		return $js;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -18,15 +18,15 @@ 
     {
         $ret = '';
         if (count($this->getOptions()) > 1 && substr($this->getName(), -2, 2) !== '[]') {
-            $newname = $this->getName() . '[]';
+            $newname = $this->getName().'[]';
             $this->setName($newname);
         }
         foreach ($this->getOptions() as $value => $name) {
-            $ret .= "<input type='checkbox' name='" . $this->getName() . "' value='" . $value . "'";
+            $ret .= "<input type='checkbox' name='".$this->getName()."' value='".$value."'";
             if (count($this->getValue()) > 0 && in_array($value, $this->getValue())) {
                 $ret .= " checked='checked'";
             }
-            $ret .= $this->getExtra() . ' />' . $name . '<br>';
+            $ret .= $this->getExtra().' />'.$name.'<br>';
         }
 
         return $ret;
@@ -50,7 +50,7 @@ 
             if (hasSelections == false) {
                 window.alert(\"{$eltmsg}\"); myform['{$eltname}[]'][0].focus(); return false; }\n";
         } else {
-            $js .= "for (var i = 0; i < myform['" . $eltname . "'].length; i++) {
+            $js .= "for (var i = 0; i < myform['".$eltname."'].length; i++) {
                 if (myform['{$eltname}'][i].checked) {
                     hasSelections = true;
                 }

class/form/elements/smartformfileelement.php

Indentation +28 added lines, -28 removed lines

@@ -5,38 +5,38 @@
  */
 class SmartFormFileElement extends XoopsFormFile
 {
-    public $object;
-    public $key;
+	public $object;
+	public $key;
 
-    /**
-     * SmartFormFileElement constructor.
-     * @param string $object
-     * @param string $key
-     */
-    public function __construct($object, $key)
-    {
-        $this->object = $object;
-        $this->key    = $key;
-        parent::__construct($object->vars[$key]['form_caption'], $key, isset($object->vars[$key]['form_maxfilesize']) ? $object->vars[$key]['form_maxfilesize'] : 0);
-        $this->setExtra(' size=50');
-    }
+	/**
+	 * SmartFormFileElement constructor.
+	 * @param string $object
+	 * @param string $key
+	 */
+	public function __construct($object, $key)
+	{
+		$this->object = $object;
+		$this->key    = $key;
+		parent::__construct($object->vars[$key]['form_caption'], $key, isset($object->vars[$key]['form_maxfilesize']) ? $object->vars[$key]['form_maxfilesize'] : 0);
+		$this->setExtra(' size=50');
+	}
 
-    /**
-     * prepare HTML for output
-     *
-     * @return string HTML
-     */
-    public function render()
-    {
-        $ret = '';
-        if ($this->object->getVar($this->key) !== '') {
-            $ret .= '<div>' . _CO_SOBJECT_CURRENT_FILE . $this->object->getVar($this->key) . '</div>';
-        }
+	/**
+	 * prepare HTML for output
+	 *
+	 * @return string HTML
+	 */
+	public function render()
+	{
+		$ret = '';
+		if ($this->object->getVar($this->key) !== '') {
+			$ret .= '<div>' . _CO_SOBJECT_CURRENT_FILE . $this->object->getVar($this->key) . '</div>';
+		}
 
-        $ret .= "<div><input type='hidden' name='MAX_FILE_SIZE' value='" . $this->getMaxFileSize() . "' />
+		$ret .= "<div><input type='hidden' name='MAX_FILE_SIZE' value='" . $this->getMaxFileSize() . "' />
                 <input type='file' name='" . $this->getName() . "' id='" . $this->getName() . "'" . $this->getExtra() . " />
                 <input type='hidden' name='smart_upload_file[]' id='smart_upload_file[]' value='" . $this->getName() . "' /></div>";
 
-        return $ret;
-    }
+		return $ret;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -30,12 +30,12 @@
     {
         $ret = '';
         if ($this->object->getVar($this->key) !== '') {
-            $ret .= '<div>' . _CO_SOBJECT_CURRENT_FILE . $this->object->getVar($this->key) . '</div>';
+            $ret .= '<div>'._CO_SOBJECT_CURRENT_FILE.$this->object->getVar($this->key).'</div>';
         }
 
-        $ret .= "<div><input type='hidden' name='MAX_FILE_SIZE' value='" . $this->getMaxFileSize() . "' />
-                <input type='file' name='" . $this->getName() . "' id='" . $this->getName() . "'" . $this->getExtra() . " />
-                <input type='hidden' name='smart_upload_file[]' id='smart_upload_file[]' value='" . $this->getName() . "' /></div>";
+        $ret .= "<div><input type='hidden' name='MAX_FILE_SIZE' value='".$this->getMaxFileSize()."' />
+                <input type='file' name='" . $this->getName()."' id='".$this->getName()."'".$this->getExtra()." />
+                <input type='hidden' name='smart_upload_file[]' id='smart_upload_file[]' value='" . $this->getName()."' /></div>";
 
         return $ret;
     }

class/form/elements/smartautocompleteelement.php

Indentation +38 added lines, -38 removed lines

@@ -11,50 +11,50 @@
  */
 class SmartAutocompleteElement extends XoopsFormText
 {
-    public $_include_file;
+	public $_include_file;
 
-    /**
-     * SmartAutocompleteElement constructor.
-     * @param string $caption
-     * @param string $name
-     * @param int    $include_file
-     * @param int    $size
-     * @param string $maxlength
-     * @param string $value
-     */
-    public function __construct($caption, $name, $include_file, $size, $maxlength, $value = '')
-    {
-        $this->_include_file = $include_file;
-        parent::__construct($caption, $name, $size, $maxlength, $value);
-    }
+	/**
+	 * SmartAutocompleteElement constructor.
+	 * @param string $caption
+	 * @param string $name
+	 * @param int    $include_file
+	 * @param int    $size
+	 * @param string $maxlength
+	 * @param string $value
+	 */
+	public function __construct($caption, $name, $include_file, $size, $maxlength, $value = '')
+	{
+		$this->_include_file = $include_file;
+		parent::__construct($caption, $name, $size, $maxlength, $value);
+	}
 
-    /**
-     * Prepare HTML for output
-     *
-     * @return string HTML
-     */
-    public function render()
-    {
-        $ret = "<input type='text' name='" .
-               $this->getName() .
-               "' id='" .
-               $this->getName() .
-               "' size='" .
-               $this->getSize() .
-               "' maxlength='" .
-               $this->getMaxlength() .
-               "' value='" .
-               $this->getValue() .
-               "'" .
-               $this->getExtra() .
-               ' />';
+	/**
+	 * Prepare HTML for output
+	 *
+	 * @return string HTML
+	 */
+	public function render()
+	{
+		$ret = "<input type='text' name='" .
+			   $this->getName() .
+			   "' id='" .
+			   $this->getName() .
+			   "' size='" .
+			   $this->getSize() .
+			   "' maxlength='" .
+			   $this->getMaxlength() .
+			   "' value='" .
+			   $this->getValue() .
+			   "'" .
+			   $this->getExtra() .
+			   ' />';
 
-        $ret .= '   <div class="smartobject_autocomplete_hint" id="smartobject_autocomplete_hint' . $this->getName() . '"></div>
+		$ret .= '   <div class="smartobject_autocomplete_hint" id="smartobject_autocomplete_hint' . $this->getName() . '"></div>
 
     <script type="text/javascript">
         new Ajax.Autocompleter("' . $this->getName() . '","smartobject_autocomplete_hint' . $this->getName() . '","' . $this->_include_file . '?key=' . $this->getName() . '");
     </script>';
 
-        return $ret;
-    }
+		return $ret;
+	}
 }

Spacing +14 added lines, -14 removed lines

@@ -35,24 +35,24 @@
      */
     public function render()
     {
-        $ret = "<input type='text' name='" .
-               $this->getName() .
-               "' id='" .
-               $this->getName() .
-               "' size='" .
-               $this->getSize() .
-               "' maxlength='" .
-               $this->getMaxlength() .
-               "' value='" .
-               $this->getValue() .
-               "'" .
-               $this->getExtra() .
+        $ret = "<input type='text' name='".
+               $this->getName().
+               "' id='".
+               $this->getName().
+               "' size='".
+               $this->getSize().
+               "' maxlength='".
+               $this->getMaxlength().
+               "' value='".
+               $this->getValue().
+               "'".
+               $this->getExtra().
                ' />';
 
-        $ret .= '   <div class="smartobject_autocomplete_hint" id="smartobject_autocomplete_hint' . $this->getName() . '"></div>
+        $ret .= '   <div class="smartobject_autocomplete_hint" id="smartobject_autocomplete_hint'.$this->getName().'"></div>
 
     <script type="text/javascript">
-        new Ajax.Autocompleter("' . $this->getName() . '","smartobject_autocomplete_hint' . $this->getName() . '","' . $this->_include_file . '?key=' . $this->getName() . '");
+        new Ajax.Autocompleter("' . $this->getName().'","smartobject_autocomplete_hint'.$this->getName().'","'.$this->_include_file.'?key='.$this->getName().'");
     </script>';
 
         return $ret;

class/form/elements/smartformimageelement.php

Indentation +28 added lines, -28 removed lines

@@ -11,37 +11,37 @@
  */
 class SmartFormImageElement extends XoopsFormElementTray
 {
-    /**
-     * SmartFormImageElement constructor.
-     * @param string $object
-     * @param string $key
-     */
-    public function __construct($object, $key)
-    {
-        $var             = $object->vars[$key];
-        $object_imageurl = $object->getImageDir();
-        parent::__construct($var['form_caption'], ' ');
+	/**
+	 * SmartFormImageElement constructor.
+	 * @param string $object
+	 * @param string $key
+	 */
+	public function __construct($object, $key)
+	{
+		$var             = $object->vars[$key];
+		$object_imageurl = $object->getImageDir();
+		parent::__construct($var['form_caption'], ' ');
 
-        $objectArray['image'] = str_replace('{XOOPS_URL}', XOOPS_URL, $objectArray['image']);
+		$objectArray['image'] = str_replace('{XOOPS_URL}', XOOPS_URL, $objectArray['image']);
 
-        if ($object->getVar($key) !== '' && (0 === strpos($object->getVar($key), 'http') || 0 === strpos($object->getVar($key), '{XOOPS_URL}'))) {
-            $this->addElement(new XoopsFormLabel('', "<img src='" . str_replace('{XOOPS_URL}', XOOPS_URL, $object->getVar($key)) . "' alt='' /><br><br>"));
-        } elseif ($object->getVar($key) !== '') {
-            $this->addElement(new XoopsFormLabel('', "<img src='" . $object_imageurl . $object->getVar($key) . "' alt='' /><br><br>"));
-        }
+		if ($object->getVar($key) !== '' && (0 === strpos($object->getVar($key), 'http') || 0 === strpos($object->getVar($key), '{XOOPS_URL}'))) {
+			$this->addElement(new XoopsFormLabel('', "<img src='" . str_replace('{XOOPS_URL}', XOOPS_URL, $object->getVar($key)) . "' alt='' /><br><br>"));
+		} elseif ($object->getVar($key) !== '') {
+			$this->addElement(new XoopsFormLabel('', "<img src='" . $object_imageurl . $object->getVar($key) . "' alt='' /><br><br>"));
+		}
 
-        include_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformfileuploadelement.php';
-        $this->addElement(new SmartFormFileUploadElement($object, $key));
+		include_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformfileuploadelement.php';
+		$this->addElement(new SmartFormFileUploadElement($object, $key));
 
-        $this->addElement(new XoopsFormLabel('<div style="height: 10px; padding-top: 8px; font-size: 80%;">' . _CO_SOBJECT_URL_FILE_DSC . '</div>', ''));
-        include_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformtextelement.php';
-        include_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformcheckelement.php';
+		$this->addElement(new XoopsFormLabel('<div style="height: 10px; padding-top: 8px; font-size: 80%;">' . _CO_SOBJECT_URL_FILE_DSC . '</div>', ''));
+		include_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformtextelement.php';
+		include_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformcheckelement.php';
 
-        $this->addElement(new XoopsFormLabel('', '<br>' . _CO_SOBJECT_URL_FILE));
-        $this->addElement(new SmartFormTextElement($object, 'url_' . $key));
-        $this->addElement(new XoopsFormLabel('', '<br><br>'));
-        $delete_check = new SmartFormCheckElement('', 'delete_' . $key);
-        $delete_check->addOption(1, '<span style="color:red;">' . _CO_SOBJECT_DELETE . '</span>');
-        $this->addElement($delete_check);
-    }
+		$this->addElement(new XoopsFormLabel('', '<br>' . _CO_SOBJECT_URL_FILE));
+		$this->addElement(new SmartFormTextElement($object, 'url_' . $key));
+		$this->addElement(new XoopsFormLabel('', '<br><br>'));
+		$delete_check = new SmartFormCheckElement('', 'delete_' . $key);
+		$delete_check->addOption(1, '<span style="color:red;">' . _CO_SOBJECT_DELETE . '</span>');
+		$this->addElement($delete_check);
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -25,23 +25,23 @@
         $objectArray['image'] = str_replace('{XOOPS_URL}', XOOPS_URL, $objectArray['image']);
 
         if ($object->getVar($key) !== '' && (0 === strpos($object->getVar($key), 'http') || 0 === strpos($object->getVar($key), '{XOOPS_URL}'))) {
-            $this->addElement(new XoopsFormLabel('', "<img src='" . str_replace('{XOOPS_URL}', XOOPS_URL, $object->getVar($key)) . "' alt='' /><br><br>"));
+            $this->addElement(new XoopsFormLabel('', "<img src='".str_replace('{XOOPS_URL}', XOOPS_URL, $object->getVar($key))."' alt='' /><br><br>"));
         } elseif ($object->getVar($key) !== '') {
-            $this->addElement(new XoopsFormLabel('', "<img src='" . $object_imageurl . $object->getVar($key) . "' alt='' /><br><br>"));
+            $this->addElement(new XoopsFormLabel('', "<img src='".$object_imageurl.$object->getVar($key)."' alt='' /><br><br>"));
         }
 
-        include_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformfileuploadelement.php';
+        include_once SMARTOBJECT_ROOT_PATH.'class/form/elements/smartformfileuploadelement.php';
         $this->addElement(new SmartFormFileUploadElement($object, $key));
 
-        $this->addElement(new XoopsFormLabel('<div style="height: 10px; padding-top: 8px; font-size: 80%;">' . _CO_SOBJECT_URL_FILE_DSC . '</div>', ''));
-        include_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformtextelement.php';
-        include_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformcheckelement.php';
+        $this->addElement(new XoopsFormLabel('<div style="height: 10px; padding-top: 8px; font-size: 80%;">'._CO_SOBJECT_URL_FILE_DSC.'</div>', ''));
+        include_once SMARTOBJECT_ROOT_PATH.'class/form/elements/smartformtextelement.php';
+        include_once SMARTOBJECT_ROOT_PATH.'class/form/elements/smartformcheckelement.php';
 
-        $this->addElement(new XoopsFormLabel('', '<br>' . _CO_SOBJECT_URL_FILE));
-        $this->addElement(new SmartFormTextElement($object, 'url_' . $key));
+        $this->addElement(new XoopsFormLabel('', '<br>'._CO_SOBJECT_URL_FILE));
+        $this->addElement(new SmartFormTextElement($object, 'url_'.$key));
         $this->addElement(new XoopsFormLabel('', '<br><br>'));
-        $delete_check = new SmartFormCheckElement('', 'delete_' . $key);
-        $delete_check->addOption(1, '<span style="color:red;">' . _CO_SOBJECT_DELETE . '</span>');
+        $delete_check = new SmartFormCheckElement('', 'delete_'.$key);
+        $delete_check->addOption(1, '<span style="color:red;">'._CO_SOBJECT_DELETE.'</span>');
         $this->addElement($delete_check);
     }
 }

class/form/elements/smartformset_passwordelement.php

Indentation +40 added lines, -40 removed lines

@@ -12,50 +12,50 @@
 
 class SmartFormSet_passwordElement extends XoopsFormElementTray
 {
-    /**
-     * Size of the field.
-     * @var int
-     * @access  private
-     */
-    public $_size;
+	/**
+	 * Size of the field.
+	 * @var int
+	 * @access  private
+	 */
+	public $_size;
 
-    /**
-     * Maximum length of the text
-     * @var int
-     * @access  private
-     */
-    public $_maxlength;
+	/**
+	 * Maximum length of the text
+	 * @var int
+	 * @access  private
+	 */
+	public $_maxlength;
 
-    /**
-     * Initial content of the field.
-     * @var string
-     * @access  private
-     */
-    public $_value;
+	/**
+	 * Initial content of the field.
+	 * @var string
+	 * @access  private
+	 */
+	public $_value;
 
-    /**
-     * Constructor
-     *
-     * @param string $object
-     * @param string $key
-     * @internal param string $caption Caption
-     * @internal param string $name "name" attribute
-     * @internal param int $size Size of the field
-     * @internal param int $maxlength Maximum length of the text
-     * @internal param int $value Initial value of the field.
-     *                          <b>Warning:</b> this is readable in cleartext in the page's source!
-     */
-    public function __construct($object, $key)
-    {
-        $var     = $object->vars[$key];
-        $control = $object->controls[$key];
+	/**
+	 * Constructor
+	 *
+	 * @param string $object
+	 * @param string $key
+	 * @internal param string $caption Caption
+	 * @internal param string $name "name" attribute
+	 * @internal param int $size Size of the field
+	 * @internal param int $maxlength Maximum length of the text
+	 * @internal param int $value Initial value of the field.
+	 *                          <b>Warning:</b> this is readable in cleartext in the page's source!
+	 */
+	public function __construct($object, $key)
+	{
+		$var     = $object->vars[$key];
+		$control = $object->controls[$key];
 
-        parent::__construct($var['form_caption'] . '<br>' . _US_TYPEPASSTWICE, ' ', $key . '_password_tray');
+		parent::__construct($var['form_caption'] . '<br>' . _US_TYPEPASSTWICE, ' ', $key . '_password_tray');
 
-        $password_box1 = new XoopsFormPassword('', $key . '1', 10, 32);
-        $this->addElement($password_box1);
+		$password_box1 = new XoopsFormPassword('', $key . '1', 10, 32);
+		$this->addElement($password_box1);
 
-        $password_box2 = new XoopsFormPassword('', $key . '2', 10, 32);
-        $this->addElement($password_box2);
-    }
+		$password_box2 = new XoopsFormPassword('', $key . '2', 10, 32);
+		$this->addElement($password_box2);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -50,12 +50,12 @@
         $var     = $object->vars[$key];
         $control = $object->controls[$key];
 
-        parent::__construct($var['form_caption'] . '<br>' . _US_TYPEPASSTWICE, ' ', $key . '_password_tray');
+        parent::__construct($var['form_caption'].'<br>'._US_TYPEPASSTWICE, ' ', $key.'_password_tray');
 
-        $password_box1 = new XoopsFormPassword('', $key . '1', 10, 32);
+        $password_box1 = new XoopsFormPassword('', $key.'1', 10, 32);
         $this->addElement($password_box1);
 
-        $password_box2 = new XoopsFormPassword('', $key . '2', 10, 32);
+        $password_box2 = new XoopsFormPassword('', $key.'2', 10, 32);
         $this->addElement($password_box2);
     }
 }

include/projax_/projax.php

Spacing +3 added lines, -3 removed lines

@@ -13,9 +13,9 @@
  * @filesource
  */
 
-include __DIR__ . '/classes/JavaScript.php';
-__DIR__ . '/classes/Prototype.php';
-__DIR__ . '/classes/Scriptaculous.php';
+include __DIR__.'/classes/JavaScript.php';
+__DIR__.'/classes/Prototype.php';
+__DIR__.'/classes/Scriptaculous.php';
 
 // For $projax = new Projax();
 /**

include/update.php

Indentation +182 added lines, -182 removed lines

@@ -35,26 +35,26 @@ 
  */
 function xoops_module_update_smartobject($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 '',
@@ -71,63 +71,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,
@@ -141,23 +141,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,
@@ -168,36 +168,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,
@@ -205,24 +205,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,
@@ -231,46 +231,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,
@@ -278,25 +278,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;
 }
 
 /**
@@ -305,10 +305,10 @@ 
  */
 function xoops_module_install_smartobject($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;
 }

Spacing +9 added lines, -9 removed lines

@@ -26,8 +26,8 @@ 
 //  ------------------------------------------------------------------------ //
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-include_once(XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php');
-include_once(XOOPS_ROOT_PATH . '/modules/smartobject/class/smartdbupdater.php');
+include_once(XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php');
+include_once(XOOPS_ROOT_PATH.'/modules/smartobject/class/smartdbupdater.php');
 
 /**
  * @param $module
@@ -44,12 +44,12 @@ 
 
     $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>';
+        echo 'Database migrate to version '.$newDbVersion.'<br>';
 
         // Create table smartobject_link
         $table = new SmartDbTable('smartobject_link');
@@ -152,7 +152,7 @@ 
     // db migrate version = 2
     $newDbVersion = 2;
     if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br>';
+        echo 'Database migrate to version '.$newDbVersion.'<br>';
 
         // Create table smartobject_rating
         $table = new SmartDbTable('smartobject_rating');
@@ -192,7 +192,7 @@ 
     // db migrate version = 3
     $newDbVersion = 3;
     if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br>';
+        echo 'Database migrate to version '.$newDbVersion.'<br>';
 
         // Create table smartobject_customtag
         $table = new SmartDbTable('smartobject_customtag');
@@ -217,7 +217,7 @@ 
     // db migrate version = 4
     $newDbVersion = 4;
     if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br>';
+        echo 'Database migrate to version '.$newDbVersion.'<br>';
 
         // Create table smartobject_currency
         $table = new SmartDbTable('smartobject_currency');
@@ -243,12 +243,12 @@ 
     // db migrate version = 6
     $newDbVersion = 6;
     if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br>';
+        echo 'Database migrate to version '.$newDbVersion.'<br>';
     }
 
     $newDbVersion = 7;
     if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br>';
+        echo 'Database migrate to version '.$newDbVersion.'<br>';
 
         // Create table smartobject_file
         $table = new SmartDbTable('smartobject_file');

include/captcha/text.php

Indentation +70 added lines, -70 removed lines

@@ -7,84 +7,84 @@
  */
 class XoopsCaptchaText
 {
-    public $config = array();
-    public $code;
+	public $config = array();
+	public $code;
 
-    /**
-     * XoopsCaptchaText constructor.
-     */
-    public function __construct()
-    {
-    }
+	/**
+	 * XoopsCaptchaText constructor.
+	 */
+	public function __construct()
+	{
+	}
 
-    /**
-     * @return XoopsCaptchaText
-     */
-    public static function getInstance()
-    {
-        static $instance;
-        if (null === $instance) {
-            $instance = new static();
-        }
+	/**
+	 * @return XoopsCaptchaText
+	 */
+	public static function getInstance()
+	{
+		static $instance;
+		if (null === $instance) {
+			$instance = new static();
+		}
 
-        return $instance;
-    }
+		return $instance;
+	}
 
-    /**
-     * Loading configs from CAPTCHA class
-     * @param array $config
-     */
-    public function loadConfig($config = array())
-    {
-        // Loading default preferences
-        $this->config = $config;
-    }
+	/**
+	 * Loading configs from CAPTCHA class
+	 * @param array $config
+	 */
+	public function loadConfig($config = array())
+	{
+		// Loading default preferences
+		$this->config = $config;
+	}
 
-    public function setCode()
-    {
-        $_SESSION['XoopsCaptcha_sessioncode'] = (string)$this->code;
-    }
+	public function setCode()
+	{
+		$_SESSION['XoopsCaptcha_sessioncode'] = (string)$this->code;
+	}
 
-    /**
-     * @return string
-     */
-    public function render()
-    {
-        $form = $this->loadText() .
-                "&nbsp;&nbsp; <input type='text' name='" .
-                $this->config['name'] .
-                "' id='" .
-                $this->config['name'] .
-                "' size='" .
-                $this->config['num_chars'] .
-                "' maxlength='" .
-                $this->config['num_chars'] .
-                "' value='' />";
-        $rule = constant('XOOPS_CAPTCHA_RULE_TEXT');
-        if (!empty($rule)) {
-            $form .= "&nbsp;&nbsp;<small>{$rule}</small>";
-        }
+	/**
+	 * @return string
+	 */
+	public function render()
+	{
+		$form = $this->loadText() .
+				"&nbsp;&nbsp; <input type='text' name='" .
+				$this->config['name'] .
+				"' id='" .
+				$this->config['name'] .
+				"' size='" .
+				$this->config['num_chars'] .
+				"' maxlength='" .
+				$this->config['num_chars'] .
+				"' value='' />";
+		$rule = constant('XOOPS_CAPTCHA_RULE_TEXT');
+		if (!empty($rule)) {
+			$form .= "&nbsp;&nbsp;<small>{$rule}</small>";
+		}
 
-        $this->setCode();
+		$this->setCode();
 
-        return $form;
-    }
+		return $form;
+	}
 
-    /**
-     * @return string
-     */
-    public function loadText()
-    {
-        $val_a = mt_rand(0, 9);
-        $val_b = mt_rand(0, 9);
-        if ($val_a > $val_b) {
-            $expression = "{$val_a} - {$val_b} = ?";
-            $this->code = $val_a - $val_b;
-        } else {
-            $expression = "{$val_a} + {$val_b} = ?";
-            $this->code = $val_a + $val_b;
-        }
+	/**
+	 * @return string
+	 */
+	public function loadText()
+	{
+		$val_a = mt_rand(0, 9);
+		$val_b = mt_rand(0, 9);
+		if ($val_a > $val_b) {
+			$expression = "{$val_a} - {$val_b} = ?";
+			$this->code = $val_a - $val_b;
+		} else {
+			$expression = "{$val_a} + {$val_b} = ?";
+			$this->code = $val_a + $val_b;
+		}
 
-        return "<span style='font-style: normal; font-weight: bold; font-size: 100%; font-color: #333; border: 1px solid #333; padding: 1px 5px;'>{$expression}</span>";
-    }
+		return "<span style='font-style: normal; font-weight: bold; font-size: 100%; font-color: #333; border: 1px solid #333; padding: 1px 5px;'>{$expression}</span>";
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -42,7 +42,7 @@ 
 
     public function setCode()
     {
-        $_SESSION['XoopsCaptcha_sessioncode'] = (string)$this->code;
+        $_SESSION['XoopsCaptcha_sessioncode'] = (string) $this->code;
     }
 
     /**
@@ -50,15 +50,15 @@ 
      */
     public function render()
     {
-        $form = $this->loadText() .
-                "&nbsp;&nbsp; <input type='text' name='" .
-                $this->config['name'] .
-                "' id='" .
-                $this->config['name'] .
-                "' size='" .
-                $this->config['num_chars'] .
-                "' maxlength='" .
-                $this->config['num_chars'] .
+        $form = $this->loadText().
+                "&nbsp;&nbsp; <input type='text' name='".
+                $this->config['name'].
+                "' id='".
+                $this->config['name'].
+                "' size='".
+                $this->config['num_chars'].
+                "' maxlength='".
+                $this->config['num_chars'].
                 "' value='' />";
         $rule = constant('XOOPS_CAPTCHA_RULE_TEXT');
         if (!empty($rule)) {