mambax7 / planet

trackback.php

Indentation +142 added lines, -142 removed lines

@@ -38,159 +38,159 @@
 $charset    = trim(Request::getString('charset', '', 'POST'));//trim($_POST['charset']);
 
 if (empty($xoopsModuleConfig['trackback_option'])) {
-    PlanetUtility::planetRespondToTrackback(1, 'Trackback is closed');
+	PlanetUtility::planetRespondToTrackback(1, 'Trackback is closed');
 }
 if (!strlen($title . $url . $blog_name)) {
-    PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_INVALID'));
+	PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_INVALID'));
 }
 
 if (!empty($article_id) && !empty($url)) {
-    $trackbackHandler = xoops_getModuleHandler('trackback', $GLOBALS['moddirname']);
-    $criteria         = new CriteriaCompo(new Criteria('art_id', $article_id));
-    $criteria->add(new Criteria('tb_url', $url));
-    if ($trackbackHandler->getCount($criteria) > 0) {
-        PlanetUtility::planetRespondToTrackback(1, 'We already have a ping from that URI for this article.');
-    }
+	$trackbackHandler = xoops_getModuleHandler('trackback', $GLOBALS['moddirname']);
+	$criteria         = new CriteriaCompo(new Criteria('art_id', $article_id));
+	$criteria->add(new Criteria('tb_url', $url));
+	if ($trackbackHandler->getCount($criteria) > 0) {
+		PlanetUtility::planetRespondToTrackback(1, 'We already have a ping from that URI for this article.');
+	}
 
-    $charset   = empty($charset) ? 'utf-8' : $charset;
-    $title     = XoopsLocal::convert_encoding($title, _CHARSET, $charset);
-    $excerpt   = XoopsLocal::convert_encoding($excerpt, _CHARSET, $charset);
-    $blog_name = XoopsLocal::convert_encoding($blog_name, _CHARSET, $charset);
-    $tb_status = (int)$xoopsModuleConfig['trackback_option'];
+	$charset   = empty($charset) ? 'utf-8' : $charset;
+	$title     = XoopsLocal::convert_encoding($title, _CHARSET, $charset);
+	$excerpt   = XoopsLocal::convert_encoding($excerpt, _CHARSET, $charset);
+	$blog_name = XoopsLocal::convert_encoding($blog_name, _CHARSET, $charset);
+	$tb_status = (int)$xoopsModuleConfig['trackback_option'];
 
-    $com_pid    = 0;
-    $com_itemid = $article_id;
-    $com_rootid = 0;
-    $com_title  = $title;
-    $com_text   = $excerpt;
-    $com_text   .= "\n\n[TRACKBACK]" . _POSTEDBY . ': ';
-    if (!empty($url)) {
-        $com_text .= '[url=' . $url . ']' . $blog_name . '[/url]';
-    } else {
-        $com_text .= $blog_name;
-    }
-    $com_modid = $xoopsModule->getVar('mid');
+	$com_pid    = 0;
+	$com_itemid = $article_id;
+	$com_rootid = 0;
+	$com_title  = $title;
+	$com_text   = $excerpt;
+	$com_text   .= "\n\n[TRACKBACK]" . _POSTEDBY . ': ';
+	if (!empty($url)) {
+		$com_text .= '[url=' . $url . ']' . $blog_name . '[/url]';
+	} else {
+		$com_text .= $blog_name;
+	}
+	$com_modid = $xoopsModule->getVar('mid');
 
-    $commentHandler = xoops_getHandler('comment');
-    $comment        = $commentHandler->create();
-    $comment->setVar('com_created', time());
-    $comment->setVar('com_pid', $com_pid);
-    $comment->setVar('com_itemid', $com_itemid);
-    $comment->setVar('com_rootid', $com_rootid);
-    $comment->setVar('com_ip', xoops_getenv('REMOTE_ADDR'));
-    switch ($tb_status) {
-        case 2:
-            $comment->setVar('com_status', 2);
-            $call_approvefunc = true;
-            $call_updatefunc  = true;
-            $notify_event     = 'comment';
-            break;
-        case 1:
-        default:
-            $comment->setVar('com_status', 1);
-            $notify_event = 'comment_submit';
-            break;
-    }
-    $comment->setVar('com_uid', 0);
-    $com_title = xoops_trim($com_title);
-    $com_title = empty($com_title) ? _NOTITLE : $com_title;
-    $comment->setVar('com_title', $com_title);
-    $comment->setVar('com_text', $com_text);
-    $comment->setVar('dohtml', 0);
-    $comment->setVar('dosmiley', 0);
-    $comment->setVar('doxcode', 1);
-    $comment->setVar('doimage', 0);
-    $comment->setVar('dobr', 1);
-    $comment->setVar('com_icon', '');
-    $comment->setVar('com_modified', time());
-    $comment->setVar('com_modid', $com_modid);
-    if (false != $commentHandler->insert($comment)) {
-        $newcid = $comment->getVar('com_id');
+	$commentHandler = xoops_getHandler('comment');
+	$comment        = $commentHandler->create();
+	$comment->setVar('com_created', time());
+	$comment->setVar('com_pid', $com_pid);
+	$comment->setVar('com_itemid', $com_itemid);
+	$comment->setVar('com_rootid', $com_rootid);
+	$comment->setVar('com_ip', xoops_getenv('REMOTE_ADDR'));
+	switch ($tb_status) {
+		case 2:
+			$comment->setVar('com_status', 2);
+			$call_approvefunc = true;
+			$call_updatefunc  = true;
+			$notify_event     = 'comment';
+			break;
+		case 1:
+		default:
+			$comment->setVar('com_status', 1);
+			$notify_event = 'comment_submit';
+			break;
+	}
+	$comment->setVar('com_uid', 0);
+	$com_title = xoops_trim($com_title);
+	$com_title = empty($com_title) ? _NOTITLE : $com_title;
+	$comment->setVar('com_title', $com_title);
+	$comment->setVar('com_text', $com_text);
+	$comment->setVar('dohtml', 0);
+	$comment->setVar('dosmiley', 0);
+	$comment->setVar('doxcode', 1);
+	$comment->setVar('doimage', 0);
+	$comment->setVar('dobr', 1);
+	$comment->setVar('com_icon', '');
+	$comment->setVar('com_modified', time());
+	$comment->setVar('com_modid', $com_modid);
+	if (false != $commentHandler->insert($comment)) {
+		$newcid = $comment->getVar('com_id');
 
-        // set own id as root id
-        $com_rootid = $newcid;
-        if (!$commentHandler->updateByField($comment, 'com_rootid', $com_rootid)) {
-            $commentHandler->delete($comment);
-            PlanetUtility::planetRespondToTrackback(1, xoops_error());
-        }
+		// set own id as root id
+		$com_rootid = $newcid;
+		if (!$commentHandler->updateByField($comment, 'com_rootid', $com_rootid)) {
+			$commentHandler->delete($comment);
+			PlanetUtility::planetRespondToTrackback(1, xoops_error());
+		}
 
-        // call custom approve function if any
-        if (false != $call_approvefunc && isset($comment_config['callback']['approve'])
-            && trim($comment_config['callback']['approve']) != '') {
-            $skip = false;
-            if (!function_exists($comment_config['callback']['approve'])) {
-                if (isset($comment_config['callbackFile'])) {
-                    $callbackfile = trim($comment_config['callbackFile']);
-                    if ($callbackfile != ''
-                        && file_exists(XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile)) {
-                        require_once XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile;
-                    }
-                    if (!function_exists($comment_config['callback']['approve'])) {
-                        $skip = true;
-                    }
-                } else {
-                    $skip = true;
-                }
-            }
-            if (!$skip) {
-                $comment_config['callback']['approve']($comment);
-            }
-        }
+		// call custom approve function if any
+		if (false != $call_approvefunc && isset($comment_config['callback']['approve'])
+			&& trim($comment_config['callback']['approve']) != '') {
+			$skip = false;
+			if (!function_exists($comment_config['callback']['approve'])) {
+				if (isset($comment_config['callbackFile'])) {
+					$callbackfile = trim($comment_config['callbackFile']);
+					if ($callbackfile != ''
+						&& file_exists(XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile)) {
+						require_once XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile;
+					}
+					if (!function_exists($comment_config['callback']['approve'])) {
+						$skip = true;
+					}
+				} else {
+					$skip = true;
+				}
+			}
+			if (!$skip) {
+				$comment_config['callback']['approve']($comment);
+			}
+		}
 
-        // call custom update function if any
-        if (false != $call_updatefunc && isset($comment_config['callback']['update'])
-            && trim($comment_config['callback']['update']) != '') {
-            $skip = false;
-            if (!function_exists($comment_config['callback']['update'])) {
-                if (isset($comment_config['callbackFile'])) {
-                    $callbackfile = trim($comment_config['callbackFile']);
-                    if ($callbackfile != ''
-                        && file_exists(XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile)) {
-                        require_once XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile;
-                    }
-                    if (!function_exists($comment_config['callback']['update'])) {
-                        $skip = true;
-                    }
-                } else {
-                    $skip = true;
-                }
-            }
-            if (!$skip) {
-                $criteria = new CriteriaCompo(new Criteria('com_modid', $com_modid));
-                $criteria->add(new Criteria('com_itemid', $com_itemid));
-                $criteria->add(new Criteria('com_status', XOOPS_COMMENT_ACTIVE));
-                $comment_count = $commentHandler->getCount($criteria);
-                $func          = $comment_config['callback']['update'];
-                call_user_func_array($func, array($com_itemid, $comment_count, $comment->getVar('com_id')));
-            }
-        }
+		// call custom update function if any
+		if (false != $call_updatefunc && isset($comment_config['callback']['update'])
+			&& trim($comment_config['callback']['update']) != '') {
+			$skip = false;
+			if (!function_exists($comment_config['callback']['update'])) {
+				if (isset($comment_config['callbackFile'])) {
+					$callbackfile = trim($comment_config['callbackFile']);
+					if ($callbackfile != ''
+						&& file_exists(XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile)) {
+						require_once XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile;
+					}
+					if (!function_exists($comment_config['callback']['update'])) {
+						$skip = true;
+					}
+				} else {
+					$skip = true;
+				}
+			}
+			if (!$skip) {
+				$criteria = new CriteriaCompo(new Criteria('com_modid', $com_modid));
+				$criteria->add(new Criteria('com_itemid', $com_itemid));
+				$criteria->add(new Criteria('com_status', XOOPS_COMMENT_ACTIVE));
+				$comment_count = $commentHandler->getCount($criteria);
+				$func          = $comment_config['callback']['update'];
+				call_user_func_array($func, array($com_itemid, $comment_count, $comment->getVar('com_id')));
+			}
+		}
 
-        // RMV-NOTIFY
-        // trigger notification event if necessary
-        if ($notify_event) {
-            $not_modid = $com_modid;
-            //            require_once XOOPS_ROOT_PATH . '/include/notification_functions.php';
-            $not_catinfo  = notificationCommentCategoryInfo($not_modid);
-            $not_category = $not_catinfo['name'];
-            $not_itemid   = $com_itemid;
-            $not_event    = $notify_event;
-            // Build an ABSOLUTE URL to view the comment.  Make sure we
-            // point to a viewable page (i.e. not the system administration
-            // module).
-            $comment_tags = array();
-            $not_module   = $xoopsModule;
-            if (!isset($comment_url)) {
-                $com_config  = $not_module->getInfo('comments');
-                $comment_url = $com_config['pageName'] . '?';
-                $comment_url .= $com_config['itemName'];
-            }
-            $comment_tags['X_COMMENT_URL'] = XOOPS_URL . '/modules/' . $not_module->getVar('dirname') . '/' . $comment_url . '=' . $com_itemid . '&com_id=' . $newcid . '&com_rootid=' . $com_rootid . '&com_mode=' . $com_mode . '&com_order=' . $com_order . '#comment' . $newcid;
-            $notificationHandler           = xoops_getHandler('notification');
-            $notificationHandler->triggerEvent($not_category, $not_itemid, $not_event, $comment_tags, false, $not_modid);
-        }
+		// RMV-NOTIFY
+		// trigger notification event if necessary
+		if ($notify_event) {
+			$not_modid = $com_modid;
+			//            require_once XOOPS_ROOT_PATH . '/include/notification_functions.php';
+			$not_catinfo  = notificationCommentCategoryInfo($not_modid);
+			$not_category = $not_catinfo['name'];
+			$not_itemid   = $com_itemid;
+			$not_event    = $notify_event;
+			// Build an ABSOLUTE URL to view the comment.  Make sure we
+			// point to a viewable page (i.e. not the system administration
+			// module).
+			$comment_tags = array();
+			$not_module   = $xoopsModule;
+			if (!isset($comment_url)) {
+				$com_config  = $not_module->getInfo('comments');
+				$comment_url = $com_config['pageName'] . '?';
+				$comment_url .= $com_config['itemName'];
+			}
+			$comment_tags['X_COMMENT_URL'] = XOOPS_URL . '/modules/' . $not_module->getVar('dirname') . '/' . $comment_url . '=' . $com_itemid . '&com_id=' . $newcid . '&com_rootid=' . $com_rootid . '&com_mode=' . $com_mode . '&com_order=' . $com_order . '#comment' . $newcid;
+			$notificationHandler           = xoops_getHandler('notification');
+			$notificationHandler->triggerEvent($not_category, $not_itemid, $not_event, $comment_tags, false, $not_modid);
+		}
 
-        PlanetUtility::planetRespondToTrackback(0);
-    } else {
-        PlanetUtility::planetRespondToTrackback(1, xoops_error($comment->getHtmlErrors()));
-    }
+		PlanetUtility::planetRespondToTrackback(0);
+	} else {
+		PlanetUtility::planetRespondToTrackback(1, xoops_error($comment->getHtmlErrors()));
+	}
 }

