Changeset 32987

Timestamp:

02/14/15 21:10:08 (9 years ago)

Author:

obi

Message:

fix

File:

• titan/plugins/readerconfig/readerconfig.h (modified) (6 diffs)

titan/plugins/readerconfig/readerconfig.h

@@ -365 +365 @@
         struct skin* tmp = NULL;
         struct oscam* node = NULL;
-        char* tmpstr = NULL, *file = NULL, *cmd = NULL, *dvbapi = NULL, *extract = NULL;
+        char* tmpstr = NULL, *file = NULL, *cmd = NULL, *dvbapi = NULL;
 
         if(cfgfile == NULL)
@@ -371 +371 @@
                 tmpstr = getoscamconfig();      
                 if(tmpstr == NULL) return;
-                extract = ostrcat("tar -zxvf /tmp/.tmp.tar.gz -C ", tmpstr, 0, 0);
-                extract = ostrcat(extract, "/keys/", 1, 0);
                 dvbapi = ostrcat(tmpstr, "/keys/oscam.dvbapi", 0, 0);
                 file = ostrcat(tmpstr, "/keys/oscam.server", 0, 0);
@@ -382 +380 @@
                 tmpstr = string_newline(command(cmd));
                 dvbapi = ostrcat(tmpstr, "/oscam.dvbapi", 0, 0);
-                extract = ostrcat("tar -zxvf /tmp/.tmp.tar.gz -C ", tmpstr, 0, 0);
-                extract = ostrcat(extract, "/", 1, 0);
                 file = ostrcat(tmpstr, "/oscam.server", 0, 0);
                 free(cmd), cmd = NULL;
@@ -515 +511 @@
                 {
                         int ret = 1;
-
+                        
+                        char* tmpstr = NULL;
+                        tmpstr = ostrcat("
                         gethttp("www.stbsw.com", "/sat/keys/Oscam.keys.tar.gz", 80, "/tmp/.tmp.tar.gz", NULL, 5000, NULL, 0);           
 
-                        printf("extract: %s\n", extract);
-                        system(extract);
+                        tmpstr = ostrcat(dvbapi, ".disable", 0, 0);
+                        if(tmpstr != NULL)
+                        {
+                                if(file_exist(dvbapi) == 1)
+                                {
+                                        ret = rename(dvbapi, tmpstr);
+                                        free(tmpstr); tmpstr = NULL;
+                                        tmpstr = ostrcat(tmpstr, _("Oscam dvbapi config disabled !"), 0, 0);
+                                        changetext(b2, _("Dvbapi (disabled)"));
+                                }
+                                else if(file_exist(tmpstr) == 1)
+                                {
+                                        ret = rename(tmpstr, dvbapi);
+                                        free(tmpstr); tmpstr = NULL;
+                                        tmpstr = ostrcat(tmpstr, _("Oscam dvbapi config enabled !"), 0, 0);
+                                        changetext(b2, _("Dvbapi (enabled)"));
+                                }
+                        }
                         
                         if(ret == 0)
                         {
-                                textbox(_("Message"), _("Oscam Keys Updatet !"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 10, 0);
+                                textbox(_("Message"), tmpstr, _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 10, 0);
                                 if(textbox(_("Message"), _("Restart Oscam ?"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 5, 0) == 1)
                                 {
@@ -529 +543 @@
                                         char* cmd = NULL;
                                         cmd = ostrcat("emu.sh restart" , NULL, 0, 0);
-                                        ret = system(cmd);
+                                        system(cmd);
                                         free(cmd);
-                                }
+                                }                       
                         }
                         free(tmpstr); tmpstr = NULL;
@@ -540 +554 @@
         startinternreader(1);
 
-        free(extract); extract = NULL;
         free(dvbapi); dvbapi = NULL;
         free(file); file = NULL;