XOOPS / XoopsCore

htdocs/modules/images/admin/categories.php

Spacing +4 added lines, -4 removed lines

@@ -21,7 +21,7 @@ 
  * @author          Mage Grégory (AKA Mage)
  * @version         $Id$
  */
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 // Call Header
 $xoops->header('admin:images/images_admin_categories.tpl');
@@ -81,7 +81,7 @@ 
             }
             $xoops->redirect('categories.php', 2, _AM_IMAGES_CAT_SAVE);
         }
-        $xoops->redirect('categories.php', 2, _AM_IMAGES_CAT_NOTSAVE . '<br />' . implode('<br />', $obj->getHtmlErrors()));
+        $xoops->redirect('categories.php', 2, _AM_IMAGES_CAT_NOTSAVE.'<br />'.implode('<br />', $obj->getHtmlErrors()));
         break;
 
     case 'add':
@@ -117,7 +117,7 @@ 
                             if ($obj->getVar('imgcat_storetype') === 'db') {
                                 $helper->getHandlerImagesBody()->delete($helper->getHandlerImagesBody()->get($image->getVar('image_id')));
                             } else {
-                                unlink(\XoopsBaseConfig::get('uploads-path') . '/' . $image->getVar('image_name'));
+                                unlink(\XoopsBaseConfig::get('uploads-path').'/'.$image->getVar('image_name'));
                             }
                         }
                     }
@@ -135,7 +135,7 @@ 
             } else {
                 echo $xoops->confirm(
                     array('op' => 'del', 'ok' => 1, 'imgcat_id' => $imgcat_id),
-                    XOOPS_URL . '/modules/images/admin/categories.php',
+                    XOOPS_URL.'/modules/images/admin/categories.php',
                     sprintf(_AM_IMAGES_CAT_DELETE, $obj->getVar('imgcat_name'))
                 );
             }

htdocs/modules/images/admin/index.php

Spacing +2 added lines, -2 removed lines

@@ -19,11 +19,11 @@
  * @author          Mage Grégory (AKA Mage)
  * @version         $Id$
  */
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 $xoops->header();
 // folder path
-$folder_path = \XoopsBaseConfig::get('root-path') . '/uploads/images';
+$folder_path = \XoopsBaseConfig::get('root-path').'/uploads/images';
 
 $admin_page = new \Xoops\Module\Admin();
 $admin_page->displayNavigation('index.php');

htdocs/modules/images/admin/header.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
  * @author          Mage Grégory (AKA Mage)
  * @version         $Id$
  */
-require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
+require_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
 
 XoopsLoad::load('system', 'system');
 

htdocs/modules/images/admin/images.php

Spacing +18 added lines, -18 removed lines

@@ -20,7 +20,7 @@ 
  * @author          Mage Grégory (AKA Mage)
  * @version         $Id$
  */
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 // Call Header
 $xoops->header('admin:images/images_admin_images.tpl');
@@ -33,7 +33,7 @@ 
 switch ($op) {
     case 'save':
         if (!$xoops->security()->check()) {
-            $xoops->redirect('images.php?imgcat_id=' . $imgcat_id, 3, implode('<br />', $xoops->security()->getErrors()));
+            $xoops->redirect('images.php?imgcat_id='.$imgcat_id, 3, implode('<br />', $xoops->security()->getErrors()));
         }
 
         $msg[] = _AM_IMAGES_IMG_SAVE;
@@ -62,7 +62,7 @@ 
         $error_message = '';
         $xoops_upload_file = Request::getArray('xoops_upload_file', array());
         if ($_FILES[$xoops_upload_file[0]]['error'] === 0) {
-            $xoops_upload_path = \XoopsBaseConfig::get('uploads-path') . '/images';
+            $xoops_upload_path = \XoopsBaseConfig::get('uploads-path').'/images';
             $uploader = new XoopsMediaUploader($xoops_upload_path, $mimetypes, $category->getVar('imgcat_maxsize'), $category->getVar('imgcat_maxwidth'), $category->getVar('imgcat_maxheight'));
             if ($uploader->fetchMedia($xoops_upload_file[0])) {
                 $uploader->setPrefix('img');
@@ -79,7 +79,7 @@ 
                         @fclose($fp);
                         $image_body = $fbinary;
                     } else {
-                        $obj->setVar('image_name', 'images/' . $uploader->getSavedFileName());
+                        $obj->setVar('image_name', 'images/'.$uploader->getSavedFileName());
                     }
                 }
             }