Spacing +22 added lines, -22 removed lines

@@ -26,21 +26,21 @@ 
 // ------------------------------------------------------------------------ //
 use Xmf\Request;
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 // trackback is done by a POST
 $art_id     = explode('/', Request::getString('REQUEST_URI', '', 'SERVER'));
-$article_id = (int)$art_id[count($art_id) - 1];
-$url        = Request::getString('url', '', 'POST');//$_POST['url'];
-$title      = Request::getString('title', '', 'POST');//$_POST['title'];
-$excerpt    = Request::getString('excerpt', '', 'POST');//$_POST['excerpt'];
-$blog_name  = Request::getString('blog_name', '', 'POST');//$_POST['blog_name'];
-$charset    = trim(Request::getString('charset', '', 'POST'));//trim($_POST['charset']);
+$article_id = (int) $art_id[count($art_id)-1];
+$url        = Request::getString('url', '', 'POST'); //$_POST['url'];
+$title      = Request::getString('title', '', 'POST'); //$_POST['title'];
+$excerpt    = Request::getString('excerpt', '', 'POST'); //$_POST['excerpt'];
+$blog_name  = Request::getString('blog_name', '', 'POST'); //$_POST['blog_name'];
+$charset    = trim(Request::getString('charset', '', 'POST')); //trim($_POST['charset']);
 
 if (empty($xoopsModuleConfig['trackback_option'])) {
     PlanetUtility::planetRespondToTrackback(1, 'Trackback is closed');
 }
-if (!strlen($title . $url . $blog_name)) {
+if (!strlen($title.$url.$blog_name)) {
     PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_INVALID'));
 }
 
@@ -48,7 +48,7 @@ 
     $trackbackHandler = xoops_getModuleHandler('trackback', $GLOBALS['moddirname']);
     $criteria         = new CriteriaCompo(new Criteria('art_id', $article_id));
     $criteria->add(new Criteria('tb_url', $url));
-    if ($trackbackHandler->getCount($criteria) > 0) {
+    if ($trackbackHandler->getCount($criteria)>0) {
         PlanetUtility::planetRespondToTrackback(1, 'We already have a ping from that URI for this article.');
     }
 
@@ -56,17 +56,17 @@ 
     $title     = XoopsLocal::convert_encoding($title, _CHARSET, $charset);
     $excerpt   = XoopsLocal::convert_encoding($excerpt, _CHARSET, $charset);
     $blog_name = XoopsLocal::convert_encoding($blog_name, _CHARSET, $charset);
-    $tb_status = (int)$xoopsModuleConfig['trackback_option'];
+    $tb_status = (int) $xoopsModuleConfig['trackback_option'];
 
     $com_pid    = 0;
     $com_itemid = $article_id;
     $com_rootid = 0;
     $com_title  = $title;
     $com_text   = $excerpt;
-    $com_text   .= "\n\n[TRACKBACK]" . _POSTEDBY . ': ';
+    $com_text .= "\n\n[TRACKBACK]"._POSTEDBY.': ';
     if (!empty($url)) {
-        $com_text .= '[url=' . $url . ']' . $blog_name . '[/url]';
-    } else {
+        $com_text .= '[url='.$url.']'.$blog_name.'[/url]';
+    }else {
         $com_text .= $blog_name;
     }
     $com_modid = $xoopsModule->getVar('mid');
@@ -122,13 +122,13 @@ 
                 if (isset($comment_config['callbackFile'])) {
                     $callbackfile = trim($comment_config['callbackFile']);
                     if ($callbackfile != ''
-                        && file_exists(XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile)) {
-                        require_once XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile;
+                        && file_exists(XOOPS_ROOT_PATH.'/modules/'.$moddir.'/'.$callbackfile)) {
+                        require_once XOOPS_ROOT_PATH.'/modules/'.$moddir.'/'.$callbackfile;
                     }
                     if (!function_exists($comment_config['callback']['approve'])) {
                         $skip = true;
                     }
-                } else {
+                }else {
                     $skip = true;
                 }
             }
@@ -145,13 +145,13 @@ 
                 if (isset($comment_config['callbackFile'])) {
                     $callbackfile = trim($comment_config['callbackFile']);
                     if ($callbackfile != ''
-                        && file_exists(XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile)) {
-                        require_once XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile;
+                        && file_exists(XOOPS_ROOT_PATH.'/modules/'.$moddir.'/'.$callbackfile)) {
+                        require_once XOOPS_ROOT_PATH.'/modules/'.$moddir.'/'.$callbackfile;
                     }
                     if (!function_exists($comment_config['callback']['update'])) {
                         $skip = true;
                     }
-                } else {
+                }else {
                     $skip = true;
                 }
             }
@@ -181,16 +181,16 @@ 
             $not_module   = $xoopsModule;
             if (!isset($comment_url)) {
                 $com_config  = $not_module->getInfo('comments');
-                $comment_url = $com_config['pageName'] . '?';
+                $comment_url = $com_config['pageName'].'?';
                 $comment_url .= $com_config['itemName'];
             }
