diff --git a/core/a/pageination.php b/core/a/pageination.php index 73d816b..58244ff 100755 --- a/core/a/pageination.php +++ b/core/a/pageination.php @@ -142,11 +142,12 @@ abstract class Pageination implements IPageination } /** - * will set the entries per page + * @desc will set the entries per page + * @param int $entriesPerPage */ - private static function setEntriesPerPage( ) + public static function setEntriesPerPage( int $entriesPerPage = 0 ) { - self::$_entries_per_page = Config::getInstance()->getConfig()[View::NIBIRU_SETTINGS]['entriesperpage']; + self::$_entries_per_page = $entriesPerPage ? $entriesPerPage : Config::getInstance()->getConfig()[View::NIBIRU_SETTINGS]['entriesperpage']; } /** diff --git a/core/c/formattributes.php b/core/c/formattributes.php index f4f74d2..fe3a36a 100755 --- a/core/c/formattributes.php +++ b/core/c/formattributes.php @@ -87,6 +87,7 @@ class FormAttributes $this->_element = str_replace(' CONTEXT', '', $this->_element); $this->_element = str_replace(' CHECKED', '', $this->_element); $this->_element = str_replace(' VALUE', '', $this->_element); + $this->_element = str_replace(' PATTERN', '', $this->_element); } /** diff --git a/core/c/pdo.php b/core/c/pdo.php index fcea517..5f92ac2 100644 --- a/core/c/pdo.php +++ b/core/c/pdo.php @@ -32,22 +32,34 @@ final class Pdo extends Mysql implements IPdo * * @return array */ - public static function query( $string = self::PLACE_NO_QUERY ) - { - $query = parent::getInstance( self::getSettingsSection() )->getConn()->query( $string ); - while($row = $query->fetch()) - { - $keys = array_keys($row); - for($i=0;sizeof($keys)>$i;$i += 2) - { - $row_values[] = $row[$keys[$i]]; - $key_values[] = $keys[$i]; - } - $result = array_combine($key_values, $row_values); - } + public static function query( $string = self::PLACE_NO_QUERY ) + { - return $result; - } + if(!strstr($string, IOdbc::PLACE_SQL_UPDATE)) + { + if(!strstr($string, IOdbc::PLACE_SQL_INSERT)) + { + $query = parent::getInstance( self::getSettingsSection() )->getConn()->query( $string ); + while($row = $query->fetch()) + { + $keys = array_keys($row); + for($i=0;sizeof($keys)>$i;$i += 2) + { + $row_values[] = $row[$keys[$i]]; + $key_values[] = $keys[$i]; + } + $result = array_combine($key_values, $row_values); + } + + return $result; + } + } + else + { + $query = parent::getInstance( self::getSettingsSection() )->getConn(); + $query->exec($string); + } + } /** * @return array diff --git a/core/c/typepassword.php b/core/c/typepassword.php index 5c6963c..a081857 100644 --- a/core/c/typepassword.php +++ b/core/c/typepassword.php @@ -17,7 +17,7 @@ class TypePassword extends FormAttributes implements IForm self::FORM_ATTRIBUTE_CLASS => '', self::FORM_ATTRIBUTE_PLACEHOLDER => '', self::FORM_ATTRIBUTE_REQUIRED => '', - self::FORM_VALUE + self::FORM_VALUE => '' ); public function loadElement( $attributes ) diff --git a/core/c/typetelefon.php b/core/c/typetelefon.php index 2919e86..cf3a67f 100644 --- a/core/c/typetelefon.php +++ b/core/c/typetelefon.php @@ -17,7 +17,8 @@ class TypeTelefon extends FormAttributes implements IForm self::FORM_ATTRIBUTE_CLASS => '', self::FORM_ATTRIBUTE_ID => '', self::FORM_ATTRIBUTE_PLACEHOLDER => '', - self::FORM_ATTRIBUTE_REQUIRED => '' + self::FORM_ATTRIBUTE_REQUIRED => '', + self::FORM_ATTRIBUTE_PATTERN => '' ); public function loadElement( $attributes ) diff --git a/core/i/form.php b/core/i/form.php index d9cfe5b..db43208 100644 --- a/core/i/form.php +++ b/core/i/form.php @@ -49,6 +49,7 @@ interface IForm const FORM_ATTRIBUTE_MAXLENGTH = 'maxlength'; const FORM_ATTRIBUTE_TABINDEX = 'tabindex'; const FORM_ATTRIBUTE_DISABLED = 'disabled'; + const FORM_ATTRIBUTE_PATTERN = 'pattern'; /** * @desc loads the current Form element to the form diff --git a/core/i/mysql.php b/core/i/mysql.php index 83fea40..4559af1 100644 --- a/core/i/mysql.php +++ b/core/i/mysql.php @@ -34,5 +34,7 @@ interface IMysql const PLACE_WHERE_VALUE = "NO WHERE VALUE"; const PLACE_DES_ENCRYPT = false; const PLACE_ENCODING = "encoding"; + const PLACE_SQL_UPDATE = "UPDATE"; + const PLACE_SQL_INSERT = "INSERT"; } \ No newline at end of file