diff --git a/4dev/database/table/edit_access_data.sql b/4dev/database/table/edit_access_data.sql index ecadbedd..09ff02a8 100644 --- a/4dev/database/table/edit_access_data.sql +++ b/4dev/database/table/edit_access_data.sql @@ -11,6 +11,6 @@ CREATE TABLE edit_access_data ( edit_access_id INT NOT NULL, name VARCHAR, value VARCHAR, - enabled SMALLINT NOT NULL DEFAULT 0, - FOREIGN KEY (edit_access_id) REFERENCES edit_access (edit_access_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE + enabled SMALLINT NOT NULL DEFAULT 0, + FOREIGN KEY (edit_access_id) REFERENCES edit_access (edit_access_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE ) INHERITS (edit_generic) WITHOUT OIDS; diff --git a/4dev/update/20180323_namespace/rpl_old_method_in_file.sh b/4dev/update/20180323_namespace/rpl_old_method_in_file.sh new file mode 100755 index 00000000..dba24008 --- /dev/null +++ b/4dev/update/20180323_namespace/rpl_old_method_in_file.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +cat tmp.comp | while read i; +do + found=$(echo "${i}" | grep "function "); + if [ -n "${found}" ]; then + fk=$(echo "${i}" | cut -d " " -f 3 | cut -d "(" -f 1); + fi; + found=$(echo "${i}" | grep "\$this->"); + if [ -n "${found}" ]; then + # no to debug + found=$(echo "${i}" | grep "debug("); + if [ -z "${found}" ]; then + fk_n=$(echo "${i}" | cut -d "(" -f 1); + echo "rpl '\$this->${fk}' '${fk_n}' CoreLibs/DB/IO.inc"; + fi; + fi; +done; diff --git a/www/configs/config.template.inc b/www/configs/config.template.inc index 6586d889..a950570b 100644 --- a/www/configs/config.template.inc +++ b/www/configs/config.template.inc @@ -248,4 +248,7 @@ if (DEBUG == false) { // any other global definitons here // DEFINE('SOME_ID', ); +// read auto loader +require BASE.LIB.'autoloader.php'; + # __END__ diff --git a/www/lib/CoreLibs/Basic.inc b/www/lib/CoreLibs/Basic.inc index 0e6e896f..c9abb881 100644 --- a/www/lib/CoreLibs/Basic.inc +++ b/www/lib/CoreLibs/Basic.inc @@ -35,27 +35,25 @@ * * PUBLIC METHODS * debug -> calls with "level", "string" and flag to turn off (0) the newline at the end -* debug_for -> sets debug on/off for a type (error, echo, print) for a certain level -* print_error_msg -> prints out the error message, optional parameter is a header prefix +* debugFor -> sets debug on/off for a type (error, echo, print) for a certain level +* printErrorMsg -> prints out the error message, optional parameter is a header prefix * fdebug -> prints line directly to debug_file.log in tmp * -* print_time -> prints time + microtime, optional flag to turn off (0) microtime printout -* basic -> constructor -* _basic -> desconstructor +* printTime -> prints time + microtime, optional flag to turn off (0) microtime printout * info -> info about that class -* running_time -> prints out the time of start/end (automatically called on created and error printout +* runningTime -> prints out the time of start/end (automatically called on created and error printout * checked -> returnes checked or selected for var & array -* magic_links -> parses text and makes out of links -* get_page_name -> get the filename of the current page -* array_search_recursive -> search for a value/key combination in an array of arrays -* ByteStringFormat -> format bytes into KB, MB, GB, ... -* TimeStringFormat -> format a timestamp (seconds) into days, months, ... also with ms -* StringToTime -> reverste a TimeStringFormat to a timestamp -* GenAssocArray -> generactes a new associativ array from an existing array -* CheckDate -> checks if a date is valid -* CompareDate -> compares two dates. -1 if the first is smaller, 0 if they are equal, 1 if the first is bigger -* CompareDateTime -> compares two dates with time. -1 if the first is smaller, 0 if they are equal, 1 if the first is bigger -* _crc32b -> behaves like the hash("crc32b") in php < 5.2.8. this function will flip the hash like it was (wrong) +* magicLinks -> parses text and makes out of links +* getPageName -> get the filename of the current page +* arraySearchRecursive -> search for a value/key combination in an array of arrays +* byteStringFormat -> format bytes into KB, MB, GB, ... +* timeStringFormat -> format a timestamp (seconds) into days, months, ... also with ms +* stringToTime -> reverste a TimeStringFormat to a timestamp +* genAssocArray -> generactes a new associativ array from an existing array +* checkDate -> checks if a date is valid +* compareDate -> compares two dates. -1 if the first is smaller, 0 if they are equal, 1 if the first is bigger +* compareDateTime -> compares two dates with time. -1 if the first is smaller, 0 if they are equal, 1 if the first is bigger +* __crc32b -> behaves like the hash("crc32b") in php < 5.2.8. this function will flip the hash like it was (wrong) * before if a new php version is found * crypt* -> encrypt and decrypt login string data, used by Login class * setFormToken/validateFormToken -> form protection with token diff --git a/www/lib/autoloader.php b/www/lib/autoloader.php old mode 100755 new mode 100644