-            $comment_tags['X_COMMENT_URL'] = XOOPS_URL . '/modules/' . $not_module->getVar('dirname') . '/' . $comment_url . '=' . $com_itemid . '&com_id=' . $newcid . '&com_rootid=' . $com_rootid . '&com_mode=' . $com_mode . '&com_order=' . $com_order . '#comment' . $newcid;
+            $comment_tags['X_COMMENT_URL'] = XOOPS_URL.'/modules/'.$not_module->getVar('dirname').'/'.$comment_url.'='.$com_itemid.'&com_id='.$newcid.'&com_rootid='.$com_rootid.'&com_mode='.$com_mode.'&com_order='.$com_order.'#comment'.$newcid;
             $notificationHandler           = xoops_getHandler('notification');
             $notificationHandler->triggerEvent($not_category, $not_itemid, $not_event, $comment_tags, false, $not_modid);
         }
 
         PlanetUtility::planetRespondToTrackback(0);
-    } else {
+    }else {
         PlanetUtility::planetRespondToTrackback(1, xoops_error($comment->getHtmlErrors()));
     }
 }

comment_new.php

Indentation +4 added lines, -4 removed lines

@@ -27,8 +27,8 @@
 include __DIR__ . '/header.php';
 $com_itemid = isset($_GET['com_itemid']) ? (int)$_GET['com_itemid'] : 0;
 if ($com_itemid > 0) {
-    $articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
-    $article_obj    = $articleHandler->get($com_itemid);
-    $com_replytitle = $article_obj->getVar('art_title');
-    require_once XOOPS_ROOT_PATH . '/include/comment_new.php';
+	$articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
+	$article_obj    = $articleHandler->get($com_itemid);
+	$com_replytitle = $article_obj->getVar('art_title');
+	require_once XOOPS_ROOT_PATH . '/include/comment_new.php';
 }

Spacing +4 added lines, -4 removed lines

@@ -24,11 +24,11 @@
 // URL: https://xoops.org                         //
 // Project: Article Project                                                 //
 // ------------------------------------------------------------------------ //
-include __DIR__ . '/header.php';
-$com_itemid = isset($_GET['com_itemid']) ? (int)$_GET['com_itemid'] : 0;
-if ($com_itemid > 0) {
+include __DIR__.'/header.php';
+$com_itemid = isset($_GET['com_itemid']) ? (int) $_GET['com_itemid'] : 0;
+if ($com_itemid>0) {
     $articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
     $article_obj    = $articleHandler->get($com_itemid);
     $com_replytitle = $article_obj->getVar('art_title');
-    require_once XOOPS_ROOT_PATH . '/include/comment_new.php';
+    require_once XOOPS_ROOT_PATH.'/include/comment_new.php';
 }

transfer.php

Indentation +56 added lines, -56 removed lines

@@ -17,8 +17,8 @@ 
 include __DIR__ . '/header.php';
 
 if (PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
-    $args['article'] = @$args_num[0];
-    $args['op']      = @$args_str[0];
+	$args['article'] = @$args_num[0];
+	$args['op']      = @$args_str[0];
 }
 
 $article_id = Request::getInt('article', Request::getInt('article', @$args['article'], 'POST'), 'GET');//(int)(empty($_GET['article']) ? (empty($_POST['article']) ? @$args['article'] : $_POST['article']) : $_GET['article']);
@@ -27,33 +27,33 @@ 
 $op = strtolower(trim($op));
 
 if (empty($article_id)) {
-    if (empty(Request::getUrl('HTTP_REFERER', '', 'SERVER'))) {
-        //$_SERVER['HTTP_REFERER']))
+	if (empty(Request::getUrl('HTTP_REFERER', '', 'SERVER'))) {
+		//$_SERVER['HTTP_REFERER']))
 
-        include XOOPS_ROOT_PATH . '/header.php';
-        xoops_error(_NOPERM);
-        $xoopsOption['output_type'] = 'plain';
-        include XOOPS_ROOT_PATH . '/footer.php';
-        exit();
-    } else {
-        $ref_parser = parse_url(Request::getUrl('HTTP_REFERER', '', 'SERVER')); //$_SERVER['HTTP_REFERER']);
-        $uri_parser = parse_url(Request::getUrl('REQUEST_URI', '', 'SERVER'));// $_SERVER['REQUEST_URI']);
-        if ((!empty($ref_parser['host']) && !empty($uri_parser['host']) && $uri_parser['host'] != $ref_parser['host'])
-            || ($ref_parser['path'] != $uri_parser['path'])) {
-            include XOOPS_ROOT_PATH . '/header.php';
-            include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
-            xoops_confirm(array(), 'javascript: window.close();', sprintf(planet_constant('MD_TRANSFER_DONE'), ''), _CLOSE, Request::getUrl('HTTP_REFERER', '', 'SERVER'));
-            $xoopsOption['output_type'] = 'plain';
-            include XOOPS_ROOT_PATH . '/footer.php';
-            exit();
-        } else {
-            include XOOPS_ROOT_PATH . '/header.php';
-            xoops_error(_NOPERM);
-            $xoopsOption['output_type'] = 'plain';
-            include XOOPS_ROOT_PATH . '/footer.php';
-            exit();
-        }
-    }
+		include XOOPS_ROOT_PATH . '/header.php';
+		xoops_error(_NOPERM);
+		$xoopsOption['output_type'] = 'plain';
+		include XOOPS_ROOT_PATH . '/footer.php';
+		exit();
+	} else {
+		$ref_parser = parse_url(Request::getUrl('HTTP_REFERER', '', 'SERVER')); //$_SERVER['HTTP_REFERER']);
+		$uri_parser = parse_url(Request::getUrl('REQUEST_URI', '', 'SERVER'));// $_SERVER['REQUEST_URI']);
+		if ((!empty($ref_parser['host']) && !empty($uri_parser['host']) && $uri_parser['host'] != $ref_parser['host'])
+			|| ($ref_parser['path'] != $uri_parser['path'])) {
+			include XOOPS_ROOT_PATH . '/header.php';
+			include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
+			xoops_confirm(array(), 'javascript: window.close();', sprintf(planet_constant('MD_TRANSFER_DONE'), ''), _CLOSE, Request::getUrl('HTTP_REFERER', '', 'SERVER'));
+			$xoopsOption['output_type'] = 'plain';
+			include XOOPS_ROOT_PATH . '/footer.php';
+			exit();
+		} else {
+			include XOOPS_ROOT_PATH . '/header.php';
+			xoops_error(_NOPERM);
+			$xoopsOption['output_type'] = 'plain';
+			include XOOPS_ROOT_PATH . '/footer.php';
+			exit();
+		}
+	}
 }
 
 $articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
@@ -61,37 +61,37 @@ 
 
 // Display option form
 if (empty($op)) {
-    $module_variables .= "<input type=\"hidden\" name=\"article\" id=\"article\" value=\"{$article_id}\">";
-    include XOOPS_ROOT_PATH . '/Frameworks/transfer/option.transfer.php';
-    exit();
+	$module_variables .= "<input type=\"hidden\" name=\"article\" id=\"article\" value=\"{$article_id}\">";
+	include XOOPS_ROOT_PATH . '/Frameworks/transfer/option.transfer.php';
+	exit();
 } else {
-    $data           = array();
-    $data['id']     = $article_id;
-    $data['title']  = $article_obj->getVar('art_title');
-    $data['time']   = $article_obj->getTime('l');
-    $data['image']  = '';
-    $data['source'] = $article_obj->getVar('art_link');
-    $data['url']    = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article_obj->getVar('art_id');
-    $data['author'] = $article_obj->getVar('art_author');
+	$data           = array();
+	$data['id']     = $article_id;
+	$data['title']  = $article_obj->getVar('art_title');
+	$data['time']   = $article_obj->getTime('l');
+	$data['image']  = '';
+	$data['source'] = $article_obj->getVar('art_link');
+	$data['url']    = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article_obj->getVar('art_id');
+	$data['author'] = $article_obj->getVar('art_author');
 
-    switch ($op) {
+	switch ($op) {
 
-        // Use title
-        case 'bookmark':
-            break;
+		// Use title
+		case 'bookmark':
+			break;
 
-        case 'print':
-        case 'pdf':
-            ${"{$op}_data"}            =& $data;
-            ${"{$op}_data"}['date']    = $pdf_data['time'];
-            ${"{$op}_data"}['content'] = $article_obj->getVar('art_content');
-            break;
+		case 'print':
+		case 'pdf':
+			${"{$op}_data"}            =& $data;
+			${"{$op}_data"}['date']    = $pdf_data['time'];
+			${"{$op}_data"}['content'] = $article_obj->getVar('art_content');
+			break;
 
-        case 'newbb':
-        default:
-            $data['content'] = $article_obj->getSummary();
-            break;
-    }
-    include XOOPS_ROOT_PATH . '/Frameworks/transfer/action.transfer.php';
-    exit();
+		case 'newbb':
+		default:
+			$data['content'] = $article_obj->getSummary();
+			break;
+	}
+	include XOOPS_ROOT_PATH . '/Frameworks/transfer/action.transfer.php';
+	exit();
 }

Spacing +18 added lines, -18 removed lines

@@ -14,43 +14,43 @@ 
 
 use Xmf\Request;
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 if (PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
     $args['article'] = @$args_num[0];
     $args['op']      = @$args_str[0];
 }
 
-$article_id = Request::getInt('article', Request::getInt('article', @$args['article'], 'POST'), 'GET');//(int)(empty($_GET['article']) ? (empty($_POST['article']) ? @$args['article'] : $_POST['article']) : $_GET['article']);
+$article_id = Request::getInt('article', Request::getInt('article', @$args['article'], 'POST'), 'GET'); //(int)(empty($_GET['article']) ? (empty($_POST['article']) ? @$args['article'] : $_POST['article']) : $_GET['article']);
 
-$op = Request::getString('op', Request::getString('op', @$args['op'], 'POST'), 'GET');//empty($_GET['op']) ? (empty($_POST['op']) ? @$args['op'] : $_POST['op']) : $_GET['op'];
+$op = Request::getString('op', Request::getString('op', @$args['op'], 'POST'), 'GET'); //empty($_GET['op']) ? (empty($_POST['op']) ? @$args['op'] : $_POST['op']) : $_GET['op'];
 $op = strtolower(trim($op));
 
 if (empty($article_id)) {
     if (empty(Request::getUrl('HTTP_REFERER', '', 'SERVER'))) {
         //$_SERVER['HTTP_REFERER']))
 
-        include XOOPS_ROOT_PATH . '/header.php';
+        include XOOPS_ROOT_PATH.'/header.php';
         xoops_error(_NOPERM);
         $xoopsOption['output_type'] = 'plain';
-        include XOOPS_ROOT_PATH . '/footer.php';
+        include XOOPS_ROOT_PATH.'/footer.php';
         exit();
-    } else {
+    }else {
         $ref_parser = parse_url(Request::getUrl('HTTP_REFERER', '', 'SERVER')); //$_SERVER['HTTP_REFERER']);
-        $uri_parser = parse_url(Request::getUrl('REQUEST_URI', '', 'SERVER'));// $_SERVER['REQUEST_URI']);
+        $uri_parser = parse_url(Request::getUrl('REQUEST_URI', '', 'SERVER')); // $_SERVER['REQUEST_URI']);
         if ((!empty($ref_parser['host']) && !empty($uri_parser['host']) && $uri_parser['host'] != $ref_parser['host'])
             || ($ref_parser['path'] != $uri_parser['path'])) {
-            include XOOPS_ROOT_PATH . '/header.php';
-            include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
+            include XOOPS_ROOT_PATH.'/header.php';
+            include XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/vars.php';
             xoops_confirm(array(), 'javascript: window.close();', sprintf(planet_constant('MD_TRANSFER_DONE'), ''), _CLOSE, Request::getUrl('HTTP_REFERER', '', 'SERVER'));
             $xoopsOption['output_type'] = 'plain';
-            include XOOPS_ROOT_PATH . '/footer.php';
+            include XOOPS_ROOT_PATH.'/footer.php';
             exit();
-        } else {
-            include XOOPS_ROOT_PATH . '/header.php';
+        }else {
+            include XOOPS_ROOT_PATH.'/header.php';
             xoops_error(_NOPERM);
             $xoopsOption['output_type'] = 'plain';
-            include XOOPS_ROOT_PATH . '/footer.php';
+            include XOOPS_ROOT_PATH.'/footer.php';
             exit();
         }
     }
@@ -62,16 +62,16 @@ 
 // Display option form
 if (empty($op)) {
     $module_variables .= "<input type=\"hidden\" name=\"article\" id=\"article\" value=\"{$article_id}\">";
-    include XOOPS_ROOT_PATH . '/Frameworks/transfer/option.transfer.php';
+    include XOOPS_ROOT_PATH.'/Frameworks/transfer/option.transfer.php';
     exit();
-} else {
+}else {
     $data           = array();
     $data['id']     = $article_id;
     $data['title']  = $article_obj->getVar('art_title');
     $data['time']   = $article_obj->getTime('l');
     $data['image']  = '';
     $data['source'] = $article_obj->getVar('art_link');
-    $data['url']    = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article_obj->getVar('art_id');
+    $data['url']    = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.URL_DELIMITER.''.$article_obj->getVar('art_id');
     $data['author'] = $article_obj->getVar('art_author');
 
     switch ($op) {
@@ -82,7 +82,7 @@ 
 
         case 'print':
         case 'pdf':
-            ${"{$op}_data"}            =& $data;
+            ${"{$op}_data"}            = & $data;
             ${"{$op}_data"}['date']    = $pdf_data['time'];
             ${"{$op}_data"}['content'] = $article_obj->getVar('art_content');
             break;
@@ -92,6 +92,6 @@ 
             $data['content'] = $article_obj->getSummary();
             break;
     }
-    include XOOPS_ROOT_PATH . '/Frameworks/transfer/action.transfer.php';
+    include XOOPS_ROOT_PATH.'/Frameworks/transfer/action.transfer.php';
     exit();
 }

action.bookmark.php

Indentation +4 added lines, -4 removed lines

@@ -31,7 +31,7 @@ 
 $blog_id = Request::getInt('blog', Request::getInt('blog', 0, 'POST'), 'GET'); //(int)(isset($_GET['blog']) ? $_GET['blog'] : (isset($_POST['blog']) ? $_POST['blog'] : 0));
 
 if (!is_object($xoopsUser) || empty($blog_id)) {
-    redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID'));
+	redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID'));
 }
 
 $bookmarkHandler = xoops_getModuleHandler('bookmark', $GLOBALS['moddirname']);
@@ -39,14 +39,14 @@ 
 $criteria        = new CriteriaCompo(new Criteria('blog_id', $blog_id));
 $criteria->add(new Criteria('bm_uid', $uid));
 if ($count = $bookmarkHandler->getCount($criteria)) {
-    $message = planet_constant('MD_ALREADYBOOKMARKED');
-    redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'u' . $uid, 2, $message);
+	$message = planet_constant('MD_ALREADYBOOKMARKED');
+	redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'u' . $uid, 2, $message);
 }
 $bookmark_obj = $bookmarkHandler->create();
 $bookmark_obj->setVar('blog_id', $blog_id);
 $bookmark_obj->setVar('bm_uid', $uid);
 if (!$bookmark_id = $bookmarkHandler->insert($bookmark_obj, true)) {
-    redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $blog_id, 2, planet_constant('MD_NOTSAVED'));
+	redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $blog_id, 2, planet_constant('MD_NOTSAVED'));
 }
 $blogHandler = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
 $blog_obj    = $blogHandler->get($blog_id);

