mambax7 / extgallery

class/GroupFormCheckBox.php

Spacing +3 added lines, -3 removed lines

@@ -62,12 +62,12 @@
         $option_ids = [];
         foreach (array_keys($this->_optionTree) as $id) {
             if (!empty($id)) {
-                $option_ids[] = '\'' . $ele_name . '[groups][' . $this->_groupId . '][' . $id . ']' . '\'';
+                $option_ids[] = '\''.$ele_name.'[groups]['.$this->_groupId.']['.$id.']'.'\'';
             }
         }
-        $checkallbtn_id = $ele_name . '[checkallbtn][' . $this->_groupId . ']';
+        $checkallbtn_id = $ele_name.'[checkallbtn]['.$this->_groupId.']';
         $option_ids_str = implode(', ', $option_ids);
-        echo _ALL . ' <input id="' . $checkallbtn_id . '" type="checkbox" value="" onclick="var optionids = new Array(' . $option_ids_str . "); xoopsCheckAllElements(optionids, '" . $checkallbtn_id . '\');">';
+        echo _ALL.' <input id="'.$checkallbtn_id.'" type="checkbox" value="" onclick="var optionids = new Array('.$option_ids_str."); xoopsCheckAllElements(optionids, '".$checkallbtn_id.'\');">';
         echo '</td></tr></table>';
     }
 }

class/PhotoUploader.php

Spacing +4 added lines, -4 removed lines

@@ -93,8 +93,8 @@ 
         }
 
         $dstdir  = $this->uploadDir;
