mambax7 / smartobject

class/smartexport.php

Indentation +271 added lines, -271 removed lines

@@ -19,118 +19,118 @@ 
  */
 class SmartObjectExport
 {
-    public $handler;
-    public $criteria;
-    public $fields;
-    public $format;
-    public $filename;
-    public $filepath;
-    public $options;
-    public $outputMethods = false;
-    public $notDisplayFields;
+	public $handler;
+	public $criteria;
+	public $fields;
+	public $format;
+	public $filename;
+	public $filepath;
+	public $options;
+	public $outputMethods = false;
+	public $notDisplayFields;
 
-    /**
-     * Constructor
-     *
-     * @param SmartPersistableObjectHandler $objectHandler SmartObjectHandler handling the data we want to export
-     * @param CriteriaElement               $criteria      containing the criteria of the query fetching the objects to be exported
-     * @param array|bool                    $fields        fields to be exported. If FALSE then all fields will be exported
-     * @param bool|string                   $filename      name of the file to be created
-     * @param bool|string                   $filepath      path where the file will be saved
-     * @param string                        $format        format of the ouputed export. Currently only supports CSV
-     * @param array|bool                    $options       options of the format to be exported in
-     */
-    public function __construct(
-        SmartPersistableObjectHandler $objectHandler,
-        CriteriaElement $criteria = null,
-        $fields = false,
-        $filename = false,
-        $filepath = false,
-        $format = 'csv',
-        $options = false
-    ) {
-        $this->handler          = $objectHandler;
-        $this->criteria         = $criteria;
-        $this->fields           = $fields;
-        $this->filename         = $filename;
-        $this->format           = $format;
-        $this->options          = $options;
-        $this->notDisplayFields = false;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param SmartPersistableObjectHandler $objectHandler SmartObjectHandler handling the data we want to export
+	 * @param CriteriaElement               $criteria      containing the criteria of the query fetching the objects to be exported
+	 * @param array|bool                    $fields        fields to be exported. If FALSE then all fields will be exported
+	 * @param bool|string                   $filename      name of the file to be created
+	 * @param bool|string                   $filepath      path where the file will be saved
+	 * @param string                        $format        format of the ouputed export. Currently only supports CSV
+	 * @param array|bool                    $options       options of the format to be exported in
+	 */
+	public function __construct(
+		SmartPersistableObjectHandler $objectHandler,
+		CriteriaElement $criteria = null,
+		$fields = false,
+		$filename = false,
+		$filepath = false,
+		$format = 'csv',
+		$options = false
+	) {
+		$this->handler          = $objectHandler;
+		$this->criteria         = $criteria;
+		$this->fields           = $fields;
+		$this->filename         = $filename;
+		$this->format           = $format;
+		$this->options          = $options;
+		$this->notDisplayFields = false;
+	}
 
-    /**
-     * Renders the export
-     * @param $filename
-     */
-    public function render($filename)
-    {
-        $this->filename = $filename;
+	/**
+	 * Renders the export
+	 * @param $filename
+	 */
+	public function render($filename)
+	{
+		$this->filename = $filename;
 
-        $objects        = $this->handler->getObjects($this->criteria);
-        $rows           = array();
-        $columnsHeaders = array();
-        $firstObject    = true;
-        foreach ($objects as $object) {
-            $row = array();
-            foreach ($object->vars as $key => $var) {
-                if ((!$this->fields || in_array($key, $this->fields)) && !in_array($key, $this->notDisplayFields)) {
-                    if ($this->outputMethods && isset($this->outputMethods[$key])
-                        && method_exists($object, $this->outputMethods[$key])) {
-                        $method    = $this->outputMethods[$key];
-                        $row[$key] = $object->$method();
-                    } else {
-                        $row[$key] = $object->getVar($key);
-                    }
-                    if ($firstObject) {
-                        // then set the columnsHeaders array as well
-                        $columnsHeaders[$key] = $var['form_caption'];
-                    }
-                }
-            }
-            $firstObject = false;
-            $rows[]      = $row;
-            unset($row);
-        }
-        $data                   = array();
-        $data['rows']           = $rows;
-        $data['columnsHeaders'] = $columnsHeaders;
-        $smartExportRenderer    = new SmartExportRenderer($data, $this->filename, $this->filepath, $this->format, $this->options);
-        $smartExportRenderer->execute();
-    }
+		$objects        = $this->handler->getObjects($this->criteria);
+		$rows           = array();
+		$columnsHeaders = array();
+		$firstObject    = true;
+		foreach ($objects as $object) {
+			$row = array();
+			foreach ($object->vars as $key => $var) {
+				if ((!$this->fields || in_array($key, $this->fields)) && !in_array($key, $this->notDisplayFields)) {
+					if ($this->outputMethods && isset($this->outputMethods[$key])
+						&& method_exists($object, $this->outputMethods[$key])) {
+						$method    = $this->outputMethods[$key];
+						$row[$key] = $object->$method();
+					} else {
+						$row[$key] = $object->getVar($key);
+					}
+					if ($firstObject) {
+						// then set the columnsHeaders array as well
+						$columnsHeaders[$key] = $var['form_caption'];
+					}
+				}
+			}
+			$firstObject = false;
+			$rows[]      = $row;
+			unset($row);
+		}
+		$data                   = array();
+		$data['rows']           = $rows;
+		$data['columnsHeaders'] = $columnsHeaders;
+		$smartExportRenderer    = new SmartExportRenderer($data, $this->filename, $this->filepath, $this->format, $this->options);
+		$smartExportRenderer->execute();
+	}
 
-    /**
-     * Set an array contaning the alternate methods to use instead of the default getVar()
-     *
-     * $outputMethods array example: 'uid' => 'getUserName'...
-     * @param $outputMethods
-     */
-    public function setOuptutMethods($outputMethods)
-    {
-        $this->outputMethods = $outputMethods;
-    }
+	/**
+	 * Set an array contaning the alternate methods to use instead of the default getVar()
+	 *
+	 * $outputMethods array example: 'uid' => 'getUserName'...
+	 * @param $outputMethods
+	 */
+	public function setOuptutMethods($outputMethods)
+	{
+		$this->outputMethods = $outputMethods;
+	}
 
-    /*
+	/*
      * Set an array of fields that we don't want in export
      */
-    /**
-     * @param $fields
-     */
-    public function setNotDisplayFields($fields)
-    {
-        if (!$this->notDisplayFields) {
-            if (is_array($fields)) {
-                $this->notDisplayFields = $fields;
-            } else {
-                $this->notDisplayFields = array($fields);
-            }
-        } else {
-            if (is_array($fields)) {
-                $this->notDisplayFields = array_merge($this->notDisplayFields, $fields);
-            } else {
-                $this->notDisplayFields[] = $fields;
-            }
-        }
-    }
+	/**
+	 * @param $fields
+	 */
+	public function setNotDisplayFields($fields)
+	{
+		if (!$this->notDisplayFields) {
+			if (is_array($fields)) {
+				$this->notDisplayFields = $fields;
+			} else {
+				$this->notDisplayFields = array($fields);
+			}
+		} else {
+			if (is_array($fields)) {
+				$this->notDisplayFields = array_merge($this->notDisplayFields, $fields);
+			} else {
+				$this->notDisplayFields[] = $fields;
+			}
+		}
+	}
 }
 
 /**
@@ -144,186 +144,186 @@ 
  */
 class SmartExportRenderer
 {
-    public $data;
-    public $format;
-    public $filename;
-    public $filepath;
-    public $options;
+	public $data;
+	public $format;
+	public $filename;
+	public $filepath;
+	public $options;
 
-    /**
-     * Constructor
-     *
-     * @param array       $data     contains the data to be exported
-     * @param bool|string $filename name of the file in which the exported data will be saved
-     * @param bool|string $filepath path where the file will be saved
-     * @param string      $format   format of the ouputed export. Currently only supports CSV
-     * @param array       $options  options of the format to be exported in
-     */
-    public function __construct(
-        $data,
-        $filename = false,
-        $filepath = false,
-        $format = 'csv',
-        $options = array('separator' => ';')
-    ) {
-        $this->data     = $data;
-        $this->format   = $format;
-        $this->filename = $filename;
-        $this->filepath = $filepath;
-        $this->options  = $options;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param array       $data     contains the data to be exported
+	 * @param bool|string $filename name of the file in which the exported data will be saved
+	 * @param bool|string $filepath path where the file will be saved
+	 * @param string      $format   format of the ouputed export. Currently only supports CSV
+	 * @param array       $options  options of the format to be exported in
+	 */
+	public function __construct(
+		$data,
+		$filename = false,
+		$filepath = false,
+		$format = 'csv',
+		$options = array('separator' => ';')
+	) {
+		$this->data     = $data;
+		$this->format   = $format;
+		$this->filename = $filename;
+		$this->filepath = $filepath;
+		$this->options  = $options;
+	}
 
-    /**
-     * @param         $dataArray
-     * @param         $separator
-     * @param  string $trim
-     * @param  bool   $removeEmptyLines
-     * @return string
-     */
-    public function arrayToCsvString($dataArray, $separator, $trim = 'both', $removeEmptyLines = true)
-    {
-        if (!is_array($dataArray) || empty($dataArray)) {
-            return '';
-        }
-        switch ($trim) {
-            case 'none':
-                $trimFunction = false;
-                break;
-            case 'left':
-                $trimFunction = 'ltrim';
-                break;
-            case 'right':
-                $trimFunction = 'rtrim';
-                break;
-            default: //'both':
-                $trimFunction = 'trim';
-                break;
-        }
-        $ret = array();
-        foreach ($dataArray as $key => $field) {
-            $ret[$key] = $this->valToCsvHelper($field, $separator, $trimFunction);
-        }
+	/**
+	 * @param         $dataArray
+	 * @param         $separator
+	 * @param  string $trim
+	 * @param  bool   $removeEmptyLines
+	 * @return string
+	 */
+	public function arrayToCsvString($dataArray, $separator, $trim = 'both', $removeEmptyLines = true)
+	{
+		if (!is_array($dataArray) || empty($dataArray)) {
+			return '';
+		}
+		switch ($trim) {
+			case 'none':
+				$trimFunction = false;
+				break;
+			case 'left':
+				$trimFunction = 'ltrim';
+				break;
+			case 'right':
+				$trimFunction = 'rtrim';
+				break;
+			default: //'both':
+				$trimFunction = 'trim';
+				break;
+		}
+		$ret = array();
+		foreach ($dataArray as $key => $field) {
+			$ret[$key] = $this->valToCsvHelper($field, $separator, $trimFunction);
+		}
 
-        return implode($separator, $ret);
-    }
+		return implode($separator, $ret);
+	}
 
-    /**
-     * @param $val
-     * @param $separator
-     * @param $trimFunction
-     * @return mixed|string
-     */
-    public function valToCsvHelper($val, $separator, $trimFunction)
-    {
-        if ($trimFunction) {
-            $val = $trimFunction($val);
-        }
-        //If there is a separator (;) or a quote (") or a linebreak in the string, we need to quote it.
-        $needQuote = false;
-        do {
-            if (strpos($val, '"') !== false) {
-                $val       = str_replace('"', '""', $val);
-                $needQuote = true;
-                break;
-            }
-            if (strpos($val, $separator) !== false) {
-                $needQuote = true;
-                break;
-            }
-            if ((strpos($val, "\n") !== false) || (strpos($val, "\r") !== false)) { // \r is for mac
-                $needQuote = true;
-                break;
-            }
-        } while (false);
-        if ($needQuote) {
-            $val = '"' . $val . '"';
-        }
+	/**
+	 * @param $val
+	 * @param $separator
+	 * @param $trimFunction
+	 * @return mixed|string
+	 */
+	public function valToCsvHelper($val, $separator, $trimFunction)
+	{
+		if ($trimFunction) {
+			$val = $trimFunction($val);
+		}
+		//If there is a separator (;) or a quote (") or a linebreak in the string, we need to quote it.
+		$needQuote = false;
+		do {
+			if (strpos($val, '"') !== false) {
+				$val       = str_replace('"', '""', $val);
+				$needQuote = true;
+				break;
+			}
+			if (strpos($val, $separator) !== false) {
+				$needQuote = true;
+				break;
+			}
+			if ((strpos($val, "\n") !== false) || (strpos($val, "\r") !== false)) { // \r is for mac
+				$needQuote = true;
+				break;
+			}
+		} while (false);
+		if ($needQuote) {
+			$val = '"' . $val . '"';
+		}
 
-        return $val;
-    }
+		return $val;
+	}
 
-    public function execute()
-    {
-        $exportFileData = '';
+	public function execute()
+	{
+		$exportFileData = '';
 
-        switch ($this->format) {
-            case 'csv':
-                $separator      = isset($this->options['separator']) ? $this->options['separator'] : ';';
-                $firstRow       = implode($separator, $this->data['columnsHeaders']);
-                $exportFileData .= $firstRow . "\r\n";
+		switch ($this->format) {
+			case 'csv':
+				$separator      = isset($this->options['separator']) ? $this->options['separator'] : ';';
+				$firstRow       = implode($separator, $this->data['columnsHeaders']);
+				$exportFileData .= $firstRow . "\r\n";
 
-                foreach ($this->data['rows'] as $cols) {
-                    $exportFileData .= $this->arrayToCsvString($cols, $separator) . "\r\n";
-                }
-                break;
-        }
-        $this->saveExportFile($exportFileData);
-    }
+				foreach ($this->data['rows'] as $cols) {
+					$exportFileData .= $this->arrayToCsvString($cols, $separator) . "\r\n";
+				}
+				break;
+		}
+		$this->saveExportFile($exportFileData);
+	}
 
-    /**
-     * @param $content
-     */
-    public function saveExportFile($content)
-    {
-        switch ($this->format) {
-            case 'csv':
-                $this->saveCsv($content);
-                break;
-        }
-    }
+	/**
+	 * @param $content
+	 */
+	public function saveExportFile($content)
+	{
+		switch ($this->format) {
+			case 'csv':
+				$this->saveCsv($content);
+				break;
+		}
+	}
 
-    /**
-     * @param $content
-     */
-    public function saveCsv($content)
-    {
-        if (!$this->filepath) {
-            $this->filepath = XOOPS_UPLOAD_PATH . '/';
-        }
-        if (!$this->filename) {
-            $this->filename .= time();
-            $this->filename .= '.csv';
-        }
+	/**
+	 * @param $content
+	 */
+	public function saveCsv($content)
+	{
+		if (!$this->filepath) {
+			$this->filepath = XOOPS_UPLOAD_PATH . '/';
+		}
+		if (!$this->filename) {
+			$this->filename .= time();
+			$this->filename .= '.csv';
+		}
 
-        $fullFileName = $this->filepath . $this->filename;
+		$fullFileName = $this->filepath . $this->filename;
 
-        if (!$handle = fopen($fullFileName, 'a+')) {
-            trigger_error('Unable to open ' . $fullFileName, E_USER_WARNING);
-        } elseif (fwrite($handle, $content) === false) {
-            trigger_error('Unable to write in ' . $fullFileName, E_USER_WARNING);
-        } else {
-            $mimeType  = 'text/csv';
-            $file      = strrev($this->filename);
-            $temp_name = strtolower(strrev(substr($file, 0, strpos($file, '--'))));
-            if ($temp_name === '') {
-                $file_name = $this->filename;
-            } else {
-                $file_name = $temp_name;
-            }
-            $fullFileName = $this->filepath . stripslashes(trim($this->filename));
+		if (!$handle = fopen($fullFileName, 'a+')) {
+			trigger_error('Unable to open ' . $fullFileName, E_USER_WARNING);
+		} elseif (fwrite($handle, $content) === false) {
+			trigger_error('Unable to write in ' . $fullFileName, E_USER_WARNING);
+		} else {
+			$mimeType  = 'text/csv';
+			$file      = strrev($this->filename);
+			$temp_name = strtolower(strrev(substr($file, 0, strpos($file, '--'))));
+			if ($temp_name === '') {
+				$file_name = $this->filename;
+			} else {
+				$file_name = $temp_name;
+			}
+			$fullFileName = $this->filepath . stripslashes(trim($this->filename));
 
-            if (ini_get('zlib.output_compression')) {
-                ini_set('zlib.output_compression', 'Off');
-            }
+			if (ini_get('zlib.output_compression')) {
+				ini_set('zlib.output_compression', 'Off');
+			}
 
-            header('Pragma: public');
-            header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
-            header('Cache-Control: private', false);
-            header('Content-Transfer-Encoding: binary');
-            if (isset($mimeType)) {
-                header('Content-Type: ' . $mimeType);
-            }
+			header('Pragma: public');
+			header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+			header('Cache-Control: private', false);
+			header('Content-Transfer-Encoding: binary');
+			if (isset($mimeType)) {
+				header('Content-Type: ' . $mimeType);
+			}
 
-            header('Content-Disposition: attachment; filename=' . $file_name);
+			header('Content-Disposition: attachment; filename=' . $file_name);
 
-            if (isset($mimeType) && false !== strpos($mimeType, 'text/')) {
-                $fp = fopen($fullFileName, 'r');
-            } else {
-                $fp = fopen($fullFileName, 'rb');
-            }
-            fpassthru($fp);
-            exit();
-        }
-        fclose($handle);
-    }
+			if (isset($mimeType) && false !== strpos($mimeType, 'text/')) {
+				$fp = fopen($fullFileName, 'r');
+			} else {
+				$fp = fopen($fullFileName, 'rb');
+			}
+			fpassthru($fp);
+			exit();
+		}
+		fclose($handle);
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -236,7 +236,7 @@ 
             }
         } while (false);
         if ($needQuote) {
-            $val = '"' . $val . '"';
+            $val = '"'.$val.'"';
         }
 
         return $val;
@@ -250,10 +250,10 @@ 
             case 'csv':
                 $separator      = isset($this->options['separator']) ? $this->options['separator'] : ';';
                 $firstRow       = implode($separator, $this->data['columnsHeaders']);
-                $exportFileData .= $firstRow . "\r\n";
+                $exportFileData .= $firstRow."\r\n";
 
                 foreach ($this->data['rows'] as $cols) {
-                    $exportFileData .= $this->arrayToCsvString($cols, $separator) . "\r\n";
+                    $exportFileData .= $this->arrayToCsvString($cols, $separator)."\r\n";
                 }
                 break;
         }
@@ -278,19 +278,19 @@ 
     public function saveCsv($content)
     {
         if (!$this->filepath) {
-            $this->filepath = XOOPS_UPLOAD_PATH . '/';
+            $this->filepath = XOOPS_UPLOAD_PATH.'/';
         }
         if (!$this->filename) {
             $this->filename .= time();
             $this->filename .= '.csv';
         }
 
-        $fullFileName = $this->filepath . $this->filename;
+        $fullFileName = $this->filepath.$this->filename;
 
         if (!$handle = fopen($fullFileName, 'a+')) {
-            trigger_error('Unable to open ' . $fullFileName, E_USER_WARNING);
+            trigger_error('Unable to open '.$fullFileName, E_USER_WARNING);
         } elseif (fwrite($handle, $content) === false) {
-            trigger_error('Unable to write in ' . $fullFileName, E_USER_WARNING);
+            trigger_error('Unable to write in '.$fullFileName, E_USER_WARNING);
         } else {
             $mimeType  = 'text/csv';
             $file      = strrev($this->filename);
@@ -300,7 +300,7 @@ 
             } else {
                 $file_name = $temp_name;
             }
-            $fullFileName = $this->filepath . stripslashes(trim($this->filename));
+            $fullFileName = $this->filepath.stripslashes(trim($this->filename));
 
             if (ini_get('zlib.output_compression')) {
                 ini_set('zlib.output_compression', 'Off');
@@ -311,10 +311,10 @@ 
             header('Cache-Control: private', false);
             header('Content-Transfer-Encoding: binary');
             if (isset($mimeType)) {
-                header('Content-Type: ' . $mimeType);
+                header('Content-Type: '.$mimeType);
             }
 
-            header('Content-Disposition: attachment; filename=' . $file_name);
+            header('Content-Disposition: attachment; filename='.$file_name);
 
             if (isset($mimeType) && false !== strpos($mimeType, 'text/')) {
                 $fp = fopen($fullFileName, 'r');

class/smartmlobject.php

Indentation +132 added lines, -132 removed lines

@@ -24,82 +24,82 @@ 
  */
 class SmartMlObject extends SmartObject
 {
-    /**
-     * SmartMlObject constructor.
-     */
-    public function __construct()
-    {
-        $this->initVar('language', XOBJ_DTYPE_TXTBOX, 'english', false, null, '', true, _CO_SOBJECT_LANGUAGE_CAPTION, _CO_SOBJECT_LANGUAGE_DSC, true, true);
-        $this->setControl('language', 'language');
-    }
-
-    /**
-     * If object is not new, change the control of the not-multilanguage fields
-     *
-     * We need to intercept this function from SmartObject because if the object is not new...
-     */
-    // function getForm() {
-
-    //}
-
-    /**
-     * Strip Multilanguage Fields
-     *
-     * Get rid of all the multilanguage fields to have an object with only global fields.
-     * This will be usefull when creating the ML object for the first time. Then we will be able
-     * to create translations.
-     */
-    public function stripMultilanguageFields()
-    {
-        $objectVars    =& $this->getVars();
-        $newObjectVars = array();
-        foreach ($objectVars as $key => $var) {
-            if (!$var['multilingual']) {
-                $newObjectVars[$key] = $var;
-            }
-        }
-        $this->vars = $newObjectVars;
-    }
-
-    public function stripNonMultilanguageFields()
-    {
-        $objectVars    =& $this->getVars();
-        $newObjectVars = array();
-        foreach ($objectVars as $key => $var) {
-            if ($var['multilingual'] || $key == $this->handler->keyName) {
-                $newObjectVars[$key] = $var;
-            }
-        }
-        $this->vars = $newObjectVars;
-    }
-
-    /**
-     * Make non multilanguage fields read only
-     *
-     * This is used when we are creating/editing a translation.
-     * We only want to edit the multilanguag fields, not the global one.
-     */
-    public function makeNonMLFieldReadOnly()
-    {
-        foreach ($this->getVars() as $key => $var) {
-            //if (($key == 'language') || (!$var['multilingual'] && $key <> $this->handler->keyName)) {
-            if (!$var['multilingual'] && $key != $this->handler->keyName) {
-                $this->setControl($key, 'label');
-            }
-        }
-    }
-
-    /**
-     * @param  bool $onlyUrl
-     * @param  bool $withimage
-     * @return string
-     */
-    public function getEditLanguageLink($onlyUrl = false, $withimage = true)
-    {
-        $controller = new SmartObjectController($this->handler);
-
-        return $controller->getEditLanguageLink($this, $onlyUrl, $withimage);
-    }
+	/**
+	 * SmartMlObject constructor.
+	 */
+	public function __construct()
+	{
+		$this->initVar('language', XOBJ_DTYPE_TXTBOX, 'english', false, null, '', true, _CO_SOBJECT_LANGUAGE_CAPTION, _CO_SOBJECT_LANGUAGE_DSC, true, true);
+		$this->setControl('language', 'language');
+	}
+
+	/**
+	 * If object is not new, change the control of the not-multilanguage fields
+	 *
+	 * We need to intercept this function from SmartObject because if the object is not new...
+	 */
+	// function getForm() {
+
+	//}
+
+	/**
+	 * Strip Multilanguage Fields
+	 *
+	 * Get rid of all the multilanguage fields to have an object with only global fields.
+	 * This will be usefull when creating the ML object for the first time. Then we will be able
+	 * to create translations.
+	 */
+	public function stripMultilanguageFields()
+	{
+		$objectVars    =& $this->getVars();
+		$newObjectVars = array();
+		foreach ($objectVars as $key => $var) {
+			if (!$var['multilingual']) {
+				$newObjectVars[$key] = $var;
+			}
+		}
+		$this->vars = $newObjectVars;
+	}
+
+	public function stripNonMultilanguageFields()
+	{
+		$objectVars    =& $this->getVars();
+		$newObjectVars = array();
+		foreach ($objectVars as $key => $var) {
+			if ($var['multilingual'] || $key == $this->handler->keyName) {
+				$newObjectVars[$key] = $var;
+			}
+		}
+		$this->vars = $newObjectVars;
+	}
+
+	/**
+	 * Make non multilanguage fields read only
+	 *
+	 * This is used when we are creating/editing a translation.
+	 * We only want to edit the multilanguag fields, not the global one.
+	 */
+	public function makeNonMLFieldReadOnly()
+	{
+		foreach ($this->getVars() as $key => $var) {
+			//if (($key == 'language') || (!$var['multilingual'] && $key <> $this->handler->keyName)) {
+			if (!$var['multilingual'] && $key != $this->handler->keyName) {
+				$this->setControl($key, 'label');
+			}
+		}
+	}
+
+	/**
+	 * @param  bool $onlyUrl
+	 * @param  bool $withimage
+	 * @return string
+	 */
+	public function getEditLanguageLink($onlyUrl = false, $withimage = true)
+	{
+		$controller = new SmartObjectController($this->handler);
+
+		return $controller->getEditLanguageLink($this, $onlyUrl, $withimage);
+	}
 }
 
 /**
@@ -107,60 +107,60 @@ 
  */
 class SmartPersistableMlObjectHandler extends SmartPersistableObjectHandler
 {
-    /**
-     * @param  null $criteria
-     * @param  bool $id_as_key
-     * @param  bool $as_object
-     * @param  bool $debug
-     * @param  bool $language
-     * @return array
-     */
-    public function getObjects(
-        $criteria = null,
-        $id_as_key = false,
-        $as_object = true,
-        $debug = false,
-        $language = false
-    ) {
-        // Create the first part of the SQL query to join the "_text" table
-        $sql = 'SELECT * FROM ' . $this->table . ' AS ' . $this->_itemname . ' INNER JOIN ' . $this->table . '_text AS ' . $this->_itemname . '_text ON ' . $this->_itemname . '.' . $this->keyName . '=' . $this->_itemname . '_text.' . $this->keyName;
-
-        if ($language) {
-            // If a language was specified, then let's create a WHERE clause to only return the objects associated with this language
-
-            // if no criteria was previously created, let's create it
-            if (!$criteria) {
-                $criteria = new CriteriaCompo();
-            }
-            $criteria->add(new Criteria('language', $language));
-
-            return parent::getObjects($criteria, $id_as_key, $as_object, $debug, $sql);
-        }
-
-        return parent::getObjects($criteria, $id_as_key, $as_object, $debug, $sql);
-    }
-
-    /**
-     * @param  mixed $id
-     * @param  bool  $language
-     * @param  bool  $as_object
-     * @param  bool  $debug
-     * @return mixed
-     */
-    public function &get($id, $language = false, $as_object = true, $debug = false)
-    {
-        if (!$language) {
-            return parent::get($id, $as_object, $debug);
-        } else {
-            $criteria = new CriteriaCompo();
-            $criteria->add(new Criteria('language', $language));
-
-            return parent::get($id, $as_object, $debug, $criteria);
-        }
-    }
-
-    public function changeTableNameForML()
-    {
-        $this->table = $this->db->prefix($this->_moduleName . '_' . $this->_itemname . '_text');
-    }
+	/**
+	 * @param  null $criteria
+	 * @param  bool $id_as_key
+	 * @param  bool $as_object
+	 * @param  bool $debug
+	 * @param  bool $language
+	 * @return array
+	 */
+	public function getObjects(
+		$criteria = null,
+		$id_as_key = false,
+		$as_object = true,
+		$debug = false,
+		$language = false
+	) {
+		// Create the first part of the SQL query to join the "_text" table
+		$sql = 'SELECT * FROM ' . $this->table . ' AS ' . $this->_itemname . ' INNER JOIN ' . $this->table . '_text AS ' . $this->_itemname . '_text ON ' . $this->_itemname . '.' . $this->keyName . '=' . $this->_itemname . '_text.' . $this->keyName;
+
+		if ($language) {
+			// If a language was specified, then let's create a WHERE clause to only return the objects associated with this language
+
+			// if no criteria was previously created, let's create it
+			if (!$criteria) {
+				$criteria = new CriteriaCompo();
+			}
+			$criteria->add(new Criteria('language', $language));
+
+			return parent::getObjects($criteria, $id_as_key, $as_object, $debug, $sql);
+		}
+
+		return parent::getObjects($criteria, $id_as_key, $as_object, $debug, $sql);
+	}
+
+	/**
+	 * @param  mixed $id
+	 * @param  bool  $language
+	 * @param  bool  $as_object
+	 * @param  bool  $debug
+	 * @return mixed
+	 */
+	public function &get($id, $language = false, $as_object = true, $debug = false)
+	{
+		if (!$language) {
+			return parent::get($id, $as_object, $debug);
+		} else {
+			$criteria = new CriteriaCompo();
+			$criteria->add(new Criteria('language', $language));
+
+			return parent::get($id, $as_object, $debug, $criteria);
+		}
+	}
+
+	public function changeTableNameForML()
+	{
+		$this->table = $this->db->prefix($this->_moduleName . '_' . $this->_itemname . '_text');
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
-require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobject.php';
+require_once XOOPS_ROOT_PATH.'/modules/smartobject/class/smartobject.php';
 
 /**
  * SmartObject base Multilanguage-enabled class
@@ -51,7 +51,7 @@ 
      */
     public function stripMultilanguageFields()
     {
-        $objectVars    =& $this->getVars();
+        $objectVars    = & $this->getVars();
         $newObjectVars = array();
         foreach ($objectVars as $key => $var) {
             if (!$var['multilingual']) {
@@ -63,7 +63,7 @@ 
 
     public function stripNonMultilanguageFields()
     {
-        $objectVars    =& $this->getVars();
+        $objectVars    = & $this->getVars();
         $newObjectVars = array();
         foreach ($objectVars as $key => $var) {
             if ($var['multilingual'] || $key == $this->handler->keyName) {
@@ -123,7 +123,7 @@ 
         $language = false
     ) {
         // Create the first part of the SQL query to join the "_text" table
-        $sql = 'SELECT * FROM ' . $this->table . ' AS ' . $this->_itemname . ' INNER JOIN ' . $this->table . '_text AS ' . $this->_itemname . '_text ON ' . $this->_itemname . '.' . $this->keyName . '=' . $this->_itemname . '_text.' . $this->keyName;
+        $sql = 'SELECT * FROM '.$this->table.' AS '.$this->_itemname.' INNER JOIN '.$this->table.'_text AS '.$this->_itemname.'_text ON '.$this->_itemname.'.'.$this->keyName.'='.$this->_itemname.'_text.'.$this->keyName;
 
         if ($language) {
             // If a language was specified, then let's create a WHERE clause to only return the objects associated with this language
@@ -161,6 +161,6 @@ 
 
     public function changeTableNameForML()
     {
-        $this->table = $this->db->prefix($this->_moduleName . '_' . $this->_itemname . '_text');
+        $this->table = $this->db->prefix($this->_moduleName.'_'.$this->_itemname.'_text');
     }
 }

class/file.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/basedurl.php';
+require_once XOOPS_ROOT_PATH.'/modules/smartobject/class/basedurl.php';
 
 /**
  * Class SmartobjectFile

class/currency.php

Indentation +127 added lines, -127 removed lines

@@ -37,115 +37,115 @@ 
  */
 class SmartobjectCurrency extends SmartObject
 {
-    public $_modulePlugin = false;
-
-    /**
-     * SmartobjectCurrency constructor.
-     */
-    public function __construct()
-    {
-        $this->quickInitVar('currencyid', XOBJ_DTYPE_INT, true);
-        $this->quickInitVar('iso4217', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_CURRENCY_ISO4217, _CO_SOBJECT_CURRENCY_ISO4217_DSC);
-        $this->quickInitVar('name', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_CURRENCY_NAME);
-        $this->quickInitVar('symbol', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_CURRENCY_SYMBOL);
-        $this->quickInitVar('rate', XOBJ_DTYPE_FLOAT, true, _CO_SOBJECT_CURRENCY_RATE, '', '1.0');
-        $this->quickInitVar('default_currency', XOBJ_DTYPE_INT, false, _CO_SOBJECT_CURRENCY_DEFAULT, '', false);
-
-        $this->setControl('symbol', array(
-            'name'      => 'text',
-            'size'      => '15',
-            'maxlength' => '15'
-        ));
-
-        $this->setControl('iso4217', array(
-            'name'      => 'text',
-            'size'      => '5',
-            'maxlength' => '5'
-        ));
-
-        $this->setControl('rate', array(
-            'name'      => 'text',
-            'size'      => '5',
-            'maxlength' => '5'
-        ));
-
-        $this->setControl('rate', array(
-            'name'      => 'text',
-            'size'      => '5',
-            'maxlength' => '5'
-        ));
-
-        $this->hideFieldFromForm('default_currency');
-    }
-
-    /**
-     * @param  string $key
-     * @param  string $format
-     * @return mixed
-     */
-    public function getVar($key, $format = 's')
-    {
-        if ($format === 's' && in_array($key, array('rate', 'default_currency'))) {
-            //            return call_user_func(array($this, $key));
-            return $this->{$key}();
-        }
-
-        return parent::getVar($key, $format);
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getCurrencyLink()
-    {
-        $ret = $this->getVar('name', 'e');
-
-        return $ret;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getCode()
-    {
-        $ret = $this->getVar('iso4217', 'e');
-
-        return $ret;
-    }
-
-    /**
-     * @return float|int|mixed|string
-     */
-    public function rate()
-    {
-        return smart_currency($this->getVar('rate', 'e'));
-    }
-
-    /**
-     * @return string
-     */
-    public function defaultCurrency()
-    {
-        if ($this->getVar('default_currency', 'e') === true) {
-            return _YES;
-        } else {
-            return _NO;
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getDefaultCurrencyControl()
-    {
-        $radio_box = '<input name="default_currency" value="' . $this->getVar('currencyid') . '" type="radio"';
-        if ($this->getVar('default_currency', 'e')) {
-            $radio_box .= 'checked';
-        }
-        $radio_box .= '>';
-
-        return $radio_box;
-    }
+	public $_modulePlugin = false;
+
+	/**
+	 * SmartobjectCurrency constructor.
+	 */
+	public function __construct()
+	{
+		$this->quickInitVar('currencyid', XOBJ_DTYPE_INT, true);
+		$this->quickInitVar('iso4217', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_CURRENCY_ISO4217, _CO_SOBJECT_CURRENCY_ISO4217_DSC);
+		$this->quickInitVar('name', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_CURRENCY_NAME);
+		$this->quickInitVar('symbol', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_CURRENCY_SYMBOL);
+		$this->quickInitVar('rate', XOBJ_DTYPE_FLOAT, true, _CO_SOBJECT_CURRENCY_RATE, '', '1.0');
+		$this->quickInitVar('default_currency', XOBJ_DTYPE_INT, false, _CO_SOBJECT_CURRENCY_DEFAULT, '', false);
+
+		$this->setControl('symbol', array(
+			'name'      => 'text',
+			'size'      => '15',
+			'maxlength' => '15'
+		));
+
+		$this->setControl('iso4217', array(
+			'name'      => 'text',
+			'size'      => '5',
+			'maxlength' => '5'
+		));
+
+		$this->setControl('rate', array(
+			'name'      => 'text',
+			'size'      => '5',
+			'maxlength' => '5'
+		));
+
+		$this->setControl('rate', array(
+			'name'      => 'text',
+			'size'      => '5',
+			'maxlength' => '5'
+		));
+
+		$this->hideFieldFromForm('default_currency');
+	}
+
+	/**
+	 * @param  string $key
+	 * @param  string $format
+	 * @return mixed
+	 */
+	public function getVar($key, $format = 's')
+	{
+		if ($format === 's' && in_array($key, array('rate', 'default_currency'))) {
+			//            return call_user_func(array($this, $key));
+			return $this->{$key}();
+		}
+
+		return parent::getVar($key, $format);
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getCurrencyLink()
+	{
+		$ret = $this->getVar('name', 'e');
+
+		return $ret;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getCode()
+	{
+		$ret = $this->getVar('iso4217', 'e');
+
+		return $ret;
+	}
+
+	/**
+	 * @return float|int|mixed|string
+	 */
+	public function rate()
+	{
+		return smart_currency($this->getVar('rate', 'e'));
+	}
+
+	/**
+	 * @return string
+	 */
+	public function defaultCurrency()
+	{
+		if ($this->getVar('default_currency', 'e') === true) {
+			return _YES;
+		} else {
+			return _NO;
+		}
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDefaultCurrencyControl()
+	{
+		$radio_box = '<input name="default_currency" value="' . $this->getVar('currencyid') . '" type="radio"';
+		if ($this->getVar('default_currency', 'e')) {
+			$radio_box .= 'checked';
+		}
+		$radio_box .= '>';
+
+		return $radio_box;
+	}
 }
 
 /**
@@ -153,22 +153,22 @@ 
  */
 class SmartObjectCurrencyHandler extends SmartPersistableObjectHandler
 {
-    /**
-     * SmartObjectCurrencyHandler constructor.
-     * @param XoopsDatabase $db
-     */
-    public function __construct(XoopsDatabase $db)
-    {
-        parent::__construct($db, 'currency', 'currencyid', 'name', '', 'smartobject');
-    }
-
-    /**
-     * @return array
-     */
-    public function getCurrencies()
-    {
-        $currenciesObj = $this->getObjects(null, true);
-
-        return $currenciesObj;
-    }
+	/**
+	 * SmartObjectCurrencyHandler constructor.
+	 * @param XoopsDatabase $db
+	 */
+	public function __construct(XoopsDatabase $db)
+	{
+		parent::__construct($db, 'currency', 'currencyid', 'name', '', 'smartobject');
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getCurrencies()
+	{
+		$currenciesObj = $this->getObjects(null, true);
+
+		return $currenciesObj;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -29,8 +29,8 @@ 
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobject.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+require_once XOOPS_ROOT_PATH.'/modules/smartobject/class/smartobject.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
 /**
  * Class SmartobjectCurrency
@@ -138,7 +138,7 @@ 
      */
     public function getDefaultCurrencyControl()
     {
-        $radio_box = '<input name="default_currency" value="' . $this->getVar('currencyid') . '" type="radio"';
+        $radio_box = '<input name="default_currency" value="'.$this->getVar('currencyid').'" type="radio"';
         if ($this->getVar('default_currency', 'e')) {
             $radio_box .= 'checked';
         }

class/basedurl.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobject.php';
+require_once XOOPS_ROOT_PATH.'/modules/smartobject/class/smartobject.php';
 
 /**
  * Class SmartobjectBasedUrl

class/smartjax.php

Spacing +3 added lines, -3 removed lines

@@ -29,7 +29,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/projax/projax.php';
+require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/projax/projax.php';
 
 /**
  * Class SmartJax
@@ -39,7 +39,7 @@ 
     public function initiateFromUserside()
     {
         global $xoTheme;
-        $xoTheme->addScript(SMARTOBJECT_URL . 'include/projax/js/prototype.js');
-        $xoTheme->addScript(SMARTOBJECT_URL . 'include/projax/js/scriptaculous.js');
+        $xoTheme->addScript(SMARTOBJECT_URL.'include/projax/js/prototype.js');
+        $xoTheme->addScript(SMARTOBJECT_URL.'include/projax/js/scriptaculous.js');
     }
 }

class/customtag.php

Indentation +265 added lines, -265 removed lines

@@ -36,227 +36,227 @@ 
  */
 class SmartobjectCustomtag extends SmartObject
 {
-    public $content = false;
-
-    /**
-     * SmartobjectCustomtag constructor.
-     */
-    public function __construct()
-    {
-        $this->quickInitVar('customtagid', XOBJ_DTYPE_INT, true);
-        $this->quickInitVar('name', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_CUSTOMTAG_NAME, _CO_SOBJECT_CUSTOMTAG_NAME_DSC);
-        $this->quickInitVar('description', XOBJ_DTYPE_TXTAREA, false, _CO_SOBJECT_CUSTOMTAG_DESCRIPTION, _CO_SOBJECT_CUSTOMTAG_DESCRIPTION_DSC);
-        $this->quickInitVar('content', XOBJ_DTYPE_TXTAREA, true, _CO_SOBJECT_CUSTOMTAG_CONTENT, _CO_SOBJECT_CUSTOMTAG_CONTENT_DSC);
-        $this->quickInitVar('language', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_CUSTOMTAG_LANGUAGE, _CO_SOBJECT_CUSTOMTAG_LANGUAGE_DSC);
-
-        $this->initNonPersistableVar('dohtml', XOBJ_DTYPE_INT, 'class', 'dohtml', '', true);
-        $this->initNonPersistableVar('doimage', XOBJ_DTYPE_INT, 'class', 'doimage', '', true);
-        $this->initNonPersistableVar('doxcode', XOBJ_DTYPE_INT, 'class', 'doxcode', '', true);
-        $this->initNonPersistableVar('dosmiley', XOBJ_DTYPE_INT, 'class', 'dosmiley', '', true);
-
-        $this->setControl('content', array(
-            'name'        => 'textarea',
-            'form_editor' => 'textarea',
-            'form_rows'   => 25
-        ));
-        $this->setControl('language', array(
-            'name' => 'language',
-            'all'  => true
-        ));
-    }
-
-    /**
-     * @param  string $key
-     * @param  string $format
-     * @return mixed
-     */
-    public function getVar($key, $format = 's')
-    {
-        if ($format === 's' && in_array($key, array())) {
-            //            return call_user_func(array($this, $key));
-            return $this->{$key}();
-        }
-
-        return parent::getVar($key, $format);
-    }
-
-    /**
-     * @return bool|mixed
-     */
-    public function render()
-    {
-        if (!$this->content) {
-            $ret           = $this->getVar('content');
-            $this->content = $ret;
-        }
-
-        return $this->content;
-    }
-
-    /**
-     * @return bool|mixed|string
-     */
-    public function renderWithPhp()
-    {
-        if (!$this->content) {
-            $ret           = $this->getVar('content');
-            $this->content = $ret;
-        } else {
-            $ret = $this->content;
-        }
-
-        // check for PHP if we are not on admin side
-        if (!defined('XOOPS_CPFUNC_LOADED') && !(strpos($ret, '[php]') === false)) {
-            $ret = str_replace('[php]', '', $ret);
-            // we have PHP code, let's evaluate
-            eval($ret);
-
-            return '';
-        }
-
-        return $this->content;
-    }
-
-    /**
-     * @return string
-     */
-    public function getXoopsCode()
-    {
-        $ret = '[customtag]' . $this->getVar('tag', 'n') . '[/customtag]';
-
-        return $ret;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCloneLink()
-    {
-        $ret = '<a href="' . SMARTOBJECT_URL . 'admin/customtag.php?op=clone&customtagid=' . $this->id() . '"><img src="' . SMARTOBJECT_IMAGES_ACTIONS_URL . 'editcopy.png" style="vertical-align: middle;" alt="' . _CO_SOBJECT_CUSTOMTAG_CLONE . '" title="' . _CO_SOBJECT_CUSTOMTAG_CLONE . '"></a>';
-
-        return $ret;
-    }
-
-    /**
-     * @param $var
-     * @return bool
-     */
-    public function emptyString($var)
-    {
-        return (strlen($var) > 0);
-    }
-
-    /**
-     * @return mixed|string
-     */
-    public function generateTag()
-    {
-        $title = rawurlencode(strtolower($this->getVar('description', 'e')));
-        $title = xoops_substr($title, 0, 10, '');
-        // Transformation des ponctuations
-        $pattern = array(
-            '/%09/', // Tab
-            '/%20/', // Space
-            '/%21/', // !
-            '/%22/', // "
-            '/%23/', // #
-            '/%25/', // %
-            '/%26/', // &
-            '/%27/', // '
-            '/%28/', // (
-            '/%29/', // )
-            '/%2C/', // ,
-            '/%2F/', // /
-            '/%3A/', // :
-            '/%3B/', // ;
-            '/%3C/', // <
-            '/%3D/', // =
-            '/%3E/', // >
-            '/%3F/', // ?
-            '/%40/', // @
-            '/%5B/', // [
-            '/%5C/', // \
-            '/%5D/', // ]
-            '/%5E/', // ^
-            '/%7B/', // {
-            '/%7C/', // |
-            '/%7D/', // }
-            '/%7E/', // ~
-            "/\./" // .
-        );
-        $rep_pat = array(
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-100',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-at-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-'
-        );
-        $title   = preg_replace($pattern, $rep_pat, $title);
-
-        // Transformation des caractères accentués
-        $pattern = array(
-            '/%B0/', // °
-            '/%E8/', // è
-            '/%E9/', // é
-            '/%EA/', // ê
-            '/%EB/', // ë
-            '/%E7/', // ç
-            '/%E0/', // à
-            '/%E2/', // â
-            '/%E4/', // ä
-            '/%EE/', // î
-            '/%EF/', // ï
-            '/%F9/', // ù
-            '/%FC/', // ü
-            '/%FB/', // û
-            '/%F4/', // ô
-            '/%F6/', // ö
-        );
-        $rep_pat = array('-', 'e', 'e', 'e', 'e', 'c', 'a', 'a', 'a', 'i', 'i', 'u', 'u', 'u', 'o', 'o');
-        $title   = preg_replace($pattern, $rep_pat, $title);
-
-        $tableau = explode('-', $title); // Transforme la chaine de caract�res en tableau
-        $tableau = array_filter($tableau, array($this, 'emptyString')); // Supprime les chaines vides du tableau
-        $title   = implode('-', $tableau); // Transforme un tableau en chaine de caract�res s�par� par un tiret
-
-        $title .= time();
-        $title = md5($title);
-
-        return $title;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getCustomtagName()
-    {
-        $ret = $this->getVar('name');
-
-        return $ret;
-    }
+	public $content = false;
+
+	/**
+	 * SmartobjectCustomtag constructor.
+	 */
+	public function __construct()
+	{
+		$this->quickInitVar('customtagid', XOBJ_DTYPE_INT, true);
+		$this->quickInitVar('name', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_CUSTOMTAG_NAME, _CO_SOBJECT_CUSTOMTAG_NAME_DSC);
+		$this->quickInitVar('description', XOBJ_DTYPE_TXTAREA, false, _CO_SOBJECT_CUSTOMTAG_DESCRIPTION, _CO_SOBJECT_CUSTOMTAG_DESCRIPTION_DSC);
+		$this->quickInitVar('content', XOBJ_DTYPE_TXTAREA, true, _CO_SOBJECT_CUSTOMTAG_CONTENT, _CO_SOBJECT_CUSTOMTAG_CONTENT_DSC);
+		$this->quickInitVar('language', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_CUSTOMTAG_LANGUAGE, _CO_SOBJECT_CUSTOMTAG_LANGUAGE_DSC);
+
+		$this->initNonPersistableVar('dohtml', XOBJ_DTYPE_INT, 'class', 'dohtml', '', true);
+		$this->initNonPersistableVar('doimage', XOBJ_DTYPE_INT, 'class', 'doimage', '', true);
+		$this->initNonPersistableVar('doxcode', XOBJ_DTYPE_INT, 'class', 'doxcode', '', true);
+		$this->initNonPersistableVar('dosmiley', XOBJ_DTYPE_INT, 'class', 'dosmiley', '', true);
+
+		$this->setControl('content', array(
+			'name'        => 'textarea',
+			'form_editor' => 'textarea',
+			'form_rows'   => 25
+		));
+		$this->setControl('language', array(
+			'name' => 'language',
+			'all'  => true
+		));
+	}
+
+	/**
+	 * @param  string $key
+	 * @param  string $format
+	 * @return mixed
+	 */
+	public function getVar($key, $format = 's')
+	{
+		if ($format === 's' && in_array($key, array())) {
+			//            return call_user_func(array($this, $key));
+			return $this->{$key}();
+		}
+
+		return parent::getVar($key, $format);
+	}
+
+	/**
+	 * @return bool|mixed
+	 */
+	public function render()
+	{
+		if (!$this->content) {
+			$ret           = $this->getVar('content');
+			$this->content = $ret;
+		}
+
+		return $this->content;
+	}
+
+	/**
+	 * @return bool|mixed|string
+	 */
+	public function renderWithPhp()
+	{
+		if (!$this->content) {
+			$ret           = $this->getVar('content');
+			$this->content = $ret;
+		} else {
+			$ret = $this->content;
+		}
+
+		// check for PHP if we are not on admin side
+		if (!defined('XOOPS_CPFUNC_LOADED') && !(strpos($ret, '[php]') === false)) {
+			$ret = str_replace('[php]', '', $ret);
+			// we have PHP code, let's evaluate
+			eval($ret);
+
+			return '';
+		}
+
+		return $this->content;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getXoopsCode()
+	{
+		$ret = '[customtag]' . $this->getVar('tag', 'n') . '[/customtag]';
+
+		return $ret;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getCloneLink()
+	{
+		$ret = '<a href="' . SMARTOBJECT_URL . 'admin/customtag.php?op=clone&customtagid=' . $this->id() . '"><img src="' . SMARTOBJECT_IMAGES_ACTIONS_URL . 'editcopy.png" style="vertical-align: middle;" alt="' . _CO_SOBJECT_CUSTOMTAG_CLONE . '" title="' . _CO_SOBJECT_CUSTOMTAG_CLONE . '"></a>';
+
+		return $ret;
+	}
+
+	/**
+	 * @param $var
+	 * @return bool
+	 */
+	public function emptyString($var)
+	{
+		return (strlen($var) > 0);
+	}
+
+	/**
+	 * @return mixed|string
+	 */
+	public function generateTag()
+	{
+		$title = rawurlencode(strtolower($this->getVar('description', 'e')));
+		$title = xoops_substr($title, 0, 10, '');
+		// Transformation des ponctuations
+		$pattern = array(
+			'/%09/', // Tab
+			'/%20/', // Space
+			'/%21/', // !
+			'/%22/', // "
+			'/%23/', // #
+			'/%25/', // %
+			'/%26/', // &
+			'/%27/', // '
+			'/%28/', // (
+			'/%29/', // )
+			'/%2C/', // ,
+			'/%2F/', // /
+			'/%3A/', // :
+			'/%3B/', // ;
+			'/%3C/', // <
+			'/%3D/', // =
+			'/%3E/', // >
+			'/%3F/', // ?
+			'/%40/', // @
+			'/%5B/', // [
+			'/%5C/', // \
+			'/%5D/', // ]
+			'/%5E/', // ^
+			'/%7B/', // {
+			'/%7C/', // |
+			'/%7D/', // }
+			'/%7E/', // ~
+			"/\./" // .
+		);
+		$rep_pat = array(
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-100',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-at-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-'
+		);
+		$title   = preg_replace($pattern, $rep_pat, $title);
+
+		// Transformation des caractères accentués
+		$pattern = array(
+			'/%B0/', // °
+			'/%E8/', // è
+			'/%E9/', // é
+			'/%EA/', // ê
+			'/%EB/', // ë
+			'/%E7/', // ç
+			'/%E0/', // à
+			'/%E2/', // â
+			'/%E4/', // ä
+			'/%EE/', // î
+			'/%EF/', // ï
+			'/%F9/', // ù
+			'/%FC/', // ü
+			'/%FB/', // û
+			'/%F4/', // ô
+			'/%F6/', // ö
+		);
+		$rep_pat = array('-', 'e', 'e', 'e', 'e', 'c', 'a', 'a', 'a', 'i', 'i', 'u', 'u', 'u', 'o', 'o');
+		$title   = preg_replace($pattern, $rep_pat, $title);
+
+		$tableau = explode('-', $title); // Transforme la chaine de caract�res en tableau
+		$tableau = array_filter($tableau, array($this, 'emptyString')); // Supprime les chaines vides du tableau
+		$title   = implode('-', $tableau); // Transforme un tableau en chaine de caract�res s�par� par un tiret
+
+		$title .= time();
+		$title = md5($title);
+
+		return $title;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getCustomtagName()
+	{
+		$ret = $this->getVar('name');
+
+		return $ret;
+	}
 }
 
 /**
@@ -264,48 +264,48 @@ 
  */
 class SmartobjectCustomtagHandler extends SmartPersistableObjectHandler
 {
-    public $objects = false;
-
-    /**
-     * SmartobjectCustomtagHandler constructor.
-     * @param XoopsDatabase $db
-     */
-    public function __construct(XoopsDatabase $db)
-    {
-        parent::__construct($db, 'customtag', 'customtagid', 'name', 'description', 'smartobject');
-        $this->addPermission('view', _CO_SOBJECT_CUSTOMTAG_PERMISSION_VIEW, _CO_SOBJECT_CUSTOMTAG_PERMISSION_VIEW_DSC);
-    }
-
-    /**
-     * @return array|bool
-     */
-    public function getCustomtagsByName()
-    {
-        if (!$this->objects) {
-            global $xoopsConfig;
-
-            $ret = array();
-
-            $criteria = new CriteriaCompo();
-
-            $criteria_language = new CriteriaCompo();
-            $criteria_language->add(new Criteria('language', $xoopsConfig['language']));
-            $criteria_language->add(new Criteria('language', 'all'), 'OR');
-            $criteria->add($criteria_language);
-
-            $smartobjectPermissionsHandler = new SmartObjectPermissionHandler($this);
-            $granted_ids                   = $smartobjectPermissionsHandler->getGrantedItems('view');
-
-            if ($granted_ids && count($granted_ids) > 0) {
-                $criteria->add(new Criteria('customtagid', '(' . implode(', ', $granted_ids) . ')', 'IN'));
-                $customtagsObj = $this->getObjects($criteria, true);
-                foreach ($customtagsObj as $customtagObj) {
-                    $ret[$customtagObj->getVar('name')] = $customtagObj;
-                }
-            }
-            $this->objects = $ret;
-        }
-
-        return $this->objects;
-    }
+	public $objects = false;
+
+	/**
+	 * SmartobjectCustomtagHandler constructor.
+	 * @param XoopsDatabase $db
+	 */
+	public function __construct(XoopsDatabase $db)
+	{
+		parent::__construct($db, 'customtag', 'customtagid', 'name', 'description', 'smartobject');
+		$this->addPermission('view', _CO_SOBJECT_CUSTOMTAG_PERMISSION_VIEW, _CO_SOBJECT_CUSTOMTAG_PERMISSION_VIEW_DSC);
+	}
+
+	/**
+	 * @return array|bool
+	 */
+	public function getCustomtagsByName()
+	{
+		if (!$this->objects) {
+			global $xoopsConfig;
+
+			$ret = array();
+
+			$criteria = new CriteriaCompo();
+
+			$criteria_language = new CriteriaCompo();
+			$criteria_language->add(new Criteria('language', $xoopsConfig['language']));
+			$criteria_language->add(new Criteria('language', 'all'), 'OR');
+			$criteria->add($criteria_language);
+
+			$smartobjectPermissionsHandler = new SmartObjectPermissionHandler($this);
+			$granted_ids                   = $smartobjectPermissionsHandler->getGrantedItems('view');
+
+			if ($granted_ids && count($granted_ids) > 0) {
+				$criteria->add(new Criteria('customtagid', '(' . implode(', ', $granted_ids) . ')', 'IN'));
+				$customtagsObj = $this->getObjects($criteria, true);
+				foreach ($customtagsObj as $customtagObj) {
+					$ret[$customtagObj->getVar('name')] = $customtagObj;
+				}
+			}
+			$this->objects = $ret;
+		}
+
+		return $this->objects;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -29,7 +29,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobject.php';
+require_once XOOPS_ROOT_PATH.'/modules/smartobject/class/smartobject.php';
 
 /**
  * Class SmartobjectCustomtag
@@ -122,7 +122,7 @@ 
      */
     public function getXoopsCode()
     {
-        $ret = '[customtag]' . $this->getVar('tag', 'n') . '[/customtag]';
+        $ret = '[customtag]'.$this->getVar('tag', 'n').'[/customtag]';
 
         return $ret;
     }
@@ -132,7 +132,7 @@ 
      */
     public function getCloneLink()
     {
-        $ret = '<a href="' . SMARTOBJECT_URL . 'admin/customtag.php?op=clone&customtagid=' . $this->id() . '"><img src="' . SMARTOBJECT_IMAGES_ACTIONS_URL . 'editcopy.png" style="vertical-align: middle;" alt="' . _CO_SOBJECT_CUSTOMTAG_CLONE . '" title="' . _CO_SOBJECT_CUSTOMTAG_CLONE . '"></a>';
+        $ret = '<a href="'.SMARTOBJECT_URL.'admin/customtag.php?op=clone&customtagid='.$this->id().'"><img src="'.SMARTOBJECT_IMAGES_ACTIONS_URL.'editcopy.png" style="vertical-align: middle;" alt="'._CO_SOBJECT_CUSTOMTAG_CLONE.'" title="'._CO_SOBJECT_CUSTOMTAG_CLONE.'"></a>';
 
         return $ret;
     }
@@ -297,7 +297,7 @@ 
             $granted_ids                   = $smartobjectPermissionsHandler->getGrantedItems('view');
 
             if ($granted_ids && count($granted_ids) > 0) {
-                $criteria->add(new Criteria('customtagid', '(' . implode(', ', $granted_ids) . ')', 'IN'));
+                $criteria->add(new Criteria('customtagid', '('.implode(', ', $granted_ids).')', 'IN'));
                 $customtagsObj = $this->getObjects($criteria, true);
                 foreach ($customtagsObj as $customtagObj) {
                     $ret[$customtagObj->getVar('name')] = $customtagObj;

class/smartobjectlink.php

Indentation +156 added lines, -156 removed lines

@@ -35,154 +35,154 @@ 
  */
 class SmartobjectLink extends SmartObject
 {
-    /**
-     * SmartobjectLink constructor.
-     */
-    public function __construct()
-    {
-        $this->initVar('linkid', XOBJ_DTYPE_INT, '', true);
-        $this->initVar('date', XOBJ_DTYPE_INT, 0, false, null, '', false, _CO_SOBJECT_LINK_DATE, '', true, true, false);
-        $this->initVar('from_uid', XOBJ_DTYPE_INT, '', false, null, '', false, _CO_SOBJECT_LINK_FROM_UID, _CO_SOBJECT_LINK_FROM_UID_DSC);
-        $this->initVar('from_email', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_FROM_EMAIL, _CO_SOBJECT_LINK_FROM_EMAIL_DSC, true);
-        $this->initVar('from_name', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_FROM_NAME, _CO_SOBJECT_LINK_FROM_NAME_DSC, true);
-        $this->initVar('to_uid', XOBJ_DTYPE_INT, '', false, null, '', false, _CO_SOBJECT_LINK_TO_UID, _CO_SOBJECT_LINK_TO_UID_DSC);
-        $this->initVar('to_email', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_TO_EMAIL, _CO_SOBJECT_LINK_TO_EMAIL_DSC, true);
-        $this->initVar('to_name', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_TO_NAME, _CO_SOBJECT_LINK_TO_NAME_DSC, true);
-        $this->initVar('link', XOBJ_DTYPE_TXTBOX, '', false, 255, '', false, _CO_SOBJECT_LINK_LINK, _CO_SOBJECT_LINK_LINK_DSC, true);
-        $this->initVar('subject', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_SUBJECT, _CO_SOBJECT_LINK_SUBJECT_DSC, true);
-        $this->initVar('body', XOBJ_DTYPE_TXTAREA, '', true, null, '', false, _CO_SOBJECT_LINK_BODY, _CO_SOBJECT_LINK_BODY_DSC);
-        $this->initVar('mid', XOBJ_DTYPE_INT, '', false, null, '', false, _CO_SOBJECT_LINK_MID, _CO_SOBJECT_LINK_MID_DSC);
-        $this->initVar('mid_name', XOBJ_DTYPE_TXTBOX, '', false, 255, '', false, _CO_SOBJECT_LINK_MID_NAME, _CO_SOBJECT_LINK_MID_NAME_DSC, true);
-    }
-
-    /**
-     * returns a specific variable for the object in a proper format
-     *
-     * @access public
-     * @param  string $key    key of the object's variable to be returned
-     * @param  string $format format to use for the output
-     * @return mixed  formatted value of the variable
-     */
-    public function getVar($key, $format = 's')
-    {
-        if ($format === 's' && in_array($key, array('from_uid', 'to_uid', 'date', 'link'))) {
-            //            return call_user_func(array($this, $key));
-            return $this->{$key}();
-        }
-
-        return parent::getVar($key, $format);
-    }
-
-    /**
-     * @return string
-     */
-    public function from_uid()
-    {
-        $ret = smart_getLinkedUnameFromId($this->getVar('from_uid', 'e'), 1, null, true);
-
-        return $ret;
-    }
-
-    /**
-     * @param  bool $withContact
-     * @return string
-     */
-    public function to_uid($withContact = false)
-    {
-        $ret = smart_getLinkedUnameFromId($this->getVar('to_uid', 'e'), 1, null, true);
-
-        return $ret;
-    }
-
-    /**
-     * @return string
-     */
-    public function date()
-    {
-        $ret = formatTimestamp($this->getVar('date', 'e'));
-
-        return $ret;
-    }
-
-    /**
-     * @param  bool $full
-     * @return mixed|string
-     */
-    public function link($full = false)
-    {
-        $ret = $this->getVar('link', 'e');
-        if ($full) {
-            $myts = MyTextSanitizer::getInstance();
-            $ret  = $myts->displayTarea($ret);
-
-            return $ret;
-        } else {
-            $ret = '<a href="' . $ret . '" alt="' . $this->getVar('link', 'e') . '" title="' . $this->getVar('link', 'e') . '">' . _AM_SOBJECT_SENT_LINKS_GOTO . '</a>';
-
-            return $ret;
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getViewItemLink()
-    {
-        $ret = '<a href="' . SMARTOBJECT_URL . 'admin/link.php?op=view&linkid=' . $this->getVar('linkid') . '"><img src="' . SMARTOBJECT_IMAGES_ACTIONS_URL . 'mail_find.png" alt="' . _AM_SOBJECT_SENT_LINK_VIEW . '" title="' . _AM_SOBJECT_SENT_LINK_VIEW . '"></a>';
-
-        return $ret;
-    }
-
-    /**
-     * @return string
-     */
-    public function getFromInfo()
-    {
-        // check if from_uid represent a user
-
-        if ($this->getVar('from_uid')) {
-            $user = smart_getLinkedUnameFromId($this->getVar('from_uid'));
-            if ($user == $GLOBALS['xoopsConfig']['anonymous']) {
-                $user = '<a href="mailto:' . $this->getVar('from_email') . '">' . $this->getVar('from_email') . '</a>';
-            }
-        } else {
-            $user = '<a href="mailto:' . $this->getVar('from_email') . '">' . $this->getVar('from_email') . '</a>';
-        }
-
-        return $user;
-    }
-
-    /**
-     * @return array
-     */
-    public function toArray()
-    {
-        $ret             = parent::toArray();
-        $ret['fromInfo'] = $this->getFromInfo();
-        $ret['toInfo']   = $this->getToInfo();
-        $ret['fullLink'] = $this->link(true);
-
-        return $ret;
-    }
-
-    /**
-     * @return string
-     */
-    public function getToInfo()
-    {
-        // check if from_uid represent a user
-
-        if ($this->getVar('to_uid')) {
-            $user = smart_getLinkedUnameFromId($this->getVar('to_uid'));
-            if ($user == $GLOBALS['xoopsConfig']['anonymous']) {
-                $user = '<a href="mailto:' . $this->getVar('to_email') . '">' . $this->getVar('to_email') . '</a>';
-            }
-        } else {
-            $user = '<a href="mailto:' . $this->getVar('to_email') . '">' . $this->getVar('to_email') . '</a>';
-        }
-
-        return $user;
-    }
+	/**
+	 * SmartobjectLink constructor.
+	 */
+	public function __construct()
+	{
+		$this->initVar('linkid', XOBJ_DTYPE_INT, '', true);
+		$this->initVar('date', XOBJ_DTYPE_INT, 0, false, null, '', false, _CO_SOBJECT_LINK_DATE, '', true, true, false);
+		$this->initVar('from_uid', XOBJ_DTYPE_INT, '', false, null, '', false, _CO_SOBJECT_LINK_FROM_UID, _CO_SOBJECT_LINK_FROM_UID_DSC);
+		$this->initVar('from_email', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_FROM_EMAIL, _CO_SOBJECT_LINK_FROM_EMAIL_DSC, true);
+		$this->initVar('from_name', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_FROM_NAME, _CO_SOBJECT_LINK_FROM_NAME_DSC, true);
+		$this->initVar('to_uid', XOBJ_DTYPE_INT, '', false, null, '', false, _CO_SOBJECT_LINK_TO_UID, _CO_SOBJECT_LINK_TO_UID_DSC);
+		$this->initVar('to_email', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_TO_EMAIL, _CO_SOBJECT_LINK_TO_EMAIL_DSC, true);
+		$this->initVar('to_name', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_TO_NAME, _CO_SOBJECT_LINK_TO_NAME_DSC, true);
+		$this->initVar('link', XOBJ_DTYPE_TXTBOX, '', false, 255, '', false, _CO_SOBJECT_LINK_LINK, _CO_SOBJECT_LINK_LINK_DSC, true);
+		$this->initVar('subject', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_SUBJECT, _CO_SOBJECT_LINK_SUBJECT_DSC, true);
+		$this->initVar('body', XOBJ_DTYPE_TXTAREA, '', true, null, '', false, _CO_SOBJECT_LINK_BODY, _CO_SOBJECT_LINK_BODY_DSC);
+		$this->initVar('mid', XOBJ_DTYPE_INT, '', false, null, '', false, _CO_SOBJECT_LINK_MID, _CO_SOBJECT_LINK_MID_DSC);
+		$this->initVar('mid_name', XOBJ_DTYPE_TXTBOX, '', false, 255, '', false, _CO_SOBJECT_LINK_MID_NAME, _CO_SOBJECT_LINK_MID_NAME_DSC, true);
+	}
+
+	/**
+	 * returns a specific variable for the object in a proper format
+	 *
+	 * @access public
+	 * @param  string $key    key of the object's variable to be returned
+	 * @param  string $format format to use for the output
+	 * @return mixed  formatted value of the variable
+	 */
+	public function getVar($key, $format = 's')
+	{
+		if ($format === 's' && in_array($key, array('from_uid', 'to_uid', 'date', 'link'))) {
+			//            return call_user_func(array($this, $key));
+			return $this->{$key}();
+		}
+
+		return parent::getVar($key, $format);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function from_uid()
+	{
+		$ret = smart_getLinkedUnameFromId($this->getVar('from_uid', 'e'), 1, null, true);
+
+		return $ret;
+	}
+
+	/**
+	 * @param  bool $withContact
+	 * @return string
+	 */
+	public function to_uid($withContact = false)
+	{
+		$ret = smart_getLinkedUnameFromId($this->getVar('to_uid', 'e'), 1, null, true);
+
+		return $ret;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function date()
+	{
+		$ret = formatTimestamp($this->getVar('date', 'e'));
+
+		return $ret;
+	}
+
+	/**
+	 * @param  bool $full
+	 * @return mixed|string
+	 */
+	public function link($full = false)
+	{
+		$ret = $this->getVar('link', 'e');
+		if ($full) {
+			$myts = MyTextSanitizer::getInstance();
+			$ret  = $myts->displayTarea($ret);
+
+			return $ret;
+		} else {
+			$ret = '<a href="' . $ret . '" alt="' . $this->getVar('link', 'e') . '" title="' . $this->getVar('link', 'e') . '">' . _AM_SOBJECT_SENT_LINKS_GOTO . '</a>';
+
+			return $ret;
+		}
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getViewItemLink()
+	{
+		$ret = '<a href="' . SMARTOBJECT_URL . 'admin/link.php?op=view&linkid=' . $this->getVar('linkid') . '"><img src="' . SMARTOBJECT_IMAGES_ACTIONS_URL . 'mail_find.png" alt="' . _AM_SOBJECT_SENT_LINK_VIEW . '" title="' . _AM_SOBJECT_SENT_LINK_VIEW . '"></a>';
+
+		return $ret;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getFromInfo()
+	{
+		// check if from_uid represent a user
+
+		if ($this->getVar('from_uid')) {
+			$user = smart_getLinkedUnameFromId($this->getVar('from_uid'));
+			if ($user == $GLOBALS['xoopsConfig']['anonymous']) {
+				$user = '<a href="mailto:' . $this->getVar('from_email') . '">' . $this->getVar('from_email') . '</a>';
+			}
+		} else {
+			$user = '<a href="mailto:' . $this->getVar('from_email') . '">' . $this->getVar('from_email') . '</a>';
+		}
+
+		return $user;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function toArray()
+	{
+		$ret             = parent::toArray();
+		$ret['fromInfo'] = $this->getFromInfo();
+		$ret['toInfo']   = $this->getToInfo();
+		$ret['fullLink'] = $this->link(true);
+
+		return $ret;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getToInfo()
+	{
+		// check if from_uid represent a user
+
+		if ($this->getVar('to_uid')) {
+			$user = smart_getLinkedUnameFromId($this->getVar('to_uid'));
+			if ($user == $GLOBALS['xoopsConfig']['anonymous']) {
+				$user = '<a href="mailto:' . $this->getVar('to_email') . '">' . $this->getVar('to_email') . '</a>';
+			}
+		} else {
+			$user = '<a href="mailto:' . $this->getVar('to_email') . '">' . $this->getVar('to_email') . '</a>';
+		}
+
+		return $user;
+	}
 }
 
 /**
@@ -190,12 +190,12 @@ 
  */
 class SmartobjectLinkHandler extends SmartPersistableObjectHandler
 {
-    /**
-     * SmartobjectLinkHandler constructor.
-     * @param XoopsDatabase $db
-     */
-    public function __construct(XoopsDatabase $db)
-    {
-        parent::__construct($db, 'link', 'linkid', 'subject', 'body', 'smartobject');
-    }
+	/**
+	 * SmartobjectLinkHandler constructor.
+	 * @param XoopsDatabase $db
+	 */
+	public function __construct(XoopsDatabase $db)
+	{
+		parent::__construct($db, 'link', 'linkid', 'subject', 'body', 'smartobject');
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -28,7 +28,7 @@ 
 // -------------------------------------------------------------------------//
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
-require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobject.php';
+require_once XOOPS_ROOT_PATH.'/modules/smartobject/class/smartobject.php';
 
 /**
  * Class SmartobjectLink
@@ -117,7 +117,7 @@ 
 
             return $ret;
         } else {
-            $ret = '<a href="' . $ret . '" alt="' . $this->getVar('link', 'e') . '" title="' . $this->getVar('link', 'e') . '">' . _AM_SOBJECT_SENT_LINKS_GOTO . '</a>';
+            $ret = '<a href="'.$ret.'" alt="'.$this->getVar('link', 'e').'" title="'.$this->getVar('link', 'e').'">'._AM_SOBJECT_SENT_LINKS_GOTO.'</a>';
 
             return $ret;
         }
@@ -128,7 +128,7 @@ 
      */
     public function getViewItemLink()
     {
-        $ret = '<a href="' . SMARTOBJECT_URL . 'admin/link.php?op=view&linkid=' . $this->getVar('linkid') . '"><img src="' . SMARTOBJECT_IMAGES_ACTIONS_URL . 'mail_find.png" alt="' . _AM_SOBJECT_SENT_LINK_VIEW . '" title="' . _AM_SOBJECT_SENT_LINK_VIEW . '"></a>';
+        $ret = '<a href="'.SMARTOBJECT_URL.'admin/link.php?op=view&linkid='.$this->getVar('linkid').'"><img src="'.SMARTOBJECT_IMAGES_ACTIONS_URL.'mail_find.png" alt="'._AM_SOBJECT_SENT_LINK_VIEW.'" title="'._AM_SOBJECT_SENT_LINK_VIEW.'"></a>';
 
         return $ret;
     }
@@ -143,10 +143,10 @@ 
         if ($this->getVar('from_uid')) {
             $user = smart_getLinkedUnameFromId($this->getVar('from_uid'));
             if ($user == $GLOBALS['xoopsConfig']['anonymous']) {
-                $user = '<a href="mailto:' . $this->getVar('from_email') . '">' . $this->getVar('from_email') . '</a>';
+                $user = '<a href="mailto:'.$this->getVar('from_email').'">'.$this->getVar('from_email').'</a>';
             }
         } else {
-            $user = '<a href="mailto:' . $this->getVar('from_email') . '">' . $this->getVar('from_email') . '</a>';
+            $user = '<a href="mailto:'.$this->getVar('from_email').'">'.$this->getVar('from_email').'</a>';
         }
 
         return $user;
@@ -175,10 +175,10 @@ 
         if ($this->getVar('to_uid')) {
             $user = smart_getLinkedUnameFromId($this->getVar('to_uid'));
             if ($user == $GLOBALS['xoopsConfig']['anonymous']) {
-                $user = '<a href="mailto:' . $this->getVar('to_email') . '">' . $this->getVar('to_email') . '</a>';
+                $user = '<a href="mailto:'.$this->getVar('to_email').'">'.$this->getVar('to_email').'</a>';
             }
         } else {
-            $user = '<a href="mailto:' . $this->getVar('to_email') . '">' . $this->getVar('to_email') . '</a>';
+            $user = '<a href="mailto:'.$this->getVar('to_email').'">'.$this->getVar('to_email').'</a>';
         }
 
         return $user;

class/smartobjectsingleview.php

Indentation +112 added lines, -112 removed lines

@@ -20,39 +20,39 @@ 
  */
 class SmartObjectRow
 {
-    public $_keyname;
-    public $_align;
-    public $_customMethodForValue;
-    public $_header;
-    public $_class;
+	public $_keyname;
+	public $_align;
+	public $_customMethodForValue;
+	public $_header;
+	public $_class;
 
-    /**
-     * SmartObjectRow constructor.
-     * @param      $keyname
-     * @param bool $customMethodForValue
-     * @param bool $header
-     * @param bool $class
-     */
-    public function __construct($keyname, $customMethodForValue = false, $header = false, $class = false)
-    {
-        $this->_keyname              = $keyname;
-        $this->_customMethodForValue = $customMethodForValue;
-        $this->_header               = $header;
-        $this->_class                = $class;
-    }
+	/**
+	 * SmartObjectRow constructor.
+	 * @param      $keyname
+	 * @param bool $customMethodForValue
+	 * @param bool $header
+	 * @param bool $class
+	 */
+	public function __construct($keyname, $customMethodForValue = false, $header = false, $class = false)
+	{
+		$this->_keyname              = $keyname;
+		$this->_customMethodForValue = $customMethodForValue;
+		$this->_header               = $header;
+		$this->_class                = $class;
+	}
 
-    public function getKeyName()
-    {
-        return $this->_keyname;
-    }
+	public function getKeyName()
+	{
+		return $this->_keyname;
+	}
 
-    /**
-     * @return bool
-     */
-    public function isHeader()
-    {
-        return $this->_header;
-    }
+	/**
+	 * @return bool
+	 */
+	public function isHeader()
+	{
+		return $this->_header;
+	}
 }
 
 /**
@@ -66,94 +66,94 @@ 
  */
 class SmartObjectSingleView
 {
-    public $_object;
-    public $_userSide;
-    public $_tpl;
-    public $_rows;
-    public $_actions;
-    public $_headerAsRow = true;
+	public $_object;
+	public $_userSide;
+	public $_tpl;
+	public $_rows;
+	public $_actions;
+	public $_headerAsRow = true;
 
-    /**
-     * Constructor
-     * @param       $object
-     * @param bool  $userSide
-     * @param array $actions
-     * @param bool  $headerAsRow
-     */
-    public function __construct($object, $userSide = false, $actions = array(), $headerAsRow = true)
-    {
-        $this->_object      = $object;
-        $this->_userSide    = $userSide;
-        $this->_actions     = $actions;
-        $this->_headerAsRow = $headerAsRow;
-    }
+	/**
+	 * Constructor
+	 * @param       $object
+	 * @param bool  $userSide
+	 * @param array $actions
+	 * @param bool  $headerAsRow
+	 */
+	public function __construct($object, $userSide = false, $actions = array(), $headerAsRow = true)
+	{
+		$this->_object      = $object;
+		$this->_userSide    = $userSide;
+		$this->_actions     = $actions;
+		$this->_headerAsRow = $headerAsRow;
+	}
 
-    /**
-     * @param $rowObj
-     */
-    public function addRow($rowObj)
-    {
-        $this->_rows[] = $rowObj;
-    }
+	/**
+	 * @param $rowObj
+	 */
+	public function addRow($rowObj)
+	{
+		$this->_rows[] = $rowObj;
+	}
 
-    /**
-     * @param  bool $fetchOnly
-     * @param  bool $debug
-     * @return mixed|string|void
-     */
-    public function render($fetchOnly = false, $debug = false)
-    {
-        require_once XOOPS_ROOT_PATH . '/class/template.php';
+	/**
+	 * @param  bool $fetchOnly
+	 * @param  bool $debug
+	 * @return mixed|string|void
+	 */
+	public function render($fetchOnly = false, $debug = false)
+	{
+		require_once XOOPS_ROOT_PATH . '/class/template.php';
 
-        $this->_tpl             = new XoopsTpl();
-        $vars                   = $this->_object->vars;
-        $smartobjectObjectArray = array();
+		$this->_tpl             = new XoopsTpl();
+		$vars                   = $this->_object->vars;
+		$smartobjectObjectArray = array();
 
-        foreach ($this->_rows as $row) {
-            $key = $row->getKeyName();
-            if ($row->_customMethodForValue && method_exists($this->_object, $row->_customMethodForValue)) {
-                $method = $row->_customMethodForValue;
-                $value  = $this->_object->$method();
-            } else {
-                $value = $this->_object->getVar($row->getKeyName());
-            }
-            if ($row->isHeader()) {
-                $this->_tpl->assign('smartobject_single_view_header_caption', $this->_object->vars[$key]['form_caption']);
-                $this->_tpl->assign('smartobject_single_view_header_value', $value);
-            } else {
-                $smartobjectObjectArray[$key]['value']   = $value;
-                $smartobjectObjectArray[$key]['header']  = $row->isHeader();
-                $smartobjectObjectArray[$key]['caption'] = $this->_object->vars[$key]['form_caption'];
-            }
-        }
-        $action_row = '';
-        if (in_array('edit', $this->_actions)) {
-            $action_row .= $this->_object->getEditItemLink(false, true, true);
-        }
-        if (in_array('delete', $this->_actions)) {
-            $action_row .= $this->_object->getDeleteItemLink(false, true, true);
-        }
-        if ($action_row) {
-            $smartobjectObjectArray['zaction']['value']   = $action_row;
-            $smartobjectObjectArray['zaction']['caption'] = _CO_SOBJECT_ACTIONS;
-        }
+		foreach ($this->_rows as $row) {
+			$key = $row->getKeyName();
+			if ($row->_customMethodForValue && method_exists($this->_object, $row->_customMethodForValue)) {
+				$method = $row->_customMethodForValue;
+				$value  = $this->_object->$method();
+			} else {
+				$value = $this->_object->getVar($row->getKeyName());
+			}
+			if ($row->isHeader()) {
+				$this->_tpl->assign('smartobject_single_view_header_caption', $this->_object->vars[$key]['form_caption']);
+				$this->_tpl->assign('smartobject_single_view_header_value', $value);
+			} else {
+				$smartobjectObjectArray[$key]['value']   = $value;
+				$smartobjectObjectArray[$key]['header']  = $row->isHeader();
+				$smartobjectObjectArray[$key]['caption'] = $this->_object->vars[$key]['form_caption'];
+			}
+		}
+		$action_row = '';
+		if (in_array('edit', $this->_actions)) {
+			$action_row .= $this->_object->getEditItemLink(false, true, true);
+		}
+		if (in_array('delete', $this->_actions)) {
+			$action_row .= $this->_object->getDeleteItemLink(false, true, true);
+		}
+		if ($action_row) {
+			$smartobjectObjectArray['zaction']['value']   = $action_row;
+			$smartobjectObjectArray['zaction']['caption'] = _CO_SOBJECT_ACTIONS;
+		}
 
-        $this->_tpl->assign('smartobject_header_as_row', $this->_headerAsRow);
-        $this->_tpl->assign('smartobject_object_array', $smartobjectObjectArray);
+		$this->_tpl->assign('smartobject_header_as_row', $this->_headerAsRow);
+		$this->_tpl->assign('smartobject_object_array', $smartobjectObjectArray);
 
-        if ($fetchOnly) {
-            return $this->_tpl->fetch('db:smartobject_singleview_display.tpl');
-        } else {
-            $this->_tpl->display('db:smartobject_singleview_display.tpl');
-        }
-    }
+		if ($fetchOnly) {
+			return $this->_tpl->fetch('db:smartobject_singleview_display.tpl');
+		} else {
+			$this->_tpl->display('db:smartobject_singleview_display.tpl');
+		}
+	}
 
-    /**
-     * @param  bool $debug
-     * @return mixed|string|void
-     */
-    public function fetch($debug = false)
-    {
-        return $this->render(true, $debug);
-    }
+	/**
+	 * @param  bool $debug
+	 * @return mixed|string|void
+	 */
+	public function fetch($debug = false)
+	{
+		return $this->render(true, $debug);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -103,7 +103,7 @@
      */
     public function render($fetchOnly = false, $debug = false)
     {
-        require_once XOOPS_ROOT_PATH . '/class/template.php';
+        require_once XOOPS_ROOT_PATH.'/class/template.php';
 
         $this->_tpl             = new XoopsTpl();
         $vars                   = $this->_object->vars;