Spacing +7 added lines, -7 removed lines

@@ -26,7 +26,7 @@ 
 // ------------------------------------------------------------------------ //
 use Xmf\Request;
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 $blog_id = Request::getInt('blog', Request::getInt('blog', 0, 'POST'), 'GET'); //(int)(isset($_GET['blog']) ? $_GET['blog'] : (isset($_POST['blog']) ? $_POST['blog'] : 0));
 
@@ -40,19 +40,19 @@ 
 $criteria->add(new Criteria('bm_uid', $uid));
 if ($count = $bookmarkHandler->getCount($criteria)) {
     $message = planet_constant('MD_ALREADYBOOKMARKED');
-    redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'u' . $uid, 2, $message);
+    redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.URL_DELIMITER.'u'.$uid, 2, $message);
 }
 $bookmark_obj = $bookmarkHandler->create();
 $bookmark_obj->setVar('blog_id', $blog_id);
 $bookmark_obj->setVar('bm_uid', $uid);
 if (!$bookmark_id = $bookmarkHandler->insert($bookmark_obj, true)) {
-    redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $blog_id, 2, planet_constant('MD_NOTSAVED'));
+    redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.URL_DELIMITER.'b'.$blog_id, 2, planet_constant('MD_NOTSAVED'));
 }
 $blogHandler = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
 $blog_obj    = $blogHandler->get($blog_id);
-$marks       = $blog_obj->getVar('blog_marks') + 1;
-$blog_obj->setVar('blog_marks', $blog_obj->getVar('blog_marks') + 1);
+$marks       = $blog_obj->getVar('blog_marks')+1;
+$blog_obj->setVar('blog_marks', $blog_obj->getVar('blog_marks')+1);
 $blogHandler->insert($blog_obj, true);
 $message = planet_constant('MD_ACTIONDONE');
-redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $blog_id, 2, $message);
-include __DIR__ . '/footer.php';
+redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.URL_DELIMITER.'b'.$blog_id, 2, $message);
+include __DIR__.'/footer.php';

search.php

Indentation +95 added lines, -95 removed lines

@@ -32,7 +32,7 @@ 
 $configHandler     = xoops_getHandler('config');
 $xoopsConfigSearch = $configHandler->getConfigsByCat(XOOPS_CONF_SEARCH);
 if (empty($xoopsConfigSearch['enable_search'])) {
-    redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php', 2, planet_constant('MD_NOACCESS'));
+	redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php', 2, planet_constant('MD_NOACCESS'));
 }
 
 $xoopsConfig['module_cache'][$xoopsModule->getVar('mid')] = 0;
