phpffcms / ffcms

Apps/Controller/Api/Main.php

Unused Use Statements -1 removed lines

@@ -10,7 +10,6 @@
 use Ffcms\Core\Exception\ForbiddenException;
 use Ffcms\Core\Helper\FileSystem\File;
 use Ffcms\Core\Helper\Type\Str;
-use Ffcms\Core\Helper\Url;
 
 class Main extends ApiController
 {

Spacing +4 added lines, -4 removed lines

@@ -38,8 +38,8 @@ 
             'roots' => [
                 [
                     'driver' => 'LocalFileSystem',
-                    'path' => root . '/upload/',
-                    'URL' => App::$Alias->scriptUrl . '/upload/'
+                    'path' => root.'/upload/',
+                    'URL' => App::$Alias->scriptUrl.'/upload/'
                 ]
             ]
         ]));
@@ -104,9 +104,9 @@ 
     {
         $this->setJsonHeader();
         // get ffcms news if cache is not available
-        $cache = App::$Cache->getItem('download.ffcms.api.news.' . $this->lang);
+        $cache = App::$Cache->getItem('download.ffcms.api.news.'.$this->lang);
         if ($cache->isHit()) {
-            $cache->set(File::getFromUrl('https://ffcms.org/api/api/news?lang=' . $this->lang))
+            $cache->set(File::getFromUrl('https://ffcms.org/api/api/news?lang='.$this->lang))
                 ->expiresAfter(1440);
         }
         $news = $cache->get();

Apps/Model/Admin/Content/FormContentUpdate.php

Unused Use Statements -1 removed lines

@@ -11,7 +11,6 @@
 use Ffcms\Core\Helper\FileSystem\Directory;
 use Ffcms\Core\Helper\FileSystem\File;
 use Ffcms\Core\Helper\Type\Any;
-use Ffcms\Core\Helper\Type\Obj;
 use Ffcms\Core\Helper\Type\Str;
 
 /**

Spacing +11 added lines, -11 removed lines

@@ -59,7 +59,7 @@ 
         if ($this->_content->id === null) {
             $this->_new = true;
             if (!$this->galleryFreeId) {
-                $this->galleryFreeId = '_tmp_' . Str::randomLatin(mt_rand(16, 32));
+                $this->galleryFreeId = '_tmp_'.Str::randomLatin(mt_rand(16, 32));
             }
 
             if (!$this->authorId) {
@@ -94,8 +94,8 @@ 
     public function rules(): array
     {
         $res = [
-            ['title.' . App::$Request->getLanguage(), 'required'],
-            ['text.' . App::$Request->getLanguage(), 'required'],
+            ['title.'.App::$Request->getLanguage(), 'required'],
+            ['text.'.App::$Request->getLanguage(), 'required'],
             ['text', 'used'],
             ['path', 'reverse_match', '/[\/\'~`\!@#\$%\^&\*\(\)+=\{\}\[\]\|;:"\<\>,\?\\\]/'],
             [['path', 'categoryId', 'authorId', 'display', 'galleryFreeId', 'title', 'important'], 'required'],
@@ -108,9 +108,9 @@ 
         ];
 
         foreach (App::$Properties->get('languages') as $lang) {
-            $res[] = ['title.' . $lang, 'length_max', 120, null, true, true];
-            $res[] = ['keywords.' . $lang, 'length_max', 150];
-            $res[] = ['description.' . $lang, 'length_max', 250];
+            $res[] = ['title.'.$lang, 'length_max', 120, null, true, true];
+            $res[] = ['keywords.'.$lang, 'length_max', 150];
+            $res[] = ['description.'.$lang, 'length_max', 250];
         }
 
         return $res;
@@ -166,10 +166,10 @@ 
         $this->_content->meta_keywords = $this->metaKeywords;
         $this->_content->meta_description = $this->metaDescription;
         $this->_content->source = $this->source;
-        $this->_content->important = (int)$this->important;
+        $this->_content->important = (int) $this->important;
         // check if rating is changed
-        if ((int)$this->addRating !== 0) {
-            $this->_content->rating += (int)$this->addRating;
+        if ((int) $this->addRating !== 0) {
+            $this->_content->rating += (int) $this->addRating;
         }
         // check if special comment hash is exist
         if ($this->_new || Str::length($this->_content->comment_hash) < 32) {
@@ -182,7 +182,7 @@ 
         }
 
         // save poster data
-        $posterPath = '/upload/gallery/' . $this->galleryFreeId . '/orig/' . $this->poster;
+        $posterPath = '/upload/gallery/'.$this->galleryFreeId.'/orig/'.$this->poster;
         if (File::exist($posterPath)) {
             $this->_content->poster = $this->poster;
         }
@@ -217,7 +217,7 @@ 
 
         // move files
         if ($tmpGalleryId !== $this->_content->id) {
-            Directory::rename('/upload/gallery/' . $tmpGalleryId, $this->_content->id);
+            Directory::rename('/upload/gallery/'.$tmpGalleryId, $this->_content->id);
         }
     }
 

Apps/Model/Admin/Main/FormUpdateDatabase.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use Apps\ActiveRecord\System;
 use Ffcms\Core\Arch\Model;
-use Ffcms\Core\Helper\FileSystem\File;
 use Ffcms\Core\Helper\Type\Str;
 use Ffcms\Core\Managers\MigrationsManager;
 

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
             $name = Str::firstIn($fullName, '-');
             // get update version number from migration name
             list($type, $obj, $version) = explode('_', $name);
-            $intVersion = (int)Str::replace('.', '', $this->dbVersion);
+            $intVersion = (int) Str::replace('.', '', $this->dbVersion);
             // if migration version > db version - implement it
             if ($version > $intVersion) {
                 $this->updateQueries[] = $file;

Apps/Model/Admin/User/FormUserUpdate.php

Unused Use Statements -1 removed lines

@@ -8,7 +8,6 @@
 use Ffcms\Core\App;
 use Ffcms\Core\Arch\Model;
 use Ffcms\Core\Helper\Type\Any;
-use Ffcms\Core\Helper\Type\Obj;
 use Ffcms\Core\Helper\Type\Str;
 use Ffcms\Core\Interfaces\iUser;
 

Apps/Model/Front/Content/EntityContentRead.php

Unused Use Statements -1 removed lines

@@ -12,7 +12,6 @@
 use Ffcms\Core\Helper\FileSystem\File;
 use Ffcms\Core\Helper\Type\Any;
 use Ffcms\Core\Helper\Type\Arr;
-use Ffcms\Core\Helper\Type\Obj;
 use Ffcms\Core\Helper\Type\Str;
 
 /**

Indentation +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
     /**
      * Prepare model attributes from passed objects
      * @throws ForbiddenException
-    */
+     */
     public function before()
     {
         $this->id = $this->_content->id;

Spacing +9 added lines, -9 removed lines

@@ -72,7 +72,7 @@ 
         $this->id = $this->_content->id;
         $this->title = $this->_content->getLocaled('title');
         $this->text = $this->_content->getLocaled('text');
-        $this->display = (bool)$this->_content->display;
+        $this->display = (bool) $this->_content->display;
 
         // check if title and text are exists
         if (Str::length($this->title) < 1 || Str::length($this->text) < 1) {
@@ -102,7 +102,7 @@ 
         }
 
         $this->source = $this->_content->source;
-        $this->views = $this->_content->views+1;
+        $this->views = $this->_content->views + 1;
         // check for dependence, add '' for general cat, ex: general/depend1/depend2/.../depend-n
         $catNestingArray = Arr::merge([0 => ''], explode('/', $this->catPath));
         if ($catNestingArray > 1) {
@@ -134,15 +134,15 @@ 
         ];
 
         // get gallery images and poster data
-        $galleryPath = '/upload/gallery/' . $this->_content->id;
+        $galleryPath = '/upload/gallery/'.$this->_content->id;
         // check if gallery folder is exist
         if (Directory::exist($galleryPath)) {
-            $originImages = File::listFiles($galleryPath . '/orig/', ['.jpg', '.png', '.gif', '.jpeg', '.bmp', '.webp'], true);
+            $originImages = File::listFiles($galleryPath.'/orig/', ['.jpg', '.png', '.gif', '.jpeg', '.bmp', '.webp'], true);
             // generate poster data
             if (Arr::in($this->_content->poster, $originImages)) {
                 // original poster
                 $posterName = $this->_content->poster;
-                $this->posterFull = $galleryPath . '/orig/' . $posterName;
+                $this->posterFull = $galleryPath.'/orig/'.$posterName;
                 if (!File::exist($this->posterFull)) {
                     $this->posterFull = null;
                 }
@@ -151,7 +151,7 @@ 
                 $posterSplit = explode('.', $posterName);
                 array_pop($posterSplit);
                 $posterCleanName = implode('.', $posterSplit);
-                $this->posterThumb = $galleryPath . '/thumb/' . $posterCleanName . '.jpg';
+                $this->posterThumb = $galleryPath.'/thumb/'.$posterCleanName.'.jpg';
                 if (!File::exist($this->posterThumb)) {
                     $this->posterThumb = null;
                 }
@@ -167,9 +167,9 @@ 
                     continue;
                 }
 
-                $thumbPath = $galleryPath . '/thumb/' . $imageClearName . '.jpg';
+                $thumbPath = $galleryPath.'/thumb/'.$imageClearName.'.jpg';
                 if (File::exist($thumbPath)) {
-                    $this->galleryItems[$thumbPath] = $galleryPath . '/orig/' . $image;
+                    $this->galleryItems[$thumbPath] = $galleryPath.'/orig/'.$image;
                 }
             }
         }
@@ -178,7 +178,7 @@ 
         $this->rating = $this->_content->rating;
         $ignoredRate = App::$Session->get('content.rate.ignore');
         $this->canRate = true;
-        if (Any::isArray($ignoredRate) && Arr::in((string)$this->id, $ignoredRate)) {
+        if (Any::isArray($ignoredRate) && Arr::in((string) $this->id, $ignoredRate)) {
             $this->canRate = false;
         }
         if (!App::$User->isAuth()) {

Apps/Model/Front/Content/EntityContentSearch.php

Doc Comments +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
     /**
      * EntityContentSearch constructor. Pass search terms (query string) to model and used items to skip it by id.
      * @param $terms
-     * @param int|array $skipIds
+     * @param integer $skipIds
      * @param int|null $categoryId
      */
     public function __construct($terms, $skipIds = 0, $categoryId = null)

Unused Use Statements -1 removed lines

@@ -8,7 +8,6 @@
 use Ffcms\Core\Exception\NotFoundException;
 use Ffcms\Core\Helper\Text;
 use Ffcms\Core\Helper\Type\Any;
-use Ffcms\Core\Helper\Type\Obj;
 use Ffcms\Core\Helper\Type\Str;
 
 /**

Spacing +2 added lines, -2 removed lines

@@ -61,7 +61,7 @@ 
 
         $index = implode('-', $this->_skip);
         // try to get this slow query from cache
-        $cache = App::$Cache->getItem('entity.content.search.index.' . $index);
+        $cache = App::$Cache->getItem('entity.content.search.index.'.$index);
         if (!$cache->isHit()) {
             $cache->set($this->makeSearch());
             $cache->expiresAfter(static::CACHE_TIME);
@@ -94,7 +94,7 @@ 
             $this->items[] = [
                 'title' => $item->getLocaled('title'),
                 'snippet' => Text::snippet($text),
-                'uri' => '/content/read/' . $item->getPath(),
+                'uri' => '/content/read/'.$item->getPath(),
                 'thumb' => $item->getPosterThumbUri()
             ];
         }

Apps/Model/Front/Content/FormNarrowContentUpdate.php

Unused Use Statements -1 removed lines

@@ -9,7 +9,6 @@
 use Ffcms\Core\Helper\FileSystem\Directory;
 use Ffcms\Core\Helper\FileSystem\Normalize;
 use Ffcms\Core\Helper\Type\Any;
-use Ffcms\Core\Helper\Type\Obj;
 use Ffcms\Core\Helper\Type\Str;
 use Gregwar\Image\Image;
 

Indentation +8 added lines, -8 removed lines

@@ -44,8 +44,8 @@ 
     }
 
     /**
-    * Set default values from database record
-    */
+     * Set default values from database record
+     */
     public function before()
     {
         // set data from db record
@@ -85,9 +85,9 @@ 
     }
 
     /**
-    * Form labels
-    * @return array
-    */
+     * Form labels
+     * @return array
+     */
     public function labels(): array
     {
         return [
@@ -100,9 +100,9 @@ 
     }
 
     /**
-    * Content update form validation rules
-    * @return array
-    */
+     * Content update form validation rules
+     * @return array
+     */
     public function rules(): array
     {
         $r = [

Spacing +17 added lines, -17 removed lines

@@ -57,13 +57,13 @@ 
         // set current user id
         $this->authorId = App::$User->identity()->getId();
         // set true if it is a new content item
-        if ($this->_record->id === null || (int)$this->_record->id < 1) {
+        if ($this->_record->id === null || (int) $this->_record->id < 1) {
             $this->_new = true;
         }
 
         // set random path slug if not defined
         if ($this->path === null || Str::likeEmpty($this->path)) {
-            $randPath = date('d-m-Y') . '-' . Str::randomLatin(mt_rand(8, 12));
+            $randPath = date('d-m-Y').'-'.Str::randomLatin(mt_rand(8, 12));
             $this->path = Str::lowerCase($randPath);
         }
     }
@@ -107,21 +107,21 @@ 
     {
         $r = [
             [['path', 'categoryId'], 'required'],
-            ['title.' . App::$Request->getLanguage(), 'required'],
-            ['text.' . App::$Request->getLanguage(), 'required', null, true, true],
+            ['title.'.App::$Request->getLanguage(), 'required'],
+            ['text.'.App::$Request->getLanguage(), 'required', null, true, true],
             ['text', 'used', null, true, true],
             ['path', 'direct_match', '/^[a-zA-Z0-9\-]+$/'],
             ['categoryId', 'in', $this->categoryIds()],
             ['path', 'Apps\Model\Front\Content\FormNarrowContentUpdate::validatePath'],
             ['poster', 'used'],
             ['poster', 'isFile', ['jpg', 'png', 'gif', 'jpeg']],
-            ['poster', 'sizeFile', (int)$this->_configs['gallerySize'] * 1024] // in bytes
+            ['poster', 'sizeFile', (int) $this->_configs['gallerySize'] * 1024] // in bytes
         ];
 
         foreach (App::$Properties->get('languages') as $lang) {
-            $r[] = ['title.' . $lang, 'length_max', 120, null, true, true];
-            $r[] = ['keywords.' . $lang, 'length_max', 150];
-            $r[] = ['description.' . $lang, 'length_max', 250];
+            $r[] = ['title.'.$lang, 'length_max', 120, null, true, true];
+            $r[] = ['keywords.'.$lang, 'length_max', 150];
+            $r[] = ['description.'.$lang, 'length_max', 250];
         }
 
         return $r;
@@ -147,9 +147,9 @@ 
         $this->_record->title = $this->title;
         $this->_record->text = $this->text;
         $this->_record->path = $this->path;
-        $this->_record->category_id = (int)$this->categoryId;
+        $this->_record->category_id = (int) $this->categoryId;
         $this->_record->display = 0; // set to premoderation
-        $this->_record->author_id = (int)$this->authorId;
+        $this->_record->author_id = (int) $this->authorId;
         if ($this->_new) {
             $this->_record->comment_hash = $this->generateCommentHash();
         }
@@ -159,8 +159,8 @@ 
         // work with poster data
         if ($this->poster !== null) {
             // lets move poster from tmp to gallery
-            $originDir = '/upload/gallery/' . $this->_record->id . '/orig/';
-            $thumbDir = '/upload/gallery/' . $this->_record->id . '/thumb/';
+            $originDir = '/upload/gallery/'.$this->_record->id.'/orig/';
+            $thumbDir = '/upload/gallery/'.$this->_record->id.'/thumb/';
             if (!Directory::exist($originDir)) {
                 Directory::create($originDir);
             }
@@ -169,17 +169,17 @@ 
                 Directory::create($thumbDir);
             }
 
-            $fileName = App::$Security->simpleHash($this->poster->getClientOriginalName() . $this->poster->getSize());
-            $newFullName = $fileName . '.' . $this->poster->guessExtension();
+            $fileName = App::$Security->simpleHash($this->poster->getClientOriginalName().$this->poster->getSize());
+            $newFullName = $fileName.'.'.$this->poster->guessExtension();
             // move poster to upload gallery directory
             $this->poster->move(Normalize::diskFullPath($originDir), $newFullName);
             // initialize image resizer
             $thumb = new Image();
-            $thumb->setCacheDir(root . '/Private/Cache/images');
+            $thumb->setCacheDir(root.'/Private/Cache/images');
 
             // open original file, resize it and save
-            $thumbSaveName = Normalize::diskFullPath($thumbDir) . '/' . $fileName . '.jpg';
-            $thumb->open(Normalize::diskFullPath($originDir) . DIRECTORY_SEPARATOR . $newFullName)
+            $thumbSaveName = Normalize::diskFullPath($thumbDir).'/'.$fileName.'.jpg';
+            $thumb->open(Normalize::diskFullPath($originDir).DIRECTORY_SEPARATOR.$newFullName)
                 ->cropResize($this->_configs['galleryResize'])
                 ->save($thumbSaveName, 'jpg', 90);
             $thumb = null;

Apps/Model/Install/Main/FormInstall.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace Apps\Model\Install\Main;
 
-use Apps\ActiveRecord\Migration;
 use Apps\ActiveRecord\Profile;
 use Apps\ActiveRecord\System;
 use Apps\ActiveRecord\User;

Spacing +4 added lines, -4 removed lines

@@ -105,14 +105,14 @@
         $cfg['baseDomain'] = $this->baseDomain;
         $cfg['database'] = $this->db;
         $cfg['singleLanguage'] = $this->singleLanguage;
-        $cfg['multiLanguage'] = (bool)$this->multiLanguage;
-        $cfg['passwordSalt'] = '$2a$07$' . Str::randomLatinNumeric(mt_rand(21, 30)) . '$';
-        $cfg['debug']['cookie']['key'] = 'fdebug_' . Str::randomLatinNumeric(mt_rand(4, 16));
+        $cfg['multiLanguage'] = (bool) $this->multiLanguage;
+        $cfg['passwordSalt'] = '$2a$07$'.Str::randomLatinNumeric(mt_rand(21, 30)).'$';
+        $cfg['debug']['cookie']['key'] = 'fdebug_'.Str::randomLatinNumeric(mt_rand(4, 16));
         $cfg['debug']['cookie']['value'] = Str::randomLatinNumeric(mt_rand(32, 128));
         $cfg['mail'] = $this->mail;
 
         // initialize migrations table
-        App::$Database->getConnection('install')->getSchemaBuilder()->create('migrations', function ($table) {
+        App::$Database->getConnection('install')->getSchemaBuilder()->create('migrations', function($table) {
             $table->increments('id');
             $table->string('migration', 128)->unique();
             $table->timestamps();

Apps/View/Admin/default/layout/main.php

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 use Ffcms\Core\Helper\HTML\Listing;
 use Ffcms\Core\Helper\Type\Any;
 use Ffcms\Core\Helper\Type\Arr;
-use Ffcms\Core\Helper\Type\Obj;
 use Ffcms\Core\Helper\Type\Str;
 use Ffcms\Core\Helper\Url;
 

Spacing +13 added lines, -13 removed lines

@@ -25,7 +25,7 @@ 
     <?php
     $customCssCode = \App::$View->showPlainCode('css');
     if ($customCssCode !== null) {
-        echo '<style>' . $customCssCode . '</style>';
+        echo '<style>'.$customCssCode.'</style>';
     } ?>
     <script>
         var script_url = '<?= \App::$Alias->scriptUrl ?>';
@@ -122,11 +122,11 @@ 
                             'type' => 'ul',
                             'property' => ['class' => 'nav nav-second-level'],
                             'items' => [
-                                ['type' => 'link', 'link' => ['main/settings'], 'text' => '<i class="fa fa-cogs"></i> ' . __('Settings'), 'html' => true],
-                                ['type' => 'link', 'link' => ['main/files'], 'text' => '<i class="fa fa-file-o"></i> ' . __('Files'), 'html' => true],
-                                ['type' => 'link', 'link' => ['main/antivirus'], 'text' => '<i class="fa fa-shield"></i> ' . __('Antivirus'), 'html' => true],
-                                ['type' => 'link', 'link' => ['main/routing'], 'text' => '<i class="fa fa-code"></i> ' . __('Routing'), 'html' => true],
-                                ['type' => 'link', 'link' => ['main/updates'], 'text' => '<i class="fa fa-gavel"></i> ' . __('Updates'), 'html' => true]
+                                ['type' => 'link', 'link' => ['main/settings'], 'text' => '<i class="fa fa-cogs"></i> '.__('Settings'), 'html' => true],
+                                ['type' => 'link', 'link' => ['main/files'], 'text' => '<i class="fa fa-file-o"></i> '.__('Files'), 'html' => true],
+                                ['type' => 'link', 'link' => ['main/antivirus'], 'text' => '<i class="fa fa-shield"></i> '.__('Antivirus'), 'html' => true],
+                                ['type' => 'link', 'link' => ['main/routing'], 'text' => '<i class="fa fa-code"></i> '.__('Routing'), 'html' => true],
+                                ['type' => 'link', 'link' => ['main/updates'], 'text' => '<i class="fa fa-gavel"></i> '.__('Updates'), 'html' => true]
                             ]
                         ]) ?>
                         <!-- /.nav-second-level -->
@@ -146,22 +146,22 @@ 
                     foreach ($extTable as $item) {
                         $menuItem = [
                             'type' => 'link',
-                            'link' => [Str::lowerCase($item->sys_name) . '/index'],
-                            'text' => $item->getLocaleName() . (!$item->checkVersion() ? ' <i class="fa fa-wrench" style="color: #ffbd26;"></i>' : null),
+                            'link' => [Str::lowerCase($item->sys_name).'/index'],
+                            'text' => $item->getLocaleName().(!$item->checkVersion() ? ' <i class="fa fa-wrench" style="color: #ffbd26;"></i>' : null),
                             'html' => true
                         ];
                         if ($item->type === 'app') {
                             $appControllers[] = $item->sys_name;
                             $appMenuItems[] = $menuItem;
-                        } elseif($item->type === 'widget') {
+                        } elseif ($item->type === 'widget') {
                             $widgetControllers[] = $item->sys_name;
                             $widgetMenuItems[] = $menuItem;
                         }
                     }
 
-                    $appMenuItems[] = ['type' => 'link', 'link' => ['application/index'], 'text' => __('All apps') . '...'];
+                    $appMenuItems[] = ['type' => 'link', 'link' => ['application/index'], 'text' => __('All apps').'...'];
                     $appControllers[] = 'Application';
-                    $widgetMenuItems[] = ['type' => 'link', 'link' => ['widget/index'], 'text' => __('All widgets') . '...'];
+                    $widgetMenuItems[] = ['type' => 'link', 'link' => ['widget/index'], 'text' => __('All widgets').'...'];
                     $widgetControllers[] = 'Widget';
                     ?>
                     <li<?= Arr::in(\App::$Request->getController(), $appControllers) ? ' class="active"' : null ?>>
@@ -222,7 +222,7 @@ 
                             echo $body;
                         } else {
                             \App::$Response->setStatusCode(404);
-                            echo '<p>' . __('Page is not founded!') . '</p>';
+                            echo '<p>'.__('Page is not founded!').'</p>';
                         }
                         ?>
                     </article>
@@ -254,7 +254,7 @@ 
 <?php
 $customJsCode = \App::$View->showPlainCode('js');
 if ($customJsCode !== null) {
-    echo '<script>' . $customJsCode . '</script>';
+    echo '<script>'.$customJsCode.'</script>';
 }
 ?>
 </body>

Braces +5 added lines, -2 removed lines

@@ -200,13 +200,16 @@
                             <?php foreach ($this->breadcrumbs as $bUrl => $bText): ?>
                                 <?php if (Any::isInt($bUrl)): // only text ?>
                                     <li class="active"><?= \App::$Security->strip_tags($bText) ?></li>
-                                <?php else: ?>
+                                <?php else {
+    : ?>
                                     <li>
                                         <a href="<?= \App::$Security->strip_tags($bUrl) ?>">
                                             <?= \App::$Security->strip_tags($bText) ?>
                                         </a>
                                     </li>
-                                <?php endif; ?>
+                                <?php endif;
+}
+?>
                             <?php endforeach; ?>
                         </ol>
                     <?php endif; ?>