Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[12806] XoopsModules/modulepacks/x257basicmodulepack/ trunk/modules/publisher
|
From: <be...@us...> - 2014-10-02 23:07:19
|
Revision: 12806
http://sourceforge.net/p/xoops/svn/12806
Author: beckmi
Date: 2014-10-02 23:07:10 +0000 (Thu, 02 Oct 2014)
Log Message:
-----------
started conversion to PSR-2 coding
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/category.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/file.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/item.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/mimetype.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/publisher.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/themetabform.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/uploader.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/media.textsanitizer.php
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php 2014-10-02 23:04:57 UTC (rev 12805)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php 2014-10-02 23:07:10 UTC (rev 12806)
@@ -196,7 +196,7 @@
}
$item['pdf'] = '';
- if ($this->publisher->getConfig('display_pdf')) {
+ if ($publisher->getConfig('display_pdf')) {
if ($options[25] == 1) {
$item['pdf'] = "<a href='" . PUBLISHER_URL . "/makepdf.php?itemid=" . $itemObj->itemid() . "' rel='nofollow'><img src='" . PUBLISHER_URL . "/assets/images/links/pdf.gif' title='"
. _CO_PUBLISHER_PDF . "' alt='" . _CO_PUBLISHER_PDF . "' /></a> ";
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/category.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/category.php 2014-10-02 23:04:57 UTC (rev 12805)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/category.php 2014-10-02 23:07:10 UTC (rev 12806)
@@ -33,15 +33,15 @@
* @var PublisherPublisher
* @access public
*/
- var $publisher = null;
+ public $publisher = null;
- var $targetObject = null;
+ public $targetObject = null;
- var $subCatsCount = 4;
+ public $subCatsCount = 4;
- var $userGroups = array();
+ public $userGroups = array();
- function __construct(&$target, $subCatsCount = 4)
+ public function __construct(&$target, $subCatsCount = 4)
{
$this->publisher = PublisherPublisher::getInstance();
@@ -58,7 +58,7 @@
$this->createButtons();
}
- function createElements()
+ public function createElements()
{
global $xoopsUser;
@@ -210,7 +210,7 @@
$this->addElement(new XoopsFormHidden('nb_sub_yet', $this->subCatsCount));
}
- function createButtons()
+ public function createButtons()
{
// Action buttons tray
$button_tray = new XoopsFormElementTray('', '');
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/file.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/file.php 2014-10-02 23:04:57 UTC (rev 12805)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/file.php 2014-10-02 23:07:10 UTC (rev 12806)
@@ -34,11 +34,11 @@
* @var PublisherPublisher
* @access public
*/
- var $publisher = null;
+ public $publisher = null;
- var $targetObject = null;
+ public $targetObject = null;
- function __construct(&$target)
+ public function __construct(&$target)
{
$this->publisher = PublisherPublisher::getInstance();
$this->targetObject = $target;
@@ -50,7 +50,7 @@
$this->createButtons();
}
- function createElements()
+ public function createElements()
{
global $xoopsDB, $xoopsUser;
// NAME
@@ -81,7 +81,7 @@
$this->addElement(new XoopsFormHidden('itemid', $this->targetObject->itemid()));
}
- function createButtons()
+ public function createButtons()
{
$files_button_tray = new XoopsFormElementTray('', '');
$files_hidden = new XoopsFormHidden('op', 'uploadfile');
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/item.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/item.php 2014-10-02 23:04:57 UTC (rev 12805)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/item.php 2014-10-02 23:07:10 UTC (rev 12806)
@@ -34,15 +34,15 @@
class PublisherItemForm extends PublisherThemeTabForm
{
- var $checkperm = true;
- var $tabs = array(
+ public $checkperm = true;
+ public $tabs = array(
_CO_PUBLISHER_TAB_MAIN => 'mainTab',
_CO_PUBLISHER_TAB_IMAGES => 'imagesTab',
_CO_PUBLISHER_TAB_FILES => 'filesTab',
_CO_PUBLISHER_TAB_OTHERS => 'othersTab'
);
- var $mainTab = array(
+ public $mainTab = array(
_PUBLISHER_SUBTITLE,
_PUBLISHER_ITEM_SHORT_URL,
_PUBLISHER_ITEM_TAG,
@@ -60,11 +60,11 @@
_PUBLISHER_UID
);
- var $imagesTab = array(
+ public $imagesTab = array(
_PUBLISHER_IMAGE_ITEM
);
- var $filesTab = array(
+ public $filesTab = array(
_PUBLISHER_ITEM_UPLOAD_FILE
);
@@ -75,12 +75,12 @@
_PUBLISHER_ALLOWCOMMENTS
);
- function setCheckPermissions($checkperm)
+ public function setCheckPermissions($checkperm)
{
$this->checkperm = (bool) $checkperm;
}
- function isGranted($item)
+ public function isGranted($item)
{
$publisher = PublisherPublisher::getInstance();
$ret = false;
@@ -91,7 +91,7 @@
return $ret;
}
- function hasTab($tab)
+ public function hasTab($tab)
{
if (!isset($tab) || !isset($this->tabs[$tab])) {
return false;
@@ -108,7 +108,7 @@
return false;
}
- function createElements($obj)
+ public function createElements($obj)
{
global $xoopsConfig, $xoopsUser;
@@ -366,13 +366,13 @@
$GLOBALS['xoTheme']->addScript(PUBLISHER_URL . '/assets/js/ajaxupload.3.9.js');
$js_data = new XoopsFormLabel('', '
<script type= "text/javascript">/*<![CDATA[*/
-$publisher(document).ready(function(){
+$publisher(document).ready(function () {
var button = $publisher("#publisher_upload_button"), interval;
new AjaxUpload(button,{
action: "' . PUBLISHER_URL . '/include/ajax_upload.php", // I disabled uploads in this example for security reasons
responseType: "text/html",
name: "publisher_upload_file",
- onSubmit : function(file, ext){
+ onSubmit : function (file, ext) {
// change button text, when user selects file
$publisher("#publisher_upload_message").html(" ");
button.html("<img src=\'' . PUBLISHER_URL . '/assets/images/loadingbar.gif\'/>"); this.setData({
@@ -382,10 +382,10 @@
// If you want to allow uploading only 1 file at time,
// you can disable upload button
this.disable();
- interval = window.setInterval(function(){
+ interval = window.setInterval(function () {
}, 200);
},
- onComplete: function(file, response){
+ onComplete: function (file, response) {
button.text("' . _CO_PUBLISHER_IMAGE_UPLOAD_NEW . '");
window.clearInterval(interval);
// enable upload button
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/mimetype.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/mimetype.php 2014-10-02 23:04:57 UTC (rev 12805)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/mimetype.php 2014-10-02 23:07:10 UTC (rev 12806)
@@ -365,7 +365,7 @@
$this->initVar('mime_id', XOBJ_DTYPE_INT, null, false);
$this->initVar('mime_ext', XOBJ_DTYPE_TXTBOX, null, true, 60);
$this->initVar('mime_types', XOBJ_DTYPE_TXTAREA, null, false, 1024);
- $this->initVar('mime_name', XOBJ_DTYPE_TXTBOX, NULL, true, 255);
+ $this->initVar('mime_name', XOBJ_DTYPE_TXTBOX, null, true, 255);
$this->initVar('mime_admin', XOBJ_DTYPE_INT, null, false);
$this->initVar('mime_user', XOBJ_DTYPE_INT, null, false);
if (isset($id)) {
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/publisher.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/publisher.php 2014-10-02 23:04:57 UTC (rev 12805)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/publisher.php 2014-10-02 23:07:10 UTC (rev 12806)
@@ -23,12 +23,12 @@
class PublisherPublisher
{
- var $dirname;
- var $module;
- var $handler;
- var $config;
- var $debug;
- var $debugArray = array();
+ public $dirname;
+ public $module;
+ public $handler;
+ public $config;
+ public $debug;
+ public $debugArray = array();
protected function __construct($debug)
{
@@ -36,7 +36,7 @@
$this->dirname = basename(dirname(__DIR__));
}
- static function &getInstance($debug = false)
+ public static function &getInstance($debug = false)
{
static $instance = false;
if (!$instance) {
@@ -46,7 +46,7 @@
return $instance;
}
- function &getModule()
+ public function &getModule()
{
if ($this->module == null) {
$this->initModule();
@@ -55,7 +55,7 @@
return $this->module;
}
- function getConfig($name = null)
+ public function getConfig($name = null)
{
if ($this->config == null) {
$this->initConfig();
@@ -75,7 +75,7 @@
return $this->config[$name];
}
- function setConfig($name = null, $value = null)
+ public function setConfig($name = null, $value = null)
{
if ($this->config == null) {
$this->initConfig();
@@ -86,7 +86,7 @@
return $this->config[$name];
}
- function &getHandler($name)
+ public function &getHandler($name)
{
if (!isset($this->handler[$name . '_handler'])) {
$this->initHandler($name);
@@ -96,7 +96,7 @@
return $this->handler[$name . '_handler'];
}
- function initModule()
+ public function initModule()
{
global $xoopsModule;
if (isset($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $this->dirname) {
@@ -108,20 +108,20 @@
$this->addLog('INIT MODULE');
}
- function initConfig()
+ public function initConfig()
{
$this->addLog('INIT CONFIG');
$hModConfig = xoops_gethandler('config');
$this->config = $hModConfig->getConfigsByCat(0, $this->getModule()->getVar('mid'));
}
- function initHandler($name)
+ public function initHandler($name)
{
$this->addLog('INIT ' . $name . ' HANDLER');
$this->handler[$name . '_handler'] = xoops_getModuleHandler($name, $this->dirname);
}
- function addLog($log)
+ public function addLog($log)
{
if ($this->debug) {
if (is_object($GLOBALS['xoopsLogger'])) {
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/themetabform.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/themetabform.php 2014-10-02 23:04:57 UTC (rev 12805)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/themetabform.php 2014-10-02 23:07:10 UTC (rev 12806)
@@ -34,63 +34,63 @@
*/
class PublisherThemeTabForm extends XoopsForm
{
- var $_tabs;
+ public $_tabs;
/**
* "action" attribute for the html form
*
* @var string
*/
- var $_action;
+ public $_action;
/**
* "method" attribute for the form.
*
* @var string
*/
- var $_method;
+ public $_method;
/**
* "name" attribute of the form
*
* @var string
*/
- var $_name;
+ public $_name;
/**
* title for the form
*
* @var string
*/
- var $_title;
+ public $_title;
/**
* summary for the form (WGAC2 Requirement)
*
* @var string
*/
- var $_summary = '';
+ public $_summary = '';
/**
* array of {@link XoopsFormElement} objects
*
* @var array
*/
- var $_elements = array();
+ public $_elements = array();
/**
* extra information for the <form> tag
*
* @var array
*/
- var $_extra = array();
+ public $_extra = array();
/**
* required elements
*
* @var array
*/
- var $_required = array();
+ public $_required = array();
/**
* @param string $title
@@ -121,7 +121,7 @@
}
}
- //function render(){}
+ //function render() {}
public function assign(&$tpl)
{
$i = -1;
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/uploader.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/uploader.php 2014-10-02 23:04:57 UTC (rev 12805)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/uploader.php 2014-10-02 23:07:10 UTC (rev 12806)
@@ -80,27 +80,27 @@
mt_srand((double) microtime() * 1000000);
class XoopsMediaUploader
{
- var $mediaName;
- var $mediaType;
- var $mediaSize;
- var $mediaTmpName;
- var $mediaError;
- var $uploadDir = '';
- var $allowedMimeTypes = array();
- var $maxFileSize = 0;
- var $maxWidth;
- var $maxHeight;
- var $targetFileName;
- var $prefix;
- var $ext;
- var $dimension;
- var $errors = array();
- var $savedDestination;
- var $savedFileName;
+ public $mediaName;
+ public $mediaType;
+ public $mediaSize;
+ public $mediaTmpName;
+ public $mediaError;
+ public $uploadDir = '';
+ public $allowedMimeTypes = array();
+ public $maxFileSize = 0;
+ public $maxWidth;
+ public $maxHeight;
+ public $targetFileName;
+ public $prefix;
+ public $ext;
+ public $dimension;
+ public $errors = array();
+ public $savedDestination;
+ public $savedFileName;
/**
* No admin check for uploads
*/
- var $noadmin_sizecheck;
+ public $noadmin_sizecheck;
/**
* Constructor
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/media.textsanitizer.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/media.textsanitizer.php 2014-10-02 23:04:57 UTC (rev 12805)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/media.textsanitizer.php 2014-10-02 23:07:10 UTC (rev 12806)
@@ -24,11 +24,11 @@
class MyTextSanitizerExtension
{
- function MyTextSanitizerExtension()
+ public function MyTextSanitizerExtension()
{
}
- function &getInstance()
+ public function &getInstance()
{
static $instance;
if (!isset($instance)) {
@@ -38,7 +38,7 @@
return $instance;
}
- function wmp(&$patterns, &$replacements)
+ public function wmp(&$patterns, &$replacements)
{
$patterns[] = "/\[wmp=(['\"]?)([^\"']*),([^\"']*)\\1]([^\"]*)\[\/wmp\]/sU";
$rp = "<object classid=\"clsid:6BF52A52-394A-11D3-B153-00C04F79FAA6\" id=\"WindowsMediaPlayer\" width=\"\\2\" height=\"\\3\">\n";
@@ -49,7 +49,7 @@
$replacements[] = $rp;
}
- function _displayFlash($url, $width = false, $height = false)
+ public function _displayFlash($url, $width = false, $height = false)
{
if (!$width || !$height) {
if (!$dimension = @getimagesize($url)) {
@@ -75,13 +75,13 @@
return $rp;
}
- function flash(&$patterns, &$replacements)
+ public function flash(&$patterns, &$replacements)
{
$patterns[] = "/\[(swf|flash)=(['\"]?)([^\"']*),([^\"']*)\\2]([^\"]*)\[\/\\1\]/esU";
$replacements[] = "MyTextSanitizerExtension::_displayFlash( '\\5', '\\3', '\\4' )";
}
- function mms(&$patterns, &$replacements)
+ public function mms(&$patterns, &$replacements)
{
$patterns[] = "/\[mms=(['\"]?)([^\"']*),([^\"']*)\\1]([^\"]*)\[\/mms\]/sU";
$rp = "<OBJECT id=videowindow1 height='\\3' width='\\2' classid='CLSID:6BF52A52-394A-11D3-B153-00C04F79FAA6'>";
@@ -114,7 +114,7 @@
$replacements[] = $rp;
}
- function rtsp(&$patterns, &$replacements)
+ public function rtsp(&$patterns, &$replacements)
{
$patterns[] = "/\[rtsp=(['\"]?)([^\"']*),([^\"']*)\\1]([^\"]*)\[\/rtsp\]/sU";
$rp = "<object classid=\"clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA\" HEIGHT='\\3' ID=Player WIDTH='\\2' VIEWASTEXT>";
|
