injitools / cms-Inji

system/modules/Files/Files.php

Braces +24 added lines, -16 removed lines

@@ -22,16 +22,19 @@ 
 
         $sitePath = App::$primary->path;
 
-        if (!is_uploaded_file($file['tmp_name']))
-            return 0;
+        if (!is_uploaded_file($file['tmp_name'])) {
+                    return 0;
+        }
 
         $fileinfo = pathinfo($file['name']);
-        if (empty($fileinfo['extension']))
-            return 0;
+        if (empty($fileinfo['extension'])) {
+                    return 0;
+        }
 
         $type = Files\Type::get($fileinfo['extension'], 'ext');
-        if (!$type)
-            return 0;
+        if (!$type) {
+                    return 0;
+        }
 
         if (!empty($options['accept_group']) && $options['accept_group'] != $type->group) {
             return 0;
@@ -47,13 +50,15 @@ 
         }
         $fileObject->name = $fileinfo['filename'];
         $fileObject->path = $type->type_dir . date('Y-m-d') . '/' . microtime(true) . '.' . $fileinfo['extension'];
-        if ($fileObject->id && file_exists($sitePath . $fileObject->path))
-            unlink($sitePath . $fileObject->path);
+        if ($fileObject->id && file_exists($sitePath . $fileObject->path)) {
+                    unlink($sitePath . $fileObject->path);
+        }
 
         Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/');
 
-        if (!move_uploaded_file($file['tmp_name'], $sitePath . $fileObject->path))
-            return false;
+        if (!move_uploaded_file($file['tmp_name'], $sitePath . $fileObject->path)) {
+                    return false;
+        }
 
         $fileObject->type_id = $type->pk();
         $fileObject->original_name = $file['name'];
@@ -76,12 +81,14 @@ 
         $sitePath = App::$primary->path;
 
         $fileinfo = pathinfo($url);
-        if (empty($fileinfo['extension']))
-            return 0;
+        if (empty($fileinfo['extension'])) {
+                    return 0;
+        }
 
         $type = Files\Type::get($fileinfo['extension'], 'ext');
-        if (!$type)
-            return 0;
+        if (!$type) {
+                    return 0;
+        }
 
         if (!empty($options['accept_group']) && $options['accept_group'] != $type->group) {
             return 0;
@@ -97,8 +104,9 @@ 
         }
         $fileObject->name = $fileinfo['filename'];
         $fileObject->path = $type->type_dir . date('Y-m-d') . '/' . microtime(true) . '.' . $fileinfo['extension'];
