From d8249262996b1e3d6f32c07b6858e86691a3ce0b Mon Sep 17 00:00:00 2001 From: xevidos Date: Tue, 24 Jul 2018 10:01:00 -0400 Subject: [PATCH] Deleted extraneous files and fixed extra session declaration. --- .travis.yml | 49 ---------------------------------- build.xml | 19 ------------- components/update/update.php | 1 + components/user/class.user.php | 2 -- composer.json | 2 +- 5 files changed, 2 insertions(+), 71 deletions(-) delete mode 100755 .travis.yml delete mode 100755 build.xml diff --git a/.travis.yml b/.travis.yml deleted file mode 100755 index 454c687..0000000 --- a/.travis.yml +++ /dev/null @@ -1,49 +0,0 @@ -language: php - -php: - - 5.6 - - 7.0 - -env: - global: - # PHP Code Sniffer special rules - - R_CLASS="Squiz.Classes.ValidClassName" # must use CamleClasName - - R_CONST="Generic.NamingConventions.UpperCaseConstantName" # const must UPPERCASE - - R_FILE="PSR1.Files.SideEffects" # a file declare , or executes logic, not both - - R_LINE="Generic.Files.LineLength" # - - R_METHOD="PSR1.Methods.CamelCapsMethodName" # must use camleMethodName - - R_NS="PSR1.Classes.ClassDeclaration" # class must use Namespace - - CS_INGNORE="" # ingore Files - matrix: - #strict mode to check formatting - - STRICT=true - # exclude some special or unsupported conventions - - STRICT=false CS_INGNORE="dialog.php" - -#allow failures -matrix: - allow_failures: - - env: STRICT=true - -#install dependence -install: - - composer install --prefer-dist --verbose - -#init the env to exclude -before_script: - # STRICT mode only exclude Namespace and LineLength - - if [[ "$STRICT" == "true" ]];then - export CS_EXCLUDE="$R_LINE,$R_NS"; - else - export CS_EXCLUDE="$R_CLASS,$R_CONST,$R_FILE,$R_LINE,$R_METHOD,$R_NS"; - fi - - echo $CS_EXCLUDE - -# check formatting and Syntax -script: - - ./vendor/bin/phpcs components - --standard=PSR2 - --exclude="$CS_EXCLUDE" - --ignore="$CS_INGNORE" - --colors - --extensions=php diff --git a/build.xml b/build.xml deleted file mode 100755 index 287707a..0000000 --- a/build.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/components/update/update.php b/components/update/update.php index ab0ae83..8d82039 100755 --- a/components/update/update.php +++ b/components/update/update.php @@ -207,6 +207,7 @@ class updater { echo ""; + unlink( $src . ".travis.yml" ); $this->remove_directory( $src ); } } diff --git a/components/user/class.user.php b/components/user/class.user.php index 5d940c2..e27c06f 100755 --- a/components/user/class.user.php +++ b/components/user/class.user.php @@ -113,8 +113,6 @@ class User session_id( $session ); session_start(); //echo var_dump( $_SESSION ) . "\n\n"; - $_SESSION['lang'] = $this->lang; - $_SESSION['theme'] = $this->theme; if ( ( isset( $_SESSION["user"] ) && $_SESSION["user"] == $username && ( isset( $_SESSION['lang'] ) && isset( $_SESSION['theme'] ) ) && isset( $_SESSION['login_session'] ) && $_SESSION['login_session'] == true ) || empty( $_SESSION ) ) { session_unset(); diff --git a/composer.json b/composer.json index cbd3b35..9f1124b 100755 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "codiad/codiad", "type": "application", "keywords": ["ide","development","environment","editor"], - "homepage": "http://www.codiad.com", + "homepage": "http://codiad.telaaedifex.com", "license": "MIT", "description": "Codiad is a web-based IDE framework with a small footprint and minimal requirements. The system is still early in development, and while it has been proven extremely stable please be sure have a backup system if you use it in any production work.", "authors": [