mambax7 / planet

admin/admin_footer.php

Spacing +2 added lines, -2 removed lines

@@ -17,8 +17,8 @@
  * @author       XOOPS Development Team
  */
 
-echo "<div class='adminfooter'>\n" . "  <div style='text-align: center;'>\n"
+echo "<div class='adminfooter'>\n"."  <div style='text-align: center;'>\n"
      . "    <a href='http://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
-     . "  </div>\n" . '  ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" . '</div>';
+     . "  </div>\n".'  '._AM_MODULEADMIN_ADMIN_FOOTER."\n".'</div>';
 
 xoops_cp_footer();

admin/admin.blog.php

Spacing +77 added lines, -77 removed lines

@@ -24,8 +24,8 @@ 
 // URL: http://xoops.org                         //
 // Project: Article Project                                                 //
 // ------------------------------------------------------------------------ //
-include_once __DIR__ . '/admin_header.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+include_once __DIR__.'/admin_header.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
 xoops_cp_header();
 $indexAdmin = new ModuleAdmin();
@@ -37,14 +37,14 @@ 
  * 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(2);
 
 $op          = !empty($_POST['op']) ? $_POST['op'] : (!empty($_GET['op']) ? $_GET['op'] : '');
 $blog_id     = !empty($_POST['blog']) ? $_POST['blog'] : (!empty($_GET['blog']) ? $_GET['blog'] : 0);
-$blog_id     = is_array($blog_id) ? array_map('intval', $blog_id) : (int)$blog_id;
-$category_id = (int)(!empty($_POST['category']) ? $_POST['category'] : (!empty($_GET['category']) ? $_GET['category'] : 0));
-$start       = (int)(!empty($_POST['start']) ? $_POST['start'] : (!empty($_GET['start']) ? $_GET['start'] : 0));
+$blog_id     = is_array($blog_id) ? array_map('intval', $blog_id) : (int) $blog_id;
+$category_id = (int) (!empty($_POST['category']) ? $_POST['category'] : (!empty($_GET['category']) ? $_GET['category'] : 0));
+$start       = (int) (!empty($_POST['start']) ? $_POST['start'] : (!empty($_GET['start']) ? $_GET['start'] : 0));
 
 $blog_handler     = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
 $category_handler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
@@ -58,12 +58,12 @@ 
     case 'save':
 
         if ($blog_id) {
-            $blog_obj =& $blog_handler->get($blog_id);
-        } else {
+            $blog_obj = & $blog_handler->get($blog_id);
+        }else {
             if ($blog_exists = $blog_handler->getCount(new Criteria('blog_feed', $_POST['blog_feed']))) {
                 redirect_header('admin.blog.php', 2, planet_constant('AM_BLOGEXISTS'));
             }
-            $blog_obj =& $blog_handler->create();
+            $blog_obj = & $blog_handler->create();
             $blog_obj->setVar('blog_submitter', $xoopsUser->getVar('uid'));
         }
 
@@ -90,13 +90,13 @@ 
 
     /* fetch and add a list of blogs to a category */
     case 'add':
-        $links =& planet_parseLinks($_POST['links']);
+        $links = & planet_parseLinks($_POST['links']);
         $blogs = array();
         foreach ($links as $link) {
             if ($blog_exist = $blog_handler->getCount(new Criteria('blog_feed', $link['url']))) {
                 continue;
             }
-            $blog_obj =& $blog_handler->fetch($link['url']);
+            $blog_obj = & $blog_handler->fetch($link['url']);
             if (!empty($link['title'])) {
                 $blog_obj->setVar('blog_title', $link['title']);
             }
@@ -116,13 +116,13 @@ 
     /* update a list of blogs */
     case 'update':
         foreach ($blog_id as $bid) {
-            $blog_obj =& $blog_handler->fetch($bid);
+            $blog_obj = & $blog_handler->fetch($bid);
             if (!$blog_handler->insert($blog_obj)) {
             }
             unset($blog_obj);
         }
         $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
+        redirect_header('admin.blog.php?category='.$category_id.'&start='.$start, 2, $message);
 
     /* add a list of blogs to a category */
     case 'register':
@@ -134,7 +134,7 @@ 
             $category_handler->addBlogs($_POST['category_dest'], $blog_id);
         }
         $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $_POST['category_dest'] . '&start=' . $start, 2, $message);
+        redirect_header('admin.blog.php?category='.$_POST['category_dest'].'&start='.$start, 2, $message);
 
     /* remove a list of blogs from a category */
     case 'remove':
@@ -146,7 +146,7 @@ 
             $category_handler->removeBlogs($category_id, $blog_id);
         }
         $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
+        redirect_header('admin.blog.php?category='.$category_id.'&start='.$start, 2, $message);
 
     /* delete a single blog or a list blogs */
     case 'del':