@@ -88,7 +88,7 @@ 
             $xoops->tpl()->assign('error_message', $error_message);
         } else {
             if ($image_id = $helper->getHandlerImages()->insert($obj)) {
-                if ($category->getVar('imgcat_storetype') === 'db'  && $isnew) {
+                if ($category->getVar('imgcat_storetype') === 'db' && $isnew) {
                     $imagebody = $helper->getHandlerImagesBody()->get($image_id);
                     if (!is_object($imagebody)) {
                         $imagebody = $helper->getHandlerImagesBody()->create();
@@ -99,7 +99,7 @@ 
                         @unlink($uploader->getSavedDestination());
                     }
                 }
-                $xoops->redirect('images.php?imgcat_id=' . $imgcat_id, 2, implode('<br />', $msg));
+                $xoops->redirect('images.php?imgcat_id='.$imgcat_id, 2, implode('<br />', $msg));
             }
             echo $xoops->alert('error', $obj->getHtmlErrors());
         }
@@ -108,7 +108,7 @@ 
         break;
 
     case 'add':
-        $obj =  $helper->getHandlerImages()->create();
+        $obj = $helper->getHandlerImages()->create();
         $obj->setVar('imgcat_id', $imgcat_id);
         $form = $helper->getForm($obj, 'image');
         $xoops->tpl()->assign('form', $form->render());
@@ -117,7 +117,7 @@ 
     case 'edit':
         $image_id = Request::getInt('image_id', 0);
         if ($image_id > 0) {
-            $obj =  $helper->getHandlerImages()->get($image_id);
+            $obj = $helper->getHandlerImages()->get($image_id);
             $form = $helper->getForm($obj, 'image');
             $xoops->tpl()->assign('form', $form->render());
         }
@@ -127,11 +127,11 @@ 
         $image_id = Request::getInt('image_id', 0);
         if ($image_id > 0) {
             $ok = Request::getInt('ok', 0);
-            $obj =  $helper->getHandlerImages()->get($image_id);
+            $obj = $helper->getHandlerImages()->get($image_id);
 
             if ($ok == 1) {
                 if (!$xoops->security()->check()) {
-                    $xoops->redirect('images.php?imgcat_id=' . $imgcat_id, 3, implode('<br />', $xoops->security()->getErrors()));
+                    $xoops->redirect('images.php?imgcat_id='.$imgcat_id, 3, implode('<br />', $xoops->security()->getErrors()));
                 }
                 $category = $helper->getHandlerCategories()->get($obj->getVar('imgcat_id'));
 
@@ -139,22 +139,22 @@ 
                     if ($category->getVar('imgcat_storetype') === 'db') {
                         $helper->getHandlerImagesBody()->delete($helper->getHandlerImagesBody()->get($image_id));
                     } else {
-                        unlink(\XoopsBaseConfig::get('uploads-path') . '/' . $obj->getVar('image_name'));
+                        unlink(\XoopsBaseConfig::get('uploads-path').'/'.$obj->getVar('image_name'));
                     }
-                    $xoops->redirect('images.php?imgcat_id=' . $imgcat_id, 2, XoopsLocale::S_DATABASE_UPDATED);
+                    $xoops->redirect('images.php?imgcat_id='.$imgcat_id, 2, XoopsLocale::S_DATABASE_UPDATED);
                 }
             } else {
                 $category = $helper->getHandlerCategories()->get($obj->getVar('imgcat_id'));
                 if ($category->getVar('imgcat_storetype') === 'db') {
-                    $img = \XoopsBaseConfig::get('url') . '/image.php?id=' . $image_id;
+                    $img = \XoopsBaseConfig::get('url').'/image.php?id='.$image_id;
                 } else {
-                    $img = \XoopsBaseConfig::get('uploads-url') . '/' . $obj->getVar('image_name');
+                    $img = \XoopsBaseConfig::get('uploads-url').'/'.$obj->getVar('image_name');
                 }
                 echo $xoops->confirm(
                     array('op' => 'del', 'ok' => 1, 'image_id' => $image_id, 'imgcat_id' => $obj->getVar('imgcat_id')),
-                    \XoopsBaseConfig::get('url') . '/modules/images/admin/images.php',
+                    \XoopsBaseConfig::get('url').'/modules/images/admin/images.php',
                     sprintf(_AM_IMAGES_IMG_DELETE, $obj->getVar('image_nicename'))
-                    . '<br /><br /><img src="' . $img . '" /><br />'
+                    . '<br /><br /><img src="'.$img.'" /><br />'
                 );
             }
         }
