update: uglify.php

fix: proper perms set_perms.php
darkalchemy · Jun 9, 2019 · f605d64 · f605d64
1 parent d2d68ee
commit f605d64
Show file tree

Hide file tree

Showing 723 changed files with 117 additions and 156 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/.php_cs.dist b/.php_cs.dist
diff --git a/.stylelintrc b/.stylelintrc
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 09 Jun, 2019
+update: uglify.php  
+fix: proper perms set_perms.php  
+
 ### 07 Jun, 2019
 update: button margin on small screens  
 fix: returnto login.php  

diff --git a/LICENSE b/LICENSE
diff --git a/backups/.gitignore b/backups/.gitignore
diff --git a/bin/.gitignore b/bin/.gitignore
diff --git a/bin/1/.gitignore b/bin/1/.gitignore
diff --git a/bin/2/.gitignore b/bin/2/.gitignore
diff --git a/bin/functions.php b/bin/functions.php
@@ -7,9 +7,9 @@
 use Pu239\Database;
 
 /**
- * @throws \Envms\FluentPDO\Exception
  * @throws DependencyException
  * @throws NotFoundException
+ * @throws \Envms\FluentPDO\Exception
  *
  * @return array
  */
@@ -35,9 +35,9 @@ function get_styles()
  * @param array $styles
  * @param bool  $create
  *
- * @throws \Envms\FluentPDO\Exception
  * @throws DependencyException
  * @throws NotFoundException
+ * @throws \Envms\FluentPDO\Exception
  *
  * @return array
  */
@@ -78,57 +78,6 @@ function get_classes(array $styles, bool $create)
     return $all_classes;
 }
 
-/**
- * @param $group
- */
-function cleanup($group)
-{
-    global $site_config;
-
-    if (file_exists($site_config['files']['path'])) {
-        chmod_r($site_config['files']['path'], $group);
-        chgrp_r($site_config['files']['path'], $group);
-    }
-}
-
-/**
- * @param $path
- * @param $group
- */
-function chgrp_r($path, $group)
-{
-    if (!file_exists($path)) {
-        return;
-    }
-    $dir = new DirectoryIterator($path);
-    chgrp($path, $group);
-    foreach ($dir as $item) {
-        chgrp($item->getPathname(), $group);
-        if ($item->isDir() && !$item->isDot()) {
-            chgrp_r($item->getPathname(), $group);
-        }
-    }
-}
-
-/**
- * @param $path
- * @param $group
- */
-function chmod_r($path, $group)
-{
-    if (!file_exists($path)) {
-        return;
-    }
-    $dir = new DirectoryIterator($path);
-    foreach ($dir as $item) {
-        chmod($item->getPathname(), 0775);
-        chown($item->getPathname(), $group);
-        if ($item->isDir() && !$item->isDot()) {
-            chmod_r($item->getPathname(), $group);
-        }
-    }
-}
-
 /**
  * @return string
  */
@@ -148,7 +97,7 @@ function get_webserver_user()
 }
 
 /**
- * @return mixed|null
+ * @return mixed|string|null
  */
 function get_username()
 {
@@ -165,8 +114,23 @@ function get_username()
             ++$i;
         }
 
-        return $user;
+        if (!empty($user)) {
+            return $user;
+        }
     }
 
     return get_webserver_user();
 }
+
+/**
+ * @param string $group
+ */
+function cleanup(string $group)
+{
+    global $site_config;
+
+    if (file_exists($site_config['files']['path'])) {
+        chown($site_config['files']['path'], $group);
+        chgrp($site_config['files']['path'], $group);
+    }
+}
diff --git a/bin/pu239.scss b/bin/pu239.scss
diff --git a/bin/set_perms.php b/bin/set_perms.php
@@ -11,9 +11,8 @@
 }
 
 $site_config['cache']['driver'] = 'memory';
-$user = get_webserver_user();
+$user = get_username();
 $group = get_webserver_user();
-cleanup($group);
 $paths = [
     ROOT_DIR,
 ];