-        $dstname = $dstdir . '/juvar.' . session_id();
-        $tmpname = $dstdir . '/juvar.tmp' . session_id();
+        $dstname = $dstdir.'/juvar.'.session_id();
+        $tmpname = $dstdir.'/juvar.tmp'.session_id();
 
         if (!move_uploaded_file($file['tmp_name'], $tmpname)) {
             $this->abort('Unable to move uploaded file');
@@ -104,7 +104,7 @@ 
 
         if ($jupart) {
             // got a chunk of a multi-part upload
-            $len                       = filesize($tmpname);
+            $len = filesize($tmpname);
             $_SESSION['juvar.tmpsize'] += $len;
             if ($len > 0) {
                 $src = fopen($tmpname, 'rb');
@@ -184,7 +184,7 @@ 
     public function _saveFile($tmpDestination, $fileName)
     {
         $this->savedFilename    = $fileName;
-        $this->savedDestination = $this->uploadDir . $fileName;
+        $this->savedDestination = $this->uploadDir.$fileName;
 
         if (!$this->_checkFile($tmpDestination)) {
             return false;

class/plugins/plugin.tag.php

Indentation +16 added lines, -16 removed lines

@@ -61,23 +61,23 @@
     if (version_compare(mysqli_get_server_info($XoopsDB->conn), '4.1.0', 'ge')):
 
         $sql = "    DELETE FROM {$linkHandler->table}"
-               . '    WHERE '
-               . "        tag_modid = {$mid}"
-               . '        AND '
-               . '        ( tag_itemid NOT IN '
-               . "            ( SELECT DISTINCT {$itemHandler->keyName} "
-               . "                FROM {$itemHandler->table} "
-               . "                WHERE {$itemHandler->table}.photo_approved > 0"
-               . '            ) '
-               . '        )'; else:
+                . '    WHERE '
+                . "        tag_modid = {$mid}"
+                . '        AND '
+                . '        ( tag_itemid NOT IN '
+                . "            ( SELECT DISTINCT {$itemHandler->keyName} "
+                . "                FROM {$itemHandler->table} "
+                . "                WHERE {$itemHandler->table}.photo_approved > 0"
+                . '            ) '
+                . '        )'; else:
         $sql = "    DELETE {$linkHandler->table} FROM {$linkHandler->table}"
-               . "    LEFT JOIN {$itemHandler->table} AS aa ON {$linkHandler->table}.tag_itemid = aa.{$itemHandler->keyName} "
-               . '    WHERE '
-               . "        tag_modid = {$mid}"
-               . '        AND '
-               . "        ( aa.{$itemHandler->keyName} IS NULL"
-               . '            OR aa.photo_approved < 1'
-               . '        )';
+                . "    LEFT JOIN {$itemHandler->table} AS aa ON {$linkHandler->table}.tag_itemid = aa.{$itemHandler->keyName} "
+                . '    WHERE '
+                . "        tag_modid = {$mid}"
+                . '        AND '
+                . "        ( aa.{$itemHandler->keyName} IS NULL"
+                . '            OR aa.photo_approved < 1'
+                . '        )';
     endif;
     if (!$result = $linkHandler->db->queryF($sql)) {
         //xoops_error($linkHandler->db->error());

Spacing +2 added lines, -2 removed lines

@@ -24,12 +24,12 @@
 
     /** @var Extgallery\PublicPhotoHandler $itemHandler */
     $itemHandler = Extgallery\Helper::getInstance()->getHandler('PublicPhoto');
-    $items_obj   = $itemHandler->getObjects(new \Criteria('photo_id', '(' . implode(', ', $items_id) . ')', 'IN'), true);
+    $items_obj   = $itemHandler->getObjects(new \Criteria('photo_id', '('.implode(', ', $items_id).')', 'IN'), true);
 
     foreach (array_keys($items) as $cat_id) {
         foreach (array_keys($items[$cat_id]) as $item_id) {
             if (isset($items_obj[$item_id])) {
-                $item_obj                 =& $items_obj[$item_id];
+                $item_obj                 = & $items_obj[$item_id];
                 $items[$cat_id][$item_id] = [
                     'title'   => $item_obj->getVar('photo_title'),
                     'uid'     => $item_obj->getVar('uid'),

Braces +3 added lines, -1 removed lines

@@ -69,7 +69,8 @@ 
                . "                FROM {$itemHandler->table} "
                . "                WHERE {$itemHandler->table}.photo_approved > 0"
                . '            ) '
-               . '        )'; else:
+               . '        )'; else {
+                   :
         $sql = "    DELETE {$linkHandler->table} FROM {$linkHandler->table}"
                . "    LEFT JOIN {$itemHandler->table} AS aa ON {$linkHandler->table}.tag_itemid = aa.{$itemHandler->keyName} "
                . '    WHERE '
@@ -78,6 +79,7 @@ 
                . "        ( aa.{$itemHandler->keyName} IS NULL"
                . '            OR aa.photo_approved < 1'
                . '        )';
+               }
     endif;
     if (!$result = $linkHandler->db->queryF($sql)) {
         //xoops_error($linkHandler->db->error());

view.tag.php

Spacing +2 added lines, -2 removed lines

@@ -16,5 +16,5 @@
  */
 
 //todo: check this file
-include __DIR__ . '/header.php';
-require_once XOOPS_ROOT_PATH . '/modules/tag/view.tag.php';
+include __DIR__.'/header.php';
+require_once XOOPS_ROOT_PATH.'/modules/tag/view.tag.php';

hook-photo.php

Spacing +6 added lines, -6 removed lines

@@ -19,8 +19,8 @@ 
 
 use XoopsModules\Extgallery;
 
-include __DIR__ . '/header.php';
-require_once XOOPS_ROOT_PATH . '/modules/extgallery/class/publicPerm.php';
+include __DIR__.'/header.php';
+require_once XOOPS_ROOT_PATH.'/modules/extgallery/class/publicPerm.php';
 
 $photoId = \Xmf\Request::getInt('id', 0, 'GET');
 
@@ -51,16 +51,16 @@ 
 // If require image don't exist
 if (0 == $photo->getVar('cat_id')) {
     header('Content-type: image/jpeg');
-    readfile(XOOPS_ROOT_PATH . '/modules/extgallery/assets/images/dont-exist.jpg');
+    readfile(XOOPS_ROOT_PATH.'/modules/extgallery/assets/images/dont-exist.jpg');
 
 // If user is allowed to view this picture
 } elseif ($permHandler->isAllowed($xoopsUser, 'public_access', $photo->getVar('cat_id'))) {
     $photo = $photoHandler->objectToArray($photo);
-    header('Content-type: ' . $type . '');
-    readfile(XOOPS_ROOT_PATH . '/uploads/extgallery/public-photo/medium/' . $photo['photo_name']);
+    header('Content-type: '.$type.'');
+    readfile(XOOPS_ROOT_PATH.'/uploads/extgallery/public-photo/medium/'.$photo['photo_name']);
 
 // If user isn't allowed to view this picture
 } else {
     header('Content-type: image/jpeg');
-    readfile(XOOPS_ROOT_PATH . '/modules/extgallery/assets/images/not-allowed.jpg');
+    readfile(XOOPS_ROOT_PATH.'/modules/extgallery/assets/images/not-allowed.jpg');
 }

public-album.php

Spacing +9 added lines, -9 removed lines

@@ -18,15 +18,15 @@ 
 
 use XoopsModules\Extgallery;
 
-include __DIR__ . '/header.php';
-require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+include __DIR__.'/header.php';
+require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
 //require_once XOOPS_ROOT_PATH . '/modules/extgallery/class/publicPerm.php';
 
 /** @var Extgallery\Helper $helper */
 $helper = Extgallery\Helper::getInstance();
 
 $GLOBALS['xoopsOption']['template_main'] = 'extgallery_public-album.tpl';
-include XOOPS_ROOT_PATH . '/header.php';
+include XOOPS_ROOT_PATH.'/header.php';
 
 if (!isset($_GET['id'])) {
     $catId = 0;
@@ -58,7 +58,7 @@ 
     $orderby = $GLOBALS['xoopsModuleConfig']['display_set_order'];
 }
 
-$SortbyOrderby = $sortby . ' ' . $orderby;
+$SortbyOrderby = $sortby.' '.$orderby;
 
 /**
  * @param $SortbyOrderby
@@ -115,7 +115,7 @@ 
 $catObj = $catHandler->getCat($catId);
 
 if (null === $catObj) {
-    include XOOPS_ROOT_PATH . '/footer.php';
+    include XOOPS_ROOT_PATH.'/footer.php';
     exit;
 }
 
@@ -157,7 +157,7 @@ 
 $xoopsTpl->assign('photos', $photos);
 /** @var xos_opal_Theme $xoTheme */
 
-$pageNav = new \XoopsPageNav($photoHandler->getAlbumCount($catId), $helper->getConfig('nb_column') * $helper->getConfig('nb_line'), $start, 'start', 'id=' . $catId . '&orderby=' . $orderby . '&sortby=' . $sortby); //xoops - blueteen - tri de l'affichage
+$pageNav = new \XoopsPageNav($photoHandler->getAlbumCount($catId), $helper->getConfig('nb_column') * $helper->getConfig('nb_line'), $start, 'start', 'id='.$catId.'&orderby='.$orderby.'&sortby='.$sortby); //xoops - blueteen - tri de l'affichage
 $xoopsTpl->assign('pageNav', $pageNav->renderNav());
 if (isset($catObj)) {
     $xoopsTpl->assign('xoops_pagetitle', $catObj->getVar('cat_name'));
@@ -201,7 +201,7 @@ 
 $attributes['rel']   = $rel;
 $attributes['type']  = 'application/rss+xml';
 $attributes['title'] = _MD_EXTGALLERY_RSS;
-$attributes['href']  = XOOPS_URL . '/modules/extgallery/public-rss.php';
+$attributes['href']  = XOOPS_URL.'/modules/extgallery/public-rss.php';
 $xoTheme->addMeta('link', $rel, $attributes);
 $xoTheme->addStylesheet('modules/extgallery/assets/css/style.css');
 
@@ -220,7 +220,7 @@ 
 
 $xoopsTpl->assign('extgalleryID', $catId); //xoops - blueteen - tri de l'affichage
 $xoopsTpl->assign('extgalleryStart', $start); //xoops -blueteen - tri de l'affichage
-$xoopsTpl->assign('extgallerySortbyOrderby', _MD_EXTGALLERY_ORDERBY . convertorderbytrans($SortbyOrderby)); //xoops - blueteen - tri de l'affichage
+$xoopsTpl->assign('extgallerySortbyOrderby', _MD_EXTGALLERY_ORDERBY.convertorderbytrans($SortbyOrderby)); //xoops - blueteen - tri de l'affichage
 
 //DNPROSSI - VOLTAN - added preferences option
 //  enable_info, enable_submitter_lnk, enable_photo_hits
@@ -268,4 +268,4 @@ 
 $xoopsTpl->assign('album_prettyphoto_slidspeed', $helper->getConfig('album_prettyphoto_slidspe'));
 $xoopsTpl->assign('album_prettyphoto_autoplay', $helper->getConfig('album_prettyphoto_autopla'));
 
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

public-photo.php

Spacing +9 added lines, -9 removed lines

@@ -18,10 +18,10 @@ 
 use Xmf\Request;
 use XoopsModules\Extgallery;
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 $GLOBALS['xoopsOption']['template_main'] = 'extgallery_public-photo.tpl';
-include XOOPS_ROOT_PATH . '/header.php';
+include XOOPS_ROOT_PATH.'/header.php';
 
 /** @var Extgallery\Helper $helper */
 $helper = Extgallery\Helper::getInstance();
@@ -55,7 +55,7 @@ 
 }
 
 // Don't update counter if user come from rating page
-if (null !== (Request::getString('HTTP_REFERER', '', 'SERVER')) && basename(Request::getString('HTTP_REFERER', '', 'SERVER')) != 'public-rating.php?photoId=' . $photoId) {
+if (null !== (Request::getString('HTTP_REFERER', '', 'SERVER')) && basename(Request::getString('HTTP_REFERER', '', 'SERVER')) != 'public-rating.php?photoId='.$photoId) {
     $photoHandler->updateHits($photoId);
 }
 
@@ -98,14 +98,14 @@ 
 $xoopsTpl->assign('totalPhoto', $nbPhoto);
 
 //DNPROSSI - changed photo_desc to photo_title
-$xoopsTpl->assign('xoops_pagetitle', $photo['photo_title'] . ' - ' . $cat['cat_name']);
-$xoTheme->addMeta('meta', 'description', $photo['photo_title'] . ' - ' . $cat['cat_desc']);
+$xoopsTpl->assign('xoops_pagetitle', $photo['photo_title'].' - '.$cat['cat_name']);
+$xoTheme->addMeta('meta', 'description', $photo['photo_title'].' - '.$cat['cat_desc']);
 
 $rel                 = 'alternate';
 $attributes['rel']   = $rel;
 $attributes['type']  = 'application/rss+xml';
 $attributes['title'] = _MD_EXTGALLERY_RSS;
-$attributes['href']  = XOOPS_URL . '/modules/extgallery/public-rss.php';
+$attributes['href']  = XOOPS_URL.'/modules/extgallery/public-rss.php';
 $xoTheme->addMeta('link', $rel, $attributes);
 $xoTheme->addStylesheet('modules/extgallery/assets/css/style.css');
 
@@ -179,12 +179,12 @@ 
 
 // For xoops tag
 if ((1 == $helper->getConfig('usetag')) && is_dir('../tag')) {
-    require_once XOOPS_ROOT_PATH . '/modules/tag/include/tagbar.php';
+    require_once XOOPS_ROOT_PATH.'/modules/tag/include/tagbar.php';
     $xoopsTpl->assign('tagbar', tagBar($photo['photo_id'], $catid = 0));
     $xoopsTpl->assign('tags', true);
 } else {
     $xoopsTpl->assign('tags', false);
 }
 
-include XOOPS_ROOT_PATH . '/include/comment_view.php';
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/include/comment_view.php';
+include XOOPS_ROOT_PATH.'/footer.php';

comment_new.php

Spacing +2 added lines, -2 removed lines

@@ -17,7 +17,7 @@ 
 
 use XoopsModules\Extgallery;
 
-include  dirname(dirname(__DIR__)) . '/mainfile.php';
+include  dirname(dirname(__DIR__)).'/mainfile.php';
 
 $com_itemid = \Xmf\Request::getInt('com_itemid', 0, 'GET');
 if ($com_itemid > 0) {
@@ -31,5 +31,5 @@ 
         $title = $photo->getVar('photo_desc');
     }
     $com_replytitle = $title;
-    require_once XOOPS_ROOT_PATH . '/include/comment_new.php';
+    require_once XOOPS_ROOT_PATH.'/include/comment_new.php';
 }

public-download.php

Switch Indentation +15 added lines, -15 removed lines

@@ -32,21 +32,21 @@
 }
 
 switch (strtolower(strrchr($photo->getVar('photo_name'), '.'))) {
-    case '.png':
-        $type = 'image/png';
-        break;
-    case '.gif':
-        $type = 'image/gif';
-        break;
-    case '.jpg':
-        $type = 'image/jpeg';
-        break;
-    case '.jpeg':
-        $type = 'image/jpeg';
-        break;
-    default:
-        $type = 'application/octet-stream';
-        break;
+        case '.png':
+            $type = 'image/png';
+            break;
+        case '.gif':
+            $type = 'image/gif';
+            break;
+        case '.jpg':
+            $type = 'image/jpeg';
+            break;
+        case '.jpeg':
+            $type = 'image/jpeg';
+            break;
+        default:
+            $type = 'application/octet-stream';
+            break;
 }
 
 header('Content-Type: ' . $type . '');

Spacing +8 added lines, -8 removed lines

@@ -17,7 +17,7 @@ 
 
 use XoopsModules\Extgallery;
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 //require_once XOOPS_ROOT_PATH . '/modules/extgallery/class/publicPerm.php';
 
 $photoId = \Xmf\Request::getInt('id', 0, 'GET');
@@ -49,8 +49,8 @@ 
         break;
 }
 
-header('Content-Type: ' . $type . '');
-header('Content-Disposition: attachment; filename="' . $photo->getVar('photo_name') . '"');
+header('Content-Type: '.$type.'');
+header('Content-Disposition: attachment; filename="'.$photo->getVar('photo_name').'"');
 
 //if ($photo->getVar('photo_havelarge')) {
 //    if ($permHandler->isAllowed($GLOBALS['xoopsUser'], 'public_download_original', $photo->getVar('cat_id')) && $photo->getVar('photo_orig_name') != "") {
@@ -64,19 +64,19 @@ 
 
 if ($permHandler->isAllowed($GLOBALS['xoopsUser'], 'public_download_original', $photo->getVar('cat_id'))
     && '' != $photo->getVar('photo_orig_name')) {
-    $photoName = 'original/' . $photo->getVar('photo_orig_name');
+    $photoName = 'original/'.$photo->getVar('photo_orig_name');
 } else {
     if ($photo->getVar('photo_havelarge')) {
-        $photoName = 'large/large_' . $photo->getVar('photo_name');
+        $photoName = 'large/large_'.$photo->getVar('photo_name');
     } else {
-        $photoName = 'medium/' . $photo->getVar('photo_name');
+        $photoName = 'medium/'.$photo->getVar('photo_name');
     }
 }
 
 $photoHandler->updateDownload($photoId);
 
 if ('' == $photo->getVar('photo_serveur')) {
-    readfile(XOOPS_ROOT_PATH . '/uploads/extgallery/public-photo/' . $photoName);
+    readfile(XOOPS_ROOT_PATH.'/uploads/extgallery/public-photo/'.$photoName);
 } else {
-    readfile($photo->getVar('photo_serveur') . $photoName);
+    readfile($photo->getVar('photo_serveur').$photoName);
 }