@@ -177,7 +177,7 @@ 
         // Get rights
         $imgcat_write = $gperm_handler->checkRight('imgcat_write', $imgcat_id, $groups, $xoops->module->mid());
         if ($imgcat_write) {
-            $admin_page->addItemButton(_AM_IMAGES_IMG_ADD, 'images.php?op=add&imgcat_id=' . $imgcat_id, 'add');
+            $admin_page->addItemButton(_AM_IMAGES_IMG_ADD, 'images.php?op=add&imgcat_id='.$imgcat_id, 'add');
             $admin_page->renderButton();
         }
 
@@ -198,7 +198,7 @@ 
         $xoops->tpl()->assign('images', $images);
 
         if ($imgcount > 0 && $imgcount > $helper->getConfig('images_pager')) {
-            $nav = new XoopsPageNav($imgcount, $helper->getConfig('images_pager'), $start, 'start', 'imgcat_id=' . $imgcat_id);
+            $nav = new XoopsPageNav($imgcount, $helper->getConfig('images_pager'), $start, 'start', 'imgcat_id='.$imgcat_id);
             $xoops->tpl()->assign('nav_menu', $nav->renderNav());
         }
 

htdocs/modules/images/xoops_version.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 // paypal
 $modversion['paypal']                  = array();
 $modversion['paypal']['business']      = 'xoopsfoundation@gmail.com';
-$modversion['paypal']['item_name']     = 'Donation : ' . _MI_IMAGES_DESC;
+$modversion['paypal']['item_name']     = 'Donation : '._MI_IMAGES_DESC;
 $modversion['paypal']['amount']        = 0;
 $modversion['paypal']['currency_code'] = 'USD';
 

htdocs/modules/images/image.php

Spacing +8 added lines, -8 removed lines

@@ -21,7 +21,7 @@ 
  * @version         $Id$
  */
 
-include dirname(dirname(__DIR__)) . '/mainfile.php';
+include dirname(dirname(__DIR__)).'/mainfile.php';
 $xoops = Xoops::getInstance();
 $xoops->logger()->quiet();
 
@@ -30,21 +30,21 @@ 
 $image_id = Request::getInt('id', 0);
 if (empty($image_id)) {
     header('Content-type: image/gif');
-    readfile(\XoopsBaseConfig::get('root-path') . '/uploads/blank.gif');
+    readfile(\XoopsBaseConfig::get('root-path').'/uploads/blank.gif');
     exit();
 }
 
 $image = $helper->getHandlerImages()->getById($image_id);
 
 if (count($image) != 0) {
-    header('Content-type: ' . $image[$image_id]->getVar('image_mimetype'));
+    header('Content-type: '.$image[$image_id]->getVar('image_mimetype'));
     header('Cache-control: max-age=31536000');
-    header('Expires: ' . gmdate("D, d M Y H:i:s", time() + 31536000) . 'GMT');
-    header('Content-disposition: filename=' . $image[$image_id]->getVar('image_name'));
-    header('Content-Length: ' . strlen($image[$image_id]->getVar('image_body')));
-    header('Last-Modified: ' . gmdate("D, d M Y H:i:s", $image[$image_id]->getVar('image_created')) . 'GMT');
+    header('Expires: '.gmdate("D, d M Y H:i:s", time() + 31536000).'GMT');
+    header('Content-disposition: filename='.$image[$image_id]->getVar('image_name'));
+    header('Content-Length: '.strlen($image[$image_id]->getVar('image_body')));
+    header('Last-Modified: '.gmdate("D, d M Y H:i:s", $image[$image_id]->getVar('image_created')).'GMT');
     echo $image[$image_id]->getVar('image_body');
 } else {
     header('Content-type: image/gif');
-    readfile(\XoopsBaseConfig::get('uploads-path') . '/blank.gif');
+    readfile(\XoopsBaseConfig::get('uploads-path').'/blank.gif');
 }

htdocs/modules/images/preloads/preload.php

Spacing +4 added lines, -4 removed lines

@@ -25,7 +25,7 @@ 
     {
         $path = dirname(__DIR__);
         XoopsLoad::addMap(array(
-            'images' => $path . '/class/helper.php',
+            'images' => $path.'/class/helper.php',
         ));
     }
 