@@ -50,90 +50,90 @@ 
 $blog     = Request::getInt('blog', Request::getInt('blog', 0, 'GET'), 'POST');//(int)(isset($_POST['blog']) ? $_POST['blog'] : (isset($_GET['blog']) ? $_GET['blog'] : null));
 $uid      = Request::getInt('uid', Request::getInt('uid', 0, 'GET'), 'POST');//(int)(isset($_POST['uid']) ? $_POST['uid'] : (isset($_GET['uid']) ? $_GET['uid'] : null));
 $searchin = Request::getArray('searchin', 0 !== count(Request::getArray('searchin', array(), 'GET')) ? explode('|', Request::getArray('searchin', array(), 'GET')) : array(),
-                              'POST'); //isset($_POST['searchin']) ? $_POST['searchin'] : (isset($_GET['searchin']) ? explode('|', $_GET['searchin']) : array());
+							  'POST'); //isset($_POST['searchin']) ? $_POST['searchin'] : (isset($_GET['searchin']) ? explode('|', $_GET['searchin']) : array());
 $sortby   = Request::getString('sortby', Request::getString('sortby', null, 'GET'), 'POST');//isset($_POST['sortby']) ? $_POST['sortby'] : (isset($_GET['sortby']) ? $_GET['sortby'] : null);
 $term     = Request::getString('term', Request::getString('term', '', 'GET'), 'POST');//isset($_POST['term']) ? $_POST['term'] : (isset($_GET['term']) ? $_GET['term'] : '');
 
 $andor  = in_array(strtoupper($andor), array('OR', 'AND', 'EXACT')) ? strtoupper($andor) : 'OR';
 $sortby = in_array(strtolower($sortby), array(
-    'a.art_id desc',
-    'a.art_time desc',
-    'a.art_title',
-    'a.blog_id',
-    'b.blog_id',
-    'b.blog_feed',
-    'b.blog_title',
-    'b.blog_time'
+	'a.art_id desc',
+	'a.art_time desc',
+	'a.art_title',
+	'a.blog_id',
+	'b.blog_id',
+	'b.blog_feed',
+	'b.blog_title',
+	'b.blog_time'
 )) ? strtolower($sortby) : '';
 
 if (!(empty(Request::getString('submit', '', 'POST')) && empty(Request::getString('term', '', 'GET')))) {
-    $next_search['category'] = $category;
-    $next_search['blog']     = $blog;
-    $next_search['uid']      = $uid;
-    $next_search['andor']    = $andor;
+	$next_search['category'] = $category;
+	$next_search['blog']     = $blog;
+	$next_search['uid']      = $uid;
+	$next_search['andor']    = $andor;
 
-    $next_search['term'] = $term;
-    $query               = trim($term);
+	$next_search['term'] = $term;
+	$query               = trim($term);
 
-    if ($andor !== 'EXACT') {
-        $ignored_queries = array(); // holds kewords that are shorter than allowed minmum length
-        $temp_queries    = preg_split("/[\s,]+/", $query);
-        foreach ($temp_queries as $q) {
-            $q = trim($q);
-            if (strlen($q) >= $xoopsConfigSearch['keyword_min']) {
-                $queries[] = $myts->addSlashes($q);
-            } else {
-                $ignored_queries[] = $myts->addSlashes($q);
-            }
-        }
-        if (count($queries) == 0) {
-            redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
-        }
-    } else {
-        if (strlen($query) < $xoopsConfigSearch['keyword_min']) {
-            redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
-        }
-        $queries = array($myts->addSlashes($query));
-    }
+	if ($andor !== 'EXACT') {
+		$ignored_queries = array(); // holds kewords that are shorter than allowed minmum length
+		$temp_queries    = preg_split("/[\s,]+/", $query);
+		foreach ($temp_queries as $q) {
+			$q = trim($q);
+			if (strlen($q) >= $xoopsConfigSearch['keyword_min']) {
+				$queries[] = $myts->addSlashes($q);
+			} else {
+				$ignored_queries[] = $myts->addSlashes($q);
+			}
+		}
+		if (count($queries) == 0) {
+			redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
+		}
+	} else {
+		if (strlen($query) < $xoopsConfigSearch['keyword_min']) {
+			redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
+		}
+		$queries = array($myts->addSlashes($query));
+	}
 
-    $next_search['sortby']   = $sortby;
-    $next_search['searchin'] = implode('|', $searchin);
+	$next_search['sortby']   = $sortby;
+	$next_search['searchin'] = implode('|', $searchin);
 
-    /* To be added: year-month
+	/* To be added: year-month
      * see view.archive.php
      */
-    if (!empty($time)) {
-        $extra = '';
-    } else {
-        $extra = '';
-    }
+	if (!empty($time)) {
+		$extra = '';
+	} else {
+		$extra = '';
+	}
 
-    $results = planet_search($queries, $andor, $limit, $start, $uid, $category, $blog, $sortby, $searchin, $extra);
+	$results = planet_search($queries, $andor, $limit, $start, $uid, $category, $blog, $sortby, $searchin, $extra);
 
-    /*
+	/*
     if ( count($results) < 1 ) {
         redirect_header("javascript:history.go(-1);", 2, _SR_NOMATCH);
     } else
     */
-    {
-        $xoopsTpl->assign('results', $results);
+	{
+		$xoopsTpl->assign('results', $results);
 
-        if (count($next_search) > 0) {
-            $items = array();
-            foreach ($next_search as $para => $val) {
-                if (!empty($val)) {
-                    $items[] = "$para=$val";
-                }
-            }
-            if (count($items) > 0) {
-                $paras = implode('&', $items);
-            }
-            unset($next_search);
-            unset($items);
-        }
-        $search_url = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php?' . $paras;
+		if (count($next_search) > 0) {
+			$items = array();
+			foreach ($next_search as $para => $val) {
+				if (!empty($val)) {
+					$items[] = "$para=$val";
+				}
+			}
+			if (count($items) > 0) {
+				$paras = implode('&', $items);
+			}
+			unset($next_search);
+			unset($items);
+		}
+		$search_url = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php?' . $paras;
 
-        /*
+		/*
          $next_results =& planet_search($queries, $andor, 1, $start + $limit, $uid, $category, $sortby, $searchin, $extra);
       $next_count = count($next_results);
       $has_next = false;
@@ -142,41 +142,41 @@ 
       }
       if (false != $has_next)
       */
-        if (count($results)) {
-            $next            = $start + $limit;
-            $queries         = implode(',', $queries);
-            $search_url_next = $search_url . "&start=$next";
-            $search_next     = "<a href=\"" . htmlspecialchars($search_url_next) . "\">" . _SR_NEXT . '</a>';
-            $xoopsTpl->assign('search_next', $search_next);
-        }
-        if ($start > 0) {
-            $prev            = $start - $limit;
-            $search_url_prev = $search_url . "&start=$prev";
-            $search_prev     = "<a href=\"" . htmlspecialchars($search_url_prev) . "\">" . _SR_PREVIOUS . '</a>';
-            $xoopsTpl->assign('search_prev', $search_prev);
-        }
-    }
+		if (count($results)) {
+			$next            = $start + $limit;
+			$queries         = implode(',', $queries);
+			$search_url_next = $search_url . "&start=$next";
+			$search_next     = "<a href=\"" . htmlspecialchars($search_url_next) . "\">" . _SR_NEXT . '</a>';
+			$xoopsTpl->assign('search_next', $search_next);
+		}
+		if ($start > 0) {
+			$prev            = $start - $limit;
+			$search_url_prev = $search_url . "&start=$prev";
+			$search_prev     = "<a href=\"" . htmlspecialchars($search_url_prev) . "\">" . _SR_PREVIOUS . '</a>';
+			$xoopsTpl->assign('search_prev', $search_prev);
+		}
+	}
 
-    unset($results);
-    $search_info = _SR_KEYWORDS . ': ' . $myts->htmlSpecialChars($term);
-    $xoopsTpl->assign('search_info', $search_info);
+	unset($results);
+	$search_info = _SR_KEYWORDS . ': ' . $myts->htmlSpecialChars($term);
+	$xoopsTpl->assign('search_info', $search_info);
 }
 
 /* type */
 $type_select = "<select name=\"andor\">";
 $type_select .= "<option value=\"OR\"";
 if ('OR' === $andor) {
-    $type_select .= " selected=\"selected\"";
+	$type_select .= " selected=\"selected\"";
 }
 $type_select .= '>' . _SR_ANY . '</option>';
 $type_select .= "<option value=\"AND\"";
 if ('AND' === $andor) {
-    $type_select .= " selected=\"selected\"";
+	$type_select .= " selected=\"selected\"";
 }
 $type_select .= '>' . _SR_ALL . '</option>';
 $type_select .= "<option value=\"EXACT\"";
 if ('exact' === $andor) {
-    $type_select .= " selected=\"selected\"";
+	$type_select .= " selected=\"selected\"";
 }
 $type_select .= '>' . _SR_EXACT . '</option>';
 $type_select .= '</select>';
@@ -185,32 +185,32 @@ 
 $searchin_select = '';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"title\"";
 if (in_array('title', $searchin)) {
-    $searchin_select .= ' checked';
+	$searchin_select .= ' checked';
 }
 $searchin_select .= '>' . planet_constant('MD_TITLE') . '&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"text\"";
 if (in_array('text', $searchin)) {
-    $searchin_select .= ' checked';
+	$searchin_select .= ' checked';
 }
 $searchin_select .= '>' . planet_constant('MD_BODY') . '&nbsp;&nbsp;||&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"blog\"";
 if (in_array('blog', $searchin)) {
-    $searchin_select .= ' checked';
+	$searchin_select .= ' checked';
 }
 $searchin_select .= '>' . planet_constant('MD_BLOG') . '&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"feed\"";
 if (in_array('feed', $searchin)) {
-    $searchin_select .= ' checked';
+	$searchin_select .= ' checked';
 }
 $searchin_select .= '>' . planet_constant('MD_FEED') . '&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"desc\"";
 if (in_array('desc', $searchin)) {
-    $searchin_select .= ' checked';
+	$searchin_select .= ' checked';
 }
 $searchin_select .= '>' . planet_constant('MD_DESC') . '&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"all\"";
 if (empty($searchin)) {
-    $searchin_select .= ' checked';
+	$searchin_select .= ' checked';
 }
 $searchin_select .= '>' . _ALL . '&nbsp;&nbsp;';
 
