diff --git a/.gitignore b/.gitignore index a078a6888103c4bb792fafaa2d83cd550974cbde..cf76f7bb1d07d9097a550f3d0007a7faf54b6b69 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ config.php -vendor/ \ No newline at end of file +vendor/ +.idea/ \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index b58b603fea78041071d125a30db58d79b3d49217..0000000000000000000000000000000000000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index a55e7a179bde3e4e772c29c0c85e53354aa54618..0000000000000000000000000000000000000000 --- a/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ -<component name="ProjectCodeStyleConfiguration"> - <state> - <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" /> - </state> -</component> \ No newline at end of file diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml deleted file mode 100644 index 9c2db00b09f68801a765b5a3db36bdd33fb9bf35..0000000000000000000000000000000000000000 --- a/.idea/dataSources.local.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="dataSourceStorageLocal" created-in="PS-233.13135.108"> - <data-source name="ByeCorps ID (local)" uuid="5bc27beb-c8ab-420d-bdbc-055b37ae9e39"> - <database-info product="MariaDB" version="10.6.12-MariaDB-0ubuntu0.22.04.1" jdbc-version="4.2" driver-name="MariaDB Connector/J" driver-version="3.0.7" dbms="MARIADB" exact-version="10.6.12" exact-driver-version="3.0"> - <extra-name-characters>#@</extra-name-characters> - <identifier-quote-string>`</identifier-quote-string> - </database-info> - <case-sensitivity plain-identifiers="exact" quoted-identifiers="exact" /> - <secret-storage>master_key</secret-storage> - <user-name>bye</user-name> - <schema-mapping> - <introspection-scope> - <node kind="schema" qname="@" /> - </introspection-scope> - </schema-mapping> - </data-source> - </component> -</project> \ No newline at end of file diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml deleted file mode 100644 index dfaf86df5c14200a08cd644b0bfe8dc25a5c4329..0000000000000000000000000000000000000000 --- a/.idea/dataSources.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="DataSourceManagerImpl" format="xml" multifile-model="true"> - <data-source source="LOCAL" name="ByeCorps ID (local)" uuid="5bc27beb-c8ab-420d-bdbc-055b37ae9e39"> - <driver-ref>mariadb</driver-ref> - <synchronize>true</synchronize> - <jdbc-driver>org.mariadb.jdbc.Driver</jdbc-driver> - <jdbc-url>jdbc:mariadb://id.local:3306/id.local</jdbc-url> - <working-dir>$ProjectFileDir$</working-dir> - </data-source> - </component> -</project> \ No newline at end of file diff --git a/.idea/dataSources/5bc27beb-c8ab-420d-bdbc-055b37ae9e39.xml b/.idea/dataSources/5bc27beb-c8ab-420d-bdbc-055b37ae9e39.xml deleted file mode 100644 index 627b796dea329f4ef2959316b6cb88a6347b4de4..0000000000000000000000000000000000000000 --- a/.idea/dataSources/5bc27beb-c8ab-420d-bdbc-055b37ae9e39.xml +++ /dev/null @@ -1,1288 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<dataSource name="ByeCorps ID (local)"> - <database-model serializer="dbm" dbms="MARIADB" family-id="MARIADB" format-version="4.51"> - <root id="1"/> - <collation id="2" parent="1" name="big5_chinese_ci"> - <Charset>big5</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="3" parent="1" name="big5_bin"> - <Charset>big5</Charset> - </collation> - <collation id="4" parent="1" name="big5_chinese_nopad_ci"> - <Charset>big5</Charset> - </collation> - <collation id="5" parent="1" name="big5_nopad_bin"> - <Charset>big5</Charset> - </collation> - <collation id="6" parent="1" name="dec8_swedish_ci"> - <Charset>dec8</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="7" parent="1" name="dec8_bin"> - <Charset>dec8</Charset> - </collation> - <collation id="8" parent="1" name="dec8_swedish_nopad_ci"> - <Charset>dec8</Charset> - </collation> - <collation id="9" parent="1" name="dec8_nopad_bin"> - <Charset>dec8</Charset> - </collation> - <collation id="10" parent="1" name="cp850_general_ci"> - <Charset>cp850</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="11" parent="1" name="cp850_bin"> - <Charset>cp850</Charset> - </collation> - <collation id="12" parent="1" name="cp850_general_nopad_ci"> - <Charset>cp850</Charset> - </collation> - <collation id="13" parent="1" name="cp850_nopad_bin"> - <Charset>cp850</Charset> - </collation> - <collation id="14" parent="1" name="hp8_english_ci"> - <Charset>hp8</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="15" parent="1" name="hp8_bin"> - <Charset>hp8</Charset> - </collation> - <collation id="16" parent="1" name="hp8_english_nopad_ci"> - <Charset>hp8</Charset> - </collation> - <collation id="17" parent="1" name="hp8_nopad_bin"> - <Charset>hp8</Charset> - </collation> - <collation id="18" parent="1" name="koi8r_general_ci"> - <Charset>koi8r</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="19" parent="1" name="koi8r_bin"> - <Charset>koi8r</Charset> - </collation> - <collation id="20" parent="1" name="koi8r_general_nopad_ci"> - <Charset>koi8r</Charset> - </collation> - <collation id="21" parent="1" name="koi8r_nopad_bin"> - <Charset>koi8r</Charset> - </collation> - <collation id="22" parent="1" name="latin1_german1_ci"> - <Charset>latin1</Charset> - </collation> - <collation id="23" parent="1" name="latin1_swedish_ci"> - <Charset>latin1</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="24" parent="1" name="latin1_danish_ci"> - <Charset>latin1</Charset> - </collation> - <collation id="25" parent="1" name="latin1_german2_ci"> - <Charset>latin1</Charset> - </collation> - <collation id="26" parent="1" name="latin1_bin"> - <Charset>latin1</Charset> - </collation> - <collation id="27" parent="1" name="latin1_general_ci"> - <Charset>latin1</Charset> - </collation> - <collation id="28" parent="1" name="latin1_general_cs"> - <Charset>latin1</Charset> - </collation> - <collation id="29" parent="1" name="latin1_spanish_ci"> - <Charset>latin1</Charset> - </collation> - <collation id="30" parent="1" name="latin1_swedish_nopad_ci"> - <Charset>latin1</Charset> - </collation> - <collation id="31" parent="1" name="latin1_nopad_bin"> - <Charset>latin1</Charset> - </collation> - <collation id="32" parent="1" name="latin2_czech_cs"> - <Charset>latin2</Charset> - </collation> - <collation id="33" parent="1" name="latin2_general_ci"> - <Charset>latin2</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="34" parent="1" name="latin2_hungarian_ci"> - <Charset>latin2</Charset> - </collation> - <collation id="35" parent="1" name="latin2_croatian_ci"> - <Charset>latin2</Charset> - </collation> - <collation id="36" parent="1" name="latin2_bin"> - <Charset>latin2</Charset> - </collation> - <collation id="37" parent="1" name="latin2_general_nopad_ci"> - <Charset>latin2</Charset> - </collation> - <collation id="38" parent="1" name="latin2_nopad_bin"> - <Charset>latin2</Charset> - </collation> - <collation id="39" parent="1" name="swe7_swedish_ci"> - <Charset>swe7</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="40" parent="1" name="swe7_bin"> - <Charset>swe7</Charset> - </collation> - <collation id="41" parent="1" name="swe7_swedish_nopad_ci"> - <Charset>swe7</Charset> - </collation> - <collation id="42" parent="1" name="swe7_nopad_bin"> - <Charset>swe7</Charset> - </collation> - <collation id="43" parent="1" name="ascii_general_ci"> - <Charset>ascii</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="44" parent="1" name="ascii_bin"> - <Charset>ascii</Charset> - </collation> - <collation id="45" parent="1" name="ascii_general_nopad_ci"> - <Charset>ascii</Charset> - </collation> - <collation id="46" parent="1" name="ascii_nopad_bin"> - <Charset>ascii</Charset> - </collation> - <collation id="47" parent="1" name="ujis_japanese_ci"> - <Charset>ujis</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="48" parent="1" name="ujis_bin"> - <Charset>ujis</Charset> - </collation> - <collation id="49" parent="1" name="ujis_japanese_nopad_ci"> - <Charset>ujis</Charset> - </collation> - <collation id="50" parent="1" name="ujis_nopad_bin"> - <Charset>ujis</Charset> - </collation> - <collation id="51" parent="1" name="sjis_japanese_ci"> - <Charset>sjis</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="52" parent="1" name="sjis_bin"> - <Charset>sjis</Charset> - </collation> - <collation id="53" parent="1" name="sjis_japanese_nopad_ci"> - <Charset>sjis</Charset> - </collation> - <collation id="54" parent="1" name="sjis_nopad_bin"> - <Charset>sjis</Charset> - </collation> - <collation id="55" parent="1" name="hebrew_general_ci"> - <Charset>hebrew</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="56" parent="1" name="hebrew_bin"> - <Charset>hebrew</Charset> - </collation> - <collation id="57" parent="1" name="hebrew_general_nopad_ci"> - <Charset>hebrew</Charset> - </collation> - <collation id="58" parent="1" name="hebrew_nopad_bin"> - <Charset>hebrew</Charset> - </collation> - <collation id="59" parent="1" name="tis620_thai_ci"> - <Charset>tis620</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="60" parent="1" name="tis620_bin"> - <Charset>tis620</Charset> - </collation> - <collation id="61" parent="1" name="tis620_thai_nopad_ci"> - <Charset>tis620</Charset> - </collation> - <collation id="62" parent="1" name="tis620_nopad_bin"> - <Charset>tis620</Charset> - </collation> - <collation id="63" parent="1" name="euckr_korean_ci"> - <Charset>euckr</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="64" parent="1" name="euckr_bin"> - <Charset>euckr</Charset> - </collation> - <collation id="65" parent="1" name="euckr_korean_nopad_ci"> - <Charset>euckr</Charset> - </collation> - <collation id="66" parent="1" name="euckr_nopad_bin"> - <Charset>euckr</Charset> - </collation> - <collation id="67" parent="1" name="koi8u_general_ci"> - <Charset>koi8u</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="68" parent="1" name="koi8u_bin"> - <Charset>koi8u</Charset> - </collation> - <collation id="69" parent="1" name="koi8u_general_nopad_ci"> - <Charset>koi8u</Charset> - </collation> - <collation id="70" parent="1" name="koi8u_nopad_bin"> - <Charset>koi8u</Charset> - </collation> - <collation id="71" parent="1" name="gb2312_chinese_ci"> - <Charset>gb2312</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="72" parent="1" name="gb2312_bin"> - <Charset>gb2312</Charset> - </collation> - <collation id="73" parent="1" name="gb2312_chinese_nopad_ci"> - <Charset>gb2312</Charset> - </collation> - <collation id="74" parent="1" name="gb2312_nopad_bin"> - <Charset>gb2312</Charset> - </collation> - <collation id="75" parent="1" name="greek_general_ci"> - <Charset>greek</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="76" parent="1" name="greek_bin"> - <Charset>greek</Charset> - </collation> - <collation id="77" parent="1" name="greek_general_nopad_ci"> - <Charset>greek</Charset> - </collation> - <collation id="78" parent="1" name="greek_nopad_bin"> - <Charset>greek</Charset> - </collation> - <collation id="79" parent="1" name="cp1250_general_ci"> - <Charset>cp1250</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="80" parent="1" name="cp1250_czech_cs"> - <Charset>cp1250</Charset> - </collation> - <collation id="81" parent="1" name="cp1250_croatian_ci"> - <Charset>cp1250</Charset> - </collation> - <collation id="82" parent="1" name="cp1250_bin"> - <Charset>cp1250</Charset> - </collation> - <collation id="83" parent="1" name="cp1250_polish_ci"> - <Charset>cp1250</Charset> - </collation> - <collation id="84" parent="1" name="cp1250_general_nopad_ci"> - <Charset>cp1250</Charset> - </collation> - <collation id="85" parent="1" name="cp1250_nopad_bin"> - <Charset>cp1250</Charset> - </collation> - <collation id="86" parent="1" name="gbk_chinese_ci"> - <Charset>gbk</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="87" parent="1" name="gbk_bin"> - <Charset>gbk</Charset> - </collation> - <collation id="88" parent="1" name="gbk_chinese_nopad_ci"> - <Charset>gbk</Charset> - </collation> - <collation id="89" parent="1" name="gbk_nopad_bin"> - <Charset>gbk</Charset> - </collation> - <collation id="90" parent="1" name="latin5_turkish_ci"> - <Charset>latin5</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="91" parent="1" name="latin5_bin"> - <Charset>latin5</Charset> - </collation> - <collation id="92" parent="1" name="latin5_turkish_nopad_ci"> - <Charset>latin5</Charset> - </collation> - <collation id="93" parent="1" name="latin5_nopad_bin"> - <Charset>latin5</Charset> - </collation> - <collation id="94" parent="1" name="armscii8_general_ci"> - <Charset>armscii8</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="95" parent="1" name="armscii8_bin"> - <Charset>armscii8</Charset> - </collation> - <collation id="96" parent="1" name="armscii8_general_nopad_ci"> - <Charset>armscii8</Charset> - </collation> - <collation id="97" parent="1" name="armscii8_nopad_bin"> - <Charset>armscii8</Charset> - </collation> - <collation id="98" parent="1" name="utf8mb3_general_ci"> - <Charset>utf8mb3</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="99" parent="1" name="utf8mb3_bin"> - <Charset>utf8mb3</Charset> - </collation> - <collation id="100" parent="1" name="utf8mb3_unicode_ci"> - <Charset>utf8mb3</Charset> - </collation> - <collation id="101" parent="1" name="utf8mb3_icelandic_ci"> - <Charset>utf8mb3</Charset> - </collation> - <collation id="102" parent="1" name="utf8mb3_latvian_ci"> - <Charset>utf8mb3</Charset> - </collation> - <collation id="103" parent="1" name="utf8mb3_romanian_ci"> - <Charset>utf8mb3</Charset> - </collation> - <collation id="104" parent="1" name="utf8mb3_slovenian_ci"> - <Charset>utf8mb3</Charset> - </collation> - <collation id="105" parent="1" name="utf8mb3_polish_ci"> - <Charset>utf8mb3</Charset> - </collation> - <collation id="106" parent="1" name="utf8mb3_estonian_ci"> - <Charset>utf8mb3</Charset> - </collation> - <collation id="107" parent="1" name="utf8mb3_spanish_ci"> - <Charset>utf8mb3</Charset> - </collation> - <collation id="108" parent="1" name="utf8mb3_swedish_ci"> - <Charset>utf8mb3</Charset> - </collation> - <collation id="109" parent="1" name="utf8mb3_turkish_ci"> - <Charset>utf8mb3</Charset> - </collation> - <collation id="110" parent="1" name="utf8mb3_czech_ci"> - <Charset>utf8mb3</Charset> - </collation> - <collation id="111" parent="1" name="utf8mb3_danish_ci"> - <Charset>utf8mb3</Charset> - </collation> - <collation id="112" parent="1" name="utf8mb3_lithuanian_ci"> - <Charset>utf8mb3</Charset> - </collation> - <collation id="113" parent="1" name="utf8mb3_slovak_ci"> - <Charset>utf8mb3</Charset> - </collation> - <collation id="114" parent="1" name="utf8mb3_spanish2_ci"> - <Charset>utf8mb3</Charset> - </collation> - <collation id="115" parent="1" name="utf8mb3_roman_ci"> - <Charset>utf8mb3</Charset> - </collation> - <collation id="116" parent="1" name="utf8mb3_persian_ci"> - <Charset>utf8mb3</Charset> - </collation> - <collation id="117" parent="1" name="utf8mb3_esperanto_ci"> - <Charset>utf8mb3</Charset> - </collation> - <collation id="118" parent="1" name="utf8mb3_hungarian_ci"> - <Charset>utf8mb3</Charset> - </collation> - <collation id="119" parent="1" name="utf8mb3_sinhala_ci"> - <Charset>utf8mb3</Charset> - </collation> - <collation id="120" parent="1" name="utf8mb3_german2_ci"> - <Charset>utf8mb3</Charset> - </collation> - <collation id="121" parent="1" name="utf8mb3_croatian_mysql561_ci"> - <Charset>utf8mb3</Charset> - </collation> - <collation id="122" parent="1" name="utf8mb3_unicode_520_ci"> - <Charset>utf8mb3</Charset> - </collation> - <collation id="123" parent="1" name="utf8mb3_vietnamese_ci"> - <Charset>utf8mb3</Charset> - </collation> - <collation id="124" parent="1" name="utf8mb3_general_mysql500_ci"> - <Charset>utf8mb3</Charset> - </collation> - <collation id="125" parent="1" name="utf8mb3_croatian_ci"> - <Charset>utf8mb3</Charset> - </collation> - <collation id="126" parent="1" name="utf8mb3_myanmar_ci"> - <Charset>utf8mb3</Charset> - </collation> - <collation id="127" parent="1" name="utf8mb3_thai_520_w2"> - <Charset>utf8mb3</Charset> - </collation> - <collation id="128" parent="1" name="utf8mb3_general_nopad_ci"> - <Charset>utf8mb3</Charset> - </collation> - <collation id="129" parent="1" name="utf8mb3_nopad_bin"> - <Charset>utf8mb3</Charset> - </collation> - <collation id="130" parent="1" name="utf8mb3_unicode_nopad_ci"> - <Charset>utf8mb3</Charset> - </collation> - <collation id="131" parent="1" name="utf8mb3_unicode_520_nopad_ci"> - <Charset>utf8mb3</Charset> - </collation> - <collation id="132" parent="1" name="ucs2_general_ci"> - <Charset>ucs2</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="133" parent="1" name="ucs2_bin"> - <Charset>ucs2</Charset> - </collation> - <collation id="134" parent="1" name="ucs2_unicode_ci"> - <Charset>ucs2</Charset> - </collation> - <collation id="135" parent="1" name="ucs2_icelandic_ci"> - <Charset>ucs2</Charset> - </collation> - <collation id="136" parent="1" name="ucs2_latvian_ci"> - <Charset>ucs2</Charset> - </collation> - <collation id="137" parent="1" name="ucs2_romanian_ci"> - <Charset>ucs2</Charset> - </collation> - <collation id="138" parent="1" name="ucs2_slovenian_ci"> - <Charset>ucs2</Charset> - </collation> - <collation id="139" parent="1" name="ucs2_polish_ci"> - <Charset>ucs2</Charset> - </collation> - <collation id="140" parent="1" name="ucs2_estonian_ci"> - <Charset>ucs2</Charset> - </collation> - <collation id="141" parent="1" name="ucs2_spanish_ci"> - <Charset>ucs2</Charset> - </collation> - <collation id="142" parent="1" name="ucs2_swedish_ci"> - <Charset>ucs2</Charset> - </collation> - <collation id="143" parent="1" name="ucs2_turkish_ci"> - <Charset>ucs2</Charset> - </collation> - <collation id="144" parent="1" name="ucs2_czech_ci"> - <Charset>ucs2</Charset> - </collation> - <collation id="145" parent="1" name="ucs2_danish_ci"> - <Charset>ucs2</Charset> - </collation> - <collation id="146" parent="1" name="ucs2_lithuanian_ci"> - <Charset>ucs2</Charset> - </collation> - <collation id="147" parent="1" name="ucs2_slovak_ci"> - <Charset>ucs2</Charset> - </collation> - <collation id="148" parent="1" name="ucs2_spanish2_ci"> - <Charset>ucs2</Charset> - </collation> - <collation id="149" parent="1" name="ucs2_roman_ci"> - <Charset>ucs2</Charset> - </collation> - <collation id="150" parent="1" name="ucs2_persian_ci"> - <Charset>ucs2</Charset> - </collation> - <collation id="151" parent="1" name="ucs2_esperanto_ci"> - <Charset>ucs2</Charset> - </collation> - <collation id="152" parent="1" name="ucs2_hungarian_ci"> - <Charset>ucs2</Charset> - </collation> - <collation id="153" parent="1" name="ucs2_sinhala_ci"> - <Charset>ucs2</Charset> - </collation> - <collation id="154" parent="1" name="ucs2_german2_ci"> - <Charset>ucs2</Charset> - </collation> - <collation id="155" parent="1" name="ucs2_croatian_mysql561_ci"> - <Charset>ucs2</Charset> - </collation> - <collation id="156" parent="1" name="ucs2_unicode_520_ci"> - <Charset>ucs2</Charset> - </collation> - <collation id="157" parent="1" name="ucs2_vietnamese_ci"> - <Charset>ucs2</Charset> - </collation> - <collation id="158" parent="1" name="ucs2_general_mysql500_ci"> - <Charset>ucs2</Charset> - </collation> - <collation id="159" parent="1" name="ucs2_croatian_ci"> - <Charset>ucs2</Charset> - </collation> - <collation id="160" parent="1" name="ucs2_myanmar_ci"> - <Charset>ucs2</Charset> - </collation> - <collation id="161" parent="1" name="ucs2_thai_520_w2"> - <Charset>ucs2</Charset> - </collation> - <collation id="162" parent="1" name="ucs2_general_nopad_ci"> - <Charset>ucs2</Charset> - </collation> - <collation id="163" parent="1" name="ucs2_nopad_bin"> - <Charset>ucs2</Charset> - </collation> - <collation id="164" parent="1" name="ucs2_unicode_nopad_ci"> - <Charset>ucs2</Charset> - </collation> - <collation id="165" parent="1" name="ucs2_unicode_520_nopad_ci"> - <Charset>ucs2</Charset> - </collation> - <collation id="166" parent="1" name="cp866_general_ci"> - <Charset>cp866</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="167" parent="1" name="cp866_bin"> - <Charset>cp866</Charset> - </collation> - <collation id="168" parent="1" name="cp866_general_nopad_ci"> - <Charset>cp866</Charset> - </collation> - <collation id="169" parent="1" name="cp866_nopad_bin"> - <Charset>cp866</Charset> - </collation> - <collation id="170" parent="1" name="keybcs2_general_ci"> - <Charset>keybcs2</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="171" parent="1" name="keybcs2_bin"> - <Charset>keybcs2</Charset> - </collation> - <collation id="172" parent="1" name="keybcs2_general_nopad_ci"> - <Charset>keybcs2</Charset> - </collation> - <collation id="173" parent="1" name="keybcs2_nopad_bin"> - <Charset>keybcs2</Charset> - </collation> - <collation id="174" parent="1" name="macce_general_ci"> - <Charset>macce</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="175" parent="1" name="macce_bin"> - <Charset>macce</Charset> - </collation> - <collation id="176" parent="1" name="macce_general_nopad_ci"> - <Charset>macce</Charset> - </collation> - <collation id="177" parent="1" name="macce_nopad_bin"> - <Charset>macce</Charset> - </collation> - <collation id="178" parent="1" name="macroman_general_ci"> - <Charset>macroman</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="179" parent="1" name="macroman_bin"> - <Charset>macroman</Charset> - </collation> - <collation id="180" parent="1" name="macroman_general_nopad_ci"> - <Charset>macroman</Charset> - </collation> - <collation id="181" parent="1" name="macroman_nopad_bin"> - <Charset>macroman</Charset> - </collation> - <collation id="182" parent="1" name="cp852_general_ci"> - <Charset>cp852</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="183" parent="1" name="cp852_bin"> - <Charset>cp852</Charset> - </collation> - <collation id="184" parent="1" name="cp852_general_nopad_ci"> - <Charset>cp852</Charset> - </collation> - <collation id="185" parent="1" name="cp852_nopad_bin"> - <Charset>cp852</Charset> - </collation> - <collation id="186" parent="1" name="latin7_estonian_cs"> - <Charset>latin7</Charset> - </collation> - <collation id="187" parent="1" name="latin7_general_ci"> - <Charset>latin7</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="188" parent="1" name="latin7_general_cs"> - <Charset>latin7</Charset> - </collation> - <collation id="189" parent="1" name="latin7_bin"> - <Charset>latin7</Charset> - </collation> - <collation id="190" parent="1" name="latin7_general_nopad_ci"> - <Charset>latin7</Charset> - </collation> - <collation id="191" parent="1" name="latin7_nopad_bin"> - <Charset>latin7</Charset> - </collation> - <collation id="192" parent="1" name="utf8mb4_general_ci"> - <Charset>utf8mb4</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="193" parent="1" name="utf8mb4_bin"> - <Charset>utf8mb4</Charset> - </collation> - <collation id="194" parent="1" name="utf8mb4_unicode_ci"> - <Charset>utf8mb4</Charset> - </collation> - <collation id="195" parent="1" name="utf8mb4_icelandic_ci"> - <Charset>utf8mb4</Charset> - </collation> - <collation id="196" parent="1" name="utf8mb4_latvian_ci"> - <Charset>utf8mb4</Charset> - </collation> - <collation id="197" parent="1" name="utf8mb4_romanian_ci"> - <Charset>utf8mb4</Charset> - </collation> - <collation id="198" parent="1" name="utf8mb4_slovenian_ci"> - <Charset>utf8mb4</Charset> - </collation> - <collation id="199" parent="1" name="utf8mb4_polish_ci"> - <Charset>utf8mb4</Charset> - </collation> - <collation id="200" parent="1" name="utf8mb4_estonian_ci"> - <Charset>utf8mb4</Charset> - </collation> - <collation id="201" parent="1" name="utf8mb4_spanish_ci"> - <Charset>utf8mb4</Charset> - </collation> - <collation id="202" parent="1" name="utf8mb4_swedish_ci"> - <Charset>utf8mb4</Charset> - </collation> - <collation id="203" parent="1" name="utf8mb4_turkish_ci"> - <Charset>utf8mb4</Charset> - </collation> - <collation id="204" parent="1" name="utf8mb4_czech_ci"> - <Charset>utf8mb4</Charset> - </collation> - <collation id="205" parent="1" name="utf8mb4_danish_ci"> - <Charset>utf8mb4</Charset> - </collation> - <collation id="206" parent="1" name="utf8mb4_lithuanian_ci"> - <Charset>utf8mb4</Charset> - </collation> - <collation id="207" parent="1" name="utf8mb4_slovak_ci"> - <Charset>utf8mb4</Charset> - </collation> - <collation id="208" parent="1" name="utf8mb4_spanish2_ci"> - <Charset>utf8mb4</Charset> - </collation> - <collation id="209" parent="1" name="utf8mb4_roman_ci"> - <Charset>utf8mb4</Charset> - </collation> - <collation id="210" parent="1" name="utf8mb4_persian_ci"> - <Charset>utf8mb4</Charset> - </collation> - <collation id="211" parent="1" name="utf8mb4_esperanto_ci"> - <Charset>utf8mb4</Charset> - </collation> - <collation id="212" parent="1" name="utf8mb4_hungarian_ci"> - <Charset>utf8mb4</Charset> - </collation> - <collation id="213" parent="1" name="utf8mb4_sinhala_ci"> - <Charset>utf8mb4</Charset> - </collation> - <collation id="214" parent="1" name="utf8mb4_german2_ci"> - <Charset>utf8mb4</Charset> - </collation> - <collation id="215" parent="1" name="utf8mb4_croatian_mysql561_ci"> - <Charset>utf8mb4</Charset> - </collation> - <collation id="216" parent="1" name="utf8mb4_unicode_520_ci"> - <Charset>utf8mb4</Charset> - </collation> - <collation id="217" parent="1" name="utf8mb4_vietnamese_ci"> - <Charset>utf8mb4</Charset> - </collation> - <collation id="218" parent="1" name="utf8mb4_croatian_ci"> - <Charset>utf8mb4</Charset> - </collation> - <collation id="219" parent="1" name="utf8mb4_myanmar_ci"> - <Charset>utf8mb4</Charset> - </collation> - <collation id="220" parent="1" name="utf8mb4_thai_520_w2"> - <Charset>utf8mb4</Charset> - </collation> - <collation id="221" parent="1" name="utf8mb4_general_nopad_ci"> - <Charset>utf8mb4</Charset> - </collation> - <collation id="222" parent="1" name="utf8mb4_nopad_bin"> - <Charset>utf8mb4</Charset> - </collation> - <collation id="223" parent="1" name="utf8mb4_unicode_nopad_ci"> - <Charset>utf8mb4</Charset> - </collation> - <collation id="224" parent="1" name="utf8mb4_unicode_520_nopad_ci"> - <Charset>utf8mb4</Charset> - </collation> - <collation id="225" parent="1" name="cp1251_bulgarian_ci"> - <Charset>cp1251</Charset> - </collation> - <collation id="226" parent="1" name="cp1251_ukrainian_ci"> - <Charset>cp1251</Charset> - </collation> - <collation id="227" parent="1" name="cp1251_bin"> - <Charset>cp1251</Charset> - </collation> - <collation id="228" parent="1" name="cp1251_general_ci"> - <Charset>cp1251</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="229" parent="1" name="cp1251_general_cs"> - <Charset>cp1251</Charset> - </collation> - <collation id="230" parent="1" name="cp1251_nopad_bin"> - <Charset>cp1251</Charset> - </collation> - <collation id="231" parent="1" name="cp1251_general_nopad_ci"> - <Charset>cp1251</Charset> - </collation> - <collation id="232" parent="1" name="utf16_general_ci"> - <Charset>utf16</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="233" parent="1" name="utf16_bin"> - <Charset>utf16</Charset> - </collation> - <collation id="234" parent="1" name="utf16_unicode_ci"> - <Charset>utf16</Charset> - </collation> - <collation id="235" parent="1" name="utf16_icelandic_ci"> - <Charset>utf16</Charset> - </collation> - <collation id="236" parent="1" name="utf16_latvian_ci"> - <Charset>utf16</Charset> - </collation> - <collation id="237" parent="1" name="utf16_romanian_ci"> - <Charset>utf16</Charset> - </collation> - <collation id="238" parent="1" name="utf16_slovenian_ci"> - <Charset>utf16</Charset> - </collation> - <collation id="239" parent="1" name="utf16_polish_ci"> - <Charset>utf16</Charset> - </collation> - <collation id="240" parent="1" name="utf16_estonian_ci"> - <Charset>utf16</Charset> - </collation> - <collation id="241" parent="1" name="utf16_spanish_ci"> - <Charset>utf16</Charset> - </collation> - <collation id="242" parent="1" name="utf16_swedish_ci"> - <Charset>utf16</Charset> - </collation> - <collation id="243" parent="1" name="utf16_turkish_ci"> - <Charset>utf16</Charset> - </collation> - <collation id="244" parent="1" name="utf16_czech_ci"> - <Charset>utf16</Charset> - </collation> - <collation id="245" parent="1" name="utf16_danish_ci"> - <Charset>utf16</Charset> - </collation> - <collation id="246" parent="1" name="utf16_lithuanian_ci"> - <Charset>utf16</Charset> - </collation> - <collation id="247" parent="1" name="utf16_slovak_ci"> - <Charset>utf16</Charset> - </collation> - <collation id="248" parent="1" name="utf16_spanish2_ci"> - <Charset>utf16</Charset> - </collation> - <collation id="249" parent="1" name="utf16_roman_ci"> - <Charset>utf16</Charset> - </collation> - <collation id="250" parent="1" name="utf16_persian_ci"> - <Charset>utf16</Charset> - </collation> - <collation id="251" parent="1" name="utf16_esperanto_ci"> - <Charset>utf16</Charset> - </collation> - <collation id="252" parent="1" name="utf16_hungarian_ci"> - <Charset>utf16</Charset> - </collation> - <collation id="253" parent="1" name="utf16_sinhala_ci"> - <Charset>utf16</Charset> - </collation> - <collation id="254" parent="1" name="utf16_german2_ci"> - <Charset>utf16</Charset> - </collation> - <collation id="255" parent="1" name="utf16_croatian_mysql561_ci"> - <Charset>utf16</Charset> - </collation> - <collation id="256" parent="1" name="utf16_unicode_520_ci"> - <Charset>utf16</Charset> - </collation> - <collation id="257" parent="1" name="utf16_vietnamese_ci"> - <Charset>utf16</Charset> - </collation> - <collation id="258" parent="1" name="utf16_croatian_ci"> - <Charset>utf16</Charset> - </collation> - <collation id="259" parent="1" name="utf16_myanmar_ci"> - <Charset>utf16</Charset> - </collation> - <collation id="260" parent="1" name="utf16_thai_520_w2"> - <Charset>utf16</Charset> - </collation> - <collation id="261" parent="1" name="utf16_general_nopad_ci"> - <Charset>utf16</Charset> - </collation> - <collation id="262" parent="1" name="utf16_nopad_bin"> - <Charset>utf16</Charset> - </collation> - <collation id="263" parent="1" name="utf16_unicode_nopad_ci"> - <Charset>utf16</Charset> - </collation> - <collation id="264" parent="1" name="utf16_unicode_520_nopad_ci"> - <Charset>utf16</Charset> - </collation> - <collation id="265" parent="1" name="utf16le_general_ci"> - <Charset>utf16le</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="266" parent="1" name="utf16le_bin"> - <Charset>utf16le</Charset> - </collation> - <collation id="267" parent="1" name="utf16le_general_nopad_ci"> - <Charset>utf16le</Charset> - </collation> - <collation id="268" parent="1" name="utf16le_nopad_bin"> - <Charset>utf16le</Charset> - </collation> - <collation id="269" parent="1" name="cp1256_general_ci"> - <Charset>cp1256</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="270" parent="1" name="cp1256_bin"> - <Charset>cp1256</Charset> - </collation> - <collation id="271" parent="1" name="cp1256_general_nopad_ci"> - <Charset>cp1256</Charset> - </collation> - <collation id="272" parent="1" name="cp1256_nopad_bin"> - <Charset>cp1256</Charset> - </collation> - <collation id="273" parent="1" name="cp1257_lithuanian_ci"> - <Charset>cp1257</Charset> - </collation> - <collation id="274" parent="1" name="cp1257_bin"> - <Charset>cp1257</Charset> - </collation> - <collation id="275" parent="1" name="cp1257_general_ci"> - <Charset>cp1257</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="276" parent="1" name="cp1257_nopad_bin"> - <Charset>cp1257</Charset> - </collation> - <collation id="277" parent="1" name="cp1257_general_nopad_ci"> - <Charset>cp1257</Charset> - </collation> - <collation id="278" parent="1" name="utf32_general_ci"> - <Charset>utf32</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="279" parent="1" name="utf32_bin"> - <Charset>utf32</Charset> - </collation> - <collation id="280" parent="1" name="utf32_unicode_ci"> - <Charset>utf32</Charset> - </collation> - <collation id="281" parent="1" name="utf32_icelandic_ci"> - <Charset>utf32</Charset> - </collation> - <collation id="282" parent="1" name="utf32_latvian_ci"> - <Charset>utf32</Charset> - </collation> - <collation id="283" parent="1" name="utf32_romanian_ci"> - <Charset>utf32</Charset> - </collation> - <collation id="284" parent="1" name="utf32_slovenian_ci"> - <Charset>utf32</Charset> - </collation> - <collation id="285" parent="1" name="utf32_polish_ci"> - <Charset>utf32</Charset> - </collation> - <collation id="286" parent="1" name="utf32_estonian_ci"> - <Charset>utf32</Charset> - </collation> - <collation id="287" parent="1" name="utf32_spanish_ci"> - <Charset>utf32</Charset> - </collation> - <collation id="288" parent="1" name="utf32_swedish_ci"> - <Charset>utf32</Charset> - </collation> - <collation id="289" parent="1" name="utf32_turkish_ci"> - <Charset>utf32</Charset> - </collation> - <collation id="290" parent="1" name="utf32_czech_ci"> - <Charset>utf32</Charset> - </collation> - <collation id="291" parent="1" name="utf32_danish_ci"> - <Charset>utf32</Charset> - </collation> - <collation id="292" parent="1" name="utf32_lithuanian_ci"> - <Charset>utf32</Charset> - </collation> - <collation id="293" parent="1" name="utf32_slovak_ci"> - <Charset>utf32</Charset> - </collation> - <collation id="294" parent="1" name="utf32_spanish2_ci"> - <Charset>utf32</Charset> - </collation> - <collation id="295" parent="1" name="utf32_roman_ci"> - <Charset>utf32</Charset> - </collation> - <collation id="296" parent="1" name="utf32_persian_ci"> - <Charset>utf32</Charset> - </collation> - <collation id="297" parent="1" name="utf32_esperanto_ci"> - <Charset>utf32</Charset> - </collation> - <collation id="298" parent="1" name="utf32_hungarian_ci"> - <Charset>utf32</Charset> - </collation> - <collation id="299" parent="1" name="utf32_sinhala_ci"> - <Charset>utf32</Charset> - </collation> - <collation id="300" parent="1" name="utf32_german2_ci"> - <Charset>utf32</Charset> - </collation> - <collation id="301" parent="1" name="utf32_croatian_mysql561_ci"> - <Charset>utf32</Charset> - </collation> - <collation id="302" parent="1" name="utf32_unicode_520_ci"> - <Charset>utf32</Charset> - </collation> - <collation id="303" parent="1" name="utf32_vietnamese_ci"> - <Charset>utf32</Charset> - </collation> - <collation id="304" parent="1" name="utf32_croatian_ci"> - <Charset>utf32</Charset> - </collation> - <collation id="305" parent="1" name="utf32_myanmar_ci"> - <Charset>utf32</Charset> - </collation> - <collation id="306" parent="1" name="utf32_thai_520_w2"> - <Charset>utf32</Charset> - </collation> - <collation id="307" parent="1" name="utf32_general_nopad_ci"> - <Charset>utf32</Charset> - </collation> - <collation id="308" parent="1" name="utf32_nopad_bin"> - <Charset>utf32</Charset> - </collation> - <collation id="309" parent="1" name="utf32_unicode_nopad_ci"> - <Charset>utf32</Charset> - </collation> - <collation id="310" parent="1" name="utf32_unicode_520_nopad_ci"> - <Charset>utf32</Charset> - </collation> - <collation id="311" parent="1" name="binary"> - <Charset>binary</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="312" parent="1" name="geostd8_general_ci"> - <Charset>geostd8</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="313" parent="1" name="geostd8_bin"> - <Charset>geostd8</Charset> - </collation> - <collation id="314" parent="1" name="geostd8_general_nopad_ci"> - <Charset>geostd8</Charset> - </collation> - <collation id="315" parent="1" name="geostd8_nopad_bin"> - <Charset>geostd8</Charset> - </collation> - <collation id="316" parent="1" name="cp932_japanese_ci"> - <Charset>cp932</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="317" parent="1" name="cp932_bin"> - <Charset>cp932</Charset> - </collation> - <collation id="318" parent="1" name="cp932_japanese_nopad_ci"> - <Charset>cp932</Charset> - </collation> - <collation id="319" parent="1" name="cp932_nopad_bin"> - <Charset>cp932</Charset> - </collation> - <collation id="320" parent="1" name="eucjpms_japanese_ci"> - <Charset>eucjpms</Charset> - <DefaultForCharset>1</DefaultForCharset> - </collation> - <collation id="321" parent="1" name="eucjpms_bin"> - <Charset>eucjpms</Charset> - </collation> - <collation id="322" parent="1" name="eucjpms_japanese_nopad_ci"> - <Charset>eucjpms</Charset> - </collation> - <collation id="323" parent="1" name="eucjpms_nopad_bin"> - <Charset>eucjpms</Charset> - </collation> - <schema id="324" parent="1" name="information_schema"> - <CollationName>utf8mb3_general_ci</CollationName> - </schema> - <schema id="325" parent="1" name="mysql"> - <CollationName>utf8mb4_general_ci</CollationName> - </schema> - <schema id="326" parent="1" name="performance_schema"> - <CollationName>utf8mb3_general_ci</CollationName> - </schema> - <schema id="327" parent="1" name="id"> - <Current>1</Current> - <LastIntrospectionLocalTimestamp>2023-11-16.19:58:50</LastIntrospectionLocalTimestamp> - <CollationName>utf8mb4_general_ci</CollationName> - </schema> - <schema id="328" parent="1" name="phpmyadmin"> - <CollationName>utf8mb4_general_ci</CollationName> - </schema> - <schema id="329" parent="1" name="sys"> - <CollationName>utf8mb3_general_ci</CollationName> - </schema> - <user id="330" parent="1" name="mariadb.sys"> - <Host>localhost</Host> - </user> - <user id="331" parent="1" name="root"> - <Host>localhost</Host> - </user> - <user id="332" parent="1" name="mysql"> - <Host>localhost</Host> - </user> - <user id="333" parent="1" name="bye"/> - <user id="334" parent="1" name="phpmyadmin"> - <Host>localhost</Host> - </user> - <user id="335" parent="1" name="id"/> - <user id="336" parent="1" name="bye"> - <Host>100.12.43.1</Host> - </user> - <table id="337" parent="327" name="accounts"> - <Engine>InnoDB</Engine> - <CollationName>utf8mb4_general_ci</CollationName> - </table> - <table id="338" parent="327" name="apps"> - <Engine>InnoDB</Engine> - <CollationName>utf8mb4_general_ci</CollationName> - </table> - <table id="339" parent="327" name="badges"> - <Engine>InnoDB</Engine> - <CollationName>utf8mb4_general_ci</CollationName> - </table> - <table id="340" parent="327" name="password_resets"> - <Engine>InnoDB</Engine> - <CollationName>utf8mb4_general_ci</CollationName> - </table> - <table id="341" parent="327" name="profiles"> - <Engine>InnoDB</Engine> - <CollationName>utf8mb4_general_ci</CollationName> - </table> - <column id="342" parent="337" name="id"> - <DasType>varchar(7)|0s</DasType> - <NotNull>1</NotNull> - <Position>1</Position> - </column> - <column id="343" parent="337" name="email"> - <DasType>text|0s</DasType> - <NotNull>1</NotNull> - <Position>2</Position> - </column> - <column id="344" parent="337" name="created_date"> - <DasType>date|0s</DasType> - <DefaultExpression>current_timestamp()</DefaultExpression> - <NotNull>1</NotNull> - <Position>3</Position> - </column> - <column id="345" parent="337" name="display_name"> - <DasType>text|0s</DasType> - <Position>4</Position> - </column> - <column id="346" parent="337" name="password"> - <DasType>text|0s</DasType> - <NotNull>1</NotNull> - <Position>5</Position> - </column> - <column id="347" parent="337" name="verified"> - <DasType>tinyint(1)|0s</DasType> - <NotNull>1</NotNull> - <Position>6</Position> - </column> - <column id="348" parent="337" name="has_pfp"> - <DasType>tinyint(1)|0s</DasType> - <DefaultExpression>0</DefaultExpression> - <NotNull>1</NotNull> - <Position>7</Position> - </column> - <column id="349" parent="337" name="is_admin"> - <DasType>tinyint(1)|0s</DasType> - <DefaultExpression>0</DefaultExpression> - <NotNull>1</NotNull> - <Position>8</Position> - </column> - <index id="350" parent="337" name="PRIMARY"> - <ColNames>id</ColNames> - <Type>btree</Type> - <Unique>1</Unique> - </index> - <index id="351" parent="337" name="email"> - <ColNames>email</ColNames> - <Type>hash</Type> - <Unique>1</Unique> - </index> - <key id="352" parent="337" name="PRIMARY"> - <NameSurrogate>1</NameSurrogate> - <Primary>1</Primary> - <UnderlyingIndexName>PRIMARY</UnderlyingIndexName> - </key> - <key id="353" parent="337" name="email"> - <UnderlyingIndexName>email</UnderlyingIndexName> - </key> - <column id="354" parent="338" name="id"> - <DasType>int(10)|0s</DasType> - <NotNull>1</NotNull> - <Position>1</Position> - </column> - <column id="355" parent="338" name="owner_id"> - <DasType>varchar(7)|0s</DasType> - <Position>2</Position> - </column> - <column id="356" parent="338" name="title"> - <DasType>text|0s</DasType> - <NotNull>1</NotNull> - <Position>3</Position> - </column> - <column id="357" parent="338" name="description"> - <DasType>text|0s</DasType> - <Position>4</Position> - </column> - <foreign-key id="358" parent="338" name="apps_ibfk_1"> - <ColNames>owner_id</ColNames> - <OnDelete>set-null</OnDelete> - <OnUpdate>cascade</OnUpdate> - <RefColNames>id</RefColNames> - <RefTableName>accounts</RefTableName> - </foreign-key> - <index id="359" parent="338" name="PRIMARY"> - <ColNames>id</ColNames> - <Type>btree</Type> - <Unique>1</Unique> - </index> - <index id="360" parent="338" name="apps_ibfk_1"> - <ColNames>owner_id</ColNames> - <Type>btree</Type> - </index> - <key id="361" parent="338" name="PRIMARY"> - <NameSurrogate>1</NameSurrogate> - <Primary>1</Primary> - <UnderlyingIndexName>PRIMARY</UnderlyingIndexName> - </key> - <column id="362" parent="339" name="id"> - <AutoIncrement>1</AutoIncrement> - <DasType>int(11)|0s</DasType> - <NotNull>1</NotNull> - <Position>1</Position> - </column> - <column id="363" parent="339" name="app_id"> - <DasType>int(11)|0s</DasType> - <NotNull>1</NotNull> - <Position>2</Position> - </column> - <column id="364" parent="339" name="title"> - <DasType>text|0s</DasType> - <NotNull>1</NotNull> - <Position>3</Position> - </column> - <column id="365" parent="339" name="description"> - <DasType>text|0s</DasType> - <Position>4</Position> - </column> - <column id="366" parent="339" name="image"> - <DasType>text|0s</DasType> - <NotNull>1</NotNull> - <Position>5</Position> - </column> - <foreign-key id="367" parent="339" name="badges_ibfk_1"> - <ColNames>app_id</ColNames> - <RefColNames>id</RefColNames> - <RefTableName>apps</RefTableName> - </foreign-key> - <index id="368" parent="339" name="PRIMARY"> - <ColNames>id</ColNames> - <Type>btree</Type> - <Unique>1</Unique> - </index> - <index id="369" parent="339" name="app_id"> - <ColNames>app_id</ColNames> - <Type>btree</Type> - </index> - <key id="370" parent="339" name="PRIMARY"> - <NameSurrogate>1</NameSurrogate> - <Primary>1</Primary> - <UnderlyingIndexName>PRIMARY</UnderlyingIndexName> - </key> - <column id="371" parent="340" name="id"> - <AutoIncrement>8</AutoIncrement> - <DasType>int(11)|0s</DasType> - <NotNull>1</NotNull> - <Position>1</Position> - </column> - <column id="372" parent="340" name="auth_id"> - <DasType>tinytext|0s</DasType> - <NotNull>1</NotNull> - <Position>2</Position> - </column> - <column id="373" parent="340" name="owner_id"> - <DasType>varchar(7)|0s</DasType> - <NotNull>1</NotNull> - <Position>3</Position> - </column> - <column id="374" parent="340" name="expiration"> - <DasType>int(11)|0s</DasType> - <NotNull>1</NotNull> - <Position>4</Position> - </column> - <foreign-key id="375" parent="340" name="password_resets_ibfk_1"> - <ColNames>owner_id</ColNames> - <RefColNames>id</RefColNames> - <RefTableName>accounts</RefTableName> - </foreign-key> - <index id="376" parent="340" name="PRIMARY"> - <ColNames>id</ColNames> - <Type>btree</Type> - <Unique>1</Unique> - </index> - <index id="377" parent="340" name="owner_id"> - <ColNames>owner_id</ColNames> - <Type>btree</Type> - </index> - <key id="378" parent="340" name="PRIMARY"> - <NameSurrogate>1</NameSurrogate> - <Primary>1</Primary> - <UnderlyingIndexName>PRIMARY</UnderlyingIndexName> - </key> - <column id="379" parent="341" name="id"> - <DasType>varchar(7)|0s</DasType> - <NotNull>1</NotNull> - <Position>1</Position> - </column> - <column id="380" parent="341" name="description"> - <DasType>text|0s</DasType> - <Position>2</Position> - </column> - <column id="381" parent="341" name="public_avatar"> - <DasType>tinyint(1)|0s</DasType> - <DefaultExpression>0</DefaultExpression> - <NotNull>1</NotNull> - <Position>3</Position> - </column> - <column id="382" parent="341" name="public_display_name"> - <DasType>tinyint(1)|0s</DasType> - <DefaultExpression>0</DefaultExpression> - <NotNull>1</NotNull> - <Position>4</Position> - </column> - <foreign-key id="383" parent="341" name="profiles_ibfk_1"> - <ColNames>id</ColNames> - <RefColNames>id</RefColNames> - <RefTableName>accounts</RefTableName> - </foreign-key> - <index id="384" parent="341" name="PRIMARY"> - <ColNames>id</ColNames> - <Type>btree</Type> - <Unique>1</Unique> - </index> - <key id="385" parent="341" name="PRIMARY"> - <NameSurrogate>1</NameSurrogate> - <Primary>1</Primary> - <UnderlyingIndexName>PRIMARY</UnderlyingIndexName> - </key> - </database-model> -</dataSource> \ No newline at end of file diff --git a/.idea/dataSources/5bc27beb-c8ab-420d-bdbc-055b37ae9e39/storage_v2/_src_/schema/id.Gw0AAA.meta b/.idea/dataSources/5bc27beb-c8ab-420d-bdbc-055b37ae9e39/storage_v2/_src_/schema/id.Gw0AAA.meta deleted file mode 100644 index d4880e4fd594cdbe86f337e7a3c56583cd952f80..0000000000000000000000000000000000000000 --- a/.idea/dataSources/5bc27beb-c8ab-420d-bdbc-055b37ae9e39/storage_v2/_src_/schema/id.Gw0AAA.meta +++ /dev/null @@ -1,2 +0,0 @@ -#n:id -!<md> [1700164719000, 0, null, null, -2147483648, -2147483648] diff --git a/.idea/dataSources/5bc27beb-c8ab-420d-bdbc-055b37ae9e39/storage_v2/_src_/schema/information_schema.FNRwLQ.meta b/.idea/dataSources/5bc27beb-c8ab-420d-bdbc-055b37ae9e39/storage_v2/_src_/schema/information_schema.FNRwLQ.meta deleted file mode 100644 index 1ff3db2ebf3a00ed58bb22e65f9d091bd1406153..0000000000000000000000000000000000000000 --- a/.idea/dataSources/5bc27beb-c8ab-420d-bdbc-055b37ae9e39/storage_v2/_src_/schema/information_schema.FNRwLQ.meta +++ /dev/null @@ -1,2 +0,0 @@ -#n:information_schema -!<md> [null, 0, null, null, -2147483648, -2147483648] diff --git a/.idea/dataSources/5bc27beb-c8ab-420d-bdbc-055b37ae9e39/storage_v2/_src_/schema/mysql.osA4Bg.meta b/.idea/dataSources/5bc27beb-c8ab-420d-bdbc-055b37ae9e39/storage_v2/_src_/schema/mysql.osA4Bg.meta deleted file mode 100644 index 86a53f191212bb859cc41144157bb22c69d7fcc3..0000000000000000000000000000000000000000 --- a/.idea/dataSources/5bc27beb-c8ab-420d-bdbc-055b37ae9e39/storage_v2/_src_/schema/mysql.osA4Bg.meta +++ /dev/null @@ -1,2 +0,0 @@ -#n:mysql -!<md> [null, 0, null, null, -2147483648, -2147483648] diff --git a/.idea/dataSources/5bc27beb-c8ab-420d-bdbc-055b37ae9e39/storage_v2/_src_/schema/performance_schema.kIw0nw.meta b/.idea/dataSources/5bc27beb-c8ab-420d-bdbc-055b37ae9e39/storage_v2/_src_/schema/performance_schema.kIw0nw.meta deleted file mode 100644 index 9394db147cfd1a9c965f69951db070fb73640c25..0000000000000000000000000000000000000000 --- a/.idea/dataSources/5bc27beb-c8ab-420d-bdbc-055b37ae9e39/storage_v2/_src_/schema/performance_schema.kIw0nw.meta +++ /dev/null @@ -1,2 +0,0 @@ -#n:performance_schema -!<md> [null, 0, null, null, -2147483648, -2147483648] diff --git a/.idea/id.iml b/.idea/id.iml deleted file mode 100644 index 7267852f3a63b79873cf96ee72724d6ceb5af5e6..0000000000000000000000000000000000000000 --- a/.idea/id.iml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module type="WEB_MODULE" version="4"> - <component name="NewModuleRootManager"> - <content url="file://$MODULE_DIR$"> - <excludeFolder url="file://$MODULE_DIR$/.tmp" /> - <excludeFolder url="file://$MODULE_DIR$/temp" /> - <excludeFolder url="file://$MODULE_DIR$/tmp" /> - <excludeFolder url="file://$MODULE_DIR$/vendor/composer" /> - <excludeFolder url="file://$MODULE_DIR$/vendor/guzzlehttp/psr7" /> - <excludeFolder url="file://$MODULE_DIR$/vendor/jean85/pretty-package-versions" /> - <excludeFolder url="file://$MODULE_DIR$/vendor/phpmailer/phpmailer" /> - <excludeFolder url="file://$MODULE_DIR$/vendor/psr/http-factory" /> - <excludeFolder url="file://$MODULE_DIR$/vendor/psr/http-message" /> - <excludeFolder url="file://$MODULE_DIR$/vendor/psr/log" /> - <excludeFolder url="file://$MODULE_DIR$/vendor/ralouphie/getallheaders" /> - <excludeFolder url="file://$MODULE_DIR$/vendor/sentry/sentry" /> - <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/deprecation-contracts" /> - <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/options-resolver" /> - <excludeFolder url="file://$MODULE_DIR$/vendor/erusev/parsedown" /> - <excludeFolder url="file://$MODULE_DIR$/vendor/erusev/parsedown-extra" /> - <excludeFolder url="file://$MODULE_DIR$/vendor/kornrunner/blurhash" /> - <excludeFolder url="file://$MODULE_DIR$/vendor/guzzlehttp/guzzle" /> - <excludeFolder url="file://$MODULE_DIR$/vendor/guzzlehttp/promises" /> - <excludeFolder url="file://$MODULE_DIR$/vendor/psr/http-client" /> - <excludeFolder url="file://$MODULE_DIR$/vendor/resend/resend-php" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - </component> -</module> \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 9367315ceb4a0ce1b29d286979fe9e07d10d7542..0000000000000000000000000000000000000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="ProjectModuleManager"> - <modules> - <module fileurl="file://$PROJECT_DIR$/.idea/id.iml" filepath="$PROJECT_DIR$/.idea/id.iml" /> - </modules> - </component> -</project> \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml deleted file mode 100644 index a30690cdaf32fda0fa81ce7d9375c0f316212419..0000000000000000000000000000000000000000 --- a/.idea/php.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="MessDetectorOptionsConfiguration"> - <option name="transferred" value="true" /> - </component> - <component name="PHPCSFixerOptionsConfiguration"> - <option name="transferred" value="true" /> - </component> - <component name="PHPCodeSnifferOptionsConfiguration"> - <option name="highlightLevel" value="WARNING" /> - <option name="transferred" value="true" /> - </component> - <component name="PhpIncludePathManager"> - <include_path> - <path value="$PROJECT_DIR$/vendor/psr/log" /> - <path value="$PROJECT_DIR$/vendor/jean85/pretty-package-versions" /> - <path value="$PROJECT_DIR$/vendor/ralouphie/getallheaders" /> - <path value="$PROJECT_DIR$/vendor/sentry/sentry" /> - <path value="$PROJECT_DIR$/vendor/guzzlehttp/psr7" /> - <path value="$PROJECT_DIR$/vendor/symfony/deprecation-contracts" /> - <path value="$PROJECT_DIR$/vendor/symfony/options-resolver" /> - <path value="$PROJECT_DIR$/vendor/composer" /> - <path value="$PROJECT_DIR$/vendor/phpmailer/phpmailer" /> - <path value="$PROJECT_DIR$/vendor/psr/http-factory" /> - <path value="$PROJECT_DIR$/vendor/psr/http-message" /> - <path value="$PROJECT_DIR$/vendor/erusev/parsedown" /> - <path value="$PROJECT_DIR$/vendor/erusev/parsedown-extra" /> - <path value="$PROJECT_DIR$/vendor/kornrunner/blurhash" /> - <path value="$PROJECT_DIR$/vendor/guzzlehttp/guzzle" /> - <path value="$PROJECT_DIR$/vendor/guzzlehttp/promises" /> - <path value="$PROJECT_DIR$/vendor/resend/resend-php" /> - <path value="$PROJECT_DIR$/vendor/psr/http-client" /> - </include_path> - </component> - <component name="PhpProjectSharedConfiguration" php_language_level="8.1" /> - <component name="PhpStanOptionsConfiguration"> - <option name="transferred" value="true" /> - </component> - <component name="PhpUnit"> - <phpunit_settings> - <PhpUnitSettings custom_loader_path="$PROJECT_DIR$/vendor/autoload.php" /> - </phpunit_settings> - </component> - <component name="PsalmOptionsConfiguration"> - <option name="transferred" value="true" /> - </component> -</project> \ No newline at end of file diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml deleted file mode 100644 index 63772a38dd7db38163dcbc79f16b90062e3e51d0..0000000000000000000000000000000000000000 --- a/.idea/sqldialects.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="SqlDialectMappings"> - <file url="PROJECT" dialect="MariaDB" /> - </component> -</project> \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1ddfbbc029bcab630581847471d7f238ec53..0000000000000000000000000000000000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="VcsDirectoryMappings"> - <mapping directory="" vcs="Git" /> - </component> -</project> \ No newline at end of file diff --git a/accounts_handler.php b/accounts_handler.php index 9add2f527a7c7dde64d58d3bbc580c01f4129549..5d862b900783304ae9b9493d9f2b84c44e9b3330 100644 --- a/accounts_handler.php +++ b/accounts_handler.php @@ -25,7 +25,7 @@ function get_avatar_url($bcid):string { } -function get_display_name($bcid, $use_bcid_fallback=true, $put_bcid_in_parenthesis=false):string { +function get_display_name($bcid, $use_bcid_fallback=true, $put_bcid_in_parenthesis=false, $format_bcid=false):string { $display_name = db_execute("SELECT display_name FROM accounts WHERE id = ?", [$bcid])['display_name']; if (!empty($display_name)) { if ($put_bcid_in_parenthesis) { diff --git a/admin_apps_create.php b/admin_apps_create.php index 0de29ff1157b0834a42dc7724ba3569f49fa02d6..1e495fbbbaf2a590e5ce4fbd5580e87fe77e7e5b 100644 --- a/admin_apps_create.php +++ b/admin_apps_create.php @@ -13,7 +13,7 @@ function check_app_id($app_id): bool if ($_SERVER['REQUEST_METHOD'] == "POST") { $app_id = generate_app_id(); - db_execute("INSERT INTO apps (id, owner_id, title, description, type) VALUES (?, ?, ?, ?, ?)", [$app_id, $_POST['owner'], $_POST['title'], $_POST['description'], $_POST['type']]); + db_execute("INSERT INTO apps (id, owner_id, title, description, type, callback) VALUES (?, ?, ?, ?, ?, ?)", [$app_id, $_POST['owner'], $_POST['title'], $_POST['description'], $_POST['type'], $_POST['callback']]); die(); } @@ -40,5 +40,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { <option value="null">None</option> <option value="basic_login">Basic login</option> </select> - <button type="submit">Create app</button> + <label for="callback">Callback</label> + <input type="url" id="callback" name="callback" /> + <button type="submit" class="primary">Create app</button> </form> \ No newline at end of file diff --git a/admin_initdatabase.php b/admin_initdatabase.php index fec3bb93c0bf89b5506fbafabd2896df42ce00f7..838580c4140878bb99ae8b273fb41fb3393a2487 100644 --- a/admin_initdatabase.php +++ b/admin_initdatabase.php @@ -6,15 +6,15 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { echo "<p>Create table `accounts`"; $stmt = $pdo->prepare('create table accounts ( - id varchar(7) not null + id varchar(7) not null primary key, - email text not null, - created_date date default current_timestamp() not null, - display_name text null, - password text not null, - verified tinyint(1) default 0 not null, - has_pfp tinyint(1) default 0 not null, - is_admin tinyint(1) default 0 not null, + email text not null, + created_date datetime default current_timestamp() not null, + display_name text null, + password text not null, + verified tinyint(1) default 0 not null, + has_pfp tinyint(1) default 0 not null, + is_admin tinyint(1) default 0 not null, constraint email unique (email) using hash );'); @@ -73,6 +73,8 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { title text not null, description text, image text default "https://id.byecorps.com/assets/default.png" not null, + type text null, + callback text null, constraint badges_ibfk_1 foreign key (app_id) references apps (id) );'); @@ -89,6 +91,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { description text null, public_avatar tinyint(1) default 0, public_display_name tinyint(1) default 0, + constraint profiles_ibfk_1 foreign key (id) references accounts (id) );'); @@ -96,6 +99,26 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { echo('<p>An error occurred: '. $e->getMessage() .'. Most likely this is already set.'); } + echo '<p>Create the `tokens` table'; + + try { + db_execute('create table tokens ( + id int auto_increment primary key, + access_token text unique, + refresh_token text null, + expiry int not null, + owner_id varchar(7), + application_id int(10) null, + + constraint tokens_application_id + foreign key (application_id) references apps (id), + constraint tokens_owner_id + foreign key (owner_id) references accounts (id) + );'); + } catch (PDOException $e) { + echo('<p>An error occurred: '. $e->getMessage() .'. Most likely this is already set.'); + } + echo "<p>Database initialised.</p>"; } diff --git a/forgot_password.php b/forgot_password.php index f8180ea8ce54e0f4884763b3982bc886ca79ad21..bd0232508216a8fd5348488e9fd0726b06435500 100644 --- a/forgot_password.php +++ b/forgot_password.php @@ -16,15 +16,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { // create a password reset $password_reset_link = create_password_reset($user['id']); - try { - $safe_display_name = format_bcid($user['id']); - } catch (Exception $e) { - die("Bad BCID."); - } - - if ($user['display_name'] != '') { - $safe_display_name = $user['display_name']; - } + $safe_display_name = get_display_name($user['id'], use_bcid_fallback: true); try { @@ -41,7 +33,7 @@ If you did not request this password reset, please ignore it (or tighten your ac // echo("<a href='$password_reset_link'>This is a security issue.</a>"); } catch (Exception $e) { - echo "Message could not be sent. Mailer Error: {$mail->ErrorInfo}"; + echo "Message could not be sent. Mailer Error: $e"; } } diff --git a/index.php b/index.php index 3c9f9b93cb8a5c74dee7d533fc04fbeda73bbab3..7a6bd0b5d9a86add0beb1b396680f8d8e841d293 100644 --- a/index.php +++ b/index.php @@ -176,10 +176,10 @@ if ($include == "login_external_basic.php") { echo "<h2 class=\"subheading\">Admin</h2>"; } - if ($uri[0] == "admin" && !$user['is_admin']) { - http_response_code(401); - die("<img src='https://http.cat/401.jpg' alt='A cat standing in front of a door with a No Cats Allowed sign on it.' />"); - } +// if ($uri[0] == "admin" && !$user['is_admin']) { +// http_response_code(401); +// die("<img src='https://http.cat/401.jpg' alt='A cat standing in front of a door with a No Cats Allowed sign on it.' />"); +// } if ($uri[0] == "docs") { $include = "docs.php"; diff --git a/profile.php b/profile.php index 0c38e6c3f3bd6fe194e2cf1c35ea3edd0efb6777..9b365d2d95f891203ac1cf1ecbfa73c5e151cb9b 100644 --- a/profile.php +++ b/profile.php @@ -11,7 +11,7 @@ $profile = db_execute("SELECT * FROM `profiles` WHERE id = ? LIMIT 1", [$user['i if (empty($profile)) { $profile = [ - "id" => "0000000", + "id" => "9999999", "public_display_name" => false, "public_avatar" => false, "description" => null,