mirror of
https://github.com/xevidos/codiad.git
synced 2024-12-22 22:02:15 +01:00
Deleted extraneous files and fixed extra session declaration.
This commit is contained in:
parent
6da112e8a9
commit
d824926299
5 changed files with 2 additions and 71 deletions
49
.travis.yml
49
.travis.yml
|
@ -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
|
|
19
build.xml
19
build.xml
|
@ -1,19 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
|
||||||
<project name="Codiad" basedir="." default="phpcs">
|
|
||||||
|
|
||||||
<fileset id="components" dir="./components">
|
|
||||||
<include name="**/*.php" />
|
|
||||||
</fileset>
|
|
||||||
|
|
||||||
<target name="phpcs">
|
|
||||||
<phpcodesniffer
|
|
||||||
standard="PSR2"
|
|
||||||
showSniffs="false"
|
|
||||||
showWarnings="true"
|
|
||||||
haltonerror="${build.haltonanalysiserror}">
|
|
||||||
<fileset refid="components" />
|
|
||||||
<formatter type="full" usefile="false" />
|
|
||||||
</phpcodesniffer>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
</project>
|
|
|
@ -207,6 +207,7 @@ class updater {
|
||||||
|
|
||||||
|
|
||||||
echo "<script>document.getElementById('progress').innerHTML = '<p class=\"status_box\">Removing Update ... </p>';</script>";
|
echo "<script>document.getElementById('progress').innerHTML = '<p class=\"status_box\">Removing Update ... </p>';</script>";
|
||||||
|
unlink( $src . ".travis.yml" );
|
||||||
$this->remove_directory( $src );
|
$this->remove_directory( $src );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -113,8 +113,6 @@ class User
|
||||||
session_id( $session );
|
session_id( $session );
|
||||||
session_start();
|
session_start();
|
||||||
//echo var_dump( $_SESSION ) . "\n\n";
|
//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 ) ) {
|
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();
|
session_unset();
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
"name": "codiad/codiad",
|
"name": "codiad/codiad",
|
||||||
"type": "application",
|
"type": "application",
|
||||||
"keywords": ["ide","development","environment","editor"],
|
"keywords": ["ide","development","environment","editor"],
|
||||||
"homepage": "http://www.codiad.com",
|
"homepage": "http://codiad.telaaedifex.com",
|
||||||
"license": "MIT",
|
"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.",
|
"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": [
|
"authors": [
|
||||||
|
|
Loading…
Reference in a new issue