@@ -154,13 +154,13 @@ 
             $blog_id = array($blog_id);
         }
         foreach ($blog_id as $bid) {
-            $blog_obj =& $blog_handler->get($bid);
+            $blog_obj = & $blog_handler->get($bid);
             if (!$blog_handler->delete($blog_obj, true)) {
             }
             unset($blog_obj);
         }
         $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
+        redirect_header('admin.blog.php?category='.$category_id.'&start='.$start, 2, $message);
 
     /* empty a single blog or a list blogs */
     case 'empty':
@@ -168,43 +168,43 @@ 
             $blog_id = array($blog_id);
         }
         foreach ($blog_id as $bid) {
-            $blog_obj =& $blog_handler->get($bid);
+            $blog_obj = & $blog_handler->get($bid);
             if (!$blog_handler->do_empty($blog_obj)) {
             }
         }
         $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
+        redirect_header('admin.blog.php?category='.$category_id.'&start='.$start, 2, $message);
 
     /* approve a single blog or a list blogs */
     case 'approve':
         if (!is_array($blog_id)) {
             $blog_id = array($blog_id);
         }
-        $criteria = new Criteria('blog_id', '(' . implode(',', $blog_id) . ')', 'IN');
+        $criteria = new Criteria('blog_id', '('.implode(',', $blog_id).')', 'IN');
         $blog_handler->updateAll('blog_status', 1, $criteria, true);
         $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
+        redirect_header('admin.blog.php?category='.$category_id.'&start='.$start, 2, $message);
 
     /* mark a single blog or a list blogs as featured */
     case 'feature':
         if (!is_array($blog_id)) {
             $blog_id = array($blog_id);
         }
-        $criteria = new Criteria('blog_id', '(' . implode(',', $blog_id) . ')', 'IN');
+        $criteria = new Criteria('blog_id', '('.implode(',', $blog_id).')', 'IN');
         $blog_handler->updateAll('blog_status', 2, $criteria, true);
         $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
+        redirect_header('admin.blog.php?category='.$category_id.'&start='.$start, 2, $message);
 
     /* edit a single blog */
     case 'edit':
         if (!empty($_POST['fetch'])) {
-            $blog_obj =& $blog_handler->fetch($_POST['blog_feed']);
+            $blog_obj = & $blog_handler->fetch($_POST['blog_feed']);
             $blog_obj->setVar('blog_id', $blog_id);
-        } else {
-            $blog_obj =& $blog_handler->get($blog_id);
+        }else {
+            $blog_obj = & $blog_handler->get($blog_id);
         }
         $categories = @$_POST['categories'];
-        if (empty($categories) && $blog_id > 0) {
+        if (empty($categories) && $blog_id>0) {
             $crit       = new Criteria('bc.blog_id', $blog_id);
             $categories = array_keys($category_handler->getByBlog($crit));
         }
@@ -212,22 +212,22 @@ 
             $categories = array(0 => _NONE);
         }
 