@@ -33,14 +33,14 @@ 
     {
         /* @var $dhtml Xoops\Form\DhtmlTextArea */
         $dhtml = $args[1];
-        $args[0] .= "<img src='" . \XoopsBaseConfig::get('url') . "/images/image.gif' alt='" . XoopsLocale::INSIDE_IMAGE . "' title='" . XoopsLocale::INSIDE_IMAGE . "' onclick='openWithSelfMain(\"" . \XoopsBaseConfig::get('url') . "/modules/images/imagemanager.php?target={$dhtml->getName()}\",\"imgmanager\",400,430);'  onmouseover='style.cursor=\"hand\"'/>&nbsp;";
+        $args[0] .= "<img src='".\XoopsBaseConfig::get('url')."/images/image.gif' alt='".XoopsLocale::INSIDE_IMAGE."' title='".XoopsLocale::INSIDE_IMAGE."' onclick='openWithSelfMain(\"".\XoopsBaseConfig::get('url')."/modules/images/imagemanager.php?target={$dhtml->getName()}\",\"imgmanager\",400,430);'  onmouseover='style.cursor=\"hand\"'/>&nbsp;";
     }
 
     public static function eventCoreImage($args)
     {
         $uri = '';
         foreach (Request::get() as $k => $v) {
-            $uri .=  urlencode($k) . '=' . urlencode($v) . '&';
+            $uri .= urlencode($k).'='.urlencode($v).'&';
         }
         Xoops::getInstance()->redirect("modules/images/image.php?{$uri}", 0);
     }
@@ -49,7 +49,7 @@ 
     {
         $uri = '';
         foreach (Request::get() as $k => $v) {
-            $uri .=  urlencode($k) . '=' . urlencode($v) . '&';
+            $uri .= urlencode($k).'='.urlencode($v).'&';
         }
         Xoops::getInstance()->redirect("modules/images/imagemanager.php?{$uri}", 0);
     }

htdocs/modules/images/language/english/admin.php

Spacing +28 added lines, -28 removed lines

@@ -19,46 +19,46 @@
  * @version         $Id$
  */
 //index.php
-define("_AM_IMAGES_NBCAT","There are <span class='red bold'>%s</span> categories in our database");
-define("_AM_IMAGES_NBIMAGES","There are <span class='red bold'>%s</span> images in our database");
+define("_AM_IMAGES_NBCAT", "There are <span class='red bold'>%s</span> categories in our database");
+define("_AM_IMAGES_NBIMAGES", "There are <span class='red bold'>%s</span> images in our database");
 
 // Common
-define("_AM_IMAGES_ACTIONS","Actions");
-define("_AM_IMAGES_NAME","Name");
-define("_AM_IMAGES_DISPLAY","Display");
-define("_AM_IMAGES_WEIGHT","Display order in image manager:");
-define("_AM_IMAGES_VIEW","View");
+define("_AM_IMAGES_ACTIONS", "Actions");
+define("_AM_IMAGES_NAME", "Name");
+define("_AM_IMAGES_DISPLAY", "Display");
+define("_AM_IMAGES_WEIGHT", "Display order in image manager:");
+define("_AM_IMAGES_VIEW", "View");
 
 // Categories.php
 define("_AM_IMAGES_CAT_ADD", "Add a new category");
-define("_AM_IMAGES_CAT_EDIT","Edit Category");
+define("_AM_IMAGES_CAT_EDIT", "Edit Category");
 define("_AM_IMAGES_CAT_SAVE", "Category saved");
 define("_AM_IMAGES_CAT_NOTSAVE", "Category not saved");
 define("_AM_IMAGES_CAT_DELETE", "Are you sure to delete the category : <span class='bold red'>%s</span><br />and all of its images files?");
 define("_AM_IMAGES_CAT_SELECT", "Select category");