@@ -52,78 +51,50 @@
     ROOT_DIR . 'uploads/',
     CHAT_DIR . 'js/',
     IMAGES_DIR,
+    VENDOR_DIR,
+    NODE_DIR,
 ];
 
 $folders = array_merge($dirs, $folders);
-
 $excludes = [
-    ROOT_DIR . 'vendor',
-    ROOT_DIR . 'node_modules',
+    ROOT_DIR . 'vendor/',
+    ROOT_DIR . 'node_modules/',
+    ROOT_DIR . '.git/',
+    ROOT_DIR . '.idea/',
 ];
 
-foreach ($folders as $folder) {
-    if (file_exists($folder)) {
-        chmod_r($folder, $group);
-    }
-}
+$chmod_folders = [
+    VENDOR_DIR,
+];
 
+cleanup($group);
+chmod(ROOT_DIR, 0774);
 $i = 1;
+
 foreach ($paths as $path) {
     if (file_exists($path)) {
         $objects = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path, RecursiveDirectoryIterator::SKIP_DOTS), RecursiveIteratorIterator::SELF_FIRST);
         foreach ($objects as $name => $object) {
-            if (is_file($name)) {
-                $ext = pathinfo($name, PATHINFO_EXTENSION);
-                $parent = dirname($name);
-                $continue = true;
-                foreach ($excludes as $exclude) {
-                    if (preg_match('#' . $exclude . '#', $parent)) {
-                        $continue = false;
-                    }
+            if (is_dir($name) && !preg_match('#' . implode('|', $excludes) . '#', realpath($name) . '/')) {
+                if (preg_match('#' . IMAGES_DIR . '|' . CACHE_DIR . '|' . IMDB_CACHE_DIR . '#', realpath($name) . '/')) {
+                    chown($name, $group);
+                } else {
+                    chown($name, $user);
                 }
-                if ($continue && in_array($ext, $exts)) {
-                    if (chmod($name, 0664)) {
-                        chown($name, $user);
-                        chgrp($name, $group);
-                        ++$i;
-                    }
+                chgrp($name, $group);
+                chmod($name, 0774);
+                $i++;
+            } elseif (!is_dir($name) && !preg_match('#' . implode('|', $excludes) . '#', realpath($name) . '/')) {
+                if (preg_match('#' . IMAGES_DIR . '|' . CACHE_DIR . '|' . IMDB_CACHE_DIR . '#', realpath($name) . '/')) {
+                    chown($name, $group);
+                    chmod($name, 0774);
+                } else {
+                    chmod($name, 0664);
                 }
+                $i++;
             }
         }
     }
 }
 
-foreach ($folders as $folder) {
-    if (file_exists($folder)) {
-        chown_r($folder, $group);
-    }
-}
-
-/**
- * @param $path
- * @param $group
- */
-function chown_r($path, $group)
-{
-    if (!file_exists($path)) {
-        return;
-    }
-    $user_group = false;
-    if ($path === IMAGES_DIR || $path === CACHE_DIR) {
-        $user_group = true;
-    }
-    $dir = new DirectoryIterator($path);
-    chown($path, $group);
-    foreach ($dir as $item) {
-        chown($item->getPathname(), $group);
-        if ($user_group) {
-            chgrp($item->getPathname(), $group);
-        }
-        if ($item->isDir() && !$item->isDot()) {
-            chown_r($item->getPathname(), $group);
-        }
-    }
-}
-
-cleanup($group);
 echo "$i files processed\n";
diff --git a/bin/uglify.php b/bin/uglify.php
@@ -400,6 +400,9 @@ function run_uglify($argv = [])
     if (PRODUCTION) {
         passthru('sudo rm ' . DI_CACHE_DIR . 'CompiledContainer.php');
     }
+
+    cleanup(get_webserver_user());
+    return true;
 }
 
 /**
@@ -582,12 +585,12 @@ function get_default_border($folder)
  * @param string $file
  * @param bool   $delete
  *
- * @throws DependencyException
  * @throws NotFoundException
  * @throws AuthError
  * @throws NotLoggedInException
  * @throws \Envms\FluentPDO\Exception
  * @throws InvalidManipulation
+ * @throws DependencyException
  *
  * @return bool
  */

