diff --git a/configx.php b/configx.php new file mode 100644 index 0000000..5910793 --- /dev/null +++ b/configx.php @@ -0,0 +1,15 @@ +result; } - if ($results = $query_id->numColumns()) + + + if ($query_id && $results = $query_id->numColumns()) { return $results; } diff --git a/install/includes/functions_install.php b/install/includes/functions_install.php index 8829617..159070f 100755 --- a/install/includes/functions_install.php +++ b/install/includes/functions_install.php @@ -114,14 +114,26 @@ function kleeja_eval($code) * @param mixed $nm * @param mixed $prf */ -function do_config_export($srv, $usr, $pass, $nm, $prf) +function do_config_export($srv, $usr, $pass, $nm, $prf, $type = 'mysql') { $data = 'version()) && version_compare($SQL->version(), MIN_MYSQL_VERSION, '<')) diff --git a/install/style/check_all.html b/install/style/check_all.html index 0caab10..482a016 100755 --- a/install/style/check_all.html +++ b/install/style/check_all.html @@ -1,7 +1,7 @@
- {{if(empty($GLOBALS['dbname']) || empty($GLOBALS['dbuser'])): $GLOBALS['submit_disabled'] = true;}} + {{if(empty($GLOBALS['dbname'])): $GLOBALS['submit_disabled'] = true;}}

{{echo $lang['INST_CHANG_CONFIG']}}

diff --git a/install/style/configs.html b/install/style/configs.html index 036a889..e75dfa7 100755 --- a/install/style/configs.html +++ b/install/style/configs.html @@ -2,28 +2,38 @@
{{if(!$GLOBALS['no_config']):}} -
+

!{{echo $lang['DB_INFO']}}

+ + + + - + - + - + - + - +
{{echo $lang['DB_TYPE']}} + +
{{echo $lang['DB_SERVER']}}
{{echo $lang['DB_NAME']}}
{{echo $lang['DB_USER']}}
{{echo $lang['DB_PASSWORD']}}
{{echo $lang['DB_PREFIX']}} +
diff --git a/install/style/footer.html b/install/style/footer.html index 7976b6a..ff1830d 100755 --- a/install/style/footer.html +++ b/install/style/footer.html @@ -1,149 +1,131 @@ -
+
+
+
- - \ No newline at end of file + diff --git a/install/style/javascript.js b/install/style/javascript.js deleted file mode 100755 index 02e5f57..0000000 --- a/install/style/javascript.js +++ /dev/null @@ -1,5 +0,0 @@ -/** jQuery custom checkboxes * @version 1.3.0 Beta 1 @author Khavilo Dmitry **/ -eval(function(p,a,c,k,e,r){e=function(c){return(c35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('(3($){9 f=3(e){5(!e)9 e=q.K;e.L=r;5(e.s)e.s()};$.M.t=3(u){N{O.P(\'Q\',d,r)}R(e){}9 8={a:\'S-t\',v:\'T/U/V.W\'};8=$.X(8,u||{});9 w=3(4){9 b=4.b;9 c=4.c;9 $4=$(4);5(4.o)Y(4.o);4.o=Z(3(){5(4.c!=c)$4.g((c=!!4.c)?\'x\':\'y\');5(4.b!=b)$4.g((b=!!4.b)?\'z\':\'A\')},10);h $4};h B.11(3(){9 2=B;9 $2=w(2);5(2.6)2.6.12();2.6=$(\'\');2.i=2.6.15(\'k:E(0)\');2.6.n(3(e){2.i.l(8.a+\'-n\');f(e)},3(e){2.i.p(8.a+\'-n\');f(e)});$2.F({16:\'17\',18:-1,19:\'1a\'}).1b(2.6);9 7=d;5($2.G(\'H\')){7=$(\'7[1c=\'+$2.G(\'H\')+\']\');5(!7.I)7=d}5(!7){7=$2.J?$2.J(\'7\'):$2.1d(\'7:E(0)\');5(!7.I)7=d}5(7){7.n(3(e){2.6.g(\'1e\',[e])},3(e){2.6.g(\'1f\',[e])});7.m(3(e){$2.g(\'m\',[e]);f(e);h d})}2.6.m(3(e){$2.g(\'m\',[e]);f(e);h d});$2.m(3(e){f(e)});$2.j(\'x\',3(){2.i.l(8.a+\'-c\')}).j(\'y\',3(){2.i.p(8.a+\'-c\')});$2.j(\'z\',3(){2.6.l(8.a+\'-b\')}).j(\'A\',3(){2.6.p(8.a+\'-b\')});$(\'D\',2.6).j(\'1g\',3(){h d}).j(\'1h\',3(){h d});5(q.1i)2.6.F(\'1j\',\'1k\');5(2.b)2.6.l(8.a+\'-b\');5(2.c)2.i.l(8.a+\'-c\')})}})(1l);',62,84,'||ch|function|object|if|wrapper|label|settings|var|cls|checked|disabled|false||CB|trigger|return|wrapperInner|bind|span|addClass|click|hover|stateInterval|removeClass|window|true|stopPropagation|checkbox|options|empty|addEvents|disable|enable|check|uncheck|this|class|img|eq|css|attr|id|length|closest|event|cancelBubble|fn|try|document|execCommand|BackgroundImageCache|catch|jquery|style|images|spacer|gif|extend|clearInterval|setInterval||each|remove|mark|src|children|position|absolute|zIndex|visibility|hidden|after|for|parents|mouseover|mouseout|dragstart|mousedown|getSelection|MozUserSelect|none|jQuery'.split('|'),0,{})) - -/** MSDropDown - jquery.dd.js @author: Marghoob Suleman **/ -eval(function(p,a,c,k,e,r){e=function(c){return(c35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}(';(5($){3 D="";$.2h.10=5(v){$O=O;v=$.2T({S:2U,1o:7,2i:23,1h:J,1i:2V,M:\'\'},v);3 w="";3 x={};x.1F=J;x.1p=H;x.1q=1G;3 y=H;2j={1H:\'2W\',1r:\'2X\',1I:\'2Y\',18:\'2Z\',T:\'31\',2k:\'32\',2l:\'33\',34:\'35\',1s:\'36\',2m:\'3a\'};11={10:\'10\',1J:\'1J\',1K:\'1K\',1L:\'1L\',1M:.30};2n={2o:"2p,2q,1N,1O,1P,1Q,1j,1R,1S,1T,3b,1U,1V",3c:"1W,1X,12,3d"};3 z=$(O).8("E");3 A=$(O).8("M");v.M+=(A==Q)?"":A;3 B=$(O).2r();y=($(O).8("1W")>0||$(O).8("1X")==J)?J:H;4(y){v.1o=$(O).8("1W")};3 C={};2s();5 9(a){U z+2j[a]};5 1Y(a){3 b=a;3 c=$(b).8("M");U c};5 1Z(a){3 b=$("#"+z+" 1t:6");4(b.I>1){Y(3 i=0;i";s+="<19 M=\'2v-3h:3i;2v-M:3j; 3k:3l;\'>"+$(j).8("3m")+"";3 k=$(j).2r();k.2u(5(a){3 b=k[a];3 c=u+"20"+(i)+"20"+(a);3 d=$(b).8("21");d=(d.I==0)?"":\'<22 24="\'+d+\'" 25="26" /> \';3 e=$(b).R();3 f=$(b).2w();3 g=($(b).8("12")==J)?"12":"1k";C[c]={1a:d+e,28:f,R:e,K:b.K,E:c};3 h=1Y(b);4(1Z(b.K)==J){s+=\'\';s+=d+e+\'\'});s+=""}N{3 l=t+"20"+(i);3 m=$(j).8("21");m=(m.I==0)?"":\'<22 24="\'+m+\'" 25="26" /> \';3 n=$(j).R();3 o=$(j).2w();3 p=($(j).8("12")==J)?"12":"1k";C[l]={1a:m+n,28:o,R:n,K:j.K,E:l};3 q=1Y(j);4(1Z(j.K)==J){s+=\'\';s+=m+n+\'\'}});U s};5 2x(){3 a=9("1r");3 b=9("T");3 c=v.M;1b="";1b+=\'\';U 1b};5 2z(){3 a=9("1I");3 b=9("1s");3 c=9("18");3 d=9("2m");3 e=$("#"+z+" 1t:6").R();3 f=$("#"+z+" 1t:6").8("21");f=(f.I==0||f==Q||v.1h==H)?"":\'<22 24="\'+f+\'" 25="26" /> \';3 g=\'\';g+=\'<19 E="\'+b+\'" W="\'+11.1K+\'"><19 W="3t" E="\'+c+\'">\'+f+e+\'\';U g};5 2s(){3 d=H;3 e=9("1r");3 f=9("1I");3 g=9("18");3 h=9("T");3 i=9("1s");3 j=$("#"+z).29();3 k=v.M;4($("#"+e).I>0){$("#"+e).3u();d=J}3 l=\'\';4(!y)l+=2z();l+=2x();l+=2t();l+="";l+="";4(d==J){3 m=9("1H");$("#"+m).2a(l)}N{$("#"+z).2a(l)}$("#"+e).P("29",j+"2b");$("#"+h).P("29",(j-2)+"2b");4(B.I>v.1o){3 n=1l($("#"+h+" a:2A").P("2B-3v"))+1l($("#"+h+" a:2A").P("2B-1x"));3 o=((v.2i)*v.1o)-n;$("#"+h).P("S",o+"2b")}4(d==H){2C();2D(z)}4($("#"+z).8("12")==J){$("#"+e).P("2E",11.1M)}N{2F();4(!y){$("#"+f).G("1c",5(a){2c(1)});$("#"+f).G("1z",5(a){2c(0)})};$("#"+h+" a.1k").G("2d",5(a){a.1m();2G(O);4(!y){$("#"+h).14("1c");1d(H);3 b=(v.1h==H)?$(O).R():$(O).1a();1A(b);1B()};1e()});$("#"+h+" a.12").P("2E",11.1M);4(y){$("#"+h).G("1c",5(c){4(!x.1p){x.1p=J;$(F).G("1C",5(a){3 b=a.2H;x.1q=b;4(b==39||b==2I){a.1m();a.1D();2e();1e()};4(b==37||b==38){a.1m();a.1D();2f();1e()}})}})};$("#"+h).G("1z",5(a){1d(H);$(F).14("1C");x.1p=H;x.1q=1G});4(!y){$("#"+f).G("2d",5(b){1d(H);4($("#"+h+":3w").I==1){$("#"+h).14("1c")}N{$("#"+h).G("1c",5(a){1d(J)});2J()}})};$("#"+f).G("1z",5(a){1d(H)})}};5 2K(a){Y(3 i 3x C){4(C[i].K==a){U C[i]}}}5 2G(a){3 b=9("T");4(!y){$("#"+b+" a.6").1f("6")}3 c=$("#"+b+" a.6").8("E");4(c!=Q){3 d=(x.1g==Q||x.1g==1G)?C[c].K:x.1g};4(a&&!y){$(a).15("6")};4(y){3 e=x.1q;4($("#"+z).8("1X")==J){4(e==17){x.1g=C[$(a).8("E")].K;$(a).3y("6")}N 4(e==16){$("#"+b+" a.6").1f("6");$(a).15("6");3 f=$(a).8("E");3 g=C[f].K;Y(3 i=2L.3z(d,g);i<=2L.3A(d,g);i++){$("#"+2K(i).E).15("6")}}N{$("#"+b+" a.6").1f("6");$(a).15("6");x.1g=C[$(a).8("E")].K}}N{$("#"+b+" a.6").1f("6");$(a).15("6");x.1g=C[$(a).8("E")].K}}};5 2D(a){F.L(a).3B=5(e){$("#"+O.E).10(v)}};5 1d(a){x.1F=a};5 2M(){U x.1F};5 2F(){3 b=9("1r");3 c=2n.2o.3C(",");Y(3 d=0;d");$("#"+z).3M($("#"+a))};5 1A(a){3 b=9("18");$("#"+b).1a(a)};5 2e(){3 a=9("18");3 b=9("T");3 c=$("#"+b+" a.1k");Y(3 d=0;d=1l($("#"+b).S())){$("#"+b).1E(($("#"+b).1E())+$("#"+g).S()+$("#"+g).S())};X}}};5 2f(){3 a=9("18");3 b=9("T");3 c=$("#"+b+" a.1k");Y(3 d=0;d1){3 f=$("#"+z+" > 1t:6").3O("6");Y(3 i=0;i 'أدخل معلومات قاعدة البيانات', 'DB_SERVER' => 'الخادم', 'DB_TYPE' => 'نوع قاعدة البيانات', - 'DB_TYPE_MYSQL' => 'MySQL القياسي', - 'DB_TYPE_MYSQLI' => 'MySQL المطور', + 'DB_TYPE_MYSQL' => 'MySQL', + 'DB_TYPE_SQLITE' => 'SQLite', 'DB_USER' => 'اسم المستخدم لقاعدة البيانات', 'DB_PASSWORD' => 'كلمة المرور لقاعدة البيانات', 'DB_NAME' => 'إسم قاعدة البيانات', diff --git a/lang/en/install.php b/lang/en/install.php index 73f93ab..c214c79 100755 --- a/lang/en/install.php +++ b/lang/en/install.php @@ -57,8 +57,8 @@ return [ 'DB_INFO' => 'Enter the database information ..!', 'DB_SERVER' => 'Host', 'DB_TYPE' => 'Database type', - 'DB_TYPE_MYSQL' => 'MySQL Standard', - 'DB_TYPE_MYSQLI' => 'MySQL Improved', + 'DB_TYPE_MYSQL' => 'MySQL', + 'DB_TYPE_SQLITE' => 'MySQL Improved', 'DB_USER' => 'Database Username', 'DB_PASSWORD' => 'Database Password', 'DB_NAME' => 'Database Name',