-define("_AM_IMAGES_CAT_NBIMAGES","Images");
-define("_AM_IMAGES_CAT_MAXSIZE","Max size");
-define("_AM_IMAGES_CAT_MAXWIDTH","Max width");
-define("_AM_IMAGES_CAT_MAXHEIGHT","Max height");
-define("_AM_IMAGES_CAT_OFF","Display in image manager");
-define("_AM_IMAGES_CAT_ON","Does not display in image manager");
-define("_AM_IMAGES_CAT_INDB",' Store in the database (as binary "blob" data)');
-define("_AM_IMAGES_CAT_ASFILE"," Store as files (in uploads directory)<br />");
-define("_AM_IMAGES_CAT_NAME","Category Name:");
-define("_AM_IMAGES_CAT_READ_GRP",'Select groups for image manager use:<br /><br /><span style="font-weight: normal;">These are groups allowed to use the image manager for selecting images but not uploading. Webmaster has automatic access.</span>');
-define("_AM_IMAGES_CAT_WRITE_GRP",'Select groups allowed to upload images:<br /><br /><span style="font-weight: normal;">Typical usage is for moderator and admin groups.</span>');
-define("_AM_IMAGES_CAT_DISPLAY","Display this category ?");
-define("_AM_IMAGES_CAT_STR_TYPE","Images are uploaded to:");
-define("_AM_IMAGES_CAT_STR_TYOPENG","This can not be changed afterwards!");
+define("_AM_IMAGES_CAT_NBIMAGES", "Images");
+define("_AM_IMAGES_CAT_MAXSIZE", "Max size");
+define("_AM_IMAGES_CAT_MAXWIDTH", "Max width");
+define("_AM_IMAGES_CAT_MAXHEIGHT", "Max height");
+define("_AM_IMAGES_CAT_OFF", "Display in image manager");
+define("_AM_IMAGES_CAT_ON", "Does not display in image manager");
+define("_AM_IMAGES_CAT_INDB", ' Store in the database (as binary "blob" data)');
+define("_AM_IMAGES_CAT_ASFILE", " Store as files (in uploads directory)<br />");
+define("_AM_IMAGES_CAT_NAME", "Category Name:");
+define("_AM_IMAGES_CAT_READ_GRP", 'Select groups for image manager use:<br /><br /><span style="font-weight: normal;">These are groups allowed to use the image manager for selecting images but not uploading. Webmaster has automatic access.</span>');
+define("_AM_IMAGES_CAT_WRITE_GRP", 'Select groups allowed to upload images:<br /><br /><span style="font-weight: normal;">Typical usage is for moderator and admin groups.</span>');
+define("_AM_IMAGES_CAT_DISPLAY", "Display this category ?");
+define("_AM_IMAGES_CAT_STR_TYPE", "Images are uploaded to:");
+define("_AM_IMAGES_CAT_STR_TYOPENG", "This can not be changed afterwards!");
 
-define('_AM_IMAGES_CAT_SIZE','Max size allowed (bytes):');
-define('_AM_IMAGES_CAT_WIDTH','Max width allowed (pixels):');
-define('_AM_IMAGES_CAT_HEIGHT','Max height allowed (pixels):');
+define('_AM_IMAGES_CAT_SIZE', 'Max size allowed (bytes):');
+define('_AM_IMAGES_CAT_WIDTH', 'Max width allowed (pixels):');
+define('_AM_IMAGES_CAT_HEIGHT', 'Max height allowed (pixels):');
 
 // images.php
 define("_AM_IMAGES_IMG_ADD", "Add a new images");
-define("_AM_IMAGES_IMG_EDIT","Edit Image");
+define("_AM_IMAGES_IMG_EDIT", "Edit Image");
 define("_AM_IMAGES_IMG_SAVE", "Image saved");
-define("_AM_IMAGES_IMG_DELETE","Are you sure to delete the image : <span class='bold red'>%s</span>?");
+define("_AM_IMAGES_IMG_DELETE", "Are you sure to delete the image : <span class='bold red'>%s</span>?");
 define("_AM_IMAGES_IMG_URL", "Image url");
-define('_AM_IMAGES_IMG_FILE','Image file:');
+define('_AM_IMAGES_IMG_FILE', 'Image file:');

htdocs/modules/images/class/form/category_imagemanager.php

Spacing +2 added lines, -2 removed lines

@@ -38,9 +38,9 @@
         $select->addOption(0, _AM_IMAGES_CAT_SELECT);
         $select->addOptionArray($categories);
         if (isset($target)) {
-            $select->setExtra("onchange='javascript:window.location.href=\"" . $xoops->getEnv('PHP_SELF') . "?target=" . $target . "&imgcat_id=\" + this.value'");
+            $select->setExtra("onchange='javascript:window.location.href=\"".$xoops->getEnv('PHP_SELF')."?target=".$target."&imgcat_id=\" + this.value'");
         } else {
-            $select->setExtra("onchange='javascript:window.location.href=\"" . $xoops->getEnv('PHP_SELF') . "?imgcat_id=\" + this.value'");
+            $select->setExtra("onchange='javascript:window.location.href=\"".$xoops->getEnv('PHP_SELF')."?imgcat_id=\" + this.value'");
         }
         $this->addElement($select);