diff --git a/bucket/.gitignore b/bucket/.gitignore
diff --git a/cache/bans_cache.php b/cache/bans_cache.php
diff --git a/cache/block_settings_cache.php b/cache/block_settings_cache.php
diff --git a/cache/categorie_icons.php b/cache/categorie_icons.php
diff --git a/cache/countries.php b/cache/countries.php
diff --git a/cache/country.php b/cache/country.php
diff --git a/cache/free_cache.php b/cache/free_cache.php
diff --git a/cache/happyhour.cache b/cache/happyhour.cache
diff --git a/cache/lottery.txt b/cache/lottery.txt
diff --git a/cache/nameblacklist.txt b/cache/nameblacklist.txt
diff --git a/cache/rep_cache.php b/cache/rep_cache.php
diff --git a/cache/rep_settings_cache.php b/cache/rep_settings_cache.php
diff --git a/cache/timezones.php b/cache/timezones.php
diff --git a/chat/css/1/.gitignore b/chat/css/1/.gitignore
diff --git a/chat/css/1/custom.css b/chat/css/1/custom.css
@@ -1,6 +1,6 @@
 .mentioned {
-    color: #5eff00;
-    text-shadow: 1px 1px #2c6609;
+    color: var(--main-bdr-color);
+    text-shadow: 1px 1px #000;
 }
 
 a {

diff --git a/chat/css/1/default.css b/chat/css/1/default.css
@@ -37,7 +37,7 @@ input, select, textarea, #content #chatList, #content #onlineListContainer, #con
 
 .ajax-chat {
     height: 100%;
-    color: #fff;
+    color: var(--default-text-color);
 }
 
 .ajax-chat h1, .ajax-chat h3 {
@@ -54,7 +54,7 @@ input, select, textarea, #content #chatList, #content #onlineListContainer, #con
 }
 
 #content textarea {
-    color: #b0b8a8;
+    color: var(--default-text-color);
 }
 
 #content #chatList, #content #onlineListContainer, #content #helpContainer, #content #settingsContainer {

diff --git a/chat/js/.gitignore b/chat/js/.gitignore
diff --git a/chat/lib/template/loggedIn.html b/chat/lib/template/loggedIn.html
diff --git a/chat/lib/template/loggedOut.html b/chat/lib/template/loggedOut.html
diff --git a/chat/lib/template/logs.html b/chat/lib/template/logs.html
diff --git a/composer.lock b/composer.lock
diff --git a/config/define.php b/config/define.php
@@ -23,6 +23,7 @@
 define('IMAGES_DIR', PUBLIC_DIR . 'images' . DIRECTORY_SEPARATOR);
 define('PROXY_IMAGES_DIR', IMAGES_DIR . 'proxy' . DIRECTORY_SEPARATOR);
 define('VENDOR_DIR', ROOT_DIR . 'vendor' . DIRECTORY_SEPARATOR);
+define('NODE_DIR', ROOT_DIR . 'node_modules' . DIRECTORY_SEPARATOR);
 define('DATABASE_DIR', ROOT_DIR . 'database' . DIRECTORY_SEPARATOR);
 define('BITBUCKET_DIR', ROOT_DIR . 'bucket' . DIRECTORY_SEPARATOR);
 define('LOGS_DIR', ROOT_DIR . 'logs' . DIRECTORY_SEPARATOR);

diff --git a/config/goaccess.conf b/config/goaccess.conf
diff --git a/dir_list/.gitignore b/dir_list/.gitignore
diff --git a/include/geoip.inc b/include/geoip.inc
diff --git a/include/geoipcity.inc b/include/geoipcity.inc
diff --git a/logs/sqlerr/.gitignore b/logs/sqlerr/.gitignore