@@ -218,28 +218,28 @@ 
 $sortby_select = "<select name=\"sortby\">";
 $sortby_select .= "<option value=\"\"";
 if (empty($sortby)) {
-    $sortby_select .= " selected=\"selected\"";
+	$sortby_select .= " selected=\"selected\"";
 }
 $sortby_select .= '>' . _NONE . '</option>';
 $sortby_select .= "<option value=\"a.art_time\"";
 if ('a.art_time' === $sortby) {
-    $sortby_select .= " selected=\"selected\"";
+	$sortby_select .= " selected=\"selected\"";
 }
 $sortby_select .= '>' . planet_constant('MD_TIME') . '</option>';
 $sortby_select .= "<option value=\"a.art_title\"";
 if ('a.art_title' === $sortby) {
-    $sortby_select .= " selected=\"selected\"";
+	$sortby_select .= " selected=\"selected\"";
 }
 $sortby_select .= '>' . planet_constant('MD_TITLE') . '</option>';
 $sortby_select .= "<option value=\"\">&nbsp;&nbsp;----&nbsp;&nbsp;</option>";
 $sortby_select .= "<option value=\"a.blog_title\"";
 if ('a.blog_title' === $sortby) {
-    $sortby_select .= " selected=\"selected\"";
+	$sortby_select .= " selected=\"selected\"";
 }
 $sortby_select .= '>' . planet_constant('MD_BLOG') . '</option>';
 $sortby_select .= "<option value=\"a.blog_time\"";
 if ('b.blog_time' === $sortby) {
-    $sortby_select .= " selected=\"selected\"";
+	$sortby_select .= " selected=\"selected\"";
 }
 $sortby_select .= '>' . planet_constant('MD_UPDATE') . '</option>';
 $sortby_select .= '</select>';
@@ -256,7 +256,7 @@ 
 $xoopsTpl->assign('uid', $uid);
 
 if ($xoopsConfigSearch['keyword_min'] > 0) {
-    $xoopsTpl->assign('search_rule', sprintf(_SR_KEYIGNORE, $xoopsConfigSearch['keyword_min']));
+	$xoopsTpl->assign('search_rule', sprintf(_SR_KEYIGNORE, $xoopsConfigSearch['keyword_min']));
 }
 
 include XOOPS_ROOT_PATH . '/footer.php';

Spacing +45 added lines, -45 removed lines

@@ -27,32 +27,32 @@ 
 use Xmf\Request;
 
 $xoopsOption['pagetype'] = 'search';
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 $xoopsModule->loadLanguage('main');
 $configHandler     = xoops_getHandler('config');
 $xoopsConfigSearch = $configHandler->getConfigsByCat(XOOPS_CONF_SEARCH);
 if (empty($xoopsConfigSearch['enable_search'])) {
-    redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php', 2, planet_constant('MD_NOACCESS'));
+    redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php', 2, planet_constant('MD_NOACCESS'));
 }
 
 $xoopsConfig['module_cache'][$xoopsModule->getVar('mid')] = 0;
 $xoopsOption['template_main']                             = PlanetUtility::planetGetTemplate('search');
-include XOOPS_ROOT_PATH . '/header.php';
-include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
+include XOOPS_ROOT_PATH.'/header.php';
+include XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/vars.php';
 
-require_once XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/search.inc.php';
+require_once XOOPS_ROOT_PATH.'/modules/'.$GLOBALS['moddirname'].'/include/search.inc.php';
 $limit = $xoopsModuleConfig['articles_perpage'];
 
 $queries  = array();
-$andor    = Request::getString('andor', Request::getString('andor', '', 'GET'), 'POST');//isset($_POST['andor']) ? $_POST['andor'] : (isset($_GET['andor']) ? $_GET['andor'] : '');
-$start    = Request::getInt('start', 0, 'GET');//isset($_GET['start']) ? $_GET['start'] : 0;
+$andor    = Request::getString('andor', Request::getString('andor', '', 'GET'), 'POST'); //isset($_POST['andor']) ? $_POST['andor'] : (isset($_GET['andor']) ? $_GET['andor'] : '');
+$start    = Request::getInt('start', 0, 'GET'); //isset($_GET['start']) ? $_GET['start'] : 0;
 $category = Request::getInt('category', Request::getInt('category', 0, 'GET'), 'POST'); //(int)(isset($_POST['category']) ? $_POST['category'] : (isset($_GET['category']) ? $_GET['category'] : null));
-$blog     = Request::getInt('blog', Request::getInt('blog', 0, 'GET'), 'POST');//(int)(isset($_POST['blog']) ? $_POST['blog'] : (isset($_GET['blog']) ? $_GET['blog'] : null));
-$uid      = Request::getInt('uid', Request::getInt('uid', 0, 'GET'), 'POST');//(int)(isset($_POST['uid']) ? $_POST['uid'] : (isset($_GET['uid']) ? $_GET['uid'] : null));
+$blog     = Request::getInt('blog', Request::getInt('blog', 0, 'GET'), 'POST'); //(int)(isset($_POST['blog']) ? $_POST['blog'] : (isset($_GET['blog']) ? $_GET['blog'] : null));
+$uid      = Request::getInt('uid', Request::getInt('uid', 0, 'GET'), 'POST'); //(int)(isset($_POST['uid']) ? $_POST['uid'] : (isset($_GET['uid']) ? $_GET['uid'] : null));
 $searchin = Request::getArray('searchin', 0 !== count(Request::getArray('searchin', array(), 'GET')) ? explode('|', Request::getArray('searchin', array(), 'GET')) : array(),
                               'POST'); //isset($_POST['searchin']) ? $_POST['searchin'] : (isset($_GET['searchin']) ? explode('|', $_GET['searchin']) : array());