-        echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _EDIT . '</legend>';
+        echo "<fieldset><legend style='font-weight: bold; color: #900;'>"._EDIT.'</legend>';
         echo '<br>';
         if (empty($blog_id) && $blog_obj->getVar('blog_feed')) {
             $criteria  = new Criteria('blog_feed', $blog_obj->getVar('blog_feed'));
-            $blogs_obj =& $blog_handler->getList($criteria);
-            if (count($blogs_obj) > 0) {
-                echo "<div class=\"errorMsg\">" . planet_constant('AM_BLOGEXISTS');
+            $blogs_obj = & $blog_handler->getList($criteria);
+            if (count($blogs_obj)>0) {
+                echo "<div class=\"errorMsg\">".planet_constant('AM_BLOGEXISTS');
                 foreach (array_keys($blogs_obj) as $bid) {
-                    echo "<br><a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php'
-                         . URL_DELIMITER . 'b' . $bid . "\" target=\"_blank\">" . $blogs_obj[$bid] . '</a>';
+                    echo "<br><a href=\"".XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'
+                         . URL_DELIMITER.'b'.$bid."\" target=\"_blank\">".$blogs_obj[$bid].'</a>';
                 }
                 echo '</div>';
             }
             unset($blogs_obj, $criteria);
         }
-        include XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/form.blog.php';
+        include XOOPS_ROOT_PATH.'/modules/'.$GLOBALS['moddirname'].'/include/form.blog.php';
         echo '</fieldset>';
         break;
 
@@ -255,14 +255,14 @@ 
         $opform->addElement($op_select);
         $opform->display();
 
-        if ($category_id > 0) {
+        if ($category_id>0) {
             $criteria = new CriteriaCompo(new Criteria('b.blog_status', 0, '>'));
             $criteria->add(new Criteria('bc.cat_id', $category_id));
             $blog_count = $blog_handler->getCountByCategory($criteria);
             $criteria->setStart($start);
             $criteria->setLimit($xoopsModuleConfig['list_perpage']);
-            $blog_objs =& $blog_handler->getByCategory($criteria);
-        } else {
+            $blog_objs = & $blog_handler->getByCategory($criteria);
+        }else {
             /* All active blogs */
             if ($category_id == 0) {
                 $criteria = new Criteria('1', 1);
@@ -279,28 +279,28 @@ 
                 $criteria->setStart($start);
                 $criteria->setLimit($xoopsModuleConfig['list_perpage']);
                 /* Pending blogs */
-            } else {
+            }else {
                 $criteria = new Criteria('blog_status', 0);
                 $criteria->setStart($start);
                 $criteria->setLimit($xoopsModuleConfig['list_perpage']);
             }
             $blog_count = $blog_handler->getCount($criteria);
-            $blog_objs  =& $blog_handler->getAll($criteria);
+            $blog_objs  = & $blog_handler->getAll($criteria);
         }
 
-        echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . planet_constant('AM_LIST') . '</legend>';
+        echo "<fieldset><legend style='font-weight: bold; color: #900;'>".planet_constant('AM_LIST').'</legend>';
         echo "<br style=\"clear:both\" />";
 
-        echo "<form name='list' id='list' method='post' action='" . xoops_getenv('PHP_SELF') . "'>";
+        echo "<form name='list' id='list' method='post' action='".xoops_getenv('PHP_SELF')."'>";
         echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
         echo "<tr align='center'>";
         echo "<th class='bg3' width='5%'><input name='blog_check' id='blog_check' value='1' type='checkbox'  onclick=\"xoopsCheckAll('list', 'blog_check');\" /></td>";
-        echo "<th class='bg3'>" . planet_constant('AM_TITLE') . '</td>';
-        echo "<th class='bg3' width='5%'>" . planet_constant('AM_STATUS') . '</td>';
-        echo "<th class='bg3' width='40%'>" . planet_constant('AM_FEED') . '</td>';
+        echo "<th class='bg3'>".planet_constant('AM_TITLE').'</td>';
+        echo "<th class='bg3' width='5%'>".planet_constant('AM_STATUS').'</td>';
+        echo "<th class='bg3' width='40%'>".planet_constant('AM_FEED').'</td>';
         //        echo "<th class='bg3' width='5%'>" . _EDIT . "</td>";
         //        echo "<th class='bg3' width='5%'>" . _DELETE . "</td>";
-        echo "<th class='bg3' width='10%'>" . planet_constant('AM_ACTIONS') . '</td>';
+        echo "<th class='bg3' width='10%'>".planet_constant('AM_ACTIONS').'</td>';
         echo '</tr>';
 
         $status = array(
@@ -310,55 +310,55 @@ 
         );
         foreach (array_keys($blog_objs) as $bid) {
             echo "<tr class='odd' align='left'>";
-            echo "<td align='center'><input name='blog[]' value='" . $bid . "' type='checkbox' /></td>";
-            echo "<td><a href='" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b'
-                 . $bid . "'>" . $blog_objs[$bid]->getVar('blog_title') . '</a></td>';
-            echo "<td align='center'>" . $status[$blog_objs[$bid]->getVar('blog_status')] . '</td>';
-            echo '<td>' . $blog_objs[$bid]->getVar('blog_feed') . '</td>';
-            echo "<td align='center'><a href='admin.blog.php?op=edit&amp;blog=" . $bid . "' title='" . _EDIT
-                 . "'><img src='" . $pathIcon16 . "/edit.png '" . "alt='" . _EDIT . " title='" . _EDIT . " </a>
-                      <a href='admin.blog.php?op=del&amp;blog=" . $bid . "' title='" . _DELETE . "'><img src='"
-                 . $pathIcon16 . "/delete.png '" . " alt='" . _EDIT . " title='" . _DELETE . " </a>&nbsp;
-                      <a href='admin.blog.php?op=empty&amp;blog=" . $bid . "' title='"
-                 . planet_constant('MD_EMPTY_BLOG') . "'><img src='" . $pathIcon16 . "/empty.png '" . " alt='" . _EDIT
-                 . " title='" . planet_constant('MD_EMPTY_BLOG') . '</a></td>';
+            echo "<td align='center'><input name='blog[]' value='".$bid."' type='checkbox' /></td>";
+            echo "<td><a href='".XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.URL_DELIMITER.'b'
+                 . $bid."'>".$blog_objs[$bid]->getVar('blog_title').'</a></td>';
+            echo "<td align='center'>".$status[$blog_objs[$bid]->getVar('blog_status')].'</td>';
+            echo '<td>'.$blog_objs[$bid]->getVar('blog_feed').'</td>';
+            echo "<td align='center'><a href='admin.blog.php?op=edit&amp;blog=".$bid."' title='"._EDIT
+                 . "'><img src='".$pathIcon16."/edit.png '"."alt='"._EDIT." title='"._EDIT." </a>
+                      <a href='admin.blog.php?op=del&amp;blog=" . $bid."' title='"._DELETE."'><img src='"
+                 . $pathIcon16."/delete.png '"." alt='"._EDIT." title='"._DELETE." </a>&nbsp;
+                      <a href='admin.blog.php?op=empty&amp;blog=" . $bid."' title='"
+                 . planet_constant('MD_EMPTY_BLOG')."'><img src='".$pathIcon16."/empty.png '"." alt='"._EDIT
+                 . " title='".planet_constant('MD_EMPTY_BLOG').'</a></td>';
 
             echo '</tr>';
         }
         echo "<tr class='even' align='center'>";
         echo "<td colspan='7'>";
         echo "<select name='op' onChange='if (this.options[this.selectedIndex].value==\"register\") {setVisible(\"catdiv\");} else {setHidden(\"catdiv\");}'>";
-        echo "<option value=''>" . _SELECT . '</option>';
-        echo "<option value='del'>" . _DELETE . '</option>';
-        echo "<option value='empty'>" . planet_constant('MD_EMPTY_BLOG') . '</option>';
-        echo "<option value='register'>" . planet_constant('AM_REGISTER') . '</option>';
-        if ($category_id > 0) {
-            echo "<option value='remove'>" . planet_constant('AM_REMOVE') . '</option>';
+        echo "<option value=''>"._SELECT.'</option>';
+        echo "<option value='del'>"._DELETE.'</option>';
+        echo "<option value='empty'>".planet_constant('MD_EMPTY_BLOG').'</option>';
+        echo "<option value='register'>".planet_constant('AM_REGISTER').'</option>';
+        if ($category_id>0) {
+            echo "<option value='remove'>".planet_constant('AM_REMOVE').'</option>';
         }
-        echo "<option value='approve'>" . planet_constant('AM_APPROVE') . '</option>';
-        echo "<option value='feature'>" . planet_constant('AM_FEATURE') . '</option>';
-        echo "<option value='update'>" . planet_constant('AM_UPDATE') . '</option>';
+        echo "<option value='approve'>".planet_constant('AM_APPROVE').'</option>';
+        echo "<option value='feature'>".planet_constant('AM_FEATURE').'</option>';
+        echo "<option value='update'>".planet_constant('AM_UPDATE').'</option>';
         echo '</select>';
         echo "<div id='catdiv' style='visibility:hidden;display:inline;'>";
         echo "<select name='category_dest'>";
-        echo "<option value=''>" . _SELECT . '</option>';
+        echo "<option value=''>"._SELECT.'</option>';
         foreach ($categories as $cid => $name) {
-            echo "<option value='" . $cid . "'>" . $name . '</option>';
+            echo "<option value='".$cid."'>".$name.'</option>';
         }
         echo '</select>';
         echo '</div>';
-        echo "<input name='start' value='" . $start . "' type='hidden' />";
-        echo "<input name='category' value='" . $category_id . "' type='hidden' />";
-        echo "<input name='submit' value='" . _SUBMIT . "' type='submit' />";
-        echo "<input name='' value='" . _CANCEL . "' type='reset' />";
+        echo "<input name='start' value='".$start."' type='hidden' />";
+        echo "<input name='category' value='".$category_id."' type='hidden' />";
+        echo "<input name='submit' value='"._SUBMIT."' type='submit' />";
+        echo "<input name='' value='"._CANCEL."' type='reset' />";
         echo '</td>';
         echo '</tr>';
-        if ($blog_count > $xoopsModuleConfig['list_perpage']) {
-            include XOOPS_ROOT_PATH . '/class/pagenav.php';
+        if ($blog_count>$xoopsModuleConfig['list_perpage']) {
+            include XOOPS_ROOT_PATH.'/class/pagenav.php';
             $nav     = new XoopsPageNav($blog_count, $xoopsModuleConfig['list_perpage'], $start, 'start',
-                                        'category=' . $category_id);
+                                        'category='.$category_id);
             $pagenav = $nav->renderNav(4);
-            echo "<tr align='right'><td colspan='6'>" . $pagenav . '</td></tr>';
+            echo "<tr align='right'><td colspan='6'>".$pagenav.'</td></tr>';
         }
         echo '</table></form>';
         echo "</fieldset><br style='clear:both;'>";
@@ -384,7 +384,7 @@ 
             $button_tray->addElement($butt_cancel);
             $form_add->addElement($button_tray);
 
-            echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _ADD . '</legend>';
+            echo "<fieldset><legend style='font-weight: bold; color: #900;'>"._ADD.'</legend>';
             echo '<br>';
             $form->display();
             $form_add->display();

admin/header.php

Spacing +7 added lines, -7 removed lines

@@ -25,16 +25,16 @@
 // Project: Article Project                                                 //
 // ------------------------------------------------------------------------ //
 
-include_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
-require XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
-require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/functions.php';
-include_once XOOPS_ROOT_PATH . '/Frameworks/art/functions.admin.php';
+include_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
+require XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/vars.php';
+require_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/functions.php';
+include_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.admin.php';
 
 // include the default language file for the admin interface
-if (!@include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/'
-                   . $xoopsConfig['language'] . '/main.php'
+if (!@include_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/'
+                   . $xoopsConfig['language'].'/main.php'
 ) {
-    include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/main.php';
+    include_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/english/main.php';
 }
 
 planet_define_url_delimiter();

admin/admin.category.php

Spacing +31 added lines, -31 removed lines

@@ -24,18 +24,18 @@ 
 // URL: http://xoops.org                         //
 // Project: Article Project                                                 //
 // ------------------------------------------------------------------------ //
-include_once __DIR__ . '/admin_header.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+include_once __DIR__.'/admin_header.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
 xoops_cp_header();
 $indexAdmin = new ModuleAdmin();
 echo $indexAdmin->addNavigation(basename(__FILE__));
-require XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
+require XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/vars.php';
 //planet_adminmenu(1);
 
 $op     = !empty($_POST['op']) ? $_POST['op'] : (!empty($_GET['op']) ? $_GET['op'] : '');
 $cat_id = !empty($_POST['category']) ? $_POST['category'] : (!empty($_GET['category']) ? $_GET['category'] : 0);
-$cat_id = is_array($cat_id) ? array_map('intval', $cat_id) : (int)$cat_id;
+$cat_id = is_array($cat_id) ? array_map('intval', $cat_id) : (int) $cat_id;
 
 $category_handler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
 $blog_handler     = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
@@ -43,9 +43,9 @@ 
 switch ($op) {
     case 'save':
         if ($cat_id) {
-            $category_obj =& $category_handler->get($cat_id);
-        } else {
-            $category_obj =& $category_handler->create();
+            $category_obj = & $category_handler->get($cat_id);
+        }else {
+            $category_obj = & $category_handler->create();
         }
 
         $category_obj->setVar('cat_title', $_POST['cat_title']);
@@ -53,7 +53,7 @@ 
 
         if (!$category_handler->insert($category_obj)) {
             $message = planet_constant('AM_ERROR');
-        } else {
+        }else {
             $message = planet_constant('AM_DBUPDATED');
         }
         redirect_header('admin.category.php', 2, $message);
@@ -63,7 +63,7 @@ 
             $cat_id = array($cat_id);
         }
         foreach ($cat_id as $cid) {
-            $category_obj =& $category_handler->get($cid);
+            $category_obj = & $category_handler->get($cid);
             if (!$category_handler->delete($category_obj)) {
             }
         }
@@ -72,8 +72,8 @@ 
 
     case 'order':
         $count = count($_POST['cat_order']);
-        for ($i = 0; $i < $count; ++$i) {
-            $category_obj =& $category_handler->get($_POST['cat'][$i]);
+        for ($i = 0; $i<$count; ++$i) {
+            $category_obj = & $category_handler->get($_POST['cat'][$i]);
             $category_obj->setVar('cat_order', $_POST['cat_order'][$i]);
             $category_handler->insert($category_obj, true);
             unset($category_obj);
@@ -82,7 +82,7 @@ 
         redirect_header('admin.category.php', 2, $message);
 
     case 'edit':
-        $category_obj =& $category_handler->get($cat_id);
+        $category_obj = & $category_handler->get($cat_id);
         $form         = new XoopsThemeForm(_EDIT, 'edit', xoops_getenv('PHP_SELF'));
         $form->addElement(new XoopsFormText(planet_constant('AM_TITLE'), 'cat_title', 50, 80,
                                             $category_obj->getVar('cat_title', 'E')), true);
@@ -98,7 +98,7 @@ 
         $button_tray->addElement($butt_cancel);
         $form->addElement($button_tray);
 
-        echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _EDIT . '</legend>';
+        echo "<fieldset><legend style='font-weight: bold; color: #900;'>"._EDIT.'</legend>';
         echo '<br>';
         $form->display();
         echo '</fieldset>';
@@ -112,20 +112,20 @@ 
         $blog_counts = $blog_handler->getCountsByCategory();
         foreach (array_keys($categories) as $cid) {
             if (!empty($blog_counts[$cid])) {
-                $categories[$cid] .= ' (' . (int)$blog_counts[$cid] . ')';
+                $categories[$cid] .= ' ('.(int) $blog_counts[$cid].')';
             }
         }
 
-        echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . planet_constant('AM_LIST') . '</legend>';
+        echo "<fieldset><legend style='font-weight: bold; color: #900;'>".planet_constant('AM_LIST').'</legend>';
         echo "<br style=\"clear:both;\" />";
 
         echo "<form name='list' method='post'>";
         echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
         echo "<tr align='center'>";
-        echo "<th class='bg3' width='5%'>" . planet_constant('AM_ORDER') . '</td>';
-        echo "<th align='left' class='bg3' width='80%'>" . planet_constant('AM_TITLE') . '</td>';
-        echo "<th class='bg3' width='5%'>" . planet_constant('AM_BLOGCOUNT') . '</td>';
-        echo "<th class='bg3' width='5%'>" . planet_constant('AM_ACTIONS') . '</td>';
+        echo "<th class='bg3' width='5%'>".planet_constant('AM_ORDER').'</td>';
+        echo "<th align='left' class='bg3' width='80%'>".planet_constant('AM_TITLE').'</td>';
+        echo "<th class='bg3' width='5%'>".planet_constant('AM_BLOGCOUNT').'</td>';
+        echo "<th class='bg3' width='5%'>".planet_constant('AM_ACTIONS').'</td>';
         //        echo "<td class='bg3' width='5%'>" . _DELETE . "</td>";
 
         echo '</tr>';
@@ -133,22 +133,22 @@ 
         $ii = 0;
         foreach (array_keys($categories) as $cid) {
             echo "<tr class='odd' align='left'>";
-            echo "<td><input type='hidden' name='cat[]' value='" . $cid . "' />";
-            echo "<input type='text' name='cat_order[]' value='" . ($ii * 10) . "' /></td>";
-            echo '<td>' . $categories[$cid] . '</td>';
-            echo "<td align='center'>" . @$blog_counts[$cid] . '</td>';
-
-            echo "<td align='center'><a href='admin.category.php?op=edit &amp;category='" . $cid . "' title='" . _EDIT
-                 . "'><img src='" . $pathIcon16 . "/edit.png '" . "alt='" . _EDIT . "' title='" . _EDIT . "' </a>&nbsp;
-                  <a href='admin.category.php?op=del &amp;category='" . $cid . "' title='" . _DELETE . "'><img src='"
-                 . $pathIcon16 . "/delete.png '" . " alt='" . _EDIT . "' title='" . _DELETE . "' </a></td>";
+            echo "<td><input type='hidden' name='cat[]' value='".$cid."' />";
+            echo "<input type='text' name='cat_order[]' value='".($ii*10)."' /></td>";
+            echo '<td>'.$categories[$cid].'</td>';
+            echo "<td align='center'>".@$blog_counts[$cid].'</td>';
+
+            echo "<td align='center'><a href='admin.category.php?op=edit &amp;category='".$cid."' title='"._EDIT
+                 . "'><img src='".$pathIcon16."/edit.png '"."alt='"._EDIT."' title='"._EDIT."' </a>&nbsp;
+                  <a href='admin.category.php?op=del &amp;category='" . $cid."' title='"._DELETE."'><img src='"
+                 . $pathIcon16."/delete.png '"." alt='"._EDIT."' title='"._DELETE."' </a></td>";
             echo '</tr>';
             ++$ii;
         }
         echo "<tr class='even' align='center'>";
         echo "<td colspan='5'>";
-        echo "<input name='submit' value='" . _SUBMIT . "' type='submit' />";
-        echo "<input name='' value='" . _CANCEL . "' type='reset' />";
+        echo "<input name='submit' value='"._SUBMIT."' type='submit' />";
+        echo "<input name='' value='"._CANCEL."' type='reset' />";
         echo "<input name='op' value='order' type='hidden' />";
         echo '</td>';
         echo '</tr>';
@@ -167,7 +167,7 @@ 
         $button_tray->addElement($butt_cancel);
         $form->addElement($button_tray);
 
-        echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _ADD . '</legend>';
+        echo "<fieldset><legend style='font-weight: bold; color: #900;'>"._ADD.'</legend>';
         echo '<br>';
         $form->display();
         echo '</fieldset>';

admin/admin_header.php

Spacing +12 added lines, -12 removed lines

@@ -18,9 +18,9 @@ 
  */
 
 $path = dirname(dirname(dirname(__DIR__)));
-include_once $path . '/mainfile.php';
-include_once $path . '/include/cp_functions.php';
-require_once $path . '/include/cp_header.php';
+include_once $path.'/mainfile.php';
+include_once $path.'/include/cp_functions.php';
+require_once $path.'/include/cp_header.php';
 
 global $xoopsModule;
 
@@ -34,21 +34,21 @@ 
 xoops_loadLanguage('modinfo', $moduleDirName);
 xoops_loadLanguage('main', $moduleDirName);
 
-$pathIcon16      = '../' . $xoopsModule->getInfo('icons16');
-$pathIcon32      = '../' . $xoopsModule->getInfo('icons32');
+$pathIcon16      = '../'.$xoopsModule->getInfo('icons16');
+$pathIcon32      = '../'.$xoopsModule->getInfo('icons32');
 $pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
 
-include_once $GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php');
+include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
 
-require XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
-require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/functions.php';
-include_once XOOPS_ROOT_PATH . '/Frameworks/art/functions.admin.php';
+require XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/vars.php';
+require_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/functions.php';
+include_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.admin.php';
 
 // include the default language file for the admin interface
-if (!@include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/'
-                   . $xoopsConfig['language'] . '/main.php'
+if (!@include_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/'
+                   . $xoopsConfig['language'].'/main.php'
 ) {
-    include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/main.php';
+    include_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/english/main.php';
 }
 
 planet_define_url_delimiter();

admin/admin.article.php

Spacing +10 added lines, -10 removed lines

@@ -24,7 +24,7 @@ 
 // URL: http://xoops.org                         //
 // Project: Article Project                                                 //
 // ------------------------------------------------------------------------ //
-include_once __DIR__ . '/admin_header.php';
+include_once __DIR__.'/admin_header.php';
 
 xoops_cp_header();
 $indexAdmin = new ModuleAdmin();
@@ -36,33 +36,33 @@ 
  * 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);
 
 $article_handler = 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));
-        $article_expires =& $article_handler->getObjects($criteria);
+        $article_expires = & $article_handler->getObjects($criteria);
         foreach ($article_expires as $id => $article_obj) {
             $article_handler->delete($article_obj);
         }
     }
     $article_count_expire = $article_handler->getCount($criteria);
-} else {
+}else {
     $article_count_expire = 0;
 }
 $article_count = $article_handler->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
+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\" />";
 }

notification_update.php

Spacing +2 added lines, -2 removed lines

@@ -28,5 +28,5 @@
 // URL: http://www.myweb.ne.jp/, http://xoops.org/, http://jp.xoops.org/ //
 // Project: XOOPS Project                                                    //
 // ------------------------------------------------------------------------- //
-include dirname(dirname(__DIR__)) . '/mainfile.php';
-include XOOPS_ROOT_PATH . '/include/notification_update.php';
+include dirname(dirname(__DIR__)).'/mainfile.php';
+include XOOPS_ROOT_PATH.'/include/notification_update.php';

action.rate.php

Spacing +27 added lines, -27 removed lines

@@ -25,11 +25,11 @@ 
 // Project: Article Project                                                 //
 // ------------------------------------------------------------------------ //
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
-$rate       = (int)(!empty($_POST['rate']) ? $_POST['rate'] : (!empty($_GET['rate']) ? $_GET['rate'] : 0));
-$article_id = (int)(!empty($_POST['article']) ? $_POST['article'] : (!empty($_GET['article']) ? $_GET['article'] : 0));
-$blog_id    = (int)(!empty($_POST['blog']) ? $_POST['blog'] : (!empty($_GET['blog']) ? $_GET['blog'] : 0));
+$rate       = (int) (!empty($_POST['rate']) ? $_POST['rate'] : (!empty($_GET['rate']) ? $_GET['rate'] : 0));
+$article_id = (int) (!empty($_POST['article']) ? $_POST['article'] : (!empty($_GET['article']) ? $_GET['article'] : 0));
+$blog_id    = (int) (!empty($_POST['blog']) ? $_POST['blog'] : (!empty($_GET['blog']) ? $_GET['blog'] : 0));
 
 if (empty($article_id) && empty($blog_id)) {
     redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID'));
@@ -39,28 +39,28 @@ 
 $blog_handler    = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
 if (empty($xoopsModuleConfig['anonymous_rate']) && !is_object($xoopsUser)) {
     $message = planet_constant('MD_NOACCESS');
-} else {
+}else {
     $uid = is_object($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
     $ip  = planet_getIP();
-    if ($article_id > 0) {
+    if ($article_id>0) {
         $criteria = new CriteriaCompo(new Criteria('art_id', $article_id));
-    } else {
+    }else {
         $criteria = new CriteriaCompo(new Criteria('blog_id', $blog_id));
     }
-    if ($uid > 0) {
+    if ($uid>0) {
         $criteria->add(new Criteria('rate_uid', $uid));
-    } else {
+    }else {
         $criteria->add(new Criteria('rate_ip', $ip));
-        $criteria->add(new Criteria('rate_time', time() - 24 * 3600, '>'));
+        $criteria->add(new Criteria('rate_time', time()-24*3600, '>'));
     }
     $rate_handler = xoops_getModuleHandler('rate', $GLOBALS['moddirname']);
     if ($count = $rate_handler->getCount($criteria)) {
         $message = planet_constant('MD_ALREADYRATED');
-    } else {
-        $rate_obj =& $rate_handler->create();
-        if ($article_id > 0) {
+    }else {
+        $rate_obj = & $rate_handler->create();
+        if ($article_id>0) {
             $rate_obj->setVar('art_id', $article_id);
-        } else {
+        }else {
             $rate_obj->setVar('blog_id', $blog_id);
         }
         $rate_obj->setVar('rate_uid', $uid);
@@ -70,25 +70,25 @@ 
         if (!$rate_id = $rate_handler->insert($rate_obj, true)) {
             redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_NOTSAVED'));
         }
-        if ($article_id > 0) {
-            $article_obj =& $article_handler->get($article_id);
-            $article_obj->setVar('art_rating', $article_obj->getVar('art_rating') + $rate);
-            $article_obj->setVar('art_rates', $article_obj->getVar('art_rates') + 1);
+        if ($article_id>0) {
+            $article_obj = & $article_handler->get($article_id);
+            $article_obj->setVar('art_rating', $article_obj->getVar('art_rating')+$rate);
+            $article_obj->setVar('art_rates', $article_obj->getVar('art_rates')+1);
             $article_handler->insert($article_obj, true);
-        } else {
-            $blog_obj =& $blog_handler->get($blog_id);
-            $blog_obj->setVar('blog_rating', $blog_obj->getVar('blog_rating') + $rate);
-            $blog_obj->setVar('blog_rates', $blog_obj->getVar('blog_rates') + 1);
+        }else {
+            $blog_obj = & $blog_handler->get($blog_id);
+            $blog_obj->setVar('blog_rating', $blog_obj->getVar('blog_rating')+$rate);
+            $blog_obj->setVar('blog_rates', $blog_obj->getVar('blog_rates')+1);
             $blog_handler->insert($blog_obj, true);
         }
         $message = planet_constant('MD_ACTIONDONE');
     }
 }
-if ($article_id > 0) {
-    redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . ''
+if ($article_id>0) {
+    redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.URL_DELIMITER.''
                     . $article_id, 2, $message);
-} else {
-    redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $blog_id, 2,
+}else {
+    redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.URL_DELIMITER.'b'.$blog_id, 2,
                     $message);
 }
-include __DIR__ . '/footer.php';
+include __DIR__.'/footer.php';

action.article.php

Spacing +13 added lines, -13 removed lines

@@ -25,17 +25,17 @@ 
 // Project: Article Project                                                 //
 // ------------------------------------------------------------------------ //
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
-$art_id = (int)(isset($_GET['article']) ? $_GET['article'] : (isset($_POST['article']) ? $_POST['article'] : 0));
+$art_id = (int) (isset($_GET['article']) ? $_GET['article'] : (isset($_POST['article']) ? $_POST['article'] : 0));
 if (empty($art_id)) {
     redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID'));
 }
 if (!$xoopsUser->isAdmin()) {
     redirect_header('javascript:history.go(-1);', 2, _NOPERM);
 }
-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';
 
 $article_handler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
 $article_obj     = $article_handler->get($art_id);
@@ -44,7 +44,7 @@ 
 
 if ($op === 'del' || !empty($_POST['del'])) {
     $article_handler->delete($article_obj);
-    $redirect = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php';
+    $redirect = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php';
     $message  = planet_constant('MD_SAVED');
     redirect_header($redirect, 2, $message);
 } elseif ($op === 'save') {
@@ -65,16 +65,16 @@ 
 
     $art_id_new = $article_handler->insert($article_obj);
     if (!$article_obj->getVar('art_id')) {
-        $redirect = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php';
+        $redirect = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php';
         $message  = planet_constant('MD_INSERTERROR');
-    } else {
-        $redirect = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . ''
+    }else {
+        $redirect = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.URL_DELIMITER.''
                     . $article_obj->getVar('art_id');
         $message  = planet_constant('MD_SAVED');
     }
     redirect_header($redirect, 2, $message);
-} else {
-    require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+}else {
+    require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
     $form = new XoopsThemeForm(_EDIT, 'formarticle', xoops_getenv('PHP_SELF'));
 
@@ -97,10 +97,10 @@ 
     $butt_del->setExtra("onClick='document.forms.formarticle.op.value=del'");
     $button_tray->addElement($butt_del);
     $butt_cancel = new XoopsFormButton('', 'cancel', _CANCEL, 'button');
-    $butt_cancel->setExtra("onclick='window.document.location=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname']
-                           . '/view.article.php' . URL_DELIMITER . '' . (int)$art_id . "\"'");
+    $butt_cancel->setExtra("onclick='window.document.location=\"".XOOPS_URL.'/modules/'.$GLOBALS['moddirname']
+                           . '/view.article.php'.URL_DELIMITER.''.(int) $art_id."\"'");
     $button_tray->addElement($butt_cancel);
     $form->addElement($button_tray);
     $form->display();
 }
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';