@@ -34,6 +34,11 @@ function url($parameters, $mergeParameters = false, $useCurrentUrl = true) {
34
34
if (isset ($ mergeParameters ['host ' ])) {
35
35
$ result .= '// ' . \Vvveb \System \Sites::url ($ mergeParameters ['host ' ]);
36
36
unset($ mergeParameters ['host ' ]);
37
+
38
+ if (isset ($ mergeParameters ['scheme ' ])) {
39
+ $ result = $ mergeParameters ['scheme ' ] . ": $ result " ;
40
+ unset($ mergeParameters ['scheme ' ]);
41
+ }
37
42
}
38
43
39
44
$ url = System \Routes::url ($ parameters , $ mergeParameters );
@@ -71,6 +76,11 @@ function url($parameters, $mergeParameters = false, $useCurrentUrl = true) {
71
76
if (isset ($ parameters ['host ' ])) {
72
77
$ result .= '// ' . \Vvveb \System \Sites::url ($ parameters ['host ' ]);
73
78
unset($ parameters ['host ' ]);
79
+
80
+ if (isset ($ parameters ['scheme ' ])) {
81
+ $ result = $ parameters ['scheme ' ] . ": $ result " ;
82
+ unset($ parameters ['scheme ' ]);
83
+ }
74
84
} else {
75
85
if (! $ useCurrentUrl ) {
76
86
$ result .= (V_SUBDIR_INSTALL ? V_SUBDIR_INSTALL : '' );
@@ -1015,12 +1025,32 @@ function formatBytes($bytes) {
1015
1025
return round ($ bytes , 2 ) . ' ' . $ units [$ i ] . 'B ' ;
1016
1026
}
1017
1027
1028
+ function isController ($ name , $ app = APP ) {
1029
+ $ file = DIR_ROOT . $ app . DS . 'controller ' . DS . strtolower ($ name ) . '.php ' ;
1030
+ $ exists = file_exists ($ file );
1031
+
1032
+ return $ exists ;
1033
+ }
1034
+
1035
+ function isModel ($ name , $ app = APP ) {
1036
+ $ file = DIR_ROOT . $ app . DS . 'sql ' . DS . DB_ENGINE . DS . $ name ;
1037
+ $ exists = file_exists ($ file );
1038
+
1039
+ return $ exists ;
1040
+ }
1041
+
1018
1042
function model ($ model ) {
1019
1043
$ modelClass = 'Vvveb\Sql \\' . ucwords ($ model ) . 'SQL ' ;
1020
1044
1021
1045
return new $ modelClass ();
1022
1046
}
1023
1047
1048
+ function controller ($ name ) {
1049
+ $ controllerClass = 'Vvveb\Controller \\' . ucwords ($ name );
1050
+
1051
+ return new $ controllerClass ();
1052
+ }
1053
+
1024
1054
function d (...$ variables ) {
1025
1055
foreach ($ variables as $ variable ) {
1026
1056
echo highlight_string ("<?php \n" . var_export ($ variable , true ), true );
0 commit comments