-$sortby   = Request::getString('sortby', Request::getString('sortby', null, 'GET'), 'POST');//isset($_POST['sortby']) ? $_POST['sortby'] : (isset($_GET['sortby']) ? $_GET['sortby'] : null);
-$term     = Request::getString('term', Request::getString('term', '', 'GET'), 'POST');//isset($_POST['term']) ? $_POST['term'] : (isset($_GET['term']) ? $_GET['term'] : '');
+$sortby   = Request::getString('sortby', Request::getString('sortby', null, 'GET'), 'POST'); //isset($_POST['sortby']) ? $_POST['sortby'] : (isset($_GET['sortby']) ? $_GET['sortby'] : null);
+$term     = Request::getString('term', Request::getString('term', '', 'GET'), 'POST'); //isset($_POST['term']) ? $_POST['term'] : (isset($_GET['term']) ? $_GET['term'] : '');
 
 $andor  = in_array(strtoupper($andor), array('OR', 'AND', 'EXACT')) ? strtoupper($andor) : 'OR';
 $sortby = in_array(strtolower($sortby), array(
@@ -80,18 +80,18 @@ 
         $temp_queries    = preg_split("/[\s,]+/", $query);
         foreach ($temp_queries as $q) {
             $q = trim($q);
-            if (strlen($q) >= $xoopsConfigSearch['keyword_min']) {
+            if (strlen($q)>=$xoopsConfigSearch['keyword_min']) {
                 $queries[] = $myts->addSlashes($q);
-            } else {
+            }else {
                 $ignored_queries[] = $myts->addSlashes($q);
             }
         }
         if (count($queries) == 0) {
-            redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
+            redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
         }
-    } else {
-        if (strlen($query) < $xoopsConfigSearch['keyword_min']) {
-            redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
+    }else {
+        if (strlen($query)<$xoopsConfigSearch['keyword_min']) {
+            redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
         }
         $queries = array($myts->addSlashes($query));
     }
@@ -104,7 +104,7 @@ 
      */
     if (!empty($time)) {
         $extra = '';
-    } else {
+    }else {
         $extra = '';
     }
 
@@ -118,20 +118,20 @@ 
     {
         $xoopsTpl->assign('results', $results);
 
-        if (count($next_search) > 0) {
+        if (count($next_search)>0) {
             $items = array();
             foreach ($next_search as $para => $val) {
                 if (!empty($val)) {
                     $items[] = "$para=$val";
                 }
             }
-            if (count($items) > 0) {
+            if (count($items)>0) {
                 $paras = implode('&', $items);
             }
             unset($next_search);
             unset($items);
         }
-        $search_url = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php?' . $paras;
+        $search_url = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/search.php?'.$paras;
 
         /*
          $next_results =& planet_search($queries, $andor, 1, $start + $limit, $uid, $category, $sortby, $searchin, $extra);
@@ -143,22 +143,22 @@ 
       if (false != $has_next)
       */
         if (count($results)) {
-            $next            = $start + $limit;
+            $next            = $start+$limit;
             $queries         = implode(',', $queries);
-            $search_url_next = $search_url . "&start=$next";
-            $search_next     = "<a href=\"" . htmlspecialchars($search_url_next) . "\">" . _SR_NEXT . '</a>';
+            $search_url_next = $search_url."&start=$next";
+            $search_next     = "<a href=\"".htmlspecialchars($search_url_next)."\">"._SR_NEXT.'</a>';
             $xoopsTpl->assign('search_next', $search_next);
         }
-        if ($start > 0) {
-            $prev            = $start - $limit;
-            $search_url_prev = $search_url . "&start=$prev";
-            $search_prev     = "<a href=\"" . htmlspecialchars($search_url_prev) . "\">" . _SR_PREVIOUS . '</a>';
+        if ($start>0) {
+            $prev            = $start-$limit;
+            $search_url_prev = $search_url."&start=$prev";
+            $search_prev     = "<a href=\"".htmlspecialchars($search_url_prev)."\">"._SR_PREVIOUS.'</a>';
             $xoopsTpl->assign('search_prev', $search_prev);
         }
     }
 
     unset($results);
-    $search_info = _SR_KEYWORDS . ': ' . $myts->htmlSpecialChars($term);
+    $search_info = _SR_KEYWORDS.': '.$myts->htmlSpecialChars($term);
     $xoopsTpl->assign('search_info', $search_info);
 }
 
@@ -168,17 +168,17 @@ 
 if ('OR' === $andor) {
     $type_select .= " selected=\"selected\"";
 }
-$type_select .= '>' . _SR_ANY . '</option>';
+$type_select .= '>'._SR_ANY.'</option>';
 $type_select .= "<option value=\"AND\"";
 if ('AND' === $andor) {
     $type_select .= " selected=\"selected\"";
 }
-$type_select .= '>' . _SR_ALL . '</option>';
+$type_select .= '>'._SR_ALL.'</option>';
 $type_select .= "<option value=\"EXACT\"";
 if ('exact' === $andor) {
     $type_select .= " selected=\"selected\"";
 }
-$type_select .= '>' . _SR_EXACT . '</option>';
+$type_select .= '>'._SR_EXACT.'</option>';
 $type_select .= '</select>';
 
 /* scope */
@@ -187,32 +187,32 @@ 
 if (in_array('title', $searchin)) {
     $searchin_select .= ' checked';
 }
-$searchin_select .= '>' . planet_constant('MD_TITLE') . '&nbsp;&nbsp;';
+$searchin_select .= '>'.planet_constant('MD_TITLE').'&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"text\"";
 if (in_array('text', $searchin)) {
     $searchin_select .= ' checked';
 }
-$searchin_select .= '>' . planet_constant('MD_BODY') . '&nbsp;&nbsp;||&nbsp;&nbsp;';
+$searchin_select .= '>'.planet_constant('MD_BODY').'&nbsp;&nbsp;||&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"blog\"";
 if (in_array('blog', $searchin)) {
     $searchin_select .= ' checked';
 }
-$searchin_select .= '>' . planet_constant('MD_BLOG') . '&nbsp;&nbsp;';
+$searchin_select .= '>'.planet_constant('MD_BLOG').'&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"feed\"";
 if (in_array('feed', $searchin)) {
     $searchin_select .= ' checked';
 }
-$searchin_select .= '>' . planet_constant('MD_FEED') . '&nbsp;&nbsp;';
+$searchin_select .= '>'.planet_constant('MD_FEED').'&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"desc\"";
 if (in_array('desc', $searchin)) {
     $searchin_select .= ' checked';
 }
-$searchin_select .= '>' . planet_constant('MD_DESC') . '&nbsp;&nbsp;';
+$searchin_select .= '>'.planet_constant('MD_DESC').'&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"all\"";
 if (empty($searchin)) {
     $searchin_select .= ' checked';
 }
-$searchin_select .= '>' . _ALL . '&nbsp;&nbsp;';
+$searchin_select .= '>'._ALL.'&nbsp;&nbsp;';
 
 /* sortby */
 $sortby_select = "<select name=\"sortby\">";
@@ -220,28 +220,28 @@ 
 if (empty($sortby)) {
     $sortby_select .= " selected=\"selected\"";
 }
-$sortby_select .= '>' . _NONE . '</option>';
+$sortby_select .= '>'._NONE.'</option>';
 $sortby_select .= "<option value=\"a.art_time\"";
 if ('a.art_time' === $sortby) {
     $sortby_select .= " selected=\"selected\"";
 }
-$sortby_select .= '>' . planet_constant('MD_TIME') . '</option>';
+$sortby_select .= '>'.planet_constant('MD_TIME').'</option>';
 $sortby_select .= "<option value=\"a.art_title\"";
 if ('a.art_title' === $sortby) {
     $sortby_select .= " selected=\"selected\"";
 }
-$sortby_select .= '>' . planet_constant('MD_TITLE') . '</option>';
+$sortby_select .= '>'.planet_constant('MD_TITLE').'</option>';
 $sortby_select .= "<option value=\"\">&nbsp;&nbsp;----&nbsp;&nbsp;</option>";
 $sortby_select .= "<option value=\"a.blog_title\"";
 if ('a.blog_title' === $sortby) {
     $sortby_select .= " selected=\"selected\"";
 }
-$sortby_select .= '>' . planet_constant('MD_BLOG') . '</option>';
+$sortby_select .= '>'.planet_constant('MD_BLOG').'</option>';
 $sortby_select .= "<option value=\"a.blog_time\"";
 if ('b.blog_time' === $sortby) {
     $sortby_select .= " selected=\"selected\"";
 }
-$sortby_select .= '>' . planet_constant('MD_UPDATE') . '</option>';
+$sortby_select .= '>'.planet_constant('MD_UPDATE').'</option>';
 $sortby_select .= '</select>';
 
 $xoopsTpl->assign('type_select', $type_select);
@@ -255,8 +255,8 @@ 
 $xoopsTpl->assign('blog', $blog);
 $xoopsTpl->assign('uid', $uid);
 
-if ($xoopsConfigSearch['keyword_min'] > 0) {
+if ($xoopsConfigSearch['keyword_min']>0) {
     $xoopsTpl->assign('search_rule', sprintf(_SR_KEYIGNORE, $xoopsConfigSearch['keyword_min']));
 }
 
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

pdf.php

Indentation +32 added lines, -32 removed lines

@@ -32,51 +32,51 @@
 include __DIR__ . '/header.php';
 global $pdf_data;
 if (!empty($_POST['pdf_data'])) {
-    $pdf_data = unserialize(base64_decode(Request::getText('pdf_data', '', 'POST')));
+	$pdf_data = unserialize(base64_decode(Request::getText('pdf_data', '', 'POST')));
 } elseif (!empty($pdf_data)) {
 } else {
-    error_reporting(0);
-    include __DIR__ . '/header.php';
-    error_reporting(0);
+	error_reporting(0);
+	include __DIR__ . '/header.php';
+	error_reporting(0);
 
-    if (PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
-        $args['article'] = @$args_num[0];
-    }
+	if (PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
+		$args['article'] = @$args_num[0];
+	}
 
-    $article_id = (int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']);
+	$article_id = (int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']);
 
-    $articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
-    $article_obj    = $articleHandler->get($article_id);
+	$articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
+	$article_obj    = $articleHandler->get($article_id);
 
-    $article_data = array();
+	$article_data = array();
 
-    // title
-    $article_data['title'] = $article_obj->getVar('art_title');
+	// title
+	$article_data['title'] = $article_obj->getVar('art_title');
 
-    $article_data['author'] = $article_obj->getVar('art_author');
+	$article_data['author'] = $article_obj->getVar('art_author');
 
-    // source
-    $article_data['source'] = $article_obj->getVar('art_link');
+	// source
+	$article_data['source'] = $article_obj->getVar('art_link');
 
-    // publish time
-    $article_data['time'] = $article_obj->getTime();
+	// publish time
+	$article_data['time'] = $article_obj->getTime();
 
-    // summary
-    $article_data['summary'] = $article_obj->getSummary();
+	// summary
+	$article_data['summary'] = $article_obj->getSummary();
 
-    // text of page
-    $article_data['text'] = $article_obj->getVar('art_content');
+	// text of page
+	$article_data['text'] = $article_obj->getVar('art_content');
 
-    // Build the pdf_data array
-    $pdf_data['title']   = $article_data['title'];
-    $pdf_data['author']  = $article_data['author'];
-    $pdf_data['date']    = $article_data['time'];
-    $pdf_data['content'] = '';
-    if ($article_data['summary']) {
-        $pdf_data['content'] .= planet_constant('MD_SUMMARY') . ': ' . $article_data['summary'] . '<br><br>';
-    }
-    $pdf_data['content'] .= $article_data['text'] . '<br>';
-    $pdf_data['url']     = XOOPS_URL . '/modules/' . $GLOBALS['artdirname'] . '/view.article.php' . URL_DELIMITER . $article_obj->getVar('art_id');
+	// Build the pdf_data array
+	$pdf_data['title']   = $article_data['title'];
+	$pdf_data['author']  = $article_data['author'];
+	$pdf_data['date']    = $article_data['time'];
+	$pdf_data['content'] = '';
+	if ($article_data['summary']) {
+		$pdf_data['content'] .= planet_constant('MD_SUMMARY') . ': ' . $article_data['summary'] . '<br><br>';
+	}
+	$pdf_data['content'] .= $article_data['text'] . '<br>';
+	$pdf_data['url']     = XOOPS_URL . '/modules/' . $GLOBALS['artdirname'] . '/view.article.php' . URL_DELIMITER . $article_obj->getVar('art_id');
 }
 $pdf_data['filename'] = preg_replace("/[^0-9a-z\-_\.]/i", '', $pdf_data['title']);
 

Spacing +8 added lines, -8 removed lines

@@ -29,21 +29,21 @@ 
 
 use Xmf\Request;
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 global $pdf_data;
 if (!empty($_POST['pdf_data'])) {
     $pdf_data = unserialize(base64_decode(Request::getText('pdf_data', '', 'POST')));
 } elseif (!empty($pdf_data)) {
-} else {
+}else {
     error_reporting(0);
-    include __DIR__ . '/header.php';
+    include __DIR__.'/header.php';
     error_reporting(0);
 
     if (PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
         $args['article'] = @$args_num[0];
     }
 
-    $article_id = (int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']);
+    $article_id = (int) (empty($_GET['article']) ? @$args['article'] : $_GET['article']);
 
     $articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
     $article_obj    = $articleHandler->get($article_id);
@@ -73,14 +73,14 @@ 
     $pdf_data['date']    = $article_data['time'];
     $pdf_data['content'] = '';
     if ($article_data['summary']) {
-        $pdf_data['content'] .= planet_constant('MD_SUMMARY') . ': ' . $article_data['summary'] . '<br><br>';
+        $pdf_data['content'] .= planet_constant('MD_SUMMARY').': '.$article_data['summary'].'<br><br>';
     }
-    $pdf_data['content'] .= $article_data['text'] . '<br>';
-    $pdf_data['url']     = XOOPS_URL . '/modules/' . $GLOBALS['artdirname'] . '/view.article.php' . URL_DELIMITER . $article_obj->getVar('art_id');
+    $pdf_data['content'] .= $article_data['text'].'<br>';
+    $pdf_data['url'] = XOOPS_URL.'/modules/'.$GLOBALS['artdirname'].'/view.article.php'.URL_DELIMITER.$article_obj->getVar('art_id');
 }
 $pdf_data['filename'] = preg_replace("/[^0-9a-z\-_\.]/i", '', $pdf_data['title']);
 
-include XOOPS_ROOT_PATH . '/Frameworks/fpdf/init.php';
+include XOOPS_ROOT_PATH.'/Frameworks/fpdf/init.php';
 error_reporting(0);
 ob_end_clean();
 

admin/admin_footer.php

Spacing +1 added lines, -1 removed lines

@@ -18,6 +18,6 @@
  */
 
 $pathIcon32 = \Xmf\Module\Admin::iconUrl('', 32);
-echo "<div class='adminfooter'>\n" . "  <div style='text-align: center;'>\n" . "    <a href='https://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n" . "  </div>\n" . '  ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" . '</div>';
+echo "<div class='adminfooter'>\n"."  <div style='text-align: center;'>\n"."    <a href='https://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"."  </div>\n".'  '._AM_MODULEADMIN_ADMIN_FOOTER."\n".'</div>';
 
 xoops_cp_footer();

admin/admin_header.php

Indentation +3 added lines, -3 removed lines

@@ -30,7 +30,7 @@ 
 
 if (false !== ($moduleHelper = Xmf\Module\Helper::getHelper($moduleDirName))) {
 } else {
-    $moduleHelper = Xmf\Module\Helper::getHelper('system');
+	$moduleHelper = Xmf\Module\Helper::getHelper('system');
 }
 $adminObject = \Xmf\Module\Admin::getInstance();
 
@@ -46,8 +46,8 @@ 
 $myts = MyTextSanitizer::getInstance();
 
 if (!isset($GLOBALS['xoopsTpl']) || !($GLOBALS['xoopsTpl'] instanceof XoopsTpl)) {
-    require_once $GLOBALS['xoops']->path('class/template.php');
-    $xoopsTpl = new XoopsTpl();
+	require_once $GLOBALS['xoops']->path('class/template.php');
+	$xoopsTpl = new XoopsTpl();
 }
 
 require XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';

Spacing +7 added lines, -7 removed lines

@@ -18,10 +18,10 @@ 
  */
 
 $path = dirname(dirname(dirname(__DIR__)));
-require_once $path . '/mainfile.php';
-require_once $path . '/include/cp_functions.php';
-require_once $path . '/include/cp_header.php';
-require_once __DIR__ . '/../class/utility.php';
+require_once $path.'/mainfile.php';
+require_once $path.'/include/cp_functions.php';
+require_once $path.'/include/cp_header.php';
+require_once __DIR__.'/../class/utility.php';
 
 //require_once __DIR__ . '/../class/utility.php';
 //require_once __DIR__ . '/../include/common.php';
@@ -29,7 +29,7 @@ 
 $moduleDirName = basename(dirname(__DIR__));
 
 if (false !== ($moduleHelper = Xmf\Module\Helper::getHelper($moduleDirName))) {
-} else {
+}else {
     $moduleHelper = Xmf\Module\Helper::getHelper('system');
 }
 $adminObject = \Xmf\Module\Admin::getInstance();
@@ -50,8 +50,8 @@ 
     $xoopsTpl = new XoopsTpl();
 }
 
-require XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
+require XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/vars.php';
 //require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/functions.php';
-require_once XOOPS_ROOT_PATH . '/Frameworks/art/functions.admin.php';
+require_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.admin.php';
 
 planet_define_url_delimiter();

admin/admin.article.php

Indentation +13 added lines, -13 removed lines

@@ -41,18 +41,18 @@ 
 
 $articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
 if (!empty($xoopsModuleConfig['article_expire'])) {
-    $criteria = new Criteria('art_time', time() - $xoopsModuleConfig['article_expire'] * 60 * 60 * 24, '<');
-    if (!empty($_GET['purge'])) {
-        $crit = new CriteriaCompo($criteria);
-        $crit->add(new Criteria('art_comments', 0));
-        $article_expires = $articleHandler->getObjects($criteria);
-        foreach ($article_expires as $id => $article_obj) {
-            $articleHandler->delete($article_obj);
-        }
-    }
-    $article_count_expire = $articleHandler->getCount($criteria);
+	$criteria = new Criteria('art_time', time() - $xoopsModuleConfig['article_expire'] * 60 * 60 * 24, '<');
+	if (!empty($_GET['purge'])) {
+		$crit = new CriteriaCompo($criteria);
+		$crit->add(new Criteria('art_comments', 0));
+		$article_expires = $articleHandler->getObjects($criteria);
+		foreach ($article_expires as $id => $article_obj) {
+			$articleHandler->delete($article_obj);
+		}
+	}
+	$article_count_expire = $articleHandler->getCount($criteria);
 } else {
-    $article_count_expire = 0;
+	$article_count_expire = 0;
 }
 $article_count = $articleHandler->getCount();
 
@@ -61,8 +61,8 @@ 
 echo "<br clear=\"all\">" . planet_constant('AM_COUNT') . ': ' . $article_count;
 echo "<br clear=\"all\">";
 if ($article_count_expire > 0) {
-    echo "<br clear=\"all\"><a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . "/admin/admin.article.php?purge=1\" >" . planet_constant('AM_EXPIRED') . ': ' . $article_count_expire . '</a>';
-    echo "<br clear=\"all\">";
+	echo "<br clear=\"all\"><a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . "/admin/admin.article.php?purge=1\" >" . planet_constant('AM_EXPIRED') . ': ' . $article_count_expire . '</a>';
+	echo "<br clear=\"all\">";
 }
 echo '</div>';
 echo "</fieldset><br clear=\"all\">";

Spacing +8 added lines, -8 removed lines

@@ -24,7 +24,7 @@ 
 // URL: https://xoops.org                         //
 // Project: Article Project                                                 //
 // ------------------------------------------------------------------------ //
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 xoops_cp_header();
 $adminObject = \Xmf\Module\Admin::getInstance();
@@ -36,12 +36,12 @@ 
  * This is a tricky fix for incomplete solution of module cone
  * it is expected to have a better solution in article 1.0
  */
-require XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
+require XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/vars.php';
 //planet_adminmenu(3);
 
 $articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
 if (!empty($xoopsModuleConfig['article_expire'])) {
-    $criteria = new Criteria('art_time', time() - $xoopsModuleConfig['article_expire'] * 60 * 60 * 24, '<');
+    $criteria = new Criteria('art_time', time()-$xoopsModuleConfig['article_expire']*60*60*24, '<');
     if (!empty($_GET['purge'])) {
         $crit = new CriteriaCompo($criteria);
         $crit->add(new Criteria('art_comments', 0));
@@ -51,17 +51,17 @@ 
         }
     }
     $article_count_expire = $articleHandler->getCount($criteria);
-} else {
+}else {
     $article_count_expire = 0;
 }
 $article_count = $articleHandler->getCount();
 
-echo "<fieldset><legend style=\"font-weight: bold; color: #900;\">" . planet_constant('AM_ARTICLES') . '</legend>';
+echo "<fieldset><legend style=\"font-weight: bold; color: #900;\">".planet_constant('AM_ARTICLES').'</legend>';
 echo "<div style=\"padding: 8px;\">";
-echo "<br clear=\"all\">" . planet_constant('AM_COUNT') . ': ' . $article_count;
+echo "<br clear=\"all\">".planet_constant('AM_COUNT').': '.$article_count;
 echo "<br clear=\"all\">";
-if ($article_count_expire > 0) {
-    echo "<br clear=\"all\"><a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . "/admin/admin.article.php?purge=1\" >" . planet_constant('AM_EXPIRED') . ': ' . $article_count_expire . '</a>';
+if ($article_count_expire>0) {
+    echo "<br clear=\"all\"><a href=\"".XOOPS_URL.'/modules/'.$GLOBALS['moddirname']."/admin/admin.article.php?purge=1\" >".planet_constant('AM_EXPIRED').': '.$article_count_expire.'</a>';
     echo "<br clear=\"all\">";
 }
 echo '</div>';