-        if ($fileObject->id && file_exists($sitePath . $fileObject->path))
-            unlink($sitePath . $fileObject->path);
+        if ($fileObject->id && file_exists($sitePath . $fileObject->path)) {
+                    unlink($sitePath . $fileObject->path);
+        }
 
         Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/');
 

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * Files module
- *
- * @author Alexey Krupskiy <admin@inji.ru>
- * @link http://inji.ru/
- * @copyright 2015 Alexey Krupskiy
- * @license https://github.com/injitools/cms-Inji/blob/master/LICENSE
- */
+     * Files module
+     *
+     * @author Alexey Krupskiy <admin@inji.ru>
+     * @link http://inji.ru/
+     * @copyright 2015 Alexey Krupskiy
+     * @license https://github.com/injitools/cms-Inji/blob/master/LICENSE
+     */
 class Files extends Module
 {
     /**

system/modules/Libs/Controllers/LibsController.php

Indentation +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
         $args = func_get_args();
         $path = $this->module->getPath($args);
         if($path){
-             $this->StaticLoader->giveFile($path);
+                $this->StaticLoader->giveFile($path);
         }
     }
 

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
     {
         $args = func_get_args();
         $path = $this->module->getPath($args);
-        if($path){
+        if ($path) {
              $this->StaticLoader->giveFile($path);
         }
     }

system/modules/Libs/Libs.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
                     $this->loadLib($rLib);
                 }
             }
-            if (!empty($className::$files['css']) && (!isset($options['loadCss']) || $options['loadCss'] )) {
+            if (!empty($className::$files['css']) && (!isset($options['loadCss']) || $options['loadCss'])) {
                 foreach ($className::$files['css'] as $file) {
                     if (strpos($file, '/') === 0 || strpos($file, 'http') === 0) {
                         App::$cur->view->customAsset('css', $file, $libName);

system/modules/Materials/Materials.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * Materials module
- *
- * @author Alexey Krupskiy <admin@inji.ru>
- * @link http://inji.ru/
- * @copyright 2015 Alexey Krupskiy
- * @license https://github.com/injitools/cms-Inji/blob/master/LICENSE
- */
+     * Materials module
+     *
+     * @author Alexey Krupskiy <admin@inji.ru>
+     * @link http://inji.ru/
+     * @copyright 2015 Alexey Krupskiy
+     * @license https://github.com/injitools/cms-Inji/blob/master/LICENSE
+     */
 class Materials extends Module
 {
     function viewsList()

system/modules/Materials/appControllers/content/category.php

Indentation +12 added lines, -12 removed lines

@@ -2,10 +2,10 @@ 
   <div class="row">
     <div class="col-md-3">
       <?php
-      \Ui\Tree::ul($category->getRoot(), 0, function($category) {
-          echo "<a href='{$category->getHref()}'> {$category->name()}</a>";
-      });
-      ?>
+        \Ui\Tree::ul($category->getRoot(), 0, function($category) {
+            echo "<a href='{$category->getHref()}'> {$category->name()}</a>";
+        });
+        ?>
     </div>
     <div class="col-md-9">
       <h2 class ='category-name'><?= $category->name; ?></h2>
@@ -15,9 +15,9 @@ 
       <div class ="category-materials">
         <div class ="row">
           <?php
-          $i = 0;
-          foreach ($materials as $material) {
-              ?>
+            $i = 0;
+            foreach ($materials as $material) {
+                ?>
               <div class = "col-sm-6 category-material">
                 <a class="category-material-name" href ="<?= $material->getHref(); ?>"><h3><?= $material->name; ?></h3></a>
                 <div class="category-material-preview"><?= $material->preview; ?></div>
@@ -26,11 +26,11 @@ 
                 </div>
               </div>
               <?php
-              if (!( ++$i % 2)) {
-                  echo '</div><hr /><div class ="row">';
-              }
-          }
-          ?>
+                if (!( ++$i % 2)) {
+                    echo '</div><hr /><div class ="row">';
+                }
+            }
+            ?>
         </div>
         <?php
         $pages->draw();

system/modules/Materials/appControllers/content/default.php

Indentation +13 added lines, -13 removed lines

@@ -4,17 +4,17 @@
     <?= Ui\FastEdit::block($material, 'text', null, true); ?>
   </div>
   <?php
-  if ($material->links) {
-      echo '<ul class = "material-links">';
-      foreach ($material->links as $materialLink) {
-          $href = $materialLink->linkedMaterial->alias;
-          if ($href == '') {
-              $href = '/';
-          }
-          $name = $materialLink->name ? $materialLink->name : $materialLink->linkedMaterial->name;
-          echo "<li><a href = '{$href}'>{$name}</a></li>";
-      }
-      echo '</ul>';
-  }
-  ?>
+    if ($material->links) {
+        echo '<ul class = "material-links">';
+        foreach ($material->links as $materialLink) {
+            $href = $materialLink->linkedMaterial->alias;
+            if ($href == '') {
+                $href = '/';
+            }
+            $name = $materialLink->name ? $materialLink->name : $materialLink->linkedMaterial->name;
+            echo "<li><a href = '{$href}'>{$name}</a></li>";
+        }
+        echo '</ul>';
+    }
+    ?>
 </div>
\ No newline at end of file

system/modules/Materials/appControllers/content/materialWithCategorys.php

Indentation +18 added lines, -18 removed lines

@@ -2,11 +2,11 @@ 
   <div class="row">
     <div class="col-md-3">
       <?php
-      $category = $material->category;
-      \Ui\Tree::ul($category->getRoot(), 0, function($category) {
-          echo "<a href='{$category->getHref()}'> {$category->name()}</a>";
-      });
-      ?>
+        $category = $material->category;
+        \Ui\Tree::ul($category->getRoot(), 0, function($category) {
+            echo "<a href='{$category->getHref()}'> {$category->name()}</a>";
+        });
+        ?>
     </div>
     <div class="col-md-9">
       <h2 class="material-name"><?= $material->name; ?></h2>
@@ -14,19 +14,19 @@ 
         <?= Ui\FastEdit::block($material, 'text', null, true); ?>
       </div>
       <?php
-      if ($material->links) {
-          echo '<ul class = "material-links">';
-          foreach ($material->links as $materialLink) {
-              $href = $materialLink->linkedMaterial->alias;
-              if ($href == '') {
-                  $href = '/';
-              }
-              $name = $materialLink->name ? $materialLink->name : $materialLink->linkedMaterial->name;
-              echo "<li><a href = '{$href}'>{$name}</a></li>";
-          }
-          echo '</ul>';
-      }
-      ?>
+        if ($material->links) {
+            echo '<ul class = "material-links">';
+            foreach ($material->links as $materialLink) {
+                $href = $materialLink->linkedMaterial->alias;
+                if ($href == '') {
+                    $href = '/';
+                }
+                $name = $materialLink->name ? $materialLink->name : $materialLink->linkedMaterial->name;
+                echo "<li><a href = '{$href}'>{$name}</a></li>";
+            }
+            echo '</ul>';
+        }
+        ?>
     </div>
   </div>
 </div>
\ No newline at end of file

system/modules/Materials/models/Material.php

Spacing +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
         if ($treePath) {
             $categorys = Category::getList(['where' => ['id', implode(',', $treePath), 'IN']]);
             foreach ($categorys as $category) {
-                $href .="/{$category->alias}";
+                $href .= "/{$category->alias}";
             }
         }
         return $href . "/" . ($this->alias ? $this->alias : $this->pk());

system/modules/Menu/widgets/menu.php

Braces +7 added lines, -5 removed lines

@@ -7,16 +7,18 @@
     $code = 'main';
 }
 $menu = \Menu\Menu::get($code, 'code');
-if ($menu)
+if ($menu) {
     foreach ($menu->items(['order' => ['weight', 'ASC']]) as $item) {
         $href = $item->href;
+}
         if ($item->type == 'materialCategory') {
             $category = \Materials\Category::get($item->aditional);
             $href = $category->alias ? "/materials/{$category->alias}" : "/materials/category/{$category->id}";
         }
-        if (urldecode($_SERVER['REQUEST_URI']) == $href)
-            $active = ' class = "active" ';
-        else
-            $active = '';
+        if (urldecode($_SERVER['REQUEST_URI']) == $href) {
+                    $active = ' class = "active" ';
+        } else {
+                    $active = '';
+        }
         echo "<li {$active}><a href = '{$href}'>{$item->name}</a></li>";
     }